gentoo resync : 15.01.2020

5783 files changed, 18035 insertions, 43306 deletions

diff --git a/dev-python/3to2/3to2-1.1.1-r1.ebuild b/dev-python/3to2/3to2-1.1.1-r1.ebuild
index 9297c84877eb..901ee6302dd2 100644
--- a/dev-python/3to2/3to2-1.1.1-r1.ebuild
+++ b/dev-python/3to2/3to2-1.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Tool to refactor valid 3.x syntax into valid 2.x syntax"
diff --git a/dev-python/3to2/3to2-1.1.1.ebuild b/dev-python/3to2/3to2-1.1.1.ebuild
deleted file mode 100644
index 37ae197c6925..000000000000
--- a/dev-python/3to2/3to2-1.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-inherit distutils-r1
-
-DESCRIPTION="Tool to refactor valid 3.x syntax into valid 2.x syntax"
-HOMEPAGE="https://pypi.org/project/3to2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	# the standard test runner fails to properly return failure
-	"${PYTHON}" -m unittest discover || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/3to2/Manifest b/dev-python/3to2/Manifest
index f3274ae25b9e..0aeca12696c0 100644
--- a/dev-python/3to2/Manifest
+++ b/dev-python/3to2/Manifest
@@ -1,4 +1,3 @@
 DIST 3to2-1.1.1.zip 78779 BLAKE2B 441e74bd06017c84bd382c32513d84f42b8bc35f46aeb62ec1e3f5b9876573e0a76f6e04f4ca529175761af6f29e10ee0c4d4114ff0bcafb066d2d6344b1d885 SHA512 7580f174409420556f89ae78eba07cc95b95aee9d062586d0862bd41980ae31bf4ac82a43855e160eec745fcdd3b4aff614f68e77da1bfc5f9f404413cab1492
-EBUILD 3to2-1.1.1-r1.ebuild 938 BLAKE2B e82f635615cce525c61ea754a63a90c088818d4f38b7d291e227f7c1544f2ac4445e4964ef6279d06d5cbefa9de32c9c650091f3f5af2259d7e1da837731c55a SHA512 c7803360442d06e5404e486a33620960cf8b3e99216aaecce4cba770828e2c044ad382bf609aed513e1058c19a36cd54ad7a29e98b176704754f741000792618
-EBUILD 3to2-1.1.1.ebuild 595 BLAKE2B c0223c8bda0a43b0a31311a1971345a5fb73b05516699fb2d446a118fee8dab1cfcd3329cbf26a8b4ad3876fe899a0e58acc1725fae2210288158ad5a1dc9e85 SHA512 1e58c8e8ccfcf84091295f186be9db8a41c9ba011702e9de44aea636e230b6419a65b3a3d5e29949ca0cdae80ac4865816e98bf882f7024802ee6bd5101c8f44
+EBUILD 3to2-1.1.1-r1.ebuild 928 BLAKE2B b4da96c2b768ecfa7c648a7daed11485d040dec625e580749d32d91d303da08cbfb891c388cad17e112d3deed5faf37de70a850cd6a7a6d6f65f2c7b7b2ab379 SHA512 83588fa92f03ea7cd85023fb19e25b11b6a37266da7dc6b55d06ce4dd7d22637cc48118f5cfb1c4b7faf5f0b53bc499cc125d09cd2f742036cd507998e1b7946
 MISC metadata.xml 433 BLAKE2B 4f1b66cebd6b0b9f083d0896f702cc2f882d0d05a28634fad2d83af9802ccdfeb237e8d1eddee71c5a18663ede779085c28c81c3586b4ccfa2274c5dd8a9e1cc SHA512 fbf01ed6fe0bfdf49ba985e62e8694d7152129e0d46a3701fe39dd11ed7d48641efaea848694a271f39b9ae7e6b805b0ac535945cf33d455e0745d1f66ad3c04
diff --git a/dev-python/APScheduler/APScheduler-3.3.1.ebuild b/dev-python/APScheduler/APScheduler-3.3.1.ebuild
index a719fad78006..e6558052227a 100644
--- a/dev-python/APScheduler/APScheduler-3.3.1.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/APScheduler/APScheduler-3.5.3.ebuild b/dev-python/APScheduler/APScheduler-3.5.3.ebuild
index 58245aabdaa0..23cbda5e5cdf 100644
--- a/dev-python/APScheduler/APScheduler-3.5.3.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.5.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/APScheduler/Manifest b/dev-python/APScheduler/Manifest
index cb5f2ce24755..fcba550f942c 100644
--- a/dev-python/APScheduler/Manifest
+++ b/dev-python/APScheduler/Manifest
@@ -1,5 +1,5 @@
 DIST APScheduler-3.3.1.tar.gz 84198 BLAKE2B 8706c68dc2b8097d4656da00b62b298ad2b0cb94079bd32b08c0c3316f8317bf299d513ef120822d40b938aff4c49aaa9a1beef9d91e554f02413407b2848711 SHA512 af861bff47f881200d97551d60a6d3210c9bf864fa83a37da7fbff31d24e9fce5d64d965ffefe6f8678320ad6dcf86dbdc65b611991b14fd8edd18efbf7e6bbd
 DIST APScheduler-3.5.3.tar.gz 95527 BLAKE2B 3d1bb49a497781d017e2fbd47176186f6449650500c57a141a114f6c610081b9d85553793f9c9f00422d3a299c26c292ab667cfe3866c381bcbf39161133b615 SHA512 dd3e98d0f474511851bdc109a1c65f7f97d221f95d086603d12b3f280285460234724369f05816e1754d58d94adadbec0deb8a0fa63fcd6531914d4a1f4fb3fc
-EBUILD APScheduler-3.3.1.ebuild 1944 BLAKE2B 3c426198115962833f9d86a18ba43e19c73b8b4280e80d6d5da67ddb9828b1b0501b0ff9fa8b1dd11c53266a692c658092ef3cfecc191b69e01c20be33aea0fe SHA512 6bba15f3d2574ac18a73a65e5e57506da92b10ea6f3ec7c65453d37cd2f6882f8ee83b6fc4a1a8c879466a668110dea356e2bce5fc8065d5d3159b3c9c2ffba9
-EBUILD APScheduler-3.5.3.ebuild 1887 BLAKE2B d3bd61bec6a4bb9d371e342f027edcf82613d5c6eb7b776bd019e1b0c8567a794829803ccdb6c6ba204d9c2bf778e6149ecf6f0d5a862d1949e20d2654f8851e SHA512 af93158e9520162bd17cb670327854ab565dfe31d7ad4b6affb319fda87085a1bfd82d904d1ceb53384de1ba76d3ba0a1812bba976612a0c989b440d92aa6bf6
+EBUILD APScheduler-3.3.1.ebuild 1934 BLAKE2B 9e4185e0be8b100b8ca7c71a2983fec344710af4738b789e5934758d38a61983bb604e24506588342e03d3e03cc60b7b0c498e8ef2925ee3cacad96f221d9e83 SHA512 efd4597084d626e1bd7168995d0ef853a7583bd1675a3b44415359a71787fccc8a6c9300e752d180cf4327af3a42457c55adbb0c2967e5fdc72302fc14a96399
+EBUILD APScheduler-3.5.3.ebuild 1877 BLAKE2B 42f3a0788f3a0187e834b075389e174cbab3f0b3ca3edb2413340d2bbe1b4bf1b36179c3672882b6bf980cd07fbb72f85ed47778a09c58e84edf88fda455eae8 SHA512 87ff06b6bdabb3ea31c873ed2161539f853e08dc4c5512297868eaa02ff127a22f3564ed498bbf3d6500907b0e4f4f310afedc530a2bf903ce6dbba892166e1d
 MISC metadata.xml 353 BLAKE2B e0c141ff0ac5a9f98c3b55871de97976f15324b722420a8def45a053b2fdd0b992c44bd6d1c4824c479700871951423ff13f921043a5dd8770ae73a279deac9b SHA512 48d42b0d3fd5ab07ecbd8554cef11d06bf5d7616e777d6e76103699f305f9aee7bd8618294d5548a62815a621bd4fe6ac4d32c008b79ac7f7334d6a29a261008
diff --git a/dev-python/Babel/Babel-2.5.0.ebuild b/dev-python/Babel/Babel-2.5.0.ebuild
index 0ef7081d419a..1b7993291546 100644
--- a/dev-python/Babel/Babel-2.5.0.ebuild
+++ b/dev-python/Babel/Babel-2.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
index 20fc22a8418b..892da8ad19c9 100644
--- a/dev-python/Babel/Babel-2.5.3-r1.ebuild
+++ b/dev-python/Babel/Babel-2.5.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/Babel/Babel-2.5.3.ebuild b/dev-python/Babel/Babel-2.5.3.ebuild
index c42965f4f324..87a7e4cc55f9 100644
--- a/dev-python/Babel/Babel-2.5.3.ebuild
+++ b/dev-python/Babel/Babel-2.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/Babel/Babel-2.6.0.ebuild b/dev-python/Babel/Babel-2.6.0.ebuild
index ebbab21c000b..c79338ec671a 100644
--- a/dev-python/Babel/Babel-2.6.0.ebuild
+++ b/dev-python/Babel/Babel-2.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/Babel/Babel-2.7.0.ebuild b/dev-python/Babel/Babel-2.7.0.ebuild
index 42b0b5512da0..f5e3d5e4db18 100644
--- a/dev-python/Babel/Babel-2.7.0.ebuild
+++ b/dev-python/Babel/Babel-2.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/Babel/Babel-2.8.0.ebuild b/dev-python/Babel/Babel-2.8.0.ebuild
new file mode 100644
index 000000000000..cdfad7184e95
--- /dev/null
+++ b/dev-python/Babel/Babel-2.8.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="http://babel.pocoo.org/ https://pypi.org/project/Babel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index b1f7f8a885e6..49da7ae98696 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -2,9 +2,11 @@ DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab
 DIST Babel-2.5.3.tar.gz 6611941 BLAKE2B 99b71642b00a853fea844220c0ce5ef2fe425906cbdd1618e31f39b60d16382d54ff5e00c493153eee2be8894edc8c96e57fc2703620db5bafcf7b7a4f1b72ef SHA512 1a41f69141da9f66e27110e7a1a5955f76d8ae9353ff7e54182c5bb6ca16e8b4799031e4df1049af54de513da9f101e171e4312b2e7775f2cab9116d5b50c0fb
 DIST Babel-2.6.0.tar.gz 7960433 BLAKE2B 0edc3b3391eb3d479eae9a223668af96e1ec47b84b13d0bb66c0e1772dc5de8321ee06f0d0dfeb6c9364a724286d0ee50a3ab4c2ea789894057fca39bb11dc46 SHA512 a87f26c25f1e48a64d1e7ee112bc0c325a6268e0e716a81cb6814a53f0add8f3d579babd2ba064f160298ebe3ac9711aa5d28f112582ee287767b6ed8427b6e0
 DIST Babel-2.7.0.tar.gz 8244870 BLAKE2B 515f1e033d408e4f5fdcf1d1720a58e429523611a2a01d62bab95b96a2187ed0594e4c05678ac3311d6570bca2bf90b08818c233bf28a2fb03fdba923f5e6401 SHA512 96314c7b26f6915a825e0344fa06e4f1d9a71b97a52b16f2f696c2e81c69318974547620135912b11edb95668a717ec49f1be68eef5a4753092d8e4cdc39a1e5
-EBUILD Babel-2.5.0.ebuild 1470 BLAKE2B 3908d03e0b509fece29dedfd7de6152aa9a16f73a1155706ce19f38e95688fac7ab80671bafeea811205c46d89805c082036328ae29ff1b2e2195268c18f5eeb SHA512 a01bbbb1979d1a6f1e2d90e87501d0c8fc01b93b1936c6eca917008d35ba0e266604dbc79568aa9886cff8c93b9ba007056d77422645d1a05eda719e7e4e03c9
-EBUILD Babel-2.5.3-r1.ebuild 1533 BLAKE2B bfc63921b9650f536b4b2e38e8a7e9732e325c1bd1d2c83a2887d4a92e6d401c3e1d1ad68c27a26a79c8e6806c95d15775a5500c149a5b36e539679816e5ffa8 SHA512 18db992d32c653135cfd816fa115fccd6bdbb0fa12ebeda2d6c8e18e3b3dfd498a8d39bea736a1cc32acbbc4615f0738527eb8ee93fb385f4870a1849abf3214
-EBUILD Babel-2.5.3.ebuild 1471 BLAKE2B 37af9fced3e32e5dffbbd5ad297b60ab3ef05546e9f24bed29ac9e0a2c496fe95748211cd86b7b4835d85bfeff6429ff5f50e5da85c70e1ffe6e7d1bdcdded12 SHA512 75688d8e2597ee52997b4f51f792f1c5175cc2135857d95de17a9d3499bd2519fd49f422a34bffe9840af71991fa99e209b80b5afa8fd95d9081e201863787d3
-EBUILD Babel-2.6.0.ebuild 1467 BLAKE2B 4e46e3a504f1502392b10bdfbe2abe32886d34cee638b09cbf2de566b5e7f1cb6bca0bc1ee2d855e9651ea7eba6100d3ffa31bc241f9581f29e08f31f3cc01c2 SHA512 ba2f8d077f4f30959b4a36c3c32bc3e3ccadaa67ec6ec4223b3cdb3fd579eac739f0ecf42279c3dc611ddf4a5e4321e123e0bf2cbbad237f4d70950579623fc5
-EBUILD Babel-2.7.0.ebuild 1325 BLAKE2B 865106521862ffe5a764aa9c4f99d2645f9d0fb2db623430f4461a9ec37261700e08c9a50a40dceb29c077cbed17a92c0f6902b9601bcd5f4c40fd79a3050d63 SHA512 d61544dfdcd90d674c4f7ae90809c24647071e836cac99926b94a03d40bbebc90674ff77d93b9b5f6e560065d72514d2399320324623a5c78447c88a3494064b
+DIST Babel-2.8.0.tar.gz 8444381 BLAKE2B ea3757182464770f47d3253e77bece7b64c84558e7a19fc55759198bfa55c6d8156d27e9de7b796b62eefd93e458c7e00b2014dd23e4ed7383f5bc9785d1a332 SHA512 f9687b36176c146a8ace073197111463d24fca343bb1dbee8b0e37a7f37b68b4cd77ffbe3bf14a20f8f64c701aa860e0b5e6076658a95dbee2556f0688d68d91
+EBUILD Babel-2.5.0.ebuild 1463 BLAKE2B 9afe674776b7c6a81913c1a61bae7d1d8c713aac3ef76a00ea80d0646fd958e91f906dcf8ef7e3600abde0882ac1b6a53611b4ce00fa4c1962fc01ce04f48c0c SHA512 296e2e936ce4046623e4a2bfb46193ce64dfe16bca41ec829b8e8f27dfb7ee7b639a8e30479623fcaeabd3469e4990a0bbc08fb93742870d911194b7a0b56222
+EBUILD Babel-2.5.3-r1.ebuild 1526 BLAKE2B 9b483506c98f7b5545ea555c8e2be7f1b85cdb7c1cdf33c40654a5258c33402f569ff5593b42fe920ea6a3749520004c3884e0988009354e04bae0d5529d85b9 SHA512 674622e70c23be8724cd65fac069bfe203a6029de9d6ee03a9697a1e16b864ddb5e6dddaef195921f776f4210433a16d0adc3e033de260d3da23b9c6ae83914f
+EBUILD Babel-2.5.3.ebuild 1464 BLAKE2B f7ce30d1c80811e4ef4eea18182ac6cfb1ed8b11a26393520b510c2a9a5b7fc0c04c08248a145f4dae973b8f01eadb4998ec903fbc10fa0ca217e47ff3138aa3 SHA512 75f35ea64d06b2201d10ff70d03c9a0cef4f14c58f9d6c7815607c670e938ad78787ed968cf8fa409dc13c1e233cd4a47ae4e016cd0c75d9512bf7facc6eeaae
+EBUILD Babel-2.6.0.ebuild 1462 BLAKE2B d778bd8dfb52e107d2650bbbe44bdf3ff167ec6c430400bacd3058cd69cb9c36853737077513351c59d25526bc1ec7167a133a3ebb10646d536aa61876614224 SHA512 a7d20ef7bc354055268f92f9ec841fb6112625b468b0dbcb2c3ba8cf25383a24e3cbc590cca219abd65e7393a54f5944facd3148f9f56ebb6f49e4c1e94eed1d
+EBUILD Babel-2.7.0.ebuild 1320 BLAKE2B d4e045f9ba204312145087e35316aff7904eb5b1f78c7516424ee5c4fef2be67f76b53dad428030e2ac3feebd3959b8c78d34287cfff51c1510e591b704bb2f3 SHA512 a10fc839616239843862f5abaa6322b2cb614609a1bcf9d1d6a6a1d60d9bc8754fc862ee0eff0b934d49bf14b71f213e42a9f0bad1bae64d452bdb1f87a9f05e
+EBUILD Babel-2.8.0.ebuild 810 BLAKE2B cae9e5a7ed2efa7549d7d0daa5ce25faba1e4130be727801fae5fabde0f88bbafb3bb5d0008614baab6bab4699c555399d797306a05c7d60e48c32654bfbaeba SHA512 b538ead11d8a19180849c0f9542ee6ebc034c6d7fc06c38387ad7faec9ded5f5ab599b1484a044a2179559a5014e19a607335843139978b457f31ceb07d59af4
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/BitVector/BitVector-3.4.4.ebuild b/dev-python/BitVector/BitVector-3.4.4.ebuild
deleted file mode 100644
index 8f85d924ef27..000000000000
--- a/dev-python/BitVector/BitVector-3.4.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector/"
-SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-python_test() {
-	"${PYTHON}" TestBitVector/Test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/BitVector/BitVector-3.4.6.ebuild b/dev-python/BitVector/BitVector-3.4.6.ebuild
deleted file mode 100644
index b677ad23df67..000000000000
--- a/dev-python/BitVector/BitVector-3.4.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector/"
-SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-python_test() {
-	"${PYTHON}" TestBitVector/Test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/BitVector/BitVector-3.4.7.ebuild b/dev-python/BitVector/BitVector-3.4.7.ebuild
index 7d2d6cb3cf16..0658ee2da539 100644
--- a/dev-python/BitVector/BitVector-3.4.7.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/BitVector/BitVector-3.4.8.ebuild b/dev-python/BitVector/BitVector-3.4.8.ebuild
index 4286029d351f..6b6f4899f3cd 100644
--- a/dev-python/BitVector/BitVector-3.4.8.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/BitVector/Manifest b/dev-python/BitVector/Manifest
index 61095f9fecf0..0357233e686c 100644
--- a/dev-python/BitVector/Manifest
+++ b/dev-python/BitVector/Manifest
@@ -1,9 +1,5 @@
-DIST BitVector-3.4.4.tar.gz 121822 BLAKE2B 1261a7b86130b15eeb3b9ab3565787e673ecb1ee908666eb7784d1da3052bd69b9878a7eeb50df49bfa0ff76b8f2f9d777517c254a320feca187161cf1820701 SHA512 b2310ef712c97538e29d008688efdc10269030bfdf7656733093dd4580ff4dfa171f6d58683c3a6336e909a020ba5100474e18997c1b2a0873a0da2e622ba9ff
-DIST BitVector-3.4.6.tar.gz 125137 BLAKE2B 877d2d855ce9eb9f1126df981c92dd8a7a475b15cbccc371ef4649692ac8b449a009d37ffd9c1fc70cd6147faf7758a18c6d83149a22786278f07eb3106a2de0 SHA512 56994692b7cd62f5790a1629d6a653f66f147e674dbc1a5f256dac4462c3eedf6363551165de940e4823d78462f63a44dce03ccd28073db1d93f2e2af436d0ab
 DIST BitVector-3.4.7.tar.gz 125013 BLAKE2B 8bd058c485d630755c0c06d4fee0e23c00a32a341d86f92aa22a48aaedf6ececb10bdae22e60a5bdb83f54c013fde8a914266deb64948ded0b2b95f5a4e4168c SHA512 5f9c9d13de6bec4b982a98564561b250152ba0ebdc119c75ddaf3822451dabe417d023fa529fd0ab8f583f86209369937b803d3ed0809ebeb312886504d96dfe
 DIST BitVector-3.4.8.tar.gz 126947 BLAKE2B 5033564af4b69b1191ff8317523067b739839e83ed6d9c2c7e3f0910f67635d9d6e8712fabd722971a4652afb6466ae08c7aebe711711e4503a08284f11eb28c SHA512 22d76c33d407b7ff2b0493ed4949189d7fc9ea8fd7497610014ede5f27756b5f91678a5f2da5db5e04f9e85e98378001d0edb5a8c2e3053083d18e547799f3f1
-EBUILD BitVector-3.4.4.ebuild 539 BLAKE2B adc80e56153ccef408ec44f04ad5cfa4130e196418045da1bc25a37bacd3f75eaa3da149dd6ab98d87b1f933046fb45bc87bd787df58048debc3fbdec3381ca1 SHA512 1b3391660ac8741f78abbf17b50b330de05336a13385a3570b960b9dfaaf8c6c30d003bebda7d4204b609d6747e479ca71c953dcbcf685e54a8e4f1911a91922
-EBUILD BitVector-3.4.6.ebuild 541 BLAKE2B 64357d40b2ebcdceafd19e68fabd6fc9b40854adfc15fb072b5318abdc2b09bf4325d67210dfaebd001f4cabbb20bd18fa823fe3894c88c1f4643702a42805dd SHA512 a97493f086dc2464d85874c8f76d665e5442fc963e42e76d6119840af6c6d2b67e6937b7d2b916ba8b11821058dfb4bcfc029bdbb624b50cde299d6285bf836c
-EBUILD BitVector-3.4.7.ebuild 654 BLAKE2B 4d360ab66579575f7e9c4df539eaf97946fb3d21088fb07019ff5cc367ac5923e6fee026ba2cfc196d4aefb4286168db72482c09f9a661170090b6d16ebd46fb SHA512 01eac913b29a4bf02e42723c2af6efcf0ce3454d43c0f210065860926173e33fd5722aa9dc836494b518f5b443dd6b3e2685920001551c6703f44ecd12f72549
-EBUILD BitVector-3.4.8.ebuild 657 BLAKE2B 3e401a07e143d66f8200e8b2d90509c82dcdc93c8022c1c4184f1c1a77678d2bbfee34f0b700f40eab85f5e7d8685ed0e5e718d4da5d1a65a733fb9d9d0be1d1 SHA512 a2fdb756e6ef131a9ab400dbfb2d28ab03391921a7e1a7c9dff7a7e8a6b3258ba913ed27fd85c4ea1fafe2b861c17f3725b6e8a06ac40c5e2066876431b24868
+EBUILD BitVector-3.4.7.ebuild 641 BLAKE2B 90ca4ad961e592bf355d206def4c9d61c373120a5e3f17596f6054ae84d014bf3280065a32a97467408dfb21168e90c9f6ca938ac41248ce836955e81f76d98a SHA512 051ef92c1b51014ea5fbc8d89f58fb347b4ee00bbbfb99e8396decc240ce01ce3791a120568a37d5a014f1544fd85dc92dbddc5d9986a3f6b929c400c65666f0
+EBUILD BitVector-3.4.8.ebuild 644 BLAKE2B 8582318b5e2747fd0f65b34f2fb15bd75ed07e9a405a82b6ad06d1c866398f5ab89d36edd1e2343d6d8059fb8f13b79d1603041a0adb85c4656838448eb7f75b SHA512 fce0070a5bd96ec7bfafc8d4dbd1e91ffe1ce0f57337ef0d561d65a541a87553d82e4371caf5356c421d1261b33e54c9bc1721d36a15ac026a370118e60b81f5
 MISC metadata.xml 456 BLAKE2B 28bb633e8da03c0f1ecc36ea797b9a29c579c226ea6a2c66f87d9639fb508c71b779cebcd5d6fd748ad2dcd28eb1ad6c39579888bac6fd682c1fc19069a8abe8 SHA512 e1f71284088a9a68ca91f5f55e286090ed8e836f67caede5a7f875ee27ba93f435a73e5f6b0c33c0bdfa670a1a006e8583f6fa3aabaf80b9a8ba82c3c72ff72e
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
index b94ab409d73e..c415fdb1b5ee 100644
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/CacheControl/CacheControl-0.11.7.ebuild b/dev-python/CacheControl/CacheControl-0.11.7.ebuild
index 1f4b641c651f..da503205fb13 100644
--- a/dev-python/CacheControl/CacheControl-0.11.7.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/CacheControl/Manifest b/dev-python/CacheControl/Manifest
index c5de544d861e..3fb215bd88f0 100644
--- a/dev-python/CacheControl/Manifest
+++ b/dev-python/CacheControl/Manifest
@@ -1,5 +1,5 @@
 DIST CacheControl-0.11.5.tar.gz 13104 BLAKE2B 460d963e7459f34d8b1ceffb9d971e3690c87635e2e88aac0ca6b54f7b5a7a4f1c3887e653af7df27d66551e1db869790b48ec9a27c48fa548b1a31293ccf19d SHA512 2acce5a8be2e409a1a18254cfe71314074037bce3341f8b8fdec52c43500c90bfdb6063b2121c5cf6c8a2fc7c0903e4fd0c15813ffdfa547810b33571d211deb
 DIST CacheControl-0.11.7.tar.gz 13902 BLAKE2B fc363357631efe3d81f53060cce9c71f21aeedcf285b40c8f9b3948155b8aa6e327ca51864073fb1eaf91bcc2c4c2d586baa73ab2b5776dae6574fd243b80c94 SHA512 fad1f93140dd6fcedb3797f4dbc1587045ade8dafe6cbc6774bf62bd635fbc1ba08b2dec124745cffed5259606b55f0e2edee036b5b5e34156d3114f6bf63493
-EBUILD CacheControl-0.11.5.ebuild 889 BLAKE2B 20c7abc0a1110f9c83945ddfbd92f3f4c74db9633b96d79ec6b9dac4cfb9f6f85ed20ffee388c8805207445940974d4b8a5b65fcd82beec96273a8d95373ee3b SHA512 d506019fd6a487b7b93f2bc9ebeed0ecbb3c83a82223659d9514ef3dfcdd74b49f762d9f69b3c5e436af01cfa0a3b88f1bbcd3937112e5e9163fe466d6b34b19
-EBUILD CacheControl-0.11.7.ebuild 898 BLAKE2B b2b2a7491e452680d3fcb4354790bf7e9026e800cae315f620217265b280867f034111539925b95874f9cb22b06df32e5b9ed51a2b15a8eaf156ee69af875265 SHA512 53034acdfdae4d2404db64ce607f66ffbc6bc83684373c0f2c40cf7e6d63b0c49a1ce016bbac8aade87fb9c9926f9686798252eb76255c5c574ddaa5909bcfc1
+EBUILD CacheControl-0.11.5.ebuild 870 BLAKE2B fd202ae83b0ebcb45ff24d875b1b41e037413a0e2a87d5ea99a56d603e08fc85ccd9f0ee0a810149a80e0fed6466ef5f3889abc97e8e96192d4f7f7249557fc7 SHA512 286102079ea0a954cf692d1a64bccc79153f0b58687a50286bcbf326b51948c7d8158d395e0fd11a16f5b085623b78e9886a2cb673d1ae38797e2ece069e5087
+EBUILD CacheControl-0.11.7.ebuild 879 BLAKE2B 7d2c0602b12f2ad7a064492e409b557da0619bdba24fc1cff7e2d42db312f7cf724d24e7145f6cb1b97d55b8e23054a23ac8037f08dcb6a8ca522669533b967c SHA512 8129502edfadbdc20c7a079a279e99864789127386488310fd4f57da0df94096012ebbc5c9ca94cfa7ff86320ea043742bbdd64c682a5453ca27a444d378a15e
 MISC metadata.xml 387 BLAKE2B 6061a2460b3bb1c6f1c8aa6d9227897a61fe36807e51273d3c1aec337a345b6df6143bb1d20a35c2bd877257ea04e7f79be5f4a58843bcc5879fbc2f03b23328 SHA512 c80bc300402e7cac33d5350aafda6c93579b3d14094ea34bfe4dd898ca498ab0139c428f01e4917544df64a1aef0022a4868650e2bb66f2cf9606c28fe885f65
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
index 8fa5ff05c2ea..9fe4d0a0e85b 100644
--- a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
index 35c64cc50a7e..34f8611466a2 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -1,3 +1,3 @@
 DIST GridDataFormats-0.4.0.tar.gz 63643 BLAKE2B cbc0bc259c30c9eccf61b11a7ed6e8004979fe2adb2b049f137caddbb71190291011664462c2c1aa4fe2baf822102d59d3079e9e48620b76d37a4812ca150328 SHA512 b480293e2dd17cb484336aa1469a8f0e739fbe7d925190f6a6502e96d0ab26a36271b0a0676c711716abd3e025e86fbec961cf965e950f89be167e0a83ef904c
-EBUILD GridDataFormats-0.4.0-r1.ebuild 621 BLAKE2B 729b32ee16058728dabd9f653e7eb2dcb832d346252d40b60c2e56818e228a7ef004a1bcdcaba9dc14b93a7c330b97904208f1a3e362b2ab653b81e105acc610 SHA512 baedfa7d2f83d783f0334748a472b45503da1ae5a01a49a8e4d11c5086fd2124fdc0787484d8a06081a49fa2e2faa7165fc13d0839410069cd03fc16dbed72ab
+EBUILD GridDataFormats-0.4.0-r1.ebuild 609 BLAKE2B 8b8aec8cbf9a4711574668b3d04755ac8cfa2d594d84c79f077f54d1c9340d208a578fc534e23f6ee44fe7b31e6450da141b5b7b2da06497ddc90f56f8a88c71 SHA512 717510dce42fceea3f39627341b9a8392fdc55db618fd92593ae6e803904de7d9bdb6f445b77ec510a70e223291a3e97f856227f363040431af5d396c0a4883b
 MISC metadata.xml 506 BLAKE2B 55c662f902e8cb3b70a60da0eb8925e36c762b1fca2987445ec0535c2176c2dbff03fc4eda6f742d94adb40f08d96bbfd24b2d62e2eb148c13a4c9175225f06f SHA512 b5dcea13ad76570e3fd89f7771b42b380fc66954a1a0849240b353382c9eb333df7a48ccee1514b0f32c80e458d6242a9c50c9630aa004f0c000a48400550bb9
diff --git a/dev-python/HeapDict/HeapDict-1.0.0.ebuild b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
index 4fe9af6c0d29..5d5b77283bad 100644
--- a/dev-python/HeapDict/HeapDict-1.0.0.ebuild
+++ b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/HeapDict/Manifest b/dev-python/HeapDict/Manifest
index 85cee661dd83..5196f1b79871 100644
--- a/dev-python/HeapDict/Manifest
+++ b/dev-python/HeapDict/Manifest
@@ -1,3 +1,3 @@
 DIST HeapDict-1.0.0.tar.gz 7713 BLAKE2B 19aedc2e7a61c74b93aa8883603520bc6ffeebae4ac4c4a4003023bf6b1c65ff55f9ef571a3e61ea92620a18eed281ad603a61e1df4f03a8811096e9f0964ab9 SHA512 1210acd3a6f3e091132d8b87963ec46c81d3141e1788c2a127fe348a9052d73225036aeabffc6a2089c7811b8571a43477055b746df6b128a645123862076bb5
-EBUILD HeapDict-1.0.0.ebuild 478 BLAKE2B 5192461cf52a0597d70c5d17ec63e6c6310a39779de2075dd5981aee5c46aea84ec71bb9ec2c05a91f365c9269ccd144c42c03a2110530505b06849be11ba363 SHA512 245d44d307ee28f40e47d81d614418ed6174cbf040a506dc5bf7d5b6c9d5e6aaeb94fd5ab290bfc85e1a01e787c3d2e7ec5a658f9078fc3afa573b2965840ca4
+EBUILD HeapDict-1.0.0.ebuild 476 BLAKE2B 2f85def0a76dbce0e9a6196b5156e73be919ba5e4f4d02b3adeb2c0cdb520a087cf6b7afceb5cb2d818448c504614b4477b13d08e73b02ef79f6dd5ab6f0c080 SHA512 8456f031294371aab791927fb42ae043d2099d3d348f43be0510f6480b9bc2ddba4655ef6982d4d4ee3cd9f05370c9800a2ec5caf06928c4b0a9b0ca5cdc8c06
 MISC metadata.xml 522 BLAKE2B a4feb2dcf86b348f8e07a76c82261db274d46668bcddd36677e8896eeb993badf321987a592ddc37bd85a9f4e237bd12c6df1cbe289fe3b3354b37352ab70786 SHA512 aca6d43cfb9d6eee3f47079bc26874f12e95f8efbdd4bdcf2685b65374b5a6500de2f12d065bdbce12b82496b931c3c00ff9ffb7aa1e040c11ea033e12304be8
diff --git a/dev-python/ImageHash/ImageHash-3.4.ebuild b/dev-python/ImageHash/ImageHash-3.4.ebuild
deleted file mode 100644
index 21f076e287b6..000000000000
--- a/dev-python/ImageHash/ImageHash-3.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Image Hashing library"
-HOMEPAGE="https://github.com/JohannesBuchner/imagehash"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pywavelets[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ImageHash/ImageHash-3.7.ebuild b/dev-python/ImageHash/ImageHash-3.7.ebuild
deleted file mode 100644
index 21f076e287b6..000000000000
--- a/dev-python/ImageHash/ImageHash-3.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Image Hashing library"
-HOMEPAGE="https://github.com/JohannesBuchner/imagehash"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pywavelets[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ImageHash/ImageHash-4.0.ebuild b/dev-python/ImageHash/ImageHash-4.0.ebuild
index 74b45121430b..ca622a755c1e 100644
--- a/dev-python/ImageHash/ImageHash-4.0.ebuild
+++ b/dev-python/ImageHash/ImageHash-4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ImageHash/Manifest b/dev-python/ImageHash/Manifest
index a7f499eb2bb0..7bc276270ebe 100644
--- a/dev-python/ImageHash/Manifest
+++ b/dev-python/ImageHash/Manifest
@@ -1,7 +1,3 @@
-DIST ImageHash-3.4.tar.gz 290881 BLAKE2B d5c7ccb997ded4fb4927906bb52464140d1a175d4dee9d4ef6981b8c0f5cd092535dd796ccccb5ca28ad168273c34b19c12fbc09e7c90a2a853f9fbcebec7d03 SHA512 a4ba260988d81135f073bfc9a1b1253a69e8736da61e09ac93f8403ca237bfe85c3f0b4791546af601d62a306dd3346ecccf8ebd00d5cd8f4c6ca717b9d89dba
-DIST ImageHash-3.7.tar.gz 294629 BLAKE2B bf2fa6cd102c24d82a83b61b6d648013eaa1a78d99df37c9b918dbcc070136bac8edcead016bee831d34b0f35ff51eeebf0cbdbe45e6ac8e5783b93d766b4d94 SHA512 e0da65d9d2a42ffce5c8b95017fd79bd002f48a963b956836695118e89bbb2ff936629a743248b4189439de155a0ec5f54a34d7cf7b803ae581b45f7bc02b500
 DIST ImageHash-4.0.tar.gz 296405 BLAKE2B 1623d679c0f10eb18d20f7cccb0a87c2584535e0afbb4e35b147f9be3e95cb0aea81eaa42fcce989427d99d8ebdcc143ce04f432520f54958d64c731042d22e8 SHA512 31265e85574cf330339d10c789d06ed0a0ff25aaa30c8ad5f2d39db3d3b40bf5b2001ff78f1e1622058d03f3a7203d2043d2a553adf6d8fe3337c44a4f605d2e
-EBUILD ImageHash-3.4.ebuild 701 BLAKE2B 319d022ba7015168b6fc99e6bd93d32dfb4c04fffd7472c7089c54f712d7b4c8586af034c6ddbbfe00fd4faa9780174a5de34338e9fce04e1b9b0d7496a63bb1 SHA512 649fab0fa194a471048f057be62f16c1a2dc9b75a0b6023a125ca41d8b042782a6028ddd890a5751f0496dbedcb841ea7bc62d1b21a09b6fa2a529edd63a4f43
-EBUILD ImageHash-3.7.ebuild 701 BLAKE2B 319d022ba7015168b6fc99e6bd93d32dfb4c04fffd7472c7089c54f712d7b4c8586af034c6ddbbfe00fd4faa9780174a5de34338e9fce04e1b9b0d7496a63bb1 SHA512 649fab0fa194a471048f057be62f16c1a2dc9b75a0b6023a125ca41d8b042782a6028ddd890a5751f0496dbedcb841ea7bc62d1b21a09b6fa2a529edd63a4f43
-EBUILD ImageHash-4.0.ebuild 705 BLAKE2B 81823c193568fc756ae4e8954ddf7ee4c8ad927a1ae8d5a3c2579c4649b9b6dc25b8aa5b942240053c2a8b942a315765d890448ca2dfeb526dd87c53177eb7ab SHA512 a2e1327fece6d3436d514b0f88c6a9e27dc4f57f0d004cd76efed6f1108fc95c29a0a29892582414a69f725bad307cfa539e1296549c975d4817d2735faee41b
+EBUILD ImageHash-4.0.ebuild 691 BLAKE2B b6bb0400d33309807c5a48857d4976ea3114c6d8b264d4893ccc51550762bdda6d7ea432d58d1acc1046f00edc09a29c437fad5a819c993e531a9efc77be2dd8 SHA512 6541a37a3ac270b438b8e45d50f2624715c8d8b0d7df57a8313623270ce437a830f1afa27970e9db4047a843eff9683c1d7f08c27a34a012c1f473101d32771b
 MISC metadata.xml 591 BLAKE2B 3b4b5c4b552696dce9aa4272c11453fa2d548ddcd97df84b392dd849123828cdce8aed16f5a78e51361ca728645b3f13d454a667169c1e5a3478a6ad44387a55 SHA512 8cdc106ca017b178f325da5e3fc1ba887a45e921e0917b82099e2c3987e49d35394890bbda5abb977563a290855a6dab9884361d095699db62001ee97fb544e4
diff --git a/dev-python/Kivy/Kivy-1.10.0.ebuild b/dev-python/Kivy/Kivy-1.10.0.ebuild
deleted file mode 100644
index ccdd94cab72c..000000000000
--- a/dev-python/Kivy/Kivy-1.10.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="https://kivy.org/"
-SRC_URI="https://github.com/kivy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
-	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
-	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	sdl? ( media-libs/libsdl2
-		media-libs/sdl2-ttf
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer )
-	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P,,}"
-
-PATCHES=(
-	"${FILESDIR}/modplug-fix.patch"
-)
-
-python_prepare_all() {
-# 	sed -e '/data_files=/d' -i "${S}/setup.py" || die
-# 	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
-
-	export USE_SDL2=$(usex sdl 1 0)
-	export USE_GSTREAMER=$(usex gstreamer 1 0)
-	export KIVY_USE_SETUPTOOLS=1
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	emake test PYTHON="${PYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples/${f}/"
-		doins "${S}/examples"/* "${S}/examples"/*/*
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Kivy-1.10.1.ebuild b/dev-python/Kivy/Kivy-1.10.1.ebuild
index 95dabb5f0e85..fef777e0c348 100644
--- a/dev-python/Kivy/Kivy-1.10.1.ebuild
+++ b/dev-python/Kivy/Kivy-1.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -16,14 +16,13 @@ SRC_URI="https://github.com/kivy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
+IUSE="cairo doc examples garden gstreamer +sdl spell test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	media-libs/mesa[gles2]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
 	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
 	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
 	sdl? ( media-libs/libsdl2
diff --git a/dev-python/Kivy/Kivy-1.9.1-r1.ebuild b/dev-python/Kivy/Kivy-1.9.1-r1.ebuild
deleted file mode 100644
index de15acb2050e..000000000000
--- a/dev-python/Kivy/Kivy-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="https://kivy.org/"
-SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
-	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
-	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	sdl? ( media-libs/libsdl2
-		media-libs/sdl2-ttf
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer )
-	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P,,}"
-
-python_prepare_all() {
-	sed -e '/data_files=/d' -i "${S}/setup.py" || die
-	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
-
-	export USE_SDL2=$(usex sdl 1 0)
-	export USE_GSTREAMER=$(usex gstreamer 1 0)
-	export KIVY_USE_SETUPTOOLS=1
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	emake test PYTHON="${PYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples/${f}/"
-		doins "${S}/examples"/* "${S}/examples"/*/*
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Kivy-1.9.1.ebuild b/dev-python/Kivy/Kivy-1.9.1.ebuild
deleted file mode 100644
index 76675221370e..000000000000
--- a/dev-python/Kivy/Kivy-1.9.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="https://kivy.org/"
-SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
-	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
-	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	sdl? ( media-libs/libsdl2
-		media-libs/sdl2-ttf
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer )
-	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P,,}"
-
-python_prepare_all() {
-	sed -e '/data_files=/d' -i "${S}/setup.py" || die
-	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
-
-	export USE_SDL2=$(usex sdl 1 0)
-	export USE_GSTREAMER=$(usex gstreamer 1 0)
-	export KIVY_USE_SETUPTOOLS=1
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	emake test PYTHON="${PYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	use examples && EXAMPLES=( examples )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
index 5c885acb16cd..f3b4e9ced79d 100644
--- a/dev-python/Kivy/Manifest
+++ b/dev-python/Kivy/Manifest
@@ -1,9 +1,3 @@
-AUX modplug-fix.patch 4854 BLAKE2B 7552e40f790de3385c7916820a6b6429917d7a6353da48a283239129fc45f7e6540a01b3178f7e70becb8f342107ad3f16b78a363d8e67247f67cbe6491d65de SHA512 07db881b817b951e20be355e926375b34a2e0b43942322d83550ff99b07e434871a0a15c1a0e9ac9eba76fff96ca8221f9f02ec1ba31b1ddbd10b567ac237fa7
-DIST Kivy-1.10.0.tar.gz 24266702 BLAKE2B 3f1dab7c69e322d5856d1772d0902eaf5d4598957df1573e0c617ca872afa446797266f1ecd4a99da81bc7dcc40a051294d96c11e51a7fe2c505224bf0edaa42 SHA512 8049c92407e464558ecff913ff076c1b8f125b85a35b9eba64af49b35df545402ec2bac907ee545265a368b8cdbb33e02d74429dce13c53dd6feac735ace9cb4
 DIST Kivy-1.10.1.tar.gz 24318169 BLAKE2B 3032034717ad580af437eb280ad8474f057e1ab9f797edf3358db1073eda6e65ee8765862e39e77818debdf0a2a972ce3701b305ddfba307d9a8bfe2ce8edbc5 SHA512 2208e1a148dd1a7c507336419e7388de87d2ab340db055e09fce99837d50639e2e38f275e383503e5bdfc4b9d3def8176d758a80bf3455467604a4219c19d642
-DIST kivy-1.9.1.tar.gz 16363833 BLAKE2B 1f81ab0688e9ddc617da5e7d56523568e396f010587c971285996ca5544367a4f63bb6493f279ea66f6606b2808394614c25a96e97018ef0ae1e70d74eb9cd7e SHA512 1ae3ff3979a89e41c0af6493b7523835c1d01ee36fcd524f15d329b8fa875c6ca9bd25db3a844597fbc5370ff86b55ce177d3e66cc169223b02eb114c88c9989
-EBUILD Kivy-1.10.0.ebuild 1953 BLAKE2B ce9c5f5f1b163a1461061b0d69aff461b4179d6506ac52558cc9cb2df769cc91f43cfdf3500b9f53d33b5f85eb560507bb96d9a04177f5d5d4d5f7d95bb1ef9d SHA512 c746348e0fb4c93a5839df04ad3fb55cbb50ad7b3a11259b78ecb3b8d417071e08b0d9689f872c0f730b15c897fff8dc22387fb2a807590076070db86253edbf
-EBUILD Kivy-1.10.1.ebuild 1934 BLAKE2B 3223d0895d55b99a44163ea06befee59ae863af0a15890af8c181109a67a9aceafdfcfea04ca7255b4b9a014c70dce4e4100345c5d235ace15034361324536a7 SHA512 fae9c3695955bc8ff74a8925384906acb49b6374485ddfdf62f16de68e4443337c29fc4440ba81d3f0614fdee97c5e03a51f81ebf97d9dd02f53219b960c7695
-EBUILD Kivy-1.9.1-r1.ebuild 1899 BLAKE2B 43302efb26ead7238cb2d05e7fb9beacd8d320bec015c5d6707e19a3293a22489ea3b7e4cb030773c92aa242fad2e5058f43fda35e630696aa354d746e9a6812 SHA512 de9d3b7b5dae134472d683d382ee1d8f501cabeb2f1ac3380314ba10a0a9485c32217c7c4f9aea6dd4a688b65ecadddf2a5eb8063ac591165e711565fc2381d2
-EBUILD Kivy-1.9.1.ebuild 1815 BLAKE2B 4f5905dd0b30c452036f5eb902d53be111014a23a61f3696a1cdb19c00c84eb8c6cec8a791615c6400d0e01935144b19d0a9ddc72a15026105ee91792bbad0a8 SHA512 8a2aca2d69927164e347444d1d61381e40c01829d0d17addc0896446c57920565437d6769b8708118cc21a09a85cf24c6b75ede21133df2462cae50754b88c84
-MISC metadata.xml 490 BLAKE2B fca6a6372250ac811cf7520b98a2d26d5951030b56fa7d62ef85c3554025bb57a55371def39747d7597b42bd9dea44104892c75a2ecb58904de423ac4260c40e SHA512 a29aa0e59c1d02423643bf9bcccca5860c981a81f45b2aec030355f566b9690b8e7e8f6339acfbb5c51436e9298b99d4b53b5e3bdb410fa4f030177f9abe2ccb
+EBUILD Kivy-1.10.1.ebuild 1846 BLAKE2B bdefdc33d2e3fc6118a6a470e1b54031ec038cab2f8b257e2e517691fee800aba80128940adab4264064497c5e5046a392544532bf0380ebe7da6027566af073 SHA512 08e42b684987758beee7c73d191dd11ff003becffb93dc12ecf3d8620fdd375cfa93886f09c016b4d4a967966fca6d9dfe01380b884f7d926911eed19a661288
+MISC metadata.xml 353 BLAKE2B ca3791f85d35fcfffe02d8dfdeae68f502ab5ede54de7efecfe726d8647126a53ed1212877e7df5ef83692d49f8c6dbdbb4bd83cfcea9f69aeb38cc7a6a67897 SHA512 7a3e5b36f87b72e55d78fdcf5508e2baa3c311c097de4db1ac006f3fd25bba1a34f14a98a2ea5a3b5f147f02c781623321f5b9bc110c72ac2b1f6cc9850961b6
diff --git a/dev-python/Kivy/files/modplug-fix.patch b/dev-python/Kivy/files/modplug-fix.patch
deleted file mode 100644
index 18abe6e8f807..000000000000
--- a/dev-python/Kivy/files/modplug-fix.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 3b85f3e1c292b3f6c3f226490f52a2ab78251730 Mon Sep 17 00:00:00 2001
-From: Terje Skjaeveland <terje.skjaeveland@gmail.com>
-Date: Sun, 29 Oct 2017 12:35:46 +0100
-Subject: [PATCH] audio_sdl2: Update for mixer v2.0.2 support
-
-Flags MIX_INIT_MODPLUG was removed, and MIX_INIT_FLUIDSYNTH was
-renamed to MIX_INIT_MID.
----
- kivy/core/audio/audio_sdl2.pyx | 45 +++++++++++++++++++++++++++++-------------
- kivy/lib/sdl2.pxi              |  4 ++--
- 2 files changed, 33 insertions(+), 16 deletions(-)
-
-diff --git a/kivy/core/audio/audio_sdl2.pyx b/kivy/core/audio/audio_sdl2.pyx
-index 2ab569fe60..c6f26be5c8 100644
---- a/kivy/core/audio/audio_sdl2.pyx
-+++ b/kivy/core/audio/audio_sdl2.pyx
-@@ -15,9 +15,23 @@ Depending the compilation of SDL2 mixer and/or installed libraries:
- * ogg since 1.9.1 (mixer needs libvorbis/libogg)
- * flac since 1.9.1 (mixer needs libflac)
- * mp3 since 1.9.1 (mixer needs libsmpeg/libmad; only use mad for GPL apps)
-+  * Since 1.10.1 + mixer 2.0.2, mpg123 can also be used
- * sequenced formats since 1.9.1 (midi, mod, s3m, etc. Mixer needs
-   libmodplug or libmikmod)
- 
-+.. Note::
-+
-+    Sequenced format support changed with mixer v2.0.2. If mixer is
-+    linked with one of libmodplug or libmikmod, format support for
-+    both libraries is assumed. This will work perfectly with formats
-+    upported by both libraries, but if you were to try to load an
-+    obscure format (like `apun` file with mikmod only), it will fail.
-+
-+    * Kivy <= 1.10.0: will fail to build with mixer >= 2.0.2
-+      will report correct format support with < 2.0.2
-+    * Kivy >= 1.10.1: will build with old and new mixer, and
-+      will "guesstimate" sequenced format support
-+
- .. Warning::
- 
-     Sequenced formats use the SDL2 Mixer music channel, you can only play
-@@ -57,8 +71,13 @@ cdef mix_init():
-         mix_is_init = -1
-         return 0
- 
-+    # In mixer 2.0.2, MIX_INIT_MODPLUG is now implied by MIX_INIT_MOD,
-+    # and MIX_INIT_FLUIDSYNTH was renamed to MIX_INIT_MID. In previous
-+    # versions, we requested both _MODPLUG and _MOD + _FLUIDSYNTH.
-+    # 0x20 used to be MIX_INIT_FLUIDSYNTH, now MIX_INIT_MID
-+    # 0x4  used to be MIX_INIT_MODPLUG before 2.0.2
-     want_flags = MIX_INIT_FLAC | MIX_INIT_OGG | MIX_INIT_MP3
--    want_flags |= MIX_INIT_MOD | MIX_INIT_MODPLUG | MIX_INIT_FLUIDSYNTH
-+    want_flags |= MIX_INIT_MOD | 0x20 | 0x4
- 
-     mix_flags = Mix_Init(want_flags)
- 
-@@ -244,25 +263,23 @@ class MusicSDL2(Sound):
-     @staticmethod
-     def extensions():
-         mix_init()
-+        # FIXME: this should probably evolve to use the new has_music()
-+        #        interface to determine format support
- 
-         # Assume native midi support (defaults to enabled), but may use
-         # modplug, fluidsynth or timidity in reality. It may also be
-         # disabled completely, in which case loading it will fail
-         extensions = set(['mid', 'midi'])
- 
--        # libmodplug, may be incomplete
--        if mix_flags & MIX_INIT_MODPLUG:
--            extensions.update(['669', 'abc', 'amf', 'ams', 'dbm', 'dmf',
--                               'dsm', 'far', 'it', 'j2b', 'mdl', 'med',
--                               'mod', 'mt2', 'mtm', 'okt', 'pat', 'psm',
--                               'ptm', 's3m', 'stm', 'ult', 'umx', 'xm'])
--
--        # libmikmod, may be incomplete
--        if mix_flags & MIX_INIT_MOD:
--            extensions.update(['669', 'amf', 'apun', 'dsm', 'far', 'gdm',
--                               'gt2', 'it',  'med', 'mod', 'mtm', 'okt',
--                               's3m', 'stm', 'stx', 'ult', 'umx', 'uni',
--                               'xm'])
-+        # libmodplug and libmikmod, may be incomplete.
-+        # 0x4 is for mixer < 2.0.2, MIX_INIT_MODPLUG
-+        if mix_flags & (MIX_INIT_MOD | 0x4):
-+            extensions.update(['669', 'abc', 'amf', 'ams', 'apun', 'dbm',
-+                               'dmf', 'dsm', 'far', 'gdm', 'it',   'j2b',
-+                               'mdl', 'med', 'mod', 'mt2', 'mtm',  'okt',
-+                               'pat', 'psm', 'ptm', 's3m', 'stm',  'stx',
-+                               'ult', 'umx', 'uni', 'xm'])
-+
-         return list(extensions)
- 
-     def __init__(self, **kwargs):
-diff --git a/kivy/lib/sdl2.pxi b/kivy/lib/sdl2.pxi
-index 07d055c903..ad62ce8023 100644
---- a/kivy/lib/sdl2.pxi
-+++ b/kivy/lib/sdl2.pxi
-@@ -881,10 +881,10 @@ cdef extern from "SDL_mixer.h":
-     ctypedef enum MIX_InitFlags:
-         MIX_INIT_FLAC        = 0x00000001
-         MIX_INIT_MOD         = 0x00000002
--        MIX_INIT_MODPLUG     = 0x00000004
-+        MIX_INIT_MODPLUG     = 0x00000004 # Removed in mixer 2.0.2
-         MIX_INIT_MP3         = 0x00000008
-         MIX_INIT_OGG         = 0x00000010
--        MIX_INIT_FLUIDSYNTH  = 0x00000020
-+        MIX_INIT_MID         = 0x00000020 # Previously _FLUIDSYNTH
- 
-     cdef int MIX_MAX_VOLUME
- 
diff --git a/dev-python/Kivy/metadata.xml b/dev-python/Kivy/metadata.xml
index c0c869933573..91807a2b42c3 100644
--- a/dev-python/Kivy/metadata.xml
+++ b/dev-python/Kivy/metadata.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
-    <flag name="camera">
-      Install libraries needed to support camera
-    </flag>
     <flag name="garden">
       Install garden tool to manage user maintained widgets
     </flag>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4857bc053d22..eea3ad00bd75 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index d73a3dc4600d..aa12f51c85c5 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -1,5 +1,5 @@
 DIST MechanicalSoup-0.10.0.tar.gz 40111 BLAKE2B cbb09253666850d3ce433f60ed6405585588e6dc7198c58de1cab8ecfad1e1c814433787aefe33dbb490edab5367ffca285d14cf8fbcb2c16e309b957a3a311b SHA512 5fa493abac39c5084dacb67b9dfaa2f8f5af773d3e3aaff48e6240596e863ada30a2fd1e345188c3249fd6e570977aa45b9fd553fe5a549f8430f170613bb866
 DIST MechanicalSoup-0.6.0.zip 5286 BLAKE2B 93a1d124cd45820e425fcb50b2aec04026f7a6f42c7c3f5c93103fbd216c98e36f366a1f7f343dd5561688ac4adb6feacab08ae444f91156348c07a80710a306 SHA512 cc413723514f3beee1267c57c16f6de2c19eb1f64535a60b546d289c7c18d8c4ba752ea61ab0b4a2aead2b56b12639cd226cb32662622515cb40262b7e619c24
-EBUILD MechanicalSoup-0.10.0.ebuild 1615 BLAKE2B b93ba9b09e677659b630d8a06ea2882f6fafe921583f006642bd51b344da317ca98691b4c156447f79247acda0f92ecf3ded23ff30881df4f8a7ec37822b3d23 SHA512 712c63af9cd0bb8810f6fdb5c968422a360b6ec296ae3f5862fecc66688ecb5855941ed1e815194c4048f33d6d743d3ddfdb75cf652d8bdae1ee48bd7d6b4782
-EBUILD MechanicalSoup-0.6.0.ebuild 745 BLAKE2B c7b31392540d08beab71ad15eb4a73e1d9fa93d38fc17afff20ca13eec305c6178f224fa9c0b5ce6bdc10a0124bb2ad728a649f9f868d145f511eef2eb4a3940 SHA512 1c38b0be3384cc5ab1f841f8f45e53f38d2a9c5180ed9f90e93dfa141e82db37a50c9ef03526ab3d6ea54724d62734863bbd9e8ce87c2a7713025a7eaf0f6a13
+EBUILD MechanicalSoup-0.10.0.ebuild 1600 BLAKE2B 36ab0be54a9b1b63e2f7a47cf445def15e2d0a4225d294416f8e58e55e4238b3cf3a98d1b2e0a98e551c9359ab661cfefade2deb1c6b9da7838fd480a823905f SHA512 af16d21b0a75cf6f0387496cfdff1c71343e454f64b662dbd52eeb9f467a4f3b4978428caf02255e65cf22873d26e317afa6903f2b05a2fb49d320dc5928e20a
+EBUILD MechanicalSoup-0.6.0.ebuild 731 BLAKE2B 66928dbcfab0ed4e8edd345fd4698bf2094a450b6b4415c5cddf86547a28af168c618e7eab291bc707dd8d95c9a2935d761431c8fccff3660af66cdc1f1a1ad4 SHA512 b7fcc6a12d62c23b68dc0a13f778c992bc531f6d40d6dc302a609d2d2a89ac22a7358cfae079b58e8550267b98b5fe3bbda6aa331e23e58747ae02887b2b7887
 MISC metadata.xml 550 BLAKE2B e580cc1c3eea5cd7a96ff564c5bb7606498911f997c326cd962ea54e7c73e6521b08d22a7de40f5a7784f3a6386aaaa6d8146ce64d8bcdc4d5f3f42a1855f821 SHA512 cf6d0689bb22256e261d2b964ec9ad05508467f68a115ded56b73fe27dad9f15f53a202f6c71e36b6219a5e79d99e01befa04bf239637f16ced3658d41d06314
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-0.10.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-0.10.0.ebuild
index a895ccf4d91c..58f9c75208d9 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-0.10.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
index 28d9ffa01f02..ea60b25ad81a 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 if [[ ${PV} = *9999* ]]; then
diff --git a/dev-python/Numdifftools/Manifest b/dev-python/Numdifftools/Manifest
index 12d5f76c9b6d..c198f8f3220c 100644
--- a/dev-python/Numdifftools/Manifest
+++ b/dev-python/Numdifftools/Manifest
@@ -1,9 +1,3 @@
-DIST numdifftools-0.9.12.zip 236823 BLAKE2B e555ee2f02b071c664f2761c79f0b90526c7b56b66d10f3b449a0f59d0db80994d0982ae04b7f9ec357bb8882ff38012d3a17893192845869e1640083aad20a2 SHA512 00c78abac0c08beb72ec11bcddd74165db773a0fa9b4eee10290a27c4c143f1593254e058898dc12aee1afc6bad5bb2849451e6018129aa32e808eee1b97420c
-DIST numdifftools-0.9.13.zip 225820 BLAKE2B a8d358dc95fa3a99f09e41db62e5bc4206ea1ce114ec3a138601157617acb194a7637b5ce5fe374d4e53327e63b66971f4bac246e4c08d80395a77d69a30faaa SHA512 e16fe167cbcc7995e5f7b1784822b94bc82261821ebf35f8b9f774ef1fd601ef13a23a72670f28b54b5f288b509a9ffccbde09033bdec6a88e8a4ef78ed74b25
-DIST numdifftools-0.9.14.zip 350053 BLAKE2B 482d4b4ec853ca8675961179f7c6b9d9f4160c833690784a43081ef4368eafd58b9e4922f9f57f81e99a85673d9f585008b8b0dc645586dfb30281274009084d SHA512 a69c878a31fa96c0b3f65c486ac75359242b6215868f24f3554be9ca104ac477bc786df7046bc830120d8fabbc475de40ab3db77c21c0d54756ccec1829fd8ae
 DIST numdifftools-0.9.17.zip 363422 BLAKE2B fa57ef2b9cb6dcaa669f14720f3fd1ed105f48b16549acd7bb6d7633b17cd45355022c9949a6099c3cbddc6b1a74b0f669344c4dd5e6f5ad56cc640549f4650c SHA512 acef3865861c76f0850b6f1c5ca5633f695603a7458c79569bbe887404c8490845d935693c57ea18468fe3cb7f864fe5481285f731dc933b6c0b521e3b888328
-EBUILD Numdifftools-0.9.12.ebuild 1259 BLAKE2B a8696247953ca2e589b126b7255b558ce03a37493f0bb7e96b06166856c2c579b0749327aa1730abc901b6c31657408c5d5817a7368c0725734211ced4e236aa SHA512 871d84d4cd3d1919cafc9296019d621da2a00f054bd64805abad38b433ad72aa31c5fb59b34eea4390a7be8e6f5f904230f215872fdade9970b274d0eb3fc46c
-EBUILD Numdifftools-0.9.13.ebuild 1226 BLAKE2B 7b82576bd7e967723ab4a2d0c24a9a9103cc7c8117669f15c16e67e14574544c4676a1cd233f53d788916d9ada6ac41c59efceec67fe011378239515a37faaef SHA512 e4e3b671f43d0e78bc96757d3019e009c5ee03c72e1ef20d594a06868cdf5c022b1ee2d3da9ed64e86f8f3fc5d0c0cac2ebf08df00081f82bd4b14ad94b36982
-EBUILD Numdifftools-0.9.14.ebuild 1209 BLAKE2B 5e796e0bea970a8f15561d4774fae317c0b1885330f6be05e60f3c980c15cc81dcc52f17f55f75b601d19679ef576ede939de3ff2b906317c112577681a7607c SHA512 31d6d98a87fefd9f0ce4b4c06117beaf28c757dcbe2903f300b66be6b455f320efa6c99f9a569cb7150676364ea5af13e6c7595d2063e0acd75fa4d7d1085ff2
-EBUILD Numdifftools-0.9.17.ebuild 1224 BLAKE2B 058c662ad4bc6ac4b1ff8d685dd5be0c9319d46362116937b7d47c46d6c685ac6b7e4bce3bfbf4bbf88d4c29379b24b914f85a8fffc0124e54eb30608a57127a SHA512 b4e818424fa583aef0c2f12c3e68424684daf50fa8994bd190107f434ec31029a9e655aa1fae95dbf9e6c421b724e0e3a30fdfb0dfd3caafbb961be050111ea2
+EBUILD Numdifftools-0.9.17.ebuild 1220 BLAKE2B 4cd3a8cd4efff43cc1af2e261a925a0f332b898bba45c80e82d7875a703b56c111f9965ff2ad369bf045db93e1ff4ed09fa1ea6ae7719d9c1d06c04031c6eca2 SHA512 6a4642900b402dc0c88d21c2716d326bdf3bdf62637d5a1ed75a090b2411aea13d98419a5197e65dc73b36fd74055cb825b4848925935b03aa69e8ed818d0748
 MISC metadata.xml 398 BLAKE2B 859e4b9cffa1d28cf7758198b04c30e17f86e29f3595e0bf2f55b62e80e6d6ed9c10d6fc8199eba90b35adb155de2a7055cdabd19f7655a6c7f9a860dc761cf3 SHA512 a56df8a9f061f0ee318e5ab2297caa7a3e8001e61dad2425c6d70104ceef999f12468fdc1e20d714aad33a56c980e1cff0677f815375ce7adbb639137016ab35
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
deleted file mode 100644
index bc725d2ef4cb..000000000000
--- a/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
+++ /dev/null
@@ -1,54 +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
-
-MY_PN=numdifftools
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.org/project/Numdifftools/ https://github.com/pbrod/numdifftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-# Seems to be broken
-# https://github.com/pbrod/numdifftools/issues/11
-# https://github.com/pbrod/numdifftools/issues/12
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	sed \
-		-e "/numpydoc/d" \
-		-i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
deleted file mode 100644
index c0e0928d8d23..000000000000
--- a/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
+++ /dev/null
@@ -1,52 +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
-
-MY_PN=numdifftools
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.org/project/Numdifftools/ https://github.com/pbrod/numdifftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/pyscaffold[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	sed \
-		-e "/numpydoc/d" \
-		-e "/wheel/d" \
-		-i requirements.txt *egg*/requires.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
deleted file mode 100644
index 64d248242ceb..000000000000
--- a/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
+++ /dev/null
@@ -1,52 +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
-
-MY_PN=numdifftools
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.org/project/Numdifftools/ https://github.com/pbrod/numdifftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/pyscaffold[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	# pulls coverage test
-	sed \
-		-e '/tests_require/d' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
index 75463eadb5dd..1be21579e12d 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index 64b2803ebb26..92be366eaac7 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,7 +1,7 @@
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
 DIST PyContracts-1.8.12.tar.gz 91393 BLAKE2B 083c836a547540f2505cbc02c8696ad2ae236a9ba46529cc60d237c01bd113cb5a9d2729a70038e28f4a6f776cb17b119bdf9ae8dcd6269cbcd05412413aa758 SHA512 9abd5ab5203687ddd8a738998e63e8f3e397b9ba9b9ee22bda945dab4f0d460115ed8e825c9c551d4c067b0f39dbb5b8ca51d365623b10ee8e210efc4edcbf15
-EBUILD PyContracts-1.7.9.ebuild 1040 BLAKE2B 7a37d4f1acc224dee1ae15b66e1ea055ace964f0c08889c6b8e0583b42649ef80d2390b6df8c4b8d7961c294cb8b608d84eb6fcec9eec770c3bf522f01df0dca SHA512 dadbafcc066284347afad43e831ab310f7268a195897daa659668148c7e22216cd33f400dba07af05671108b58080d95237a938d39d8ab7dcaca47f3032728b7
-EBUILD PyContracts-1.8.0.ebuild 1042 BLAKE2B 8ea742711a93342691b5c447ea1d737813c50c60c09a7c7960fa57271b03286becba44c564f5db4eaaa4f4e76e543170a6b6dd9f8e9a68a41aae337f3d920137 SHA512 172994c5817fdbd062f3122cce9ef8824b70cb2010191fd07df6124cd77ea86eb1e5a1f4b84b40a53fefd41ece25e2fb6b5903fb82117b687245c36f441c49b3
-EBUILD PyContracts-1.8.12.ebuild 1077 BLAKE2B 9b87f4742e3a8ecdd96ee875fa7ef27ed5d5a3bafad49374e40e00d20131215530749efb5301cc8a486e390be49acf51d3a6b07407ddf42dc3137445aeffb10b SHA512 7bc0d0b7802dde659c04ba7d990f4bdb59d2ef7680e0c1d739c8ad6805efb0481678010ff9cebfca4e56ac4101e5dfe5e323a3bdd1720fc8acd1246b60575f54
+EBUILD PyContracts-1.7.9.ebuild 1031 BLAKE2B d9c8d3e8d42561a6e49c45998b8dc6722505999fd90d8995e5e5eadb2bcbeb592fbf14e9f6d39a8cf3685bd5d170e32b656f91c2d754e1387455d487a7c7f6df SHA512 675830ed99fa1d53c6b884837a95c5194d752cae8b872046e2264341963233d6b562903a144797ab2d7a17de4407a2f3f10698c9367b78bf9a99fbb6384cf28c
+EBUILD PyContracts-1.8.0.ebuild 1035 BLAKE2B 095e38960d416a32c2a4dcc8562fcc8c37d158545f2b21c2b104f6076a3e6763a8d83da8d946e1ed2aeccca256f31250b908c95c306c0213ba095407845601a7 SHA512 4796f510f88561e91280ef9ff8479ca61038792da8bd171a3bc22761a7a12efa6f9ac386acce5e2003478f775e3d0a80f4fbfb1318558f4b2d8a7697aa9889b2
+EBUILD PyContracts-1.8.12.ebuild 1070 BLAKE2B f5bdb189895f4106c2290544f18d044cbb9789407d57f8f88e2af2858ffbf082f1c50909f31e3bf3b45e2a8e0e75b2aa07d98e74d9f283fb4f55371f123d314f SHA512 961f3645f92fbca6fafe2542ac8a3c23b8abcb831567ae36ed0a839d49f57a5a3d609a62e4ac15bb103c227d6076abdccec2b4fc666abf2c4de854a78f477eb4
 MISC metadata.xml 387 BLAKE2B e1a27603eeb8fdd909b3b7d8052c69b4f0c4aae087140d36e5b49ce470ee486706fa3bd6a8fea1354a50c17499157e540e3e9ed514802b9cb2640b396905b500 SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27
diff --git a/dev-python/PyContracts/PyContracts-1.7.9.ebuild b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
index caaa734a04b4..1b05f39dcc20 100644
--- a/dev-python/PyContracts/PyContracts-1.7.9.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyContracts/PyContracts-1.8.0.ebuild b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
index dfde65e01ffc..5ad5020f5e71 100644
--- a/dev-python/PyContracts/PyContracts-1.8.0.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyContracts/PyContracts-1.8.12.ebuild b/dev-python/PyContracts/PyContracts-1.8.12.ebuild
index 977b82d3faca..865057197d54 100644
--- a/dev-python/PyContracts/PyContracts-1.8.12.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyDbLite/Manifest b/dev-python/PyDbLite/Manifest
index 336556bf0d3c..8ffec50f60ad 100644
--- a/dev-python/PyDbLite/Manifest
+++ b/dev-python/PyDbLite/Manifest
@@ -1,3 +1,3 @@
 DIST PyDbLite-3.0.4.tar.gz 510241 BLAKE2B 948858df8653a74872a7a017ecdfee2d078edd441671e4b0fd2a6e4ea73d9b885899fd8d35209c96e72bcbae48cc7c9db940e4add8ba9afeb55a6da1b49664a7 SHA512 7708d6cf391f18dbc644cfe6af34868d2eb59aae47ffb67cdb77d468d605b14c0dccfb159229035984d0dd9dbaa5ce706068ed23a09a5ece2f58565afdfad69f
-EBUILD PyDbLite-3.0.4.ebuild 431 BLAKE2B 9b2f670bcd2766bfca745d2e609aa3cee5c7b71ed8b4d2c80f0f0926bb0d37858198c292c801bdab1e03fce3d72eff0acae8eca7f2226eb81591905b897f3abe SHA512 cdbebe2cfe856f7d9c31d9984f0eb25f96cc429ba58caae97357f1394826cb98b2299bbf8f85c06e8cb8a1b1cdf864edbc0bba1182edf248f5315a1b0bc3bdfb
+EBUILD PyDbLite-3.0.4.ebuild 412 BLAKE2B 7e2663ceb2ec8862f8074af77fb99d240e1ff957def0a8f65a0fb92e236415726d4358261de2cb7e2a033e1e7cabfb6d982561af09c9f6886b9b062aae53457e SHA512 78f74c92f7a4e35f23e9bfe3170846c8ea99a2ae6ed9912f66e106e5fa8ad84d6e016ec29e4029778b932aa5476925597e7323641e2dc5b0808b7d3109c8eafd
 MISC metadata.xml 332 BLAKE2B 75aea1249092294801fd82ef9e00e26d02d510e206afe1668e41d41d24bdf5c3dc79b82f883d139a928fcbd98b716795d5479b35304209d9be4ee5cba29fa7af SHA512 a1ccefa4e703e7b041015712807ef972394a8c75d0efa8aa8609ac280356a74787daa693fd92124d076c889aedc6bec08b62d64391a470c9a9f803631191ae0a
diff --git a/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild b/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild
index 10952f812e69..2fcacb0e5387 100644
--- a/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild
+++ b/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3)
+PYTHON_COMPAT=( python3_6 pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 0e445d593faf..a3be1de42427 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,7 +1,5 @@
-DIST PyGithub-1.43.8.gh.tar.gz 2842219 BLAKE2B 7711885beb4cb855ea5a5755abe881f7ae7825feb76cb0ab30aa9ba4a2530440d2816439c43da23a42f134286fa0806875d075920776960f04cdd21131bcf700 SHA512 dc58166ebb27f855ed4f32448029abe7e53b8050d8d99029d460f2dd94180ca8bcef68a75469293abd021f70cc3c67c32061e6439db1b3f1dc77af464c658bb6
 DIST PyGithub-1.44.1.gh.tar.gz 2866013 BLAKE2B 90ca7f21fe0031c6cc6d50f54facd7c086037f942f9595e78a3b1a0fe0d21b6bc587f07b63152afabbaa2f38d165b8014600cb195207519a16e3e05fb9bfbcff SHA512 87b6c05f3bbfa463995b67d0bb257700e8c67050dd291c60737a84c4e8bc6bcbde1c0e2add98ec38174c55f2c21abcf4c46bba8be752d132d7e63e423ab6fd1e
-DIST PyGithub-1.44.gh.tar.gz 2855748 BLAKE2B f728562617632f99d5b8a141e7b8eb7527812388e71c7f6dcc55fbec2b0da5ab3882985d4e815fe18affa662351942ba2223eda3ae68bc1cf550c2cbc2bee7f9 SHA512 26aa86822fb8c3ca8a8a0e8d5cd9bf9457cab8a4aa006fa195bb4922867627b5516adbee19cbf5c30d24de8266b496741ae7f4dd8c7cc0494044e6cd585402b1
-EBUILD PyGithub-1.43.8.ebuild 1201 BLAKE2B e142dace911dac44389a8407628c295465de3c86926be5f0d49df62c4e602a8346a5714afa6b52028d9d024ea57b3d5fcc1c1b3198a33a34558cbc2060b17399 SHA512 c061c186fee870038de0654d7e671c96d6be95d0cd7662b477d434a6ff73f74c47f002f88d3621f149487de59985e449d79bada852e3676c07a77764d9e27ce0
-EBUILD PyGithub-1.44.1.ebuild 1198 BLAKE2B 01b71695d8a27e35d089ecc38d575beaf12d695b5e51a25f9789b5c355abeaa79e4eebb9c8cd397aa60d9ff1002017c015b492d5208b0524923c95e7e4b22ee8 SHA512 abf395749fc7aee6dda576e25a4670679be85954734b2d7a3686cda3e7ff1f96538abcadfd29c19778185fb0f2b138f724cc4cc2501cd432d2c32657762cf01e
-EBUILD PyGithub-1.44.ebuild 1089 BLAKE2B fe2cc32412ec96bb845e5fdfcf4127309165497ea00142af5c3f7fd10a87f8f8d2dac102250c8485ecf9d5d61a219cff0c724f580d9198afc82d15198e83f231 SHA512 f970501be33ee797717c3d7556e9a0558c8af047349333572bfc89e14829876c86875dd602ed97ea25afecc51252997330e73c8735db8421a4e8809201b0fe95
+DIST PyGithub-1.45.gh.tar.gz 2881912 BLAKE2B 0117608298f6b5d522f451382ea058a9dc507dbf15b31542f4039da8105cf0cb002ac17b5c5c321e465f97dce20699de0d319010c478a5c9d30529e885516e42 SHA512 24ff3c75f5578f5e0df59fa1a02511747857984d7bd4ae1b3d0a3b41a0eee79df9732d39ee5026978b70a71746826e92f27cc44b8362b6bd3e7dd4edb1654acd
+EBUILD PyGithub-1.44.1.ebuild 1192 BLAKE2B 96919c9ddda54d07fb81d7ceb47dc9890bf72dbaf0d8cfe55b7b3d83f7f0220e3e3b7b4d2115e75d2aa6a9fc81a0c829e4258359dc2021adb4a8838c45d93409 SHA512 4f6084e373bdd01b89fca3ee9dd98231a19a639d01112ae693199e360c21058421ee883b9808745697e8459b2cdef20e599b7fff0bc5a349029ae61c1eabad85
+EBUILD PyGithub-1.45.ebuild 1041 BLAKE2B e98fd493b2e6dd0f953dbfa1137bdccc8af29b36ed60abca11b83b304831b444b442020dd40f9e69aa3e342ac701e705f46dae10e416208e045c7a08eeab529f SHA512 339564e78c3660dfebeec89e59b2a2076d3b411be090ef6ed3d183664d3ec6cdff33d5fb2b272fd4433e99ef58a51525f1cfeee70c234b837eb08ce2132708db
 MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
diff --git a/dev-python/PyGithub/PyGithub-1.43.8.ebuild b/dev-python/PyGithub/PyGithub-1.43.8.ebuild
deleted file mode 100644
index 4c63d604bf8d..000000000000
--- a/dev-python/PyGithub/PyGithub-1.43.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/httpretty[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# tests requiring network access
-	sed -i -e 's:testDecodeJson:_&:' tests/Issue142.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# silly!
-	cp -r tests "${BUILD_DIR}" || die
-	if python_is_python3; then
-		2to3 --no-diffs -n -w "${BUILD_DIR}"/tests || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	"${EPYTHON}" -m unittest -v tests.AllTests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/PyGithub/PyGithub-1.44.1.ebuild b/dev-python/PyGithub/PyGithub-1.44.1.ebuild
index 385efd59ba3e..aaf385d11624 100644
--- a/dev-python/PyGithub/PyGithub-1.44.1.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.44.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/PyGithub/PyGithub-1.44.ebuild b/dev-python/PyGithub/PyGithub-1.44.ebuild
deleted file mode 100644
index 48417603a98e..000000000000
--- a/dev-python/PyGithub/PyGithub-1.44.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# tests requiring network access
-	sed -i -e 's:testDecodeJson:_&:' tests/Issue142.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest -v tests.AllTests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/PyGithub/PyGithub-1.45.ebuild b/dev-python/PyGithub/PyGithub-1.45.ebuild
new file mode 100644
index 000000000000..2df4ffef03ab
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.45.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=( python{2_7,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/PyGithub/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+	)"
+
+python_test() {
+	"${EPYTHON}" -m unittest -v tests.AllTests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index bd73283b66da..8cb56788ea89 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,4 +1,4 @@
 AUX PyPDF2-1.26.0-py3-tests.patch 1452 BLAKE2B bdeb36156cf9b6eec975f0b92f85cb6794259081ec8766b316e94efdf90ddf4bd2401fe1954d87e841628aa90b0978e9899f7562c5c15d71c2c271c6e8537894 SHA512 434d1cb0fb934149054d16521ca414291cbb83618de1468a2a9e630e75fddad4c33c3ba254ae00315b2075faad333b9b027625adda3a0cf064df3366989ea399
 DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef9c55fbf2d146b379586160cb985948e0feb7aed135f601535d034ef79ddc1af58a670b07ff7d3621907022ec SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
-EBUILD PyPDF2-1.26.0.ebuild 741 BLAKE2B 98b6b4552de1413b25270e8df60ffad1fec91396c074a23eaa26af74a34fcb5f3bc103556cf5ca129d828ca872e522cb747f6e33d594830ed533f720902d7f4a SHA512 8237d67ea1325485da09654ae93e99e042fc3c820abbc73d076764c708b788b25756d99decc74b54f7985dc54901ffd3df3aafe45e85d895dd7801d15af7da18
+EBUILD PyPDF2-1.26.0.ebuild 744 BLAKE2B 6c756e686cbf0e94b211d7b80884c3732422e7465368c37e625fc83b7a016a6d37cf8c2dd17de08be6320c5302e67b988abececbd5d26cdb61cf1c9cd6c1d2dc SHA512 ad3842325ee9a461f9d2d6f85d91a73f757d90e8a0d369ba500ac9a641ababdcc2ad8c575ddcee12ea3193ec6094d7dadb29dff4b674659c8679d97a98dbf83f
 MISC metadata.xml 375 BLAKE2B 70bd4053cc8b7a65a31c3480f4205ff4945af86675b5f58a22efd3d27947b40cf49591746ae90d314e24d69d44dce606ef32b2c6fd7fac8aa1d431c6256c6c59 SHA512 9da6355a60e212e6e5ee3ac1c5cd1c357b243ab3131b2f6d261a4039c6cbc67c1e375be8685c900c533a0273b017b6d4428c7521539b917a2c380f9435b3cefa
diff --git a/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild b/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
index 1368a2472055..ef87208335d7 100644
--- a/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python library to work with pdf files"
-HOMEPAGE="https://pypi.org/project/${PN}/ https://github.com/mstamy2/PyPDF2"
+HOMEPAGE="https://pypi.org/project/PyPDF2/ https://github.com/mstamy2/PyPDF2"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 1ebcbe928696..591ef358e404 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,7 @@
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
 DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
-EBUILD PyQt5-sip-4.19.17.ebuild 2147 BLAKE2B 57a1dc01a4de554d741ccbabacf704ee37434ca27b7f7ba19b7db0719745e9a02f2e514f4e38e11e016e917637caabd08cc4136762fefd5900930dbc3d8e4610 SHA512 b2c71ee834e6d8465d697f24fca460213a0fca50b0841309d9b1729417cfd9e6f80de4e1e2298fbbc0813b1d6a94c835afd6bce94e288bb8a108202c365b6718
-EBUILD PyQt5-sip-4.19.19.ebuild 2153 BLAKE2B 87774dba8ec4defcab59d91884212c373551204e922259704473ecccdf29c23938d78a87460d426f83f370966ec70e1045cf93bd1ffab0dd8a300dbd3e4649a0 SHA512 7327eced76dbe6791f4cf0dcdc7e70263426c17a0e62faf2a25f57faf2a1f99d8d5dbcdd5dff0f21506d0b39773754f178970c42715c95db571bf168dd95bc1d
+DIST sip-4.19.20.tar.gz 1050009 BLAKE2B 2ee7ecfbb2fa2c1a6a7ec57ab91113cd0c93fa5be4f5a05b8edb568e0d26e1d248a504e95cfd1485bdf156680e7e076c26f354e05bef45d7a37e9f79f7f0a0aa SHA512 d5cd49f6fcae08306ac5f993710c40b82804d6b268cf3fa14077e73f34b02d551aa3caf57a985fe39b5acd61c465b00372d2ada722ced76e670dec14b5f8de44
+EBUILD PyQt5-sip-4.19.17.ebuild 2145 BLAKE2B 1547a2e0c2fb8add669fe31b82e630a90633ecbf365518429f2f0ebce6279f8d6fbb27e467b9abaaaec69cb7f8aee1984962a6386678f365c5b1b91f6683c1bf SHA512 942d43df7bb3fb0b591cab2a0979abfad951b6fed1ea976ab195c6ef7595217085057239b39d83c24b28375131ec4504940d5ec94abbdef7d13d4f9554e022ac
+EBUILD PyQt5-sip-4.19.19.ebuild 2149 BLAKE2B 83b49f3f691236c11425a6ac44d7a103df7984be01f50f6f8063fdd6d6d28db5b977231fd8c7cbde4acd97590f15e658d3d546ffe52002092b053e8c430845b1 SHA512 60ad3994701a0444a41a135b2a001ff53df9597c046be6588ed3f3df0ea95f590766dc2c3e0fb0d4e955b988915259f1d17fd70d1ea484328cf5bc917e25d320
+EBUILD PyQt5-sip-4.19.20.ebuild 2151 BLAKE2B f1857883f2b5cf6ee97c3654b41ed4de0d7d4f9acf2211ddd879f2069a6f625c1b5166ca159d188b3ae23f47111d83a0e3dd03c36ebcbc250cc2a3df35ab2a24 SHA512 4a237cc928695d22daf7c1b848caf82844a20a0427562c08af3d6d309aa563d45ebb59542224956a46f97e3262b09593d479d81caae571755bd10dbd6e785cea
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
index e48ab8a708cc..b5622576b38b 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
index 3fd39ab528f1..c381a44d8150 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.20.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.20.ebuild
new file mode 100644
index 000000000000..a5b7820e1a9d
--- /dev/null
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.20.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Private sip module for PyQt5"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+
+MY_PN=sip
+MY_P=${MY_PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	!<dev-python/PyQt5-5.12.2
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--sip-module PyQt5.sip
+			--sysroot="${ESYSROOT}/usr"
+			--no-tools
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" install
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index be65e7241087..07f034bfb03c 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,11 +1,7 @@
-AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662fd63590e097fbb8b681ac02cb3d96c9670ab1a1bbe873c1c1320dd78cc4c738f9f714c8ffd5be732bc15f084ad7ca721 SHA512 bfe80fa6018174a6981777031ffa97bc834e17848580d02c994c61507aa4ea16091e582b6bbc3754d469de1901fa8cf2e3e12240cced44fd0dbe928bdd360925
-AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5-5.13.2.tar.gz 3162810 BLAKE2B 383aaa3f1f51ed618a3b6475432a96f6a8f89ad4d97197fe87469e0a69e1db79c762965adfacdf92cc43d1bb2eb5e2790f6bdb7e8b288f0feade828bf8e30090 SHA512 9a16450d8fe2a7e94e182ebb03cc785c6de516e356251753abfb79af3958230043f2db59750cde0a6f1fd6cf5568eb8b7ae76d5a3fbcfe9f7807e02867973b55
-DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
+DIST PyQt5-5.14.1.tar.gz 3241571 BLAKE2B c4f6ab8b5c955186c71e0f6c1ac75fc559839c52374e8ce400c823a813c0c646ed60b5f496145114e5480bd2e4c057d52181b81d79fd01fe5dcd9e4c537118ff SHA512 10b6abb6fdac64233041b0ee91c9f25cfd2a759ec5bde239c87ca9df8176cdd4fcabf6deb8db2dd9bbd911a040d5c476744f1b55aded9c66eb8b5182f99ddc86
 DIST PyQt5_gpl-5.12.2.tar.gz 3147205 BLAKE2B ad0b09548521ceff869bb44cfceb0c2cf31338f46c76da23582f7949fdcc0e8feee3cc0dc0610e8152dfbc701c3ac765eea7898f5061775a92e2601c5b7ea8ca SHA512 dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666
-DIST PyQt5_gpl-5.13.1.tar.gz 3162737 BLAKE2B 1242069b757ef7d9532375758ab29954f216f6d8b1fa18e433ab41cf56df13b7408547dd5c58eb0417a011d834ef9301aa090a4e88a9b10d48f15267eccbf6a3 SHA512 7b7001b16a8c730d7ff2d340fa1dd118868b53519e8f75e8c2ce00b44e3637ac6a31b41a7456fc610df11ff3928b924cb54c0c3712f22ed4df5058fd8bc77281
-EBUILD PyQt5-5.10.1-r1.ebuild 5812 BLAKE2B ceb731b308578c3d8dc511f3bb56b49656bca92bb8e4a89cd140d8044d7445bbb3f4e3a018b63cc29624d273bce1dd8976f7f848b8485d08db00022a293b9be8 SHA512 6f2169fb459bbe378db594edb9ae0e56a96b1bd0014c5855ef038229a8bfa4dd328fd7e7f0659469805b81d7c4589f3d306e1fb7a4cac21c4c2658e599d53f84
-EBUILD PyQt5-5.12.2.ebuild 5904 BLAKE2B 32191a4182088ea16548c68bd45a5081fea20bfd67789380e2150c9ed9c6f919fc6a3cd0620d4b181d393edf5cdfcba8110866f5c51f92e13504d64c4bd9478a SHA512 1ed8f4be78ea9ef0f140d32c5b4fafcb04440237a080a06d88bcac2d8f85a7715c554df4b23de57ba9f332ad7d4c0149dc5e6d831ed1fbf21bf76e8f46cc7ef3
-EBUILD PyQt5-5.13.1.ebuild 5908 BLAKE2B b71caa77bc38e19dcc4edd952aac100bfefae7cd5e77991a71175023eafb264a061bbfa57159e8c88a944e8e0d84732d523f6c85c9dc5d72e7ab2679bd1a15aa SHA512 6915af2b75a45d6d3eced09af924a084a41e5db64cdb2f58200bb87276fa86275702e12629647df6cc04a6503683616600f75b27f49459acbf7bce06f8a002bb
-EBUILD PyQt5-5.13.2.ebuild 5845 BLAKE2B b8999ceecbc39e7bd008a36067435e31a9c8518cff2cef1862dcd4849eb476e95abad98d3bac5f94263f01f469a835d2e0562ba10c33ce9d6935e537f2d517a7 SHA512 5a8d1ec8c52d960b13d173d7fb2b7c27505de5d492696a73a176fb6683b6330ca27f27542011fff9319187b26ef3c9706f1c28770734e60866cd7e5335c40e1e
-MISC metadata.xml 2501 BLAKE2B d7a5d2131b9eec75f488bb28583a99de49191bcd8dae4db3ad51395763bcc9be0433f74e6b732c6f585b0a7fbe3d18c1689aa9eaa65e32ec63dc85e0bace0b07 SHA512 8866f1f87d19e7b7ddb76fdeb0891d928dc4e6cf0561f53b6962fc3bbf7b50a03b0257463942804ddc2bed1e0367732cc74cbf9c3c7f4c2759b9bfa5e92e4af6
+EBUILD PyQt5-5.12.2.ebuild 5902 BLAKE2B 0c265494965e473adf1a1cd6c4ecb1d92bc4c3e0bea3143c2d01371f977b7b09705d9e95875e7fd9579efbeac45d6b7a42cb295d78835b4cb4f2292b35614fb2 SHA512 8d55d4964d019fb28f7c6e0eedaff01f66889f5ef39ff2c1a5ffefa8784b2a9527bfb82c2b2043873bece8872246e49d60c049f48e9f9fc90c5cbbd56df7beed
+EBUILD PyQt5-5.13.2.ebuild 6056 BLAKE2B 25e48fd4f3b806d77c9fca12b200bab855a46f104cce8fc95b5a1e081d5427770936da2e3eb94cfbd8f80cf0e372b2662fd368f8bda0de35318929a035514a33 SHA512 b95891a1438681168096e1a893819f3b7fc94e409207d2955681604c4830964aa3afb6e564dd98dc2234036c671d413be4fe33b7b1f82ad5894b578f348c1b3e
+EBUILD PyQt5-5.14.1.ebuild 6021 BLAKE2B 3a7aee40dda97ae9b6f322b1a03d34bf464edb38e046f936e77aecb134a888f15e175bf9fcbfa91a24b6fbb1337fe58a1730a62d3a6cf7c6a4005aee3c7997fe SHA512 6f47736c94ecbfe3a153cf4a591b558e8fd65718b659778371e84bef561d062ff95b3a2caf9c095fbfdbe49b43134644478fc09602d58dfa486a186ff8d9115c
+MISC metadata.xml 2427 BLAKE2B 38eb2e33dde7fe4877028975c6c4d9ffe53f1c9b7fe4697dbf4959ba0ad53226cd4c0e58c8c1de3c8fe4d9fe66b1423e1c1cae047b1894208e9069ce64e9c0e8 SHA512 bf47edf8c7e577d3851c5e40491cfb5f6eaf214ead58babe5c84c4cddbbbfc65e90fa31dd95701e5e5d1b3496a739dbc451640b70ad4f610648c19f810c6340f
diff --git a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
deleted file mode 100644
index f636c196bc02..000000000000
--- a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_PN=PyQt5
-MY_P=${MY_PN}_gpl-${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 arm arm64 ~ppc ~ppc64 x86"
-
-# TODO: QtNetworkAuth, QtNfc
-IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
-	multimedia network opengl positioning printsupport sensors serialport sql svg
-	testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webengine? ( network widgets? ( printsupport webchannel ) )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.9.4:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19.6:=[${PYTHON_USEDEP}]
-	!dev-python/PyQt5-sip
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
-	webkit? ( >=dev-qt/qtwebkit-5.9:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( "${S}"/{ChangeLog,NEWS} )
-
-PATCHES=(
-	"${FILESDIR}/${P}-timeline.patch"
-	"${FILESDIR}/${P}-fix-testlib.patch"
-)
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--sip-incdir="$(python_get_includedir)"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webengine QtWebEngine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		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() {
-		local tmp_root=${D%/}/${PN}_tmp_root
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.12.2.ebuild b/dev-python/PyQt5/PyQt5-5.12.2.ebuild
index 522cf5cdf410..b7946f867b2a 100644
--- a/dev-python/PyQt5/PyQt5-5.12.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
diff --git a/dev-python/PyQt5/PyQt5-5.13.1.ebuild b/dev-python/PyQt5/PyQt5-5.13.1.ebuild
deleted file mode 100644
index fdf60501f5b9..000000000000
--- a/dev-python/PyQt5/PyQt5-5.13.1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_PN=PyQt5
-MY_P=${MY_PN}_gpl-${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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
-IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
-	network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
-	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	networkauth? ( network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.10:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.19:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webkit? ( dev-qt/qtwebkit:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.19[${PYTHON_USEDEP}]
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(usex gles2 '--disable-feature=PyQt_Desktop_OpenGL' '')
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable networkauth QtNetworkAuth)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(usex ssl '' '--disable-feature=PyQt_SSL')
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${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() {
-		local tmp_root=${D}/${MY_PN}_tmp_root
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${MY_PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.13.2.ebuild b/dev-python/PyQt5/PyQt5-5.13.2.ebuild
index bf0d0d6170bc..e86afa7381c4 100644
--- a/dev-python/PyQt5/PyQt5-5.13.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.13.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
 IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
@@ -154,7 +154,13 @@ src_configure() {
 		"${myconf[@]}" || die
 
 		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${PN}.pro || die
+		if python_is_python3; then
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+				${PN}.pro || die
+		else
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
+				${PN}.pro || die
+		fi
 
 		# Run eqmake to respect toolchain and build flags
 		eqmake5 -recursive ${PN}.pro
diff --git a/dev-python/PyQt5/PyQt5-5.14.1.ebuild b/dev-python/PyQt5/PyQt5-5.14.1.ebuild
new file mode 100644
index 000000000000..e600cf5bf0db
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.14.1.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
+IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
+	network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
+	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	networkauth? ( network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( widgets )
+	webchannel? ( network )
+	webkit? ( gui network printsupport widgets )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.10:5"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
+	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webkit? ( dev-qt/qtwebkit:5[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.20[${PYTHON_USEDEP}]
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(usex debug '--debug --qml-debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable bluetooth)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(usex gles2 '--disable-feature=PyQt_Desktop_OpenGL' '')
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable networkauth QtNetworkAuth)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(usex ssl '' '--disable-feature=PyQt_SSL')
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Fix parallel install failure
+		if python_is_python3; then
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+				${PN}.pro || die
+		else
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
+				${PN}.pro || die
+		fi
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D}/${PN}_tmp_root
+		emake INSTALL_ROOT="${tmp_root}" install
+
+		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+		local exe
+		for exe in pylupdate5 pyrcc5 pyuic5; do
+			python_doexe "${bin_dir}/${exe}"
+			rm "${bin_dir}/${exe}" || die
+		done
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch b/dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch
deleted file mode 100644
index 38a20bc36d12..000000000000
--- a/dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Subject: QTest::waitForEvents() is internal only
-
-Must not be used, got removed with Qt 5.11.
-
-Index: PyQt5_gpl-5.10.1/sip/QtTest/qtestmouse.sip
-===================================================================
---- a/sip/QtTest/qtestmouse.sip
-+++ b/sip/QtTest/qtestmouse.sip
-@@ -41,7 +41,6 @@ namespace QTest
-     void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
-     void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
-     void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
--    void waitForEvents() /ReleaseGIL/;
-     void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
-     void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);
-     void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);
diff --git a/dev-python/PyQt5/files/PyQt5-5.10.1-timeline.patch b/dev-python/PyQt5/files/PyQt5-5.10.1-timeline.patch
deleted file mode 100644
index 857492266e01..000000000000
--- a/dev-python/PyQt5/files/PyQt5-5.10.1-timeline.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip
-index e40d12c..4419f2b 100644
---- a/sip/QtCore/QtCoremod.sip
-+++ b/sip/QtCore/QtCoremod.sip
-@@ -22,7 +22,7 @@
- 
- %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
- 
--%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1}
-+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1}
- 
- %Platforms {WS_X11 WS_WIN WS_MACX}
- 
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
index a69c270de40d..d337ce9c4697 100644
--- a/dev-python/PyQt5/metadata.xml
+++ b/dev-python/PyQt5/metadata.xml
@@ -26,7 +26,6 @@
 		<flag name="svg">Build bindings for the QtSvg module</flag>
 		<flag name="testlib">Build bindings for the QtTest module</flag>
 		<flag name="webchannel">Build bindings for the QtWebChannel module</flag>
-		<flag name="webengine">Build bindings for the QtWebEngine module</flag>
 		<flag name="webkit">Build bindings for the QtWebKit module</flag>
 		<flag name="websockets">Build bindings for the QtWebSockets module</flag>
 		<flag name="widgets">Build bindings for the QtWidgets module</flag>
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index acd07cdc6fea..c73b6bf32416 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,7 @@
 DIST PyQtWebEngine-5.13.2.tar.gz 45234 BLAKE2B 4ad3aa63856cf3627c2f4ba29d93394f13297deb5e54bdd200bd419f71322d541ae72e45d70cff09cc53808f0d2430f8922d44f18bbf177c42a6b9c827854d6e SHA512 778aff78ea731230029e8dd993f4bc59a32bf74d65f06a8b3d1467efdc67e3b3caf0d9a968682c6c275c8ffdb8d85d9c756cb51727769949656620e944c736d3
+DIST PyQtWebEngine-5.14.0.tar.gz 47794 BLAKE2B 28f4a577ab5d8c1bea439b11e836008d27b4a49f31f230885013b515147a95c97e398328d1fc3a99619c3fd6eca3da7e94bf5873de9ac6511e0f59e467d4490c SHA512 c5274ce5ba1c80c6851971c3e18acf33121cd5863f613bd1789fdb40323b52429b55b54f3dcbb3127c85343e11f14c004ad54711b2b59cab95fd440f90fe5f2e
 DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
-EBUILD PyQtWebEngine-5.12.1.ebuild 1703 BLAKE2B d7e28f4b15836437f1ec47c64da008d5e5f3113f2969dd08750d4f324219290e957391ed6d152cd949bb88afeb87d946b22e92223fb92e8d27160c8d184983fe SHA512 0329d51e5df79ddc6ec2de02365e86f49b3f3267abe492079396646bfd93500649b4261adfc68f4e3c1b86ad58b41a70263f9bfebbf5eb385b52a743dd9847cb
-EBUILD PyQtWebEngine-5.13.2.ebuild 1680 BLAKE2B c67b3d71502d986aa09d43255b28fbd07e16bf70851a30d24fa5874b8d5fdd493f372e2c8f23a285ddc6866041f01f72037a5e965bc298c53ecb9a64f5a5eb9d SHA512 8fac5f51cb220bce68a8af2f3ffae742891b8dc279cd975bfc731982bd8666098d25d28c7dcb4a39d3bdf1e1bb7469d7f98aefbc617aa731e0b152a49b440a4c
+EBUILD PyQtWebEngine-5.12.1.ebuild 1701 BLAKE2B 0d613d9c7104bdfbe0bcb354859bfc8a71152c34d85e3c63d1be6f3d63851c0f59093d1dffaf8757799db3f28ba5ffa226deaa2580591a40a8af3f303909fde6 SHA512 3e60e50baeb21cf8976046da49079a44f70d00c754b77d1e9da083f83faf33a47ef98f1369eb6ead5b98cff8f441d607dc179ba34743c6470400663adff58158
+EBUILD PyQtWebEngine-5.13.2.ebuild 1716 BLAKE2B e9daa33d3f26d5154178d019cedd424b3792855cd4902c133be76e781bf056a0ba51569dd5bb1cfc913ee15961f5b9d4cdc6e6104492543f363cb96426510207 SHA512 182737679c99d6875e8e16a650e5d5d200fc4722f44f067ed5ba8c0cf2b2299eed7c4a974c365a561c5cda5208d508edd00ad673083fb9a1bea6c8ae5d913e1e
+EBUILD PyQtWebEngine-5.14.0.ebuild 1681 BLAKE2B 1235a69a52bd9c9e2d2017aae1f25a5ae75b2b30208bba4785b4e4037c731ae96ebad577998b21c1a5746d76068080eba4df9fd7e14aefb124bad03339e70b9e SHA512 872e7c531a7f4acbfc18a1375616ad87e7f0898ac7a4b707eaf651a9146bceefb0a159c3323e4af2faf708aece5e174704cc13f8da30b504a2ffa6410d341c85
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
index 98a5fe34affc..cb8c9bbbec36 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
index 9614f515fa23..420935369b19 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
@@ -51,7 +51,8 @@ src_configure() {
 		"${myconf[@]}" || die
 
 		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${PN}.pro || die
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
+			${PN}.pro || die
 
 		# Run eqmake to respect toolchain and build flags
 		eqmake5 -recursive ${PN}.pro
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
new file mode 100644
index 000000000000..dae102ae3cc8
--- /dev/null
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
@@ -0,0 +1,75 @@
+# 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 QtWebEngine"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtwebengine:5[widgets]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.20[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--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' \
+			${PN}.pro || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}
diff --git a/dev-python/PyRSS2Gen/Manifest b/dev-python/PyRSS2Gen/Manifest
index 3460b12b6797..eb06e2b0e622 100644
--- a/dev-python/PyRSS2Gen/Manifest
+++ b/dev-python/PyRSS2Gen/Manifest
@@ -1,3 +1,3 @@
 DIST PyRSS2Gen-1.1.tar.gz 9149 BLAKE2B 1f388e8616c79d8b5436f69191d479c529e1348308d69782a833bec714da6289fc459ea2b554a1e660027a25d0581c441a0e75a623add3c42c8c33c5cc8518e1 SHA512 2240686914c87984626eb739676927fcd53488158bdebf589e07e8a778e6d24305964e032581c61836f0fabc1264e42d05c88eac8f4c5f6536c31c775434ce02
-EBUILD PyRSS2Gen-1.1.ebuild 442 BLAKE2B 9f55e2d06532fb5e8588af7722bbe2d53b68239586cf3ca2960e0aa90f3dc26ceaa50fa3be40f7ade211733b9522d0bec12ed095f6a50d7453f146ff69473aec SHA512 459484d40bdc341b6f3bd9622f46294c197302882d638fea89540e533ae4ade0c21d3ddd58cc1a188ffe975c8deaf5850ac5f742d0a33d0e646767c7d61af3b1
+EBUILD PyRSS2Gen-1.1.ebuild 433 BLAKE2B 1a66e27f112ef17986f4491bcd61d66ea3d4e1b9a1d4ef3ca054ebad6008d22bd1c89626dc7cd3df1e6b8c154eefa4f57ef7f5a51a49a24bf6e70127d2758d56 SHA512 46a43980c4b5e22d5ccae24d81509529e5283ec3e3768c2b4957d4de8aba591c239663834e178143596909162bc6fda86cd08e7c657d4f02fbc069786ba25dbb
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
index a64042ffcb57..d736f664a604 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PySDL2/Manifest b/dev-python/PySDL2/Manifest
index 3386262db634..1d21109980a3 100644
--- a/dev-python/PySDL2/Manifest
+++ b/dev-python/PySDL2/Manifest
@@ -1,5 +1,5 @@
 AUX PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch 1812 BLAKE2B 7551d27fe1044d9a7bbe741fd70417f3f180d722915e53ff4374efc5575c70c8171cf4032d26e3b7703eb39e7da4998c6d867447a5338c76897ae84e598192ac SHA512 1a26d4db26b5fbc3c259c110825dbefa272e5c565928d041951438d1ed2012a67b3a06b2158b1c2a7c57685ab6e22363c3841e8bb3bf2e54ea21553b386c89cf
 AUX PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch 950 BLAKE2B e4baf35535ff37a845ba65127d6e580d2c5086e60df0d03a6939b5fee7dac860475503b01644097d9af2a21209e25258524f0feacd45729574034095615ecaf3 SHA512 50b1785d02290ce9544743cea245e216f8cbbadaf9dfc0c865fadd21e1beea88a64d89a304bcfb72e8b2cc19a961fba3c23de028b7caf7e16739f9665dd9aa1a
 DIST PySDL2-0.9.6.tar.gz 1048158 BLAKE2B 70a450990dd73169489af2d5b218eea0794c9f75948d774680df4b4423855318ddc6d16a0453f62361d4f0b81e872edc067235c4f946476ea8988e16cd0de44c SHA512 676b1b3381b614122442c70fe4cbd7c210ef3d8695c2babd37938e67b5cfeb2f8acbdcb914c5f68aceb549d89f7a77bdc80c7406b340b0e38c22543df8d46739
-EBUILD PySDL2-0.9.6.ebuild 1885 BLAKE2B 4e1e2771e221948bd590897741e22492d9fdfddc1cb72ad0e03f76006afb40af17ccf1a61ddd69b252f6eaa8d6705ad1e2632a57becc607cfda0ba4656fa3905 SHA512 147da24ae789dcc30be95b153116cc93280a5dfd1305d6a8b76aba950695662cdb861fc816111d9d2cfb77c4bf169670688beb9e0d34d7fb4795fc65d871e6dc
+EBUILD PySDL2-0.9.6.ebuild 1883 BLAKE2B b260261475023760a09a4f075bf19ab1ce7a44fbe89ec089b1b20b0488cf6cd94831d6eb608d6cfacac3f182a5fccfb82e99f0aca3ce2f2790982e0f4ff01f04 SHA512 ed051cd2b7c4d3986611ac53e93d1ac7bbf03243d2669664a0965b01bf78e95f3ce2b0312285a7cbf60c36b257f4341e6533cd99a22097d97c620206a52baeda
 MISC metadata.xml 451 BLAKE2B 2bc91faee3235d8d971aaba13051362ffe22563c5bc5a33a4dcaa0fa59abb7f238310d271a5311c98d4f69b112f731e11d1c8c49fa1a1d2bed1a5acf36c905f5 SHA512 50ba020088e640ca59a7ab64e30ff760b4708866ebc54b91fa2a12e4408463ebb0b04cfe990113bb7f556cbe8a4fc369fe86e3da4ec5b79a76752868cd08a62c
diff --git a/dev-python/PySDL2/PySDL2-0.9.6.ebuild b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
index 7e3b2317f27e..53b5ea93671d 100644
--- a/dev-python/PySDL2/PySDL2-0.9.6.ebuild
+++ b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
diff --git a/dev-python/PySensors/Manifest b/dev-python/PySensors/Manifest
index 5dc36adb405c..8dfc942e8ccb 100644
--- a/dev-python/PySensors/Manifest
+++ b/dev-python/PySensors/Manifest
@@ -1,5 +1,3 @@
-DIST PySensors-0.0.3.tar.gz 5109 BLAKE2B 8d537c121540c8e28d0f8cfc45152abea0e312c48a460e877935c7d8639710c8046a96f598c724082870ad7c0d528621bce85d8616485336c2b4f8ac2ebe7579 SHA512 b9ae61ee9049e1edd3fdee7b122c0f9aa19677aee401c910fcaec5a6bc95a0628d6b7eb2b59f1d14196bee22395819f4980d328d60dd69b0a413f7d08041f159
 DIST PySensors-0.0.4.tar.gz 10599 BLAKE2B be3a3692a846e5339758eff4f4396dd15bf96b3d20bc40df45436ce58381ac87503bca190fa215121506ecf9ce5175b254d93142ee881c4d5b8ef8e045854659 SHA512 8e6b2beee9bf282f073618c0b45e53330ce82c9fc9c6565a3c6b5f812231421c8c6e15ccc4fc92cda67ed08df5c482577d4a34720c920dbba7604f2b7c3ba21c
-EBUILD PySensors-0.0.3.ebuild 466 BLAKE2B 1bd8a0daddba4359d9bc0647096bd1fffea3491026bfdf923b1812eb03495051ce554be122321d03d88246682f71e5b83b9546a17dabcca30609734786e4f269 SHA512 e12c55c5821652c12501d3d8c8a4ddb43fb9103cb3ad1cc72fef37706f70aa78aea863b12e4cf4019d15e89ba5fa77d991e2e43cd228bc2c0d1548055d411693
-EBUILD PySensors-0.0.4.ebuild 473 BLAKE2B e2150a71e02eb69c063be07d21683fdb797806d65013b3288c76c3ddb692c571283b72b9a177275a2322059f98efefa0eab028c1a576afbb7b230342c585d36e SHA512 bf1e708473c368c2d7fc749aca461174f18d1cd181aa25ff6f84097732e332c4de0ed33643129f670a0b5eb8af499812d877706a4749ee2e447505800c5b3022
+EBUILD PySensors-0.0.4.ebuild 462 BLAKE2B e1c013c2a5e93b637495409f82a79228e07d06084d9214be9c746e9880196c0f5a7aab5147513461ed5fe68c00576332b1d56d6155b40f9cc686cd50e6683999 SHA512 92a4e6ab3ebd1600d5ebdc13b55036253026b9eff81876acf35ca53530e30577fe7894a0a81809001e7aaede9ea85a5f82c9b08a53c8777d624a057cbca6b783
 MISC metadata.xml 437 BLAKE2B 42315c93aedaf44d9ecfda30cabe8751e9fb8ca2621dbfcb434fda1581a5d6ba415a025c37fbfe1b03de8121bd4248aaeb6159e6850d08c692d6b729953dfb81 SHA512 63f7823890f90ae6049539ba3b15ddd3beade8e75ade4b06835ca7f04d64f1744e752eb2e7bd2b66e9cde29a4a1e79467a0046bc01ea34e50c1753b4a2ee811f
diff --git a/dev-python/PySensors/PySensors-0.0.3.ebuild b/dev-python/PySensors/PySensors-0.0.3.ebuild
deleted file mode 100644
index 4e6a9118e291..000000000000
--- a/dev-python/PySensors/PySensors-0.0.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to libsensors (via ctypes)"
-HOMEPAGE="https://pypi.org/project/PySensors/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=sys-apps/lm-sensors-3"
diff --git a/dev-python/PySensors/PySensors-0.0.4.ebuild b/dev-python/PySensors/PySensors-0.0.4.ebuild
index 4b2716c2ce5a..1ba53eaf6a5b 100644
--- a/dev-python/PySensors/PySensors-0.0.4.ebuild
+++ b/dev-python/PySensors/PySensors-0.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 python3_7 pypy )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index e11bafc8345f..5cc39e0887aa 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,5 +1,5 @@
 DIST PySocks-1.6.7.tar.gz 282874 BLAKE2B 9e4ecf57f6cb9b7690ba68e21b3e52a535a08490b78ad5d8bd90384acf26f16e6a08018eaa7e91763b94182119217404b235425fce146af7e989c5e39e5e07dc SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0
 DIST PySocks-1.6.8.tar.gz 283450 BLAKE2B 72b52fcdb9f3dc3bd71ca75cdbaa159c0b35a81fd4ed9476ab043819dad3efac76615bc751fc6014e1358a13a3a735023bae7f502e2863b5e733982c16758db1 SHA512 9b544cf11464142a5f347cd5688b48422249363a425ccf3887117152f2f1969713674c4bba714242432ae85f3d62e03edeb9cb7b73ebd225ed3b47b3da6896d5
-EBUILD PySocks-1.6.7.ebuild 577 BLAKE2B 020ac039cb11f1bb65d8145107462c1df9904aaa591bba0c242ab4dae580547a20e5dbc73f6af1551c314ea7d85e3f4bbab1dfc30acb326d8097b076245c5aae SHA512 d03dc3261c2cf5bc44a7952973ad3457d30b0a7397a74e9819016b2e6b09afe8a7e8de9bf1b793c5d195a99d157dcca26e37f924c8b0bcaa1946781697bb6f3e
-EBUILD PySocks-1.6.8.ebuild 913 BLAKE2B 2984d6ad8b0c44227cfd880ffc5c231954abf357327f155d32c700fa9e9376c0062a1e5d761231b4b3ee825403eac2f6a8e83661ed149c655db54a2eb9e1556e SHA512 416a6ddc40098c81f81c8fc8bc416f1ddb0f28098f0d10021f0b3a76e641ea8454b2798ccf43c8687b8be1005b43b78d02b61656ded40aa3ced6a8c7acae75ef
+EBUILD PySocks-1.6.7.ebuild 570 BLAKE2B add1debcfe2b317ca10eb252ce706e1201bbc9b8ce50cf4278ca83477bc56ed4ea009d6c1fe1612e558008ee50052fe0bdc7c30baa0061cf4ff8f9c138f0cb53 SHA512 4d115844e12e72e0dcadfc41d53d7596cb422902f7558f9816347a87fd4ca18d844478b0f9c587fa0835050e97adc8b9629156e826b2b8e2937f42cdf4f824be
+EBUILD PySocks-1.6.8.ebuild 905 BLAKE2B 47a623b8c235a2ad4a669b260301d9ed466af4b06b379a58763712a9b7a79c5622113b73570a82730396aacce056be5f1626894062ccd3e81de61821b6cf4570 SHA512 dc5cdbdff385bb6dd84a7d2c6fa1ccfb144f8330f5de5912afb232ca1ff3538dbe243c7244ff33626986ca02f32efe2cd2a254207f30f1eba968ce57115f4ebf
 MISC metadata.xml 499 BLAKE2B 6eeb0c4905d8f0d6c2d276b36a74ac9e1aaf3f5066ba79ea3b821fa31440a46c4ba49f88be096850032cf8598f6abee09182d84a35345fa53e1001a05137dbe0 SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa
diff --git a/dev-python/PySocks/PySocks-1.6.7.ebuild b/dev-python/PySocks/PySocks-1.6.7.ebuild
index 59ad8375ca14..35249b1f81fa 100644
--- a/dev-python/PySocks/PySocks-1.6.7.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/PySocks/PySocks-1.6.8.ebuild b/dev-python/PySocks/PySocks-1.6.8.ebuild
index 32f0cf17d6a9..4ae280e814cf 100644
--- a/dev-python/PySocks/PySocks-1.6.8.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
index 93574ceaaf27..08f27bbe4784 100644
--- a/dev-python/PyUtilib/Manifest
+++ b/dev-python/PyUtilib/Manifest
@@ -1,6 +1,6 @@
 AUX pyutilib-5.6.5-tests.patch 1413 BLAKE2B 8cfb6abadbd0c83adccd69cd18dd85aa2c58ad6d8610de0912397e626704ff6921ed54869c0ea2e7dd1567070e5061fa424d7749236cd2e8321d17a6b60ad4a8 SHA512 00d838e4eab285e7eaa1fe802abd1fa22f3a662fd10220cc3811fab6d9025dcb327811e13ee13f2102ff1ff2b8b132a10c32cabfb94080940dec691b6a890298
 DIST PyUtilib-5.6.5.tar.gz 1504220 BLAKE2B 2d00b8b9a0a787413dce5dd4380382efa4c8788e9a8f5188eb0decf9e55bc07ce5ceb8e6f32ed2fa7cf58c331fe936ea07d9b599ff8e7e9593327d3c0f05d4e9 SHA512 5e7f86c29ff81cfffea5862d09ec8d026739f09b172606acd4d08dc4a9bde28c8b63b8e51634d17c3161b46e7e8c8881050044baa22bc07b0926efe46ed7331d
 DIST PyUtilib-5.7.2.tar.gz 1566034 BLAKE2B 913c6576b39f14c19e2e633c36ade33fe812c77a37374c7c14d2fb4384ca38f68efd55209d70e96d9a78fea2fcf1cf83423680d0787da2d03cab88e59a208b96 SHA512 d9d7d890cdb524bb055885354784f2af01967164ce88cf3b144ccffb0a855ef34243fd518c58193517ecfc50f3c2e3ca333f026951c1ab0b38ce181ecf9e7750
-EBUILD PyUtilib-5.6.5.ebuild 1109 BLAKE2B f2f7b8d29f3aea195399aae89e82a7ad06c955e134c7ed9b1ff9cc3068a8c53ffa8394f155627ec6a8225a42c5929e12d7d613e2b1c803b85752e26a9d3fb8a7 SHA512 8a1899a90968a3c5de553aa716bf292b5915d309b28b355e8b99754e0955b0c05cb3e8a773dcd4ced6a549006ab87a4c8250d3d13ec8d6ff868072cbe2a45c83
-EBUILD PyUtilib-5.7.2.ebuild 1338 BLAKE2B cb4ef87edc0680ca27ec6d4e123943052e5abf29884ee26951b4fbd65ae5f2d2d71b7197cfbf368f4131b03e138455db743ed26b84e9b286119ff59558cea562 SHA512 33dfb523b25011d9a95e0af9ab385f232280749f87ce1fec07c303ac064f8d61c936489ebf739bc8dde25f091af1ade28236bcb8458f17045ed8a453898ba85c
+EBUILD PyUtilib-5.6.5.ebuild 1099 BLAKE2B 8b0062104c305d53fbb1ddb34d1a46d4280cdae5f57ec234f9abaab33d98b8dc54ff1ee4d7cd96ad6481e784c0a11ac6070c81de3e51816f72d66eb55a9d6723 SHA512 6beeff0cb50028755c9e9dc9280a0f430a6f78a337f6928870240e2c58d7fef961b252dffb640c81eefc06763a66feece061681a4c8af491d72ef318fa2f19aa
+EBUILD PyUtilib-5.7.2.ebuild 1336 BLAKE2B 645b98744021b0b582f9b3f75cb33cbff9478aa2dae303177e7ad92d0c8c28892209393bae9d860a7c30a2d522fddeb6b04f8f164a2a92cc4bddfef4ca451bbd SHA512 b4d782527d68ca1fcd9aa9939794079630a6729772be759b154d243a7039229bad44c90c34d2a5a30a9fbd74c515420d8ac00d169dbdc79cff54706d338c10a1
 MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/PyUtilib/PyUtilib-5.6.5.ebuild b/dev-python/PyUtilib/PyUtilib-5.6.5.ebuild
index 22a9c5f3ade5..32506e723c9b 100644
--- a/dev-python/PyUtilib/PyUtilib-5.6.5.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-5.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A collection of Python utilities"
diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
index 2fc844c76ed3..1c83d3e94854 100644
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-python/PyZilla/Manifest b/dev-python/PyZilla/Manifest
deleted file mode 100644
index bc7a5de8ebfd..000000000000
--- a/dev-python/PyZilla/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyZilla-0.1.0.tar.gz 14686 BLAKE2B 93d199cc821b5b2eca99fa701e072072d75681356a8d8ef6cf67c1bc115c48365d5397b41a0f5f2f6550ff9296cdb970efdf0461f81cfccffa00d4d30586e37f SHA512 20f893e1251eb9f3c62ee702c12064eb3d560c82131cf4b228d11426f2b8a7c9cf08b8d45439445b381f9c23861f75b5c11c71ef59c50fbca7c0ef952a4fe5e5
-EBUILD PyZilla-0.1.0-r1.ebuild 401 BLAKE2B cf7bef5c950d376ef6d6bcd0e9bd965858a705af8e809215b0c57244c7ae54be9e4c641f3ef2a2afe9f269419a5afad0b0ff0fc264b08241cad84652bd6e10cd SHA512 61549cb8f8f20f401fe6fa4b807b4fbb4b563d8ed8733d234f7dfec6f7a2b951142577963bdc9e8a5eda2715d5570da5b3c6b45d49982787b5de6f6078ffe06b
-MISC metadata.xml 289 BLAKE2B 1baef8a964fd647974a6f65a97656f2538b92c094f99e4f3106c9c0ec270e30cefcc3b0748fc8bfed649f1720c02dab6ca752e3d643d0ad6cf969bc82fd1be6d SHA512 8d1840c315abfadc3081d55b8bfc0838740ada22749645b445536867cb90a7ce3949615d47c0ef170ae7bbbb305738c9224c943b0bf38b83ec3339c7f6f82b41
diff --git a/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild b/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild
deleted file mode 100644
index fb8425a4c794..000000000000
--- a/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,20 +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="Python wrapper for the BugZilla XML-RPC API"
-HOMEPAGE="https://pypi.org/project/PyZilla/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/PyZilla/metadata.xml b/dev-python/PyZilla/metadata.xml
deleted file mode 100644
index 772d4a8cac6c..000000000000
--- a/dev-python/PyZilla/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">PyZilla</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/PythonQt/Manifest b/dev-python/PythonQt/Manifest
index b1b486a7b51b..0678fb6e4a44 100644
--- a/dev-python/PythonQt/Manifest
+++ b/dev-python/PythonQt/Manifest
@@ -1,4 +1,4 @@
 DIST PythonQt3.2.zip 4539058 BLAKE2B c50b8333b71b6cbce6f372a0292a0ccfe791dc7eae5c660d4e6d1f5f2b3355644e3fd8cce9a514f0500e935f96c46976d0046ddd716465adb35d225e3c4cfeca SHA512 1ee0f50f5035568b38e945108f5496ba64355c6357c1ea8dfc17ad90fa360540769f94e0b3e0e398176e8a21c8afe139607f0b5a2e82c63f1cbd40201a25e0f0
-EBUILD PythonQt-3.2.ebuild 1840 BLAKE2B e9212d352bbb3a55760bddbb2c94e59850963da57b8d8bb480b9598528a8a1fcf85524bee4d4843b1aef5472f85c1adaabf19c8406a295bf27ff5b45e63a1c27 SHA512 8f69d22613a62f427d959922abfca62b621b9364551fc0aa7eaf6e4174c6828234c74f7beecbe9e55b6c7854f168e74e01efdee740bd5b5b5825655bfd1728d4
-EBUILD PythonQt-9999.ebuild 1861 BLAKE2B 77191e52f2d8261f946dc35791932518fc919ee37d0dd75bf286dc10128a387a2b2e8233f228df6bff66122befdb2ca2b610ee35e808d0f0f2b3e0d4bc5d16b6 SHA512 d31262b750a2e71bd27c7d3a97c37bde8c3f41e2a0536f553224da107aedd25a652a7f9e77f7ca3909dc5761b56af10a4d479931a425af7fc0032cc17d381201
+EBUILD PythonQt-3.2.ebuild 1836 BLAKE2B 3ece364a090a055d370b306160a33d2b2e2aed972dca94e21957ec0b9d1f53f9ee26e6621dddf86c83f636b4cf59cce484f6b9de155fec162d6c4fd9499fc0a7 SHA512 de135516fae6a3dc98c9eca513a15a59e8d4b5afcf020020f7d55e259708fd4c2d8ff053a00a2580d76cc7a8bb21fae4431fd152df4601c817465a42bdd71578
+EBUILD PythonQt-9999.ebuild 1857 BLAKE2B 6c9a911e7a16c4c46213d60d156257a9e3387aec213fb0fd734ba30d04318e06d0be1046c8dc0d6e41bd1f3d2d1626e82c7ef585148dc48607b192b241a768f2 SHA512 951f44aaa0731c0c81571c5c11001110fe019fb054e826928d843d7fa7761d422ef2e153890bf9ced540b765512cd2c239cff0a46cbdb2a14ca6bbaf87804ff1
 MISC metadata.xml 971 BLAKE2B 4a9f0fd3832f83eb46ef65a18774c998daeb9544b1ac6a23a189b909c7e4168031a68d56952d9ed2b7b76fb8fc3a912e77d162cb94e73405f285bd834644fb98 SHA512 565d8517faba162fa855acef4dc659af22954796a25da9479d7ec530afee16606904b6bfba9a568e6caa8c47f3195401eefc3a9048077e73582cf7357cafce5e
diff --git a/dev-python/PythonQt/PythonQt-3.2.ebuild b/dev-python/PythonQt/PythonQt-3.2.ebuild
index 4bb549be95b7..e6f1e98cc5aa 100644
--- a/dev-python/PythonQt/PythonQt-3.2.ebuild
+++ b/dev-python/PythonQt/PythonQt-3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 MY_P=${PN}${PV}
 
diff --git a/dev-python/PythonQt/PythonQt-9999.ebuild b/dev-python/PythonQt/PythonQt-9999.ebuild
index fc6953a399bf..121aa21e910e 100644
--- a/dev-python/PythonQt/PythonQt-9999.ebuild
+++ b/dev-python/PythonQt/PythonQt-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 MY_P=${PN}${PV}
 
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 2c6520fb5be6..fc4abc5a4d57 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,5 @@
 DIST QtPy-1.4.2.tar.gz 27471 BLAKE2B d70de67944a4019031b52cd3f6c588261537a74ce8b968d9577b016d18767e3e2b6981dae983573bd1644949b13ee271a10beaef9a371ac41b3cd1b9cb506cb2 SHA512 eb8a059f110f3262ab62f8198019b9826a5b834da62e59791fb3a6c235eb797291e4f180b31704d7d61811791e5b245a05b57fc385de358480561508e3b29a4d
-EBUILD QtPy-1.4.2.ebuild 1063 BLAKE2B 8caf6f72e1da759c30a963a4e5f74d46ca09c7f70e86bebcd15ae9d16e8499242e1e75538a972e7b27a0a07e1e421962109c715ff34c9899d9ee3b2e45225a90 SHA512 abedccd9814fd3c1b7ab1ce873df111e2feb5d4cae0ef011fbd66222a822f317128f97272b44e192cf3793b7bf49741c8906c87f3969134f7cb79e9f0563b793
+DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
+EBUILD QtPy-1.4.2.ebuild 1061 BLAKE2B e9c98cee21e6afd616934d7bb62855fc0770171a231ab874b80a5cc3384cf2b3bed8f5ea61018aeff7d96b8dba81e9f12ef015f74f66a963396da10a5971c37e SHA512 2be59409b66b18cf15d02a3f6ac5db9d5c709d0924d234bb11183a9f5dcc83f2e10c22edd88c9f504b7986a20a0acd7965c4ee6479bfd15d0f9439bbd4869607
+EBUILD QtPy-1.9.0.ebuild 939 BLAKE2B 8004d11a8cb8cb73d6f0e1da6e5918437feb12365c38624f1653c58a49fd357dfb2eb78ab83123e576159ccb78abbf4551aec1410ae96a3c0717c619b593140a SHA512 686a66ffa14d2f26b63c421249b29ff1ecac6338a69db702ce43251bfe652eb615ee01e400abf9d2373e419bb6f3409a04f5cf16a6889dc919e95da8c507fe23
 MISC metadata.xml 1338 BLAKE2B 7eee8e39324b18bd84a076882dc539fe2e18f38ec68a539ab40968a3a6023ac0cdfc6899305df0ef0c7561409ca81526d474a1154fb645dccdffdb0779282b12 SHA512 08a2e0b2d0aaecaf91bffb82dbba9d24d4b4753801610102db08c3e29b3ff51f1bd6d46f9c2a706f4b9a887be781a97ead1c753631717f82cd44080d44b67c4c
diff --git a/dev-python/QtPy/QtPy-1.4.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild
index 08987abc73d5..fcb713ba467d 100644
--- a/dev-python/QtPy/QtPy-1.4.2.ebuild
+++ b/dev-python/QtPy/QtPy-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Abstraction layer for PyQt5/PySide"
diff --git a/dev-python/QtPy/QtPy-1.9.0.ebuild b/dev-python/QtPy/QtPy-1.9.0.ebuild
new file mode 100644
index 000000000000..85c3f572b63e
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.9.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="designer gui opengl svg testlib webkit webengine"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}
diff --git a/dev-python/ReParser/Manifest b/dev-python/ReParser/Manifest
index 90ead62fe276..fea3405987b5 100644
--- a/dev-python/ReParser/Manifest
+++ b/dev-python/ReParser/Manifest
@@ -1,3 +1,3 @@
 DIST ReParser-1.4.3.tar.gz 4560 BLAKE2B 1ec7ef9174ae284d80c6cd2a978da0bdfb897628bc72f9afaedc38de32bd26bf1dd80488e20fbb14e073f8eb1365b942621b65b5e0d95884501918845666c343 SHA512 db02caa6f4f1997cfc7a79283b1b90d3ff96e7fa2e7ba5b119e0060b97d1dd2604640c7d0a8503dbc05613b9b507e7d8732e9448c3ecb59ba85cf340ff1a5e2b
-EBUILD ReParser-1.4.3.ebuild 546 BLAKE2B 7f94ba0d249bde1f7e308d22dd5099145e07085839511610346f59766b26714b238eb62c8d338a8bd6317744bce497d255d8ccc5a9f43ad805c3e5ef61636c59 SHA512 394b69a28d695f497875530c35cd7d12c18bb616692c7b37377d05b40b643b841340ab764b8badc7ce7055f75f2442ef186e0566a9df1ae21f3b1ed5a415ff44
+EBUILD ReParser-1.4.3.ebuild 542 BLAKE2B 3e885b05cd4e9abb175d3afd5ac51d5841cfe4fd6c600b8ce4cffae26dca48b74faf50bcf78c040e34b1d03f661a67c639e9a59870d33b1aa548fa80e3068891 SHA512 ccee81065616cb25c648b2ca0895f83cc0dd861522ed397f213bd063ac96546890023bcf6e13d7d4af1d47a38846a97753eb989e85f8d03adb9955a38f2f0f43
 MISC metadata.xml 398 BLAKE2B 896de8811157615aa2bad3da1219598b6c78e08f67952671e686e1f5a799390a2214e9c4c3d2c436b1ebb386ec97a5509844ac2e46a0e84100fb06454a2d0054 SHA512 5a538c39f6f84d8ffd0a465694f34b22737b944c7226fb01abff08b4627276337688dc3d9255ee219cd75e066c4ba30e66b072af8d56ff288d2eeebf906b39f1
diff --git a/dev-python/ReParser/ReParser-1.4.3.ebuild b/dev-python/ReParser/ReParser-1.4.3.ebuild
index bd6e34292182..287182c9df2d 100644
--- a/dev-python/ReParser/ReParser-1.4.3.ebuild
+++ b/dev-python/ReParser/ReParser-1.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 if [[ ${PV} = *9999* ]]; then
diff --git a/dev-python/RecSQL/Manifest b/dev-python/RecSQL/Manifest
deleted file mode 100644
index b248069fed67..000000000000
--- a/dev-python/RecSQL/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST RecSQL-0.7.11.tar.gz 134676 BLAKE2B 47c481dc06ba736560b53e4e44d2774d4059c11e846dd107c89b42687e2fc148a12a2afb818a7edc0023717a12ea928cac9613d7fa375345e9f1d4deff0e548e SHA512 e62b0eabbf74f25f362469a79d48665ad71de06818a2ae20cd2116c7460a5bad6034fa2199c1548394ca22018a6fa8d930fd22e5dccc82bb6a70d4d998fea51c
-EBUILD RecSQL-0.7.11.ebuild 684 BLAKE2B 9c94d02ab1e673ec49aadd87725c36f7c77c062b2e3b00001ef3d5dff9bc3c308a0b80007f2c56d140ef7bc48e2515c928b54c9a7b003b7558184c80595c956e SHA512 9940d49694241a55b88c681175ea95828160c30d8c9e83822d1ede72b4aa86e26787ccbdf8fa56d7cedff9a2993556ebbb8135035e901053ab22e68ab9851907
-MISC metadata.xml 458 BLAKE2B 2dfccb86507920ab72b1dcc86ede6906a333c13661c78592e705674f8339afe36f30fa79c663524e6ab0e8cdbb40a4f80eb66d0909b88e4f01b42ebf3c124104 SHA512 28380450131ce260ddba649be54b15115115bd150124fe11dab164f54a39146cb021468e15467e33868d8ddd99cc788535f7de5300b4dfc247984fbfffe13703
diff --git a/dev-python/RecSQL/RecSQL-0.7.11.ebuild b/dev-python/RecSQL/RecSQL-0.7.11.ebuild
deleted file mode 100644
index b40dfd020dfb..000000000000
--- a/dev-python/RecSQL/RecSQL-0.7.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI="https://github.com/orbeckst/${PN}.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	scm_eclass=vcs-snapshot
-	SRC_URI="https://github.com/orbeckst/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit eutils distutils-r1 ${scm_eclass}
-
-DESCRIPTION="Simple SQL analysis of python records"
-HOMEPAGE="https://orbeckst.github.com/RecSQL/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/RecSQL/metadata.xml b/dev-python/RecSQL/metadata.xml
deleted file mode 100644
index c0ad26b50241..000000000000
--- a/dev-python/RecSQL/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>alexxy@gentoo.org</email>
-    <name>Alexey Shvetsov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">orbeckst/RecSQL</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/Rx/Manifest b/dev-python/Rx/Manifest
index ef9635e21f48..e6d648c1f979 100644
--- a/dev-python/Rx/Manifest
+++ b/dev-python/Rx/Manifest
@@ -1,3 +1,3 @@
 DIST Rx-1.6.1.tar.gz 89543 BLAKE2B ee0b6c30c794febdd045231ff61a330a512c86a9dd3c56a6afa900c31ca774725d7bf5b589d46b60f79cd1f0bc967b5ab5bc87a58f6d3dbebbdb1b6618db875d SHA512 8602b5175c058e855ac4b67d8feed435f93632da2f4033fe0db54fcbb012a702786b29f97fe3fd641f054c3a61478dccac21c614b5708f7bfb0b986c9951e6a9
-EBUILD Rx-1.6.1.ebuild 361 BLAKE2B 47515656f54c03be0001e71062585b1e3b368bfdf1e6cd1caac017fb42ed38ac97b1e1bfe49040dd818f21dde47934248b7b31dbd845e0b5f56c1871971f9913 SHA512 22263d0888a2beb5734ba0b48cd46ece0cd34baa0aeac416a81f79e7381205c8ed26437328abc73fcdd22bb355c9106e2999c579e5275b7ca4a80220c9275ed8
+EBUILD Rx-1.6.1.ebuild 357 BLAKE2B d182d29fdc6601ba47d66695d3948923831341fe71ea4707b7520fe34c3e29a3cf6b2319c1897647c08861201bf589dfed416fab2b34f927c319541b6a90fba2 SHA512 a8d5917a12c4312e878bf4b56e115bfb1085b3e09904814e74dd87d3357aa4e495bdd7b3cc193d4904863392afb741ed447062322aed50b3fef8d7da6eaf65eb
 MISC metadata.xml 327 BLAKE2B c9349fc7bf783920d0f8469ea19b8cf475c4705d3499364ab79a6960e19c3458b7d2a18aa90a470b033003fe461f06d34d25206b702c835e5a311d698d4c2e95 SHA512 382a7e9dd6cf734155229b3acc48060b4d11f2e68b2fe906ad8508ea5de95b1adcd5d23d58b6ff4881f7d5c9f103e64b60787eaebbeff2db8f9b24188dab6395
diff --git a/dev-python/Rx/Rx-1.6.1.ebuild b/dev-python/Rx/Rx-1.6.1.ebuild
index fd1d7857a144..56b5e2456853 100644
--- a/dev-python/Rx/Rx-1.6.1.ebuild
+++ b/dev-python/Rx/Rx-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/URLObject/Manifest b/dev-python/URLObject/Manifest
index 7d82b4104fc8..506b502816c2 100644
--- a/dev-python/URLObject/Manifest
+++ b/dev-python/URLObject/Manifest
@@ -2,6 +2,6 @@ DIST URLObject-2.4.0.tar.gz 12533 BLAKE2B e5fcd97267ef66124074ddc830c547df5bad02
 DIST urlobject-2.4.2.tar.gz 25457 BLAKE2B c5d3ed0f38b3fd58ac52638059497cc53347bb378d737f87f2fadf43368ced9450cea0147c49a7cee5b29b4805bebbd22817910d922813882aee5b7f467dd653 SHA512 970c5900171fa64624cd2ed2ba7f3a761057eda5c1fc07f881e8b7c74bde0cbbb7fc6c7c8694d8b8be0e991322da148528d99ff6fb2d4b75e1ddd1c2f474b4f3
 DIST urlobject-2.4.3.tar.gz 26325 BLAKE2B 6c73bab1768d8676ccd7411175877a17a8b64e2498345443bfd8e28873c1ba9aacf158cfcac739d8ae1abf7d7845bc5fa5f478441d6d99530a9395b236b118f0 SHA512 2bd08ba5695c8277eeed154d7f414939e8b471e83f1fc6b9db93931f8e49dea4583036b0b7fb8d820e0b214bdc4bf2fe78987eb6a5c63ba70611aea6365c2972
 EBUILD URLObject-2.4.0.ebuild 430 BLAKE2B 9574c5710b9b8c53c094bb76cf16763b5e0c9bd4508e63401507595199c9bcdcfb6efb318783febf91971453b0257261f80508fce401bca9e8f1c8a8b038134b SHA512 5ee0615f1e67eb0d1eca12a97ae67a3dc16b134886316b32f701f2cf408d7ac5105c8ccf30bfeb34aff69a3f759da97259a4e0c0a0e112694c55b638e4d5a2c5
-EBUILD URLObject-2.4.2-r1.ebuild 774 BLAKE2B 779c9cc37fac0009ec816fcb43be3201c0cbd981066c94804cbb4baeddc94acb5cffe874c8a76a8c2ddd49ba641b9a974ac8e3f2a766f22a8203994da9dd8416 SHA512 1a0ac3c349dbee9142bce3cb2140e95a7084c6799b447cbdf22d53e5ecf32157cf3aacc468e942539d1caa726b164c2c2dde59497fb5eeea2dc01f26857a6b1b
-EBUILD URLObject-2.4.3.ebuild 1020 BLAKE2B 87b810c706534bc800d0c2d600343f62b612823de9be4511d7c29bea280dd33402e36b2c8f41c4453de3bd15615a815ba20ed26c8ea5f88e3328b0ee48e55c7f SHA512 a3c8cd199ea19eba39c6432ab99fab623eb7b6d99cfe0e0d9a1d0447f3235ccaa0451d3f318b5c8c61f648c3ea17d1dfd4eecc0feb72fa4c022c289ab35351ed
-MISC metadata.xml 359 BLAKE2B eebe59144ebb3622f044879ca30a76d9dc852f936efffbf8da19ab24912d91247fa06d35787c067931ef1a619b79669635e9420ddc66d4571fb6482f54349e75 SHA512 dacc5d5ba44600cd31a8f4980af6dcb28d00b98ef32e411a8845d6241d4eddc3ed30597d64f925dac219026fe1ad250e6b3b38ae00e912499cf3393dace020c4
+EBUILD URLObject-2.4.2-r1.ebuild 770 BLAKE2B 2b24de04d09edeb80ef52eb962ce7994e6295e3072538904f0567f042e2c8200f5614cbea929fdc07c39bebc869cffd060fd38762b15a3d3381d7f858636d13d SHA512 b198e2d0b484b12690d7a7bf01decf4047eb093f292bde3220fb8595b0cb761861a1176e645652a589ab887e77bdf75a13e9aac7bd9fa706b15e0c8365ac3ba1
+EBUILD URLObject-2.4.3.ebuild 1016 BLAKE2B c452e88211c5a2902fad7745b55bc05af58d181180e52e3a78e779409b0641e2c6d69ba2a5c53cb05cbaf26caeccc9e5a5d591193a9586f192d5112ceb3315c1 SHA512 75582d6304a1617af7d7b92e99f60401d0db0c9756758659ee36507235375d950cdc0b0fc2867b67f7ea618e112810f82d51e4e24c828b5ed26f055b64c7cfb9
+MISC metadata.xml 308 BLAKE2B baba8517a0e2446ad07003fdc6126fa4da38b1fa4427180af4539369442d7defe4e11cb0b8c417a1397d144716a1c6d33505d7e5bcd881531a22b8a28308ec92 SHA512 b72e2bb992898597ff98e8bf7c47ebd49f21672e102df17eb27f50e0065ba230d4967114fbdcff26d21f27bf35eb3aec5c28aedccd1200f9e67f28d4f7ee1692
diff --git a/dev-python/URLObject/URLObject-2.4.2-r1.ebuild b/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
index eb159b69ab9e..871f97ef9c6e 100644
--- a/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
+++ b/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/URLObject/URLObject-2.4.3.ebuild b/dev-python/URLObject/URLObject-2.4.3.ebuild
index 5713e72331c1..2c73710f1b39 100644
--- a/dev-python/URLObject/URLObject-2.4.3.ebuild
+++ b/dev-python/URLObject/URLObject-2.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/URLObject/metadata.xml b/dev-python/URLObject/metadata.xml
index ba221ccd4b9c..b2ca80a2d7a8 100644
--- a/dev-python/URLObject/metadata.xml
+++ b/dev-python/URLObject/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">URLObject</remote-id>
     <remote-id type="github">zacharyvoase/urlobject</remote-id>
diff --git a/dev-python/WSME/Manifest b/dev-python/WSME/Manifest
index f698d8fc0938..479585dab6c1 100644
--- a/dev-python/WSME/Manifest
+++ b/dev-python/WSME/Manifest
@@ -1,9 +1,3 @@
-DIST WSME-0.8.0.tar.gz 121619 BLAKE2B 8d6f05820457f556a14aff2e28cbd4d489832a2c2b0644e213861811e70590c1b88378cb2fc8803cfd85da79c4cacc9b95021d83506795f276652095f27815aa SHA512 a0fb92a16bf3a3df75c71ad8756a18e97ee6ab381ad954898970a5eec93cae5469a8fa07a8724cfc64e53d3ad3c3d7d7feaaa55b92176bfb24fc566bd7f415a7
-DIST WSME-0.9.1.tar.gz 123187 BLAKE2B 1c4d750dcac4fa28002931286b7390d4e30d7903bef74a7a16746f9fb60c83f368675d1c91050854372575100cb5db7ed80bce6253643239d544c3c4343aac46 SHA512 795cd780f54e4b4b25d7ae5bee75f3b8d1513b315dbd8f056051452181be4f2067b06db9e695585c0d2b00474c2e2d7c75bbf4ec57519f9343c8cc184389ca4f
-DIST WSME-0.9.2.tar.gz 122620 BLAKE2B 1731654cc33581d39cefbf825edc925ac06ab653da68438b22e36b3f9c582f833b603cba6c372c68594664eb082f3b60f1455204a0c77e20bbfe82844e86d8dc SHA512 7817e5c90a18223a317b6d1e437796fd87ba4b70f4f4ea4873c305b796fae00bc8bad20f30d736ac50317eb45e2aec0e4e819f7fb9b22b1b116983837af58cc8
 DIST WSME-0.9.3.tar.gz 124775 BLAKE2B 393168629333c4e304689758c9462164d638cdc529c6128975ed5cb6624db4caef5a700a41ae8e51565cd796d1c4e5539bc553bc358991c3c62c1a18aa443cd4 SHA512 dcff4a1742c778af37b1182f45d4025a3a9b60b1aa7b7c1e62957eb1a2c0d38ffe0a0d16a921e44fda1f2310aa60cdae9bdacc1941cb01d8eb8f36cb31514c9c
-EBUILD WSME-0.8.0.ebuild 768 BLAKE2B 311d5878427280f16fe403f2773c74d041671fa64b8d07811f6a9762f29f17369913509449c58a7396018f5709546e86507e4901eba106297b6e64a90735e72f SHA512 041c4c2014147cd1b28b965b3c50a21944f8d9495c3ce634b571a9b55ddeefd41816f5401c9bbedba01f021a5f0bc02d4435add426a4ad2bf086d8a35cd951b3
-EBUILD WSME-0.9.1.ebuild 768 BLAKE2B 14dd0758c1b0f34b059d5b5d171115ebad3d15c4f1da425f7b36f02e43349813422453c8905494fb3103d4d31a1e6bdf77821a3ccf57bdfa441ef15525cb543a SHA512 768d32c250c474892fc5a18b26ff003a12726949011fdadbf9c7c1f4eb7db0006200735b803f784a036fdc008703ad96d265d717c92ff6ab5647268c426bc2a9
-EBUILD WSME-0.9.2.ebuild 778 BLAKE2B c203ec38c5ae93488c91849066c51e3b724102029098b74c3dbcd9aed32bd9d67357c51003b54136a22d3989b8d1dd4fc4d6522b5586cafe03d48eda0e1238fb SHA512 47fb9f512cc82aff9a35216ccd068d91e89449b57eeba8bd9ae71e9f665431a6bb96bdd464d14248c8f24f34df29b955e726dc43b8e75d3fd012e63d0b03c9f7
-EBUILD WSME-0.9.3.ebuild 788 BLAKE2B 5dcfbf1290cf986a0081b6fba19df0309ad1bdae008f74b200537fab53e0ed9674036e0294f4a2f054b7105a3d3bcddbb6ab3d46f7f9993968627b4ac2d2489a SHA512 2517153b01d3a2720516a0bde86ca8dce88c8445ece72e29b26d1561fc27ca6d507adebf8b9f9364af25ed6e3e137b0daad79081a9105203800dd0e2ee45bee4
+EBUILD WSME-0.9.3.ebuild 768 BLAKE2B 9890917e01dd84ebae649cc40776b99d24da5655775b0a228f94ab9a7d0e2da75674202b5d9225725ab23436be582597d6dcafdb70af533b3fde8685013f1fa5 SHA512 2aedf9567670bafadb8146609169042d1c63c5a7a3624ded65a85ad0731d0951ba60b642935bbd3c4238181e499ed54cfb93f03c5dd0d8a9bac4575af2136532
 MISC metadata.xml 575 BLAKE2B 124788df9210c22a2bd71eae838d413f3faf231eb31dafef6f6c4cc15a65cc23098e052d18353470f23c8874bd752503cb7d44f629dc1faef562309479315162 SHA512 d57f5520e1f102f496ac66c0f9b2842ee4511ce96e9fca3d4e166ee81307d8033d36ed1d0d90fd91a8285d9516a268691dd3502beefb398e7b1303b0af0111af
diff --git a/dev-python/WSME/WSME-0.8.0.ebuild b/dev-python/WSME/WSME-0.8.0.ebuild
deleted file mode 100644
index 42e7ad7a66bf..000000000000
--- a/dev-python/WSME/WSME-0.8.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplify the writing of REST APIs, and extend them with additional protocols."
-HOMEPAGE="https://pythonhosted.org/WSME"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/WSME/WSME-0.9.1.ebuild b/dev-python/WSME/WSME-0.9.1.ebuild
deleted file mode 100644
index 3801a77b910e..000000000000
--- a/dev-python/WSME/WSME-0.9.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplify the writing of REST APIs, and extend them with additional protocols."
-HOMEPAGE="https://pythonhosted.org/WSME"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/WSME/WSME-0.9.2.ebuild b/dev-python/WSME/WSME-0.9.2.ebuild
deleted file mode 100644
index 8e6bb269050c..000000000000
--- a/dev-python/WSME/WSME-0.9.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplify the writing of REST APIs, and extend them with additional protocols."
-HOMEPAGE="https://pythonhosted.org/WSME"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/WSME/WSME-0.9.3.ebuild b/dev-python/WSME/WSME-0.9.3.ebuild
index 3a79107a5fd7..02a646dc225e 100644
--- a/dev-python/WSME/WSME-0.9.3.ebuild
+++ b/dev-python/WSME/WSME-0.9.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/XenAPI/Manifest b/dev-python/XenAPI/Manifest
index f009f5c3e0bb..f3dd51a963ba 100644
--- a/dev-python/XenAPI/Manifest
+++ b/dev-python/XenAPI/Manifest
@@ -1,3 +1,3 @@
-DIST XenAPI-1.2.tar.gz 3901 BLAKE2B e87cb08c7a13920b23f33272b32680a13f05c0815c127790e14910c94fe5a55082816a6f13e87f8f84d00803931163637e15386a80ee1715b3b1ea47f5799340 SHA512 24b0fd6591d5bca0ac2b17808afa8c762a3fdefdb44fac41cc223aaa16a58073a4160ecedeef0e1490df18fba8b20e2072b6dc68cbe0f53145351f76d9d1e621
-EBUILD XenAPI-1.2.ebuild 459 BLAKE2B 5328c960b7db435db30f3ea6e736585afc6090af3918d0cc362804c35d616b620c3b6096246fee66fa0e5dd10ca2579bac5f78241f7bcb8906934de9e3e27054 SHA512 0063b1e6fd34c1c5cc8bb38b50c0a06c0882b54caac6b548bc05720aabce8e9310630cd362879f11acd256c35f971e5a377c8e4e86ab2c494c9ecb3d9f45369f
+DIST XenAPI-2.14.tar.gz 5110 BLAKE2B 0391ccfffe8c2a264360eef4057a666e92bcbc8b31e7848f15704fff4d554db9758b1aa0b5210d1bfc41c4df261096b04961a4ff6722a8ea25305971b70f8562 SHA512 a56245b617fa049bcc62ee78e85167e322b632e53d2a6bc3e042e1cb0541ea0004aee4b957f9190c30685cef935f236d980a224322ac593896abd7a31e36abd2
+EBUILD XenAPI-2.14.ebuild 462 BLAKE2B f6578250afd91c805eb164a97313bd903f1374012a33da365d3b8403d3b06d7830ccc0c2bf3c35f6c3ba2f86aef505dc05e5db2157deb18c789a289c0d0d218c SHA512 76cf2181567c4bb8d8191bbc3653e2ec074ef3fff18a7501572435708bc0b6ac8fa870a3787939a1887932fd04fba45f6f782e455cb70c2f5b8aaf27882cf4d6
 MISC metadata.xml 328 BLAKE2B 7c32e9d13e6d6da9055b9880a8eedbbc3beb47a375833dfb6cd655bb2e06b7c07b5e1bdfda6bf4e092f890bc6e487292db005602a16bac30c86a959a3fa5ab00 SHA512 c9cf99e35ff5cb0d55bf111931d907b7773d3d919d7886d10b295ab02f3c32d2d8506050aa14738a9baa226f71e2f493edfff28c83231458131c1493ac3b6398
diff --git a/dev-python/XenAPI/XenAPI-1.2.ebuild b/dev-python/XenAPI/XenAPI-1.2.ebuild
deleted file mode 100644
index 627ce1eb6f10..000000000000
--- a/dev-python/XenAPI/XenAPI-1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Xen API SDK, for communication with Citrix XenServer and Xen Cloud Platform"
-HOMEPAGE="http://community.citrix.com/display/xs/Download+SDKs"
-SRC_URI="mirror://pypi/X/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/XenAPI/XenAPI-2.14.ebuild b/dev-python/XenAPI/XenAPI-2.14.ebuild
new file mode 100644
index 000000000000..f5ff332f6e9a
--- /dev/null
+++ b/dev-python/XenAPI/XenAPI-2.14.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 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="Xen API SDK, for communication with Citrix XenServer and Xen Cloud Platform"
+HOMEPAGE="http://community.citrix.com/display/xs/Download+SDKs"
+SRC_URI="mirror://pypi/X/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/YURL/Manifest b/dev-python/YURL/Manifest
index 2374df877aa9..f4b4534359ea 100644
--- a/dev-python/YURL/Manifest
+++ b/dev-python/YURL/Manifest
@@ -1,3 +1,3 @@
 DIST YURL-0.13.tar.gz 16555 BLAKE2B e48dccea5e0affa59c65682bfaeb4d4eb2504e8f712aa02f428d1767d439ac25bb4edf84515575d5e24a8b655e48ccf4974f761bd36fb4a9797b21b35bd76501 SHA512 4eb6f12b266a8905ec56131fecf6d6c44a18258c3d76df4d2d758a2053065abe3695d7ed627da274e7a5aa30e9e1af49beee1a537b8f22aa8022ca926c78ab0b
 EBUILD YURL-0.13.ebuild 467 BLAKE2B a30906994970a547cc0c3d961ceabc53a14253a5e55247677b119f8004027a2dbb41f2ad4f180569c4e71ee1ea08e4a6df99a5f94a4dd0922f3e241f5b7f564e SHA512 c4a2af6e1d20e82ea0ae91a8aca678714f1bc4c85f13fa221d3c6309176388fccd0b24ddb517eda308a5a7ff0d0bf08344165f00d9e4ba6a94aecde6559c3c10
-MISC metadata.xml 290 BLAKE2B 5bf86da7860b5b2af07381c53d178c0128c962dc40fc890619c5dc5a63fd679bf67e35f5825b0a614a12bbf2976643930d6013c4ba5acd65f009a47050b4af9c SHA512 e1dcf749d70b6344e5575bfbad113d58fc88ddfbfd474c4c5debdbaf920a827765ca6652085c6f99acd9a90254792226356b96f7628aedb0d1be2a807a098511
+MISC metadata.xml 239 BLAKE2B e344b32f5289e9825f8017aa219391618f6b7917833467c804ab10283959b127fb41dd4bc5eabb7c9f38ef866958793604fd935cf4bda3ae229c7f5e8b910862 SHA512 0c8a2241af97764e511ed2b95e1d09781ad0b7ff507f27b8bff8e9a33cecd8de6ceee4ed8b3e0e3327da945011c42ad2c32f2c5a15db13b2a4879009776e638a
diff --git a/dev-python/YURL/metadata.xml b/dev-python/YURL/metadata.xml
index 09fe84a1e843..e2e382769b7e 100644
--- a/dev-python/YURL/metadata.xml
+++ b/dev-python/YURL/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">YURL</remote-id>
   </upstream>
diff --git a/dev-python/aadict/Manifest b/dev-python/aadict/Manifest
index abf78cca19e6..b6374c1656fa 100644
--- a/dev-python/aadict/Manifest
+++ b/dev-python/aadict/Manifest
@@ -1,3 +1,3 @@
 DIST aadict-0.2.3.tar.gz 16511 BLAKE2B ab9450e358fe0339f60f4d6be6445064c67303420e2d4045a21661f8038ad506c8cfe551fef9353404822b1a2824f6eb6461fc783e252ae156f5d76de41c9d3e SHA512 16f3ff59f41d5dd1f9504ed11d660636766758332a0317544253daef9d76f2fdfc654add6346ad809e56e2be51c1f19a645c1047ef01e1e4aee8db24afcab113
-EBUILD aadict-0.2.3.ebuild 737 BLAKE2B 3a51cc8717b2bf8e95d1eadb3a8665febee950be8c23edd0ab6581a57d36aa414b2f6b6c948634d177355b8f2abe1b380bbea5f7f3e83cba54494c576ba93b80 SHA512 d788d97da794bc31aeafbfe3c722001e45bc24ad1a06ef82ec64a6ed1e4711a2275815c9e59bba53f27a0d71f26db5add9951a55771ba8d5654df30183732a3c
+EBUILD aadict-0.2.3.ebuild 728 BLAKE2B 4bbc0c326f80bcc4fbe298f021bd989d1eb9b4f198094a863aee3e3615b0115d941a67c4a5336d4a3c09ec69fdbadd813c37cdf0c9290850f433d5aa71314de8 SHA512 0d2b4846e7ce2d4a273ba4fa68ae691258b5044a4c73f6f2a202eff1441f14d42c32722f71d2a9541bf1cca2f01d9f3ef475754ba329faaaf1b317f67ee1e3c7
 MISC metadata.xml 503 BLAKE2B b917d303ed73f424328952a01daa1302e3dae2876f1e5fea0c0cf6792e2fe0957a873062cd9f7b5e2fa5e27ba56c3d98d06e112e2d20da0508fc6876f5d16933 SHA512 31dd3aecd967835f84c7f6449b1adaf8c8e6cbd2f8513dcb2b0d3193c97b8588f58fd881f27c7b766e072cead538f6327492977d2d03ae54654756b04ab9b5fc
diff --git a/dev-python/aadict/aadict-0.2.3.ebuild b/dev-python/aadict/aadict-0.2.3.ebuild
index 2b91b9ffcd1f..dfa830ab5ab1 100644
--- a/dev-python/aadict/aadict-0.2.3.ebuild
+++ b/dev-python/aadict/aadict-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 8bec05a76f3d..23ff7704ebdf 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,5 +1,5 @@
 DIST absl-py-0.7.1.tar.gz 215669 BLAKE2B 6c7eeea6c21f03a493448dce12bd30b62a34e087b1bf932f10d638190dbeecb79ff40d90698b80bc2a62b6c45d9254f6ff4a789d8e8139b8317516ef2f7b5fea SHA512 19fc41effaeb22f6a4376b9ce32560fa8e3f36b7004e17806ac64fb6775525f3530b36ea8b224d1ccf2f1ee076ed0671039971b061b9185fe37c8f2495110a84
 DIST absl-py-0.8.1.tar.gz 220234 BLAKE2B 5ce5bc83bf456794f1e38a00ac7c52397e262c8d69e35248b008a5f682fdd8d1cfc33fc5313783644a6baa0be7f32660c4eb2b0e72d86259f40abbfbc1eb868b SHA512 84f751dde2bf725e08adfb8bd34e3d43a13bf557d2c2e3b3fc98ec4fca78c8a17a714cd7804cdeae86dbf758c5021d1d92c688df25f7eb83e633c312303efd36
-EBUILD absl-py-0.7.1.ebuild 562 BLAKE2B cd094e19ddc15078c62e8fb7ea12e0a2a8752b70dfeab0814766259a3e4cfd8b6e1dad314535887c2b61de364cc9feca5479f69f5a5492e99cc563e165605975 SHA512 98a587678a6602545e85a6e62d67193293d40eb581be85191f2c46c068f822c842e516fb041385ebf115e56e738d609972f321188f14177a7270864e5344dc89
-EBUILD absl-py-0.8.1.ebuild 564 BLAKE2B a5619872992c9b8d0e45c9bda1667c5510d0139cf381e97c659cca5fdc930d9638a602d11c5c1baa03e9b277d4c922221ae2c7956bdbaacff4ffdeeb0905d2c7 SHA512 a5ce033e8279fc90215ac430d2e186938a653f72e37bb8759a7a6d5ae2b54e9ab995ffc9623661af558b4da908836e46b4724b984a3a7c1136c75a9c96f28237
+EBUILD absl-py-0.7.1.ebuild 560 BLAKE2B e484e5d16b6a5e268c801af9ebaa5efa8fa1ab4a24dd6d04b7a9de0e48bdc5662c7cabe27e394f904903d165e3d239289e35be52cf8dbd264de6c8637ec9d210 SHA512 198467325b9eafab58802c3a8b1797781edc9e4025099893af38d7c2dda7edf0fd8ff12450d75cf631bc767dce9989ba1ea0803af15034c6879d43ac033e5a76
+EBUILD absl-py-0.8.1.ebuild 562 BLAKE2B 2e9d45038b44e1d86627e0cbfc6031c3d5407d4f9d2a2c7c12a46c41ae8f33b7aa23a5e4638f05dd0a2db6a3af543bf13558022e9177bbed51f07465f75ee090 SHA512 7140380db8fce828c5d2782ffad1e767f184fecadce4656af11bf86cc65ea679cf832ba1a05c1b0d74b25b9b1be53207dd6fa5b3327211ba9846478c1080d651
 MISC metadata.xml 507 BLAKE2B 0a25903f7c7a7b2954b7d7e9a6e405cf7191e4c759b5bd34bd5891dbfb1e328e6e3ebd9ed9fb34bced6b807759ee6b2c2b04673608d4b8db4fe63f93c3c19dc3 SHA512 64f94f3f0e4e2d4fca4d98aaa2886172019ae38cff25aa6e73cc8cea8e1d39a765918f93dec489439ef4ccae85e01972dece72f3ba06eeb37b91cd6f928393c2
diff --git a/dev-python/absl-py/absl-py-0.7.1.ebuild b/dev-python/absl-py/absl-py-0.7.1.ebuild
index 5568397250a2..e8aae602ebeb 100644
--- a/dev-python/absl-py/absl-py-0.7.1.ebuild
+++ b/dev-python/absl-py/absl-py-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Abseil Python Common Libraries"
diff --git a/dev-python/absl-py/absl-py-0.8.1.ebuild b/dev-python/absl-py/absl-py-0.8.1.ebuild
index 27a30fd06963..8448a55c1621 100644
--- a/dev-python/absl-py/absl-py-0.8.1.ebuild
+++ b/dev-python/absl-py/absl-py-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Abseil Python Common Libraries"
diff --git a/dev-python/abstract_rendering/Manifest b/dev-python/abstract_rendering/Manifest
index 0df4b9ad4fab..01c54c46cec1 100644
--- a/dev-python/abstract_rendering/Manifest
+++ b/dev-python/abstract_rendering/Manifest
@@ -1,3 +1,3 @@
 DIST abstract_rendering-0.5.1.tar.gz 33753 BLAKE2B 8395568da0cf93a954fc8f4ab9ed259ded5ac58845a33f96fbd36645cc3316692e0c5f55a978212867fe768184baa926ce1d2332abde639283f4b8d1393d3e1e SHA512 6e687bbcbf8017d58667c92f6199e037abfbd2d787167f2ed457dcc174bc99f3bef19e94be67c41937df52d5efa72e605d6649151d8d9b19880895f7f4d4a792
-EBUILD abstract_rendering-0.5.1.ebuild 718 BLAKE2B 26cfaa2166fd367f9778e860069096cdc6ff07c04059a3300ff24a132f9eb670de56f237f3908bd78ac58c446ba895e09b94325968e49079556c9ff8541df653 SHA512 14bd19a5452d2b7406f3d95ab44d34c427822c461443b19e1afdb84a4a718b891556a5f65ff80550bcf981cac4aa8cbed74115187f77ce811463fd6b9b897ec8
+EBUILD abstract_rendering-0.5.1.ebuild 704 BLAKE2B 822b4e50a89abe3c8de3988ee5b6c3e0e29906abb11901d03800eee28ff5748b52803f73e847c8052850743258cb803b2aca12557822c6f43015cd610f610a86 SHA512 14729eac037621a77a0f5ee62373ad5aa2822d349521be190683cd00d587ea2a957d7e06d30617e2674faeb8765d6507f2d0e135d5418eb9f464c826845f0e6c
 MISC metadata.xml 529 BLAKE2B f5b8e2e67f8605cdc3034d3aabd19b7c958a5a674ef37952e8e85ae05e1b981c5af5ee33c3af689f1a92700909b562be025a233b6ee14defee8ee4df4b4e8b33 SHA512 50f3fde9e223c863a61075398545e7816a637f060d3a1b08b1687f92d0a80f1c517d7dd922e2a1c81f399fbc05e4e7ad251874f31d29e8c23091e41cb8d7faed
diff --git a/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild b/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
index e33a71a62828..63f028966636 100644
--- a/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
+++ b/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/addons/Manifest b/dev-python/addons/Manifest
index 77b1d1150ba9..9df9812db939 100644
--- a/dev-python/addons/Manifest
+++ b/dev-python/addons/Manifest
@@ -1,3 +1,3 @@
 DIST addons-0.7.zip 34220 BLAKE2B 06646cfc5e5aa46226a2e341c2cadc0589fd6b4c39e7dc8adfd015d8ce36e17b7ea1d5da7c8460649c36aee0f9afd73d6813a3545468da7d6038c3de97e7df14 SHA512 4847508aebfac56586878e987eafc852bf41abb5734efbd4c0f12480a871e9820449f0c56a2da82060234a36b3b5b359d908283e6d830df56b759dd39661adb4
-EBUILD addons-0.7.ebuild 675 BLAKE2B a869b2831934ef68e414e8661b25a202ced980b1d05be24fded8bf635d1ffe27dcc8cf545b1212310905ebe4a49d2d1a40adbd142d6e7ae770b312edcffb34e9 SHA512 4e392a469137cdd0cff035a0bb6d471a7a536d17b9ee8d37e49fc748e8cad88f999eadfab0971e0f8838a4b0854519ef1ed3ec139a764fe59dd24eb76788931b
+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
index ab68b7df33b2..4009d010a1d3 100644
--- a/dev-python/addons/addons-0.7.ebuild
+++ b/dev-python/addons/addons-0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiocontextvars/Manifest b/dev-python/aiocontextvars/Manifest
new file mode 100644
index 000000000000..0770736b5fb5
--- /dev/null
+++ b/dev-python/aiocontextvars/Manifest
@@ -0,0 +1,3 @@
+DIST aiocontextvars-0.2.2.tar.gz 17329 BLAKE2B 96c77d6222456b84a99454d60aa5f30d8256297f716d729398a07a3d9bcfa4a64fa44d183163c47deccda75d5e761140aecb6d5f5df2865e1c52f9cd6682cce8 SHA512 87de2be27217b664615ebfec2b4bd4da8542913649ce2b4f23357e7d8b07c9776d633f7f781caedc6eb4e261bdd762228486ab69d6b776e40013942e593f19bf
+EBUILD aiocontextvars-0.2.2.ebuild 703 BLAKE2B ab0727d2d5c01161e0bb108b06e9a186d97dfac985fab8a877e283b6e08873d9febf33c8ecfd9031132e6fc6ec46df705dadceb763daab620a3c51e0560ad466 SHA512 0025d4999a6a4b60fd9454d4dbb3e31e24ecae7623dd5e8b01d8aedb08af047fa0677297e6ec9220b8c502384fe184a6eb7d3bb6c784776fa8db1c800fb32cef
+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
new file mode 100644
index 000000000000..51f92d49879d
--- /dev/null
+++ b/dev-python/aiocontextvars/aiocontextvars-0.2.2.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 )
+inherit distutils-r1
+
+DESCRIPTION="Asyncio support for PEP-567 contextvars backport"
+HOMEPAGE="https://github.com/fantix/aiocontextvars"
+SRC_URI="https://github.com/fantix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/contextvars[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|'\''pytest-runner'\'',\?||' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aiocontextvars/metadata.xml b/dev-python/aiocontextvars/metadata.xml
new file mode 100644
index 000000000000..be2393327675
--- /dev/null
+++ b/dev-python/aiocontextvars/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">aiocontextvars</remote-id>
+		<remote-id type="github">fantix/aiocontextvars</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
index 79f0c664b2d1..3ca05be24e74 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,7 +1,3 @@
-DIST aiodns-1.1.1.tar.gz 6084 BLAKE2B 8e58cedcf288f87ca9cc8d5f067bdf182f220979aba3d2aa53eb998ae877dcaa7c2a7419a50719ba150fdf17271d025668b28a3212fc5a819bf13129b4fb25a2 SHA512 4bd8b80a10f84b82b13ba4ff6abbb1afd13ba6cfececc4db7c4bd303569473316f1c0e083f1017a450875fc8994a70c30c9a1b3fb2278fee5e27158973bc3810
-DIST aiodns-1.2.0.tar.gz 6457 BLAKE2B c1035e5a31b179665be1c7c75e3e8f6665e04c43d5f2bada7e0d7ef76f17d99d2d86c2bd5063fbda2d2947c7a4aa1e21e66cef070019da6bf56e94d716edc0ea SHA512 2e80c275d98f54378b121cafe4680221f29eb57346976b3c476c7110fcb215892744982de25736193663ab4ac3f3cf516fa38b664e3303e6c67180ed6c31e21b
 DIST aiodns-2.0.0.tar.gz 5948 BLAKE2B 70944ffbfa3fa1c591c5aab6ce2c4c59564a7665fd2eda1b544616a4481e58464f918081dfb21f74db08ebe4c7e43eebd17e0dc314cf79423835a182a257cd11 SHA512 d80b8f7641234c4d367e4554b10c5a66265e75ee82c58adf2a36f9e369bb1dbf4341dd6459f10540b771de3f102454511ca81eddf3082733e88c09bbdf125fe0
-EBUILD aiodns-1.1.1.ebuild 708 BLAKE2B 11ae61d4a66ea3fb1c940417e21cbdb209d6b40bb3d3831b289ddac551b1d9e0d1aabb7de8ccd4147042532d7589eecf38bce138cf482bcf7217159943256f85 SHA512 fb5abb7d904d927e81af9123cf40f3d2b1c21599ff8342bc9734dca2b214eeb246e2c457ea17dc9ada619feb686198f0dda912236b33e0566c44b3e7adc6df9c
-EBUILD aiodns-1.2.0.ebuild 692 BLAKE2B 978d98048ffc0d239493730dedab4e580dcb411885110597494ad8390e09d9e31ab3b5ab888c32a922dc854bf6dc1321230c5fac8d47db567aa05e40bb4d85df SHA512 6a6f8802e5e0e5778a98ecd5be89a408fd731a4b430603170c09163044da5bdf8b778ad00b3f8e11ea6210edf17d82e29dbcd97b82f5f793eed82249a91df846
-EBUILD aiodns-2.0.0-r1.ebuild 826 BLAKE2B 840cf7184879d8495ec087fddddc68b87d93301ecc4c602a542140eda31479ccac7086f7bb6b0bd5b4617362f27e9dfeb898e90cf83af882a4670432b36888db SHA512 ca0b65a0a60e88da1a29dcfde22c8d241a4b15f560758733838adde9d91155aea1afc19b5d8f538bdd26c1d763f2004526bc4ee3de7246a04f9aff30303d7ea7
+EBUILD aiodns-2.0.0-r1.ebuild 824 BLAKE2B 8c24dd47e423d56d31280a51449297ee0eeb65364b38576a1a488c00e2af5de883c9f55d149ed6d518356174f0077e050c152ab770035e43eb41e46547179940 SHA512 e0c5f9d2ef95a95a8ed7aaabe9a9e73afde37e9a7cc08436ddb46dcd5f597944b3faa3c07d8d4fa946703d63db55d4af03143b88df752cb0d3643171eec9c7c5
 MISC metadata.xml 340 BLAKE2B e607777274ea754605542b7ade5ba3d118ff366ae3bc57f586031450dd54e43189e0e1b3fd8305e351380bda96289e0cd95e074fdebaa7816da757329203775f SHA512 b77ba4eb56072b4801832400361bcc80e73c2f0f1507e9abfd8c9beaa255594554b4a2555e3304307af6c515bea097311c70f515f875a7a98cc197e5cf538ce3
diff --git a/dev-python/aiodns/aiodns-1.1.1.ebuild b/dev-python/aiodns/aiodns-1.1.1.ebuild
deleted file mode 100644
index 52933ca110ba..000000000000
--- a/dev-python/aiodns/aiodns-1.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple DNS resolver for asyncio"
-HOMEPAGE="https://github.com/saghul/aiodns/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-RDEPEND="dev-python/pycares[${PYTHON_USEDEP}]
-	python_targets_python2_7? (
-		dev-python/trollius[python_targets_python2_7]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON:-python}" tests.py || die
-}
diff --git a/dev-python/aiodns/aiodns-1.2.0.ebuild b/dev-python/aiodns/aiodns-1.2.0.ebuild
deleted file mode 100644
index 3f3766200b23..000000000000
--- a/dev-python/aiodns/aiodns-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple DNS resolver for asyncio"
-HOMEPAGE="https://github.com/saghul/aiodns/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-RDEPEND="dev-python/pycares[${PYTHON_USEDEP}]
-$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' -2)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" tests.py -v || die
-}
diff --git a/dev-python/aiodns/aiodns-2.0.0-r1.ebuild b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
index 0799c11f85d1..60100a71a0da 100644
--- a/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
+++ b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aioeventlet/Manifest b/dev-python/aioeventlet/Manifest
index 209d0b1749b8..7953d809dcde 100644
--- a/dev-python/aioeventlet/Manifest
+++ b/dev-python/aioeventlet/Manifest
@@ -1,3 +1,3 @@
 DIST aioeventlet-0.5.1.tar.gz 62371 BLAKE2B f9f6ec222649fab7e69694214af424992f19008572ad9639fdaeb480970ea5dd80a55b454dde07fe1fa87a06560e220128b02f7738a0527b6fec23d559807721 SHA512 b89d99c2ac1f59ed599f01bfaee6b1eb60fc7f3332cb64b7061e67b0c1de15c38b3787100c176995750b7f8debd04bc8651362c6c2d43beff6af35bc15b64204
-EBUILD aioeventlet-0.5.1-r1.ebuild 906 BLAKE2B a162c52866df188f160836a70f99c06660d1f53bf82f118ddf45885d322f26a62a8f0a104715febfeffc9147d4be5e168388068c3a72ee1a45b4d61c1a715144 SHA512 8bd2cb03eeadb7aca5d2c033046acbbce6f7828418f467cb962983dec11d4497015c4851d11c94fc99fe17f755e8e7bd0c3b5d23c1926eab580a04bfe5483b13
+EBUILD aioeventlet-0.5.1-r1.ebuild 892 BLAKE2B bb98f3675ef6739705214d885b3b83cfcb03f485706fb9e21ee353b6988bf113620aea681df840473ed975663e2717fc0fdf8624452d360152ed8ebb6cd1ed15 SHA512 6358087a24cdb70a1373a79d81359ebfd67fa03cd87831392dbba1b295900dbf0a35142c0d403a2d785e634fce59c25768037abbccfea76b20ea7b2010572921
 MISC metadata.xml 711 BLAKE2B f184bd1795c342943118a94ea27e9746d6c35c8dd7aee97d4315259677ba16cb563795704c16ecbf90093a042bde4db7914a8fe0cb7856ec2ba239521458dee5 SHA512 8d3f849a43a211485e664c422ef5cc290c80bbbdf027fa6c5a551ca1848103acc0b2ae81055f274a88f49c38054708036bc92aa44dd5b8684ed3077647ee3738
diff --git a/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild b/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
index a3e6993d9f47..b9e76d0e36f1 100644
--- a/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
+++ b/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 192b916565e4..4d336229d5d9 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-cors-0.6.0.tar.gz 42507 BLAKE2B 7b63916b983d3dc208058c8b04445a30762eebc4999135ae802d1ceeeccc476a335eae66126bb3fd16f938af3649e8b9096433c2df09e82bf4e5d4ba8e38c42c SHA512 75453ebbc074d5f25cc8efc46ffdb76fc90b0a96a9e6fce0eee5a5f28dba31cb50301289cac3b36c70ccdbc10c8f4ba9e362d8e9f350ba7f9dfacd06e6f5e699
 DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b
-EBUILD aiohttp-cors-0.6.0.ebuild 1141 BLAKE2B d3711045c8144774896c2887b195b95622bfde6e676e573e973112b59efefb5f03771587892b754d618803629a0d8409f44fc4e88a3490b381ee6dff071c9539 SHA512 7d250fefd6c5333a3fdad036c31bfd0fbdcf69ebca97b042c1be1b6e6531d3861ee658ff993995a8cab025df6cf92f96dc89181d828a628459d62a21a09a1a02
-EBUILD aiohttp-cors-0.7.0.ebuild 1141 BLAKE2B e0d33b7f67a7967e1900188ab9362834c55b3c4549ef982cbdc8f446ab641ca64e7b9caaa392af661776869f8ee143919632d2c25bcbdd601d1e9a03d6874a4e SHA512 8cf18f64627407b885f41545792d9bbcafd420d6aff309a1837c227e388858cc7bbf22523c73498dd2a693bdaf523b22a436fcf2d9d6ae923f67f5b535c5b0b8
+EBUILD aiohttp-cors-0.6.0.ebuild 1139 BLAKE2B 7b0ab5b7e0a386a0edf0ebe385bbd26cda5a5610e04e28daa57175a4d6730db12c9dd7aca603f20a9bf74080c0faf2a76a141007b5c1db53314c9e4aaebad8b5 SHA512 b5a85cf1b96a2709ce94a2d71e5cb980cadc3b26625ab9758f85a3cd29dbec392a659b3a35744b547573a5315a788d46bf048bf11ccb00844ad1ebdde6fda228
+EBUILD aiohttp-cors-0.7.0.ebuild 1139 BLAKE2B 29d12899e458631773504fe4789d44fa472d5312e56bf2c79bc403125a24dbfdfedb1077f46df3fe1c597e7efe34ea7a478d5c7c082103e9d8e2e665233821f2 SHA512 a4c0599e648c98fb13c1317bb80cd02466ae254254288421f809cc81ca3a88245673e1747c3b0ee2abed215add0732d87c3c6fefa3539348981cfd47dfca8f30
 MISC metadata.xml 253 BLAKE2B 0311910d10e4b501d39c01678bb1e58bed2e6e3252e6c3195d3284cf2e9652081b10a83f045689a56c69a4d318b209bfdac0a63ff6dab2a8fbb0160ac9c7e2e2 SHA512 bf75301ff2098e846a7d6dc9166d1c8b6e77b4f92327e5c5aad0edcde6274e6aa224d89c2c5ed7efc6fb7fcc7258a2a01a24591a43688679c4109f8cc89fd9b1
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
index 6a2b315affe4..771ee65952c0 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild
index eb2e764e7273..f02b23e4590a 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index 359f7742afd3..b9d59380aaf7 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-jinja2-0.15.0.tar.gz 51183 BLAKE2B e19ca813f36ac746a84812ec278a3de43e6e24eaafcf949fd18a32c99f460ded03f4dc97171fe1493174a8e2c51543b8c1afcdec51c4688f4fb0b7781287cc03 SHA512 084714cd2376b93f32cdcebc1971d4aaa704a177524b00f322e0347c15ab8085960a68a3760be056e391410f01b6b637eb59db54fccf54d09ba53a9ea03a01db
-EBUILD aiohttp-jinja2-0.15.0.ebuild 1095 BLAKE2B 1654008c0b370474e940a22f8aa7e86148945b4c3289ffa46502ae1fc89d82c4cd22d5a29d53c1425e7cfc05ee1cada5eed7edb8ab2a1e165a2bb451d3cd6065 SHA512 14bb8f57087b25f1519f734f737e50cb61ab55087aa7dbf577ba1f6fa8e8b09b3ecceea148eb8abc1ccb617157bd0b48828f2553f1344cfab17de39ed898dbbe
+EBUILD aiohttp-jinja2-0.15.0.ebuild 1091 BLAKE2B 1fac850253eb78ef15532ad34d0bc74d3b386ac5d597b20a5237cda1477e46725a0eff6cccec729b254031cd36ada8f7c773cc1d381c3bf63005ff6e9882775a SHA512 519a9c363c2b31407d21ee343c08a5f14aef11db8d0c3e9c363ef8e11ef8c7a98ea0b22709efec1a13262c5efa89573f27a313aa7abbf83aa964c08daa220db7
 MISC metadata.xml 384 BLAKE2B 37044e46bf0ffa1925c6b50e3d2298993ecc3c8f42e18c52bfec22b620dafcabc77cb63f51f98337470f0edeb600c6b96c0b518f012bcfd3147a0f91def9d30f SHA512 fa82c2fd1f793d00baf665208c6321db03f037782c592f84d5efef68c271413ec080cd0322fc308cb4eddbb3e8667b907036eaf4cf8e00a800b9657bd9b366e1
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
index 8d1d06eca111..b3745e314ea0 100644
--- a/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
+++ b/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 2a4f7de550d2..eee932ed20ee 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -2,8 +2,8 @@ DIST aiohttp-2.3.10.tar.gz 848324 BLAKE2B c32a7be3f3d9ba0bd1308c5bea779a10e177b9
 DIST aiohttp-3.5.4.tar.gz 1097647 BLAKE2B 27d3631cf33cc5052deecfeca23f6c052fce344d9a889b0c0c0e68d9dcc19eb56e2ef2496f025c795dea4f906a59ae579ecd489188f8c56bc41255b4f450f4bf SHA512 9bc31457029f7db5bbfe1e213c1f428bf90ac96d83b6d2c8838261a3910ab9f7632a4299618377acb1bed04b0cbb4b4f6d9ee814495c05f210ed9bb4f4c61714
 DIST aiohttp-3.6.0.tar.gz 1110800 BLAKE2B 30c583c5d9079dcc3481b917b51c09e40572228a2df3acab468036f22a75fbb21963805bc37d353c82cc81fddc6da85e9ae9fa6b4a0eb0c305de5428f48a05b2 SHA512 90a0c55b5f20fc7cc14d138fca93206a7b64ac069fbd81c77b5373985236c0c09b44bd167be58129ce2e4f2bdefe59891d6d52938f9fe04c462d4aea6af67d9d
 DIST aiohttp-3.6.1.tar.gz 1113678 BLAKE2B cfdf1c650ec52c7b6423f7afd40060ccd1631a407f126bf64c2a353c51f09c31bae3912b8ce9397c0c8350a2e82a98724ae58335998d1ab08ae46a49abce0251 SHA512 4939b89d45abcd655ef212ff87f66a83882fb12dffb87d62ae57afcd9517725af61f46f9b7428112e2dcd72d3a4027524967461270ede34348ff3ead47d14c9b
-EBUILD aiohttp-2.3.10.ebuild 1716 BLAKE2B a2736bc15b41a4a29bb45ff422b86c30d886fbc80e968bf7b435045addf953bef80e24950e5ab6573e5e84f358f89c59d217e56c717a9e13aa06410f8d5e7a2d SHA512 541325c91470dc74f8f51843c5544efed81ad52bf706a8160f6fb269ae9c594a4c1f86f556b846998667b8996a80dacbc86bad968dbf5824fa81b509f3dc4049
-EBUILD aiohttp-3.5.4.ebuild 2194 BLAKE2B 5d8c82f63b0f6aff4f640da121266e99489073653107f912ac224ea78e5c419af40909994fc8d4fd3e825d0acb4c01eee572b6f7ce77088c7a53f2a988eee4a1 SHA512 35012568426f847ba852b26db64dcd3f6d535692bf897c75b822cc33b5b826a1c526f9f300bc3496b38beef7d940c785b3634704f8137d6a8ea1a2af9ff211d1
-EBUILD aiohttp-3.6.0.ebuild 2196 BLAKE2B 31e48cd677a296f32f3f8249fedf71d288eaddd62a7c46ead50729662c8c201994ad8cc3544decd04968784ef5a7baa86ff1daaf64b7f996367d0f4276b376f2 SHA512 592685e8a6ff8a6da602dc63659f4c37bc522ac5be1c7aa8edb6be96d224f57c41e6ea7dca9c462b5c4662a4a1db342ae5db38b1b6b7ac5d04ca3d7ba05873b1
-EBUILD aiohttp-3.6.1.ebuild 2196 BLAKE2B 4bd4b84395061a80b7b5ea6dfd54c50d6255233a4a436c67c085a9f5ee8fb863cc379f7c1e488025c3c76cba370ab14a556294b0bdfcb4df7f7c8378d5661d9e SHA512 b827e5331c62e8e74f51edcffbde4ff6bbb2af08426f705c2518eda1126020bade731325b156b3eb37bc5034b62faaf300a6a1034533d519142744fa864a4e59
+EBUILD aiohttp-2.3.10.ebuild 1712 BLAKE2B 65f329cb813e9958af70ed0ee63919b4de2010d7193eb3ad0c54715dc3bfb2171b369993a760e0f8c22ace2b14e50c2744fa4f3d89a905278ebcff61f19d8ad8 SHA512 7e76cb30525cb0812d95fd6eed10109b55869135795cc32425b24536f342d77b2ff5b38b44a025c2e0cc3fc92e9a3373571e39f0497a9dcc517af8701d5945e0
+EBUILD aiohttp-3.5.4.ebuild 2192 BLAKE2B 7e62c2a62b0e45e49e4b2437c40be95670a90be49e816a32dc046aedbfd71151baf51e689ae5955d5a2180fd7df6513bd35f64ba93b68a3c6ecf032d3b000eb1 SHA512 86003617b2815dad77ed63aab4082165e9f46754cef36b933f22f14cdcea11010228943d04fa4dde3b3cf45e1ae2a8c1f598c3f67403006cf61854d121e45e97
+EBUILD aiohttp-3.6.0.ebuild 2194 BLAKE2B fcc3ad20d3b02d20ecb758cf966275880784e265e9129999080a03311805dc789b588dbfbfb795a93bddcb66b9645af9a36c5e379699445e442f8ce6b6097e42 SHA512 0c3c32885b999310e2cc3b17b8c1279baa4b86dcf3aa2b92ba01f16f1138cf8c31f32fbbb5968851b62c37a9d32f6d73a26a88e2b942964a45b9c445f3bfa78e
+EBUILD aiohttp-3.6.1.ebuild 2196 BLAKE2B 5f14a1d5513abedf7d34a17860ee63de70ac13b7c3289090b5b2e58892fce40963ea5bd90224632a54e870dc9dda2a689e04dcc608ed7fa203ec53968472f9a6 SHA512 b04406037f412080baa6b2afbc45f8de47d6fc113d8b86c966797c259c9fd4c0083a5ed4381d159f5022dd6adfcffe628d49ad9efbb0a33fe62f8cf10add4801
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-2.3.10.ebuild b/dev-python/aiohttp/aiohttp-2.3.10.ebuild
index 2796bb5f43f3..25932298872a 100644
--- a/dev-python/aiohttp/aiohttp-2.3.10.ebuild
+++ b/dev-python/aiohttp/aiohttp-2.3.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/aiohttp/aiohttp-3.5.4.ebuild b/dev-python/aiohttp/aiohttp-3.5.4.ebuild
index 632b95d6b920..e91c43acad9c 100644
--- a/dev-python/aiohttp/aiohttp-3.5.4.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiohttp/aiohttp-3.6.0.ebuild b/dev-python/aiohttp/aiohttp-3.6.0.ebuild
index 069ceaa89856..1548628acf09 100644
--- a/dev-python/aiohttp/aiohttp-3.6.0.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiohttp/aiohttp-3.6.1.ebuild b/dev-python/aiohttp/aiohttp-3.6.1.ebuild
index 42c6b0667c20..e32ec5c84b2a 100644
--- a/dev-python/aiohttp/aiohttp-3.6.1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index 8e0b98b637ef..4b510901d81f 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -1,5 +1,7 @@
 DIST aiosmtpd-1.0.tar.gz 49930 BLAKE2B 7c8f845746b51e2b77f2ff00de2c88c3a090a4cd65e55fa69fc371f8ac5a2966c31e3e7184188a1b4af1f5c3d22b7af5655c5673d199b9920865ddf56c119a06 SHA512 874b3505dd35cbb176cba058a8816329eb4177db705b10c3883f88d76e3f587efc35543812fd36a03f453c8c1ee359bb3f0239d8a246908c5c17b59be134d933
 DIST aiosmtpd-1.1.tar.gz 50722 BLAKE2B c7d21eea7816a758fb69061c0f1c4c5dbb7bd28a6daddc436211e4d8066380847255af537904ad5c09badb813269d0bc4b54dbb527b7b0c717d498c9475c8c2d SHA512 b61df616f2e14d1da67ac05149543bf48b14a31d44437d9a1dd11b166b98b56220c00e7c55e18d4fd99872d724e23f272922dd3548150632a189d9cb9b652883
-EBUILD aiosmtpd-1.0.ebuild 546 BLAKE2B 5b5f8eb4ead79526c6a6470ca8af7e2f3cefd94da445530a9e82987729805d4a559e7c5ca30bc242b82ba834c52bcd2cf062d18db8caeea4cf1d1de60f98040c SHA512 72219113196a613bdc7667458b705f58a13123226e785be7b3238bdf594699342f5b66c6da024001e01f9bcdd589bc493908a4f6472a256cf8e1d09e3770f355
-EBUILD aiosmtpd-1.1.ebuild 546 BLAKE2B 5b5f8eb4ead79526c6a6470ca8af7e2f3cefd94da445530a9e82987729805d4a559e7c5ca30bc242b82ba834c52bcd2cf062d18db8caeea4cf1d1de60f98040c SHA512 72219113196a613bdc7667458b705f58a13123226e785be7b3238bdf594699342f5b66c6da024001e01f9bcdd589bc493908a4f6472a256cf8e1d09e3770f355
+DIST aiosmtpd-1.2.tar.gz 51457 BLAKE2B c2dba38c5d5a243a65c332cb3b6bf85a124eb6ab9c3526d0ef57788eb7e24e64ec86c56eeaa57e5171631c8a965447f125366741b1d1c54fb48473da5123ed40 SHA512 520b0fae80423d3963d4f17ef393cc0ce9e342fd1237c909159706bfe1e13f27df849fbc14aa1c94ad02e7c9108308984b6f9e21c7dbddb09093ef00884983d8
+EBUILD aiosmtpd-1.0.ebuild 536 BLAKE2B 4ee15e0884cdf25b6532b8834f7e1a96e05a263af1bff8e519d94169115a65da091b8deacf5e5427a470300f183142a668c2288917df722a98665dab8a468d44 SHA512 0a0cc5a125e8527af19f07505e76cd7aac26ec1035ca81c66310698386981fec8507d27b670d993bb756dcfe1f86e9596d5942b74b07b27a6153e7d5b46bda8d
+EBUILD aiosmtpd-1.1.ebuild 536 BLAKE2B 4ee15e0884cdf25b6532b8834f7e1a96e05a263af1bff8e519d94169115a65da091b8deacf5e5427a470300f183142a668c2288917df722a98665dab8a468d44 SHA512 0a0cc5a125e8527af19f07505e76cd7aac26ec1035ca81c66310698386981fec8507d27b670d993bb756dcfe1f86e9596d5942b74b07b27a6153e7d5b46bda8d
+EBUILD aiosmtpd-1.2.ebuild 546 BLAKE2B cd59516a0ae3b2705fba8851f6232f8a5f25abb73d16feb74df1307da81571bd640c17ce4d04ebae8a0f502ca90bc052e1e91c79f9efa876a0fb28f1b2ed07b2 SHA512 3f06522d3567729f0ecaec83587e892ac91e17992422ce5b3613f22b475fd9b1273ad292c9117a022ef206b6a958b4c12201b646ba21031c22cc0e2d8b84bcc2
 MISC metadata.xml 451 BLAKE2B 71e452a1b393808879ead1ea59d7b7a7136a39810533db9a43e1da155724ae75ff4cdfa1019fdec699fc4d4a0b7fe2291af27877a60867a63c300d4b6f089e51 SHA512 15ade72252545bff264b5504ac70210b8f8a1fc9b816b9d00bc1fbcda685efd4f1cdd6dfdd01ec27888b59d7098c0e6f64d4781a8b9ba697f4613775d0b966a1
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
index 505e7d32f174..0c3f352eb1ea 100644
--- a/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
+++ b/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="asyncio based SMTP server"
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.1.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.1.ebuild
index 505e7d32f174..0c3f352eb1ea 100644
--- a/dev-python/aiosmtpd/aiosmtpd-1.1.ebuild
+++ b/dev-python/aiosmtpd/aiosmtpd-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="asyncio based SMTP server"
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.2.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.2.ebuild
new file mode 100644
index 000000000000..c0028357df7d
--- /dev/null
+++ b/dev-python/aiosmtpd/aiosmtpd-1.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="asyncio based SMTP server"
+HOMEPAGE="https://aiosmtpd.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	rm -r examples || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aiotest/Manifest b/dev-python/aiotest/Manifest
index 2f43f28cb224..f522b9ec9262 100644
--- a/dev-python/aiotest/Manifest
+++ b/dev-python/aiotest/Manifest
@@ -1,3 +1,3 @@
 DIST aiotest-0.3.tar.gz 10146 BLAKE2B 730da4dcdf50d0cc6262f8ec07c260981440734b672be6c997dd7f98afa7b71300f0461d5b3ebfc052995327b1f9f9429a1e84658b100dc689f633e8d7db5071 SHA512 6af65e283dfae1ff0f09fb09498f1a5be971daef4907c5079acc1c7ad353f4aa415e03f3fb18d9fac28c54abe35c9db917584082a56b4b43cd80cbf5fa689d59
-EBUILD aiotest-0.3.ebuild 798 BLAKE2B 968a8570c94d20123502aba40a3ba432301b4242f322ad4c9bf633d24c6d172e83ac56381280128bdc06d5e452b72021dea47104125237a2eccfbb4a13dc0298 SHA512 1f40a8b8a93bb578f8a7a3caed3e0376218d8e490ebd2d87a766bcaa0ceb06554b9c0e73d58058bc3590a30653dce8588493a467fa12296b3adcf689b3ac882b
+EBUILD aiotest-0.3.ebuild 788 BLAKE2B 243b931a7e5eb8d85815c3272bf2c1b0fd746d0b181dd38dd36810c8a4213eba1a8624495e5e69c7048923b853dffda91de25fd261af2be1a43049822145c1a6 SHA512 227f2f861dd175c708f68093bf18e86b4a1d6f655d29ab354553468f9fc88cb6082e6fe78c0ade767d406a431ef19d7e4df3da28c3689a3ccc329b829c90a09c
 MISC metadata.xml 344 BLAKE2B c1f17b0db31bed7998b4d75c436520f05722062eb60f64df7fbb3b9d75d324d77f7e6f96cd3dcf2baabd6a0c9e11219b87c13f354f0e04239032dd3796ee7bc6 SHA512 da7c8a88e3043b5148eed4f1de62acd094f7e0f791cbb7d9707a97ba5fc85a1833c9754ab3beac904ccfca500b20196999b1381a8f5bdafb5375f2c9b7689819
diff --git a/dev-python/aiotest/aiotest-0.3.ebuild b/dev-python/aiotest/aiotest-0.3.ebuild
index 60c70aa897ca..f17915b2cd3a 100644
--- a/dev-python/aiotest/aiotest-0.3.ebuild
+++ b/dev-python/aiotest/aiotest-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Test suite for an implementation of asyncio (PEP 3156)"
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index 6a6e17684953..04e7792a9b82 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,7 +1,9 @@
 DIST alabaster-0.7.10.tar.gz 10486 BLAKE2B fa4e08cc06a22830e7ad1a5cc5e2ead40d919158d200af2d7259c478d1999329ccd798594b1ee3302d5610a972438e771cd83c82544f0f1783bac345643737a9 SHA512 e2391079360e050e532f878619e70a120f141a3e84d1e213e508e4be25ff2ac704717fe8398dfaf016dfb6dd3ad1105a67e1d5438737f45064f7602a5ce5fda8
 DIST alabaster-0.7.11.tar.gz 10998 BLAKE2B 93975fcb93cac425d6db903f89c862041dd4817a1a411adb2b8d0e9af754be6f1a9649934b183678290debd71722146a547ced7407a9da10741d88a806d5bec2 SHA512 3b3762cc9f0a04296d07bdadeb7e77ae007e307bfad81d8ddfa8e883dcf7577bf544957b3664ec4cc354749fa249627071474466dc771c5883c75571c86d8f3b
+DIST alabaster-0.7.12.tar.gz 11242 BLAKE2B 5690d9c0b8aabfc2c95c4279183d174d6a5768f89732028f7ec6eb790531499a2017b9f3b9896442e298f3189f79070178b3e281b6d0bcfad3741625caa99c48 SHA512 e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac
 DIST alabaster-0.7.9.tar.gz 10485 BLAKE2B c3a22dd8b813f2dc717a1fb24d252db949f6336cb5b785603f933d4cf32236f9bdff117118d85ca3f6995e761e8d2689feb2c69be516ab681dc664323da43605 SHA512 b1286c4d5d17d172baaacbc40ba6a435d433f0880e31416c37ac88df8787bf522f1c28b6903fe92c88414f54286734508860eab86ff7f12da72315bf9ae0e6c8
-EBUILD alabaster-0.7.10.ebuild 532 BLAKE2B 9421933657591620dcc4926adc358490eb8cf5c447c973fc28eb1734b7fdfddf32151b69d645b6e86e46aeb7f12f02bdbea49959e2650a9ea5af736113e72a82 SHA512 50fe7d64f9edfa5d7a89b5effac52ca0c33c872ddb5fcdb2db57bf8c47abe56efafdb4894809c2b8df741e9aa648e759a03b8193c3861ef8b5addd5b8ff1fe95
-EBUILD alabaster-0.7.11.ebuild 526 BLAKE2B 9d7ffeeb7f14cd06be380e55a9caa09e2bcee0bf097db75a5fea0058dbfae44ca497e6a89333b5ce9f286c11e870e40aa554b4db91bd90518c69bac81dbc0e64 SHA512 c6b5ab8c071c96edd3e2e182de55c79fae28ab2e842f857d78ee65a443463ca551103660053e0da40479f67ea5b7ff542134ea2b3edf26698d381b4cd7ecb845
-EBUILD alabaster-0.7.9.ebuild 508 BLAKE2B b6af6d5631bd3427cbada4bed6f39b216cfba0854e038321eb2ff1d1f695a712c42a485b435c4ef736bd55d5b734590c01d4f4451de1342d74e7621f4221dc1b SHA512 0154b11c3df291810dc7c09d8c1954c32f4d91695875acce07b80f711267c218ccd95474d5947ddf4aed7184750c9aa0831af1d122c75d53e678f664bd489057
+EBUILD alabaster-0.7.10.ebuild 523 BLAKE2B 0f4dcb1f1e50af16cd04c10f30ca4a1db8120a5d4ede84cdca496e14b9f4d1a65e65a13de55d4a2631d5442e7df15dd04707470a98c192d2f509e452dd95532f SHA512 ebb8573c4cb633af69a9d737aa888c35992c045cafc90e5f390fa9a0954a32741e25fbad51bf4834eb610b2a1217e0c9d90ba0dbf9a86cee11a6655f9f12bbaf
+EBUILD alabaster-0.7.11.ebuild 518 BLAKE2B 5300e07b2078cc392b42212a3e5e7a238742928d680348d741ab6388f5e08ec4f5963d1d610dd13909ed69077907cc562a513304d78788e081011cb299dbbed8 SHA512 16a5a6a46bee7021e89c940ec0c9b4137c17fb231c3c5e736766a950eeeb7e8c75391cb5402eab843f2aff4aae90d46c9cb6660bdd84c3539384634e9805daca
+EBUILD alabaster-0.7.12.ebuild 512 BLAKE2B aa86bf402fb191c08cee6509fd589f897ded4b961c74e34aed81c7200716d08021501f56ea5de8883bb7ccddfc171d9857bf2ee9d91e94df708026b94497b057 SHA512 d1342036a31b19e581c3a23c7361890e68ceacfcce2a3288386580925740447b9304aef9c6f8578bb3b1cec8b715646147ca11ad5ee8406232338a6820cc07e9
+EBUILD alabaster-0.7.9.ebuild 499 BLAKE2B 4d064c8f28229713732beaf166df08666c9712bf9fc7283318847586e6c7ca39fca0fdaf2e38e51067ee5b6565dc3e7b48409f3fbe2db081a43e9fc7fb405849 SHA512 d71b99414c19689bc07115c172ab3d6ed43c2a0a5213fefef2251a3cc43d45d3d15d01cd78eda910396337f5423cbcd557e4e20a8cc82b4e2b5cb1af68b96d9f
 MISC metadata.xml 384 BLAKE2B 55991f34f966ecaa57dfd6474f3ffc0d25b04b106c3a45c6d5fbb88457598b7ea93ef5edbb84af23fcfd1ff4b6314c6c56397a5a52da64e3fde3ce1f40587d6b SHA512 7464f7780562e6a8aff5a243e0a87e08740b06210a25c83ec82649974b0b50aabcab46f6c35b5e568b898ae8a4d10087961ae8953785f4dab33b62cf782e4657
diff --git a/dev-python/alabaster/alabaster-0.7.10.ebuild b/dev-python/alabaster/alabaster-0.7.10.ebuild
index bafd1ed3fd80..ba97d04e34aa 100644
--- a/dev-python/alabaster/alabaster-0.7.10.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/alabaster/alabaster-0.7.11.ebuild b/dev-python/alabaster/alabaster-0.7.11.ebuild
index eef51ea73718..60618c2c97ab 100644
--- a/dev-python/alabaster/alabaster-0.7.11.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-solaris"
 SLOT="0"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
new file mode 100644
index 000000000000..4a75a0efc162
--- /dev/null
+++ b/dev-python/alabaster/alabaster-0.7.12.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
+HOMEPAGE="https://github.com/bitprophet/alabaster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-solaris"
+SLOT="0"
diff --git a/dev-python/alabaster/alabaster-0.7.9.ebuild b/dev-python/alabaster/alabaster-0.7.9.ebuild
index a4c5b60cabef..dc18358c865c 100644
--- a/dev-python/alabaster/alabaster-0.7.9.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/alagitpull/Manifest b/dev-python/alagitpull/Manifest
index 503ac45ae71e..b06b9a11e78f 100644
--- a/dev-python/alagitpull/Manifest
+++ b/dev-python/alagitpull/Manifest
@@ -1,3 +1,3 @@
 DIST alagitpull-0.0.23.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
-EBUILD alagitpull-0.0.23.ebuild 556 BLAKE2B 381b1aee6bc750234f4e51833c72e772eda6baebdb65d6156d7fd7237085620b43e225208dddb1990ac4c5b11bd94e1ef711e1268c8fe336103faf03a64f8fd0 SHA512 d30d6e40f0d204b5a6c53eccf82f2f28766d5320bf43276d067823353b9c8d9867951c62a1b02eb9086f1ad2e68512705db364c054425998e3f13a862e6fa459
+EBUILD alagitpull-0.0.23.ebuild 539 BLAKE2B 42bf8cd9f37e6289116afa629302e64c8d7f6a67a2b2128845b2dc26de88b1c5f194f14ca77826ef86022f3c0cd4ccb76e8abad709d203fbd69150a0aed0d950 SHA512 005bafba9830010f7add06e4dbbe2c6f52872fae8f262a196b9fb8fad82afbb0fe31d299f6e19999848aa0d4d7b8acc36b3b5fe71b8c6f2a4ee2c7b5c0149b85
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/alagitpull/alagitpull-0.0.23.ebuild b/dev-python/alagitpull/alagitpull-0.0.23.ebuild
index c60405b24eb4..8c700d4f059f 100644
--- a/dev-python/alagitpull/alagitpull-0.0.23.ebuild
+++ b/dev-python/alagitpull/alagitpull-0.0.23.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aldryn-boilerplates/Manifest b/dev-python/aldryn-boilerplates/Manifest
index b24d4271c25a..59399c8d35c4 100644
--- a/dev-python/aldryn-boilerplates/Manifest
+++ b/dev-python/aldryn-boilerplates/Manifest
@@ -1,3 +1,3 @@
 DIST aldryn-boilerplates-0.7.5.tar.gz 8550 BLAKE2B 11be4c7bce5fde173ba553995a41ae597b9c396892c88320ffce64da5299506683f31a96175f214dc20361b83e1c9f4b37f2b283e7d843604a8aaadfe37c2dca SHA512 63aabe996bb89433bfd649890c0bfddd39d7a65efe4e6a5d1141caad2a87df8b0078c72a48d2fec02794d976cf92804fc5ddc549b31ad83184c93f8d24e0c936
 EBUILD aldryn-boilerplates-0.7.5.ebuild 618 BLAKE2B 7cc449bb2c22e5c494d67a4da1c2430057dbf5dfb626bd7e1c37a84754fc81891bf14c11496302e7b6224078c3577f11998000207b9a994ac09e627eddbe2bb3 SHA512 958831f2f357507f27e371e94339490f3a1d9afb355439ba6cfdb40ec0b574c769736ed79b4ede0caa88c18a6712eef14b1e19aba4595df09287130ec7d86994
-MISC metadata.xml 305 BLAKE2B a88fa01e4ecaf9d847825347715d3f61722948b77bd71fed5b6e57cf972e959bf9cfba16df26ffb370c4081592464fbd9f3022541cf839d5915abc7ce8704595 SHA512 56fdc7c1e64e04f49c0f7050ad39da0648f8e54281a3cb95f054b44909122c7a1fc01691f8c63cff3ed3b661bfe726780682cc6328afdfa0de225a63435071db
+MISC metadata.xml 254 BLAKE2B 4a61e0cce74e3bb62268b545faa16fca60f30a7edf81bb41f23dd6c4db17da23b63e2145162b8ca402087e4b1bdbd07610c01e67c6e19178aeb1ef08950e5f79 SHA512 164c0aa149539308315815690a804353b48f57c1066b5024aab69460712e0909628165ed048ed81bbe4cee6f179b4d999eb3cf28d7960e1765f6eabc841147df
diff --git a/dev-python/aldryn-boilerplates/metadata.xml b/dev-python/aldryn-boilerplates/metadata.xml
index ade9e83b4ba6..55e7e1cbbb40 100644
--- a/dev-python/aldryn-boilerplates/metadata.xml
+++ b/dev-python/aldryn-boilerplates/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">aldryn-boilerplates</remote-id>
   </upstream>
diff --git a/dev-python/aldryn-common/Manifest b/dev-python/aldryn-common/Manifest
index 60e315468b32..dd1ab5e16694 100644
--- a/dev-python/aldryn-common/Manifest
+++ b/dev-python/aldryn-common/Manifest
@@ -1,3 +1,3 @@
 DIST aldryn-common-1.0.4.tar.gz 13789 BLAKE2B 1b24bef79caca8b93badf54263d3c35991bcbc95a588a572047b31b02421168dbdd40e852f4252f6ac7aa12f88692f83b9529e7da94a1eda620dbee27c74496e SHA512 6c95cd0ec4ab19e2802fbb5d40a1644eb5c87c0aeae40eed5645cdedb3bde130201067b8c116d86bb68e24a3c6b4c321d7a7d99f3a312493b4c9d2fb4c3eddbb
 EBUILD aldryn-common-1.0.4.ebuild 710 BLAKE2B 62b7718f2060ab84e6a7d429cf212316f4c8a09110b1198d0220d9450904e3ed14319901ec797f1623583fe2ec1973987d9d36e05f1f67f2fde43b27eb7d2b40 SHA512 2db901635d562f391490f0767200ce75743e00a4e6db6ec78ec50ad7c6c7d73ad6c63af757698df517d0b55419bd1b4ad5491f3545e63e0b20981e725daa1df4
-MISC metadata.xml 299 BLAKE2B 456186ee8f7e9215258e373fa99e7147229fefbdabb8eb89a63a5a6191a13c7a0997eecfe28c085e946c7cbecdc4f54b567701302445bda419723fb8b055c3e3 SHA512 94bfd8d44bf7f1b62155b6324ce5fff9e7028096bb9247667db80363594f5d487f8a7fde211866d8225b045066cda01a33e4daf91c77214388737617cee3ced2
+MISC metadata.xml 248 BLAKE2B 40d2448a2149cb029c3f5fc389792c92a978e8c1a9e4f410aac4ae8c21e708063e4c8a98766e7770afb354b0000259498debd7aa122ccb86b71e7c8bfd62caec SHA512 dd31153d683122724800bb3baf7893a1064eabefda3d85b22ce073f26c9093b58ad85cec79e2f5b3e75fac76c3b815f6b0cd13152dc1a9d425489a29f7af73d5
diff --git a/dev-python/aldryn-common/metadata.xml b/dev-python/aldryn-common/metadata.xml
index 66ca2240eece..b4b8c0bfa3c1 100644
--- a/dev-python/aldryn-common/metadata.xml
+++ b/dev-python/aldryn-common/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">aldryn-common</remote-id>
   </upstream>
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 470c40cab96a..d516431501ad 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -2,8 +2,8 @@ DIST alembic-0.9.3.tar.gz 991744 BLAKE2B 2d18836fee1bd9a57cdc1b8f6159b9c1dc79b82
 DIST alembic-0.9.5.tar.gz 990808 BLAKE2B a8155d15a9de2acb7a2f01829a0d01eeae5a7981a72aaa95e0d9d53433f52d0695d7e5414dbded1e5d53253a5e2d1cef67b12ed6be58d901859f3eae137486c1 SHA512 7588a681a6cf50a58ad697cb879d465d259880a473647d598242609c6321a8be7f53fc0d9a24fe976c4c65750eb0acc1a8e60253d4ccda33c87319ac9985e8b8
 DIST alembic-0.9.7.tar.gz 1003312 BLAKE2B 2c8c2c14bede5f1997f8822ae6400718fa8302cef55020ef84975965295ccfa20885d48274a24e0c5dab72ec1611884d29d4bec422da8a93241aa280cda47dc3 SHA512 102592f7a25033af197fadc260dbb5ee4ad7038feb015fe5672de83c42f6125b659873071b339cccf5eebcf390c16651f6b9064f225198f88b42d58796fb1ca3
 DIST alembic-1.0.8.tar.gz 1030713 BLAKE2B 67cb80ed064e99f27e41a7ae2e42231794c177f96b95e2c3409a0ebc26e5323665147b2721efcc4a4d8ee2a71ada76408187f39ff5ad3745de64ed31f87d2895 SHA512 7a2ab63c6a823a32f45cd8ff5b763671806a8fa3d2b31e09c2051bdf92784fdafea1e3be217d84885d92eaf550e223ef77fd6fd387d35a5882d60ebcf042d835
-EBUILD alembic-0.9.3.ebuild 1416 BLAKE2B ec20d714cd89f38cec44f49f7e76ee3cba63d210bbb0f4c53686032ba29bbf3c4324726d770988941be39989eaa20ab0e7ae8da39377e52362246a41269bed75 SHA512 f80f7aa9633072490da179a7f5ab4564f4eabf5a848157a427bf173ddde278927b494b499db93c26995f760a7be45b9f970a8c1362f5db864c2cbdd199fb38ec
-EBUILD alembic-0.9.5.ebuild 1418 BLAKE2B 805fbc7c397f3a1d9f2a0c8632a7ae28ea415e5e601754b39d5407f4e9f1696e74e9615440d0c820737caa0c0e71123bcfb40827b10ac8c628a774594b560167 SHA512 b70e31960c250c327218bab3b2ac47a36f55b5108e72be8e6c139fcb7e83c00d0809f9699feecd55f8bff1339327808579b38a00c4af2ff97c692d9e08f14377
-EBUILD alembic-0.9.7.ebuild 1416 BLAKE2B ec20d714cd89f38cec44f49f7e76ee3cba63d210bbb0f4c53686032ba29bbf3c4324726d770988941be39989eaa20ab0e7ae8da39377e52362246a41269bed75 SHA512 f80f7aa9633072490da179a7f5ab4564f4eabf5a848157a427bf173ddde278927b494b499db93c26995f760a7be45b9f970a8c1362f5db864c2cbdd199fb38ec
-EBUILD alembic-1.0.8.ebuild 1420 BLAKE2B be373fe99110e03a0f5a57139f2b853737213bb687f1461fa2d478d507a2d14d2513883aa9ad3bd9338172a7541386f2e4280d9d5a4c061670b065f5f3fd5b83 SHA512 7d429d5ae06b9c3412cd9c7bfa074febd7c7506bfba3411b13d28419c85f594ebf459917325458101e8d943f9296ad22d4218f75ed30850f39afd260ab81fecb
+EBUILD alembic-0.9.3.ebuild 1412 BLAKE2B a4494d17a825ada0aa2815c205d4f683e4a3aa21978fc5608ba185f4904a24ce21cbc39528b904f0b9eb0abceeff05b8588870eb5407ed454fe9b7a78ad295e3 SHA512 684c92495ca630f2c94c9fce75c107afde213ba41392388382089e0249ab43b1a54cdf8b0ce8ff7964f53c8635794f485f456d4cc5b5371f2b4b3f1c6ce11ad9
+EBUILD alembic-0.9.5.ebuild 1414 BLAKE2B a58cc7c02951a9e5d8b65d929b7516c170741a73627ef4a84e4ab76c0f2798609953bad0588c2bacb78abbbe652b9b8a4b312b4822fc91b1bf193b27d08d4880 SHA512 41a6222f7d582dab1d6cd3971fc3def548ea1bdd8af057f6e22017a4029bb61299461aa80e435ef8aa162d3e529e5a6e385e9e6bc8367fd93eb3139a462104fb
+EBUILD alembic-0.9.7.ebuild 1412 BLAKE2B a4494d17a825ada0aa2815c205d4f683e4a3aa21978fc5608ba185f4904a24ce21cbc39528b904f0b9eb0abceeff05b8588870eb5407ed454fe9b7a78ad295e3 SHA512 684c92495ca630f2c94c9fce75c107afde213ba41392388382089e0249ab43b1a54cdf8b0ce8ff7964f53c8635794f485f456d4cc5b5371f2b4b3f1c6ce11ad9
+EBUILD alembic-1.0.8.ebuild 1416 BLAKE2B 5e2e4399105ea098ee6ac225254ae746a59476fac625b5de04138123ca9823725585b8d6a8de63f5dc683a2e9017fe6a73aaad7597fa86e0d6115de65caed6f9 SHA512 60c7a8d1b696a78bf0c3ccd2e980874fa1f1ab5964b09e2d18829708cd227f6d9f39c5bae85788ce30b1409ed332ba0329fba579f3a35857cc574f2244307eeb
 MISC metadata.xml 379 BLAKE2B 8fcdef99cd9d57757692cf72b6f43bf874b7657899197d754ad81866f77d0a48d0fdaf168eeb37ad29ec975ddd7533be90f1e9926de9faf1bb56c3ad4e1d7513 SHA512 809c3f1585e85726feefc7f8493ec83ee31a9f7aa99aacf82026742f278726ad960a63b40c701a1a2453d46fd64d8245b83f2bd7511b5cc077c44bc62dda3e83
diff --git a/dev-python/alembic/alembic-0.9.3.ebuild b/dev-python/alembic/alembic-0.9.3.ebuild
index 4a7100974ff0..9e712293a04d 100644
--- a/dev-python/alembic/alembic-0.9.3.ebuild
+++ b/dev-python/alembic/alembic-0.9.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/alembic/alembic-0.9.5.ebuild b/dev-python/alembic/alembic-0.9.5.ebuild
index c2c8eb428d17..0a9e59f88b3a 100644
--- a/dev-python/alembic/alembic-0.9.5.ebuild
+++ b/dev-python/alembic/alembic-0.9.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/alembic/alembic-0.9.7.ebuild b/dev-python/alembic/alembic-0.9.7.ebuild
index 4a7100974ff0..9e712293a04d 100644
--- a/dev-python/alembic/alembic-0.9.7.ebuild
+++ b/dev-python/alembic/alembic-0.9.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/alembic/alembic-1.0.8.ebuild b/dev-python/alembic/alembic-1.0.8.ebuild
index ae07cdf79c27..b165007b945e 100644
--- a/dev-python/alembic/alembic-1.0.8.ebuild
+++ b/dev-python/alembic/alembic-1.0.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/algopy/Manifest b/dev-python/algopy/Manifest
index 732c5279391d..376359355a24 100644
--- a/dev-python/algopy/Manifest
+++ b/dev-python/algopy/Manifest
@@ -1,4 +1,4 @@
 AUX algopy-0.5.3-fix-test-cast-ufunc.patch 1216 BLAKE2B 400a6f13fc9e9d426e35af04c1e57c812916ce73973f5f474c27b62a212e3e5fefdbba628d5280c1b9bc8af45667c1b42186ac0ecccd32f49deab2ee11d6f8f4 SHA512 760f2d9ccba579079992b59a8334a1606ac8481c7164637640916418d7ffa1fb989b81dcf1445c205b832f476ef883f1f0f18cb540909526e8b1a05e6c897442
 DIST algopy-0.5.3.tar.gz 149560 BLAKE2B 8fdb5e5c00aa161bbc2a03c584d644e36d2843bbd3d1e090b0a89ef52db9a122561f050aa7676f9fecdf78485963fa3712b3f2698e52fed90d9077ab4395838e SHA512 43b3cd4f17fa821fc61898534f595202097cd56d57133a1d13e23743c794166a0f8877947cc6eae6d2ac2fd7400e2a6527ee8229ec1b26ea660ac9c01cd22912
-EBUILD algopy-0.5.3.ebuild 750 BLAKE2B 10f60465f60760143e0b85e546340a49d6d9323ef77f82c565101d071f3ff89516fa016edf29cdec85f9ed8e99e81b4ed9b25a154862cb45411c0ff7fcb556a7 SHA512 c99919f1f2f0abb4b9992e41056ec0a77de518b2e25b8db4476b07050d34c4245f656faf0adb578a625a61f7ef8c583bac1c6efd9e62841643b28ecf6c5b8426
+EBUILD algopy-0.5.3.ebuild 746 BLAKE2B 78af6bbe90d0b4717417dec106f014e4cfd4d5b4c802f548103505d574cdf248a4b19ca607883dd43620330e237c407fd01058605f3abb4572ab7721c52b6e5f SHA512 202a0bcecbcbbcf4d93b0a27fba49ecab9c0d0b7e070cdb11053a241e4d5fb31533796c8aa5e9a15de4235527c02d19cee084dc284d5c879196af8158c33d66d
 MISC metadata.xml 319 BLAKE2B 467b55a1297cc848051e0e3d9a6d8fd6a4df43c639f3b79fbd3ce31247fe3082c208282256dc070b0ffb0e0721ec868c97bf56c43c8910a554eb29506820b1bb SHA512 032311a0f7e860ef5e890c30458a03beaebb7911d412642208e1bf60f26088e981ef99bce52a637048512eacb3460e740a7d969d5c83ad42e64cb0c584151477
diff --git a/dev-python/algopy/algopy-0.5.3.ebuild b/dev-python/algopy/algopy-0.5.3.ebuild
index b720b3a8e675..819d381dbcc0 100644
--- a/dev-python/algopy/algopy-0.5.3.ebuild
+++ b/dev-python/algopy/algopy-0.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/amodem/Manifest b/dev-python/amodem/Manifest
index 8b28ccea6c2a..2db8cedc626c 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -2,8 +2,8 @@ DIST amodem-1.13.1.tar.gz 28643 BLAKE2B cef1d0c405e3ce666876cf1bc8ea2277bce928cc
 DIST amodem-1.13.tar.gz 20171 BLAKE2B 03ce5e6d36a90024e3ca83853fffe5742d6d41fa065adee1083f00ceeef96be791ca8605e739bdde432216e281198dc740666160615c1e1009940129f53bf45d SHA512 daf1d86fd201153da46e5b0f31d07c0fdea2dc55aa3136d72de894e6ae6c9ddb753d4cd8227b5e3ac44a6803aff00c3299045ebd620b95d1ee8fb4945e7958b4
 DIST amodem-1.14.0.tar.gz 28647 BLAKE2B e2f8a3a0c73d5cc306087aaee5b827cf5401e3c1730fbc3708e177ef804b993355f8fb28daa69ffdd2e832e5caf918e5ff102f9d86f82386a1a17dc02a97c446 SHA512 c135c80811fac6fb86b7de31d797bf96c5e455d805537cac34b8012162236d679a2b39b3821aa9797c8f45b77ac983cbdf8d2227b6556413632552894a4176dc
 DIST amodem-1.15.0.tar.gz 28779 BLAKE2B abc2afbce47cf5e3b2ae34bd54228618e887b3f0b919d421114ce5e56e3e8a14477f130f03d77851c1e256afb22d4b657367c8e59954438dec72f3059278de64 SHA512 5d39e08d47410a55c218ed2dc5a413cbbba602fe1049d3e8824ca62b439d029c42294b2a17e4077b2c746336b1471a4a94ffa19b9eb3145869dfc158404bcad8
-EBUILD amodem-1.13.1.ebuild 461 BLAKE2B da675b19ee0d7136042c0e46ef05540de7af76a35e1aa9a5296cb87c205a8dce9be47c9344d6e5f2ec7584b1489a2a93ad8e4ae5be38493a8fff7e4437297e4a SHA512 fd518f142ffa92ad08901b8d29d1799d0e5152187ba3fe798c7e1b66ec1a848149de91a6415348833abd03a002dfdfe3e16bf362ce02c4e6c91b0c58bed52f23
-EBUILD amodem-1.13.ebuild 469 BLAKE2B 910246499d13099c29fffbbb5b70a48d011f9538c05ac58df8a1328472525c0ee1f7b28adf22ddb039b11cdaa4203fec5dda51fe06d1d5ec65b08d64306af834 SHA512 1932ceaefa9f99baf59a3195bf0cdb688cb72452a4a4757fcfb387ac2d8c1bf24ddf1aa951ea003662146bfe9e60399aadc9d6a67302c6197a27f325cce5c0b2
-EBUILD amodem-1.14.0.ebuild 461 BLAKE2B da675b19ee0d7136042c0e46ef05540de7af76a35e1aa9a5296cb87c205a8dce9be47c9344d6e5f2ec7584b1489a2a93ad8e4ae5be38493a8fff7e4437297e4a SHA512 fd518f142ffa92ad08901b8d29d1799d0e5152187ba3fe798c7e1b66ec1a848149de91a6415348833abd03a002dfdfe3e16bf362ce02c4e6c91b0c58bed52f23
-EBUILD amodem-1.15.0.ebuild 461 BLAKE2B da675b19ee0d7136042c0e46ef05540de7af76a35e1aa9a5296cb87c205a8dce9be47c9344d6e5f2ec7584b1489a2a93ad8e4ae5be38493a8fff7e4437297e4a SHA512 fd518f142ffa92ad08901b8d29d1799d0e5152187ba3fe798c7e1b66ec1a848149de91a6415348833abd03a002dfdfe3e16bf362ce02c4e6c91b0c58bed52f23
-MISC metadata.xml 633 BLAKE2B 6d2f1f3fd08688a970ef0a51f587374a2222e8c131cedcd79c93dfd77b174d2e489d51b911e8aba587a79d7cff83d9d1c8a0591cd01222520868eac9c2b10640 SHA512 f08c5cfb56bc47822c398189e67ce9cfac32564a715eb1e802c467fbde9e893566bada4fca093e5d99c2dd991cefb940b7e7f6ba3e904b2642a8f8a9c5398bf2
+EBUILD amodem-1.13.1.ebuild 446 BLAKE2B 2ab6154da631c158c329491386f7facd65116ed1f408e3b4b2bc0ac55e6358381427006a68d1ec2214c556b52e53f288a91495f62db95f30109aa788a870b7c2 SHA512 e30e00c50d3a0499a69818918ecf199a79f561a6c64220872f74e9160358f4eb776a77574ded33b1e7c2475805f3a7f8100957b358eb3aefe440414e31ba2734
+EBUILD amodem-1.13.ebuild 454 BLAKE2B bec1ec23875c536e02d475adf23b89e8b8e1f2ba08c2db5a4d47f7e0e7893510eeeafb771a1dcf86fb3f90e9787b273176a9d80bc0092faf354d593e7c3191cc SHA512 65fb767a67e95964d2ac36dbe44b9abeec7284bf0b908de14a0af3a508b399f1705f3a35aa530a75c75db4f70ec8d42071879ad1474e690aa84c9fa5f74386e9
+EBUILD amodem-1.14.0.ebuild 446 BLAKE2B 2ab6154da631c158c329491386f7facd65116ed1f408e3b4b2bc0ac55e6358381427006a68d1ec2214c556b52e53f288a91495f62db95f30109aa788a870b7c2 SHA512 e30e00c50d3a0499a69818918ecf199a79f561a6c64220872f74e9160358f4eb776a77574ded33b1e7c2475805f3a7f8100957b358eb3aefe440414e31ba2734
+EBUILD amodem-1.15.0.ebuild 446 BLAKE2B 2ab6154da631c158c329491386f7facd65116ed1f408e3b4b2bc0ac55e6358381427006a68d1ec2214c556b52e53f288a91495f62db95f30109aa788a870b7c2 SHA512 e30e00c50d3a0499a69818918ecf199a79f561a6c64220872f74e9160358f4eb776a77574ded33b1e7c2475805f3a7f8100957b358eb3aefe440414e31ba2734
+MISC metadata.xml 514 BLAKE2B a9a520e6446c6d3713bd0e56d69d19f2ff0731dae551184279ade5591b300446f4fb2b4db14f495fbca2bb3fa126de168e6c0d8d27fdd8ac3737b15c7472b997 SHA512 6544f7a44ad78931b88b85d7046dfc03967076efc5ff5395c44a84cd7a649adb1bce38221fb7d86c4569cfb912ae4fb0ddf031f27109fbc8ff60e187f4eb4a83
diff --git a/dev-python/amodem/amodem-1.13.1.ebuild b/dev-python/amodem/amodem-1.13.1.ebuild
index bd4ee7afb969..99aa9b456180 100644
--- a/dev-python/amodem/amodem-1.13.1.ebuild
+++ b/dev-python/amodem/amodem-1.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/amodem/amodem-1.13.ebuild b/dev-python/amodem/amodem-1.13.ebuild
index 23eb20d20f7e..835ca0c8176e 100644
--- a/dev-python/amodem/amodem-1.13.ebuild
+++ b/dev-python/amodem/amodem-1.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/amodem/amodem-1.14.0.ebuild b/dev-python/amodem/amodem-1.14.0.ebuild
index bd4ee7afb969..99aa9b456180 100644
--- a/dev-python/amodem/amodem-1.14.0.ebuild
+++ b/dev-python/amodem/amodem-1.14.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/amodem/amodem-1.15.0.ebuild b/dev-python/amodem/amodem-1.15.0.ebuild
index bd4ee7afb969..99aa9b456180 100644
--- a/dev-python/amodem/amodem-1.15.0.ebuild
+++ b/dev-python/amodem/amodem-1.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/amodem/metadata.xml b/dev-python/amodem/metadata.xml
index 119339804385..142f79bfc21a 100644
--- a/dev-python/amodem/metadata.xml
+++ b/dev-python/amodem/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="person">
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
diff --git a/dev-python/amqplib/Manifest b/dev-python/amqplib/Manifest
index e0517e714879..88710399fdce 100644
--- a/dev-python/amqplib/Manifest
+++ b/dev-python/amqplib/Manifest
@@ -1,5 +1,5 @@
 AUX amqplib-0.6.1_disable_socket_tests.patch 652 BLAKE2B 7bb62c50f025c6b5223da2a83e68eba5b1659917f625658ad4ba1ffada8ed452348cc4db59d634d49d7b1c00e69e186abd3cf282631d008285b4df27c1dc9e48 SHA512 9808f03c281a1384c2753441355fc563663579c178e59a65140146ca670e2e90a2a486eec1760dfdf5dd0f91f522cb427094c758bac04c6f0f06b9e9c7ea2434
 AUX amqplib-1.0.2-unicode_tests_py3.patch 1943 BLAKE2B 995cc28ebd9dfd6762fbbefcf9bcc5c62bf50f78f446ffc95892c0531316a2f1db0c4a0ae5409083450a452f3ef785be4c42935f68f4e2b193a54c63d1f44f03 SHA512 8f7f0896593d5fc166de14116e6e67924e41332ae7cedf83501697fa64b847f9f6decd5bb9c6a3af6921607c0ec62b972be74f961a9e616de60d50a01f8ed482
 DIST amqplib-1.0.2.tgz 58544 BLAKE2B fed0cc178042467ae4e73d197dd1f2819725236274aa5951d67f7277825b851425712c96b5b1fd95010e47310746bc5b903f8858777f8999a9d310b675d60a11 SHA512 6c8c9fd7fd68fd6a1eb944962094e57f89525bc78dd002dc0dadd491b262293367a86569dfc52f0701723b4327b7c290150dc2e69e3ac1a28613578d9e0d0710
-EBUILD amqplib-1.0.2-r1.ebuild 887 BLAKE2B e270bd64f6448e91f8b1a825223671ba7113751356b45f0d8d6a784b7057082513cafa582edcd96cdc819e911e8b0bc6e3155b2ebc19070c731bb25d64b7b122 SHA512 d87e93dd6345b24ca442a456472b5ab19b8955df70d8191b82ff979cdfca5b6a085fe6fcd3a1d1002f21752ad0f9ce6fab17cdbac4409e027b8df8a5bc0742e9
+EBUILD amqplib-1.0.2-r1.ebuild 878 BLAKE2B 32ce315141c9351704970a0f4cfbacdc7ffbfb94acf3bd2f44b1e9783ba94ba2f0b6dab3473150cb9cc1ae065682993ffe8f581af0bded1146718b8974dc22b4 SHA512 b4ae395ebbd31b6c09d946ed943e8f6fd4512173a4df39880682c0c0e621a35d91a7ec5f5042b848816e5d8f51462ff759f2bb2e698ed52c73cc498203fce6c8
 MISC metadata.xml 485 BLAKE2B fca427e3d8c4fc624fcb356fc94bdbbf89ad5ace792bb91a47248503f340e3426f1cb524c94ed1c0dd0514561a42a04fa4d89d37783400c9cca214d240883c8d SHA512 95c41cbe50f47f275c9e746bc7a7a90ecc63d17f02d7f94dd0eec0cc58de3ef8083a5f96cde53dd284e4ca0c218789b36766d798ba63ad0064838e308431e3ac
diff --git a/dev-python/amqplib/amqplib-1.0.2-r1.ebuild b/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
index bbd4303436da..b47216fad439 100644
--- a/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
+++ b/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index c4e1d18628d2..2a9b5aa834e1 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -3,8 +3,8 @@ DIST aniso8601-1.3.0.tar.gz 57730 BLAKE2B 7844add7f785371f69a8a473c0706edb76f994
 DIST aniso8601-3.0.0.tar.gz 69371 BLAKE2B 7dabeb013df414db6ade982595cb95514eb408855641ac2a6552f4ab1e646d478c2435a2b1537149fcbcffa076a913b45b644163585377cf98036d898ed1154c SHA512 bea2b9dad8f8ac2c5314570ce49846ef0cdf6459019065b5529966fbaf20a79d76b7af5a93f5bb8e1d811d3355a217877ae90d295529f3e9a7b2b20e6465b1c7
 DIST aniso8601-3.0.2.tar.gz 69520 BLAKE2B 84cc774b72b04055fb7fe79456fa8c47b7ca3b2406dbbee5022912bf13bbe3663fc67ea663ba4654d27362df5bba6b9ce811ca89fc919fae9c0f5732087c43d4 SHA512 c367a9f783fc5e18bd761ce501ee7331cfd2b3f209578f90a16817ef47a16c45ea7ddc0ece648bcf91cc9e249f8f01b8d63fd1fd4bfa585bf2d959a4a12a3d6f
 DIST aniso8601-4.0.1.tar.gz 109849 BLAKE2B 487bf340e181997219c2e39ed887161c3f5daa336cee79ce947b55a11c463b439086c3985fc93184de550f5e34e03f2d855ccb9a3072c0dc16ac21bf02a7e78f SHA512 5638ebf82a1a1aceee866eb17e8e4b5c8023961a9e31ce3e12123b89dba0ea0924e10a6aa458c838fcfdb72b94af4e81b3e9e8805cb534a1eccaf5a51f2026c9
-EBUILD aniso8601-1.3.0.ebuild 636 BLAKE2B f26b96fa02248e06350b481cc8f36bc9ed398a7d2a81a819c652bc0d4790d608bc22c2c36a5a0e4662a1bb98b1a9df83c58c871a290e5fc34bd16ca09b039aac SHA512 59734fd2f6abf46884ccec622649f6ec91e30492bc8d54cc8fd762044fb40b03ccfc7b4fd46ef95146748686fc6db4526d33553e8618c5ebcdd28f67182dfc80
-EBUILD aniso8601-3.0.0.ebuild 638 BLAKE2B d818e0be6b76199b594762b89fa94a4cfe92ddde507912a43e96287e3c1df44ad9e11700c0420b3dc1b06d2e0b598b016a230437534550aab1da1f2c7ae5a2e1 SHA512 55e34703a5f6a0f1ff8828cf69a92f2a87173ff8004d0d417dee5f02bfcc630816a92bdf9c6c3af06f0c013b62ece6125d95a20ae9092353f1e65174a1a69973
-EBUILD aniso8601-3.0.2.ebuild 645 BLAKE2B 3c64f6a091ba41496b4adf0ecc78f1ef2055a72c8bcafe943b492f1a665437ea74802dab704d0140f8eb5158869d7f0dee3af9af7280ce0cbeeb854cb2c041ba SHA512 1f1f1bea0bc91ee56221dbdeea2da1fddf9224ee8ef2224c7ba0fc93866add7fc1ca7d5d765116461e72fad04dae242a699ca1e1b86e74c69e733ccb9b91cd26
-EBUILD aniso8601-4.0.1.ebuild 818 BLAKE2B 8bd75935c2d3cf125686e8112195c7dd2f5e74157c1347aa65507d538df2ebac3bfadda0a6ff688a897acd2f7ea1cf8e954c75de7753a10bcf4c0aeb0547b233 SHA512 230f9319bfca9cd28e19efbc7b7db3d1c01d89e118c05e1b6062b27e1d2e652142c6581fe6a8f9bfb0dd95e73d3631f532e842a2a0074cbd99717e2846598ec7
+EBUILD aniso8601-1.3.0.ebuild 627 BLAKE2B 9e59d0bdb3870022bcebb5b5bc68e9cd13fc11dadfcac6d21e836029a88e67f39e78c9a1559ed0ea297b6a5fa90daaf145b822b16340bdf4bccffee267e68063 SHA512 066e43199cc000cf76942147b99373cfc0d8a9938359bfba9af68e71870452aec126dbfa1966a32d82f740b9e9b08c47f0faea03ea5d136bc1b3895afe4482af
+EBUILD aniso8601-3.0.0.ebuild 629 BLAKE2B 19503be7b929b2826de10b4545304b89412f31fbd20d697917e65e4dad26055ade02e4dbc8ecc2905ed44635872fd40a51340e65754f6cab4b02941827bb0454 SHA512 89a516d6b5500e7068859b879c1276f031b448010831b162b0aaefbecb487b52177934dbdca377d078fbab91779d5f92803359da1357b57b6124d9fdb11968aa
+EBUILD aniso8601-3.0.2.ebuild 636 BLAKE2B 9161a8a45e28e0f3591ca6eede2bdff6dc36620802d8e20c36ad26bf4c9a513e86765d7d3d2d48f50f1b88614b1224dccad0084efea0a112fb0bfb73c48a5a27 SHA512 573f73e3f9e3d9e28af969650524d5a4227880d3ac09f17e768e9fee22d3a95fd32c55c56935022cdb10cc826ef9e600e2765eefa15c60c1a60d3b68410f6350
+EBUILD aniso8601-4.0.1.ebuild 811 BLAKE2B 22356def5066eabee740dfdcf4cad67459fde9ddc23c8d8adafcc45a4d01cff02a4f69d7143f2d903857e7bc2195c0552f937fdcb2c1f92bdc82da47b9866dd0 SHA512 e78b778c740836609e8b0a3091eee7a8290314554e5c2bdb3338a146e17db2c392193e6f3309f996bfda5e627a393c64f69825479e18134daf650229e109bb67
 MISC metadata.xml 385 BLAKE2B 665a2f5886166953707e75ee9f5bc225154157431ae9a9b6bb7cbcb8103150753a848ff184100c73177f40f6c5b11f1ccb4d0037504d67513810cd6dac8a1f34 SHA512 43b38fe6bef338dd41825197e7d3d0bfd3f040ce52073a6db93592f1b49bea4141a58ecc55e71b742c498a62000a2666c456b08d15bf25888858dce310e38121
diff --git a/dev-python/aniso8601/aniso8601-1.3.0.ebuild b/dev-python/aniso8601/aniso8601-1.3.0.ebuild
index 46b44e77b554..b7ddea2ddc0f 100644
--- a/dev-python/aniso8601/aniso8601-1.3.0.ebuild
+++ b/dev-python/aniso8601/aniso8601-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aniso8601/aniso8601-3.0.0.ebuild b/dev-python/aniso8601/aniso8601-3.0.0.ebuild
index 317ee41aaf89..a04ddfef77f4 100644
--- a/dev-python/aniso8601/aniso8601-3.0.0.ebuild
+++ b/dev-python/aniso8601/aniso8601-3.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aniso8601/aniso8601-3.0.2.ebuild b/dev-python/aniso8601/aniso8601-3.0.2.ebuild
index 8ad9667d014f..35c08d46190f 100644
--- a/dev-python/aniso8601/aniso8601-3.0.2.ebuild
+++ b/dev-python/aniso8601/aniso8601-3.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aniso8601/aniso8601-4.0.1.ebuild b/dev-python/aniso8601/aniso8601-4.0.1.ebuild
index 6a3cc8fa7454..bfa2cb8ec8c9 100644
--- a/dev-python/aniso8601/aniso8601-4.0.1.ebuild
+++ b/dev-python/aniso8601/aniso8601-4.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ansi/Manifest b/dev-python/ansi/Manifest
index a1fc1cebfb65..d8bb8064c6c3 100644
--- a/dev-python/ansi/Manifest
+++ b/dev-python/ansi/Manifest
@@ -1,3 +1,3 @@
 DIST ansi-0.1.3.tar.gz 4561 BLAKE2B 33f1bb49dac19879a1e98dc75706e1963a11665a31c80161a6ff9580b5e2c0ec50de7e168860cde647488c67d2bb5bfd1418b9f4637c9db2f3d68d1b49bcfb47 SHA512 824ba1a9125af8fc23f402ab4de26c82250dad7be0080e0050585ad955337801393792c01ed3affa8a25551fa07b3caaedecde1889401293d415249e70a72705
-EBUILD ansi-0.1.3.ebuild 459 BLAKE2B e861e3a7f46e163615fefe41ccaf9a6bfa94fd3bad91176b2995598e19924e0e49c5a0c48deb3cbbeeb644bc06f22ec506e64746fff7e39b26814b4d817bfd00 SHA512 9a305ab520ba8ee3e76d0ae25f22e4bd08278d9edf3965a23839514f3575103bee045e5aed888268d885dc028bf0ac395e426f49c7696a821e565f060b329e0e
+EBUILD ansi-0.1.3.ebuild 452 BLAKE2B c52fc7bd4309b545be9eaa16887f513e4a84133f598b9ee308fd334ce7152fdd4c4575b239eb2f09845b30a120d4bcfd01723d2b42fffb0824a1e9260b281058 SHA512 1556576affd4171ff6f19d69be7e4ad15303cf94b928b8b3553d8caeb763e16a2f3e80743fa4553fc34ac2d770aee8c467afca93ff70645cfb8bc5677d1aa081
 MISC metadata.xml 366 BLAKE2B bb092fb0749c188b5367ff6c352e7614fcd4761d81063f7ed4c07958e6fe2752e88e0dcdb93f48cc58a0e35b8aa2f5ba280ca082767c303118f956d7c5ed5c46 SHA512 4fdd976a6c082c245474c4c5d4809b9b17ad90fc237b2ea08cd3fd3022ae3e3a0a92b8f27b53429ae8f1a1bf964ea1af65523f9f43128a40e296d6714b1b4711
diff --git a/dev-python/ansi/ansi-0.1.3.ebuild b/dev-python/ansi/ansi-0.1.3.ebuild
index e1e76f207625..640bd0e16757 100644
--- a/dev-python/ansi/ansi-0.1.3.ebuild
+++ b/dev-python/ansi/ansi-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index 6628b89336cb..9123fd9888f7 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,13 +1,7 @@
-DIST ansi2html-1.1.1.tar.gz 46591 BLAKE2B e2eb3d9b2665fd495ee8591a3cbfebcd1d565edec9f8ec6840bed8303bbc094e71b9371f496f5f479da9d61937fb2e4ac4deb485631c2576bed33bfee731fba5 SHA512 5f08e6e3e89797f23759da7aac8cbd17e86ffcac37af8db8c345423c69744d88a1517cb0f17dc9c366b509b972484d25877cce8c7466a7a463eea24af17133de
-DIST ansi2html-1.2.0.tar.gz 46748 BLAKE2B c5ea7d35640f93562f6098a46dbeff9248e25b6210bfa5e71265d529599eea7713581ef986faa5afefb445492fe09d2170d164a63b2a602c57a79f2c72cbe118 SHA512 3106488da19cd093d7ae2a7499a66baf77877f47da0e497791cea2a63079c184f1d36743e78116b3faf08ab145ca97b5774151114b9ca193020578c8a3bdc860
-DIST ansi2html-1.3.0.tar.gz 35989 BLAKE2B b2f949e2c559b2da91d3095b4d8ac2091bd15aad46b178a01aa59d4c900917e733f6ab3884d9c4c7c46bfa530936339d9b105a0471a09eb7a01693c43e8a87dd SHA512 73d1b3431e22146c4fe18fef4b05413231d79d627c396d67528d0aa1ab07a7ef4bcfeff56829b85d9fe9ad508599b782318911f7b10d6b9a1bc98780e31389d7
 DIST ansi2html-1.4.2.tar.gz 25485 BLAKE2B 93f3bbd307b916c9ca60379235600606dbe16f1b6e423d0d2615f7825e92a6d7a8469ae7d60cf5131b4c3431897b3161bfcd2a0327525a332bcd6a6980dad5c9 SHA512 29c569839788968ba5a1fed8dddd4cc92f40ca88b4135b597815012ea44a44e8b7a3c2259d2d5d5f3cc690400be882236b88c0764a649da5679431501aab0b1c
 DIST ansi2html-1.5.1.tar.gz 27133 BLAKE2B 8a8017b8f4edb878b105138ec0dfe3fbde8647315382d763eeae7f90f094b60f0cb7205718c75930ccb7ca1183e40e5205eca6f8362e20445d930d92db23bc22 SHA512 367fa9721de65a6e14118d65de9ea8ede1ecc9f0809115ecccf481947aa442409ca972442e51a75bc4f14913566255142da4e411fe060dfda5e55f84a7ac67af
 DIST ansi2html-1.5.2.tar.gz 27124 BLAKE2B 0d02e8cea46622c4d2cbd06f06fd31b3c7e93d61f6b9eadb37815d2ee490b6ce4233fb019f175f61465ef89520a944bbe14543627a6421a64304b58dc038c0ca SHA512 163d5784d04e6eea0847676b967051382fa74a354c19462d1b73980fd1b0a7eb45ce1f1bd88cca803356e7767ccab1bbce6de4152c98aec98534f4ed7d65a83f
-EBUILD ansi2html-1.1.1.ebuild 967 BLAKE2B 06d285a51945f8a56a000aae79eaf81f303adc267e32db059a8a3a1d352a18d3baa50a30a256d0b57e0665860cc79112886247648daf091af859c0a663f27947 SHA512 ce581b9865167ba59beb1ba574d8c544bec11a0ddb551aadf9f7084b2e9bc104d543b201c7ada6b5a5e5803a66dc2653265bcefc0a9fb3b9e3180e6085320299
-EBUILD ansi2html-1.2.0.ebuild 967 BLAKE2B 06d285a51945f8a56a000aae79eaf81f303adc267e32db059a8a3a1d352a18d3baa50a30a256d0b57e0665860cc79112886247648daf091af859c0a663f27947 SHA512 ce581b9865167ba59beb1ba574d8c544bec11a0ddb551aadf9f7084b2e9bc104d543b201c7ada6b5a5e5803a66dc2653265bcefc0a9fb3b9e3180e6085320299
-EBUILD ansi2html-1.3.0.ebuild 1084 BLAKE2B e61851240d8103dfca9fefd7d41140167d3b5031aeeede9c580245ecdb2211284dbd1c507883d467df42e097a41a456a99609e9a627922d030dc73ff7260e119 SHA512 90ccc58d0cfa374e1c0785619e64d500657df7dfd82f7e731a9e2d0d9f7e62ee9eb7a2da01e53db2feb9d582f378daf29ebefaf92a2a86671bc79be405895cab
-EBUILD ansi2html-1.4.2.ebuild 1085 BLAKE2B a6cac97e0fe240f7c689d7e6a45f66354ac98bcd4c319db10d2d637e9356d4489bab3557879aeea60cf954979ab27723c556fcb142a6543493ae6c4ddecea31d SHA512 017645ffc29f08bdb38744aa8b09df3292b37a3980beb9c0cf949465621839e5d56b7e11c924eccf94d92d2ef8a6e413989e7e0c923dd58752ba89b3f5127d77
-EBUILD ansi2html-1.5.1.ebuild 1004 BLAKE2B 982403a1041b62351d469754c633a9651ffba652d69e6a7f73b7bda5b125dd6d190e7bc5edd6ca17946e148176f9b12afb3520031da71b751974a964bdeec664 SHA512 ce7088c8c2eb0f25044740975e1177d6a5031b71a6af001b0515b936046752775560ee654659e8d6888ffcd5a2fe26f59084b799f900254a1dddfea0d84078fe
-EBUILD ansi2html-1.5.2.ebuild 1004 BLAKE2B 982403a1041b62351d469754c633a9651ffba652d69e6a7f73b7bda5b125dd6d190e7bc5edd6ca17946e148176f9b12afb3520031da71b751974a964bdeec664 SHA512 ce7088c8c2eb0f25044740975e1177d6a5031b71a6af001b0515b936046752775560ee654659e8d6888ffcd5a2fe26f59084b799f900254a1dddfea0d84078fe
+EBUILD ansi2html-1.4.2.ebuild 1066 BLAKE2B 0e71b307386f6928ef498ca889c8803235c1dbd092053f321fc611a493fc9e2f55bfa8dfedde8981af62a72cc48a170ca27bb3345e436265a159276db6d18a11 SHA512 ba831fd35d3c9ffaaa47b4fad1cee0af8b379f56b36bc72436484ae3a29c308b20ea725015b53a2394dac2187f84b0c2ac455cd36b3a3d69af77875a9d619e4b
+EBUILD ansi2html-1.5.1.ebuild 987 BLAKE2B 2641a40d02aef09e41111e4c793329aa555d407e2915523f4c2c75c6ed1633af945c06bce317fd999e4c5e79994caa50ded9004a8828b13b6e037383e627fc13 SHA512 9a176beeb026954a50ebce6a919bf0234b3a49105f6263d69259434728ebf4f3af8932b03f9d8d14e1d82998ebdb0fc8ef1d9e8944fd7b46b695a2dcb9c5c53b
+EBUILD ansi2html-1.5.2.ebuild 987 BLAKE2B 2641a40d02aef09e41111e4c793329aa555d407e2915523f4c2c75c6ed1633af945c06bce317fd999e4c5e79994caa50ded9004a8828b13b6e037383e627fc13 SHA512 9a176beeb026954a50ebce6a919bf0234b3a49105f6263d69259434728ebf4f3af8932b03f9d8d14e1d82998ebdb0fc8ef1d9e8944fd7b46b695a2dcb9c5c53b
 MISC metadata.xml 392 BLAKE2B 13621595cc083a069522c51b4e29b362f7217698c194d5247d73a3acdaca7ca8b13a3afb0e9b0671785ce246219d44bd8511c5ef243111d43067b138635f5963 SHA512 a17684f5bd76762a832cba99a1edcd2b2ebb1abdd27f36528fb4d2ded639b6223f60495c6dd2ee548826f3a2e177238318c02962d2300ace37eaa881e76cf095
diff --git a/dev-python/ansi2html/ansi2html-1.1.1.ebuild b/dev-python/ansi2html/ansi2html-1.1.1.ebuild
deleted file mode 100644
index 614d26f6a637..000000000000
--- a/dev-python/ansi2html/ansi2html-1.1.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-
-# They miserably fail.
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-
-python_test() {
-	chmod -x "${S}"/tests/* || die
-	esetup.py check
-	esetup.py test
-}
-
-python_install_all() {
-	doman man/"${PN}.1"
-	DOCS=(  README.rst man/"${PN}".1.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ansi2html/ansi2html-1.2.0.ebuild b/dev-python/ansi2html/ansi2html-1.2.0.ebuild
deleted file mode 100644
index 614d26f6a637..000000000000
--- a/dev-python/ansi2html/ansi2html-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-
-# They miserably fail.
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-
-python_test() {
-	chmod -x "${S}"/tests/* || die
-	esetup.py check
-	esetup.py test
-}
-
-python_install_all() {
-	doman man/"${PN}.1"
-	DOCS=(  README.rst man/"${PN}".1.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ansi2html/ansi2html-1.3.0.ebuild b/dev-python/ansi2html/ansi2html-1.3.0.ebuild
deleted file mode 100644
index c867b966fd3a..000000000000
--- a/dev-python/ansi2html/ansi2html-1.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc test"
-
-# They miserably fail.
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
-DEPEND="
-	doc? ( app-text/asciidoc )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-
-src_compile() {
-	use doc && emake man/${PN}.1
-	distutils-r1_src_compile
-}
-
-python_test() {
-	chmod -x "${S}"/tests/* || die
-	esetup.py check
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && doman man/${PN}.1
-	DOCS=( README.rst man/${PN}.1.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ansi2html/ansi2html-1.4.2.ebuild b/dev-python/ansi2html/ansi2html-1.4.2.ebuild
index c9debaeefef2..cb0d0a34a328 100644
--- a/dev-python/ansi2html/ansi2html-1.4.2.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ansi2html/ansi2html-1.5.1.ebuild b/dev-python/ansi2html/ansi2html-1.5.1.ebuild
index d890b5f02357..cf6d3e97e080 100644
--- a/dev-python/ansi2html/ansi2html-1.5.1.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ansi2html/ansi2html-1.5.2.ebuild b/dev-python/ansi2html/ansi2html-1.5.2.ebuild
index d890b5f02357..cf6d3e97e080 100644
--- a/dev-python/ansi2html/ansi2html-1.5.2.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ansicolor/Manifest b/dev-python/ansicolor/Manifest
index ce651ee29a21..c68fc7c944a9 100644
--- a/dev-python/ansicolor/Manifest
+++ b/dev-python/ansicolor/Manifest
@@ -1,4 +1,4 @@
 DIST ansicolor-0.2.6.tar.gz 6224 BLAKE2B 38ffd0e9a88c886ebad25c4f0072f2f8f833e028c3bc14eb89252c1c0b501f973c9b3e371b4c605a3b98df33eb7203a963797d3ee56cf87b0afb927b19096fd5 SHA512 44c7dc6f621fc3044d4a52acb96e7e497578e025090633bfc8cbf686d7461da018f64502b477a6090e60747481f320cebaad00ee0776c9f4c52d4abbb1812121
-EBUILD ansicolor-0.2.6.ebuild 528 BLAKE2B 30c09c0b8174b5296e91b746da5e85a583ca836a905fab7a6e7588f0fe8613ea25b48e1b10ef6c0c5bf4ae5dd461a7b44381da00902dda50be3b29a87f95d273 SHA512 400189c7204091b835ec04aeb7affb7b1485ead2ba20f99b16284ea5c94bbc955bfe69fe6bf4271a3eec0f3bb835e33afe81b6af13928554647e9ab11f606938
-EBUILD ansicolor-9999.ebuild 664 BLAKE2B 750432f7ee407686ed0f3d356c562510651ef78d66e69fac0c0bc79357542324e2ba6ebb0d32d11c663b05084d15fa7af95c439c645d2b1dabe093186c3cd53a SHA512 4a7097b95c8650fc9039bddca5d31a78d4019c0d9894f40d0be52d642196b422e207da2def69974b70f35f988c89cbf406a3a050408504f83c856937f329c22c
+EBUILD ansicolor-0.2.6.ebuild 519 BLAKE2B eac359028c7d33ff539aa2da26d7ab26962b89d21467d4832cd0f5d59a430172c6a4b14793664ebc42dfe521bdb4d0b59691efeb48dadb2c6ab3c49bd762a910 SHA512 0191d819adccc6fc570e58b1dced7f861767ab61a3d60c5192e1073fed3c980cac0b4cb2efaffcb049dde673b13e43ef48587c6ad2381bc70a4fdc0f8d940a49
+EBUILD ansicolor-9999.ebuild 655 BLAKE2B 70f5f845b839b32cfb19fbb44b7cf08d265b269f0986ca179b5cd616a850f5a94fea0b3342224d8d9f5f3266180b4bbd39c0fe7d027752b61832312b3f03657d SHA512 6becc8b119e4a04c07c2d9b95f823effba528f2d3ac339caa77845c63cbf5b855a0a0ee5a355349e23da9fce157540818a54ac251d6ae955f1f5ebe323b23c88
 MISC metadata.xml 298 BLAKE2B 4ca5c54a9b47e20ee8ed4520c011034049088aaa0bcb1ae7d37eb590c3f3b3d8296e71958dcb1b6342f69cb4e8edb443823bce0381f97cf80544bbe66473c122 SHA512 debf13987936d64adf35fcc48d08f306f13d2d719afb478e8c78a89eec873c17a0323a6cc7ce473c67077c5ec9ed97e8983dedd63e986e74702166c592d4a193
diff --git a/dev-python/ansicolor/ansicolor-0.2.6.ebuild b/dev-python/ansicolor/ansicolor-0.2.6.ebuild
index 7379b7c5e259..7ef5812453e6 100644
--- a/dev-python/ansicolor/ansicolor-0.2.6.ebuild
+++ b/dev-python/ansicolor/ansicolor-0.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ansicolor/ansicolor-9999.ebuild b/dev-python/ansicolor/ansicolor-9999.ebuild
index 0a193bca2140..43e3b92c5f6f 100644
--- a/dev-python/ansicolor/ansicolor-9999.ebuild
+++ b/dev-python/ansicolor/ansicolor-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/ansimarkup/Manifest b/dev-python/ansimarkup/Manifest
index 8eebe6847557..a3f5d40c6d01 100644
--- a/dev-python/ansimarkup/Manifest
+++ b/dev-python/ansimarkup/Manifest
@@ -1,3 +1,3 @@
 DIST ansimarkup-1.4.0.tar.gz 12533 BLAKE2B b43b1dd0d8fb950866a313b7f8bb0fe44f983aae1c8e5cbca95aad7b77ff7563e04e019622a3531228a891c6c8c16bc8d9ddbb55e9d418d8055f3eda41ce0866 SHA512 c397201f7789cbdec0d4e32ac5a4e1f130deb329535303538b48136381e7217ed7e80fe4eb586c6e2a30dc9848813c7d43bb01c0a2a6a4a29e14842bf4540c4e
-EBUILD ansimarkup-1.4.0.ebuild 745 BLAKE2B 0423b4626a2d6140e0caca4b9dd4e627c5b2d6085078894539dd342767b80ed953d7398d20aff1665d2a637c2ceb78ae83da5cd2e0db9dff38d45b5356994dc9 SHA512 b5e15f0f46e39ff516c4369ee75b156994c123c862532fcac81703777b9fcd1d8f3151ffc4c7e36375d5e8b1fbc8af20b7d496f0d54e5638a6dd70d9b3c75b7e
+EBUILD ansimarkup-1.4.0.ebuild 733 BLAKE2B 1ffbf342966e729765a79f0f641b5001b923977e8f6111311e656e44d7939dd575beb0cfb8ddb3feeac92e675515a7745397158555b98e5e2becb53ca6601632 SHA512 2412130cc1802cb399a8638f72d6461875cc7d96fc0ca395402ab5320338e9011940ae23980d9283a6b95c8bd910357c568a206d252ee858cf7735252401a936
 MISC metadata.xml 493 BLAKE2B e57eaec5f0bda792267ee5cce190f2b1f7f1017bf5e28e28051f947143cfb9f9173311e57e9f6d490f3a59908bf0af11378f394f4c8edf2cc78466758753db57 SHA512 3c9c292a3e84dfa535eb062e3f71b0d3a8b374dae7810129473abc3f801937c2e09b489ac2f0fc66103ed4da110df661570ab8f0d9f8857f938d97d443af6793
diff --git a/dev-python/ansimarkup/ansimarkup-1.4.0.ebuild b/dev-python/ansimarkup/ansimarkup-1.4.0.ebuild
index 05bb5d0b182d..9227457dd041 100644
--- a/dev-python/ansimarkup/ansimarkup-1.4.0.ebuild
+++ b/dev-python/ansimarkup/ansimarkup-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="XML-like markup for producing colored terminal text"
diff --git a/dev-python/anyjson/Manifest b/dev-python/anyjson/Manifest
index 2b3d3e29088b..cf972e54bdd5 100644
--- a/dev-python/anyjson/Manifest
+++ b/dev-python/anyjson/Manifest
@@ -1,3 +1,3 @@
 DIST anyjson-0.3.3.tar.gz 8332 BLAKE2B 196596b832bddf7969fa9f77f7b78e37bf7fbc93dacb2790615555072b1b504b70d43e50bd968969abe92b6503b79d392f344b72b663fc3be700a0e4053c278f SHA512 9e70df3cb8bfe2348fdb0eb03cf3c33ca5a1171aca6467787fc28c161354b5ebe89b2f73badfa00708774d6825799860493ddcac7f5da8cc9c251b92b5a343bc
-EBUILD anyjson-0.3.3-r1.ebuild 968 BLAKE2B 3b481393f6e3be11b18b354a2841ada2f82a8f37829fa0a244ea6e1f65e1925a73dfaf5026771959bd2d90f81f37ff9b7b948db126f3e6fe8aeb3b3308c9eabe SHA512 e0de12af758cde5f0d1679d3b2e23e873e210851cd4b454d1acf10ea8a81201f488ed22f6a80b10d183383bd41353390740674bc2e488dd55b35dca2a66db479
+EBUILD anyjson-0.3.3-r1.ebuild 959 BLAKE2B 91ada9cbdf3fc6663a3b4c101032766ea1860a64215f5c41cc2871c43f58579417005a71e17cdca43c0f98560874c8c868638f413101d081bb680b1bb6218658 SHA512 9385c16d0f8c77cdf8217246eee6b0212e7abfbf18086d1b956cac6157bba62433b856214ffc41e9be382aa48ce278ca84a88c3fdda6b191a3604d003acf8d94
 MISC metadata.xml 378 BLAKE2B 6235a5004dff3622b6b68f5595905cdbb330d2d569b1da979a1f4caeab510ff5db4932a9dd916b9d81227110173a8a3cc789fbba0a9712b429bef35ed038742a SHA512 51bd7728ffa457fe04c22c66f497e5cbc1cbad3ead97525a8b443616801338d49100d77d57c33eca873fff567e86ba73e319d66c9d117e246bdebd36d30cab0e
diff --git a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
index 4e656759e579..b156c5bdc1b6 100644
--- a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
+++ b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/anyqt/Manifest b/dev-python/anyqt/Manifest
index 130294cd0100..ddf1ffce9708 100644
--- a/dev-python/anyqt/Manifest
+++ b/dev-python/anyqt/Manifest
@@ -1,3 +1,3 @@
 DIST anyqt-0.0.8.tar.gz 43519 BLAKE2B cd70564e858fc344d89b85a5e5556cdd35dd584f51bba2bc39b9e015dcacdb8f0964b0d6dd435ba6e219543aafbca2fda0f49309e8df07e790bd75660d8585b0 SHA512 8bff488972703385bb0506fce7b33e2c62a0c6469e0284062b0882dda0842d5488621c722e00c2005aa1f8ff18307e823e146aca92c16f5116d2bc974b194641
-EBUILD anyqt-0.0.8-r1.ebuild 480 BLAKE2B e7bd7aef3a640be75a4e287726a7f0b06d4858f8f554fd808b751d0b4934858b4709326337809dbdb35beb854b5905bc209647f13d5cda2b2613803c360b09ae SHA512 498f6d15a2963a5e52c08d214252d19cb68e3f5909c0ea1858da76b3e72dabbee7d70a2f7cb5171d1ddc833e6c49513b73fb6087c65e3712569234bc4d2aebfc
+EBUILD anyqt-0.0.8-r1.ebuild 476 BLAKE2B 69ef38c11e39bebcf883858099f0a0dc5e5d5976b07264f4d24af4c1c0a5f6b7c445d9aca5ab6a59d260d736f1e54363ad7c3545bf7ffd5f1d84e708ed12201a SHA512 e6ea4a1742753bb8a92e7660521de6ba90fd944ddd1f5c61b83cb17c5b904dc276ec2df583a0ffe3d42fcca789e118c2bbcd4a28134d0a3c199795d3b180e6cf
 MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
diff --git a/dev-python/anyqt/anyqt-0.0.8-r1.ebuild b/dev-python/anyqt/anyqt-0.0.8-r1.ebuild
index bd60b3f055fa..109bb075285c 100644
--- a/dev-python/anyqt/anyqt-0.0.8-r1.ebuild
+++ b/dev-python/anyqt/anyqt-0.0.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/anyvc/Manifest b/dev-python/anyvc/Manifest
deleted file mode 100644
index a06278167218..000000000000
--- a/dev-python/anyvc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST anyvc-0.3.7.1.tar.gz 45890 BLAKE2B 8fc02b78be464b8bb839db02ea09303d336ce18c72da11e63f3a6945853a7f7986cd4997cb64bf3e3a1445cbbc9f7dbfee3c0b54fd8741ea12a19ec5d5b7a15a SHA512 90151133b4da41acb10c2d8e421963e5ccb1e8da1e5327d5a69a77ccc647086683f1ff8ef600c69e01cfda28193c69166fa5717af3dbd13761d95ab3f1c7be46
-EBUILD anyvc-0.3.7.1-r1.ebuild 1395 BLAKE2B 212c11a96a0d59fd7d1dcb54bead07ba3d0696f91b45370091a243f71335c7518bd55872beab9fdcc965c1083dd5919393178f7d5da586119c0036fee1a8d431 SHA512 7e30d8e6e1d6363e8dd8bd0da94a63ddfe477caaa3e8dca3fdaeb14188f8bb68af7598ecfd34fd24761290da8a9a2d2bfd05327d42c42fef0682396b147afe36
-MISC metadata.xml 433 BLAKE2B a624517cfcbc74c3f0e78c304b06051f23728f3ec7c145e9e29f1c995aba43448a4f39c3f4c22e968dba9cd15b04e984145cebbe7caec76a0a8be4bceddfb328 SHA512 fae34b68b323e879e3867ae5410242856a4b2cff5ccc17c8007eaabc6546e17460fb910208610ca36114d284626eb937bb080cb953e9b9f55c0d27d881338d6c
diff --git a/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild b/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
deleted file mode 100644
index 741f89054941..000000000000
--- a/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
+++ /dev/null
@@ -1,54 +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 access any version control system"
-HOMEPAGE="https://pypi.org/project/anyvc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bazaar doc git mercurial subversion"
-
-RDEPEND="dev-python/apipkg[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	bazaar? ( dev-vcs/bzr )
-	git? ( dev-python/dulwich[${PYTHON_USEDEP}] )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-python/subvertpy )"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/hgdistver[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-#		dev-python/hgdistver )"
-
-python_prepare_all() {
-	# Do not use unsupported theme options.
-	sed -e "/'tagline':/d" \
-		-e "/'bitbucket_project':/d" \
-		-i docs/conf.py
-		distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html docs docs_output || die "Generation of documentation failed"
-	fi
-}
-
-python_install_all() {
-	if use doc; then
-		pushd docs_output > /dev/null
-		docinto html
-		cp -R [a-z]* _static "${ED}usr/share/doc/${PF}/html" || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/anyvc/metadata.xml b/dev-python/anyvc/metadata.xml
deleted file mode 100644
index 8177266e4c5c..000000000000
--- a/dev-python/anyvc/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<use>
-		<flag name="bazaar">Add support for Bazaar</flag>
-		<flag name="mercurial">Add support for Mercurial</flag>
-	</use>
-	<upstream>
-		<remote-id type="pypi">anyvc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/aodhclient/Manifest b/dev-python/aodhclient/Manifest
index f7be354b02ff..db3b24bacc6b 100644
--- a/dev-python/aodhclient/Manifest
+++ b/dev-python/aodhclient/Manifest
@@ -1,7 +1,3 @@
-DIST aodhclient-0.8.0.tar.gz 41676 BLAKE2B e9399f6f5adc2962b28b375db010b699fcfb4358daec375a6588f38f1600e557c73adde558d0ab88b14686f295d6dbbc2446e71de127d695ff2afcdcae99000f SHA512 8cb6ccd3fee3e2abecd5f9eb1b00c67ec4476f85498a9b23f4818c80e787d5373899eb90217e03b5baa376dcdf3c5aed9da8f369a0d6e562c3d97fd22b5b8850
-DIST aodhclient-1.0.0.tar.gz 40704 BLAKE2B bb097a62bf52f77df013ddc9301bd357bfbbff9a084b9a83ec5658512abfff811316ee9f39c227a74b2d2d139c1b21a402acd8d8cd8ba948d307d5e73b26fb93 SHA512 61bc58aad95e5781a8ed4f5cf7687d3cbb4f893513f8abacc7a93cd9774aed0ad02565a8e26718cf9dcb1c095d6b8bdd4719f78855b6af9629f1a04a6ecc0f59
 DIST aodhclient-1.2.0.tar.gz 41043 BLAKE2B 2ced3205427291470e2bacdadfb4328e5bc933aa57ea3bc8b92cd4781102acec53992212caf323b134522c72ede98a2c036a07230ff6a78ce8ef03e5d9129b55 SHA512 2422847c83c2a331ff4b6778f8819b6cb67e840626854961e865c3fd8fa00ce34ca6cbfd8eed17a0779daff784cae2c9084b163aaeeee8df1563a797bd2832ca
-EBUILD aodhclient-0.8.0.ebuild 1029 BLAKE2B e37ac2b5984ed1e54d44ecf2d4061becc3a264d368272d06a9d2e436722ff2702cdb248d484a3eb0b079f10498f8193f5c2596b603232cb2738b45ccf5401d35 SHA512 5f757270c6abf5d792eb23ba78aa34e578e00fb2229865b17f72ae98dcac4ba3241918033ea7bc65fa7218d575ebd47c6716dd18d809c0bf8388e293f5f3901f
-EBUILD aodhclient-1.0.0.ebuild 981 BLAKE2B d4c2ae33339d64556a1bffe75a0bfac6b399a43875267b049a9034e9a5dd23fee4056d0980aaff5f8021a27053d4ddd11b885b1705c7313bb09fc545f65347c3 SHA512 960db49e8f5927a2e59a0834d322489d3d54d8147c8c6020bc560d19527e8b508df7b29b86ced303666f19c1df65354ea24358b3323d1dc9cbf7dbd3bfd4348c
-EBUILD aodhclient-1.2.0.ebuild 983 BLAKE2B fcdb0cc007f8c8a4c26b8e08acd482ca359d597ae3e8754ec1093aecaf67f23d33d1dc0de1a10400dda119206282797b73ec467465449c470c69691af06e868d SHA512 b3c819375d62d75b2fd31e31fcd598944e537a53c5c1fbacabcc4542293e8435b6ea33b8328da5816d9bc6b31d5ff3986bae9ca29d0d311501541f6b288c35c1
+EBUILD aodhclient-1.2.0.ebuild 971 BLAKE2B 1e03854fb8f67f202454404d8e2beebcf7299ae77d24587d7aad204da9c6dbe7c5932b70e22567e3e6f876d95ad40d413eb687f22dc4ad30a12cfe8e2c6190cb SHA512 c72b40d06e6efa2f0058e46e633d4d4366a2a74a5c1ca98faa3387c3abb3ca00a4cfd0cb8ed3f60d372183bade926fcd337e71005b03660592be9747124737ab
 MISC metadata.xml 604 BLAKE2B 2389e07026b35c4cf96b7caecf3c29f7f8c7f5f8a7cc6b9c576043163826d97092999ff76dbf6f52b49475c001a89409095a7af25c182bc2069bb9e7c6ae0536 SHA512 95b484267b9f6eceeed9f404fe3ca3140d364aa9551cb306e0a40769b17afcd927b1570fa367eff9c250b1fd8bdf8adddfb4f61f506d297eb011f83ab4676aa7
diff --git a/dev-python/aodhclient/aodhclient-0.8.0.ebuild b/dev-python/aodhclient/aodhclient-0.8.0.ebuild
deleted file mode 100644
index 9cfdfa2d173c..000000000000
--- a/dev-python/aodhclient/aodhclient-0.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Aodh API"
-HOMEPAGE="https://github.com/openstack/python-aodhclient"
-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"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.3.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/aodhclient/aodhclient-1.0.0.ebuild b/dev-python/aodhclient/aodhclient-1.0.0.ebuild
deleted file mode 100644
index bae9070b439c..000000000000
--- a/dev-python/aodhclient/aodhclient-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Aodh API"
-HOMEPAGE="https://github.com/openstack/python-aodhclient"
-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"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/aodhclient/aodhclient-1.2.0.ebuild b/dev-python/aodhclient/aodhclient-1.2.0.ebuild
index ea55a45b4d92..6b02d754f00d 100644
--- a/dev-python/aodhclient/aodhclient-1.2.0.ebuild
+++ b/dev-python/aodhclient/aodhclient-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 086a4138cbaf..e9be05732188 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,6 +1,6 @@
 AUX apipkg-1.5-pytest-4.patch 801 BLAKE2B 4fe40fb766f4e8654ef37f0796a88f74b81e2a1d237382f87745f33ac80e505c9e764f8b83d467c7f5051ce7eb3a80add369595556b5b6abf3e1a569d33cc071 SHA512 d50ecac0382e70124634a403c5010bc929f92f7a6768979497a5d2646626c6244f3c213f18989f71dda137bd4376f81d5d97a5f4979ff0e937046bffeef75b04
 DIST apipkg-1.4.tar.gz 11224 BLAKE2B b59e3fe39030f1f1f7f41e121d7a4e242d7155be5f7b2b8f3cd7550772acceacaf2d9540cf98bdb51e6d132af937d634bce3699b950b9d9aa9a618009cbaebb8 SHA512 118f806706944513f50d3cdef596b32f8ce585cfaf94d2531a6d260f90a0e2147177161aaa6f5d6823150e6182d0f73be3dc01259b8a2f8d710733a22ea54789
 DIST apipkg-1.5.tar.gz 11186 BLAKE2B f703a37b38b412228348520a9daa0276a69c3be47a9586e1c2797cf525a024bb0fda81dbfad7d4b1404e1ebcd3eec0e9ce2231beef5072bf9915240e2e5fb445 SHA512 828937ca5e203915248fac54db8e7c13f941e006403f2a415c27fa4d1aa114790be3d7b5dd892f528611e5e6dfe75114ee80f4f4589a03c3f789ae6ddfcae0bf
-EBUILD apipkg-1.4.ebuild 822 BLAKE2B 51edc31d7dbca921b9e6ca9cbb7ce197b5a033395dd09da343f55d40bde95302c79e32ba9b3df4b0207c89039dafaec037367defb8b59870d2b04baa844dd8f8 SHA512 ca325bcc5c89a6dfc5581a13f41ffcaa56085a04ee38197e6d8b4befbf2cb4e8514765f1f7c54b024c76bd6b9ad0be77f91c2e44d444a126515e7d76c3113c40
-EBUILD apipkg-1.5.ebuild 640 BLAKE2B 233ba393d3ca63100d915aeac24d28f96386096d6b5adcc1b36b8a88af7cfcc24cfca9ef33d7a52c2b5294b0d900cd3a0c83c851fb8c3e9cbf95b5690885e0f1 SHA512 f4ff6f66835d909d2950f5e9023381946410b9072b5effab7b7dd40d68de259372c212e76febea76801230a9946cf32be6c950a714d312bccbf96e2b9bfc8458
+EBUILD apipkg-1.4.ebuild 815 BLAKE2B 0628ef6115ef4ccd1fde8fb79f83e3c6b8feebccdffd1d0eaac8065d43077de72dcc9eaded0a218e0e9206dd91e8f932eba781ffc0d2654b02dda770febd49b1 SHA512 c95baa01543813c1ecb26ac3c80827bef3b0d49fbb7c026b66ab7aea4ad898f372f94da1badd02f91a1a497f2e327b03dea116fe6cdd4597d2c1f76738902170
+EBUILD apipkg-1.5.ebuild 633 BLAKE2B 62cc483e7f038601b88010bf4f10de3bd898097b3346c21ff32b3351c6c699ea68e9744a6a7c7ae6937c90e58fa9d78f0f1d6054cec42349356395a2452a25f3 SHA512 93ae06a50b0b1aee581d69b9b2d04c8d98f4a03c497a413cdb4371168e2b36eb264d065388f0e70b80a1b6e9130bbbe9a782c549b1ab4107c9905b45b753adfd
 MISC metadata.xml 309 BLAKE2B 693a9a5373548cbc3c78db6df12bd9dc7aad3bfd3665f702f65a18a1799dc089869d5577ff6d6dba67573393970d8b85c356387a53786376503d33f979bf6e52 SHA512 0f74900faac286382377f2233aaafc9a6e8d7b49c017f60c7c451728d67cb9b9505f57903901a56f67327364951e2e7ab7dae7c852ad70b16070ce48ff3f93cb
diff --git a/dev-python/apipkg/apipkg-1.4.ebuild b/dev-python/apipkg/apipkg-1.4.ebuild
index e50d756e34d9..bdd563fb5f63 100644
--- a/dev-python/apipkg/apipkg-1.4.ebuild
+++ b/dev-python/apipkg/apipkg-1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/apipkg/apipkg-1.5.ebuild b/dev-python/apipkg/apipkg-1.5.ebuild
index 63525d9df7f6..35dbc8dc4aee 100644
--- a/dev-python/apipkg/apipkg-1.5.ebuild
+++ b/dev-python/apipkg/apipkg-1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index 5004b3169669..afa71f8b65ef 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,3 +1,3 @@
 DIST apispec-0.35.0.tar.gz 47684 BLAKE2B 3067a0d50a6f53378f46a9a07596da53679f399732619f5bd3d1bedd85d088c6901560dc46be22b42d77537c437d9d97840a55f0b1513e39c87760e9e6c8ea0c SHA512 45a3034c49169ca7998480a8b8e0ac6415d49b6235885fba31eaaccb1c008b4ea845a6743f10cc3492215affe20b690d73a9a06e0e0c3942e0327f381415fa57
-EBUILD apispec-0.35.0.ebuild 823 BLAKE2B 1615f7736c85d7e42a26b1a8a46c8bdb2c55bd9aa6ae7b3e48b2da9d708ba6a01ab1437a931530277c455d2866d1ff5e8571acc8d15fd1eb2c03f016177bf7cf SHA512 9eb236ba556129b5543f7322c01cf6e8c2f5f43fe26efd1dd186a3f23a30781e305552d5c9e687a60e9fbd5195877fe55339399beeb73926ad8bf234e45bf924
+EBUILD apispec-0.35.0.ebuild 809 BLAKE2B d456eeff4a9e93bc6967746ae7a6a7e31cac04a7da2d2da8ec80bc61b23a4f045e21c9b76d5014524debfa13d3cf94b497396c6dc786495828f740ab92f7dbd4 SHA512 34e4340ae0af84b2f49dcc00fcb06f7182497125dbeeadd7bc6ff27b54c9817676efc35e4f2041b2d91b592f917a966cc9b97d22ae542a9633986afaf2ddf7c9
 MISC metadata.xml 352 BLAKE2B e072e5a12d891408ee029e0f51b9c2a232e8a31e941352d43695e0bec949c4f0d1d709707c052971a3bac490763d3f79a264bf85cf97e6f6b2bd62064f1fbcc7 SHA512 ba1e41f1977b0afa34de52bbd96bba0c4e517e5f6b0094356d37c36b4365cd7ffaa055caef08888a4e1da912e1d3616e8545cb6f8de20538ea15f338a5dfb0f6
diff --git a/dev-python/apispec/apispec-0.35.0.ebuild b/dev-python/apispec/apispec-0.35.0.ebuild
index d8b88f00cb2f..29c537f4aca7 100644
--- a/dev-python/apispec/apispec-0.35.0.ebuild
+++ b/dev-python/apispec/apispec-0.35.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aplpy/Manifest b/dev-python/aplpy/Manifest
deleted file mode 100644
index 3e69c6f3e5f3..000000000000
--- a/dev-python/aplpy/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX aplpy-1.0-fix-dependencies.patch 456 BLAKE2B 556271cdf233cc2358d6be0daaeb63122b687e7b820b02ba6113f3c2cc54243fd860a2aaa943ddbbc8c8f5af74d241b7c525dca191346f5a777c38e7aa096278 SHA512 b0b0ac53fe6702947d21fbe1cbe60c6dfe5047fd74e54cb5ff02e2adfc8f6c53a3da14681cc6aa5f441a90aa3478555b558be6a1be96111d380c0b8da55c5185
-AUX aplpy-1.0-mark-known-failures.patch 3738 BLAKE2B 56dc68f826e4f1a657030fa8fe3cf1587229c516c04ccc659a8bf8e0d2f9e8f4bdea58dd68c48d86effb2dddbf597e12f17ca36c158ae9ae448711a1a6940019 SHA512 e076921616ecb528844b79f330b1901958ed12e4985063ee2829ff361b93cc457b23caa9107c79c58028a53e97b085033b8666681d2ece7ef24b9bdd9d955ce8
-DIST APLpy-1.0.tar.gz 1169280 BLAKE2B 10c7133c5708412741e25b85f3286d28ab36c5ab69fa65dcbb8b1607c171f1fc5c7b341fea8255176a90d97e18c7a5071d9f3e7848558ee66f7f48de0cf9ea09 SHA512 658b626c2a94c73cc8ba45fde86409659555ed3ec065d07313f08b67c0bcdc596c8dc94562c924de2f3f32d6884051e6756e22384d9594c4538578b482fa7590
-DIST APLpy-1.1.1.tar.gz 938943 BLAKE2B 1b5ca8f1312a0bccea46a3d7bf3dd8cc7a003083cc321147d24c650abe6bc77c3b2398db64687d3603a1077f3253a1cccf37efe874148c681393563991f96b43 SHA512 accc355fb56145db33a931b77b9d5b56e5e0f5a486a3a8d776b0645991883df4b78fae58cfe87c1575dad7f02baa5c68c95427c1de18c2435abd13c4a85eee93
-EBUILD aplpy-1.0.ebuild 1205 BLAKE2B b680059c92ef70123174b4f1f71a9c592aa3e41d96bf64008df321ed80f652bace94015e22505b9644ba7be055e8d01c7cbf2e23b1eeaa967372332d0a77bd01 SHA512 a512bb92eed48deb65da098c5b10f76e5e37b550c608fb4667acbac16f0ec17d218bdee394d765e7c04cdca69fb680e7f07afdf8456867cd21215e0f3904574a
-EBUILD aplpy-1.1.1.ebuild 1449 BLAKE2B bd606c5be620df83e04323325c70913b664cf3fb5c8704959a1fc9faaa3ac1808a919c6ea96d2a6ed137180b5d58ddf6e6e805ae7c06be2aa49c758f92ccd4ae SHA512 cb57e75aa0553674d5c067ec6f947cc39502e7e8f5c71d05750ad4199f07a80cf356bd2afb6327f6214c5858b82c87d1a69d688edb20101ebe0e7515155227c2
-MISC metadata.xml 698 BLAKE2B eda7318fcd5f52478bb03e0259fa991042759ff55409c42f44ccd9d0ac8220cce6aadfaccd71c8934fb33650e55af30e3b644f0920fb15cc74a8c65eea479ba7 SHA512 33e925cde2dd0ff56a158426d35d5f498fddcb352042c4acd868b577ca00893fa2bf2f9ff33b8931578af4841ba08abfea159003bc33be4c579bf51ac8cad1df
diff --git a/dev-python/aplpy/aplpy-1.0.ebuild b/dev-python/aplpy/aplpy-1.0.ebuild
deleted file mode 100644
index 1b77d9ad92e8..000000000000
--- a/dev-python/aplpy/aplpy-1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-MYPN=APLpy
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Astronomical Plotting Library in Python"
-HOMEPAGE="https://aplpy.github.com/"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pyavm[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0-mark-known-failures.patch"
-	"${FILESDIR}/${PN}-1.0-fix-dependencies.patch"
-)
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile --use-system-libraries
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}" || die
-	virtx "${EPYTHON}" -c "import aplpy, sys;r = aplpy.test();sys.exit(r)"
-}
diff --git a/dev-python/aplpy/aplpy-1.1.1.ebuild b/dev-python/aplpy/aplpy-1.1.1.ebuild
deleted file mode 100644
index 75229e2c5791..000000000000
--- a/dev-python/aplpy/aplpy-1.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-MYPN=APLpy
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Astronomical Plotting Library in Python"
-HOMEPAGE="https://aplpy.github.com/"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-mpl[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0-fix-dependencies.patch"
-)
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile --use-system-libraries
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}" || die
-	echo "backend: Agg" > matplotlibrc
-	virtx "${EPYTHON}" -c "import aplpy, sys;r = aplpy.test();sys.exit(r)"
-}
-
-pkg_postinst() {
-	optfeature "Interact with Montage"				dev-python/montage-wrapper
-	optfeature "Read DS9 regions files"				dev-python/pyregion
-	optfeature "Extend image i/o formats"			dev-python/pillow
-	optfeature "Astronomy Visualization Metadata tagging" dev-python/pyavm
-}
diff --git a/dev-python/aplpy/files/aplpy-1.0-fix-dependencies.patch b/dev-python/aplpy/files/aplpy-1.0-fix-dependencies.patch
deleted file mode 100644
index b5708c8971bc..000000000000
--- a/dev-python/aplpy/files/aplpy-1.0-fix-dependencies.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Change requires to install_requires
---- a/setup.py
-+++ b/setup.py
-@@ -94,8 +94,7 @@
-       version=VERSION,
-       description=DESCRIPTION,
-       scripts=scripts,
--      requires=['astropy', 'numpy', 'matplotlib'],
--      install_requires=['astropy'],
-+      install_requires=['astropy', 'numpy', 'matplotlib'],
-       provides=[PACKAGENAME],
-       author=AUTHOR,
-       author_email=AUTHOR_EMAIL,
diff --git a/dev-python/aplpy/files/aplpy-1.0-mark-known-failures.patch b/dev-python/aplpy/files/aplpy-1.0-mark-known-failures.patch
deleted file mode 100644
index cf1aa92190d4..000000000000
--- a/dev-python/aplpy/files/aplpy-1.0-mark-known-failures.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Mark tests that are known to fail with matplotlib-1.5
---- a/aplpy/tests/test_images.py
-+++ b/aplpy/tests/test_images.py
-@@ -61,6 +61,8 @@
- 
- class TestBasic(BaseImageTests):
- 
-+# see https://github.com/aplpy/aplpy/issues/278
-+    @pytest.mark.xfail()
-     # Test for showing grayscale
-     def test_basic_image(self, generate):
-         f = FITSFigure(self.filename_2)
-@@ -68,6 +70,8 @@
-         self.generate_or_test(generate, f, 'basic_image.png')
-         f.close()
- 
-+# see https://github.com/aplpy/aplpy/issues/278
-+    @pytest.mark.xfail()
-     def test_ticks_labels_options(self, generate):
-         f = FITSFigure(self.filename_2)
-         f.ticks.set_color('black')
-@@ -84,6 +88,8 @@
-         self.generate_or_test(generate, f, 'tick_labels_options.png')
-         f.close()
- 
-+# see https://github.com/aplpy/aplpy/issues/278
-+    @pytest.mark.xfail()
-     # Test for showing colorscale
-     def test_show_colorbar_scalebar_beam(self, generate):
-         f = FITSFigure(self.filename_1)
-@@ -96,6 +102,8 @@
-         self.generate_or_test(generate, f, 'colorbar_scalebar_beam.png')
-         f.close()
- 
-+# see https://github.com/aplpy/aplpy/issues/278
-+    @pytest.mark.xfail()
-     # Test for overlaying shapes
-     def test_overlay_shapes(self, generate):
-         f = FITSFigure(self.filename_1)
-@@ -112,6 +120,8 @@
-         self.generate_or_test(generate, f, 'overlay_shapes.png')
-         f.close()
- 
-+# see https://github.com/aplpy/aplpy/issues/278
-+    @pytest.mark.xfail()
-     # Test for grid
-     def test_grid(self, generate):
-         f = FITSFigure(self.filename_1)
-@@ -125,6 +135,8 @@
-         self.generate_or_test(generate, f, 'grid.png')
-         f.close()
- 
-+# see https://github.com/aplpy/aplpy/issues/278
-+    @pytest.mark.xfail()
-     # Test recenter
-     def test_recenter(self, generate):
-         f = FITSFigure(self.filename_2)
-@@ -135,6 +147,8 @@
-         self.generate_or_test(generate, f, 'recenter.png')
-         f.close()
- 
-+# see https://github.com/aplpy/aplpy/issues/278
-+    @pytest.mark.xfail()
-     # Test overlaying contours
-     def test_contours(self, generate):
-         data = np.arange(256).reshape((16, 16))
-@@ -144,6 +158,8 @@
-         self.generate_or_test(generate, f, 'contours.png')
-         f.close()
- 
-+# see https://github.com/aplpy/aplpy/issues/278
-+    @pytest.mark.xfail()
-     # Test cube slice
-     def test_cube_slice(self, generate):
-         f = FITSFigure(self.filename_3, dimensions=[2, 0], slices=[10])
---- a/aplpy/tests/test_rgb.py
-+++ b/aplpy/tests/test_rgb.py
-@@ -6,6 +6,7 @@
- 
- import numpy as np
- from astropy.io import fits
-+from astropy.tests.helper import pytest
- 
- from .. import FITSFigure
- from ..rgb import make_rgb_image
-@@ -17,6 +18,8 @@
- 
- class TestRGB(BaseImageTests):
- 
-+# see https://github.com/aplpy/aplpy/issues/278
-+    @pytest.mark.xfail()
-     def test_rgb(self, generate, tmpdir):
- 
-         # Regression test to check that RGB recenter works properly
---- a/aplpy/tests/test_vectors.py
-+++ b/aplpy/tests/test_vectors.py
-@@ -1,4 +1,5 @@
- import numpy as np
-+from astropy.tests.helper import pytest
- 
- from ..core import FITSFigure
- 
-@@ -15,6 +16,8 @@
- 
- class TestVectors(BaseImageTests):
- 
-+# see https://github.com/aplpy/aplpy/issues/278
-+    @pytest.mark.xfail()
-     def test_default(self, generate):
-         f = FITSFigure(IMAGE, figsize=(4,4))
-         f.show_grayscale()
-@@ -22,6 +25,8 @@
-         self.generate_or_test(generate, f, 'vectors_default.png', tolerance=2.5)
-         f.close()
- 
-+# see https://github.com/aplpy/aplpy/issues/278
-+    @pytest.mark.xfail()
-     def test_step_scale(self, generate):
-         f = FITSFigure(IMAGE, figsize=(4,4))
-         f.show_grayscale()
diff --git a/dev-python/aplpy/metadata.xml b/dev-python/aplpy/metadata.xml
deleted file mode 100644
index 8fa6a8c707bb..000000000000
--- a/dev-python/aplpy/metadata.xml
+++ /dev/null
@@ -1,18 +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-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  APLpy (the Astronomical Plotting Library in Python) is a Python
-  module aimed at producing publication-quality plots of astronomical
-  imaging data in FITS format. The module uses Matplotlib. It is
-  capable of creating output files in several graphical formats,
-  including EPS, PDF, PS, PNG, and SVG.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">APLpy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index 3b965e944b79..02fac15fcf35 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,5 +1,5 @@
 AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905
 DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
-EBUILD appdirs-1.4.3-r1.ebuild 1178 BLAKE2B fa045167dbc08aaa61e573cea99a3327ecd513a76dc387b30a01dfbf582a0d03d85495704d9286d867e41608e78324a2d014573659841da968a7a195f94dc911 SHA512 97c93bc34d042bc745086e8f60035ce19cef8aa2e0633a56069069aac9a8ab086b55c131c16dbe37b4af8b3f4aee614a593ce8d415202038e793962e5a9b4938
-EBUILD appdirs-1.4.3.ebuild 1172 BLAKE2B bf0a7e9a89704f98fc89686ae8b8c60a2a70fc9f5d8ba63d482f879cbb4ff91939a6946e3f94705ecb28b0363b6561e1103f031cfbd750165c3c59b5fff06e80 SHA512 4f5669802072fc9a53a9d8da894efc0de490d76fe5c5056334af10ed6cb9177c9c2161a8a41f02a3b8a8990f05c8115c5563870441ba53e70f1a93dc3fb736ec
+EBUILD appdirs-1.4.3-r1.ebuild 1224 BLAKE2B 8c4cbcb3b28b3e41a9912ff2fb22a352359333664ea547c151acd7b440ffc32afe99a32b3ffc2bf6857a7340f29eebed72920a184a685042d02dec8282e9d01f SHA512 ed5216a816befd0afa35a08c8d594dfa2c36a7ce007da3c0b9aa24d74aaea70011d3870f89a679fceda6b5c059a37d16daf4f1c4bb87dcac43a4c15c7a1c8c73
+EBUILD appdirs-1.4.3.ebuild 1165 BLAKE2B 8ce45b789805dd760cb6f42c7381e37a4b09de259ed352a4e71384db7428b93ad8e39056b6591f6f006ec06fa03119fedceeff53b997c90b8435e06d6178fd74 SHA512 4ef2d171a5365c9f5458280aaa3a1b565c07c9dc9dcc309fe252b44e75499ee00d2f8e880b9735817fd2dd2f1236ad8db6385bb107c65e7d61dc09629aee66f5
 MISC metadata.xml 742 BLAKE2B 4731940c3aa6e3e0616487d4600c77f31712455aa70eff1bb900ec121cb062e45e1551206b86a5716b49f6163612096cb5ab9e3cf693af2d1fedaac023de29e6 SHA512 c1e35e090d6e3af99b8879a8a553c89989b149617857696fccecb4ea0435979f547049db2cdb7c505b50c20dc9f081233990f6fc0ee05de8ee27c7629292244e
diff --git a/dev-python/appdirs/appdirs-1.4.3-r1.ebuild b/dev-python/appdirs/appdirs-1.4.3-r1.ebuild
index c39cc5139148..8455f6d6eab0 100644
--- a/dev-python/appdirs/appdirs-1.4.3-r1.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.3-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+# note the patch below
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/appdirs/appdirs-1.4.3.ebuild b/dev-python/appdirs/appdirs-1.4.3.ebuild
index 3bc9745b1061..a4f15bcfa832 100644
--- a/dev-python/appdirs/appdirs-1.4.3.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index c7d49f466923..46a8815e5065 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,6 +1,6 @@
 AUX apsw-3.6.20.1-fix_tests.patch 340 BLAKE2B c70f404afaed26c92f60690820812fb0ccbe355f43384b4e0a931851c27348b04335aa4c25baf5b2662c85403ad2eb075ce049a724c297a46ea2f796845aebd8 SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a
 DIST apsw-3.23.1_p1.zip 682088 BLAKE2B 0b1c492c68522f9d3d1c693370b3b1562de0e4521f3a3de0988c40ddcf717f79201555228c16b9b9870db47582bf2b774f7e9ce0ddea4e19c3d132bbf2322551 SHA512 8f3bc9e619ed8671a0804e6d3c9ecf34d452a4e6fe540fb23bfb6ae67578971013300ad6cdffe3be2fc1197c4fd3af096802aef5994cbe53253467133363ac62
 DIST apsw-3.25.2_p1.zip 682975 BLAKE2B f9f471378cddd7da1c06158b7a041d9377da4d4123846318c0cfc24167734bc1813f667e64c4c6bf643c6a618c9cabf58301dfbaad0998082d764212ea369fff SHA512 073b2fe9170fb00ac6f2ba52eb638d64d79875ba74b09f0307fa2c075e714bb91465fd2edd46341dac5cedc0bee0a1099888b6c1cee706fc04fa6b9ad99c47d7
-EBUILD apsw-3.23.1_p1.ebuild 1048 BLAKE2B ffd56557036b5b5ec9703f5f9baabd8db633c83fd3b0291936410c9f1db047369108b90a7aec179d001e99f82c03e4c35d6ed57887d48c55d53d039ade00b8a2 SHA512 d16a7b5b781eb6184e555502cee6092cf8ccb612d821229da3a5b4bbabd8bd5fca5c834c7fb1404e10f7f92d421aede96f41e969e49b3554fad86dae2c47e1ff
-EBUILD apsw-3.25.2_p1.ebuild 1052 BLAKE2B 4ac194d5842e9f9f3039390b266855f548852a21ecc77db91768c6dd6ec68c9c12a560eef406109889f1c23671b006ac4722a86eefafd4569f9a377a80d4df00 SHA512 d57defbdbed00e5a042bf9b8cc686d2238936bf19955266153096f8b4fec647db4565194b9538ae957133656158ac7b6adf34fba08825774eade8764494e570d
+EBUILD apsw-3.23.1_p1.ebuild 1044 BLAKE2B f34fe3b6892b2c8cebbad0335529c95b6b17e6b4e0c61bf0acd732e46a2031d03ee9703d78c5ef73f217094dde4a31409412d0102af0b2bb142bdf68ca3e8191 SHA512 c712ff36f4914ba6264ba34e7f54db4b933786bafb9753447d501100199467d3b472b3b852255eb0cffcde7492915a3c3df650f920a588489bcaaf06986c7459
+EBUILD apsw-3.25.2_p1.ebuild 1048 BLAKE2B e3f639861b0b4e50e86853d6716fb02fb15a94d229ff84913040fca9054a7ba918f6ee886ea02ad5de539d5ac1f0e2b3366e8e05cbf02238841b884e17a1275b SHA512 ab3ed7fa1ba52ae7fc0daf224339bd7b0a592c55cadd462e49aed8d0596458afdc3df6c962428cd443c4a2083fd92cd4a44ee51729a97170f56d3a5c0a3e9ef9
 MISC metadata.xml 677 BLAKE2B 8125a6d9906cfa5626bff6182635ac0b6c65d52abfb9011fb486430055b3484855a7529c0b4fe7d3c2bba8646318a8cb01a37e2ac0b63def11abae26bef6882c SHA512 970eb7e730f147bbe24fbe377f6b9a1557f56d536ce462aef5ccba23059295c4c8d88bb384a7b7ec3f401a512e04134ebe19efa03473a90841d7c6246e2eb244
diff --git a/dev-python/apsw/apsw-3.23.1_p1.ebuild b/dev-python/apsw/apsw-3.23.1_p1.ebuild
index 4ce8cc9b4ee9..81ea4e3a0d62 100644
--- a/dev-python/apsw/apsw-3.23.1_p1.ebuild
+++ b/dev-python/apsw/apsw-3.23.1_p1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/apsw/apsw-3.25.2_p1.ebuild b/dev-python/apsw/apsw-3.25.2_p1.ebuild
index fe61912cef2f..7246ac0d4521 100644
--- a/dev-python/apsw/apsw-3.25.2_p1.ebuild
+++ b/dev-python/apsw/apsw-3.25.2_p1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 1d64231be136..fae8ac3c78db 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,10 +1,9 @@
-AUX argcomplete-1.10.2-test-pythonpath.patch 1563 BLAKE2B 0442a02ac2cfe15c6c7c78816c5281935c65ecec7a4c4c65ee7388b681de8102e8271a8bc6a8295c4a04ac24610d5e34ba20318e2003e281949d2f954184c68c SHA512 8b9efa077c2543f45425604a738924f0dcace1ba3924ea03d5e3b41a1e2a0271c8311a3e28206095c7cdea9ee5f65a6f213b44608b51951219eab12f16b752fc
-DIST argcomplete-1.10.0.tar.gz 47271 BLAKE2B 78a67b56d4871120d7384459c8ee591f42dee195143712c5c70d144d4116041d36ba687d4425beba6258b58d5a0a3ef847d10d6267f372282f37e953c6f92d80 SHA512 59e9cb721ddffd85d9f6461a70d50f9ba0795e36044cd46fa5fe707fb1be28c12f4ef531d2844020efc156300861b2ca8b73f56a116dd54bda0e52cf68c0a411
-DIST argcomplete-1.10.2.tar.gz 50128 BLAKE2B 95a7f5a10b5d86e2b065b0d0563ff6281a5d6a0c9ea83b432492a00f67a1321c52cb9d5907868f36351f3057b21d215ab5a897a2ea7530d27925914a9e04eba8 SHA512 5e425f7ed042c429d8c01bdf11b6e721343229ec9fe0e3f9d4a6e49c40473a40286175a82f62530b822294e1fd8539e941c17673f2a0dd05216a243f1c2f4fce
 DIST argcomplete-1.10.3.tar.gz 50173 BLAKE2B 371baf55b65d49885398d3b2cbc2fa8abda30345643fd3f5700f92b76d4426a5f790835a83c158e47f9ee0f5fb6de8f8696528dc0701a1c8431f205bf2033703 SHA512 ea0fa18c161b395448fc09f5fad1190040ac05bb8c763c1ab775a95a10fcc88342f1b8594edcb07d56728014487f6ac54899b7e4cd16788cdc40cf14a4d60731
+DIST argcomplete-1.11.0.tar.gz 50555 BLAKE2B 7029b2bf442362f3dca804b75c32e000bf48e1ccee1e8e4e0e3c484d883a95f4c4774f7367b51f6310b653be457f3ad1ee5e4907cf9566c97a12ca85fbcb177d SHA512 30a594d7f3a9ad31b4a7c537bd81e6cc23bcb3861a9d2b9999c654c0f04b4f330bcb7dbab7fe7191d4b8bbbbecdb2ad3c1b8ab812c16bec880fe83733f75c5b6
+DIST argcomplete-1.11.1.tar.gz 50773 BLAKE2B 15c92929fc20a10a1f1e29cf8714b74dd9ab0ce11e7f77acd4b15a907ad885f944f8540a8b37fef13ea67ee8eb76107e1c72746434f2710ded7331830494ff50 SHA512 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce
 DIST argcomplete-1.9.4.tar.gz 47471 BLAKE2B ba64acc1fb2ae336166504db3dd991227c4e2a04abc6909ecf6723c1d2ce82ea65453ca2dde97316da9eaaa5b60026a6c8e4f3d658f1ed8122ca4fd00723fca1 SHA512 831958dffc75c65e2a63918d1e6f5e1fa47ec753b913c978e8d1d30d430ab8fedf66c99d8df23b2abc547b42c27335ccf47811224322994316ca2225c85ce346
-EBUILD argcomplete-1.10.0.ebuild 676 BLAKE2B 6275bf40b609222d486d1573d7c3fb24e4c4d857af66c29819d8382f1a5c36ab8d298297de1ebcbbf679de3e2d02a152957dd74741cd161148e2d3dee931f279 SHA512 9d031bf58b76a54c4ada8fc1e6189c5eaf6ef0c53d23d129320bb955c0850bacfdac6dff4656fccdcaaec454cea80d466ec56f413aa4a91e0f7c92dfe82812e8
-EBUILD argcomplete-1.10.2.ebuild 799 BLAKE2B 40f2681cf2e0bbe307b545064b32a70a0af59551d4581d2da0c7b5925f7e0bc2350334369897f97401276ece6d9bbd32fc69c571e24a1146164014dcee51439e SHA512 f884433cdcf1418215b34b90500422bda124bc2d2d9f0c3b8baab0eaeee9a5f178c2396ef659e46381753b9bfb3c2ab4ccb9606e5a8d3d0d9fc12ff08e2f1651
-EBUILD argcomplete-1.10.3.ebuild 728 BLAKE2B b1ef6de9b760408d52a4f3542294396fd4d3e96a7a368cc7662470699ddf16c57c49d2d2b72f9ef95d846622489fd209215aa6cf2d9a1b9f68bf24ddca5afd19 SHA512 c08c4825da6e908d58684419ee11f6175f98d931c3afc54833f86713a7859a6d245ae26fa80eab17e1c9d1ff01f5ec50cc9e70b48241a96732c17123607de373
-EBUILD argcomplete-1.9.4.ebuild 804 BLAKE2B bcc010bf6173d0a81750dbcac4ba0ca8a69432609dcb997ffdb1df226500a7e0b22f9c7f03f6ba4f3a7ee1c01edadf40f457f01c0f0c2cf1c7f20db46752d767 SHA512 056cbead37a9f84a86c0ccfd66a7c34cd72a382cd7abbf3e93cf31efe186399c90280f056a5c84e64113aa099cc4fa3b5b240da0b6fc31c0f5b935d1c48ef8df
+EBUILD argcomplete-1.10.3.ebuild 719 BLAKE2B 88502b7ea66e18c8cecdac8be8be6d85fcdd75b45a26e3106dc70d9fe4126c99142e2b5f589dc9ddd92bd9bbaef7140dba8315cd55601a38ce164d11a8f4a299 SHA512 91d22b2effb286d86b2bfb11ebba9e6e2ea9a54dd4b4183ce7cce3b1161d51d2019598025b62acb06cf0c456c4512d44cd89db538218d3437f54cc08afd7cb3d
+EBUILD argcomplete-1.11.0.ebuild 839 BLAKE2B 3b61280b21199538fbe1ef5f0192a169ae994c4b1b07dd309dd5347c86e5de2eed03e143b627ee2771196da644aed266ab8b9a4112ae68e59eb53ca0b193422b SHA512 c64429febb5b3ac5b9f13ec66835274135952a9d2de517baf4bc3b074256678738f1101c6477d9b3d69195217791baa23e12b710022789b3f44f858543984ec7
+EBUILD argcomplete-1.11.1.ebuild 839 BLAKE2B 3b61280b21199538fbe1ef5f0192a169ae994c4b1b07dd309dd5347c86e5de2eed03e143b627ee2771196da644aed266ab8b9a4112ae68e59eb53ca0b193422b SHA512 c64429febb5b3ac5b9f13ec66835274135952a9d2de517baf4bc3b074256678738f1101c6477d9b3d69195217791baa23e12b710022789b3f44f858543984ec7
+EBUILD argcomplete-1.9.4.ebuild 795 BLAKE2B 0873ba077e327793f7c6007e562db7fcfe7d7e575816d51a9ee7407a853808973d393e04ef0cbddc2c6bbdc980c4f878c4be5237cbecce18ac600f1ae22d5f0d SHA512 0fefe66d44fd35db81611e0458fa32aa8c250939bc0ed217690a4ef74afaa417b295a70dbbdd66635465220391ccdadbc6695078a249e88d32cffad09c75e1cf
 MISC metadata.xml 385 BLAKE2B d552f29df1805f58bef2bbaf91166ef43daebf78d36a079c9b93bee54a8165d33576e1f9c238e7070f64253e0ff71c9b6a18c63b3321b5a400f8d287b10e4a82 SHA512 125cccb9f83bacb68944c893b76905ca6db26c41f0e843bc3b2ed4fd8b18df4247696c0fb34acff77c41bd57fce517669878e071db6dcdcedde42f85cc012e5d
diff --git a/dev-python/argcomplete/argcomplete-1.10.0.ebuild b/dev-python/argcomplete/argcomplete-1.10.0.ebuild
deleted file mode 100644
index bcf6b4e47484..000000000000
--- a/dev-python/argcomplete/argcomplete-1.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		app-shells/fish
-		app-shells/tcsh
-	)"
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/argcomplete/argcomplete-1.10.2.ebuild b/dev-python/argcomplete/argcomplete-1.10.2.ebuild
deleted file mode 100644
index b4d81cae4366..000000000000
--- a/dev-python/argcomplete/argcomplete-1.10.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pip is called as an external tool
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pip
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/argcomplete-1.10.2-test-pythonpath.patch
-)
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/argcomplete/argcomplete-1.10.3.ebuild b/dev-python/argcomplete/argcomplete-1.10.3.ebuild
index 0e5076f4659a..c3d71aa3c8fb 100644
--- a/dev-python/argcomplete/argcomplete-1.10.3.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.10.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/argcomplete/argcomplete-1.11.0.ebuild b/dev-python/argcomplete/argcomplete-1.11.0.ebuild
new file mode 100644
index 000000000000..4fadb22776fc
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.11.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=( python{2_7,3_6,3_7,3_8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
+	' -2 python3_{5,6,7} pypy3)"
+# pip is called as an external tool
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pip
+	)"
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/argcomplete/argcomplete-1.11.1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1.ebuild
new file mode 100644
index 000000000000..4fadb22776fc
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.11.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=( python{2_7,3_6,3_7,3_8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
+	' -2 python3_{5,6,7} pypy3)"
+# pip is called as an external tool
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pip
+	)"
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/argcomplete/argcomplete-1.9.4.ebuild b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
index dadb76efe1e6..65ae7e0e5033 100644
--- a/dev-python/argcomplete/argcomplete-1.9.4.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/argcomplete/files/argcomplete-1.10.2-test-pythonpath.patch b/dev-python/argcomplete/files/argcomplete-1.10.2-test-pythonpath.patch
deleted file mode 100644
index 18bd22cf1893..000000000000
--- a/dev-python/argcomplete/files/argcomplete-1.10.2-test-pythonpath.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 003cc45b1fa45c766e38c3230423a5662a00d371 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 21 Nov 2019 11:29:41 +0100
-Subject: [PATCH] Prepend to PYTHONPATH in test_console_script* instead of
- replacing
-
-Modify _test_console_script() to prepend to PYTHONPATH instead of
-overwriting its value.  This is necessary so that it is able to find
-just-built version of argcomplete that is provided via PYTHONPATH
-(vs requiring it to be installed in system-wide directory prior).
-
-Otherwise, the tests are failing:
-
-  Traceback (most recent call last):
-    File "./bin/test-package", line 5, in <module>
-      from test_package import main
-    File "/tmp/argcomplete/test_dir_pychyg9vqx/test_package/__init__.py", line 4, in <module>
-      import argcomplete
-  ModuleNotFoundError: No module named 'argcomplete'
----
- test/test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test.py b/test/test.py
-index 98da760..ddf5a03 100755
---- a/test/test.py
-+++ b/test/test.py
-@@ -1185,7 +1185,7 @@ class TestBashGlobal(TestBash):
-         with TempDir(prefix='test_dir_py', dir='.'):
-             self.sh.run_command('cd ' + os.getcwd())
-             self.sh.run_command('export PATH=$PATH:./bin')
--            self.sh.run_command('export PYTHONPATH=.')
-+            self.sh.run_command('export PYTHONPATH=.:$PYTHONPATH')
-             test_package = os.path.join(TEST_DIR, 'test_package')
-             command = 'pip install {} --target .'.format(test_package)
-             if not wheel:
--- 
-2.24.0
-
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index a572665af700..7af7a189a198 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,4 +1,4 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-EBUILD argh-0.26.2-r1.ebuild 714 BLAKE2B d2d8389c20b4962b96912768db91d075f912f13ce1c7d35992d4c300049de6d2b4d7b35084d45f982c6ab1300619ec64525cf84736e8e225289419fbecc7d18c SHA512 49bcb1bc4f69b9f7de7405248b5b0a09d0d135bbaf9042688aa1d6f06cef33ada4c4e4ddf53d1f474690423cef7ce512fb4bbc853e75a601ac29d4cd29c6ed94
-EBUILD argh-0.26.2-r2.ebuild 683 BLAKE2B b08010525352f00eeece024743afa0b8cf9a5127399a9ae0d1efe376c9167a7a546e706e261999ca1aa9a44809aae7d22b4c617eb5b3a11cad686d7003cb8c05 SHA512 c4b30d8c866f91e66a5890bfe3265ff85849d74a130d271debfe35a6ffbae3483ab655dfb84a7fbb8143fa31872618264d2630ca9ccebc353bffb27bb541ad67
+EBUILD argh-0.26.2-r1.ebuild 705 BLAKE2B 7268050d35be0ea9d22159354361dd95ddac6f3c8cb5e09a2f853a28ad8c7563c5055ecf783b6303eddd6a4ccfa9b9ea05aa3152883360d79bb8f3470bc7ebad SHA512 3a7af618fb4a8f5abfc38ef3f5be9b88609f04196b0eff621a405e814be81dbcc95e7f155b265a1991030a8d9c3df2193641cd1ecf873f61161074507b295604
+EBUILD argh-0.26.2-r2.ebuild 674 BLAKE2B 87b39f8a50d59ebf9a70b224fc914e08161e8e7d7b2d20db4fdecb1d381146db5af968143f19a0219a8bda9d49c891f7894a15d52af77e5d7b15c35bdeec2996 SHA512 829634e9490976ace30947a7f4e810c8c0ee22690aa90a576df35620ce9d05a3f79d690690d3ab6f47ee585e1cd853fed0b2928d7f4437c900a79777bd639a64
 MISC metadata.xml 307 BLAKE2B 172ad4318c81373d000c3138ea3efd86183f1b17fbbdbb793a99aa43732c85ebbaa90235096835ca07a70db115fad09debf1f9ca3c5a46f6f01b6273b4e04d5a SHA512 6236f4f54de93e831341d268725741e3a46e4a4cd815ead1d5751ab551ec06fd58acb410d2cff973c992d564b69f21e6e56168ad567fe3e7c810eca5c2a83712
diff --git a/dev-python/argh/argh-0.26.2-r1.ebuild b/dev-python/argh/argh-0.26.2-r1.ebuild
index e9a2af54e2a8..92e57f4fcdd2 100644
--- a/dev-python/argh/argh-0.26.2-r1.ebuild
+++ b/dev-python/argh/argh-0.26.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index 2e430e755443..7152a12d75f4 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/argon2_cffi/Manifest b/dev-python/argon2_cffi/Manifest
index 2c891a07ab20..d226aaae357f 100644
--- a/dev-python/argon2_cffi/Manifest
+++ b/dev-python/argon2_cffi/Manifest
@@ -1,3 +1,3 @@
 DIST argon2_cffi-19.1.0.tar.gz 1808120 BLAKE2B f30afe3c270fe4ff41ee97418a49480d7ec7235db659d033926cb7380afb664ab61cfb41fbae2f8581c6873c474746431a1360abc134244803acab73836ed533 SHA512 9bc10f0dfbb199e0ae0c9bd6a7c9183a5b0b108966d89bacf8ee744a926d400bccc14869b889a2482be4a5c48bd7ed0464cf316ecad74b758a5493beed7d466c
-EBUILD argon2_cffi-19.1.0.ebuild 1197 BLAKE2B 35304ed14c77f7c484f9d214fe094f745a261f72de4a5cf060864b9e898fb1042bf710cd9b816fb8e6b7974c557f6bd00f2937a3144cba0ee5d1772fc75efeeb SHA512 38576bb1b59507ff0913c42ff337215223e4a0545e415333cc55fcab6b27bafc2d203c3d393cb71909214456d5da7d660da10cea0a44df4a2d1024d7c563e059
+EBUILD argon2_cffi-19.1.0.ebuild 867 BLAKE2B bcb80c268529555b0e40a81fac1dc9328728a40e78d5a54cfe76d312010319d8e34fdebe1e0c2102f7f714c3a0f53fa900e33b825be994d804b61b053fa0da1f SHA512 0b914708f3c0e182f42a3e1ef73642ef5e61603f60604371b989dd4cc3e4fa228d9a5d10946cd666a261c0c5f34055db6dac263ea99cc9d26ff2ae68b95abd32
 MISC metadata.xml 727 BLAKE2B 8ca033f1a646a7d55dd8c78f483998d8ee34863d372c88b0d9e42c7d1fa7a14962b9a2e9c19aa13d0d35c7cd0e68599419a9641982dd376d76ade5c98d3cf338 SHA512 770cffcd4f6ecbf4fe93463bdb1670a9ec882844da62ac8ce18d606efcda6f314a3942b205d6a4ec54aee6b53f784faf6d19482601c9b570567217c31c6846b2
diff --git a/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild b/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
index 88f98ec94292..2be6653bad4d 100644
--- a/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
+++ b/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
-HOMEPAGE="https://github.com/hynek/argon2_cffi"
+HOMEPAGE="https://github.com/hynek/argon2-cffi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
-	~app-crypt/argon2-20171227:=
+	app-crypt/argon2:=
 	dev-python/six[${PYTHON_USEDEP}]
 	virtual/python-cffi[${PYTHON_USEDEP}]
 	virtual/python-enum34[${PYTHON_USEDEP}]
@@ -25,28 +23,16 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
 	)
 "
 
 DOCS=( AUTHORS.rst CHANGELOG.rst FAQ.rst README.rst )
 
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
 python_configure_all() {
 	export ARGON2_CFFI_USE_SYSTEM=1
 }
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/args/Manifest b/dev-python/args/Manifest
index 79c000a848d3..c93e7c49c6c0 100644
--- a/dev-python/args/Manifest
+++ b/dev-python/args/Manifest
@@ -1,4 +1,4 @@
 DIST args-0.1.0.tar.gz 3048 BLAKE2B 4f31ec64f740640c9c927585ae35877654eb99beb5f0673ce8561ee093efd8b69eb5cb0c08a304c2319a38496935b62286f8bb9b2f1dca7c9447671ab0e3732f SHA512 664d33386af2ac0b9d30344db5fb5cea4210f600df28708ada19266afec237d6e6d9d57f03c8b64cfdbb6a17eff05f633a2cc4ddbfedc320dd133be246aee033
-EBUILD args-0.1.0-r1.ebuild 436 BLAKE2B d7dbcd80f67ab7123a514904cc7c065e8e22b2d6377e43eb8bbfc635546e8bbc988f53d41179ad51aec61589df13a288a1d0a02e4e4405b010e17c10d948f0d2 SHA512 8fff36659bc0c614fe358aee2c6ff05ff7fc99e116ff747c2d5b681aaa2f1136f1fe927bcb06a09aebd08b612c644cc434bc12529c9214ace2d61f70ed3ccc74
-EBUILD args-0.1.0.ebuild 435 BLAKE2B 1d329203f195a6de45b2db948346d058b862ba267a696f475057a0c9f4f5d09dfec112c5d0b392b7782a3ad0a907430e1ef044ce79ebf25e86e46411e0475d9f SHA512 a7aea5109a29c52e727a297f78233988f8eec97634558099628b0b6a4ac7c446e429856d99be993c7aa75f286bbe011f5166bb70c7c94821848492af21be43da
+EBUILD args-0.1.0-r1.ebuild 432 BLAKE2B 476f9764c38ced0ebbcd8e4d25745a2864201983c6d8038eeeb0704f3a8526a90f5c6f6d0329d2877b5ffb8888e6cba61007f4e3ded67bd019e81cd901cc7e97 SHA512 52eb722d80e80c29d983ec5a1f6101ae67062753b437b047e5b687e48f6b6ce46dab8b79693e38f5b2fea00fecd540a12953c3d59fccfdee5dd1cc5466d91d13
+EBUILD args-0.1.0.ebuild 431 BLAKE2B bc5441a9816b6ebe225c19714d3dae456069aed107b805eb4e16571d209a2a44f18c396bd1caa7fc23a8b071199a2736ee1dc8750b141dd956cedc0dcf58d43f SHA512 83bc707c8a2e1ae01a7db1cc4e2af0d668c7a02481bc83786316a94b76f8ea25881ea6e680692ef2d96f7cf4acac7911e38a83ff829d39c11ffcad699240387d
 MISC metadata.xml 289 BLAKE2B 9c506f540fde2d50daea0c83d559dc27456e9de951493e87d2df4f9dccd50ea7b26046815c05587608667939108dc7a335792ca923b8ef731ff6511024a2e003 SHA512 ad6f17d093352ca14bbef50d96672c676a617d17fbb0813ac36b469b0c72e88858afa427f788877f40496a4300af6d6e893d80b6ad0eaf64759e1a19bfcd97fa
diff --git a/dev-python/args/args-0.1.0-r1.ebuild b/dev-python/args/args-0.1.0-r1.ebuild
index 228d6f726ce1..9f8832f03768 100644
--- a/dev-python/args/args-0.1.0-r1.ebuild
+++ b/dev-python/args/args-0.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/args/args-0.1.0.ebuild b/dev-python/args/args-0.1.0.ebuild
index f16cc707904e..98631360549f 100644
--- a/dev-python/args/args-0.1.0.ebuild
+++ b/dev-python/args/args-0.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/arpeggio/Manifest b/dev-python/arpeggio/Manifest
index 15380d974458..48708ef3225b 100644
--- a/dev-python/arpeggio/Manifest
+++ b/dev-python/arpeggio/Manifest
@@ -1,5 +1,5 @@
 DIST Arpeggio-1.5.tar.gz 18856 BLAKE2B 5ceb26d034622c448ea29adc70f6934dc2de8335c526f02d91bc4bccaf435d462516830fa6b124638fdcb0b4aadc859d602e1ec59469077d796b7534fa28f7aa SHA512 533c59635556a3446c04c8b14f53e8ad6a7a39869f39d958bdd52b5a55ad43c533bc42a41999cc149015b34470d8ff0eca295ff1942c75b33a58a403a604c449
 DIST arpeggio-1.9.0.tar.gz 757412 BLAKE2B f89850a16b2ac1a87cbac3ae0f10d4c04af6097bfb9292abec24c8b938bdf3b837c4d292650b2e335ee5b4b03cd149e1722e35ceabf1b59fd4577ba7e62a8e44 SHA512 179ec76813476823f316471e1b313f377064a75879c52060e547fd755ae72947594dc4d6e58a798150620e82c8b123fbd88484881c12ccb311c47bc93a45a0cd
-EBUILD arpeggio-1.5.ebuild 712 BLAKE2B dd9d6d3e36cc6eb64f147dfb5128737a8d7861076f13e6a64142f30fe1f7f2d054ecfb61f302122e3a6b00c61d15d64d45fffe6573958767495a69ca3c230f79 SHA512 bd8f7eb0d1e9aad3c68b6ee50128e01d8c94146b0ebdd91e14747c77532d18f26cde1f57554b784c7fead5cb3e3939ff9a786e58ad42c4eaaa443360d1029949
-EBUILD arpeggio-1.9.0.ebuild 770 BLAKE2B f314edd4910bead4b826cdae5f4571e47b616fd9ade5c943deed2a5aaf716fe258aeee3c4e9a29eece328087511ba1d965ed38f86caf4f827ec41cbb8b9954ee SHA512 bc2083888d8269befc093062bae072146ff97ad70d714ff5cdf19c713919115c35b3233d66e2da6cd984e7d2776c10a1e96d463b3a40bbeaa0eda54604d665be
+EBUILD arpeggio-1.5.ebuild 708 BLAKE2B 6d39d038862746bad6cacf7e36024da27b9bf941de83087c03f7a08739388f4c96ba8d498bf9db323b5fc1b2ed5ba2a35c271bd893e0f7bcd7e7b3004e030842 SHA512 b83260e697f5c5c816ca672d963fac8f6086eec3203358cb2e541f3feec71bb3ee9965446a110ec6d942da1e5112d6ff660eecfdb1b0000bda5f821fbce01069
+EBUILD arpeggio-1.9.0.ebuild 768 BLAKE2B a4a076fed67afa2abf20b892b45854fde2b863215db69f36b4aaabfdfe225427471c91470e54382497420e1f32d70cb7212461f1888659df2f9d724ee39db723 SHA512 d970b96f863743b45cab654bd20384f367a606ba1d772f6a5ee5ac19bf6ac25c425ce8382d9658cb579a97b280df253839add0eedca04fff51b5bcf7a1ad018e
 MISC metadata.xml 351 BLAKE2B dac9aebd47c197ac00e60de049d4bfc62b3fc4082e1566475ca0a9fba0435385dc475cb6c2e7eaa6e4b91ea0ccb097ebe55da23f5f3e00325c7c1fc74e66d278 SHA512 cad3a1cb94dacf951a07d5a98a35bd723b00ba6745f52f1ff2f5d20c5c63fa9c1e875617a0833f822a1177cba0805b07964eb6ca0abbfa74f93dcd42f601a935
diff --git a/dev-python/arpeggio/arpeggio-1.5.ebuild b/dev-python/arpeggio/arpeggio-1.5.ebuild
index 00a0e283679b..d979ae5cd264 100644
--- a/dev-python/arpeggio/arpeggio-1.5.ebuild
+++ b/dev-python/arpeggio/arpeggio-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/arpeggio/arpeggio-1.9.0.ebuild b/dev-python/arpeggio/arpeggio-1.9.0.ebuild
index 272b3b430fd3..e9f42e7e31c5 100644
--- a/dev-python/arpeggio/arpeggio-1.9.0.ebuild
+++ b/dev-python/arpeggio/arpeggio-1.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/arrayterator/Manifest b/dev-python/arrayterator/Manifest
deleted file mode 100644
index c49ae4cd99bb..000000000000
--- a/dev-python/arrayterator/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST arrayterator-1.0.1.tar.gz 7840 BLAKE2B 0fefab32f797f37aef37be4582f0e77ad2e07dd34102bddf763e93ac3c5843d57adf04eee547645fa5c547e3704d6a4da4e824182d55cb8201f40552203b98e5 SHA512 91d560f1aac1e64cda6feaf6ead5ab8ac59555e046760b6caa8cd80c47b7c96f032bde064eee82b9d5e287e8845afa2a17b3460c68561d8ff3c6fe7eecb69cb4
-EBUILD arrayterator-1.0.1-r1.ebuild 661 BLAKE2B d011f97ddbc86c2611bcd16f0347f3cda52f4d3b0a02ecd784ed149df4d741736ad6d6289f66085fde6b862280370e8ecd5d6ebc38d0a59eeae511aa2526c54e SHA512 12413c8e7d6a93a44c7e1fb225338b19713b99fd076bee074f4a0fb4c980ed7facaeb79caab65cb275416cb50c8aeddb5ad8a37260fd5ee85b575b46872e8240
-MISC metadata.xml 315 BLAKE2B 06b10d9d9f1f9ec60d97c5d42392b403ce4f76674cfb96eea3e832189476f5b5160428017db5e49da2eda7ba294a588a56deb601a3d75fe36d4797b740a67e70 SHA512 ffe338d470a70adefae552059ffae9658594cb62a5dd946c3616286bf53963a3116ce0f1c5ec1aeb65753cd2dc8544db192a7a80c2039f0bfd839113fa026289
diff --git a/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild b/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
deleted file mode 100644
index b4299a09a288..000000000000
--- a/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,28 +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="A buffered iterator for reading big arrays in small contiguous blocks"
-HOMEPAGE="https://pypi.org/project/arrayterator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/numpy-1.0_rc1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	cd tests || die
-
-	"${PYTHON}" -c "import test_stochastic; test_stochastic.test()" \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/arrayterator/metadata.xml b/dev-python/arrayterator/metadata.xml
deleted file mode 100644
index b7763250cf5a..000000000000
--- a/dev-python/arrayterator/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">arrayterator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 95842fe618ab..9764555daa10 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,7 +1,7 @@
 DIST arrow-0.10.0.tar.gz 86506 BLAKE2B 3971e2aa4cefe70ce84267830800bd80bedb68caf3bd595614ac6bd77051bdff7c0e33ee09d569f4bcb9991255050b533464ade12c0d850a1d46dab3f65f03bd SHA512 a2baa23f1424b21506f3b664f0ef02d09f91b9cfaf6e0badfa544f42c750ed51136ae0e8910ac24207c0265a1b233f10a6f3cbafee3124b5f5c4fd965cfd01c0
 DIST arrow-0.12.1.tar.gz 65356 BLAKE2B 671f1094bc71b4ab03a967929cd81cff46e0b48d509ef82827e28403eee3a92a8380a4e4903599ae3f2e2813ebe3b47a46846e32d98f78eb5866c643999e3a79 SHA512 f18449d3629ff5630aa77f6068e7cd3e2ee32ba35e1d0d972b03fff1dd817d2d936a38cdde45b2b8f218df5c1ce3e316404e33103d8bc82af9bcc377e37afb09
 DIST arrow-0.13.1.tar.gz 148509 BLAKE2B 7a47f8886cc2f50f6dda682daab37c599aad15c7e4a0c76b1324f9fe3a1b8168e3a2b29352bdc9c4daf0fa3b3843fa919d5256997c673bcb24ca033312242b60 SHA512 4933e02fe4ef7a632d55e5c6d2cbcefe6840467c809e0377be92f02d0dc10b5b2421cea2be7ddd5158236ec80f44848125253bfeef5a2ae635a3b9c5761fa105
-EBUILD arrow-0.10.0.ebuild 726 BLAKE2B 570cb774580782c5f8cbd3d0463710c46acbfaaab8a7f7b58bf9fdf1a2b41fddc9e3f29322741cd9229189b3739532c0993164cf3912f89600bd84a10e1b1edd SHA512 95ae503ac7fb20f39bab3dd6860ca2d7bdf657a28a024aa2451adefdc84e9fd2e1224353c8248c0c4f3e5a1c9bcbb439a4e7410b760c36e942ca569cd3030f80
-EBUILD arrow-0.12.1.ebuild 736 BLAKE2B ef55776d1448d9d8d9656fb8920be0ce02230a6fe3ecf3a6f4fd800f0296479ecc66c14230b4eddfdc810e63456f3f32f691e00439db3773aa72b05d9b91d020 SHA512 815efc9e41fa81c681875ce077f066dc3639dd6e73b4d29ff022747af41d4fd28b69e061220b26e2a64109c9e8423c023c0f495bebe0322d19de1f04a812e192
-EBUILD arrow-0.13.1.ebuild 821 BLAKE2B 4a3db0694152acaf04f89ec4b377195c07040aee25af95027952e4ae206814809775ab28d7e7c95cb3c3213a1c7263cca853e615e5fb10a52769b5b7ff6906df SHA512 da0dd4a55d627fac51f07d18e588193ba27f61eadcec1a2f06d6f17ef91cb24c2a01fce6b3494ed295c2f1993a87d1f1fc48ed4d5f365ad86e7c9e2a4f21b673
+EBUILD arrow-0.10.0.ebuild 720 BLAKE2B 7a662547be55ee22301b37e9d33d1129e73eb76cbddf567869a4ddd902bc8a3a05192c84490640f26492754153433945f35c9cb49bfaee41d52a61d79f921c72 SHA512 8e81bb95345eacad41cf1afd0f5437a676b2a9c6ecef7445d62c2b14e9bc683d36a1f334ef5d3868f41f7861a5f2a26012a5db19eea44ed134bff655dec38cb4
+EBUILD arrow-0.12.1.ebuild 730 BLAKE2B ad7ad4a060ca9c61a94243aef246681b983f57d59f0d6cbd5aaa2ef44a44f3947b15f1e0ebcc68e3bb28b7cde767c3f6a4f09b8fc346c7a79bc99a84f5b22d09 SHA512 2e0e2ecfa555defd1eef12fbd6267132d142a2e7671139989b3c8795704601606bbfb8c02fddde33adc3b24352600d81422dadcc61016cf94782e6886f38f193
+EBUILD arrow-0.13.1.ebuild 817 BLAKE2B 7cd6d76b4ca924073206c5e38554b682dac84fbdb8ba5e82a3575aecd853aca81057476115aeff46d0faba7649678bf9125c403d4816b3e47fde057180e02792 SHA512 418cf2fc8e0d79ea36e6515d3d4f088b61864a839c599a2c2bf0cd54d505c3b27c77db1b97b08ce58b27560339267863e66813334872b7c398dbb85bc8dc0f88
 MISC metadata.xml 364 BLAKE2B c9cf1b8e27d0ae03d522628edffd052df05f37a857d671df00ec0f2868c598ba983b32b66a98c0f4ff814f8fb5fcad8482592852c38384c7eb99bb71f0ac8b32 SHA512 4288f06ad48ba051749472da3ff12ab53d50226c053764c9c175ac13a24b8817c731350ae153ef83ee02db04aa6ba7735cb30b8e35339badc0e46b6998773015
diff --git a/dev-python/arrow/arrow-0.10.0.ebuild b/dev-python/arrow/arrow-0.10.0.ebuild
index afc9b1ee120c..141e3d0f796d 100644
--- a/dev-python/arrow/arrow-0.10.0.ebuild
+++ b/dev-python/arrow/arrow-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Better dates and times for Python"
diff --git a/dev-python/arrow/arrow-0.12.1.ebuild b/dev-python/arrow/arrow-0.12.1.ebuild
index c328b67b62ca..a3e878321157 100644
--- a/dev-python/arrow/arrow-0.12.1.ebuild
+++ b/dev-python/arrow/arrow-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Better dates and times for Python"
diff --git a/dev-python/arrow/arrow-0.13.1.ebuild b/dev-python/arrow/arrow-0.13.1.ebuild
index 5f98bc6ca5c5..ed980c88a606 100644
--- a/dev-python/arrow/arrow-0.13.1.ebuild
+++ b/dev-python/arrow/arrow-0.13.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/asciimatics/Manifest b/dev-python/asciimatics/Manifest
index 84046ec20fcb..513f97d85d7f 100644
--- a/dev-python/asciimatics/Manifest
+++ b/dev-python/asciimatics/Manifest
@@ -1,3 +1,3 @@
 DIST asciimatics-1.10.0.tar.gz 1536207 BLAKE2B 9a96150d43e4f59932e4a23a9d580698a053b35a6f5ddc9c967e4202ba1e2b0bb181bc88d9382725d2ae4b10241397f421d8e0d9baf1f269cb52977115d47296 SHA512 dbf2d44f5d667e59bbd14db761ad60a482b8afbbc8190248cdd49a8317575194ce9d2127f9275599bca800f1d5bd5e57fed5cd02b28d739c2a203b15ddebce7f
-EBUILD asciimatics-1.10.0.ebuild 1240 BLAKE2B afe5e411f69853eaee22e9609ef823f240414b4887a5c5515385b7c1628664b728e6b4406670a4cc43dbd3bc5d3774e1514862d0de4049b81100251201e212ac SHA512 a280651f51a55d28c0f525261b59541e3e607d994f767b01875de727b85dcbe888bc7db2d109c22e0a3cd4ca4deee1853a258086abe4d2a67b8ef26e90ef4c7a
+EBUILD asciimatics-1.10.0.ebuild 1230 BLAKE2B 72f92c79e8ddebc86b17ae692e9975cad6322330aacaf37f934c0355d631b13cbe2e68e914cfaa597819ec58fcb4ea8911af6ace14d35084b435727ac492b8bd SHA512 8318bb6b7245f2e19a8c3c7c546c787f5c3338a99a55bcb47a91de873f416df47e46e3e3dfe37bc867f65f169663ee38278a4b3f78daec083211aeae8eb0d994
 MISC metadata.xml 473 BLAKE2B 2916025fe2913a4628af8501e0c906ec58bae5ee38176bbb9ecae7d2d00b24694db8aa8ec59794a65bcee01f31bfa4eee1a5f8063b7e5c729c83e182665602d2 SHA512 8c5d4633c383b369dbba29d1176bf553b09429493b8d7439b338ed6ce52a6eb2d26a9752b1496a89680b53dd47de1b72028b8857f97bfd23bdb0e19b4b34f3d5
diff --git a/dev-python/asciimatics/asciimatics-1.10.0.ebuild b/dev-python/asciimatics/asciimatics-1.10.0.ebuild
index 07362efd779c..ed77bab76706 100644
--- a/dev-python/asciimatics/asciimatics-1.10.0.ebuild
+++ b/dev-python/asciimatics/asciimatics-1.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -21,7 +21,7 @@ DEPEND="
 	dev-python/future[${PYTHON_USEDEP}]
 	dev-python/wcwidth[${PYTHON_USEDEP}]
 	dev-python/pyfiglet[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 src_prepare() {
diff --git a/dev-python/asciitable/Manifest b/dev-python/asciitable/Manifest
index dbcd55ea812f..8cd63142ed47 100644
--- a/dev-python/asciitable/Manifest
+++ b/dev-python/asciitable/Manifest
@@ -1,3 +1,3 @@
 DIST asciitable-0.8.0.tar.gz 299640 BLAKE2B e98aab28a0173793ed609084f691af50f67d753da3117288525e49f4f1b42efb52b051f79a3a3206a2b5ad9d9fa4325f9a819e30be3136284f2bf8c38d08051c SHA512 a74dfcc3515a9959af8a0ec0906e440aaabd402ba8987a581c774bc97344abece0fbb62957b0a5af89e290a505acc4df1dad5a22c08ca2ea8c7c65ca0a582a22
-EBUILD asciitable-0.8.0-r1.ebuild 607 BLAKE2B 5ca2a5d2650f53bcec796d60f96ea4fc439763482729cf9557ae6391a1b5faef2d48e5565bbdb3835af6acf6bc53326262c6088162f73d8c03064f11edb60f44 SHA512 ff7c2de8325e25fdb53071303ce678d17bd782e4aaa70a4be41ea36bb3a1c74b09a325900f4b57fd39cc50c3e2cd3cf911ad14489ae71011b0f22775c894584e
+EBUILD asciitable-0.8.0-r1.ebuild 597 BLAKE2B 75e3216452975c5887f2577cef8d30fb59eccf811e0d5c7851031037c2350e840fa7da0b41a1bde8edf9c3de28620075f8edb16dc8d41e2987155ad0c6703d69 SHA512 5031186b3ed425b2bd2131f73106150656711c8c1c2860305e8070a449ef93ed3397d89078bb04c25bac1c26b48366812ce5a7289efa5eedd30663bdfb442167
 MISC metadata.xml 525 BLAKE2B b58bb02eae6a988738fed0de5a064f2599f5ac1c1aef8624cf90a70c2f2f2a5a8b2a6df1ced26fdc0ef08eb35b5e66e9e18a2221c8822db9a2fba634e5c050c1 SHA512 1d2a6f8011dbd066f835120db3bcd6e71e57da7b1c5241409220bd3410c9c2f55a0dba0d88c336dae753fbca72a9c99977bea51a2e3813cfafee587432a90f6b
diff --git a/dev-python/asciitable/asciitable-0.8.0-r1.ebuild b/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
index 2ba9ad80ed5e..a360b54f5258 100644
--- a/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
+++ b/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/asciitree/Manifest b/dev-python/asciitree/Manifest
deleted file mode 100644
index a461e3d93685..000000000000
--- a/dev-python/asciitree/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST asciitree-0.3.3.tar.gz 3951 BLAKE2B 3ba081424ba94cc8afd9f688e78c3f05d99b01746023ce359285ec9389c1a8f4d471cbb16e2b66ac271a859379de0f195ad7072f016878b5c444bcfe4d2445c5 SHA512 7b61134299ff1cb907cbe74811dc1cab09d6aafdefad599e67025b85d8e35ffc8538524a8c6bb683009f7ff7f7f946250e81afac3fd3b7f3b3b0cd8e528b494f
-EBUILD asciitree-0.3.3.ebuild 390 BLAKE2B b662a2bd7bce56b256a4fdbd3055d0f0555b238a2551334eff0898d2d304b7411694ecb4c3937b27c2cb5f20a9c58d38bc24e99e2d1f7da31653ca3dac9d1424 SHA512 c8f531f558e8108a40c5dfcef5ad71f6989af38fe79425e79204da98a6abc4c83d6e37cf18dcbb13917c438ce008340f8f13c5e585eb9a5124e138378924e6d8
-MISC metadata.xml 318 BLAKE2B b16b67cc35cf940393676c21bf414ca1563aba4e6ecbc0e3d97fd618ea3540970c23e27840062e0a1c90283dd22fde9681159707e2c98ae967297810bc9ecbf8 SHA512 40e32765c53019a3b7355317409ce188f6cd50bcd85abc2870db9535f453f0bbda73b35f7fa8aaee69144a0a62bdcf23b7149c16746d33cdb7d91765b0521050
diff --git a/dev-python/asciitree/asciitree-0.3.3.ebuild b/dev-python/asciitree/asciitree-0.3.3.ebuild
deleted file mode 100644
index 71c50f6e3f1e..000000000000
--- a/dev-python/asciitree/asciitree-0.3.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Draws ASCII trees"
-HOMEPAGE="https://pypi.org/project/asciitree/"
-SRC_URI="mirror://pypi/a/asciitree/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/asciitree/metadata.xml b/dev-python/asciitree/metadata.xml
deleted file mode 100644
index 34e95c6c0757..000000000000
--- a/dev-python/asciitree/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="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
-	</maintainer>
-
-	<upstream>
-		<remote-id type="pypi">asciitree</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/asdf/Manifest b/dev-python/asdf/Manifest
deleted file mode 100644
index 8057bcc5bc37..000000000000
--- a/dev-python/asdf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX asdf-1.2.1-Disable-test-that-require-http-server.patch 2043 BLAKE2B e0f25fc217eafcdf451bc5a6417ca2b4521db0a17b7144e6654c22d949a3915b8b4194bc1c0ab1a92add64e3b1e20384a521afee58b3ef946339670133dc5981 SHA512 0bd18603e37027d4daf9227fb7c34b48dfca47bd01771dac6be894938c625b0753769764e7ac7b9b23463c6f1d52f7732b960764ccf3ca8d3904e0d5de88e2e7
-DIST asdf-1.2.1.tar.gz 320828 BLAKE2B 8050b24616ba56ac8d946a579da1a8962e54f22db45c8c95c45cccf4552355f68e6983c3831b60aa18d7c33a3914b1984ac31ce3461568bd5c4dee6625c113be SHA512 ac8b94ee1c0e2f1d99d55e38d13cd78e7fb14fbf8b5e15a725c61560e14ab96401a53909954ac6cde825121c6a1205b2d3b8ca474499b90461a2f0ebb5db4638
-EBUILD asdf-1.2.1.ebuild 1349 BLAKE2B ae1b1ffe8148dc8ca15af63c5e6b317a3dd409e66d795da26a9e3be9863fa9b749c6a12d731365149c26ed59d82c4f5e4b4b2863102ee11f69b950e1ba663b02 SHA512 735557a98e3b52fa038661d019b6a89e9a6372789e837146535058f660b792a9b5a6d5ba909a5f5f62110b437bf416e5993544e8fcdb8452c9ace0894685f5dc
-MISC metadata.xml 912 BLAKE2B 71dff7af9bd8506d3819e00a21b45659088ef3876f0f8a481809ed7f4f8c53e04044ff6ac6adabbaa60be00489cd4482c3c7c853bd240789175c2310885a8b82 SHA512 3594bcaf9bb04369baeeea29f728653efbbe2e77b2b77127a34d6b0bc03e5cfb7405f21341df351e86accd774838808aafd73c533c8995d875882436cc898c66
diff --git a/dev-python/asdf/asdf-1.2.1.ebuild b/dev-python/asdf/asdf-1.2.1.ebuild
deleted file mode 100644
index 5a7e8cbaa666..000000000000
--- a/dev-python/asdf/asdf-1.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for the Advanced Scientific Data Format"
-HOMEPAGE="https://asdf.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="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Disable-test-that-require-http-server.patch
-)
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		PYTHONPATH="${BUILD_DIR}"/lib \
-				  esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/asdf/files/asdf-1.2.1-Disable-test-that-require-http-server.patch b/dev-python/asdf/files/asdf-1.2.1-Disable-test-that-require-http-server.patch
deleted file mode 100644
index e59d48246000..000000000000
--- a/dev-python/asdf/files/asdf-1.2.1-Disable-test-that-require-http-server.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Sat, 5 Nov 2016 14:03:24 +0100
-Subject: Disable test that require http server
-
-Network connections are not available in pbuilder.
----
- asdf/tests/test_generic_io.py | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/asdf/tests/test_generic_io.py b/asdf/tests/test_generic_io.py
-index 3f48eab..b90ca7e 100644
---- a/asdf/tests/test_generic_io.py
-+++ b/asdf/tests/test_generic_io.py
-@@ -241,8 +241,7 @@ def test_streams2():
-     assert len(x) == 60
- 
- 
--@pytest.mark.skipif(sys.platform.startswith('win'),
--                    reason="Windows firewall prevents test")
-+@pytest.mark.skipif(True, reason="pbuilder prevents test")
- def test_urlopen(tree, httpserver):
-     path = os.path.join(httpserver.tmpdir, 'test.asdf')
- 
-@@ -260,8 +259,7 @@ def test_urlopen(tree, httpserver):
-         assert isinstance(next(ff.blocks.internal_blocks)._data, np.ndarray)
- 
- 
--@pytest.mark.skipif(sys.platform.startswith('win'),
--                    reason="Windows firewall prevents test")
-+@pytest.mark.skipif(True, reason="pbuilder prevents test")
- def test_http_connection(tree, httpserver):
-     path = os.path.join(httpserver.tmpdir, 'test.asdf')
- 
-@@ -284,8 +282,7 @@ def test_http_connection(tree, httpserver):
-         ff.tree['science_data'][0] == 42
- 
- 
--@pytest.mark.skipif(sys.platform.startswith('win'),
--                    reason="Windows firewall prevents test")
-+@pytest.mark.skipif(True, reason="pbuilder prevents test")
- def test_http_connection_range(tree, rhttpserver):
-     path = os.path.join(rhttpserver.tmpdir, 'test.asdf')
-     connection = [None]
-@@ -348,8 +345,7 @@ def test_exploded_filesystem_fail(tree, tmpdir):
-                 helpers.assert_tree_match(tree, ff.tree)
- 
- 
--@pytest.mark.skipif(sys.platform.startswith('win'),
--                    reason="Windows firewall prevents test")
-+@pytest.mark.skipif(True, reason="pbuilder prevents test")
- def test_exploded_http(tree, httpserver):
-     path = os.path.join(httpserver.tmpdir, 'test.asdf')
- 
diff --git a/dev-python/asdf/metadata.xml b/dev-python/asdf/metadata.xml
deleted file mode 100644
index d9905abb5f0e..000000000000
--- a/dev-python/asdf/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-     ASDF (Advanced Scientific Data Format) is a proposed
-     next generation interchange format for scientific data. ASDF aims to
-     exist in the same middle ground that made FITS so successful, by
-     being a hybrid text and binary format: containing human editable
-     metadata for interchange, and raw binary data that is fast to load
-     and use. Unlike FITS, the metadata is highly structured and is
-     designed up-front for extensibility.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">asdf</remote-id>
-    <remote-id type="github">spacetelescope/asdf</remote-id>    
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index 5c6ba143fe03..25aed3790403 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,5 +1,5 @@
 DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
-EBUILD asn1crypto-0.22.0.ebuild 628 BLAKE2B 1c756a659b40938c7706aeda357f6f7d4119308e8d608785fbb4e1a9f92fa14cfe2736883b3c67fa7a8b17cfee69f4913d66ca004a7179e97109591f31dd8fe2 SHA512 9c220d9bb2a40f0c0ddd904a75a0b7fcad4b5c94286acd4cc307cc0df442470f4b8c826e649d03ef580409218d6635dccfbe6f38e97c499dd556c1051af034fe
-EBUILD asn1crypto-0.24.0.ebuild 856 BLAKE2B c385d799de045eb119bdeaba4047df85c4efb7cd48f3d8e717ac578628c87912088a4bb567d61e2f446f0e2c763b627e82cf3bc648ad6c539fbbee0fe0bc9f3c SHA512 b8ccb691535b796f0816bccb8b06064960e38f8adf0696d520d1582954360a1ad64acd9863612999078b1766497cefa6c88d65a24efe0ed6beb2cbc19366a8cc
+EBUILD asn1crypto-0.22.0.ebuild 621 BLAKE2B db20b906a6aaa2b572ea5450ac6a1a6cec7b6aa8f1911acb6d039c2ca7bc16e249b4f7a50d3b60d955292da0a0edf9573140a186171a36f81f2236c78180c152 SHA512 83fd0e21fb4298d90713704f2654fce751f13a35032f957b85f4b4e69bdfe5a4454355ed51fb38aea2300dd970edc8d9a045fef50291b45335b59989ac3e0e9e
+EBUILD asn1crypto-0.24.0.ebuild 850 BLAKE2B c4bfec7fd2dc510c577f0308becb0ca04aa3477c1c2d4c434e471d583def7dfa904604d223a6ef8a444da8721412143d785c0b77901f07049bc68c5a4706baa3 SHA512 613a13875b0dc4bb0cfdfefd916b89ab5937eb47729b4f4535b6f470d9d8642228a8b344b4d369c7476a1e6a949e47a29cb0268440797c4dd396d162c6a4c654
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
index b57285fbdbbb..5d75aa7fb76d 100644
--- a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index bae8b6a2665f..b2587708d2ab 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/asset/Manifest b/dev-python/asset/Manifest
index e71860928345..1c80324f63bc 100644
--- a/dev-python/asset/Manifest
+++ b/dev-python/asset/Manifest
@@ -1,3 +1,3 @@
 DIST asset-0.6.11.tar.gz 28071 BLAKE2B b9222e0c51ccf4417afccde445c1ebb8583459977c8a39ad7650eb7c6cbf5b6252c239c714635b8b4d95ac16e53c2edf268871d733e71d6b89a403472da3fc62 SHA512 b9c002febd234d1342de92279a0e1fbaf30d53e9efa46e3ca2cfced43f4a9582bf731545185f868752a20d97c5ab0f7b5fbb453c1fdfe4e67d6bfcab222d0bc7
-EBUILD asset-0.6.11.ebuild 809 BLAKE2B 52c0e1ace64bd744576f068e81fefbab566d17b2209394df20746a4f217c4e4ba22518a045d8fe8c95503b555204bece6ac46c60f3aaae93291bbecfc1d89447 SHA512 8a8ddbf005d3dccd7e5d9933dae1cdfd351b19e06858f922c3da6f31880c8b324b98eb571d6e7cfda58eef9858250fc1fb93e48339db52d2d69942251034fefa
+EBUILD asset-0.6.11.ebuild 799 BLAKE2B 0eefcacc436b24f1de4bd3aafeaa5ee475f67d89882b573bb175c34207150cb03bac2755cb0057623b853ff545ca5197c9cd23adf0ea14ccbf1691d1e5265d1e SHA512 45ccad01cac84ef7a631c86c91e33efc917b67b2dd6d4a5e631d54423b748f47516ff543d77eb1d04f293ab40615f619205b544653d77107bb06ee8dc25b4cef
 MISC metadata.xml 365 BLAKE2B b55ad33a8138a899c1285b3aab6566a09fc6a7b1f88af60f8b55a244aafb54c7ab56fc22c27af86fee940d2d5eea138946b62be7322d286eafdad3abbd861b88 SHA512 2a64c1ef39be430881823d5ccfd8a3b9b18a7b9fa59947eee0479d392fea9eda6c6402e40eac77c72296a1ff49c7b0962134fb60c357511a821096e6b3e78d70
diff --git a/dev-python/asset/asset-0.6.11.ebuild b/dev-python/asset/asset-0.6.11.ebuild
index f47c107b6558..c886a2d1f62f 100644
--- a/dev-python/asset/asset-0.6.11.ebuild
+++ b/dev-python/asset/asset-0.6.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/astlib/Manifest b/dev-python/astlib/Manifest
deleted file mode 100644
index 2e085a798a19..000000000000
--- a/dev-python/astlib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX astlib-0.8.0-system-wcstools.patch 1129 BLAKE2B 1a899aa13fcd9829db69ea42f1e4bba5a908db6a1f2c9c7a38a4b6ba9ffeef4ff71c64088c396a7eb888d15799ab2d88efe69d96e2f050d32474a7c83ac9f69f SHA512 8e6684cc1899aa5f5c995ea128643cbf07adb114901a07c30c45a8718f8f031aff2f67c91bca802caa2049463f41f1e064cd000a51a00f79c82a921d05f7cee8
-DIST astLib-0.8.0.tar.gz 708939 BLAKE2B c60f1803ac2b488eb24d04b8c8ecbf405299ca9cee0489952a7aef02047cf78db8b7b3f46b00aa26fbdd59ce8035e8612ce0042c912718c03e4e7f1f3914f328 SHA512 44e3903c1353fa69841a28e61e52f9cb7165edfffa2eba17cbf6bfd671ed8e8745cf2364b418a3f012bb56088fa7912ef0b00d8c9d96f7b4ce196881b4b05a31
-EBUILD astlib-0.8.0.ebuild 985 BLAKE2B 1f159f6dca899eb189ba6eb0dfb0d109cc402841cfb68c5c8f5e986353d9922dfc195a2e9aefbaae86867e5c748220edca1b412d7e14afab7f422b33fc5829ff SHA512 5b5d5cf94bb19d68f8a6d71f0238ab1f202f01dc2d838d6274574c9fc7c2cad069ee61bdb98c82dee3bce1d165c3670aa8874369acdd037cc9f3ccb190e9d175
-MISC metadata.xml 870 BLAKE2B 31455c78eb4e099f839104ee756580036cb3e570c2c40efe520807cfedd516ff891c5c234cda7e17a5c59fbdd7db11df39e0fbc302b85514191dd42162b09017 SHA512 015e4d3a47a6ca0bcf94d9926d13f46c2787967c0aa3c8c0ca89b7bf52f70841cd5c81f800b96426c03343126c33698b0ed2064d59094405a4d7ae108b4477dd
diff --git a/dev-python/astlib/astlib-0.8.0.ebuild b/dev-python/astlib/astlib-0.8.0.ebuild
deleted file mode 100644
index cca8f0ffeef3..000000000000
--- a/dev-python/astlib/astlib-0.8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MYPN=astLib
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Python astronomy modules for image and coordinate manipulation"
-HOMEPAGE="http://astlib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE="doc examples"
-
-PATCHES=( "${FILESDIR}/${P}-system-wcstools.patch" )
-
-DEPEND="sci-astronomy/wcstools"
-RDEPEND="${DEPEND}
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MYP}"
-
-python_install_all() {
-	dodoc CHANGE_LOG RELEASE_NOTES
-	insinto /usr/share/doc/${PF}/html
-	use doc && doins -r docs/${MYPN}/*
-	insinto /usr/share/doc/${PF}
-	use examples && doins -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astlib/files/astlib-0.8.0-system-wcstools.patch b/dev-python/astlib/files/astlib-0.8.0-system-wcstools.patch
deleted file mode 100644
index 5b8746fe07d1..000000000000
--- a/dev-python/astlib/files/astlib-0.8.0-system-wcstools.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Use system provided libwcstools instead of local copy
- Also, build the swig wrapper from its source file.
---- a/setup.py
-+++ b/setup.py
-@@ -84,12 +84,11 @@
-     PyWCSTools is distributed (and developed) as part of astLib.""",
-     packages=['astLib', 'PyWCSTools'],
-     package_data={'astLib': ['data/*']},
--    cmdclass={"build_ext": build_PyWCSTools_ext},
-     scripts=exampleScripts,
-     ext_modules=[
--        Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],
--        extra_objects=oFiles),
--        Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],
--        extra_objects=oFiles)
-+        Extension('PyWCSTools._wcscon', [sourceDir+"wcscon.i"],
-+        swig_opts=['-outdir', 'PyWCSTools/'], libraries=['wcstools']),
-+        Extension('PyWCSTools._wcs', [sourceDir+"wcs.i"],
-+        swig_opts=['-outdir', 'PyWCSTools/'], libraries=['wcstools'])
-     ]
- 	)
---- a/PyWCSTools/wcssubs-3.8.7/wcs.i
-+++ b/PyWCSTools/wcssubs-3.8.7/wcs.i
-@@ -14,7 +14,7 @@
- /* %feature("autodoc", "1") */
- 
- %{
--#include "wcs.h"
-+#include <wcs/wcs.h>
- %}
- 
- /* WORKING */
diff --git a/dev-python/astlib/metadata.xml b/dev-python/astlib/metadata.xml
deleted file mode 100644
index acde5aed73f9..000000000000
--- a/dev-python/astlib/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  astLib is a set of Python modules that provides some tools for
-  research astronomers. It can be used for simple plots, statistics,
-  common calculations, coordinate conversions, and manipulating FITS
-  images with World Coordinate System (WCS) information through
-  PyWCSTools - a simple wrapping of WCSTools by Doug Mink. PyWCSTools
-  is distributed (and developed) as part of astLib.
-  In Gentoo, PyWCSTools is using the stock library instead of the
-  bundled one.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">astlib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
index 6bc627bae476..1a4adc3fdd4e 100644
--- a/dev-python/astor/Manifest
+++ b/dev-python/astor/Manifest
@@ -2,8 +2,8 @@ DIST astor-0.5.tar.gz 10999 BLAKE2B 278bf193003dd9f8f2d5c6a33229e3f4013bcf0618de
 DIST astor-0.6.tar.gz 28684 BLAKE2B 372314e0d92721d3cbb7fe0fe8bc42635e023ca590c4845c8e7c499bc947c3de0a3679fff51a07085d26bca37e83301ef9c0b66548b929a8f018760c8370319c SHA512 4f9598229f8a77901573fa1841716cc810ec8e108b155d8c7c50ab477d794f8ecd1784df66a1272a2739cc968d8eb6632f62b4d6ef067682db05233f127be409
 DIST astor-0.7.1.tar.gz 30633 BLAKE2B fbffcbe9cb372c82741788624674c4397c3534eb2b3f44577174279c38d0c45366b444dab1384a251a74ca87840ce150ab1ce3f0439987ba2a19adca270af74f SHA512 c52fa0b8ec5003c04d978c23361d423283a43be2c027d8d39ce1c45528dbbedb98b2a269ce97152bd9a4c942d95a6ec55720757b7811df4f34bb6744e2fff781
 DIST astor-0.8.1.tar.gz 35090 BLAKE2B 11e5e77d4f8a8617d0330d3091a1571744bb5773df926f41b10208e1c5beb7e82ad8961a460dd326e9130591dade495c77a36456618a97a5c22e41237805a4ce SHA512 cfc69a21fcbc9842bc26fbe8372e5c700d9957cc0c3c62de415155d2036163951f0ece88557829afd7c4dabba8a8e238a2335994ddfc020cb3db913eed5b6f28
-EBUILD astor-0.5.ebuild 700 BLAKE2B e6d6182b16ba865774b874ab62b684e86a2532a9bc2829541b66d8e5767b4d0f81dcab2611f4de9d158b0f97c367dee69c9284e6d2c880c5cbd9231bee1517c6 SHA512 59115c07d4b07c537be7ed3b4485e87e2592bb8c258094a2b243fe13862d326614626536bc468dae2dea2c655f4be57335b57ba190fe73cdb0f34af3e48d0231
-EBUILD astor-0.6.ebuild 702 BLAKE2B 34192a9325e8944a092f435d4da722ed6275a1e19b671377e667f33a7638a4e4d83fa8466266a08477acc16985ede29421d405f48f585d26fc439a9fb8eff558 SHA512 ddb31dde514867b65faa65fba9e9f01df162b0154353109a4043c742446d48c711039259413fe088474d7acb18cb541121ea01340780f6da65b531784d971547
-EBUILD astor-0.7.1.ebuild 709 BLAKE2B 4cd8c9b2939565238e1ce5fcaa499343d3189d29b7c111a8c9b7b2538204b0ac8724e5f55088f27dab786cd66e8f831e0a01c78694325f6475cd1d98e0f6734d SHA512 b2626ba8b88e6def595b7c556f8290d4441fbb138398c67249151726db072a34582ba290a5873103e60e4336872929968f82eacfd4ec92a96ac3be2cedd0082f
-EBUILD astor-0.8.1.ebuild 606 BLAKE2B 00409902588b037f4c5ecbfc21a1b8bc0237f536824e59c683f90041f53e0a53644bfc1af93a8fb81bd5b025532cc781f07d7cd21a0750d465b2fa0f25f09fa5 SHA512 ffd7df3eec8ac594677767c19d927f3235db7c458b9bd7a3b8054e937edeb22a93c6e02b5992c30535b1ce0158260348ec1f908997699bcb2a1bc3f2e3a2d8ff
+EBUILD astor-0.5.ebuild 691 BLAKE2B 72d173b0651f6d7f647f57ffbc05d0caaad4ce202e2051eaa658c7e6fcf15019269e382aecda5e7d5e6b45fea376bc36fac7b4e8d6d0352efefd503e21ab6099 SHA512 0aa2a53168e12d3634c1228cc9e596d63bcf1bfe33d7086608d02d4cebe8546ac172e970799a7e57b49f37374eaac8684e5b9dc837eb8ed0f93977eb895999e8
+EBUILD astor-0.6.ebuild 693 BLAKE2B a6bda7a8fa0ebb50e3e24b180fa85e5ef608e35505e51db8af22bfa24033186462859c61834dce98531dfd7d244b1cd5003c00897a62106da4c2724a3608d366 SHA512 00fdf42a678ca317bffada89ae00bfe04a9132a80f49c7adaa1a9b9debf44f7d598983d69eb708d4d231c8b23b89e927a340ce00b04fa0985e74621a522930d2
+EBUILD astor-0.7.1.ebuild 697 BLAKE2B 97b698447994084c3d33479f3bdf4e95bb628607c04274aa4cdbbcbabc53ea7834b79fda9d3dd47034f06c7345b8c7f2ff30034da9a6bee8ac9c535b659d5b3a SHA512 f3d18a9b3a61214d8b1c990d9363345c84193d8517c4a75368233ab1dc1a784a10dd121588b609b077e581c0cec815d4a7ffccbfa0dbab1cf3145ff62fbb9f05
+EBUILD astor-0.8.1.ebuild 597 BLAKE2B 2a71e35be5efdeeaf8b595534566eaeb1754b820fee4c3bfaa1fb4336b5f1aa7c344c889eaedbe5ef7d85c7f42e8fa2820d21acf5e23f2bafcab43a15d54af8b SHA512 77d8b55dc6825beb1bc7a28c3a50e9b8b5264fe6e684605fe0406c6ee31de0abd12a2e878e4e8b3d46d12bb1fbba3ff10843690af8f9108515607cd0ef5b7f17
 MISC metadata.xml 308 BLAKE2B 4eb385f663046756ae848b87d82301e3d2ddf388eae73431024dbf4758c5d4787f879ad167eda72ae011ab41cebc48718fc40a5ed86f3d382dea6165baf1a3cc SHA512 86cbc23c8c077f9849004214ba32c5096e64ea8092ff1940f3fb4c9bf4fd420f2883aed76a7b96774f639cb98ef14429a9e55993db07173443ee16b3ac393aab
diff --git a/dev-python/astor/astor-0.5.ebuild b/dev-python/astor/astor-0.5.ebuild
index 46e1498471fe..5d9eb8b17cbe 100644
--- a/dev-python/astor/astor-0.5.ebuild
+++ b/dev-python/astor/astor-0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/astor/astor-0.6.ebuild b/dev-python/astor/astor-0.6.ebuild
index dd90bdd3eeac..e44eb34e0d21 100644
--- a/dev-python/astor/astor-0.6.ebuild
+++ b/dev-python/astor/astor-0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/astor/astor-0.7.1.ebuild b/dev-python/astor/astor-0.7.1.ebuild
index 39071f8adc5e..65e1aa654bfb 100644
--- a/dev-python/astor/astor-0.7.1.ebuild
+++ b/dev-python/astor/astor-0.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/astor/astor-0.8.1.ebuild b/dev-python/astor/astor-0.8.1.ebuild
index c4da9ca17c5b..3a53d4ae0d26 100644
--- a/dev-python/astor/astor-0.8.1.ebuild
+++ b/dev-python/astor/astor-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
diff --git a/dev-python/astrodendro/Manifest b/dev-python/astrodendro/Manifest
deleted file mode 100644
index 69fbf8fa610a..000000000000
--- a/dev-python/astrodendro/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST astrodendro-0.2.0.tar.gz 4594802 BLAKE2B 19499d75d6ecf024c399595926c41fcd19b7dda017cbde2d6466cc85c9a7e5eec15ea459691589dcc89013b3ca8c76532d85eb565635a526283a63e88b9fc5a2 SHA512 2079e2844537b74b8c40a5e2d9c04a2e7940f12fa0ac77dc95f39d7ea623ad43d8635043336f5cedff6076599a44c4b8908dbd0b67d33c47310408496bce1b1d
-EBUILD astrodendro-0.2.0.ebuild 1405 BLAKE2B 9052e50d9bd942229b868a4405a2e395a637eff714f2722b4b47f6a5c9a845d38a0c99298e48efc9e0474fa48ed54704ab30fbfcb2040de8a894f916c2db457d SHA512 6285111c422d1e1d2d3bcffc8b22c0c5df7d747d48fbcdef4b74c145fe5bcd0752bd08fc8121071cd4c977c18f632cc218213f7dc91fd2e3298e77de78b96757
-MISC metadata.xml 530 BLAKE2B 46d64e0eda7d2d5f8001dfe42f9036a96ba8ca0da9a6a3a535407c91bff68adc559144b0937b9d37b08630e69de46402dd3728b73099e7ade1ece8a710ef9a63 SHA512 939a42e5c9eca1901749e5ab2242cdd375df94cc85a68076825023a4bd48d7866400023b74d2ae7271d638bb706155cebb049b9e190aed0b286055937b9f8aa4
diff --git a/dev-python/astrodendro/astrodendro-0.2.0.ebuild b/dev-python/astrodendro/astrodendro-0.2.0.ebuild
deleted file mode 100644
index 2cc0f59afb54..000000000000
--- a/dev-python/astrodendro/astrodendro-0.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 xdg-utils virtualx
-
-DESCRIPTION="Python package for computation of astronomical dendrograms"
-HOMEPAGE="https://dendrograms.readthedocs.io/en/stable/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/h5py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-	   dev-python/matplotlib[${PYTHON_USEDEP}]
-	   dev-python/mock[${PYTHON_USEDEP}]
-	   dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astrodendro/metadata.xml b/dev-python/astrodendro/metadata.xml
deleted file mode 100644
index ea17c673072e..000000000000
--- a/dev-python/astrodendro/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    The astrodendro package provides an easy way to compute
-    dendrograms of observed or simulated Astronomical data in Python.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">astrodendro</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 9feaa5e1d1fd..90c905b01689 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -2,7 +2,7 @@ AUX astroid-2.1.0-no-pytest-runner.patch 474 BLAKE2B fde7f34aa9e1feefb29bf0a993b
 DIST astroid-1.4.8.tar.gz 184091 BLAKE2B 7180b98c757c8681dd0abaed1e79d2c58ce676aff07b539af8776d589ff23770335d0ba4ce5c9b3940b0428dd10174e7c6eff66aeb500e6ac561734e27975be0 SHA512 54bb20edf5518b417470a2d63210802b267fe727f9d30e1ac5000db00a7894739b1c4249468fb55df81b55d382f3a5bbe019876141f7ee4d94040fd699dc0c2c
 DIST astroid-1.6.5.tar.gz 255688 BLAKE2B 7547e4c537f73ef77b61fba1ab8640c7cd50014ae52e4e4b8f8209a000c55bbdbb1ddcd3fb90d078f99a34d4a4779adabc8ad71af40c3a4547fe3e0d814b328c SHA512 f51f275c9f04809c8993d187cb62fadc84003ddc954d371356474dbe6b719868406fd9188c560f5b658b8b44bb6a4d3ee0785e809e789ca117e2bcbdb58aec53
 DIST astroid-2.2.5.tar.gz 281829 BLAKE2B 2cc341caac381fb44b0302e8057a6e2105a6a82dbf807f8a59598e15c5658cc30d4c32e3b58ebbc94c4559f2b2274373f5ed6c4b86b4e8eff86dd91a5520e7ce SHA512 71c8c26314f666e2b9519a83dd9476fbfe0ad7d72f5308f6a94b83c5442dc695bc3e51155df45586ff2ff0eec522a02286d00ac566d542f0b82e5e0d0d7d9c65
-EBUILD astroid-1.4.8.ebuild 1088 BLAKE2B 27844625dd01b856e02e528e7da2be65b32065ea6fcb9d51efeebb39259f2da9737a793bbe980e0b9dd7aa7d082ff94b4b06752e0a45d1cda26c00841a9be6a2 SHA512 7e76ceba7ec1b416aeb5ceb82d948de7871590b978a2f185c50459dbf7c7252488f945d22e0d6a8b79a045586325dc97c434954c428b0ea7c0aa88d0b6b04a2d
-EBUILD astroid-1.6.5.ebuild 2043 BLAKE2B a37c65ac4e57e8a9dd0bb88fed6c4b61f3832c4642ba21b550b6b72f575d66cdda12e804640af42770e9453e2b63e4c82a3926456bf37bf8896046e7d87fc9e6 SHA512 afad56b775df2ef238690408f74a38cd0bf5d2b06a06ae5a0e4851c586f55141bcc685abc881fa677bde1c92dd6c624ae1b18558f5b8c167e02c60702bf94a76
-EBUILD astroid-2.2.5.ebuild 1314 BLAKE2B d482c42da533c9aeff010ce104073f648436c85a7ae407640921a333ca8f49a2613c320c26d5f5f36ce4ed17534025fb0669c87b605b9896f00a9830f26c6805 SHA512 25792ced1975caeb5eadf2af0ce7b84d2c5424222d03f3b9c2829e13c139b6c68d58160691d03cb1ce8632328aae799ed7dcbb4c8f791719ecbe7b2f7c9bd084
+EBUILD astroid-1.4.8.ebuild 1079 BLAKE2B cf5d56bc203f7545fe0b2b7c149e7db2ab16923a68a5214389e7c27091007d3d4b3d5c83cff177bb029de0a2e148e908f489b0a9b7992b8f4a3ce29d42bc9b77 SHA512 2a48edfc1babf719c2db66fdacc0e7fa4d56bd6e3cd7eafe9a19c39c36a904ce68395fee61e9bce6c564ea6da44f7caa037eeee0b43a4c9c6487233ff0c5ccbf
+EBUILD astroid-1.6.5.ebuild 2036 BLAKE2B cbb4a4aa0aa92014bd5206a51ebd845c2f7b9c7fb3c4a9358f50de4bff3cb730e64d16a67707f6820efc0834cc27bcf4944d5e9b33e22dcbbf25c5a2f9cfd84a SHA512 49c1b2832593d175a54819b026fcfdb481428a089c980deaf7048d53413263be682bf81da3a646e156a5f58ad2a478b1ef2d42b3d9119e582570237f19563e7f
+EBUILD astroid-2.2.5.ebuild 1312 BLAKE2B 56ff2f3fed59bba1f55c28e6ef15fedb9412e7f982762e502875afc7c1ed37ae87a911e2b58641f4fa3271b6cc8a9798c6125926beb4b577d15331b955bd7d76 SHA512 58d7fad12ee4e3ab48dfded72c5c8128ee934b6a49ce636fd75c7e0e3b6e8bc29bfc6664a0d334c9aeb167ea307c568a6e4d0b671b72dc75cab15adbee40cc8e
 MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
diff --git a/dev-python/astroid/astroid-1.4.8.ebuild b/dev-python/astroid/astroid-1.4.8.ebuild
index beea443b500a..c8ab6cc0393d 100644
--- a/dev-python/astroid/astroid-1.4.8.ebuild
+++ b/dev-python/astroid/astroid-1.4.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/astroid/astroid-1.6.5.ebuild b/dev-python/astroid/astroid-1.6.5.ebuild
index f64200d9c1b1..9ddd3f86523b 100644
--- a/dev-python/astroid/astroid-1.6.5.ebuild
+++ b/dev-python/astroid/astroid-1.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/astroid/astroid-2.2.5.ebuild b/dev-python/astroid/astroid-2.2.5.ebuild
index 6f60036aed4d..88949dd0eea3 100644
--- a/dev-python/astroid/astroid-2.2.5.ebuild
+++ b/dev-python/astroid/astroid-2.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/astroml-addons/Manifest b/dev-python/astroml-addons/Manifest
deleted file mode 100644
index c3c7f0762247..000000000000
--- a/dev-python/astroml-addons/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST astroML_addons-0.2.2.tar.gz 51052 BLAKE2B 82b1933d335096f85d311fff8e252a4c36ce56922084c8ffdc01535cee3529c705627ff986d1bfdb60a8b9679db5042a1511a17adf93860509a47aad2660efe9 SHA512 97c61c731d3dd8cadbfcb36defd1a678f776a2012fda1159621d3e364e25ca74cd0d284980f52095a2df31973cefba09f9b3efe72ba95b4f65ca13e4aaec5e20
-EBUILD astroml-addons-0.2.2.ebuild 637 BLAKE2B 66dda7e6f96e937f55ffbbd189edfb3eb40a9370f8d0b24fd9b440901dd9fbe93651ffd8cf708338f109e4046545aade49298b93608baa4fa86c4aa073bf4245 SHA512 727b497bb60ef39eeb2235af2176eecda434cb6356cd4bbad703d00a5164168cd555355ef04d66b16912b7227d4e40c3856cce4faad77b732e2bd2d9217042d0
-MISC metadata.xml 1161 BLAKE2B 4d6ea9a526f2a8a9283557dbd1c9fb350480dea5df19f16cc8f0494faecf077a749046bebef738ee6c5d579ece0b1aabc4c869d0711fdd0fa64711ea8fc6689f SHA512 3010f13652915ec0a1daca8a0bf090e7e9e7522485080492b3fd932b2154752d56c95a586ec693bca1f6c6062e8c49e35336daf987b9119c5c97c1a8350f64e4
diff --git a/dev-python/astroml-addons/astroml-addons-0.2.2.ebuild b/dev-python/astroml-addons/astroml-addons-0.2.2.ebuild
deleted file mode 100644
index 4723dc43980b..000000000000
--- a/dev-python/astroml-addons/astroml-addons-0.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MYPN=astroML_addons
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Performance add-ons for the astroML package"
-HOMEPAGE="https://github.com/astroML/astroML_addons"
-SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/astroml[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MYP}"
-
-DOCS=( README.rst )
diff --git a/dev-python/astroml-addons/metadata.xml b/dev-python/astroml-addons/metadata.xml
deleted file mode 100644
index c9e92bac1f13..000000000000
--- a/dev-python/astroml-addons/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-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    astroML is split into two components. The core astroML library is written
-    in python only, and is designed to be very easy to install for any users,
-    even those who don't have a working C or fortran compiler. A companion library,
-    astroML_addons, can be optionally installed for increased performance on
-    certain algorithms. Every algorithm in astroML_addons has a pure python
-    counterpart in the core astroML implementation, but the astroML_addons library
-    contains faster and more efficient implementations in compiled code.
-    Furthermore, if astroML_addons is installed on your system, the core astroML
-    library will import and use the faster routines by default.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">astroML_addons</remote-id>
-    <remote-id type="github">astroML/astroML_addons</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/astroml/Manifest b/dev-python/astroml/Manifest
deleted file mode 100644
index 6df687068619..000000000000
--- a/dev-python/astroml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST astroML-0.3.tar.gz 242925 BLAKE2B f0a5d650cbd7e16b7c2a47cd83206312d7781c5a9b118a726ac19355f6de76c4fc2301ac91c7ad44b8076b61c167ea9c34272e9d63442e3fb606a0bf31acbfec SHA512 7b9c6824ec1c09c35a0e9ea10674c93c7f301a3b15c5104357d9749534b78203c33eaac82c8ec1d1c51bdf30e1408d21002d1d2e7e243aa08c28cc7b1f1ab74a
-EBUILD astroml-0.3.ebuild 978 BLAKE2B cd055402f163ae8840d09cf0ff5cc645c5b0c1f6a1980f8a98c1c692706872416d53f6a04882db1876920ad7b0bab4a371d3b5cebb5d8311917b643e4765b9f2 SHA512 cb93815022950cf16fb2ed155b4c6e631a837a3ca545f83efd16cbc70ebd98e1acf39b21ce6a14731d4e9fb36ee57cddc058b545386d0ecbf485a1365026cc16
-MISC metadata.xml 770 BLAKE2B 6eeb2a402eac5479a10bba907afdb5f6f38ab037d6af5b6624e40119c1edb57bff94f27106b6125ed33115e2190ab0c7dcbaac6c436ccce511d3b73e276369ab SHA512 b1134c879b3a47608584621255916dd406a1de7f14b4ee4cb4a6e0f241f83dc86e4e48c54075b574e063f569049f0c793293fdb13098d874be75f0860ed0c082
diff --git a/dev-python/astroml/astroml-0.3.ebuild b/dev-python/astroml/astroml-0.3.ebuild
deleted file mode 100644
index e352f57c59f2..000000000000
--- a/dev-python/astroml/astroml-0.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-MYPN=astroML
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Python Machine Learning library for astronomy"
-HOMEPAGE="http://www.astroml.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	sci-libs/scikits_learn[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-DOCS=( CHANGES.rst README.rst )
-
-python_test() {
-	virtx nosetests --verbose
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/doc/${PF}
-	use examples && doins -r examples
-}
diff --git a/dev-python/astroml/metadata.xml b/dev-python/astroml/metadata.xml
deleted file mode 100644
index ce125c4d77e8..000000000000
--- a/dev-python/astroml/metadata.xml
+++ /dev/null
@@ -1,18 +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-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
- AstroML is a Python module for machine learning and data mining built on
- numpy, scipy, scikit-learn, and matplotlib. It contains a growing library of
- statistical and machine learning routines for analyzing astronomical data in
- Python, loaders for several open astronomical datasets, and a large suite of
- examples of analyzing and visualizing astronomical datasets.    
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">astroML</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/astroplan/Manifest b/dev-python/astroplan/Manifest
deleted file mode 100644
index 4b16e6ac6c3d..000000000000
--- a/dev-python/astroplan/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX astroplan-0.2-ephem-import.patch 505 BLAKE2B f8cf17ff9725dbf756ffce538225fa893c2122bf249001b4631549dd2663cd24eef988bc33456477ccdb2ed9250636397758db1c90bb2bcae1179dcd5e82e73e SHA512 9ea80ff153f9da458d377eb99fefa5f0dfdf448af196150e47bd19d3c5071f975b7746c6fe91c0042e92b3349a44d7c0843025d8069084bd779ebdb7160f0d74
-DIST astroplan-0.2.1.tar.gz 270482 BLAKE2B fd0d83e492a46c711b32899d6cbb93fac1708588028e8a0c72c76fa13bfdf9db3bea135a09d801deea0a7a67b114c9d8b7f8af5a642348303a392240cdc76363 SHA512 baa585ce2b651753b45c6bda78a93b22340b380197338ce3d27d36509c82c29053da237f1f1daf5c12ba08e0da27f7c3cc98daebedb703c944a3e225444f3aff
-DIST astroplan-0.2.tar.gz 264623 BLAKE2B 4343334ef12a13d3269a35403c89eb5c5b124de5f30e9512dce9ba47f1f1ee490e9caf7c7c8511f027eeddae33e2732bb2bad6722ec8b7dfb348aa586c905dfb SHA512 ab98402d2b0daf64aea4a10934c8e33097b92d3b7de9a2346fa3e318e672c85966c050f560bb3fc4c247e2fdd4c94a4b158d6a0dff6af9c83d6411613c663bd9
-EBUILD astroplan-0.2.1.ebuild 1485 BLAKE2B 8f73ddf31a1048012697f0a54c86fe3bfa82c2c4a1c66a031ab22a0aae2241dc3204842550e8e0634f2a8ac367e8cafabf2c4574370f4b9badf01c64ef458386 SHA512 854e1135fc0ece6bac973b9b244118a8a284e9c29853baea4ad9bc9f58f8158669d64e8d824999a4912b49592616dce5340ab352e411ff113362eadebc3b1d22
-EBUILD astroplan-0.2.ebuild 1476 BLAKE2B c26ed167efcb1f61865d70a5787edd3f6e7d23a5b50abe60cd56606681bc09ad1bdbf7c3aa63e6cc782e0cfd0fe34f5da8a39fd6879253cc03b5fe595b81e7b4 SHA512 1b65f353d51f16a8cb8111c4e702879b47e778328a06573acb3d02218ba24b84973a5efde7d9403dc5ccdbe5536a5d58cd36743aafaf63c66a6731c164e313ba
-MISC metadata.xml 580 BLAKE2B 4874e04355b1b3ee9b09fe0f55030436c8e538ea3a7727ce389879fec76e03b7285eb776d1b2c182dac19a1dac29f40c8f414f3eef0e4e4b505681507459ec15 SHA512 16cb9da0545ab48966ee589d6f6ed9dbf011efbecf5eeddd3cbca35d1369ea35fe7dee7cf89ea735ca83058b1e2ab8232d2f404cba35d100798fdcc0ab46a083
diff --git a/dev-python/astroplan/astroplan-0.2.1.ebuild b/dev-python/astroplan/astroplan-0.2.1.ebuild
deleted file mode 100644
index e1435494bb95..000000000000
--- a/dev-python/astroplan/astroplan-0.2.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Observation planning package for astronomers"
-HOMEPAGE="https://astroplan.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-	  dev-python/sphinx[${PYTHON_USEDEP}]
-	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest-mpl[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.2-ephem-import.patch )
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	echo 'backend: Agg' > "${WORKDIR}"/matplotlibrc || die
-	MATPLOTLIBRC="${WORKDIR}" virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astroplan/astroplan-0.2.ebuild b/dev-python/astroplan/astroplan-0.2.ebuild
deleted file mode 100644
index 831a8badcc65..000000000000
--- a/dev-python/astroplan/astroplan-0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Observation planning package for astronomers"
-HOMEPAGE="https://astroplan.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-	  dev-python/sphinx[${PYTHON_USEDEP}]
-	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest-mpl[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-ephem-import.patch )
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	echo 'backend: Agg' > "${WORKDIR}"/matplotlibrc || die
-	MATPLOTLIBRC="${WORKDIR}" virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astroplan/files/astroplan-0.2-ephem-import.patch b/dev-python/astroplan/files/astroplan-0.2-ephem-import.patch
deleted file mode 100644
index 59328290c07f..000000000000
--- a/dev-python/astroplan/files/astroplan-0.2-ephem-import.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/astroplan/conftest.py.orig	2016-11-30 23:17:49.057492656 +0000
-+++ b/astroplan/conftest.py	2016-11-30 23:18:11.076451659 +0000
-@@ -38,7 +38,7 @@
- try:
-     PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
-     PYTEST_HEADER_MODULES['pytz'] = 'pytz'
--    PYTEST_HEADER_MODULES['pyephem'] = 'pyephem'
-+    PYTEST_HEADER_MODULES['pyephem'] = 'ephem'
-     PYTEST_HEADER_MODULES['matplotlib'] = 'matplotlib'
-     PYTEST_HEADER_MODULES['nose'] = 'nose'
-     PYTEST_HEADER_MODULES['pytest-mpl'] = 'pytest_mpl'
diff --git a/dev-python/astroplan/metadata.xml b/dev-python/astroplan/metadata.xml
deleted file mode 100644
index b320e5789d60..000000000000
--- a/dev-python/astroplan/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>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    Astroplan is an observation planning package for astronomers that can help
-    you plan for everything but the clouds.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">astroplan</remote-id>
-    <remote-id type="github">astropy/astroplan</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/astropy-helpers/Manifest b/dev-python/astropy-helpers/Manifest
deleted file mode 100644
index 99515ac869f2..000000000000
--- a/dev-python/astropy-helpers/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST astropy-helpers-1.2.tar.gz 134346 BLAKE2B bbd341a164bfbbc7e6a7eed98f4880e9505d458a6ae3e94d0b4f6a3be074bc01833cbc62015f60b77bb0f11e96a394bb3e6002e9cfce59dc467e5259d06fb0e0 SHA512 c343b2d8a2f37f8baa94a4920c458b23fe28e5afa812937559cd10c1f6750bacc21aec38b8f52367ec68e2ea3ffeea85125290c320288888b3076abebb8f2e7e
-DIST astropy-helpers-1.3.1.tar.gz 136460 BLAKE2B 123b9de9dcf7dfa6206a4ec452b5c5fa782cad5600a3b8b8a63974ff0d15b64a2e1c77659d98bf14cfcd4e2ba5b5ea87700bea01ff5454c64b8f239d14580568 SHA512 796e9827a6c29e148474180c9c8f934a51a8ed455991d84a096025ed5d8aecf764a8152a8b24aa1aec6c254b39ca3f13ebfc764717bd0109022b86c384ebaa99
-DIST astropy-helpers-2.0.1.tar.gz 122118 BLAKE2B 366d3c2af2c53082d23b1a5951b0a6c2e990fc1ba38af98bc2e0647b421c17943fbbab8727370eb15c16339fc6265c6a42c7ce85c0fd8c3ff616b44777489213 SHA512 ce0fb8bccc11b4e26ae9455f156274a4fbdf82bb1b6bf6c8322b0cb218502bcf291c175149e71ebd31cbd0434455a3c974cccd38c38f9263ae624cf2edffd475
-EBUILD astropy-helpers-1.2.ebuild 591 BLAKE2B 208187950f1315039584b0be4a8b53a117c9c8318f98e4f934ba2f7c76e4c3706f4ae1447514663b4dfd37f02a859df47b6d8806fc0e0c8263b9c3c43f292741 SHA512 d5547e0e53ec394841cfbb9e21544f63e4450f14b3df3cff389190c8301907ad6faf06dd9fc4807b42d2bff991c1f8d29a7f3e9322753eab5fae7d904409c415
-EBUILD astropy-helpers-1.3.1.ebuild 595 BLAKE2B a0e30f616895dbb7b82370bddd09445420c6f94c47f016733f2b533c623aef30af1101af4a4f3af179fcd1161ff382cb4e48c637ea6b8e32b37075ec1c8b59e0 SHA512 6b64fe0425c5ba749c8f00bef900e51340e30e7592e11fd2ddb6b82573c2d906d88d1e81da71a3368c77704b881b7329972082d556c1f053a9adf68cbf7b9253
-EBUILD astropy-helpers-2.0.1.ebuild 651 BLAKE2B e7fe251fc83b8e9b37509f6ff276191f7841226fbf55c443e8d84c0a08366d4cfa3858aea2835c1aeb5fbd1102eb32213199c1fea9506d019f88944d7fe32553 SHA512 42bddbbc05f9ce92b07423fe59ec0832180d741b826ba195939ccf5a8417e4f6801990534fdcb2f4637a69dd6a7ccc367df272e563198e0b50695b02d6b034f3
-MISC metadata.xml 558 BLAKE2B 20913fc4b4872dea89683861f6fe80149a2f4d466d3e77e7a72ff14a2ea01d408e9fe5e945ce6dc8df16a2915acf4f8781b547314dffc93db2821898fa12a880 SHA512 89de5e5c1557ac63fe6147d8208ac796a740c818477590968ab25ca11ac3b90433c946f73459990bf431c840ce7c85c0bfb282ab2b93266cb8f66058ef0046a9
diff --git a/dev-python/astropy-helpers/astropy-helpers-1.2.ebuild b/dev-python/astropy-helpers/astropy-helpers-1.2.ebuild
deleted file mode 100644
index 56f01cfba51b..000000000000
--- a/dev-python/astropy-helpers/astropy-helpers-1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Helpers for Astropy and Affiliated packages"
-HOMEPAGE="https://github.com/astropy/astropy-helpers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_prepare_all() {
-	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/astropy-helpers/astropy-helpers-1.3.1.ebuild b/dev-python/astropy-helpers/astropy-helpers-1.3.1.ebuild
deleted file mode 100644
index ee8b427fcfac..000000000000
--- a/dev-python/astropy-helpers/astropy-helpers-1.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Helpers for Astropy and Affiliated packages"
-HOMEPAGE="https://github.com/astropy/astropy-helpers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_prepare_all() {
-	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/astropy-helpers/astropy-helpers-2.0.1.ebuild b/dev-python/astropy-helpers/astropy-helpers-2.0.1.ebuild
deleted file mode 100644
index 10745247c922..000000000000
--- a/dev-python/astropy-helpers/astropy-helpers-2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 xdg-utils
-
-MYPV=${PV/_/}
-S=${WORKDIR}/${PN}-${MYPV}
-
-DESCRIPTION="Helpers for Astropy and Affiliated packages"
-HOMEPAGE="https://github.com/astropy/astropy-helpers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MYPV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_prepare_all() {
-	sed -e '/import ah_bootstrap/d' \
-		-i setup.py || die "Removing ah_bootstrap failed"
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/astropy-helpers/metadata.xml b/dev-python/astropy-helpers/metadata.xml
deleted file mode 100644
index 845f41eee17a..000000000000
--- a/dev-python/astropy-helpers/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>sci-astronomy@gentoo.org</email>
-		<name>Gentoo Astronomy Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		astropy-helpers is a collection of build tools used by astropy
-		that may be used by other projects.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">astropy-helpers</remote-id>
-		<remote-id type="github">astropy/astropy-helpers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
deleted file mode 100644
index 4341d08d032b..000000000000
--- a/dev-python/astropy/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX astropy-1.0.4-system-configobj.patch 601 BLAKE2B 44a6b472c5e7a80d64eebf2cb42af82da5fd4a4690cfeb301fd42b61b41cc861590b72c02af256484a013414fdbb4496e3c61f5ffd7de70caf24057bfb6ca4ae SHA512 9cb9bbb65fb4c1e3f45256643cde6e2c3f5d9cf60bd3ce2d1aab7e1f4d1fc82581e85059b1f8f50af1217836928bec83db5d87633c1252448ddfdbb3ec3b819e
-AUX astropy-1.0.4-system-six.patch 568 BLAKE2B 2dcaebcc21874c4e23c5824f988a9ef1f38ae08e59f84e0e0d18ad4afb5b33801b7ee1c0da40fedddf615d4fae0479f662774bda2b16f68552c0ddf7414c958c SHA512 7687cd3fb2dc8f9d491ec15cc848c53aa58df2405bb1a48d68c384b5a3595502abcf2413bef95963c4fdf30470f95b0906a3fd991ad3b72f54a82ea2da3c8594
-AUX astropy-1.1.1-mark-kown-failures.patch 3418 BLAKE2B 01eba6db8810de60a07560626292f3bcff7208c1ce305763419e10559e60e68c862cafb884952a8df860b5f6c0f0c887915dbc2e80c2bcfc3648a3bcafe34125 SHA512 0b8b29c5cd9c9781c4f64c4595fba11efe1bd6d06be56a80fc8832a295b9c95993281014c642b21d40f3be18835de6d83796977c495a8c2ce1029c935d555962
-AUX astropy-1.2.1-cfitsio-338.patch 667 BLAKE2B a3f4b46ba405a132e2593a63816bc78f0474de4d6abd7e5465931b5cff3ef50077c8096a7bff0eff39ebefc0aede35db69d08b215c6aeb723c18ac14f4b67917 SHA512 4422dc794e2ad3ff91342b521b447115157c464883b928970ccba6a999bd7a1ceea2d5fc48f3c39769be4b9a174d571bd57ba58d1a08d90fa72f626932d60668
-AUX astropy-1.3.3-external-python-pkgs.patch 4890 BLAKE2B b105f42deea1cb99df3a4a76393e1cf682672901abaa4365f9b3ddb6950f89cbc6d505e332453345e2c524fcfd50857c4c208c751aff9ed95da3b45d994c2a2e SHA512 57aecc6768f4e7e3522fd3ec9bf39dbf769be0219df5780d1f535e4b228e9e90f3bc2330c6d8f3c4fab50a435abbfbe1478ca70f8067e5ffd11048783b7379a8
-AUX astropy-1.3.3-mark-known-failures.patch 3374 BLAKE2B 8cb11e06f54231e05571175fb6faafb2e0cda1602733a8393031083ba32d3e0dcec4ef0568b05d0d9e7d4e43488a08392843ac59aef76fed930ddc5f75502b40 SHA512 7a2b9bb3a97ed99efe5c61d98e141e53775a1c106c758d662e22f7f6651b05e1d2ac429983b7fe431a07c9b94a93a43b158d68251a03220d3138683c52083a06
-AUX astropy-ply.py 1674 BLAKE2B 1a23e1fb350c23a9ac35c0bfc4075219fa939642ee456446df59bf48b9f599ecf5ead24d029c054036f7b5911a6d07125c5489670c8f5908fad38abdb05bd719 SHA512 ebf5a7ec8df3c62b2f7ba91a4c5138558583186dfb945c89cc1454f9cafadc0e11bb5390c2aa57a993ca98e04dd06167e94d54fb1acc4b49c16e90dbab6b63d7
-DIST astropy-1.2.1.tar.gz 8179665 BLAKE2B d61dbb7a4e56d9a0273dd87fde5b6ed8b2fc8cd206eb51f57621d0ed48adffb76653e1ee5954a7b33ba6e0e2e9d3edb9a5a5afd269d674a899196280fea379fa SHA512 2ef37537a4c6b2ec50a1d898f600978475c9c5d2cb66ba19d06782656e9ddcb4aa6a8e53217e318448cedac45dac0dce0d8cc2fe94cddc15ebb306b3b0794595
-DIST astropy-1.3.3.tar.gz 8427036 BLAKE2B 60a9f78f01fe3607314d69bc66180f2afb0ca9a53f7916079f18bf982cff2cda8986823ec03ea8ecd439df6d213547067d04425f43536f37baadc1caa56e9db0 SHA512 15956d488a390ab3b4091146bffe6f192f22e7598d00e302c2bcf0ec9728911f48bef3ee4c71d331f58e57aec86292421d27f915ea16027a7f62c5d43f6a12e5
-DIST astropy-2.0.1.tar.gz 8220097 BLAKE2B f9332b828d2204f60a0e032e79fb841235a08ce3be974563fa0818f98d02c95743dc42ec6c8bae5f239c0917b030b073f5a9ee5cbf848682b7d2ca01ef9b5009 SHA512 0677b4f22a9eb7d3334109a639ec14ce904935dc58925d303dc98c27cbac2be7d0e95bd873cc21d3cd92e8e553481d203382c281f91cb7a4e41c27d1ff83aac7
-EBUILD astropy-1.2.1.ebuild 2747 BLAKE2B 0c65a5229e6f1189f26845c05c47f9746b7702863dc2dfd90de202f48b64e99e2e13793fd4bdd5daaa900204d9fce3a1448ad6bb5c5b0f79ed18ab78472a5df6 SHA512 30edd38b6bc8befb71697fece86e038baa42a7373b2e775bb2b318b0093b649292dbc2806443e4936505329d2a8d06bdc3ca6b53b6edf0338b02575a61182b83
-EBUILD astropy-1.3.3.ebuild 2546 BLAKE2B 9786579565d02e95c44029b568767cd9f4298458ed05af9814cb152ad2b05dcf4b66be321d31a238eed7f99b94e750ac5c689475d948ade0e819fadc9f55e6fe SHA512 a6053146ed0ea72c28931ea08b1071ebc9e01ce1a742c32ab5644613de3f45b7db3205aa101227e74272de7d0b39d8ef4b11031b96d7076f0689014904a188c2
-EBUILD astropy-2.0.1.ebuild 2520 BLAKE2B 21c48aa40f351d63bb630b2a5d4a3172a4966fa4401788965254610d355ff9de67d0fb946a40ca2fa21d05fec8961aed0242a55c24d3f8d35d8bd827c6e41447 SHA512 c3492075eb851e96e0379d9af61ecd2017fb3d9823057a9492a70833f2a159494bea44a57df7eb4f83ca56c0f0dbea4c8949ebee47923859051224e2094f0e18
-MISC metadata.xml 573 BLAKE2B 101ff09377b24ffca933b12059f2347b604ce6389420314a049ee16569ba62dad19c88611de4871b55b2fdc5ceef3e57100b52da7160928b3cf511f17e734d16 SHA512 a8054d4eb431348c9840e37a5877c2ce7cd4b73f213c1a24f9d3548dfc63a6756d80ffb9f96f78a053fb4ae2a39a424dbe46257be2e9f892f42ec18ff44fad17
diff --git a/dev-python/astropy/astropy-1.2.1.ebuild b/dev-python/astropy/astropy-1.2.1.ebuild
deleted file mode 100644
index e7786c0fe173..000000000000
--- a/dev-python/astropy/astropy-1.2.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="https://www.astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/expat:0=
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-astronomy/erfa-1.2:0=
-	>=sci-astronomy/wcslib-5:0=
-	sci-libs/cfitsio:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	>=dev-python/astropy-helpers-1.1[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		$(python_gen_cond_dep 'dev-libs/libxml2[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/h5py[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/matplotlib[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/wcsaxes[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'sci-libs/scipy[${PYTHON_USEDEP}]' python2_7)
-	)
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.4-system-six.patch"
-	"${FILESDIR}/${PN}-1.0.4-system-configobj.patch"
-	"${FILESDIR}/${PN}-1.1.1-mark-kown-failures.patch"
-	"${FILESDIR}/${PN}-1.2.1-cfitsio-338.patch"
-)
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_prepare_all() {
-	export mydistutilsargs="--offline"
-	export ASTROPY_USE_SYSTEM_PYTEST=True
-	rm -r ${PN}_helpers || die
-	cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
-	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	cat >> setup.cfg <<-EOF
-	[build]
-	use_system_libraries=1
-	EOF
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup "python2*"
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astropy/astropy-1.3.3.ebuild b/dev-python/astropy/astropy-1.3.3.ebuild
deleted file mode 100644
index 924aeef85f40..000000000000
--- a/dev-python/astropy/astropy-1.3.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="https://www.astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# ply-3.10 incompatible, keep bundled (bug #622802)
-#rdep: dev-python/ply[${PYTHON_USEDEP}]
-#prep: cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
-
-RDEPEND="
-	dev-libs/expat:0=
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-astronomy/erfa-1.3:0=
-	>=sci-astronomy/wcslib-5:0=
-	>=sci-libs/cfitsio-3.410:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/jplephem[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},jpeg(+)]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/sphinx-gallery[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},jpeg]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mpl[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.3-mark-known-failures.patch
-	"${FILESDIR}"/${PN}-1.3.3-external-python-pkgs.patch
-)
-
-python_prepare_all() {
-	export mydistutilsargs="--offline"
-	export ASTROPY_USE_SYSTEM_PYTEST=True
-	#rm -r ${PN}_helpers || die
-	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	cat >> setup.cfg <<-EOF
-	[build]
-	use_system_libraries=1
-	EOF
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir -p examples
-		touch examples/README.txt || die
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_docs --no-intersphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astropy/astropy-2.0.1.ebuild b/dev-python/astropy/astropy-2.0.1.ebuild
deleted file mode 100644
index 4cc6a45fc865..000000000000
--- a/dev-python/astropy/astropy-2.0.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 xdg-utils
-
-MYPV=${PV/_/}
-S=${WORKDIR}/${PN}-${MYPV}
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="https://www.astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MYPV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/expat:0=
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/h5py[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	dev-python/jplephem[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/mpmath[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
-	dev-python/objgraph[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP},jpeg(+)]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-astronomy/erfa-1.3:0=
-	>=sci-astronomy/wcslib-5:0=
-	>=sci-libs/cfitsio-3.410:0=
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	sci-libs/scikits_image[${PYTHON_USEDEP}]
-	sys-libs/zlib:0=
-"
-DEPEND="
-	>=dev-python/astropy-helpers-2[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		${RDEPEND}
-		media-gfx/graphviz
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.1.9[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mpl[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	export mydistutilsargs="--offline"
-	export ASTROPY_USE_SYSTEM_PYTEST=True
-	rm -r ${PN}_helpers || die
-	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	cat >> setup.cfg <<-EOF
-
-		[build]
-		use_system_libraries=1
-	EOF
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts MPLCONFIGDIR="${T}" PYTHONPATH="${BUILD_DIR}"/lib \
-				   esetup.py build_docs --no-intersphinx
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch b/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch
deleted file mode 100644
index 9578c0d43571..000000000000
--- a/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur astropy-0.4.1/astropy/config/configuration.py astropy-0.4.1.configobj/astropy/config/configuration.py
---- astropy-0.4.1/astropy/config/configuration.py	2014-09-01 22:41:30.066853605 +0200
-+++ astropy-0.4.1.configobj/astropy/config/configuration.py	2014-09-01 22:40:50.793528942 +0200
-@@ -23,7 +23,8 @@
- import types
- from warnings import warn
- 
--from ..extern.configobj import configobj, validate
-+import configobj
-+import validate
- from ..utils.exceptions import AstropyWarning, AstropyDeprecationWarning
- from ..utils import find_current_module
- from ..utils.misc import InheritDocstrings
-
diff --git a/dev-python/astropy/files/astropy-1.0.4-system-six.patch b/dev-python/astropy/files/astropy-1.0.4-system-six.patch
deleted file mode 100644
index 8bfab98124b3..000000000000
--- a/dev-python/astropy/files/astropy-1.0.4-system-six.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur astropy-0.4.1/astropy/extern/six.py astropy-0.4.1.six/astropy/extern/six.py
---- astropy-0.4.1/astropy/extern/six.py	2014-09-01 21:57:56.663393218 +0200
-+++ astropy-0.4.1.six/astropy/extern/six.py	2014-09-01 21:59:02.940933294 +0200
-@@ -13,7 +13,7 @@
- # Update this to prevent Astropy from using its bundled copy of six
- # (but only if some other version of at least _SIX_MIN_VERSION can
- # be provided)
--_SIX_SEARCH_PATH = ['astropy.extern.bundled.six', 'six']
-+_SIX_SEARCH_PATH = ['six', 'astropy.extern.bundled.six']
- 
- 
- def _find_module(name, path=None):
diff --git a/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch b/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch
deleted file mode 100644
index 2e2c82af5416..000000000000
--- a/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Mark all known test failures as xfail.
- These failures have been discussed with upstream.
---- a/astropy/io/fits/tests/test_connect.py
-+++ b/astropy/io/fits/tests/test_connect.py
-@@ -136,6 +136,8 @@
-         # while reading is to check whether col.null is present. For float columns, col.null
-         # is not initialized
- 
-+# see https://github.com/astropy/astropy/issues/3415
-+    @pytest.mark.xfail()
-     def test_read_from_fileobj(self, tmpdir):
-         filename = str(tmpdir.join('test_read_from_fileobj.fits'))
-         hdu = BinTableHDU(self.data)
-@@ -172,6 +174,8 @@
-     def setup_method(self, method):
-         warnings.filterwarnings('always')
- 
-+# see https://github.com/astropy/astropy/issues/3415
-+    @pytest.mark.xfail()
-     def test_read(self, tmpdir):
-         filename = str(tmpdir.join('test_read.fits'))
-         self.hdus.writeto(filename)
-@@ -189,6 +193,8 @@
-             Table.read(filename, hdu=0)
-         assert exc.value.args[0] == 'No table found in hdu=0'
- 
-+# see https://github.com/astropy/astropy/issues/3415
-+    @pytest.mark.xfail()
-     @pytest.mark.parametrize('hdu', [1, 'first'])
-     def test_read_with_hdu_1(self, tmpdir, hdu):
-         filename = str(tmpdir.join('test_read_with_hdu_1.fits'))
---- a/astropy/wcs/wcs.py
-+++ b/astropy/wcs/wcs.py
-@@ -84,6 +84,8 @@
- if six.PY3 or platform.system() == 'Windows':
-     __doctest_skip__ = ['WCS.all_world2pix']
- 
-+# see https://github.com/astropy/astropy/issues/3380
-+__doctest_skip__ = ['WCS.all_world2pix']
- 
- if _wcs is not None:
-     WCSBase = _wcs._Wcs
---- a/astropy/tests/tests/test_socketblocker.py
-+++ b/astropy/tests/tests/test_socketblocker.py
-@@ -66,8 +66,8 @@
- def _square(x):
-     return x ** 2
- 
--
--@pytest.mark.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")')
-+# see https://github.com/astropy/astropy/issues/4193
-+@pytest.mark.skipif(True, reason="Blocks on Debian CI test")
- def test_multiprocessing_forkserver():
-     """
-     Test that using multiprocessing with forkserver works.  Perhaps
---- a/astropy/coordinates/tests/test_api_ape5.py
-+++ b/astropy/coordinates/tests/test_api_ape5.py
-@@ -319,7 +319,8 @@
-     # coordinate object, and one that returns a cartesian matrix but does *not*
-     # require `newobj` or `fk5frame` - this allows optimization of the transform.
- 
--
-+# Temporary mark until scipy/numpy is fully on 3.5
-+@pytest.mark.xfail()
- def test_highlevel_api():
-     J2001 = time.Time('J2001', scale='utc')
- 
---- a/astropy/visualization/tests/test_histogram.py
-+++ b/astropy/visualization/tests/test_histogram.py
-@@ -50,6 +50,8 @@
-     assert patches2[0].axes is ax[1]
- 
- 
-+# see https://github.com/astropy/astropy/issues/4329
-+@pytest.mark.xfail()
- @pytest.mark.skipif('not HAS_PLT')
- def test_hist_autobin(rseed=0):
-     rng = np.random.RandomState(rseed)
---- a/astropy/table/tests/test_info.py
-+++ b/astropy/table/tests/test_info.py
-@@ -6,6 +6,7 @@
- import warnings
- import numpy as np
- 
-+from ...tests.helper import pytest
- from ...extern import six
- from ... import units as u
- from ... import time
-@@ -225,7 +226,8 @@
-         t.info(out=out)
-         assert out.getvalue().splitlines() == exp
- 
--
-+# see https://github.com/astropy/astropy/issues/4336
-+@pytest.mark.xfail()
- def test_ignore_warnings():
-     t = table.Table([[np.nan, np.nan]])
-     with warnings.catch_warnings(record=True) as warns:
diff --git a/dev-python/astropy/files/astropy-1.2.1-cfitsio-338.patch b/dev-python/astropy/files/astropy-1.2.1-cfitsio-338.patch
deleted file mode 100644
index 9a688d959851..000000000000
--- a/dev-python/astropy/files/astropy-1.2.1-cfitsio-338.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Make TFORMx check more flexible
- The maximal column length in cfitsio changed between version 3370 and 3380.
- This patch checks their syntax, without a specific length.
-Bug: https://github.com/astropy/astropy/issues/4646
---- a/astropy/io/fits/tests/test_image.py
-+++ b/astropy/io/fits/tests/test_image.py
-@@ -1070,7 +1070,7 @@
-         hdu.writeto(self.temp('test.fits'))
- 
-         with fits.open(self.temp('test.fits')) as hdul:
--            assert (hdul['SCI'].data == cube).all()
-+            assert np.abs(hdul['SCI'].data - cube).max() < 1./15.
- 
-     def test_subtractive_dither_seed(self):
-         """
diff --git a/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch b/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch
deleted file mode 100644
index 5c69704df9b0..000000000000
--- a/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Edit: bicatali@gentoo.org, ply-3.10 incompatible, so keep bundled.
-
-From: Ole Streicher <olebole@debian.org>
-Date: Thu, 12 Jan 2017 11:37:47 +0100
-Subject: Use external python modules instead of convenience copies
-
----
- astropy/coordinates/angle_utilities.py |  2 +-
- astropy/extern/configobj.py            |  5 ++++-
- astropy/extern/six.py                  |  2 +-
- astropy/table/jsviewer.py              | 14 ++++++++------
- astropy/table/tests/test_jsviewer.py   |  6 +++---
- astropy/tests/helper.py                |  2 +-
- astropy/units/format/cds.py            |  4 ++--
- astropy/units/format/generic.py        |  4 ++--
- astropy/units/format/ogip.py           |  4 ++--
- 9 files changed, 24 insertions(+), 19 deletions(-)
-
-diff --git a/astropy/extern/configobj.py b/astropy/extern/configobj.py
-index 8d1bd8c..e3bb0e0 100644
---- a/astropy/extern/configobj.py
-+++ b/astropy/extern/configobj.py
-@@ -7,5 +7,8 @@ currently installed version of python.
- Also, this should actually never actually show up as a docstring, because
- it should get overwritten by the appropriate configobj docstring.
- """
-+from __future__ import absolute_import
-+import validate
-+import configobj
-+
- 
--from .configobj import configobj, validate, __doc__
-diff --git a/astropy/extern/six.py b/astropy/extern/six.py
-index 5398fc0..fb3a30c 100644
---- a/astropy/extern/six.py
-+++ b/astropy/extern/six.py
-@@ -13,7 +13,7 @@ _SIX_MIN_VERSION = StrictVersion('1.10.0')
- # Update this to prevent Astropy from using its bundled copy of six
- # (but only if some other version of at least _SIX_MIN_VERSION can
- # be provided)
--_SIX_SEARCH_PATH = ['astropy.extern.bundled.six', 'six']
-+_SIX_SEARCH_PATH = ['six']
- 
- 
- def _find_module(name, path=None):
-diff --git a/astropy/table/jsviewer.py b/astropy/table/jsviewer.py
-index d0cc380..9f686ea 100644
---- a/astropy/table/jsviewer.py
-+++ b/astropy/table/jsviewer.py
-@@ -30,8 +30,8 @@ class Conf(_config.ConfigNamespace):
- conf = Conf()
- 
- 
--EXTERN_JS_DIR = abspath(join(dirname(extern.__file__), 'js'))
--EXTERN_CSS_DIR = abspath(join(dirname(extern.__file__), 'css'))
-+EXTERN_JS_DIR = '/usr/share/javascript'
-+EXTERN_CSS_DIR = EXTERN_JS_DIR
- 
- _SORTING_SCRIPT_PART_1 = """
- var astropy_sort_num = function(a, b) {{
-@@ -134,22 +134,24 @@ class JSViewer(object):
-     @property
-     def jquery_urls(self):
-         if self._use_local_files:
--            return ['file://' + join(EXTERN_JS_DIR, 'jquery-3.1.1.min.js'),
--                    'file://' + join(EXTERN_JS_DIR, 'jquery.dataTables.min.js')]
-+            return ['file://' + join(EXTERN_JS_DIR, 'jquery', 'jquery.min.js'),
-+                    'file://' + join(EXTERN_JS_DIR, 'jquery-datatables',
-+                                     'jquery.dataTables.min.js')]
-         else:
-             return [conf.jquery_url, conf.datatables_url]
- 
-     @property
-     def css_urls(self):
-         if self._use_local_files:
--            return ['file://' + join(EXTERN_CSS_DIR,
-+            return ['file://' + join(EXTERN_CSS_DIR, 'jquery-datatables', 'css',
-                                      'jquery.dataTables.css')]
-         else:
-             return conf.css_urls
- 
-     def _jstable_file(self):
-         if self._use_local_files:
--            return 'file://' + join(EXTERN_JS_DIR, 'jquery.dataTables.min')
-+            return 'file://' + join(EXTERN_JS_DIR, 'jquery-datatables',
-+                                    'jquery.dataTables.min')
-         else:
-             return conf.datatables_url[:-3]
- 
-diff --git a/astropy/table/tests/test_jsviewer.py b/astropy/table/tests/test_jsviewer.py
-index 6a8b033..5018bd4 100644
---- a/astropy/table/tests/test_jsviewer.py
-+++ b/astropy/table/tests/test_jsviewer.py
-@@ -145,9 +145,9 @@ def test_write_jsviewer_local(tmpdir):
-         table_id='test',
-         length='50',
-         display_length='10, 25, 50, 100, 500, 1000',
--        datatables_css_url='file://' + join(EXTERN_DIR, 'css', 'jquery.dataTables.css'),
--        datatables_js_url='file://' + join(EXTERN_DIR, 'js', 'jquery.dataTables.min.js'),
--        jquery_url='file://' + join(EXTERN_DIR, 'js', 'jquery-3.1.1.min.js')
-+        datatables_css_url='file:///usr/share/javascript/jquery-datatables/css/jquery.dataTables.css',
-+        datatables_js_url='file:///usr/share/javascript/jquery-datatables/jquery.dataTables.min.js',
-+        jquery_url='file:///usr/share/javascript/jquery/jquery.min.js'
-     )
-     with open(tmpfile) as f:
-         assert f.read().strip() == ref.strip()
-diff --git a/astropy/tests/helper.py b/astropy/tests/helper.py
-index 9e88d1f..94bd40a 100644
---- a/astropy/tests/helper.py
-+++ b/astropy/tests/helper.py
-@@ -40,7 +40,7 @@ __all__ = ['raises', 'enable_deprecations_as_exceptions', 'remote_data',
-            'pickle_protocol', 'generic_recursive_equality_test']
- 
- 
--if os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
-+if True:
-     import pytest
- 
- else:
diff --git a/dev-python/astropy/files/astropy-1.3.3-mark-known-failures.patch b/dev-python/astropy/files/astropy-1.3.3-mark-known-failures.patch
deleted file mode 100644
index 1a30bc1d10ab..000000000000
--- a/dev-python/astropy/files/astropy-1.3.3-mark-known-failures.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Tue, 13 Dec 2016 09:41:39 +0100
-Subject: Mark all known test failures as xfail. These failures have been
- discussed with upstream.
-
----
- astropy/table/tests/test_info.py                                      | 4 +++-
- astropy/tests/tests/test_socketblocker.py                             | 4 ++--
- astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py | 4 ++++
- astropy/vo/samp/tests/test_standard_profile.py                        | 2 ++
- 4 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/astropy/table/tests/test_info.py b/astropy/table/tests/test_info.py
-index 2bbcc7a..50fbdb4 100644
---- a/astropy/table/tests/test_info.py
-+++ b/astropy/table/tests/test_info.py
-@@ -8,6 +8,7 @@ from collections import OrderedDict
- 
- import numpy as np
- 
-+from ...tests.helper import pytest
- from ...extern import six
- from ...extern.six.moves import cStringIO as StringIO
- from ... import units as u
-@@ -229,7 +230,8 @@ def test_class_attribute():
-         t.info(out=out)
-         assert out.getvalue().splitlines() == exp
- 
--
-+# see https://github.com/astropy/astropy/issues/4336
-+@pytest.mark.xfail()
- def test_ignore_warnings():
-     t = table.Table([[np.nan, np.nan]])
-     with warnings.catch_warnings(record=True) as warns:
-diff --git a/astropy/tests/tests/test_socketblocker.py b/astropy/tests/tests/test_socketblocker.py
-index c362fa5..783defe 100644
---- a/astropy/tests/tests/test_socketblocker.py
-+++ b/astropy/tests/tests/test_socketblocker.py
-@@ -66,8 +66,8 @@ PY3_4 = sys.version_info[:2] >= (3, 4)
- def _square(x):
-     return x ** 2
- 
--
--@pytest.mark.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")')
-+# see https://github.com/astropy/astropy/issues/4193
-+@pytest.mark.skipif(True, reason="Blocks on Debian CI test")
- def test_multiprocessing_forkserver():
-     """
-     Test that using multiprocessing with forkserver works.  Perhaps
-diff --git a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
-index 53436dd..4c710e7 100644
---- a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
-+++ b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
-@@ -3,6 +3,8 @@ from ..core import WCSAxes
- import matplotlib.pyplot as plt
- from matplotlib.backend_bases import KeyEvent
- 
-+import pytest
-+
- from ....wcs import WCS
- from ....extern import six
- from ....coordinates import FK5
-@@ -93,6 +95,8 @@ class TestDisplayWorldCoordinate(BaseImageTests):
- 
-         assert string_world5 == six.u('267.652 -28\xb046\'23" (world, overlay 3)')
- 
-+    # See https://github.com/astropy/astropy/issues/5601
-+    @pytest.mark.xfail()
-     def test_cube_coords(self, tmpdir):
-         wcs = WCS(self.cube_header)
- 
-diff --git a/astropy/vo/samp/tests/test_standard_profile.py b/astropy/vo/samp/tests/test_standard_profile.py
-index 325ac96..ac25e55 100644
---- a/astropy/vo/samp/tests/test_standard_profile.py
-+++ b/astropy/vo/samp/tests/test_standard_profile.py
-@@ -62,6 +62,8 @@ class TestStandardProfile(object):
- 
-         self.hub.stop()
- 
-+    # see https://github.com/astropy/astropy/issues/5460
-+    @pytest.mark.skipif(True, reason="Setup fails due to SSL problems")
-     def test_main(self):
- 
-         self.client1_id = self.client1.get_public_id()
diff --git a/dev-python/astropy/files/astropy-ply.py b/dev-python/astropy/files/astropy-ply.py
deleted file mode 100644
index 19eb104c4ca0..000000000000
--- a/dev-python/astropy/files/astropy-ply.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Licensed under a 3-clause BSD style license - see LICENSE.rst
-
-"""
-Handle loading ply package from system or from the bundled copy
-"""
-
-import imp
-from distutils.version import StrictVersion
-
-
-def _find_module(name, path=None):
-    """
-    Alternative to `imp.find_module` that can also search in subpackages.
-    """
-
-    parts = name.split('.')
-
-    for part in parts:
-        if path is not None:
-            path = [path]
-
-        fh, path, descr = imp.find_module(part, path)
-
-    return fh, path, descr
-
-_PLY_MIN_VERSION = StrictVersion('3.4')
-
-# Update this to prevent Astropy from using its bundled copy of ply
-# (but only if some other version of at least _PLY_MIN_VERSION can
-# be provided)
-_PLY_SEARCH_PATH = ['ply']
-
-
-for mod_name in _PLY_SEARCH_PATH:
-    try:
-        mod_info = _find_module(mod_name)
-        #mod_lex_info = _find_module(mod_name + '.lex')
-    except ImportError:
-        continue
-
-    mod = imp.load_module(__name__, *mod_info)
-    #mod_lex = imp.load_module(__name__ + '.lex', *mod_lex_info)
-
-    try:
-    #    if StrictVersion(mod_lex.__version__) >= _PLY_MIN_VERSION:
-    #        break
-        break
-    except (AttributeError, ValueError):
-        # Attribute error if the ply module isn't what it should be and doesn't
-        # have a .__version__; ValueError if the version string exists but is
-        # somehow bogus/unparseable
-        continue
-else:
-    raise ImportError(
-        "Astropy requires the 'ply' module of minimum version {0}; "
-        "normally this is bundled with the astropy package so if you get "
-        "this warning consult the packager of your Astropy "
-        "distribution.".format(_PLY_MIN_VERSION))
diff --git a/dev-python/astropy/metadata.xml b/dev-python/astropy/metadata.xml
deleted file mode 100644
index 85615ff002ce..000000000000
--- a/dev-python/astropy/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>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Astropy is a community-driven package intended to contain much of
-  the core functionality and some common tools needed for performing
-  astronomy and astrophysics with Python.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">astropy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/astroquery/Manifest b/dev-python/astroquery/Manifest
deleted file mode 100644
index 07e0947a1dd5..000000000000
--- a/dev-python/astroquery/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST astroquery-0.3.6.tar.gz 2879493 BLAKE2B 893dc6e961fc983cf5c6892607b74d7f3302bc6396c2772129bfb719003b5263be52e8bd9bb5eebaa271c8b7d5ac9103b6c001798aba7051d4203f5abb70d480 SHA512 631e42ef2c50b7a876efeff5a498707734a3ce29e9b5ad7074150272db4928b4f32572d1bfef37c10cb26c2f8fa39e4c7cc268d61320ba399f8479507b1a2fcd
-EBUILD astroquery-0.3.6.ebuild 1570 BLAKE2B fd0f8fa7ce21be731323f003df3c9e2181c71bcfe1d221cba44d89620681a37a948a8ffdba0a933cfe42caa02c412e8c9d0fa7c1bc583724f38e741478aa5739 SHA512 c9f69af8c4f7a33854811ea3c6aa1fa6851ffe5d3ce3f4015ff79c8be94dbfb5881110cec342b9fa1a16df7ed32090f843e275d70ec206dc06d57373d865b9cc
-MISC metadata.xml 647 BLAKE2B d6eaac8a1127e1d3a78cced70785c73dff08a1d4eb8a4fe80d7ed2c11f84da448a530b81023a073712eba304a4e809dd8d6b2454e1059db9e5cbe1926cee46e0 SHA512 d677c42414e0271d73748505e577ec2dcedaf9fccf92413a8f3ad8f47c4823c1c0ea7856e977862581b0ee9e88ac12f1cf25e0e336293feed1f51597a4c6875f
diff --git a/dev-python/astroquery/astroquery-0.3.6.ebuild b/dev-python/astroquery/astroquery-0.3.6.ebuild
deleted file mode 100644
index 042945510c6c..000000000000
--- a/dev-python/astroquery/astroquery-0.3.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 xdg-utils virtualx
-
-DESCRIPTION="Collection of packages to access online astronomical resources"
-HOMEPAGE="https://github.com/astropy/astroquery"
-SRC_URI="https://github.com/astropy/astroquery/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DOCS=( README.rst )
-
-PYTHON_REQ_USE="test? ( tk )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/aplpy[${PYTHON_USEDEP}]
-			dev-python/pyregion[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astroquery/metadata.xml b/dev-python/astroquery/metadata.xml
deleted file mode 100644
index c634ebada8b3..000000000000
--- a/dev-python/astroquery/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 type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    Astroquery is a package containing a collection of tools to use
-    online astronomical databases. It integrates with Astropy and aims
-    to support many services with a uniform API.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">astropy/astroquery</remote-id>
-    <remote-id type="pypi">astroquery</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/astroscrappy/Manifest b/dev-python/astroscrappy/Manifest
deleted file mode 100644
index 3e38e8d7bc15..000000000000
--- a/dev-python/astroscrappy/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX astroscrappy-1.0.3-dont-install-binary.patch 460 BLAKE2B 6d18dd6fcd8a3353fb1abb4ecdc2e299928c332d0d1dd17b671ec46e28840da3dc8e5aa63feadd211bf66cb1c12a1b56d8233e2a725af9e96c1c45ac1dd89eda SHA512 b18ce0be8e2dc7c4e9c2334ae8987b5e3cfaf51c31de8e5be88a4f49436ddeb2de71caabaffda2441fbd59dc43697386ef0653c3210f8a728d175609d96226d1
-AUX astroscrappy-1.0.3-endian-fix-tests.patch 3941 BLAKE2B b0109cefaa976d6355f6e1fe1416ec9e610a4ab5b4e9412f1e96528314cf8c064cd4773deab7347953a39aad9adcfc3f64e2dbff13d0d3c00191df4ae7c67452 SHA512 0439a414c87428e05c68677248b3bd37a9981aecf89d891c9d7b9c0d96d0f1e62f547cf88e4a8f3f1e71183aca607e407662bdc087bd4cc676bbc075f8653472
-AUX astroscrappy-1.0.3-numpy-fix-tests.patch 933 BLAKE2B cf31eb447908d43e02e0134423ca0ec943243cde31e62ee13c093c221e06666974825f0c327cf6c773174baa7a6e2d9f28a06a527394cf84543b2cd876fe3730 SHA512 1917d7d89550d6303f4faadb498c61669f5590edd836a49a21b4c419b92972244a6a1f90aa73add85e17bc0e336f04b13239948994dee53c57f48ba0a1c6e5a5
-AUX astroscrappy-1.0.3-respect-user-flag.patch 1639 BLAKE2B 41953a090177c8d7ecc5c425d114b41ae19134bfe11674a2f496b369fe981225d8fa5a8b245a16b8a535da93a704f0a32d33dd0348208cfb09ba1e9ce54943c8 SHA512 5d39c2e0dac5647ff624680fdc8f369b92e6b325a3da55ea112d9df31af9534a164cf598a90a369dc0d753782802bfcc6927a8f4e8ca6f347e608a133584a148
-AUX astroscrappy-1.0.5-respect-user-flag.patch 1417 BLAKE2B 11f69ab3cb75ae00ac18553f9096bff9d80273a11232230ce526a9d8e7d680f46e697b99c2051ad499cee55b33d2b4027af335a542f4d6a16e878e94681e69f1 SHA512 9bb2420c761bc11c4add8d058a216ba5995be0c8bcaa11d408b1c8cc51d9e86e70e52744238a760c4cb415248b0a0a7be09207dc2ebe3affd9c26442bb214e91
-DIST astroscrappy-1.0.3.tar.gz 422209 BLAKE2B f0d5a83c6b4718eb6d0a1d60068459da3d886c6ab389be5b65a6b31dfb2bcfff9238e8773d1cfeca8db15289999ccbdcf96ba966f85ca76779077ee6fd0923a6 SHA512 2e96e8e62f81c770802a3c7699ca4455c640bb000aa4bffc22149745eed4e7e33cc4b297649020a601ff7fb242c0545cf9391c19ee2687adab26ac494d37dbb2
-DIST astroscrappy-1.0.5.tar.gz 421910 BLAKE2B 7ca92277e3914b54cce09cb9a5d8e4657dbc2e3aead8904c967be906bdf78d4b73450adff7d7b970ec37e7b4ba5ab275f2c1cdd8b4573b1563daed6ecae14682 SHA512 bad648140abe3032aa76f43b4c61a15bc49b825bb8333d0e2dc6ba244542e5d6b283824336de82c73aefdfd62b952c9089c3237c913faf17874af13725345064
-EBUILD astroscrappy-1.0.3.ebuild 1434 BLAKE2B 8d842394867a673a8bbd0022c978656444312368435d3e3d58ab5c7996758467bc17cf2c9a4abad6db49e611bf91479acb0d69a57b84c98ac01d2defd4617ba3 SHA512 7d49df72848ee4266e0f1709e3368f715cf21579c67f36195812ebe3d01805e20e788a2dc32304e26c76a41080d28433f04a3f95ba4d61cfab381ffb066ea588
-EBUILD astroscrappy-1.0.5.ebuild 1455 BLAKE2B e1df7031242270c612895d159afea4a26a0fc2061ab18369b1d54073e4f82d06edbc1e76475c793319e841a72c8ab20ed252152a6a57f5d1bed8ef7333f4e40e SHA512 c55463dad7f52a46ad07031af1ce942be5be33259f0a0a8fdbb2a2744f7bf8e5347ae63bccad09d6fd3ce1c6dfb9909dc31897c70b27b8c1d7a809185981003b
-MISC metadata.xml 642 BLAKE2B 0fafd3972f80215f48309afe038d5419edb6caedceb873d083aabfa27ab418e5b3128c2031e34280754fe2234e81e276ecd04a41c54acc55d226513b32e5f654 SHA512 803d99c24952fb6bc3e118234c4e2c7c78dcd82717e0240104f042fd305d3e1c675b9b67a7cdedd5a3d0d71967b460b3c32174eaeff6d8b523d6e57dd961d298
diff --git a/dev-python/astroscrappy/astroscrappy-1.0.3.ebuild b/dev-python/astroscrappy/astroscrappy-1.0.3.ebuild
deleted file mode 100644
index 65c8cd32f821..000000000000
--- a/dev-python/astroscrappy/astroscrappy-1.0.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Optimized cosmic ray annihilation astropy python module"
-HOMEPAGE="https://github.com/astropy/astroscrappy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-dont-install-binary.patch"
-	"${FILESDIR}/${P}-endian-fix-tests.patch"
-	"${FILESDIR}/${P}-numpy-fix-tests.patch"
-	"${FILESDIR}/${P}-respect-user-flag.patch"
-)
-
-DOCS=( CHANGES.rst )
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	use openmp && tc-has-openmp && append-flags -fopenmp
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astroscrappy/astroscrappy-1.0.5.ebuild b/dev-python/astroscrappy/astroscrappy-1.0.5.ebuild
deleted file mode 100644
index 3ffbc1766ae9..000000000000
--- a/dev-python/astroscrappy/astroscrappy-1.0.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Optimized cosmic ray annihilation astropy python module"
-HOMEPAGE="https://github.com/astropy/astroscrappy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( CHANGES.rst )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.5-respect-user-flag.patch"
-)
-
-python_prepare_all() {
-	# use astropy-helpers from system
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	# if the user explicitely does not want openmp, do not forcefully use it
-	if ! use openmp; then
-		sed -e 's/if has_openmp/if False/' \
-			-i astroscrappy/utils/setup_package.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astroscrappy/files/astroscrappy-1.0.3-dont-install-binary.patch b/dev-python/astroscrappy/files/astroscrappy-1.0.3-dont-install-binary.patch
deleted file mode 100644
index 4c69f00cc88d..000000000000
--- a/dev-python/astroscrappy/files/astroscrappy-1.0.3-dont-install-binary.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Don't install example/template binary
---- a/setup.py
-+++ b/setup.py
-@@ -80,9 +80,6 @@
- 
- # Define entry points for command-line scripts
- entry_points = {}
--entry_points['console_scripts'] = [
--    'astropy-package-template-example = packagename.example_mod:main',
--]
- 
- # Include all .c files, recursively, including those generated by
- # Cython, since we can not do this in MANIFEST.in with a "dynamic"
diff --git a/dev-python/astroscrappy/files/astroscrappy-1.0.3-endian-fix-tests.patch b/dev-python/astroscrappy/files/astroscrappy-1.0.3-endian-fix-tests.patch
deleted file mode 100644
index 7a2bbb6299c6..000000000000
--- a/dev-python/astroscrappy/files/astroscrappy-1.0.3-endian-fix-tests.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 5b5ce99c63d03e60b6027f09f72231db11a87bf2 Mon Sep 17 00:00:00 2001
-From: Curtis McCully <cmccully@lcogt.net>
-Date: Thu, 3 Dec 2015 12:02:38 -0800
-Subject: [PATCH] Made tests not endian specific.
---- a/astroscrappy/tests/test_utils.py
-+++ b/astroscrappy/tests/test_utils.py
-@@ -56,7 +56,7 @@
- 
- 
- def test_medfilt5():
--    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
-+    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
-     npmed5 = ndimage.filters.median_filter(a, size=(5, 5), mode='nearest')
-     npmed5[:2, :] = a[:2, :]
-     npmed5[-2:, :] = a[-2:, :]
-@@ -68,7 +68,7 @@
- 
- 
- def test_medfilt7():
--    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
-+    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
-     npmed7 = ndimage.filters.median_filter(a, size=(7, 7), mode='nearest')
-     npmed7[:3, :] = a[:3, :]
-     npmed7[-3:, :] = a[-3:, :]
-@@ -80,7 +80,7 @@
- 
- 
- def test_sepmedfilt3():
--    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
-+    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
-     npmed3 = ndimage.filters.median_filter(a, size=(1, 3), mode='nearest')
-     npmed3[:, :1] = a[:, :1]
-     npmed3[:, -1:] = a[:, -1:]
-@@ -95,7 +95,7 @@
- 
- 
- def test_sepmedfilt5():
--    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
-+    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
-     npmed5 = ndimage.filters.median_filter(a, size=(1, 5), mode='nearest')
-     npmed5[:, :2] = a[:, :2]
-     npmed5[:, -2:] = a[:, -2:]
-@@ -110,7 +110,7 @@
- 
- 
- def test_sepmedfilt7():
--    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
-+    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
-     npmed7 = ndimage.filters.median_filter(a, size=(1, 7), mode='nearest')
-     npmed7[:, :3] = a[:, :3]
-     npmed7[:, -3:] = a[:, -3:]
-@@ -125,7 +125,7 @@
- 
- 
- def test_sepmedfilt9():
--    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
-+    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
-     npmed9 = ndimage.filters.median_filter(a, size=(1, 9), mode='nearest')
-     npmed9[:, :4] = a[:, :4]
-     npmed9[:, -4:] = a[:, -4:]
-@@ -174,7 +174,7 @@
- 
- 
- def test_subsample():
--    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
-+    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
-     npsubsamp = np.zeros((a.shape[0] * 2, a.shape[1] * 2), dtype=np.float32)
-     for i in range(a.shape[0]):
-         for j in range(a.shape[1]):
-@@ -189,8 +189,8 @@
- 
- def test_rebin():
-     a = np.ascontiguousarray(np.random.random((2002, 2002)), dtype=np.float32)
--    a = a.astype('<f4')
--    nprebin = np.zeros((1001, 1001), dtype=np.float32).astype('<f4')
-+    a = a.astype('f4')
-+    nprebin = np.zeros((1001, 1001), dtype=np.float32).astype('f4')
-     for i in range(1001):
-         for j in range(1001):
-             nprebin[i, j] = (a[2 * i, 2 * j] + a[2 * i + 1, 2 * j] +
-@@ -202,7 +202,7 @@
- 
- 
- def test_laplaceconvolve():
--    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
-+    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
-     k = np.array([[0.0, -1.0, 0.0], [-1.0, 4.0, -1.0], [0.0, -1.0, 0.0]])
-     k = k.astype('<f4')
-     npconv = ndimage.filters.convolve(a, k, mode='constant', cval=0.0)
-@@ -211,8 +211,8 @@
- 
- 
- def test_convolve():
--    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
--    k = np.ascontiguousarray(np.random.random((5, 5))).astype('<f4')
-+    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
-+    k = np.ascontiguousarray(np.random.random((5, 5))).astype('f4')
-     npconv = ndimage.filters.convolve(a, k, mode='constant', cval=0.0)
-     cconv = convolve(a, k)
-     assert_allclose(cconv, npconv, rtol=0, atol=1e-5)
diff --git a/dev-python/astroscrappy/files/astroscrappy-1.0.3-numpy-fix-tests.patch b/dev-python/astroscrappy/files/astroscrappy-1.0.3-numpy-fix-tests.patch
deleted file mode 100644
index d7a1c93a5740..000000000000
--- a/dev-python/astroscrappy/files/astroscrappy-1.0.3-numpy-fix-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Cast the numpy arrays in the test to the same data type
-Bug: https://ci.debian.net/data/packages/unstable/amd64/a/astroscrappy/20160112_151253.autopkgtest.log.gz
---- a/astroscrappy/tests/test_astroscrappy.py
-+++ b/astroscrappy/tests/test_astroscrappy.py
-@@ -36,7 +36,7 @@
-     imdata += gaussian(imdata.shape, x, y, brightness, 3.5)
- 
- # Add the poisson noise
--imdata = np.random.poisson(imdata)
-+imdata = np.float32(np.random.poisson(imdata))
- 
- # Add readnoise
- imdata += np.random.normal(0.0, 10.0, size=(1001, 1001))
-@@ -60,4 +60,4 @@
-     # contrast that we can turn our detection threshold up.
-     mask, _clean = detect_cosmics(imdata, readnoise=10., gain=1.0,
-                                   sigclip=6, sigfrac=1.0)
--    assert (mask == expected_crmask).sum() == (1001 * 1001)
-\ No newline at end of file
-+    assert (mask == expected_crmask).sum() == (1001 * 1001)
diff --git a/dev-python/astroscrappy/files/astroscrappy-1.0.3-respect-user-flag.patch b/dev-python/astroscrappy/files/astroscrappy-1.0.3-respect-user-flag.patch
deleted file mode 100644
index fb7bca64ce7f..000000000000
--- a/dev-python/astroscrappy/files/astroscrappy-1.0.3-respect-user-flag.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- astroscrappy/astroscrappy/utils/setup_package.py.orig	2016-03-09 22:50:34.304043122 +0000
-+++ astroscrappy/astroscrappy/utils/setup_package.py	2016-03-09 22:54:53.560783823 +0000
-@@ -43,30 +43,11 @@
-                     sources=med_sources,
-                     include_dirs=include_dirs,
-                     libraries=libraries,
--                    language="c",
--                    extra_compile_args=['-g', '-O3', '-funroll-loops',
--                                        '-ffast-math'])
-+                    language="c")
-     ext_im = Extension(name=str("astroscrappy.utils.image_utils"),
-                     sources=im_sources,
-                     include_dirs=include_dirs,
-                     libraries=libraries,
--                    language="c",
--                    extra_compile_args=['-g', '-O3', '-funroll-loops',
--                                        '-ffast-math'])
--
--    has_openmp, outputs = check_openmp()
--    if has_openmp:
--        ext_med.extra_compile_args.append('-fopenmp')
--        ext_im.extra_compile_args.append('-fopenmp')
--        ext_med.extra_link_args = ['-g', '-fopenmp']
--        ext_im.extra_link_args = ['-g', '-fopenmp']
--    else:
--        log.warn('OpenMP was not found. '
--                 'astroscrappy will be compiled without OpenMP. '
--                 '(Use the "-v" option of setup.py for more details.)')
--        log.debug(('(Start of OpenMP info)\n'
--                   'compiler stdout:\n{0}\n'
--                   'compiler stderr:\n{1}\n'
--                   '(End of OpenMP info)').format(*outputs))
-+                    language="c")
- 
-     return [ext_med, ext_im]
diff --git a/dev-python/astroscrappy/files/astroscrappy-1.0.5-respect-user-flag.patch b/dev-python/astroscrappy/files/astroscrappy-1.0.5-respect-user-flag.patch
deleted file mode 100644
index b3638e1bffc3..000000000000
--- a/dev-python/astroscrappy/files/astroscrappy-1.0.5-respect-user-flag.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f3acf99e65f58e2ee2f409d33f44a3abb1ba90c4 Mon Sep 17 00:00:00 2001
-From: Sébastien Fabbro <bicatali@gentoo.org>
-Date: Wed, 31 Aug 2016 22:19:12 +0000
-Subject: [PATCH] respect user compiling flags Depending on compilers, -O3
- -funroll-loops is not the fastest.
-
----
- astroscrappy/utils/setup_package.py | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/astroscrappy/utils/setup_package.py b/astroscrappy/utils/setup_package.py
-index 3e1fba2..c271613 100644
---- a/astroscrappy/utils/setup_package.py
-+++ b/astroscrappy/utils/setup_package.py
-@@ -73,16 +73,12 @@ def get_extensions():
-                     sources=med_sources,
-                     include_dirs=include_dirs,
-                     libraries=libraries,
--                    language="c",
--                    extra_compile_args=['-g', '-O3', '-funroll-loops',
--                                        '-ffast-math'])
-+                    language="c")
-     ext_im = Extension(name=str("astroscrappy.utils.image_utils"),
-                     sources=im_sources,
-                     include_dirs=include_dirs,
-                     libraries=libraries,
--                    language="c",
--                    extra_compile_args=['-g', '-O3', '-funroll-loops',
--                                        '-ffast-math'])
-+                    language="c")
- 
-     has_openmp, outputs = check_openmp()
-     if has_openmp:
--- 
-2.9.3
-
diff --git a/dev-python/astroscrappy/metadata.xml b/dev-python/astroscrappy/metadata.xml
deleted file mode 100644
index 6a303f8428d9..000000000000
--- a/dev-python/astroscrappy/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 type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    Astro-SCRAPPY is designed to detect cosmic rays in images (numpy arrays),
-    based on Pieter van Dokkum's L.A.Cosmic algorithm. Parallelization is
-    achieved using OpenMP.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">astroscrappy</remote-id>
-    <remote-id type="github">astropy/astroscrappy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/astunparse/Manifest b/dev-python/astunparse/Manifest
new file mode 100644
index 000000000000..a385b9797c92
--- /dev/null
+++ b/dev-python/astunparse/Manifest
@@ -0,0 +1,3 @@
+DIST astunparse-1.6.2.tar.gz 16339 BLAKE2B d35d63b8313718c1d873d55b7da824465be9b4bc9e486ff82dac7db2df5185f8a59bfb283844d7108927b04ee02879fe921c87f9da8bd87c157341e6022b40cc SHA512 1e344354481dab7345d8790791e15e2ce733b8985839972a1771b97adebbfc2b42c8fb258ea36f245baed553d3b8e5007872d6559ebcc5ef1eb6f6c6a5d66c81
+EBUILD astunparse-1.6.2.ebuild 518 BLAKE2B 779f4a1fc85b1cfe50aa2d858c9de7dfad1cfbfd155aaefae47f3a9496b38c4ae9a82eddb7548fda21d97686b3bf756afb5a1f92370ffcb5c55e6a9e5320f1bb SHA512 87bffc80aedfa2cd50adb977a5a4e38c07e66cb4e1e5f5924c6c6b6eb21de4c7c3aaab647f32d171f6f696adb9e738c7ea9a68e55862321de27a0d68452b3c74
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/astunparse/astunparse-1.6.2.ebuild b/dev-python/astunparse/astunparse-1.6.2.ebuild
new file mode 100644
index 000000000000..ea706a5884e2
--- /dev/null
+++ b/dev-python/astunparse/astunparse-1.6.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Astun parser for python"
+HOMEPAGE="https://github.com/simonpercivall/astunparse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.23.0[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc *.rst
+}
diff --git a/dev-python/astunparse/metadata.xml b/dev-python/astunparse/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/dev-python/astunparse/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index 8d0e07c06bbf..03f5f6eab12d 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 692 BLAKE2B 4f7efdb7b5654ab8de75cff12623a74ef8993bf18551fe1c15eeee929363250022d179119f97023e69dbb4c4fbc70bb9c8f56a048ded8c3607f6b6dfab874a99 SHA512 ed9fe883fd48c69240eeea8408debe57beb9d68bbba90a2b1931e49db9478e5c340c99debfd621365a270c79626307bcc84e22ed63f79923a3247951c6c22863
+EBUILD async_generator-1.10.ebuild 699 BLAKE2B 302d7e6d3fb7ff74a9a83e4857187744e35c1df52384b63809218ea62d49ae53c0298c2213cd12edec72360aa68344dd3444e4a42fc88168dbae8f3773c9469f SHA512 4d6bf52c889f1d9abdb58016bec16b4b60fb19a896dbeaa63fd18b575156a07b6bf31056d8910da00b45e76d8be6aab700abdec8eef0ade6f633d9169116a238
 MISC metadata.xml 442 BLAKE2B 93ff73ecbd80ae38cb18b2ffe11bb60c411b7f3ce36b196566e230fecda350a13d19892e672a65fd278038feb53273b39ed7eb42809bd397bb71b8eeb4baf5ca SHA512 fdd4036bac7d48e387e8ad059be940d3eb3cebcf1d6a6079cf4effe25265c3a52d360269fccd8e45f67374d2ce4c2b67245e75fd59656df92a36744265494f07
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index 27d275915a85..d12667b57c3d 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 8ca57653aa38..765e129ecd2d 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,7 +1,7 @@
 DIST async-timeout-1.2.1.tar.gz 7797 BLAKE2B d8f736423631a2b2c0fb748eb2857e0f9a143af9591ddfae15d42ab13af33196a6624db5b0a705265269ed28c6c15a4e8cfe56143ccedac75a555ae62a82891b SHA512 2072caeb65a74f1a24b59a4ea905ef96d70f8fb117e3dd9c95c1107b1d67ffaa4d76b68f00364049e6e29cdb0a6d247ba0c3638ccd0a8db27bd6ee0f180f9ccb
 DIST async-timeout-2.0.1.tar.gz 10463 BLAKE2B a9c1ab7ffd249f1d4d07a37f07743923a890d11bb9ff913b37f45e9f7be1110eba9cd24ce741b71a353ae349aceccd66a1853ed985416a85cdb4faa46f341681 SHA512 cb66bdc286082ef5570a7e3aa420434f82bb4131e9527c499c693a21d72b3f3772922c0ce2ad68e7de5f95960061e508effda56be398356ea75d55272f534a86
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-1.2.1.ebuild 796 BLAKE2B 096feb0978986bed2760338a6ee2c2a1c8f4e33b3382cd92f646b90e68ba6b08be0ec025ea7502f64bad072b2b41b4969e0f4f33c9372361ce28e8f5b1d8e09f SHA512 dff89ced7983fc1d597b53d9f7d1f34d985e573b8b21b939bf11000410516de9a5ed7c84b3b6e01aa12296f17eb35e4f30a749656a128133ab59aac93a436648
-EBUILD async_timeout-2.0.1.ebuild 1010 BLAKE2B 5b83635cddfa16e2ad4395561b07be1cb579056b27c270ffa86849b182bf17c0e8f3617fd256dd9bbeffc11719438e1de96889c63f68d9ff25b298a21b5b9b54 SHA512 057b419ed3b6ebd4ae24c4b417914d90c659cf8f74bb8037f09bd0bc5ede828871a62ef435c94d604b289e887b41fc716207b770f33374d2ed8dd3213d8dc673
-EBUILD async_timeout-3.0.1.ebuild 973 BLAKE2B 1ae7cbf17557bb56256981a445da9c76465e2b576ec78c2931738863ca55c6bb75fb89c1013c88d979a40baba7b52042a7abe171040e84ad0a4ba2a68d5cb77a SHA512 43a969030e9de93dadb3dd07b47e8393e8b5036b313823f805655f3eff3af1b29d7b3a1e9d6b22de503e081df28cea4709eaab8e0948273e644b7790adf02dc2
+EBUILD async_timeout-1.2.1.ebuild 792 BLAKE2B 3a23974e56c29b19328df4eafc902b4ff9c0f05c6f3bcf22dcc7b0e5edb4d3eda378972536af00f0f8dfdd39b4ece7a8b7fdddf8cc7f624a4ba21a963c9488f0 SHA512 f80cf73aee197e76f431478f05ae13b286959757eb4578275ec30356a58abc98ed3d257f84d96b26e8808cfed678de3dc2b7c5a414037d059cfc533db1705f9e
+EBUILD async_timeout-2.0.1.ebuild 1006 BLAKE2B 25d3dcac493e8f5f6ca146da9d96d41074a4f098418f7dde9ff2e6c123285b5c7433dc6927c6d23671184798cfe89620f7eb2cd69c0c5d2ffdcce12f20136808 SHA512 95d405833019b3436dc16e368528ef15c2329eb672eb387f1bb25b4a57796010f8a900e4ad90665037ef1a374347efe521636bbc70197e759e8f520635f537ce
+EBUILD async_timeout-3.0.1.ebuild 973 BLAKE2B 87a36586680da426991a6d74a3e54061fafdcad6cbb63a2092faed781f327f4deb339f76b8bf7ccbab3aef55c0b0d973ee22f919579a589ad092271267d06da4 SHA512 494b5e6b6f4fd005ad1fd983598f2e15db45e475364426efa9559533ab6d5d8882a7d894856f1e8c6758baaeaeb25106f895a0af20e4e0fc6ea5ebbea3761d37
 MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-1.2.1.ebuild b/dev-python/async_timeout/async_timeout-1.2.1.ebuild
index e2d2d43e3af4..c0504b87b044 100644
--- a/dev-python/async_timeout/async_timeout-1.2.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/async_timeout/async_timeout-2.0.1.ebuild b/dev-python/async_timeout/async_timeout-2.0.1.ebuild
index 96ae22608826..b27f94dc93a5 100644
--- a/dev-python/async_timeout/async_timeout-2.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-2.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index 74ee98ace42d..782e942a433c 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/asynctest/Manifest b/dev-python/asynctest/Manifest
index a6943b3bc74f..d4e8b714bde7 100644
--- a/dev-python/asynctest/Manifest
+++ b/dev-python/asynctest/Manifest
@@ -1,3 +1,3 @@
 DIST asynctest-0.12.2.tar.gz 49647 BLAKE2B 40bb5212409b2f0d9efce5c2559ffeea081c41b3f5158874d9a733f6f5dd2e6a2d7acf3eb495d91c1bc94e785dfd67c9bf5d1845e6fe40ad72aa36ea548b15b9 SHA512 e182fcf0c42d726dde810b9e2d50492b9e5ec9209b5419bd5faef28ee475ff04d6c8220bc165ec506eb9fc2dd38e45d7c3f8bc4ba1f0e279e44214e39862fe0f
-EBUILD asynctest-0.12.2.ebuild 782 BLAKE2B aee11b352ae489a167d315fc1c92fa58b990e7c035426e0df50274f7fc8aaa6dc4427b4df09583468005dce8a181c59799c3325ad4b64d91afeb982556b4ab41 SHA512 b445aef57b1670f23aefafbfbb633c145ef77b9793c7bc0c8d1f7cd760d317c616a910f0cfe1ebd546e481e55177d7b57f94fcd63ee93d858268acb3976e17d5
+EBUILD asynctest-0.12.2.ebuild 780 BLAKE2B 206bde7222d02275eee695f2eb40ff8015dea811f689bb8ad9ca1bbd5e18ee9642f19c63aa1a17fb2058e822e9153a61dfb9a9fa9f3609887a32b04d6b2d347e SHA512 44f24c22627e0b1a06613105bb8de4ceaefa14cb130e20f05021ad1e84f57e1e440457ca594102848efa6568807d1b8155062adfbabff2968e39fa87e331243b
 MISC metadata.xml 591 BLAKE2B ae0988f66c0e87680b326bba5e73deb1e1bcd21cb7b2879b1f8959700c1146177444e3e3cb2cd2d0cff7a13027519371f5a888648132e51db19a8a8bf4d05e54 SHA512 a17f936b2c2bbbc060f7eea6c246616fa5aaa535a5483e65f9f02efb508f28f0ab18770a64a61d069e479a14232e2dab37b3b4f60c8e73c088a064a44eb6fa24
diff --git a/dev-python/asynctest/asynctest-0.12.2.ebuild b/dev-python/asynctest/asynctest-0.12.2.ebuild
index 48dc3cc3d806..92996edd1fe1 100644
--- a/dev-python/asynctest/asynctest-0.12.2.ebuild
+++ b/dev-python/asynctest/asynctest-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/atom/Manifest b/dev-python/atom/Manifest
index 62546397f815..ece4629055fc 100644
--- a/dev-python/atom/Manifest
+++ b/dev-python/atom/Manifest
@@ -1,3 +1,3 @@
 DIST atom-0.4.1.tar.gz 65082 BLAKE2B 9f2f1fe4a910e69a083567472d1d442570b922e1aafd3a94ec55541b406d7fa876a5260193137f9de37b1c44fd97f95d0868fd345cc82e0c1c73683c149aa2e7 SHA512 95c5b5a78fb8466a78b8f983290e722d7f797ecbd9d149e37f2f52f0604c932bb747c791a4d16922535e0ef2c992c59021c2f695563d5a320a86538a6a80b958
-EBUILD atom-0.4.1.ebuild 712 BLAKE2B 6363e460ed03186fae7014ba94d4bd31b9d2dc74e2e5591f414e43441f123878c209a7462481318c69fb8066365a9f001439c769ff85b794a391bba898ae3b4e SHA512 e11ff1b8c94a6c2618dd7856d8440a7d5eb489043224408f73f90ab70ca961f71e611cdf5f14475abbe51b8f5d76cd39bbca62f9362fbab1426b40bba2acf2ce
+EBUILD atom-0.4.1.ebuild 542 BLAKE2B 2547dddd990a2f6f8284af6a1d6871213b0b0abae97e6e210b08c91699f017ef5e2730c63c4b4ac68f8c7414f9acd7cd782a35b96462aef06c623d411966edd6 SHA512 71d136e34941f1398443d92c70d577bdefcce9208a93f953bd828773b69d3d6e85ebd70e7c0f0ca29e744842490fe786822660148c40b246c6b36a10b02bd406
 MISC metadata.xml 371 BLAKE2B 713d6d3b8890c79552ca16e91f29a485e477dac4f89b15c45a5346d97672381b6ef8c5903e659991c24378c8cf14b58381f3a0f3dfaaae6e2fc0754de83da428 SHA512 1914ed5cf60c1815a0bd9639e7af0a85b6dc2bf9952cb0ad00e69fd3e3a529a0fa6215079f8ca56b1fda49d36f34190a4c011afe41b11d81d0bb58e0674e466e
diff --git a/dev-python/atom/atom-0.4.1.ebuild b/dev-python/atom/atom-0.4.1.ebuild
index 413485df8be2..e810d940de5f 100644
--- a/dev-python/atom/atom-0.4.1.ebuild
+++ b/dev-python/atom/atom-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Memory efficient Python objects"
@@ -22,12 +22,3 @@ DEPEND="
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 RESTRICT="test"
-
-python_prepare_all() {
-	append-flags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index 39a3a1bd0425..f42bd3944fec 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,8 +1,8 @@
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
 DIST atomicwrites-1.2.1.tar.gz 11660 BLAKE2B 06b4ca25f39be0e7e8d8e8b46749d7dce052f912e82b1ccd39e308c8ed51ab0d4891f00c11d0e52ef50901c01566f20fcf1318cb472c9a1f3a08617fd1b56235 SHA512 4df7ee97e0817a80378b273ced310b8ad88eb6ced93a594a6e3dc38ad1e7208226fde01b6d282f85583c57a50859e82c85bacaae8a7c64fce55e6965f74b12c5
 DIST atomicwrites-1.3.0.tar.gz 11699 BLAKE2B 7f1d61547f753a69f28f86dc4f7ea66010c12c68fa9babc7913848b011e956b6cfb30b595cc3d06bd6a3555ecea0b5d1eca703a0fec3f1dc0631fea2a12c7565 SHA512 9b619b622f4509c2a41ad340f91bd6e74f238cf9a35f4662fa70f1f957a78069cb89f9bf16f8da70a597bc43a0c6c4fdea6afd0d157364a53a2fa5d8f4272a61
-EBUILD atomicwrites-1.1.5-r2.ebuild 600 BLAKE2B 92abb65ee53d5c64bac87e7c4049e1a40ac46027d1b447ea194a1da61a8ae6f06e072e66cde5aba247b971467031329413c7473be6cf7a8f26b2885bc9c2e0b7 SHA512 cda65d0bb3d988f87805856e9b709eb2f280e87a0f67a8405ceddbfd03a6fe637f42356c4011e8cb5367f6cece54f6e08a8a71cfc5c74dd724fe2b6816449c8b
-EBUILD atomicwrites-1.1.5-r3.ebuild 978 BLAKE2B 1af1ac447b0f4a48f812f3e4dd79f99ea8300c5f907be6feae0c4a34e359c8b6f6639e15b2685e7e4ed6da6cca9cd2d0c6c1a21f67c2214f5e58ee68c40842f9 SHA512 86f87683c024771921c59d396cae1e16c65167dbe5689a5a0dc6a1bac1796d466fdeed77a5c7d314b773957e14da5138c438e809862b0c0e7532f7cffa59cf21
-EBUILD atomicwrites-1.2.1.ebuild 620 BLAKE2B c6a510132e8c8bd8be6528c23127f9dd5ab5da2d7d8593bc86e8905d0043fdfa2aeb33d7dba11cd938d1a20a8d9b44a007488a8d5eee6e62028d488edf8b5915 SHA512 1f2fcad65627a4d4f523db5739ef236b5c66f68ce53c58c6b7fe701926d0755d4f6b3f6e8c5caa4d4dae6f411aba6ef067007a621e6af9d61f38a283e55263ea
-EBUILD atomicwrites-1.3.0.ebuild 620 BLAKE2B ec4181f7bab79d32dbc485548eb5303343a413b2e452ecb3c626748afa168f7389f355d6f2a5d04d85e934864fb0dccc1c0e7e50dff5039af527dd4c92a95378 SHA512 1bfff96c1d659c5ba6c7471fde9c884a2a47ab6917b603c916cd54358931184691af7d139ce3b0a440318256538c68f2aede53b123b08bdae72d984c4d33febb
+EBUILD atomicwrites-1.1.5-r2.ebuild 596 BLAKE2B 8b7bab51cc6539972e7ec656c5b561a0401c73527f8911d502aa2dbc0f33eebc7e5ead6b64c5181a07e294b48b8b87e1de08109ae3eb045cb1b7fdf5a421442c SHA512 653687e15e702080f886c85794c42a04b3d5c63a42101b9417b4539fd9763bda3b056efb7409a42ae8c1cd3bfffe9069dcb1fb732cd1e65a9b766840b10e375a
+EBUILD atomicwrites-1.1.5-r3.ebuild 973 BLAKE2B 2508c7624e6fa977918ca10f51afda7e6220d64728d36247dc5194c7bb02d29897efaea4f770ee8000118bd754f30bcc90f7570fce909c86edb49d3defeeddbf SHA512 8248ea93adc5336a62712d84d545dc5972a8c546a1065f6d7aa4dcb2ef8e93f746454639c2cd9dc1989eea7381b898fdbba57dea5f2621cfda326fe14f03931a
+EBUILD atomicwrites-1.2.1.ebuild 615 BLAKE2B 232610bacd9cda39f525289cf75e1ee2c458c8a353a0b1862f2b58af83b25c5d28a74a2bfab5c648c3f662e173fa3303de708b7fe81fadf0e2222939f91bc4c7 SHA512 db6b9011eb1b52bd96f5a6bcedf46cf1d86fe83a3a3308878a94c50add82a36d5230a988d3b8dc7c3a075bef26b65e556b835e394786647820d6ab704721166d
+EBUILD atomicwrites-1.3.0.ebuild 615 BLAKE2B 5ce9ffa2efa4fe9ace7094d48d1a730815bf324fbcc1a1c4a7295882aa2776b63083fed734416d76e2c00afcfcbec525d97a7492d34afe4ffcddcf16205eec5a SHA512 e0fe9f5505209a15a321da1b81e7161abe546e34ebaad52067552c92d18f5a27ebfcc4940221271c30fc8d7b5a7d22ee82b8a5d918950bba57c6e1bf602b89ea
 MISC metadata.xml 438 BLAKE2B c2a138ede668039b703fdc3e2ca8e1a7a07546e01540fdc502d79a48a8ddfae8dc7a79ed371373d95054731fcb25af67daf75ef5a1c08fafe9976f7a2c30525d SHA512 f38332e752b8bb660d8d8291b897fc96865a134108198e01df2dc4365c0c6e87c6039a907da38080a4d07d7c57750f8a32c6d6c3653b57f5aa193ca5b5b53449
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
index 85b1e5aa6843..ba9a8c7c00f2 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
index 12017592573b..28e04739a26d 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
index cc737b11e313..e20787abf6cc 100644
--- a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/atomicwrites/atomicwrites-1.3.0.ebuild b/dev-python/atomicwrites/atomicwrites-1.3.0.ebuild
index 5fc9d8c0a5db..562d4cafbf82 100644
--- a/dev-python/atomicwrites/atomicwrites-1.3.0.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/atpublic/Manifest b/dev-python/atpublic/Manifest
index f7ea1232bada..3f31879e4b46 100644
--- a/dev-python/atpublic/Manifest
+++ b/dev-python/atpublic/Manifest
@@ -1,3 +1,3 @@
 DIST atpublic-1.0.tar.gz 13611 BLAKE2B b5ce4cbbe950943c001e25c3f0c1fe6c25a99a96e4c630844a409cb0ae9a2e7d8fae8d010864364bb2bc948ce78ed17bef5c1f1ca1435faca439f62521bcc719 SHA512 f9e6f7bbbe12d86df5bc849c432e789fb55c6d19b9d6b3fb2462ea38aa8ad6602504a30a95ec14e001f62709ae5e11ae29258b9cb7a71eaa48879f9cb0cb19d8
-EBUILD atpublic-1.0.ebuild 495 BLAKE2B 973c3942162c5235c3978a6e44d19d84e5e5fd1e42a24623cb5bee6ade1b4cc641e8db65e83c8e055e74dc77be855e0ff582c0e4636132cf01ee79282cdecb20 SHA512 c10a0c6de29db05149937f07fa3f24d9b697a4e47b720b6778a2822c1e0f27cc46786427013119e722be43f25374bb4d90f281047ded65ecb13b82004489049e
+EBUILD atpublic-1.0.ebuild 495 BLAKE2B 1d71d3b681a9e7b5bb443f1772ed23849de2e6ef97e2f4f66a0d6db15f7c77abad32dc4848aefdf0e6f3eae01e3945619254d199e9414c841cb71e7f9691d2d5 SHA512 0212885e9bdf42d832a534bb6ebff24f31bb4d88708bfc8b1c19784d191afcdfc1610b21b69f5b9928dd4579b095f66a13bcc9fe5d80201bc7ae98d3086e7558
 MISC metadata.xml 499 BLAKE2B 545ff1748d57a895d71011220a139f70d3d6477248c79a2345ddba23995c5ac32ec2748567728485db49dbe2f2b61d3b0a5ba76839217ca5e58881193b49b0a1 SHA512 9001d8c190fae7cd4ec6e9ec9224493b4bd66af4a3cae4caa38c2ad02a361208cf953dc7357861dec1582923df187bf0ac85f478b06a3dbdf2f6921a40a2f1c6
diff --git a/dev-python/atpublic/atpublic-1.0.ebuild b/dev-python/atpublic/atpublic-1.0.ebuild
index a5bc1aa9b4d2..6cdb26be63ac 100644
--- a/dev-python/atpublic/atpublic-1.0.ebuild
+++ b/dev-python/atpublic/atpublic-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="A decorator and function to polulate a module's __all__ and the module globals."
diff --git a/dev-python/atpy/Manifest b/dev-python/atpy/Manifest
deleted file mode 100644
index 25ef9c2d52fd..000000000000
--- a/dev-python/atpy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ATpy-0.9.7.tar.gz 663163 BLAKE2B 57636ec6bb3d1fd094db963a7330b403467981b231a126f1626115bb3dc660422b64c75ca2bdbfcbdf09d4b843141c72b03f161c73b97ee75d24232bb0d949ea SHA512 4cd078625fd4fc83d267cf3aff4728ec8b2de927dd0a748dba47030216b141aa0c266f34bbf708211ec829a363b3b8e5eed36bf538efbe170ae316a271b36bb4
-EBUILD atpy-0.9.7.ebuild 822 BLAKE2B bf5bee3283128d467483135ad5b86a8728b3b6df8de324dc9e4dbe4a73e4b9e4f3cd0bc98c670aabde7136102a29ef501d2bcd159d1d3647cbe4538e69d6088b SHA512 f23b363e86beed375fd92c624d5b8f60fdcbe5350dfe9df9c73c578a65648d9976225dfe13780fd5671223137028438d169616070a4e5469f6903e268c9636a4
-MISC metadata.xml 932 BLAKE2B c9a29dba74241c5990eb13fcf51a5f148fdbb63c6dba1375f7d6abb121497918d2f28edb04e232c8c82cdf8e252feb06c91da8c411cedfb50fedef2aa7cdb905 SHA512 a9bbb7bdaa05f7bf9a6c0a9b58579de1ff120779788e562993dd1acd8b6fc28f87402f55aa39db871b3e0888619a8077a6556e163658450469f54b3cc28faca3
diff --git a/dev-python/atpy/atpy-0.9.7.ebuild b/dev-python/atpy/atpy-0.9.7.ebuild
deleted file mode 100644
index e9e43608e6c4..000000000000
--- a/dev-python/atpy/atpy-0.9.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MYPN=ATpy
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Astronomical tables support for Python"
-HOMEPAGE="http://atpy.readthedocs.org/"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/astropy[${PYTHON_USEDEP}]
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( dev-python/pygresql )"
-
-IUSE="hdf5 mysql postgres sqlite"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-
-S="${WORKDIR}/${MYP}"
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" "${EPYTHON}" runtests.py || die
-}
diff --git a/dev-python/atpy/metadata.xml b/dev-python/atpy/metadata.xml
deleted file mode 100644
index 0a36a95e13c5..000000000000
--- a/dev-python/atpy/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="project">
-  <email>sci-astronomy@gentoo.org</email>
-  <name>Gentoo Astronomy Project</name>
-</maintainer>
-<longdescription lang="en">
-  Astronomical Tables in Python (ATpy) is a high-level package
-  providing a way to manipulate tables of astronomical data in a
-  uniform way. A table is defined by any number  of columns of data,
-  each characterized by a column name, unit, null value, and
-  description (the last three being optional), and can be supplemented
-  with metadata in the form of keywords or comments. ATpy can be used
-  to manipulate single tables as well as sets of tables. Table formats
-  supported are FITS, VO, IPAC. Database supported are SQLite, MySQL
-  and PostgreSQL.
-</longdescription>
-<upstream>
-  <remote-id type="pypi">ATpy</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index ba3418b9f88e..18e83dba8add 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,7 +1,7 @@
 DIST attrs-18.2.0.tar.gz 116817 BLAKE2B 79d50c9b49956bbc1e04084eed36a5f65f2dda8e954b23f15650cb881d6f77a8325e042c6d1a77dcad43661d4524a4d253d96bd0053464ef03091779636e6d0b SHA512 58c26579d6dfcacbe9e3f770a125861e0625d435f1293eebe0d62efc9b8aa9572be2b312d73037a647163bffb0a13b240fb157aff7ed35196f637ae945d61d22
 DIST attrs-19.1.0.tar.gz 124220 BLAKE2B a7a8321857c2723398db3b7943f221cc141f2d365b84d3f77ccd16c9180fb1d73402c7a1018d70b666bf76b6021bd90df14d792886c1345752b8fc810ac54a35 SHA512 22ee45e8b10a7abe10e720788c5cfab424d0bfe70e595dfb116928b8ebea497a747e8234d96549da00f0967de750fb943db0cd3669354253a27be2ca30fe413a
 DIST attrs-19.3.0.tar.gz 132477 BLAKE2B 6577f39fc15c9e70f0f76ba358099e83c57e226574cb11dbe83747f12e285a284e9d1a218fc1670e0d08be550d42c67cde132604b2cf385d1ee25bda7e57e79a SHA512 b5b641e6732156d1454ed6c49e3a6b29200a8d3f1515fb59aeb85fcb5e9ab6a1d760904de45083cae5250e7bf1a7aa2c1f3ede217240a63f989ae4bb484f2511
-EBUILD attrs-18.2.0.ebuild 945 BLAKE2B 12a864763c3484dd442c32955441ad7f259d43cc93c63dd6d840804f614fa4550f5d1888bfb7b46a578ec14af32705862f5a28417b68e8b73d81e5173f4243d3 SHA512 6101641d5ff23dc53dcfd81129e010a1c3cb77ceca4e954f8e1af3eb16057916ba9cea67888e039e5e1d83721fdbafc16205dc75ad8907979362196f597bc261
-EBUILD attrs-19.1.0.ebuild 956 BLAKE2B 16741aaace7e23b520a43a4ba2d47c2e7b6a6c38590193bd6c81398f34067ee60a22d80706bae0ffff6084df54ee646a1ebfd4bfab3f990bfd72ef3f42017524 SHA512 4906f9b36d175cced1815b96c5c365f8269a76822128c5447ccc2b10c99652dbd94b5ffe7cc6ba0aa38ce2f387eb9fe0ce254d2eb1fae21642b80f34633f9b00
-EBUILD attrs-19.3.0.ebuild 877 BLAKE2B 9d71b2bdf0eecd492be9a4eaac5525f0cb6d3c0cc3581e5efb8c6e0bf1c3fffacf786025d9b0f84eb83465591b07741425b9d7ea19844c11538b786955549ec8 SHA512 dd11b6625fe06254da1caa110cdcea80c6101e1a92684aedf564958e7aca449002330dec2750784ce82796d88cb89223d8d7dc6f88210ecad0fcf5ec2cf901db
+EBUILD attrs-18.2.0.ebuild 940 BLAKE2B bad33348beb8ab34df73ac9bae7acd9d8270f1a71b00055fe43c91eb24409f96251afa1d830075c340d2d35ff317dcd89d37a7c46dcdf105a0be4a002e6bdf3d SHA512 c904d51c449b4168be52a40939d2bd85475840e8e824666044ede71c83efbe7167cf7dfa9b87be67cbd96c6ef83b4beb41663285594ad15c8bf97a88a8e20501
+EBUILD attrs-19.1.0.ebuild 951 BLAKE2B c0d012689b6c0195d004b5a791a92f66a07aada3849901bc2b75613b85d2721379c24ab96da8aae0e0bbb8180244266f66450eca897197bf9590fd4b9064a41f SHA512 5e3984dfaa07a419fed2101cc410c73fbff34c0a3a84fb405b7bc2c1b93bc960d53e0559d2796582db367c328415af94ac8dec80cffcc8bad2a4ec44dbcc755e
+EBUILD attrs-19.3.0.ebuild 863 BLAKE2B dd880c98ed7f48fa71e346a39d4a0e3e2936f752e2443a5fed5a142e4044cd7bc743f30e98dd0ed50a617e64394b6a5682c45d3458392a44b7ce0a889144aedb SHA512 1f67ecad39e537ebe2fafb53971b5312dcbd081b754a2961f4e3b274474d6cf5bd95fced45014daa0fefc56374da3ff0f24bac6ab50605e5f3544e84c4ca155c
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-18.2.0.ebuild b/dev-python/attrs/attrs-18.2.0.ebuild
index cba1fc875e8e..b69e3772bc94 100644
--- a/dev-python/attrs/attrs-18.2.0.ebuild
+++ b/dev-python/attrs/attrs-18.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/attrs/attrs-19.1.0.ebuild b/dev-python/attrs/attrs-19.1.0.ebuild
index faa7c448ec5e..cb1c61df86aa 100644
--- a/dev-python/attrs/attrs-19.1.0.ebuild
+++ b/dev-python/attrs/attrs-19.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/attrs/attrs-19.3.0.ebuild b/dev-python/attrs/attrs-19.3.0.ebuild
index c21800f30138..19f7b1550de8 100644
--- a/dev-python/attrs/attrs-19.3.0.ebuild
+++ b/dev-python/attrs/attrs-19.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/authheaders/Manifest b/dev-python/authheaders/Manifest
index bd15ab611e6b..a6fa15f420e4 100644
--- a/dev-python/authheaders/Manifest
+++ b/dev-python/authheaders/Manifest
@@ -1,3 +1,5 @@
 DIST authheaders-0.11.0.tar.gz 88501 BLAKE2B a4ef01d206c470c4d97443af2b770d301de59aaed709ab72f439c43e0fa11e20a4a0b7f4122cf3c3212781750a1505af7a8143be9277a7989819948c1c18274a SHA512 7d0d8750eb606f3e52e85159e6b5da2fe377816e7572ee01b6bc90dffa996717c0f2837e52b170ecbd97b7617461a0b96d0736084590673a516e7d3ae7e8f999
+DIST authheaders-0.12.1.tar.gz 93106 BLAKE2B 2799422b4e792a4734f0e0922cd99b62fd0e33014dc67ef74694e134ef0417ad2a0a3f4e832b50e36b32c8941940c7d3445a248d1bd32c611b954324f54d5233 SHA512 68ac36227d0ef602ed89fcd5852c0984b0875bd4a3e1465d87791178a0e42072bca79335054c82bbbe6e06f6484598cabfa83676bd3338114f82bf9dbd23ccc3
 EBUILD authheaders-0.11.0.ebuild 734 BLAKE2B f4700ad87ad5f73ff82b3fed1691f9307880dc0e87ad33db8230c8d9d22529cbc900180fa8c622378672f5f49e188ce10eed07cd47750406825fe8be5cb8138c SHA512 89dd49322ef0febd04964388d63cb90ac274e5019fc33ff3810e8978226e567e827a88a90c0996a0580e4516d1fb0352d78e178d24f53fa318cb239fc7e19468
+EBUILD authheaders-0.12.1.ebuild 699 BLAKE2B 1b8020b993d29a634692ba4e832ff69e3192e949eaf2280602d058397bafeaf7da670d59db3f33042f35dfe450987e0ee0d781a46596211526ef03ad06bc5108 SHA512 84794f956f8eaa0aeb56942d08ad3d636c4a8ede1b16195dd9c7e0294dc19c704d1647905e98575697fbf4294a4c4d591af9029a996de56badfa1c4982303d94
 MISC metadata.xml 462 BLAKE2B 136929c00b3dc09352eafe4819eb1aa20ca5e6f9742036cc9bbf2dcefaf9e2c9173d39450ac27d5900573e78b3bc5e95de90e06b319ab2ccffb352d96aaf48af SHA512 a748fce55630560f5ad5315361c1cb23db3b74d416fc24bfd61c0aea6f722f363db521efd898f9495838c618ae109f3490fb047d8eba515304304ce7468c2a76
diff --git a/dev-python/authheaders/authheaders-0.12.1.ebuild b/dev-python/authheaders/authheaders-0.12.1.ebuild
new file mode 100644
index 000000000000..606604702e6f
--- /dev/null
+++ b/dev-python/authheaders/authheaders-0.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="A library wrapping email authentication header verification and generation."
+HOMEPAGE="https://github.com/ValiMail/authentication-headers"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/dkimpy[${PYTHON_USEDEP}]
+	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]"
+BDEPEND=""
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
index c70ca47c810f..614c3f84c66f 100644
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@@ -1,5 +1,5 @@
 DIST authres-0.800.tar.gz 19863 BLAKE2B 01f9264a78ef5a3ee9fa1db17dd4fc5d1e849a5f297f610ab0bda09f4900bca15e63d71c2312e12b1e6173213d3eef938dae996c7bcc599de496b6c77001de87 SHA512 d9e73309064e396c51ed55394ce505c21869d267922df55b6723cb6b2409282c7827d35d381877b5f08e037042e015d59246603d51219c829df7b81011499fe7
 DIST authres-1.1.1.tar.gz 23180 BLAKE2B 8ca2e0a0e93da50188d721be1fd60604ec2fdedb117df39c6e74d454d48d008a1627b45acbc18df3bc3c386794d7ac91e31ccca131c9e6e04f6bb34417f64c50 SHA512 61e73e85e524279d5db37375fbe7b1fcf65a24280ef61124a94e4236ce477c225637690e9d424f5ee3fef8b9cd3d26c6d512dfa3c1c8491fa4f4bf266f88ac80
-EBUILD authres-0.800.ebuild 601 BLAKE2B 574ff453a149edfe7099d477d40b20dcad735e26d1ec767d0a50f494f58524533a066f6e88fef1809b57b371a46683599a80bc05913b9aa4e620be3c2e3d347d SHA512 cf28623b12c682c0c36ebab3fd77febce9b16e5d57cee176207f79239d6d07a775217e31e61474444601defb4b1a39ba49a6a34ed86069d3015f697b4d92ec5f
-EBUILD authres-1.1.1.ebuild 571 BLAKE2B e9c4e4098b213c316a2bf7eaf5f0b337a84f9008d3f929a381893a6416904d0b8ae1dae4cdb827c3600c0b436ce2364528fc966270d71a8faf8417a99a27ca66 SHA512 37388e1459581da89e9de2431a349a9bb00503652b7b4d33980453e9a4b39505959e365fcf4e25a9b3aa47d40a963708f84393d3a28e835aa6d4e3981b8e2fa4
+EBUILD authres-0.800.ebuild 592 BLAKE2B 7615b6090d4ab1cbcce42c714486e01125fbd401e0f7eb69fa2815d5adbe1306625c715eb21910c0a30bd910e7b03f00d3ab7401142a71c1ad37d9e96e70432a SHA512 6b26531173e11d8891393278f1e74fce81a1f09c40fec2f724791a27e54984eb0cce1a35e8bdbddfba8587314e33d3e3bfafc34f3f9acf2f86fad9876659acd3
+EBUILD authres-1.1.1.ebuild 564 BLAKE2B ec00fd05642651b38e746d9449b6972bbff01a00548c4005a851caf393bc0b93118f478c47503efbe15da7684ecffe89e791b134d9482aec958d6ed18befebfd SHA512 20567a250ca5606354e8e30bb571b2356b7dca06e56c69c7f9108641b07eaf6272d4c595f0b357faf167857d57d9be77865a3b62f6d57debc9bfcc663a5d7906
 MISC metadata.xml 659 BLAKE2B 96a0bbbd3a801f527d61237bf4de6b1140cdbb316571efbf4934a0398b6f171ea04bb9c80eca90809ba00eb4b8a2bf9806442752d58e5fc2b43e5c7438425762 SHA512 166514ed6b7ff4e3a3acb703da72e72865ef51b067595375f36bc45541483629582828980befba2711d7b7555f571b91c777162a0996ce57f735a0934c4dfb9d
diff --git a/dev-python/authres/authres-0.800.ebuild b/dev-python/authres/authres-0.800.ebuild
index a151b5687444..a2824ec8e273 100644
--- a/dev-python/authres/authres-0.800.ebuild
+++ b/dev-python/authres/authres-0.800.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/authres/authres-1.1.1.ebuild b/dev-python/authres/authres-1.1.1.ebuild
index e502ad34aebd..26a7340c6387 100644
--- a/dev-python/authres/authres-1.1.1.ebuild
+++ b/dev-python/authres/authres-1.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 3c13b675a0de..6ecd1d3bb1af 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -4,9 +4,9 @@ DIST autobahn-17.5.1.tar.gz 205144 BLAKE2B a026381330d062059f23bd0fe20de12bf227f
 DIST autobahn-17.9.1.tar.gz 209230 BLAKE2B 4e637ee22fe84c51b294faa853034b65e5bc7b230d1d80eea022a2e3809a7ff0c9ffee7c13886f154efffdcdedf5c790e5891466107670c3221a5c7b5de846ea SHA512 036508c1170f53b01be360083bbf9f569fbaf216d984b34e10ad18e5f5e156e74bd4c8979bdd977a8e23deff0332e16d3d606716d32f3987ff37c7707eac0f86
 DIST autobahn-17.9.2.tar.gz 209442 BLAKE2B 66d31a575d980d81ecd50d9511ed49b947a568ce5457db2de7fd67a85ae06016bacff10f65b74f43c2b72b21543ddb8c0d527f6b9ece706c67adb96860435232 SHA512 de73a4cc99616802d280887ef8a9971c532f974dd43cda933da953d7bcc45da3fd9d0c91763c6a80371f582f0acc9741134b1ba1b98035ef0f63e4971aaff79f
 DIST autobahn-18.3.1.tar.gz 213042 BLAKE2B 2f5eb92212f57d2301dbac1108a81cbbd339da4cb5527e3eb55f1ae7dcb951fed3cb7c643e76beaa0a83d623fe96f9eebcf7945e10efb0773e102d0234ebc479 SHA512 3d122cfb54eff0697cf60cd155a07699c6f6b39e573616c247ea79e65e6fa0a86d505ea8bc4f4755dbf266fb8bc7fadabb4338aeb1b9e6a2f0503e1b4d25e2e6
-EBUILD autobahn-17.10.1.ebuild 1932 BLAKE2B 086ac11cf8a70e8278b5393761ec1c0f782f6201d013b3e4dd23f1228a18f8b61f0dc6c8f25a40a25886adff39ae881acaef77bbec4667e4b9ce82df1cf74e25 SHA512 2b41c4edf6e9a4431089ea09a12dedf742b88204b1a928c2da9bec05f71efe16d972107627087cbb3f4cdd98fea5f5c4014a72fafc52c9ee7264342471b5b390
-EBUILD autobahn-17.5.1-r2.ebuild 1925 BLAKE2B bb025a3b574cc526b38fbd4fb6dcf631ffa883da6dce5e6d18133ae48425bfd9b91bcf7b09ab5e879d1283a92b40a06818f31152f3e98c3724a05769b060a25d SHA512 49935b8f182f372754c25314fbbf9def4a7b7d6e7c55bf9541e4361f5cf68c2590cafdd0937cc2a68f572b8d8fd6eb2b8dfcc78edc41f11a6a88afa308f9059e
-EBUILD autobahn-17.9.1.ebuild 1932 BLAKE2B 086ac11cf8a70e8278b5393761ec1c0f782f6201d013b3e4dd23f1228a18f8b61f0dc6c8f25a40a25886adff39ae881acaef77bbec4667e4b9ce82df1cf74e25 SHA512 2b41c4edf6e9a4431089ea09a12dedf742b88204b1a928c2da9bec05f71efe16d972107627087cbb3f4cdd98fea5f5c4014a72fafc52c9ee7264342471b5b390
-EBUILD autobahn-17.9.2.ebuild 1932 BLAKE2B 086ac11cf8a70e8278b5393761ec1c0f782f6201d013b3e4dd23f1228a18f8b61f0dc6c8f25a40a25886adff39ae881acaef77bbec4667e4b9ce82df1cf74e25 SHA512 2b41c4edf6e9a4431089ea09a12dedf742b88204b1a928c2da9bec05f71efe16d972107627087cbb3f4cdd98fea5f5c4014a72fafc52c9ee7264342471b5b390
-EBUILD autobahn-18.3.1.ebuild 2224 BLAKE2B cfb08889b5b10dd39e1e0bd1f70fd534e42eb48615c4178747eb5e675588d93948cfb584ef5ae6df5ef376f769d544126ad2c14bc6dfc0995f99522651142ce8 SHA512 d1539ec74c2436b8fcf8e88e92ee3d540acd37d26baf52d83daa2bc3cef77fc13f02c866e5617520219e0fa20f5eaf0fafc8719bc62f70cd689846c4fad870d4
+EBUILD autobahn-17.10.1.ebuild 1928 BLAKE2B 577b79249f1c095f2e9cf44893be2d3aff18067da7678306c71057f5870c6b15e25195373ab4fb51b4768044cd44e51b21abd4cd662a2606bc2f432fac5a3e10 SHA512 09cd54a28a135b78499231aae4e35315e4168f22dcacef91010462c900651b875670ea32357a0100f74fbf96fdc21bcb91fc0df1b2aae478aa37a6ddb54a7f24
+EBUILD autobahn-17.5.1-r2.ebuild 1921 BLAKE2B ac2b1c039c31192f70dc305d45d88dc139fee02eca4d234d286af203823590065ddefa63990fdd8737c7ae636da9eddb27320b4ebd11fb0088634f6a8f0f51d3 SHA512 071f7f70cb4e059997ec9223fead0df46197e56d4d9211c1b43aebf41c3c0eede429eeecac417f1a45667a81f97a53c70f59b7a10d276d5d88350971efa82b71
+EBUILD autobahn-17.9.1.ebuild 1928 BLAKE2B 577b79249f1c095f2e9cf44893be2d3aff18067da7678306c71057f5870c6b15e25195373ab4fb51b4768044cd44e51b21abd4cd662a2606bc2f432fac5a3e10 SHA512 09cd54a28a135b78499231aae4e35315e4168f22dcacef91010462c900651b875670ea32357a0100f74fbf96fdc21bcb91fc0df1b2aae478aa37a6ddb54a7f24
+EBUILD autobahn-17.9.2.ebuild 1928 BLAKE2B 577b79249f1c095f2e9cf44893be2d3aff18067da7678306c71057f5870c6b15e25195373ab4fb51b4768044cd44e51b21abd4cd662a2606bc2f432fac5a3e10 SHA512 09cd54a28a135b78499231aae4e35315e4168f22dcacef91010462c900651b875670ea32357a0100f74fbf96fdc21bcb91fc0df1b2aae478aa37a6ddb54a7f24
+EBUILD autobahn-18.3.1.ebuild 2220 BLAKE2B b16233a7c54ac493c0b330f31578191bb74967d363fad5f41f822bbda26ffdca622061a3a0a26a206085428ec3e713b428f587f935b7961e8674a796891d664f SHA512 7838b2edaa5eef807b76b9b52d1454bdb283c596e2eaa1ad90d5872f91f22f70d947a1619fbe3f38afa4da1963a604e85c2e0d17caebaf6e662f61c5158787b3
 MISC metadata.xml 321 BLAKE2B 2a222ee5e7e6a2a90a44b834a4b7d430938813786c7179fe3fe273456b501feba4c20da2fe3b9671092085a991fd35c736a5b64c179a08f54fddd029ac5bd731 SHA512 fd00829f66750d3d54b7bfb472179639fbe453840e7c3056b406af546acb952d3fb8d4552973a68ff0966f25bead8dfd4501888cbd68721e54207b5a7628ac36
diff --git a/dev-python/autobahn/autobahn-17.10.1.ebuild b/dev-python/autobahn/autobahn-17.10.1.ebuild
index c4ec6e740ef7..d806cf15eee9 100644
--- a/dev-python/autobahn/autobahn-17.10.1.ebuild
+++ b/dev-python/autobahn/autobahn-17.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
index b6b988d506e2..7a621b460ede 100644
--- a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
+++ b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/autobahn/autobahn-17.9.1.ebuild b/dev-python/autobahn/autobahn-17.9.1.ebuild
index c4ec6e740ef7..d806cf15eee9 100644
--- a/dev-python/autobahn/autobahn-17.9.1.ebuild
+++ b/dev-python/autobahn/autobahn-17.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/autobahn/autobahn-17.9.2.ebuild b/dev-python/autobahn/autobahn-17.9.2.ebuild
index c4ec6e740ef7..d806cf15eee9 100644
--- a/dev-python/autobahn/autobahn-17.9.2.ebuild
+++ b/dev-python/autobahn/autobahn-17.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/autobahn/autobahn-18.3.1.ebuild b/dev-python/autobahn/autobahn-18.3.1.ebuild
index 87aa279ca102..d52ee164e216 100644
--- a/dev-python/autobahn/autobahn-18.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-18.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 524bded2f452..cfda2b6443be 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -3,8 +3,8 @@ DIST Automat-0.5.0.tar.gz 32599 BLAKE2B 951da8840c2334fe3cd86804b39beedaad0d344d
 DIST Automat-0.6.0.tar.gz 31767 BLAKE2B 28baa9d6cc7497f9c0a4b7f4050b197d3dff871b91f5f3e29bdc47ace443af8de0fbeacf1657dc6565b3ab824365362a42204d6d89a8dfc82eaa6cd92d4e2308 SHA512 94f2fa06b0e0e1c0538bcf4bd9046ea40600a018bdd1da2d5bed479877807ad56e448c4f1d7ec87341f80013ae6c35b01201cbe3c4ecae1105419038ed43024d
 DIST Automat-0.7.0.tar.gz 61461 BLAKE2B dd09ce090c7333ee17b701bde2c78e01dacf40cefee847061a2019bb27f0982091e7628737211421ada351937caf9c6734cb445ee6462ce84b381030b013bd05 SHA512 a6f307d312a3ceb721071b5212297c73d2306894b5fafd39265578041a2859bd6f041ac43a654bdda4175a70a4e90e0db1ee35cd43fa620cd5c594b5d1988a74
 DIST Automat-0.8.0.tar.gz 59687 BLAKE2B 56e4ec76564d321ca9a709c484077a4003eea2842160e226728aaaa4ec6ebc2486482f79cd919bef7bbec8baeee7a34ca2a11d48665bb36c79c5a45a3c97e992 SHA512 2dbd4e784f65b02a8c93fc5f15236df3649d667a9792f6cac929dbac5d971495bdab4825df0fcd6817b9a9f79b7a5d8cfbdf8e4d18605f0761546b31b3091ad7
-EBUILD automat-0.5.0.ebuild 1245 BLAKE2B 01b3b438368c5bfc7086976edd42af19881a2d1b04e1b370abc6c15e2b8673a4291b98e77dc01214215d09840eb67d04a0c60a7dce57800eba21aa089748de42 SHA512 9d01ad553de7702dba31f661e15e11504e6161c869cb091bc501a64baa5467600c34732650b3e86e95a46b510bfe16cb70a4ff4c272b64bda0eef1b99acdfba2
-EBUILD automat-0.6.0.ebuild 1251 BLAKE2B a2bc3fad13fa8f48da21627545352af7277abd169ad94088e79366c37c2a42dd6cefc9cd5658cc20447780a9b8138f337bd8c8c2927a99bbc59fde4f462797d0 SHA512 60252491e369204c3821694ffe432f6233a7ecdea86175869d4aa6ba3a27c5086faf8fa9837a6aefd7d262be0f4f16270b8d92a982ae93be69193b8f5b6e7061
-EBUILD automat-0.7.0.ebuild 1484 BLAKE2B c8785ffd5a35d726f4675831cc345ace1d355b9ccde3e6220577dbafacbf828083a10e2c2a8465ebcb56de63a044a7669a230edcd3921171da26f0e62b252853 SHA512 04d0d12ef7669e83bac1d042893f5e921775d262d36c880251b79676333ae9842e45f7e85127386b4e16892e7375fb46f6c95f9d4c54d0b4f4bcb9b7349f0a02
-EBUILD automat-0.8.0.ebuild 1531 BLAKE2B a6d8bb1c1dd714a2919de88f8d6d9d4971e20b54e8a81a91bea0aeea0b12af74dd78824cde83b26958fc03c6a6d2c6851e72f02d03327fd707391cd256b4c145 SHA512 4f72cdf8db42d91005b2587e4ff0b68ecab202020a151cb3f8216a0cb817b13bace5e1576dc65f9a44e5fe590d8e5b7da0c378451d50b9c08a2769deb4ecb9bf
+EBUILD automat-0.5.0.ebuild 1236 BLAKE2B 5392bd176fa9f27c5aed60b35b120ee0e49871256f85dc91016ee47511098b3fb59d3bd54a66bd9c93b633f0f21e6b012c9a17d0d969752c7733feee966795aa SHA512 85ceb7753f23ba41e4d342d39a8435c2db778dc64018f150f4f60d5f5ef3e9381e82a64ac41d308bbf773fa5652abdd217baf80e639a4be5c6db706d8c6813be
+EBUILD automat-0.6.0.ebuild 1242 BLAKE2B 2f949d1a3af97d7517f632b6d70cdee2e8c9e0dc92264d684fcd787acf2d1f6fc941c369c03c389e4e83f52a301a7ac419769ab9050f4a6e12c54832198161f1 SHA512 96627427bace08d20ed87e5a83e7cfc6162c5d9214446ef6c24ba20bb5f8d78c89b210f3d57306a7c613f30d1695a44a4fe58301c280af21602d6f380b4cb2b0
+EBUILD automat-0.7.0.ebuild 1477 BLAKE2B b5f7b3e0e265e6384970633e068afefbea5fa3315dad83bfbdcfe5d412e84bf3756b12c1aa4532f458ce20c656fb30a853ca15d38a06ba3f27345d4cee4607d8 SHA512 43b1d626d09ceaf844990c67a4468c12b55ba365de8c1dc92adbbd5022eb7ce7cd2769141239407c096db5792ef4d3cd478b9c04daa3dc05e733936eae9ec512
+EBUILD automat-0.8.0.ebuild 1526 BLAKE2B 29d32d7c1b34d2e5be1f7859bdf5f1d57e8bc1527b1e478857785b751ea90c6d0b4acf0d0fcc340f291b76d61dcf2005d2b82552071cbbf3d721e9d172e0b9c4 SHA512 bf9b0675b6f6da80b9adc6fef0212147aff299131cb270d5f360071267bd1bd71dc78ecab72156188907923ad99915321a0c652d9f110a2002c2eea4120d9ccd
 MISC metadata.xml 572 BLAKE2B 26d7ccc6325a7ff3f051d90ffd36a50485575cd78a2bb35e2f471b2ae5c0f2a579269633db2fa98be1682b5a53271acfd97f079d8c040e30188dd07ef886d509 SHA512 6514fa4351ceffc03f98fbafff044548b350b69d78b0926e598e230fbf6ba52e8a2e0346e89b14d8c4fee914d0a846e457bebe62354ea10186dcd24c1daef590
diff --git a/dev-python/automat/automat-0.5.0.ebuild b/dev-python/automat/automat-0.5.0.ebuild
index 5729d9769dd7..da69ebd7e7fb 100644
--- a/dev-python/automat/automat-0.5.0.ebuild
+++ b/dev-python/automat/automat-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/automat/automat-0.6.0.ebuild b/dev-python/automat/automat-0.6.0.ebuild
index c1d2b9abb655..9e702ebbb8f8 100644
--- a/dev-python/automat/automat-0.6.0.ebuild
+++ b/dev-python/automat/automat-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/automat/automat-0.7.0.ebuild b/dev-python/automat/automat-0.7.0.ebuild
index 3abfc8453262..7fda0cb8d2e3 100644
--- a/dev-python/automat/automat-0.7.0.ebuild
+++ b/dev-python/automat/automat-0.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 
 inherit distutils-r1
 
diff --git a/dev-python/automat/automat-0.8.0.ebuild b/dev-python/automat/automat-0.8.0.ebuild
index 97cd84600b35..81c36630d9a4 100644
--- a/dev-python/automat/automat-0.8.0.ebuild
+++ b/dev-python/automat/automat-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/automaton/Manifest b/dev-python/automaton/Manifest
index 15af8cd54cb4..873fc0bfcddc 100644
--- a/dev-python/automaton/Manifest
+++ b/dev-python/automaton/Manifest
@@ -1,5 +1,3 @@
-DIST automaton-0.8.0.tar.gz 24784 BLAKE2B 0ba9e4042b7e4e022a8b83a0d9489c5d8ca6dad25840761e0770cdce56476821d5cc722abd0c30b5c6dc056e34b0caac26cda1f3d779ce59bd61e9be5bad3ae5 SHA512 1e167cd99ba427485d73f30ff55fe7f2d5f978d6e012a35ac104e611f5e37cc9a39f45dc93540fcb07b5ef0179790e9539a2cce74c88514701e8ce418ff6394b
 DIST automaton-1.12.1.tar.gz 30350 BLAKE2B 2557cfe4be401080615a7e640d54184ac8213654711f75b12512c5fc689d96bfcb486770fe6bb1999a7af54f9c2e115a5a5bc2a45a25ab6e89d0030d4087d45f SHA512 c0b78d934f1c0768e1131db0640649254489afb8710098f68f61293746c80a2807edf82659d8fc9bd3812107dbb823e95055842c81477325f9ada65967ebf4e6
-EBUILD automaton-0.8.0.ebuild 714 BLAKE2B 23f669c2505210c3150fd981df3d9ac0ed1147fbaccd128a9e93d7ff875489a0fbb6e4aefa36675fee612704b67544bdc111f6cf4d70355b577605138d402f4c SHA512 3120c2ad24f4fb67e726aa23bf7db102405f8cba122c9728d369e1aea79a21ef56b02742bc69943b1e4cdc2165cf29e620744c61428ac5925ad23688606cbca2
-EBUILD automaton-1.12.1.ebuild 778 BLAKE2B ee5f9b8cb27a5df1467fe3f87e6c216c7275b0528865e977a9767c3e0d75317d817c9820da5edae746c3d8ee6758fe287ea854fa36bc288eefebd0a262221b38 SHA512 933986f1de8c17b87d4f01d62fa22ad3454124fc1039c4ca303ea9557f80bf403d5d3c6c10f6f9da8ff823e89bacacf9af81fc8ceab348a65ee1f5ac2b5182c8
+EBUILD automaton-1.12.1.ebuild 768 BLAKE2B 4cf4187ba4b801aafdcfaa94980b4ca36985864ac336f1ededbc5baeb32336724c1293d1ab7d2dc8503941240432da738179c6655bf8d1c06122894063a6d0ca SHA512 995c7d6fabc89a78cea6f94469187209ac62e0a9c8046cdfe31c7bf4c9e7cf7f20c5b76569ee60e18422806fe4a70bda172d0d59b3a6eadc1907362d95d2f7a5
 MISC metadata.xml 326 BLAKE2B 3a95411503927150283986660bc36f2ac54e96937de019fde1215d237f8629d271a9581b1d27ec229aa2ea2b7f2b2e7bf48d46915def83c10c2386b9160ca761 SHA512 d11557577fad543f40098af61ee4d40223e14a68de91dcfc92e595fba7c149c0c621081655e8c14e79d6cf9d0b6a17596096a74c8ac90f0f2c89e96d563797d6
diff --git a/dev-python/automaton/automaton-0.8.0.ebuild b/dev-python/automaton/automaton-0.8.0.ebuild
deleted file mode 100644
index 232ad9e68f8b..000000000000
--- a/dev-python/automaton/automaton-0.8.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Friendly state machines for python."
-HOMEPAGE="https://pypi.org/project/automaton/"
-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-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/automaton/automaton-1.12.1.ebuild b/dev-python/automaton/automaton-1.12.1.ebuild
index 31f9b3a9687a..1391ca0acf28 100644
--- a/dev-python/automaton/automaton-1.12.1.ebuild
+++ b/dev-python/automaton/automaton-1.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 422a9e35f3cf..7fd3b1fbdc5c 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -4,11 +4,11 @@ DIST autopep8-1.3.5.tar.gz 109415 BLAKE2B e30a9719dcb2ce5463adc967ea76daa1c919c4
 DIST autopep8-1.4.3.tar.gz 113940 BLAKE2B 89a75228e80a8c1dae3e2ac10618c14e2dd83e2cbab2c45f6b17fa229a7d49ea0f0b8e95324c7d6eb89152112adae9dc5379a145db01ab48419b4abdd3ee3587 SHA512 a51b0f74c056207c869e8b9f178e08854cb274af56734373e2e6ad9626a1d28b6ec5beb7b90c4fa8c71d3d7c4ede199f716854f93f369d669ecc7095b09dee38
 DIST autopep8-1.4.4.tar.gz 114796 BLAKE2B 0eef2550e2e13a79e4c3199dae119ed49b13056d9bbd98be5d9e4c7d0288d12bf6ad30162c0e4c485f6de9b47b4b6ecfe92dcb278f2cb265b75e395bdda77aa8 SHA512 06822df7cd02c68980965c1fd987dec03785e155554ff0f735dc707c4de99b4d152b0d092e21017ec5d9176b33bcf22f3ef2b0986f38faebab0928443eca4d32
 DIST autopep8-1.4.tar.gz 107925 BLAKE2B a64f3af22d0f7910210c8f49b29e47a4a8a5118135a77ac53f1fbf97ff826b6dd2df034610c8d0298af27765e260d26627bef4d8550fdf31d6cb1068d52a0d18 SHA512 ec7dd7879140119227f30bd87bb416a74c402ff1c0b32f45103847774fc33de99d51d1815991441c20e3c81b3fdef73bc4563899da5a6d17b1e682e42f53754b
-EBUILD autopep8-1.3.2.ebuild 1053 BLAKE2B bc3a8c8414e443a021075ca25bd0794a9262ed9a62582a17e4f7b5c7e322346bfa3b5db1fd36e50fe6078e06dcb9eac8e52a13e6d96aaeaf34dcf8d4e8521fe4 SHA512 b7d894ecf5ea91c0935a0b32e58f954f1c7960bd08eb1937ed3bff26ec9247dd84e3a478662f89d678dee58696e38b57b5d4635cafb142c4c3540d004e0a6b8a
-EBUILD autopep8-1.3.3.ebuild 1055 BLAKE2B 9abe5e5262cab5feba505af3752716772841cdaf089b860c7a0f9f1a6c92fbd1801486018587dd2338362df883338f2cd89de0b2e36600f60f759a596dbafba5 SHA512 a856febb10d865899fef65e2678f5788e4091111cbf79242707cb2523bf4d76aafbe83199d8e3bc033e9d6bbc9750228d7dd9318d1acda4a3c5fdb6d6dcd2ffe
-EBUILD autopep8-1.3.5.ebuild 1056 BLAKE2B f9e48c33ad2f4870f4757719660893893bdaece6ccc8014f2d85c3fdfea8a21b034c33366d2f659cec298ab63f84e5599bf83895ea8243a0706471b1dfe13cf7 SHA512 da9cfd285750b819c8f720c4d6262caa0a96d7fda90b59a5e092ecb58fbc4fead075fb10c8b85d920458c0feccaece9a9b75b6935234f2c6ce7c6c4d350228b0
-EBUILD autopep8-1.4.3.ebuild 1054 BLAKE2B dc36ceeaf61cc5985fb4c9aa6c00f862658740d21f6019cabc82e9b844cee61e81df6b814f8949a106afb721ce453f1adb05cf27d1b27253bab99846bd5d05f2 SHA512 05b0863de763b297ca79abded29cb3c1c24adbed859200f95ab39969af454c9dd6c49da0e004159de4c78fac0a0bfeefe9d553426758548a3fef346fbd2cfb47
-EBUILD autopep8-1.4.4.ebuild 810 BLAKE2B 3605d576d7c6400d9157626a591b4cee2dfc5049697539a34efc423561aebd20425662b341dba24422228f1703017ae37235b109ecb19718eb780f08b1a84f78 SHA512 766a049f79cb283ff15d7fb9dfd1d9ada4afb4323e54e5764080f32c56f1f0c79fce833e3d878254e9c0dc143e72cd839f177948d5fb326084af6c1a3ab2431b
-EBUILD autopep8-1.4.ebuild 1056 BLAKE2B f9e48c33ad2f4870f4757719660893893bdaece6ccc8014f2d85c3fdfea8a21b034c33366d2f659cec298ab63f84e5599bf83895ea8243a0706471b1dfe13cf7 SHA512 da9cfd285750b819c8f720c4d6262caa0a96d7fda90b59a5e092ecb58fbc4fead075fb10c8b85d920458c0feccaece9a9b75b6935234f2c6ce7c6c4d350228b0
-EBUILD autopep8-9999.ebuild 810 BLAKE2B 3b3ac86f0781ede42b7ae8d54b33c25c96e40ac2a478a981c1c673457773268c0ef7e3201ee80c6b6125a92272ded718b417d0b7e4c9592fd5e42ca2b884aa4c SHA512 356adfee5be4aea18eb54ab3aebc7ee2e090dc1f9ad0c1b6ae73cd29d0d27d95869c71644ecb388eca24e27255e3e1a7cac95e60dae5b989ad816eb3495513c5
+EBUILD autopep8-1.3.2.ebuild 1046 BLAKE2B 9d7cf59cd52e9e6a4e9d52965059fc642d135ad5749c7363a338c10bc29d885576042106e48da09f5556c01d797824b99969959ff4bddb317a3b4336aa8ef277 SHA512 912da1e33b48960e444538a0bf942784d9df1f62d0df33e458dc6b690042a31c253c0bf0a0bdc2b9a3cdae5beb0be6af4dc31196f078ec423de585dda8c99066
+EBUILD autopep8-1.3.3.ebuild 1048 BLAKE2B b22b2d627475dc1acdb56e7e3dde5f3f5b0e5f0b3bc4632a5df2bb246aeb347679308ec22a5e08e17128e476c7d9e260fd0cca47e0366cf88b2fd78527fa138b SHA512 63af486932bba6dd957ad8af53fdb34b0cf8fb9920225bc5e3a4966ae76ac51cd8c12a50feca26d7aafb47971af3f36fb7857c34a307eb13e9eb37b0fa66e110
+EBUILD autopep8-1.3.5.ebuild 1049 BLAKE2B da91055caa6c42553542e4e629d4ff2d0b1d6295f366f0b9da8c9619dca60739d26b6428daa0e48bc7c922c0e546c86f5325eac79546e7f1dd07b6a792877006 SHA512 24adc2c3a0d5f20588ab0d8aba763ef6b04f5505f718be937634eac53a5f196164d67ce7757c3b8fdd2cbb3a9e6fcca29240aced448d9abf85b436d07d713709
+EBUILD autopep8-1.4.3.ebuild 1047 BLAKE2B 5407b5ca607b0fbe167674d6867a2b26760b729e4b1d59b82adf2bcc8ccca340b5cf8174ebc722b20c04ea091e2613d5b625ed75de3060c023725ea1e619f665 SHA512 5c52fa314e1cc2bbff998e54301210409494738eedaed5db22fab30afaf996865577546643d0b1c4554226a0beb61651a1ae3d655875453543c61a05dfa398fe
+EBUILD autopep8-1.4.4.ebuild 805 BLAKE2B befe4cd91350b748f3947e17847e3a9b815203c5737b765a5063bd624ddf36a4475db6d0537eba2395d322acee8de0ad79cada01cfe0d8b8822a73e4e761fba7 SHA512 dd2bcd33ef15c8fddbf38de1f54774edcc3b4403cdb1a9d2ac1accd0964fdc5bde7d26b528aa40e0c4ad2167b72923f707f213dd7f369fddc86f40b3e8c99d89
+EBUILD autopep8-1.4.ebuild 1049 BLAKE2B da91055caa6c42553542e4e629d4ff2d0b1d6295f366f0b9da8c9619dca60739d26b6428daa0e48bc7c922c0e546c86f5325eac79546e7f1dd07b6a792877006 SHA512 24adc2c3a0d5f20588ab0d8aba763ef6b04f5505f718be937634eac53a5f196164d67ce7757c3b8fdd2cbb3a9e6fcca29240aced448d9abf85b436d07d713709
+EBUILD autopep8-9999.ebuild 805 BLAKE2B 2cf72deacc03c5063d3230e6d2c1cc2cac0fa5ae320be4e14e107286c69036774316d9ea79771a8253986841d575d844370ffb151e2ce3b6a09ca0a693eab0dd SHA512 ac92e7ec145f7186806a2e0a7c85e081cc0d997894718135f7f944421d000ac6b69f890ffda6406880f0ccf15b77fd7d51d70d74709625ed31e05739e68e9b3a
 MISC metadata.xml 484 BLAKE2B e99d8c92cf8d692e645db02a59bf083c14d12ae177a5acf1248961329e79fe5f1a56af05d2a942e3d644918c9f2d6e4a24d698e18441f5a65efac87ad880bed9 SHA512 7542d6e1738ad7d333fc2ef8d6072e6963dfbc07f731f3e9137e49936165ef26145185a34cdfb6dfa5df16ac4a73bff3c8e6fde8c9f0477e1545ee5e2c6b605c
diff --git a/dev-python/autopep8/autopep8-1.3.2.ebuild b/dev-python/autopep8/autopep8-1.3.2.ebuild
index 5379d78d612c..cc199687a344 100644
--- a/dev-python/autopep8/autopep8-1.3.2.ebuild
+++ b/dev-python/autopep8/autopep8-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/autopep8/autopep8-1.3.3.ebuild b/dev-python/autopep8/autopep8-1.3.3.ebuild
index 223feda0f66e..2c90a97d42d8 100644
--- a/dev-python/autopep8/autopep8-1.3.3.ebuild
+++ b/dev-python/autopep8/autopep8-1.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/autopep8/autopep8-1.3.5.ebuild b/dev-python/autopep8/autopep8-1.3.5.ebuild
index 313cabebde54..143334b360e7 100644
--- a/dev-python/autopep8/autopep8-1.3.5.ebuild
+++ b/dev-python/autopep8/autopep8-1.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/autopep8/autopep8-1.4.3.ebuild b/dev-python/autopep8/autopep8-1.4.3.ebuild
index 513c94362cc7..4be5e34f6b40 100644
--- a/dev-python/autopep8/autopep8-1.4.3.ebuild
+++ b/dev-python/autopep8/autopep8-1.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/autopep8/autopep8-1.4.4.ebuild b/dev-python/autopep8/autopep8-1.4.4.ebuild
index eda59462a420..5ae7b2539ec4 100644
--- a/dev-python/autopep8/autopep8-1.4.4.ebuild
+++ b/dev-python/autopep8/autopep8-1.4.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/autopep8/autopep8-1.4.ebuild b/dev-python/autopep8/autopep8-1.4.ebuild
index 313cabebde54..143334b360e7 100644
--- a/dev-python/autopep8/autopep8-1.4.ebuild
+++ b/dev-python/autopep8/autopep8-1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index ae057e4cf2d2..136de80ed7ad 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 5587133d10fe..74632969d9ec 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,3 +1,3 @@
 DIST aws-sam-translator-1.11.0.tar.gz 96492 BLAKE2B 4025492501d17699b64041a94704d0ec491ffb02a4b7e48c2647101be4d504b6a8c08a9a043c2d964a51d1ef7b40e4fd1d993f9d3b38b5b75460a7d0117b9f49 SHA512 e008248ef3401ffe58590c6d68667f67e5963e416656daea545c8d938ab8cb5d8b1c9c7f5aea2d53cedfd74b1fb8677e99a93a8a78235198b18c14df957d0c74
-EBUILD aws-sam-translator-1.11.0.ebuild 877 BLAKE2B 01ab7a3c27190f282d7805a1a35aee2f4d4d64429923115054ebe3e8fbf7c4e28ef8408ad3dc15221158e71af7d890acf0b4c768781139071f8ce475760c6fbe SHA512 e46f1cbea560a0cc5774e692b6238ebd477992ad715344ac7cd527031cc7106375294367e802e30449edd3ffc43cdbfe796201a38fe8d4a81c898591b68e1e8e
+EBUILD aws-sam-translator-1.11.0.ebuild 875 BLAKE2B 1da5a2c72c41a5d2bd5ad6c190689b91d2bbfbfb7ed207279b72248c252e71076cf0ee3445ca0b2e8be2002ce9f060150235cc0c9ca73c5db449786724c7f528 SHA512 30a08cd927edb7404195e045c099f0e34b83286b6c85103e88aed54157f87a69e1a757841dfba1e6c260eeac6094f7d79dd7a74b419bb8236be56ecc8f7cad2f
 MISC metadata.xml 485 BLAKE2B 10b9c47652be590d59b1947cacf9553a9b4ce84a48984f8b8d7f3084faea37d32d55521cbf3ae5850753745284e36b18013416c929cba11b2b5e92f51292db5f SHA512 c75c6b500543fbd58dc0ffa7a129619d27580935a407653ad65aeb8c38c7e56b1e5fe87191d53d9c5b336953270b120843587a1c5a3030b19e9f48fb690d78ca
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild
index 43c8b5ac9611..f560c5647804 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index a634a0b5acb2..36feb0a5eb30 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,3 +1,3 @@
 DIST aws-xray-sdk-2.4.2.tar.gz 66737 BLAKE2B 5f062299ad28ee12d4f90bbdcb03d691fb9a5888054eae4759b9a0e916f720e71a9b9e01fd4d11106499395c5c1aa1ec90ec4874301a34657cd04b00cb5450e3 SHA512 3d12e96a54a2fc65bd6b6772b1e9cc72c09620d9a8b900780afb6c4051b88f0ada1e2da2e31bf93c37a881514e2ae79692a287a63b44845e0e2b8cb33109f81f
-EBUILD aws-xray-sdk-python-2.4.2.ebuild 879 BLAKE2B 62ef44df3665bcc902e6960eed6e37ff75fbc2aa2788e0e7671656e7f4269eb601a839422bc2a1d3ef96a69fc3908dc8872a49576f6bd058832fe12692bfd845 SHA512 daa7e8e9c9ab0ef9d16f8b2ff5f9b3c26e93595cf04c9c88ce3b11ec5178a97120cbbe3fb569758cf81f85f309e34110df06ce926c0f8b378a15183cd2187f24
+EBUILD aws-xray-sdk-python-2.4.2.ebuild 877 BLAKE2B e3c1491df0e96b70c888a4358003679be39966cd93d16e422a9705619be2fb974a83ec4248c0ee92ab3aa0a7461f1bc5877dea0d9ee544c4e843c37ea7b46490 SHA512 2c6c7913a1d84b4806303f49d98fb2da71b909fb591cb013b720dde8af6af756f667f2f6f8d04587315a64c34c57a2ebb4e0a14c12565a030df965ad04994770
 MISC metadata.xml 453 BLAKE2B 78db6d0eab2360b69ec4b17c073e47d10693c8b63b5f0c9f28aa8905453085c9595bed462a7d010480ff37b8b11083e2ce93e24da7cd59413592a5b4fe63cd8c SHA512 5206f2494c0eb5ab56f9673e837b2878aec4f512f6ef6dd8b70ca66a0e5c9c18b5626d9a90541adb158f0d08e0644ed2fb02fa3b80283a0883713eb45fa21e2d
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
index 8247d997b00b..2cb5c11a6df5 100644
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 2eb38c288a75..e498a13f63f9 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -10,16 +10,20 @@ DIST awscli-1.16.278.tar.gz 1509613 BLAKE2B 71799c760f9396d18c86c1fd7da79a115ad8
 DIST awscli-1.16.283.tar.gz 1545412 BLAKE2B 98d72a103718def5d2678c36f7654bcb378a5e4df05d17bd545f8d981c571ae9c09412644e233848035041d3fc3fa7fff9dd5b2f98e92b1d1d0fe6897fb17c7e SHA512 5539a665c8997c1fa637bb9cc133888483becc9cd5fe424e8947a83d4448de376b0d7ee3a7a63d07f90c649c956a12f544646795cf4a8a12a09880a05da0d3d1
 DIST awscli-1.16.292.tar.gz 1547260 BLAKE2B 3a1792f588b74826c847a78ee0e3db583d1932681256e36a78fe63b238e66e89a7f6cd4b2c8f7028ae3826506bca4d4e483adf48b7889c28732cbfd4d5640cc1 SHA512 f315ff5081865061168082ca74d87c9cbbd681f2b1d581a502f0b2bb3074e6cfa3eaaf9509d19986747677671b68bfbf4b48cb7a2ba1009e186bc85a7ff1664d
 DIST awscli-1.16.300.tar.gz 1553269 BLAKE2B 7b22b58bc75bf522828b91b5d97872c9aedd35f3ee6ae29ccbdbfea7a3fc809b336f7abd7e512ab96e9d8ef9305c0ef6f32ae64d1d64920eee56d8f646b3d098 SHA512 78b398d1a19ac94ded67a1b2813cf16bd6b6e236e4207253884b228d7c16bd57b170a5262406bb57b4d17ac4610e9e5abdb5b68ceaed2c5bf094f445a757cd12
-EBUILD awscli-1.16.104.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
-EBUILD awscli-1.16.125.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
-EBUILD awscli-1.16.148.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
-EBUILD awscli-1.16.190.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
-EBUILD awscli-1.16.215.ebuild 1304 BLAKE2B 6636b1a295156b3dd5887c6eb734368f516c18812af8472c8954f6bc056d2e32c2c35261c180db714a2cb51e38090245ea792793a72345dfa2af5836c0dfd5ae SHA512 81e65f6f925ab25959a0c22aea53a341f4152be66c2af0168d0f934bff05ddbb57415e45f205325befb480ad741e137cf14f19a262f67d56cab38699dc930bf9
-EBUILD awscli-1.16.220.ebuild 1304 BLAKE2B a4687c4aa3cef1ce9c24d3c84353080684fc5547e3322b161b8216d1255625c137ed3f787a7fc24e12519c0e88b9b5d4a2a5aad450a1e8a40fb10cb2f8a37cb8 SHA512 61d3a69714931f89ac2710365ce13f847bcadf115b89bf30ed951e1347324b4a1316f814cf86f87184c2a0cfc10a353788b13b7db76173b7b2fea8cd1ce8902f
-EBUILD awscli-1.16.233-r1.ebuild 1306 BLAKE2B 2396bd7b7b0fd463f0a0faa560986dfef3735feefa34bae1e9e959c3cb190f4b27d52f02825267f46192a2a9072bb9e0cc52f94f618f455ba24eabc70d822dc3 SHA512 55fc153a697a5cc0afa048c042323cd938063e733516becfedd9080c3082a0bb390fdcd14dfbd3d851eb3c4f44c51a012e5f58f9be4911bc4c799560d305acf9
-EBUILD awscli-1.16.261.ebuild 1304 BLAKE2B 195d93407b8d5bd159558133fd9675066238e26e9486ef74d6c498f37e3e2e73af03c04247f2da98b97612cb1a98e93d3723bbd6b02328a2049b8344fc0b9745 SHA512 c5810d0b1964edf697372cf06a9bdaaf5c560c75b8dc32150ac261429295f5dfb7d52c79d70ac534566a3b53e14f714155e7406e9344fc4f641e2dab8453ad7a
-EBUILD awscli-1.16.278.ebuild 1303 BLAKE2B ca0c1e3d7cd60c954e91cc757ef941b31eb2c275d09f129b04664529df5955ce4f953e095fefbdb6715bf11fe9d39769524b85df2ee17ee370c1a96a285bfd18 SHA512 96a4925796c1f42e3c399990bd1f55bdcf40505d9ad99d130e789b6f3cfeb4c65543938857a3af6da036a47eaddbd2418a406f362ca5582c5d64b602e22d0dcf
-EBUILD awscli-1.16.283.ebuild 1303 BLAKE2B 4e828d6f3c599222c77b8c2c43231423fa317f2a3727206f6b6815a701bff84ac3fecaa3bf830edcb69e05bec84339576739767f81b8f73403a38a6c72b0e70e SHA512 edecb7669df636c8f66a04a5ac7921fcd150add578f812bcb259b984e86e817fa0a9fb5d1d70716c94bcaff57d0ef5afdfd972e10e18ec04ec3c6e3da9d158b7
-EBUILD awscli-1.16.292.ebuild 1303 BLAKE2B e38357d8821a1754af8b5be6697c9d450c7360a2dec904edcd40c488c18ed7165296b319608c42ab92322fc09f1f866efe84163cd741142253682773414bc865 SHA512 8696a71aaaf6cd4e4a86139e2d38042a187a67714e1c5b21251cbf21966cdd759c568a07213faf2c039351dc34be80353f201b904977dce28657f91697e0f556
-EBUILD awscli-1.16.300.ebuild 1303 BLAKE2B dc861926b99052232510484df798011f05d0a31d0eb41ef0b53124c5b4d09a5334e0faad5d6782695f9b8eb57b370523c03c516637cbafebc479752b6c61612f SHA512 4fda6ee5db8436bbeb2daf47414f31260a129c84235cfd2c6164322adcef7e2d5cb12a8fa3be7cf637a557441fc03558ff1d6edcce7c892744790d5ce3aab03f
+DIST awscli-1.16.308.tar.gz 1612631 BLAKE2B e527704ec0d80f1d1af1ca9b3ca541873113eb0318c866eb193a6fbd830f4f46b62192739b235c3a858a78d7acc8b7b5841520dd4c67dc69d62904e1092294ad SHA512 bdbe22e16914822f08303d91a1f4b4bb3a37abb45ec6d84b027e511c16184cc34d0b26df632a5c5a82e328837d23db4c62d8289d31165be4761003f0f47e002d
+DIST awscli-1.16.310.tar.gz 1615978 BLAKE2B ca5d4f6d7cc12b7346eedda837eb4c9c470434514139c747d0652f398b17afcfcd18410645a47f4a6e72b7520021713e6dd377a0268f8958f6c85ac7909ef917 SHA512 d3ad61d632a3f1f2922102f7d8e3a2943c91f8b32a64e02167ba2ad415165d3be2c55ef8cd75db1510750ec43916b7064d098f0de4f727f51b9d639c76f08b70
+EBUILD awscli-1.16.104.ebuild 1293 BLAKE2B b7e5497d8975c381da2f45c851eda6aedb169cf04e20872687efeca92ab762f5dd23df32fcafe9b30fb39a903c2cfa17f7e59e2620eb8b37b0492f76939248a4 SHA512 61ed9f0ff3e017c11953159eee1c65ea32aab3cd5b4372748fb63333c4ad17657f7bec7876ae9047f13d3bc41782113e653aea43e1ce3a7058e93b255179e20e
+EBUILD awscli-1.16.125.ebuild 1293 BLAKE2B b7e5497d8975c381da2f45c851eda6aedb169cf04e20872687efeca92ab762f5dd23df32fcafe9b30fb39a903c2cfa17f7e59e2620eb8b37b0492f76939248a4 SHA512 61ed9f0ff3e017c11953159eee1c65ea32aab3cd5b4372748fb63333c4ad17657f7bec7876ae9047f13d3bc41782113e653aea43e1ce3a7058e93b255179e20e
+EBUILD awscli-1.16.148.ebuild 1293 BLAKE2B b7e5497d8975c381da2f45c851eda6aedb169cf04e20872687efeca92ab762f5dd23df32fcafe9b30fb39a903c2cfa17f7e59e2620eb8b37b0492f76939248a4 SHA512 61ed9f0ff3e017c11953159eee1c65ea32aab3cd5b4372748fb63333c4ad17657f7bec7876ae9047f13d3bc41782113e653aea43e1ce3a7058e93b255179e20e
+EBUILD awscli-1.16.190.ebuild 1293 BLAKE2B b7e5497d8975c381da2f45c851eda6aedb169cf04e20872687efeca92ab762f5dd23df32fcafe9b30fb39a903c2cfa17f7e59e2620eb8b37b0492f76939248a4 SHA512 61ed9f0ff3e017c11953159eee1c65ea32aab3cd5b4372748fb63333c4ad17657f7bec7876ae9047f13d3bc41782113e653aea43e1ce3a7058e93b255179e20e
+EBUILD awscli-1.16.215.ebuild 1294 BLAKE2B f1515b13a52bcbc83c486ac99055057f9a74d019fbd2e154fc230a7a5f6635c2f48d2a5cadbaff5f1908156d716049db59b065d025fc17b3fc816f2b84ddb4ed SHA512 be9209e30891f01f165342cd8bc1ef41caf1a02e7b0c66ec22e68371b3fadc8265506c83f561fc76a7bf57b71a92a7d1ae891e428a2e3646970697a667d9b2a2
+EBUILD awscli-1.16.220.ebuild 1294 BLAKE2B 8971f689f429620bee83dc3682dda5abe97f8157b8f4ab4750a1b1f0aab0c30f162dc5400e42ca5e2f522d6c24fe10b283a82b2a50afbdcaa26b8cc1eb43d554 SHA512 d1d095787b7457a0019375161e5854e0e2456cbed232379c71034dc46bcc0b5f346742f94117d4fbf2d05085ed71ea5d87cf350947f1c3a169d1c38c85d98b4a
+EBUILD awscli-1.16.233-r1.ebuild 1296 BLAKE2B ee79833f11b3b1a39de85615881d9df3c116becc1aead4f0211cf6094abadc7e055d776a853c53e2f28d93148def239c59c3269bcbd632390be70301aa3c1455 SHA512 4233df442e6ed56c2ecb144da39ce97179a3987e6ba5ac369ef88da49c235ea6f80ee7a0a776af8c68c692790f5c3c796e6dc7eb15dfdff37535e62988584133
+EBUILD awscli-1.16.261.ebuild 1294 BLAKE2B bd78485670ee64540aafc56842d2af2901e157310d024c21ce8ec5ef99f8dbc8acfc0a3066a67f40048d94e50bbf0410ab1f796552a1f739cb504522c4cdcd08 SHA512 e74c42f0f8052d2bd98cbab902a5eb80624ecf8d4a5549c7249cda7fefcbfaa2ec580495a36675658deb7d3d872ee3645fc723f7fe54e9e053c6c44aec73c2b9
+EBUILD awscli-1.16.278.ebuild 1293 BLAKE2B 6b71b7c821a5fa3aae5927e366b43bee04a4d3b6d291dc318ec66cfa4c96d9d8a7c7b350e5a944374238fc724ae7699a5fcf95e624b1281917ebac53a61efaa7 SHA512 42b90a9433debbd55a7ef4b75655cb7f039116c49f4f798c909c1c7ab1e3550a75e20c9f433ccc74a75086f3ce27cf77ca9631523af187bac489b5deed0d9e5c
+EBUILD awscli-1.16.283.ebuild 1293 BLAKE2B 32ce2c99690950f79555b6ccfe0e1db7af77005567e47b5b45865cb3777fe7b2bbd657f9de10fcbc645db43e65f10c4dce019f0a1fbe3959c9ab709e30bf52e7 SHA512 2c7d09f9d6f46b9e53d6e0b4829d06437f2efee91a5a71247f6480f08b62919a8b1a1296adc39893e4ec0293e09ed6e628316088736a0576a8a5b2e9471f4dc3
+EBUILD awscli-1.16.292.ebuild 1293 BLAKE2B 6009c0196655cc0c2c27a8b8e14a46bf7e117cba641e69c9892031fb5062fb31858ac693c56d48fd4b5645b22901412021fdf5968a20aaa23bb63782837add21 SHA512 8cfc99d7924152e46075ef28a94033564e72b1a8b46dc0de39429e292aeae45714b52f8c52aef5af0548326fc8f899082413d2e7aa5b84a7763b09c2941d0737
+EBUILD awscli-1.16.300.ebuild 1293 BLAKE2B 0fa540686066505ee9a41ef9ad8fced862dea657855f32285305f3d22cf8465ef5ff0516984ee679136de9a3971c3502be245375361200df67e978e55e013dea SHA512 776fd653d3f1456a78dad13a4d1acc4e8fd61ea3c66235cb55ad543fb20d2b4b909c49e1ceeab415a38dc2fd03756aee58b0b1839d6c200806d9a887ea16310d
+EBUILD awscli-1.16.308.ebuild 1293 BLAKE2B d372b5b09b666b76ce71f73148c0cb4d23e210eee9e5c03107aba7de8955468a081035d21c4e963a8d18f36672570f666a87230f85e2b3dd56aefe3d499904c9 SHA512 12b148c98e2b8522e06e58636ff3a53ee8a2a70c0b06b7255d6f81e53e2cd7f20e9da35712770823b13353ad9762fdb1f50d69836a569e09cf049d6953da2bdc
+EBUILD awscli-1.16.310.ebuild 1295 BLAKE2B 18089ad0b92bc2c4be6ec914c15345ae43bf1af96ccafcd3edec2413e066cda13dafd396ff1e51f545cd1169bd2b7760de688a264af890b01eee8cad84d381f9 SHA512 0866029d44ee6074de493db7a959acb6297caed918080c685bec8fa3cdcac2482eb5a69deb2d265564606138001c465617c51a4ff720b232cc0658af1e9b8a71
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.16.104.ebuild b/dev-python/awscli/awscli-1.16.104.ebuild
index 12aa770f418b..a5af4415d29d 100644
--- a/dev-python/awscli/awscli-1.16.104.ebuild
+++ b/dev-python/awscli/awscli-1.16.104.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.125.ebuild b/dev-python/awscli/awscli-1.16.125.ebuild
index 12aa770f418b..a5af4415d29d 100644
--- a/dev-python/awscli/awscli-1.16.125.ebuild
+++ b/dev-python/awscli/awscli-1.16.125.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.148.ebuild b/dev-python/awscli/awscli-1.16.148.ebuild
index 12aa770f418b..a5af4415d29d 100644
--- a/dev-python/awscli/awscli-1.16.148.ebuild
+++ b/dev-python/awscli/awscli-1.16.148.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.190.ebuild b/dev-python/awscli/awscli-1.16.190.ebuild
index 12aa770f418b..a5af4415d29d 100644
--- a/dev-python/awscli/awscli-1.16.190.ebuild
+++ b/dev-python/awscli/awscli-1.16.190.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.215.ebuild b/dev-python/awscli/awscli-1.16.215.ebuild
index db0d753213de..e2b6c1cf4e82 100644
--- a/dev-python/awscli/awscli-1.16.215.ebuild
+++ b/dev-python/awscli/awscli-1.16.215.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.220.ebuild b/dev-python/awscli/awscli-1.16.220.ebuild
index 7d7999f4f678..aeed484c1211 100644
--- a/dev-python/awscli/awscli-1.16.220.ebuild
+++ b/dev-python/awscli/awscli-1.16.220.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.233-r1.ebuild b/dev-python/awscli/awscli-1.16.233-r1.ebuild
index 63afdae0e49d..5a752ec9aef6 100644
--- a/dev-python/awscli/awscli-1.16.233-r1.ebuild
+++ b/dev-python/awscli/awscli-1.16.233-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.261.ebuild b/dev-python/awscli/awscli-1.16.261.ebuild
index 4ca105e91809..0c66e4a0d66e 100644
--- a/dev-python/awscli/awscli-1.16.261.ebuild
+++ b/dev-python/awscli/awscli-1.16.261.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.278.ebuild b/dev-python/awscli/awscli-1.16.278.ebuild
index 2ebf30a1141d..7baa126cb5b2 100644
--- a/dev-python/awscli/awscli-1.16.278.ebuild
+++ b/dev-python/awscli/awscli-1.16.278.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.283.ebuild b/dev-python/awscli/awscli-1.16.283.ebuild
index c60519f93156..8054164374cf 100644
--- a/dev-python/awscli/awscli-1.16.283.ebuild
+++ b/dev-python/awscli/awscli-1.16.283.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.292.ebuild b/dev-python/awscli/awscli-1.16.292.ebuild
index d46238539ea8..7b71769c7bcc 100644
--- a/dev-python/awscli/awscli-1.16.292.ebuild
+++ b/dev-python/awscli/awscli-1.16.292.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.300.ebuild b/dev-python/awscli/awscli-1.16.300.ebuild
index 3e7fb77700aa..a39b384413f8 100644
--- a/dev-python/awscli/awscli-1.16.300.ebuild
+++ b/dev-python/awscli/awscli-1.16.300.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/awscli/awscli-1.16.308.ebuild b/dev-python/awscli/awscli-1.16.308.ebuild
new file mode 100644
index 000000000000..114534d56046
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.308.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=( python3_{6,7} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.13.44[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/awscli/awscli-1.16.310.ebuild b/dev-python/awscli/awscli-1.16.310.ebuild
new file mode 100644
index 000000000000..15fdd7d45a1d
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.310.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=( python3_{5,6,7} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.13.46[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/babelfish/Manifest b/dev-python/babelfish/Manifest
index e42e11538f39..f3b8c553c2e4 100644
--- a/dev-python/babelfish/Manifest
+++ b/dev-python/babelfish/Manifest
@@ -1,4 +1,4 @@
 DIST babelfish-0.5.5.tar.gz 90398 BLAKE2B 3266a92ba5c68d7b801fa9cd13417d04b4a4526ba9fbee34116e356e42857bc36a68b085626a084047d7f9dc512d71d45cebfd06af65ed35bd2478b6957d00d9 SHA512 71504dd0203ad85a6a69107d67df3bd5ae4193515e74c05b346a8bd0aab425fc1534d54d1c74b14e48580ee5e76f04705e35c2d359fbe46254bee37e41cb4bfa
-EBUILD babelfish-0.5.5-r1.ebuild 538 BLAKE2B f01a9e5f1717551c9e376b9c19a9cb101107fdc9995bcc5bf3b7c9bfb3ad76b9ac84d4ad29745b95d9895d0c44b0e68677c96bdc16885e44344e009470a1a471 SHA512 9c36068365c95f37148521b3fa8bb0d93cb500c750b8f96ecc6c297c11152ccab11597c7105f8837aac2614d5b65cb7c01345ab12dcfc0bc697af141c281a134
-EBUILD babelfish-9999.ebuild 536 BLAKE2B 8252e8cd77bbf0cce0a477d81799f6fdd8ae0a895997b712af41de66361e5cf84c7918915381e99a36759e64e517fd21df09f5dc7c9555c39495fa5cb9976197 SHA512 995a3f1c677d8fe48c9fd59c55778db1f4b5d90bc0015c3d736a24fc28c70e683824ba30c4f9657715bb6865e5aebd04fe591deecf5091398abe4348a2836c75
+EBUILD babelfish-0.5.5-r1.ebuild 529 BLAKE2B 1bc2b03ead9c42fc7e98ba4b493e0143867bbc50f5a73debf816b5cbc9998d57cc626649af443f1a17267e2dc2a6bfee2a5480b72c9ac2df1538e178efeb0363 SHA512 956cf42f29241a7cb9abc262182fa8131e196cdd7b96b843c81ac6e80c59391bfdea5a1405952af511cdea44d2824dd8ffdff412f3bc08086cd8ad31ac682560
+EBUILD babelfish-9999.ebuild 527 BLAKE2B 79bca05a0f3e71dfd02701fb8f2464b913b717ae45a1099a66ab18737ce8d80d04a54e002d554b7c85fedc5a3445543eddeae1b421a4ce84f0f32411618a95e7 SHA512 95c98dee1ea3d92f18387f19d1ce391017a870fb56bb48ce6f2b1fe4e820d4826d19e11d05513863a244caf279e17cf3cd1fdd09559cdcfcbd73166a8accd579
 MISC metadata.xml 295 BLAKE2B 8753e4e51cd05d5389050cea0d9c1c105c22f795affe060fbcd4b8746e8ea4bb0c424e6c431678e820b358c599f4cf32e5d716da9b37ece8c9897a73ab4b44e6 SHA512 837f0811f7168be64415b914c7d36900ef1965bf133d635e5e61f1fdecb7bb6fa462fafc7a794ab1264d7603d748fa0d65c8a176dc1b89962561a562b7b4eaf8
diff --git a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
index 166b7c144b8d..707e8a553891 100644
--- a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
+++ b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/babelfish/babelfish-9999.ebuild b/dev-python/babelfish/babelfish-9999.ebuild
index ebf34f7685f8..90c7394ac00d 100644
--- a/dev-python/babelfish/babelfish-9999.ebuild
+++ b/dev-python/babelfish/babelfish-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/backcall/Manifest b/dev-python/backcall/Manifest
index f6628bbe7ab7..2811f3b76efe 100644
--- a/dev-python/backcall/Manifest
+++ b/dev-python/backcall/Manifest
@@ -1,3 +1,3 @@
 DIST backcall-0.1.0.tar.gz 9690 BLAKE2B 975944b508a4488cd78620b2f6efa8b0ebd7404966db5a53e409000c11641c979abb269289d3e570d01dc50961c881fe80ebbc2c6b79a01ce563d4e3f855af63 SHA512 359c483fbc8998fc2420daee2a6af7566c47fb03f64e465aa226589a2f98a4b219ab5e5b90e5f677087827a1ac658c02ec3062e9ffe9ac1ebfd9db3bb40339cd
-EBUILD backcall-0.1.0.ebuild 504 BLAKE2B f4836cdf7d6f415121d10e9ee84c60a279e4a10c06e1113cce9b9cb5e024a30ce1832e13d9bf622ae14fb82f2d0bc574c3222cd4ce5cb1092a8aae5348f8c15d SHA512 77048000547e4e465fc030d236a2ff730b1226e9507390073dd36b9b231423e2d4d2516dea0c158aa13e4cb9d6ef46935907a48ca44dfbad34c2ab3761fd30fb
+EBUILD backcall-0.1.0.ebuild 502 BLAKE2B 1bc683400b4aaefa264d58ef0a769da85dfb1400d2c469f0e7df8bdc023ff3b8127c089c793ebb7ce62dd819ef53c93fbcaa802561e16139df71c0ae4d588239 SHA512 017529e440a5a520a7a193e7ccc55ada43e689b8baa6f1998b11c6867ace1bb4da03ea17c4a06ae2a6babed06533dca9c05bd996f651bfe466e3b3a7be003072
 MISC metadata.xml 311 BLAKE2B 7930b7db6a4df8fe11e5490dc1df86b4468954db1a5d7508e95007780b5df1cfc07a2783638310cc9d52ffee52ffe702d4f6f46146d8c88adb4e9036bc5de8f2 SHA512 bf3b5d9da6f976f24f791baca8e2703dca2fa1e7d0e7e3958951147770c0448300b6875c405bd4d09cec2561ad6856d4d562a511c57e94f342adda68538708d0
diff --git a/dev-python/backcall/backcall-0.1.0.ebuild b/dev-python/backcall/backcall-0.1.0.ebuild
index ef0e47971309..db71318487ea 100644
--- a/dev-python/backcall/backcall-0.1.0.ebuild
+++ b/dev-python/backcall/backcall-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-abc/Manifest b/dev-python/backports-abc/Manifest
index 2d58c5959137..568430ad088f 100644
--- a/dev-python/backports-abc/Manifest
+++ b/dev-python/backports-abc/Manifest
@@ -1,5 +1,3 @@
-DIST backports_abc-0.4.tar.gz 5593 BLAKE2B da3779a09d795d7257b365d507b5bb802fd6fe5f920088b2dac813dabf4ce69268d51332dcbfa19cc38b10714dcadcaef17b15c78ee8c5f7d7fba17d0c67c4b9 SHA512 0b7f9cc1d12db16a0c0eaf658fd874bf9fe09959fab65d1b0104d337fb20cceb2e3e9213be895df5951876846eccac85012c270e34197d625ce128b688e847ae
 DIST backports_abc-0.5.tar.gz 9807 BLAKE2B 1ff59c61ed95f535d89afa1a6f6c4356bfc76de88e59618f950a536e9d44ce4093cd91ea61a4574c0d2e40c638f90961db8c6e1659996821f4b8532bfdf60972 SHA512 5c2bc01bce8d3ed482bf5d8361a20f9afa3edc1c50280f0a01ffb890690b92296fcbfa68f79677fc3ebba851617f339cb6367ccdd0fadf1127a4e3c030784b7d
-EBUILD backports-abc-0.4.ebuild 692 BLAKE2B b32cbf99435ac4a131de647b7fe5c67442a8355187dfc760f7b59f61b88cfa08e28314394fa6545021b76bec5bf61e5111e7ff83bf0e5530211a745d82d23a3c SHA512 af0c111336a6a7b7a212267d7371b5f30e3931b88367a8d4f134c541d53e91b16837a4199ec89acc3b555a45c80b15e3f3befb94c4b8fab6c05d6bdc3635324f
-EBUILD backports-abc-0.5.ebuild 693 BLAKE2B be5f27389e5d3fd6a13b2d2474896985918df1611c6bc2325f0dec2ba4f0917b94063bb7fe90fe22a03e994f6b7df821eb1c22768a0ebc5575fe470319aea113 SHA512 f09140e556c2ef529230a14f2f44cbfa8993f49847ec14b48af4d4af094a44803e0519dae6fb434b138f5112c357f35850b0eb4f5972307588fec0205fe63ed0
+EBUILD backports-abc-0.5.ebuild 686 BLAKE2B 497952b0ee95edbb60f034584f1b1484b8c44da43367ef682fe19fe32c76de960ab45113e69e3413c373a0529ff3eaa217e32c3e526ff3af8685e841cfba985a SHA512 6f81970bbdd358539215028a33b0434b9d4039e340fa3d2f31dc782f255eb56d4a68f3af08dbab4bbfe68e0d4bc7f9d35c466c51e8699a39f4ced80d6a8e736a
 MISC metadata.xml 458 BLAKE2B 9b218899826e360d19ef39e1efabb2141e6a11a18a4a7887202796680c642525a69f0d925c82323debd4971fe729c5be7e45ccc44b121bf18c5c22db132e7eef SHA512 c9a1b4563f13e731a6b89b0d67a64a30918ff4d8248e36cad0e11e7f040aa268326e98cbd50d507583ecdc5b288473b5c7a5c0be14387ae5294ad607330ed42a
diff --git a/dev-python/backports-abc/backports-abc-0.4.ebuild b/dev-python/backports-abc/backports-abc-0.4.ebuild
deleted file mode 100644
index 89d92dc2be7c..000000000000
--- a/dev-python/backports-abc/backports-abc-0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Backport of Python 3.5's 'collections.abc' module"
-HOMEPAGE="https://github.com/cython/backports_abc https://pypi.org/project/backports_abc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" "${PYTHON}" tests.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/backports-abc/backports-abc-0.5.ebuild b/dev-python/backports-abc/backports-abc-0.5.ebuild
index eba05aebf0c6..aa069b864c53 100644
--- a/dev-python/backports-abc/backports-abc-0.5.ebuild
+++ b/dev-python/backports-abc/backports-abc-0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-csv/Manifest b/dev-python/backports-csv/Manifest
index 57f185ba431b..bd537e60e17a 100644
--- a/dev-python/backports-csv/Manifest
+++ b/dev-python/backports-csv/Manifest
@@ -1,5 +1,5 @@
 DIST backports.csv-1.0.5.tar.gz 12050 BLAKE2B b6c5c4b846040167c081166fc4f0f0fb2df4f4d68e28a00e43762044f86e35c5e104a07028bcb7a7fa0f2d377b2da16d202308b4b905dad979118786c0ea0f7e SHA512 0b3885d818153bd50da2c7d931f64464cb344100622d9692925f9eaca056bf973f7d1d3546520e54e03472766c7d8b600c53e0674eb5958e768f713ec16a96a8
 DIST backports.csv-1.0.7.tar.gz 20836 BLAKE2B c9360890f4ace39564072afa6ee32d5ee5682f1703fbe87eea8b4a04c5575ab5bd63a813f0a86d3c5945429fb9e56693db38a80dec098e4ed7701684f1006570 SHA512 5b82b79ea865381a738f1d77a472d97118f853290fb4fd787537a8dcc7247b33cf8cf507519ad88d55419efa97f86ba9ef3f003b067b1f9cff87e08c2395969b
-EBUILD backports-csv-1.0.5.ebuild 706 BLAKE2B 2366b035e29963930683fa645bc1eecc1ddec161e354f75bc829265d28e4a905720a1cc004574f54ea98f1a898ee70dbcb8d641e5dbb7eeec911ca39b8ea525b SHA512 61815210c9888675624f06a0fa55f5f5dbfc17964d94491e98e910a7b222b615b82f9a0ae6f32f15a796f221a16608730c211ca3566f9656a1faa1d423a9c985
-EBUILD backports-csv-1.0.7.ebuild 833 BLAKE2B b7942210ef8e51fa3c5392057f8f25ee9d7282bc470f968092296f3638e58306dcdd7de6252d57e94a746cac02c26c17af1d3c8494df715e8582651aa95c0bce SHA512 1478acf9333516980c643c0d27d4a8f71958131e1878bc608f8365564ff9dbb87311486c47ee09610b65c96b52ebf3be55fb940be8ee927eb4e001c7ab446542
+EBUILD backports-csv-1.0.5.ebuild 702 BLAKE2B e45d92008b92980da823330ba1e5c6b8624a5a3357a3ef03036b7718173b95f633330d33187436ea0b0bd1b0bbe581fd0a72df4473a1c4dfcc22de813c435f95 SHA512 1833de565204946f4dbfd1b90ea87fa0fdbbecf16cb9501d90559f89e7fa0d18863f70dabf221fbd1d9371595bb0c1b487a4c1b5f8ac71c8eb33023ed59a4205
+EBUILD backports-csv-1.0.7.ebuild 829 BLAKE2B 5e4ef71902646098f1d28a6dc6b257effb087e1f2b4fde87688576e76a3d6ced2ad38f001a60116c9589c1f33e1c5e64dbae8da31176ac3a2958148ad1a7559b SHA512 90624bb2a0d0d2477b42851fc120521984517dd8e213a4bda15c3c3e40e264588ea48aaa3616ea51d8b254d311490462edf0b1b988ee3d1a16ee8aeb17056851
 MISC metadata.xml 482 BLAKE2B fab9cf82120cae287eda87ebacd96e10a0ea271df200cffd224986f04d632f2cfe9ee82fd96dfa404410b8b930686a150ceafda98206b2d638b80ce26cc3c877 SHA512 3973cdc0242a097b7860ed221806a32bbe016a7e554745faec02394f5838f01ed2436569420b30b0410ba156ec0b3788397657aee1465beb983b4faeb1570cef
diff --git a/dev-python/backports-csv/backports-csv-1.0.5.ebuild b/dev-python/backports-csv/backports-csv-1.0.5.ebuild
index 18e631963b94..a1dfee00bf7b 100644
--- a/dev-python/backports-csv/backports-csv-1.0.5.ebuild
+++ b/dev-python/backports-csv/backports-csv-1.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-csv/backports-csv-1.0.7.ebuild b/dev-python/backports-csv/backports-csv-1.0.7.ebuild
index aa307ff49dbd..34ac23e9e08f 100644
--- a/dev-python/backports-csv/backports-csv-1.0.7.ebuild
+++ b/dev-python/backports-csv/backports-csv-1.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-functools-lru-cache/Manifest b/dev-python/backports-functools-lru-cache/Manifest
index 53b4ee533662..67c40aade240 100644
--- a/dev-python/backports-functools-lru-cache/Manifest
+++ b/dev-python/backports-functools-lru-cache/Manifest
@@ -3,7 +3,7 @@ DIST backports.functools_lru_cache-1.4.tar.gz 6927 BLAKE2B a0ef9f56abcfde51b9d7f
 DIST backports.functools_lru_cache-1.5.tar.gz 7891 BLAKE2B 5de046672e25f95e8b224d79deb4ce7eb40aef72ea80e0788ef54076fc98ea3a993daf5a607a6670925707f357b4be14affc626b45bae100c6feba9a41e4c606 SHA512 083a69beb050a6de0f838231ceae05cd1825f42310b2cd4f0e53f7ca043af4c699ad7042c32831ee365bb6b374d33189136e45689c77815b99773d145f0ef4f1
 DIST backports.functools_lru_cache-1.6.1.tar.gz 12426 BLAKE2B 361cc71e0a18e6d578ac007d4990c2f7ae86a5753c25da378a7a3cfbece63b088278fc998adfea3eccaa51146659d658cdd7ce4e4e19d6d2fd7639f8df0a7262 SHA512 5764cc6ed83dc4abc2a7e5f8b5bb30c7b7554aafcbb6dfcececdb3646fe9298a8c1791a02112238ec94a0e383855bdec43bf9094f40b57124d0a0c9aa7c67f88
 EBUILD backports-functools-lru-cache-1.3.ebuild 1110 BLAKE2B b42fbb4b504bc751b884612c903a6d16ccc6b10e425ccad11434c6fa962bf2bb5da34fc0b97bfbdf4bc0da07211bfd7f7215dedaf3c6425105e44875d698a6b3 SHA512 66b120f44c6d77aa3703b094ccb7f247633667ca056480489e60ceb528965e9c14a9437afd75cab35be225504acb4c370eaee8bccbfae9d2ae4bc470204efade
-EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1352 BLAKE2B 2169de5368fde245828179234c9923b7e9c180e824b328242e689ff7f40b8facf9c2b8424ce2e68297fd7b5c160c86b85e34e359469aef784fcbedc2c71ede3c SHA512 a718a260628643ab533a78b5ab9aefa9ab93163f75a10d6d9e402ace1b5e22d6931e046c71ae83de68d9214436e5724915f5f8b1aa754b9c4b26effffdf3fd9f
-EBUILD backports-functools-lru-cache-1.5.ebuild 1361 BLAKE2B c5c35dbf3e1fce0f6fdf3e955aef27ad824ab1e07450d3c2c67ce7581f0ec67216bbee65e2175e55ae683d3ebf6e1c2b264b0bbacae9de3da8013e3cd3e4f668 SHA512 c53803488a718f61f74b8ffc530ffc2ab08b6f51eaa5c25dbef2959cc4d44dbf1f75b77bf1c8176a960e35c775c921788f0d8c56e62c5c07b60646e991f12277
-EBUILD backports-functools-lru-cache-1.6.1.ebuild 1472 BLAKE2B 14284dfa2b8d6c7bae8eb1bed13f16c14050cccfa684626b508e65e26112db2ffdd39664cce22e7a2909d456a92a2d6d7ed5cc68bd21d010af355fc41d638f53 SHA512 738d2254e86462af4a6bca6df71b6595085baf3dd6ca625ba81fdbcb8b3e5c91f7690450e853bf32d58870cbf2d21bb2042645c590356bf283204171c87bc315
+EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1347 BLAKE2B 34c97d790ffdd6c9723b56b41a6785690f8e153d032108b6a46f8c01fc823313ebcc4a2036cf2e87831ff588ff1e21c1e753fcd073e26fb32820aad499732976 SHA512 773bea39bea66ec68c3f797c9d0fe99bf1b07858972eb1ccf237fa0e7b45c9057a990b233463edeeefb60ff3bda418ed20fee75919f280216fca7a3f3ef71755
+EBUILD backports-functools-lru-cache-1.5.ebuild 1356 BLAKE2B 8d7307dacd49c1bfa49fbeabd669e433b4425d65ed921db89d397bd2145c79b5f5df50a133884deb4eeb30d772d9b116fcdda25d5a1e667bb1c77b7514c505ad SHA512 76350b0feff12eed06c9962ece17f25f13fb8693be47be18b77e523ee6dccf1e17a7fdcf793f7ebc2bb51e2d66b997dafe60853be457cf0fb579db7411a0cd45
+EBUILD backports-functools-lru-cache-1.6.1.ebuild 1467 BLAKE2B 73c593115168efe301a6b229ef78e157e3001279f1d2d5c5997b611230e7e82c847586033d9fb4e93a99863f3ca9316effa56f1939d1f2fa83e4042f6c08fa35 SHA512 36adfdf7d65caeb19651171d84d4f20b3c953a6664d1c8d137437ef8ee2854ddcee3c3a322426ce49a828c6e7163d2519b11a7cc7082f85635a6b5b014a0eba1
 MISC metadata.xml 602 BLAKE2B 9fce22594360dac2cce70a5e636668f47097bf52db6cf2f0b663f7305831d53ec2d6671657cc72c64dcb1b6d459868c6645a81e227d7acf7c6de71d29d1303c9 SHA512 dface430e3611aaa78c2407e574d1346424b35732f54f0b29cb956bea7fc64f1429d229a4d6d09435279523ff22a998f09a450bc15a1b0e304475544c0748581
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
index fb95cded49c4..3eeec3619300 100644
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.5.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.5.ebuild
index 7b31226d848c..873ce2136cd7 100644
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.5.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
index b70dbbfe3cbc..969f24c43f04 100644
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy python2_7 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
index d6c22936f29e..5420bd22c502 100644
--- a/dev-python/backports-lzma/Manifest
+++ b/dev-python/backports-lzma/Manifest
@@ -1,7 +1,7 @@
 DIST backports.lzma-0.0.10.tar.gz 37242 BLAKE2B 42ee440437379aae9a5d4708d8766300143651f932a63b54e3c4153d48e02843cfd45ce2d60baefcda1f10465f8b982b6883a6047a146d14858f32f5ab9c9485 SHA512 72814ea262ec3916e6a44a571ffa2fb3316e7238a84649232849e378f720132157f5747dbbce659e7144e53e62a84bb41e419ae6d9b8f5daf10ced372b1bf9d5
 DIST backports.lzma-0.0.12.tar.gz 37640 BLAKE2B d157e71fccd7367bfa9d0a856cc9bcde7c33685816c08e380ddf596a4a84cd9cbc4cf1c3d866057a507adae053678d150c054c6b078c4aabbd3385e5821c275a SHA512 c855a1b4b17df5714060e18bf0b3de4db24e1ca1f97550fa44749bf50eb2309dbad56feb092246db8ccb23d61d84fb3deb2553670ec035b5d11982c33bda47f9
 DIST backports.lzma-0.0.13.tar.gz 42552 BLAKE2B 85cff01ee9b5481a056fe6fa993a44ec3799eed3ef8e12f98f7b94d8af85c196c3244df4555b957fbdb566416c1bfaa4e8654e16115c9bea986a72bb9d834b3f SHA512 e022de691bc1eef917286da40e2c0ee477300a0af20fba9e972bffd3d0ca1155d5d2607e7601e28d70d1e721b93c785f81adb1c7c73172659ab7615708e55aa2
-EBUILD backports-lzma-0.0.10.ebuild 1074 BLAKE2B df2903ff76e0ef84ec3239d73f1c17003fc66f203f59ce0bcf656888220f6ddfc9027e0f8871a53000f79af46604a4fd6ef3ffc64c2441443708f75e1956a4dd SHA512 16a52b9d62a730dcddd1c63eee8623ba64139b1efe71124da97e359500ca5e30388e9fa832d0ca27fdc86850f6d98e15bb9e5ae19f6b9c446ec7b8c26e0a81b4
-EBUILD backports-lzma-0.0.12.ebuild 1087 BLAKE2B 0be487dec143b20de6a60b8950e1d7efcfa593d22fb24b20b3d3186ef0240f708904ffa7e5b75c891405a8a76f3f08e5407b2d027683cd3e1378e06dbac6fc9b SHA512 c3be35d4e25b6011dc00696cc9f018090ed058889919df6f1a0c6119098ee234d0e9dcc4a83572cdb1d92ab7965eae83ceffef39a42a8ea6e63cee9cca9c5628
-EBUILD backports-lzma-0.0.13.ebuild 1087 BLAKE2B e1754c80b53898aaa5fbd94e1b6ce1724a48662b755f78aa3008df8aa0d11e137db15b9f6bc1e0bf4057829e2b949def4f4bb7a571af4bf69ff6c8a842df0245 SHA512 902ebb5b7d450e665261f1c71f7f5ab93ec7658f483e244ca651313d733c2d1a7e422fd8c1a235bf47f32eb9b10d7c4ea03b7ee709fc764f5ef014486f7d0faa
+EBUILD backports-lzma-0.0.10.ebuild 1069 BLAKE2B c7b626acdaca209f69fcf751b1790d0997e6efd4f676176cf9ea9806e01dafadd8f0aea5b6dc2ab9e5935acfd8c43150dc9adf3682b0b63c48c61c73f934a604 SHA512 3970cec3f0040dddd4b5b92bbfca623a71397e5012f50f5751b7a15f27fbddeee09ac90665f4a1453e2aab4a9aa6596c787a90ec07ddb5d0d413fde24976f7e7
+EBUILD backports-lzma-0.0.12.ebuild 1082 BLAKE2B 51c1a4af76efd514cb0f52c718e6cfb5484a509801c653fd0d1321df1e909aa78a0505797867cd1288e6830e90e1d19573bdc4b3deb6b63451664c0c61b2a4c8 SHA512 f5309be6ee9884588f2f7582959dae7204dbd00db1ff3c980a41aaa27393bf80171a64eba282a71b7efe6e0452793ca37a01c3aa98d4d8cb789bd7108a5f5c15
+EBUILD backports-lzma-0.0.13.ebuild 1082 BLAKE2B 906cee7ab56cb260e7fb54496066a69b092c7a7ffa89bb6a54f36dffdedb2ba757fbd9fd11a25c5e216b5049b4f5b7b9cc0fc35436299d652f41d86f9976b728 SHA512 d4839cb6a649e3c616474655e8e0fe3c20159ac0ac7e577b911a86a5983a826bfba8b70e04f15e7facfaa0a0758c3986ae648e0e6bea703e216195ddadb2e03c
 MISC metadata.xml 391 BLAKE2B d3837447c0258730ec4e5d45fb0e341494c8b29388d9cdb2e212e1118a9be1ae836cf8b5cc0d7ce652aeef359d6650f562385a884a9698c79518066bd9c9b96f SHA512 382866a463cef16a42a0a89b3f1af18565a8e72858ab1c55d7c89e9c8bf87224b3d5beed52beb46ed83b8e8f55bb02a5aaccf15fe027d21de138fed5f9798cd7
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
index 7bbad18291a0..fe43f3ab0255 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild
index 50b36cc06d7c..3ac2d2600478 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
index 5c1dc097d1b7..2efdf807542b 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-ssl-match-hostname/Manifest b/dev-python/backports-ssl-match-hostname/Manifest
index 7725337c1384..f988833467a6 100644
--- a/dev-python/backports-ssl-match-hostname/Manifest
+++ b/dev-python/backports-ssl-match-hostname/Manifest
@@ -1,3 +1,3 @@
 DIST backports.ssl_match_hostname-3.5.0.1.tar.gz 5605 BLAKE2B b9c346cc7414fbda97c2b1646ec406942ab5527b6537338a9fe0ed60d62d8515cd03fdeb68cfed10862c23f1d6e37ffc13bd479e55f6a9310abb4be14e3de83c SHA512 414c2b6f302a4655c3db3ef09e1dca4916ae4e8c4aa69e43c63bbb920303ea4b2618150c2c35d8a2e1e1283b1d65ccd10a350888fd771addda533c19c20b7e82
-EBUILD backports-ssl-match-hostname-3.5.0.1-r1.ebuild 1057 BLAKE2B 08816b93f0d6e4652e847ffc25c740815da23b343cf521dc7fa1f74d1c50defde73dc559638b9b4f588fef66cfd8127ebe3f8d5e84b73690177f3c41b44c8700 SHA512 ffc8a157a72b269b0a2ca76a6648b5290e5d09b01f7e709a0b3ce061d1da9d6d12a100acfec9f490e9c67b8f38bf7bc2000c546b73c3107116f1e6a5d8c3fce8
+EBUILD backports-ssl-match-hostname-3.5.0.1-r1.ebuild 1052 BLAKE2B 7787dd13311e212bcc5317f3e64c1ba77ae8444f868b57a054c11602e2f2a233211fc857483a3a05b55623ac6c1ee7c90ea7746b51010a4ea3a994c157a0cd33 SHA512 969e8d44d8e6643698e774322dd5d0d9b7370cbc6f92c1d0148616f886bb391fa32be2ba82f185631acbf0ba955fee77c7ccb5e437d89d88949757d0f8b079c3
 MISC metadata.xml 331 BLAKE2B 048adbe9d02c7be8d4d0a40aa2f496015a2225ef8ac7f745dd0b8c60d8adbcc44920fe1bf08e0bb5e0eea329b521c549f2218132a96cd29a6a3ff52368602f04 SHA512 e536e9be47c0b879e669145ca18650e86ac94375d9c9451e7b54cc9e9b8aa1f854611f5e427c13970e6735cb59bea7515a0f7bbcd6c5dbfafbe72d02d64101df
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
index e20c897d95f5..59abddc19ad4 100644
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 # This is a backport from python3.5+
 # Do not add python3.5 or later support here, there's no need for it.
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-tempfile/Manifest b/dev-python/backports-tempfile/Manifest
index 68f2b98caf46..3716e24c70bf 100644
--- a/dev-python/backports-tempfile/Manifest
+++ b/dev-python/backports-tempfile/Manifest
@@ -1,3 +1,3 @@
 DIST backports.tempfile-1.0.tar.gz 10262 BLAKE2B 9436c8a3eb7fa6da17dad4466ab030f62b93a19103e519efcbe79e35cf0687ca2960666a9337cdc2929aeeed3790a7ee0441377755b1f1e2a8192b07ed7f049a SHA512 1f3cf634e289704e96bd8483289415aae896d95a16f5ac9b226ba879497675d76148399770966bd2ef14a02d3c8848516a9b39cc400819023b06254b5b0500dc
-EBUILD backports-tempfile-1.0.ebuild 1174 BLAKE2B 445c24e8e298e496a6cf41d4fcfb62176ea3d583d1cc63201a7ec20101dc826814f1681a20b5cf76cfceabee72ea845d4036f851b47abd2d449e30d18c8a29ea SHA512 a83cc86a3ff5e5c7f3ba9d36fe6c40e3cd972572f94a1ae02a2834412d55de1a19049fa18914ff14e557393dc72f3c7de90e23d706a8229b59fced3c92348bc6
+EBUILD backports-tempfile-1.0.ebuild 1172 BLAKE2B ce617cce54ae53c00003ab174584bc6ef19b2cdf13fc110f84243a55e4f07fce1372fd8c8b0206296b0d6932addd9fbee10e68d1256b77b74c5062e8b543c98f SHA512 ed305cdda2d1058caf8f0a28833ce8a0f2208fe94b8a40de4fbe541c8d2ed88cc9fe3acef921737ce7758716f0dcd6acffa76bf20ff436921aa107c77381ac87
 MISC metadata.xml 469 BLAKE2B a2d579bc290c1cd1f0cc4b8372b3f4b14bdbc351f4ab368df14cf784fd46af41074c61a0816c619d0805485b1b41ce69110578af25f9d00956ba8ec3a68f9e2c SHA512 4b6866dc60034a21acaa1dc1c2a389d878d495747e51dc99ee60b8379e03bd99559f3c805920a77cdc35fb551f97195c6fdf9d596af881ff6f6829c5b7e4b235
diff --git a/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild b/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
index 632139290b10..769970e0c4d6 100644
--- a/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
+++ b/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index 6b7242fd60a4..ec0c2ab50f00 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -1,8 +1,8 @@
 DIST backports.unittest_mock-1.3.tar.gz 4687 BLAKE2B a01712eaf5cb32d7da803aa9034f68508faa4d8db8d6f6eb02e20cb9f42c4e6bda3b409a0e2f676b6b7782f16d78877da6f093af6ac1f1deb100b19969570787 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff
 DIST backports.unittest_mock-1.4.tar.gz 6034 BLAKE2B c347f1d45c610701b605cb75304f93c8fc7a8534e2c14efb4600a7c5cdbcff02e0534dbf572ac248d17dbc161dcabd8448941d8340a71734f29ff3294c8210f1 SHA512 ad19eba7c221fbb97ba710cbe96aa26de74ad8c70ea7b794d8dcad3dc86a55a45d36f542ad829fb8c4bcf09c772cf64532dabf337b40bf87c7b29e13236484a9
 DIST backports.unittest_mock-1.5.tar.gz 8941 BLAKE2B ba0ba99bd2668ffaf02f10cd5cf511e32660a2592550f879422400265a4b75732e03d2d0627c4563daca0063ac5759d30abf450c13f9d38b6b3a94b85cab9c17 SHA512 2f2d2c34f80009829935f9e97404bf1840d3ead9dad55fc6f967135b80ed572389d7f42ead2f82671ecfe341eb6ccf696a49560c848d1a36ec5570769a5820a5
-EBUILD backports-unittest-mock-1.3.ebuild 1496 BLAKE2B 5a60644895a880ef9e9bcae2622227ed21ed687d6dfee13ab217a6f921b71bf8d6322012af6a43ab6114b6bfb13c9b04f3459e09c69618851d42c483083b5bf9 SHA512 c5c678db5b51788cd7140a340217347170d389d7f8412a948c7f0fd4a0ef6a0956c48f24dc2abf4155b37b9c6697a815b1387d5249c2c966a576299faf5c7367
-EBUILD backports-unittest-mock-1.4.ebuild 1607 BLAKE2B 4f4077e8c578075fe2c6558f95cba984fc0f16d43a1c311376860b7d338297cda406cdf7b712b65b30ad857c7d642a2b975e0dd8187032f910c423fe0c5c853b SHA512 c9626664eaecff1185421d1cc96d42af78b0678605367f740df02bc729ff88a39ee90a8ea9eceb0573b056ba95dfa65c93f1af5ecdeb012191a0fe513110d7f0
-EBUILD backports-unittest-mock-1.5-r1.ebuild 1637 BLAKE2B 54c5992d8f82d3bcac8967af91bd8b47c8e9fa2a447b67a022771c2f1591cfed1cda4c84f3670fe8a96207e92ad211f32170fd157f90c873cdef8a43092bf31e SHA512 95cf6bf2991dad843deef9a009f9b4c59dd3023e12060f8a60a90149bed3b190c8b0431facc82378606cdcc3bc46a54f538b272a98d419adb2dc3ec6e6ae6ab2
-EBUILD backports-unittest-mock-1.5.ebuild 1608 BLAKE2B 941f8b41c18166a23ad8b4a2a8804bed0b15630079b4d58502b0957e9138b89e409528d8658bdf7a3131f81705265cc96e091cf400a976313e20491d3d0b9ab7 SHA512 b23f07aa63ed8432755a5d3b5a393de3d13e09d59e3e4236c36df9ab76ccd61e869badb5ede3f938db3b806138944be291ad9e152582a28fea8829eaa063061b
+EBUILD backports-unittest-mock-1.3.ebuild 1489 BLAKE2B 6acfe647ed6c490ad9098ec7696f116b2d9031f3725aaca15628aaab57f19769d819c406499204bb8c086dd358ab31ffe7d430f4094cbc7176c4ce197dff09dd SHA512 cfad0f2e6473f298aa73f3f617e42628ea01254072871516fe61fd5ed53ad8bb19701b557fbbb912157af1c68f2bf3cf1e95d93e245d34bebcdb9bb0c6534224
+EBUILD backports-unittest-mock-1.4.ebuild 1602 BLAKE2B 78e295dba3721ef2a600c49551e71e5f0df28a7e282cdaa739dacc2243d1bf8e63a5c7cbe9db18d033af7c0c884ae01270ce1df2b4da72f9b34bfaf409f8ba8b SHA512 3af54f6729f263308dd71c5985ba1ec93d062c374f6c54f94f207b9c6e65a3a3ef9c00f9fd337b5a5864341c2f063ff216b79286359f5999d9fd55a19463165f
+EBUILD backports-unittest-mock-1.5-r1.ebuild 1632 BLAKE2B 8cc7ec3cf7157173586a65c2a126a8b4539c15b940859196350bc741c0c3b751991e3416a4cda6fa2b40a1671439644379327f4d22575f227e19010a4ebe4c56 SHA512 bc2ce0e063ba93d1aba57e0d9d92ad709f55fbe945a7fa97b3c81df400d023fc5088f7a96e5b62c5ead73e0552628150b35fd18594ec0eeb3ee4ad798d370942
+EBUILD backports-unittest-mock-1.5.ebuild 1603 BLAKE2B d5b6ce6879d0a2e2232b50f7f0ded0b8816108a283b335b12b051d9dfd7abdad1fb244151e3fcb5d1b5b9cee6442d5a76c9c12d8f22c0b340193235b5a9157c4 SHA512 d6a00ea2670f56cf372708a1b18bde4cd01cde087a62a521650f355a3a2f9646fa5b7d0e476640b217263522f53c12d74cabd160b38100383231cf60fd858036
 MISC metadata.xml 657 BLAKE2B a5a51b30ebc334f17d09e38e1f42fc1e06fcf65de5a56810378909169cdce48bcb0acceb8b192bec54e67a254b0809a0339fb8ee11fee48e043a082f63fb9bf9 SHA512 5d0e58887da4b7362f3469c218af61c4ec31426aec212013f3ee19992fae9e664ce13b226c928fb0e6e6ea3efdd946d1c09b1da623a741e89b7b68b74e73cf24
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
index d59f641f84e6..530be3c09508 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # It is the developer's intention that backports.unittest_mock will be
 # used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
index caf9b410c4bd..a0fe40ea7aeb 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # It is the developer's intention that backports.unittest_mock will be
 # used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
index cd052cc5e1bc..985e10c71cec 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # It is the developer's intention that backports.unittest_mock will be
 # used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
index 584abb732695..6687ef65dd1a 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # It is the developer's intention that backports.unittest_mock will be
 # used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-weakref/Manifest b/dev-python/backports-weakref/Manifest
index eb8066cf795d..73ed9a01c341 100644
--- a/dev-python/backports-weakref/Manifest
+++ b/dev-python/backports-weakref/Manifest
@@ -1,3 +1,3 @@
 DIST backports.weakref-1.0.post1.tar.gz 10574 BLAKE2B a53a64dc22d8d1ac93a157bef4a858156f620593ae3d9e69b99762298e9aed73a04fd0557d98f53eed8816e746869718bc028aeda619330ce7c031f8b6f346b1 SHA512 27fb7ffd3313e62ca5ac220efe5ce0a9ae2ba8a589c80d3c5cf98741e913da7f713e1ecf2af848510383f574fa3bc3b7b3c21e6696f0a252fb517fe836c07cc7
-EBUILD backports-weakref-1.0_p1.ebuild 1131 BLAKE2B 9582635c5204b4d6ccc2f6630b4f7b1d969e7454a32398a0bb64b593ec5a673f78f057f4b8c5bf99c8821db7ec0e1c7bc12f56b3bd31cc4d5da8f4b27c39d746 SHA512 faafdfbd5e8f7f3d99aeff64db06394c2cd986df20a10291a7b1d485b3c80a51277e5518420e08a2882f8d578960ed892c8cf77556670762c2c48eabf5d32a0d
+EBUILD backports-weakref-1.0_p1.ebuild 1129 BLAKE2B 5917727dcbb75d0eb35030719010ee23a2eda3865ea234e920e0f9948244d48f2cfbc7f0fffb3353c608cc0785d7c68561a9f3933ed580a065b772feccb54242 SHA512 5937c58e639e40ec7b43f7f82be4d999a3d0ac7f8813b5fb06503ea2b6a76e3ca8c24800071388d9ae2968b2235b1d2a8eb80966caa9b21bcd59f8e88f50bfeb
 MISC metadata.xml 466 BLAKE2B a722c32d4462c21ac4fc1ce66a92571a26c283d10cabb187a8cc107604632c4ab79ad74290e07c318b3ee634a624459b667b9963c2a0a8485c470fba6ea982aa SHA512 77a6a25be5149dd2b146364f46e70585320f03cfd88f037f012df3601a8d74c789f33ab111d99d77667cc41be80050b398536e0b687014ac094436a7605b62d6
diff --git a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild b/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
index 027168047eab..481d6f42be33 100644
--- a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
+++ b/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
index 07a8afa604c9..036641605fe2 100644
--- a/dev-python/backports/Manifest
+++ b/dev-python/backports/Manifest
@@ -1,3 +1,3 @@
 DIST backports-1.0.tar.gz 2070 BLAKE2B 7fad9ef13abdc5bab550ddf62061a952991ff601642f5e03359c3ba2bf20d923701d86aed178dce530c60870efd33a4a2b4b2498802c78df73d406bc496239fb SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37
-EBUILD backports-1.0.ebuild 608 BLAKE2B 2428c1ec589afb040fd479e4649d9149c75c7ccbf4d996f291df44311ba76cd9f867ecc393e25e8db97b90d6d53e5ee11a1cafd31067446e5b8f17074cfcb244 SHA512 f61812209081515bc6599a8a9d20f85445128714408b1b1de1cd5bb54a59433c9912cb8e218bd2fb74848bcfa0c350708851bbd363bbaa3ba1f0a9eb1438d0c0
+EBUILD backports-1.0.ebuild 632 BLAKE2B 06752cd26bece8b4a107ccf0ec0ee266531e5111a9631b8ce54d484e48bdec6df9606615edc2a1df177839bbf9954f5c7e493c5bfb7eba21733a6299468e8bda SHA512 ccbe3453d967f64c1d7411177f5d038cb6da79c47f4c74d59d2178fead7bb545dd853f543361a3ef5feb9aa6c008e538308aade23aeb776a7a12b7a9af518aa8
 MISC metadata.xml 335 BLAKE2B cd3125c95ede34cf51567293406cfb3b489874a7a2fd594e157c9167fa2b3d0cc5a4eea670851a648ed81100f0ccb246ea64d316b432d516219f61c02425feb2 SHA512 d0432bc56a1e591a0f699d61f2195872cb62e591027212cba00a127c89d9a2c29a54da495436233ad93c3868f98b184c73da9057be26ce9abada2516be518e30
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index a9de582f3904..7b60ee22879d 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 58a0c085a557..213d8fdcd0c5 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,15 +1,5 @@
-DIST bandit-0.13.2.tar.gz 68888 BLAKE2B 6d352fec9b45f75f452f06ef2ebf9aa023dfbc1c70f05b7d15b25d7e3b3e1345a559e141bc41c7da6d95035d5b18f049be0ded89a5051fa08c912ca4c6d26818 SHA512 0809b7bca2f88e579760c7dcd3fedd1bdd394930eb0cd203ec24d75a18cc8007fa0db304a378f2d99d9cfd5e8b1f34a4ebe427a4bcb5daadf3d29acf0a26da42
-DIST bandit-1.0.1.tar.gz 130662 BLAKE2B e6eede0bb909b04f35902626f680c35f24bb74949fd1f68987ffd8803f136973f5cbc344710abfa50df7fac73b8c1b21f3150b5d005c449a48c2ddc26dd710a7 SHA512 47e82de934d1f7b28d4d9acbc33b7cd704bab9332b1ef5815e8f6f8b6c99763b758716782ae0a6b0a7db393e0ec6d619c9c3c70e2e645f23dff28b0de04250d2
-DIST bandit-1.1.0.tar.gz 135333 BLAKE2B 828356ddff316879c0d7a308b0e1545a20ddeb83931453f1ffb4d76a86b414fb5e4528733efe137c7e6c4998e9e5be1d8b41a658a2e71c17c4f3c86053e55c09 SHA512 0344be4c98b4f1df056761f7735fa0b23dc234c64ca0090d3e665899905eaac9d49750a7ebe6f7f9e4c39d07f3c2cb0d653cc65c0e56dfadac0caeac5799af94
-DIST bandit-1.2.0.tar.gz 138040 BLAKE2B d2eb2d36fa80f7e2873454ceb043ae2aad5a7df09f250f0f5d5b13852ce38e848e5ea34f93df647ccec125c847b2184cfbb3dc72f20228d808364f1c09312fac SHA512 f2119bb7b920ca7b4254fed433ee0e41bbbde51a45cd88283fac1a9ac8f60ce621fffecca676bdb8db7ea5cb925851e50176014405425c30b5991e17f57f294a
-DIST bandit-1.3.0.tar.gz 139075 BLAKE2B 870481b4ef9932ce9bae2e6563cd7007d5f2afe3abf2b4e03b3da5f8c719c6792f1dc0a9f9c252b922324ef8369d4265f0b81426a6db67ce52595dedcb5f1042 SHA512 24341cc837fa6a8bb095c7fdc684a81b3c06834b408c6328c6b3425d5cc5c63dcb119cadf54c8cea302a108923638839626f1f8c6d401ce66cd112a776a8363f
 DIST bandit-1.4.0.tar.gz 138019 BLAKE2B 1a7aee62aa44fca533d02bdb6e5d44fe136038b9ee8ab462d6af6af84a4111ae341bd791b142d5e090e90f639cd5968419b2a9fa3b51e664dda971af13d52959 SHA512 e5ae412e3b13c89f8c4a85d318b0504c2d5b9aa4ca81652266a13d96f859705c2d0112dc534373cd7fd1020790369e3fe6b55da57773fa7821e663c37fe98817
 DIST bandit-1.5.1.tar.gz 480856 BLAKE2B f8a1a7dc1d93a1b6c8d3eb5bcbecda895b29dfebe055ac358b9437bd0c9ab5562e6d25a658bc2092cff6bddfd0245e71bf39ee88b2718e3a0c7376fa50293ae1 SHA512 e6f596e73af45ca2ff4d200fad63d37adf44efd5de52f8061f5a349b66457a39eb442ad442d5fb57b2e0e98c8bae0eb0879b958ff619b4e26c0183bc8b928e36
-EBUILD bandit-0.13.2-r1.ebuild 1387 BLAKE2B 3aa3395aa0f37be4c961cb1ddfbe99de8a2c63980439354916d14db7e436001c0481574fb03ce74d517f20dd40214c6ced5a3deac83e32299393761273773a3b SHA512 231d36d896eaee1063d309e7e73fca319387d80f0b88d7c9a4217ec126ebc2b19df9cac7149f3264acfc4d57b7ab7106f302a56a639794b3180a3f0bf3741638
-EBUILD bandit-1.0.1.ebuild 1319 BLAKE2B 24a4c814706d88f4a0524e878d33e9c604a4c1b88dab8f162dae6cc2d6c1a9cd12ebc2ba8f3bddebc11af8a59d2f4480f08078d44a546e4446f7a08b8dddf1eb SHA512 5832b7d776f64da64812492c9e1ceef9a50d322d708e13e401fb29dd5c67c4d1285bf7dcb8f1af7adf02928c7e2507f71b891d501bcdbda938c194c0619d2f9b
-EBUILD bandit-1.1.0.ebuild 1366 BLAKE2B c116e7c9e0c58dff9f4a7bb3bc43d8cf6290f88fabd6ccdd2d5204f416248aa7be02f4a96d8c4cb1e6f2b76b6fd7ba6147c8c14ca24c893914dca858a97442bc SHA512 61097f4a58a3ccba218b24fb697875889c515d887067449e43891a18e57dddf8b31507dd63c319872de98d63902593efcb1fcab6d0ea77c85044938f900d3f21
-EBUILD bandit-1.2.0.ebuild 1369 BLAKE2B c4156b23f87dbbbc814b964843cc72fcad1aab0785595a7f4b2796532ee1929b3dc6900ae600191c3c90163df949c7f4c98463ea0e6bbbd63f1356dcb4883a00 SHA512 89a20bd33c8d6559ada7146028e3e88e445f7db9c3ebdf7e179eb63e4fd95b23ee1f1c47625099251fe516e53ac5de0a92a185c7ea8745f88fafc608d5b82000
-EBUILD bandit-1.3.0.ebuild 1415 BLAKE2B e01d5a2c4ed62ed5b07e3796332be04e43689cd18794eea2d72cc1bceeea177bc1b6606a1b4f5dffa6d525f1ad2f38ebed40074f1f78061f511adc1a63f8d6b8 SHA512 5e833fac26e0a10c216e0ed9176738c98117056d1849b3eccf8704f346962922182b6cb6c67b53320a787253a995dc318123b32e5469fef03f3b245cc68d78f8
-EBUILD bandit-1.4.0-r1.ebuild 1427 BLAKE2B 980002f88b9b5f28bd2f4ac045aafcb831999d7824674d0ef8825d0cbb5a1060626fae6ad955b2bc2b8278abdb7ffa900789d512dfd5c0fa1cf68343fdff837a SHA512 fbdd48965308521a9ad8feba8db7397bed9f05967140b2d4674538bf6c919feac8d5c1daaf8065c098f49c226ab7a815f701bfae107c23d5f3ed32fb161dd64e
-EBUILD bandit-1.5.1-r1.ebuild 1320 BLAKE2B 6cc2a989b45deefeab25bc8d37a40cbcae6c488c21e38d0026a0c22ec814f9d30c888db8bf6ec9c4b834560e07a4969fdfe15c193a3f888563a1c8a36fcce83b SHA512 261774ae4e3e5544a53ef20e31acd0ade6b09e38dbf4ff499cacddeb3fe2f839fea77211eda258ebd5747ba4b06aa83f671406b2561c3d6df86f37bed5687221
+EBUILD bandit-1.4.0-r1.ebuild 1413 BLAKE2B 077f53f5d4196ae2b5c321fbff2488dca247cf673893a04ff2fe8958517c90dd5ba1a418b4ff9c605ea60307fb79dfeb5e0006c09710fe3e7d5c3bd2369557ee SHA512 1ab834fa721f17a353832f5e7d6e688d0cb3eaaeeb623532e7af488d8b1e85d9bf90e490a1c06615621bc3fb0870517c3d2f0758229d8ce7d7979fbe06b0fcbc
+EBUILD bandit-1.5.1-r1.ebuild 1308 BLAKE2B c4be32f105f0538e18984405b19f8929ba5db4ce070d4e87a6f9916c82337392846b22df50c853e3808e6d4d31808f0c3d977a61aa906b749f146883c132294f SHA512 d21989c9220820e6902ff50650c5a665e38c7a8dbbb623c2fc1adc616008e55da1a34eb4e132b2d5d4e934501b0611a601a374413e928e9117c54911a455d131
 MISC metadata.xml 437 BLAKE2B e9d2b3bbc3f4795ca95af1113008d33a635efed8ab7b6da63fc1b73f426b37b7fda1dfba1f0737e8dc116447b873515d37c628d00876f480fc654a78eef9c2ef SHA512 3e34e842afdbdf7c90b6a9ed8f11d4b4955c03f7f3b3a9cde02b2fa33bcba39a00556e62c5c29b721e3d25d33de8396b5dd9737037f9000b1fc3e707ab9fd9bd
diff --git a/dev-python/bandit/bandit-0.13.2-r1.ebuild b/dev-python/bandit/bandit-0.13.2-r1.ebuild
deleted file mode 100644
index b1bc77be8ed4..000000000000
--- a/dev-python/bandit/bandit-0.13.2-r1.ebuild
+++ /dev/null
@@ -1,53 +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="A security linter from OpenStack Security"
-HOMEPAGE="https://openstack.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/pbr-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${D}/usr/etc" "${D}/"
-}
diff --git a/dev-python/bandit/bandit-1.0.1.ebuild b/dev-python/bandit/bandit-1.0.1.ebuild
deleted file mode 100644
index d6617bf5f6d4..000000000000
--- a/dev-python/bandit/bandit-1.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="https://openstack.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run || die
-}
diff --git a/dev-python/bandit/bandit-1.1.0.ebuild b/dev-python/bandit/bandit-1.1.0.ebuild
deleted file mode 100644
index e8d34d5f304b..000000000000
--- a/dev-python/bandit/bandit-1.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="https://openstack.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run || die
-}
diff --git a/dev-python/bandit/bandit-1.2.0.ebuild b/dev-python/bandit/bandit-1.2.0.ebuild
deleted file mode 100644
index ba40f9ff0209..000000000000
--- a/dev-python/bandit/bandit-1.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="https://openstack.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run || die
-}
diff --git a/dev-python/bandit/bandit-1.3.0.ebuild b/dev-python/bandit/bandit-1.3.0.ebuild
deleted file mode 100644
index d87cf46e7cc4..000000000000
--- a/dev-python/bandit/bandit-1.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="https://openstack.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.4.5[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run || die
-}
diff --git a/dev-python/bandit/bandit-1.4.0-r1.ebuild b/dev-python/bandit/bandit-1.4.0-r1.ebuild
index ff899eb719ce..974ae4c8083e 100644
--- a/dev-python/bandit/bandit-1.4.0-r1.ebuild
+++ b/dev-python/bandit/bandit-1.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bandit/bandit-1.5.1-r1.ebuild b/dev-python/bandit/bandit-1.5.1-r1.ebuild
index 88e30effca9c..a7e548d414f4 100644
--- a/dev-python/bandit/bandit-1.5.1-r1.ebuild
+++ b/dev-python/bandit/bandit-1.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index da80c8449109..8fc101fb6d74 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,5 +1,5 @@
 DIST bashate-0.3.1.tar.gz 16016 BLAKE2B 72bcb6ef2c8dda48b40351f37971473b9c2137f3a727a355f1742f20355aee8a3898d4aaf61e0e6538b22adbe3ebd34bb30d67d0fb6b5f3535c9b46c1544ce5d SHA512 dfa3e8f98879169cef445cc9a788b4ed051630330e2270c721e472f080899d6742cd3deb571049ba6b943ada0fc77a70f5a7e4742a54d1ca6d5f075a92a00ffb
 DIST bashate-0.6.0.tar.gz 30980 BLAKE2B 5b210edaa44a0652a03f30a641a072dba1482e1ca3b42c6b7140a52349ddb271f0137373a4d2f364032c22c176d6caf14be2635038df8a4e86585773d17a1f97 SHA512 bb64d8de0143bf2662497b1571ce654f4ceeb7d1dea3f625705b609ab70ed3b4bca6266c4eba7c2e7d99a1520fb9566a4a4daefa34c9c16538537b446c1da255
-EBUILD bashate-0.3.1.ebuild 691 BLAKE2B d328f410b6a483f5c8f7c6448fe75fdbaeecf1bc9a8342d2eb299b862cd08daf7bb4e8406a177f3646bdd0ca111340cef23ebf774b0ee4b87d7ce3b00c12b8eb SHA512 b3b5185dc22ecacf7aa82d2e8e40d267c7c98b7f26d3743f8da94d567f02a67e389adbfa016b6e89a2bd08035caedda8d60337817fa18afa06b29b14cde18516
-EBUILD bashate-0.6.0.ebuild 706 BLAKE2B 316d757c9a3797e5ae325bde0a63682c5dacac0c5aa2f98bd43636cef3511881483ea72234ea1b446f2aec986eae0310299815059b28a75faa0b4bf712e22e63 SHA512 d77731f7d40b9c262bce13da8f2a7ee13c6fe918979838a3fd00aeb9ef369c5353c89c020102c64b8791137030fa998ce2a1ee6d0814fb2d2ba08560a3268346
+EBUILD bashate-0.3.1.ebuild 677 BLAKE2B 9e32b9172b80ec0263e3ae47c86934a24f09d3fa754a00c4173b5ce54fab76a895e0d632b272b4f45fb9d2c76aba028dae8b171e44bd6393990b9751bf6fccf3 SHA512 00b7e3db1facafe9db550f036e9dd71226b304a79e1cb9b393d3acaf7f2125802a2b90d825a5bf468723ca63de016f6140dd2dd87293975a78690a7e7167b339
+EBUILD bashate-0.6.0.ebuild 694 BLAKE2B 24c408328b73bb6cc1fe7ed5bc3cb3986e3582ddba853a6d0765c062b93419123ef85f3a4ea4e02e0fc607567ece2528e365721ccdae00bbc03d0c7bc1b640eb SHA512 d58adc2eed2f5d9f788a1b442f2a54890f0bbf41a359b79834015c7af314e4c9f777b994d980b4d9440172283b26fe56644662e05b953715db3d257c455d51f7
 MISC metadata.xml 517 BLAKE2B 74c61fabea9ee345173582be1486426377f97187d976b992380d6670fb024c00ccfa818e6bac19e1e637c371280ca8d5535c8e84bff52ae874eeae939728a400 SHA512 eca862a58ed6a1571e626ddc24e73fb8d295f0a6e5fa36246d261688d9de81ff7780018df8defd159094ed8badf8449982dcf07c2415067080f38ba516da481f
diff --git a/dev-python/bashate/bashate-0.3.1.ebuild b/dev-python/bashate/bashate-0.3.1.ebuild
index 20a97d960379..7cd8b1c13dec 100644
--- a/dev-python/bashate/bashate-0.3.1.ebuild
+++ b/dev-python/bashate/bashate-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_IN_SOURCE_BUILD=TRUE
 
 # time
diff --git a/dev-python/bashate/bashate-0.6.0.ebuild b/dev-python/bashate/bashate-0.6.0.ebuild
index 02b8b73e7e8b..7bb9ed360080 100644
--- a/dev-python/bashate/bashate-0.6.0.ebuild
+++ b/dev-python/bashate/bashate-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_IN_SOURCE_BUILD=TRUE
 
 # time
diff --git a/dev-python/basho-erlastic/Manifest b/dev-python/basho-erlastic/Manifest
index ada50258b2c7..2bb89aaa8b5c 100644
--- a/dev-python/basho-erlastic/Manifest
+++ b/dev-python/basho-erlastic/Manifest
@@ -1,3 +1,3 @@
 DIST basho-erlastic-2.1.1.tar.gz 9298 BLAKE2B a3cd69a77c2d75ccbc2494cf841563a075036ce2ecca4425b3e806463e080d87fc2ab6668bcb21dfe3b083ec51498113c641f033cf66b0fd6b1b00ddd9703349 SHA512 bc8666b2e9ffba3e5c7105d1502423a1b0861047218ad18524ad77853137dea5f17c64d6cbb9cdbc6ac6e207b0a2f9a57d65e5c4cac67172654c5eb92ac7ae2e
-EBUILD basho-erlastic-2.1.1.ebuild 569 BLAKE2B 9d9c9d6d33417fe8a3747b50481f70d9df672b573af862a5052d2dffa04b3111d65d31fe0808f179b1261b4b7f547f2e5f22a8e9a4ca298286a6be9d9a5eb8fd SHA512 1afa4cb28ea4873f47d7ee16ebc68dc7e05a9921b73fed23f7dc2bcd1f0c68442b663af31b5684a812da0e400eeca9c4c693ba0f0eae296a97c0906bebbc9ea9
+EBUILD basho-erlastic-2.1.1.ebuild 565 BLAKE2B 56f39f3260deb58a913849c4f52227d7ba925c79c5a971802a024303633ce29824a99af8652bb0dd58f30720825a464c9a21f4d1386aca5867b343270d03e7a7 SHA512 1f1e2d8de13fdf981f0e262fa7219dfa45aed51b356ad5ff7ed2e15f0d26d4aeca1066af1f0f0970d800cb672bb2e57b5951fe963148d2a281df18a6f750b181
 MISC metadata.xml 356 BLAKE2B e6bdd5c282ab43b84c7d3e581a62b579d3e46031f31e4e81426f93e9fe97f46c5ca9ca844afb15e0a31436464473ea4ca03923ace0ddb55ffdb695569fa42f84 SHA512 cbd8ab52f7ab3e2b9627d745405f21c19e9918cd765005628415626d0598e216ad53744988e343f2d03bbb71d92b3cd62c085ad4288393f016950c8dcda7f09a
diff --git a/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild b/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
index d8bfc1e1b3e2..39b775042479 100644
--- a/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
+++ b/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/batinfo/Manifest b/dev-python/batinfo/Manifest
index 462f8752d823..1a3060700fcd 100644
--- a/dev-python/batinfo/Manifest
+++ b/dev-python/batinfo/Manifest
@@ -1,5 +1,5 @@
 DIST batinfo-0.3.tar.gz 3951 BLAKE2B 11360a3322866b084294b930569d3c2e424b8bb56e0484aba81085b68707287ad7be9a65b0bf5188c030384d70fbbefd30886ef73d03e7c29801a0e5ce49a3d8 SHA512 822e8e70f14a7f08713028ebc8b41aef6d9256984a6a381af11e5b36980a355636bc21d8b21753f4dabd20e38becf6152c623134a65109593ccba019afe3f3f3
 DIST batinfo-0.4.2.tar.gz 6497 BLAKE2B 24efbd63f25bbd743e02ea04bf656d24b3132b6ce7e2754359a84648c357fb40967c3bb2a0aa27a3938489f2fb64c9b712718c8a5ede0869f83a19eaa82a74e1 SHA512 c45232cdd79d2d10d814019bbfc167ef54c3d970c74320a5a007d3b603e62fbdfeaf53f88074cf53a7865293181707e2e63e5a565219c094a77be2adc5d53876
-EBUILD batinfo-0.3.ebuild 539 BLAKE2B ae1eff302f8eb5336badd678ede51bb9e97bfb0b2d49057e124e3ed1a6ec1f5ec1a5714e60c7eca3e7645e2521c62dc8a15ad194ff5386fbf06a9a9f573c58f9 SHA512 f85cac0c7f61355b46d411b3c078aa9d627d7b6aa514793a4cd5273ae9cc9e67abee4aee1e26d66eda5f2b825891c5b5c02a699874bf90d15feb5fcf6dd9e22b
-EBUILD batinfo-0.4.2.ebuild 535 BLAKE2B 478ea25075edc319d485dac042887773f875e5d778c168548f55c0e69c88af22426d7a96e6909a150911918f14d7065ca56c25bfe9fc6903e11766d26e08f3a9 SHA512 5027ccba065d6f4cc54f11806829c8221cd61fbfce1c91aa0b3ff11041344269b7c2eacd57e8115911c9a8a3983e8ea6917fdc9f87713da49733b5d093e5815f
+EBUILD batinfo-0.3.ebuild 524 BLAKE2B ab016a8236be25ef19088740ff5bafe90d3a75660cd72b8b60467cd80b7f509c7bdc90734d2b7bc18dcf4345a4b494596027ff3de2c28497453d5358cab10416 SHA512 e12809b83ee7d4d0a914bc6998f489cb5ffa1324e03c7e93145c7172f02eb266efa55c30e16d13ff5d0c5c773a3c1ffae1d729a2a3f9500ea36e757351b3d23b
+EBUILD batinfo-0.4.2.ebuild 520 BLAKE2B 5446ae018b445bd11735dc8dfcd7472755a7bebdaca24f91bc366f46f9a4fab1df6d3dba5228a082a25982998fbfe8fe8d8b393e0510859a77138865fa1d81b4 SHA512 1a4ce4f8d1292f4d6096f989b33db4b02268b0114a0200580034769b185efd4f31ccf9bddccc73dad0c08a484880b9e16e3df71e8c7e9b89c2971389206bcc91
 MISC metadata.xml 509 BLAKE2B 661b2e2643a0a07f718d81ccdf62b0ff1130181780973ebf99eebd8a98a41400bda49a36400d7f538c6ce6f2fb8a452035b4b2600a10e1cedcb379858dc0de23 SHA512 78a20df6c5c2ff4b32a8d54da4d1c5eb8fa5b4ea8149d3ab5a2fa999ec0b0134cb41d9255517e867ac47e3e4656e76eae926418ec572253c4d0f439d629cfbb8
diff --git a/dev-python/batinfo/batinfo-0.3.ebuild b/dev-python/batinfo/batinfo-0.3.ebuild
index ba9b043f133a..6e26090fbfe1 100644
--- a/dev-python/batinfo/batinfo-0.3.ebuild
+++ b/dev-python/batinfo/batinfo-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/batinfo/batinfo-0.4.2.ebuild b/dev-python/batinfo/batinfo-0.4.2.ebuild
index ef5eaf12879e..f25539f7af9f 100644
--- a/dev-python/batinfo/batinfo-0.4.2.ebuild
+++ b/dev-python/batinfo/batinfo-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bcolz/Manifest b/dev-python/bcolz/Manifest
index 982114c13e9b..18de4c022660 100644
--- a/dev-python/bcolz/Manifest
+++ b/dev-python/bcolz/Manifest
@@ -1,5 +1,3 @@
-DIST bcolz-1.1.0.tar.gz 914616 BLAKE2B ccc5ea84907c16df6aaef4a85e1b89c415b909c240d56746ed1144c22255c7d5f85cd791ba99b3cf5777c2459ddd5c1e26bf489fd7b1fb69709b587033040019 SHA512 77d3cb45658304036273ebe7ff006d3770d86745e8bd1dbdb07db0a2a1ffcd3268ceef2cbdec0579e8e65560706eb3ed43664c90078fe2811a497b4abe01e511
 DIST bcolz-1.1.2.tar.gz 1271418 BLAKE2B 322a755ce3a744d14e185a2a242cd9c2326033404f15a8bef789d0f9cb961a63ad12aa28860c0f62577cc61091983e17e043deafe7c2ca78f0ab2c620da2e395 SHA512 cc0149b5a8a0ded7653c4f1e2232fbf8501027538a3e5d8de4be0eed096e17e7d3845f19cb687a533a4c385b31f5a5262fe140a27ac63b434b57667ec5a55e66
-EBUILD bcolz-1.1.0.ebuild 1421 BLAKE2B a0c82b9ac49cf845fb3f92ab0e57666462ee1a6d98f69298d4e42e245f689e2cbb0c995b679ff57d21cd52a001bf04ef07dd9fc71dea934de01533197164c4b7 SHA512 03e9ee214155538b76956b448dab3905f7eb334e106993b9f10d382f6ee1b1522e5f5f170b1623997d0731ba00804385518891422763a77d2b4b8550731822f9
-EBUILD bcolz-1.1.2.ebuild 1160 BLAKE2B a29c5b11ae9cd6649e59d61b704b86ccbe75d583f839e26b42bb764b516747c3afb934375043cbadd615198390719cb534afcca019ccb3676d087d7f36ee9d65 SHA512 98abe0d14732e8d60a60d15138d52815753b04f37b693ffd2123020606516ad68fa697f6f025455ace28f394e3d86f4f790913873dd19e441b126d444dee5fc0
+EBUILD bcolz-1.1.2.ebuild 1156 BLAKE2B 30db7ecb1a2a8bcf64e919e35bec9d8cbff0c72e2891ab0ee7b58bc7df271c4d1184cd3d2eba489c3458b4362b05b0159f7466b79510c0d200ee8b3ad31e50fd SHA512 1b8590283aea9a70c466d931752387e6dd7245abf2a89c1d38450f83d3211b0fb59893962bcd670f3d12a96302a231b914847d83918f88ef894f9384dd534d12
 MISC metadata.xml 853 BLAKE2B 65ce8db96ca80674e08d006cc5b986cd88868f0b3ae4581cf4cc5e785062de60fb6990c286006e3386443dcee4b1890bf973790ff38a3344e2fa01eef1567440 SHA512 65bee839731be99ae673f86f4d5b791bc115cd5b65f3fbfc79c7e2df35dc08af59bb2fad4ab3b9ee2588582644b10153f2d932d2c292ab0e1fb0db92d88a631a
diff --git a/dev-python/bcolz/bcolz-1.1.0.ebuild b/dev-python/bcolz/bcolz-1.1.0.ebuild
deleted file mode 100644
index daaa4ca15106..000000000000
--- a/dev-python/bcolz/bcolz-1.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides columnar and compressed data containers"
-HOMEPAGE=" https://github.com/Blosc/bcolz"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# numexpr is optional but set hard rdepend
-RDEPEND="
-	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-1.4.1[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/setuptools-0.18[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7)
-	)"
-
-python_prepare_all() {
-	if use doc; then
-		mkdir doc/_static || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/ doc/ doc/html
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib > /dev/null
-	"${PYTHON}" -m unittest discover || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bcolz/bcolz-1.1.2.ebuild b/dev-python/bcolz/bcolz-1.1.2.ebuild
index 5a28998925ab..747e3936031c 100644
--- a/dev-python/bcolz/bcolz-1.1.2.ebuild
+++ b/dev-python/bcolz/bcolz-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 35e98ce86a0a..65371d2da4e0 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST bcrypt-3.1.6.tar.gz 42216 BLAKE2B 280e2d01d3d5195fe7d32426b9e9bb7b4544dd1c0027a9d1b4be287e21759efcb274cb3f943a913891fd63183f0525f7f301b6d76055a37240a7594240bbff33 SHA512 fcd4f3ec27ee27b4523c9f9b796e9c279895ad66d124fdabaee61b3fb27351b2e8721deb97e7bfc4f07ac4cfad6c2948d467cf21faba2af656ab0030c842244e
 DIST bcrypt-3.1.7.tar.gz 42512 BLAKE2B 5e762f153a5a69c1426748737956fd370e74fcd02e82b5a634e74dbb50fc9e894bdadb4e87eb9cdc580d0853f73ef348d9523ceaf4236df565e39b714bbd1c60 SHA512 bb9a431c8de97d5615d1a7fb67f868d08d839313fd5f3e17d8db40db1870f8b624594352c24c163c6a03485217de873cd92578040350678888728885c7b749de
-EBUILD bcrypt-3.1.6.ebuild 1014 BLAKE2B 88d5addb51940535b96a77cbc2bf5f9eff392bcbd85586f33e03047ed08198ed637594b19cb704ee6581c77aa503624c98568adb5b4d7f5fb7478d337090a928 SHA512 c2141684fab90c5acc952566b550a81441eff1cbc422894ea6447c6b6048e05274138bb36176d182a18f1037f1992b5b4d1749afb78a00837e6f779505d748ba
-EBUILD bcrypt-3.1.7-r2.ebuild 909 BLAKE2B fc9f5620f8feeacac357cadcc2260e68c54a1b19e2cae1084a244c0a45b861af6acd6e1008dce2cd6000e708af1ef7dd887a1ca9dea15f72d64457f26eda7ccf SHA512 899d46899e0708464babe37ee2b353d92939e234bb24e8484fd940eccf036fcdee8519b0f03105e502906de33a0ad3408f74e87a9633d2baacdc8d7345d62c0f
+EBUILD bcrypt-3.1.6.ebuild 954 BLAKE2B ad07ba9fa3dda43f56332f5385c4c22be9e9e15354f3b9aa548da0a77320689a12921a119cc43dbaf684e3f98d0750407c1e76104cb14306e566f1fa367905d5 SHA512 45b737c6c1000dffb5f264d54ecc92679f7e66864df47cf28d64c3fe7a739cda698c22e65d7c83fecddcfc084032dd15e1a8b0a07ecaf228a09da95c64e72061
+EBUILD bcrypt-3.1.7-r2.ebuild 851 BLAKE2B e393dab96dc9467395d05d0ac44dfcb26f0d398d4dff0d8501a9f0deb78b2a0d2618af325172172f7f3772b9872b5f195cc5fd291e7c4da08f1384f8f4771bfb SHA512 940a20b8951b3133fe67c1888c8108184b7a91b55e769d681e6a1d352739769b5be905cf62e3e3013fd2fc946076e4c0bfda672f895bfcbe76cded1161d1747e
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.6.ebuild b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
index 98355a38ab3c..2795d4d57b22 100644
--- a/dev-python/bcrypt/bcrypt-3.1.6.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -19,7 +19,6 @@ RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
index 3c4d8047e7c1..293200971b53 100644
--- a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 
 COMMON_DEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/dev-python/beagle/Manifest b/dev-python/beagle/Manifest
index e518a9dbebff..7c064bb2f832 100644
--- a/dev-python/beagle/Manifest
+++ b/dev-python/beagle/Manifest
@@ -1,3 +1,3 @@
 DIST beagle-0.2.1.tar.gz 12628 BLAKE2B f1d68134065a5d71f6662770b0a6a7c201a3019b57c12c3200cb59db00e664b5bba27b8a4029c0515e8095ac3c7153058b22d43e3245c3012e52e2ca734ce2bd SHA512 4cd58c05764dcca8959b2137f5bcfe627d83b576878eb77ae28ae38cd5d2cef16d045ed5d186fdf7eda6be821abe4d2eeee106fc505a5e59f027f59ab82ce653
-EBUILD beagle-0.2.1.ebuild 676 BLAKE2B dd206f452250397fbdeaa07ccee44b1ec00942c718ddac32d4c4c4c8e2384d3b3271f5d5ada278600766d1d3b1d8366c788b1c079b7a08353b6e8376cf093472 SHA512 627a477376a12649f19fa468ff812bebb918dfaaf144323aad242c7e9b8cdf3d696e1d9d39378cb0dcb03ce633f7dd87035ee0d0d9e2a40887c4f871f2d7c1ba
+EBUILD beagle-0.2.1.ebuild 666 BLAKE2B bf08821372681675c64e0c385c33242df1dc801569b0903921fac9220fc00da87d7bc47ed02d2154d269ef08315734525e3798380aeed0e792d8020d5ff45dd2 SHA512 b887c02ae24a405275a4f0a9accb821007fcf8c1ea1d6fe73f95bbb84508a70e5868d578fc5a3ac3b72363352814589b170a454b63526ff29c265f0a0f2ad975
 MISC metadata.xml 574 BLAKE2B fdf6ea50667c20fd2eb8a0f7d1810b4828b99b482bafb5a0fa013818ebdddbdaaa1fbc0c3582d8b95403c305e2605a7b9737de50a02d0b2665217f525cfb4c0a SHA512 0698273824072d90953026383d2e1fff8cb1631104097cafdb4e4d853c25cb4c4db54f7870a8dab15026d8faa06399983220e93da846202a4885a876b94635ca
diff --git a/dev-python/beagle/beagle-0.2.1.ebuild b/dev-python/beagle/beagle-0.2.1.ebuild
index d6bc30ce80c6..06ccde927f27 100644
--- a/dev-python/beagle/beagle-0.2.1.ebuild
+++ b/dev-python/beagle/beagle-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Command line client for Hound, the code search tool."
diff --git a/dev-python/beaker/Manifest b/dev-python/beaker/Manifest
index 2e5c07ee8871..40c813103438 100644
--- a/dev-python/beaker/Manifest
+++ b/dev-python/beaker/Manifest
@@ -1,5 +1,3 @@
-DIST Beaker-1.6.4.tar.gz 54480 BLAKE2B 809b2d23fb95a21ab442b3be20ff5372630697baaf507fd26d8aefabeed422401de890c8de165a079bde4a05230cea244a8d5bf31b8b89e60a88b840de9cdedf SHA512 5a6835d01d0b1bee57844525f1223d74edd26f07cc769df6a8cfa77f44dda4435eb96639175928a1caf7c4f927ac3a674c0fd0e7f50f1aea91da7880de3a6704
 DIST beaker-1.8.1.tar.gz 80541 BLAKE2B b60ba47a41f5f039699324dcb403d99cbf3d7e7cdbf593e275e1d41e6abc86dc829fd9a582b80e6274d6459624218585239b1b623e70636e2a1d736c584ce245 SHA512 bd9c4a4bbf21749a59c50ffff1d1dbff8bc9116394f79924efc6be637fb8c1ffef91a8363da3375bffdcb0ba291b71b57f75303f3fbe111e8670a390058e9fa5
-EBUILD beaker-1.6.4-r1.ebuild 1303 BLAKE2B 750c0b8ab2420bc5efd66945e81321fbcd8b7b8d445b0c9836e1e639b6be324401bc79fe4d888ce1058e6847d696fa9eeb1322f9cb09e5302bdbea54f159063c SHA512 d6f1c8834c72ca2f7f3bbc7d8bc289dd7ff70a6605242b4bf37cb72e2c01cac44751ecf1c552ede68917e627d9aa9ae6240a239c58ef0cdaad75dbab3c8c2c54
-EBUILD beaker-1.8.1.ebuild 1364 BLAKE2B 6f590350f4c75358d8a53525b6becd23de3dac6b726cd9ea215790c4be5b5c5a3617b53ea1b0cf128ffc41926fba2ff1428ee83321a94462af4f8fe5d7c1b599 SHA512 1e6adb202a074802833007016a504c3ea1841b7ca9f8208622c94ce92756dd857fa15886e82e6c42b74f11ba00debb1358971bf01f19109c5e62743178a216be
+EBUILD beaker-1.8.1.ebuild 1354 BLAKE2B cee0c0d632bd542c5265ffe73e99312b1aebf0805a4e3ed91c33effdb3fda5da37e6e05540693c59528b741442910aa4c73592818bcb57e29faa2cb311348599 SHA512 03df238ca05d3ba4751b0527cf6003303fd7094d9df51fea420a68530a633669f6932f23f0a67817a18f5f11340d337a79690e89791f267b4821b9bbf9881680
 MISC metadata.xml 376 BLAKE2B 5cb61bb094fd8e020b5e83aedd79fa283143e9156935fbb3d6666186b81a17d544634349ff10b50bd9568895eddf54dcdb2c304a4fd6fe51bb37931cbb181074 SHA512 09586c7ae4aa5259c0776ef77713538e8b8dc730da802d95b3de5501aa6c88c96c1967740ff77a124821bbd93b13e9547879f452d46325916237aeaddf58c353
diff --git a/dev-python/beaker/beaker-1.6.4-r1.ebuild b/dev-python/beaker/beaker-1.6.4-r1.ebuild
deleted file mode 100644
index 2fbcff2d7d24..000000000000
--- a/dev-python/beaker/beaker-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# py3.3 unfit with some types
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="Beaker"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Session and Caching library with WSGI Middleware"
-HOMEPAGE="
-	https://github.com/bbangert/beaker
-	https://beaker.readthedocs.io/en/latest/
-	https://pypi.org/project/Beaker/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# webtest-based tests are skipped when webtest is not installed
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Workaround for http://bugs.python.org/issue11276.
-	sed -e "s/import anydbm/& as anydbm/;/import anydbm/a dbm = anydbm" \
-		-i beaker/container.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	pushd  "${BUILD_DIR}"/tests > /dev/null
-	nosetests || die "Tests fail with ${EPYTHON}"
-	popd > /dev/null
-}
diff --git a/dev-python/beaker/beaker-1.8.1.ebuild b/dev-python/beaker/beaker-1.8.1.ebuild
index 0af3014e876c..cf50507a8696 100644
--- a/dev-python/beaker/beaker-1.8.1.ebuild
+++ b/dev-python/beaker/beaker-1.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/beanstalkc/Manifest b/dev-python/beanstalkc/Manifest
deleted file mode 100644
index bc088c40a259..000000000000
--- a/dev-python/beanstalkc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST beanstalkc-0.4.0.tar.gz 13921 BLAKE2B 9b26f4e785806a00601c3fb32d2a0352bf5ab03feff8c471c6142e0f9111a297ea4ac57d29c10c5fce6f11f100771b5a618db5910843cd2cf707eaa47d7252dd SHA512 30485aed4036549c524982bbabe5a27af5fe6f0547175622019b4469fc1fef32d013cbef5e38a1928ab92a3acf6aba9bc7607c3e8e9f2f3c6f65631d39471a7b
-EBUILD beanstalkc-0.4.0-r1.ebuild 533 BLAKE2B 1a8151645baf86fb276521d1c642a7e1005d9538e3722f9f5748417d81b93dee21a0cceaba40c2df8c0654098b31f875c6442796651a949dfe340818a6749e29 SHA512 49a45a4086c7f1bf2072712439b242a9ba9812f70e60e8bbd2043d13229eb1bc42d46504556c0c6b72a751771fee8dce9021911b148ececeb6758b0963b9492b
-EBUILD beanstalkc-0.4.0.ebuild 519 BLAKE2B 8c630bd5af5514c9c11f6fc5356004a43c187247c08cbd59e60baa759dfb76e842baa09d9b142a89ba802d54fa89c9cf2823ad1852735e3061a2645cb5ff43d6 SHA512 ca4b4eec8ce85dfadc52e2f4fc04e60f6406d8bc7a8fae4914aad0815e980eae56f90b9e4ac646b4807c07f94e49eaed08f3fb00d4221851e7819fb3f9b72f99
-MISC metadata.xml 380 BLAKE2B cd22bbcec19b77790e9402d3138be50c140b469916cb7a66d8c14d1c42760090e17d936a79c652bf6d8d580809119fc42f93076a390b4747d2352f79e4395fca SHA512 9af0543dce24d2c9bd0016c5c357c39c2bbd42b08459ca3a08072a420e1e77e9814458498af0574ee8152693d9512c458312bec81ffbba4e318e079c50594f74
diff --git a/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild b/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild
deleted file mode 100644
index 5d0a167ccafd..000000000000
--- a/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple beanstalkd client library"
-HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.org/project/beanstalkc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild b/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
deleted file mode 100644
index 669df4843c19..000000000000
--- a/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
+++ /dev/null
@@ -1,21 +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="A simple beanstalkd client library"
-HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.org/project/beanstalkc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/beanstalkc/metadata.xml b/dev-python/beanstalkc/metadata.xml
deleted file mode 100644
index de6bdc505c0e..000000000000
--- a/dev-python/beanstalkc/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">beanstalkc</remote-id>
-    <remote-id type="github">earl/beanstalkc</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index b9f4c7fb3917..b526a5eeda13 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -2,8 +2,10 @@ DIST BeautifulSoup-3.2.1.tar.gz 31224 BLAKE2B 9361ce6d048d0443c3257d10ec2734c242
 DIST beautifulsoup4-4.5.1.tar.gz 158039 BLAKE2B 5eb99c7efdb13c359385c7c7f3280332ca28cc4b5ff80b90c326d80ef55acef8e98d86691a7b1df420bf68bc65e96ad7d559b461a03f44e494fb4b7789753601 SHA512 d560d7f743507084ec546708d29bb3764512f5b2c380004280dde813350bf48d1697fddce3bd3f95186407bf5142941d7adc7d0de8e7962eb5ca1278dbc7e93f
 DIST beautifulsoup4-4.6.3.tar.gz 167469 BLAKE2B 0bc8f729298a2fd1e8f3cc8a7635587217f9a2e6e2c71709e99c40eedf1ebb4d76cd0d17ec36b99f3ee047193e4d44e31b8d2aa9864c43ce5db380fbdc083f76 SHA512 0cacae77843326ebee87d108b6706a7ca6943684bcccc62554d2ae5d77dfd181c97435ceca9d3e2e51962b024bbe52bc08d7f0dc516311aa87b3a1f87fb4ae23
 DIST beautifulsoup4-4.8.1.tar.gz 159164 BLAKE2B 00121e9b30f700ade0bb2ec8f637b4173ecb4c187b8f9a77bcc4e6b333fced85a699c8d9efa5b757ab02f54c2b05740702c13625ff427730ccc1f6a97f43fa48 SHA512 7abc5e84cb8da5428dafc6b473418d0cc72b518cb1a73d4ae58b8dad3ec985e5778629dc1d7c8374dfb223be981983c745a1dbb55a98078b4cfe7ba5ce25539b
-EBUILD beautifulsoup-3.2.1-r1.ebuild 836 BLAKE2B 52e0e05b6a8cad84e346a246ca15ca7f8831d10896878f8532a8293f29970e66973942dc09174646e12dbef94874aacd03c844b71adb25054deec43333de60a8 SHA512 3c6cfa0a3afb65c665a17eb55b8ab8f6f1622b4525391b7135e90197ebf769ff03d731714167dbdd438e06bbb014d5bdf00c4d6cd8412f6095df84cb89a69c1c
-EBUILD beautifulsoup-4.5.1.ebuild 1358 BLAKE2B 7e26f86e615618c2f2a41de43329791b55a744fa72e9946161368146ad49154f228d405cc30dd7cbeb43b5bb9206750c71e45cf58de7944c8056bf613707dcfe SHA512 e159aa7e2409e67d90322dbcdc882935c22833f6b88a24c656198b47e8ca50b801772e26e5a0b5daf81bff613d2e1cdbd13b5d91ea4982cd06e979d6eefc32a1
-EBUILD beautifulsoup-4.6.3.ebuild 1329 BLAKE2B 150f8c0e7d6937fd477a9298ea6731d3b7083c31de50600ddb8cbf17f8b59d1c22a0295999b1b75a3a80ad5deba5934e65814964580bcf56cb7e7d4425b4cf33 SHA512 0a4c11b1ff939c9fed55268ac0500d86d02f6fef5f38ab5dd6efe57dbfdaf4496f3c673634df4404e48a235e7312906d13190313158fd1ed7071cf349c0c3e69
-EBUILD beautifulsoup-4.8.1.ebuild 1065 BLAKE2B 2b6c11924cd6c9d4b778b3317d8a0cf785683d6d1eac519dc3c78a1e8a7823119fd881b5ba496db44b4d0c54f63461ed15d9b1c4766d3f85d474a54171118461 SHA512 3be5b0a8722d2d6f68dad3971ff5dfe00a84d59ee24d56d6a6ba4f813aa3dd391952a1810d4b02db5ee09c2366758f91ffadcfb6a728d08a698444a813182332
+DIST beautifulsoup4-4.8.2.tar.gz 298650 BLAKE2B 6826abf793efa63be89d844bc25bdb105413196bfab21c18f3816fd59a7a771459bf2c7ee209b75b0c88dfa14da8f4625c948889acfb48502e2260ccca229675 SHA512 aab90eb22614e9a2fb47792389a951b3ad7faf9791e15984a6c27a38be6f3d0ccbf3a9753d9afb5c70105097ac1a9c5f9e07206e12c6d4cb7a7f6d4e90ec18c2
+EBUILD beautifulsoup-3.2.1-r1.ebuild 828 BLAKE2B a112934cba4689e878cc8e71aee921f5dcf53ec41e8775820e8809ffde7dfe307d59e1b91a9e95197ed54efcbbeb31d4876d25a26ff7339ade34ea291c01d1b3 SHA512 8f75ad4231b8c78b75e1a2bb1bf5173c2901413cae05f33198b7eede63f1c3bd9df8127d9c775f2e70861a3295e320967ca7149296deb8725b499860eec4b808
+EBUILD beautifulsoup-4.5.1.ebuild 1349 BLAKE2B 512713938f0da338dd7cc97ede1060c64b812d69c7d4a00a1ca209fcfab123a1b499902165871778aff75d99c06817a396b36cab963bbefbf19ec7fe69bdbc68 SHA512 d9aeccf8d6028697e327db4e905f30cf1b45bf2b9aaebdf1508e41d5355573cd98884494f8bbae05124accb06a240f7732f5150c6d06ff7ebff0d5fc41f421ca
+EBUILD beautifulsoup-4.6.3.ebuild 1322 BLAKE2B 38c9f458e86d34db0153506a7e8aedc561a53181bf45ba15ab69e1760582ecae4a6c8a3bfd275a9a31fc61a10ff6b1f36208be37555baa42f7408e60ce60b21b SHA512 298d3e179df527aea408ec196cd9b617c8a886c753ddc08dabf5ed55889220a74c93338f83d7a798f73789b7ac2cf07538c41829f2eaaf6a5bf82d6e6076711e
+EBUILD beautifulsoup-4.8.1.ebuild 1060 BLAKE2B 226ec5de5cfe9480130fdb9d754a47bfc10bd8113889629063ceb687bc996ac96637723e6ebdef10c05de6f460487cd4f139be09547a8f2c3724ab3fce69ff38 SHA512 624290347a9fd7c5e4c4092b8a0bd731acdc64b59a694dbafc493be603a0f51a530df7019a4d2e46b88af53c1d7d096b277b0c01ce81b21b728ac5e42d3b2e7f
+EBUILD beautifulsoup-4.8.2.ebuild 1062 BLAKE2B 2a7d245c478167ebc5b54087bde4e8e1e6a0dd4b723249a334cef2f72b1ba6512f5091351efc49b57178c5b28c942fc71161c1d1138f94c0e4326860ad7aded9 SHA512 23e1de6416b0ccb3c15f41e717f855341566c1f82cbe847358b380654265e4ddc16a49391f4a358a4ab54e0180e828a2ce096d5bbf7601b0dc23ec38d1d0c41a
 MISC metadata.xml 720 BLAKE2B eb5a827491cd19df36bee9593e3e110a986fceee9f6d62a4de47edfc3daf4e1090062a2a9a4c8bc9cbb4f9b378de0c21126b3229740b7e75fba22643fb28fbcd SHA512 94493d30b0e0e55b94d08f9a56841c54088469a86b706b73e8efe9c0f9a0da598feececd01f5f14d7e28bfe6fea5d7b017fb84a2df680335f519803450c6f578
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
index c2afc9c095d7..0e5b504533d3 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
index 87b2796d27f7..62ce34be602e 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
index 9566d646c163..23c46d032439 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
index a40d7f313a1d..b5e62a152a5d 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
new file mode 100644
index 000000000000..712974a6956d
--- /dev/null
+++ b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN}4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
+HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# html5lib is optional however hard coding since its use is actively discouraged in the devmanual
+RDEPEND="
+	dev-python/soupsieve[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/html5lib[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' python2_7 'python3*')
+"
+BDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests nose
+distutils_enable_sphinx doc/source --no-autodoc
+
+python_test() {
+	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/bert/Manifest b/dev-python/bert/Manifest
index ed48b162deb6..7cc60b847cd3 100644
--- a/dev-python/bert/Manifest
+++ b/dev-python/bert/Manifest
@@ -1,6 +1,6 @@
 AUX bert-2.0.0-remove-basestring-fix.patch 647 BLAKE2B 19b7b65b41be9c3b929c0dc2c92d5f511017f093e924813d547e29a763a0fc23d557798be5542a2991fdb2a808afc087a8e5c40dc03d06d1864564ef6a566aa9 SHA512 e4554308cd81c9b7bd69cac3eed2bb65ce604bfbc494f644b7b0dccbad527af973cb7afb4589b602457ecccbc893f50acbd1031aff87ed30b06f2824ff20d548
 DIST bert-2.0.0.tar.gz 3503 BLAKE2B 6435177493a822166e2f5e2c461f17deb9553aa3aec8893d15e057da9907ae4949246fb19299a1263905e648e0483d2e4cfeddbd2915f2c0d147a0a2bc62daf0 SHA512 643392ab1f8f0cecad9773846a52d5207f3dfeb431c6934b7cdfa523319c1c2aca4b9f8139d0a52ea759df03163b820adb963e4a21284e579a9d139da9acbeb3
 DIST bert-2.2.0.tar.gz 3541 BLAKE2B 3f1f87d5205e1098f7d170da5a4e331f9421151af536c106ce2de925082c48bc739df4bbe2294a2dbe8f65d2ccc24a1d5bb944ad90e80e558cb5032e4fd7c639 SHA512 417c9752362c6dc7ade8078f259d1674fcddd09b6af595694a9c31e886dbb523460413d4bf041db29afd4d67a9d639ef8f9254077c31d1593657ad52f8ef45a8
-EBUILD bert-2.0.0.ebuild 537 BLAKE2B 68fbcf5c60353d4b9804e186886e64cc7a6dc2ade892aa5c7d30c0d42dd26ccd068a106399dd8f36de5cd0a9a65d4b86da600ccd8b9351ca790dc2f7931f6e37 SHA512 4574abc11e89f400ea35462dda9b8af43860b69ed77d7c7e730f510c972cefd867698dbc3e5e44edb20dfbf3551046b72614a1d2da91088efa1ead678f75ac9e
-EBUILD bert-2.2.0.ebuild 551 BLAKE2B 005a0762eed0e22fe6c3aa3fb4270e21fd61b1e70c89db19ad778ffcd4420ea63d04608fd5a57fed7f7c5d7da6b53640296b5f4309cc4e14a76810bb9608057e SHA512 a8f1cbb00feca4bb9be0169576e664bf5d3c4a835a05948dc2cb90a058ac1bf8f1439c2d73d153fc5b69b594e1322ea46455a38c45939c016b7e22940b6afe55
+EBUILD bert-2.0.0.ebuild 527 BLAKE2B 5bbcc336bf646e834796aab4c86eff149d19d685070c042be83ee77297f11d37fbf2f19d7cf8506ef5fc872f0f19ebefadb33d119c026f8bad9b093399f578ac SHA512 94a9f7f07f2eab6b1225fa2e94c2b59cc96aaf4329b4208d8d3f78606a78864a334fd8fd3e6e112cb16571ad5cb577161b6483e2c3abfe6170cbd229cbe5c519
+EBUILD bert-2.2.0.ebuild 541 BLAKE2B cfefbd8f11cc74feaeaf16a8657ae6c5bd32d8673231df92a14b659e40ab8a57f7ff6b7b8c8fc73cd72e37ca70f7108c8bc033ff9f446b10792e71967f882f8e SHA512 dcd302fd73bb5d8963ae99f230ee7d685cddb0ebfb60339892b0ef4d70e6a50db7e95dfa35de705a66abe8ebf12f08af0c2e22acc31b84bb14335dece775caa9
 MISC metadata.xml 389 BLAKE2B 75c3d2580d105790a4507edbc3ea6553d7cbbc96796947441d6ea8e6fdb6344b474cdb86b33a94ba8f7a5537ccc9e7ae1572556d21e56521098aa2c15231f404 SHA512 571fa89a2d05efe16247a98320bc4ce94b0483626d5f9a0e5ea9f72ddc0da3425e56e5b2b6d7cf1a1fc7103aef39cda13edea686947cd91a440014f954ce5314
diff --git a/dev-python/bert/bert-2.0.0.ebuild b/dev-python/bert/bert-2.0.0.ebuild
index eef25181ae9f..b3278d603cc1 100644
--- a/dev-python/bert/bert-2.0.0.ebuild
+++ b/dev-python/bert/bert-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bert/bert-2.2.0.ebuild b/dev-python/bert/bert-2.2.0.ebuild
index 163daf03d317..70fe0b5560aa 100644
--- a/dev-python/bert/bert-2.2.0.ebuild
+++ b/dev-python/bert/bert-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 6a67b5e3be06..545f5f1dc016 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,6 +1,6 @@
 AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
 DIST betamax-0.8.0.tar.gz 78398 BLAKE2B cc9546eb028343621ef47a9cb7992f1d3eef4a2b6837cc8b670ff7d0313020def203ff06bf1e21c2d4ef26932df65e71562110b14bf27fc5c1a6ca3ba9023f54 SHA512 52b330747b6add52390b50dd63c05851adc01ccd238fdb5c3401efdfc26be363a3f61145dc0e1f3cc43ff520e1457e33fa47952d2929c7c3e12c3e2612621f95
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
-EBUILD betamax-0.8.0.ebuild 765 BLAKE2B 6f19eeebc83e10b1651bdab08dc9f23963632c17a945471d4d0b9bd5cbda204f5739a5e8ca2849a62a9383cd674dc4054e0cf1afd0e695f4e0e0a2d8c58fe061 SHA512 1a877d6715b15eef9c03421aaa2c9cdb536071be8aa92b72b14fa97dc88a54d8f6bbc5279404f300dd1e26b1919224e10f177b6f12e0a4b4d29de42f3378b17f
-EBUILD betamax-0.8.1.ebuild 770 BLAKE2B 1503dc793b90ecd1202e1545527a8321e82e3d6d98e960324731f50dbb62faa67ca326361e060832a6d0e60dc1e19784047e03ddf277278f0c2296027940989e SHA512 712354730bd18f24711115b2f0ba35b2cc52ccddcd40b2209f250b917cc636f8ca9026db10cd7f7b09a1144cd3968c6ebf9290b862ff35e96584757d47d03710
+EBUILD betamax-0.8.0.ebuild 761 BLAKE2B ef7477ef93717e84d9c04b099845fa289cf1e6cfa57dc6a6cf87228854147e34aa8bbef566950cd6fb9a213ca1350b9ed8332dffc3ab4cb93b6d4117df387bae SHA512 51142de23911a422a6f12f3300f79beac681b20661c3fa9b8386d0d69a0c512fc5ff3983dcf75aee4b2e9fb0feb33a96f8245e31c58328b4a562d83d585305e0
+EBUILD betamax-0.8.1.ebuild 765 BLAKE2B 4c7d0f5882a2b5a748aa841836c4b1aa6d886d4cbb4ac49eaaaa7975b10e3a00bb17078141a33ed9c20b867f9ffc9eff62050104c23d6986a19f11ec05b3b670 SHA512 7c3ada94f39c0395652c7b35a8839803a935e2cad4210a0476896ced9b8e5977b937306fa460fd9f4523e62736761dfc7c47f92390fad41c0ba367e127b08413
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/betamax/betamax-0.8.0.ebuild b/dev-python/betamax/betamax-0.8.0.ebuild
index 4de0f8b0a576..ee64a9792070 100644
--- a/dev-python/betamax/betamax-0.8.0.ebuild
+++ b/dev-python/betamax/betamax-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="python-requests HTTP exchanges recorder"
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index f5e096379c01..c1807b13d5db 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bibtexparser/Manifest b/dev-python/bibtexparser/Manifest
index e11a9443d210..a854d2d4f5c8 100644
--- a/dev-python/bibtexparser/Manifest
+++ b/dev-python/bibtexparser/Manifest
@@ -1,5 +1,5 @@
 DIST bibtexparser-0.6.2.tar.gz 50876 BLAKE2B 660508717a224d1c1c28a52c8d7ccc8de7248e61b45ce73bb46729ee7feb8872bdaf92bd6b07cdfb7934fa57993b39749b9961185d4dc9cec2d55809761a783e SHA512 43a1c0475bc9e97c201a850e944f082e9eb316ac475cce4128b821008fc5b1597317f28c594f5462daee992b455fb4254fdf76a5baa02ff8e8a0e36f43c52491
 DIST bibtexparser-1.1.0.tar.gz 88656 BLAKE2B e5285953fbf79558643e19ea39f6421394f93afbfc6820be9bee0583c1efa010b9fe3478c9f3e36bea0c64e35c9d5bcb8341f1ee784c4150883e160723b94119 SHA512 f984cb307bfb8ee8143499469c0a83a28b3e9f061b17e5b43b7f9aa730c91427f2b2c441e501d37ab62f99ce2b7dd1cd7dee40b21c9f1a8e8b2dddf8eac2e74b
-EBUILD bibtexparser-0.6.2.ebuild 727 BLAKE2B 6670cc1f3c61abbac29f46169921a6d128729b9ec6e2b6fac7f99324aa131f4f52e1b9a61f0a69eeaf846295097546c4e358b7e3d2df726e460c50f803a6bc8c SHA512 fe28a6b2ac199101435dd69e44af7469c650e845888114a3478283662daaf159b2d0fe0acfb615397b0650715a5454c0952a8f3b448ebb2819251b59e6d2a2b5
-EBUILD bibtexparser-1.1.0.ebuild 729 BLAKE2B d780d89d868aeadbe66cbd8cf6bec94614df2203e9b909105bdc465bbde515be6ab96503d9ab9e1a0dd080d7a2b5409ebf215e93b9d4e15a85bb7c73d4eb7a01 SHA512 10044a8073e45b1d718c44925c77d579e7666c97bde2c37a5aa3e9a0d0c968a0a23efc013f6bef370f9f33a5b117d5d9cd7cda7691f040276559b3cd6d442e36
+EBUILD bibtexparser-0.6.2.ebuild 723 BLAKE2B dd2239def5229c5cef324189944c2470acac5801aae0f9b70206666858c02b8f095324076eb37265517ff679564f0fbfe70448aee858fa0de9ac4877224a36da SHA512 4cee896fd1070e2c0e11413d141f630b5525793f023665b89fff0d36ca71b32d593f2169291dbd7b6f0bd33c8066d7d714e38bc43da91c3640409db19a3cafc0
+EBUILD bibtexparser-1.1.0.ebuild 727 BLAKE2B b16612b8f74b3002e9de2800e5d7f92a2d178c4a0156aa3368a8f119f6182195d1e312f8845bc3b35da4cbeea2e1820d5fa7829644022ab497c977a4a69097af SHA512 b4769849ec996d9647a6044be8dc239c4c0703e73bfd05fd7d6eed797ddac494584387267292b00032379076321f844cb1a394fea024227bc17a1f40b0665e50
 MISC metadata.xml 345 BLAKE2B b62679a7f708f8ff2757c923e3ba7d8cfc73a7b3f1a293020660a20bec6cfd07e33b073f18f9543085834b7cfb07fb83f749ae30c2a0b18face008ace3b50da0 SHA512 d2ed1034bf79aeb9c8bb102618e5c5478a526a8567dd8e232126f35919b1e6ab6b27bc02f01d61a475c8ec3488450968fabe4548539d61a70b61459e0b1e1615
diff --git a/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild b/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
index 1eee6e86ca3a..38eef0d64151 100644
--- a/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
+++ b/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 python-r1
 
diff --git a/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild b/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
index 930e71bd6df1..72655859320a 100644
--- a/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
+++ b/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 python-r1
 
diff --git a/dev-python/bicyclerepair/Manifest b/dev-python/bicyclerepair/Manifest
deleted file mode 100644
index 29207409ee00..000000000000
--- a/dev-python/bicyclerepair/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 50bicyclerepair-gentoo.el 196 BLAKE2B 3f7b6d8452dd0c33718acf8532e3b9e50db61a25a39acb19f0436d68f2e715060eb61638b5af91de6c52fbf1afd08e7eb660baa607f78006851ad64f76ed8ab1 SHA512 adaada9d49a5ecfbed6a1e478f0cd7cddad774d02f0c9f4e0ba3cfd1fabd56d80496e869f5a2c33f6883937b7c5c7b20e61d09730faee3a5babd6a91063b4709
-AUX bicyclerepair-0.9-idle.patch 1525 BLAKE2B e561d19c99f21406635b78f661f2dd7a898df2be069bdbde65886c9a6367bde0e4bd29e41ef0b764971e2d639c5969a9595efa4505159454f8f90c7ac6cd5b7f SHA512 986021b98639c9cc2838244c7000b9cc4617d6638a9971d1260c0a594483604e7a3d2af95ba8eab96ab61c485a4de4ebd7b976cc75529c0af754825426f856e3
-AUX bicyclerepair-0.9-invalid-syntax.patch 340 BLAKE2B b0c7ef65c76c766b851ee3076cc1bf47ff45d1c96d7ffa17c879a4b44ec09f3c44286cd77dffc604a10c4b04606c6106cf964eb71b11aa858044933187106bfe SHA512 5204519af71984c9bc183ade57531955f3449d77f6e234d425f976c35c3a249a6d4dd90ad8e96a3f5d5ddb337612e68c241f0c56933f8ea2f3c4b5bb772df77d
-DIST bicyclerepair-0.9.tar.gz 165025 BLAKE2B f1d2aba79da4aab161a7f07cc662a4d39d61e15a388d3dca7f8f4f513913b64db4522848ebe1a47db34b23b62ee7be73ea450e1072f72e673e94a8b3ee31e56a SHA512 e80495ccd01d72964eaf3dc8cc4430215ffb563710893c52141e8393125dafd085ba485a2228fed0ceb364515efe08db1947201e73f318498788a9e3581765ff
-EBUILD bicyclerepair-0.9-r3.ebuild 1127 BLAKE2B e932515bee9ff59d93be8b727ff195ac3dd177de644292967fa2bfb27d024691ec7fbc003c9972bfb74be77598491866e123e227f153e3ca7633b3ada1bdbcf1 SHA512 6a5baca6802600f4c0317ff4dc51f812c27cbc93a55a987b28a680947a39b766924feb81ad46a0ea3c850e11c80c2bbd2c8da45562e102b1ef4a23de76738181
-MISC metadata.xml 323 BLAKE2B db6df33753977bb5d1a9ed08d8557dce0d2e9c27f0148774addbcdfc49f176075d653086932ebdfe8ef2cfcc3276d4a946ed803880f1d0fd91d0669374ca5b30 SHA512 37257b3ff5caf7b347efa06a5a3f53df261f1b29e1c93f828a9e1847551cf4db09854ec8979c66e6f54e38a2b1de4d3d7e381a892d3065ca8b3b1a5e5708da3b
diff --git a/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild b/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild
deleted file mode 100644
index 32c6a6c8f2ce..000000000000
--- a/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild
+++ /dev/null
@@ -1,56 +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 elisp-common
-
-DESCRIPTION="Bicycle Repair Man is the Python Refactoring Browser"
-HOMEPAGE="http://bicyclerepair.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bicyclerepair/${P}.tar.gz"
-
-LICENSE="icu GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-IUSE="emacs"
-
-DEPEND="
-	emacs? (
-		app-emacs/pymacs[${PYTHON_USEDEP}]
-		app-emacs/python-mode
-	)"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${P}-idle.patch"
-	"${FILESDIR}/${P}-invalid-syntax.patch"
-)
-
-python_prepare_all() {
-	# bikeemacs.py contains non-ASCII characters in comments.
-	sed -e '1s/$/\t-*- coding: latin-1 -*-/' -i ide-integration/bikeemacs.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" testall.py || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/bicyclerepair/files/50bicyclerepair-gentoo.el b/dev-python/bicyclerepair/files/50bicyclerepair-gentoo.el
deleted file mode 100644
index edad427b54e0..000000000000
--- a/dev-python/bicyclerepair/files/50bicyclerepair-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-
-;;; bicyclerepair site-lisp configuration
-
-(add-hook
- 'python-mode-hook
- (lambda ()
-   (unless (fboundp 'brm-menu)
-     (require 'pymacs)
-     (pymacs-load "bikeemacs" "brm-")
-     (brm-init))))
diff --git a/dev-python/bicyclerepair/files/bicyclerepair-0.9-idle.patch b/dev-python/bicyclerepair/files/bicyclerepair-0.9-idle.patch
deleted file mode 100644
index ff7e6f8d80bd..000000000000
--- a/dev-python/bicyclerepair/files/bicyclerepair-0.9-idle.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-=== modified file 'ide-integration/BicycleRepairMan_Idle.py'
---- ide-integration/BicycleRepairMan_Idle.py	2008-07-21 20:08:33 +0000
-+++ ide-integration/BicycleRepairMan_Idle.py	2008-07-21 20:15:02 +0000
-@@ -300,21 +300,21 @@
-         return 1
- 
- 
--    def confirm_buffer_is_saved(self, editwin):
--        if not editwin.get_saved():
--            name = (editwin.short_title()or
--            editwin.long_title()or
--            "Untitled")
--            reply = tkMessageBox.askokcancel("Bicycle Repair Man",
--                "The buffer for %s is not saved.\n\n"%name+
--                "Save it and continue?",
--                master = self.editwin.text)
--          &nbs p; self.editwin.text.focus_set()
--            if reply:
--                editwin.io.save(None)
--            else:
--                return 0
--        return 1
-+    def confirm_buffer_is_saved(self, editwin):
-+        if not editwin.get_saved():
-+            name = (editwin.short_title()or
-+            editwin.long_title()or
-+            "Untitled")
-+            reply = tkMessageBox.askokcancel("Bicycle Repair Man",
-+                "The buffer for %s is not saved.\n\n"%name+
-+                "Save it and continue?",
-+                master = self.editwin.text)
-+            self.editwin.text.focus_set()
-+            if reply:
-+                editwin.io.save(None)
-+            else:
-+                return 0
-+        return 1
- 
-     def errorbox(self, title, message):
-         tkMessageBox.showerror(title, message, master = self.editwin.text)
-
diff --git a/dev-python/bicyclerepair/files/bicyclerepair-0.9-invalid-syntax.patch b/dev-python/bicyclerepair/files/bicyclerepair-0.9-invalid-syntax.patch
deleted file mode 100644
index c32fdb621217..000000000000
--- a/dev-python/bicyclerepair/files/bicyclerepair-0.9-invalid-syntax.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-=== modified file 'bike/query/getPackageDependencies.py'
---- bike/query/getPackageDependencies.py	2008-07-21 19:37:44 +0000
-+++ bike/query/getPackageDependencies.py	2008-07-21 19:38:11 +0000
-@@ -2,5 +2,5 @@
- 
- # fileInPackage is the filename of a file in the package hierarchy
- def getPackageDependencies(fileInPackage):
--    
-+    pass
- 
-
diff --git a/dev-python/bicyclerepair/metadata.xml b/dev-python/bicyclerepair/metadata.xml
deleted file mode 100644
index 7bf4b4e5aa51..000000000000
--- a/dev-python/bicyclerepair/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="sourceforge">bicyclerepair</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/billiard/Manifest b/dev-python/billiard/Manifest
index 5cf71a9d85d0..a8131ed4ba5a 100644
--- a/dev-python/billiard/Manifest
+++ b/dev-python/billiard/Manifest
@@ -1,9 +1,5 @@
-DIST billiard-3.3.0.23.tar.gz 151675 BLAKE2B 78cddee80df8a7d78f993ac33b40967c1f7f7b9c65fbb27d4038b48732a90e4dc016c83e009a5963e9cc208eaa6a5f74fd4a33f3faa0f49b2112f10c285be1f1 SHA512 2ab83512f5317230066f6f82615bda97c1fe6c0cf98281dc3ed486055584c6899695e6b9905d5825d657111c65c7f3552cf3fc7934ad2e4d4b3da09b538b09ca
-DIST billiard-3.5.0.0.tar.gz 155959 BLAKE2B dcfbcf7ca7d53cc1963d9753736e1001d2a4e1b19e4e67fb937619f327ec9c6af66ddf23a89ab4332499b16a6ede8bda86e82a8843a66d4d2b47d1c95885ee57 SHA512 c73adb0cd470e66cc6aaca848f24a991df3eda44e7adf0e83d2a7a1e87bba4381b165842e8cd297d43a4d01d4c006953107354b841cdad9fdde4e00e7a80c4f1
 DIST billiard-3.5.0.2.tar.gz 157299 BLAKE2B 1400d5a562dcab33c83a64cc7f7d14ad55b75677c3bb4c050cd4ba08a1f882e65d033653628fc3f2b52942081da3d5661fb0bcc5f2dd95f81a64749cd47d324f SHA512 581e1ac361324b36d79e280072952e490ef3470709b094f001c579feda54578c8e7b3e5afc93a5f878a6118c56afff7e59e13b3d3f2ccb2564b9b27cc810dae7
 DIST billiard-3.6.0.0.tar.gz 151342 BLAKE2B 46e29ae54144f3b4ebf3fbb4a5bdbba29662d3a6b292cbfef526618237103fd833d10eefe03211141264424590b33ddcd8722616d36ab4e2405198628cc29d5a SHA512 0a71de026d2a781b83fe2c549ecbfe9b6fbd574d8067fc46ba7eca6b76633a123620853d22696df3563d050043cfe75b14b4b69bf5217e0af964aaa0bcbe08ff
-EBUILD billiard-3.3.0.23.ebuild 1508 BLAKE2B 34b61f03f74aba02e05df57e313d04c073586701ec710a31c0726992b1b5a553b7c109db78f9e30ffc6778221c3fb4ee4138f7e7b82781a3ccf107347058f44b SHA512 ad0598788aa25d897fe6a1b44d560ff8d6a405450a3a28c5d4a033d93c88b59ff5378dbdde3a12a28961f62b5064b8d12797913b271294abd8f6815b0cac4b21
-EBUILD billiard-3.5.0.0.ebuild 1548 BLAKE2B f308e89764c01f7a86673d6dadbf1aea5f7d71325d989c5507021a98da92b6bfccfc41fda7847a875ef79eeed0b714374320407c18d4d69ad535c4d290def46b SHA512 3b7b72249263e554bc1ce9102acba5841e0a97a53b35906d1b3f419034980d399e0c2163ec8e982dc013fd951f70718d5e4428d565dc172d4f2b300049fb792c
-EBUILD billiard-3.5.0.2.ebuild 1074 BLAKE2B 5e11d61785b654d62632974347f10d0a8eb70558428d33277f4e107ac1f7055c8b9f636fec5634070a0249667c40bc1f9cb8ef99966f6b7a9e60bf7878c6e42e SHA512 ae0d4c23d1a86b7325c654df9d5f000de1dce64b356870d62503c55a197da7ace742f2c9948cfb8f142b42769c6c0c43043e6e7350bbd867c535772362dce803
-EBUILD billiard-3.6.0.0.ebuild 1154 BLAKE2B 21c4e670c7c8126b2a8eae1d61e1ef23d4a85c84f02bd39da5b4274480c0cc0b4c690013324183eb64fa7818eb4d0080d548e49408b977e10ed431ab024a8b98 SHA512 247ff4a8686c3d6db87a14087082fe76be22856e88c13a9f98e4a2650cf0551d4f0a8ce3d28b86001e85b6e75dd6399e66ece810997b0f4ae71e0cf814e5134f
+EBUILD billiard-3.5.0.2.ebuild 1065 BLAKE2B edf8404f6cd0be7b3b0cbcdde8c35186256410f04838bd5b9aac3276b2a54bed43bfe1fa8fc723786490863c3403444f17d6329554c5b4293808f9fd40505648 SHA512 34078eda255b40c1775213b287208fd081b7ee1ed74b5afb5494e217473caca51df4e210ed537385b18a5fd6d47b80b776b1c8e23c775df1b5b756e594cfc577
+EBUILD billiard-3.6.0.0.ebuild 1147 BLAKE2B 85b6b8aba5da5e940daee939035b525a48d3dda8f1e0e574e0e5365934eff044708c5efe8d9b06e703d210dda82e992bc6ad5a1b04ed9c93ecb9239c1dba3d1c SHA512 90bfc09e4e56c923476ce9907c2efc9c6cc80d2162626ebadc36c41c3742e9068d00afc8506666d77dbf1d9737c1f1b0933397271d3a464ed4f6bd85f134c615
 MISC metadata.xml 366 BLAKE2B 1ebf602d203fab55800c4b1c9df304a2eabab36beac69affe09a3429cf94daf9481436f4216f7e697cb4dc864962ed3a0d6ce3c476dcbc325292c7a38e331718 SHA512 f9784ef6cb7607efaced1b96745e9fcbfb13cff64d2be2cefe2e28e5475d8386daa675592f22d8f7fa23949cb015de73583dd8ab392aa9b6383e0befe30dc8d4
diff --git a/dev-python/billiard/billiard-3.3.0.23.ebuild b/dev-python/billiard/billiard-3.3.0.23.ebuild
deleted file mode 100644
index c7c794106fd2..000000000000
--- a/dev-python/billiard/billiard-3.3.0.23.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python multiprocessing fork"
-HOMEPAGE="https://pypi.org/project/billiard/ https://github.com/celery/billiard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/unittest2-0.4.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.4[${PYTHON_USEDEP}]
-		dev-python/nose-cover3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy pypy3 )
-	)"
-# The usual req'd for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	if !  python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	# The teardown in __init__.py breaks pypy's installed nose
-	if [[ "${EPYTHON}" == pypy ]]; then
-		rm lib/billiard/tests/__init__.py || die
-		echo "from __future__ import absolute_import" >> ./lib/billiard/tests/__init__.py || die
-	fi
-	nosetests billiard.tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/billiard/billiard-3.5.0.0.ebuild b/dev-python/billiard/billiard-3.5.0.0.ebuild
deleted file mode 100644
index 7da717f5be5f..000000000000
--- a/dev-python/billiard/billiard-3.5.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python multiprocessing fork"
-HOMEPAGE="https://pypi.org/project/billiard/ https://github.com/celery/billiard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/case[${PYTHON_USEDEP}]
-		>=dev-python/unittest2-0.4.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.4[${PYTHON_USEDEP}]
-		dev-python/nose-cover3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy pypy3 )
-	)"
-# The usual req'd for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	if !  python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	# The teardown in __init__.py breaks pypy's installed nose
-	if [[ "${EPYTHON}" == pypy ]]; then
-		rm lib/billiard/tests/__init__.py || die
-		echo "from __future__ import absolute_import" >> ./lib/billiard/tests/__init__.py || die
-	fi
-	nosetests billiard.tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/billiard/billiard-3.5.0.2.ebuild b/dev-python/billiard/billiard-3.5.0.2.ebuild
index 42146a67c21c..541e6643f469 100644
--- a/dev-python/billiard/billiard-3.5.0.2.ebuild
+++ b/dev-python/billiard/billiard-3.5.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/billiard/billiard-3.6.0.0.ebuild b/dev-python/billiard/billiard-3.6.0.0.ebuild
index 087879f89dc1..4d3b932cc8f8 100644
--- a/dev-python/billiard/billiard-3.6.0.0.ebuild
+++ b/dev-python/billiard/billiard-3.6.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index 71065c26e5b8..d9b6d6b3fd73 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1,3 +1,3 @@
 DIST binaryornot-0.4.3.tar.gz 372299 BLAKE2B c4ae99b9ccb66da8925d74fad68b8df4713822acc74d852e2f584e5c157eb465bc6418b0e0085533479ba1ee937c3d2716dea66ce3bd517d49a490ab4615f694 SHA512 bdb918b921fc46d056572b84126dbdc6605ec98cf13aac84f6f64ce07d083839be40bf7a08185eaabfbe136a9bcf0c1acc8041a23a6bb2843e8e72981222ebaa
-EBUILD binaryornot-0.4.3.ebuild 696 BLAKE2B ea854d9cf190cd00b5ae35ccbdbddc7a3fdad8e66675a24df55852a4edb39ae38f3b90e27b69dc4dfab6f6c9d15146fbed8d4e4b00bab6a64676346d26e53b07 SHA512 afbd576b1cb77554f9d4802d087959a8b1e03c35d8d9e9a30fac8cfcc2676db3cdc748c8c5dceccd99068cdf74570edff35fb7290032b659b16b39a1eac648cb
+EBUILD binaryornot-0.4.3.ebuild 692 BLAKE2B e5578fc630940e357296d46c6df890cf9b655dc7ec5fb9254c445c39fa0bfec97143fee6d5dfb3b295da603feca199fe9d82ad7550e429656021293fa6faa349 SHA512 23bdd11bbb48b780e9f1fb9bec664890649e75f022ffca306ce819b66ade5474ece12d61960a5682eefa426a83dd6cf3f17ef1e552683be965ea7aa2d0cc742c
 MISC metadata.xml 324 BLAKE2B 85a0925b2255a6577beed4974beba21884b88df30bc1519f6ce16e856659589c6e6e38166540f59fb0043885ce786382d90b6830c6ed1bc0051a5d728a1f780b SHA512 f20343e29c9a1d2bb354ecb3c308d5b21985deed5368d27dc144c3a6f2e236f30f7516e27a56e55be48fda32bd59ae9af96ff3b90ecf641bf57dc5b61a4267c6
diff --git a/dev-python/binaryornot/binaryornot-0.4.3.ebuild b/dev-python/binaryornot/binaryornot-0.4.3.ebuild
index 4357895d22a9..09a2b92fcbbb 100644
--- a/dev-python/binaryornot/binaryornot-0.4.3.ebuild
+++ b/dev-python/binaryornot/binaryornot-0.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/biplist/Manifest b/dev-python/biplist/Manifest
index dc53d11c1eff..6f1f2cad8fac 100644
--- a/dev-python/biplist/Manifest
+++ b/dev-python/biplist/Manifest
@@ -1,5 +1,5 @@
 DIST biplist-1.0.1.tar.gz 16251 BLAKE2B ca56064e4d0ea6cee1088964c38d2cb780366ecb36a5c19458a975fde70d100063ed057cc597bfe7db86542f4acd027d37f5e5526a0c63a5f4bae080653aba20 SHA512 017bbea254f74d2c647322044a7b9a6006a0d69ecd44d1cd0281a3f30b38fd0feeef1b07272b9495440d3cd4434e2d4802681959b4185e2c354999884605a657
 DIST biplist-1.0.2.tar.gz 16246 BLAKE2B 7eb12a7f416c8ef588e4dbc2ea9332664150aacd2d3064b901d3aeaffcf5efd871d47f68e3ce941c82a6697c5149e6bb8dd93f42ef6eb94ccc5e44ac71ad5ddd SHA512 2418d24b2d9e36aad76ac6626e82b8f60f0c167636142a054b02de3437d117fa1ccfeb9c104801fe106fec2d7a31c2bdeaab27fd519f1bce3bdf8a3b90b42c27
-EBUILD biplist-1.0.1.ebuild 804 BLAKE2B 38e846b9402a3a9a4ff6c6b97de3fb8e4bc2d6c366cd7de6512e0662babe0551ad711a9625ac3cc8ec9610c86e610f07501964f6e9d18be2d4415cd406d80070 SHA512 3e9dc21ce6661b4be74a24163020f3f4070dbbfec18a7426947cdd58c9bfe21e52e3f7cc3166cc2fcffe60e276b12dd7b82070954db37ef5ce814cd6dd8b18ac
-EBUILD biplist-1.0.2.ebuild 811 BLAKE2B 9d828645e2b21bca4f8b849fcc0dfd8f2e546b6e572f3a118f718114554034fc4a0bdc003f5415c1cb237fe0c007cdc3b175d8bea51ba474ed3d836dd96eb1aa SHA512 75119a6516dabbfba047855ec53fc9461924eeac1863bd4d76120b16aeaa8be4d47ab957e48ff57e03550a3de74ac40abfc62ac59ca0d29b3cfa84766c2a5388
+EBUILD biplist-1.0.1.ebuild 789 BLAKE2B 9f2a7030e9e29f38b32fa09a12fa481f746b2e384331645bb1ffd9ec8253ad5da0a5cf591a31a85f1b05798db555414e8911a49d10975f861345e0f150526f5a SHA512 d389fd140bd1c57f714dbd87bcf666cf707035d2b42723038c4edab70c3ce9bf1f2bc11fc25552fd7c114af810685b45329ea18562ada558a39fba21d3548c13
+EBUILD biplist-1.0.2.ebuild 796 BLAKE2B 5367ab107f76d386ad42a0c5075a7f0d7a334748e3bf1372474a984ba0a3540cbb5dac872c8b7e6549c22ddd6ceddb92152182c7b1fa03b1a68adbdc311731af SHA512 08b3c5dbeb742965b809777e4b516b1d24469962231def8edba87b39ca935da3ad51fc6486af8541f4ba391d51389db6940b5f5336b83be4e69b52cb05fdd0b5
 MISC metadata.xml 377 BLAKE2B af123a6b5cd24a6e3fb88b77d147697b4b235cb80fcba16ace67dbf322579cfd76d15836af2f437c923256c92015052d64c9c6a665ff1d369bf744beaa4d2b7a SHA512 4adf5d21a3565339161bfcc8685e00ba88df7588f9a844d79572f7258fe38777fb99385377a175b7a52ce4815f38c8f54f0e1567e0637775dcbf1d8ff059dfd4
diff --git a/dev-python/biplist/biplist-1.0.1.ebuild b/dev-python/biplist/biplist-1.0.1.ebuild
index bcab105a5bcb..58cd4297dc9e 100644
--- a/dev-python/biplist/biplist-1.0.1.ebuild
+++ b/dev-python/biplist/biplist-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/biplist/biplist-1.0.2.ebuild b/dev-python/biplist/biplist-1.0.2.ebuild
index 8e1836cad2f3..c5d7686cea18 100644
--- a/dev-python/biplist/biplist-1.0.2.ebuild
+++ b/dev-python/biplist/biplist-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 42a9d8789c0f..bdc996df9901 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,5 +1,5 @@
 DIST bitarray-0.8.1.tar.gz 46877 BLAKE2B eb6b78706b336c73cb9895bfa2645fdc2d8a2525b23610bd37dc959a0aa2bad0c5d746ee31c53ca73a0248f989e69e23ef173dbe9dc0848453e6a8a5b14b3704 SHA512 10f4872243b92cd5a1a77e1e2aca80135d31904e17cb3de4eb2c3f2c4d3f00ad0573b6bc4b9c9379594e2912cb0e5d5870fb4e59eb298e269ecb3778fbae7d1f
 DIST bitarray-0.8.3.tar.gz 36292 BLAKE2B a9e55e5f8e8257759ae8b6fb5e817c76ab9da6cd73699d492e111a9237e08718b4de22f20d97d1f633075228c503697e6faf032cceee01aaaeb4ef041fe39a4c SHA512 67e634fba3672faf986117534e9260566b7596c7fddc67d7195fce4c9cc13bf491f94b6d25005143aee1cbbfbce168be0c7a833bc1f293cdbb30149b29855372
-EBUILD bitarray-0.8.1.ebuild 518 BLAKE2B 72d83ed81b8799c70ec06f995eeb2a24d1a826587ddd923d1ae09e67e356dba53ad28253a8097716d7db556d012267c1ac574bd1fe30896ce7523cbb9a4ab316 SHA512 294e0b25205c9932b9bef2181323463a6c17dc39bbd3aaf01bd6c32091a092632da91e6ce7c16a936245fb3cd868d34b6d5d4af159c7195c0c443480e6829ecf
-EBUILD bitarray-0.8.3.ebuild 537 BLAKE2B eb1f7661146599f7832689c775ced4eab39e9963b2693b0d81d022a9932a7053904f54302ed9f720f3144738c2e535b20373dbce45f4ac42cf825552d6b7b2ea SHA512 d49396f508b80124677dc4fc88213fbfc3f3f64b9e3e631fa23959d794765bc5f1c595065be2ca3051ab642aad7cddc63e3f19cee060ffbaeb2cfe01353de30c
+EBUILD bitarray-0.8.1.ebuild 514 BLAKE2B 16a4fca38673923656c20cc9fb7b480d6484e0ae07dc814bf0b8c58abdca55a23f3b25e91b68efed1dad1691ceab827c46bcdd8ea8331084886434eed6484f01 SHA512 6a6bf79eedb394e66c4e6465e5da86fdf3ab3415c5fca67b1bc31abc4240d152c5b3a2711bd01620c3e5ea14265309556e7a9e0c628deb14f12eed767dee16ae
+EBUILD bitarray-0.8.3.ebuild 533 BLAKE2B c3fe1e1d8a557a3cfc9761516581f7483aafe554846862a05de4d97cfaaf03423e3f9c9909bf34a81e99a96e1dc492184b8ebeaaa7b9b5252eed0846dedcdcb9 SHA512 29f0c7613f35e1e617b860313b6664e7a9aa46981a5827ad2d096c8a3a56ad6a57018a35d7f511296729baea943c8bae5a1183a242cb3df5eb656a0f28c00d23
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-0.8.1.ebuild b/dev-python/bitarray/bitarray-0.8.1.ebuild
index 00becf220643..1c68816388b8 100644
--- a/dev-python/bitarray/bitarray-0.8.1.ebuild
+++ b/dev-python/bitarray/bitarray-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1
 
diff --git a/dev-python/bitarray/bitarray-0.8.3.ebuild b/dev-python/bitarray/bitarray-0.8.3.ebuild
index 5249c257908b..b34e5c1f6c28 100644
--- a/dev-python/bitarray/bitarray-0.8.3.ebuild
+++ b/dev-python/bitarray/bitarray-0.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 382d1b36b2cd..5098a76ff889 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,3 +1,3 @@
 DIST bitstring-3.1.5.tar.gz 761527 BLAKE2B 2e0c9ade6cd946bb777ee666d12c777191add1fdbb2c47fca097a0ee48cd8caa6eefb5dc1a4d69d9fbf986342759956bd2ed078043b1df7c482af54e25afc0fe SHA512 2c98768c98fc5ab99eeb4ac089ec66f091949e5e4f326563b1b480981ac2aa40258fe0065809eed9c08a71fae3cf09254a8a2465e86635db5287c0d2f241d75f
-EBUILD bitstring-3.1.5.ebuild 646 BLAKE2B 024cf19ee5f4ed1db1811612502c8236c631c54863e8d6bf3f2e1aba110a6d999196409f3394e292c5b40b23b43aec2110dd07eeeb310dd3d4cf67e02dc42dc0 SHA512 00183cbabc6bc6a5bd4f368c511d9f770de10a14e2179247148807b5aae3bb133c95fe515276c1afb014dd0bcfeddeb43ecdc06d843aaffe3f7355cc87c52108
+EBUILD bitstring-3.1.5.ebuild 642 BLAKE2B b3115fa63f7b3efde6c2f6e5e421293e88a0c829d7a21e8138bbc837927e8ee42f99aa8a5fb6dce2f987e1f0ec1bbea8ecda00ea2491d7d2fe1d0f65ac1f12c9 SHA512 ecb82fe2108f62516dd59cd03cb0c539b27b9afccb06c3bc0674080a8ca0618e6ad573be7b709c5fa78e8fa06cab4741ec4bfe2ff93d4f1239ad2d9b52e18ddc
 MISC metadata.xml 661 BLAKE2B c6adcf300502376851157d3fb869c9327f49f4ae61f820ff59379816fddae11ec5c2952eb708d817facc9899ab347517a41c1307ac0bab4dcf34a4ff877bd704 SHA512 666cfe84898096825c292dd1e37af3b8d962f199199b8a73813b366fa4c14cc3a5373c4ed4fb8153b8e1c05321f4dae87204e1bf5a53e6fe07ab0117704b7f2d
diff --git a/dev-python/bitstring/bitstring-3.1.5.ebuild b/dev-python/bitstring/bitstring-3.1.5.ebuild
index ecd8aa648a6f..893b6edc11e2 100644
--- a/dev-python/bitstring/bitstring-3.1.5.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A pure Python module for creation and analysis of binary data"
diff --git a/dev-python/bjoern/Manifest b/dev-python/bjoern/Manifest
deleted file mode 100644
index 1cb1eac6df17..000000000000
--- a/dev-python/bjoern/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST bjoern-1.3.2.tar.gz 25878 BLAKE2B 855a913c6cfe05bf21f95ba7b94e229b6a96dc38f79e9d93d0aa1bb75d384794f037835fcad13ad8a9140e899aa73d6e62ca0c4fcba3eca722e283e6d1ffaf97 SHA512 f96ab7f6bfdd158da398c56555a47944f30ac505ed3cb8610a3fc12fe15d5a7bbb0cdba27c858e5ccac28213504b2c68aefd0c252591e3e4d63ce70c8ac840cc
-DIST bjoern-1.4.3.tar.gz 28824 BLAKE2B d8ce2009eb59d8b9d06c81e9a8e626d486043a627bc276f2fd4e185e78bfc8ee0804ac739fb59a673b102aa730ab28af44e1557866ff5a69c46fb16a1837dbf1 SHA512 a044067b18aa7ad9159a8682005137afbe99774804da8dddda4a4dab0ab34f52581e6bf9d9a5a7a9a13775408de2b88204f8c9f5a64f7e72bd21fa97d1e52b58
-EBUILD bjoern-1.3.2.ebuild 485 BLAKE2B f84874755ceac174e4bbe299f9e15c418106e8fcdd58c7951676253c291cb6790b2fa3d70b14fea2208e00c1a8ff0f51a4e27b69a7e8548c568f1d02a5eab308 SHA512 83c868a71f192acd82f6effb6a5093a9470db2a9783f24a314ae8ee0b3c9a8880ae5ddc38546470f852307048eb64921dc48ee4d9c14ae74ec8d8c077d65b6d6
-EBUILD bjoern-1.4.3.ebuild 487 BLAKE2B 88bd8604d2c5c393fa0ee2a6f222848ead16538be658d8236922876c45f1df4f250e2e68c7d2b2a9f126bba9bd74a7bae7de0c12dcc1766de3eefc247677d7d3 SHA512 51d405bc0ea810edfbdce21ca95adeaededb907c89d1c8c8051f24f7584d0cd44656745f819f732cc42c29af54daa5da73352f03ca97e0f7d0e4db81b1bf0bbc
-MISC metadata.xml 377 BLAKE2B e021c3f7574c92c923a66bc4733f74500ca08ec88a298ffbf94042694828cd7b34dd41a0748516f8a5fc3f5e6eaddcc41c0d09762e21965ea05e1658578182d7 SHA512 d7ce5899f15015e2683744f01807d0f452f8935508fbc2d2372ae0e1e6a71be9673ba9a71b4edaffba95c1c499e9226392fa77f7a38f9a8029344554ddbf9b83
diff --git a/dev-python/bjoern/bjoern-1.3.2.ebuild b/dev-python/bjoern/bjoern-1.3.2.ebuild
deleted file mode 100644
index dacd8ac896f5..000000000000
--- a/dev-python/bjoern/bjoern-1.3.2.ebuild
+++ /dev/null
@@ -1,20 +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="A screamingly fast Python WSGI server written in C"
-HOMEPAGE="https://github.com/jonashaag/bjoern https://pypi.org/project/bjoern/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libev
-	net-libs/http-parser"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/bjoern/bjoern-1.4.3.ebuild b/dev-python/bjoern/bjoern-1.4.3.ebuild
deleted file mode 100644
index 4f7f95d7ae1b..000000000000
--- a/dev-python/bjoern/bjoern-1.4.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="A screamingly fast Python WSGI server written in C"
-HOMEPAGE="https://github.com/jonashaag/bjoern https://pypi.org/project/bjoern/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libev
-	net-libs/http-parser"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/bjoern/metadata.xml b/dev-python/bjoern/metadata.xml
deleted file mode 100644
index 366764578b3b..000000000000
--- a/dev-python/bjoern/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">bjoern</remote-id>
-    <remote-id type="github">jonashaag/bjoern</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/blaze/Manifest b/dev-python/blaze/Manifest
index b319bab23bba..fd722148e8f7 100644
--- a/dev-python/blaze/Manifest
+++ b/dev-python/blaze/Manifest
@@ -1,5 +1,3 @@
-DIST blaze-0.10.2.tar.gz 9681767 BLAKE2B 9972d0f9bb00ce462f20673e9e164d504bc1157730bcb36a42b53ed1523a73bde36a1858ba7df1f813c126291251c6170da8ac70aaaac8932206de5f3e063a10 SHA512 01b7c5563f928c336f13eb13c6397f1089bca7c1cf0824da672acdabf28b18356c52678c58b2fa7af303601c6013e9d6f4fe26359ee6ab9a01f8b735c7d24a56
 DIST blaze-0.11.3.tar.gz 9691443 BLAKE2B 13734e3b2f63ad044991644a4c8243b449c5179a80efdaa5faf6ecf443434bec7a00953f0f17d73885b9e9fa506e72a9bc369380d2d7a561f5da064d8339e03f SHA512 030079e5d3f17355dac588154ffb7ba7993935dfd39bce141341b6e2b9a17f812982ce83776ac1e4224649a343b58615621347ba65e5aba2ca2e568d755f276f
-EBUILD blaze-0.10.2.ebuild 3229 BLAKE2B 0f7ccf27b13dcde8d4d1ab91aa2eafd77102721a1b3209398d7b1172891e830faf46fa74dc8301ddd0411d6dfe796aed88745982df818ffd6c59d97cbe280a29 SHA512 33d0f799f7c10eae8f48e853e35405182dd38b1243c9838545b176a9cf747db4b96a5f9acaba949e48579507955c61b6eba84988ff9988bb73c831182cc3b80f
-EBUILD blaze-0.11.3.ebuild 2225 BLAKE2B 790d93e9cedeee8bfa84e8b997feeba111c587d1148ae96d559d9969abfb612b9b62af00e085ec2ddf622280c8ede97c099892fa28a5fd199dd3d1f86b1a6a1e SHA512 c1b62a5567564eb3f2f5005c866d51ac9b720f4f793f0d08084f2142888e524e16290e66fc29df68a286d8527940fcf99f92de473295672094a347db47636970
+EBUILD blaze-0.11.3.ebuild 2215 BLAKE2B 359df6a63a5ff34423c245ee91425630bc10638d2098477a7d68dad21e0d8030c2a083c9ef1d138ae99eb1c7d7d64d91c19f29d13c3fce0a44e9abd1b2b7e022 SHA512 6acf53b639d20d0e049c752a015f14e7ea3ed3b30220a7746b57608aaf2894d4fcc95289f09fa2a1f4a9591c0a7e8df2548a727d5622970f1dae00e0a6b4858b
 MISC metadata.xml 619 BLAKE2B fcf9cafadca88ba8f5465f681c3fc87159a1e8f7fde68007f85d5f424682fcf4fae81b6002c73043f1fcb6c492e618277a2daaa7140086324ad31d84cd97004a SHA512 2fe8804a4e526991e088834f7d3a49a1273c8da255df259a3552b4a4613bf0386bf464e025e191eb0087258b53a003efb0b6ed1afdb5ceb5e9e7c1c9ebeda7b8
diff --git a/dev-python/blaze/blaze-0.10.2.ebuild b/dev-python/blaze/blaze-0.10.2.ebuild
deleted file mode 100644
index 31109ca7fb71..000000000000
--- a/dev-python/blaze/blaze-0.10.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Next generation Python numpy"
-HOMEPAGE="https://blaze.pydata.org https://blaze.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-# Currently doc build fails, reason now, attempt to import mystery modules in datashape
-# Leaving doc build content in case this is fixed
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-# pyspark appears an optional dep not in portage. pyskit appears to be dropped
-# some packages including pyparsing appear required despite their absence from requirements.txt
-
-RDEPEND="
-	dev-python/datashape[${PYTHON_USEDEP}]
-	>=dev-python/dynd-python-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/toolz[${PYTHON_USEDEP}]
-	dev-python/cytoolz[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.15.0[${PYTHON_USEDEP}]
-	dev-python/h5py[${PYTHON_USEDEP}]
-	dev-python/unicodecsv[${PYTHON_USEDEP}]
-	>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pymongo-2.8[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/into[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numba[${PYTHON_USEDEP}]
-	dev-python/bcolz[${PYTHON_USEDEP}]
-	>=dev-python/odo-0.4[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/cython-0.18[${PYTHON_USEDEP}]
-	test? (  ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/contextlib2[${PYTHON_USEDEP}]
-		dev-python/dask[${PYTHON_USEDEP}] )
-	"
-# It was found on testing that dev-python/chardet is required for tests
-# despite not being inlcuded in requirements.txt
-# The doc build now fails due to dep bokeh failing to emerge. Deleted.
-
-python_test() {
-	# https://github.com/ContinuumIO/blaze/issues/1117
-	# skip test requiring a server daemon
-	# Tally of known failure reduced to one under py2.7 (test_highly_nested_repr)
-	# and 2 under py3. The failure of test_query_with_strings persists
-	# under python3 and appears to be unaddressed upstream.
-	# Changes in the suite in this version require PYTHONPATH set to ${S}
-	# to avoid spurious errors resulting from the change of path set by the eclass.
-
-	einfo "The test suite has 4 additional failures with package numba installed"
-	einfo "Upstream have been informed via /blaze/issues/1117 @ github.com/"
-	einfo "For optimum results, uninstall numba, but it counters protocol to exclude"
-	einfo "dev-python/numba from dependencies in the ebuild"
-
-	PYTHONPATH="${S}" py.test --ignore blaze/compute/tests/test_mongo_compute.py blaze \
-		|| die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( blaze/examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/blaze/blaze-0.11.3.ebuild b/dev-python/blaze/blaze-0.11.3.ebuild
index 482f87e156c2..a4ccd33010f1 100644
--- a/dev-python/blaze/blaze-0.11.3.ebuild
+++ b/dev-python/blaze/blaze-0.11.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 58173a52e8f9..fd6ed1ab0182 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,7 @@
 DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
 DIST bleach-3.0.2.tar.gz 165682 BLAKE2B 26dfca08732af9eb11a27e1913ad1ed76454950d902d8f0dfd4a816dfe972d2280a29fcb7ba6c021938863f92d20d6ee3bb5ea64ee0b1f52e62cdbe12aebe009 SHA512 f5a6537c5b048a23b7834f27e30413517f82082f2abc4ad26c16a3aa4486545beec5394d2b759e82022f4cb8915e4034d8cd3383e41a3772a73f3858c283c155
 DIST bleach-3.1.0.tar.gz 167814 BLAKE2B 386d483ec9554d0436eeda70a5f558ca2191914ed90ddbfa00ae887e682505d1b84f511d21be7eceb8c98422a4dbb25ee32af49edc4b811e3816aaf9161fa4c4 SHA512 8db3a54b68fa66a07a3b4b90481557aac06e7783f9c72035a6f037909017354718b67b64153e1cd50cb2c821174b8282837c4c3e667878041a68703b141b2969
-EBUILD bleach-2.1.3.ebuild 809 BLAKE2B a1ef75c5936469da5ed5581723ac7d0164fdbacd7bf23bfe4f194c14ef778bbb94e9d8fcfc77552733c39fbae93eb08736a26d3aa81b3f92203ea4ad5b44d3a5 SHA512 ad42f2a37d493e37dac25839c6ea4b5137fc029ee3fa34f435e74230fbf7687e6e7a5bbbf8ae607539a2655d60e362a975bc03b8d1d263203229407bd3353107
-EBUILD bleach-3.0.2.ebuild 778 BLAKE2B ff482e6d64e1e7f4cc8fa0b5320a2b57e08af3265550c058a727b14c2dfb4c29867e15ee6fab35f62ce9cea473b9b3f2314d42589423e0a8ce06f861b28e494b SHA512 f5b7450577a950903694728660c14a9f54b2881a88c7902cdffba6032fe741458f0e6f5ad0179a63bd94e51014d993d89b3309a8d4fb8dc00c60b67e645965ab
-EBUILD bleach-3.1.0-r1.ebuild 678 BLAKE2B 3d31dbfaf3c133388981b918e906d6c51cc7f275a1abc478a3474922bb21d0de604d654a41701b5d9fad206aca6634e3086aa6ef3d6dac4f4a6d589c2760492c SHA512 d1b9dde750c51156642a95235fd71aba77c9b15a77ca0fac03ad37e6549f645c2cb55d5e571a996bb305aa3d06ebe273bf8c88f2abe73e2331cffbeec08393fc
+EBUILD bleach-2.1.3.ebuild 802 BLAKE2B e9dd14cbea9a018ec02a6a0b109f33cbf021c45492d58b3dd73b52c0caff89bc4ac0c18e52b3b663462cb9cda03ea88d9136bb84c000ea0254ab48f18f0a5a63 SHA512 8e112c2e51e234b75d01cb9efc3fad8a6b49d85464500dda292b24e982566f76f199e187fde450c3c941c7296d00dc86a1487d770c8c87552bee94c91b85265f
+EBUILD bleach-3.0.2.ebuild 773 BLAKE2B 5110c24c3fd4f6da9a6fb35e3dea2bb40f8f36872efb04bab6b207fc37a851fecfd3d7807e5208ab23732c50dc9222bab9615d0fca2601e134fa9c465d6666d2 SHA512 7b470c9b33c3f0ef3f86e55fac8482127bbf5bcd8a23b7790f23dac78c0baed6d6a4135d2c6dc92f65ec4d64c557f63a31e71b6a9958b7a9448f20e242c45581
+EBUILD bleach-3.1.0-r1.ebuild 673 BLAKE2B 6e38dd14db6cf0b37cd213887cdbd80b85f54d8a6eaf6381f7983d5129d47c234e7f30deed05d7b2818e2a9eb98c1cc68a5e0b4f1b7211b211f539b808d6d783 SHA512 eddbdad07822184128323bd2478708762d4ae590b5375367f95967a795c6b35053d8990a164d084b542ee3c4188e80b1ec8b992b3245918e98b411331e865918
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-2.1.3.ebuild b/dev-python/bleach/bleach-2.1.3.ebuild
index 4179e03e5468..b2cb3060f12d 100644
--- a/dev-python/bleach/bleach-2.1.3.ebuild
+++ b/dev-python/bleach/bleach-2.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bleach/bleach-3.0.2.ebuild b/dev-python/bleach/bleach-3.0.2.ebuild
index 7be0f325a316..92887bd8f5a2 100644
--- a/dev-python/bleach/bleach-3.0.2.ebuild
+++ b/dev-python/bleach/bleach-3.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bleach/bleach-3.1.0-r1.ebuild b/dev-python/bleach/bleach-3.1.0-r1.ebuild
index 51c292c42449..e487450fbfc6 100644
--- a/dev-python/bleach/bleach-3.1.0-r1.ebuild
+++ b/dev-python/bleach/bleach-3.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
index deb9565069d8..4b7736574259 100644
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@@ -1,7 +1,7 @@
 DIST blessings-1.6.1.tar.gz 20122 BLAKE2B b2158f3fd538ef8641438bce7800efc9417e9febec6509d0e11389277b02ee03e661fe70198176a6a3578c216aeb4a6957da28d090cb1dc2849efff135cdf400 SHA512 7a4b051e448cddde7e8ce24106ce0d5d893eb442b19fff04f9ddf28381dfa1b4bdd4be79b87782162b2ead13597a346f533edb944130f2e5bc39aa936ca48db2
 DIST blessings-1.6.tar.gz 19974 BLAKE2B 5b454c7199c637f9b8d4de69a92b8137e65b925898064f31dabb56bf4fd7af8b3374b7311bcd0369b668868bc2335ce945306c242c1bf58d6d7d50c09150c017 SHA512 5d0fc365416bf2b36b6de72f6b8c01bf0ab8df4a0148f492c80056a9ebd5d569e9c01966481e0d70a25add16da2bc3e73be933226369abca533ce019f97479f2
 DIST blessings-1.7.tar.gz 22844 BLAKE2B 3694d3e421416bf876265fd0877240b2e0d61e8c58dfa63a6e74dd2f5efd2307cc4a0eef0e825adc0c0f37f6e78e15640362f9477c0dc5c89846416e16f180a9 SHA512 9b1e3eded3fa588c48898d88ba466836be8f25264ce908a2289504e8f13b01315ae1686ee34c0e3a44cdd2bf73da8c1b65e0aaf49ffc0e5b29c412a497c3d76e
-EBUILD blessings-1.6-r1.ebuild 822 BLAKE2B e89d4f48336af12419d68baea3de655f8ddc059309ec2cbc74155e414572afe87de067d5060f971cff0bb535ea8a232e7b9efcddc799cff8ca0ffc33dfa0bc00 SHA512 a748f0c3423417cf17815dea5c971f245686e8992400ca8df8026d0a1b0edcaba42750feadf5d4c84dc3f7b8c3aca18f91a1bfa9575c0ff835bba858d9d34f6b
-EBUILD blessings-1.6.1.ebuild 824 BLAKE2B d2aebd36cbde45570c6931754598c8f0f35daf933a37a3cfe94424d9a3fa2fe6db3e4bb120fa6d9373712a8360d89c01a601f8fac5d72f46e36360b24f536500 SHA512 184e176470f8c0a87843c91b874aa28d806f9e629d4e07dd5eb9efa69968699205478c0a4bf040600642d49c1734b6108d37752e160fe32a691fe81e8632b830
-EBUILD blessings-1.7.ebuild 1149 BLAKE2B c4204deeb4001f568159562cf60f7a84aaeefe2707ef3f832e0c007056d22127ab8e1eabf9fdba34cf8f22fa1c3fc74795a2496ca5460ab8665c4e88818941a5 SHA512 0b28878d2029912adb100e4589f87506211aab7d311c9cad40618812c2b8e721c09f0840f3c418fc135bd52e1c2609ea00160efe91db1b8a43d3d19381378f7a
+EBUILD blessings-1.6-r1.ebuild 818 BLAKE2B e03c3d796bcd157ec7c86f742e846ff28bf36d65fa6da5748eaa2a2fc6254e737799429cdd52822cfb73b7a157ab8b7610cbc49d6581e163d97152b1745662e2 SHA512 1f343c8cbaf66103a22b519413e3808176a5be04c9e764fccf8af11921ee406de9d2ff399af40da9574379c444f3f4cfe5a7a9c8cf056e28b49a78047f63a6f8
+EBUILD blessings-1.6.1.ebuild 820 BLAKE2B cfb8a655d6c03b5ec86bdb4b0f9e4dd22d93f6b85727a0a79091ee3165db6ce6ae780d1d9a2b85d17e7a16561f84dc1de252d4f7104fa81f4da04869cf064890 SHA512 c33c310c156e0e4509ef2f4f97b97298c7f430f98c517d90603f64e3ef4e2324403fd9d6577af136c6ce1683273d750dfd85ff8104f82293df57d955f260d695
+EBUILD blessings-1.7.ebuild 1144 BLAKE2B 8308443f19582f5e42a081910b350695c677424bfd1ca163452c084c53518647057d7a4951c5b740ca54000e9f28e485bd66f136cbc48a88817c7f88426c53b5 SHA512 9ffc5de306febf8b517f4086fa6d05e87dc52579c42f788e90cf42897cfe1daef0d224887e80bf8675b9ac4eea8a3beb69bbf1e9f106e2d7da887842b84c03ae
 MISC metadata.xml 450 BLAKE2B d5969d6f857cb2ef4927505a351baaa6116bc3b85c1e54a1afd031cc903909ababfa7fd76c01fc9ee4a4bb6ff33552ab984f902932bd8772f11ec931f8fa99dc SHA512 8851fc3ed67dbdbe0efb8fd1712101644793086e6d84fe52fd54d741d81f4c30bb666e1aa82bfc111e2f264e3a238c6059d8be6844a05819b285cc913ade0231
diff --git a/dev-python/blessings/blessings-1.6-r1.ebuild b/dev-python/blessings/blessings-1.6-r1.ebuild
index bb2cf62a56dc..76477c0821fd 100644
--- a/dev-python/blessings/blessings-1.6-r1.ebuild
+++ b/dev-python/blessings/blessings-1.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/blessings/blessings-1.6.1.ebuild b/dev-python/blessings/blessings-1.6.1.ebuild
index 2dce525e5a06..e7023a9a4998 100644
--- a/dev-python/blessings/blessings-1.6.1.ebuild
+++ b/dev-python/blessings/blessings-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/blessings/blessings-1.7.ebuild b/dev-python/blessings/blessings-1.7.ebuild
index fbf53e5d1e90..3abd1eb700c7 100644
--- a/dev-python/blessings/blessings-1.7.ebuild
+++ b/dev-python/blessings/blessings-1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/blinker/Manifest b/dev-python/blinker/Manifest
index d0dc15cf1d20..ced462c14810 100644
--- a/dev-python/blinker/Manifest
+++ b/dev-python/blinker/Manifest
@@ -1,4 +1,4 @@
 DIST blinker-1.4.tar.gz 111476 BLAKE2B a9ebe32bc01f7f08a5f180caa3d3830eaa10b7c0499c11ff4ceb71ed604f94dfbe4c783cc7409a57da28d6d69cc49d7861d05401802f86d054bdd2501f36cf60 SHA512 2f5f71b05c7cc27f5761ba698b05c78c8a491f5285c120e532d24be0c8256daa14e075f3f30e15fb18e7c3f16579af9378a155d058f170e3af9ffdb89e49f56e
-EBUILD blinker-1.4-r1.ebuild 622 BLAKE2B da1d4f442e2dc037dc08a4235a0fb96513ee8347d2ca6af8b8c773ef83df65d6a13adf7db9f93f4ad1936a723581ff47ba4c48c2eb63aefc93ad86e565ef4565 SHA512 519c2d24cfbf859deb196d5652cec11bbcca61d020e1d4e1e978c302c270a37c083ad734febca235d4d3facf3d0a36ffa43c486eb6ba3386e84f3e71490669c9
-EBUILD blinker-1.4.ebuild 745 BLAKE2B 82d6a9a6688a566febe7ce0a21c4bc9c74d45f9f7f4b0562bdb65b6025fa2ed52f3e404b0200d754284a46ea5fa8fcc37689cb1f6a5705e10f8c6f7ae9da7ffe SHA512 30875ddd34992a2d0dae39787c96bc0a44869dd875e9e9ff57a1008a742323c9687761fc9e27e5dde44561db39599e922f3050677d6286a075608cf35b934dcc
+EBUILD blinker-1.4-r1.ebuild 628 BLAKE2B 2316d0b8cadf9077d61cc8acaf679cd05fa804b1151dee124a03187bdabf482f753afa42e98d6f974770a82e61a1910934999bb6b8c5987821a40e3c5b688772 SHA512 ccab17875767363c0cf4f4fb3c63811afab312e327f893d0cb4a9a34fdf37b6af0cac1fc1024dcac83e064ecdb7cc51319d970af9ba52c01d10631242ab56ef1
+EBUILD blinker-1.4.ebuild 736 BLAKE2B 4e8b9fa7bfaf6bbdec27e2c5f0425eef90acdb16b5af566c4c1adb854e17e15b17de763c38a4ed7ef349dbfdf90f1b3a0005b78591f20eb4389dd5b00073f258 SHA512 8295d5c78bcbc93b0e7ea84c6a33f4262f7f1993bce15cb2096809ca1a68cf60f53be70f1aa328d15ef7759a8e41fbe3c8fcfae3d6f3bf3471c35792a57d27f4
 MISC metadata.xml 310 BLAKE2B 4300b6665f80282364e473ec1113f6cc1a2f33f81ebdd4c9a070a7565cd10d83026807ac49472fbbd0c09df5b58eeb18c407b3487a7de8780149b14bdcc09c0a SHA512 4712a1a048dd03c070785ebbefb637eade345c4959994d74643f9f521ebbc3c5477e38ad7628de967c13ceab3c906fd54db6322f8a32a43a47f3223cf8783250
diff --git a/dev-python/blinker/blinker-1.4-r1.ebuild b/dev-python/blinker/blinker-1.4-r1.ebuild
index b5b1c2498da0..e08f1ef6814b 100644
--- a/dev-python/blinker/blinker-1.4-r1.ebuild
+++ b/dev-python/blinker/blinker-1.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 distutils_enable_tests nose
diff --git a/dev-python/blinker/blinker-1.4.ebuild b/dev-python/blinker/blinker-1.4.ebuild
index 824e7a37f9a0..0faf7a1f136e 100644
--- a/dev-python/blinker/blinker-1.4.ebuild
+++ b/dev-python/blinker/blinker-1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 9e96c3664c02..002166af8cd3 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,6 +1,6 @@
 AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 BLAKE2B d7e44b823390b6338bdb2d33cbdcea1ce3785adc0c6ad2b198f4157336ee2f823f95023c0eae9724cb695fdf8576f754430baff5bfa2a77099649991f72ccde9 SHA512 08273d2d3ed14a88082ca1c21b9eed73bd7e878473509d2d00eff89f0be1b15441e9d60123f41f29afc7752d10a357a9457100ac2cc0f8f9daaaf76bdd24f659
 DIST blockdiag-1.5.3.tar.gz 2704391 BLAKE2B 4d66263d63c73607a9f1e180172be49d25ffd042fb5ab088138dec542a47ee3e68c99442713f32b004ec31ca608686e495d3ec9172f8ab8b074d94d111733144 SHA512 11ff6334d1ae50c103158db6ef9acce76116a17cfb8e0066581c234138f17fabfddd183b154f407fe95dcd414b0054aebdc22682e82a8e7595905f1ee2fd6222
 DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
-EBUILD blockdiag-1.5.3-r1.ebuild 1640 BLAKE2B 183c16c9e4a4a0108a0555cef7ef01625088ca2d08d57e53b79784225c737a96eeb8f89587dbd925f97c834009f1f21dcb6ea2384338759a23ef5e47bc014da3 SHA512 1c0128479ab2526c398519a1ff5fbd19dcb951660744199db5346c761554f3cf842d47c13b64e3fd36db90f9cad37a5c7022f9ca52b4b6da678742bca9e97bfc
-EBUILD blockdiag-1.5.4.ebuild 1828 BLAKE2B f0074666a517f90264dc140ebba439eb93fa056cc136f91c00fa92133f61ce0b78f81f025197285e91056f9a46f917f3624cb7d4a6d346d2494334303acf8b79 SHA512 30081f9558183db8fdeb8f73c68653a26c3339b88951e56b52f42f0ec40f063747041cd08f082ab18e9e5cf867a4ab2af705137b82f52088df3e93dc0c5e9724
+EBUILD blockdiag-1.5.3-r1.ebuild 1636 BLAKE2B 64d297dfcfd17b9db20aa36c0944569a77dc67cb49e81e76f27e9986db56a03fcfb5ab9d6fd77cf1a71032ac675859f32b954820e8f37d6437d47b8c62cb625d SHA512 3f4676ae297ba078ba32e7f27da78ba91c6f74579bfd364094f3eeb33d0a61fdd1ff485cfa00064c35d99ddfafc7f3e5b27b94a4473fce8bfd596c6fad76824a
+EBUILD blockdiag-1.5.4.ebuild 1828 BLAKE2B 33e3d02b392356e6ebf422a2c94243335a4bd145cad3096dd6221833389e6991e1a47786949fa1ce862f14c5962efa1b9a60bdc9c2d199bd350b80320fcaea96 SHA512 7002640bd2b967a7bbd596313c00c9ef99766043ec0f18eebf07b5cd4c1adff187436442a1194d889489c779cbbeba087faf06adab5afa7b1b0f3749998f4644
 MISC metadata.xml 752 BLAKE2B 25048231ba8066a856109d0c6e785430481522dbc610d00f4fc08e77c09912325beaff486e79b0b557a81db0ad8f89de256b775cbee12e1add2e4196b0f43b97 SHA512 8f6aacd0a990cffb868162f374ff541a3d24cff90ef4e2cf7bac5a0b0062a8c82577e5ff71fbfd8b09dbc4f21d200c37d239c100755605e4d66635b56b8a754a
diff --git a/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
index 08c5adfbe046..8a137320716c 100644
--- a/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
+++ b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/blockdiag/blockdiag-1.5.4.ebuild b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
index 56d9d2ae83bb..88a33caf9ca2 100644
--- a/dev-python/blockdiag/blockdiag-1.5.4.ebuild
+++ b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 8ae50532c422..342ae216f300 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,9 +1,3 @@
-DIST blosc-1.2.8.tar.gz 259299 BLAKE2B 2d0945ba30ea2a112d51e6f732366d18533ba7e54a139150d03ccd76da0bb8ff8de7da86eb29757ed9517f1041df2ae6853e0b99d100593091228f5f407f18d2 SHA512 8349a7b401e3b55b066efa4d647255dc7bc735a1de0eca5e33b2deb4ca90e317b90d6ea42433ed06f2680bccb2198e0e4bbdbf5a0fd1c22db900aa896c88427e
-DIST blosc-1.4.4.tar.gz 613097 BLAKE2B f382f48289041e4b31b1f59a99e11bcbdda71465276a5523df04923de1d4db1af3b45eadbf73e1fa1498f950951d9ce3bf87ca5c013de254c1e6efbd95112dc0 SHA512 0a7da71086eda4fb7851a3ad1f3cbfe231a9b97d0177e6cc085f2b600d33ce0a71cc361bcfd682a526002465d375e89b7397270953ecf163db1922a9d51ac8e4
-DIST blosc-1.5.0.tar.gz 617120 BLAKE2B aff52df1af6e9653aa552230a3f311d2a3b3d67ec2319e57e48eedbbf83e71a7fedd0f4d8c719092fa688dcf4d5d482aad25198fbe56386769539214a42bc8e5 SHA512 75121989880dff6c2ab9142b02ccf45efac9eb442e4a3db42099047f1f5b86973ec5339314d867c3213ebb10fa883d993523a6469b3a3f6a230dbdc8a6ba03f2
 DIST blosc-1.5.1.tar.gz 641172 BLAKE2B 2305c8a4b32192393182306c1ae074caff1bab28b7c842c14f737354c282aa30ae1f9d6cfa5c4932832c505a9d1eb1a579cd2303d1800ae42e52fc58100ca99a SHA512 76d8c5d9e0e3485aacd5646970ce62e34d6ef3ff04e134342544ab044c4d1925a537187b4ce8b7ef3f6cd327e26d47dbdf1bf04233186a8baedbc7c839071cf8
-EBUILD blosc-1.2.8.ebuild 874 BLAKE2B 7d850efbb7668a9a5ab826cdd59356ce876be102d9f3e5486724e7bbe91de426b2185f1d884c500874fd224e1c3ab7fa12803ca2a88a8ec69f125444ab8f81cd SHA512 3186391ebd3d34fc478efbf9e2abdbc8c976aeca78b87dc39dbc00a3e483b30ca1ba251c715662f59e7aa664691318ab08c585a783b1d351b5ed4feaa1c26674
-EBUILD blosc-1.4.4.ebuild 749 BLAKE2B e07247ef3c1c0177dbe018d5dab887effe8e4c188192b61914de75feefd0232e4d96323b40d08bdf8ad3543bd9fb05141e8737e88a33f96eea590ec2682dc726 SHA512 79fb8c02830d30055eb9c6d89800dd8a2e8a85f7004051dc92fcc266f14e1350bdb50e7185dee2bad068b5dc831c6673f2a252341784d83d855f1b727d006282
-EBUILD blosc-1.5.0.ebuild 816 BLAKE2B 9b1e2e35ee84b07668592311bf4b486427b40b766470d566907f188ba2434044f263eb9d7d5b039e26b5a896f92fdeeee79be8dc0e682b62413e095c1eba40d3 SHA512 c8a3f846805c2d70453b7a8c9c76995760c255e59ca8f6addabb4e779a4d9465fa799e4f27cf09b075a707a68928cf7b64b0212204a555d9071cc41964c9c6c0
-EBUILD blosc-1.5.1.ebuild 815 BLAKE2B 42c9f580638fa6215fdd0ab505bde6958a82dcadce8f90bbd1d97e6a5509936942172629e6809666372965aa0712eac1fbf52e42304a5c17268b37eb29a213d9 SHA512 aed66153a934dcaa806524688f510bee73be8150e47d5bc4cc0f37961c5b5f0d7689c814a5732b5270b6498e5ed4a06e1d49bc3c0b82406e6f7a2dd4930a2b6b
+EBUILD blosc-1.5.1.ebuild 815 BLAKE2B 533c2b70d38438e8a19f3e3f55f6bedb5219dd1d4e8096454ad69f6b087eebe53e9006457f739843f7192e34a6f52994238bba7c13ac1ee10baf9a074c076acc SHA512 71f03733e6b3bee1356d31841d83136df185e88e403b900e93a98f09987472716503ee6329a46259482ba29bd6afe0aaa754550fe6d0ec0cc524b453bfa897ac
 MISC metadata.xml 891 BLAKE2B 2ed113aa84063255dfc15d018340cda188c9441a252a4d5c86f1821d5b7f16df6084a4469f05bc7cfca16439538b7d2f5fec105ac709aa9b056c537d8840edbc SHA512 e4ece5eb12f91e4416a8a685260f6bfdfee12ca64b7f2ad4ce0cdaa81287a24b1f51a156c7502b1e16341088743d7df9fdd36aa9095ab9d02e0bfa28536bb9f5
diff --git a/dev-python/blosc/blosc-1.2.8.ebuild b/dev-python/blosc/blosc-1.2.8.ebuild
deleted file mode 100644
index 707d0f3e7382..000000000000
--- a/dev-python/blosc/blosc-1.2.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org https://github.com/Blosc/python-blosc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/c-blosc-1.3.5"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# remove forced sse2
-	sed -i "s|CFLAGS\.append(\"-msse2\")|pass|" setup.py || die
-	export BLOSC_DIR="${EPREFIX}/usr"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	nosetests -v || die
-}
diff --git a/dev-python/blosc/blosc-1.4.4.ebuild b/dev-python/blosc/blosc-1.4.4.ebuild
deleted file mode 100644
index 2fa9aa3ba29d..000000000000
--- a/dev-python/blosc/blosc-1.4.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/c-blosc:="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	export BLOSC_DIR="${EPREFIX}/usr"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	nosetests -v || die
-}
diff --git a/dev-python/blosc/blosc-1.5.0.ebuild b/dev-python/blosc/blosc-1.5.0.ebuild
deleted file mode 100644
index 5ad73fe18ea6..000000000000
--- a/dev-python/blosc/blosc-1.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/c-blosc:="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	export BLOSC_DIR="${EPREFIX}/usr"
-	distutils-r1_python_prepare_all
-	DOCS=( ANNOUNCE.rst  README.rst  RELEASE_NOTES.rst )
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	PYTHONPATH=. nosetests -v || die
-}
diff --git a/dev-python/blosc/blosc-1.5.1.ebuild b/dev-python/blosc/blosc-1.5.1.ebuild
index e67958e3439b..646deac156a5 100644
--- a/dev-python/blosc/blosc-1.5.1.ebuild
+++ b/dev-python/blosc/blosc-1.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bluelet/Manifest b/dev-python/bluelet/Manifest
index 3b6b993da2df..a0fe317a17e2 100644
--- a/dev-python/bluelet/Manifest
+++ b/dev-python/bluelet/Manifest
@@ -1,3 +1,3 @@
 DIST bluelet-0.2.0.tar.gz 14182 BLAKE2B c05560f4cd1b4aaf3f25d22bbf5eabfef695cb1686742ae274df9024786ca08a4604ec9a24ad185718ad8d8876f8b5fb12df0f45cdda5b61fb6fbdc8fb09bcaf SHA512 58bd8df4b61f23a53f9310b68e5754155c00d598c9bcb7724e90ef6722ee5d6017751c2e056eaaa64cca71b89c391d248c14477457f30ebf2b28841a3fdc98fa
-EBUILD bluelet-0.2.0.ebuild 582 BLAKE2B 313b1868bd3c7e0c58f2acf2b0f7099d43f9f3f1d9c772497d8a0465f2215c8ca085d9344dc751f0d1a1d24589bc89482aa339133f8adacd93cdc4e265f87ecb SHA512 c10dabdd40fa23095531bf40f8923144e47c1608a9cfaabf1ea250f9a9972c8ad113fb0aa6609196f50c1b677a7e084868c0853d2e0910c9c1769dd68d515d49
+EBUILD bluelet-0.2.0.ebuild 578 BLAKE2B 12fdae76626b2a1f84130ea5daeb56673d89e3775dfbb7a680824b3fbd76617682545dca8d018438f34b41d13f9ca65dc9033d411cea6ccdc3555c2f9d968a36 SHA512 a0bace83e403cf6999d0d223a6dc97f0dc0bbfd6274909310900267e0eb7bf7976e1494b79bfb7063aca4d88c46558db198896bc5ff3ca3a95c0fe4af26b7f12
 MISC metadata.xml 969 BLAKE2B 64de2c903db588aa64c305a35d712d4a8905051cf021968081f39ade06cb393ef2028f96401259b359497d0acb422827f640333485bd7f5ace79a6fca7ab782e SHA512 98ec10adf32ffc4b2adcaa10f08e3e8f24e06aa22b66cb9a372952583153688349b11bb99654b8c53901b073085dcfbba6fe11b943b6ada86116d36163b89908
diff --git a/dev-python/bluelet/bluelet-0.2.0.ebuild b/dev-python/bluelet/bluelet-0.2.0.ebuild
index f3760dd89a34..bdd2fd1ac734 100644
--- a/dev-python/bluelet/bluelet-0.2.0.ebuild
+++ b/dev-python/bluelet/bluelet-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bokeh/Manifest b/dev-python/bokeh/Manifest
index 6f28f01e0b20..8e39ebe8a065 100644
--- a/dev-python/bokeh/Manifest
+++ b/dev-python/bokeh/Manifest
@@ -1,3 +1,3 @@
 DIST bokeh-0.12.6.tar.gz 13720124 BLAKE2B e8fc1c42b530622bf6de8e13e81ae45e6d47985cef1ed81a2e32bfaef2a246a09c25210728cf434da6d4a0ef8f47ade1be5ee9e9318cc0a071bff36b317069a1 SHA512 7a293169521b690bb2cdcefe3667f869e75f2b718d6122af63201e2fb2e530eba931b3fa2ee3474a8ead758039cbb7d756acc0349e2f0820d72a4f754b9301b2
-EBUILD bokeh-0.12.6.ebuild 2148 BLAKE2B ffa63e562003c1ba6a5581808152acfa4d91c2b0c859a89a75ec305cc7f538d4d1ea13a4470a2d50d983de71f5b3f34028ca16e3a4aae09977e2d7d4945c6228 SHA512 4b2d5d557cc57ea144f7bbde8208f2fdd1ca23a1057132b520a41cc79d580dc45b69958ef51882f7afa58ba0b5bdc0785919dc22abbd188140a6d3beaf1fca64
+EBUILD bokeh-0.12.6.ebuild 2144 BLAKE2B 9e1c3fc154f77a52c47725dacff05566abb751bfd417da15e727201df08be10a347ee28f0a8d444d8d628036348b188c67af8811cb59a0e19ed0e7c6fc53cd2d SHA512 bfff1bfa9b32bc6c332edd3d5e640ab0c3b412327aff3ec1048c74bf3cc314f0371e1f138e3577e4ea63cc16a0b156d9b30ea157b69c25e2c3c3d2866fb1e967
 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
index d29d9e8ff984..5b9856552d95 100644
--- a/dev-python/bokeh/bokeh-0.12.6.ebuild
+++ b/dev-python/bokeh/bokeh-0.12.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
index ee65493a7560..13544a03320a 100644
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@@ -1,7 +1,7 @@
 DIST boto-2.41.0.tar.gz 1440323 BLAKE2B 9d72fcd09cbf57d22dc45d42699af8cecef6f2c8e4009c9d70b54a9b84e23801ecbb5f7bc484692ca93ae302793b4d2f511c1209bcd33d0703a39b809bda1e00 SHA512 ffb503e8f7ec84ec973e109ae9524e1db2ef5f34d9424c380eed9a85871f07f8c9c798ca358fefd772ff45a72226bb02eebbbf6ab2d56b2442c41ede736f6f5e
 DIST boto-2.48.0.tar.gz 1461372 BLAKE2B 0069ddc6def7d8698471bd66a5d8d4b62d49f49138036b3ae6a9655e7b7432af5449f2812e83f2012be2f01e93a61d9608157c9fd4ea0a52f8801e31877a78a7 SHA512 ce8e302b059ef31e81078ef21999b96b8770d2ef0c70358624c8cc6a79b1a43a78e1c206cbcba50eafb9c964c4eda5b9b0b127ea9523dcf7438453b4b2293f9f
 DIST boto-2.49.0.tar.gz 1478498 BLAKE2B 6a897ea162f5f4bd34a2d488a3e3897f7f2f5b8707dd0922c01b6a0b90ea577223bf3e588b6685bda1f2bc0e92af426711fcba67a70377183465a530065c6c84 SHA512 2175cf30cd25bbc05812e83e5ade7668c3e21b1bb09aa1b43f0f0ac7d6967a646394fb52c9be673ebb65618c5b33a52d6f31f6da702f5cd1d6c9a18169476dd4
-EBUILD boto-2.41.0.ebuild 1402 BLAKE2B 7f769e6d77cf1e65c804eaf723b6bc4c18f052c695a2e5acadaca36fa55a29b16f7837cf89e695d03d25fa45c260f179f233e646f0a10ce9c88a096811b82b7f SHA512 f1f33c9eca24e2e02aaa71b8cdf4ba32011c278a00f927842822d0ea7a4d2a8c0b3c0754d1a300b3819bc3594c614c6f554f545ee568e4c748ae33124cbc6d66
-EBUILD boto-2.48.0.ebuild 1415 BLAKE2B f7ae0768ae73745cf8c3ce2cfdb00752cd875aaaafd4b195c09111b5d889f70c9ebfc69c396e3f5592d43f0bf8bc25137b6477cd45e032106f1bef7cf0e06d06 SHA512 2d39d0cbe80133c9b3e56aa7425cd4b7aa4d4fb953bc5d8ecff64ae735b15e6790d672cc534d29a055448da417481becdb975ac1ea25403bb614f71be48f66d5
-EBUILD boto-2.49.0.ebuild 1413 BLAKE2B d7efa99ec47b565008d24ca22bede371b4085d9a2ce757f98522a6a43bce6883ce6c9af3bbf36ece8db7dd0ffacc9f1e10b90af7a94d9b9da7f23129d1a6ee1e SHA512 f77d91895ea2bc431011694fb49355a18942e4fcdedb453c8ed5d3850dd7c460945f22a4175f9d48ce87af799f8c9aea4e516a8ab325beceb1d6832abd532191
+EBUILD boto-2.41.0.ebuild 1398 BLAKE2B dc18f937aa6fca1cd6096882f76dd202671a19bbbc8b89e789259ef87064cf75006a15bcf222264c0d9839ec4bf07bd0196f00a2fb712f2fdd74374b7f09ed6d SHA512 825bcf8f298314609a096c076e545963e27f73c159888d32f18f52f17b0206e4b8a0a62f2321011a3531a0e0103464892098b5f8091942614042ee2bc2f04d83
+EBUILD boto-2.48.0.ebuild 1413 BLAKE2B c2f6441ffeb10d57ef771a9d18ef1cde1445a6ebaff3d508a57513d6ec2d9cc18c8fc378089b85a5c00430f47e96e788fc15c5789da2f1b76afa7a38c4fc9556 SHA512 6067e8866608efbee11aa8f3a57786921638c7220a30a728dbe600a711c41aace126de4240dcc79c08796e260090282eccf50deb472f1b94679600c309aac3f3
+EBUILD boto-2.49.0.ebuild 1411 BLAKE2B 04acf3b642266c405a2a7bf1933d6d7951b1f3799003d0019a3ffb676d40ec9d00708b2788577f466888df5b47c0dd9ba3133aac01e457148275cc540cf86aa9 SHA512 4d1c4e27551dc8ca4d83b377afb05d13dedb3590aed9d26864f1cbf9372db0074b067e207d879a53e3d42ce346caafac4c7a1bd4f7feefc5d30bfcc2a0ce7ce0
 MISC metadata.xml 419 BLAKE2B c6c19e4ba3ecc5a36b535267b75cdf3afb7317e577e8f0899d43a334632633d771b5e5216517537616cc99c7766a852d2b4c5b132e174f8481d86649253e0897 SHA512 ee5587224538b14f67c30eda60c161e4c07c801c4b4edb24bcb0350e17c4d655c4d9a6907ebe5913d7689e1b6078ef25f47b4fe0a7c655cfa8d5ea775b4d0329
diff --git a/dev-python/boto/boto-2.41.0.ebuild b/dev-python/boto/boto-2.41.0.ebuild
index a47c0bb07347..398b42145329 100644
--- a/dev-python/boto/boto-2.41.0.ebuild
+++ b/dev-python/boto/boto-2.41.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto/boto-2.48.0.ebuild b/dev-python/boto/boto-2.48.0.ebuild
index 23aa3a1ddca4..b269ce78a621 100644
--- a/dev-python/boto/boto-2.48.0.ebuild
+++ b/dev-python/boto/boto-2.48.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto/boto-2.49.0.ebuild b/dev-python/boto/boto-2.49.0.ebuild
index 2dcd97359a2c..ee6edb1fe34e 100644
--- a/dev-python/boto/boto-2.49.0.ebuild
+++ b/dev-python/boto/boto-2.49.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 372c55d2922c..4349f82d5b46 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,8 @@
 DIST boto3-1.10.2.tar.gz 272071 BLAKE2B 9c3b90ae751784946a84d0cf31ed0111526ed97b5be1fe5f256f725889f9819db632c6e6f217e3f01ebb0aa5594257a5bdaabd8dcc5f14ccb5bdd333b1c416c7 SHA512 37ea11f5ae9263aa5e97ce94f2834c987190ba2eac4a60bf9312bb643f1d204e48db7bef6ddc0d46ae124109ec6807589108b58f3024485de163fd8f83688b42
 DIST boto3-1.9.122.tar.gz 258061 BLAKE2B 68903edd97e10693675e4c2fa77c2c54f2d3aab79307ee0a856f43aabe256f7782d027b0a23f433c593962c90f7364c26a87c27fe8770e67b5052e4ced73a9bc SHA512 31b8d8c2369b9076d825196d400c8a8b5579c38f87c7f41634eedbdaf6c2be01072018312e90e25d81b850c51f7c22a13fa565cd4e8b7672c238bad61e6a0810
 DIST boto3-1.9.4.tar.gz 237313 BLAKE2B 20ab73dd02864b455a2bcc567b6303ef8b0503c4dd80efb442bf7ad8167329c938dcd41cbc61d4ab50fd02cbf8758c10aadb9b13d9c795330fe1faf9a1f7352b SHA512 7f0eb3b5537aed598d75a05474439819dee8c0030dd1eb685281e963ec465699ff9120394170f1ac7b53493de9b8702ec789863839eb3710ff3d60e2dfc1f1ac
-EBUILD boto3-1.10.2.ebuild 1252 BLAKE2B 905aebae0e3a983784220fb2299005621a2e06fc2ba69fa5c985a0127d39c0fefdbb4b5be468ff6e920156f7ab3d96d49813b638b09d68ca2771e5521a8f801e SHA512 5e063ed9df0d429a9f8bd284f87375fc89635fde3e1a870cc4e8ba372bc11c6735b8eaf3dd45f784da47ba2511e524ad075f02f09ba16f6b98ef660b18816d10
-EBUILD boto3-1.9.122.ebuild 1250 BLAKE2B 32354354575cc0c09ca8fc0cc5c049a005852587b177890674da9fbba9f8581e9ccde072efe9beb2ba87414f51b87bd9d8bfca042bd7c5c9c24e7adc1dcb8cce SHA512 b06e2510d946cc3cd90652a21ae67dc320470da92279f6c4fb39acef98004db2a8b6f6e3f9fbd1a9001cfee91a7b7bf8e7d35ee2777d2731b0c7dc379705aeb5
-EBUILD boto3-1.9.4-r1.ebuild 1250 BLAKE2B 32354354575cc0c09ca8fc0cc5c049a005852587b177890674da9fbba9f8581e9ccde072efe9beb2ba87414f51b87bd9d8bfca042bd7c5c9c24e7adc1dcb8cce SHA512 b06e2510d946cc3cd90652a21ae67dc320470da92279f6c4fb39acef98004db2a8b6f6e3f9fbd1a9001cfee91a7b7bf8e7d35ee2777d2731b0c7dc379705aeb5
-EBUILD boto3-9999.ebuild 1252 BLAKE2B 905aebae0e3a983784220fb2299005621a2e06fc2ba69fa5c985a0127d39c0fefdbb4b5be468ff6e920156f7ab3d96d49813b638b09d68ca2771e5521a8f801e SHA512 5e063ed9df0d429a9f8bd284f87375fc89635fde3e1a870cc4e8ba372bc11c6735b8eaf3dd45f784da47ba2511e524ad075f02f09ba16f6b98ef660b18816d10
+EBUILD boto3-1.10.2.ebuild 1242 BLAKE2B ca7011306a68173ec6d6c199e1b7cb8d1817461006e2a6f51edde004e5afb24c11f0786bd5df275fb1543601bf45511c8266ed29607070ee7ad4bccf383cc7b8 SHA512 8165eac1060959022cc0daf8fe28fe9cdc468af70cbbb65f2e7d7ddc9bc646f3833f470f5be4c1a5ae00622b0dc3d37345dd2b01d04d8093a8f983780d712906
+EBUILD boto3-1.9.122.ebuild 1240 BLAKE2B e9abab01968d32f0e4e886677349bb0af716dc5e167d51500dc7eb2a6a427b49aa686d2aba1b410de8eb9df48ed30fb61586b81fc016b5a546a404db5c643b13 SHA512 0e9822cd104fddf1ffdfd3521b8d11cbca978fddfffd57f95031de2d2fad4dbf750cde5df70f034a6ac5119c3e06e03960836ef1ab297f799215e6ade29735ad
+EBUILD boto3-1.9.4-r1.ebuild 1240 BLAKE2B e9abab01968d32f0e4e886677349bb0af716dc5e167d51500dc7eb2a6a427b49aa686d2aba1b410de8eb9df48ed30fb61586b81fc016b5a546a404db5c643b13 SHA512 0e9822cd104fddf1ffdfd3521b8d11cbca978fddfffd57f95031de2d2fad4dbf750cde5df70f034a6ac5119c3e06e03960836ef1ab297f799215e6ade29735ad
+EBUILD boto3-9999.ebuild 1242 BLAKE2B ca7011306a68173ec6d6c199e1b7cb8d1817461006e2a6f51edde004e5afb24c11f0786bd5df275fb1543601bf45511c8266ed29607070ee7ad4bccf383cc7b8 SHA512 8165eac1060959022cc0daf8fe28fe9cdc468af70cbbb65f2e7d7ddc9bc646f3833f470f5be4c1a5ae00622b0dc3d37345dd2b01d04d8093a8f983780d712906
 MISC metadata.xml 326 BLAKE2B 0ee2d830daa48d21aa34b2bec8f8b9d6ff03edaffc6bf8f5b47c05b5a83aa0947e22651dcf9ef4d8153b3b0f21913069a77bcfb7b25f55a67c147938bfd6c0a5 SHA512 0e38efcdc960343f3b92fdfca7d91719b2b3b66969cd100fd8e0d53eab876e062ffe2cfb370b605881631f1077861cd6e0aa1b103477933bfa949d297193e109
diff --git a/dev-python/boto3/boto3-1.10.2.ebuild b/dev-python/boto3/boto3-1.10.2.ebuild
index 9a5496ae2357..7ade38cf0450 100644
--- a/dev-python/boto3/boto3-1.10.2.ebuild
+++ b/dev-python/boto3/boto3-1.10.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/boto3/boto3-1.9.122.ebuild b/dev-python/boto3/boto3-1.9.122.ebuild
index 383c97855e8a..7d65a1022251 100644
--- a/dev-python/boto3/boto3-1.9.122.ebuild
+++ b/dev-python/boto3/boto3-1.9.122.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/boto3/boto3-1.9.4-r1.ebuild b/dev-python/boto3/boto3-1.9.4-r1.ebuild
index 383c97855e8a..7d65a1022251 100644
--- a/dev-python/boto3/boto3-1.9.4-r1.ebuild
+++ b/dev-python/boto3/boto3-1.9.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index 9a5496ae2357..7ade38cf0450 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 4f57ffc3fce5..34be315c1fc5 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -11,17 +11,21 @@ DIST botocore-1.13.19.tar.gz 5653940 BLAKE2B b7fa4678cb62bdc1c0db517e537c3c6a038
 DIST botocore-1.13.2.tar.gz 5560942 BLAKE2B a46c72fc62bb776e4d462fea49d7010f45502c201d956ce5878fe9b8673cadf186b5c61e60bda5d666eb47454799fa53f40cf59d7f10246c79374132fc3d03e8 SHA512 ef48ae18c61c83b43ac435c9b9e3e7c69963c19cc79bb34c7541d5d823f952c022b1b7e4eb1dfa33dd9fe5c14c87f7cf72d0e9d17012984c9f10c06abe27d279
 DIST botocore-1.13.28.tar.gz 5881818 BLAKE2B 9ec33e256a1dd09be0951e880947eaa9394e538823458859d6f44516b278a144337fcfac1cbdc6aa87babaa7c177aa936bbf3587ff7ff94a228b34f99557701e SHA512 3c6ffa5389639643d237c6945942add1aa21f40419a31fc8bdb06532505e7d5e273afd6616705fce1d46ce76e997b9c3a6854876549b26020f1ee8a019c93a2b
 DIST botocore-1.13.36.tar.gz 6029078 BLAKE2B 83cccf74c368f9ee5292b8f880545582f220518491924d65991618a505649e795e89cae0f898c63e9b140afc4d2ff1a4861447e827d8a915e44412b7534ddbb8 SHA512 6b342a4a9c473a8c818b1de8fc799d746de9642b67d43d8da2e6eac8d4263b9300609359c22ea553c30dbe37ec64e8760934a5b21f8f25de71868cd88c4e1878
-EBUILD botocore-1.12.122.ebuild 1516 BLAKE2B 0b1d6fd8016c3aedde3ba6da9e3a782ca9e14ed3712f521cad7292c7d62330dec1fffc0fdfb1d9307a821077e476e5fc73f9a1573af0404d544db5e3b5e4b5f9 SHA512 a763d6c4e3f32f024c2e76a8f1b1d881d5af3725f403dc002b32d64e683a519ead55f0444bbff7cb59145376905d0fac1a65c03d7bae6ed0baeead0a57f70b70
-EBUILD botocore-1.12.205.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
-EBUILD botocore-1.12.210.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
-EBUILD botocore-1.12.223.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
-EBUILD botocore-1.12.251.ebuild 1515 BLAKE2B d42c1119b6c7c2916105da39edad73ac3062f32f3a27e3d1aca8f5f6dd7961b8715c4fa7e6d1b0748ab6b962fef93c656077ff9e95bf56775b99be17c47f601f SHA512 4654af4df7a49e0234ac637fc88c95b140b1df58be7e28bcc473ddd10c5d2fd912459efb4e9f7ba489830736206009456466ab85f196a99f0fe90015bdd9f6ca
-EBUILD botocore-1.12.4-r1.ebuild 1516 BLAKE2B 0b1d6fd8016c3aedde3ba6da9e3a782ca9e14ed3712f521cad7292c7d62330dec1fffc0fdfb1d9307a821077e476e5fc73f9a1573af0404d544db5e3b5e4b5f9 SHA512 a763d6c4e3f32f024c2e76a8f1b1d881d5af3725f403dc002b32d64e683a519ead55f0444bbff7cb59145376905d0fac1a65c03d7bae6ed0baeead0a57f70b70
-EBUILD botocore-1.12.81.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
-EBUILD botocore-1.13.14.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
-EBUILD botocore-1.13.19.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
-EBUILD botocore-1.13.2.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
-EBUILD botocore-1.13.28.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
-EBUILD botocore-1.13.36.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
-EBUILD botocore-9999.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
+DIST botocore-1.13.44.tar.gz 6063673 BLAKE2B fc13c068f1173789188ce0d6c7b51294bb4a1ff2a1ce4823e20481ba2ea7e30972161e6f3439a1047f135259c5f10fbe5755b9301682fca9a5c7c882b363386f SHA512 1720dd64bc245e66bbda1c9c7369f16f3870c6cb9f2908e6ffa5bc4c6c211acc5e922d45bee2c13dc44665e5b69738b920f15a02572631804a6625cbe82d331e
+DIST botocore-1.13.46.tar.gz 6069713 BLAKE2B 9d10fc46314f379ed384f2803d4bf43b10e73607e4f8d29a2edd0c067a3df5f2473175d70276c24939e24393d496b9875c4509ae7644b42d0899e5627c660f21 SHA512 71c60edef4f49f88a52305568f9b177ab8fbb9048203b3f7cba85dd676e4a3fc02f2ba0b07afabb6598d7e8f6d6703446325275f1fb54209e57ee51d1e3b2a8e
+EBUILD botocore-1.12.122.ebuild 1506 BLAKE2B b5a4a7065d643096e02e55cee757486a2ec5a7f311a3774e0bb0d926dabc0974225d9a2283a52bbb48aecab23e061c1394836590329c33d0b93cbbb027e30faa SHA512 d05c54c3d14f16f0de77f2c9eb056b23367b19c7b1c45dc575c80036132015dd28c272a80cf873a53e514af7aafbc19a7e45f8a2c0bda6d89d27518ad472a58c
+EBUILD botocore-1.12.205.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
+EBUILD botocore-1.12.210.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
+EBUILD botocore-1.12.223.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
+EBUILD botocore-1.12.251.ebuild 1511 BLAKE2B 36f1152e4ad33fd07092d644312ea20de2f0f5b27563ff7119361ffb8fe28ea34499a268d5f5bc0baa1bc056a32b5f0f6765e77bc71890476bb199fe7e4816bf SHA512 f5628d7b11a559e36912d92ee601b0df5632c74bad3b156a0575aecf1dc506173e44dfd2770be5e15710d4ce42c136c0b489dd0fe7ab86850ca1e7df4ead6638
+EBUILD botocore-1.12.4-r1.ebuild 1506 BLAKE2B b5a4a7065d643096e02e55cee757486a2ec5a7f311a3774e0bb0d926dabc0974225d9a2283a52bbb48aecab23e061c1394836590329c33d0b93cbbb027e30faa SHA512 d05c54c3d14f16f0de77f2c9eb056b23367b19c7b1c45dc575c80036132015dd28c272a80cf873a53e514af7aafbc19a7e45f8a2c0bda6d89d27518ad472a58c
+EBUILD botocore-1.12.81.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
+EBUILD botocore-1.13.14.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
+EBUILD botocore-1.13.19.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
+EBUILD botocore-1.13.2.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
+EBUILD botocore-1.13.28.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
+EBUILD botocore-1.13.36.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
+EBUILD botocore-1.13.44.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
+EBUILD botocore-1.13.46.ebuild 1518 BLAKE2B 7fd20b08a187ae4b238909640169435ccd6063085c8c889669539a73f4791c3c6ae6f7cc64d735009b2af8457adfa0e4df266c91516dfbaa648031a4f9521b1e SHA512 a5e2497737370dfce7380229b8cb94385081ed0bb06db473555cfa0a78465825d85a98c00d39d6e7d9d1c4f6c67bb01b52d1c26600f5d4242159c870716b2a60
+EBUILD botocore-9999.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
 MISC metadata.xml 487 BLAKE2B 4da33579cf14e968e507d4115e361aca7f13f618853758ae8cabd3ae7cc3adffdf374c091fe8086382728be8a59a8ee289408e53865807e0e0f93546d3eeadf8 SHA512 9df7187812d396f69b5a3499c20fa062a703c6a0385e63c812a2e1b7dd10a2c16343ff49d2585b17256623fe1b465f0e73d0fa39b07827338ed7fcfa38e45e90
diff --git a/dev-python/botocore/botocore-1.12.122.ebuild b/dev-python/botocore/botocore-1.12.122.ebuild
index 31d713100a09..6cb36e84b365 100644
--- a/dev-python/botocore/botocore-1.12.122.ebuild
+++ b/dev-python/botocore/botocore-1.12.122.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.12.205.ebuild b/dev-python/botocore/botocore-1.12.205.ebuild
index 1b2106971f31..8fd7899b8b6b 100644
--- a/dev-python/botocore/botocore-1.12.205.ebuild
+++ b/dev-python/botocore/botocore-1.12.205.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.12.210.ebuild b/dev-python/botocore/botocore-1.12.210.ebuild
index 1b2106971f31..8fd7899b8b6b 100644
--- a/dev-python/botocore/botocore-1.12.210.ebuild
+++ b/dev-python/botocore/botocore-1.12.210.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.12.223.ebuild b/dev-python/botocore/botocore-1.12.223.ebuild
index 1b2106971f31..8fd7899b8b6b 100644
--- a/dev-python/botocore/botocore-1.12.223.ebuild
+++ b/dev-python/botocore/botocore-1.12.223.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.12.251.ebuild b/dev-python/botocore/botocore-1.12.251.ebuild
index 11c21a3177d2..4e7a1c73c1cf 100644
--- a/dev-python/botocore/botocore-1.12.251.ebuild
+++ b/dev-python/botocore/botocore-1.12.251.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.12.4-r1.ebuild b/dev-python/botocore/botocore-1.12.4-r1.ebuild
index 31d713100a09..6cb36e84b365 100644
--- a/dev-python/botocore/botocore-1.12.4-r1.ebuild
+++ b/dev-python/botocore/botocore-1.12.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.12.81.ebuild b/dev-python/botocore/botocore-1.12.81.ebuild
index 1b2106971f31..8fd7899b8b6b 100644
--- a/dev-python/botocore/botocore-1.12.81.ebuild
+++ b/dev-python/botocore/botocore-1.12.81.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.13.14.ebuild b/dev-python/botocore/botocore-1.13.14.ebuild
index 1b2106971f31..8fd7899b8b6b 100644
--- a/dev-python/botocore/botocore-1.13.14.ebuild
+++ b/dev-python/botocore/botocore-1.13.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.13.19.ebuild b/dev-python/botocore/botocore-1.13.19.ebuild
index 1b2106971f31..8fd7899b8b6b 100644
--- a/dev-python/botocore/botocore-1.13.19.ebuild
+++ b/dev-python/botocore/botocore-1.13.19.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.13.2.ebuild b/dev-python/botocore/botocore-1.13.2.ebuild
index 1b2106971f31..8fd7899b8b6b 100644
--- a/dev-python/botocore/botocore-1.13.2.ebuild
+++ b/dev-python/botocore/botocore-1.13.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.13.28.ebuild b/dev-python/botocore/botocore-1.13.28.ebuild
index 1b2106971f31..8fd7899b8b6b 100644
--- a/dev-python/botocore/botocore-1.13.28.ebuild
+++ b/dev-python/botocore/botocore-1.13.28.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.13.36.ebuild b/dev-python/botocore/botocore-1.13.36.ebuild
index 1b2106971f31..8fd7899b8b6b 100644
--- a/dev-python/botocore/botocore-1.13.36.ebuild
+++ b/dev-python/botocore/botocore-1.13.36.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.13.44.ebuild b/dev-python/botocore/botocore-1.13.44.ebuild
new file mode 100644
index 000000000000..8fd7899b8b6b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.13.44.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/botocore-1.13.46.ebuild b/dev-python/botocore/botocore-1.13.46.ebuild
new file mode 100644
index 000000000000..58b2573e49f4
--- /dev/null
+++ b/dev-python/botocore/botocore-1.13.46.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 1b2106971f31..8fd7899b8b6b 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 61af3b148694..17e55b04b88a 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -2,7 +2,9 @@ AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca9
 DIST bottle-0.12.12.tar.gz 71554 BLAKE2B 4b0d0d77c5ebaddcafd44e16a052535ded566245324d39e97a39dd20a193360487f9489e8e89471dd92ca35d6c5b2e8cbe1572a958db31b69d32d3e32f1b6403 SHA512 cdba3859129680f08b8c641708fd884ccf46d404786cbf48435d752fece998a446f49799e4e05e979b967843866f3e966a35a6cac7aed3270df55fae508bae31
 DIST bottle-0.12.13.tar.gz 70870 BLAKE2B d8bdef473181ce1cf6c0d1ea3537c407e68d23c1c44ca33e26c647d3b3783040d466b594c56c10cdd007d23bdf1708412d3e3ff108effa9e8a92e1b22f7a6c69 SHA512 86d106eb08e0b736a85aa69871f2d1e23c1d6f71948b85718daf131002c53c000e092ffdfe5b36c60460473467a2ca2b5af19767344689ffe638245e6859a80b
 DIST bottle-0.12.16.tar.gz 72248 BLAKE2B 21b5bc376648baec74577ac5b57fcacc58899babe07a034a436d5e2bde75a9e2e48b2569c5caf1478e77790c5fa327114ab9b084f014cc1ba97637d9ddfec659 SHA512 3c167f95902522c8f264e8478403da8e9b8cd84594318c4a773d38b7548b5ba95c99ef922033f6885cdc044b31f9c2e2f7ed263886637ce2a048e99c0c6e1403
-EBUILD bottle-0.12.12.ebuild 1448 BLAKE2B 43eca996f1b3afcb170b0bea233a6173f2a9883034488585d0a44782e65ff6c0fe14306789b3a9b5b7515db563e03ffb6cf14bf752f3c4d2e608646843a69d94 SHA512 32b5226b5032cf57fae85859a93a2699408d12db1b932761cb07805bf715b3266696ae3169f00534c86d80eb25c15fa293be788535b9082de97c79888643a0ad
-EBUILD bottle-0.12.13.ebuild 1459 BLAKE2B 069d94752319d6517cb41ffa3ad1ab928fed6e8ba218b7538d0eef2aa480df56a50d33fe405c5b57f3e483b95c6993b4286443ce6410eb39d22cb72f2aaa122b SHA512 41d734c873db91ad000a6e850941a9223166c3aa9edae8c87481dbe7b278f908e5307abd351ffa22b83a13f7a68d255681111094598ca6dee3f4a028167f3c03
-EBUILD bottle-0.12.16.ebuild 1453 BLAKE2B 32791c0e9eaa9cffaa883df662b4afdf5164a2dcf35982df25c2b947d35abcb94c2bfb9b286cc9c59c4f8f2f4b6526c154794e9e8c31cad9e1f7a87658441225 SHA512 cec3dcf52e663f49f5aa085303fc823934219d7eed1074ce625b7e077700eb7446abd36a378ff12125f14b295625cb08a9bec4bc7c5346d1376a3fad0a147cfe
+DIST bottle-0.12.18.tar.gz 71557 BLAKE2B a34cc1ab9a2a8505b7fda8bbddbae30b4e6c4829cae53f0f886237a21fdfa7f2b2463b216d7a16464539f41bdce4c1dabb5cc66027b8fdd19b10e9a78a3cdbb5 SHA512 db8a341cd80d755205518bb9eac5b79dca9e541ab3ad9d9d57f891d895f7df75a8facd16b068cbdf7c4f884f35e384449f4cbd565a43e9c5d000d3a9f5b7dcb0
+EBUILD bottle-0.12.12.ebuild 1439 BLAKE2B 03689e51e3e9d824be9e9c0c17c4ffec086d08143b1e34376be6e1fefb627686a9af62c95ca1eed4d0f3ff8be5127868b3bbcbe9dbf6575d2d02e9a5f068a297 SHA512 3e644818e3c96eb1a2c110109a66597353e0891b69a605e8c371fecf6592cce628c2c450ea206f804c797c487fc47fcf43318b8dab4322b6c2c1af60a597577a
+EBUILD bottle-0.12.13.ebuild 1452 BLAKE2B f135d7a49b999e4a718f852f460942f203c6bc421e17de32d14941ae4e8f7ec064b2eab6a29334146ae9fc9c74d41c9ee549b523c318c1b5fe5674295fa40ed7 SHA512 e788e402a32f4c1cfa8535cab12f4d999935a562475ce7d1179032e4aa062fae874a85551cd8bbecb4b9522256d4c9ed0de964f91139bc701cb7b51dcd629bb7
+EBUILD bottle-0.12.16.ebuild 1477 BLAKE2B 298e895147ca927d982c649109d3f40c515f11e81fa3367b38dfabb4b8263d884e4b83103999fc204da51b060aebad10a744350def2639db8103db95dadc2c90 SHA512 7c6cecc35d259c77fa1037094300119c0845dfd62307c7e0290d908eae6173f45a5daf4c85d78089102b2fffeae6c5af3c1b2a158657d897d749b4b77636fb38
+EBUILD bottle-0.12.18.ebuild 1446 BLAKE2B 403af2044ae8ace7378ccf2d7d6456b35af95dcf74a6314b04166ecf2cb256c4cb980e36f670b7e5d07065932fb9c2f4cdb6dcbe23a8751cc23df9116c7b1ec6 SHA512 8deb026f313edf9c4f2ba271935df3dbff0e00cfbe8b8a32b959427fcf4ea35e334ed93027fb88b037e257d81a38bc5603bbdf8189406d750c29d2164e16814d
 MISC metadata.xml 319 BLAKE2B 29a2c856ee0a0af9214a5cec842b697fcb095d2bcf4702225b2e81d4f715967c29a383da78c43ac60d4464e27e651e81f1b085684b0b6f39925a6df7c36a54c4 SHA512 2ff50f032ea6042a32a7d391906ff95d00115367770423874aa6ee638b1db03fc0b7fabc484e1ecc002eff1e5abf5d45075463b76b7d512535d4820c46b56251
diff --git a/dev-python/bottle/bottle-0.12.12.ebuild b/dev-python/bottle/bottle-0.12.12.ebuild
index d6c4500fb38a..7ffdcd18c13d 100644
--- a/dev-python/bottle/bottle-0.12.12.ebuild
+++ b/dev-python/bottle/bottle-0.12.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/bottle/bottle-0.12.13.ebuild b/dev-python/bottle/bottle-0.12.13.ebuild
index b5e4b879eda4..6b4830583b0e 100644
--- a/dev-python/bottle/bottle-0.12.13.ebuild
+++ b/dev-python/bottle/bottle-0.12.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/bottle/bottle-0.12.16.ebuild b/dev-python/bottle/bottle-0.12.16.ebuild
index 529b10e1111e..41250b4a6f30 100644
--- a/dev-python/bottle/bottle-0.12.16.ebuild
+++ b/dev-python/bottle/bottle-0.12.16.ebuild
@@ -1,24 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 eutils
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.org/project/bottle/ http://bottlepy.org/"
+HOMEPAGE="https://pypi.org/project/bottle/ https://bottlepy.org/"
 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+		' 'python*')
+	)"
 RDEPEND=""
 
 PATCHES=(
@@ -36,7 +40,7 @@ python_prepare_all() {
 python_test() {
 	# A few odd fails in the suite under pypy
 	# https://github.com/bottlepy/bottle/issues/714
-	"${PYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
+	"${EPYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
 }
 
 pkg_postinst() {
diff --git a/dev-python/bottle/bottle-0.12.18.ebuild b/dev-python/bottle/bottle-0.12.18.ebuild
new file mode 100644
index 000000000000..5c483f67e834
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.18.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="https://pypi.org/project/bottle/ https://bottlepy.org/"
+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 ~sh ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+		' 'python*')
+	)"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
+)
+
+python_prepare_all() {
+	sed -i -e '/scripts/d' setup.py || die
+
+	# Remove test file requring connection to network
+	rm test/test_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# A few odd fails in the suite under pypy
+	# https://github.com/bottlepy/bottle/issues/714
+	"${EPYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 5e69149ed5c6..06c0238a649b 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,5 +1,3 @@
-DIST Bottleneck-1.0.0.tar.gz 363223 BLAKE2B 6dd8e18d14675c08010850091343856f2599de71ef57ff1b0bf1b748bc7f2e6d2d0fd0ad8ae1bc00dc38b9dd92676531b4564558b7ec0f9b79d2ebe4061a028a SHA512 b3edeec0b4c2beeebb08eed8cb7aabb92f736e47c657f1fa580ec36d839941d3d1955209b2286fd9d41c4941b46b97a27049c51bcf5a098d27a19881f570d2d6
 DIST bottleneck-1.2.1.tar.gz 98920 BLAKE2B 02fd35eaa15761f2008e46c459d842cdb5ad16372a03ea51a82b775ae0fbfa81beb0f1f304dcf6565956dc2d6deded579d8e400eaa250f9ab639261c085a6525 SHA512 0299eb1a12d808f18b8c4259c2205b47b34af4c1245867ab0857eb34a1aad630507cd3307a16f522db461977bd3f70aca688fb6a62ae84d1f895d18165132781
-EBUILD bottleneck-1.0.0.ebuild 855 BLAKE2B bb260d115c35ac3a276ee7676f3a07673aa6b2f39587f4ee7bc04cdb14c22576078cc31ed2e8be12c4bad17f61ddfa5728667666746b4dac54639f64bd56ee95 SHA512 4bf97834231323a7bdbc7d95d1facb45cde9b8d3181b727bb0f71b7214977e2824bdbaf205caea0938eeadf02e401d6f38e4512d15df07fd617d961586d524c8
-EBUILD bottleneck-1.2.1.ebuild 723 BLAKE2B ff100c45309c3ac17c5c6fbf4c8c6f75d45621b8ee24d6df84704bf9c2eb3b8e7ee4075f0b3b0c62e1658208c2ef983cde4ebdcbf373ee0361bcf136ea9365f3 SHA512 3fd3e43ef5af3c01363223dc620ecb818d675b5a873f4f734408e9c0b1297aba1ab763d93ae53c5422c2f5bf296a029792fc78dd1d8fb9dd57548fad1f788342
+EBUILD bottleneck-1.2.1.ebuild 721 BLAKE2B de74cfd8ef1b4cc0d43d3521ef4c7a28b021581692d85f47f246d50e648b40b75cb2d006137d4764cec4fe9d371fe02a8a6536ebb7ed71600bf8adf309614703 SHA512 1be4ab226e4fcc2860b8f2e3483f3feb962d6a8626deb875a90d14342801fae65c3b448126df99f2f6d5c780ef2e1cde1c4db7ee61fafe8dbd2f28bd05978d49
 MISC metadata.xml 471 BLAKE2B 9580e4438e0fb3dad08815f43e730b365be1ab25b4a308ab6c90b00d0c5c58a1bae8063fd2df68fb68542010cbc14e3626b4baf3b43adf8f38f44c7d87b74038 SHA512 9f31d5257385cb237ee675671473fcb8e932cb792fadb30bcccccdfad9f1372207e54abc3ec2712735e2250b9a583578d2a3e7e8a32ade30d634f620644c3def
diff --git a/dev-python/bottleneck/bottleneck-1.0.0.ebuild b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
deleted file mode 100644
index f9b7f7f62b95..000000000000
--- a/dev-python/bottleneck/bottleneck-1.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-MY_PN="Bottleneck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="https://pypi.org/project/Bottleneck/"
-SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	emake PYTHONPATH=. pyx
-	emake cfiles
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	${PYTHON} -c "import bottleneck;bottleneck.test(extra_argv=['--verbosity=3'])" || die
-}
diff --git a/dev-python/bottleneck/bottleneck-1.2.1.ebuild b/dev-python/bottleneck/bottleneck-1.2.1.ebuild
index 8a7686c7dde0..6221eaf82420 100644
--- a/dev-python/bottleneck/bottleneck-1.2.1.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 3c40ca8a74af..c82c3a8c4ce4 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,5 +1,5 @@
 DIST bpython-0.17.1.tar.gz 213638 BLAKE2B 42530a38f8cf714a0415957a46374b83ad14dfab89a76317507763c2f83b3dbc8f71c7cc967ec353fabd38b6631130d34df99c0d53f3728fa2390d4a6f64b25d SHA512 5b5e861646df90510db75520dff9533b71501d35b7af1d152adf2c929b171fa6a2b1c0a6b7eda0311f9315703db161c6a78698a6cd434e5321464d6d1c033e4e
 DIST bpython-0.18.tar.gz 213321 BLAKE2B 476c18fbec1d4ef3c5e206e7586b0e982656160474b64ceaecf5b49f560115af0e51d964553aad25bc765f7b431bc4f062581f9f30c0cb2e8da51cdbf2bca5ca SHA512 760143c286e686d4b8d706e38f3b2d2e7c865f960fa8d828ec08a7d0dd198bfa09686ab3c4b27ea365400d60c45b69a3c03ee726879a8825cc91af2a75d28dab
-EBUILD bpython-0.17.1.ebuild 1503 BLAKE2B 910c678492c31e38c989f555125c995fa5ff78bef1160cb06732207bb59433d272f799b09022627c408663695ebe87564d149531cfd3740267ea85535acdaf46 SHA512 05802a10cc238c0e93f179958ad0ba9c8f7c70f849e9a1e5db3cd8075eb7cae38e92b92234c86329d08eeaa5f80befbd6d7be12ff4c4cebc329d2b6a1e68b91b
-EBUILD bpython-0.18.ebuild 1505 BLAKE2B a6e188c38e28a8ab878798f151724e4def66f1a66019a0e045cc9a6c731076a744aa80c2284e724584a8e526d510c895183e6b0ff43f668ebca3fa7e96b4e15d SHA512 0ba71d663e2b099f44503ae26016baf1631834beb36f8db87641ae0271d2d280afdfa9cc1561b83ca0191fc8c36c198a11dc78ef0a2c47a7473a6010264a0ff8
+EBUILD bpython-0.17.1.ebuild 1489 BLAKE2B 8b30f8c8c24461828206e3cd422750add7dc671417a097d631c5db53349d20a9ee58ab80bc53f801f8ff9943c0cbd938d3519be920202980e223c407961a509e SHA512 63685278cddfcd1f11dbc1c2c264dd74b9647ff4ee158bdc8a6db83bbe0633a46d9b7350ecdfefb4b44302551aade4873d057d74944924298569a9b2392c557e
+EBUILD bpython-0.18.ebuild 1491 BLAKE2B f1153aabfd96e9c6d1281fe9954cf5a2d2e5777d723f1428e31950edf3c51a49bff3eae7496964ccc4bb1f971a693d2c6a3e4e71ca65eb1337740f7290ca86a8 SHA512 00249d3feb37c2a0ea07c862a5393e4a3816a58bd25cd87086ddaf8e9c69673724bb2004cdb8328dbba0b53a8bb4603768f66b815fbfe98a9f483d721cd00486
 MISC metadata.xml 636 BLAKE2B 8a0306ee698c4f53a67ea4662791444115ba8e0cd14294614b7ff1dc6ddc28023897e3e3c4d4f0e8f8920c8fe6298ef8b866ead41df4871d2461f9c999e6c498 SHA512 84dc3ce1791ba626a1920d6ee3e5501ad6eb49528b7ba055811e1eda46a354d8e704a31b5c4ca7be5b4512f641098311ebb1c6651d889cedb6071a97a0aff9ba
diff --git a/dev-python/bpython/bpython-0.17.1.ebuild b/dev-python/bpython/bpython-0.17.1.ebuild
index 557cbb3e4b5f..c124d8fe9617 100644
--- a/dev-python/bpython/bpython-0.17.1.ebuild
+++ b/dev-python/bpython/bpython-0.17.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bpython/bpython-0.18.ebuild b/dev-python/bpython/bpython-0.18.ebuild
index 75a9f0d8ad9a..a937218bdfa5 100644
--- a/dev-python/bpython/bpython-0.18.ebuild
+++ b/dev-python/bpython/bpython-0.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index f7b6463fb58e..36cdf16818ca 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,3 @@
 DIST breathe-4.6.0.tar.gz 67655 BLAKE2B 1d3a2915f8530da2b56583565ba03b1b05f38ce4e763c10a0a7f72661f2d22800a5d1b72d1e1497c537150f883dbc434bb8950275ee28668df21a87123dc8898 SHA512 8e26a102c38a916818ecf1a5d6a0f6f01de4285a98dce7abda6f2a401f8e5db380150b24bd2bf6f430a53324be5f1da28d084d8d4ae3969ec03914b88bc3908f
-EBUILD breathe-4.6.0.ebuild 599 BLAKE2B 8b26617a3173240a11c480002f250ccc34b100edbdbe8a276c29d658f0739a617909b8c089d4a6679af6f86967da7e8bb3715dd9a9c1fc67c24d800a4a619af5 SHA512 50c97fda850c67d91c2d9d01a45012fafd121620f8bfa1f3c03f082816fa31272722163ba74e28099f2273134e69b78de6d8ca037cbfc3a38ac82e097337ed0f
+EBUILD breathe-4.6.0.ebuild 585 BLAKE2B d13e91cc258ec03436814b90c75094041dfb9d3607a26d6d274f686de32b00406423345076a33f05b1f47c954af25247ea4ac2706b6968468b4cf3d90b4e41d6 SHA512 3a43479f2eb9736eb92b6dd5fe9cd903c10b3354878e57850997f63dd00e0f566de775373df2f73ac9c1d7fb40b7134a9c9126f905a0db08ffaa5c62801d58fc
 MISC metadata.xml 796 BLAKE2B 5f7541beb0113e83fb387eadfbbefea4bfe9d6a172c61fd60a2de473ec9e61f1a941d768350526de1464ff0ebbc58dabf13e7be3e38cac1d3a3cbcd791260d40 SHA512 734fa318039a2831c3cd35fa9f710739406b627f1e0f1d34c772d1d9dae53ea6921c21a236cabf00e3a1d3d2e95f053ea39436b1f539d9fa0c2bf1abbaf9018f
diff --git a/dev-python/breathe/breathe-4.6.0.ebuild b/dev-python/breathe/breathe-4.6.0.ebuild
index 4481fd114c93..80d34d62e80e 100644
--- a/dev-python/breathe/breathe-4.6.0.ebuild
+++ b/dev-python/breathe/breathe-4.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/brotlipy/Manifest b/dev-python/brotlipy/Manifest
index badaedf633a4..ef93a1c2a723 100644
--- a/dev-python/brotlipy/Manifest
+++ b/dev-python/brotlipy/Manifest
@@ -1,5 +1,5 @@
 AUX brotlipy-0.7.0-test-deadline.patch 913 BLAKE2B f7a57989defc3cbc6aa0f29d9db73d7aaf5abae22609b4d501699b4e5195f50fa8025feee64e7935584868d5100f3e088abcc2086056058464f3f4ad14a939e6 SHA512 c125622a149582b0e45397877f4f609ced2d9b388ed101a7a5c0bdbdbb849093538be5ba12e6d549c7a9fea1df3c74dc8dcc3d4bc894bb2ebae0117440b1d5af
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlipy-0.7.0.tar.gz 19375 BLAKE2B 035dc8757e491bc4fc0d8e2b6b82703eecc8f6f4150da42fda0f6c6f42a617519f5191371eb1dd976b8bbfeab88845bb018b874a395cdbf0ff409a6911f969f5 SHA512 bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf
-EBUILD brotlipy-0.7.0.ebuild 1530 BLAKE2B 3c266612dd720d7852616e9da929ccead467ac338b5b165006cf99238dbd371e1a0bdd4f68c6b83849379390f564a2dd9658e069ea45c5f118656d30e69af8ad SHA512 345f171d6fe093fc9a6c7891a4309e642695dfc09bf5e5ec3450a905a15416c18e62afcd4dffd2b13cf828b3dc38ceebf8c042ce428cd2c5af47ad196de2cc39
+EBUILD brotlipy-0.7.0.ebuild 1523 BLAKE2B e42c0ca84e65f22f05d3c0f8187dcf385583352dede821d9d84f95bb46d2c01de814ca515b939715d5ed9601d1c33eb68cce622451edd63316fa160faa613589 SHA512 7620f52af4b09b28651dd625b996d720a706de13475cc2941f2adfae721d42903b223a63d91c623694a69dd77bf506587583dd8260334b44ab9194587e3e564b
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/brotlipy/brotlipy-0.7.0.ebuild b/dev-python/brotlipy/brotlipy-0.7.0.ebuild
index 2fdc5f0ea568..30684562cc70 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index 46877fe92753..03874387928b 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,3 +1,3 @@
 DIST brython-3.7.2.tar.gz 10403203 BLAKE2B 1fb7778a961c68a873033321fdf7a5b24f422d52195ff1f0606384c76007ab87a1949ead2ffcd7b660b544a9833acf90b254a542ea8856510579bacd0be8477d SHA512 76bdbc005832b4980e38ff4bf2fd705291eb06ee6b9f0c4b25a90df9ab4e6da6638990abb37ebf526d064f54823a9b4ff387edd919db69b1eb3bfc8ed27d6290
-EBUILD brython-3.7.2.ebuild 763 BLAKE2B 66644fd554fa874e2418ed7abf84a65ad0910ee6b5a1a8a6e992e30a5889a05d4af1feeae9faea69b5b8f100e5e33022884215e617fe3ee7abeb2686517dc01b SHA512 bd6d15c121077acdfbb37138cea0d5f685994d9dc7227061d6cd55126d3a4acc41d9aba8f03799d7121d5a6ef08038c1298cf1e164757e9fc035f343bfd38163
+EBUILD brython-3.7.2.ebuild 753 BLAKE2B e58754d488cdcb191080848ae9848da3ea8bd57e9ae9e3b4e373ec4388645d9d40216ad3328089b7eccec4c27f74c4d5ba94348dd805c83b5094a42496abe30c SHA512 7849162fff9f817cbf48ed061737ecc01c260990971b79648aa52327428cec33a4e5adb8098e9b77be61d35dd7cd2069b80681655f55fe634ffbac54edbef205
 MISC metadata.xml 345 BLAKE2B ab7c78390c35a156fed3a3507ab979347fef95259f4083a28ba2c925356907158a0e7249cc4e6e46cc9117e418a07a3f91a67ba34163aa5be657ca37bf11b318 SHA512 ff1357bc421a8f96fe10ddc253035271616da444fb6cca11d3b263629c12abfbfc17324d06e744c95c319fe525763ff752db69aa3439edaa3fdc3e7e56c5bb05
diff --git a/dev-python/brython/brython-3.7.2.ebuild b/dev-python/brython/brython-3.7.2.ebuild
index 29277fb2ae96..8c1259305c3f 100644
--- a/dev-python/brython/brython-3.7.2.ebuild
+++ b/dev-python/brython/brython-3.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit webapp python-single-r1
 
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 2965862ab1c8..4e64e2c19159 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,3 @@
-DIST bsddb3-6.1.1.tar.gz 450571 BLAKE2B fae21052d3422e6e837f21a0e5f65aac063cb4c03b4c833e8b74fdd7da929972f81c3eaf5e869ce0990c1d55454d9f5964c3d526a44c047124d12da2afd78361 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01
 DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
-EBUILD bsddb3-6.1.1.ebuild 1940 BLAKE2B cdaa1ed8bdb037f43efdd6e40f2f2c4bbd412ac48420164fd431b637dbaea03df4aecf0a5623595846d50fef7cfb3d291125f7d25ef6552734d087d1bf12df1e SHA512 085ba98fe0374aa5349a7812b935476a150c2e92fc2cf5c8d0ddb4e8ad430d99b0a78d639e42bb1b46aaa1f1ead234f964ff41307994d43c7c10256e8e225ac3
-EBUILD bsddb3-6.2.4.ebuild 1939 BLAKE2B 8f787fb2c77b737117424cdfee3786934d6eccdbe89200d6bdd59939a84cbd37d3a90cf74b06b75bb6542a7181b60cd98bc376f5b26964919fd1e0c1913d6f63 SHA512 8f9278aae23784d90ae23d7ff4ad3289df730a231666bdc41f0cd6a28c8654ab0c71e46e024cd0f2d56b754da6e4dddef64cb1b16d32ce9ca230069b4cf6d762
+EBUILD bsddb3-6.2.4.ebuild 1937 BLAKE2B 10e7fb47b31423214a3c11e6461d1b71c01d1e942b9d707a1981f2f6961c4487816b2322a16699cb6b9ec008b9e426067a74ee0eeebbd11108a90279107d201f SHA512 e8d2a467756ccc39e56603acc3be3500c61fd175b06f3150aa73975faf3d544d618e63b0b94f22bd856815747a3845b2b21f3b4f8488c9a383705ab6045171f6
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.1.1.ebuild b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
deleted file mode 100644
index 2fabdb1ad52a..000000000000
--- a/dev-python/bsddb3/bsddb3-6.1.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit db-use distutils-r1 multilib
-
-DESCRIPTION="Python bindings for Berkeley DB"
-HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	>=sys-libs/db-4.7:=
-	<sys-libs/db-6.2:=
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# This list should be kept in sync with setup.py.
-	if [[ -z ${DB_VER} ]]; then
-		for DB_VER in 6.1 6.0 5.3 5.2 5.1 5.0 4.8 4.7; do
-			has_version "sys-libs/db:${DB_VER}" && break
-		done
-	fi
-
-	# Force version.
-	sed -e "s/db_ver = None/db_ver = (${DB_VER%.*}, ${DB_VER#*.})/" \
-		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
-		-i setup2.py setup3.py || die
-
-	# Adjust test.py to look in build/lib.
-	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" \
-		-i test2.py test3.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	# These are needed for both build and install.
-	export BERKELEYDB_DIR="${EPREFIX}/usr"
-	export BERKELEYDB_INCDIR="$(db_includedir ${DB_VER})"
-	export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	if python_is_python3; then
-		PYTHONPATH=Lib3 "${PYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
-	else
-		PYTHONPATH=Lib "${PYTHON}" test.py -v || die "Testing failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index 0b0b57a9b3d1..009dea51735f 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit db-use distutils-r1
diff --git a/dev-python/buzhug/Manifest b/dev-python/buzhug/Manifest
deleted file mode 100644
index 8927605310c4..000000000000
--- a/dev-python/buzhug/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST buzhug-1.8.zip 26529 BLAKE2B 429a4f9a1084be046f806ffd53eda1d009f8728776e8e5994582bd3bd63d1aef09277eb3049c4dcdfdbdf2daed29884d6a89ff5e1ca13379037a6efb0df91855 SHA512 e2354980f175485223b68ca0afee4ec07505a6f7f874e16e04b99b91e19930acda6005834dbf8c2ee318d357716f3fa7c8a0db3c15fc17ffd7c880a4c378ab66
-EBUILD buzhug-1.8-r1.ebuild 553 BLAKE2B c3f8f81e9ab1d29243e9ada6184844efc9edccbb69ec3ab650a9039bb85f6f51506215094cd24841f808303945b8fe27c3df89bac374ab2dc642e4f0c0f89a46 SHA512 e258fc49fe24f14fcc84b5cb2afe2c4f7dc899eca9f38ebaee3b111fc012041ad37bba1a52eb4050045821e848736d3ba7bc7be104ed54c7f1125ed85eeb5e08
-MISC metadata.xml 316 BLAKE2B 2f2020c63a3c3f825da73bd79dd64078d74c15316e3d612b540d9dbf7fae431332bdb7a02ee7f1bfb82a0f2bea39901316ad3ddcd6f35b9ae226ec437b9505c8 SHA512 2d36baac74fd2759305463b0caa7718043fcf0cb5c18a57ea2b7ddfffd9aef34bd3d8c617c9be97369988715ca465b8c6b80aaadcea2dda0147c3c61e9c853b3
diff --git a/dev-python/buzhug/buzhug-1.8-r1.ebuild b/dev-python/buzhug/buzhug-1.8-r1.ebuild
deleted file mode 100644
index c7716586d777..000000000000
--- a/dev-python/buzhug/buzhug-1.8-r1.ebuild
+++ /dev/null
@@ -1,25 +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="Fast, pure-Python database engine"
-HOMEPAGE="http://buzhug.sourceforge.net/ https://pypi.org/project/buzhug/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/unzip
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/buzhug/metadata.xml b/dev-python/buzhug/metadata.xml
deleted file mode 100644
index 6e68ab46d677..000000000000
--- a/dev-python/buzhug/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="sourceforge">buzhug</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/bytecodeassembler/Manifest b/dev-python/bytecodeassembler/Manifest
index b094f8e418d5..8e100460673f 100644
--- a/dev-python/bytecodeassembler/Manifest
+++ b/dev-python/bytecodeassembler/Manifest
@@ -1,3 +1,3 @@
 DIST bytecodeassembler-0.6.zip 52734 BLAKE2B 5634a77f0f250d5dd200496498080cb568ac4bc492745345871561ee5b68a58dc3b753df2dd87e569998c19723c869f4df88666b9d31cea07555a7fa928559b7 SHA512 95f90a1b6e1a307d8754eea301ae187783460fa8df3163f26253b8ebec16b31a8899a1d27c13158c5cb97763c7057f83b1dc1f642b5e2e9e5b844837a5208363
-EBUILD bytecodeassembler-0.6.ebuild 726 BLAKE2B 5e015e547fad2d5fed052570628644417ccefcfa3ead18d0fcd63e66e94a5e09fe331d49bab33d5dce2ea73ffb158eb931a84a62c91b3e9e193e4b1a1154461c SHA512 6aee8aa3b4ae698ddf53b1e26444e2df0c73cb42c2a567099f1475fe369566dfb9f74e358a994dbd20eee9b4e8d5237038625d779ebf352f78414882f2326137
+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
index e9df4677d166..6a95aeb72a96 100644
--- a/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
+++ b/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bz2file/Manifest b/dev-python/bz2file/Manifest
index 4e92159a27ba..1c22bbd7f18d 100644
--- a/dev-python/bz2file/Manifest
+++ b/dev-python/bz2file/Manifest
@@ -1,3 +1,3 @@
 DIST bz2file-0.98.tar.gz 11333 BLAKE2B 4ec4687f609521a637c20a512b544cd99d7c334f7cffaeff71d2a893eefe131a10bd548b9f1e829c899cdcf181f5e877e092cf08d709bb3f1ba9901d3386b3e6 SHA512 2d28e71fe71b5fea4008d65a1fa91d5c6fafcacc09f891c5deaaa985661576bd97f2e33fe9f8c5943841f09c153f2079a2511329c066e57c775fb0b089b30b20
-EBUILD bz2file-0.98.ebuild 610 BLAKE2B c8af1bd28ed8715ac443450a11e095f1db588790b2a17e47b3780cc86349d47a529de436650143b626b944a04f720ba13431df00ff9266f9ff6cb207644360b8 SHA512 77bd84728d2d5bf24bacecb1119971e92829be5e6863744d1388219255f330927276db7b704a9d388d2b4109f8b6964d072dc5097bb5c3daa82e2e9ee926a73c
+EBUILD bz2file-0.98.ebuild 635 BLAKE2B 692f5a5878abd05f3d014b5d580d64f8c73ce8933791c486c4a3a01f7cd155e9811522257eb397c095bc829bf7ad19bb5bed39b90193b3542b1ad85ff9849f5b SHA512 7ca5e59fae91de473b23df92fe478352a47d5be7b7b192b8066907fd1f5c0ece3f943b3b7fd71a68738b30fc1856fb581d988b2a81ce252db739c6f651d4bdd0
 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
index 3b741c619575..af4f8e3f6261 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 )
 
-PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Replacement for bz2.BZ2File with features from newest CPython"
@@ -16,5 +18,5 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cy
 IUSE=""
 
 python_test() {
-	"${PYTHON}" test_bz2file.py -v || die "Tests fail with ${EPYTHON}"
+	"${EPYTHON}" test_bz2file.py -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index 59c0262defaf..d89dd86fc85b 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,5 +1,5 @@
 DIST cached-property-1.3.1.tar.gz 9648 BLAKE2B 154208108cfbec914519f2a08ecc6ad025c284726d65a001eae84701b1eb8479e127473c124b08d3b0d969f59798f9dcef473cd8209c248b1d5b016a0bc8dac6 SHA512 3349751d442ca6e7d4e792c8b076735d5308d68244af9c03044f3d72d619a5c3d7d5dbef434caa954db4b983245bfe646d4a25c99aec39f32d99751edd9e233f
 DIST cached-property-1.5.1.tar.gz 12791 BLAKE2B dcc75564d3b1dbb2f34ea433f4a477b2fe0454047f1fb4825cc6350458bf09509cf970b308744d79eb3b17f96c04c606ad36327c7e24f0b13f412880d9ad2ab7 SHA512 61bbedb48336af7c0b465421eb4d3b6b48155cfe4fd6270ff49caefe0d80e40b50c4801a68a5564931d316e374b69112ad14f72687a015ce81aaeade6fcf9ce3
-EBUILD cached-property-1.3.1.ebuild 645 BLAKE2B 9fa963dbaff16b53750b6339b696ac3de8f43131025db670ad860ae7e03063b83e9f81d788a990be29fcddfd965f319d03fe1bf9dfd352798292b9637b60e571 SHA512 a7a6ea47aeba8bb063c0549cdb502ae2423cb7e39b7253d4ced2f15211644dd08eaee4ef248f60fe276b5dabb90e96f8b1e198a0be5dbdf27cc385b121f15949
-EBUILD cached-property-1.5.1.ebuild 935 BLAKE2B 69f8ef4796635d3a0c7b0f1632612bed86e90e3c448694476c3cecea2c6ea54c4f22eb7807c60462ef83a7abbd2c7726367b9b304066c78f44e9609f1025810b SHA512 1988f4d52bed2c7bbf0c411775ee747017dd939e891af49a0e7d00f86fffb82a8abb4f5f96d06ca70a4cb0e87d9d8ac748441db0478ca42b58d8959e2606a608
+EBUILD cached-property-1.3.1.ebuild 641 BLAKE2B d1f72de56092f4580a76b557af48b1d9c020a00787cd0f93ffd6e1fa2c1797a1076157a62a708c5f90028f3a4ed633673b5fd95ae909dce3bb4e3a00d27d991a SHA512 68b0e5ab142999cf4e0a17fa41facbcaf69b08cb8f8bc381af2f567a43153061e507012871c38082cc8068beb067d8de887dcb04cddb322815d539318864ac86
+EBUILD cached-property-1.5.1.ebuild 938 BLAKE2B 10de8e646aa0c71dfe8bcd71ca4c85da7215c3879ce7086a5f8aec3210e06b276d7e2aaaa695e4234f401193a00790faf034eca4edc4f2ece4b9204b9b230978 SHA512 68884ea5eed2ed335013cf1e15d081bc0384a527c329637ad11d4d101e405ae750fd93e867de3c64cbce2ace49fb26a1ba2805aaa4b84ea88a0cb9616706fa81
 MISC metadata.xml 489 BLAKE2B 36f59b8764462acd2920868cc5b5c84e27cf2e86b1356a76a816ec60a5f69bda780a62a811aefe06639827bdc3257128cded2d6c2e53e8c4516af9d1b9769879 SHA512 cecc6d43fcd54d1a949a60380d91a313d0464e0858be0fd544a76232f04961eca2530ebddaf6daabc5f050bdfe12092c99028c4a9cd33a14f23c0b43befe7def
diff --git a/dev-python/cached-property/cached-property-1.3.1.ebuild b/dev-python/cached-property/cached-property-1.3.1.ebuild
index 2cf489ec2431..b2614e31f34d 100644
--- a/dev-python/cached-property/cached-property-1.3.1.ebuild
+++ b/dev-python/cached-property/cached-property-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cached-property/cached-property-1.5.1.ebuild b/dev-python/cached-property/cached-property-1.5.1.ebuild
index c23efbc22d1b..6ecae98df753 100644
--- a/dev-python/cached-property/cached-property-1.5.1.ebuild
+++ b/dev-python/cached-property/cached-property-1.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index b6e3334ef5a1..4efea6596028 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,5 +1,5 @@
 DIST cachetools-3.1.0.tar.gz 20664 BLAKE2B acb9ecdc1a9ca4bfdea7b9f593aedd6c8db9f96c703b71fb3007ec6e255d4d99d53c22f6b61ba25d53ac9a3bdee8de7303d18ba05115017bd6ee63c2bacf1fca SHA512 1d03cf42b56857ccc1203a658a8c70fa3c0a3be2ecfa3b9501c14ba674463d4ffccf8a8a9daee13084545a5072ecd7757174a4b074d33b0619020f7ec89515bc
 DIST cachetools-3.1.1.tar.gz 22055 BLAKE2B 9141adb9cff5e7f76a370666c24664de09b1562a9e40636b8103157cc65b146dca96ad871065191618e2d458078cb7da30c80da21b4fded73097bda7916f4819 SHA512 23a7d9c91f97727984585745169dbf94922288e464196d5c05f442226cbff4efeb3588ed463f481bd75892824188bd3ab8031f4f2f8e52924c74428b1034714a
-EBUILD cachetools-3.1.0.ebuild 508 BLAKE2B aa727c7d0aff07834a3bb82de23c31549aee4348ef41fc880d2a79f2d0da245b5ca6ee42aa2f5d3dac34a5552355e9daa473a9e71dfd53d7abf860983535ab03 SHA512 8d1788d23876e75212adfc2264776f5a075666540481e5c9f7044b6c052fb6f2eadf8cd6ba476b6373d0341faa2584e38c8e939080af3e2e8cf4b1a0236185aa
-EBUILD cachetools-3.1.1.ebuild 508 BLAKE2B aa727c7d0aff07834a3bb82de23c31549aee4348ef41fc880d2a79f2d0da245b5ca6ee42aa2f5d3dac34a5552355e9daa473a9e71dfd53d7abf860983535ab03 SHA512 8d1788d23876e75212adfc2264776f5a075666540481e5c9f7044b6c052fb6f2eadf8cd6ba476b6373d0341faa2584e38c8e939080af3e2e8cf4b1a0236185aa
+EBUILD cachetools-3.1.0.ebuild 501 BLAKE2B c2fbc351edf63711d418743e3e3854de5f6ac6d080504c228f450bc02fe6b588394cb124419ddae9d666309691ccecca4622309cdf7e64a804310774730ee0f1 SHA512 cf46006e3a7229d105bfee04e1a8c81fa39ed9aa8068443b2f00754d45fa59efff4f366c319ee5ea80f086e1037cdb9edf990ba128adf74780e66cfb5527e222
+EBUILD cachetools-3.1.1.ebuild 501 BLAKE2B c2fbc351edf63711d418743e3e3854de5f6ac6d080504c228f450bc02fe6b588394cb124419ddae9d666309691ccecca4622309cdf7e64a804310774730ee0f1 SHA512 cf46006e3a7229d105bfee04e1a8c81fa39ed9aa8068443b2f00754d45fa59efff4f366c319ee5ea80f086e1037cdb9edf990ba128adf74780e66cfb5527e222
 MISC metadata.xml 382 BLAKE2B f140052d08961397a0f05455570a02fe09a16a332cfa85cc61aa43e3a7cd634872453e92c440bce9d80f712d9db5f0daab42182ab442618fb37fc361b53506f6 SHA512 24e532452d31effea36e8aeb24ea13a7d4eedb17538bfbabcf1427e049c7d309d67748d5360f43d6a175c2fd0868d40949199b53601f28964e3cbd23482299d2
diff --git a/dev-python/cachetools/cachetools-3.1.0.ebuild b/dev-python/cachetools/cachetools-3.1.0.ebuild
index 95b8c6679b06..c343dc3a7942 100644
--- a/dev-python/cachetools/cachetools-3.1.0.ebuild
+++ b/dev-python/cachetools/cachetools-3.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cachetools/cachetools-3.1.1.ebuild b/dev-python/cachetools/cachetools-3.1.1.ebuild
index 95b8c6679b06..c343dc3a7942 100644
--- a/dev-python/cachetools/cachetools-3.1.1.ebuild
+++ b/dev-python/cachetools/cachetools-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 251ed2b6092a..0c1aaa964172 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -3,7 +3,7 @@ AUX cairocffi-1.0.2-test-deps.patch 671 BLAKE2B 489b14e3e9847f28c53211aedc9b3ef4
 DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fcc184f7880e86cfae0afc22c1e712ad7e835d76506b4ab0cefab6629abcc5bd86cd95c417dcc64c9374a8629110 SHA512 70179e05ca4a4efeaa39ade1ee1a96d280d198ecff5ae8c8fc634c24d8922ea6a3e1eb6cf5f55c5fc9d3f5b2fc3131a53051690eb86712762d8b6400df8a630a
 DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5
 DIST cairocffi-1.0.2.tar.gz 68537 BLAKE2B ddaf20e0d878126c86b03aa87663391fad37386b8d2dae790e26c20b9050cd3bc36783a32a5c8ee99f64acb232701316bd8308be7327ce406cd49de4df3f92dc SHA512 0ae63be9d6ca4591d806e259ecb385086b053739de2e5098541078d4c142dd100b593a7712d5410a92ed7dbf6e9a7f7a5287f00425cd8d54ada421dae0cfd762
-EBUILD cairocffi-0.8.0.ebuild 1250 BLAKE2B a441dcbe48cd0a27f499687388144767be7af9689d4f86a52e6ccff9e45cd1236565aa6f5e0f45b5dd7ba9a0086d1567e4ebfecde0536816b471f4de41176a69 SHA512 8820927cf6f0f83622574fc4f733d57136850f562e6dd03e0f0c47d98f5ef3595b568825b9f1e5e3e0f01ff6cc2b4a2c1a9a767bd66b7ec09cf29dab24c95e20
-EBUILD cairocffi-0.9.0.ebuild 1222 BLAKE2B d6fdcdbddaeaeab3df24ef29b15060af32c66fd0e9d16449b1aec1ec923763b687fac71098792c8bae5c3c1906f7916df71c9f414edbd59bca81eaa9c4e68159 SHA512 e545addeb4f6f14a8c618b78e64fa4562f7442915063c5663770d4712386927dc93f78b4c123fc5e2eca9c2a3036b43ce5a9d267f083acec38c6e36731841cdb
-EBUILD cairocffi-1.0.2.ebuild 1283 BLAKE2B dd1e5f08c107380a14e7e7a2322490668664842b88a56f83891ab3b650d84c4f0f18afde6dcd45d481e5e6a74c5d96737ae2aaf3349387b4593ebbcb42ace626 SHA512 ed3925e4589f0081b531eb9ac822c751a2f33697f13e82280ca40ef8fb3625882c5e4ee120e67cf3339fdc1ed37259a50282253b53796e970b3ae7799771a65a
+EBUILD cairocffi-0.8.0-r1.ebuild 1142 BLAKE2B 4d5aeaf534b104e6869e25d24de9ec10df350d5fc27b0cfd624d8e1e7bf9399839bdcd63958404b27592bdf71468a534760b51fdf8273135913378c5985f04c2 SHA512 fcb08dc478ef62f2e0fb748fdb4e950f4465eb4f9ba0f0e3bd789f1d95b03f2b93a7d47cbf8ed7f15d78527959c39bf6ffbdd84271b6bdcae18c4c43d79316d8
+EBUILD cairocffi-0.9.0-r1.ebuild 1114 BLAKE2B aa6c295b033d43ccd66033ada4b767998794b32031088d7d386b1195b4da9af3d1979a5b0b4b6141d8147651f5a38948afd08ae7dc200a5d237859578cb16908 SHA512 64a5b85a396b094f3130fb81f963aea74b18ec357071c485c09b853cb35e62f10ce2b8c23b2a9cb6e683a6a02636978746a9cdb046d3f85fc8a670c360f5d972
+EBUILD cairocffi-1.0.2-r1.ebuild 1180 BLAKE2B f87b6cbfd6d2d8ed340fffda39910fc9caf648626665f632f3bdb3560908cfa3fc5c366ddaa1768d36e1edb10565aa29eb851315e631d7e18a25368539ec0ac6 SHA512 f2deea39b685b62b64496a17bfc3f9a8a0a2f208cc03737fc2325fb1dfc08d892fcc11cd192d021e86ec7eae1a5b8c950da63c4ff31c2f3cc13dd2c6ccf047df
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild b/dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..ba91b5f72454
--- /dev/null
+++ b/dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit distutils-r1 virtualx
+
+MY_PN="${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
+HOMEPAGE="https://github.com/Kozea/cairocffi"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
+	x11-libs/cairo:0=[X,xcb(+)]
+	x11-libs/gdk-pixbuf[jpeg]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	virtx py.test -v --pyargs cairocffi
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cairocffi/cairocffi-0.8.0.ebuild b/dev-python/cairocffi/cairocffi-0.8.0.ebuild
deleted file mode 100644
index 7a53cc6195e8..000000000000
--- a/dev-python/cairocffi/cairocffi-0.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1 virtualx
-
-MY_PN="${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
-HOMEPAGE="https://github.com/Kozea/cairocffi"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
-	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
-	x11-libs/cairo:0=[xcb]
-	x11-libs/gdk-pixbuf[jpeg]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	virtx py.test -v --pyargs cairocffi
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..45e349b58087
--- /dev/null
+++ b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit distutils-r1 virtualx
+
+MY_PN="${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
+HOMEPAGE="https://github.com/Kozea/cairocffi"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
+	x11-libs/cairo:0=[X,xcb(+)]
+	x11-libs/gdk-pixbuf[jpeg]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	virtx py.test -v --pyargs cairocffi -o addopts=
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cairocffi/cairocffi-0.9.0.ebuild b/dev-python/cairocffi/cairocffi-0.9.0.ebuild
deleted file mode 100644
index ac85506d60c5..000000000000
--- a/dev-python/cairocffi/cairocffi-0.9.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1 virtualx
-
-MY_PN="${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
-HOMEPAGE="https://github.com/Kozea/cairocffi"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
-	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
-	x11-libs/cairo:0=[xcb]
-	x11-libs/gdk-pixbuf[jpeg]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	virtx py.test -v --pyargs cairocffi -o addopts=
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cairocffi/cairocffi-1.0.2-r1.ebuild b/dev-python/cairocffi/cairocffi-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..e5bd3f05cf67
--- /dev/null
+++ b/dev-python/cairocffi/cairocffi-1.0.2-r1.ebuild
@@ -0,0 +1,55 @@
+# 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 virtualx
+
+MY_PN="${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
+HOMEPAGE="https://github.com/Kozea/cairocffi"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
+	x11-libs/cairo:0=[X,xcb(+)]
+	x11-libs/gdk-pixbuf[jpeg]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-tests.patch
+	"${FILESDIR}"/${P}-test-deps.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	virtx py.test -v --pyargs cairocffi
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cairocffi/cairocffi-1.0.2.ebuild b/dev-python/cairocffi/cairocffi-1.0.2.ebuild
deleted file mode 100644
index 686400bc32f6..000000000000
--- a/dev-python/cairocffi/cairocffi-1.0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1 virtualx
-
-MY_PN="${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
-HOMEPAGE="https://github.com/Kozea/cairocffi"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
-	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
-	x11-libs/cairo:0=[xcb]
-	x11-libs/gdk-pixbuf[jpeg]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-tests.patch
-	"${FILESDIR}"/${P}-test-deps.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	virtx py.test -v --pyargs cairocffi
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cangjie/Manifest b/dev-python/cangjie/Manifest
index e572dcf0ca9b..fd9516d29d34 100644
--- a/dev-python/cangjie/Manifest
+++ b/dev-python/cangjie/Manifest
@@ -1,6 +1,6 @@
 AUX cangjie-1.2-cython-0.22.patch 1056 BLAKE2B d528edfc39765ce5bf89ef5778dbc600cb80b07ace3e8766dc865b2e43cd9860df6144de9ff864fd0c48e9528516ba86918638f527cdc6a86de5ec5a941345ac SHA512 d06d5d19914ce829ac8cf2e461bcffe404b3e639ae37b6eaa81825ece9fb0e55b8ba2b316d18c80149b34cebff75368ac62eed58dcf6345affc71d798e267ce5
 DIST cangjie-1.2.tar.xz 221524 BLAKE2B 149d10c6d1806b08e1de852d7e48807bd027986188555caac1b9c1495573230341e611466563f8fc3072b2cbd6a4913646c44408c91816ce9fa0d67655796bb2 SHA512 4cc3e0e4a77b671c93fe39f17c970d458d6d935c1efa33f9d8de0a0311ed6c3a444fd41431d553f70f3e96065f8136801128d8b16c86d0340c78ab560bd9e63f
 DIST cangjie-1.3.tar.xz 237156 BLAKE2B a94f51df82136edddeeeecb729737a7be1cf4677c86df153ba86b436a404615156e6fe43d6efbb6ae602982763a4cd8ea09850882942a70a3a3737075bde0c01 SHA512 633b0040740105573fe72811c2f763756b67784330520ecadd5e0b24fc51e414f54a71f03444940f20c8a4943a14b65e2f1d18339696e2ea5cf659de8592df2a
-EBUILD cangjie-1.2-r1.ebuild 1034 BLAKE2B 8818137b2c0f972adf6ed967edafbf0449ce55a3ba935aa841e94d7f8a204e9e5c9b6e7745c9e4337cc6e64a6d8378644600f76b8cc5885abeb8d25791ed7b6e SHA512 4d2e2cd65f5c9b1a9774adc0053a526fb5899274d3475e90ad0e146ba82cf8fc8a53b2fbdac86336752a38100b90c59daabe5550362467dd81246db93417994c
-EBUILD cangjie-1.3.ebuild 986 BLAKE2B 4aed0838156811cc429e37a05de1dac3376fc0681361a81072f36ddaf4dc070469e36c41f7c7601ff30891f656f173af7d2c8fda71c814e994601b003aca7140 SHA512 1fe5227fdfd9b55a59196bcc117a38d0e589d80985440d50502b2ffbdc030274ba9de0343f97a6b91b4f18fb567c6c692847ceceebbeca85051a52d217ed68d5
+EBUILD cangjie-1.2-r1.ebuild 1028 BLAKE2B d5dc641c6637456b638ede69a88308de34e672b7306911b04a2228f82653fa92cc3e70612ff455792eb02bf55351bd530af271d17ca24202e5ece3ac57960fbf SHA512 376074f3131591a3ce7b5c2cc39b33c50db20dfdb8286e598626db7352923ee0d6b7b49726db34413435695ccb352dbcbd232f01d0dfada60bf745b69e305773
+EBUILD cangjie-1.3.ebuild 980 BLAKE2B 84cb18d49951113306552279b5d3c433fadb5ac24d8fe2694e00490cfac7d03d2d7310fb7606727384c507b054d385500dbaf9479ddfd6167d77c482e6251ba7 SHA512 ed1874765c58b571c7c16a57e603a0ecb6eff53a8a4c8a65743148019d378d0d45e38b3cd3346f308a8607b888f3a19e37d49602a26ce6fef24686408c942ce6
 MISC metadata.xml 318 BLAKE2B 7ec0867350c50e5dd8bb12e583f3b9fd3d396922facfd592bed942cb6c082ecd6e61a8b80c124bc6f092ecf9a8f1888f2e36165d862b246737c5387ed53bc59e SHA512 052a2ca9b301c41b76960284f760443dff543294b9a8d13de4c2454747e61a2d85e317a1ce08b224442c50822d0a39916aa897ba63c31b4707ebf667fd5ae70f
diff --git a/dev-python/cangjie/cangjie-1.2-r1.ebuild b/dev-python/cangjie/cangjie-1.2-r1.ebuild
index 6c6dbcd427b7..d41c713ced22 100644
--- a/dev-python/cangjie/cangjie-1.2-r1.ebuild
+++ b/dev-python/cangjie/cangjie-1.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools python-r1
 
diff --git a/dev-python/cangjie/cangjie-1.3.ebuild b/dev-python/cangjie/cangjie-1.3.ebuild
index e8a1f39e2fcb..c31639bf3165 100644
--- a/dev-python/cangjie/cangjie-1.3.ebuild
+++ b/dev-python/cangjie/cangjie-1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools python-r1
 
diff --git a/dev-python/capturer/Manifest b/dev-python/capturer/Manifest
index 3c624cbfc3e5..c35a18f44426 100644
--- a/dev-python/capturer/Manifest
+++ b/dev-python/capturer/Manifest
@@ -1,3 +1,3 @@
 DIST capturer-2.3.tar.gz 18380 BLAKE2B e51f7013715e1bcf83da6126804aa3c223fcfeb7c4f958038f123e19dcb807bb480d46ed17307ccc312b2d5873dc9f82ed90f7be7f01b7062ef81c11829c6698 SHA512 267c6238ab143894f3d74002334b99e3d1a59a3bf30f5ad04d6f1a81c9439b1369fe161859f86924280e3b9e47536e53a0a80045acda9ae471ded7d751e01470
-EBUILD capturer-2.3.ebuild 823 BLAKE2B b9829a42528e32ec31ad7139476e685b544cfaaa871df81fa68da2a2cd93741ed2ce236ad4c89dedd82ffe69234d877ff2628262d327a3baa6d1f826fcebac1f SHA512 fb1ea027df38f64b268f70b8810849cca25b8452bcf8788214b0f5b21173700046e139b21b9eb8343781d6bcd91d325d226486dd63a419c4517ad1a68c41976f
+EBUILD capturer-2.3.ebuild 819 BLAKE2B bb6ee7f47d5da9749a8e8f8fd14bdc05c70cab11fa4d36a2668d550af2662ed2e552628fa97f6e3eb0267f3ea92efee2f34d1071f0219e5cb93f93c0c4abb994 SHA512 572eaedb97a9937ee2496652fd1875678284292c20c9b20c531560ae0a38e32764ce0fdf157a2ef566c85d453a01ae615d67dc00c73e991580e677725e4bfecc
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/capturer/capturer-2.3.ebuild b/dev-python/capturer/capturer-2.3.ebuild
index 437dd675dd28..31a964c7bfe8 100644
--- a/dev-python/capturer/capturer-2.3.ebuild
+++ b/dev-python/capturer/capturer-2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index 857f35c65914..feb418e4a78a 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -8,6 +8,6 @@ DIST carbon-1.1.3.tar.gz 68824 BLAKE2B b5e532fa0d0d8dc8ab8c3c555dea6bb3b918cd5b5
 DIST carbon-1.1.5.tar.gz 72365 BLAKE2B 304e515fd3cae806e141d0a76983d13967885a7e57c310d86c0c83560aa306a573676fb0135fceccf14cc7ed42d8a9dcb7869ab0d6ac3b2fc00c2fb088011873 SHA512 1b3a0a0d4005e2ec8d5bca062b41f0e18329c1bc4d3a4b3eca5e8f7c94c20387281392eefceaca90294e51860eabecca242c487068433119f1f249f8659ed560
 EBUILD carbon-0.9.13-r1.ebuild 1843 BLAKE2B a8ba9d28061af7db44af73e714c33b96b61fb90af199fee1ecc6fdd0d6db5034cf876e33cc73b1f8b6826c94c76a62755cb56eb650c2e70353ec2e9c2be9fd9c SHA512 e82fd28ed25b8e10c3f3cba93fe307f209a09a5bdba8ef1b2e1acfd2e696cf45b3c2ed36f0fe9e7ec1e74b4e6a533e93d95c705a42c4575ca1ffea50e117ce75
 EBUILD carbon-0.9.13.ebuild 1838 BLAKE2B 0810875d6f256a3af040a41d8c05104fd2c860d00e50a0ce4f2e19fe97716408e777fb8dbd392d3810549671b3c2ffbf8ba6a9e59556d9c1ed389cf6e9e8f094 SHA512 97502916be13d332389c68b30366ef6b254270cf1b8c702318f18efd2019950ccefae0815d17a467879e60afcb557dbbcb6b412ccc21c9f84e0cede6986a843b
-EBUILD carbon-1.1.3-r1.ebuild 2122 BLAKE2B b48821e8a76a6eee30f792b80300e8ca5c7d88c6d9626acf99c4f1b70471641c2a2f3b158b4fb3499f01ed1c74fa2a650a3fda9bca8c5f4759ee2b98318d6d5c SHA512 3f488796d83611b16be5882fd682818cd86c6eda81301f18886f866994d4912ed47603eaab1101477f1951070ad1b38f6d96382b4b9b3a5cbf7743ed8ac96de0
-EBUILD carbon-1.1.5.ebuild 2033 BLAKE2B 6216c5245122c4d2b51b678333942377fbdd9c390bc32a4e9a0feef9d8cbd645822d027d869c2ffa196fb37023be7e45fbf5ae166526e9fbb9e2c8703efda643 SHA512 7223b47525b5ca1adf9fbfda0fe59a0de86e5cac481b25a5989b8acfe55d281e90250b52a3281c5815b0564b5e6dfd1db11ac08bb76c893f48872a2d41070962
+EBUILD carbon-1.1.3-r1.ebuild 2118 BLAKE2B 8acd4660ff77218fe0b91af19764a5f4f26f9655dac7bc107ecedb6d9165e8e2039336c3e51ab7ec3114cd5efc2affa0c2fcaac5568f74b10085865f02e0145f SHA512 639f188212d18bfd3ff9e12c98a4b3f04e38808f02c9ef4510e9e202ea20764eafca11b5c15cfbeb14c599096bc03cdadbb5445f1e4033855fd1953367dd2271
+EBUILD carbon-1.1.5.ebuild 2029 BLAKE2B 7d1bc83fca553a044ed6ffcb3d17fcedee9b9175718e49350ea7234bdf791d3f8b540f92c48efe9de47254b5947778a566e9cdee9e3de9d5fb1f216828da3d40 SHA512 b457a70ce53fe6fd9afc3b0022db563594d0654d60c8beebe067928a920716ef03aac70c2b187d600b541f0676184eca73818b6afe992c3c7e76272b76306496
 MISC metadata.xml 441 BLAKE2B d2e47e40cd430deb50428472c2a1aa280b888429892f59bf49a58b3ace4210005efd9489821c89ec59b72b398ef78510817a552dbbb65f2e64c9725ab0375507 SHA512 b6a65d642333fb19a34c4f1342b58ee9eadb9824f078a7cd9faac06d3d9e731ea67aa138a8e36db797b755dd382873583808aa6460375ebedf61443be962fc5d
diff --git a/dev-python/carbon/carbon-1.1.3-r1.ebuild b/dev-python/carbon/carbon-1.1.3-r1.ebuild
index 3bf8a434141e..1a6e761e0a81 100644
--- a/dev-python/carbon/carbon-1.1.3-r1.ebuild
+++ b/dev-python/carbon/carbon-1.1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/carbon/carbon-1.1.5.ebuild b/dev-python/carbon/carbon-1.1.5.ebuild
index 98643b503262..7aae679f68c9 100644
--- a/dev-python/carbon/carbon-1.1.5.ebuild
+++ b/dev-python/carbon/carbon-1.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )  # 3.7 dropped due to dep-hell
+PYTHON_COMPAT=( python{2_7,3_6} )  # 3.7 dropped due to dep-hell
 
 inherit distutils-r1
 
diff --git a/dev-python/carrot/Manifest b/dev-python/carrot/Manifest
deleted file mode 100644
index 9f71df60de53..000000000000
--- a/dev-python/carrot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST carrot-0.10.7.tar.gz 62069 BLAKE2B cb181317fc0840941975479ada35aee1e1937423e3ed97c7289e66fdca84fc0dc4744199568d1fcb4ddf4be174a55afa8012512ae12d3959fb47bbbc6b4b9783 SHA512 3814089acc0b4ec51fc67470f0c3f21b740c5b7ed284d61919d6796f6e0529cb3d5e9c1a4cbf8360f98c76b520e5b73b43fa744775f4c6e3a629d77a46a10f3f
-EBUILD carrot-0.10.7-r1.ebuild 701 BLAKE2B aaf1f75ee6290e5c0580bef8eca91ebdcd03d227fe81883d000d5d7cfcaa981cef3fe7ee49109fd305ed0c1bcf51df1d2aecbb3b40e95b19824d9dae2dfc89d1 SHA512 1c8567d333e76e519ae1198f07602569f0a2afab1379f578904c2c4cff8ef4905724d898dcc475618c29eafdaf653e8f6b8a5c7a097657b2e31e3ed2ed996dda
-MISC metadata.xml 371 BLAKE2B e3aa2f77efbcbec1594a706abd1dfc68d0145e130dac28ce0d74e5f956238db4bf3a336006778d864c07737f4b28cc2ecc5ea0cedff28c0efbf1f089f3b22647 SHA512 d72f0dcf63d0b7e94b2766256156206c42a471f5828e6fbccb2073276c22db002523b3c40c0d8b145545d161e6820ca575e63b08ff69eb7a4ddc5a590056efa4
diff --git a/dev-python/carrot/carrot-0.10.7-r1.ebuild b/dev-python/carrot/carrot-0.10.7-r1.ebuild
deleted file mode 100644
index 26f4797bd611..000000000000
--- a/dev-python/carrot/carrot-0.10.7-r1.ebuild
+++ /dev/null
@@ -1,31 +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="AMQP Messaging Framework for Python"
-HOMEPAGE="https://github.com/ask/carrot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-python/anyjson[${PYTHON_USEDEP}]
-	>=dev-python/amqplib-0.6[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-# Half of tests fail
-
-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/carrot/metadata.xml b/dev-python/carrot/metadata.xml
deleted file mode 100644
index 30229b1cffcf..000000000000
--- a/dev-python/carrot/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">carrot</remote-id>
-    <remote-id type="github">ask/carrot</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/case/Manifest b/dev-python/case/Manifest
index 3f127092a7db..f6cf0ca8cf4e 100644
--- a/dev-python/case/Manifest
+++ b/dev-python/case/Manifest
@@ -1,5 +1,5 @@
 DIST case-1.5.2.tar.gz 58382 BLAKE2B f5924a7bf276087e469ec43780791e7eb223daf9649eadb79060066ea0125931e5534762b148b0b3b65805bd05c7111bdb0b598df12d056535c01662260eeb5f SHA512 82c0ed9a788fb57c4109cdbe24822fdaeb59fdfd5d7ebe0c93a39e8e2a2745e911d6dc1b679ac46e263eb6041bbc0ab46b20f3850c12f8f63324cabe145ebdd6
 DIST case-1.5.3.tar.gz 58469 BLAKE2B e535664cc616ac14d1b13e01abe44544fa470030895237711456eefe1aff0b79876b2225344065416149f7de444bf4dc5bef22a184b148e059a8b1f38a394619 SHA512 ae98a571c282f80c685c42ab1dc578847fe88cf8cd07faff505a8df8e3282a602908a8780ab88b36851e3ee6f3c178405e5c50776fd0f49fcc990087575f2958
-EBUILD case-1.5.2-r1.ebuild 591 BLAKE2B e606a5ced40d2efe228c30539c2f9519887a4bd95149274ce0ee36395a544427092d0039506898c052be7674a892b8662550821ef9523ce0634b819bee46b08e SHA512 b0e4ba07b7becd688068f7521c241546fa58460e7c20238860c83d79576a64ad1a55479a26920c9405c494ca42dc5d13aaf7382d49b1307706190d2f7a26db47
-EBUILD case-1.5.3.ebuild 591 BLAKE2B 96f6394b97718d6a1c9de0b91c2f70774269b98490baa9114ee9e4b390cffe9538bc9ebc4fd80545cad5a676e0c7534e66edbffff6fa6cd30d0bb96221c253cb SHA512 ca65c4cf3d19448ecca13bde8f4fc3d4ebe588298b3039e7c75b888ddc1cb6aa5b909e6cd28fd4ccbf1dc2fb43278da43a573bf84fd6b8fbcc8930d272252b54
+EBUILD case-1.5.2-r1.ebuild 582 BLAKE2B 0fa5ba7048c1f84c4f9658dee4b208e526693d230afba5b64effbf957d2d423c236912fc4d440aecdf26a08732ce2c3913d9df0b3d42a09952f9fb4327d5c91c SHA512 33351c5a6c93cb5077717a8f5f5fc1181bdc35b34c6ca5b8ead70dfb0368594f2476c38c639d5fdb92506b014a79d19242469feffdf27135fd74b006e80940e1
+EBUILD case-1.5.3.ebuild 584 BLAKE2B f1a57535f6615f9470397e9ec9c35095d13e48f34c812dcf26f51781b0b17e36475ad00276087be1ec2de5287ad27b9bd0530a0522175e8fa5266dcc7fca2eea SHA512 60cad791a9e6f23e84fb5ae3428764a1f5acf655516bce92e394be2b0d927066d59783e26302370c4f2feb000d35f5a4a8d7a56ece1f45b501dc1a1280b6a2e0
 MISC metadata.xml 336 BLAKE2B 4190ad7722be2f40f19911895aa86b9181bac364174de9b3e9016c541b0f1ddf53114533a6ccba680cebd510d411ac2a1f5d32abf04a71016dd7243143d8c7d5 SHA512 c0fdd3bfed03072c578a781b4aeb08728b17c8f9b22f4ac346cd993604fd634de8f94b7803c73f7285f87bc4f0a2245536f9a9bab8a254052bf10b8c979a3a28
diff --git a/dev-python/case/case-1.5.2-r1.ebuild b/dev-python/case/case-1.5.2-r1.ebuild
index ba9bda320a7f..d078118426be 100644
--- a/dev-python/case/case-1.5.2-r1.ebuild
+++ b/dev-python/case/case-1.5.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/case/case-1.5.3.ebuild b/dev-python/case/case-1.5.3.ebuild
index ed1215f2e85b..6a8f2b244ed3 100644
--- a/dev-python/case/case-1.5.3.ebuild
+++ b/dev-python/case/case-1.5.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
index 2d7af22afd00..b84fbfc242c8 100644
--- a/dev-python/castellan/Manifest
+++ b/dev-python/castellan/Manifest
@@ -1,7 +1,3 @@
-DIST castellan-0.12.2.tar.gz 50938 BLAKE2B 03cec0cd85042c482432bef7a0115413a9ea03aab05555dc1d4a65b5cb9893b57e2164a5174fb984c8ffcd190b27f9c26552dc242f9d79e3d60dce5a4a27479e SHA512 11ed1eb7fa1e5721f26afe23299ac7b0d13b4570b1f0670f4b13ac05149bdb9b9daa85cd1b29374f7d67eaa22957088b2f42313e23d8c0adf4edef108f7b44d9
-DIST castellan-0.17.0.tar.gz 61193 BLAKE2B 91f9a4d6b495bd4bb8f1f00a9b2435a892a7ea2f6f64d36423aee3c87250deda73cdcb2070e12cb1c38c5ca716c4365d489990e7b07f35fa7e6e597eda442af7 SHA512 21b702cf73cf62456d677d01706f23e9d64c726d06d867d61559b0b221e016f519c067c1f10e540fb25bb73841ef633b7b4a602ed13ae64456aaa4843ee19c53
 DIST castellan-1.2.2.tar.gz 67085 BLAKE2B 5a6af5fd91e1371ed9024bf09f31bc5b9e7d55455a61c6c23f62fe84d80f717e83c96f2c72375c37537fe4fb7484b7a16e668f6e37ffa14bfa04f6e1fb69eaeb SHA512 3777180ecc2a2a26c917d89dff28d2ff9e20e1de86249b0e5cda63027394dd8b5a763314135bebba3d2b6194825068c9a7c1c32a4a1e3185caaed74a105aa032
-EBUILD castellan-0.12.2.ebuild 1421 BLAKE2B 640fb3331c3de63ddc6682375f85937c28ee34eb94cd4cb1d6dfeab68a50a16cd0c4e1e4ff497bafaf7f6d9b891cf4a37caeed848b8301547f37e5b66d2ef271 SHA512 7ee40ef7618f58aa6c859b06cdfdd8bb7b3e88367816203ce18f6f85376128380185aaa90b787cbd92a3c7fde1ed4cc7cb5da570ff32f57aea50db36925ff038
-EBUILD castellan-0.17.0.ebuild 1277 BLAKE2B db956a21ae27a161bfda9840fb4592e3c4726c135cfdcb64f334e53bedf20dff5c769125168a2c349f939cc17894847d0799e4eafbe782e2cb16437b9e1d5961 SHA512 0b1186adc1767db61b4d316f8f768004f0d1928c39a9ecdbe665de38b8992073e333fadd15fab9a502618bc6c65104bac0516f74c66073dc4bb4d197904339df
-EBUILD castellan-1.2.2.ebuild 1110 BLAKE2B 908cf045e448c3e3935cb64a37982cf4c90693037a72d0c2ff6a143b4e83c1609e3e4ffe88e166f5b16d0ca84b92eec46dbc6b21ba6cde73f3ed80578bc48f59 SHA512 3ff9e4c61be7c8310ec7c7e002d8a6a95ea48fa8369bbfd9bd3d9ea5fabc75444beb5495ac7cddd6c527607d454812f8f62fc2439bce46d2d13664a7d3f5d376
+EBUILD castellan-1.2.2.ebuild 1098 BLAKE2B 054592ce40101386e2795b1aaef7e9e400f72a322183a0f4305ca784975b7962864b0aef6d2d198657b2e8a9ab8e2591a9926281cc2ce11b9c245fe4aa4f5542 SHA512 2f0e198b9920586feb08629468f48c5ed959c2fd69c7c1f2d27bf08f558a05d9dc4bba80099c6ff5fb8c64977f3865882f8d63e6983e3c0fda61fc00ef684d8a
 MISC metadata.xml 326 BLAKE2B 5ce95fc1eeafa570c9910dd492a822dfeb251bb98c5b341281ee99e7402be32234fc38bbca1b7ea0fbb67f8bc88e9b1a1c85da73f79d2a9ffc3a69289da507b4 SHA512 f8d928ab94ac70a7a3c2548b67a6296b8e86b5e239a9c74cc4b1a120f64c1e2e2084612b025e26fa3c02099f543ce156e5419a5f6ea165eff79b2dd77e9a2d66
diff --git a/dev-python/castellan/castellan-0.12.2.ebuild b/dev-python/castellan/castellan-0.12.2.ebuild
deleted file mode 100644
index bef3946fa030..000000000000
--- a/dev-python/castellan/castellan-0.12.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic Key Manager interface for OpenStack"
-HOMEPAGE="https://pypi.org/project/castellan/"
-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/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/castellan/castellan-0.17.0.ebuild b/dev-python/castellan/castellan-0.17.0.ebuild
deleted file mode 100644
index 87bb4e00c211..000000000000
--- a/dev-python/castellan/castellan-0.17.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic Key Manager interface for OpenStack"
-HOMEPAGE="https://pypi.org/project/castellan/"
-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/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/castellan/castellan-1.2.2.ebuild b/dev-python/castellan/castellan-1.2.2.ebuild
index b9201cc5b8e9..8c30a552b997 100644
--- a/dev-python/castellan/castellan-1.2.2.ebuild
+++ b/dev-python/castellan/castellan-1.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/casttube/Manifest b/dev-python/casttube/Manifest
new file mode 100644
index 000000000000..840cb7a3d59f
--- /dev/null
+++ b/dev-python/casttube/Manifest
@@ -0,0 +1,3 @@
+DIST casttube-0.2.0.tar.gz 3760 BLAKE2B d4e37fb0e98f2e9197e7e1a78b45109d0319f9b4337ef86d0dcd5797e703960162432990b9c4d26796ce5cc957179023044b86a9b07c8e581d13373889c6c824 SHA512 0ab69a92d49a9095c0adb70fec95011447d1f2a57e7642504d2ab4f19fc5f93b09db0e5d277bf7876311e5f26067a687bde58e3aa12469dcc6778486fc19c836
+EBUILD casttube-0.2.0.ebuild 524 BLAKE2B 489b7f9b235d1a09621092ab2f3b546edc968944bfa531b26022aa3afdfdc791eeb5721ced4ba3cd8f501c6c1722bd17b218bbe6da604f6ba42e0943043f3ce0 SHA512 28adadfa6a157353446927d56a1572cfdadcc8e86f3bf78f1ccc0b5f048cfab5eefa2717cb98c4bc7e51b4292952a04f8bca2814032a5b1879cf5cab3bced325
+MISC metadata.xml 454 BLAKE2B 4e344ff1bd14e77af4be34248975293d7a1539e2c3d639319da62d410617469de124e17e7e9b93e08b9a304db1bd6c85474fa4532e91e5e47059ef0f8b15237d SHA512 f3e86a08b9b0507e69dd28fa09461909957f2867d043fadfd369e9894f12cffd89254cbc67f97bf4d7cf3e8831b085a9532a6aac81090ee204a17ad9a3728e3b
diff --git a/dev-python/casttube/casttube-0.2.0.ebuild b/dev-python/casttube/casttube-0.2.0.ebuild
new file mode 100644
index 000000000000..6d11275e5628
--- /dev/null
+++ b/dev-python/casttube/casttube-0.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="casttube provides a way to interact with the Youtube Chromecast api."
+HOMEPAGE="https://github.com/ur1katz/casttube"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND=""
diff --git a/dev-python/casttube/metadata.xml b/dev-python/casttube/metadata.xml
new file mode 100644
index 000000000000..09f75100735c
--- /dev/null
+++ b/dev-python/casttube/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+			casttube provides a way to interact with the Youtube Chromecast api.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index d5f048021782..6b7797e3bb14 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -4,8 +4,8 @@ AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a
 DIST catkin_pkg-0.4.12-gh.tar.gz 61535 BLAKE2B 9b1a60cfc6bfda6e0f126f062cf62636df162577d693aaa07c4e7433f74383686224c31e0d567a95de20e2643c39f84781be3f82b39d9dfbbd1aed0dd397587e SHA512 227a6f07a46ab62d51f408a8aa08d57199a8f4d7c954421bf9a605fce3a0dc447c9379987bcacbed3bce139f00e95bd565286a530b7177acfc29a172da30f7dd
 DIST catkin_pkg-0.4.13-gh.tar.gz 61790 BLAKE2B b879b6e71c84863fdcbca1023dd5850a226c850e47348a5ce3cfa846bd4dfb7fe0fa2c406003b4d1a0ae7ab97e57a983a499c3a27851d3101c928765c9620cdf SHA512 b971019fe2f8e66639d271ce3a7933368a4af7658d143cb042a315492926a4b0c3593dc9f784ea75150aa048266219fe80f2a104adc6d361a6725d4b24aef330
 DIST catkin_pkg-0.4.15-gh.tar.gz 63376 BLAKE2B 14eaddbc4dd544c26556033699806ee7596a0b262fc8c445696df468d3031ee63ec6c5e74c0a99569fd3faccf79202809b5e85e5ad5655d2f529d25b3d62ce1b SHA512 568f169e8fff5c4e41fdd02cbb4549dac99361a83241acbf15d3a3f2ae72f9230cab147eaa79688ce8e59d91f49096c8c57f73bb5fbfa89a41ac37aac9841f22
-EBUILD catkin_pkg-0.4.12.ebuild 1261 BLAKE2B f87a0620dd3b010ed3ed8a61bd19cb79e83f248ad544d88ae201ff83a19640b2503eccb8661975288668ab59ae025a4430f8f281a881545230e71534481f09c8 SHA512 de46f9758296ae0471f67a2ad4a8127e29c0b518439889a4710a0fe7546065f3ed463396c68e40de6bee061df5d165d12170a7151411ff545f733fba1ceb3a3e
-EBUILD catkin_pkg-0.4.13.ebuild 1261 BLAKE2B f87a0620dd3b010ed3ed8a61bd19cb79e83f248ad544d88ae201ff83a19640b2503eccb8661975288668ab59ae025a4430f8f281a881545230e71534481f09c8 SHA512 de46f9758296ae0471f67a2ad4a8127e29c0b518439889a4710a0fe7546065f3ed463396c68e40de6bee061df5d165d12170a7151411ff545f733fba1ceb3a3e
-EBUILD catkin_pkg-0.4.15.ebuild 1265 BLAKE2B 25f93ab5ca1bc1f56a435b704ec3422f0cefdb972195ec7c5a8b86d85a3aff3a868cffbe89291743abac4d821753000f6290bac8e6a8ad6dc79e78f026124929 SHA512 fb8c95bfb6a0904b0ff79c41cd8dca432460ada2734190270e411c794e87f26292b07686a1977bc24431f7cea94cf798009fc3e0bd9858a6113c89807e2c5322
-EBUILD catkin_pkg-9999.ebuild 1265 BLAKE2B 25f93ab5ca1bc1f56a435b704ec3422f0cefdb972195ec7c5a8b86d85a3aff3a868cffbe89291743abac4d821753000f6290bac8e6a8ad6dc79e78f026124929 SHA512 fb8c95bfb6a0904b0ff79c41cd8dca432460ada2734190270e411c794e87f26292b07686a1977bc24431f7cea94cf798009fc3e0bd9858a6113c89807e2c5322
+EBUILD catkin_pkg-0.4.12.ebuild 1254 BLAKE2B 6c11e00c5b16a7b7a272644eca05ff61dc1bf562b9ec607fad5e1efcfb7215817ea34914667271f018a80885c90600753547f5d458f203a23c0533a55b055ec2 SHA512 86e1397862c5af4f31491c000a2c1c62e8b28b65565c1822ae272733d2acc403e26279aadc79927805c3ac000bd5cdae46c9f1eb85339af81bb7ce3d4bf3b76f
+EBUILD catkin_pkg-0.4.13.ebuild 1254 BLAKE2B 6c11e00c5b16a7b7a272644eca05ff61dc1bf562b9ec607fad5e1efcfb7215817ea34914667271f018a80885c90600753547f5d458f203a23c0533a55b055ec2 SHA512 86e1397862c5af4f31491c000a2c1c62e8b28b65565c1822ae272733d2acc403e26279aadc79927805c3ac000bd5cdae46c9f1eb85339af81bb7ce3d4bf3b76f
+EBUILD catkin_pkg-0.4.15.ebuild 1258 BLAKE2B d4efe5ee074e46b82098153b78f19de0ea9084c454a385e79734bc9328433e4c635e544a0a6ed66bd819bc18ef79da14f657702961cd04a07f7d4fb4aaacf528 SHA512 27e3bd14ddc99d80f67508d039df5130b65b83f509573e4b65fa4ce5c0dfd845fab1598fcd829745e02c776a2d91f96c9f1fcb4e7d73b072d261cf693ee16e43
+EBUILD catkin_pkg-9999.ebuild 1258 BLAKE2B d4efe5ee074e46b82098153b78f19de0ea9084c454a385e79734bc9328433e4c635e544a0a6ed66bd819bc18ef79da14f657702961cd04a07f7d4fb4aaacf528 SHA512 27e3bd14ddc99d80f67508d039df5130b65b83f509573e4b65fa4ce5c0dfd845fab1598fcd829745e02c776a2d91f96c9f1fcb4e7d73b072d261cf693ee16e43
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild
index ceddd52d1f42..60470f9cf46f 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
index ceddd52d1f42..60470f9cf46f 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild
index 6ddb6178b793..4bea3cb1417b 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 6ddb6178b793..4bea3cb1417b 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
index b1c1113645d7..22c92363f555 100644
--- a/dev-python/cbor/Manifest
+++ b/dev-python/cbor/Manifest
@@ -1,3 +1,3 @@
 DIST cbor-1.0.0.tar.gz 20096 BLAKE2B 0e15bc4984155c1046836c94f3025f8dd451aaad438c78de25a739738e6de8d3ff3e737dbaeaace3d837be08e9702a3b7d18d840c0bc5459cd3919159eabd728 SHA512 996b61c7d16cbe8bd7b056d09286a17f3a6a29cb97ef9e5ca1d1bfe8c53393ae3d2b7565c937a283cb78f377af14c070bd663aabbce995dc7e5b9d2f69a6ba73
-EBUILD cbor-1.0.0.ebuild 498 BLAKE2B 49f9d0dbdd9702e492bd5e31bb2bfe07e90afb97012edf11d33b6e000ef6d395a0e6f6fe742356e42cc5e83a845451ab78242560b176d405248838337dab259a SHA512 878b43c12bfd69b70d086e08cc9d56fae83ee53afcb85341ef7c66ed065cff73e5f03fff4270b4c7908d838b7959ab77fe13b61e71fe1341af9d29d31fa841dc
+EBUILD cbor-1.0.0.ebuild 494 BLAKE2B 429ab2997fd0b52c4ecf5d5d66715044ae1d53a8ae2df908986aa683ea0db32883ef6d2841ce86cc51aae2a0537ff25e369facd71494bb153f5804deb004c81d SHA512 b57fed6e3c3a8b111ba600d82418b43c42fa256c83c7717906ddd8dc30271a5fbffd8e0b982fbbac5e6457c9cf75082e1021ff1c977315576095853837aae1fe
 MISC metadata.xml 996 BLAKE2B 086a81c0714c78e89681623baec48d9b2ef864a107a1ef87a2bbccc1de657f96e6250f03e028f724e59b6bd70fe9970255d4bd2c13faf20b696a9fd330fbf36d SHA512 eadcb582ff299f943fedef2af5932750a9530f3de9c0962d1a288eb667eec5933ce5b96b5fa9212a3b4020f70b5686ead34e2591f24aec64f1b21c2ff7a69e6b
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild b/dev-python/cbor/cbor-1.0.0.ebuild
index 3db5b91c12d5..2373bdc11cf7 100644
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ b/dev-python/cbor/cbor-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ccdproc/Manifest b/dev-python/ccdproc/Manifest
deleted file mode 100644
index ca0d11c7ef4d..000000000000
--- a/dev-python/ccdproc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ccdproc-1.1.0.tar.gz 493426 BLAKE2B dec23d02d4ff5d61e2b348a0d68eb48d45b701456dac7242f183e892319759697a6737b0bba2afca29ea56acf42d25d62da8e3129e5fa23a9544f9c5034a0c60 SHA512 72c55df91e2ede41898af0631d83121f7e13f468c16da570e6fca5742f431914be7da5e030f62041fb59b2d8c721b4250205d7b733d8bbb2becb15d9b98607be
-DIST ccdproc-1.2.0.tar.gz 504810 BLAKE2B c890a1c289aabd9bb07365020cc1834478613329bb47e3e904c0fdbec660f1d23ddd5656a2a5af60bf1c760789e5b947c7f199be62fcf66fa780399fdfa1a77c SHA512 f9f400aedf46ea7614e5a958f65e058dc081604b3bed499cdabe6abf4df3c4d1457469aaa15511edf1a2518f98e6d6fe8677a5b89b01b2dde4c0d0817d8c64df
-EBUILD ccdproc-1.1.0.ebuild 1211 BLAKE2B 61bffd3d7b40fc1779cfec6d88ce041267e2732d03690eef4024c39a80cb3440f792f012ce9aefe7f0f407b645bf67856b298c7da1eefcc909e3fb81e4aaa616 SHA512 7a827bfbb24e0ec18e3db488a7bf5e7fccc66de2cf139a4879d4a99d4fc92b3168dccb27835781d59333d848953d8c6fc3046c557a217624016d9d19cf5f80bd
-EBUILD ccdproc-1.2.0.ebuild 1259 BLAKE2B 85d105ce5953b6aa25a2ff9f86ebb647b6c3238055a524c37e57be98d340366ca304ad9b6266cdb21afbacdd57db538a07867d40789a17f70f57a20a9d53c537 SHA512 c48bcea67604d1234e6a7b3bf1f395d28994edde32a5bd5e5cc5b0d2ad7948a24f950a92b2ea1cf69c948a6751449559af0797823d67f89428e8f4b2f2beb2e1
-MISC metadata.xml 656 BLAKE2B cece38e1f945f48a8e82858505d281a1154296d1dc6cb41845046e901aa8ad39110d8cb7a8a4f6de699ebf62560ac95af46b9385aabe44f6969bcaf3db88e95a SHA512 49c3ba25e1411c6a55a1adf61ebb6ff13f2843b5e66a7672d4359bcf5c21710b946b78693a55665eab835629fff37fa60c41a473f757ddb8a4d5cbe2e3cdce81
diff --git a/dev-python/ccdproc/ccdproc-1.1.0.ebuild b/dev-python/ccdproc/ccdproc-1.1.0.ebuild
deleted file mode 100644
index 7d8d58105a24..000000000000
--- a/dev-python/ccdproc/ccdproc-1.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Astropy affiliated package for reducing optical/IR CCD data"
-HOMEPAGE="https://github.com/astropy/ccdproc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DOCS=( README.rst )
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-			dev-python/astroscrappy[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/reproject[${PYTHON_USEDEP}]
-		  )"
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ccdproc/ccdproc-1.2.0.ebuild b/dev-python/ccdproc/ccdproc-1.2.0.ebuild
deleted file mode 100644
index b859d5a5fa0e..000000000000
--- a/dev-python/ccdproc/ccdproc-1.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Astropy affiliated package for reducing optical/IR CCD data"
-HOMEPAGE="https://github.com/astropy/ccdproc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DOCS=( README.rst )
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-			dev-python/astroscrappy[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/reproject[${PYTHON_USEDEP}]
-			sci-libs/scikits_image[${PYTHON_USEDEP}]
-		  )"
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ccdproc/metadata.xml b/dev-python/ccdproc/metadata.xml
deleted file mode 100644
index 8c6cd2dde78c..000000000000
--- a/dev-python/ccdproc/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 type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    ccdproc is a AstroPy-affliated package for the basic reduction of
-    CCD images. It provides a framework for accounting for error propagation
-    and bad pixel tracking through the reduction steps.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">ccdproc</remote-id>
-    <remote-id type="github">astropy/ccdproc</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index 1c711e609d9e..56af385c3836 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -2,6 +2,6 @@ AUX celery.confd-r2 1442 BLAKE2B df6ab3585c12fef2272979ad3412f08827f59e9306b7b99
 AUX celery.initd-r2 4303 BLAKE2B 259821a93fc84c45580e06bcb4aa36b72a26290c917afea86b6e095489a1abde7b00f3ed91fa699452b4b7635d71bd72fd12ef9f46a3452f1f0d69c841c83b29 SHA512 722b5d526cad15589a4c26c4871c11255f8f1550b6d6a9d503962c07a6c60167d411f47135d55408acb6320636f885fff28e7691d74831ec1c2bb9d5dc48f3e2
 DIST celery-4.1.0.tar.gz 1331689 BLAKE2B ac134d26a21bfd1172ea7a2ccc5f9934b4fdf56dccb6f840726040adf5b81ab0c675c0c93754340c0429c4eb5777a344be74415a795a9dd6654578979609cecd SHA512 5232adc43ba55d01f2b030382075750033e0c5c2abdc8308903e0cef7a465513b7765e2ae495da6555b377452ae233500530ef9d57e584a5352a54c5f4731c64
 DIST celery-4.3.0.tar.gz 1434073 BLAKE2B 47d9d461a9bf3d3418a7cb37684f53cce58ef1d1bee928e74cc8b6ff8e9bfde19d99a59d7a8ef7b638efa24263d5b35f50c774fb5f81e9c693c9d3c6242015ac SHA512 6a4f99857c2b329eddb5200934b2c83bc2377b5b89ccbcfed548d8f52cff40800db7b94ea321f74e932ea4be42a546fb9b515569266435cecdbe204a0a891b2f
-EBUILD celery-4.1.0.ebuild 3488 BLAKE2B ecc58546db8779426ba8eee81e7ac82389452ebfd5a7f0a726b1c6451912f8979b388e23b33e4208151a3db086c857431fdfae8b32949da8be9df26d646c3a91 SHA512 1ccf38ebf9ec46e0e9d20512cea35a925ae0001ee74f7ed24ceb2cb03472b75bb4ce34dfbf6f2a2a60047b611e30110c7ce36ad7d957daacfa3cf6a4e498b449
-EBUILD celery-4.3.0.ebuild 4112 BLAKE2B 4c0afd7bd0a5af4f8ee4cb348732633f3604ba54f9dfa8863687181b199e03099c52d1bfd410b7e2274f058e8dc37e1933ee2d2d2a2bca902acd767c523dec7c SHA512 c16981166a34959e5b79b223cf546073b50a1fd6c3f18d010b67feae93c76b3be74226f628434e03441e83f76955c23f2a833f1e73639d5a2cced36b0cc8a3a9
+EBUILD celery-4.1.0.ebuild 3484 BLAKE2B 7f007cabefa307f4254b9b07c1794248132b38cc94ff2404c7418a1449d578575ff7402d06dd318d4436b647122fae3fbdddb19c7162380e9d36f72b44f2ce66 SHA512 5e4e0275f6112e2d75c3342d40bfe20d0b1fe7433e2cb877a7bb9528086a6d98d91fd15c1e9b9c450758d82724b357ffbbe45544ec7b999d8d715cc39c0037c3
+EBUILD celery-4.3.0.ebuild 4110 BLAKE2B 90117fe431faa35d9e9fa31ab09bcb6ef1dc95be29576878290d1cb03e5d50cd16631d8dbfaa490a20ea70a202c36d6cb853a1923befd3711e1c4dc1147853be SHA512 2aa8725ed897164ac8debfad286573812f225d7b3d8d30886628e0a1e7929309b325fa370a70f04cadd745ad71320f2323215dea199c0e236764d907b3683c13
 MISC metadata.xml 528 BLAKE2B e7c57658c1e2d86d4f437649706c340148e6c713e7e1fa8fae06e60afb332562683bcef6f4946555664a1d1a916857addb1e3134c49edd20245fbee58468eab2 SHA512 73fe8a564452f48193e92c3c72368868fb0a6c4ea54e836ac91547f8acd190a4c653b6770f36fb645b4aaad86ed720a4cf4793a8cbfaf3188ac297708508d59d
diff --git a/dev-python/celery/celery-4.1.0.ebuild b/dev-python/celery/celery-4.1.0.ebuild
index abae2734b997..623202a77643 100644
--- a/dev-python/celery/celery-4.1.0.ebuild
+++ b/dev-python/celery/celery-4.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 bash-completion-r1
 
diff --git a/dev-python/celery/celery-4.3.0.ebuild b/dev-python/celery/celery-4.3.0.ebuild
index 3776ae77abe0..4259161d25fd 100644
--- a/dev-python/celery/celery-4.3.0.ebuild
+++ b/dev-python/celery/celery-4.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit bash-completion-r1 distutils-r1 eutils
 
diff --git a/dev-python/cement/Manifest b/dev-python/cement/Manifest
deleted file mode 100644
index b8aeca3f03bf..000000000000
--- a/dev-python/cement/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX cement-2.6.2-exmples.patch 518 BLAKE2B deb3d8c6c0a182f00070388cc4dc30c768f5cc840227a087e085aa44c53572ef57fa00ef5d909c08abf44d833140ac9403361030c5b99526d75c6972da89216c SHA512 3a1fc644346dc8cf5001be298e73734b729b31c8e0bff57b131247e768b9e6b91c4bb8b9206d94e211599796916732af105a0b5aedadbd8087e2e5eae80e2a4a
-AUX tests-installation.patch 595 BLAKE2B 5db6b1d97f0e07d630468421f69ed85892d455d03a8ded427d60e370fa96e5c7a25bbe0b3e77c417c4669f19cb74e0aca4504de950966237c66af516b59ce455 SHA512 3f6273a5843c19873ea05f8f61afb00d43281210d523b2260f5e3bf8e84c64c9a8193c1ddfbb09662352e5a92cb291441b3e2bc8e92c1d6d8ade13cdc3c496ff
-DIST cement-2.0.2.tar.gz 81009 BLAKE2B 634dc2f1bde45e60b6936399db8928e4adedc1ef1f5fc2b1dc38022a7dffdde6e7c70ccef9ec81542a29572b4368d963ad48b3d8f1bf51164f13807d15bcd0a1 SHA512 d5fb1e31c72440fb74c1f75084599ab569c669443ff4d80b76929159b80870b19ba895a35f7f8125a8ffe74453be2927f048fedd2cbd422f4bb4d7946f334906
-DIST cement-2.10.0.tar.gz 179447 BLAKE2B 146e942b177be011a96b7cce91f87d5079fd37503ccbae26164114846c6e01964722c9c6ea4238a808e2320b05d103e3f9f9646af0ba6a35bbb420e229fa5f05 SHA512 3a4e2be833628181fe0d6b8ff5b00b7003e05486eafffe29a2c31825a69e74c609965453a2e66d009444cc43361d7c0c14662215ea46957b87a043ed4f0a0848
-EBUILD cement-2.0.2.ebuild 1012 BLAKE2B cc387814457c6d2956bf569b2568e8d869cf66a0e25ee406b36e7cf271a2f651ce392c84809dec708643fe1e5cda7d51293c7832dce8e3554997bbaeeb4e9d72 SHA512 2c6350aafcfc8fb3d69d1ebb47e863afd6896b5359ac38f082a9b4626d63750714c5d59a25f9298420fc943e6ea9c38d43855091a7dcce5337496548ff37db33
-EBUILD cement-2.10.0.ebuild 1324 BLAKE2B ec1dca71f5657cf05fe31a9fe0fff5134d13507e3228753bcac98d808c6a6d2dbe4e8130123f27ba235875edc5ffeb6e493336f254d828be4ccfc97c05d70a73 SHA512 f0c76a031d9409dd287d008bdba377dc50ec4b50dc22e65f71fbec0770abc4eb5d48441898e8621e5f1c2959a6f5428771cc1ece4ba0df7ebfc14eac814ce9fb
-MISC metadata.xml 540 BLAKE2B 5fc8b22211e7b2b6434c45fc55b3a8980470d630859564524189715d608af9b6c4779b2825d67e8d67e342e84c2f88fe04eee355efed399221ac355a815ea3b7 SHA512 58b32c0757712b4e28667d921159e847285bd63c712fee382fa1c83e890a183fea8ffae22bdf088eed936dec152013e8c2bfa63ccfb05a601ed5e43ccfdab4ab
diff --git a/dev-python/cement/cement-2.0.2.ebuild b/dev-python/cement/cement-2.0.2.ebuild
deleted file mode 100644
index 0319dd71c371..000000000000
--- a/dev-python/cement/cement-2.0.2.ebuild
+++ /dev/null
@@ -1,45 +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="CLI Application Framework for Python"
-HOMEPAGE="https://builtoncement.com/"
-SRC_URI="https://github.com/datafolklabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test doc"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( ChangeLog CONTRIBUTORS README.md )
-PATCHES=( "${FILESDIR}"/tests-installation.patch )
-# https://github.com/cement/cement/issues/185
-
-python_test() {
-	nosetests --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cement/cement-2.10.0.ebuild b/dev-python/cement/cement-2.10.0.ebuild
deleted file mode 100644
index f5f4a24d2263..000000000000
--- a/dev-python/cement/cement-2.10.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="CLI Application Framework for Python"
-HOMEPAGE="https://builtoncement.com/"
-SRC_URI="https://github.com/datafolklabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test doc examples"
-
-RDEPEND="
-	dev-python/pystache[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/pylibmc[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( ChangeLog CONTRIBUTORS README.md )
-
-PATCHES=( "${FILESDIR}/${PN}"-2.6.2-exmples.patch )
-
-#https://github.com/datafolklabs/cement/issues/331
-RESTRICT=test
-
-python_test() {
-	nosetests --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	use examples && EXAMPLES=( examples )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cement/files/cement-2.6.2-exmples.patch b/dev-python/cement/files/cement-2.6.2-exmples.patch
deleted file mode 100644
index 09348898c74d..000000000000
--- a/dev-python/cement/files/cement-2.6.2-exmples.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index d1318e7..ee184b5 100644
---- a/setup.py
-+++ b/setup.py
-@@ -40,7 +40,7 @@ setup(name='cement',
-     author_email='team@datafolklabs.com',
-     url='http://builtoncement.org',
-     license='BSD',
--    packages=find_packages(exclude=['ez_setup', 'tests*']),
-+    packages=find_packages(exclude=['ez_setup', 'tests*', 'examples']),
-     include_package_data=True,
-     zip_safe=False,
-     test_suite='nose.collector',
diff --git a/dev-python/cement/files/tests-installation.patch b/dev-python/cement/files/tests-installation.patch
deleted file mode 100644
index d93926b2100d..000000000000
--- a/dev-python/cement/files/tests-installation.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit a952b0a202e05dd2a1222840be70da77a62095b5
-Author: yac <yac@blesmrt.net>
-Date:   Fri Mar 29 20:21:49 2013 +0100
-
-    fixes 185
-
-diff --git a/setup.py b/setup.py
-index 31225f7..4544edd 100644
---- a/setup.py
-+++ b/setup.py
-@@ -29,7 +29,7 @@ setup(name='cement',
-     author_email='derks@bjdierkes.com',
-     url='http://builtoncement.org',
-     license='BSD',
--    packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
-+    packages=find_packages(exclude=['ez_setup', 'examples', 'tests*']),
-     include_package_data=True,
-     zip_safe=False,
-     test_suite='nose.collector',
diff --git a/dev-python/cement/metadata.xml b/dev-python/cement/metadata.xml
deleted file mode 100644
index 9ece43a263d5..000000000000
--- a/dev-python/cement/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		Cement is an advanced CLI Application Framework for Python. Its goal is to introduce a standard, and feature-full platform for both simple and complex command line applications as well as support rapid development needs without sacrificing quality.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index bd0891cafddf..ea631f7fa2fa 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -3,8 +3,8 @@ DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78a
 DIST certifi-2019.11.28.tar.gz 156407 BLAKE2B 61fdee083aa1f5467bb4a6a65c9cdff2eb9e88261b4702f9d03b53abebb9f9815499a0cbcb53e983e81d5c54ed40e2ff7b351c19c90b2340373414e7e8afaea6 SHA512 6821444f02db0d9d03ab1891731178af1d7858df3c729f079147a9c588cf97a456e050da3421a0d2a3559145610826669034a8d46cd50b7c76e90249db1b09ad
 DIST certifi-2019.6.16.tar.gz 156721 BLAKE2B 3990a9c122dbaf554f4482ad97192efa66f1cf54e83bd4ee67248bbea8797dc4da38ab537230a8263a491a2a2115528138965480ef4da6d6cba9ac2af5bff830 SHA512 4641626bc5073cd0b3a520855ddef1007dcb42933baa7a3469856f936e725581042bcbd5b67e984ba9748e7faa62b9125cba7dc160dcc5db2eafe46461a29f5e
 DIST certifi-2019.9.11.tar.gz 154855 BLAKE2B 1a2e39b44e2285bcf2dfc0104873fc2c5004c54b346a27beebffa28894c22ba77b7ba0b17131e686846be14c2200ea0fba89f8b465f4c61139122d88d6d1ebf6 SHA512 aab5734bf65cbad12772bb120153b0325a5c3226339e0a03fdf4c3413303feb930b6d53d1d9dab93bd4f3cf00d2bfbe86419c4c462570340f1a4aa143a31373c
-EBUILD certifi-2018.4.16.ebuild 1394 BLAKE2B 631b8ac0be4695a24f478114a02e6bb39b6c0dd7bdcc43c030017d7130f8ccd88c93e269dba52597238984ea8ce171be56b366ac549f54e321569ebb71363d4d SHA512 520854ce5851c12139c5fd05d0bfb2abe3a61429d34dfacdbaa8d74cad8027d9f2a34d450b618f2ebe46ab8c586f12318dd5d6166edf7166f701d8f923ec0f20
-EBUILD certifi-2019.11.28.ebuild 1402 BLAKE2B 08bdd49c696001a2817ebfd2d59978dbedbf8eda2eb10b32bdbe1c33183f835c8656cb36e5fa01c938754961bfd1cbf498e0ece792b5901055e2a9007877fd09 SHA512 70ebad533cad1e523fa5ebdfc6cb3854d25817a41f5495862de2dcec15f9e819ea2dc65cbb263d50dbce1c1445dcc362caaf7ce5f4d08c268fb63b8d8d767339
-EBUILD certifi-2019.6.16.ebuild 1380 BLAKE2B 7180aa27e17db38fd7cdd36cfc20da801f6d87f2db041e8f5c1a0da23a4bcd6b9ae249e975a2e5df80134f2bbb34a10db7e07400ffdcdbfbd293caa9dd0ab07f SHA512 9b6a32ae29ec76ca6e7dc355634b2dc67e5fa8d414d5c6fdbb3f06fda4fa156fe74bd8a97e4650380777ccec20d0882802c200dfc28e25c16c98c63de749f5e9
-EBUILD certifi-2019.9.11.ebuild 1402 BLAKE2B 08bdd49c696001a2817ebfd2d59978dbedbf8eda2eb10b32bdbe1c33183f835c8656cb36e5fa01c938754961bfd1cbf498e0ece792b5901055e2a9007877fd09 SHA512 70ebad533cad1e523fa5ebdfc6cb3854d25817a41f5495862de2dcec15f9e819ea2dc65cbb263d50dbce1c1445dcc362caaf7ce5f4d08c268fb63b8d8d767339
+EBUILD certifi-2018.4.16.ebuild 1387 BLAKE2B b4d64d96a2050b9c5b908e7b7c852993a0af931668c6a63b468557f9ae8e7b7a75f1a01bf20564c7b4663b0263eda1fa43faef241a121d546c3195f9b24667d9 SHA512 c35fbec1c9d20d874e26b832c56617a7db3e244d2c0c5d29a3e43d3131b4c4f5188e177a528c8d6053423b115f5e2b37b82bcf9368adbb711ecf5c1b481118dc
+EBUILD certifi-2019.11.28.ebuild 1397 BLAKE2B 6252b9a806c50d2f8de2a9543f571c986ec9ea1dea1a29d6ceaf2090952329e4d87d31dd777416a90a12ec7fbbea2fd2e0e692490434e05225024b3ef314188f SHA512 7ea1dc8bbcf856b2dfcda268f4a5e4ef6d84e056a45b97b666d3219247ec751e19ba803428d951ad4109483b44ccf6df5e636dd569f77dcf8535b635594b572b
+EBUILD certifi-2019.6.16.ebuild 1375 BLAKE2B ebf8dc433a17973a10be4cc09a7afd71337d8a076ce11fcb593251c83b02d2703f41e5527b155118a438445f3e0edfe22ab6457c98b40c5718a16b960a786bed SHA512 a8f53596e26512abfb53c278a1e850f6473e7987fa0fc435f8dde66e2c8030a24c5578b38621e2e3c0f0908f5522ff8eda7e4d0645bbeef1fd3820137bbb2ae1
+EBUILD certifi-2019.9.11.ebuild 1397 BLAKE2B 6252b9a806c50d2f8de2a9543f571c986ec9ea1dea1a29d6ceaf2090952329e4d87d31dd777416a90a12ec7fbbea2fd2e0e692490434e05225024b3ef314188f SHA512 7ea1dc8bbcf856b2dfcda268f4a5e4ef6d84e056a45b97b666d3219247ec751e19ba803428d951ad4109483b44ccf6df5e636dd569f77dcf8535b635594b572b
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2018.4.16.ebuild b/dev-python/certifi/certifi-2018.4.16.ebuild
index cad00a0fee49..416a75c33567 100644
--- a/dev-python/certifi/certifi-2018.4.16.ebuild
+++ b/dev-python/certifi/certifi-2018.4.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 prefix readme.gentoo-r1 versionator
 
diff --git a/dev-python/certifi/certifi-2019.11.28.ebuild b/dev-python/certifi/certifi-2019.11.28.ebuild
index ba409ef85575..217f48bd96ea 100644
--- a/dev-python/certifi/certifi-2019.11.28.ebuild
+++ b/dev-python/certifi/certifi-2019.11.28.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 prefix readme.gentoo-r1
 
diff --git a/dev-python/certifi/certifi-2019.6.16.ebuild b/dev-python/certifi/certifi-2019.6.16.ebuild
index b5a4c3be2473..8ccdc9753502 100644
--- a/dev-python/certifi/certifi-2019.6.16.ebuild
+++ b/dev-python/certifi/certifi-2019.6.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 prefix readme.gentoo-r1
 
diff --git a/dev-python/certifi/certifi-2019.9.11.ebuild b/dev-python/certifi/certifi-2019.9.11.ebuild
index ba409ef85575..217f48bd96ea 100644
--- a/dev-python/certifi/certifi-2019.9.11.ebuild
+++ b/dev-python/certifi/certifi-2019.9.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 prefix readme.gentoo-r1
 
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index be2eb538d521..b4326f83bfe3 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -5,11 +5,11 @@ DIST cffi-1.12.1.tar.gz 453584 BLAKE2B fb0fee63f5cc4dacd1055036ed6e7882452e848df
 DIST cffi-1.12.3.tar.gz 456340 BLAKE2B bac7265ed9b0858d791443572f39316fdf809c8e40b5a2557ccd667858d994cb44368b4b74655813833d3c5cd5c266fbb5227d777db8fcedc599917f31dab7ad SHA512 9070f5cfe543c9261a79f995548899c3e7539ee20f562ba91a4a909887745bd28448b0e38241031d6b2ab87286fd0ec91768b8bf6577716427612d41b0ed3b93
 DIST cffi-1.13.2.tar.gz 460243 BLAKE2B 74603f2b1bde068a955e94912488fd7d8914267ec2d0cbd8574f62376fc24ef16d85d59e9fee7f6015e6d242726ea25235788faddedc68deb56ae71e627d6322 SHA512 2c57d9c06c39e95498a54408dc39940427190f3c03e1b8f1a3584140db08a5775dd12e6e67b03093429c130af579d01519b0fc868b99ba7a530068ed22d38522
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
-EBUILD cffi-1.11.2.ebuild 1491 BLAKE2B 6e5bb4cbaf19f43227d3ddd1cacbf97adb573daac72865a7e209631b92549757694f320c8bc315410d98e69d9deaa984b1e4f3e4ce4b851d093bbf3f9ac8c424 SHA512 99e575a5e9d85b7deb11ab1f32dae93b8d9c7ccd5d46b666890dfb1d98efe38128e93619479127aa50458769c8342ae3da8b15c10e51948c4b165b654ada2bb9
-EBUILD cffi-1.11.4.ebuild 1480 BLAKE2B 354d245b6d37c73aa98f567fda2c0081fdd4b268d0087164218ea4742718e95205f0dfd41c18714f5f257201512176df5a50b4190ef6d9f2b892293972d0f94b SHA512 d2361253ea42d6bc50ace5394eee3058b10b2182f6db8edeaad9ea9636ebbc8460442c5cdb3b1e50c2be649714f4cd9e7edc3a6b911704613517e5d91d27275b
-EBUILD cffi-1.11.5.ebuild 1582 BLAKE2B 3c8c1002ca7b3ad277ae2222a0168285700e9f0a445a81445f32e4419d8d325ccd0e303d9c1fffc3e6b6f107043ff2f8e9bf10324198f9c32495c69aa9ad4e6b SHA512 1a87a24cbe82d17aa4676296567d5c660764053065f297cd9f048def18fa85716db9f861d8307af7f4b1d63a82cc32870fc4a6a1d646f7a30c3f536d3727e462
-EBUILD cffi-1.12.1.ebuild 1582 BLAKE2B 3c8c1002ca7b3ad277ae2222a0168285700e9f0a445a81445f32e4419d8d325ccd0e303d9c1fffc3e6b6f107043ff2f8e9bf10324198f9c32495c69aa9ad4e6b SHA512 1a87a24cbe82d17aa4676296567d5c660764053065f297cd9f048def18fa85716db9f861d8307af7f4b1d63a82cc32870fc4a6a1d646f7a30c3f536d3727e462
-EBUILD cffi-1.12.3.ebuild 1519 BLAKE2B d51e6d9d0d8b5762b359fcf63e4ffbf93df75de6bbe5e300ca18507979b21f7ea774e4b1db59b481f19ad7ee2f24fba266c575f0c6a201f8345349d9903e1e69 SHA512 23c72b4a6ccfdf666159e8bfd9efe88a1dccb58874754a4cb5ab35040b447b91b534a3c4c84d51829c28817bb197fbbea0d47060cf7adfdcf7e242d7906f3529
-EBUILD cffi-1.13.2.ebuild 1266 BLAKE2B 102c0804a9299ba7feead3a07677b104f958fdaccc2b4b28212374061f0cc14713a722acdf6c94f26c3dcb647193d1cb9940c32d1e79606701bb3dda744b151f SHA512 7eb6bc837f3057ac423f8ac181eb8b768d1b5c3a4ec48d9314a61c3f6bdd4dfd53d68b607bc0206c0fdb65dcfbf09b76a33970943c24b16436609806908299c3
-EBUILD cffi-1.9.1.ebuild 1481 BLAKE2B a1f6ea34fb65784e00f04e22bb1df51a1944af481c3e573911448137f32d7be40b264916158a9e835d17f9a80d9ff23e3048e98275fa9b3426d9081b33557eb9 SHA512 e4e57197c669ec81d7d98e7b447fed58395857ee6b61f21754dada6dcb17fe942e855b3b26095c039c6830d1af67d5e3962950cbeb77adf5c6d6633ca08c8f2e
+EBUILD cffi-1.11.2.ebuild 1487 BLAKE2B 200c098a677558ccc64dad4aa6e18a4b9e4bab053739bcec60f755fcc762e118cf5013663c426df5772b8bcbdd88714bc2d730fc2a4563c6947765186bafaa58 SHA512 3213245482b1ef824d885024e13cd30fafe9821bd56dea28b61b62d8dcd8b31773754cc33652a80ac4e5dfa3f21a83c40c524453a793d5d1a7e1ef57c58e9a23
+EBUILD cffi-1.11.4.ebuild 1476 BLAKE2B d51ca55c31ca13491922f95c1befd72638980ffca533bc8242dd182de74cee455a2abb1e166d6a19a58cc5e33c4f03ab493b63178283e4da7fea57fe10cd08c0 SHA512 d1a96611f0d0ed5ff8f826410ec8a3c315e7925ec2ca7ba60fc871e1c17d6d544a5eba15f437a77c39c14f7890c9f1ff7dbda18b1f8f74f4c202ac9c3f41cc78
+EBUILD cffi-1.11.5.ebuild 1580 BLAKE2B 73d83e2026ecfcd32a0e24a8e0130d71f63f37802dbebd746063f7dd76b3f2c2426e23f8bbb22319eb801d4c978b33bd73ccce41106383ef74999db32e3416b4 SHA512 393f1e481bbc9354447b9d968b93096d39bf49cbe986214dae320b867660b94999f07f272cd88af89644b9c59da406260b676cdd006ed4d92889deeb7ab12eeb
+EBUILD cffi-1.12.1.ebuild 1580 BLAKE2B 73d83e2026ecfcd32a0e24a8e0130d71f63f37802dbebd746063f7dd76b3f2c2426e23f8bbb22319eb801d4c978b33bd73ccce41106383ef74999db32e3416b4 SHA512 393f1e481bbc9354447b9d968b93096d39bf49cbe986214dae320b867660b94999f07f272cd88af89644b9c59da406260b676cdd006ed4d92889deeb7ab12eeb
+EBUILD cffi-1.12.3.ebuild 1517 BLAKE2B 0e6221f43acbea90657bffc060fbe383f6df28d2c46bcb2fa4330c841edee9c66eefa69f03dd73704a7bd44b2ca3bebb6e3e7858743d0fd0eab5850262ebf9bd SHA512 1d2721232a0c15327231f20ca04e61acb2058835ba83e8545423faa3ec6e8bbddc9431b55b6b38a1e5713ee260f0329e6ae76a4811247bfe1c87a8395305a54c
+EBUILD cffi-1.13.2.ebuild 1264 BLAKE2B 1b37473e1b200092e8879f1b308342d2edf694ad796373be4da4cf6092886b1a2c2c53fc6ce3d193f1c26c4a0eb715c744db3e34d2a698cf6fcf9b6d3e0afc97 SHA512 8548618f09fd67af4f1f017ee7a0572eeea349c5727052b89414fb33fdc92bcd1a179327cad0aaba3c3f37bb937e362bc6506647f637ebcafa81fa1389369e6f
+EBUILD cffi-1.9.1.ebuild 1477 BLAKE2B 6eb014ff874834255b4a83e6105d6a456e473595b7ad91f919ad6997d9f155a46207852043c61c073651ba3cdc6ee21e79509d9f146e2252ac4d10d18b36fdfa SHA512 e6fb68d2a72ac621ad0290661d3f70f1a56d232e7772d39be63ed381ecb96ddabb5b40e80a8131014162872e220487dd28879ed86c315d4d67bff7bb1fb71067
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.11.2.ebuild b/dev-python/cffi/cffi-1.11.2.ebuild
index 7997903d406d..b5cf9755e76d 100644
--- a/dev-python/cffi/cffi-1.11.2.ebuild
+++ b/dev-python/cffi/cffi-1.11.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cffi/cffi-1.11.4.ebuild b/dev-python/cffi/cffi-1.11.4.ebuild
index 4fa309be531e..54f9c23c845f 100644
--- a/dev-python/cffi/cffi-1.11.4.ebuild
+++ b/dev-python/cffi/cffi-1.11.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cffi/cffi-1.11.5.ebuild b/dev-python/cffi/cffi-1.11.5.ebuild
index 338c67e6375a..18166d476691 100644
--- a/dev-python/cffi/cffi-1.11.5.ebuild
+++ b/dev-python/cffi/cffi-1.11.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/cffi/cffi-1.12.1.ebuild b/dev-python/cffi/cffi-1.12.1.ebuild
index 338c67e6375a..18166d476691 100644
--- a/dev-python/cffi/cffi-1.12.1.ebuild
+++ b/dev-python/cffi/cffi-1.12.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/cffi/cffi-1.12.3.ebuild b/dev-python/cffi/cffi-1.12.3.ebuild
index 227b58619cf0..297c0da19387 100644
--- a/dev-python/cffi/cffi-1.12.3.ebuild
+++ b/dev-python/cffi/cffi-1.12.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/cffi/cffi-1.13.2.ebuild b/dev-python/cffi/cffi-1.13.2.ebuild
index 8cafafe56ca3..d4b10421eed0 100644
--- a/dev-python/cffi/cffi-1.13.2.ebuild
+++ b/dev-python/cffi/cffi-1.13.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/cffi/cffi-1.9.1.ebuild b/dev-python/cffi/cffi-1.9.1.ebuild
index 3b260e715e71..6cd8ed722081 100644
--- a/dev-python/cffi/cffi-1.9.1.ebuild
+++ b/dev-python/cffi/cffi-1.9.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cfgparse/Manifest b/dev-python/cfgparse/Manifest
deleted file mode 100644
index 20bd5bad1edc..000000000000
--- a/dev-python/cfgparse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cfgparse-1.3.zip 98401 BLAKE2B 0d8a6e958a1b681f5b85ab20305fac91300af41456891331a72e8b854921d7c6eec12c6d6354cb260365385e714af4aac0cfbf7b234083f31e33f47f0fde186b SHA512 95d5396f5ca681f67ab701edf6ddd45776f8433c4b5ca08ee7796fd5ac866a709436257e4ddaaaf010dd6b5917d553dc4edceda05fb15720b03691d7c663a55d
-EBUILD cfgparse-1.3-r1.ebuild 474 BLAKE2B 93f66d8b87e3e563b411bc65aa569a0174f31771092e878c7495018339673e71c8960632069357c02ae2e6a59e5bcf7ea165b282a54f38c7e5ba0d796327bf02 SHA512 ca962bb39c42eb797184c1ebc2e5fdd171d29cb9e84253f7eb28b5bea32bcec553a90b003ed5cc7c291d8f930a7b71996d29fba3946030ea8f51cf3f60532982
-MISC metadata.xml 364 BLAKE2B 693621e088f0e05a6222b479763deb4cc5685776173c19ac52e7529d00fa7c74e95f9206a971801e2b8f6ef35732b89294c3ec7cb75f298977b051fad1c1cd41 SHA512 7e82a6bdd1a4d56250e53013773097610cbcd3e8e7c1ad4240733c050d8c3a846d6fe31f7b57b46e8eb84833ec4cf4cc1b3d0072fcce652f93de11bd44c1eb32
diff --git a/dev-python/cfgparse/cfgparse-1.3-r1.ebuild b/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
deleted file mode 100644
index 064a8ef7f86d..000000000000
--- a/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
+++ /dev/null
@@ -1,21 +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="Config File parser for Python"
-HOMEPAGE="http://cfgparse.sourceforge.net https://pypi.org/project/cfgparse/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="PSF-2.3"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-DOCS="README.txt docs/cfgparse.pdf"
diff --git a/dev-python/cfgparse/metadata.xml b/dev-python/cfgparse/metadata.xml
deleted file mode 100644
index 17d447f0d7da..000000000000
--- a/dev-python/cfgparse/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">cfgparse</remote-id>
-		<remote-id type="sourceforge">cfgparse</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 9e3b33c4f395..a23bba89f6ca 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,3 +1,3 @@
 DIST cfn-lint-0.21.6.tar.gz 2149548 BLAKE2B 36bb80d8b656eddc0e0a00e4728e46ff05f12ff93d70295a045602f09d570880bf087f25165ed21641e80f096b93e3cf4c9cf97b6498b330dc53beaba67aa492 SHA512 c263e6e5ccd03ff5b843e9d4ebd74844f1b4053fa766f5300e4cc66745c42e82771e6af73cf950c81bb66f09b4afd5d438bdcf8489a3b9d61d562a7145d04297
-EBUILD cfn-python-lint-0.21.6.ebuild 932 BLAKE2B f6fdc7ac67232f7acdb54e3ff36c7b945dbbef548a7b9036b54e24a9d4de9549641ee8941af2a5f4480491a2a79f427b9ee9b0c5b27bf6e3ba94f38a0c8ab331 SHA512 739166aaee339864d6d521df7141a895036d6170582629c8ec8f67ef4a6d328a6b5c0cc47c4acc899025a30e926e67bd06b9c251aa341081b37658c074189cb2
+EBUILD cfn-python-lint-0.21.6.ebuild 930 BLAKE2B 084ee4759c847e21f92fb2f7c0513d389c4c6274bd8fd9ef9639a22b957bffe2084db5ead9fcc04b49db7d44f192ec8df50d02874476c391822a1cfe2fb6af04 SHA512 e7a3d9e42e77d9bb36309c6ccb5ef8a1055b1e14e20be17faf64602222a9f27d0d2e22c05a46939ec152702f1837b6d81690c24c4594639d8f585e025d98b1dc
 MISC metadata.xml 471 BLAKE2B 3f9bf2f5249caa0794d35fa4e56d2504ab5576cba4b8d1e22d1d8eab30bf4f2e9fef843b4e6d222c478ba5edef63d7805a854ce788b7f2ba51d46aeb60ecdb81 SHA512 99c9ad08011f920bc7d9e5399e9b230eba05bad6da18be859211f83a0895b9a0a74613d854338ae9de9dc3f4308a7701dee819722b5b3921aef4449f1ca45d8c
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild
index 6c7860dfb01f..7efc58b4dcf9 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cgroup-utils/Manifest b/dev-python/cgroup-utils/Manifest
index a6287fd75136..773f7a49c5f9 100644
--- a/dev-python/cgroup-utils/Manifest
+++ b/dev-python/cgroup-utils/Manifest
@@ -1,3 +1,3 @@
 DIST cgroup-utils-0.6.tar.gz 33845 BLAKE2B 1e7688f9dc32cc976acbd0a89e561b6f5537972c286765370cd2d9e090ca95cc122442d82e617b6d7132d35459b7ddd3413060945651593ba7498da22af26ae6 SHA512 5751ad7979812117cd75fc74282fb24f3ee041cc08eaac986544a5f12b7e83c806f0d1bb4c92c32314c5c8af4995dc4f36e023037ed7617907c8f42f97dbf6b5
-EBUILD cgroup-utils-0.6.ebuild 477 BLAKE2B 85a99dea66e022484047e71449684ef41b10b39acc824a2916183327697d627e0646e63ce9340e89130daf11da9046ca5e772ab0cb60375e21f9dffb94046ab6 SHA512 300253a6a31f07f45449f547ad606de830b676c040c1f443c44659d3eddbbbf373e8645ae0931a6583dbf720bbbb775421d2f5c43c03e950b9e66cd588246062
+EBUILD cgroup-utils-0.6.ebuild 467 BLAKE2B e7603493ef261bc0fe94c2d3e4f6fa44851cb53515be0b233c4cefe2c4246b5349c00584ab8dbf76efacdf360286c3bdc85ec8699250e7fad0fe723d60894aae SHA512 44d23e7dc316a48df2ff90f23f50709e6c12e17243dd881540bab8b9e739564027bf4122ec853f0b7450a00e4ce3c71b7fdbc324871cbce82072631a0d15d5a9
 MISC metadata.xml 451 BLAKE2B 062e0315750415c2f65864206c4a9fb474131476a22f13248bf052f89fe275cb8d2deb3701b13944876490610fb15d6772749e04fa853475ea86eb0a775a48c9 SHA512 79e6b6e146a3cb3ad322dffe5a299ed92c800988b943d9fb2080ba2c0572d5adf376948f7f88c529b7d98db3952e295fb2528f235025c841f0df7ed7d01e4484
diff --git a/dev-python/cgroup-utils/cgroup-utils-0.6.ebuild b/dev-python/cgroup-utils/cgroup-utils-0.6.ebuild
index ffbf3e97776b..89e081536178 100644
--- a/dev-python/cgroup-utils/cgroup-utils-0.6.ebuild
+++ b/dev-python/cgroup-utils/cgroup-utils-0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/chai/Manifest b/dev-python/chai/Manifest
index 718b344a647e..1b05fcc6401a 100644
--- a/dev-python/chai/Manifest
+++ b/dev-python/chai/Manifest
@@ -1,3 +1,3 @@
 DIST chai-1.1.1.tar.gz 81684 BLAKE2B 0aa285d3545e445f26f0b088c1b721f2dd14094a8f499cf7b2dde378a20ee15e376e43a91a664be9d6bd11b45d9c2f4606ce5de73743c27b6bb76e9bea409194 SHA512 f51406258327d9a49e820f0489d60e87f576c72232c701e99f96945932ed300582e6dd81608e5b262e2645c4e9c5216ec8f52e98d454c994beac8d1d8137dc87
-EBUILD chai-1.1.1.ebuild 537 BLAKE2B e3021af35ec285cdec75c0e18cbaa8d459816653039981897d85ab25db82cb33838526ad2b5311025747fac19cd51b59d5e6ec1548b58a8ef2c57c7202fbccd7 SHA512 5935447287bc87d6e4c25dae07a69918545529c868fe4439ca9c0a100fd3f335065fdb9a252b66560acf71b7efc4de484b70bd6940e96cc8be0cae89c7be3591
+EBUILD chai-1.1.1.ebuild 533 BLAKE2B 872983bd2f9f1a4fdc2d4c8897906835c1d8e7409d0add1467089368c64bcdf786bf958d4c3c6d64f86d2c61e7f88cecdaf3e80a4f5efdfe0f4454880b7ac42a SHA512 5c6f2aca88181de5388a22c0641e86bb1e9f18e9ddd93670e7345f6069ea714f420a77385d18f22ce3b7e46477f721e539b428ca985dd091bc733db1a831d731
 MISC metadata.xml 362 BLAKE2B 50f7aa3c56d7e09aed14029e4b52d3a1e5b765423e86b5e9df00d11f0b2d12f45b07334e64c1ac01854bcc673ab183e491298bc91537054bd4f3df3a014c5867 SHA512 3adf8064d0528af8205ca600f4f3be089872be7a37cdcb0374f9a8fe9589fe3b807e02a194e0cf08a5dfd08855951c842329b6b81aacf5146465e84cdeef6176
diff --git a/dev-python/chai/chai-1.1.1.ebuild b/dev-python/chai/chai-1.1.1.ebuild
index 93673da698d6..0a45c23a7740 100644
--- a/dev-python/chai/chai-1.1.1.ebuild
+++ b/dev-python/chai/chai-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Easy to use mocking, stubbing and spying framework"
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index f740e36abdbb..4a545edb3648 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,3 +1,3 @@
 DIST Chameleon-2.25.tar.gz 193965 BLAKE2B a6ae7768c52807a82229d75fc044116a77df5ae3032a98e44558a1d2b3ee2f427f3291b7c2895639050ea1e9fda0e6868ca7b8299cbbf1d5e1b0714af0d835c0 SHA512 b2ffc05c6ab5268757ae6a93a0579d8031dfe7e09882f0f3f0b9a25677ecf896af99a8e7cf6bec98648e9c8526365e7e517bc174d36137734968d80f3f14a05d
-EBUILD chameleon-2.25.ebuild 846 BLAKE2B 9125eedd7c1d30bb15d8af1e23f4664fa153068916606beaec7a7bd168a41ef2388cba5a871beeff7be60f71d4cb3c850acadd864661fc76b09cee2fdb449133 SHA512 93d7542748d57b92926f4e19c0ec0cb7884a27db414fdba0b25b95cf8ef10b813bcd0a8b19aa1b6f329e31cf95a1074dcb64e4ca000565103821dd7c0a2d8628
+EBUILD chameleon-2.25.ebuild 837 BLAKE2B c9d43a03cdf61d9f2c6a41ab46e431555f1495b47064306f424e9894b3c817b3d43eee426e5bab5199fa3114aee90cab44fe8703577d115d25c695b9e5837aec SHA512 08ff32c79c214415b0c0be55cef5ce6247c58ae2830d527addfffd16eadd258e01c6b62e5f82471afbbe40fcbd3f20e02ae1346a5a7f492b3288d7c6f23716bc
 MISC metadata.xml 312 BLAKE2B 9cef667b151e7c744637259ffe810e24eff175a6c1544091effc28d2bfcbc8f7d221af7d572662a037a78af3dfeefdf70ee4ea2ec066b798525d686130632c8d SHA512 12c503e809af190746a7f59c4367083bf566e1d908e0166d109cfb507e1b7472ef8574d790d6f9403d9bb6d4246eafa2cdf77ece46dde74ced493c91acf52f1c
diff --git a/dev-python/chameleon/chameleon-2.25.ebuild b/dev-python/chameleon/chameleon-2.25.ebuild
index 81722c16ab42..a82f27e2bb13 100644
--- a/dev-python/chameleon/chameleon-2.25.ebuild
+++ b/dev-python/chameleon/chameleon-2.25.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
index 7d03b5a0581d..2dee937aa70a 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,5 +1,5 @@
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
-EBUILD characteristic-14.3.0-r1.ebuild 1065 BLAKE2B 5e843ba6a7abff9bd21f624de926b25dddd7df5296bed00a22395bb3b8a95bf715261bcd48983127d75d96ab8e10f5dfb4e9b14f2355d00df3a784ff40f63dc6 SHA512 88df76f567856d3336d4aa350bd96327caa0a94836a5e214a8a60be1fd283b66886d20007da314c3a124b66a3eb421acfeff932d56e04ec041f9a9742eff8dc3
-EBUILD characteristic-14.3.0-r2.ebuild 1080 BLAKE2B f37d0867e415a9169c0e6d9b80cd726bd25deaeca3ce6f002298a85e02b08860297300471575922f85dbd9cd65c6b5c9a28be5fb5b2a095d1a7c85b24d219bd1 SHA512 81fa796de0d691a91289dc53c4e9e8032fca53b15187dace8c160ca6189e1e174c00be4ea75ff3316c5ed158fb5b69779ef9404687278156e915006cade0e318
-EBUILD characteristic-14.3.0-r3.ebuild 863 BLAKE2B 17c6db39cf244829a1ef11c9bfd0b6081193cbfc4996045784f3caf1fd3fd590d3a3ccf894d76e7318110d5831e5c789370c34d325fb7b58be93907c394dc777 SHA512 3e6f158da25a17df5748bbdf3f3c075eed0e1eeda41ac678152281fc97aaf4d90a833524607163fb29e0be869db345f066a1e1f557b4c952064decb20d78c56b
+EBUILD characteristic-14.3.0-r1.ebuild 1058 BLAKE2B 923397d69eb96d9ff54f25eb93d06654476071616ed88e265f08e69f074abd63cca671c611ca57d03d21912b4874823713c7784e9ab28bfff96e68ae2464a795 SHA512 0c06726163716a9866f9dde22f4d4afb386dea0374c239945edbdf00682ee305635c5aadbe9e97bff36cd55cdcdf679442aa10690d23abfa8c2bc6088ed58cb6
+EBUILD characteristic-14.3.0-r2.ebuild 1073 BLAKE2B 4d73bdb39bd6b56bb1b04b2e7bd8822c336317ab215a684efd612f39a44ab12fcd3e005cd97b63ba424cb40f7f1aed9c89f8421e8fa83b041ac1842553bd52fe SHA512 e9ecfd05f824745561526ab66a4a6f532c3324b6ad231f467ac5e472c9c7f6cb4f1882bd34d7060b2d4e4690b01bff06e24f4f348748528ad0fa0b10ca27ace9
+EBUILD characteristic-14.3.0-r3.ebuild 858 BLAKE2B e41561a9e97d144d30dfe1390e85c5c670f3a312c9ba4157bc2ddafcdcfc7fc6c7690564649ec6d1b2e4673f2729c6128295c451b3485342aaf70d9e52727abe SHA512 573fe84012542a251271d61f32395880dc3fc2977522254176efddeeba07850d00d16f1d6707b79e72f9abfd497ffb639d96baef64b6ee62090154bd34be592c
 MISC metadata.xml 389 BLAKE2B 0e2226a252bf0308d7bf33b34eee3f035bfd242736b91072eabd77e07216104961c45f8469dcfc3a8871cacb4ed619bebfd3443612bce85d1f2ec4d95a13dd21 SHA512 291bc593113bd6fa148fcb5f978ec1630808a0a6b4ec7fb40b00596c9cd2bd56357fa792af91243d96ac21fdab420d370c0d1f59570e739be22d81b8add56676
diff --git a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
index ca90563a2e66..ff7c1bd331e7 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/characteristic/characteristic-14.3.0-r2.ebuild b/dev-python/characteristic/characteristic-14.3.0-r2.ebuild
index d11fc76b6bd1..0583900f4e1d 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r2.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
index cc3c132af490..7be30e15b3ac 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 735be534e879..7ecea566a8a4 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,4 +1,4 @@
 AUX chardet-3.0.4-pytest-4.patch 802 BLAKE2B 64992866c2f101b41f525a0f8cf642774850211f434b471dcfa5aaadcabd5ceb573d5b902f6cdecc2f651a71dc8955204f13beb8a5261d4d0ff3aa6703a4266d SHA512 ca99abb30e8e221b43b7467cfa385c0abb16addd4befd149e35208278a25faf07dd99edd20595be4d0d0d0afdf81602b47e0110f4e9335ef90f5b4c41b54b0ab
 DIST chardet-3.0.4.tar.gz 1872214 BLAKE2B b93e2d3e0b5a5c35affa5e3ee661323029f79837a1222d8f69db72911301d9490c9788d2effc577eeeb2a50334cc855afc4bdf4b8dbafb143fcc411d93b824a9 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357
-EBUILD chardet-3.0.4.ebuild 915 BLAKE2B bd5afda062113bf0cfbeb8e030134ef792039e00525894befeab09dee5aec822de2e8d602e622afc4bc08b4ced52ab1cdfe88830c2f0c1c98c45ea9d409453ff SHA512 a22cc9171b12e26e09d072777bc299151ab3d462b6dd58b6ee7cd3129329d835a60f6c11d69c3d1ae38c39f8ff4687f75ff25817744af572cffd74ad768d47c9
+EBUILD chardet-3.0.4.ebuild 908 BLAKE2B 0653acd177a134e229d4f1a6e66c2e8dc75954e81ac55f95fcd1b19a1e9851f267add3b4aa0b763d7acc54a641d65fa95c4e45da33b91d8ce16f2a3c9e5a004d SHA512 5692def583978a3784d18c589e7677dcae52c481ba2419c2e6ac500af12c769ed952e1a5716ac308511df1239efe1b87d64cd3b05d6c5af8bd7519c2c1773fbb
 MISC metadata.xml 377 BLAKE2B 8aa19a889e96303024d469c969a9e47613cabd1456b0e21888a02a091049e09a53c6faa3d0e128b5ea21b68f521cede9cf09b570f2fba7a4299187a44e40b018 SHA512 c48c3874a248049fc2845d0a64ee5b94c705ef58158f882f30bbdc561f311a7203cd8979e067a5b0f3f034c95cc4b6da373cea6efc9616f3dabc574772874650
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4.ebuild
index 6dce19acd095..32b7964cedbf 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index 7f5635fd247f..51423f43d8cc 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,3 +1,3 @@
 DIST Cheetah3-3.2.3.tar.gz 875441 BLAKE2B 0fa4a533bd66f98e982312a451f464a2c3fb645916b98aaa92d3af219cb49e252985b4c675a612c1c9265f8028577be4be78b551ad4cdbbaca7f4439624193b9 SHA512 ebc735b59d61912679405469f9d509fc73bbdde51c414320994421849f4a02266d2c286c0f618cab2a592ab47ac0a4be9ec444fab75145a0c31dd0c3c39fc1e3
-EBUILD cheetah3-3.2.3.ebuild 1097 BLAKE2B 8b3c69330a39d6dfe872c11b227fa6c7030b46c7c89aa40352207f082d4c17f9f7e9d1f75d3bd536c67e76e26241c78849e5405fd69bc452c8a321fad5808ae9 SHA512 1e41a33d9ef1fe1bbcc2f6b45639b28d8722b950f0ebc705ef8c31300435aafa9a2b1ecf11e6e278718356078555a652ccc608481bc052055f76f5474abf840b
+EBUILD cheetah3-3.2.3.ebuild 1095 BLAKE2B e17987d4cbb7d1325e4857c1ec53bcce97caeca742780957b99ea43e962f9b2f7ea3a47286dda066103663d08c93583b98b9b169134f2cbeb8259be05655fb78 SHA512 ee337a07d1db64dc59fe5648200ea23be996766b27747313f891a87ca11c5068ce80efcd9da992ace500ee6748e56a97ab8a1b1b257646544c73e78f695bd02a
 MISC metadata.xml 662 BLAKE2B 3dfe6898c1c2b60050da8427fd4e51a07ba7870120ce491166b9fd222bbaa49e7df7ba3afafe8b159a7b60f781da67dc0dfdf03f085e813cb3f6d59169ecc526 SHA512 b15fac64b057cc9216aaa21002332ec348e89a618ba4c32dd8b9622afd17d7d8db6ef6c3e7c645ad0a03b306c50b79322f5ad1866db93f1033e69b1c7d6130a1
diff --git a/dev-python/cheetah3/cheetah3-3.2.3.ebuild b/dev-python/cheetah3/cheetah3-3.2.3.ebuild
index 202438225dd0..a8d49c8a73be 100644
--- a/dev-python/cheetah3/cheetah3-3.2.3.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 4f39e9b61909..95f3c86f1eb5 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -2,8 +2,8 @@ AUX 6.5.4-fix-requirements.patch 272 BLAKE2B 9694f577198f94ee1634468750f4ca8a1d6
 DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
 DIST cheroot-6.5.4.tar.gz 81067 BLAKE2B 5304373bb8c7cefa341260d4fdb8a99b9e22041260342a716a6b95ba324b4f31d20fb44d8dc10840fb35d3b04de1283deb9aca11bc78772655bf7ad81cf16f3c SHA512 62a48ced225bf9167259b82f5e88a953bdc422982a6c0b0121b28e895cc8347cc033f573b57a048c59167586e0b21e94ad233ce2b65a1b72feb01db82b5ed411
 DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360 SHA512 3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862
-EBUILD cheroot-6.0.0-r1.ebuild 955 BLAKE2B 35b6bd32f07d9233b58d4e5131c2d1862bd6076aafe892d9173db83e9560144a3ec68aafc69ec5166315f2e4fbb306cf83880eefa842bcea99b72a76ed9dd1c4 SHA512 82427c2440b1cb7d3a503f48e921bbbe0cb071b1569b4d368e4dc5db167ce1a088231eefd0fdddb7e6e1316213dec92485911be3053088d5fa3901017b377c18
-EBUILD cheroot-6.0.0.ebuild 958 BLAKE2B 51c9af6ee0f97e9272868db1e474c13b9537cc4d7a98570a156f579e21316d974dab66a4272e9d6dbe823eb5df8cf3bcae3e49331653abee03588d90f9c49f48 SHA512 37df682e8a6db897984e367dee6ce6d1bec2ded9abfbb1a478fed617746770b52fa239c53788b26c7341c3a40037d940509755c821c4a407dd67779357f9d875
-EBUILD cheroot-6.5.4.ebuild 1757 BLAKE2B 91d67e14734ec541797afbfd6579c4bb30147500a7c51a7c8ddce734624cdf9653de60a0c22b73352e13e407a867eaf58e0a315023dcc652b5a5aaa8be18a5a9 SHA512 24fe894299387b4c92ed4aaf7ac7e710dee58923e22dc846e415b2916746bfa8ac19f078a91a50dc9141605d2b52a0e36fe5935edb0b001d77b1aecbd8d1da73
-EBUILD cheroot-8.2.1.ebuild 1688 BLAKE2B 575f9b0b92f3bfc131d3d144d670d576df95883f418c1e4ed3d874f599d76c13abc3d1a6e6b073c4f550f44d51127326d1d0411c92138c2b2f2af9d07671c82a SHA512 1ab5484ae856fc4810039e42efcb2d2823f02769dd13e8952e9efdaff0dc82c01c6b877df32e12ab0f1aaad9a59ddf1781793344ef69ff2bfbb230f9a5b4ea80
+EBUILD cheroot-6.0.0-r1.ebuild 953 BLAKE2B 91b0ed39a656cf1157b220f9e782a581f75da7a6a575795c459012ed04e4a7544ceefab0562adec37f621627ccd16d49839d237b5a91ef619b7adca455b34942 SHA512 b6e6421785bc4cde9b19ef1284cd6dad2b89f4da3f56e21ed8389af1c93a5848be1128b4bbf58ee2df29dac58afab6c623df226a0f40877fa1c76af20d2fa899
+EBUILD cheroot-6.0.0.ebuild 949 BLAKE2B a960c8098e908eb8f9340251983fc0101d7323c8fe95be8e0448ed7cc0ae454991884e511bdbde85d25a545bdfb9c235490841da2848933d28b569cf7348e031 SHA512 19132e54d92488ee8cf1ef7a675c41a4113d3e605afc2ef94855f536ec2218046092264877b92b0e0627af92805d77148f9372ac38b40b02539c5832fc5e6b5f
+EBUILD cheroot-6.5.4.ebuild 1755 BLAKE2B 469b56035d63347f3b50636461b4b06d3752ec49a66103fda38c5e4c797fe3e07ac27a2af8c2596a00ce7700ea3e7c3df088b4f2c84ae11c0f1724fe238e01f8 SHA512 1d19f865b105af315a7fd5c940d4e5a43982010be7c904f947d15b7b7604579b71d083277b7dccf0ac8616f954b4d9fe9089d7f0b1f174997211567e1924402e
+EBUILD cheroot-8.2.1.ebuild 1686 BLAKE2B 6bedefdadffc34796acf70d670c88ff7bd49b49f61520cfbfaf04820999e2e3fbf9ddf3bbe04df4b84c8fe3f3daf92646b560aea62c6b49d945b6f95d1811d2d SHA512 d68e7fd571c487b73f0c91ba6eb15bd32cbbb25790d9b4cdf1cca1482dbad931e4e85a1dfce0fd196d5037dd8a5403215af703265fd40d5e81533c7f29c8ed1f
 MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
diff --git a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
index df19109dc7dc..521f18df2856 100644
--- a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild
index 5ce25b8c2b27..b92338f529eb 100644
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cheroot/cheroot-6.5.4.ebuild b/dev-python/cheroot/cheroot-6.5.4.ebuild
index 52823236539b..56b20f23d4f6 100644
--- a/dev-python/cheroot/cheroot-6.5.4.ebuild
+++ b/dev-python/cheroot/cheroot-6.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cheroot/cheroot-8.2.1.ebuild b/dev-python/cheroot/cheroot-8.2.1.ebuild
index 88bb64a5d8bf..38c6aac0d28a 100644
--- a/dev-python/cheroot/cheroot-8.2.1.ebuild
+++ b/dev-python/cheroot/cheroot-8.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index c0122d697cf9..9c614e0622ed 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -2,9 +2,9 @@ DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa85
 DIST CherryPy-17.4.1.tar.gz 684113 BLAKE2B 8922c1f6c3e7ac654f84dbc56c7ae17e9ba83e01132dc6a34413064879a5fe22b1dcaa0eac7415b23cf9dc4fe54fd3e5d078121b354599b30c89f69f107208f6 SHA512 588aef80b12bdd27d83fabd466add12753d62760cd0c6beca8ecb78a0cd1e04a507327409bd4cd3c6e6e6133922e06c2f8c6ee2877b42ca635f8001812a4bd8e
 DIST CherryPy-18.1.0.tar.gz 682792 BLAKE2B 0e072bf21656778ff8d64e87a6b19c8c5e9a3057312ebd3155b3b876432709f6f205f267cd9a105727153d458daab3e7113ffe9b3c49f911bd956bf72a19086c SHA512 58ae40ef62efeda051bf5dd35768a599094792d06a0e7c6e34c21cc5b003b700f43a02460d38a00067d255939e341fc438d248e3499fad76ccc8100f8eac94d3
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
-EBUILD cherrypy-13.1.0-r1.ebuild 1335 BLAKE2B b2856a92766143958c5836ca1daf4c6b62a19326c67ec38b25a70077486a73eab04636409503c7d5f8ac5f4cfc348465598ad778295aac5444c7b9c8f5406077 SHA512 5281245a61c96babab87c05c9731045789f1b3a6e3a26417cf760479ac2449469aef119d813c1652f1655e2c785f7086518c3068f4e9e15c278cd8cf6862e96f
-EBUILD cherrypy-13.1.0.ebuild 1337 BLAKE2B e937473571a4c985c69692bb68baa1ac8c67a00f023fab91bc9d9186132bd9005be76cf8fec256ef16d47888da567686914478cf6998ccc8faab7383dcf37826 SHA512 f60d4c06af4c66bc56950e0e47180d14e44ae7be74222cdfd7dbc54885314f7160b175858452eda8f03b6ab07e8d22e43a247d19e400ab8f86c7272834f9cea5
-EBUILD cherrypy-17.4.1-r1.ebuild 1870 BLAKE2B 3a5b1968d388086d88e32ab75c69d75200edbd29a945b29afd2755a6980438a9db0e0ce4944ca106567f293002e999341ebde1ae2441304c6240b1056673f08b SHA512 708725ef083c55b1c323b94e3a54b8836899874f6b1e3a1fc538f61c29ccb25f416956a7941d484d81b2a41e24fa09fbaae40df1ac9226729ca0eab732a3171e
-EBUILD cherrypy-18.1.0-r1.ebuild 1867 BLAKE2B 808c36f22bea951fcb7e9db3a6a104387c5ad4e72849263f194a214a399f0b34fdfe9c89c56238f1e4c6ed52a003623c0e15f659161348bfc3e806e4db2365b9 SHA512 2ea24fd2b46137c0c4c1358fa08c5e2cdd495161bd4b390cfd6e3802c8560e55d098d122c5288b8a507df56653a8be9dde4ad20585728c68821523ea9a2b9a6d
-EBUILD cherrypy-3.8.0.ebuild 1653 BLAKE2B 425320ba12aea5967ab3a67db824c962c1d9cb01a022a506eda9e74b26adb2bdbe0b0a078982dfb66baa12479e06ee6be537c1eea01392250c70469c17b32618 SHA512 57a9b9520476d06e73431b681f81f98d5a56f4c7ab39e20c4ec63720a913fedb97397d11403e6ab3f74727e0951ba5767db741492a8cc5745e96a47a37972151
+EBUILD cherrypy-13.1.0-r1.ebuild 1333 BLAKE2B 13654a74a00c7aaeb88082e17addcc2d0b218f1cf87e20aba9d97e3395e9f9b0b04cb2e79e5b87d99c742941b0c963c548915feba275e7222eeb4ac92963aea6 SHA512 b34c869296eb7d409c72c1e2c466b1cfafa87f1980736ffba2eb7612ba82ec1a6bc945c1606e0acf38d993cd5be9b111f2e1f0897a6a78eb0705d1e5207a2236
+EBUILD cherrypy-13.1.0.ebuild 1328 BLAKE2B e82b1edf805d27c309ac58c2d9b2145c175a9e042f6830a6eb84776dcfbd84c5f950ca1b3ccc11b33e925550d413a70e1ad287617d24f40466300964bb60f1f0 SHA512 014cddd7b0a27c531864f9e849f2e63d92ecb231ece860bd3fa7051533e65ffdddbef845da1d7f0664af6591d8805bcbbf7c04b7689a6f2b5df98cfedcd82cde
+EBUILD cherrypy-17.4.1-r1.ebuild 1868 BLAKE2B f8b9434e763c4fe1f32f6367336dd892d50a3ebb80d0cca6cf81e2517183a5161d016f7919ac4dab39273dca8811b7a674cfe2f97575e112b15cba2e9accb752 SHA512 d2df7bb63575680ef596c02f6075861fc531c4361338d8e78a7c40fc8a16c28f3bf51c063a3dd12ecc4c1c65cdd81bbf2d81ed92890428d39dabed7fd968ee78
+EBUILD cherrypy-18.1.0-r1.ebuild 1865 BLAKE2B 834646e7469b9f243ca11816ef9aaf15a581f0fa25e5714033b19a6fc0cb2808b26c511fe33fd55083335a7bb4434df03e3e3d38e50a9707d716b035cde695f2 SHA512 e8b105e377d0388da923ae185551ada0709b8c7f5eb2c59ccc7fcbe9f641f4a33748440cab929e1ad389497a3f7fa191c7cb84c5f8abd193920401077cbabd8c
+EBUILD cherrypy-3.8.0.ebuild 1644 BLAKE2B bf220dcc718bc88d841ae178415456c0c7e87a8f802fca72a9b0cec7e7ecc83cae2606bc1d2ac35484b55f0f6acbbcb3d1f51a572538c955ddc9fe32e4a91ed6 SHA512 f00bad2b5503302f1d248cae5f23f59c8efce2bd415da9fe1de0a3caf18a11f1f7e4560791be70c88ebc106786875ce94f5b6bd82d644b87d294aed5e39cfb19
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild b/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild
index af6fa84bae5b..d56e06649b0e 100644
--- a/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cherrypy/cherrypy-13.1.0.ebuild b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
index 95d71619592c..eceb096c1e5b 100644
--- a/dev-python/cherrypy/cherrypy-13.1.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cherrypy/cherrypy-17.4.1-r1.ebuild b/dev-python/cherrypy/cherrypy-17.4.1-r1.ebuild
index 521944dbe3de..bc9e5e3927d6 100644
--- a/dev-python/cherrypy/cherrypy-17.4.1-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-17.4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild b/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
index b0b26399f625..830c8b85f9ef 100644
--- a/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cherrypy/cherrypy-3.8.0.ebuild b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
index cdb3a990b7e2..b939cb23d64d 100644
--- a/dev-python/cherrypy/cherrypy-3.8.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cherrytemplate/Manifest b/dev-python/cherrytemplate/Manifest
deleted file mode 100644
index fe0d9511fcd7..000000000000
--- a/dev-python/cherrytemplate/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST CherryTemplate-1.0.0.tar.gz 6227 BLAKE2B d1a07f2ce9681aaaf19bfe16889d96d2760306872d39a004f37fc363533abf6e110874cb31df521e585522f4efbccebeb40f190b557750ba51b83a427b19adb6 SHA512 275a18b29d31fa5a95fa1cc5b72adb923f34fa787fd3ab8c2f2d87c7c32399fd2e1a7b408124320b86d651713fe769a5f81fc76a1ccd9a87d4481bad9111e821
-EBUILD cherrytemplate-1.0.0-r1.ebuild 489 BLAKE2B dcb501df8017f33b91c390282048eed6e3e9f55795126526dd69d2e8e0ca3e872b5c9e845446bcb545ceb217680d2e0d897e4569fd2b32548c3b9f2a7dc90e5b SHA512 f4e5e459475c3fdcb1723ce1135d99f9f75738f5145656cbe575fac7f77e3106abf761a7714395f259c55ed37177b9ba7fb5fe3cd00d5b34f6cc93fd50028f40
-MISC metadata.xml 318 BLAKE2B 6ac3614670025740f543800015791a9bad7d7df196fcdb1d3693f687334a0678dbca5486538ed0afb84b9c76b6fdf3a227b2a8c5404b85c907de32b2b25f3fe5 SHA512 e57e8bcf4af42d06a554dc8b074c20e4b384476c36bacb51475fa53ab600d8a81d3da04b189596063a0b5e372bbc71e362ba6942c9527dae5cccb379732244c6
diff --git a/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild b/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild
deleted file mode 100644
index 758b3150cd3e..000000000000
--- a/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,24 +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
-
-MY_PN="CherryTemplate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Easy and powerful templating module for Python"
-HOMEPAGE="http://cherrytemplate.python-hosting.com/"
-SRC_URI="mirror://sourceforge/cherrypy/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/cherrytemplate/metadata.xml b/dev-python/cherrytemplate/metadata.xml
deleted file mode 100644
index d0393a0e0717..000000000000
--- a/dev-python/cherrytemplate/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="sourceforge">cherrypy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/chump/Manifest b/dev-python/chump/Manifest
index ec97625cae73..c1b52f7edf1e 100644
--- a/dev-python/chump/Manifest
+++ b/dev-python/chump/Manifest
@@ -1,5 +1,5 @@
 DIST chump-1.5.2.tar.gz 12920 BLAKE2B 5fde4774009ebda37e7a9f9c9cfedea3d4e19a9be1aeb165dd867a8ec8cc69385855c22763bc822d3a65d76c70cfe7ef41e4761319dbfaca9587301570765a8d SHA512 6b836bac1ab38c88084f9d6608a9ed88b305847faabcf5de6c13d587e91dc92b21334877cb9290dd56873de40be92f31f2bab3a345c7a7e62259004f5762cda4
 DIST chump-1.6.0.tar.gz 15646 BLAKE2B 8cab76e633fd4084d349115fae925c152439d06acbe629d5c23c474f2dc0a3cb1b5b727b856a9d54a82e39698b3cfd7470086a976cfc6b4870f1af02bac71f87 SHA512 d219f1b9e28dd17f834dc807cd42a288adc4f5579bf97cf6b1833e63f339bd811953c3a74cafad9021beb05cd5fddb46cf49b62a4803c62ece62d037fe38a4ee
-EBUILD chump-1.5.2.ebuild 1071 BLAKE2B bca902b7d9c479bc92994ef2ef6cdac5fa5e6d64de31ab6673e5c41aeee1f3155d785be4ba7cfcf142420b93a627f4eeef912c164f14223c1634423e0dd6f933 SHA512 d5585b47117f8abc9028f0814778f7c4baf8b71ab7dd2deb23186734e27934ecd4ef6d16993c618e3da6aeb067b97ab5df4c439e56316f1eeb0075d02a609fc6
-EBUILD chump-1.6.0.ebuild 870 BLAKE2B a408c4af2f4071febbe737fc975bac074148b401c19961bc3e01bcc7ae65dfd26358351217e4ab2b13000edddad8421288d3172f92911fd3ee813b9e9c9ed27d SHA512 82978ff81057078316b672edd277b2cd372f293c8df14eef8aae78331e587a547be10beee53ff46893b561dfd222d2d197e2264611bf168940c4231a5e45f9e1
+EBUILD chump-1.5.2.ebuild 1061 BLAKE2B 137457bb5812a56aa5e9393311ccaf13326a0f264d98ceda7fd19c7f97b42dffe43ef7ecf5bdd8181d62be9b414de77a9146e1ac40dac0f261d626d9d792b739 SHA512 5fc4dc4b9c932f3ab12387b69913cdeb9bab4a7c845ca19f4457a73f9eaf850a1f27478c7f80fb814a068f703846856b1913c8ecbf12692c0e703d56a453731e
+EBUILD chump-1.6.0.ebuild 862 BLAKE2B 84f43b11ec2ef74a0c9c0fe84f75f3797565e6f033f2f6320a005f8481ef177840554e19ca1507343dcb3601b7cb3ebb91b10537b4a39123cca6445a6e913927 SHA512 7d211f00bfec5fea73807be43bd2540f0e818415379710a6819732f77b520e368926886af72d6dfc6f77420930a747619e0e3ed4868f6a244571f4ece0636841
 MISC metadata.xml 518 BLAKE2B 126300d60995a32912c84d734b465bdc4ad7f4569aeeae7674325dbd44c177431dffb22e05341cc50e8ac0f294617c64c18c11e3b5f7bfb17eb083f48f06ffdc SHA512 bf56b4200d946208832b539649d18f450da83e2bcc31bff902ad8793fb27f823e2e4207175cc13db3ae49f1862b5889a36fa06d27ec412da647cbdb2c4286604
diff --git a/dev-python/chump/chump-1.5.2.ebuild b/dev-python/chump/chump-1.5.2.ebuild
index 5ce7c43c101d..342300311c9c 100644
--- a/dev-python/chump/chump-1.5.2.ebuild
+++ b/dev-python/chump/chump-1.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/chump/chump-1.6.0.ebuild b/dev-python/chump/chump-1.6.0.ebuild
index f2bad783dd2a..4eca65a67580 100644
--- a/dev-python/chump/chump-1.6.0.ebuild
+++ b/dev-python/chump/chump-1.6.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # PyPy is not properly supported:
 # https://github.com/karanlyons/chump/issues/17
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
index 8e70de37e814..b715ca842287 100644
--- a/dev-python/citeproc-py/Manifest
+++ b/dev-python/citeproc-py/Manifest
@@ -1,4 +1,4 @@
 AUX b1a5f925527093b0b5c11507f379a908e3354820.patch 1339 BLAKE2B 0dc159ac56179f13c528a13ad617d1ac52e65b4cc9be59bf6374adcb1ce787ffdc960bc70cc5dcd6287bd9bde4157f0ed1bb1511d2021a476ac61ce9428c2dd1 SHA512 477fc02354cacc75bfc341257caaac23501381c1e233a84a1e0973c98eba350c7cfa1a15503130f3059c0a239c20d5bb5fbde40b754785581c287fadc0183701
 DIST citeproc-py-0.4.0.tar.gz 109786 BLAKE2B 8d8520ad10a9db7b7da1a2febcc594750572a562ada3944e41dd42321a3b9384828ad17e671307b5c4affeca2ec4a3f8e97eec650dad7005323ccb2913ef43d5 SHA512 bdc09a6f632a13cdfa757710c0d137ec73fe590bd01e049847fe013569231426bc72b318133fa34c96c5608b7a30058c27f4cd3d5fa2ba4b0760527b877992d5
-EBUILD citeproc-py-0.4.0-r1.ebuild 569 BLAKE2B d2c29afa11e8c9fcd893233dae45dd6e68a1fc5a41677efb1452b2f9d5a6ae421193c42243e30315c71d2b868ed89a13c2a4594d72baf4bf8b218f51426a55a3 SHA512 f7d96323b61b2208ec1bfff868a6134814a0b3049912f90c06ed34d929d19901da86f0e7a60d4c2fd4d10a18345ffb4856ef16beb561ae2085c06062444b7705
+EBUILD citeproc-py-0.4.0-r1.ebuild 567 BLAKE2B d5eee81c2978334e417d2edbf60696cab10c35dafc31656c61956891de7dc8adf2fcc7968ab8d3a32d688c2ddcf6f7097d8dc5ace21f7c4c50cdd033452638dd SHA512 212939385416e197a489fcbd2b4d6ea64c2fb05d02e6750aa097f444004d3a07659b616aadf29c2d283532efc2904b50085e77ff96d297847c90257700fe6bcb
 MISC metadata.xml 433 BLAKE2B f512298eb65cda00ae88968b103a176640dd993d5e1815a1b414167f90014a74957b2043f7177d3f9ffb7b58cabbfae42cf06894e3247ab65d6ce11ec362477b SHA512 375292332cd82155673005e0a0d189120fadacf98e81f181b9540f40915147e895b7ce5fa3bcf1e924c08619944b65b28745f9b76ee520877abf3c6d94a690fd
diff --git a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
index b81b9c57d500..326dcbec5f6b 100644
--- a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
+++ b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Yet another Python CSL Processor"
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index c6b4bd9c885f..e9e856b0ee6f 100644
--- a/dev-python/cjkwrap/Manifest
+++ b/dev-python/cjkwrap/Manifest
@@ -1,3 +1,3 @@
 DIST cjkwrap-2.2.tar.gz 20995 BLAKE2B 35604e2d1aa24a75e1de0f0b17ba592e7588aade42d43e98864f5d83fe598eaa0ca566682cb7c7af566e66f79c9696ba2ae86b1579681688d6cd31469c07a3ff SHA512 c72ce67b10af46018f7aa5d65af030373e8889a28f533a59d55668e5c90a759ad7cb31708dd6ff35561f9e62115edef5bc0facc74b6a6e122d7399d9dc950624
-EBUILD cjkwrap-2.2.ebuild 472 BLAKE2B b5d00af80bf6fd365675b804e5fcb592c5ab0d6f8520cea33d845e5ef86ecee9077389b0a2626aaeadc411a83294361d73def79525b356dd0cfe7ce4ff335759 SHA512 daa761f55dc12e1a4de8aac76ac82c6005a822d01e17d16bd53ebb41aa9f9bf03234cc92992bb691ac69382912197de8e1d1275b9ceb6c74c31402c5d4c3790d
+EBUILD cjkwrap-2.2.ebuild 470 BLAKE2B 7f859c154c672504dd8b6206847db493e0e7937cc5dd66bf60b0676529b1b075c7816794c0014339feb133656c5add0cb99ec09fbca5bed3e40f5b32a00de32c SHA512 e85dbb70efbafa3f73f9d350e2657a4e657ba519141dba2fcec22e01ba56c9d62ed9236130fa75cac90a17a7c2a4b91d1dcb8dc5836efa76b108ad84e07f3c8c
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-python/cjkwrap/cjkwrap-2.2.ebuild b/dev-python/cjkwrap/cjkwrap-2.2.ebuild
index d8b4cb6c0f8b..979fa3fbe9f9 100644
--- a/dev-python/cjkwrap/cjkwrap-2.2.ebuild
+++ b/dev-python/cjkwrap/cjkwrap-2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5..7} )
+PYTHON_COMPAT=( python2_7 python3_{6..8} )
 inherit distutils-r1
 
 DESCRIPTION="A library for wrapping and filling UTF-8 CJK text"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index d935068509a3..fd341ad237f6 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,13 +1,8 @@
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
-DIST cfe-9.0.0.src.tar.xz 13533024 BLAKE2B 61fa57245d54930d09c2ff6024cdefb35592f7d1c644657b0aec9e7cc2dca29b45f08b8a2b716812025a438841e83ac3e30bb6f051498aa860533995ef7757b1 SHA512 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe
-DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
-DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
-EBUILD clang-python-10.0.0.9999.ebuild 911 BLAKE2B 2be001063777b7960f8a65a96713d2e00b488c6786ff22f99d92607e2cec095d6655d969dfb035f50097044c72b445bf4ae6358fa5a0c33eb55c17f4d8fa53ab SHA512 28cf60ca9bb4b3973dae96063bfa276a56b78649667b450b20c86e1e4ec28738da150df5a2b4285396ee224028dd971fcc2e4e7d457ea3181e35a3bb3d5e3b94
-EBUILD clang-python-7.1.0.ebuild 1087 BLAKE2B 83371e8a63b5345c34a0ada6e669576305ada918be395a7335fac384f3ec7bed0c7087b520b96386e154625972ee303bf8349e8e4da1bc76c5c8839fc8b828a7 SHA512 d8af70530cb8caeaacae8a319474c30681398c083916970e2038bc8f2c480777f745dfea80e9480668d5d2bc480ab6a2b96dd16a2fc04a1feea75ec83f69cf59
-EBUILD clang-python-8.0.1.ebuild 1120 BLAKE2B 525bf364a9900da246a411be0027efa4cc40a8cba995f1eb9979107cfb0973115d944d3528c5e25e30425c6858960eb7cf3678494459f1120ace43b5307acaff SHA512 7861dfa4221d5c9bc676e451053712f162df04509602077756f8232429de9be9d5dd8d57136b309b73b4868b192602e86ed4ab1b7329d2d7cb83a170106ef93c
-EBUILD clang-python-9.0.0.ebuild 934 BLAKE2B cef82e98f864bda0e1ca61c477f448b10ddcd3ed15b1bc7854c81201e451b7400629684dfde3a1637961392c4dea53d7cbe769949daf1617ed25333f1f0e8d60 SHA512 cdc01e1c56bef9b6727985c7b72b8cd10188315393e494366ae49fe255033e247e962c140320d5a40736496b3a14580550b4ee3935a94a26d58256e0d1e76417
-EBUILD clang-python-9.0.1.9999.ebuild 911 BLAKE2B 2be001063777b7960f8a65a96713d2e00b488c6786ff22f99d92607e2cec095d6655d969dfb035f50097044c72b445bf4ae6358fa5a0c33eb55c17f4d8fa53ab SHA512 28cf60ca9bb4b3973dae96063bfa276a56b78649667b450b20c86e1e4ec28738da150df5a2b4285396ee224028dd971fcc2e4e7d457ea3181e35a3bb3d5e3b94
-EBUILD clang-python-9.0.1_rc2.ebuild 934 BLAKE2B cef82e98f864bda0e1ca61c477f448b10ddcd3ed15b1bc7854c81201e451b7400629684dfde3a1637961392c4dea53d7cbe769949daf1617ed25333f1f0e8d60 SHA512 cdc01e1c56bef9b6727985c7b72b8cd10188315393e494366ae49fe255033e247e962c140320d5a40736496b3a14580550b4ee3935a94a26d58256e0d1e76417
-EBUILD clang-python-9.0.1_rc3.ebuild 934 BLAKE2B cef82e98f864bda0e1ca61c477f448b10ddcd3ed15b1bc7854c81201e451b7400629684dfde3a1637961392c4dea53d7cbe769949daf1617ed25333f1f0e8d60 SHA512 cdc01e1c56bef9b6727985c7b72b8cd10188315393e494366ae49fe255033e247e962c140320d5a40736496b3a14580550b4ee3935a94a26d58256e0d1e76417
+DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
+EBUILD clang-python-10.0.0.9999.ebuild 901 BLAKE2B 1f79a09947039b9a8c1f73545d4007232487260d9b3098a34f25511649bcd1aeb51750942762cbbae87fff96b4830d964cd0d7579d5e9a69363aae883a261da3 SHA512 f346e41814484d59e37c12b2c9aa656faddb05f4599e2ba3cb60543eac666d6b265e6a1abf676294a249cce2a85133e577230264c4b4d6b4851c1e92efca5f22
+EBUILD clang-python-7.1.0.ebuild 1077 BLAKE2B c7da5b347a56f6bde3052e3c06ec398741e545e7b3e672282eb531e7acaff55153d648412bd9310134d037fadada36115e37ca10a66c853ea54d8429d102f8b8 SHA512 f5c9100f4e5c11052ba332ffeca078f16b7a1b5b4776e2bcb07e302502816dc8e4931d58931cb167dfc5ae04fc4ff67c35cd428f8db74f4c9ca0b131fa7929e5
+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.0.9999.ebuild b/dev-python/clang-python/clang-python-10.0.0.9999.ebuild
index 3b6ab496dc37..dede9129a35c 100644
--- a/dev-python/clang-python/clang-python-10.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.0.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit llvm.org python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
diff --git a/dev-python/clang-python/clang-python-7.1.0.ebuild b/dev-python/clang-python/clang-python-7.1.0.ebuild
index f1ad33cc876e..a7afb8a3d395 100644
--- a/dev-python/clang-python/clang-python-7.1.0.ebuild
+++ b/dev-python/clang-python/clang-python-7.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-r1
 
 MY_P=cfe-${PV/_/}.src
diff --git a/dev-python/clang-python/clang-python-8.0.1.ebuild b/dev-python/clang-python/clang-python-8.0.1.ebuild
index 292160ae9af4..853ba7aa772f 100644
--- a/dev-python/clang-python/clang-python-8.0.1.ebuild
+++ b/dev-python/clang-python/clang-python-8.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-r1
 
 MY_P=cfe-${PV/_/}.src
diff --git a/dev-python/clang-python/clang-python-9.0.0.ebuild b/dev-python/clang-python/clang-python-9.0.0.ebuild
deleted file mode 100644
index 6796e58d1b11..000000000000
--- a/dev-python/clang-python/clang-python-9.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-9.0.1.9999.ebuild b/dev-python/clang-python/clang-python-9.0.1.9999.ebuild
deleted file mode 100644
index 3b6ab496dc37..000000000000
--- a/dev-python/clang-python/clang-python-9.0.1.9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-9.0.1.ebuild b/dev-python/clang-python/clang-python-9.0.1.ebuild
new file mode 100644
index 000000000000..11516a4a6ead
--- /dev/null
+++ b/dev-python/clang-python/clang-python-9.0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/clang-python-9.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-9.0.1_rc2.ebuild
deleted file mode 100644
index 6796e58d1b11..000000000000
--- a/dev-python/clang-python/clang-python-9.0.1_rc2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-9.0.1_rc3.ebuild b/dev-python/clang-python/clang-python-9.0.1_rc3.ebuild
deleted file mode 100644
index 6796e58d1b11..000000000000
--- a/dev-python/clang-python/clang-python-9.0.1_rc3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index 91ee1f4eef06..bc545e651ba9 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -2,9 +2,9 @@ DIST cli_helpers-0.2.0.tar.gz 33855 BLAKE2B 8509fd6ea4ce1af77a522d36f98261a019d6
 DIST cli_helpers-1.0.0.tar.gz 23269 BLAKE2B 2de1729b32a690d5832cc956c30bdf3ec35b3bfa94d1eed391dc18a1aadfd7229a1cbb4368a08406a3c6bf2bf59c835ac975bee797a58dbb3121c34586632d1f SHA512 8137b081cfe3d226c63cc7c17165f884a42147ea184d11a1e0ee5805f2d22bce37ded580a0c15566bcb057df4c39f2685595d74b2e21d46932e2e635f77eec68
 DIST cli_helpers-1.0.1.tar.gz 23382 BLAKE2B 544bf4165315a6459ba203efc7f55e3a48d4af8a12a4a3dcd4742c9e8f9d72c9163784e4adc42f5910d5ffd42d957aca47f4765e01cc9fc8c17649494b0396c4 SHA512 f4999f20d7f785a143d672ea9e62375dc6cb1abf093796dedcc01003970931a397096cded3515d060b47aa8e38b2a03fbe12f919f84451365d078126a5b35021
 DIST cli_helpers-1.2.1.tar.gz 31104 BLAKE2B ded2b9b7825ddaeb33acf64b65362251f773a4a0a74aec1c79bdd8ef77f8f6953dd8761fd926f7a2b210c69534bee220f88e816dd63277b27db15b400510c9f3 SHA512 299fa4984b7c76e6be0527f040582242a746938f8725b6193895f9bbb835c82078658bbb8d1ea0000c26f3c8d2dad93139fd600e7c8d7c2d89777de27a5b26cf
-EBUILD cli_helpers-0.2.0.ebuild 546 BLAKE2B 1d26923f1cb8db6ca7a42ad6ed3b73c2136e6a5e7fdbd3bc1b982ab71248f537fe89ed6f8c8db444ebeac6c116668e4055a7f5ec2dde90c8f3cda38b378ad71b SHA512 c0d1b017c574d936a1499eb9791f1216a444971dd9915b988c238f442fdefb62595d6b277bb70445cb025bae574e5c5833154b72a0f74dd1c6692a0c4ea8e222
-EBUILD cli_helpers-1.0.0.ebuild 601 BLAKE2B 91b79943d8404e1730cf5a56af2e4cd58a11ef863be685d4db5b5074a2ac39cf407439f53b0bcc48fd109115069ea23acce0d35a11198efca1d1d9da5447f7a0 SHA512 0cbba1ebff44bdcf8ceb7ec5ac10c7c2959455017beacb08a483588dc1dec9830bea185180c8ffec09ec68f667029a8b16eaf089cdfd1c9a496238805905f178
-EBUILD cli_helpers-1.0.1.ebuild 651 BLAKE2B f59049620bc9d66bc472fab7d5fbefa66eeeebcbf375cc9e42471c8005a06e9b1a49e68c1a5be1b053d1f0a640599c0595d67fbbbbdf6c2ec8b4ddb6d8ec98d7 SHA512 caea109dfa202f5eea3e8865d25bb908b99ead7821b4b746761e4f7245fb770859668fc92187a6ae92f2223f8fd8c55774e7c66c4273ded34e49b7a2eb60cc8c
-EBUILD cli_helpers-1.2.1.ebuild 971 BLAKE2B d9093cfec13b41a6f2480406e002582f4e79ff6a3a98fe967f6ab73c5916c432b77cea547eed9c77a530f597c1dd02e659143bb1ab5842c6e1413835a8a41ad2 SHA512 5ae9610d22da8a05147e1f9e5db61d3f46361a3775e4e41f5116d619b39d354a0750d0e1609a6e79a398a1845200872a67af1c403f591b1ef30e3ef8338ab621
-EBUILD cli_helpers-9999.ebuild 959 BLAKE2B 04d3a02e0f236a690fdb8a2aa6b91c64d00fac4042acf3c09e88a1452eb9fe622800c3fae60427159bfc7e54f11baac79adfd3f4c8bd5d3a2be7466430898b97 SHA512 29adea347d6d6e14eb375aba42c307303baecfd5e6b71a9f28b2ec597462c6b31376a8e6d54ef28a3492ef03c8a0d14d36c5d1710d0fbbd800774fdee4122f44
+EBUILD cli_helpers-0.2.0.ebuild 542 BLAKE2B a9a466cd7bfdd03ebecd888beee779e447e8fd2852cedb52ee31125ea4c3435ecea5f3f3e3469c300d1780e017e12644e132c61b203bda84a2d00c6a3de586ae SHA512 380feddc8e658a96edc583f1d3a364fde74753588ef5aa60ace48677c5335923387c4c999804a43d1708a3defe24e6376fb1d7b7b536e5778c10f71127123036
+EBUILD cli_helpers-1.0.0.ebuild 597 BLAKE2B 1ddd10a6041fed0e2b9492a38d68d0a0dc1e0f47106e8b99dc53c36483785d23d490f2a8809e6eb2dafe1a7faec7bfdd725081891e9773da3c622971883d40ec SHA512 d7927852c04fbb126da6419bd6141d5ec24ec81ff7a54e9eddb289f73ce89a0f1d24844e0688a10582321398c74712dd7d0be1bcfd65065a8abafc3139499445
+EBUILD cli_helpers-1.0.1.ebuild 647 BLAKE2B fb010b9e85a9ef2c2fc826a6d2a0312bb1aa8b85299c8342179fdba513fed1568cf03b7205099a78b88e1bab55b8c2c5e5adf6a78896d38c56d145a24b38bd9c SHA512 7e473772892c34f254d8e025ea164e00b7612edd0b9e729975cf7252d9c849eb0bb6a1a5a809eea18b88c930ef2eb748c4396543a349271f789e1369e6d7462b
+EBUILD cli_helpers-1.2.1.ebuild 969 BLAKE2B 8d49945ce303a7c140f9221d47f185eccaa3c09e20cf0b43c949b307b2cfb7a3725451ac6c32626081b4189574fe74b7a0f2dc737a21133c673ee79803d5510e SHA512 e0bacbe86e0c88eab00b12145e062010cd468b8742c806e40b0c3617cd2b77769929b057f8c39b427bb135856b732afe34fe576b972afd4b587655e9223d776e
+EBUILD cli_helpers-9999.ebuild 957 BLAKE2B 7f3e1697e8337701012ef6b3335a3b1e2590c99f7b55ffb5b80fbfcaaeb39de64d8aedad03279948fc9141e3dc4b53a101d75c46fd5a3929194b2d6a66cd54f2 SHA512 961f7d90050be16cb546d89a91f2d18d6bf19a84707091cbf755c9208dc331faad8cc4206372f0adaa67c1aeb5b3678061a7a44c3eeaa78dad03be2b71073759
 MISC metadata.xml 407 BLAKE2B a1128f59da6b44295f47017d6c08b582d58b51b551e4ec866ca0b40778c4353f9c633fbbd3423df0d89b7c85f81caece2fa3a9ce40be2fbf4231961dde1aaf92 SHA512 19d20ea5cc6006d8b35576e7d68167b797eb677cbd62a150f82ac6738ae43d658d9461ae3ed0499b259812ab7b1e4aeb30348436c25fd96e95cc75667fad803c
diff --git a/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild b/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild
index 5ff0fdebe8d8..dc30a060f6a5 100644
--- a/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python helpers for common CLI tasks"
diff --git a/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild b/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild
index bc81c191fb1d..b0424fb4e6d2 100644
--- a/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python helpers for common CLI tasks"
diff --git a/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild b/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild
index 139a1cb6fbe1..b9152ddd69f8 100644
--- a/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python helpers for common CLI tasks"
diff --git a/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild b/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
index c87fb19bc66a..797b09c21cdf 100644
--- a/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="Python helpers for common CLI tasks"
diff --git a/dev-python/cli_helpers/cli_helpers-9999.ebuild b/dev-python/cli_helpers/cli_helpers-9999.ebuild
index edaf342667d6..f90a664aa824 100644
--- a/dev-python/cli_helpers/cli_helpers-9999.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 EGIT_REPO_URI="https://github.com/dbcli/${PN}.git"
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
index ff1496d0918f..78e1c6eeaed2 100644
--- a/dev-python/cliapp/Manifest
+++ b/dev-python/cliapp/Manifest
@@ -1,5 +1,5 @@
 DIST cliapp-1.20170823.tar.gz 54601 BLAKE2B b2a414aa77de872045983a9776e2afd55fa18a5997306f1e532b4b2bb413eedd6a868fe52f91565829be09f42808f745bfefd94ab307a61eb39f64805c3d7cdd SHA512 f66e35faf2cf64d56bfac546cde7e4818d54e4eded9841c788eb7800ea87211594cd9921d6e5f7d2c2b69b031823ab85aba92b09ea204f3b89f060b353a2d311
 DIST cliapp-1.20180812.1.tar.gz 55134 BLAKE2B 184fb65751ce9960f98a62beaeb7ecd4f55cc8bfc9f5dea568900b7be5f5b42277d5ea8b23c20f73c73ab67d605234fe0a5e28660647a985c0de19de0b625ff1 SHA512 61b6f36abb3eefb1c52752e8eb1048c1629c86aa269fcac9c5ee4d875031a040c9c3824131f953dc9bfe568e9e99202750c2e8c11791afe3fce1c1872ce2510d
-EBUILD cliapp-1.20170823.ebuild 660 BLAKE2B 83308ae15f62e466ddd6cb5e57092a2a5ab60d57b9139c5f5280eab19062fb4577f6f8b3d48adce84f7e95bbc8bb1eb7757f89fc60acabafd985222ac88cd6c6 SHA512 376d85afa3b802f4993b88e5302c4389862403ad9a6d67783bcac300042e9fef300f461894ef5b80ceee6554e5313b3fb21105a4a7afaf37686bd7562834ced3
-EBUILD cliapp-1.20180812.1.ebuild 645 BLAKE2B 18000288ac555896e114c2cb0aa2f56ab57748da4d7da6435279a244a546a9e338f81a045879ac4f7574761e09e3bc0a92d77eeddec8b8639c31f88066b80572 SHA512 f761a6e36aedebaa51429f8d7c900daa65ef0e9d062eef53429cf49deae5b6821fe31d4b1bbf3ce13660e94b9404e71217d6c9f09cc384cf8893f14965817e22
+EBUILD cliapp-1.20170823.ebuild 656 BLAKE2B 8e58254a5933195fd4ded924a17a5a8633dac9373690462aba7d59c46902c2afa80d7ba7fc6f2ea5de504068ba61e10e3abcb73ebd5e44272c318cdce34b779c SHA512 4affe84e70fa014e8d9891062e720954199906b7ffe183b580d7732e77c140c12be4ccc8a9c4211f66c5446f4683e86425aaf560cf2346ac8844fb8c7d5758e3
+EBUILD cliapp-1.20180812.1.ebuild 642 BLAKE2B 9b0ec5bd60995b183b948b73af319ddfad0af5e14d9577edde248e9750a54b4c59462378ea21391dfd186a368fb94b187c536950e64757f5bc991163d99b7a64 SHA512 c496d0ed80f27f1dd48af3d5f9fe1668c84beefdb4a3219c0114b2fca2ba75d142cca2567d82983afa97bd2bcc09109f67d68614fca661be8ba45480f366fcd4
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/cliapp/cliapp-1.20170823.ebuild b/dev-python/cliapp/cliapp-1.20170823.ebuild
index b24eb718f6b1..82f944c4e62f 100644
--- a/dev-python/cliapp/cliapp-1.20170823.ebuild
+++ b/dev-python/cliapp/cliapp-1.20170823.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cliapp/cliapp-1.20180812.1.ebuild b/dev-python/cliapp/cliapp-1.20180812.1.ebuild
index b1ade5fe2e11..5ede92770cf8 100644
--- a/dev-python/cliapp/cliapp-1.20180812.1.ebuild
+++ b/dev-python/cliapp/cliapp-1.20180812.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index eb78406eb524..010dc6a9d0c4 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1,3 +1,3 @@
 DIST click-default-group-1.2.2.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
-EBUILD click-default-group-1.2.2.ebuild 611 BLAKE2B 152d763f767c9e0483a8dc38b04ca73b45b351f59ff43e5df896a992e5285bcb61d2e7e775a7074c08d410ef4da62231460dae5714eaeeb41e1b5495b8d3e16c SHA512 e249ffaba07838d0efb712bdd047eb0dd5e867651eaee56dbbe675a6abaea8ba0b4fa57977953941e7e69a6bb4c4b2ce3dd7f84b7d17cb5195990b61d990e906
+EBUILD click-default-group-1.2.2.ebuild 606 BLAKE2B f9b9dabd8ee86bf016ab449e6f8f5ef466aaf78288194d837292c8e714c1379ae5284c6195e06e5d84e5dfae18b373b11ca349a36aa0f779b035668b7eb0ec02 SHA512 68cc5478ff6081a441db05b4a5684b305f6e1d74d9cb740643eed536ffea5ee2c3189afbed4427d66ee5ae12288f7ecbb820e1f6ad49959923914b52809b878a
 MISC metadata.xml 322 BLAKE2B 8a78490ccdc4b51ba871eac8ca74b0e342ed41d8d91f8a4b7c0c824b6447be791604c71f1f59d5151686931a34160b5f5d1979b2760e4aa533b45033ce3d09c9 SHA512 c90048e0f2c412a4d44e289cada3350df7a74a8d87f09b1568085183a37fa6895163fa913f4a3917c34e314a81fedac06d8c24304b1cf619c3489275a2ef1417
diff --git a/dev-python/click-default-group/click-default-group-1.2.2.ebuild b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
index 27f8e2be99d4..d3baa5db9e4d 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Extends click. Group to invoke a command without explicit subcommand name"
diff --git a/dev-python/click-log/Manifest b/dev-python/click-log/Manifest
index d7918a586c69..d137135cf587 100644
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@@ -1,7 +1,7 @@
 DIST click-log-0.1.8.tar.gz 9277 BLAKE2B 656088998bd6753f491e21a96dbd41e02e4decf1043217863478841b258b4d6e1c0ad7ffa983d0138ffccb22206b1f9fbe47ea0dbf305036db32d9810b149b5e SHA512 35baaabc54502f203da2fee02f6f63478f4f902bf333331b6ef9ae4b9d1677020ef0dce9f24f64e6e48bfc31280b72882f7cdf1f42ecf2cd941256d2e96a40e1
 DIST click-log-0.2.1.tar.gz 10062 BLAKE2B bc973ec0a7c9b98567b13bf22cb3732dc4ee9bcabee5cbb4942b9981e78893dc5ffef92142ef02d1d013fcaca81d28d5295ebd83a705adce189f7355fbbfdf7c SHA512 4fd56d4514fe3db74fd626c20579bb4bec559e60194d1b8127007281546e94b7b3248ede4da9f896fbf3e06be97db0ac9e7fe4cfd442848fe7b8e5392eced98f
 DIST click-log-0.3.2.tar.gz 9523 BLAKE2B 212ac421b402fc0f32a9aec11a9e20c87a8148c461af87af78f8068ca95d60cab0c47bf24162aefd1c299ba783fb7a70e7e9dde01f0fc1f7c44a69fa8cb07121 SHA512 8ae5c43d739127367bbcdcf32bfd4b34b2ea1c377948df3b8588e4bfe2b0f5e7a61d1ccc6cb32c77045b15251222866daffa5a7bfb7a907487548784ba345351
-EBUILD click-log-0.1.8.ebuild 529 BLAKE2B b767960e486ce8dd73433f2b0e57d99448bbf5f97497841fb7e9048ca56e341651d93dc8f320d485d75522a53a2afc1678d8431a5275f65081a76bc24b5efe17 SHA512 85d50a5a3331ac31611715a5ea57b709bb03029bf8f1175636d9fe9e1e23db111cb48db15510f45558775b4cba23a2a1eb09bd9e511fa29782cc7f1dc42a2da0
-EBUILD click-log-0.2.1.ebuild 529 BLAKE2B b767960e486ce8dd73433f2b0e57d99448bbf5f97497841fb7e9048ca56e341651d93dc8f320d485d75522a53a2afc1678d8431a5275f65081a76bc24b5efe17 SHA512 85d50a5a3331ac31611715a5ea57b709bb03029bf8f1175636d9fe9e1e23db111cb48db15510f45558775b4cba23a2a1eb09bd9e511fa29782cc7f1dc42a2da0
-EBUILD click-log-0.3.2.ebuild 536 BLAKE2B d52b7b2baf885000e7ece68089b02f6c2c1f24549c67d7877855d9ad1f1c4b385af9dba07d7ca1d15a3b1c806227a2ce52d9476a100b4a86e18d33779f26e36e SHA512 1236fead76aa4412f1b3d7e5360af6f3d9c0a4d0b6e7b520aecfa440fb8051cf2d6c778c2fb51028861ee84d3485cf2b4067afe1563d1dfc14cf97f32ceda10d
+EBUILD click-log-0.1.8.ebuild 525 BLAKE2B f0cf52637e7ccf12750a475fc5c1785bde1327f4bc5856c9ca6991ae03baa0b078758c49a595de4cc04d2ca73f2bf773cd7d38fbfdd08bdb1159e28b2066bc02 SHA512 2b842ffdba50e7ecefbd2863d70cf2c3bb38ddb3caebe7716ca079e59de9e2e7dfd0675614a66c96585d152e36278972133eabdd6e474b3529f4e9ad0b6e7f7c
+EBUILD click-log-0.2.1.ebuild 525 BLAKE2B f0cf52637e7ccf12750a475fc5c1785bde1327f4bc5856c9ca6991ae03baa0b078758c49a595de4cc04d2ca73f2bf773cd7d38fbfdd08bdb1159e28b2066bc02 SHA512 2b842ffdba50e7ecefbd2863d70cf2c3bb38ddb3caebe7716ca079e59de9e2e7dfd0675614a66c96585d152e36278972133eabdd6e474b3529f4e9ad0b6e7f7c
+EBUILD click-log-0.3.2.ebuild 537 BLAKE2B 7e17b1713d3082e5c6c2bf95741045f73e4b9ab8c06653ea2968f9ac50e073044c547076ecc03a07e070f6fc45b5e59b86db39c47f35ef778c4bdc0886b66643 SHA512 e22884b66f1aff9cf9e110078a441d3238c8cc3f37b2c9e8e59cfacb392679cb0eea6e963e80f62cda7e51ecf1e2e925c0bb7a42863a8ff1d3727e03e267175e
 MISC metadata.xml 352 BLAKE2B da4fa1487d5ee53e0f682676dae2d9dbdb581ebe4289d2673ebfe4ab09759b6d7928c24b28cb4ade9a4d55e05c6473356590190327cced4f2b87b723d15d1c2c SHA512 20b7009e52be3fdfd67690972c9ad09d77a505a59bc2a4c65ede59a72e33e7ffeb7c6a663487e01c94aa73507ad5fe4154ee2f9e336c85d8e173c971644e77d4
diff --git a/dev-python/click-log/click-log-0.1.8.ebuild b/dev-python/click-log/click-log-0.1.8.ebuild
index 0a7775893540..c2e850628c03 100644
--- a/dev-python/click-log/click-log-0.1.8.ebuild
+++ b/dev-python/click-log/click-log-0.1.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/click-log/click-log-0.2.1.ebuild b/dev-python/click-log/click-log-0.2.1.ebuild
index 0a7775893540..c2e850628c03 100644
--- a/dev-python/click-log/click-log-0.2.1.ebuild
+++ b/dev-python/click-log/click-log-0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/click-log/click-log-0.3.2.ebuild b/dev-python/click-log/click-log-0.3.2.ebuild
index 7d9bc6d73ff9..6cccea5b2fcd 100644
--- a/dev-python/click-log/click-log-0.3.2.ebuild
+++ b/dev-python/click-log/click-log-0.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
index 9feaa8530608..7f762d903bcc 100644
--- a/dev-python/click-plugins/Manifest
+++ b/dev-python/click-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST click-plugins-1.0.3.tar.gz 7950 BLAKE2B 4ed7d15c37b2eb127faac6179c06467507405d4fd3eb55d93e2210df0eae124167e0206fe9996298abbd7ee26edc8849d5c4062875db12ea92937f225408b4e6 SHA512 1eac03d57931bdf8e2f387164490436b3b921738936ee6cd9a58246e05e84133e77c47dd606a00d1b3e238a806bf83ffe7dc7c758a92d789cc229a94ed26e17f
-EBUILD click-plugins-1.0.3.ebuild 513 BLAKE2B 1fff7b99d514a9f8e7284ec7349134057c02487f46d1c8bf09f53c8ee0197a8240099dc4ea4387f4116645a46b7d65d977dad4b579d1fa9c6a30f470778ef4a7 SHA512 64026e881598b1120c1a51dd21dfc11c363558ec0f9293e16fad2366805a595d54154c70d64d68ba164ddd88984f50759c6b1815ec4ea66cc0878c2198952934
-MISC metadata.xml 299 BLAKE2B 86d5b1fae7081c68356c3991a2b423a2d4326fd29d7db97f3371bccf74ad772f5e53ff22c6fd07fc4442215ff4c36401b0d6c7af59a9584416c4f04f426c1bb4 SHA512 b37fff24719eed45df0c672912037dff92cd7c820316fd17ac532d8aa3d6b04103c837fa436fb4863b4dcaecde2fab4fb35b0e86e2f7c083364be723dc979e61
+EBUILD click-plugins-1.0.3.ebuild 511 BLAKE2B 04881c48c7b063cd866f0df3aa712c2a0f32d060b3652884100d38a9b7aabc21e63f59de7676454d1d3a1c90dc6816bbf7dc43165f5bfe611b6c5482ecbe8706 SHA512 52cf96f9be0aab1b2f7e6853f2f42578f47fdd62d1c0e011584b0bd0ec8ca827e4b81a2c8bda0c8b0c1f00bc0481f3451c48edf99f28a58fdbd0fa3756d69d90
+MISC metadata.xml 248 BLAKE2B db670c3ae382b7098d9d12959aadf4e3adc1e8d9ca4960e6966b63b88a179376cc32540952c9ad5835e5c41f0c8937c383da2ba2d079d78a868b3274bca00330 SHA512 a16675a6c8b0afce6dfc3591b8c30b89454b6a8aece3431d396a0cf0b32d5e19f529e3e514130881657bbd079347cdc1fc9e8ac5fadc07c3dae3cfaec1ad0bbe
diff --git a/dev-python/click-plugins/click-plugins-1.0.3.ebuild b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
index 81a2844d6073..34a162ac2b49 100644
--- a/dev-python/click-plugins/click-plugins-1.0.3.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/click-plugins/metadata.xml b/dev-python/click-plugins/metadata.xml
index fc6c3094d657..9cd89183f850 100644
--- a/dev-python/click-plugins/metadata.xml
+++ b/dev-python/click-plugins/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">click-plugins</remote-id>
   </upstream>
diff --git a/dev-python/click-threading/Manifest b/dev-python/click-threading/Manifest
index fae90a791bf2..f7487a6b04ce 100644
--- a/dev-python/click-threading/Manifest
+++ b/dev-python/click-threading/Manifest
@@ -1,5 +1,5 @@
 DIST click-threading-0.3.0-gh.tar.gz 3759 BLAKE2B 2d91085004c2cd6dd6af2ad4b61284c93ad83b458fb68df0908fdab0de1d87bfd994d3c68cd58e671219b38af55282ee5a17b45a12a4e76e7c40768869ce7968 SHA512 ca535a54f5d88c70c3f8f05f2d423e1b9b0f0b3793a1c04cdc90b61d4fa99f6906a327143dacb2b946ba8c1a9977d9c96ce9caeac9638521641d574316a0bad6
 DIST click-threading-0.4.4-gh.tar.gz 9815 BLAKE2B 57f4cd386c0d1a0ee999ea7ccb91319e8bc2d177e9f52b9979b4a93d68a1c3502f8aa05f163a991a8f78c90692c65d026295a710004035f2c48868453bf2f2a5 SHA512 4a7af23be600cab43dcda267d9d9d3ed0cc885f9829f2412844ac9cd3f0f41d1bea3f157f9e37cc3333c4b0a3d65ab4525edcaeec767850efab5cc037e95e532
-EBUILD click-threading-0.3.0.ebuild 588 BLAKE2B 08d4068a3c5b6403e64404609da61c0d0328846d023726edb21dc74ab32d6c1b8e5847e84d5170ed2654b05fbdeb3f656bf872d0e3dbf9be9af37c6c9176d290 SHA512 5e85217300ed90b5fcb7d2fe95752700a46158fd7fb9aec6ac6920c4379a958eaa10bb712ae17ecfbf6a89f41988c3b26e1c193b0a6bab3b62359b2377a02c93
-EBUILD click-threading-0.4.4.ebuild 584 BLAKE2B ecf2daab609f46ba11c962206c31d6e6ae9b0d8ee60a654084ea67d6d667d43cc95503936880cd8a919801604fb967c4373049b69bb6bf8a5c3720a4dcddddc0 SHA512 3ccef2240a4d172f1f53f24989d60b7fcdd94db13835bb8f98b24699ed923065efb2f21324f598aaa4d980cc43c7ddcb97f66cb1f69631c18a4da8ae907c7fad
+EBUILD click-threading-0.3.0.ebuild 584 BLAKE2B bc4effd32961bcf308a26c607dfe2a11a568a9167a0cc5cd92a789d087b7ff95dc1031f59695bd2d6e2d1cb35742aa4cc0d905daa66f3c339e43301f5f75f1ef SHA512 dd6d36bf71c16928438915f1477585939c5fa0a364a53e738139f49146e31d4a1b498ed6ae78e917d6402c8f1f3c814733c7f98e13188a82fe8e458a49657183
+EBUILD click-threading-0.4.4.ebuild 585 BLAKE2B 4123c0118416cba55031d356312cf9e463e7b5a2ccc396997a458025a6c1e6dfa2eee1dc8d5c0afb0d5ef44e6eab1ccff37602fcfd40e9c49b9c1b3fb8fc3809 SHA512 f1719eda6d77b39f1e91f6e70e270992b194ee6272ba320275279d45ba9f73aa2a93c02014f6357b8dca001407a025b39c5a5565c5e8acea777785503932c1c3
 MISC metadata.xml 364 BLAKE2B fed4e1a2699583fc6fe19fed19523c6f452639fb8a6fa7ecc3280207808d83d993e336d2482341390bd63ef8dc41746ba3a476995cd34c436e8360ae2b2012f1 SHA512 bdc9d9789f853bc0bb5a1cf03141f34baff1dcd7d4d169256213b08df47487ffd29edfc5e567239881b00fa81c6452ec50b19670676039044b80d6ee5dcbbbbb
diff --git a/dev-python/click-threading/click-threading-0.3.0.ebuild b/dev-python/click-threading/click-threading-0.3.0.ebuild
index 5355a0103c2a..5a71933a3286 100644
--- a/dev-python/click-threading/click-threading-0.3.0.ebuild
+++ b/dev-python/click-threading/click-threading-0.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/click-threading/click-threading-0.4.4.ebuild b/dev-python/click-threading/click-threading-0.4.4.ebuild
index a61aa16cab9f..ef19dfba63a2 100644
--- a/dev-python/click-threading/click-threading-0.4.4.ebuild
+++ b/dev-python/click-threading/click-threading-0.4.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz -> ${P}-gh.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index e6d1f0929b78..a91da58d35a5 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -4,10 +4,10 @@ DIST click-5.1.tar.gz 275592 BLAKE2B 0a58e210003f88081fd2ba8e9f401c74d8d61758ae0
 DIST click-6.6.tar.gz 283420 BLAKE2B 1fdc90ca65d18153d6260b6753e14a1d94cae77ab7f52dcda4fb439f9fdfeea8fdc33b1ce60e93711ba40ecdc508dc3fc5f8aadc371bd85b7dca1bfa070786c2 SHA512 5650cfe6c8b55a7e823e22248964143278d61383dac63497508a864807f1950f9dd5d76ce6a501e589dd81fed6e2a1248d3f8973be25a91950896b7408dc88bc
 DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
 DIST click-7.0.tar.gz 289077 BLAKE2B 0e180eeb1d7d9da34c33f95398c2b53dce124317bd2777ad545c1d4b4f3a96da0e281fac46c8fe6446848f25f7b705d2348d3ab6f5786219b4214650424ab260 SHA512 7ed2bf677f4a56f120deb61318675679a8f09c152af618e8808d24a20cc8537b0691c18b0de2e25b814c59e34b47d6f4d71191856422fc3be206de7669d78f3a
-EBUILD click-5.1.ebuild 1240 BLAKE2B 110e358365c64c59ea1b9b67ce2b7ee8bfb73bf2031728549a142b772e60dbfe784cce37c910b852f857c2f60f16151c3c2634f53c08ac228c1ee07912e0ac73 SHA512 6c945b458954678701b1e55d99de2c443aeedeff655a99cb231e39310271f03c7fb9d546655b7eb230b4e9aa78c0f46f3a53dc2a608a4bfce7e514bb573e09a1
-EBUILD click-6.6.ebuild 1227 BLAKE2B 268b9305995bb815f62176fab629a51006e511c9a43002337b98dac807f89fe655bd6e9b18c3d92c70b003fdf767689bfaf3d8c066b60a380d8fbad423628db9 SHA512 13beb2a779b4bfac9394716587f522c1d3ab28e5c963c6396672cea23e4c3fdb32d80130bb1dd86616b8ff192aaca6fb4ad80a7cc6aa42931eaf62dc8a339f46
-EBUILD click-6.7-r1.ebuild 1446 BLAKE2B 47e7392c38e0829282a52e08d45af71c4776c123301930aff15a9c410d984c75c33712d2f52f4f1ef11ae87b4395aac28f7bfea307bb87fa9e54af2b23e4b4b2 SHA512 afb5f22f1cce370d2a9db2e82ef00bdb52c3daea897b35db08555e5d1a3bc8ae17ef815cf1a8b986d8cb96768484fb43f60bbf8a8e7ec0ceea6d391b825406b4
-EBUILD click-6.7.ebuild 1334 BLAKE2B 4c68d8277aa3702fcea81b54ca26b4481a35db7f6023f303f85b764f7fb38aa0ce7cca6eadbcbcfb2638c5ca7caa99053debf223130a7d741c19431ecfaf346a SHA512 4a82e8670c8e290af264305ccabe9552651a3406e615aad946e33f3da91c5358bae0fc42b5e243163bef36c3bf204de8b78a03ab3ccff45078060a52bd6116b7
-EBUILD click-7.0-r1.ebuild 813 BLAKE2B e2ba60f2838aa5a463d03a5545cc3d98b4770f90a030077d47f1fee279d30229e3f2824decce84fbb42f180aaa05732e2bbccc59578c6bba228af59a834fac07 SHA512 fe62ee9771d48c0baecb42c949346b6eb49f15a75c1dbcc31930165bfc49e0c3450c249515f1ad331622043a1ba9e38c76ca44102b6b4fe578f95d96173300f2
-EBUILD click-7.0.ebuild 1239 BLAKE2B 5e4cb6c58e9c232ac83767ad64eab76261e3a53db64245032e238b6d6a7fdb05273937fd33c0e2175a43e1ed7c0e6a9106b7bdb78f735c752bb04f8f88f84386 SHA512 8d2960c71084200a1a408cc9f4267726583f0749cacd7aa013384fc8f1561602d0908d2f57b7f5d378e16e52232a0e6d6ae51fa22d80fb91db5378a447696f0f
+EBUILD click-5.1.ebuild 1231 BLAKE2B ca2e0720f98342640b0d8a949decf5e379e637ad11a5336f015295def7f14860f3c183ae33f5a1da7ae91d2aa53c693085feb25733ee25e4990be3dff2f18e7d SHA512 c9991ca5a6fa15323b4b6fd4f3e40a799587b3048982a575664dfac1fdc9bb93f6baa9002692beebd7de506f7a3fec63ebc76847afd7a80140a2edaebdbf1911
+EBUILD click-6.6.ebuild 1218 BLAKE2B 3b4ba9ac24f1feed62a04512670bb2bbf61c86881966efccc3d3563703585bc576ddeef4c2cce83e64fa2d2180e4a479d6de4eec30ad83ed73d9cca20e1c2a6a SHA512 bf49b2cfcc9444e51a92de39a31824b52bb75d88fc656d1fbfe286a413668c01704a2a77488a1706b8da15aa8be0c2354283ebba6b43f6390354f7c1652c419f
+EBUILD click-6.7-r1.ebuild 1439 BLAKE2B 4f92b35102b92e4c232741e81e57b2a8b9737bdbf914ff9fd63fd5cfc128bbee419124983a7d8d585e3cea27f42c5d706b44464cdaabcb9b2d8c7f4a853d8fe5 SHA512 5ea892ff450c607fae8f8e62651a4b99c88d8f4fbd7a4bdf8b04101ce62f0e1ace0eca1d81ebf5a24b8e111a7d32b433e11615b65214d9268c64ab32a6dd76f9
+EBUILD click-6.7.ebuild 1325 BLAKE2B 4192928138100819a675e035dfae712ae6892840ec623b4882bdeb93c9cd517bca99e77019de1c0e9c05f039dc93513b6c72ac2be0a788928be60e664081c51d SHA512 60e808a5195eb92073eb37a326d76faf9d1f494c7f2ed848cae71d9694888f00c6602a4f57806bc048f5b6bb78bb183fa2fa82de72c5b50177475d2177e6421c
+EBUILD click-7.0-r1.ebuild 808 BLAKE2B b5ae0868d11fc0ae664b13287a01d204ab24cd54a7a42c11cf53b8071a80107e73aea5c8ece549b026b53111d49feebaca9f2d990579f19bda75a4fe031df7f0 SHA512 9641d4014bf61ee0c3057a783b978f77edfb413278acefd680f37fcbf31441b42669995076a9b7a6d3b9968fbecaf144b509814651aea2d986f28f9a735ceffb
+EBUILD click-7.0.ebuild 1232 BLAKE2B a757ffcfaedf68a5c537179af7be15892c6807ec645035eaa14ee796d3fc785d6c68f701928c7d1a8242b9eb42023aba3e19c65a8d524f3dbcba64c3f9e53616 SHA512 0f8aec6ee7debab6e5bd1f0bc21f6c1e414af4fb7525f08f9149edf4d2f692a8e5dee58d2c4bfe8abfdcf9da33c594a5d5d3fa48b1983cd7bf5ab6c5dc9b7ab7
 MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
diff --git a/dev-python/click/click-5.1.ebuild b/dev-python/click/click-5.1.ebuild
index eefcd37cbb64..97b0ee85c517 100644
--- a/dev-python/click/click-5.1.ebuild
+++ b/dev-python/click/click-5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/click/click-6.6.ebuild b/dev-python/click/click-6.6.ebuild
index 6c6693dfb00c..2b9e8a2c2df4 100644
--- a/dev-python/click/click-6.6.ebuild
+++ b/dev-python/click/click-6.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/click/click-6.7-r1.ebuild b/dev-python/click/click-6.7-r1.ebuild
index a168f4494fb7..0e9465516dbd 100644
--- a/dev-python/click/click-6.7-r1.ebuild
+++ b/dev-python/click/click-6.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/click/click-6.7.ebuild b/dev-python/click/click-6.7.ebuild
index fbc0eab8dab7..9502c026f716 100644
--- a/dev-python/click/click-6.7.ebuild
+++ b/dev-python/click/click-6.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/click/click-7.0-r1.ebuild b/dev-python/click/click-7.0-r1.ebuild
index 19c2a64fcf0d..6b7be64d64fc 100644
--- a/dev-python/click/click-7.0-r1.ebuild
+++ b/dev-python/click/click-7.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/click/click-7.0.ebuild b/dev-python/click/click-7.0.ebuild
index ad0d3470267f..5895ed9b786a 100644
--- a/dev-python/click/click-7.0.ebuild
+++ b/dev-python/click/click-7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/clientcookie/Manifest b/dev-python/clientcookie/Manifest
deleted file mode 100644
index 8827128a6dfc..000000000000
--- a/dev-python/clientcookie/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ClientCookie-1.3.0.tar.gz 130974 BLAKE2B 02b2e227078ee3fa01f377dbd96baaa15cc7f46ed4ac8f10d817b0da5e2b4bc090345f9057b946219907163cf230cc39213f6a92f4fee75d4dc2ba8ea57b3673 SHA512 3a42660557bbcda76f7e63fb4fea0ccaa15967e8e6991d65dc72921efb8cec475f7ebfbfe963e5577f7dfbacebb84488b7bb5e6e4e913e863e54c0faf0b4e9f5
-EBUILD clientcookie-1.3.0-r1.ebuild 651 BLAKE2B 039659be841d2cc2bbbb2ddfa0f343eaaab1bfa586a9eecda17f7d30fa90481afdc6c998e220e49346e2e900675e2b986e4e2847eaef9ead68b41f5ca07a24e5 SHA512 9164eee69f027fe723d1e8845862aa5b7da4b08f2cefc1c14710371813769c844d72944df194f0ed9f2a9375618378af83cf9bf2820874ef3275a848746437ed
-MISC metadata.xml 929 BLAKE2B 39902cc037ebd81f96e531d057dcbe942f1fd7c06174682ea0ede9af5cbf823145b7101699c354a4126404e63fcb98fa490449a88610d110b327814f7ebfb8e4 SHA512 3cfdde23672ae821a27cd5aa40597dd313ebdb915afae22f014e25f3fa86bda64330502cbe7a2535519b94bf60c1acc2a22d45529330517224fde6c9023f1a5f
diff --git a/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild b/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
deleted file mode 100644
index 026c593b482c..000000000000
--- a/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,25 +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
-
-MY_P="ClientCookie-${PV}"
-
-DESCRIPTION="Python module for handling HTTP cookies on the client side"
-HOMEPAGE="http://wwwsearch.sourceforge.net/ClientCookie/ https://pypi.org/project/ClientCookie/"
-SRC_URI="http://wwwsearch.sourceforge.net/ClientCookie/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="*.txt"
diff --git a/dev-python/clientcookie/metadata.xml b/dev-python/clientcookie/metadata.xml
deleted file mode 100644
index 76ae290ba533..000000000000
--- a/dev-python/clientcookie/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>
-ClientCookie is a Python module for handling HTTP cookies on the client
-side, useful for accessing web sites that require cookies to be set and
-then returned later. It also provides some other (optional) useful stuff:
-HTTP-EQUIV and Refresh handling, automatic adding of the Referer [sic]
-header, automatic observance of robots.txt and lazily-seek()able responses.
-These extras are implemented using an extension that makes it easier to add
-new functionality to urllib2. It has developed from a port of Gisle Aas'
-Perl module HTTP::Cookies, from the libwww-perl library.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">wwwsearch</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/cliff-tablib/Manifest b/dev-python/cliff-tablib/Manifest
index 8acbc9641622..882bb1807aab 100644
--- a/dev-python/cliff-tablib/Manifest
+++ b/dev-python/cliff-tablib/Manifest
@@ -1,3 +1,3 @@
 DIST cliff-tablib-1.1.tar.gz 80508 BLAKE2B 11faebcfd01813467850f17f49d9ef18f6d15b8a9d13b58b2a36e115ef17913b8f21cb19709f9938e8cdded2538b5c3affbe548896cbd95f0957eda4f5fb8a71 SHA512 26beea20ca1ba5c96276ce974c24bab572c6efebfe44ef45bd3ee6197593a34bf29843676a4e37fe400272f3ff59f703d60ff1abda22a1ca28c2434c0f224aac
-EBUILD cliff-tablib-1.1-r2.ebuild 783 BLAKE2B 068caaa0650ed76154488c1ce769f3859212f12848179a8d5524cbc0a16e795df2219c46fcb68e2968e87286724bbe7adf44070456b543dd5977a8714e41ae7c SHA512 07f3fd4b1064209a8656b2f2c177df868d971a164459fcf206737b6967a46d9ad60299a4992bbdd121aec9512ea09790b781510940c27c6dd11b42e0a9bfb055
+EBUILD cliff-tablib-1.1-r2.ebuild 766 BLAKE2B 2c67252541b287f81eb9bbf0c99a6daaf761580d79e1d50fa7228d4d45c9204e10d06345eee31a13da47124f14efb631ed5145c2999df29216b54779f9b61840 SHA512 7cc4ef73d8b665a9da62230e6ccb90924d352a01381d25807ba50c7a08b6af5fb80ab7f4982399890b3b3376bba1364198ba0e2ac674fce78ed7e7d658b1d04f
 MISC metadata.xml 395 BLAKE2B 875c5346b128d3653e234932bdf62471ad993980ad77006296bc6ad3710fb71089df8c375b42d5f5e219f433dfafe67a389b0a2a04a2f99db0537f89f496bbc1 SHA512 874e5cc1c3b1c7341127ab43fde400a9341d9475f6c32f44b3f0faedd8e422324d703eaa814b9cbb4a5fe0ac13a09320c60f83f236cd51bd6247def77005e71e
diff --git a/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild b/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild
index ce7a076cd9cf..7cae8ec8c0cd 100644
--- a/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild
+++ b/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index ef5eed5045a6..d5646d2d1bb7 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,4 +1,4 @@
 DIST cliff-2.12.0.tar.gz 77405 BLAKE2B 70b3865837bdba1396fd76b4937c594dfc9f50db24f684c6676c4ac1125ab34f6cdca29fe63a490d41abd49a268d6246afc873a5805446d06b07cd754aebb727 SHA512 5802cdd17b6aa81dbb344efb8ef53212de999ab33eaec1eb06e1d002ab513758d3634ae5013ece6375b1bb98c9fed99aa74cf92752c34e1132fa5ac20a969f4f
-EBUILD cliff-2.12.0-r2.ebuild 1775 BLAKE2B 54a8cf4a09b0f2740be5f7f3e41e2aa47bf54d540b8fd491c5fb3a289ca02e4ff5b007ed421894f5294ee6b569ec999af1cf0c7f04222e5e2650e121b37348c9 SHA512 79c532d4780eb14af417b3345e4eae41509de33e868c4bebf5ed32315493974a783eb7ff8f70836068bd48281d945a3f18d4375b5508491d0ce4fdfa4d30e563
-EBUILD cliff-2.12.0.ebuild 1563 BLAKE2B f4bb7d8677a0f492c4e73cf959b32d366d8762cd23b1c3255c92d4e7901ff8d8a47ee54fd1a95148925d6055124c6e9d15e72c65805b86d8af5c2957ca1b5357 SHA512 8dd6d5accbe9f6397f84845d926616e27b216dc985f827121ad4a7d933063314eba424cf2d775dde67fb5a969f5c933d74a9e171d96a7ffaea17b5228e9d208d
+EBUILD cliff-2.12.0-r2.ebuild 1771 BLAKE2B 0dcdee6da211f6642e1f0c5e9ee036d4ab7100a600e0fbe8f85a87712fc876dbb541fcd2536f9d120ebca458cd02b5dbf2fb27a5f3dc4ad268f3d1896b4b81a4 SHA512 47706e4dca094e7f3f12ae05baae4371423713e6ecfa4af4f707570a8081008b330f2e05fffce241ba2c5b9f816aa2fc97bc99fb22c247e849434d85a86ea939
+EBUILD cliff-2.12.0.ebuild 1559 BLAKE2B 617935eb4c097d30af968e9ed5b0f7a533cebce42d0a55c3e768ba082ffc01b0c6d15f373b0c0fd2dc53cfd4525c5e159df939e06ef98c68e39cf8833ca16f0a SHA512 2b320599b909e3ca925c3689d9433a90b91cb82476304cd9fd8982bd3d102b7f5aa3ca39714b8a12cafc8f939ba6b6262f6476541e121510f14c552594d71de1
 MISC metadata.xml 709 BLAKE2B 05e69832a5cff97a52caebc4c113a39342e62803fd523a753a8ba119f4326a9814c7c382e88906514e539922c1f22683a09dd46b2c11e3d60b8f885072a08e72 SHA512 f031fa34d06b4c12c8eba5a046c07f1e391fd84bd29d6a4ca8c769c2d774262d66d7bac12d05cb8ef669db7e2713d6862b6a118e9f9ca810e9ae0fa9fb881892
diff --git a/dev-python/cliff/cliff-2.12.0-r2.ebuild b/dev-python/cliff/cliff-2.12.0-r2.ebuild
index bafe40ecb52b..1231c46ba18a 100644
--- a/dev-python/cliff/cliff-2.12.0-r2.ebuild
+++ b/dev-python/cliff/cliff-2.12.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 VIRTUALX_REQUIRED="test"
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/cliff/cliff-2.12.0.ebuild b/dev-python/cliff/cliff-2.12.0.ebuild
index 504ef282ad3a..89202b961400 100644
--- a/dev-python/cliff/cliff-2.12.0.ebuild
+++ b/dev-python/cliff/cliff-2.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cligj/Manifest b/dev-python/cligj/Manifest
index 8bff67e00f9f..8360793102ab 100644
--- a/dev-python/cligj/Manifest
+++ b/dev-python/cligj/Manifest
@@ -1,3 +1,3 @@
 DIST cligj-0.4.0.tar.gz 7281 BLAKE2B 7795f28bdef6ce5823bbf0b346d900e95cca4655cce985823318b8fd9854fcf245b523f3ecb06b44d6810f268b658ed4e4276d7f022a9085bbfa623914b68a2f SHA512 35c075192f39c7c756a5abce2cc706818a5c40ed91d25a5763483b01acfffa29b50ce58e758b0ca42431978e436ad45a93049e05c6dd0a98da40d74c4a329669
-EBUILD cligj-0.4.0.ebuild 533 BLAKE2B 2be6841c43f7549f4e1907d093568f84758c9742b346b5e20fb2cd9ecc5dd26f76869754e925fcf0e6860e763df3a471e8fa34e22a3cba67734d931760df472c SHA512 53d71f1171b74f1a8d4fa0eab25f59f7badce8869a3660239d3b1e94056a5b81cd7378e46ffdf298e6c1c118499a56d1a3a61bd9544a9e39d42a6e81a015e015
-MISC metadata.xml 345 BLAKE2B 6ac32f031872abe67c62acaf5d9694542ff5e11b85de643dfb56ac6f679c629f437556b54af4983b1eaaaa80b38de1bb5cef95b3a0f732187fcccd1d8191c03f SHA512 a9339c6f4320ad67867db9436b328856a253450f2e10ce5ddb11c62ad1fabe60434bd74213877efcfd390ae424b3276bdf0efa28a1c050cbf76d4d24b391354d
+EBUILD cligj-0.4.0.ebuild 529 BLAKE2B fbba482e904885d449d5fcfb5ca7614016019efedead7e556557721f2c58bffefedf3baa119d1e7b85212b44d7125af0a6fa7302cc2977abb62a55a175301140 SHA512 c9be3aba872408dd8ef6fde7c8a955e298ee5e44919712d8196293c231de2c5ae6a8ad2146e97f0c00a2a7b908cdbb48aca85adfbaa2f3c5176f6ca583bb0f32
+MISC metadata.xml 294 BLAKE2B bca7d1cd438a89c87a8e56a37280f0c3154362b1245e169b8803a5727f7558abf38158badbd0767cbadc34f3fd1fec096331d1f5f1b95aa4bf34886b900c2d94 SHA512 855a3e9a0b306da2c0fa957e19fb1e57c798aefabe924a29d6f4f53715a891eac7fc31cd1b8543b9553230d79ac4797bcdf2bdd50c1b63a1cf729afd6ba5be57
diff --git a/dev-python/cligj/cligj-0.4.0.ebuild b/dev-python/cligj/cligj-0.4.0.ebuild
index 1791fe4702d0..d20b2c2d7248 100644
--- a/dev-python/cligj/cligj-0.4.0.ebuild
+++ b/dev-python/cligj/cligj-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cligj/metadata.xml b/dev-python/cligj/metadata.xml
index 40d5bc01d252..436332904367 100644
--- a/dev-python/cligj/metadata.xml
+++ b/dev-python/cligj/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">cligj</remote-id>
     <remote-id type="github">mapbox/cligj</remote-id>
diff --git a/dev-python/clint/Manifest b/dev-python/clint/Manifest
index 5b98fd815b3c..394a42139062 100644
--- a/dev-python/clint/Manifest
+++ b/dev-python/clint/Manifest
@@ -1,4 +1,4 @@
 DIST clint-0.5.1.tar.gz 81140 BLAKE2B 5b42e7d46321f0416d3ffb51edf66c53476d3e4a211e971f36cab54a412f6b0f0ec26486c2b95871956ab09e7e4adf68e8329dd7e9e3c7ed1adb3f8a0dd2a728 SHA512 3ad8bfc587acb1322c7d7c3e73756a07c98f3b4215a3d4dc409b5a2067bc70dce2dd98d19250b8122b319b7bcf5e2859251de2829780345de06f93b35447c4e8
-EBUILD clint-0.5.1-r1.ebuild 965 BLAKE2B f067ad6997e8b9c4497f0c7377642acb37c4ed5e8b4a10b0d5d2c62aef099eb90772c6f661f496fbd31bc753bd81de38e48144f85fc9ab967c03d0963a34b496 SHA512 867fd4957edb99d27d4fc445bff748339c102f74fb41a529bd9327b16e43d3932642c2c429e60cb3d6ddee7661f4925c06466fa26342ce6b8d27ffc32f5e26f3
-EBUILD clint-0.5.1.ebuild 977 BLAKE2B 65c3cac9ce4d37f451e8496dee6209f939a499fb68848175acddc8291ae967c7b355ee5d22aaec2dcee05b2c809b77cbc1f24209bdb5543606404bc01c8e47fb SHA512 cb3bd6d396a203e29745b90ed5d40c2935a9c114cd21af89ebd80607533c73d4938ed250c0126b0ac6ca9860162accc958ce4d4646a2ca8f79209a294e6c889f
+EBUILD clint-0.5.1-r1.ebuild 961 BLAKE2B 32af5313b110bb2cce5c0e0d6c7ed8f0f9661e6436156cae4a4215f5c0326688334c27b276ee2107a5965261e29a94378b863b5f62e585ca6729f5dafd611e49 SHA512 25a983177cb48285c65cc84f4412a2b1a40cc899d50f5efe008ad66734f36e822a85f61593b9ba58e0403e52c195825791341cb3ad5d659b73628f70134bbb62
+EBUILD clint-0.5.1.ebuild 973 BLAKE2B 3bdecaab2384075a53bc6359be4fab8dab8891a1198781d263f4b3a1b3c507077ceb4f3ccbea0de2ac0b0d35574a8de614a04abb9e9ddfb15a44a7633cad193d SHA512 4e9590c071a0b33990c4bfc869da4b8bf5ffac27196a862797e70dddffa340637a4e85ee71dcf68b6585b117ad81ec4e7b05eae08c86f9671b6ac8fca8edc9bb
 MISC metadata.xml 248 BLAKE2B 886e9928c5735483e1b88968c7c68b328965d8b77022184e2428115042bfa146439a44a5b3b6ae1c813fc9626617bc5158d0be4d0c173594dc93efa84f1c2268 SHA512 28daaa3233c61835448e78dfcf4381cbb1d6789f0fc16b309aa9317d36f81754d1757ba5d6be5b6b6209fad9921708619b4e92011d91c879eddc440a819fbbdb
diff --git a/dev-python/clint/clint-0.5.1-r1.ebuild b/dev-python/clint/clint-0.5.1-r1.ebuild
index 6abb5289fdca..efed5775c96b 100644
--- a/dev-python/clint/clint-0.5.1-r1.ebuild
+++ b/dev-python/clint/clint-0.5.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/clint/clint-0.5.1.ebuild b/dev-python/clint/clint-0.5.1.ebuild
index 80b7b89c814d..1538323f4541 100644
--- a/dev-python/clint/clint-0.5.1.ebuild
+++ b/dev-python/clint/clint-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/cloudlib/Manifest b/dev-python/cloudlib/Manifest
index 015886da062c..38a1475c39cd 100644
--- a/dev-python/cloudlib/Manifest
+++ b/dev-python/cloudlib/Manifest
@@ -1,3 +1,3 @@
 DIST cloudlib-0.5.0.tar.gz 117422 BLAKE2B 358bceef2a5331fe75a63469b8562bab7136f3608d5f695e9cb86f498fa06299fb767a0148e67c1a6911838b30ff354a0e8f5c5114039323f19b9e59be1f8b7d SHA512 fc400b89045706638fddfed5a6bc5e48995106dc02a216bbe8ae32e7a01c1d4d4fd2a22c7aa914a7fdc8197639f82d41cc2d7071873234e171d3fb7f434cdabc
-EBUILD cloudlib-0.5.0.ebuild 641 BLAKE2B 8a8262d0a7f1f5d9a2b056bc1fb66077e51eeffc7bcf6b85cb54770d45dcf39db281682ad42be5c5bd0b9ada5f1df096684650f0e26b532e11e02a536f12bf0b SHA512 a1d3e09a1f51024d8eee22dcd60a8c56acc96c6be509ee704f8d7b3af131b7614a8b81d6b671f8ee03f38d2de2b5a56a5080d688349c87ccc12b05340bdc731f
+EBUILD cloudlib-0.5.0.ebuild 627 BLAKE2B 09bee8276264573bb54c8481a5df1facd2925b982f0bc234c481b2bc9d8558b56419e7b054a83902bd8bdd8435dd002c4e421486e7b7a0fac6bbcf9c2684974a SHA512 30da8fde3aebf91b49eadca72d9b38647aedf7991c9d6fab0bded4a6dadcb1704f4bbddcec04d957d136da2253ed6b6593af388dc33c3a68677ec8b672657310
 MISC metadata.xml 597 BLAKE2B eb76497b06f3ba5007a38c13f57b099a037d75ad14c5cbaa42e3352b7c1bc05df41d6e1ba4c1f4626800aebbe95003a409b9ef6ec927ce15bc62c5a0de5a1184 SHA512 94c2a4bbbc2e6d33444e1afc6f18923a35fd8c3794cbb59ef5d08fcf8bd9ac029901b0b4b78ff75563eed0afa707083e9188408d2b54f137da710e3cbaba0074
diff --git a/dev-python/cloudlib/cloudlib-0.5.0.ebuild b/dev-python/cloudlib/cloudlib-0.5.0.ebuild
index 06ea31cd8196..32b98be82734 100644
--- a/dev-python/cloudlib/cloudlib-0.5.0.ebuild
+++ b/dev-python/cloudlib/cloudlib-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 01b4810ef905..a03f442d9820 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,7 +1,7 @@
 DIST cloudpickle-0.3.1.tar.gz 18927 BLAKE2B fab03106f91d475c83c25d0259fcf4e70baa96422bad84e7393967ea480ebe36412b32792a4e334f6a495c795139accaed739a3e3f3d7058352dac2f0f55974d SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d
 DIST cloudpickle-1.2.1.tar.gz 42138 BLAKE2B 37579a1dbe6c38697236273f67221d2cc497c1bb92a268e39339a9c55a348645cd6e0872ef720e19d0e891359ad6e0af3b6cba8416c431c79979c68c53f9aa7d SHA512 5ec7ddceff7c43e46011370ba00f693dc669a1b3e1cfc42b42483850879d6246073ed20d4ca92698984b4935f5b69e5ae0dd96dad82de3f296e38ce7b644a6d2
 DIST cloudpickle-1.2.2.tar.gz 43576 BLAKE2B 9b99d106196ff88bde8c8add2eca7dd0c6118c89b3d68892b17b11ad73435b83387490e4c5c52306b4355033595f9783e3a313a6bd58f9eebf4517ff77d486b1 SHA512 44f41433bdb12e6495c14b7a470ee671fde3fcddf1a57d8f6d1203925a63944a1458af3ae7fc0353602f9900bd92581699b1f7ab199668f0425447ed8337bfb8
-EBUILD cloudpickle-0.3.1.ebuild 649 BLAKE2B b03f481cec5af1f73be2d7e6a64a524e6de9c11fbc80779c7b7bf4f77b1edc0e98a44906a8c3fea6f43ea8986ca38407a73b83c5a4b700f6ee82ef34353dbd20 SHA512 a0acb2a991270b87824512daf57c6f29b77b9c009e393951968d426d4e1bb63288c67baaf302096fa5e222f0e7ad0044ba4c0cf8d94e04586d40f2e1eeab9da0
-EBUILD cloudpickle-1.2.1.ebuild 749 BLAKE2B 6bb06894ea14b8949443688268f7c20334a6ced9715589b8463629d9965318cac3d9ac417c3e693450ce4f4d3889f14ed07366f82bf957c0401d3d3bbd678a8b SHA512 45f8b44bb3e387a1d7d5dec5530f70a690c00a3ffb2059434031ea7b5ca153bf33e475fa08cb99a6eea22450e250f458d4846ccf63a6874b4bd8333f372ed91b
-EBUILD cloudpickle-1.2.2.ebuild 756 BLAKE2B a17507ffd16beb9c95ccb46e1af8cf2d659bcc855934404981754f8f922d538ddc4682c73ac0e4077cece49027acc7ec95ebac613763b1a4870e2f65fee11120 SHA512 e390732e3c0b955ea8d78b3335497f86b9cc0a601fdf8c95b849d32b4959e86c7d23847c59e54f3854696f2370263d09a6ec96dbc32c4cd97abf1bfa6fc1727e
+EBUILD cloudpickle-0.3.1.ebuild 640 BLAKE2B 75f26c9586e5b4672ef8ebbe3f2126dcd542548badb6959658f380747aecf6cd15406ca5d462c050b014536c4740b1eb6cf1e83794dad5a37eaa55479d1c61e8 SHA512 905ab77f282591cd0943d0a888a980fc2428ef46a29f2c0b8f70077dcedab8a54562c6ac6494e2a8c82995572c66af960eb959e22654ce6545b35298cc2fa98d
+EBUILD cloudpickle-1.2.1.ebuild 745 BLAKE2B 9631d4066278bd4f8e3013dacc50a15b906895ef8445c7a4adce80bfa8f0347652163f23d8778ca49dc9964c8c8d3735fbe99568f0ec2a0aeecfaa4adfc24b9d SHA512 bb4a12aac5cb563b6224b5d18fc01575de5c8042cc44e74a2bcbcaf0ae4b113ee518667dbb4ab7602a47ede91f06457827a3ad6466cd042789a5aaf934d7957e
+EBUILD cloudpickle-1.2.2.ebuild 752 BLAKE2B bfe4fc924d6b1813976723f4fd5dd91b761ba35765bff4ef0a001495e50115e8f9a04cc9676b8ef5764f1556f58dd0e4e0ad1f355378a4c848c314bc3c30463f SHA512 6e2c42453b2ad7ae742193d25f116c2832a5a3c8983aca081d5879ac9f90742dd97f57aa028adf96b3330b955a39bf99d61717f243b1d0a083eee2ac1af2b10b
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
index cb46036e1876..3dbbee18a2a5 100644
--- a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit eutils distutils-r1
 
 DESCRIPTION="Extended pickling support for Python objects"
diff --git a/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild b/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
index 74f40c775fc0..8db399324541 100644
--- a/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Extended pickling support for Python objects"
diff --git a/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild b/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
index 1e11924d44fa..1a4644082e51 100644
--- a/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Extended pickling support for Python objects"
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index a90c1d52bf8a..fb0f164ce8bc 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,9 +1,9 @@
 DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b5659c3287a9aef9a7deb16338d71a2c07ef15ec72ee5e62aae0ce3cdf2f202d0d423040b734dee059f1d4876 SHA512 39086794ea57cdfdc7388aaa485770f1a76457bf2b2f58cd4703dc0c082f58a8343aa777304e833133040fdab8ef8451d85bc3c19721432514bb380330823abd
 DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e SHA512 80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
-DIST cmd2-0.9.21.tar.gz 563600 BLAKE2B f438dfac5b8bef33e151d3c577bd9d140a5da746a91b445715aa15ff5853346472e62cb361f9ffe742888404606c4731148f3002c7555d70eefc71e44908c06d SHA512 79994739ac311113ace8f7d35c314b34a45cd6893fd9fae3995cd753bc3651f6746f5be65f81bcf1ab7d2810a070602c150af71fba9945331bc3e0f1dea730ad
 DIST cmd2-0.9.22.tar.gz 565214 BLAKE2B e0f950c1bc994bbc3d1ddf2a526a97d61c1aa59c6089574518d2222c385ecf91f53fcc0e6dcaa84460cc4a6647bc5baf37f12c6c9bf16fdb3db14cf15a05bd18 SHA512 1ff5cbea130ef3729c021144ca27a31c0e9cb8b2977eca454a0f528c468180e822fa8d23e7b07846a5109ad38bf12565b613b8295751f94852d9251c4e8d6edf
-EBUILD cmd2-0.7.9.ebuild 899 BLAKE2B a475b51f4ecc87d0df39bb21550aab47331d2355310a05d051fd089e5a8262e7e34c301fcadb9559fc850e8f7fef452f4d187c51dcaa0d1a3e09dfb8d55edd3c SHA512 937f70ff38800622db1c2b50e159d53f5ac1628a6f0e16a3ab205f5d1aa4b6f74702b206b4be2bae9d1d0afb5a88db481749a52ef5f777f12dd414cb3304fc3a
-EBUILD cmd2-0.8.9.ebuild 979 BLAKE2B 92cfdb67bd7c9619239b8d3b742ec9e004b5c628caa8790859a19ba707d6a2263b63dc84f7e0c5afbf7ebc1a336673507c3de76113e54332c87da1d3661c87a7 SHA512 5c48cf31cc0bf761822c8b78e99a605753023b4b82b8fa634e322c1dae0973c969866ca3f00312b5236aaff59082969165e397ac584d2079118dd57dab2f05ef
-EBUILD cmd2-0.9.21.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
-EBUILD cmd2-0.9.22.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
+DIST cmd2-0.9.23.tar.gz 568514 BLAKE2B 02070a72ec42cd04f3f647eb6344b48a5149e21a8a87be713dec837d48295c6b919f55229fb09d013f1722ee111f8a75958e884c18b2eaa339097ff81554d8c3 SHA512 ea00a17b206d6312b0c2ae6b982f3fe4634f7717286a475438972780a1510b37120f007907f632338eafd093d03cb0e928c705e54a3aa8295f7aced73630a2f2
+EBUILD cmd2-0.7.9.ebuild 890 BLAKE2B 487bcb215e12de6e29fcffce6b7d3d6284fb762e5a8f16722c7ab16696415d0ce615f9ce03d34f2e8dfef5b7abf8d5c1d2572055acff8d38be1b69707baaa912 SHA512 7864c9455ee3b068026832e29371d8cb844b7a43e0e826dbe88fc42ff9b12a6a23259705c3e321ce8637e4d0dade5226f678de4564329d8dae416203801900dd
+EBUILD cmd2-0.8.9.ebuild 970 BLAKE2B a784b56d861c9e799a75ea4bf5626fac0a846249eb4de2b90b0f14b25d4435d6a4ccb8e98cf64b799aae1b53ea86079eb63ac470cef3e17277655bf2bd35ecde SHA512 fb5f2668cc8c607b8b49f66c9f1f9216a346e53d3184b383b173fe7d0fe71feecf149ee8196998ca9af40a82d93050028f987b5086a1462a0fa3e03aa50d16fb
+EBUILD cmd2-0.9.22.ebuild 980 BLAKE2B 98e6cd484b1e109cda69249627a4c17b3656e84b2be47ac7a16e7227a108a71c4d914f2bf88eea445463edbaf15e82c39b98790521d8afcf4537e57135187a6c SHA512 d9afceb31e3b128b34a39623c58728ec3d49b365df04c3984102d927a06c6fd0f7c21a94647d657df45c9090dfb9819b74ad275c84891d9b9a7ac5a6b2e196ae
+EBUILD cmd2-0.9.23.ebuild 875 BLAKE2B 07901fcb94d8517f5b0e865203f7a447dec469f0014724da7f6714f9523eeec5460bd841829bae7558cbeb3450484809dc6591cba0562d334e864b6a8829a58c SHA512 37f24d5b354b5dbde620c55c4b3430dd26ac380918481ac083c586e0cc5d5a5fc1d632da0e7e27152d54fd28dbcf66dfabae743d736e43f0cb37bdb6bd87d215
 MISC metadata.xml 665 BLAKE2B 796824fde35499ef70bd730f7e6c6ae4b239ea278f77188215ae0fc6e062598d943b0ae42ab5b378e8777c7c6a2162b330971bc00572e6dd43c663a3da677aab SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735
diff --git a/dev-python/cmd2/cmd2-0.7.9.ebuild b/dev-python/cmd2/cmd2-0.7.9.ebuild
index b48eabab9269..dfda6cf7aa37 100644
--- a/dev-python/cmd2/cmd2-0.7.9.ebuild
+++ b/dev-python/cmd2/cmd2-0.7.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cmd2/cmd2-0.8.9.ebuild b/dev-python/cmd2/cmd2-0.8.9.ebuild
index 7444fcf4634c..bb951d314309 100644
--- a/dev-python/cmd2/cmd2-0.8.9.ebuild
+++ b/dev-python/cmd2/cmd2-0.8.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cmd2/cmd2-0.9.21.ebuild b/dev-python/cmd2/cmd2-0.9.21.ebuild
deleted file mode 100644
index 715f6032dc28..000000000000
--- a/dev-python/cmd2/cmd2-0.9.21.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python3_5)
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	# test rely on very specific text wrapping...
-	local -x COLUMNS=80
-	pytest -vv || die
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-0.9.22.ebuild b/dev-python/cmd2/cmd2-0.9.22.ebuild
index 715f6032dc28..347d10c90d72 100644
--- a/dev-python/cmd2/cmd2-0.9.22.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.22.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 virtualx
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -28,7 +28,6 @@ DEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python3_5)
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/cmd2/cmd2-0.9.23.ebuild b/dev-python/cmd2/cmd2-0.9.23.ebuild
new file mode 100644
index 000000000000..502253d32c93
--- /dev/null
+++ b/dev-python/cmd2/cmd2-0.9.23.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,8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/colander/Manifest b/dev-python/colander/Manifest
index 585bf13fa9be..f75d35fea17e 100644
--- a/dev-python/colander/Manifest
+++ b/dev-python/colander/Manifest
@@ -1,3 +1,3 @@
 DIST colander-1.3.1.tar.gz 119999 BLAKE2B 8677dc49eb24b353dc42e858da4e745e711cf852226079190e475f45e6dec341d429cf3d62cfa6b4835b9bd137956ef6a04eb7f1684807bd5f230e114f3ee2e5 SHA512 0aa9063e6f88ef63b5378cd93d3b121c8323e4632dcff31f143d2ee6dd33edb93a7fedfa06ca250288f7bc194a534f1027b89c9c6cc92765cf4348709e539da5
-EBUILD colander-1.3.1.ebuild 1551 BLAKE2B ba771dee3f5363a7bbac966b847765514b9f93dd378d0215d4956f0d673b8c8e9af0280f9f125d4721a5b63620709082deffbc27f7308305b36ca21dbecae8f7 SHA512 8b6cc5420455f22e64a99be0ca12791f4afbc3a01eb1d43c6f4f0619ba3582f649005ce1602b86dfe6e08c3f95fbef376c80165915d79e45299ae4b2020708c9
+EBUILD colander-1.3.1.ebuild 1542 BLAKE2B 87330afe85d695127f64ee8cea5beb921374f03166cf62f5d7a67d0d3c54ebad68284debd5a83d7dd9ae216570a5216c2c625b1965f41d7802b62612cb28dbce SHA512 672e348a6a579ee0960228473c1cc963aa43631d4663427e91d6f765f17dc96246339136590a0617408a43512141aa4438b4e2985544621460c6e0fc49580597
 MISC metadata.xml 311 BLAKE2B 369a77b1ef148e7c46c7f3eebc89ec61b45295ae10c9882bff3ed33178ef80e671cba4327d31f0a1c7a3ffbc65c52c8e546f9e663b7291636d6b764e88347324 SHA512 c0fe889c10d25c88c37e781c6e355c51f1c2c24615d616170da287c6bce490f6cd6b501a783c5a4e98f7c00c945fb686e066422271d5f43495c5c68e459c7f7f
diff --git a/dev-python/colander/colander-1.3.1.ebuild b/dev-python/colander/colander-1.3.1.ebuild
index a5eab09ea671..fe15d24ea55a 100644
--- a/dev-python/colander/colander-1.3.1.ebuild
+++ b/dev-python/colander/colander-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/collective-checkdocs/Manifest b/dev-python/collective-checkdocs/Manifest
index 5008fc203499..58099f195e97 100644
--- a/dev-python/collective-checkdocs/Manifest
+++ b/dev-python/collective-checkdocs/Manifest
@@ -1,3 +1,3 @@
 DIST collective.checkdocs-0.2.zip 10865 BLAKE2B bb6013564f5763d75639c2e17d01dfc8a3ccf2a47e59bad388738c4e31a37ec7f7e247ea2847f304771b0ad80d0dfd78cdf048d2dd4deda0a6a5f5ad307522a8 SHA512 c234a365d3e89cebd467a42f98be256e8e24e42c88e5aee71556d165deb8d7d54d4b515fa6fdf70bd24e7727e083f3b6fb061aa304fa7a72de7e8612ad2fc2a2
-EBUILD collective-checkdocs-0.2.ebuild 748 BLAKE2B 72482ca5566821089e159f390a0264e14da6a79e7500a825d88dfeafce8ba0e9c64cd69907ec1f94bb34ffccfe57df91dd9d7ae2e8f69f3fb93e78730b144f7d SHA512 adc04bdc1ca59b2e7a998b739d042fc2ee360a3bd3e5d9f5f8083a6c031ef852c33c581a4c7a5e72962b894c292f1229bc81f4d1b5504f7e208d172b5efcd112
+EBUILD collective-checkdocs-0.2.ebuild 738 BLAKE2B 9789c19e99720a725b6548bee36b0cb3b64692a746350914336ee0da13ae698aa63e1079aaaad727d7892b441c4a0f58933cebbc769ace3e44afeba347dc24f0 SHA512 82f51c0707c1e78acdab92eec4bd021beb80c647eae172841602ce80bf5df60c1e7de4acd86c41ac0bfd88950a5843bdf1a62ff157251ec52f7e5b6ef2751cee
 MISC metadata.xml 606 BLAKE2B 2858dbe47b07baf0d8c69ac4a3df9774e97489f6b8ae9fa7a880095cbe3ca0a62c213617ee6ed4ec47d1b20792fa78f05ac217ad673a928b8efc472851e8fb5a SHA512 197107242cfa084e5b1e7cdb3b2b16bf493891156b8e478dffaa40215e2a7a2edb4115101df22889901abb71a23faca6d02ca7720af76a968a60b52eefd26913
diff --git a/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild b/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
index 1358b47a507c..2684c90f190c 100644
--- a/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
+++ b/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Distutils command to view/validate packages's rst text long_descriptions."
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index 32e826600549..0d16fa727a33 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -3,9 +3,11 @@ DIST colorama-0.3.9.github.tar.gz 122180 BLAKE2B 0ef1b2876a8d790e434548649d34bc3
 DIST colorama-0.3.9.tar.gz 25053 BLAKE2B f633a188d032c41d0b6de60540ca1774dd8f3e8fe2e558333baf09855db30fa7a7ade5944ff12e4ca1a3685930d10a02009162733666d711ad25a16ee96ace55 SHA512 248e3d3d1f95cb85baf55ef4d705508213b81edfb04b39fe9a7bc9c7ac564986726ab6e9d9f73d64ee02e1c9b86d4c6bba40543590dbd170180a37d69e07b627
 DIST colorama-0.4.0.github.tar.gz 104679 BLAKE2B 416a8bc5af470dc22b71a84279e4d984b57fad7ddb617c80c9104830127efa4f545eb08c003d263e48edbc0db39bc150e74f64f68f22075e759c11a6e84c75d5 SHA512 e2214c0a4ce1dd5515cf12cbb91220d2314da747b1a1246641117e70ea81b162cb4748b2b5dff049e102540470617a0076a3afff64bfe67158bf7bd95e1cc6f8
 DIST colorama-0.4.1.github.tar.gz 104708 BLAKE2B 625c6ff325ff0de8113c5c9abe9dd296eb614b0483a2dce59b163431ec4ef1992073719160143b68e76d3ad77f77b975a110ce19496be1d8f6ee90b3f66b6e7b SHA512 006069859ca05ec8a6808860ca73ab541b246e6e6443b1bc8426973beaa5268660b48994f21edb6492fe97c4b9d29949b874b861ec200b1756d40e8abda8dee0
-EBUILD colorama-0.3.3.ebuild 672 BLAKE2B 599155a2a963a60b3e54e1fde3ef3a820f4fdeb854b92720cf29280f14f755ab631878738e50827957882bc7f3c8d29714e8e901cdf14f9aa0d677943424a9c5 SHA512 57d054c4bad90ccfec7e90329f6527e0d8b65b734538077ffa31bf87e86fb8c04c6ba592527923e7186fd508a88832a3d1199d8726cc74eb71f1aa29aac956cf
-EBUILD colorama-0.3.9-r1.ebuild 1151 BLAKE2B f430d41eae492fe2039b5ce4b7098511505d0e6129174e2a5b427b2afa08b5fbcf80051720f51db82b72fa9c84328b4c263d81a47d6dd534e38afd7df4e4a25c SHA512 24f7347ac86780fceea8cfdde67105c920234db6744ba111f458b44991497e793e0b0368b9a3eb14359bdcf0930b0eb07d98a318a2936cf2f037b2de471fd751
-EBUILD colorama-0.3.9.ebuild 770 BLAKE2B 5e88e7ea0c5c840aca982c0694d238501c98ec36302020dae7dbb3380d02e2083b834b28582da45d37b1262f4681cc49d297ee75e3cf325a6ece3aa024e2fb71 SHA512 215da74a5ec453d47708d5fb7068b6650cca513d27515941624e0526601f01b0140fb54fdb785486e5622f111f46afb8876d3c0c67efee91c4c2b2db95a78b71
-EBUILD colorama-0.4.0.ebuild 1151 BLAKE2B f430d41eae492fe2039b5ce4b7098511505d0e6129174e2a5b427b2afa08b5fbcf80051720f51db82b72fa9c84328b4c263d81a47d6dd534e38afd7df4e4a25c SHA512 24f7347ac86780fceea8cfdde67105c920234db6744ba111f458b44991497e793e0b0368b9a3eb14359bdcf0930b0eb07d98a318a2936cf2f037b2de471fd751
-EBUILD colorama-0.4.1.ebuild 1151 BLAKE2B 07de1b1262a9dcbbdd4d5e368440f7c76c4bfd43e2752777131805d2ab4e36b4624f0e485db3217b0325c046bbe5ef4deb606f270461c615a20b18c52282552a SHA512 bf663d4bbfe0b238a21a4eec93737026ab49b8f80c55b83750b992d3d6962365782cc2f72333aa8962ef81e40b2507846e83e1331197e7890fceed2686ccea64
+DIST colorama-0.4.3.github.tar.gz 107251 BLAKE2B e09e92171b6ea4b3db4801feaf794e9aeb4f2b3e57079907911cbb909167b192eb857f0b404fa45673bee3bc02c122326bd05091846755d7dbfd990a74c60a24 SHA512 ab41a2f95fe75de0b280c174c6166b86645e5cc675dcedf784fe15170aae630e831370527c9490342b77c7d088a023a48428a519b52ad1c70be58904742a94c8
+EBUILD colorama-0.3.3.ebuild 663 BLAKE2B 99c36aba507188afd87c5033ee90934aa3d2c009bb2fa9090ac848c63955cebb66410ceb5304d07c5bd23dda7d24e53a565bd591d1aca30bee694664c754109f SHA512 26298ef2df9bc496f0355fa524ed3181f7e7165abbbc655612c9495d4c252ba8ad8dd30329cbb02b3a8161c94e7b35e3dc7894710dd1ec30f6e83ea0b1687bd2
+EBUILD colorama-0.3.9-r1.ebuild 1146 BLAKE2B b1921f7ca267a296cd4bec50b23b23ffeb8d671350e67185ec48e9e290717dd9755c98ca2156deebb35e92fc5ade74a68bdc46eee233348b0c9e555b4369d264 SHA512 537ce9e9572954d23b93303ad985f09db33fa79db9d0a33dc2c139ca0d45aa72f8a51b892a7054db35b67201d7c5d583c8cd4fb752673cb0685cd8294b9b3f0d
+EBUILD colorama-0.3.9.ebuild 761 BLAKE2B 7abe940a7bb508c6fa06e25fb80aa72290ca632353955e8fa3741c4ae973dd10cf6e11a3fd11c3ccacaf360f81a4d6cdadbb79ececad79db639a2ff238be1d0c SHA512 0f7981a23288f1466bb8bc5e8c61c8195865b217c320534c3eecffe54ae668bbbe2fc57090fa8613996f43a9046ec582a9ad5c2acdaf0ffd8ae7f595783f3140
+EBUILD colorama-0.4.0.ebuild 1146 BLAKE2B b1921f7ca267a296cd4bec50b23b23ffeb8d671350e67185ec48e9e290717dd9755c98ca2156deebb35e92fc5ade74a68bdc46eee233348b0c9e555b4369d264 SHA512 537ce9e9572954d23b93303ad985f09db33fa79db9d0a33dc2c139ca0d45aa72f8a51b892a7054db35b67201d7c5d583c8cd4fb752673cb0685cd8294b9b3f0d
+EBUILD colorama-0.4.1.ebuild 1140 BLAKE2B ac535623d482bc7134ca7533aa2f7cfbda90de56c204cb5de6a80f097d011ce64a77b84cac09e20d39d45fabeb52a0bfc9935e0b77ec48de34aae11442a3a2ae SHA512 1da9957818faa25ac8f130121055414f5cad26ad618515ad4fe7f14e8258bef5c83c92ffc879f5ab6f0f885ffb46980a2ccdb71546417c1617e2ffce333944e9
+EBUILD colorama-0.4.3.ebuild 1107 BLAKE2B 2e691950b939dc790fbceedf8ac7cfb349cd1a9e1fd18335b0df1daa6409ae70a4184d82be5b4dfe454b30e86e0d43c5baa7dc009eaf0ce4b0832d12b61f1f01 SHA512 dcadb2b81cb3e1cc729cfc3611ed499006e25781029c0c02ae846e7c91372c38da0db0fa1a943beb9ebf5b50bd3cf71313e3dc56dcafe0d36af2d64527754e7c
 MISC metadata.xml 682 BLAKE2B 9e9eccb56152824c5d47896af7ae8a699a9a614437f20008fbf9c793e0b79cf3dfb0fb6b9da6d36be4d699b2df8817f74a74e098b8fa945e08734d9f068cca12 SHA512 0a9144ad52b490c2e607eae85aced164f4c2f15c152592ca67a588d659c34c3baa16105746fd4a6894c49ca31ee4b0e1b18957cb7c421fc788cbc933afb3e895
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
index a4a8be4efd0d..f6b2b337305a 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorama/colorama-0.3.9-r1.ebuild b/dev-python/colorama/colorama-0.3.9-r1.ebuild
index 3139799d1c24..3dfc4e38b84e 100644
--- a/dev-python/colorama/colorama-0.3.9-r1.ebuild
+++ b/dev-python/colorama/colorama-0.3.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorama/colorama-0.3.9.ebuild b/dev-python/colorama/colorama-0.3.9.ebuild
index aabc1b0b0adf..e25c9d32c119 100644
--- a/dev-python/colorama/colorama-0.3.9.ebuild
+++ b/dev-python/colorama/colorama-0.3.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorama/colorama-0.4.0.ebuild b/dev-python/colorama/colorama-0.4.0.ebuild
index 3139799d1c24..3dfc4e38b84e 100644
--- a/dev-python/colorama/colorama-0.4.0.ebuild
+++ b/dev-python/colorama/colorama-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorama/colorama-0.4.1.ebuild b/dev-python/colorama/colorama-0.4.1.ebuild
index ea129d62f2de..2ddcb44bd200 100644
--- a/dev-python/colorama/colorama-0.4.1.ebuild
+++ b/dev-python/colorama/colorama-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/colorama/colorama-0.4.3.ebuild b/dev-python/colorama/colorama-0.4.3.ebuild
new file mode 100644
index 000000000000..ebf9d38ce484
--- /dev/null
+++ b/dev-python/colorama/colorama-0.4.3.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=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
+HOMEPAGE="
+	https://pypi.org/project/colorama/
+	https://github.com/tartley/colorama
+"
+# https://github.com/tartley/colorama/pull/183
+SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+python_test() {
+	# Some tests require stdout to be a TTY
+	# https://github.com/tartley/colorama/issues/169
+	script -eqc "pytest -vv -s" /dev/null \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index a51e88d9e907..077aa06224c8 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,5 +1,5 @@
 AUX colorclass-2.2.0-tests.patch 483 BLAKE2B ea0a953102fcb693e451f837cd35b77a0a8430ed7f44e898a8c6b8862643c8f51ef6d793153af795862561df4cb6046c98e9658409aded87ef74073e0858a26f SHA512 f415192d9de61ee8d0d6ac39f33effdc4b107069cc9a9abc3c0b1ecdb903ebe9785036385bac59217a33a75c0bd267dab2a9f2e9b9127b00e4abf4e7632123f2
 DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed
-EBUILD colorclass-2.2.0-r1.ebuild 621 BLAKE2B f99305ffa396aec4ac2ac906cf0b6c9e6b3183bf20d3bcf1ee4503abd10cf40c056c91c6d7ea2e994ce33024c567efe4eeb1d6b360f4e3c1ac09b509f654578e SHA512 ec11a351c53aa983c4eafb75503f07b2a126b8ddc7b113a29aa8b983917e990382ae86c8a5ff53a1bfcfd59f53aed291ac246bcb7100bdc39ce2b2b6628d571e
-EBUILD colorclass-2.2.0.ebuild 674 BLAKE2B b858d9f2149e54099abfc32f5a7d52d92a9172c1e1b73d65b6c362ff64f7c4370d5c1d6ac99f52a2fde9a3aa2276f297baf3c46be99ff6fc651a1055e21fe0d6 SHA512 c4615fd717098cde340b8e1dbd595764ba1928e303cfdefe2e73506f1fc260417b63cffcdd64663c745fbdeb92873abdad30fa141107be2e93cc0f67252d83e4
+EBUILD colorclass-2.2.0-r1.ebuild 621 BLAKE2B ebd65d9063b329795015717779b989b55d0ea67410d88c9258f87ba5fc515b63e1f2e6b4e24d26921474c083860c8deeeee7d271ae35cd59c64fc5f0214de7eb SHA512 812940c012057eca67f4bf6b30fa94d01c8941967ddee459a9d07593201dcdd091d4a4d8e274ebd8f4065e9efb4aebfeb78f162041e665ed6756d55b690e1076
+EBUILD colorclass-2.2.0.ebuild 677 BLAKE2B 32a5941d5b4fb2f919dafd6976de5b0e1dc7d02933e0e1ed9071d54c521195079736296d7e66ce1572eb9ffba0bef648f806b096eeb27f43290b7dc29b6ea476 SHA512 1a7f10e789b23418b4487aad446e6bcb105bcf3b8c8ac742049503dd495a281b12a9056a5df6793f1499c5fe51e5879e64a7f864fe062d859be53f4ed30488f3
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
index edf891faaa70..79704c087f4f 100644
--- a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Colorful worry-free console applications for multiple platforms"
diff --git a/dev-python/colorclass/colorclass-2.2.0.ebuild b/dev-python/colorclass/colorclass-2.2.0.ebuild
index 3a2e9a69f58a..f955ecd6a25c 100644
--- a/dev-python/colorclass/colorclass-2.2.0.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="Colorful worry-free console applications for multiple platforms"
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index 88f28a915ffd..92f924ef335b 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1,4 +1,4 @@
 AUX coloredlogs-2.0-skip-cli-test.patch 842 BLAKE2B b6e17539f22349bcd20ba4ec64f03dd2e8e291e7f8e892765cc675d88b338d64f5df12b28b1909d0554eb42bfc70cc564f603d026f05e2ca4fe0952b6021af91 SHA512 98e5e8d207de67abf22d0de5729cf6926802329e1a32977dc95155490cf32c6b94b69f8e78a410a718bae073e4d6d618c515dcd7318b057671bb91fcf84c4424
 DIST coloredlogs-6.1.tar.gz 28057 BLAKE2B bbb5946db3e6cbfae0b9947d2aa29769858833e35213a44a5be4ceb434021ee8c583ff00c980b9ab4fc533f6fec80e151895097b6a87c44257ef0fd5c7ab0bab SHA512 834cf993e7ffd3328644d334912fcf5a5156a441c6184643b38e5f356d46d7b5c48e02ee1e1b432265052c7a5ab1071ba456e575217a4a762f8387131059c405
-EBUILD coloredlogs-6.1.ebuild 1228 BLAKE2B e4f7fb68f478c8e72b8035448d18f7a94801b9cd1c781d35f51461e1ce491cba4fe2ae0ecd2675295e101373696ad9290e818f37c16331af447dd1d0a8fd0b47 SHA512 4396b32fa200117b63aae3e1336337da3455f686ee94db2f9f7631d8d85e5c8a6c4107eaa4103c39639cbd5f059a9db9ed590d5e6a95708ff2e16fa7b38244a5
+EBUILD coloredlogs-6.1.ebuild 1224 BLAKE2B dd2629e708f1014b04c6bf5e7850aea32c3fe2311f9f5ed1585a5a2e7ca3e030d58cab595b53ef20b95c66b71917f9e799da159a3a6930288de3e75530007cde SHA512 9c69905531fad4d9370df1c6a98757cb6033ae42f2d20574b5f4b0a02df1740d0a3b87be6d22abcc29652f9be6ae9ab9664e5b535c7ea7b7aa9e1dd32c3f02ca
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/coloredlogs/coloredlogs-6.1.ebuild b/dev-python/coloredlogs/coloredlogs-6.1.ebuild
index f6494abbccd7..e5f3a194fa47 100644
--- a/dev-python/coloredlogs/coloredlogs-6.1.ebuild
+++ b/dev-python/coloredlogs/coloredlogs-6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorful/Manifest b/dev-python/colorful/Manifest
index 9242821eb444..017d64f697bc 100644
--- a/dev-python/colorful/Manifest
+++ b/dev-python/colorful/Manifest
@@ -1,3 +1,3 @@
 DIST colorful-0.4.1.tar.gz 19696 BLAKE2B 9229200853d3050ebe61817fcfd975444a6568cbd490798c8bb2fdf3bb0286f7263d40942bb5edb28f64c6dd28e7a02cab5939d562bd2b091c05232efc3ac37f SHA512 41ce1c35193ebd8fa22bc06afb5536d02cdfc6bde89068693f6ddd1fec140f8823dafab10cf40496f48cb38ad87f874edd6819446b824028575030160b0adc7c
-EBUILD colorful-0.4.1.ebuild 532 BLAKE2B bd550644a69a0682374ac76e328b7aafc8f890e7ebdfd967210ef9d7b96ce37319c02316bd948557459eba64c313aec4da08f0d26bdd1f6b868a339dd4d5b2e5 SHA512 6aad78daba22dae5a680c7747827b4d15d2ede92db8b6cc1ea4d015fa222c5dd114ba45c6c6247699c791f0ba03a2a9790cb8dbc69de6b449a7d8e4378cc53e5
+EBUILD colorful-0.4.1.ebuild 525 BLAKE2B da441bbdf93aef7fe007409e1698b3b7c00a3f88c575808c99549b88b32fc6abd9ddf8eb4f49c0596f332193d0c21f0bcb6048ebf6db99bf9c8532f27c147c22 SHA512 3bf62d22515d2bd0843c2f5e566e86297b16e120f0256d4f253ab79db270540e57490fb6a45e2cf04bf427b714e9a0b2902de345c09e763394234faffe0c2723
 MISC metadata.xml 414 BLAKE2B c31b4109e46e8ade1be085620f1fd56f1e9f56dea42ede3a4a6c2d78c4ad3064e1b1b461f4f592fea22d43c2cd9ab8d4a77c5c538253fcc2bafee93286e6a270 SHA512 7115621b68130df38d2f5f1a40b4149dad94b96d985ae2d3385e717a163604cad5d38901310b757447912d00efc5c6a24f51729d7396a652bf2d8a97fdb466bb
diff --git a/dev-python/colorful/colorful-0.4.1.ebuild b/dev-python/colorful/colorful-0.4.1.ebuild
index 846c46b1efc5..75f2c8b247df 100644
--- a/dev-python/colorful/colorful-0.4.1.ebuild
+++ b/dev-python/colorful/colorful-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index 835eacf99dd2..a22d6bbb9a8b 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,5 +1,5 @@
 DIST colorlog-2.7.0.tar.gz 10153 BLAKE2B 5e3c1fb3dce5b9a925739777b3f7569cd10094e02385888cdc2865e47bae4dfa0cb9960a3144794fa6cd09c5143adf4df8f18af1c0d9cf561165595e10322053 SHA512 765923004a2e2b0c0e34f7cbf2d79ac7232a13e9aba68166c8ba295303cd7187317d9a34a405a78cc5f7ca0281fc3b653848e419c0b3a0dd473ad0b859216703
 DIST colorlog-3.1.4.tar.gz 14424 BLAKE2B 0434c92044c623dc4b9be4ae3ddc491ccda3db7725894d07125ed19e8f8ae184d8cae27a7adb424e799cf092e66c17089eb193686ef710b5a4789f2f7c75dde6 SHA512 9333e8e5a3237cf3f43d0a86cf93c6252ed52031e685342a1afc411568407a77840946620da429dc384c8f77f7e540339632f15a417ce00a13b40b2d51f1c730
-EBUILD colorlog-2.7.0.ebuild 674 BLAKE2B 2a1a141b4fe9563105a4234a60b1de5dcb7aa1e3b52eafc6539f00461f0d7c37bd033a9b1590e3162090eab81a0481deffbf7b3c1a08ffe03c77c7faa277aee2 SHA512 5ac4185820ca07e31c7fe9de2e67d589884104cd20d206da4219353b95349c7294c6586280f0c30c44f3f99ddc6c39b67a16834d56dc11b7aced43727d196a31
-EBUILD colorlog-3.1.4.ebuild 620 BLAKE2B 890c63bc5bd1600b6eacecaae077206ad18f4a46f000a56cdec8ccadc45239c92bb0a40c23d1d7e1879d6ac41393f8a066081e750829dca37e6ea9f7f9d5438b SHA512 93afac4f513877bd5c18da5ebb430deb03d60b751c62067ffacd0312f097e52e24735805801192d1353d50e98ceb3d794cc073e894fa067b76132420b0132211
+EBUILD colorlog-2.7.0.ebuild 670 BLAKE2B 68eae48cef09d199b6345ab1f5658a278a389dfff68d0eeeb9f31ab45b369f15323a46aec63612c895aed8e675f3528df4344ff92515dc04483af0a0993dac5e SHA512 5f4425e389d95c5521eb40b926d0ce225ef00ab3353183e10cf1fcd972196825f8fb03bb8cff57f8daf0dff6e69ac5188c2a6d2cc1ba019e973175bf0a68eae0
+EBUILD colorlog-3.1.4.ebuild 615 BLAKE2B 3519527555eabf2e185e9a964cee991d733becf01e378db89e01fcef01247c5daeef94a2606fb92aea389f31d61a12e4492461c7fa0c83d823e73abf2b8cb8d5 SHA512 ea5b0cfb7f1bc503b12d55b543aaaa21a3309b6450fb4a9d99d5160cb6c7c73e08e01bb5870c0a52b94bf9db60e00fab6e2477bf61e87ef792a5b1e2b55a92d6
 MISC metadata.xml 389 BLAKE2B ded38a2f991252ac74f592870d12edb503ed77e13c60a393545ba0fec689f355ae1ef7bd89190e9d6837bc932f6d61e60e48e567c4ff09ebfb21ab666fed1867 SHA512 04b339e2ca89bfd8862d5491081c7b66f5211dc490b650140499f5a4fc6f66e705a5ab805a6c0bc4d867183e699c3c73a199a750d156862346cb68e3647f8390
diff --git a/dev-python/colorlog/colorlog-2.7.0.ebuild b/dev-python/colorlog/colorlog-2.7.0.ebuild
index a69abb2e44b0..19b9bcff80c1 100644
--- a/dev-python/colorlog/colorlog-2.7.0.ebuild
+++ b/dev-python/colorlog/colorlog-2.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorlog/colorlog-3.1.4.ebuild b/dev-python/colorlog/colorlog-3.1.4.ebuild
index bfce984695a8..820ef8ce9409 100644
--- a/dev-python/colorlog/colorlog-3.1.4.ebuild
+++ b/dev-python/colorlog/colorlog-3.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorspacious/Manifest b/dev-python/colorspacious/Manifest
index eaa9735c6b2d..8e1d0e21ccca 100644
--- a/dev-python/colorspacious/Manifest
+++ b/dev-python/colorspacious/Manifest
@@ -1,3 +1,3 @@
 DIST colorspacious-1.1.0.zip 698745 BLAKE2B 3d6ebf9b76b727a982829fb0e3012507e30524662110628d8bc164bad4581baf147cdf4d6c8d54a52420d3e72497ac547f98f1d162b178ac20e8e9c926d41bd3 SHA512 b4267cab679d581f2072f5a315aeccd78cc68e325e16f14675cb17133cd411a28f376f150aee7822e1568b84571d5d149adff10e9c5a7fd9f41927153967e2ef
-EBUILD colorspacious-1.1.0.ebuild 697 BLAKE2B 5aef072f84a5d9e5d0dd236ed6b178a47a159027500ce00f0bd1fa74af73c2e6a39765dd2989d998d5992b28817b89d3dd00a697ba32e589a3f0be72033e6aa4 SHA512 766d47a20e3ffe316b4e60932544e1fac39ab5645cb8e9ef07de81bdb58e0faf45ec81a68ab6a8ade81b4c7e53b761224b276b0f4dfbf574f4d7f43b2c4db7e7
+EBUILD colorspacious-1.1.0.ebuild 695 BLAKE2B 591c3e74b656e589095b23ff60f9d27f1af49d4a5debe9a84bf16f28b4fe350588c0cc21eee8e850a1c13fe4c6f285ff8b3a656a8708a09014e57d1c393b2963 SHA512 196b95b7de8d4be45edde09731a8f4f825a97baf3bdff0452456e77bde453cf4eb3c241c6c56edca2199904df40c1b9b35c14a105a78aebe5fd0ccbc03887fc0
 MISC metadata.xml 377 BLAKE2B cb7c86d4c3ae646535ea9bd34ab9b1102227fb900472740734d9e35d18115d4f255cdfa146e9c74c5d1907c0ec3682b01cf72e2a5b6428e2a4eac94ad6854f3e SHA512 5dc4640a370df69368d6d731b54693c4a7f1b2d7b155dbbef2bcc0e8ac4a153d05b4b2a43e6410750a3dfedd15752b3470b023d7b9106eb78ca64bd3a73059e1
diff --git a/dev-python/colorspacious/colorspacious-1.1.0.ebuild b/dev-python/colorspacious/colorspacious-1.1.0.ebuild
index 6e78bdf749a9..0f597b43087d 100644
--- a/dev-python/colorspacious/colorspacious-1.1.0.ebuild
+++ b/dev-python/colorspacious/colorspacious-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Powerful, accurate, and easy-to-use Python library for colorspace conversions"
diff --git a/dev-python/columnize/Manifest b/dev-python/columnize/Manifest
index 647ef98802c0..cfe3afb0e516 100644
--- a/dev-python/columnize/Manifest
+++ b/dev-python/columnize/Manifest
@@ -1,7 +1,4 @@
-AUX columnize-0.3.5-nose.patch 425 BLAKE2B 85936064f7982e64b261f6822f517efd463ef566e1140ed7f142560f391579ae13a4713850fba66d78a9b6290478b6cf3e31f157af0366cb4e7fd476aa95c881 SHA512 93a495010eda573a32e402690beee5f708da5d8b809f83f17f26d2c44f356fcf6dc887c4f7220c3fcc102bcc70322353d954b012c85c9d41873bf22d5acce6d1
 AUX columnize-0.3.8-nose.patch 435 BLAKE2B 3819d39d430dee26109a9def0a12e5565b44fb3f2114096f2a1050d64904a740bb0df8de0a6e291c532da94074066f216957d70fe6cfd1fb93d080dedcffd988 SHA512 5db32976721850538986523fc0a17f8f4c7d95b5bae077644b093d63e1a03ae9c08ae01742b4057a13588347ca5f2ab6be35a00b53a9a0abd9006edde4757ee6
-DIST columnize-0.3.5.tar.gz 8841 BLAKE2B c2b26a7b762dbb72e50efd4b6adb81ec490358b2a757c9cd6e299b76335f933aad32287d3a6e8db338f840739f310842505d8768391f6d11bffbc53463f3f08c SHA512 b3090f6588ace5c204a6e31a93ad4bd659df81a0b5568003a970a04b456c946fd1c6adf13122a3327b7032e54e04f0410c06d8c377854de51017842ce58cc360
 DIST columnize-0.3.9.tar.gz 8581 BLAKE2B 553927b6d5c9385da13402e27c5f42506840df3fd9df7aed3c077d440ac0d7ec6e5f3f0fa0ce0a7c088a1fe01075ab525580de8a22c995365f8913d2cab5e342 SHA512 2bb9a25200a1574cc6471ce06dfb2b4b62c5a23fa0e4fabad515dd2939b3f67ca61132121e4326dd820691691dce67d664302d99248ea2d5c5f25357203d9d08
-EBUILD columnize-0.3.5-r1.ebuild 660 BLAKE2B 96390940385b23de5e4361ea7cab482007708ac6ae0fd4da42700aa87a26a4275682b0502495961790524f66d06e163b6d47cffd02eefd4936658cf81e9ae882 SHA512 8155474d17c3e7a8266852cca9b8bb359384360d3de7c2f02d905aca27cbf7706211b11e50563408337fa7fbe1b0d281aa2035136876aeefe6a4f0c8eb8a0756
-EBUILD columnize-0.3.9.ebuild 634 BLAKE2B c64f879cf27304251cdc52c05618212592b142b057b3671fa7735891d4e8769062619a3ade1f3dbc2a386904bae9f0c6ffa9baa6a094e199ffc7df100e04fa47 SHA512 182aaa2dfae464c0e01ec9b1882a190d7ed7186410ca83f10477379b2b7b99815510066c807694ac391ef07a6fcc1e704fe1cb7f968390c95b7dfb86ff01d5ee
+EBUILD columnize-0.3.9.ebuild 531 BLAKE2B b569f83c0c2f89132936bcf740f59bedc9f807bf92bff702eae2c79d8b86aba3933a64809fc35d7d485bbfe0c71d3bfb1c9c19dcff186a4ec9eac3e94acaf52e SHA512 60d232888c6c10150eb7ee4430fa0f82e71b5ddb0c788851f9d869457aa9b1a56e3562b812da982ced79f88421c29a484bb0a7103818cc5b001a705f19a4f4d7
 MISC metadata.xml 425 BLAKE2B 0428ddff8f70a44c0f57a0c2eeb661593b36749d56280fd41fd07893665ff7e4b0f51a4f9a6e265c995834ad7f2939a93c748e578376b915afd99e83fd1d624a SHA512 8b1e38b3f56187d7f003c4a3c232fb386e146dc70501387cf3e25a21b9b630eadde4ea2e022599f7fad88e8719e51422e53675d4fcb8526a93198c89cd5f9e1d
diff --git a/dev-python/columnize/columnize-0.3.5-r1.ebuild b/dev-python/columnize/columnize-0.3.5-r1.ebuild
deleted file mode 100644
index 394c713d65a0..000000000000
--- a/dev-python/columnize/columnize-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,27 +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="Format a simple (i.e. not nested) list into aligned columns"
-HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.org/project/columnize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-nose.patch )
-
-python_test() {
-	nosetests || die "tests failed"
-}
diff --git a/dev-python/columnize/columnize-0.3.9.ebuild b/dev-python/columnize/columnize-0.3.9.ebuild
index e587ed0aa5bb..f83f6941d67e 100644
--- a/dev-python/columnize/columnize-0.3.9.ebuild
+++ b/dev-python/columnize/columnize-0.3.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -16,7 +16,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/backports-shutil_get_terminal_size[$(python_gen_usedep 'python2*')]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.3.8-nose.patch )
diff --git a/dev-python/columnize/files/columnize-0.3.5-nose.patch b/dev-python/columnize/files/columnize-0.3.5-nose.patch
deleted file mode 100644
index f09f7704cbab..000000000000
--- a/dev-python/columnize/files/columnize-0.3.5-nose.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index e1035eb..bb8eaf6 100755
---- a/setup.py
-+++ b/setup.py
-@@ -26,6 +26,6 @@ setup(
-       url                = web,
-       version            = VERSION,
-       py_modules         = py_modules,
--      setup_requires     = ['nose>=1.0'],
-+      tests_requires     = ['nose>=1.0'],
-       zip_safe           = zip_safe
-       )
diff --git a/dev-python/common/Manifest b/dev-python/common/Manifest
index 3b2f523a748e..4d6b3226bd13 100644
--- a/dev-python/common/Manifest
+++ b/dev-python/common/Manifest
@@ -1,3 +1,3 @@
 DIST common-0.1.2.tar.gz 3541 BLAKE2B 5791d91a49776646ebb57bedacfbaa4b87f61ab89b4bcde2e147c5712c66f5c138b7a94f48421b751753cb689fbbd91badbf5a1fbbd185286c574f1316be7e16 SHA512 2cba2602fde34ced5b6fe603eea0aaa6810981089c9484f25ede16f6910896e783312f4d7bfc411d4eb8c278967c21ce000c3d1eb2a775d2bd76728eeebe80dc
-EBUILD common-0.1.2.ebuild 464 BLAKE2B cfef32de2d3bab0e5c4c9c972549d2416e4a41270ec7fbc3724edfd2e2179d565bacca058a4c2d59be43579fbe8a0b765523b6a82bf2e3b96a6de9e18c591d70 SHA512 f31c019cea5685e273325df5298151bb458138b8e2ecf2343e3810ec427c3666875a15ea92d6d6404392063982eeb7cb7c90780c216182e937cb018252eb356e
+EBUILD common-0.1.2.ebuild 454 BLAKE2B ce0e33c3ce7d088e37863b2c7e44d5ac78d42785d4db4a82628e8e791b1fb774b834d0edccad7dfcb4e354255d073c32f52fc1e2fb0a5b4cbedc7ab8580fe464 SHA512 e95a35427a0d2be240cb1dd69fd4c51587f119c82bf3c77d5e9b0582c2797a980e8e764a552ccee4c575c1eedd284c6f7526a53fa21649b6bdd1958fa0f7778a
 MISC metadata.xml 319 BLAKE2B 6a196e1f5ae09dfa304a5c3688104ff09a078eb413d6069ddc700b16aef64e9cf913727f28db7f5a5c75868d1ed55512ca9d7a3bdfd08a3f255dfa47c85f1e50 SHA512 b3e0c5dadbc5227193b6ee672f8e8d7671d1aa20f5b77e7efe01873d6a47432d19855243a3de17c3589988efd7127ce654995c75032db4a889fbab1982c0ab5d
diff --git a/dev-python/common/common-0.1.2.ebuild b/dev-python/common/common-0.1.2.ebuild
index 459b5db11e48..3d2ec10fab30 100644
--- a/dev-python/common/common-0.1.2.ebuild
+++ b/dev-python/common/common-0.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index 4c0945a7845e..a7bd687d4b6a 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -1,7 +1,7 @@
 DIST CommonMark-0.5.4.tar.gz 120316 BLAKE2B 47904d101d9d0e3759f82c28a4b80edfc0ed12cf0888e4915339118e496322cf0791d8a46d2edddca0d1794e82a9647cc22cbcfcc2d385a740c7c31cb8251659 SHA512 1983714a50a627f30f86af0d02dad9e52cb7b0ffce29691d0e740f587e599ead6de2412d72b895b7df772e1c81e171e56dfecaf593e611af65bd5798632a98ad
 DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e61b17d0335c3234fc0fa0d3738e9117a8ca29e7a6bbaa6cd0d58b112defb6e19a7efce3ca57ca25c8ce67b2d3d2 SHA512 b0e3c4fea6c99b51c541054ecfe887935c2cc517a82df86da1d9cb4914189652326ec5b543cbbcb40ec43e5e09c285c47f5304ca1907764692e659c540591bdd
 DIST commonmark-0.8.1.tar.gz 90795 BLAKE2B 718c2b1af035672d74e2c6b6f89ea0cd23f45d7b0e47b6dadeef742d772f5458e08ec5f69fd4f34df9ab2c491d9d7add4c4acc7018c4048649aa0d8244d7db91 SHA512 dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf
-EBUILD commonmark-0.5.4.ebuild 809 BLAKE2B 7a6aa1d9416359c2e8454b2edd801c3a4c9694fe4a6c9c98e39b671155475781e3d9dbeae58aedad7aff692c6446ba3bc26f289613b4e774751c45fff684e1c9 SHA512 175cea42a18bc00806248f1d2cd282846f6163024442674edd8532a7d68ac681d67e0af9e63146572cd6c6ad8ad802232313237c0d442dcbf47f04fde302f763
-EBUILD commonmark-0.7.5.ebuild 1092 BLAKE2B 7593d3ca6a89bfdfa7834ff268fd22d3b2f25e139e23db895cf7eddf57e5a3e593df86101381af781d6b31d9e77ed23d39edd0affe500a1789add6327bb0dcce SHA512 22ee362ade08a045223111c08f53041e43e2d965f98f64b823c9e3a972ec0a91aad5e734bde809fe2ae95651c45d0764fd067e246b6978a88ba1b099ba00bcf9
-EBUILD commonmark-0.8.1.ebuild 1045 BLAKE2B a03d194a5967ff74ac541bb071cef54ab997a67a1bb6edd8230bcc7a2fcefe90160943fdfb93e5b9926aa6f1a95be98c57aa49fdf39e7f24fa46724558c90942 SHA512 19fd9c10fa1fbed5b61dce4097eae5c8fd2c70d9b684913fc046574bc919f6d570836a7aa5480c21beb2ad86e8bf72603e96f3418d27b15627b011aeec738980
+EBUILD commonmark-0.5.4.ebuild 805 BLAKE2B 0bec3226c65ab5427ec6dfe538a6e21421a26632d61f9485567db063608bb29761fab8b697e5e54c025ed0d17aedc8c478c0200fcb4ea00970b0619d2303f3cc SHA512 a3a51a5b6edee044913e9f4b9ccd4071223144b979483fc318c5740d1b1faa12071a0f8129549cf5a12a129ad32aed92602c2dc74300d0af5769b8686dff0d58
+EBUILD commonmark-0.7.5.ebuild 1088 BLAKE2B 6afe1d1ce15f9e40cceba308f7f523aa37d6a3b6b57464c02cf53cdcd640d533a51b0ed42f7c6c8ea3368c42f84bd839b0030f9837aab4fc7ea56e6c4d3c4d51 SHA512 4e6bc4943e32a5bfbc1b945ce1f6e59123afeaac42c52cba0f9ed84cf26ef99608bfedc18710e5362a9e7e0a36d8b9d8d93d5fe19a534de0149c59e4456acdb9
+EBUILD commonmark-0.8.1.ebuild 1041 BLAKE2B 1e6642426786142733edb175018bb83e84d280084588adfceff3ed3a76ee5627e17e5f2a55dc169fe46d5e14f2529b9adbaed5b30b200ce66c22ba93910afb39 SHA512 40ce5529dd683716b1d148cd2481ce49c49fe0db024b6ae39af33e5ebda90c62166d9404586b1285c13652b5ba12b8912e45fcd3ca787edb368974059d148c23
 MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
diff --git a/dev-python/commonmark/commonmark-0.5.4.ebuild b/dev-python/commonmark/commonmark-0.5.4.ebuild
index c1d02b2c3c95..f000a90e3b6b 100644
--- a/dev-python/commonmark/commonmark-0.5.4.ebuild
+++ b/dev-python/commonmark/commonmark-0.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/commonmark/commonmark-0.7.5.ebuild b/dev-python/commonmark/commonmark-0.7.5.ebuild
index 13c6460eede4..28ef183ac3d9 100644
--- a/dev-python/commonmark/commonmark-0.7.5.ebuild
+++ b/dev-python/commonmark/commonmark-0.7.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/commonmark/commonmark-0.8.1.ebuild b/dev-python/commonmark/commonmark-0.8.1.ebuild
index 3fffe165a5f4..ba49a86e694b 100644
--- a/dev-python/commonmark/commonmark-0.8.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index 6c124e00f657..75cf53d3b689 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,11 +1,5 @@
-DIST ConfigArgParse-0.11.0.tar.gz 40863 BLAKE2B f51e9e1a1973f7e477082f5dfffe8cb03b69ed26d85bc375851a01c2f6e5526f4b5954b71c85a274a58e34abbe07bd864956430d5a94961a38a4ad3340737286 SHA512 f97d37b5d1c0f5ebfdec4c55e9a8d20d0943a41d16b80fe1b2cfdd6acfa210e0cc7bae49340498c1b31dcc76704e8291892b97415137ec90cf49e24f261c62e9
-DIST ConfigArgParse-0.12.0.tar.gz 41524 BLAKE2B 7bd8afc4be817c34dc6cfc6c5b862fdc53ce2ea37b019f165489596622f6ed7fed5fb6db8f84afbdd4d749a24b8aeb15378868db55668e7307c712db7fb09094 SHA512 d06f969088fb93479decffd984efed61070a663a652b06a3ac8198e64b5d681423f693ac6fdb58390eddc392ded9cf1e45056dad83256a84773c5f558f6788e8
 DIST ConfigArgParse-0.13.0.tar.gz 31775 BLAKE2B 252130b58a514f667655e9fa0bb73c00be410d9c817d3dc57083a9a828d9c25231667720ab7c99068b502bd5eb7c79fd7053c500862447b1213d912568a2e57d SHA512 232ae25e9daf3ebedb8757912a507576a154a3b09c297db7684776172c32aa7ad03362f60d26961499c17dcf0e3cc5763b40004a75ebde5643414bceb4f3eea5
-DIST ConfigArgParse-0.15.1.gh.tar.gz 25760 BLAKE2B f5b8bf4d04bcbdf9f1dbd36fda91e6d0b2cc0034a79c5e2408755d3e7d661ee3518d5c1603fafa866450aafeddfdb0431bdc459d5fe3f401569ad11e87fab0bf SHA512 53d90238ac233249f305585fd8e7abcca0e45a16c53e9353d13ce6f08bbd58dbe7ea26a0627c96e686ed96c001f0b6d28bdcd4b2921c9e54811c6981bd4b7560
-DIST ConfigArgParse-0.15.2.gh.tar.gz 26047 BLAKE2B 1a817a76e237e698f13ebd69394e918b79981f4f983653c3777dfe77c009e01f1b646e0dea88a2e2ec574f48626e8e75ae7570ddfd6adc350e25ffd9a4b2d3cb SHA512 c8403751506b3ce096d707067659492422ecef8e684107935ab26f2e518c7c2c4baca8882cac55dd1961a86e5ad95b73389bc1a681cd2a67b5000bd6d626d2d9
-EBUILD configargparse-0.11.0.ebuild 613 BLAKE2B 277ca0e6810d665c054dba3a02be864dad53da61cbdcd154cacd2fc4296dd26e88ceceda25aadbf525be5f8a1f0f14eb700b9947303cf3f63ad67198bf732758 SHA512 5e1fe9264da49c49a3285e5ab76432fd3676e144ec39f59ae5931ad48874174d0abe7ed7d86f3ebc5d3902a73a41e7d9e9a04eeceb5961c12bcc7b4293be626b
-EBUILD configargparse-0.12.0.ebuild 629 BLAKE2B d0db5358eb4f7ee7477c70d9c3404b79dff3304bbdd5e0b2690f8a0bdb73e267c7753538ee414ab9af828a8fbd113b37f550c51366a4d0565d9a90ad3f1db71f SHA512 be0a26dda8f3891b6e02c8c7b699be926278972ae34b8216a35d41c56304407541246b09a459a7581642ea31eaa38c93baa09f7e176af5c96ae053d6943bdbfd
-EBUILD configargparse-0.13.0.ebuild 640 BLAKE2B 23dc863017738a70552effa98cc13633414d503463807f9523b82eb21195bc0358c6688cde504acf5f12d4d69d17dadd740712eaca404dcda768cedae2c0d52f SHA512 1b1662391f1c7afc92e6350b1f6bdff84cecb118010e543a837a02c87eece42487bc6a297856215dcdfe53e162472e64714ad63bc79869f1ba67eb6a9076eeb0
-EBUILD configargparse-0.15.1.ebuild 808 BLAKE2B 84a66e305a79cad82a0b845141f88952d94ff821341aba56dbbc522ab56a8379da753ade904540336502b63093f5bd117de0024aa2c8f55aeb70cc036e3caa1c SHA512 0558cfe98889d5cc84c6d2bc2449c3ec1e64d784fc1c07588aef080db368f4944add1eccc61ecea77fc3f9cde7b79547e2bf34ff4c463032b2dde595de877f19
-EBUILD configargparse-0.15.2.ebuild 740 BLAKE2B 6b314f6b5204a1e3eadbc0372302539a02a46816d359e528d9d3ed9764fb0df98a03ed61f952308bd38836809beb733cdcf388c8ff1389e1fb740e4ad551e375 SHA512 dc4873488c1161503b6966c9c88574de80c4b04e8d708b0674b9be283418ed5962f835903ebc4b95f7befe9a023bebdab298e3a1fd1bdff5de5168534fbfbf0b
+DIST ConfigArgParse-1.0.gh.tar.gz 26460 BLAKE2B 0dc83125116139e9447da8a9c660ac67db8b83a3b09c1e3ff148e09053ca10d2ef01447fd055d11804ad3903134043672ce7f458d990ff69c0ae07024539a3c4 SHA512 8e2af22dfa08bcf4665289285cc8f94aca00b650cd9521e9c02d4d83b546f4d79f2fd2cae2818ad0f2d38a16907e145ca7165071b78c557fe0be1797609e1cae
+EBUILD configargparse-0.13.0.ebuild 636 BLAKE2B 94cde54d54d89fb87007fb780a3569dd59275280f9c9fc8020c0c07b4660c3f07f0f18b40b29092106d3705b345c0b3258b1e5d9ad0290ceafa35f3c852e0967 SHA512 5c732d2310de50f8c3dd6ba140883268bf71aa8568ace7a875fe94b14f33af4d82de2e539bdeceffb1ff9f67c2d13d99334f95e7efa207da1bc9a2cd818d9928
+EBUILD configargparse-1.0.ebuild 736 BLAKE2B 6952c93cfbf43cf16e4b122ac3be4bd7f244ea01a83ba3a215b9b3295634f06fc76bec40033c2326d4adbde482eab0b9e5a44ee60be6632d81c83fc5b51c156e SHA512 7b1d9bb68b2250421405b582d8153ff2f56357418368769d1fa99bfeba7f0f73737a62f840d3441dd1013470b2cf644afeb2ab01193ad1f941b64da2e24e7af4
 MISC metadata.xml 387 BLAKE2B 36e5244634b47be38d833ffa6fa4996fcf06b54d030e147314289f0d2d920356b6726c1f8ed5529b7ebf74710173dee122ad40195796121855dedbdc07a91ac5 SHA512 5fa5e8515c41658a734dd17f3afdf59310c8347cdc9d6c3c1a9eb35dba26edb13e273bb5f577fc55fb3e3a54c1a8ae3f62d644be7cfe96900545de7b4f796e09
diff --git a/dev-python/configargparse/configargparse-0.11.0.ebuild b/dev-python/configargparse/configargparse-0.11.0.ebuild
deleted file mode 100644
index abeedc9308c5..000000000000
--- a/dev-python/configargparse/configargparse-0.11.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MY_PN=ConfigArgParse
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} tests/test_configargparse.py || die
-}
diff --git a/dev-python/configargparse/configargparse-0.12.0.ebuild b/dev-python/configargparse/configargparse-0.12.0.ebuild
deleted file mode 100644
index e9f07f6663de..000000000000
--- a/dev-python/configargparse/configargparse-0.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MY_PN=ConfigArgParse
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} tests/test_configargparse.py || die
-}
diff --git a/dev-python/configargparse/configargparse-0.13.0.ebuild b/dev-python/configargparse/configargparse-0.13.0.ebuild
index 1208a60e46cb..7e3fb31dec40 100644
--- a/dev-python/configargparse/configargparse-0.13.0.ebuild
+++ b/dev-python/configargparse/configargparse-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="ConfigArgParse"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/configargparse/configargparse-0.15.1.ebuild b/dev-python/configargparse/configargparse-0.15.1.ebuild
deleted file mode 100644
index cffd852dc51a..000000000000
--- a/dev-python/configargparse/configargparse-0.15.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ConfigArgParse"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
-#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-SRC_URI="https://github.com/zorro3/ConfigArgParse/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-python_test() {
-	local -x COLUMNS=80
-	esetup.py test
-}
diff --git a/dev-python/configargparse/configargparse-0.15.2.ebuild b/dev-python/configargparse/configargparse-0.15.2.ebuild
deleted file mode 100644
index 0124d46ae566..000000000000
--- a/dev-python/configargparse/configargparse-0.15.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ConfigArgParse"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="https://github.com/bw2/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
-SRC_URI="https://github.com/bw2/ConfigArgParse/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-python_test() {
-	local -x COLUMNS=80
-	esetup.py test
-}
diff --git a/dev-python/configargparse/configargparse-1.0.ebuild b/dev-python/configargparse/configargparse-1.0.ebuild
new file mode 100644
index 000000000000..51199ce8306b
--- /dev/null
+++ b/dev-python/configargparse/configargparse-1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="ConfigArgParse"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="https://github.com/bw2/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
+SRC_URI="https://github.com/bw2/ConfigArgParse/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+python_test() {
+	local -x COLUMNS=80
+	esetup.py test
+}
diff --git a/dev-python/configclass/Manifest b/dev-python/configclass/Manifest
index 60e42f689729..a013d6300fe7 100644
--- a/dev-python/configclass/Manifest
+++ b/dev-python/configclass/Manifest
@@ -1,3 +1,3 @@
 DIST configclass-0.1.0.tar.gz 3246 BLAKE2B e97ea98e495dc920d50e7240eed4d9182829b664baac0e8712b5551703f730f7052228d693a60784435fbc839639fef9e5c29caef2f8fa26827016aead182a8e SHA512 d3a83c742916a9d345a3e8b2fb29d8742cff67a110f9bbaaee6e04fc1134faa6eee13f7344a95f133107afcdfccd394f6a3b5fc516b21dbfd7ac38a5bed00d34
-EBUILD configclass-0.1.0.ebuild 507 BLAKE2B 33f68f7877d24991641a4ac05d1b3f0983ec3a55689b1ed185fe3315ffad13781751a6240772fe19dc8a61b8cd0f977d2a08b86909f195af29f77dd57c5a4149 SHA512 e0f5b79dd4b71c552db6b5cc47a1c250a7cc8a940c223414392655a7d4f4743ebf04e1805557f59d2d97c5c03385923aa179bc667151103fc395adc5b11aed51
+EBUILD configclass-0.1.0.ebuild 498 BLAKE2B d4f87f95f3076dacf3c42c1229cff867b2ebf3a1821343124a566851a28fc91904e93b323d793f124368e093e16f62dc39d178d77027b0716bc555d306b4e2dd SHA512 78daa2d046139d10787a1aca752f70fe1241d9a37fff3889a5670a83b8851ef06e959f032801e17be8e78a62740b8f5ced78313b207d3196c9bc7bd9ae4a0aec
 MISC metadata.xml 377 BLAKE2B ea0b67dc8ddceaa21470ba69394b82acd8b9b946992d359c2574cfa69ddc49597b971647edff13a7415251e5b05e2f43cfd1660259f864e6c5414b49c226bf24 SHA512 6307100bf5465c429ee480c4157953a4a7b24a5429197bb43ec7141b846247c13570f946dcf1795afe2d3c97039d103ad796e1626c0ad80ae7b19814cdbe44a7
diff --git a/dev-python/configclass/configclass-0.1.0.ebuild b/dev-python/configclass/configclass-0.1.0.ebuild
index 40fc65537dc1..cb12a302260f 100644
--- a/dev-python/configclass/configclass-0.1.0.ebuild
+++ b/dev-python/configclass/configclass-0.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index e66a21fe48f4..cba00feef3f0 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,3 +1,3 @@
 DIST configobj-5.0.6.tar.gz 33248 BLAKE2B b58a22fdf247f1c3022108e24abb4de55620ce75f6aeb5f269f008a5668e07b8c1d0c49e4059d7f4c4c361d269ead39c3784377635c7718f92c2381e69c56cb5 SHA512 f253fdd0bc3fcd37f56c9ceb28f5c8c739b0861e099b07a3929645907c97b2261f0529850a95c1a42507846f72d88a0992fcd1e1d6fa8654dc713d120f769963
-EBUILD configobj-5.0.6.ebuild 970 BLAKE2B 82bf4fc3d240963f5dcc2e29c1d0810e85cc0f27b1302d3a1be95c5cc550c68e7399978329e05280772caa26029915623e38ce0830e288b1aa8738d4bc4c1ec6 SHA512 e4624dea31537884c520977119f3d3119cdefbd53639184f0f70869c859a63ac28b42b215c16eb0ecaed2548aff8595c6a62aeae30407f4f931f878880a49e57
+EBUILD configobj-5.0.6.ebuild 963 BLAKE2B 74548af0b7cd9bd1c909c8fc03ee35f361491c743cbe1775fe08c6dea4c1ccaa2659ae398934afca9944ca1b262f22d2ed1b7d93f4ed7d9a7ace240ad294f700 SHA512 df537a586c059ff4a964dc73b6ac226efd3cd35b4cdfa020fe8497848acb2452a5fae4d1ce798213e2e0760692d31892dc1a118a5a51bd292b1bdf1ee3dba277
 MISC metadata.xml 663 BLAKE2B e4c20390482c920c99164449489636bc0ce8305f38a96673898743a79bade7b6c09d6c9cb0fa5f7df84dd3791e7b78ac0e685e2c32dadfde1c44ad48f427a655 SHA512 c8c5d8bd7b5efd97310af1bc9dc172f3623f01b45b44c20ca33f92ad0d09845bcab10e6afd704df1188a747660ee4e7f519a55dc40ca5945c189611740e9c480
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
index 69cc5e395b21..06548d4f7877 100644
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ b/dev-python/configobj/configobj-5.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/configparser/Manifest b/dev-python/configparser/Manifest
index e7554c81fae4..be6c99168cde 100644
--- a/dev-python/configparser/Manifest
+++ b/dev-python/configparser/Manifest
@@ -1,6 +1,6 @@
 DIST configparser-3.3.0r2.tar.gz 32885 BLAKE2B 395a6fc69b1b4c8f6d59bf088ade94f0573faf26964a38a64393912fc8ea7279d4d8bc67d3f7cba5d754cbe82572ddc12e2fdef1ae3ce18cd216f4705eb78b85 SHA512 86c095bb64766e87ba59462a99d0287ec52073f27a1c9be7d37568516bc0cc4af6f362ca90a1b90f52aaa4342dc275d769c77f18d80c0efb114ba6fce37fff5f
 DIST configparser-3.5.0.tar.gz 39573 BLAKE2B 100baa33268376e44bc8f7f8e875e93f081baf71226fd84430823617805c0c983e49b5ba08261ba0d73e92d30e0151a9ef9733031673e16fc4012f4020881298 SHA512 490b9f7807bce02667f41a48389b51f550818d2bd4296b528833d65d4b04bdbe5b906e7584e55eee4495405267a697ba26a056e6504fe6b3f8cf07ea8f55f7d3
-EBUILD configparser-3.3.0.2.ebuild 496 BLAKE2B 087eadbef663ff1d887d312b1e90b62349bfc0889ab0de0499972911f5cdbda2b3ab20675cbb423981fbdfb9c7b5ac7f941177d8bd29dc7ccaf2c0538ca0d2a9 SHA512 354dae94eee3311df24f084ec3ef355d515ce0f3d6e17637f1b95c5b3f36f732553fc8fd5648afba2f9de2aa42cd28490abf2424aa6855b85fbc44fb99050dce
-EBUILD configparser-3.5.0-r1.ebuild 680 BLAKE2B 4f77f823a1481f78dd93549a649afa9eef6e630a8e35cb4c9d6420a1738336fb8bdbc3df767bca39bf844ee39e17696d59329dc1cd71173da85b461ddd540866 SHA512 375dd23e645e616f1b2dc1195c7aeab2a8e66542a994b97ba48388576e7ce8e42a6833c0c5d637e891cc1fa3440cbf47eadd69c638ef0f0f86a4e8818e736700
-EBUILD configparser-3.5.0.ebuild 476 BLAKE2B 941a8f0d41fb785b71164789d102ffe0cc8f620988b4326283a0bccc55d11ded12b982947dc2b182e9d491586da6fc8e24b73bc949517c65e8d7daa9ef3b6b6d SHA512 e628d5a8ded1d49f1d8adb9758337c012663cc3550e4600e82c45848a78e13d1c73356b24887b971de3708e4b0ca6837b9c4c349e95be1e09fc368e61774f0d1
+EBUILD configparser-3.3.0.2.ebuild 488 BLAKE2B a9a751d2a7af1c1e44c943a8580693c31f6617f8d4377ccbcd151cee9366ea2d9f1443de67dc8bddc0938a85d6d0576d2af5a43d1e08dc20f2fb1c0d356f0a92 SHA512 152a1a22b6f5f0b6203c8c1806b6e07f93f002a66b237350646d97faa33989a5451d963da20a460419807a74002672d5f073b27cf2e2ab80568080255eb796b6
+EBUILD configparser-3.5.0-r1.ebuild 675 BLAKE2B 9338f605613d6b95e1339a406a1123001eae247a477a377ff306d5c892725a42320a0769f7ea4e88491731bab25d3fdff74b52c63c3de404ac7dc4b62a9b1de3 SHA512 4ab24657c9b2dea057c46450e34658d0174a3875f89c5a48ff29b2437ff93b517ade6db7d2e036d2c91ba40183eefd8a7b14d9c253fd1cd71395c69155c9d338
+EBUILD configparser-3.5.0.ebuild 468 BLAKE2B 226e65d685d2bcf6728cdf08ae25c0b24acb14bfa6d66351ec5db2bdb7f49f30971f085f6bf7153c92cda790a51bcb6af0373f4c20a52b65aa25a335b749df44 SHA512 eeb5082ea448b90aa2938c750d8dcb63c95abd05e2c98a4ec2f817e9aaae9b85405f6c4d17a0a23b3fdd17ebb3bb6190ebd35de3787c49fcf236b4c6f13895e2
 MISC metadata.xml 325 BLAKE2B 8b2c0dc1df941bc82398abee2ba3521a98bf318d2cb7ab34105eae2f10582c94d9d6c14dfc4eb9dacf1a87c0e4e0b80aaedfcf8d172205ed2b945abf1d3578f7 SHA512 84ae4fb022faa7158c67ee9be02019edf93a84b0f97d56e9bc4384bb57abc4f7c93db747627cd87696506383922101f3f5c58ed8509111b75eb6f3574cabc75e
diff --git a/dev-python/configparser/configparser-3.3.0.2.ebuild b/dev-python/configparser/configparser-3.3.0.2.ebuild
index fb1072dc4527..5073c1f61890 100644
--- a/dev-python/configparser/configparser-3.3.0.2.ebuild
+++ b/dev-python/configparser/configparser-3.3.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 MY_PV=${PV%.*}r${PV##*.}
diff --git a/dev-python/configparser/configparser-3.5.0-r1.ebuild b/dev-python/configparser/configparser-3.5.0-r1.ebuild
index 8433812f8b3e..ff585f05a164 100644
--- a/dev-python/configparser/configparser-3.5.0-r1.ebuild
+++ b/dev-python/configparser/configparser-3.5.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Backport of Python-3 built-in configparser"
diff --git a/dev-python/configparser/configparser-3.5.0.ebuild b/dev-python/configparser/configparser-3.5.0.ebuild
index ab81156bbe9a..349b4a8448fd 100644
--- a/dev-python/configparser/configparser-3.5.0.ebuild
+++ b/dev-python/configparser/configparser-3.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Backport of Python-3 built-in configparser"
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index 13682ff0f192..29e29fde55d8 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,5 +1,5 @@
 DIST configshell-fb-1.1.24.tar.gz 56946 BLAKE2B ddda3313bb41a346d08006f1d3c1cdc708a940ab9fb2e0042896947b89e32cca872fc8a19a392eeebbc6403f042aadcef2c78962c069e9c1ed10a2f5d4bb102f SHA512 34aabe6fa5c2f00112748e35fe3859fae09baac5ef13b9aa80e6f00908290a0d724119aa3b2ce86da8bb171c60860304e650aeb16bc678354a7464bd0b5c9b48
 DIST configshell-fb-1.1.25.tar.gz 56900 BLAKE2B 00f16c401a87cde0e70730ec74fe5885af3ebf22c3745851661fea7de874f5609c49e0b7c521c5d3db16eec903e0f24331816acc8e19a080043e8399c98bd18f SHA512 338eee8eb7b0fad533b739bb0c9460757cdb90103c44c37568dd86158431b67e1b0ab050afe2670abbba96c5d8c18db9b107d9f7650937a2be7f53fad26efed3
-EBUILD configshell-fb-1.1.24.ebuild 599 BLAKE2B 6cb9b6e718e112e72d082a2c65cab98dfbcaa75c20c10c3a0aff1d5e27d59adb2bfe69e05b0fa62d5aef2e6d83e8f402e0dafb5166c21bb74024408752260e20 SHA512 61bfa3fbfa69478a58ffa115ac7faa19a261eca804d602b0b28b6315d3aaa36ccd70129a058fb9864a79aeb6c9a570f6af70cf31404c88dcd38e3d19b4dddfc2
-EBUILD configshell-fb-1.1.25.ebuild 601 BLAKE2B 70066b9c912a641326c1785f9d703aa60f532a1f4a7d57b2543ac04095e476d893280cd8885607e050d8cbe7af12fb01d1438e5c5661676b8c14706b9da7e4a0 SHA512 02e3b0d9ecc32d3dabf0445c6ed923b6183c795fb5c11d37c11e5b0517da828a5a7eb387af5f8921f10b2c4f83f5af75ed28642c1a2926decd24bdea37f35170
+EBUILD configshell-fb-1.1.24.ebuild 595 BLAKE2B 2a76fe91e7fd0e8e2c46173ece40a20e66e05986839e0142d3c85932777decfae42dd36b1a9c3b1b3ee93ee3e7f1806cbfd6c2e1265ae2d606bd044a30f3bd4b SHA512 d22984c52dd8876340369c786ef7f75b7ffe8c4894bb7366d76f620eb75cab3c9693ade96efacf5cb3e7a38ef88c389ba3f47971e030671713e19cfc2d9bf7c7
+EBUILD configshell-fb-1.1.25.ebuild 599 BLAKE2B c28dbc86455cc4ea6cb3c3a8976b43dc6475b401d634751722f7749641c5107f855b97b608692bac44b12cda653fa7b3c330195f462e3430887458c3607a738b SHA512 a628d3aa0fd8cad79510bc53d78c4b9fd7d48ec04cf7e0f0c2de1147a4f62e6cb83411ec9c4270bc44dbd1d87ea862c730d7ac12a7724b719ac38e51cae7f519
 MISC metadata.xml 937 BLAKE2B 2d5ded6950c4286478b6867241f974274b06fefb406117b7b1b6123d092f680e998967c0892fee40f268eb6530b62ac99f4a23859e0d208b6b1b73c730c3343b SHA512 fc2d86ea29566dc96e24e9126c28f76d83bb97e11bc336aef563595602a8342f7e1c2f9fedf6db1aea603d736e5dab3fef7e89e5b8ef4e3e5bca671019a87e73
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild
index 55837c950daa..1c7e2b98e61a 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
index c04e53c370b3..8f0a3486e6cf 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A Python library for building configuration shells"
diff --git a/dev-python/confuse/Manifest b/dev-python/confuse/Manifest
index 6520d4e4287e..ff0f0f434099 100644
--- a/dev-python/confuse/Manifest
+++ b/dev-python/confuse/Manifest
@@ -1,3 +1,3 @@
 DIST confuse-1.0.0.tar.gz 34790 BLAKE2B efa23f59e6d450160af279042ed3d77b3b26bd1fe2fffd90b0ce1c87821b5540048b45644bfff1a8420007cf2a705d388965daa20034bb8f846085dd92b49186 SHA512 f436a400b9b84db1a20409c70d64fdde44903ffba6c3618917fd297e04ecf3dda806e315972f7cf1f786c93639b10b0652a622a579a2cfa47703386a43433c8d
-EBUILD confuse-1.0.0.ebuild 953 BLAKE2B 0addd6eabce174929e85f013587383db1149143c90a1a1de420e772f7efcec4d249fc27ac0b2958264728574c3829658345313616730338fa5c2b44f6037a4ed SHA512 491a8e32b47c39fa0fda44ce6eac43c45f156a2f6d7c86146e3ddabb4918e667655c3a0e137facaee04ba3332a43dd245553afea9762e5201be9665449230b5e
+EBUILD confuse-1.0.0.ebuild 951 BLAKE2B 850c9ff33439c653f186e8093bea5df58b8cdc9887394b0d079f734bffb57b380a0ea9927013755760c6c4718458a0b4a0c7e095cdc16e2693a81a822f522841 SHA512 1ec796da1398cccbf84d7d6bfa93dc82c560678f0e211f8d2834eac8d6a32b8b7bec8636c9bdaf88ff9809452126084f475644436b2dca88dd383ddb7fe616a6
 MISC metadata.xml 718 BLAKE2B a6560be26b0df5dcc2eba17f94fc39f9c046eb77dfdad707c1c31e193f80b5d759a7bc952e02e1b366d3808ec693af515f49145ab07999b33dfc4246df409b6d SHA512 a1ae6c33763436de811d9f72b654586d5f08f6ed6130756455cdd9c200f0f800494242224ca8bd80bb99a6308a730940fdeea170e5c6816a8edcbf14d7d171fc
diff --git a/dev-python/confuse/confuse-1.0.0.ebuild b/dev-python/confuse/confuse-1.0.0.ebuild
index 716e4d492632..bd024be7b970 100644
--- a/dev-python/confuse/confuse-1.0.0.ebuild
+++ b/dev-python/confuse/confuse-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
diff --git a/dev-python/consonance/Manifest b/dev-python/consonance/Manifest
index 87b5e3f2a0af..e64849800a2d 100644
--- a/dev-python/consonance/Manifest
+++ b/dev-python/consonance/Manifest
@@ -1,3 +1,3 @@
 DIST consonance-0.1.3.tar.gz 30762 BLAKE2B c30db2741a851ae1ef02361102c432d931925125d8648c0e5b1a88005f480219eaf81e8205559dd709b43e98b3925777d1fecf702577e38c3ec1c8f4e8a19cce SHA512 9f36f81b453dc4de2217a997580bb3f8747c86a8116275ba5a0e86cc66ec62d6490ae20c0e5f7401d1c16d601686936ba7b789999941c657a0b508ce0dea1cea
-EBUILD consonance-0.1.3.ebuild 935 BLAKE2B e4b12ef116329705e83360b304d21dda2c7e261603e065e23db7c3e7a0c238994574363838c9642d4c9ce0f13dea5f3eb696ec35020b2f0569d819ea668ac3dc SHA512 30c219eea8076d416796ddb4801a1662cf44fe0ce984b107e5318317cf24fce190ddf2804d687efff60ddfd1ff5917015746ad201011ee2cb3242609819425ad
+EBUILD consonance-0.1.3.ebuild 935 BLAKE2B ab921e4a81f04a42b22ba05b851e403e46a704f41cf13df956007e27e1755019c5c6fe8c344366cf453c12a384161e0662ca2b8ce4c18a66f28aefe535b2a15b SHA512 01c04e539bb701051fc20fc5a4ba5ef4a1a031a14de4fba9d54bd399b5305402d808bb404cc6cc523e59fb3eb7e4c9602ce60cd5ee5855c63ab41741eab9d4de
 MISC metadata.xml 582 BLAKE2B b36276e39edda1de4250583df9a2deb2118b0433ffe44c20960108f79857efc8b3c86950e8fe1b8cf115d40dfc767eb14908886b7e86e108582d3262ec960561 SHA512 fff3526cfea536ac2704be7a8da499b4d4a64f07f5682ed48ab84bbd1ecfdc9e2272d46eb3623a8623097544da121ad8de826ba474579e201b614ff7d61c6572
diff --git a/dev-python/consonance/consonance-0.1.3.ebuild b/dev-python/consonance/consonance-0.1.3.ebuild
index d8e2b3f37064..e20cc9128560 100644
--- a/dev-python/consonance/consonance-0.1.3.ebuild
+++ b/dev-python/consonance/consonance-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index 5c103d6bb46f..df60ff897947 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,3 +1,3 @@
 DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
-EBUILD constantly-15.1.0-r1.ebuild 719 BLAKE2B 88471b240bb3dd9fee8308831d219957b6950888034542a192106da80237544880e63ccb10375e1f44b362cadbeeb51290b168ca1bed356a79a61a82313d4323 SHA512 12780953a9f125618888e0f33fcd862f06f5ebdc471d06b39c1f008905954599fa5fa19296a75bd67b09501bd2d85040ef27de5153a10bd6e70b2e36ad50c1af
+EBUILD constantly-15.1.0-r1.ebuild 717 BLAKE2B ddeb217ec59cef744a55ddfdecb8fc413cd34d9c29a1e0942cf3fca5bb188265d137066764b533b523ad754af02448026d3f45d4b89fc5056a835fd6ba6427a9 SHA512 8f9a0ed55fd562a8d227cd0eceffec1de8e5779ed2aff7dc785126afce466a6289f8f9fecf8de793a6658a514c7a1b6eb506265f277a9d9d14d320013b72105c
 MISC metadata.xml 664 BLAKE2B c08531b4ad0b05cd57b529174a364c5761e99f333515728204112e81552e40e4bd016e80e7e848a532203314b1a2ff525a0f984e7bc0c2147d4e6eb7446d98ab SHA512 5570cfa8d4c71931cc24c1dc8dfdd3610447cee11097f92c7794a3850a946755991a3f3ad043e3d6a4b05f87bb85d4a819799623fad6e1b10021fb37afcf3c22
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 2cc0e6074f89..e3b36e5d7bb5 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index ff64da708cd1..e51c0b18b684 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,5 +1,5 @@
 DIST construct-2.8.21.tar.gz 706022 BLAKE2B a7fb81185b380b444bede5dffce11158d93f0076cc3fbd836cdef3cf8425e2bcce0cf7b8e2d2654effc8beac3d3d0f722dd2786103f9b85f05b98216fc7684cb SHA512 f8e2c8d0f437cce760b1439fc68e2b10dccf852e1bf3c42e0569a3e32fe218d2a4d4cc662229455a910fa8a7cf0fc0500cb0d38ad0485f1b9fd954334f343562
 DIST construct-2.9.45.tar.gz 1042299 BLAKE2B 4d646c3a340b969e83e15436422732f4f4380ef24cd0e9f258f3d3666f17b08ab628d19db39bb8fcd3f370c2b0c93a8329fba56727f28d7a23d868d001610927 SHA512 78d64f3e567e6c9cef842d3e15f416d48856d229a8c6f21e282d3123a86fdd243b20dba5040c6e1d28b67422881351b303262132263efdf94bb73adde0d5dfc1
-EBUILD construct-2.8.21.ebuild 738 BLAKE2B 2159ef7927be01b86097229305dcf0c6a52f8ad83c8ef22a7bd362e2aee14e226f61401a5ecf8364907e7e5f2540ffb47e2500033ecb25933fc42777dfb9fb2f SHA512 9a5624ee9ef830b03087fcea60cc05d04e78e1f9d3cc005ef3aadf28a529d17f2e1a2eeb92756995a7993d1e38d0a9f48e8d8df1774c15b1fff61b12cddc6c87
-EBUILD construct-2.9.45.ebuild 983 BLAKE2B 1af28c94b0ce1980df4bb086575feead8896eec41c4bce6c09661929d922d172b53bb2875f039bb0a3c3a7d43d6f1f8079dd620d0eb9568712f71b7fee5a2dca SHA512 e34c370b1d5e5106926cc57cae1b861b4d803131e63480358029752d69cd21bbb0a46e6929b6b106217f11fabf9f6c0e9c4a2fbead757e7a1d51798bfce42205
+EBUILD construct-2.8.21.ebuild 728 BLAKE2B b5018642e486443e268c560ad2c6e7d1ec8fadc82d419716216454a2a913487a961daf5f7025029f28f2922bb0065a1ec1ad6e407a5790b93f8dfbf69e550a48 SHA512 31d64198a2c1fb8c0082f58a4c2b44c4bebf04ec1336520c1f16acff46fe86ea0feaa78077a2125e0c4b65df7dad2fad4a73fc32550cfb7b12b7d3a9329bea2c
+EBUILD construct-2.9.45.ebuild 973 BLAKE2B 1341559194f95e013c913b11c48831600241381a35ac311047019abae6d0e86ee28d7a5d69f1d56df9e405309768e93cf010a72c4a6e186889256fdae6492425 SHA512 8e00b0d565e1f55053e0ea2bde44fd12027bb0636832825b3c0740e8a636ed492741e223eaf4c5be03b70a3bd10fa69ab1a24a5b683af3ea5dbeecb124b61c63
 MISC metadata.xml 491 BLAKE2B bf8f7729988a0a4c39c9f8081a4b05560d1596a69c8670e378ea1f1f81b8dd5a2c366e8211c36e07f809378c6ae769b01181a4ceaf3f82ec8eb2b1879d874a87 SHA512 a8a85937bda8fb36a51bd6e0c0bcb1ce721073ee07a8e198c88b64ee484e8fd1c813e937443885e5ea2e532cda3971e8eb59385797a7a8f44ec9524a57acbbf9
diff --git a/dev-python/construct/construct-2.8.21.ebuild b/dev-python/construct/construct-2.8.21.ebuild
index 7004e7042c5a..9b6945e26a56 100644
--- a/dev-python/construct/construct-2.8.21.ebuild
+++ b/dev-python/construct/construct-2.8.21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/construct/construct-2.9.45.ebuild b/dev-python/construct/construct-2.9.45.ebuild
index 4547aa73be86..877483c6d924 100644
--- a/dev-python/construct/construct-2.9.45.ebuild
+++ b/dev-python/construct/construct-2.9.45.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index 995c93c8d2e0..b5abb815404d 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,7 +1,7 @@
 DIST contextlib2-0.5.4.tar.gz 28523 BLAKE2B ada08a83e968f58caba5851b0f6ea0eedf8242d5e4b0d4e9c036ed0576c4ce8300669fd09d4ab3b019d8d49bdb79dfcdd03668d5af8519119013c931f037daa8 SHA512 c8bb5bf9dbbf5bfd882663813f2a456d82215be7ace55aed1d5047ce7f21f26d5518982ec26344b1e950d3aea27cd8a5c48627730bb28f8b3cfb6a331fd7ba66
 DIST contextlib2-0.5.5.tar.gz 28755 BLAKE2B 4fa16a0591c5e2138123b4f6d539bae8993bf826bc92b9ba08d335efd142b5e20c53e0d4e3cf5d7ac5d8b43cff45a19e170a7d97a9300fe385fa53d042cbfa38 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d
 DIST contextlib2-0.6.0.tar.gz 29607 BLAKE2B 674d0ed2cb71837ec8bed46b44790c31601347e315abb3ab666aac3a7754f07602bbc4f1591a8c905e02949ed9178fb6230f600ca35d244b83353286901510e2 SHA512 01901ac226c7fca40add00e95cedb2535a802e0114a53ae1315c6dfee20744dbafa7d9619986ad76345ad9b9aa3e364ac01d23f51b5eb70dd2febd5af1f1fc56
-EBUILD contextlib2-0.5.4.ebuild 645 BLAKE2B 030c9912e9c5712208bf18d341e2ad8cf4bfb849d531cbf7de9c6229a4f5e2964c2679ab12772a9454093b6058a8c19589c74aea2341515a5763749bfe6a1ca3 SHA512 81145a9c7a79c32279a0cb2e2b39188ccaedd6f6259958bb6febea591c8bd0ebbbd57561bb7143286dc91aa52bc3d0f1e61dbe6c7152b9b1b64baabe31bf77eb
-EBUILD contextlib2-0.5.5.ebuild 686 BLAKE2B 6dd19a56a579feca030f9513965aabcb12ea4d2611a6be29a872a7d84d522f7904a75feba5c1ae4e9b89204ff2817fdc84cbbb7a5695df0497e0eb36b6e1e4d4 SHA512 dc4e2d82e57fdf2da1c45900d83846844d75adf7b318a8a5de19bc10258b4c98b1eba6c52072eefaf65866c8156f3e664de62c7b7b2fb393f7e103ea532e4917
-EBUILD contextlib2-0.6.0.ebuild 920 BLAKE2B c1e2876d9e116b43ffc5892a30771d53045b5ed06370dd674f331b84dcfbf4662b5b09de253314b318d59c1cf3c7f1f4ef38b9b4f85c2cd4c2fadae44fbbed35 SHA512 c1577fc7f70e228f299b4fb3a41d7a61b9bb9b8cfe1259b250f2ef84d2ec917e16e4c6cbfadabe0a238fcc72ffdac33ed3b02a6b075f4c14172bc573a0002cc2
+EBUILD contextlib2-0.5.4.ebuild 636 BLAKE2B 6bb7a505f6a7eeee6119909d3de9483d565a3ef4b14da3f6f19cfd71b5635859e522a4fcbacd252825d72a8f86a114d8bfaf3c63837c15d56e492f45267da55c SHA512 f2e5d45688e91f1b1731d1b03a3f7fb1c520165f8fdc32f6fb2d860e91a28ad05e9f617d9f4140954b68b99cc703f2c14d0d370be9be39142751ae0f064fd1fb
+EBUILD contextlib2-0.5.5.ebuild 679 BLAKE2B 5c8415fadd3ea2a86780f61f95756ca87e95c6a13edb3acab67b8c611f9fa37c7c10c054a17276fd00763ef99ff2fb2b843651b5bf966a572b06b6b492ad7bd7 SHA512 d9270d73de537ed52a5ed5c417ad68aba36e8f6ca24208c3afb275deac802a1a43648ab2dcb3efae69d936ee0f05158adcd22418467bdd10a5850aafcc5aeb03
+EBUILD contextlib2-0.6.0.ebuild 913 BLAKE2B b8dcac943cce16bec9c304dc51bcfa7da0d0618e3e7624c98043cf4bc9e3e3a525d4374805aa14223897058397cdb0a8d622cd1699eb317543b27fa3a4022292 SHA512 ae072dc7e0fc31de7b24d3e649ad1bba7db146a7e85ab9afc9b1c84ba74076bfeffb647191644aed6d70798a28efcd9280b4c3d5952319c81c0b2b4c65b25c6c
 MISC metadata.xml 324 BLAKE2B cfd3b05583ab0f14acf1057ac34124525ffd63c1855689ac19fb10fa9f998f477d1c070226c9e5798dd68c8629b2564e2112d24f38306a0f3958526179c4caf5 SHA512 616fe24d7cf8c1e1c52add7d9a8fc15d6e41cf20c116e73997b1e3a732110f6305e5ec50de9a4be75d58c588f55da30980bbdcbd65078c05a6da0dccd89cb36d
diff --git a/dev-python/contextlib2/contextlib2-0.5.4.ebuild b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
index d595e8f8f79c..f5f089951b95 100644
--- a/dev-python/contextlib2/contextlib2-0.5.4.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
index 49e57c6b9476..3cd97b6ce980 100644
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/contextlib2/contextlib2-0.6.0.ebuild b/dev-python/contextlib2/contextlib2-0.6.0.ebuild
index 3d3da3b1ba8a..3f0e0face25f 100644
--- a/dev-python/contextlib2/contextlib2-0.6.0.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,3,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/contextvars/Manifest b/dev-python/contextvars/Manifest
new file mode 100644
index 000000000000..2b006dac45e5
--- /dev/null
+++ b/dev-python/contextvars/Manifest
@@ -0,0 +1,3 @@
+DIST contextvars-2.4.tar.gz 9253 BLAKE2B b46466e44f836561024b69bd648613654336a41f964ced77ab29e2fa20b43b19f0c6b5b72d31ccf208c8b74ad54fa1898ac1c09b24b124ec53a5970019910553 SHA512 391c12f163854a21d6422afd9464e8896c02b5cb5e2c567550907a16b7970d4e2d02cd360851bba103efd64062669596eacadc7421432198c61054837b57b223
+EBUILD contextvars-2.4.ebuild 511 BLAKE2B d0286916a5c0feb678261386f58597c082a5e7bf4f4caf6bcd4fa9db548b1f32069dd213e08a9453f238134dc79b8ea7be8dc21bea9268e3140a0be65ba71977 SHA512 7776495ebff2257cd8cde5a74ac582c933c22ffa2e5825a919815414f37fe665736a1aabc5b415d6e0ebbb4bc0dd9debb461a4f846a0da19e0aa6e416b78c02d
+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
new file mode 100644
index 000000000000..a430739ae4c9
--- /dev/null
+++ b/dev-python/contextvars/contextvars-2.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Backport of Python 3.7 contextvars module (PEP 567) for Python 3.6"
+HOMEPAGE="https://github.com/MagicStack"
+SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/immutables[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/contextvars/metadata.xml b/dev-python/contextvars/metadata.xml
new file mode 100644
index 000000000000..2cd9d5948e31
--- /dev/null
+++ b/dev-python/contextvars/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">contextvars</remote-id>
+		<remote-id type="github">MagicStack/contextvars</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index 3a1566729feb..5bc623b17c16 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,6 +1,6 @@
 AUX cookies-2.2.1-fix-warnings.patch 9038 BLAKE2B 78692c413a2a5495dc43c544cbc27410a341088c8ffc8cfb8543ef0a6f7e7393ae37379912dada2cf0e4ce8b238160244305869a12629ede435dfcb6df334910 SHA512 cc18c782d07bda0518a1d0824281ac068bc97684abc505ba24bc895e6f43f70bc16835c9781ffada42175ac2cb9dde7a200b0746910e7106c3b41e8a9a0cb382
 AUX cookies-2.2.1-tests.patch 1131 BLAKE2B c98b40cab2a20b5779e670bfb481f34abaa080d0780a76127f12783f0fd108b67c590d01304f2f173ab5808fd8f9ad7ef65d0227a1f31eac4296302b7610ea81 SHA512 ff571d810ca576a9dbcea1960056ed05ceaf738148324d434409b03cf399d43ecb5b13fe228da54465d020c6cabe109a447f1a04a37d1276feaf5be6cf38eea9
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1-r1.ebuild 665 BLAKE2B 01d31578bc9f4fdcf2761fc6a3a93ca386fce133504a51448d2d2d86ae649557ad5a74ac8c4ba6544794443b583599abc5db8dd98fb1c4edfddfb74c5ca08ff1 SHA512 6d41b4cd71679bd2ad44f214f1f359da6e2fe20d6478d84dbf62bb6ff47dd939b070acf15dbd92cf9f6b447a9237aedead1643bc7e5aa937c5d0efa86f2fd6ce
-EBUILD cookies-2.2.1.ebuild 582 BLAKE2B 7465825e51c93e9a331c11502fb0ecfd7783069bff2cd95c5d4092bee69a15a74b01306c998029bbed05206b1db317eaaadfdd79eca5e9cd650e12549be63526 SHA512 f800f137571c3c66c184dfc820f0d60189c2fc55f9958921d3bf3cea03a490911c8cbd42a7ad80b7cd584ae2936e65e607d4051d543957ee6ebd20d3b3d1c876
+EBUILD cookies-2.2.1-r1.ebuild 660 BLAKE2B fe159ff1ae2691458689201071043ca0423a7ee6c8c55ec664f256785b03449a903c5d6ed7ce67979c874636f5942baf1df8349ef6b48d3cc328c5849dc68328 SHA512 19e250dc0c59506935aa7e717f119a5374a164e489a78e692f31d3959c43d3079f798700afa1bc28cff6c8e01547a99734c61b1aec15d6b5c8b4d1297c765cf5
+EBUILD cookies-2.2.1.ebuild 578 BLAKE2B bd5c53fd4760dcc8e95f033ee1041dcec7b3f4d480dd49009f3ca7e28f0e6165d8d5ba1bdfad4f8458df82f5972d01214848306619407d8a83f05f94797c169c SHA512 38e5982619219e8a0e26bcb9ba60ae6a1aa3765879323a96d928a52493244e35875d6d0325ab1c68a8f06b2148de5b45df5caf81afd3bb91fcc7bb02db3afe7f
 MISC metadata.xml 310 BLAKE2B 3f44f9692738692ca4eff801de2fa67bf33220d8b5a94985dcf33c21d1b18b78f6dc8f13bdc42b4edb4afa96a869583c6caa0643190ec68a24c57852c4212d8b SHA512 b98da30bc8b8f3deb352a59ca73a88a9640cadbc20b3049523930f6e671cd057d19b4dbd559702efdac09ba1ed238b7df95502e9203f1d34147fdea5a308c82b
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index 7902a8e44f21..e973e6e15b0f 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=(python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cookies/cookies-2.2.1.ebuild b/dev-python/cookies/cookies-2.2.1.ebuild
index 6762c79f54a6..09dcb5dcaac3 100644
--- a/dev-python/cookies/cookies-2.2.1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 inherit distutils-r1
 
diff --git a/dev-python/corner/Manifest b/dev-python/corner/Manifest
index dd676bc13556..6142c037bcd9 100644
--- a/dev-python/corner/Manifest
+++ b/dev-python/corner/Manifest
@@ -1,3 +1,3 @@
 DIST corner-2.0.1.tar.gz 10534 BLAKE2B 7ea10bce4c45385aca7083d7276415168e4f2fc900020df5f67a81e86ddcc4f9df5e5aa76270fee72c41395c7cc549bb9630c3b3eb24e0640f10c387adb1c976 SHA512 ebd625ab1e4591b4c21d25ec706c35d37f560b727e1e0d6a79948c4a112ee6f21d3ca30162901a27715074e1345f3bdee1a0345c63e5fec24113e495fb094127
-EBUILD corner-2.0.1.ebuild 586 BLAKE2B 03697dda7685733378ed3b14d84ebd739b2f82a7934f2d258234c335dea44f87e3652330d62ca48339be6c09844e011cb40de355e10772715c886542fb4a2b17 SHA512 a144faa91fe2260ffe7f65ea7374c2b0afae029c8b22129e0f2961826f69307fe2c9994167baf561fdd54470aef8a21a020d494ad579fa04edd1a8b677148269
+EBUILD corner-2.0.1.ebuild 582 BLAKE2B 6198ae25cb6256bd951256e719c662c55c0e4e4a7c30303eb42dc9e3e7b91f24c9e479af442c4e32cd9033d037786910376d1c0d8eefeff0a7b8582da1ee6c8d SHA512 f9e11822341bca368f4f10114f0e93e79415ab76a6ac7d86252b6aaf0589526a5726411e56557579b1a60c6ad0808b1af5e8ea0f047be5005996268f9f46ee80
 MISC metadata.xml 906 BLAKE2B 09ba82ccb3f2d27db911b5cffc81e9255340d262e1cec1ba59c4caaba12e295c6b320b4d489e132258e18a7debc2fa1762b6fc813fbebc55301b3a442922e7ec SHA512 aa1c5cdff441cd455b25ee307f2afcf274eae44fdf5b6cb65d1e5492c39509d5a6edafa32309545c387619f95773bc93d799be160d432cf33bec6eb34d820e2d
diff --git a/dev-python/corner/corner-2.0.1.ebuild b/dev-python/corner/corner-2.0.1.ebuild
index 0c44d2167259..c898eb2a6bf6 100644
--- a/dev-python/corner/corner-2.0.1.ebuild
+++ b/dev-python/corner/corner-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/couchdb-python/Manifest b/dev-python/couchdb-python/Manifest
index cdcbe599d883..d179c6f4e7e5 100644
--- a/dev-python/couchdb-python/Manifest
+++ b/dev-python/couchdb-python/Manifest
@@ -1,3 +1,3 @@
 DIST CouchDB-1.1.tar.gz 60839 BLAKE2B d3fe1195083f0e0e36dfc25ca25d08e5f447ad34b8908bacedb43d81979ce7bf926100297422439103f8ef3a8bd398e408c19ad676461ad5908d79b92b4d9661 SHA512 f68a0bb04f74cf91ae7d190eedec2a9c24c03dd0ef333c27cca7ef7abc95d3d355f78d653d68371a0d27dcc9a8d69f5886627f0eb0c6af49b632becf6bd0668f
-EBUILD couchdb-python-1.1.ebuild 950 BLAKE2B cf551f8a6d2b880194e1afdcfa7f5cbe9dc42baedc8875efef2eb46cce648e7e6242564cd8b5dedad2e1874beaac6f77ae4c49ea43842f8363e44163f34312ba SHA512 04754104de38bb0d7e29ab106dbf39d0bc63388609a88e70b658feb54cec3bf83f83039d5e84728140f2cf55249b3b52a60342b21184b585c6084dba5b4ad1da
+EBUILD couchdb-python-1.1.ebuild 943 BLAKE2B 1ec77b933cf9dd9f26f862da5692306ba64dd246305609580198fabf929bcd28829db5262550b71ec2e1d1e96651723ba437bfb5b9ea63bd75902dcc39f24978 SHA512 26753d562d6e48be83d3e2334dac438062fccdffbab0a13737e197b0965f1674dd2952feb4ffc4ec3a8dd70f4eeb01620d7cdad385896d4055c9eab315d283a6
 MISC metadata.xml 492 BLAKE2B 238ee8a64a2463e5e261c9d43fe9853fa7b5cfb135d9961f798e60937c9618e11dcb3d28ba9cda9a6fb017c1f31783ffd0aa15d3a9e94cb1418a768b327e1a81 SHA512 69b7bd6ace846417beb252df5372a01726879e839a14c8586deb33a6ff53a2279b088f822cd30d86af58197d9202526eac40d9394f74dbc4093b1dc23277b10f
diff --git a/dev-python/couchdb-python/couchdb-python-1.1.ebuild b/dev-python/couchdb-python/couchdb-python-1.1.ebuild
index 6a9a620d5746..9224e54f5d72 100644
--- a/dev-python/couchdb-python/couchdb-python-1.1.ebuild
+++ b/dev-python/couchdb-python/couchdb-python-1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cov-core/Manifest b/dev-python/cov-core/Manifest
index b63e4aff11a7..1c336900bf3f 100644
--- a/dev-python/cov-core/Manifest
+++ b/dev-python/cov-core/Manifest
@@ -1,6 +1,6 @@
 DIST cov-core-1.15.0.tar.gz 5890 BLAKE2B bddab94ae47ba19ecdee5aae0198d9086a423673362ac64f0885f773bd8b8ab3f4d6abf1203ee901e272161dfb4b64168f2aa5f2d0f4426ea279d6d7251e921e SHA512 1b962a6a7253c1f6530248f3a71058e7709ee5cca274166807f040163c9cc240e9e85e42820063476c1c0f6dfca81d45277738663ed818fe715b30db151ace16
 DIST cov-core-1.7.tar.gz 5972 BLAKE2B 0f1304722ea590ca6331be85413dcf614a9a4584101824e68775a0fbd41e82d92d5dd74115bd525e155937fba710201bd184873caf79c5f88a4bd10cefb5d848 SHA512 8e1744f686262c5affc6e2d7b08ce6277b60e79156a4c2491f805325048702f765b64c40acd53d59b5fd7358d85bf3ab367270eef4a12ad209db5f661612b140
-EBUILD cov-core-1.15.0-r1.ebuild 630 BLAKE2B 4a57cdecaed921163d7873d4788f3c2ecbdc6af038931b83fc2dcfb8822f24f480434c3f7c0cbf663ff7730beb9e42a49f18add116b21ad9cc05785a11ae7c28 SHA512 37e70ee776497497a32858cfb86edaa7fdc129f547bf42ddde0e0ac633dd493ea0b7957deb39e5b231e4b0c475bcde6e0d96420150e431efff9e933b8162a972
-EBUILD cov-core-1.15.0.ebuild 615 BLAKE2B 60b2b56d75f33cbe26acb845ca00471178a3485ec439d9322ec78de324747f2d88365980b593de0c2caccb5fe222c180d04b8ac1728b773b61b573bba3702217 SHA512 92db46bf732f4af7b3d10a71814e0e52e15c7c620bc211af8ec1fa9c7e893c9a2dca8c1463762773d27b3073e3fe653834552ab65f08ca06ece02202ce71735b
-EBUILD cov-core-1.7.ebuild 530 BLAKE2B c362700469801f66864c28789b9da74d1d1b55b4b7f8c8ab4d85827dc3b822d067d5bf0c9a2d7e187da06918f4643f10594b28c3842edef9e4f3eef9325a499f SHA512 2ed2bc3bf82246f7f9d53b3a15610027c112df5b678d625c84a871c372d6f99297705a0b4ba068d1a921f8f137d42637dabb19763ac06246f638f7e4fcee8492
+EBUILD cov-core-1.15.0-r1.ebuild 623 BLAKE2B a8879320026db57228d78d1d32dbfead858b191e0e25143afd36e0f3fad9ace45df79d2c88b70bc94f41839bc577638092faa8f375cc930a5e21795a8ed97d6b SHA512 6a04873308b83b724c9d1529d7f94b47c0c5471f1012acd99b94762da2dc97af3b887c58cbfecd65be82c83f6f1382be3c8ebdeedfbb4ac973e8682622e76296
+EBUILD cov-core-1.15.0.ebuild 606 BLAKE2B eed6ebac348dde0563efcd9509560ed549771fa05d3ae97988671eeeecce3665e5d9ea7e72cc8599dc2a34d6b08dc5e1fac282cfb7642dfcadc860f3a6c705b0 SHA512 7fd2c3f5fe77a8c1feba2a4c505027c50b2517a1ea25beb9f0ee3dd7664ac9fbc1840048aa9e896caed6848a4a7de65bd09a3a61e01be70be3fa40950789f8f1
+EBUILD cov-core-1.7.ebuild 525 BLAKE2B 6c6c4c0240f8be8b16db20ccc583a4668fe5630ca5f95741bd585fc59e38add4cd3a4cf0b933f18d481d1f0766516f66bb0c8f5dd58e823c3fbf7362874a5ee2 SHA512 c0ee7ae50011e3a682ebad0ef71234e52f25142c138ab52473b4d013ac1d4fddb16c136853b0fa72521aaacad9543452f7cd9ae73e61c73e78b99824e5693b68
 MISC metadata.xml 393 BLAKE2B 087b56c47500bbecddabad8a768033971f29215be751378ccc272f46dc3aa2b4cd14a6ef101989a12f3b540b792a407dab5f4e65ea5cc619f3fcdfd0b596da8b SHA512 6b76948ec29858288c7604b9153e30d347f6b718cac4d367170694ec7d57fabb48f3d07ef1478e87924bd39f07be9c1da7a07a393818ddf5d9c9762f44a757fc
diff --git a/dev-python/cov-core/cov-core-1.15.0-r1.ebuild b/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
index 8976673fc4fd..3d8bcd7a1ab1 100644
--- a/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
diff --git a/dev-python/cov-core/cov-core-1.15.0.ebuild b/dev-python/cov-core/cov-core-1.15.0.ebuild
index e93465c69f61..7b223c4afb42 100644
--- a/dev-python/cov-core/cov-core-1.15.0.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
diff --git a/dev-python/cov-core/cov-core-1.7.ebuild b/dev-python/cov-core/cov-core-1.7.ebuild
index e9a064662f89..b67ef7e15ab6 100644
--- a/dev-python/cov-core/cov-core-1.7.ebuild
+++ b/dev-python/cov-core/cov-core-1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy pypy3 )
+PYTHON_COMPAT=( python2_7 pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
diff --git a/dev-python/coverage-test-runner/Manifest b/dev-python/coverage-test-runner/Manifest
index dea7ad76b100..2c4bab6e58cc 100644
--- a/dev-python/coverage-test-runner/Manifest
+++ b/dev-python/coverage-test-runner/Manifest
@@ -1,3 +1,3 @@
 DIST coverage-test-runner-1.15.tar.gz 21243 BLAKE2B 37ae1748e9bc43994c7f59de0551b732b1b8b29a06f0a8a7ee03a31538a34758bd14715d29c26372c37218dde70c980339f42211b142c8a4841d3f016d65dc1d SHA512 a78219c30dfcbf46778a52da2291da0fff5ead42c133c4a28cc7f685111ba1bf2eca303e3f995ba19d30c5eb10605aba0665a8f9e6a4c17a4337a2a1234eb2f9
-EBUILD coverage-test-runner-1.15.ebuild 564 BLAKE2B a661bc6974c9268cb44167fc7b68d98d93815fb19c9c60ca3a49e1986693688b8c8dde6e9663de4d7cba5d48ef3b43b11e33285f04c8d7c4b6d9616520053a06 SHA512 2620e0d8f7ec0a26b663bfb03f69b87f49328ad84ae80da42ec429cf9c2a5a1090a5f37181e56216a72f2d178fb3669889fc1b367bfecf45fe2d74216194a80f
+EBUILD coverage-test-runner-1.15.ebuild 552 BLAKE2B 8695146388ef7d079958cbd443357ebe380ce7745a724fd3896c3d8548954d371e15f2147fb897a6ef80db526b01f4620be913f5c25a4fb06ed11a272c5e99fe SHA512 b8495b9b7c5d60e77cdb75c0c636678e42d42b92da094a52d2b65b996f08eed6cf4fc3e750d09c063ec11d6787d36e75c39e79ba05b77dbcbe493f85b9fe0e41
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/coverage-test-runner/coverage-test-runner-1.15.ebuild b/dev-python/coverage-test-runner/coverage-test-runner-1.15.ebuild
index 67f6e01d2fde..e330f1f78631 100644
--- a/dev-python/coverage-test-runner/coverage-test-runner-1.15.ebuild
+++ b/dev-python/coverage-test-runner/coverage-test-runner-1.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 73d34e8d1be4..cfa6ab9cb5bc 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -2,7 +2,7 @@ AUX coverage-4.5.4-tests.patch 5117 BLAKE2B 2a0642f71b8504d542e97fdd3258670c0c50
 DIST coverage-4.2.tar.gz 359873 BLAKE2B 4bca9c44922ad99203d65387267c62bee02b0368dfd70c758dbed959ebaa1352366603359865662cde863ca1518de21a4d33d22b86b78ff75c2c23aecf4d726c SHA512 17c508e65e8494bda51dc301eb99e24f39392cc3efe54eee5d94bf45021f91cb5e1acc192981974eb1725e01cd4590c80308bf9bb237a129c2de067bd4556e23
 DIST coverage-4.5.2.tar.gz 384845 BLAKE2B a7b4f249a68e025449d26ef8ee2194b9ce355c979d1f5192a7863a0ab0089f9deb3a8e63a39bef528ed7c58fbcc7cd4bc193fea3a135f5996a6655268a6b7a93 SHA512 0d98c8118648a319ac6f3b4c4c6f1ff8a92085bbe8276dd5504c8df4638933f920d7382d8e6de8e16bff43b62091310e0eab7b7722c6d28c976baedbfae3d03e
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
-EBUILD coverage-4.2.ebuild 1245 BLAKE2B ccd13bc4859a329781600fc33c74d6d40c12df18b1552eaeed4d6ef7eb1571f3ae51252cdcfb87de051647bfc4c3831a4e81fe6d09e5954b3d044d57be7576c7 SHA512 75a189500516f4f677410a9df61588ae256a246b3239b1c78f1ec04be5750238710871a39cd928a7f3bcd352025a72a2c3defcaa181ea6f65e82da92fd24a133
-EBUILD coverage-4.5.2.ebuild 1244 BLAKE2B 39420d4e3a6ec6f67391f9ee9f7824b28873c7ccdc4ab9515eef1b98d46a21e04d41536bf307326caea6d5d122344c5a16b8731cfee23d3246d34ef40228f8e1 SHA512 20e59c9a860d4d7d8eb914f2278f46186a4fc9f87824fbceda4869779eb82814dba2f6c98157da116df32cc871d9cbc15e459f190527544c9b58149be9b39fb2
-EBUILD coverage-4.5.4.ebuild 1724 BLAKE2B c354a8f3d927e387f1710e8d537f80f7b85f1e8efe6542d82730538f20b8cb04c72412b829130861c756a6e1a5e896eda10686a88f76e37ad5ec07a929926725 SHA512 dd8d4797250e9f51ee0d046ae2603b8cbc5297ef051be01922ca994aeccd90d5990581b72dd1538e3c339fdc709b9e1a251375d2e936e37f62cb6a65241d2c07
+EBUILD coverage-4.2.ebuild 1238 BLAKE2B e0be01e7bf8d4bea99aad231749f0fd2144557bd8033cc73c3a10371c78e09eee15fea00c04e20bc0413fcfa246966fb663d1c1bdf13b5020ae8a343d1311bca SHA512 d35c3ebae1ab2dd22ca5b7fb178cc66485eec9cd9059a52caa80214b32658a80912cf95fb406ed69d10a7977fc3d584fee402be386dce21dcd45936c1cf61d82
+EBUILD coverage-4.5.2.ebuild 1237 BLAKE2B e546c56cde4ef3c69502cd573a1a0399f3bcf6f9986977bdb2e43b91477b519ad8eaa9c0656bb9bda010d516a58a7af4f29a38dd75c45b3cdb56d74dbca34f7f SHA512 23a5ceb376aaa3c6e71448d67473705efc62ddb69172e0c7a9dd0f30f8e7cfa65d7b5b36465a87d0f4815ebdb23d438dbda3ddb0eb4e00770501cf4c4fa617f5
+EBUILD coverage-4.5.4.ebuild 1733 BLAKE2B 3c82cafb1eaf929a0e7ab17db615e796bbbbf204432167b88260d3bfbf73a1c888058e9aba16963de00b6f170179e7011d18f24908c6e735c8fc66dd9f43c76b SHA512 6184ae7b6b1926b88f35417bdaed9358fae0af316a48b126e233cb166ac7eed4e035c5ae5e20d08a68b09701cb7224ba69be32620738adc873c265be813a26b8
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.2.ebuild b/dev-python/coverage/coverage-4.2.ebuild
index 0db0400c8bc5..a885974edece 100644
--- a/dev-python/coverage/coverage-4.2.ebuild
+++ b/dev-python/coverage/coverage-4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/coverage/coverage-4.5.2.ebuild b/dev-python/coverage/coverage-4.5.2.ebuild
index 755bd7f16b78..98e11cf637c0 100644
--- a/dev-python/coverage/coverage-4.5.2.ebuild
+++ b/dev-python/coverage/coverage-4.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index c3ce1a9f6d65..f6013f4246fc 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/crcmod/Manifest b/dev-python/crcmod/Manifest
index 9c123cc57c40..d63d857fe01f 100644
--- a/dev-python/crcmod/Manifest
+++ b/dev-python/crcmod/Manifest
@@ -1,4 +1,4 @@
 DIST crcmod-1.7.tar.gz 89670 BLAKE2B 542bdde18f4565f574a2746de5e1fcb10d015d5c89f3eba7a0c316a3e53eb5a895664e2f51e54dcbab7d2ee6f30055137f22498f44b6c27d40d0692ff9652813 SHA512 3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31
-EBUILD crcmod-1.7-r2.ebuild 495 BLAKE2B 394f8b4fa416c20004803a3b03ac4615e22231a96f79e26d60d27e2e248b18e44275e44202c28e4faed90b694e0b13e01749ca09081f169ac06bf9cd14621560 SHA512 15d4a4ea178de8448ee441ca81c235382eeb2c59ac465a17964247871e2b2112fad0877498bc1c5d972643bd787bee007ce51352f0ae7b527d7087de3b7e2b19
-EBUILD crcmod-1.7-r3.ebuild 506 BLAKE2B 6c919985e110b06cc9a1852c3e9ae0f00a2c31d121d1dca68a1fa9abf7b33dd5c4574a95e44b14ab8bb1210c1605952639dc645146cf1e559c21fe0da37acda1 SHA512 7edbb06ec7cdc05c326cbd5675983ab0f682e0f23e0283db3101457233218040effb0fed0caf3d52f6b0553794719bc5bd158165cb6f7401b3d0bab72e551897
+EBUILD crcmod-1.7-r2.ebuild 486 BLAKE2B 640f0f74311dcee22c9d091510eb2705c7baa1a3429e607f5b48e5a24bd4d72b95282a98678b5bcbc898e5b895b0c4c95f05557002ee16bdb7e38fd5bad43bcf SHA512 2e8f0d9ec3be3f6974c20b1e34615512f801e42fc1b9b8bd157b9d1d965ef58ca4e5c31720f6bcdf28337df9c497a22234d7b67dbffc68003e52476114955def
+EBUILD crcmod-1.7-r3.ebuild 497 BLAKE2B 764b1785128baf14f43b3229ed48fb769eafe98fb71fe79199f4bb498d7d63fead7dc0c1135071a7099615ffce882e9208cb3e5d7c621e3af236d059906c7a75 SHA512 da445064ab8285687b42cd4a9484d8c5551a1ac9fd594f28fb479fb3933917f441eb79693c30d8eaff01d8fd4ccd54c483ebbf62c26aab35ef469595c60ee530
 MISC metadata.xml 592 BLAKE2B d936b9da244fdf7e037e990eb21fa657a29e77351583bcb07485e1a89b995bfa63cc135573eaca2dc9bd5c0a5a1df88f4940c7d47dc9aa2ac14731e3882883c1 SHA512 b2cd4011048abcfd7853c8411820b7f5d8ca69ec9c12f121f4c2f406989a8a829bb998c05019e68c0dd702f32ccdae94e83d4897d174c4e09a99177ae3a89433
diff --git a/dev-python/crcmod/crcmod-1.7-r2.ebuild b/dev-python/crcmod/crcmod-1.7-r2.ebuild
index 9b9634802ca9..7ff8cdf4990c 100644
--- a/dev-python/crcmod/crcmod-1.7-r2.ebuild
+++ b/dev-python/crcmod/crcmod-1.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/crcmod/crcmod-1.7-r3.ebuild b/dev-python/crcmod/crcmod-1.7-r3.ebuild
index 14a3f65d101e..66999019a6c3 100644
--- a/dev-python/crcmod/crcmod-1.7-r3.ebuild
+++ b/dev-python/crcmod/crcmod-1.7-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index d3434fc50d39..76ef2ee379ea 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,7 +1,7 @@
 DIST croniter-0.3.17.tar.gz 17362 BLAKE2B 59887df1cb1464046612fd87bf82575355361b9baa934817d92ea17ded6a440100015168d7622952a218d96d6f8d3a568ebdcde85f2a7ddbe8a31a44b201b3b6 SHA512 4215fc7461843cc2c62fca05424d5eb7d0c80c21cc1e637f5ce3c4891da458cd609d6ed501fab7fe244bbb234e9834ec8a12b76289eec10808ed6c30c1b4d45a
 DIST croniter-0.3.29.tar.gz 20276 BLAKE2B 951b9f2e998be496420dbf08e06a60a0eb3eb8538d9e63bf11182bc449bc49eaec36c1d1025269974fd0ff24430e16c3cf410d2b50873498d077ac22e0b52fb8 SHA512 0333e8d801aa7453ea6bc2b49abcabb24390535eecb5af2050512cf69410d21179405ceea14b8037c8f107321ee53a10c6060796c86c9b24ae48af65068e9b87
 DIST croniter-0.3.30.tar.gz 18122 BLAKE2B d15e19167eabf935ca12ad2b277b9b97459248c3a47982346070b4500b45f8296beeabf76c5ceb9bbff579ab2d713392c82446b234a6f4b4f6e8317adc67613d SHA512 1e7f5da56991281a16919abbb386a20a8437604bbe0e57d12726d5f19c1c038e9b320a900471b1d4dad9f5dfd0eeb85ced17232a4907e50025592a293a5a8ad1
-EBUILD croniter-0.3.17.ebuild 732 BLAKE2B dac85876d1e7bd0445fa728efa66861d28c3ae4c4924dc5954cc839d4cd7e690f694f91bcc7cdc570e2ac4f935410ec41c1f5567fc321157167d49f2f42c6adc SHA512 42bf61b0963600f06fcfb96f0632c5c7ed37ae7cac2ba1f11fb6707fe02f08b8b49845faa34da72b584adcfbdd635e5468fd27c4d325e132980b97e4c9972a15
-EBUILD croniter-0.3.29.ebuild 734 BLAKE2B d62e56ef1e3c80eba27690105038f46648ad08f68a9f9a9f3139dc91258e7860434b8ae4cdc5b7e95cb56908b9cf96b27ce5d938b52bc57f2c23642b7edf699e SHA512 7eb8823514c343b6da28d1e41a9c9cf596cf6c8a186c9286f3ef46abca754c8d6ac314763c2d2d11928dadfa2866f4641c249faeda3b83376d1a86cd3b980230
-EBUILD croniter-0.3.30.ebuild 736 BLAKE2B 6d3b63602b313f90b37924f956a4c0cdc16703583965dafa9783ce2b4078fe32bc42a0cc946c6e3d08e487100b2a05e03905158ed9baf20b438ffd25c21f057f SHA512 42a3f3c3efa3e120672176b0024603f0a6acb9aeda79e4bc8b040999c4dd925d12c5a897245e2ebc58176517b248d791a83082adf38663c45f85e3463e535434
+EBUILD croniter-0.3.17.ebuild 728 BLAKE2B d3910bc517103ead2e3d829d3db2b2a58208692d1ca2d20b799f6ba402fcfbf128e669057b6878e7219d8e151d3bc594ce1476fbf776d1e07f27ba4b1e7d4f6d SHA512 fba89e6a66fba23384a09c553ae94c5cb90283d399b5056b7fd1f9956028db62e6fbadcecd608a81db161f4c933b4b4e2cff0ae4e0f4da9ffa04d9a5cb12659e
+EBUILD croniter-0.3.29.ebuild 732 BLAKE2B de79ad620d6eaad78a3dda0fa63bd86b0d068ab0d86a93072eaa9404bb2bdde2dd3d03f963552271ef09f4b89f98dd3efb4170ed71a051d341098dccc597e50f SHA512 52c9f20dc4b3a4f15c1fd350ba6ea77380094a8e85d4c2bad6a4b6dbffc3f5cb8c9fed968d3f9ff199b8c0374fea122487fbce59617fa6bc78604c016c1688f4
+EBUILD croniter-0.3.30.ebuild 734 BLAKE2B 4362b4151aca832acfde1d4808f62f842f1673cb689c771e1d7580cd7447508475a8104d42575c53218b1bb6cb81580ae636881054978b3018ffe525a5910952 SHA512 7b9a0a4cf849b1497830330817277019b7598d47a8f4a45168332689a1e6d64da6cf83662a2e57ebad739952cd1a91537881634e01372749b5f9bfb347aef218
 MISC metadata.xml 344 BLAKE2B 1e0acd7a1c4fa483433385eb74da9459dc1348f00cc2bde0d8f5b98a0e298f943628252e15d60b1a3c1b2858358ac6a7683394c51f0e06f3467accaab2af6ce7 SHA512 13584ced1986613a6ab7550b050531bb5049b8f0bafc6dd59045620744513d785635aef91f5300cf9eb302b385e6049107691201a866d51061ef2411a24e9a2b
diff --git a/dev-python/croniter/croniter-0.3.17.ebuild b/dev-python/croniter/croniter-0.3.17.ebuild
index 5b56e2c93fe0..f25fc007d12f 100644
--- a/dev-python/croniter/croniter-0.3.17.ebuild
+++ b/dev-python/croniter/croniter-0.3.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/croniter/croniter-0.3.29.ebuild b/dev-python/croniter/croniter-0.3.29.ebuild
index a990ddebe1b3..882e559ce1a6 100644
--- a/dev-python/croniter/croniter-0.3.29.ebuild
+++ b/dev-python/croniter/croniter-0.3.29.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/croniter/croniter-0.3.30.ebuild b/dev-python/croniter/croniter-0.3.30.ebuild
index 40acac6a4716..1e68e1d777f3 100644
--- a/dev-python/croniter/croniter-0.3.30.ebuild
+++ b/dev-python/croniter/croniter-0.3.30.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/crumbs/Manifest b/dev-python/crumbs/Manifest
index b6a9edc6764b..af759674b8c2 100644
--- a/dev-python/crumbs/Manifest
+++ b/dev-python/crumbs/Manifest
@@ -1,3 +1,3 @@
 DIST crumbs-2.1.0.tar.gz 19968 BLAKE2B 2d02e3d7235e64624558edb4de7cca133f8e013c636d9b0a087171cecc7cc0a5540e20725f65969aae3e2bfe8864fd52b1b01e501ad6ac456641befd7d3cd165 SHA512 f68a7d0eb4375db6172ce714cf9350d236320e9a37b732f96cb6fa35f11b14ff19dcb233ae5062cadede625470e777ade12ddebe669d1ab7fccf9425a31a6087
-EBUILD crumbs-2.1.0.ebuild 973 BLAKE2B d76ac5aa69c16bf14b89e309b4bbe886fb6683a77c356f15d06900090d271bedca964f3dcf78775516e4dd322cdb114f8c2cf47ae66cbd3e14a2828006aead5f SHA512 a3948bef2cb3e6bbdfbd8899758b825944ffa2c4183aea262673536d52188927dca80756d1c63f7f6f27bfd305cf1f69cfb3b5c62836c71b0f89c55acdc4a4a8
+EBUILD crumbs-2.1.0.ebuild 959 BLAKE2B ce098d922ae5d23f498b378a90399b64ba56ca18e305594c2bef5fd79fb5b7838ebd14ea66eca568856c472d91a932159db8163e2add9149a6c3b479e812f94a SHA512 c9d40c5418663cffff07b1210f0df46cfc20a699c1abaa35d02cba4d79f9ae7dd0d434fea7a264f2ad11c2b572911d492a80df14f1b44f08a99294a1f2c1099d
 MISC metadata.xml 364 BLAKE2B ba9392dfee87f57c4fb3d120e37ea590700ca42886261f49b004966a91b0ead99f46ce6ca743141d2c48b0589b5ca4822f2019c6330bc00a2e34f133b7c1f6f5 SHA512 b28a482fb9a8a92d05259dde1ac284ca32b60b4c6af0bc433f9da63dcb41df03b242d838f2ae5f7abeb3921989e07efd58ca9731f8eb51f8b812e6b3cf5b0f71
diff --git a/dev-python/crumbs/crumbs-2.1.0.ebuild b/dev-python/crumbs/crumbs-2.1.0.ebuild
index 82a29fd76d3f..7dde2eb106db 100644
--- a/dev-python/crumbs/crumbs-2.1.0.ebuild
+++ b/dev-python/crumbs/crumbs-2.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 039b980d3e02..8c04cc6bf398 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,3 +1,3 @@
 DIST cryptography_vectors-2.6.1.tar.gz 35097785 BLAKE2B cf5784e97d288b464d79d0aa13bcd19fed3e1c585c1589b52092d654a9988dd52e64c317c50774d4dc54f535d37296df8e5da070fbaa5f38d4eef3cade671a87 SHA512 44d318d5f983955f42791cf182dd80070a87c3c05f7353e204a520588243041fec97367c6fb6d9febcdab0ce7bcf1d135a8e6b44a7387b599752b7c87fc81d9a
-EBUILD cryptography-vectors-2.6.1.ebuild 671 BLAKE2B cf2f30c327afd3354f70b56208609f6982f11b10bccc35abd1b0829161df3feab30ca4ea460f3b5cbf5f129214ada81011daf020942a16f5c66fb6cf4176e476 SHA512 979228ef1a7a90b8c111d4caa45fe5853ad7bae78077e0827f0a3be6333493a16e244c7d08e3eeb848dadf3b6899227e09ac6a73c754b3442faf550766336d53
+EBUILD cryptography-vectors-2.6.1.ebuild 664 BLAKE2B ed56b2d148b29c4447083c3f19627d9d49cffe4414f59663581a5779f0db716f68598a44adc4dadea87d84fdc822447458b1ecf7de865a797fd1d1822dc0d73c SHA512 b1e114f098e9857d03fff4b29f1bb421d46cf2de8a2295157378505232a193a1aa84735a669b930c30c8006161604396fae8a416503483359cbe1ed597066f0d
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
index c5dce029e10f..65806782ea8a 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index c2981e972124..52bb1672a040 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -2,6 +2,6 @@ AUX cryptography-2.6.1-libressl.patch 2527 BLAKE2B 090e0fcd78a6661f8a87c27f572b0
 DIST cryptography-2.6.1.tar.gz 491580 BLAKE2B b81114b57e9973c80fe999a63a3b1269d6289ac67851fedc263927b74e9e5ec4f35356cf5d46e4a27a994d5a3b2b3b599fea264b3ebce3a0cac27abfde3ef046 SHA512 f14319e24d9dca52e74548cada5b78a6235f089ef875dbff4799e862f94da8b087f1b6e03e84dcef9fc7d7693c4a349c5f0cd54b8535806da777420ce8757d39
 DIST cryptography-2.8.tar.gz 504516 BLAKE2B 3a853bf59a752acee9e9607f3f35f3815701c6068a1ffa5b6604ec648a31a5d4e31f13a1b19f3156c703313800242d8b06dd71a54a4eb0cc68481dea894002f3 SHA512 bf3ca44123c693b0602be19445925f9efebd46c469909e47b7907d57141fb6bd99268c33e1fe3f42a08ab8b4edd4f98f21b6a682f530352313334dfd31ba91e7
 DIST cryptography_vectors-2.8.tar.gz 35102030 BLAKE2B 8e98e12bab31a2097a72c849f52ee93b9b684a8923c140722419154471bd695c6287ff4498c9fe326662c7d9a9f5d9ebaa55dc4d5a0d8180a6827ae244464006 SHA512 d328082d3a65b8036d396172d7e42c753c842e9310850a77c6ccd99c9905d48bbc3e3319d216013c1370b8439f0f8056749ae94b1abf9a5b7088435acdeed7fb
-EBUILD cryptography-2.6.1.ebuild 2241 BLAKE2B 23fde60e4629f87b17a8a0575051b9e9371cd43c6f8fc4cb4ea3cbe6228c197010cdc3ff591326c100fc3128190c3e60960e225faefd388c03fc44aadacca97e SHA512 93b740d2cf9b0739328febe821a31c14b6f7b015b267baceb2c486cfd7b93b61a6b436ffca9294835ec0d3dc06e9f0f12a7640532cb9f455f2c9f1451bb4c063
-EBUILD cryptography-2.8.ebuild 2235 BLAKE2B d435869379f0aca996fa3219d983fba9d81460a58c7b5be8d341c6a32914908ed2a4d7f3946a1a5e9db736a725b8f933abee47ad3cb2687ac524ae9199d5fecf SHA512 eab3de85e0af3c29d8039f584ff578bbb5e748d5d56b21c07192458f3d2ce3a24afe840b371dc8cc741fc058c735c528c593b8b2dabb24de3c2d94ab1e736b0f
+EBUILD cryptography-2.6.1-r1.ebuild 2236 BLAKE2B d0bf98ac1a5a4e3f1ad8f4538425fae8d9020158bf400a5e2f06de64aade06e94bfce70fcbcd4c53c1004ea07860badf3a47fbb2953ad2e40175443360335f3a SHA512 70b5dac1e58a1265bd5fb4b93fd8b4901277bd2d5cdc6be1cac9ac0fc5dd3b1f5f8c9a60420dc923d90f905802b167a981fd04b8c1ed8bdb874638c4e21e6bc3
+EBUILD cryptography-2.8-r1.ebuild 2225 BLAKE2B 2e57f651f05be3144be7b0a854e94ea73d5f157d27c242b719c9b4a55133b2100dffec12ad49805a6fb92bc67f040d9e4c15240004da1b96ffd21691f6d1b406 SHA512 817ec38de30488d5337b8179b1b58e2c950db13e36f3f4c42f03246297d213156fa75b0701b2002d4790a5dc0945e421f8707f1719b641aa5e81b1f1ef4bd87c
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..d0c85a6a8fd1
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="libressl idna test"
+RESTRICT="!test? ( test )"
+
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+RDEPEND="
+	!libressl? (
+		dev-libs/openssl:0= (
+			|| (
+				dev-libs/openssl:0[-bindist(-)]
+				>=dev-libs/openssl-1.0.2o-r6:0
+			)
+		)
+	)
+	libressl? ( dev-libs/libressl:0= )
+	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		!~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libressl.patch
+)
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/cryptography-2.6.1.ebuild b/dev-python/cryptography/cryptography-2.6.1.ebuild
deleted file mode 100644
index 52a71757df07..000000000000
--- a/dev-python/cryptography/cryptography-2.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="libressl idna test"
-RESTRICT="!test? ( test )"
-
-# the openssl 1.0.2l-r1 needs to be updated again :(
-# It'd theb be able to go into the || section again
-#=dev-libs/openssl-1.0.2l-r1:0
-# the following is the original section, disallowing bindist entirely
-#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
-RDEPEND="
-	!libressl? (
-		dev-libs/openssl:0= (
-			|| (
-				dev-libs/openssl:0[-bindist(-)]
-				>=dev-libs/openssl-1.0.2o-r6:0
-			)
-		)
-	)
-	libressl? ( dev-libs/libressl:0= )
-	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
-	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		!~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libressl.patch
-)
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.8-r1.ebuild b/dev-python/cryptography/cryptography-2.8-r1.ebuild
new file mode 100644
index 000000000000..93cb6bcfeef3
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.8-r1.ebuild
@@ -0,0 +1,67 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+VEC_P=cryptography_vectors-${PV}
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="libressl idna test"
+RESTRICT="!test? ( test )"
+
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+RDEPEND="
+	!libressl? (
+		dev-libs/openssl:0= (
+			|| (
+				dev-libs/openssl:0[-bindist(-)]
+				>=dev-libs/openssl-1.0.2o-r6:0
+			)
+		)
+	)
+	libressl? ( dev-libs/libressl:0= )
+	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		!~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/cryptography-2.8.ebuild b/dev-python/cryptography/cryptography-2.8.ebuild
deleted file mode 100644
index f030b1186e72..000000000000
--- a/dev-python/cryptography/cryptography-2.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-VEC_P=cryptography_vectors-${PV}
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="libressl idna test"
-RESTRICT="!test? ( test )"
-
-# the openssl 1.0.2l-r1 needs to be updated again :(
-# It'd theb be able to go into the || section again
-#=dev-libs/openssl-1.0.2l-r1:0
-# the following is the original section, disallowing bindist entirely
-#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
-RDEPEND="
-	!libressl? (
-		dev-libs/openssl:0= (
-			|| (
-				dev-libs/openssl:0[-bindist(-)]
-				>=dev-libs/openssl-1.0.2o-r6:0
-			)
-		)
-	)
-	libressl? ( dev-libs/libressl:0= )
-	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		!~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index 92c28151b4a5..34c19e8bb02d 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,4 +1,4 @@
 DIST css-parser-1.0.4.tar.gz 143977 BLAKE2B 94a42d751a90d306b0dd2d503d8d9c326509b438d1f52b5567e6f6db7d80e7a6d2c37cbfa0db79225cc4d0fd5df612b3e430fa1c62604a2f8990d20678019af0 SHA512 3781128e55c1e72aa00369873e214f683e3f42944ae83d399697adb7d2966f68fb500c39982845ce9cd06078e4021838d82b06f99d90938069371da8a89a0857
-EBUILD css-parser-1.0.4-r1.ebuild 454 BLAKE2B 54dcd27e65fd39ebde410af6218d19e334a273eda334ee98e312349fba947ae883a6d8a5eb7b01e962d6baa0602111f4ce8ad8035f0d37fb34f075ab502d4501 SHA512 799bd4da0ffa1219e68ae8bed097618b7c3d39b83b4ed600b56f1b1477b5b5eeac36575a2a4f6c70b89344f71f78375225dd11abc84288f5636cfdeac45e2dd1
-EBUILD css-parser-1.0.4.ebuild 513 BLAKE2B 0f71bdb613060632b0aa263ad32a1dff6f1cfccd2622c1e5b08dd80a990b27e79e29107a5adcb53baa378b5418b78d1afe7826352c34701b06a76b73ce53e305 SHA512 42eb2bc62415953f4d34cb550380c5c1a26fad3d34008be88b77a43086d3fdf3f6ee3372cb518080f74c778c5f632b5db10690c0d54852ebdac4f42e84da93ca
+EBUILD css-parser-1.0.4-r1.ebuild 447 BLAKE2B 94bca495c4fdce10c89aef64745a8f7391580d76c77e1f3b7ec075bd400eb5a54f3f350a2d22410a73b09f138a09862641946fdf7a62b2fedcc339155b1fbd99 SHA512 27a67f2b961ab13b65cf66c28464d4277f3c5d6767b4230abb9311e0664910f6557e940fad1c9ae0cdf43113be0eb0c2dfd029b1d596160ae3febb9373c04542
+EBUILD css-parser-1.0.4.ebuild 504 BLAKE2B 13565e161f115759da506ab67f51351dd371e9ad3e3a627de241e498c9ab1e6b3a79777d442a69eeb39b10a76ae466d1194bfa4d40898fd598348df9759231f9 SHA512 1f628f7cb29632eae50cb570d9a996a6b349467ca7a75f8742f400caa179344651c1d47ba584a56788db24af8081062aa01ca1107a11572c5adbb763a9ebb39d
 MISC metadata.xml 313 BLAKE2B bf6a2cf19a6d43b19692e4d932d695a811d10530fadb6b33a6f329be4ce815bb36ded2c7a1b3b0081237543954972d58ae115576d4ff0c3d4fc0309fb77f3a58 SHA512 1ca073d67b4f5afa950071e961b091993c0f14a66073e28f33604bc5cf5820d9f4701901d93f8db46a91b1fb6b7a05b8164a749823e2c59959640e8771b3126f
diff --git a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
index e7bc561a48cf..a4463625ab4d 100644
--- a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/css-parser/css-parser-1.0.4.ebuild b/dev-python/css-parser/css-parser-1.0.4.ebuild
index acae24f4a4b0..ae8265ea555d 100644
--- a/dev-python/css-parser/css-parser-1.0.4.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index 8d278f830766..29db9cfb1fa5 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -2,8 +2,8 @@ DIST cssselect-0.9.1.tar.gz 32952 BLAKE2B 7f7a78e8085036bed72c2a1a0e4a97cd1988e8
 DIST cssselect-1.0.1.tar.gz 21849 BLAKE2B cfe3637746329db224a44b680cda044238fa831ed0d05cf3484be6181de13bf8660330362626ddc03c7284a80e7c4a814bba293dfdca07a529d9c0c7163c95d2 SHA512 060c4b8d427a935b851b4b20d10ef89b9d6f685692b7144afc8f848e318abaa182ed60538355ea3f25050e358f24904fa0d9c01fe77e3d2428e2ef2a825e2928
 DIST cssselect-1.0.3.tar.gz 34027 BLAKE2B fff15a50d26ce83a0480020e54d00a027a7f21ca2c4c45d5552c6b4c19f7be21c390650c4befa61b7ae2b63946de88945deb488ebd6c7f7fc470950dab233671 SHA512 08feb3a515cc75089657a508cd1a80c6aaa97d710f27e99f9e749a1519adc13c5540134c6a4e0d7f548b022b8bd23dcbe360530d2329c5da36e43aca1f9627d1
 DIST cssselect-1.1.0.tar.gz 35516 BLAKE2B b4480ad4335ba15ae8a2ae758ff942865a5b61de68b3b00fb59d517b1dacfce1cd817280e4aac562dbf829f90601a56220f01d99aecbc502420b9102e50c46ca SHA512 b33bca6a026f4de37b75606fd238dbd170b57d06288fbff3ea97ce79685a99af275fb8522b04ea9d6693aba5a18541d70b657191fdad881be79718bcf2e7655c
-EBUILD cssselect-0.9.1.ebuild 1137 BLAKE2B 982e3d9a39707053463c21378e8020d304aa8e209351c01f44fa7d84d3a4a7f60acd7ddf413b49740710f6391f825400063c25b419adf8f1ba0321f4bfddc20b SHA512 0739793115bb34ad831c25c1a8b55a1e614d5673df21431d26199b0205860b002d5e6ec844b3d51cb057a164962a31ac18e5738067b99e6d8e950031e9c54e2d
-EBUILD cssselect-1.0.1.ebuild 1236 BLAKE2B 2e8021da151c696864861d1d51efe17341d73147ac1ee3895c578846cc0ac07e9c1d5c7283312a070c7f617766c2aacd681b27c3c57d81e60204e3c092099a49 SHA512 f19a1a11566aebcd59f56dd14745732ad5fd9121fa819ea3970213f9377006831ac6df365fe67dc0c7d668c8527f00aef8aa4510b9750b3e5c2dfcfb1ff58df1
-EBUILD cssselect-1.0.3.ebuild 779 BLAKE2B 9bad64bb8a91bfdcc6f2fe6b106371f13ebaf58d4eac32d17c880749b5aaa403f14421f66be3b6fd707276929bb20515c276f552487fdb040b46644ab85e1119 SHA512 4319a87a6144700979908a898bce9da7ede1a4672700e77ed9927c41be9878e1643c5e79850ea35df272dbdda55d2f022af9199a60947c423857b9835c7750f3
-EBUILD cssselect-1.1.0.ebuild 771 BLAKE2B 670e3fe382db88b3e14fd14ace67fe8150c0d283bfa81380dc3e73432ea630b416431e2e127be7956e37257e2ebe0523c68166261fd4cdc60af34d501e485d40 SHA512 5c5e64894663cb04b58b0652b263df479107fe4501bd8abdf65766a82af97421f192d7ce5163f24c2520fcfc463eb1a25f585738cfb3fa289c3dd68ad134250e
+EBUILD cssselect-0.9.1.ebuild 1133 BLAKE2B fcbb4aad5f9b3c610500e4cb532a252baa8cc72b5ccfc433e89f6e931631bcb1295e3c58e79c43af2b2b97a52ee31dffb3e356abced18063382f8fc5b459209d SHA512 1a8430a6b94502358cd33b3c74498bed832e4bc64d2aaf49373ab4c668dbfcea7c7ff9182a20af10a7d2049243699b8e91e4136908a9869aef03d27257961266
+EBUILD cssselect-1.0.1.ebuild 1232 BLAKE2B e56b62f74fdc1ac71339959a7ea350aa36bbdb45ea57777300a16bd1b2935aa57d37946ef1a636de8f96875d28358ec412158a1d1080b848bfa787edee4f9abf SHA512 747746a711b4db90e20422a061c96e483cf47df13e7733c8da046dbb3368b5536dd4249deedcbeed3362c3f07c5a1868755fa912e2f64a2751e7b85ef901a240
+EBUILD cssselect-1.0.3.ebuild 772 BLAKE2B 2c9f4e896918b83b7b6a6f6bf0e6e33ae2c0d771b51959da15aa9969368f14cfba3f91065d318ac5c82d762f3ba4e0675f937770a1b4723a84199ee62bd0415e SHA512 097987a11b6dfe643162ce3d4aa3d84ebfda80b43fb022924899baac29a2eaec66f45dd319b66333c6b00b2a08b0b21ddb0d2d019a15de8caf321bb9c91bd506
+EBUILD cssselect-1.1.0.ebuild 764 BLAKE2B 859238f8e8ff645d697fe7a2c6ffa5a8be334df3766bdb0bac235e7a7a2ac6f726dcf6552d5b69e92c60003d06df4218dfbb71cbdf569041889809f78167f90f SHA512 80f789c3ce28fb9be4316ad3de231da50b48bd778f8cd3b2e9481c519dd7e7a46033dba9bf4515b4cac9639523fd02dacd338002f5235f1b9ede0b20274d10f9
 MISC metadata.xml 322 BLAKE2B 2ec56f6e5522f780aef1a27df29af54f7169cedf727e4698c0c3764002501a06e52db5a94901d795d75f792ae2e8eb7d82625f88e2069453c2ff4190352aa7c9 SHA512 9933f17432e27a6a708ad4c9ec1e5f65197c4c0048fe2deadf3ba66d878f98510e150dfdb83cf935294a529e505b261808b33503f5d6acb622ae1821e065d798
diff --git a/dev-python/cssselect/cssselect-0.9.1.ebuild b/dev-python/cssselect/cssselect-0.9.1.ebuild
index ea4d791779c8..dea1a10f1bfb 100644
--- a/dev-python/cssselect/cssselect-0.9.1.ebuild
+++ b/dev-python/cssselect/cssselect-0.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssselect/cssselect-1.0.1.ebuild b/dev-python/cssselect/cssselect-1.0.1.ebuild
index 4e96046e5d88..83c87c580073 100644
--- a/dev-python/cssselect/cssselect-1.0.1.ebuild
+++ b/dev-python/cssselect/cssselect-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssselect/cssselect-1.0.3.ebuild b/dev-python/cssselect/cssselect-1.0.3.ebuild
index eb7e80a7db75..004a8ab34579 100644
--- a/dev-python/cssselect/cssselect-1.0.3.ebuild
+++ b/dev-python/cssselect/cssselect-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssselect/cssselect-1.1.0.ebuild b/dev-python/cssselect/cssselect-1.1.0.ebuild
index d2cb2b0aa064..0de99b01ac8a 100644
--- a/dev-python/cssselect/cssselect-1.1.0.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index 1815ebb601bb..d5fa63d995c8 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect2-0.2.0.tar.gz 28197 BLAKE2B 447dc915ff550ee137c64096ed760e12d8da4dbd732a1b48668c2843aa90b11af89e3fe6e31d7128ec713132c7dd5a8b17ed271e0afc3a9219b5839f5e1292d7 SHA512 18069dd22892d8457865c2960630e984e791c6779b8d3a6ce4542c3ae92535a8ab23fc964e59776095a999a38ad2c40facce3b9164fef68870bb54167b6dc49b
-EBUILD cssselect2-0.2.0.ebuild 511 BLAKE2B 416d1e163bcdc04f7f8dca6e5f550edfb653a8c0b9b07c2a6b862ebbf8c7dc44fb45cac197ebd872b3a2e219faf7b6c6ddce1d14545fbbdcd9b191acdc5e52d9 SHA512 02c50527433eeae0306b6d87534defd45cdf9957e5e5ada4ab2b9f65764a656f69da8770c4b963ef2a2fd18ac1258e83d3f2104bcdca8e9cafeba74c5a88dcd5
+EBUILD cssselect2-0.2.0.ebuild 507 BLAKE2B 42b02700c08d900581f61ccc295d04e74ff014a226a81dc463ab12ac8c0566bf4f2554eadfc5b9c1692deb680abfdb47059a85fe8a41407bbfb037e1713087a2 SHA512 acb7a2c7cd30813f68008664a0c8613b0c5babd0b71cc3008ba66854e9b84a660b98d27198d608d150c9ebfe5ff31c6f8f542a5fb0a41b2210892020944648e2
 MISC metadata.xml 323 BLAKE2B d7d2c7c44a6d77f88dbdcd8a0543282203a71e28f2b64f637d92d37cad737fa6e27d339d6d2c66fb96f83aead59794ef4da5fcabcfc51f1945c781b6c4295a89 SHA512 977631018db4c06abc89d7eeb92640e7a045c64fdc96ef9d69a4191a6e3e07f6ecea37c779b9fef2e01a433dfcb311e991b31fe4656119fd445154628789c005
diff --git a/dev-python/cssselect2/cssselect2-0.2.0.ebuild b/dev-python/cssselect2/cssselect2-0.2.0.ebuild
index abf323c78c34..1868a97a3e31 100644
--- a/dev-python/cssselect2/cssselect2-0.2.0.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 4fbdeede59bf..4d63e5c3bbc7 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,6 +1,7 @@
 AUX cssutils-1.0.1-pypy-test-backport.patch 1215 BLAKE2B 8a6859fb3721a1c36541c816d10da5109a525bb8f92e07df79c0bf0d002240f838a7b58b67779acf7c41f331b218fa3342385ed3ecb2d15e624f14cec1336536 SHA512 a0072d67f034b066a30ec9cd35b5f618ce8e0beea2b1236b6900d7e028b1ed7d6095ca0beaf0eacb3f7e8a4649e22b98951df9a303d4761f15d7472e2e57b41e
 DIST cssutils-1.0.1.tar.gz 353621 BLAKE2B 142320e2358acb1b5b95400f42fb5eb40840602bd204f68a1896ea92b35dfe2ce6f316d84cf5d21a2ef8047f4748294b908057fa12cab352b42d7ab2ffcfaa6f SHA512 932a128443cc31f689d91c7c75a04ddc79824b4e5c0779e48d30fa0a3a760cad82d8208264ec95a3b120c38962f2eabf6b3456aa8f81d24e9c9718e95fd6bf83
 DIST cssutils-1.0.2.tar.gz 367038 BLAKE2B e19edce100dbc05d6e469eb6b0ad234d7d4c9458aca1b2a3e72bdeff1a35dec64427353936a339e2071d8ba2e8804c5754f55a391955a61ef61ae56381269125 SHA512 4988893875a03923d3127e334654799e5c2ebcdc0a7f5b3fb5c9ab27d1b331caa5bf197161312a298531e0757843aa3259ceba5fa19947353eea24a5da53ceda
-EBUILD cssutils-1.0.1.ebuild 1326 BLAKE2B 2d4eaee06258b4f162c25cabf115e6a3682e4221911510230d934d85d753b883cb8726648dc7bd127289116cd1fb68e3d7f5e9fcbd354f123d5bb3eb2437ff14 SHA512 8a68f9668fcc65814b0a415769a479a3459973b425d513b3da547c0e57c06399fdbf3a90e43c7c0d9332018a4c04f3e3f8a48a789d51a1296faff77f9dfb811b
-EBUILD cssutils-1.0.2-r1.ebuild 1520 BLAKE2B e9ccef9164a52342daed990e429ec243bec4e0d9f0e06593739c2e839466733f4470687e705f50ddb6c5a2f9ee075cabf5e612f28afcecce92abcfdc2655e3c2 SHA512 0ae1090a63cc56370e8c232cd193e7ba1dd4e8951045a0bc6106cce0bdb27cd17f6a32590826e9c287a394d58876a878fb1b62a8a654c9d924011f18f6eaa56c
+EBUILD cssutils-1.0.1.ebuild 1317 BLAKE2B 529ad01400b420b33ee03db7094c8832b54b9e6fcbeaef55619a9c60e0a14c2497f92dfe0f56d706eb68f8745d49429185bc1faf5ca8505ed0d68330d32dfee5 SHA512 a0b5b2648bd8be6f322dbe52cafc885f1d335309e6996149ee19adb45ebf518b613f334e555c36ea9756e87f6d2ded62837de9dbdd55b6107b134d398172a3db
+EBUILD cssutils-1.0.2-r1.ebuild 1513 BLAKE2B 9ef184a37a60d62ee5e5f267f001923a481c9e03cb273a72647c232e04bd5f77cb20531ed1f2655fc901243429915303cc94c108cf96d761a555ccf20607dd19 SHA512 21fbc26e09d1e9aa34624181ce5758f3e58e432c8e15e3c46d7ad71ff473909263fd7884b9b7c3e460c9fcba3b859b434a71588e566556c135a4f90e2f8a4c36
+EBUILD cssutils-1.0.2-r2.ebuild 1517 BLAKE2B d7ccd17ba289edbb14a95ad42a79454687877b0e2e6b5f7a28625660dccafb925dc7dc70f5cce884f856e2ffb4ebc9d5391dd4b619ce19448cf31c1117babc42 SHA512 0f3e392f202817be0872c57992c27ed9fe693eda830252a587630a0fe224aac73bda8ab99d678baa888201fac097641bcbb4b1bcf8fe3c6fb9cb31e800631a5b
 MISC metadata.xml 669 BLAKE2B 1d3cf25cab5d7a828451da5ec24ccae08e31141e6ec2ffe3efaead8284a4a7763a1c5d053138bbbc2f3846a45dcb6bb353efaffdf0a83fc110f13a6af13ed1ac SHA512 3fe0661179833d29c8a5e5ae2b7d872ad860354c58bff8e18935f5876fd95cf8fdfbb4ebda9719198dfce891647d04f263d213b74eca635005098a89a0402294
diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild
index dce1a69ac358..8e3bc6478cb3 100644
--- a/dev-python/cssutils/cssutils-1.0.1.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
index 2791f39a7dfa..9536111a6c7f 100644
--- a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..ba3995b9145c
--- /dev/null
+++ b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
@@ -0,0 +1,55 @@
+# 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}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="https://pypi.org/project/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Disable test failing with dev-python/pyxml installed.
+	if has_version dev-python/pyxml; then
+		sed -e "s/test_linecol/_&/" \
+			-i src/cssutils/tests/test_errorhandler.py \
+			|| die
+	fi
+
+	# requires old pbr, does it really?
+	sed \
+		-e '/tests_require/d' \
+		-i setup.py || die
+
+	# fix casing of call to Windows-1252. Remove when upstream fixes casing.
+	sed -i -e 's/encutils.tryEncodings(test)/encutils.tryEncodings(test).lower()/' \
+	src/cssutils/tests/test_encutils/__init__.py || die "fixing test_encutils failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
+	# esetup.py test
+	# exclude tests that connect to the network
+	set --  nosetests \
+		-e test_parseUrl -e test_handlers -P "${BUILD_DIR}/lib/cssutils/tests"
+	echo "$@"
+	"$@" || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/ctypescrypto/Manifest b/dev-python/ctypescrypto/Manifest
index 990363cdeb47..9c495d24b68f 100644
--- a/dev-python/ctypescrypto/Manifest
+++ b/dev-python/ctypescrypto/Manifest
@@ -1,4 +1,4 @@
 DIST ctypescrypto-0.5.tar.gz 44667 BLAKE2B abf24a4a5dc5ea1d977427f781e44433aaeac716b4f1f8d6f23e7f8de7debae75cfff80e72c369b64b8b9299f4b058763d42c5f21cd499f9b5689481afa5a538 SHA512 96ca12145be503a5b343d936cde172039057e5a2308fb6f6f65e14fe859d4e98d93ffb996849e391cf0c474425ee6243fd4c7998b088938a21456965d135188f
-EBUILD ctypescrypto-0.5.ebuild 1082 BLAKE2B 488ec4389cefd798e4316d8fb3d5fb9fa1670d42ecd1d3e2632511ab0c7d3196879652616852b46c7152f83e5c41d3b16b3cac0a3351892b3eeee87902cae070 SHA512 6b0ab0a0d27b33e5e71b9627a3605f6d081216998182394be6df231030bc01e615c5ae112eb8073f60f1e2efd5519ede79e29a81862ac587aee72ce376ace95c
-EBUILD ctypescrypto-9999.ebuild 1082 BLAKE2B 488ec4389cefd798e4316d8fb3d5fb9fa1670d42ecd1d3e2632511ab0c7d3196879652616852b46c7152f83e5c41d3b16b3cac0a3351892b3eeee87902cae070 SHA512 6b0ab0a0d27b33e5e71b9627a3605f6d081216998182394be6df231030bc01e615c5ae112eb8073f60f1e2efd5519ede79e29a81862ac587aee72ce376ace95c
+EBUILD ctypescrypto-0.5.ebuild 1082 BLAKE2B e533c66ccde8575feec643302756025988131bf5f78432ca805bf35d659fe99166221bf1ff799869795d21a32561a8b0c3c18575e82846fea76a3847da6e23e5 SHA512 dd8b0db20979ed26608693f656f6749803ab38e712ef5584df9d994254236e983f107fb4509b816c8267280ebe1dc336632907023bc670334a224cfb1cf34eaf
+EBUILD ctypescrypto-9999.ebuild 1082 BLAKE2B e533c66ccde8575feec643302756025988131bf5f78432ca805bf35d659fe99166221bf1ff799869795d21a32561a8b0c3c18575e82846fea76a3847da6e23e5 SHA512 dd8b0db20979ed26608693f656f6749803ab38e712ef5584df9d994254236e983f107fb4509b816c8267280ebe1dc336632907023bc670334a224cfb1cf34eaf
 MISC metadata.xml 425 BLAKE2B dc5497a725f4d7ce3118e6de7090649851ab489289173a21a687aff121ec731a4713c726aa462f54da58801dd9f53787ce480d93f657e0a4c48b69874b15202d SHA512 a0c956fffdd8fb67922d69df4b687537522c50aa685c5689ccaf216d789d00f2221ec1d3789f75dbedd5d204fbd2089cee03c7aef1db0fa3d43a7c88c7b77494
diff --git a/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild b/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
index cc4b87b8afab..c6686d39c74e 100644
--- a/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
+++ b/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ctypescrypto/ctypescrypto-9999.ebuild b/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
index cc4b87b8afab..c6686d39c74e 100644
--- a/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
+++ b/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cursive/Manifest b/dev-python/cursive/Manifest
index 65e17ff8b8fc..9d18a84acd89 100644
--- a/dev-python/cursive/Manifest
+++ b/dev-python/cursive/Manifest
@@ -1,9 +1,3 @@
-DIST cursive-0.1.1.tar.gz 18522 BLAKE2B f2239747b6f4b033c2230b47c477ee9121a705dc032e83f02569e7cd37c5330c37b8aef999b1943152906aa73995e49a34a6e9b7d8ab8dcde75601e5a87ca665 SHA512 3a6ae804c010ae2b596eac8fbc3c9be6d7994ea8984513617f1eaa7c77c8335ce2c36419d8e6acadb305210d96d51ead8470a79e8425f2c00ef0dc9ead59929b
-DIST cursive-0.1.2.tar.gz 18620 BLAKE2B 058a15d9fc7b0e23318da903ad25b6e3b5efec56fedcead1a2016147a1ebe94ec20ceea7c4bd4ee0424b56d919b5d5ede6748ef4f8125c99a4b9c654f02c32b3 SHA512 e8957df9de252435a534bef3b84c6b96de369036515e74614433f4d270aa8cb0bc4f467591a839ddb3b5f76ab7f302b18d6af5f79c7554f027a3cfb4e0571fba
-DIST cursive-0.2.1.tar.gz 40334 BLAKE2B 9d90793d4cfb63ae9f4f6bbe8628a7130b3b9658f98b044f0cbb60720c70e3abe4a34773ce3e4100d4bfa9c81e25cdbd215d8752306fba13abe5e811412aacd2 SHA512 70d16d27cba944946579821e3669a17a72b2d5cc1b026427e5a09d0385e08afb7cd7ea3c3cd180d3bc8f3e7b58772e1055e193d06cb57a58e1c83d1230c62c23
 DIST cursive-0.2.2.tar.gz 43065 BLAKE2B 2c007b357c3cd1d560f74958b78d157c97301b8c2e15ed50ff340950eb4abb8baac078865bd82a3222a22505862a78a651905c843b6b0ba4662d653dfdd5f369 SHA512 6c97f8f71b016ee57349b8156543c8ca41c29c3f234ea60967b96c09fce2cea4b36b9f92996c622bd9504d4a71893903e8d5a8ab50e089fd37bddb8095f4b9d2
-EBUILD cursive-0.1.1.ebuild 1024 BLAKE2B 7e15004a489ad21afdfd4facfe2ead777f5b6356bda08578c566053a563e6d3be98d09215d8469d7104931e5b7f0134d0cb89a1da71b7c57bb3a07d48b61353b SHA512 43cf103dc618027012d545c4a27e987d7c3461aa2e808eab479e212ae0a0deca504d467a52565540fbcf34e472ad76b89c45b5553c6cfa12ec64e990b87d332f
-EBUILD cursive-0.1.2.ebuild 1072 BLAKE2B f84019d597c2ce7639b15019556a3e1c057878f28812efbeeeb23450605625a750a9f450f029d3b8bc920ccb8a23a8eccaba75054104ee48baf65cc412232fbe SHA512 ab4b0a34b69341ada7eb69088e4ca75b78ed954618f01cb966ec6e896b4ffdd647e579f0f3c4e8880e7cf7d62d3d04bd6d34e4f9f268a801a7e14183034894f2
-EBUILD cursive-0.2.1.ebuild 1076 BLAKE2B 06f46d3c096ef59f06d638819bbc46c06d5c03257143204cd29041525178ee03ce1d9c5df1a218637f5ddfa44f94f53e66bcabcaceb70b0af0ea5061b3c15f96 SHA512 7d5d6ce6306737317d1a58713df1aba9e725f380bb437479be28338af8ac445f2f0db42528a695c7cda60b36f6743dba98000794f5cea8727603f4ed0942f170
-EBUILD cursive-0.2.2.ebuild 946 BLAKE2B 95f13dbf597295fb1aedfe3856da156873f5d2158864ed916cb896e7f65d070c9dc857941cf42819828a57c6298fbcf0bb173902661dbf0ede7f2e6b02b67ebf SHA512 b1165d9a306d4988be4da92baa4e3caaa6dcfe4d13f6fa0f67b115486bda0d786827b8f55e38e34cf46eca48c69bdebbacee0cfe540366d9934cf1060da98511
+EBUILD cursive-0.2.2.ebuild 934 BLAKE2B 5a9a3797ac27efde9ed5294b625f948c20776c7c46260ba45e778d01ee1c73c3d6ac77f1ebd599ff7ea859b583b254f0d7355b3027b41d44ff7b38d84ac9d753 SHA512 ea751234fa50dad065f7bca45c6b5fccb33442bde0f6f3095cc0c09ae3264bbaa7545bffc6c03e30304bc68a0cc5e87a42e66d17aa13da85a44083bd3f831708
 MISC metadata.xml 633 BLAKE2B 7b363a0b8ced131965cfbe2616dd30d3608d3d61b1c402b1885eea0e10c379e5d82e87e15abe1d805349ad2d99b94a2c2ebc2df7e8df7a5a095a4fffdd174c52 SHA512 0ab2f1ce6ef8d6e2a53a9dad20c26a26beddb6738857e3cd360362e0c1ad1c562eca6551cc88bb8ad4a8e08f621224934a4476b1ff22aee805dfe6f1ce352c6c
diff --git a/dev-python/cursive/cursive-0.1.1.ebuild b/dev-python/cursive/cursive-0.1.1.ebuild
deleted file mode 100644
index c1dec73d0021..000000000000
--- a/dev-python/cursive/cursive-0.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cursive implements OpenStack-specific validation of digital signatures."
-HOMEPAGE="https://github.com/openstack/cursive"
-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-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/cursive/cursive-0.1.2.ebuild b/dev-python/cursive/cursive-0.1.2.ebuild
deleted file mode 100644
index 4e5a0eb49e28..000000000000
--- a/dev-python/cursive/cursive-0.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cursive implements OpenStack-specific validation of digital signatures."
-HOMEPAGE="https://github.com/openstack/cursive"
-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-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/cursive/cursive-0.2.1.ebuild b/dev-python/cursive/cursive-0.2.1.ebuild
deleted file mode 100644
index cccf76176aaa..000000000000
--- a/dev-python/cursive/cursive-0.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Cursive implements OpenStack-specific validation of digital signatures."
-HOMEPAGE="https://github.com/openstack/cursive"
-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-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/cursive/cursive-0.2.2.ebuild b/dev-python/cursive/cursive-0.2.2.ebuild
index d0a0d192a7e0..f2b44124535c 100644
--- a/dev-python/cursive/cursive-0.2.2.ebuild
+++ b/dev-python/cursive/cursive-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 23f0cf27e8c5..6ff402a7ee5b 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,7 +1,7 @@
 AUX curtsies-typing.patch 330 BLAKE2B caee67d514f926271fcbe498a06cb811ce48035317b23e03e160405e0d4209a95579e70c7bbf1d4d5926af6d24e2016dd51aabfeacc796f9e32649b65c269cee SHA512 6f13aab4de020c39bbbe531e9fbbb24b419d7dfd8a982d04748ee067254a52087ffb04189e05428abfe6e8f163a25541bd5f0681c660bb550ccc84865d03f6c0
 DIST curtsies-0.2.11.tar.gz 46740 BLAKE2B 103355b8467617ac4890ca0d2c444336963d91934539c79314f4319b9fe273973c6464247cf2f5d07ae2ec5fcf45f302c80fdc94cd159715cd204d12870a54f1 SHA512 1fd71d9bc4125a427a5990c6fcef4f73f6e677096eda8d29f7dfee7fe6fc3a350fc66c4383d5e9370a3ed19dfa211285f8b99c425b154e22d3cb4718e1f1d05e
 DIST curtsies-0.3.0.tar.gz 47120 BLAKE2B 51d6bf5686c275690c6b906e7eba642aebd54dccb106463a9b1733e2174fa26a30b8365a17d6cfa18244fb74693364a3aa5184a17f2460425a57fb8912d6bcaf SHA512 b1fc09a4e9aefe09b878a5c710ef86c90f93895a8ed40b40a3c13b24a2dfc1fe771ace11c20e3fed4fcdd0bed8b9615ee3c2bcf200fa34fbfb895a4a7b57b14c
-EBUILD curtsies-0.2.11.ebuild 833 BLAKE2B 9b12375ba9b556f8fb8873bddb324d0517c73e6dc6817684a59513fe3ff77b5328c7be6a154db328d8a259e498eed70e655c0479dc42adc5ffea8a5e26afad34 SHA512 9744e1e1d57680c761472400d669782fe36bdef8a4a8e6c722ea373e109e037c4bd12c3de5e7ea82483781cfeef936c90341029b13c6a51e70cee211bea3067d
-EBUILD curtsies-0.3.0-r1.ebuild 918 BLAKE2B 7c7e94a41b062c2e80c22d3dc13e875f1084f7ad4b2c0bbc8e2cd753e5d5dc212f49921e580d933757906d7ccfe6becd10546be3a5f74a458a71fe4c55bc5f51 SHA512 ae5b18e32f13a73aa51e692eef26f2bc84f279114080b305fcefc98ee813181ceb4d40d9ef0535b7fb6529dad7d94a9bc9518fa861d29b1ace2cec8421752b51
-EBUILD curtsies-0.3.0.ebuild 835 BLAKE2B 4c7ee0cf207a42ef93da4e5f410e8eae5acc28cc55016143e816c06a2b0c31c4ab6f4527de46315755eac399d7cebe1c9c70b9e02763143833ee58e31dc33a36 SHA512 ce859a9afe2d67f52cd19e2297b0313ea05680b39bd56798fb57908f4b3492aaac472ee85af497a63893bbb40c503d1a048a61bc3feb6cd1e7786f3d3e639190
+EBUILD curtsies-0.2.11.ebuild 829 BLAKE2B 0ba928bf6609448b7ca193c91482a6d657ce2dcbf16e426eaed1de1d0fd6aedc4be3b301f6a0a1f5faa7a06e18774b80a453baa69b77f4539ffa09483ff1ff16 SHA512 f1d07243901321862c4eddf7c1f2c9a89b5a6bf467040285e9e5e5882b3417d7e432a3b87a77f746e781f4a3b2df4710cc0ca9ef4183ecd764082fa7a8da661b
+EBUILD curtsies-0.3.0-r1.ebuild 914 BLAKE2B 625614c73faaaecac2c2ad79a66621699cc76345b9f59027c36e65160fd08a69e083e618ff39a8965c6f0bb39b3d730fddacc9848ea7c4bca688d73dda7d9b17 SHA512 d3896d17025476956a37693eebd8a0cee0975ffec4fddb8b89c4f5dfb24139c145be3f5862c5d4a99b7a8f56d28f5dd0c76eb374b1b3168b834a4411d341a835
+EBUILD curtsies-0.3.0.ebuild 831 BLAKE2B d95b849cbefcd8c035dd85f2c5f0d2bedcb22a64d8ff058b4009b02bc0e3d3888cbf3b25c2a7cca7510d688632ea94e041d2ac9d1d2f44fdf4d653c224e0be45 SHA512 268cd0cc91dcbe81e7b1db7b2e3580ac37e623d57b127fad29de22e930d3a69ad2411872864fcff41a8259e6e60abf05c49ebf4cdbe4bd1c234f1f78b9bb1f04
 MISC metadata.xml 387 BLAKE2B bdddb5521d99066f5585c1180d4cab02d11d48f1118f2548bd0d4889d83d9c59a4fde4d018950b34c4e930c33b034439d500fe21f861ee139a8e5d997cce73a8 SHA512 c5e6232c1d85452c22de8bb1b112abe47881e3d0c4fcdda8b7e22ac7544222b63b48becaa225d40ce2a3025966474a0f9bae126f0348b1ada65c1447921dc714
diff --git a/dev-python/curtsies/curtsies-0.2.11.ebuild b/dev-python/curtsies/curtsies-0.2.11.ebuild
index 68c3b1d69330..17c9f3c0540b 100644
--- a/dev-python/curtsies/curtsies-0.2.11.ebuild
+++ b/dev-python/curtsies/curtsies-0.2.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
index b6091a983f44..0972d4ae5a76 100644
--- a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/curtsies/curtsies-0.3.0.ebuild b/dev-python/curtsies/curtsies-0.3.0.ebuild
index 33613df3df51..29bc3515e920 100644
--- a/dev-python/curtsies/curtsies-0.3.0.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 26d62a2a7812..53b4fef36cb0 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,3 +1,3 @@
 DIST cvxopt-1.1.9.tar.gz 1872932 BLAKE2B 50990b8432d32db68580243a5f547a4be2fd36f23196b1505e90eccef9fab5526ea485bf9f81539842229eb276345edce12b064065a1e13125d5adca0de07e8c SHA512 bb0982cd1489157df4c7cd0dd92bf83b1692dc3a27d6b9a7a465dda9f9daea4ea5ef69e48642a879d036679bd0b0fe0dfd782433ce4cc570e90e11823733e58b
-EBUILD cvxopt-1.1.9.ebuild 2884 BLAKE2B 9bf11ffbf96deff41c7ae98bbb80a41faa9d74e1828aeabc3a4b03c82d023d39747c6d8214324bd201e3cb9f90b3702248530391496c497824b8b8456e8e8a6a SHA512 f06935a295e057ecbc859e2524d6d9d47d2e2eb96e3113982b331b9b6a4558430db5acf93d967520853301c0c3fde8bbf3e6dd19cc96f1620cf6bc7728010304
+EBUILD cvxopt-1.1.9.ebuild 2880 BLAKE2B dc899c3cdef39a1d17bc468a54222aa5607d487ae817ab8cf1f173af78f2a1d8e8cfb083b130f65b6ef72acc4a880ec999eef09fb8a72a786438cf5c70724dfc SHA512 e738603f4d9e4e0b9f87ff4936137b705a04670240eb220a8589d89492014564464272e12e223db3272fcd2e91589a86dea208b9949e44616ec5d13d6eeb9fb3
 MISC metadata.xml 805 BLAKE2B cfeb4a97635e28a1fe93b26897950dfe13268aef349647c5ca7455597e679ab7e79d21daf1b54f4c8855624abb8286676aff2da381782dd3b42b0a587f9396b2 SHA512 52bdd0bdc12807d7a3d2d820af3167b0768225167377bdf42e5f7218d5154deab2bee8bbcfdd173301e4b1d87f268bfb4bf6c1f884113c2d1f3fbf7fa1dc2ab6
diff --git a/dev-python/cvxopt/cvxopt-1.1.9.ebuild b/dev-python/cvxopt/cvxopt-1.1.9.ebuild
index fbd551f1b80e..133148d8684d 100644
--- a/dev-python/cvxopt/cvxopt-1.1.9.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index edd6ad0c6793..854514aa4165 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,7 +1,4 @@
-AUX cx_Freeze-4.3.4-buildsystem.patch 543 BLAKE2B 26807f3e50dcfc78ff7950685c889bd56bf1c4002d43b1a7eb5d8658494a30cbb199842dd1227e0f8b0bf6e82f0d9353e6a6afd013be2ccdeda8c60950ac76ee SHA512 263ff5b148bc0054ed92fc96ad73a310b506b40d7b6cdb73c342f4cc25b4f5c7916cc7d84eddd3fa3cb2ae393918c1434a70019f9680ce410ca566c3c88a7e3c
 AUX cx_Freeze-5.0.2-buildsystem.patch 531 BLAKE2B 930bde6c60990417c6b2365e7b8d1784d6d816093a0b005d7722c4936431533950b045ec8ebacd1b5aeefe29f24c4c98c8298d2a3ae641f2350fa1fbd7c54081 SHA512 ecec5ba92d669267c98a980722c5ac17e5ff6f92ba34b25bf7d2827cbc2e7022262baef42596fb84d4b101481d1377a2a2f3ff13069476f9c37c2da7fd6bf8ed
-DIST cx_Freeze-4.3.4.tar.gz 60172 BLAKE2B 62a2cd43307e518889cc4f01c9ea6f0f10c7c7ea7729758858cf6280437f63fb7d85947da71eceb7130dd0f501275e979be1f0e39bc7a36829310ee50df40cf2 SHA512 b523322c8199757245f3af2d9e3d68397708cfc8f318761f1eec6e011bd07ec12d3b748a60d33f43f0849f68ec064a729fb3250747216b90b8dd700d0a83699f
 DIST cx_Freeze-5.0.2.tar.gz 60104 BLAKE2B 476b418f0dc7b702e3bf2f651761f0ae8978eaf29108340a397ba6d225b8196dd0278fbb27cad78843ef4246176a8d4fb241d9ee0111a7470179cd0829f9250a SHA512 eac1a5cfd5b73f43a9447f3fce8a6ba513e253da10f44a74e4fbcd5b83068a57316e215aa03acac6807dee235e6f690b4bbba1447667bb2cba33b1182cb87d29
-EBUILD cx_Freeze-4.3.4.ebuild 502 BLAKE2B 9d27526acf2d24539f2de87c5944722f62850cf28eb974d4db7b5f119dcf34ad1e4a7163ac544ae98a829f0443c62185147455113a65854b738816ce3e115de8 SHA512 3e144ab1fadcc1370827cc3f40eb3eee6cc578bd24017a2971bbedbd246170b8f21d069e18459b8b548acae556424bb744c1cbcd4c1b8d965c74d37bb66538a4
-EBUILD cx_Freeze-5.0.2.ebuild 506 BLAKE2B 9ccd3acba244046dc1cac0b34f0c2c3cf5bdd9946e579b4b401b6d72b0c63f1b057f443d2e9b7dd99b906e0718e61c9fe0ea9d99b99515dbac2cecdaf256bd5a SHA512 d30da97daaf1988d5561370b5a752fd548bab653d34281a499ebbf2e6c21f9e59a9dc0931d2ef446a74d87dfa6e80b30ebc9029d719188457ba0605c13b13f85
+EBUILD cx_Freeze-5.0.2.ebuild 496 BLAKE2B 4954069a8966ed0f0365d03ee6b95ec0ff1028fb0e3cb59dc437820eb79e4c8dec0f3516625198595d3726079ff3bba90b93d1cfa3026ce6b66b0a12a48283be SHA512 a34dd54368ebf9e75a322e15afc4a6653802d9d0de032e04dfb9d901fc972ff1b8f544a670886271186e71b9daa7989aa3225b1872703052253f93589dd4d122
 MISC metadata.xml 474 BLAKE2B 32357b7a3ef2dbbd11d4677315e4aa5bf65d7fba68e35a8edffb1c227f684bff7d7eecfffa7a4e497007a44eb2a258db4f472c4b913c5e776eb8f417323c3f97 SHA512 ad0429814e187ecb959811bed818f16c573940b4ee1c6671f967c2ac8673f0661404bc33fcb975f0a14e3841d8a9c376ec52ff1704d8bc33bc23a1d7232f3529
diff --git a/dev-python/cx_Freeze/cx_Freeze-4.3.4.ebuild b/dev-python/cx_Freeze/cx_Freeze-4.3.4.ebuild
deleted file mode 100644
index 4d28b631cef8..000000000000
--- a/dev-python/cx_Freeze/cx_Freeze-4.3.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-inherit distutils-r1
-
-DESCRIPTION="Create standalone executables from Python scripts"
-HOMEPAGE="https://anthony-tuininga.github.io/cx_Freeze/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-buildsystem.patch" # bug #491602
-)
-# test folder missing half the source content.
diff --git a/dev-python/cx_Freeze/cx_Freeze-5.0.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-5.0.2.ebuild
index 52bac57fad1e..a5e0bcbaba5d 100644
--- a/dev-python/cx_Freeze/cx_Freeze-5.0.2.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-5.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Create standalone executables from Python scripts"
diff --git a/dev-python/cx_Freeze/files/cx_Freeze-4.3.4-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-4.3.4-buildsystem.patch
deleted file mode 100644
index e55d0d324c30..000000000000
--- a/dev-python/cx_Freeze/files/cx_Freeze-4.3.4-buildsystem.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Nov 19 11:20:21 UTC 2013
-
-Respect LDFLAGS, remove stripping.
-Fixes Gentoo bug #491602
-
---- a/setup.py
-+++ b/setup.py
-@@ -94,7 +94,6 @@
-                     extraArgs.extend(vars["BASEMODLIBS"].split())
-                 if vars["LOCALMODLIBS"]:
-                     extraArgs.extend(vars["LOCALMODLIBS"].split())
--            extraArgs.append("-s")
-         self.compiler.link_executable(objects, fullName,
-                 libraries = libraries,
-                 library_dirs = libraryDirs,
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index 7f32c4593ce5..1edc2cf7caf8 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1,3 +1,3 @@
 DIST cycler-0.10.0.tar.gz 16553 BLAKE2B b2f3263e18fab74eed8c92a888f1a5cd47a2c24499fad3d9b9737b2fd01c3b085d6008d65e7cc075d9336321193e779e9c1c7b4daf9bb33be219f54267cd40dc SHA512 b7d2ba19861ffaf4dea0444bfe68b5a6264a022d7b3f02c9ff5e5859e3901de12a90f8dc7469e995e09c418515b3df55dbf05a0cfe5368d40790a2c878a74819
-EBUILD cycler-0.10.0.ebuild 824 BLAKE2B e7226b27dee790c23f0536204d74364e24ec2697d9713fda39c6bb58794ff84d3d268b597a5b7bc53d81a36ba498dbdb001cded589cd5bc1dfce0f82109a69e9 SHA512 11ad762b47797bb9647ad62fd8ce1d8fba9690ac93d8cc06d89102f4d4d131515c020d3a7863c0c3ea83559b8673f00d8e63c79fff692f2c65217398b407bcfa
+EBUILD cycler-0.10.0.ebuild 822 BLAKE2B 6a3df16f2754f978f4e53323798d673ab65cd43501a4751bd20f02604580b2ce1c733eb73d7f1ba14669b67b97fdb0901c463d0a2e709f30281295a1f53837b9 SHA512 09d5178d0e0934870d53941b9aa97d7a12e3248f178c794ae95afc58e86886bb670d46249a0dab93025a3bb01059fd062380c0e0c9de099a97e68dcc74ce3860
 MISC metadata.xml 366 BLAKE2B 67803b534c2f9bc0266a5178178da1e400cfb9721c63d8d7103b6ee12b7b76808a570d1748d12ef55685df108d7dfdb7ff632e63152c4cc0e65ccfa442ae8efd SHA512 43c46a3af153f4b58f305632cac2a699eccc74417ea468b1f85810ea90e843979a9c360231d6762acfb1402270ff27491dd0927f762143e354925637dc24df5f
diff --git a/dev-python/cycler/cycler-0.10.0.ebuild b/dev-python/cycler/cycler-0.10.0.ebuild
index 09fbf971a00f..c075dab00182 100644
--- a/dev-python/cycler/cycler-0.10.0.ebuild
+++ b/dev-python/cycler/cycler-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 7b1e7b2a2fc4..e1d1723beda9 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -4,9 +4,9 @@ DIST Cython-0.29.12.tar.gz 2050537 BLAKE2B 86c5ffd07e97d549f2d98ae0aa66a03dc2f8e
 DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
 DIST cython-0.29.13.gh.tar.gz 2072564 BLAKE2B 55a8c5c932262972cfa55ee2771e17ab5a57beab03d0dac5668f654a0bf68850ef62b7e59b322c527115af48b7243b9c919e739eaf440338a50b89c4645c0fbf SHA512 79efebfddabf31a046ae86a2c2170e0956098f4b1c7b8bbd338d30be7c96c31ee2d648332fc16ad9cf1e5d0ea4ca1a070b2d31ccbeae0c0f86a2f7700b92f656
 DIST cython-0.29.14.gh.tar.gz 2075030 BLAKE2B 12bbc2979c34fee9b498f5425d2cea5cedebda474e3f4ee6c9eb3185a4e33fc84df6c16454830316548e36cd9fb7c47f0925b0d6e16b325cbd81f8747c7e492a SHA512 fa1575fc5ec7ee19de34f91a15bdd45d889f54217dbe2a9654604ada90d8d86fe7bceb86449c41b68d6b65459769916a0d7d5f5da21c5597aedc876cde4e37df
-EBUILD cython-0.29.12.ebuild 2194 BLAKE2B ab0487179b79298f92b758b98610f246363be34b0c2af18eb07aec5434c1af37341eb108ab2c056d9377432a024346a3dacfcb34c6e3437fba30b8f5ed4e6150 SHA512 6e366e00fb3502e9013681ba4af7e3999b6e1b34ea01829e4b23ba34561c4f17b7118bf847a3fedb436c0f824b44fac44ea99521e3757b575931457a097a3975
-EBUILD cython-0.29.13.ebuild 1992 BLAKE2B 0b0b140208d6fc0c304b52ccf3b9812e9072fc69fb5371732181be934a2ff7a2f6095ce23ebff17b894fd9a5ee4e8430d73121864b6365b94fd49fd0d174b84a SHA512 7d2b74467d79ef2de680468cda3eef19ae3f2fe8df79fa7fe62796f8015d9acd46aafebeb0af303b5cd579ff002e4f682c3a93cafb279c34829d82a7b0afce71
-EBUILD cython-0.29.14-r1.ebuild 1957 BLAKE2B 705b08bb09913448f078c30f783cdabd725e89b9ad49469c474e63304b0d17a4a73579b853b2ae50bc8ef3ea2a20c95d050b7eb270776329bea54fa05f7f45f2 SHA512 ac542dc6f199b2f7492b155b8b20ee3c29e3e7b010c7575e10becd009855a8b122f89e97efa9effb58846312df6237f7d25e2890591207d231d1f8453d9b275d
-EBUILD cython-0.29.14.ebuild 1992 BLAKE2B 0b0b140208d6fc0c304b52ccf3b9812e9072fc69fb5371732181be934a2ff7a2f6095ce23ebff17b894fd9a5ee4e8430d73121864b6365b94fd49fd0d174b84a SHA512 7d2b74467d79ef2de680468cda3eef19ae3f2fe8df79fa7fe62796f8015d9acd46aafebeb0af303b5cd579ff002e4f682c3a93cafb279c34829d82a7b0afce71
-EBUILD cython-0.29.4.ebuild 2165 BLAKE2B bd8cdff790567006ced7633820365310421919673e777d18b4983ae2ae2bb139ea1b75b7f0b6aa1017329698d6deebcf9137c3e8d69f42334fd52ff4a5ab13fc SHA512 dac802145933e50aca440faf6351078b468b4478487431e913237ddbd95c707c01380eae60b8a7705bbccc77607c11fd5ae36b4af209e97e64a17ea5c9e9b5bf
+EBUILD cython-0.29.12.ebuild 2205 BLAKE2B 562168a2bcff3f94a596a778937559a7e1c59fe9725455ac418b928a857e8004b18bfa28b5f35ac1cea25f76ab118615c30b5cb47604bb01b59ddfdfc6cce612 SHA512 929ff6c6dd6ff3b79e8961814a1986cd0b7e921435d512a991c811e64dc5540ec63a4a5e97c7c31c43c19414688b13134af2dd4eeceaa5231e1e462a646a6ccc
+EBUILD cython-0.29.13.ebuild 2000 BLAKE2B 03140f3fe420923488c9099439cc71d406620cf5f86c6576cc9841299138918b87c368920ad750b6a9d9c6d98fa82177e6bea37cb612b0e46574a24b41c86a33 SHA512 fd41fdaf8bb98d9210d0b8bc2cd74339a821acf4585a281b7b5c7db59a25fc5a3e4d219268bef5712d9e1a4b70867410af7fb5cd6ecc34dead62d7f44a19d909
+EBUILD cython-0.29.14-r1.ebuild 1965 BLAKE2B 24f822ffc042de44f22cc32306f70471bdef6357d215bf8b4cd6b850f86da11de1822aecb078b569e2a934cbfe791069d16d78e5d4fe85ba8f6619c08608f659 SHA512 2d81f01b57dcb5734a2ba067b872f2fbace9768d928c757e68084938c65498afc2adf56905f5679250d436a4db8b73ae35865f0134145c5955956aa5be7d3634
+EBUILD cython-0.29.14.ebuild 2000 BLAKE2B 03140f3fe420923488c9099439cc71d406620cf5f86c6576cc9841299138918b87c368920ad750b6a9d9c6d98fa82177e6bea37cb612b0e46574a24b41c86a33 SHA512 fd41fdaf8bb98d9210d0b8bc2cd74339a821acf4585a281b7b5c7db59a25fc5a3e4d219268bef5712d9e1a4b70867410af7fb5cd6ecc34dead62d7f44a19d909
+EBUILD cython-0.29.4.ebuild 2176 BLAKE2B 773d1e0cad44940dcb5b17586b690584b957a7551b0661880a97c48dd8dfa8fd186099ef329274b2d72cf4c0d03e3e18d77c7ab328dbe7f83bec6745a5a487ca SHA512 3464c0ba73b52f7a7f9d04b309c786741f9f2409d923d1d19d9e8618bb4d04eecb259cdb79d2451802d796120dbb12738bda9dc7929577af63f9e612d76963e1
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.12.ebuild b/dev-python/cython/cython-0.29.12.ebuild
index e2d3fd719bcb..3409b161938e 100644
--- a/dev-python/cython/cython-0.29.12.ebuild
+++ b/dev-python/cython/cython-0.29.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common
@@ -22,7 +22,7 @@ IUSE="doc emacs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/cython-0.29.13.ebuild b/dev-python/cython/cython-0.29.13.ebuild
index e05666fae50d..dcbdd3965218 100644
--- a/dev-python/cython/cython-0.29.13.ebuild
+++ b/dev-python/cython/cython-0.29.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common
@@ -20,7 +20,7 @@ IUSE="doc emacs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/cython-0.29.14-r1.ebuild b/dev-python/cython/cython-0.29.14-r1.ebuild
index 55b4818f31ed..460ca46f183f 100644
--- a/dev-python/cython/cython-0.29.14-r1.ebuild
+++ b/dev-python/cython/cython-0.29.14-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common
@@ -20,7 +20,7 @@ IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 BDEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/cython-0.29.14.ebuild b/dev-python/cython/cython-0.29.14.ebuild
index e05666fae50d..dcbdd3965218 100644
--- a/dev-python/cython/cython-0.29.14.ebuild
+++ b/dev-python/cython/cython-0.29.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common
@@ -20,7 +20,7 @@ IUSE="doc emacs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/cython-0.29.4.ebuild b/dev-python/cython/cython-0.29.4.ebuild
index cc697a40fd27..6d1dd848103a 100644
--- a/dev-python/cython/cython-0.29.4.ebuild
+++ b/dev-python/cython/cython-0.29.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common
@@ -23,7 +23,7 @@ IUSE="doc emacs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cytoolz/Manifest b/dev-python/cytoolz/Manifest
index 2cc626fcf63b..d0bc42b2658a 100644
--- a/dev-python/cytoolz/Manifest
+++ b/dev-python/cytoolz/Manifest
@@ -1,7 +1,7 @@
 DIST cytoolz-0.10.0.tar.gz 475069 BLAKE2B aabd1bee4ee5b17640cc1e4126920c4e21893286315e3e4a5e968fb52dab371ade7a00f3082a704dbaeeb00af5ccb3cb9743fd66a3d23ad5879503f66c4f0c49 SHA512 62e90837125fae5dc6b96ac13a7fc2193604cd1250173b8e24ba3e65571e9394369cad07e39e7e6e42da0e3dab04db98193ba55195267c49447cc7ec0ff7b840
 DIST cytoolz-0.8.0.tar.gz 349493 BLAKE2B 4dca289eea51f34aa0faf869778a289c12c7e7c43893680c3f6c6302312e47cae6070203b21951a4a9c38f373f87fb773e9ccb9787568b378638d449d82ffb47 SHA512 08a97312602b3bd71cb9a3b6f879121f739c73065210bcbac227e366112b2157d479912040296d58c5aa79d3fab8496fb92b12e0ee8df0cca15f46f151312b73
 DIST cytoolz-0.8.2.tar.gz 386259 BLAKE2B eaf31b9e40cf53ecf32b7113d55d4600ea6105187f78a4cb6f0b0ceccf02d2c5fd637ecd3d8f80328b209eb694ef67c7c188ca8c458f896868bbc2a71b2e9ce4 SHA512 b75408db5c13c1142fe71f37c43e7b3dd73cba294571ddaf5dc1bf03ae0e18fb7b6d37f42980db65a4e074b923ac1243a90f1dd30302f0f9be3d7b1904014082
-EBUILD cytoolz-0.10.0.ebuild 1073 BLAKE2B e8d13199358eb5f4a5f6fe120ae24f4fd7a3119d5ff3c9e606381f4c5c1e18a91786415de8af68e14331d8dbf34b3ee390563195052fc8f6632aad624ebe2de1 SHA512 c5477a9280deb570f6c16b08d72ab78b7e5fa72d29024f40f2c8d5204ed331d1e6d33bbeeed4c5785405fb874d71ea12059be00db471ba7306e22bf9620efb7b
-EBUILD cytoolz-0.8.0.ebuild 1043 BLAKE2B 864de4fc26292962a8c1e91128dac816d68fb052228b45bbef14c5fea07cd1c4bc44cf6172db09682aca7fc7a937ae4c7d304aae8d8af46cdf0c1b2713ba9d32 SHA512 4f54fd4a2224509c1054243ff399be332d5a4bcdd64a02aa19bbe353ba35aa40d65afe980f0706c0520f11939faf236c1b0588698fcab0a9d1886377acb2e89f
-EBUILD cytoolz-0.8.2.ebuild 1069 BLAKE2B 12e3b1eaf38aa198e536d194ccc6208a4a5e82ed7884becaf6be9017ee150dd1451b5cc8309a4b91954aed25c026b245e6f136181d883223f19e8582a5c2e2f8 SHA512 1aa5a44041f4e7470b1cb224d2aa82ad54dede3285fa518cee394c0667a9c1d34746d5fafccff93912da2ed8b6e5be3f58a87adec5a1f9c4254a13a90191e1c2
+EBUILD cytoolz-0.10.0.ebuild 1069 BLAKE2B 47d53b3a7530055ea44bf291171243c016fabbc03774a797e29f5c3051fe47159e14020a9e37f8539daac71823ca20857ba288e21901b6da0b49851d7c436d2e SHA512 9ecc368f35e7eb7d125a1c400545f9418fef7418f172bda2d1fa63df7b40faab7e2545347c55fa257dc8a3b3ab8b0e71ec26acbb1367ae3c3244a61a0e719128
+EBUILD cytoolz-0.8.0.ebuild 1039 BLAKE2B 66be30869b87ed16236f0dd4f220509c804af8a480df0e58f7997e2e66cb20d7908564f513473a1ea58488c076f03ca707b23bbdde6140d525da053d5f987e86 SHA512 3fd2d366bdeec7379eb3c4051095e5e1c6fb35e184cbec4dc73ab5d34133913ea48fb5d11dd20c721f79e30d4b34272192388bfde07bc62ab131a11b4b01eaa5
+EBUILD cytoolz-0.8.2.ebuild 1065 BLAKE2B e39ef512c65ff4685f4dcf93111d3b0ad207a3119ac100318a09457fb362eab7df00c7cbb5e88b6f5eea631a824646fd85193f2433776c99660df08a1a21b1de SHA512 04a5fae5303bc7a0f01093f5868b2acd6b8f12ec8f8055126fca18aa09bdfed030b9c9ac5061e195bd97e59cbf708c9435d19d845c57f4ee76d3c3163e880958
 MISC metadata.xml 310 BLAKE2B e591a8dddc9f32e19aa8510333860ea3ed1f833005b621d59f653b97e0863dac0acc67ee66a3a2c53062bf4ef0c0028e67082d24c0793d3bf0ac2ae60e2bec08 SHA512 3858eac51c768acb385d86f38529d983b781efcc4cb0ce8b6bc326962df9541d13f21881c4deffa19b5575ae7fbd1b97da58a3ab65dc724eac7144a050de540f
diff --git a/dev-python/cytoolz/cytoolz-0.10.0.ebuild b/dev-python/cytoolz/cytoolz-0.10.0.ebuild
index 58af60083e3a..b2617dcd9569 100644
--- a/dev-python/cytoolz/cytoolz-0.10.0.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.10.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cytoolz/cytoolz-0.8.0.ebuild b/dev-python/cytoolz/cytoolz-0.8.0.ebuild
index e91727f171b8..1bad2aa4fd85 100644
--- a/dev-python/cytoolz/cytoolz-0.8.0.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cytoolz/cytoolz-0.8.2.ebuild b/dev-python/cytoolz/cytoolz-0.8.2.ebuild
index 203df1593ab9..78b48b218d8d 100644
--- a/dev-python/cytoolz/cytoolz-0.8.2.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/d2to1/Manifest b/dev-python/d2to1/Manifest
index 05e04c550562..2e3672d52bf2 100644
--- a/dev-python/d2to1/Manifest
+++ b/dev-python/d2to1/Manifest
@@ -1,3 +1,3 @@
 DIST d2to1-0.2.12.post1.tar.gz 35973 BLAKE2B 19cc191b18168cdbe291235eeb7d0a6f9c9ad9e049c91a337541903ee39c0f1b247bc966c311bd703ddf0283b33fa0a2dc09ec5ba78cd694bc9cdee17c625575 SHA512 89890afc78b21d78f42ef5c920d377cd58075829e025c512d86138d52943ce8b71d1245bf267f76f775c6a69bf81bf9881322bd64b0e75ae088134e6b66f4d2d
-EBUILD d2to1-0.2.12_p1.ebuild 898 BLAKE2B c70335bc898028575e0549b2a1292bb2528dd5ac73b00ce81a4b72871b5e6050498c819f5a346914d796231c2cf41bdc262969f2fd3b3a66efd1a86369eaa365 SHA512 d444aab6da22dbdcdb19bfe0b47f2ea755ef484797052907ec9d60f0236db46cc96d081e3da6d56db69fd289693759c79aecf3be3856cd8c27cacff6b891b8c3
+EBUILD d2to1-0.2.12_p1.ebuild 889 BLAKE2B 68b6c42cbac666d2b91cc727fe4d8c59b0c4a9474d64cc07a3881d78d5070134168fd6f82bde688157983da16ab0f8d533e51f8c76630bf33dfb2d36fe026afb SHA512 88d7b139f969b7a97a1c4dd10440f0e6a56f738ca53e2b04052b92bfce450afac5c18ec5f4fa1b3537f13d0cd50b6da5e3faebb43bcd859909783a01f03f8d63
 MISC metadata.xml 734 BLAKE2B 58eadaeefacc91862709b46bd127e5c863da57460458d8a98108a260d97a74b96898b4d87dfc45b34410d6288bf0f42e6043c13484d83c04e7d265c8b6c8f1b5 SHA512 b31816f24d91b5eca6cd55019cbb9442e33b110f35899d0a6b1118b4611d80d2914e2242ed62ef4154a499cb33b5f1866b17eadb5c4b9d1505d3d6cb226fd02b
diff --git a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
index 71611f1a1ef3..54d354f521f0 100644
--- a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
+++ b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/daemonize/Manifest b/dev-python/daemonize/Manifest
index da48ecea4573..b7767fae9cc5 100644
--- a/dev-python/daemonize/Manifest
+++ b/dev-python/daemonize/Manifest
@@ -1,3 +1,3 @@
 DIST daemonize-2.5.0.tar.gz 10126 BLAKE2B 10e13f93825309d48ef67d0725ed53dcca2220b3940b3b81e1e7f29cf7b6d89af40f94488a2398bec74c0f6235ef8b1626871bda4fb33c233a872a9ccea47558 SHA512 c17a14c073e22fc98b3663da207238d183c12e95750f14cddcf90419c51c95ebc36251bb95d0bb4db84a2fb243499329473e7d14172d855d3ee204757a2a1a65
-EBUILD daemonize-2.5.0.ebuild 467 BLAKE2B be33a2d6711e30c43993cdc389f63de65c6614622c2166bc2c95cbb74ba4b7dc01a19a558429863c0a8271bd0d364b5248a616aa1403e98321b03779f506ede7 SHA512 c3d0aff4707e4e71ea130215fbe33fea2bc46756e2bc6e641b722ba639d2f0c4509e7d455185843c15bd897a2ad55098b008e34106490f43cb40fc723a9fe0c9
+EBUILD daemonize-2.5.0.ebuild 460 BLAKE2B 41963a65c2bfd265fa932c909450f56556b081318ae7f6f3befd806aeaa6e7c4e6e6acf5d4393ccc3379f9f4010811c834d0c146c8b2c60ec3c4662740eba046 SHA512 1616e4d347140956ebc3b3d0d6c8740a04da08c7687a1cd9874923ca53ff2d39b21f02695d420a250417cb24d345f4cc762259c7f5002dba4d03aef556dfd765
 MISC metadata.xml 377 BLAKE2B c8bc7c4e33e27cb2f208673e213460e02fa448f41226b08324f44d700d856be8b1bd408dce6f24dbdc1ffe8d2b15d99f56160fb93727066d887362fee7a532db SHA512 7d2e4141f084e93515957fb82473b1504b53c5082063b3f4c97fc1d326bc03b589405df8b3f19f8f926656fd52d7972b1b95a479c045d8a691cec255bb95d4c0
diff --git a/dev-python/daemonize/daemonize-2.5.0.ebuild b/dev-python/daemonize/daemonize-2.5.0.ebuild
index 8a120a67f65c..ac079e318e80 100644
--- a/dev-python/daemonize/daemonize-2.5.0.ebuild
+++ b/dev-python/daemonize/daemonize-2.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 2bdfa47be0d6..ba417e11d38d 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,6 +1,4 @@
 AUX dask-0.18.2-skip-broken-test.patch 1349 BLAKE2B 8ebe780c900407dcf9052828059bf14dbd7e7761e1c5e07455e067cb6ad13a83084e573be4be71fdd1218fe1fd67c6ce2f9c0984a20f4373372e8177a7519eb9 SHA512 79ccd5ccdd6709dc01dc0f6c3ee1dea9cc3dcd2c8e443cf74e9002e5658f0e72b709e0717e342040f2bbd85ee8ea331d6d6baa2c600fa498154b7137634b74e5
-DIST dask-0.15.1.tar.gz 2147022 BLAKE2B 79c3355e8f3c202e598b32ca057c237d07db283b04b99ea713a820869207af9f46cb80ab58c0a058ac327873851f2d89050a4b9d7ecac3c1e1173f6be5349848 SHA512 44e7119c2a8d15efb89e265e5752edb117dd06da8a5e7511b68c5859e9068aedb3595540645304f0322f869c83df79a497d731bcade79612f8fd3f4eaaf3763b
 DIST dask-1.2.0.tar.gz 2381831 BLAKE2B 88d48b9bcd4444dfe066c8049eae2a8b65e6ae1a7e4f4ff89697c254efc365091a61b298333b0f8d660cc9f760d3960a355beafde2555dfd912606dbe4a49db1 SHA512 c00886768b331f48ac9627f81c39368afbb4f1083ee9f7e3ebbe64352cc48c3c580fccef8d5466592f5bf772f873bef2ac084a972d30e7c1b4d1028e1d456059
-EBUILD dask-0.15.1.ebuild 1108 BLAKE2B 9f2ae509835cf662c2e861ee5d4615c9c0c1a53dfc759c59f99e87a331a5c6c0be97fd9c7695e636bdd6339e01aed532eed9c9ce33e9e038e4c24750f404f9e2 SHA512 f2714271c10c4ea25b2190a6458c3393aed84f645162d7b1d12ff930f7daee5caff75aa912d5189137ace4f852b73875fbb3372bfa18f99f7b3fcf60e1515169
-EBUILD dask-1.2.0.ebuild 1216 BLAKE2B 47685e6cfea48de9d15994a476833a0a21d97898b1e1cd51be528239e58d205061a9734e456385cb617d2d2cc87732a71a076d9339303a7dfab14d0dedb9535a SHA512 911d3bab7929f4c98dbc15c42d4fdccdebb5168667dfd067d2692cb49eb15366ca0d70691fd0543a1837e934b9d4a734c0237ad39993103fd725f3650ecd6c2b
+EBUILD dask-1.2.0.ebuild 1214 BLAKE2B 1e59694a5261f0196564a74319f294756ce6cb31f5775a06addc14cde3822a4c73ecc3a9c61b2689b23c55f23298a1d36480f14a534ab194ab9a942862e02465 SHA512 e8eb3c504b763537fc9096589ca5f7e1d1cd43ba7ea81269f8715b0c833840046bb30709b390de8f432e6c21c23661730ea61b30096e06767571777ef162fa39
 MISC metadata.xml 777 BLAKE2B 5574aa56065f36366ee721e25b1bfe06127a22a94666bfdcd1b62e4d03456948bb22db23f64ac7ffbab9816ad508f97fe23a2c9a0e34cd58a61946c6098585d7 SHA512 0ec3d7886c54dce68d7aa90cca45e54b37a000617d4bddd88c1d06ef7db50c23a077b8967acbfdc475cfafe444edd2584500867f45f9e89721f259d3dd330850
diff --git a/dev-python/dask/dask-0.15.1.ebuild b/dev-python/dask/dask-0.15.1.ebuild
deleted file mode 100644
index 81adc991f791..000000000000
--- a/dev-python/dask/dask-0.15.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="distributed test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.1[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.19[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.8[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.7.3[${PYTHON_USEDEP}]
-	distributed? (
-		  >=dev-python/distributed-1.16[${PYTHON_USEDEP}]
-		  >=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-	   ${RDEPEND}
-	   dev-python/pytest[${PYTHON_USEDEP}]
-	   dev-python/numexpr[${PYTHON_USEDEP}]
-	   sci-libs/scipy[${PYTHON_USEDEP}]
-	)
-"
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/dask/dask-1.2.0.ebuild b/dev-python/dask/dask-1.2.0.ebuild
index 07842de20912..a043828eb990 100644
--- a/dev-python/dask/dask-1.2.0.ebuild
+++ b/dev-python/dask/dask-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/datashape/Manifest b/dev-python/datashape/Manifest
index 5767720d279f..2fa78d12556c 100644
--- a/dev-python/datashape/Manifest
+++ b/dev-python/datashape/Manifest
@@ -1,3 +1,3 @@
 DIST datashape-0.5.4.tar.gz 99343 BLAKE2B f976a565e5a099949e359b6b2de0cd9ebf0520e780fc096b1e528e54b26d13fb68a27cc86a7ae6f402837ecd76a6f889308cc79adc9579a26173fdf2f8abf234 SHA512 3640c3871e6a00ad5c9961586821c0aab94ed10e82f5c2d361707c66853025aec70793f74f057c30a7bbc58d4645791b33df2916732e703586fd6bb84e91bdfa
-EBUILD datashape-0.5.4.ebuild 1184 BLAKE2B 0a220d9ff87646457bc99516c23b8b1367d183bd9ca4df0b81a1e3951d87a781e629c4c4a79312944d1ac8afa5210ce21bacdc8b392f193d672dd44fb4939552 SHA512 147cfacdf2345791f59e10b3897638b3f3adf76d4118011ab8825fddd1fd255873e065064d0f15df6cbc1d1633150a8c8fdc63692060b011b55e4eccc50e1eac
+EBUILD datashape-0.5.4.ebuild 1180 BLAKE2B fd1b06c857a0710242647add17ee733a6cf91c6c10027b5f1acbb4080dea23f6894a3617b2eab118013d0de8ceb95b7939fe76dd97a12dfb7756a625b01e2ef9 SHA512 e909e1ce1c413db6927d4ea66c39bc7442d10a75fc18d90ac75eba3411cfd55cd7e94306581bffe89e99b72064f3b92fee5c606ee1e6127703ca112035d3027e
 MISC metadata.xml 510 BLAKE2B 631f7ed8106fd090953d4969cbf687d3ed5990af3803ca8315a848c95c9d8a0a5293cc79b7428e5f8f1c5e8bec76ec18b3cff2eac4f6cef8ab316cc28cc0d185 SHA512 7216551730e65c069c1315ccaaad65434106876e4a33304b9f7214610fdda9919a44bfce6e8f4cff680976ff51ca10ab23ee11abf5987e7b25cdaeac8a174bb8
diff --git a/dev-python/datashape/datashape-0.5.4.ebuild b/dev-python/datashape/datashape-0.5.4.ebuild
index 22e0065bd364..d62fc5beed98 100644
--- a/dev-python/datashape/datashape-0.5.4.ebuild
+++ b/dev-python/datashape/datashape-0.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 4aeef3a6f5d0..d5a11eb0c791 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,7 +1,7 @@
 DIST dbus-python-1.2.12.tar.gz 574727 BLAKE2B e5516e7109fad089af51d3e5db3921d056f327c27f9b74a870b1b31b04ba952ad3c9ba5916a18d674ab1179b94cf516b24e046feded8f2e542b196d162038944 SHA512 6f90eaeeb74ea71a026a331d4c611911eda6dfb6c9086a0a80352f9963a9ae126db6f3e32d183916b8517f177fc947f1ddb15df83ff0b5c886532116868383b4
 DIST dbus-python-1.2.14.tar.gz 576181 BLAKE2B 4e36c3d0ed07ce6c7514e2699b6cf5d0a75332c8dab3ca90e2d451d6649c26f61b2173b4b7f230c54df2b9f4214d0f3c54a45c233d6e8fd38bf39a6312f480fc SHA512 773d66e40ab514639f1c5c619362659f290ddd5ae944eb8e09b5752624f3c86305b6c1d5562e290b36f1e6cf43f6d39cd4a227e18ff41499877546982ceebb51
 DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e2307357778371742a7fe26a0e419af41886efebb27a73f642d2ecd4603c79f4afe6e7002af95c831180e0e7844c079b2c8c SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
-EBUILD dbus-python-1.2.12.ebuild 1746 BLAKE2B dfb2c428ab95c36b8ca14ee9e71b8812383832aae56c328ba50c32ef3013c3e51e204f9842db5f9a5db2a2cf7dc24fc717e130df7a1155aa9e54fcab01e3a518 SHA512 9b9ef253ebbf78d7770f7ab964202fb3bfe59e94ea10c377531d7decb189ee0cb5eb782149858ed26f27a48752fe1d0c6513f100b051d15d12ee99c982105abb
-EBUILD dbus-python-1.2.14.ebuild 1746 BLAKE2B d3df9a434b1e215a80b7c880bbd0375ee0d97fb74099f8ec9b66890418a1a6a42e70c68134ab28f4a06193eaa0dec9ec3e0d95355d52a5eaf92d60e1b3973e9e SHA512 0ef61e10c9b1b884a3d0c1a060fb70062e07fdcc7585f61ed87e361b4d1b5cfd0f5823c05c08036e73a377ee1629be37ecf14183a8506c0c10a70cdd6935058a
-EBUILD dbus-python-1.2.4.ebuild 2227 BLAKE2B f201e37d187a59b9ebc5056f89af111da2b628f6ee0a1eec2704c5d72d14e827d6b2d26e441df97cf84403d77c85ed2b1b7678d6141e8c154c5d6c06ab0e1483 SHA512 a46104409fb14d0eb58b6b4a909961b7736753240a29bc1bf3605e8671a3713a1f75c9e7188f4d0bbcea0dc960308c921570b0b1a27fd2a0e6bddef2ee4c56b9
+EBUILD dbus-python-1.2.12.ebuild 1743 BLAKE2B 81e0544a4d4d07726e257463ec6ef32eb0f5bf662efa7f7ed906217b6865e7a89e2712ffe4a031b7389d9639903b793c98fe9de5ec12670f05aa1ad6760d5636 SHA512 db0a8e9ee824ffc3353a986d0fc7e30ec410876d92e2c0db57c664c58e5b8453de91b377f8090756aa446ec03546904c496a5f8404a7d7672cfbe4e5e4716c8c
+EBUILD dbus-python-1.2.14.ebuild 1703 BLAKE2B e4cc001c8b1fb3d7cac2b1c356aebd98b5c660c3c1685affd2c717794ea4577a51392c1a9a97f9ac63c02dd241fd9d4520c27dc5ed7e398f6150e1ac7e0a3abb SHA512 b7f3db6e3788aaad85be6a4476d649480ff4ee3889b47ddf2765f795d0b4cf0a1fe65e597b3713a347fac72fd7d95de7e762ee5743fb3cec1baec6401ffe6bb4
+EBUILD dbus-python-1.2.4.ebuild 2223 BLAKE2B 0f143aeae17e987b69fa84637bc1f51a9d72ef4ab37e13e5c176ca5066ab7f75d5885423ed7c47707fa37db9ca92bc689025670f449f2873845b06aede86d5bd SHA512 86f5b36535526f0b91ef046732ffa375a65ed4f691119923dad8c5f04df1563892aa959170e8f94067089b79046e5415af60fad889d018ca5964ecd281a287c2
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.12.ebuild b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
index 494875ffb628..f540a4a3c54c 100644
--- a/dev-python/dbus-python/dbus-python-1.2.12.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit autotools python-r1
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/dbus-python/dbus-python-1.2.14.ebuild b/dev-python/dbus-python/dbus-python-1.2.14.ebuild
index 5526593b6e83..7c3a124a8e92 100644
--- a/dev-python/dbus-python/dbus-python-1.2.14.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit autotools python-r1
@@ -27,7 +27,6 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
 	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/dev-python/dbus-python/dbus-python-1.2.4.ebuild b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
index 5708d06496b0..da990bedbbb5 100644
--- a/dev-python/dbus-python/dbus-python-1.2.4.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit autotools eutils python-r1
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index c1a6f3ab3cb2..2d5465d4de12 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,4 +1,4 @@
 AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea5360cf6a128a2f569782a51525c1ac9e6972bd03188f9777b1685f04900d48f2e554507db7c8b755de02c0a07de8defa26f05 SHA512 a105bb67702ef10d578e4df723452f060248287e9fc394754257c036ba0c6b186f90f5849a37e32e57cd70f16bbb73d0b8f84d9d153e1649d3ec5ab147dd6183
 DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
-EBUILD dbusmock-0.18.2.ebuild 1075 BLAKE2B e821ac7d0be21633e3b9f0cc53b193741145eb43ff99456c9b3a077fd32bdc069c6c51215d270e8b60599f87ec0be9ff8bfb54db32abc4574fd4e029a8a64d90 SHA512 deac3fdc5d2b8f523ae04ec9899d969369704ca1fc17c0ce0468ea79a932efbb7d04ec67353ab34d35c11a2e03096ef522afe8f20a8eaeb47ae45500be7fd3a5
+EBUILD dbusmock-0.18.2.ebuild 1073 BLAKE2B 9088ad956ebf752f7d0d788fe2f6952966924f898a252be84b5c613442d98bd32cddd196870a4ee5430e388b64f4cc03e9dc83d361dda1e2dbea6c47353336e3 SHA512 849d3710129657983bc30517335de517162507664302b7577a94378960c4688df206562d4c427a768e765f64536ee8f3ae8e0d97a0cf149ec936168480222749
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.18.2.ebuild b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
index 5189486b8f30..e2df5eacf945 100644
--- a/dev-python/dbusmock/dbusmock-0.18.2.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/dbutils/Manifest b/dev-python/dbutils/Manifest
deleted file mode 100644
index 6fca74656495..000000000000
--- a/dev-python/dbutils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST DBUtils-1.1.tar.gz 109943 BLAKE2B 46b325eff6719f22dd2713d74deb16f5a1caf075d4c53d001208b763e5f5edbe10f3ba9a5e9877a8f1f50915c5d9a14f3911c5ba477258f3c9714897c39d8e09 SHA512 34e2dd85e94bbf13804deb7a40707ed2d83174758af7282702e1614d34924a6ae085bca620da0233bfd8972a00332c022fe764e6e5efa642c3365879cdedf88e
-EBUILD dbutils-1.1-r1.ebuild 963 BLAKE2B fd252bda4c05a069309f53f0afd8caf06813e4cf1ec4eb02a15284f47776d4bfd7d69731d97e2f0ff1ca6d92790532796176f0d372b63d37443b6b1a6333e722 SHA512 88a4476df11c4e398ff0e6d174645c1c751ef348fc1ee7b78be5b2d298f707b7bcb8e017ea8620372f4258c3434488ecfc0aac1b41a950305672480cd51d305b
-MISC metadata.xml 692 BLAKE2B 0d9f3b68a08a952f56283fe308423f0da561bc36c0460fcb5b2a3530eb70544bf5d353f77ac050dfeec680e0440d6d32ec5834a969907f5f38e08559fbb146e0 SHA512 d441db855c228932b5eb74e85a9406e730605f7bd23ee7e0505adccb18839e21caa3c50fc88ff9bf07eb400cfc0a0005704548e4bb46ac155572a8e16a6a378f
diff --git a/dev-python/dbutils/dbutils-1.1-r1.ebuild b/dev-python/dbutils/dbutils-1.1-r1.ebuild
deleted file mode 100644
index c38aa2a4269a..000000000000
--- a/dev-python/dbutils/dbutils-1.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="DBUtils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Database connections for multi-threaded environments"
-HOMEPAGE="https://cito.github.io/DBUtils/
-	https://github.com/Cito/DBUtils
-	https://pypi.org/project/DBUtils/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="OSL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed -i -e "s/, 'DBUtils.Tests'//" \
-		-e "s/, 'DBUtils.Examples'//" \
-		-e "/package_data=/d" \
-		setup.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -s ${MY_PN}/Tests
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${S}/${MY_PN}"/Docs/. )
-	use examples && local EXAMPLES=( "${MY_PN}"/Examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dbutils/metadata.xml b/dev-python/dbutils/metadata.xml
deleted file mode 100644
index caa310978e96..000000000000
--- a/dev-python/dbutils/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>robbat2@gentoo.org</email>
-<name>Robin H. Johnson</name>
-</maintainer>
-<maintainer type="project">
-<email>python@gentoo.org</email>
-<name>Python</name>
-</maintainer>
-<longdescription lang="en">
-DBUtils is a suite of tools providing solid, persistent and pooled connections
-to a database that can be used in all kinds of multi-threaded environments
-like Webware for Python or other web application servers. The suite supports
-DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index da41c464ea36..eecec5865eb4 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,5 +1,5 @@
 DIST ddt-1.1.1.tar.gz 10021 BLAKE2B b2024bb214bbc13b585ebfedecec32e3e53072a9c82ac2355625ba0e8a77159cc8e3c3d86788b5da4319f9ba6afddd61086b1b305ae7e2b9bd71edde139b7185 SHA512 3839ac0448292bde07d676456640cd9466353e8c4481e60cb51e33704c21f92fdf840901430aa7f5276ccf579a7cd70b277fa2ceae03bce183e2422d514897a9
 DIST ddt-1.2.2.tar.gz 15170 BLAKE2B 4fb4a4493b96b7d45e060146212d6f2b4b31ecfa8ad5650da34cedb53725b20cbecafc765f3208cffbb3bb3c4f92579e94f369c9b8216e9693eb0fcddff96af9 SHA512 9b45c4b422cab9e6858235b413b622f077bf4e5254214165c50afdea767dda7d9f39e7be7b0d583b87849a078271f4fba34ac5fe0f35bd196eb7f396bd308fe7
-EBUILD ddt-1.1.1.ebuild 650 BLAKE2B f436128d57ca350a5c05474d6de53a4fe869ff4f116bbb2f624d8226461d41b3637f7940ffae525e0eff651bc819695c7522b41b0014098bff8752d9dc7a025c SHA512 bda16b4da6b4ba9e71f08f8563f6d4de37bfe87642f75bfccde0a2372242beb5c98c5df7af290be3cce7da2e07df7cc2bfa78abe319ecc461cd4081036f9553a
-EBUILD ddt-1.2.2.ebuild 620 BLAKE2B be6385ad8960dc516423e45d781c2df76b7352411c3201f3f4065f7efabe4adab42647f58914b711b2cea8299a3bcef6e6fe4f035ca2c26723b0466881a9f519 SHA512 4824a636c49685d9c51c5d67b1b7c99e3f129624be8261c9e2d7f2842466148f7b36eb2b627f576c5e6fa27c657c8f40ab14b80217daa70e1fe9e8e3d934d4c2
+EBUILD ddt-1.1.1.ebuild 648 BLAKE2B f92dbd3da06d3c415507181fdbe69dee1490b86408f4ffa3237b4324302e34deb78a0b9e2556ffed2aa74a897a472261d7a76682f093619978cf8107462fd894 SHA512 8a5548f90f579c2f4e6ab8a1175b6a4f551aea658b21b06002d844e935aaea4d7f0b55b6bc5ea71504126cae046e17bf901434be23624a5bffa2734af08524ca
+EBUILD ddt-1.2.2.ebuild 615 BLAKE2B 2f2df01d54b7fec5bb05ab622eef6cea82c9a9a539ea67002f21d8ab3848d1e3b0b3cf7e1c3a6e6f22cefef59f3e0f8d1c46c7c86233e1d6176953da87ecc389 SHA512 cbf2cfe26b5016ffff3b2ca68e5a671629638f9af0143a14b978d1a0381c4e67fea26762bfdffa086f1b438051bad9c92bf0971c62da806a3401e59a74ce405e
 MISC metadata.xml 731 BLAKE2B a3bfcf8b61d030a5b8637c1c913e999ac5ac960333bc56bc7fd20edafa538a0b679f818677a5a32b3a6c06e8cf5d42e120b89b76c4c4dd7db47e989cbc252a2a SHA512 71dcc2ff9b9b0f152a361e56cff5151c43d16a7517c26982e0af5133fd2ed953f38976ec75fdfa7e2b138e8d8d3d983777392438f2495a188ed9a5fda9ed4538
diff --git a/dev-python/ddt/ddt-1.1.1.ebuild b/dev-python/ddt/ddt-1.1.1.ebuild
index 9d03194aa6e1..25db5bf52c93 100644
--- a/dev-python/ddt/ddt-1.1.1.ebuild
+++ b/dev-python/ddt/ddt-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ddt/ddt-1.2.2.ebuild b/dev-python/ddt/ddt-1.2.2.ebuild
index b3e404bebdea..5b8175e76031 100644
--- a/dev-python/ddt/ddt-1.2.2.ebuild
+++ b/dev-python/ddt/ddt-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index d3ebb87078ba..a8805c802ebd 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,3 +1,3 @@
 DIST debtcollector-1.21.0.tar.gz 28472 BLAKE2B a7c4a2d41ff6df1df1bfc2b775d888c1f9839ddb76bc80ff6b9bb9d1fb8e14eb225006021a0889d2a49c317c48f65cec024ff1d3c4e9c9bee1c0139a7cd1fc71 SHA512 a5a4f66a4d65134e84164de6953d4c6d5b2b9d36974055d26263b6d8505c4a131d693c371287ccd9c76220a9b59d6c3d1f0015db1d0f2bd8eafcb79c0bef0822
-EBUILD debtcollector-1.21.0.ebuild 1501 BLAKE2B 2c1080a607fe180fcfbfa0f5df38a6430b16b89bb174d0f177db854a44791fda029cb0d41242fdfa20e119f5dbaea88a91811bb48633274cf9061ebe0160c02e SHA512 bb5a12dae184077bf357e315d37651d33cab6f3aac2477960fc9c537072e9a42cd188f2b42c93ba234a33b63c459bd85e384a8e93ea6fb4114f1c107f6684fa3
+EBUILD debtcollector-1.21.0.ebuild 1499 BLAKE2B dda0827dd2858c0601ad708eedf2f23d64c1270eb7b7b4a24b3b346a4bb3003555dbd4e84e3ced3561b0c14da84d9a2208f728755e21de607a6de23333764d2e SHA512 294d05cdc61659d0b4c444e81c7a25056978d811694bfecdfe0c452368df83ff86152a21a0721d5aa4a9578ad20a4b67361faa53972d85eb776e39176e5c4c44
 MISC metadata.xml 330 BLAKE2B f67815c96ec5d1c50e57e80edcf471c38482eab644d201f4f1d4afa9a44941aa26cf5151d74ab2be666514454a3cb041cb1cf31ab22b4c4efe01a4a57ab5aa75 SHA512 b7a055d8cce134695b3443f4c361636ec4b6741080671b65b47cb7823384370caefb825ab3851cd8cb4852a696d2ded714087917cb565e381aac7ce53e537268
diff --git a/dev-python/debtcollector/debtcollector-1.21.0.ebuild b/dev-python/debtcollector/debtcollector-1.21.0.ebuild
index 6f77d8d2dbe3..1f91538f8b82 100644
--- a/dev-python/debtcollector/debtcollector-1.21.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.21.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 67a1c5c4234c..22a0071a91d7 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,7 +1,7 @@
 DIST decorator-4.3.2.tar.gz 34892 BLAKE2B 49485ec0ae25947b27dbc23c8f17194bf5b03778e7e43524e561c320487e1b6830a1ab39e9fba2a154e1cd00155af779965e497724f01d81d301a0ca979ba058 SHA512 87102e1b314086d008c48bf53f1061b28fdbd3ccd3d301773102fd43e3a4ce8b5ffeb9107fb5d5f47b7bd45c26e5b3b2913ea20745ffc9b274e2c0b24a69ef70
 DIST decorator-4.4.0.tar.gz 34559 BLAKE2B ed8cad0081ca47cef15f30d10afda1d19dd496f482a4621a1a349d0b5fa63d41ea4daee389d21b8b176be09949f8519c117a448003b2e8ee5f5c2d50d3015cac SHA512 32c35c80581cb7fd0b2461d21c7eb14190294b2ccc9f92749b6bc74449f7d02a26281e9a2817f6f16871a6cddb7b02b8fae8119c22256fe43a6aaa31a7599dd5
 DIST decorator-4.4.1.tar.gz 33350 BLAKE2B 75544aeb6dd995edc091515da70f4bfff8a12a02442b47c945d4ab18e90eb48647cdc86540de542ff3357cb2114eebdefead7edeeba25587a15fb1e7c87519c6 SHA512 12378702246b212d5fe0153dc97cafdb2afd4779c51fd224385e3c3562e1a1e3439574aa7c37c8521fe5f86a5f0b4d4b3075e0407cc249f8fa4b341e1ebe06e0
-EBUILD decorator-4.3.2.ebuild 701 BLAKE2B 8ce6978d9fc2d69bff93f2effcb0f44cfe0839ab7d31e9b130d93bda0ea63a736e036d0f6afff6ff3fce7ba2b4f37c8a311a4296a14e0b93f9413342cb6f1979 SHA512 0afc60a353077ae003be791145a43e15f494c45eab0004d1c0d55068ea9a4f082f9e5fdca6c276872f2f88e346c6d7a1995cedaca0e9efb8e1da8565d85a8952
-EBUILD decorator-4.4.0.ebuild 664 BLAKE2B 9fcd2f34a9d4aa78c7a9de85dc3a9efd19e853fb98693fea00d6076f13f790e9b493ab4778a9696b2f846fc9022e868488bff893227495162e967ffd1c0f756a SHA512 6eec12d7018f3f2bd8ae23f2c5fffae04c74bc7ba96be81836acb677504d477981e80aa8d6298c98dd48016995ac3ae9186a237dbd64e99b52ff1239e309d166
-EBUILD decorator-4.4.1.ebuild 652 BLAKE2B 9406d799be011412a792498119ee4f391a499deb1dac789cb75ee444e952050dbd3c1457cc8578957c579aa74eb0f8d14e947b00462e35d1f2feff5e03997f36 SHA512 887b14eecd90b61232823559817edea005709a93ddc7a95418159088833e4524b26c64be778532d4a94f705244ca750b7cf2487379c57c35dafebb7b4900f873
+EBUILD decorator-4.3.2.ebuild 696 BLAKE2B e845b21309eb6d40fe35ab98db655647e22908f84ac4d278d6138e1d43f2f94dc053a759c5806eb2710f53ad7dfa1216706890fcb33423014839399fbf8d772c SHA512 ac07c624c1eb85c4e90dc691cd7f2891466c8592f95d78da2a5ba0da8f86581d3a0cf149521493616fe3e67ff5adbd79b4a09bde99d86fe32b1d6154ff364056
+EBUILD decorator-4.4.0.ebuild 659 BLAKE2B 7e48cb9e9b81dd433cd25dafd3422395923cf6f8598d6b51ac7e53e13532bc128f754bc3b44e0a4caa9a88473bef625cc8793e6978e5368a9d0241f9db2f9e14 SHA512 b3d654e90940e4433fd6b1b8dddd2fbbe9b47aa37280d71120cb7e78fa4903c1a98df2f9f863a6593a42bcf5c8a2f769b3e57a0dd13aca1f1fb9f8048e481515
+EBUILD decorator-4.4.1.ebuild 647 BLAKE2B 62024ec39ca7030ff3e13dce570af6331d467222c54fc1f4cc35b53b6a5276fb56d58a847801a39ed1c7744cdb525aee00ef63e55953f94ce09432bee8e04450 SHA512 bf502ded9142aa27b8db5644baa02a4f085b52a05cfb90472ce79933b804f35104d6dde51305642f6930a4be87bf57cbbed48ea3d76474f14a5606add7763426
 MISC metadata.xml 731 BLAKE2B 9dcc846096fd68b11b1af0259b9707ca288b962a871c50b1701dba0e00011db27d3bc17970310b57b70301a51f083d41a3f6659ced9a7c34e48caaa60333af25 SHA512 6df81157bc757c8a8218fd75a28165cb8349d5a17a320db78582311d614a4fd586cf928e4d1c2158d8fa96cbc6537e26d85524839b688e82b29e5d7997819219
diff --git a/dev-python/decorator/decorator-4.3.2.ebuild b/dev-python/decorator/decorator-4.3.2.ebuild
index 337653168201..92f2c7e3c24a 100644
--- a/dev-python/decorator/decorator-4.3.2.ebuild
+++ b/dev-python/decorator/decorator-4.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/decorator/decorator-4.4.0.ebuild b/dev-python/decorator/decorator-4.4.0.ebuild
index aab9db8591c6..d5f6d4d751f4 100644
--- a/dev-python/decorator/decorator-4.4.0.ebuild
+++ b/dev-python/decorator/decorator-4.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/decorator/decorator-4.4.1.ebuild b/dev-python/decorator/decorator-4.4.1.ebuild
index c7eead64caa6..ffcb5a9cbd35 100644
--- a/dev-python/decorator/decorator-4.4.1.ebuild
+++ b/dev-python/decorator/decorator-4.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/decoratortools/Manifest b/dev-python/decoratortools/Manifest
index a1dec1aba7fb..7a8cdab0eab9 100644
--- a/dev-python/decoratortools/Manifest
+++ b/dev-python/decoratortools/Manifest
@@ -1,3 +1,3 @@
 DIST DecoratorTools-1.8.zip 29566 BLAKE2B 878abdcee14f4b7a99554655dc3b5003ba49911893230dee51da54f38e78582cbfc6f0a53b7a19aae1abb85474dd6c85b824ac69f60add756c5a36c2563755a8 SHA512 b107b61d76c1c41ebe4f663d42fff3ecf184364fa46c234a8ad9df0d626bdd113c7527c6e1d97fc2d38c0fc76ff43dbe0190fc1297240c44d9ba490b11f6fa51
-EBUILD decoratortools-1.8-r1.ebuild 822 BLAKE2B 8cf75908eb2d9b6d968f0e8cfef3a95a0a435022b30eaa0bb601699648f0514f916b5aee93bd8a0832b2b0842859e05229b8cd8045d6e940a99b9f00e357c47e SHA512 75285ab72df51d8bca8bd60f306407432ae7950d29506c7dd18f80de3a84ef0ff174aaaac5b72a9f516a791db48ca0d9c2b2379ba56f7875d0f1bba617cf0287
+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
index c938c40e6c26..91487d35a326 100644
--- a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
+++ b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/deform/Manifest b/dev-python/deform/Manifest
index 8fa54e17be06..1d74f285e116 100644
--- a/dev-python/deform/Manifest
+++ b/dev-python/deform/Manifest
@@ -1,3 +1,3 @@
 DIST deform-0.9.9.tar.gz 1336829 BLAKE2B 45ef40587e308f889ab8088abea51756291289c44d2ccbc63cafffea57d885360ef750860f95436a3e6d1b4f16ba67e8ebac69ff8281466227655a51a813c00b SHA512 f0f615415696adba8add8f37c7ab8b8d213ec6d1eb68e2322961cef46df9e381b2368515b524d71eed110a33aa8a7f0aee8302e39b4d6a8871a0eb78108aca11
-EBUILD deform-0.9.9.ebuild 1280 BLAKE2B a1d8fb0db9c297a111b715b2bddc0478222a9be4e0cdf309b25b61257c49f4bb70225eb4327518f7a968ca90f64ef495226bc2475b1b8c27e0852d500e5cd115 SHA512 74cf41545a1471d54c12d83fb6d4829d69940695a55017d0c0cd9d0c5a376d35e86857d8079b99badbaf9894d8ad34d9b8915fd31825deebfe23390cdd085ddd
+EBUILD deform-0.9.9.ebuild 1265 BLAKE2B 30644225d6f3a96e61a7eaa314f7b10db2327aec647c036b7be024b530c8d2d9d636dc77580ca2d6b885cf635b488647e54c95b5fed8a6379848fb75764cde1d SHA512 d55eee36bbf535cdfb3ed2f9e8a98124abc32d7ddb83c1f9958ac8ef545868ee67739c620f5c5d739840286789f60b97f4b1fe2c89ec1f7ed141efedc99ad8dc
 MISC metadata.xml 374 BLAKE2B d9ac7238236780e9577a2e23b01f20b814b941966a023ba76c3aa441bb5e51e226297549855bf1a97ed5045e755df87fb753ef526c057cd6d53e89b6301e056b SHA512 0a4ba9e4f6072f1fb583028f4c4ae34598d9663c380c0ddac4fa7c497cf5d3b44ed8c761777c4f5467ff2c1baa393699f2bd36d15a3cf9cce9a35c2ef00734bf
diff --git a/dev-python/deform/deform-0.9.9.ebuild b/dev-python/deform/deform-0.9.9.ebuild
index 64f187924daf..156ec54b8cc4 100644
--- a/dev-python/deform/deform-0.9.9.ebuild
+++ b/dev-python/deform/deform-0.9.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Another form generation library"
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index c1fd30dc9ef8..41f031fa1d6f 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,3 +1,5 @@
 DIST defusedxml-0.5.0.tar.gz 60405 BLAKE2B bd57b3b705abff71ff99ce4e43fe4c1fd708463546cc5d614dceb56f36e98771ef5c952a1aae010d32e4b557ed687c194c61723a0b3334dc1b0d517591d7c3d3 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452
-EBUILD defusedxml-0.5.0.ebuild 755 BLAKE2B 5376aeb35680d5678fa19f44420a65a4689911c6d5fecd5c8e0df2e7f66989dd82a19414e8bee4b2bdbbcfaa06b970d6b7dc5dcfedf2aaaee3fb2436707ee392 SHA512 807bbb10c0aea163f53889fe6cf36e669b64893fe9e1820aa80949b1574d39a06fa3e0eb28ef15771a54883011ebfc3763107d3c4e7b80e561f67cbcff7880aa
+DIST defusedxml-0.6.0.tar.gz 62670 BLAKE2B 352202cd8157bcd18ecb06921eb086cfc91e567dbbb18592e526caa4fed69bc76842eda849813b829ef4389d3df74303529e7f775d56be2f919783fc7fb19b04 SHA512 dd1313802cf8565fd319ef10af04075019d00cba557e6414b2a2762bd4302437a32c05cd8c9e4cec5310c68c6a95d2951acf1360244e7974d40bb3fe963b7226
+EBUILD defusedxml-0.5.0.ebuild 748 BLAKE2B 01d4e3b4747422227816e9e61ca37e3d9b62d39d980a980726ad0acb722baaeecf1590578c845014d0ef9850eb174f16c6fa76ebad342bba02853bf71d4a67c7 SHA512 98974274931ed405eef9ccdf3665e3c8ab7ff00c27522b1c687273249856845a09b1a59695a679dc24bd3e376bfd1b05942f444e8df69aabe80cac18bdcea927
+EBUILD defusedxml-0.6.0.ebuild 719 BLAKE2B a229cbb1b4701d536842ef2f92113fd8c5a60970afd34784b6d9f022abfbbda210ef9e256b092eb0f69d395e0b1c7add2c094237b7d112e42e99b505d713a9c3 SHA512 cfda8d21184f5f1733582765a8937bd8d4932d186ad55095fd1527761f787c2bfea778c5fd935b18f21370221630420437bbdc84101ea3e141531967ae3790b4
 MISC metadata.xml 384 BLAKE2B 27ce5f8830ff4e0646f95d633cbaeb85576ec01fea3bb46d7b54d2be2acd6f154ccfe8455169d61014bce03e5434eb449c2876c53a77f64bf083559985531de7 SHA512 377bdeac0f80c45f6f6f3387182e75c47e8cd526f563a1ce5305119113b4a1c4a99dc3a76bc91d81a967498645c9a23dc2746b62023dd0dc26e8d55d15424b6c
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
index 8d0c0b8212ab..4de368eb4718 100644
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/defusedxml/defusedxml-0.6.0.ebuild b/dev-python/defusedxml/defusedxml-0.6.0.ebuild
new file mode 100644
index 000000000000..681a66d806c8
--- /dev/null
+++ b/dev-python/defusedxml/defusedxml-0.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
+HOMEPAGE="https://pypi.org/project/defusedxml/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	default
+
+	mv other examples || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples/
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/demjson/Manifest b/dev-python/demjson/Manifest
index 4fa6977bc11c..42aa2fa88aaa 100644
--- a/dev-python/demjson/Manifest
+++ b/dev-python/demjson/Manifest
@@ -1,3 +1,3 @@
 DIST demjson-2.2.4.tar.gz 131457 BLAKE2B 2bd38a922d68c1a415e7258d7e1cc8b852c703df5cfcd2dbffb3936fb5b93950f2af56c0a8eb961868c1e478520bf8fc33855ecc704cd5f95e6e5b310ddb3b3d SHA512 d8a1cde062d0b062bdae29b6d79ad69fb9cc185428718a0009ccbed544ed37bd354fbb86edadb56bd98183ac8636b2edae322ed19aa5f07a7b6df668c7aa0029
-EBUILD demjson-2.2.4.ebuild 791 BLAKE2B af3e7ddb265a096556a0912d4f1cb9af3d6331b96727c9d0b423bdcfd3207a0a7be4ea85dc21033ab5f24dbf0b79d4e0aa2c892cca8364d966f11abde5be479a SHA512 707de88f867e5d0029347eb0adf015df45dd8f46a06876643a712a2b41ec2743a2005c87d610ed61570e0786d4f09097f5c46cc52d959bf7fa165f00f9653803
+EBUILD demjson-2.2.4.ebuild 782 BLAKE2B 3121c28d3708cc5e5595ecdfa20ea42f599a818c0d630893274da4a74e2dbcbbb5f58d6067ae245deff73b76d2febafd71a506d62b9ec330d6a6bd04163d4f38 SHA512 f4dee5fbe15bec328fcfe24f0906d346ab3bc914355c265183d4010884777d36b289f02984db483b972a1730242df49bf2228ccf97554f3f9974a01cf64fcf71
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/demjson/demjson-2.2.4.ebuild b/dev-python/demjson/demjson-2.2.4.ebuild
index 45f254647785..c6079a8834b6 100644
--- a/dev-python/demjson/demjson-2.2.4.ebuild
+++ b/dev-python/demjson/demjson-2.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 329e47cfe593..f0a014e044fc 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
 DIST denonavr-0.7.10.tar.gz 62877 BLAKE2B 0b011f187f8952af81669d3568d5c6ae5584ce6b106ca769609711883bf62f7d4b7a605bc12e8cfac8f1a1e9622e7b37cc17be0545bbd24898b0a6f882f7adac SHA512 62b8a1f61f0fcf5c7d13b473d990a562e3fddf777b077bf5f9a0d7c24f9bc76810917421653dbbedd292b659e6c0ef7e1c303a5f152cf9d7aee2039d47702314
 DIST denonavr-0.7.9.tar.gz 62838 BLAKE2B 59a036a1b2fdd48731741180b143f69d0fc78e30cfafb88c675eb4a30b079eb3955b1e2f76306809d183d10a9583dbb500962cbae352203c570861687c58b539 SHA512 2c9cd25bd38d9128602b0bf009d3d147059d712a3ead99514a257e71ea2a1c97d94c151d42840dcff55ababffce53a23fab33759cf7bbc8bb786fefb91dbe362
-EBUILD denonavr-0.7.10.ebuild 768 BLAKE2B 7a97611dab76d87adef1dbfbc4a866f99664cab01991b58a62d9f37ebc098579443cadba4664b26f756e11458eddecf57aec9e5d686060a95833a4b14610cc07 SHA512 9a2b14c3514f98ac8f3c57b075138e7f4adb04b30a580a4ac23fcfa6dd2d5b2167ea772ae474a410e09bf1c1afa578acedf7230df1a13cedcf25dd296fa1add2
-EBUILD denonavr-0.7.9.ebuild 768 BLAKE2B 7a97611dab76d87adef1dbfbc4a866f99664cab01991b58a62d9f37ebc098579443cadba4664b26f756e11458eddecf57aec9e5d686060a95833a4b14610cc07 SHA512 9a2b14c3514f98ac8f3c57b075138e7f4adb04b30a580a4ac23fcfa6dd2d5b2167ea772ae474a410e09bf1c1afa578acedf7230df1a13cedcf25dd296fa1add2
+EBUILD denonavr-0.7.10.ebuild 766 BLAKE2B ef73989120429123e111242eaf9ec91f21f7b3d9d5a0642655f3d53f03ffa7c64acf3b4414de0c812555ce106b560065f28b93f54746a739e16fab20086172e2 SHA512 c82090f5c7ce83cebad8ffdf194bf7b25c8fa5226a0c178ebd071d796ac8ad229ee0e92a2a6eede01063140f329f16bcf1e34783624377f6153b8860edb3d552
+EBUILD denonavr-0.7.9.ebuild 766 BLAKE2B ef73989120429123e111242eaf9ec91f21f7b3d9d5a0642655f3d53f03ffa7c64acf3b4414de0c812555ce106b560065f28b93f54746a739e16fab20086172e2 SHA512 c82090f5c7ce83cebad8ffdf194bf7b25c8fa5226a0c178ebd071d796ac8ad229ee0e92a2a6eede01063140f329f16bcf1e34783624377f6153b8860edb3d552
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.7.10.ebuild b/dev-python/denonavr/denonavr-0.7.10.ebuild
index e0d6e3b36457..c181baaf4bb2 100644
--- a/dev-python/denonavr/denonavr-0.7.10.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/denonavr/denonavr-0.7.9.ebuild b/dev-python/denonavr/denonavr-0.7.9.ebuild
index e0d6e3b36457..c181baaf4bb2 100644
--- a/dev-python/denonavr/denonavr-0.7.9.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 4c83a84bf1e3..e9287b15a3a9 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,5 +1,5 @@
 DIST deprecated-1.2.6.gh.tar.gz 5043633 BLAKE2B cc72838dc772db62ca75637268d09cbab4c9acb84b42bd1d2d76397d43b81781cfcef075a9a6e6ca2ab55eda19acae95cdfbdd820c1363e7ea4841fb1cb61b7b SHA512 fcef322c6d9c317081dae365d469d4b26b0d23d8290e7aa0ca18592fb098ae7f535cb5e898cc81e5c734e7e211c847cdd9d5430c1999a4b9612f30934243ee9e
 DIST deprecated-1.2.7.gh.tar.gz 5044697 BLAKE2B 5e295ce21a3e536e08b6e57d78d3682b31e9041f4c53d97c06af03f8272a5b729c892449210471b80500ce499fe9e6af22df8ac0aeec5ac774fd74590ebdfc3b SHA512 da99a22410fdcc2a96cb5b15c489971078ce34e251406ae3dce6b3f97e284a4f09aaf1c5702407abe85a94cb6c8d9237f373a3096d6182e4a9cd1990be2817f1
-EBUILD deprecated-1.2.6.ebuild 681 BLAKE2B 5e0fe484c5d35ad867e3aa52dbc893f82f9dc5a32e804dcd0886b4621be15936288f09ddb1ccdd0f97a7a0e88da540a7b653543f65b09562add67e822a8ac4bd SHA512 bc167eca3a8f890c467b0e4f1a38d382ad3e1ff51ae9c93c575d11d892c6c56bb35336a6899b6aee2cebc79de45fce48579a519d470899bff6ea594cc5fbbdbd
-EBUILD deprecated-1.2.7.ebuild 545 BLAKE2B 014398f08ed8e20520de6f13149719dd0feccf5dad97c14a764f261e8773721eafe506070ccd5a73d6cefb3daa720a1b8aa52bf53567551e17e33cafc280477c SHA512 7fb1908a5986fb4c18ae901664d498ef7358cdb27e87ae4bd739eddf512ba307386c16ce072f017c6ccd322a2975c4b30c915e423b4619f7ef133e3d077184fd
-MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
+EBUILD deprecated-1.2.6.ebuild 684 BLAKE2B babb5aa8d2f5e13fc92a01290690a62565de357489a6f1f91856ae3d752a944885abfbda0c603cd8ea017faa175d345996adf08c5b88469c8a1a52d036fa36da SHA512 33bc411b81ab96f6046e6ee6d10076b021e14cbdcf54e14c9007cc2a4b968a99fc2dbdb130f65ab5569e35c2ccc7309492c08123bcfce58b14f297d337ab06c5
+EBUILD deprecated-1.2.7.ebuild 546 BLAKE2B 4209fb53716e6c29dd1f4164409f749b882ddad7fa5854d45167984b501fbb5459309a8ed32794bcdde0fb6bddb8608dad94e036c18c4fb6cae6e5e8eab58b38 SHA512 789c25d9d32ae506591b4a305f3592214af09f2af74f9ead7f03e8a914e379a44b61af9ac7b5a10ab6415e4cdaafc4b74657e967a491ff4180d58fa790a95e70
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/deprecated/deprecated-1.2.6.ebuild b/dev-python/deprecated/deprecated-1.2.6.ebuild
index eccff652e55b..28c8ff5ffb19 100644
--- a/dev-python/deprecated/deprecated-1.2.6.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="Python @deprecated decorator to deprecate old API"
diff --git a/dev-python/deprecated/deprecated-1.2.7.ebuild b/dev-python/deprecated/deprecated-1.2.7.ebuild
index b42bdd730040..1c28971d7adf 100644
--- a/dev-python/deprecated/deprecated-1.2.7.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="Python @deprecated decorator to deprecate old API"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/deprecated/metadata.xml b/dev-python/deprecated/metadata.xml
index 22e0d6d87f61..266e3f19ca59 100644
--- a/dev-python/deprecated/metadata.xml
+++ b/dev-python/deprecated/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index 586ee8bc5e2a..aa2d6f5d6dfb 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,7 +1,7 @@
 DIST deprecation-1.0.1.tar.gz 9596 BLAKE2B afc4cb457ce224f120d41944e6eb71c212ef4d40d5a7c5d6d695d31bd105a4a5291daf5d3c7af0f94b58049f7e745e7e5be462495de88c48cabf5a28c22b3637 SHA512 fc35e6516e1617e2baad598a91e5d83ca95ab8a2d6a2753751d6752675de93cb44210109450a2aad9eb52b3c772a8b753c1d42ab2356c6663d2a03c4f779f086
 DIST deprecation-2.0.6.tar.gz 13381 BLAKE2B 1f21a4b8bd9293d50e9068762d4f909afe02fb1f7a8f352c5b3d5d10e0da90d122927a97cf060bec626ff8538478f83740dc1d79e050fe43dc27ade8729f26d1 SHA512 69dcf5e07cfc1c746564e03063088cce65690e2b34cffe327d59edad24f00d23cf9904089ab9ff5e67dce2b6b02ed617e53959be4a907074440ddb778576aa2f
 DIST deprecation-2.0.7.tar.gz 17077 BLAKE2B da3fb5db53f281c29e2af40335ef4038e37d133563b85d0ea795a314fd9f2d725a98c100aca338dc9ebe60bb1000476e0debcfdc9c4583108004df207cb36747 SHA512 4412e2e95f4aa4b3d5598346a6649c8d945d7401ac2d0fba3b6f6eef567403c8454ebe537e8de646903cd0c2308f48ecb949dae3015ba7617edd2fa3a26ed429
-EBUILD deprecation-1.0.1.ebuild 467 BLAKE2B 223c9caae66c8830dd03170bce2a31e0afe98af0d2801efa9aff54479c93853cdf1df2e66cb71b6dcfdcf57849e2a3e8690438cdb26e4493f8cdd3806411d006 SHA512 5f90ee69bf623a018861dc4f21b26112eb84ec9613c402fe286a35b4f15f6e3e5d2ee502ec97e6590537e0e384a4e896fba64c377a28399e431eb8165c896dea
-EBUILD deprecation-2.0.6.ebuild 705 BLAKE2B a3c02ababd046470996453b377c78e928ae0cf3d5ad7548fbe41b48e9ff1e74450aea29bfa007d4c56d2c82e7db2acbf852f576ab974c0c5bd201678af951701 SHA512 ba1fda4a0700e9281e83c48f87b5ae42ce2bd560d37de0f57563825ed52200bf1aecfb4e24ef9b74d057f391f0c93d14b6429f0e9d9f0b42d3f8a2d730b9bb0e
-EBUILD deprecation-2.0.7.ebuild 1002 BLAKE2B a9f0c802918c600221d89798ce4d63095e35e2208e4227e3c73998528220760053e06fbcdfaa31b6148c8121a599f03c039ee032694a66dd93621952740a108e SHA512 0238461666ca6f76aa2a0a1e002752f18f4047197e0005b1ab383462a019bf7d8ff2226b01114e2fd2c52b048169dfa7b6c66f341fae0d5c3e150c0a3e638be6
+EBUILD deprecation-1.0.1.ebuild 457 BLAKE2B b2acfa21d69bed5a03848d6c85c604c8efecfb1adba98739b6d89e7f7bd96eab87e3dbefeff2cbfee2b1216f649f40286e068b429f78be6d86dc52a1c4628533 SHA512 ec9d1821e8f3dc00658cd6fdf39c7239e887b7e0fbca34ae01a826cfd12ae9e05899b5a3e99a7b169aec38134d9d69d93818e6f502304570d3650a6f44ac5e1a
+EBUILD deprecation-2.0.6.ebuild 700 BLAKE2B 794546d2226b8b47fd3550f7d01c5b3e84991730fbae31247c85eba947feb3cead1197fc377345758889e20b05b10bdac9c58d7b41a7196897014fdd82aa3119 SHA512 ae9e0209678c9de665ec9a32c0615f07f14a3185bc498ed8f0110e2b179c644f2c36dcf435873b726b14b3b8e40ba4212dfe954a0daa39535702e69a8f2a67ab
+EBUILD deprecation-2.0.7.ebuild 997 BLAKE2B d532701e8ed512b9ab9fc3ac2b88aca720a459d4dd72ed0b770ce36138ac0a9c3f4fa5a8e807f099f7f93becd83e269c9bdbec4f388561723a577efcf30a4b6d SHA512 25eb21953bd622ef5cb3679ba6635d658ea4705a34d9593d39a44ad65fa6313a4e4276b1dd45e4736c915a1a99cbbb24c6ef13604ab68f8f1440dc1ee209e838
 MISC metadata.xml 635 BLAKE2B 5f363fe7d6dfea7c8e2a2d250134dab625e1b349be4f12c7438adeb6bd81ee1332762259b38a9460ad6de845152151e272a8454aeef86ad8994a0f755a8db89e SHA512 6878bae4d120e4d0db92023f5fbae1eba8a056515fe2746f34fcbc931d6cae8ca0c0d972eb91a571ad462fa140bcee15b6401dbbb96af09eadffb147ec3a826a
diff --git a/dev-python/deprecation/deprecation-1.0.1.ebuild b/dev-python/deprecation/deprecation-1.0.1.ebuild
index 5c92e71bc836..823f76d0e981 100644
--- a/dev-python/deprecation/deprecation-1.0.1.ebuild
+++ b/dev-python/deprecation/deprecation-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A library to handle automated deprecations"
diff --git a/dev-python/deprecation/deprecation-2.0.6.ebuild b/dev-python/deprecation/deprecation-2.0.6.ebuild
index aaf9394dc847..18e20d00af4d 100644
--- a/dev-python/deprecation/deprecation-2.0.6.ebuild
+++ b/dev-python/deprecation/deprecation-2.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/deprecation/deprecation-2.0.7.ebuild b/dev-python/deprecation/deprecation-2.0.7.ebuild
index 1bb27c7c37d9..a3979c046d27 100644
--- a/dev-python/deprecation/deprecation-2.0.7.ebuild
+++ b/dev-python/deprecation/deprecation-2.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dexml/Manifest b/dev-python/dexml/Manifest
index 49df79e86b66..66f39b102e9e 100644
--- a/dev-python/dexml/Manifest
+++ b/dev-python/dexml/Manifest
@@ -1,3 +1,3 @@
 DIST dexml-0.5.1.tar.gz 24359 BLAKE2B 98f315a331fc1d2b69250a088bc491d6e425106dea0025a26c044951b164f61880cd772a88eaee688ccb550050981c5fe489dd9e8d74bda2c351e183b15bb5e9 SHA512 b8ac2b9f875ac7cf699eb9ee17adb8678ed8d4a796130bbb60f05431207adb68f490b7a7a41600acbc16a3cc08d55f22d91a13e53fe3d835a322709ee3446c9f
-EBUILD dexml-0.5.1.ebuild 595 BLAKE2B 4be371252e2bacad23319b3a382b77dae6eb57c8b53f9045c7e8316f1001f83381958b833ff4e40e6faeb7d80a29858c0c23d6691173acb1520c4a81dacb712f SHA512 68535b3d174c92618b9c6bdaa610b358474aa30d40fcce7221b6ba7b3f9521e094e4281019e5caf45e03b0cf1c5e00768defa787d514f31c8c7cabf03700112f
+EBUILD dexml-0.5.1.ebuild 586 BLAKE2B 3c7c8501ad7b00686a2d57a2597d524f8f7d4ec16655c3f2a8998f61e2e43492c9588dbe709c3d9d8dcbe0080c2ca9e560562fc6578dbeb7adc2b48ce304834d SHA512 7a3fb3126ebcd5bc49c86980e38f17a16ad4777d1c268e34c4b2f3c362b559417789fead779689e302ee7509e2aad9c1a545f8c1aa06dfa6cacc8b806d018d32
 MISC metadata.xml 482 BLAKE2B 723601ff5198bd9c34e3e4500e49ea082618c341e217d1fe845123d38b80992620d0e3c1a4c113bd25a2105f7dd12b865f0a9f1201886a954ea43c66b743755d SHA512 ab731eeb859d2eda21fc492a4c63c39001e49011e6d2b9fa661aa2b1b3a03874d0219b81e614ef371a42b6695847376c6880b349bb40862d3e23f6646be0096a
diff --git a/dev-python/dexml/dexml-0.5.1.ebuild b/dev-python/dexml/dexml-0.5.1.ebuild
index 63b86b04026e..52ba616d513a 100644
--- a/dev-python/dexml/dexml-0.5.1.ebuild
+++ b/dev-python/dexml/dexml-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/dib-utils/Manifest b/dev-python/dib-utils/Manifest
deleted file mode 100644
index ce3a5a6870d6..000000000000
--- a/dev-python/dib-utils/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST dib-utils-0.0.10.tar.gz 9146 BLAKE2B 58ad9bb90c6480e645602f7f30ca467de7554599283f0ebca3bd5b04126829c06c1c64d0e3d80589a2e01ab9b6464a9ac072dc3256139da1f974b31abae59ce3 SHA512 7a73748ebea78f93136518fe599fcb10a27d8c9c432398fee7fd87a93207bc18154547f9af4f85c7c04d684d13c777f1a2da0287b0f3195303866fd541a18d68
-DIST dib-utils-0.0.8.tar.gz 7764 BLAKE2B 791fdb61b813d971a7c48ba6c503989cc4d7217772036e6770e0310c2340f5725bf8df0c3db768c5016721f7df81a2498a7c4ff8086ed8663c2aca5b395ada30 SHA512 a639a142156027ebe6ca9d5fba6458175b2db37dae14f8cde75d9c32c1903e5774a9cf69d1c251af17ce1c98a4ff28238a8abe75c32956b9605b23ff327f980c
-EBUILD dib-utils-0.0.10.ebuild 564 BLAKE2B bf2aff519cec21f5b0b8685765643e3eecefc8ae92ea44b9daf828014a414b6c9c1fa300ad5769f562dd7462efaad98182e62eb531a30e2fc126362ca6ccd0e2 SHA512 f5481f80ffb47f019f654dac8f72abbe81fa325e8fe8c57c60f3ba4fbc91b23bdb2b948840a3c5c6a6772b78cd532535c9f62833d8817a974580295738c5e490
-EBUILD dib-utils-0.0.8.ebuild 566 BLAKE2B 29174063c0bbfe9d8e1295ab5198ec8abaea388b7e6e1578a8c1c7b2e5e3d2c2cdf425ee384a890cd3674e0141168e4c9a0f4a440c57e8e5cbb4482fcb9f48d3 SHA512 29f9ed47df2756949aaf2098cb287c36496dd373a136e74faaddf3b7b62a65999517037f651ea6bdf4b4e25405456c673536dc021250467647952df5089bb1cf
-MISC metadata.xml 666 BLAKE2B 4429be344007e9d14cc3057b86f1a644ecbba2fc6e9a4a31df08e8b3d1f854a2f578a4381ceee56919c379e76d0809676fd6202428fd32c293f26c06ad430120 SHA512 3905d6028d0b680ddbb63b50491bf57a693b8b4a2473cc3204d87234a23fbe9a4c6c34a6a4811201ecfc2114b99406f7a745f57793ac4bd830aff6b6c30234e1
diff --git a/dev-python/dib-utils/dib-utils-0.0.10.ebuild b/dev-python/dib-utils/dib-utils-0.0.10.ebuild
deleted file mode 100644
index 3d036390f017..000000000000
--- a/dev-python/dib-utils/dib-utils-0.0.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Standalone tools related to diskimage-builder."
-HOMEPAGE="https://git.openstack.org/cgit/openstack/dib-utils"
-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-1.6[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}"
diff --git a/dev-python/dib-utils/dib-utils-0.0.8.ebuild b/dev-python/dib-utils/dib-utils-0.0.8.ebuild
deleted file mode 100644
index 3fb0870f6427..000000000000
--- a/dev-python/dib-utils/dib-utils-0.0.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Standalone tools related to diskimage-builder."
-HOMEPAGE="https://git.openstack.org/cgit/openstack/dib-utils"
-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-1.6[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}"
diff --git a/dev-python/dib-utils/metadata.xml b/dev-python/dib-utils/metadata.xml
deleted file mode 100644
index f1ec9a48bdd3..000000000000
--- a/dev-python/dib-utils/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>openstack@gentoo.org</email>
-		<name>Openstack</name>
-	</maintainer>
-	<longdescription lang="en">
-		These tools were originally part of the
-		diskimage-builder project, but they have
-		uses outside of that project as well.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">dib-utils</remote-id>
-		<remote-id type="github">openstack/dib-utils</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
index c6b3f026f323..6823c3b98d1d 100644
--- a/dev-python/dicttoxml/Manifest
+++ b/dev-python/dicttoxml/Manifest
@@ -1,3 +1,3 @@
 DIST dicttoxml-1.7.4.tar.gz 18190 BLAKE2B e8fd4974cbd9e83b72c25f28fa5595421be88ed5fbb1e64721280c4ead3003f95c98c7b4f12bced926f0c4af31b30dd76ddd49ddf297fa5f68eeb466d042ede6 SHA512 91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf
-EBUILD dicttoxml-1.7.4.ebuild 449 BLAKE2B d8fd29f7062f8b7e899d8bb68cd322bd0a9edda921c787456c5fe25bfb211cfffce3d0d8055786a677e0b12bc1ce5d9699517a490f6ae42146f6d5a416e25089 SHA512 60aba9986af10c15527f5feea96764193ed84e40101a4ef51d6aec87e5411f9d4edcb419cf130f82a9b269bce0b41f467973adddcc90fba0dc8746559c5a0cb4
+EBUILD dicttoxml-1.7.4.ebuild 445 BLAKE2B 0bf22cdd151bba10259170c20891e2053d29463cbf6445a88ed4e2f39dab464c220f569355c3cd7c5ab25c7cf185b582b2d6291b6bb9fee8324a5181d1e4ab81 SHA512 37a5fb21d92f41e72d9cdbf057d0f7d90603a1a5de76d77d84420bea39352e84070923e68065f47f4130b9ef61534c36592158e55b46f1fefc0b79ecb449e522
 MISC metadata.xml 503 BLAKE2B 6669e69ea7d5afa8edb064e78652a4b035f19dd786aa8eb531ed2cbdc4274a884330e7159b9a3ed051a28a0be531237bc88fe893961e5b59fec738a6d902a0c9 SHA512 3bf0c6926f48f42ce8e81c3111a625f43d043af1a95fc74eeb2463f789a2226591cea81b5f1ec1f4c12bbf365f3002f5f652f2dc7ce0ae2bf26bee1eceef75b3
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
index b4cd29bc1652..78d47ad9bf8b 100644
--- a/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/diff-cover/Manifest b/dev-python/diff-cover/Manifest
index da955534e819..dca17192c961 100644
--- a/dev-python/diff-cover/Manifest
+++ b/dev-python/diff-cover/Manifest
@@ -1,5 +1,5 @@
 DIST diff-cover-1.0.4.tar.gz 73907 BLAKE2B 81562c30533739f950e52703ce235b214f66932f806a47b1ab245b69bba8ef46d4333924ddf2ba4ca6b70a7df85ae071805a4fac7181711495f46540c4a20301 SHA512 aa5646c5d097e2b3ace5807bde007c9d8ebcf99578dee2aff1174aaafbdb9777c4794a8e9ddd4dc6edb5af7f1afc812fce4410db87d0bab4159f044489eabb5b
 DIST diff-cover-2.3.0.tar.gz 76738 BLAKE2B 467d8ed3cb2f4b0f76ad6b1928a87ad6f75ce46e555c061e30b56fc4856089fb270670ad9f704b9dc407e5c6cab2cf881696bd263befafbe3863bcda4ccd4ac2 SHA512 c47d64e1695596ba1244d687cdbbd6edf391b0c4a18b2550004bcfc36ce8798ef9e6a059e726e52eff45251b3bb27cca873be493c37b3b7eab9dec02f99953f6
-EBUILD diff-cover-1.0.4.ebuild 1039 BLAKE2B 3177e8f9381bd12d818befbbfe22d074dd1a99bdfd17c29dd09e56797f0f83a39107da1d21428325a32bf8929d1b2655db7838d3b27dc214cc79a16f3dc1a9b0 SHA512 6091446254f177768f0d04ebac7f5d754435965b0bcae732f946bd7f624275766066b08e78b440bd76410c508d070aa5cf074e4449f0a79c6b936a42b5e7d174
-EBUILD diff-cover-2.3.0.ebuild 1323 BLAKE2B 34db5fe4ccc7fd623d02e1428eb2de0560bd546391f27d84cb0a400d260fab82306901e11b43bd06a04bd6f1614cf2f6b87a42946a61cca850282884a78278c3 SHA512 d2ddf235db1dc0d11b7e1f79ee2fed4a55e098ce8f937fe9a55bf0911adce4627b84a08c5cff8062f783f9fbb83769035f6c975359c4abd5b792ef28fc9f6ac8
+EBUILD diff-cover-1.0.4.ebuild 1029 BLAKE2B ea4c2d28fdd8bbf15090da4904735692ee7b3390eccf28009dcf2590f7594cd4b48cf5cbc62745469e55281c799a95687c0ff5bfde083775b7624359b85e91ec SHA512 d9200b6fb1914105679ab7af2270ee6af0627ec17cd2e53cb54d63139a435199dc7b638c03a7fb0003acd9dfc8ab3827fdd51b786c57661125818165097c4bf2
+EBUILD diff-cover-2.3.0.ebuild 1315 BLAKE2B 7043633b79b17ef9934f5edaf8f1244fc194b1073a29a5de8176f11522c97294193c734334865653775b1838b3882487cf343517678fb0260b986c494cc413bf SHA512 89493f0165b5683856ba0a23fe109a8195afad718310f96912f23cf1015ceac9b74fe41f728e614e75575960bdbc76cc6378664e42e61b3706abd1590af6ea9c
 MISC metadata.xml 380 BLAKE2B b3fee2fecc0de95a5056955412d4f069a57a405a887966c1511c4c63f6c2c77778ace33d439fd37c6b5db62c247fa7fcd71c15f6cc8a97de46e72a841aaa9514 SHA512 80581412380ac1b87077d5e1c74596434ae398bc9b654c5492db7ce60270e9ad40c0e13b5c95a11cae57bef6b2a1dfa8888f8061a2ff221acdfc30c21e57242e
diff --git a/dev-python/diff-cover/diff-cover-1.0.4.ebuild b/dev-python/diff-cover/diff-cover-1.0.4.ebuild
index 9049ca86efa4..b9312ed98bca 100644
--- a/dev-python/diff-cover/diff-cover-1.0.4.ebuild
+++ b/dev-python/diff-cover/diff-cover-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/diff-cover/diff-cover-2.3.0.ebuild b/dev-python/diff-cover/diff-cover-2.3.0.ebuild
index b16f1d1cad99..c8b17359bb26 100644
--- a/dev-python/diff-cover/diff-cover-2.3.0.ebuild
+++ b/dev-python/diff-cover/diff-cover-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index c5e5b2d71bec..0bb64fa45980 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -1,3 +1,5 @@
 DIST diff-match-patch-20121119.tar.gz 54113 BLAKE2B 0fcfa46f02f92af0e31ded7c51c651574104fb4d7d70082873981138579b12231dea0eee417614981a96f7ceaa50b288fefdbc21dca687451095dcdc34fe32f8 SHA512 3daff80a6043a0413c515125a21839d9fa1d71f7e2441f4870ebefed35f1accea711814ad231c65de0e3468bbd01402c977fc063ab120b7d9f0e04ef555a8207
-EBUILD diff-match-patch-20121119.ebuild 524 BLAKE2B 8d1774ac42b80fdfac0b4a6cf6a6fa45b5636ab5664b23268b32912e64cd888f1bfb9821394c7c1c2c328e0818e94442829ab562755ed9586c0b6341bbb60996 SHA512 d6851d0c61615fc6dd03d24a8efba622df4c5d80c5866b5e8b3556ee7e03597012fd62e9675b8a605ed738fd6cf9bd7e1cfbd2e9970cf9bda16cb772150baba8
+DIST diff-match-patch-20181111.tar.gz 58554 BLAKE2B 2a74294bb9ac88447cdea794a9c3b44d705d93f7e0777d5e5ece4a306f43df47458a4ba0ec8b16624862a6e4540a605695c3a83ee7dad7749b22210ebe65705a SHA512 9b21726b9c0e350553533c14dd86cca823c6f98ab642e7166cf9348952a57b62bcb0576e3d6a3b76655ea1bcc8cef3fe7f33ffb068b5a4bfb4b4b521042484e6
+EBUILD diff-match-patch-20121119.ebuild 517 BLAKE2B 1d085c40585fcee7df0a9032d064a20994f1e621c133c7a65514d13121979d232653a2ba8ded614610a9e43970c9c5857040c8b7fc752ee123397df85c1e4441 SHA512 718bc146fde16a05e39c3db70866050eb7e3eaf8888882f3d05266b4f6b6fa1db446f39f12786532042db9aba2277172f6bff60878e6ee1d40722f064b0a5916
+EBUILD diff-match-patch-20181111.ebuild 429 BLAKE2B f6a44d663fd3c4489ce887c417bdfc4df3cd2208367dc325d21879cc443b1eed713ec4d0ed053462b5b655de8f2eddbee855b065ed2a9fc8d6c463d035c90da9 SHA512 bef81d3ff72add918b7d54c51fb5c36903154f7a4a536d34dc0b17558f3831dfd2a39b6112e94d69b771659d1f9406ca54198cf34df364459f836603c2ec20e1
 MISC metadata.xml 1275 BLAKE2B b1014d31b63cb9b926bd12d49bf17dd9f204ed5e72522a98926e4c15fd69ced3e826cde8ef86766af00c8d85aa0294b0839b9bed84a9e55c50cd9f2a46f9f55b SHA512 0a5e72080b845fe7ba9b0fb41b51aab1bdc9eb11e702027c9dc1a83c245e54c9b1c667f4e5726a026df75996bdf0ffacf6d3f68ea79705847f657f1b859ee556
diff --git a/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild b/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
index e7adbd9b337c..ceeb5d4ff7ad 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/diff-match-patch/diff-match-patch-20181111.ebuild b/dev-python/diff-match-patch/diff-match-patch-20181111.ebuild
new file mode 100644
index 000000000000..427f78469f2a
--- /dev/null
+++ b/dev-python/diff-match-patch/diff-match-patch-20181111.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff, match and patch algorithms for plain text"
+HOMEPAGE="https://pypi.org/project/diff-match-patch/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index d656e9c2404e..a7a45ac9f545 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -3,7 +3,7 @@ AUX dill-0.2.5-remove-install_requires.patch 906 BLAKE2B b8d38d701448930cf8596be
 DIST dill-0.2.5.tgz 60572 BLAKE2B 43877e36cb62406b486f5619a54db0a4983f70b0a1712e39bcd77aa892fd17dc9ea774b85faa48441beaf993296a877249ff321fd0977a1317eeb25d0b020d80 SHA512 94942a736b4c2e1558eb9475f9bafe3a24f88a976abf9880beec386497a2bc769cb9be6bbfd2baac006c92578c372f5dfcfa165c5649876ea5076a3b207de6fc
 DIST dill-0.3.0.tar.gz 151375 BLAKE2B 11f22f18c5491633a2a3136d6993c59a1078d478f2e45d40e5a71fd9929527f4db98fe261d406c2cceb0cbafa277f620a17068123c73d85a44dc2252be138845 SHA512 d3e36716ec264fab2532264e82dedf2a0923ed11f2517b3df6e5576159d5701f336125e7967a37f4c80c37f60abf584b9f7cd4225ed68f942dca7af500c091cf
 DIST dill-0.3.1.1.tar.gz 151986 BLAKE2B 71b364730805974117cb00965a2276aa240b6265f2a98ae8e70ca2f9d8bf7a4b801fac083f2395932fdc016de3f068fb46091f296910ce96725bc982e774a40a SHA512 e61610451972522316d7ed6bc8287e38521fcd2e6736b43200ae498f24596994caec92313be1da71cf1b536fbbe01505673fc8018bfcbaf7705147a294565ab9
-EBUILD dill-0.2.5.ebuild 527 BLAKE2B fdcda81ffa74b97883513ab5317d19879b43548a2359e3cbc6122705e1a6ca7f5231ba9bcc9446d13c56dea796440f9f92e3024771a8f4344a0882c23406f0bb SHA512 3b3e662b59be3a9c779165cbb845f1fcd6396c568de9cd3af097d8ba972f06992e340ef6b3fb8205fed26e48a4dde518a6b5e88a8bcf5df7ac05cc93c0a2791c
-EBUILD dill-0.3.0.ebuild 595 BLAKE2B 7888c6d5ba9f29fdcc36deb62f54126283834c48e84ebffee7b27fbe8f861fe21cd9a7e5fa1d52fcf9cf86bd3c8e4f68f1d0b9cb459d147b78f1fe70acee1ba5 SHA512 e68526b21a9227be0f9ecaefa2dce2f24fb29f1962c0a030c72daa0a3e35456118b84738f87696398fb3ccf70ca2e9fc4ca725850391f4e222850b4a72816167
-EBUILD dill-0.3.1.1.ebuild 595 BLAKE2B 7888c6d5ba9f29fdcc36deb62f54126283834c48e84ebffee7b27fbe8f861fe21cd9a7e5fa1d52fcf9cf86bd3c8e4f68f1d0b9cb459d147b78f1fe70acee1ba5 SHA512 e68526b21a9227be0f9ecaefa2dce2f24fb29f1962c0a030c72daa0a3e35456118b84738f87696398fb3ccf70ca2e9fc4ca725850391f4e222850b4a72816167
+EBUILD dill-0.2.5.ebuild 520 BLAKE2B bd8401634a7166b9bf87a34c9e3d0a54a34ee1a2aa1cde92f115f54608b0af21bbf8d31c5549c0980d72c816d69ceaa95736eef40e9b94489ae713915ef19c28 SHA512 2463cb1ffdb59e5a578d4fdb9f6182e3becef25c96a81a54f02e07f22a12ba8c83fc1cd2e93c933101f36d1641dd816150fc1df9d14cdf7f139985c4c1a7485a
+EBUILD dill-0.3.0.ebuild 588 BLAKE2B 1eb579ecad9b49e671161c3b5eab61eb132a0e4443eaf97ac1612b3636b3b3af8c2765e3cd6f8cbd094ba819c782a63f0b85bbb66ba4a96afba5993a06697c96 SHA512 7fb71a3daa594f89b4a6c21b0d471d4b5d394bded33a2631db33165dfa9891dab4e59d215181b93609a91dae6fb7651400e1509df894fb2f6a262eaf6bd19f53
+EBUILD dill-0.3.1.1.ebuild 583 BLAKE2B 8d675b2b3fbebe868e7bab9a9be5da7c84ff6170baa4b90ff5c3df02a0fb3ed264f18eb1c610f5fdcdf0a509956880254338be51ba2e57386007551bb249a378 SHA512 52b9e74e5ca1fe1fa71aaaf910440d606e94912be7c066457590f26671a4c43577a527c330c47525c3e50dda035776f0540f0911b57904cc4eb34602035ac7d0
 MISC metadata.xml 971 BLAKE2B b81903b1c1e32c039f956d6bbbbd8286edc4a80432ae473d6967c16b397aead0df3746d892ed29e94c55d2e555a14e81b068c1a95bef3e87c4248f8809e736d5 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094
diff --git a/dev-python/dill/dill-0.2.5.ebuild b/dev-python/dill/dill-0.2.5.ebuild
index f0fc80e6f068..fed37739e487 100644
--- a/dev-python/dill/dill-0.2.5.ebuild
+++ b/dev-python/dill/dill-0.2.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dill/dill-0.3.0.ebuild b/dev-python/dill/dill-0.3.0.ebuild
index 2df94b7bb42e..c65d45eab49b 100644
--- a/dev-python/dill/dill-0.3.0.ebuild
+++ b/dev-python/dill/dill-0.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dill/dill-0.3.1.1.ebuild b/dev-python/dill/dill-0.3.1.1.ebuild
index 2df94b7bb42e..ec2d5b67f695 100644
--- a/dev-python/dill/dill-0.3.1.1.ebuild
+++ b/dev-python/dill/dill-0.3.1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 python_test() {
 	local fail= t
diff --git a/dev-python/dingus/Manifest b/dev-python/dingus/Manifest
deleted file mode 100644
index c1387c315b08..000000000000
--- a/dev-python/dingus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dingus-0.3.4.tar.gz 6202 BLAKE2B 786a31507966ddf3c248b205c9b1c1d48133732cad6ef47654f3eb0d0ccfd7e1e3829f642d5265aa9a501df5538ffb7bce701b27efbb6dce05c9077059964003 SHA512 7fffe0a02037b8e85f4d58fac1b5e59af98a8fc4a298f67bf9cd813b369c469046dfbbdb07965df4aa8ada56de1f097c19ed448d99fc41047f02e5dec701e504
-EBUILD dingus-0.3.4-r1.ebuild 542 BLAKE2B ff50d5a84dab2fe7f11a333c61c116f633bd4fe82b77ffd3b0765b1df0cd39023539639c7a2a64a295129229394c5fbcc414e6413471bd9acfadb320ba02bc59 SHA512 63beb9c9132602120d495310d65ec34e5abe9f3b1d77496cdacebecdf09f83aea4a05f6f0ed32a9ddad5e045f4b1c324ede9846430d32f6321048dc7a26a9d0d
-MISC metadata.xml 319 BLAKE2B 7f78cbf6ec6955beafbf38fba0fd22d7276b5268748551657f54375dae637605d828285fa953ee99b8225a8ce0f7095a02b69c3030563177df4bbaed7cca666f SHA512 536932f1f602daa8324efe7288b378a2ecb6762dc0d9656efd473008352a60b700e368ff5749746f972954c68aaea7e3c9fcd84a234932909d19a31d88a04327
diff --git a/dev-python/dingus/dingus-0.3.4-r1.ebuild b/dev-python/dingus/dingus-0.3.4-r1.ebuild
deleted file mode 100644
index ee8118b58f18..000000000000
--- a/dev-python/dingus/dingus-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A record-then-assert mocking library"
-HOMEPAGE="https://pypi.org/project/dingus/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_prepare_all() {
-	sed -i -e '/data_files/d' setup.py || die #413769
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/dingus/metadata.xml b/dev-python/dingus/metadata.xml
deleted file mode 100644
index 40e1585aee2b..000000000000
--- a/dev-python/dingus/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">dingus</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/dirq/Manifest b/dev-python/dirq/Manifest
deleted file mode 100644
index d68980aba620..000000000000
--- a/dev-python/dirq/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dirq-1.7.1.tar.gz 32645 BLAKE2B ac03910299ce25e0af41f88f7b5c5ed4538c3635dd747a2c1bf6770263b6091e5e0f557a2dcacf2e0183f9bef994d4bf836da4383d62b27507eb150d4cd7f371 SHA512 8865f395e6ef81131c5e1df9f97cf1768557af06d446a79ece29e23b83c228cbb158099a7e85360423013cd8e5ead8970c5160865f065d16fcc288c2ce9d176f
-EBUILD dirq-1.7.1.ebuild 571 BLAKE2B 31c00c48de4d06a54402a48e844c5b118dc89336850c0af80c3bf0b361c0ecd72de56dd4946848e4366f0a7c48c9e19b5098f76908389682953e30fb1072d06e SHA512 46697b3d47bdc52e0eab739698ad9ab0de4eec6b4822744cb58e7c59264799e5a7c236d0ed1c05b32d869f6b94f1ec67ae77f94655f3d27dfe8267f957fa3c2e
-MISC metadata.xml 737 BLAKE2B fd53eeae3b338d2952c769f861b9902a4deff181ecdd62bffb692c64153011e98a6488b9e26e2005ae1b4be4d394975ec7071a78bb3e32155165311df6298dac SHA512 b5444242e60c9e2c847c91cdccaf43567bc9e77c6d6a89bc705af98c3eb2cc115f64abeeff191c9803ca50d73af89b6e91c0104d130c45087f11bd3f128a6459
diff --git a/dev-python/dirq/dirq-1.7.1.ebuild b/dev-python/dirq/dirq-1.7.1.ebuild
deleted file mode 100644
index 6bfe5e8640c4..000000000000
--- a/dev-python/dirq/dirq-1.7.1.ebuild
+++ /dev/null
@@ -1,25 +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
-
-DESCRIPTION="Python port of Perl module Directory::Queue"
-HOMEPAGE="https://github.com/cern-mig/python-dirq"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note: as of 2017-03-22, dirq tests are known to fail in Docker containers
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/dirq/metadata.xml b/dev-python/dirq/metadata.xml
deleted file mode 100644
index 2e025c6c0714..000000000000
--- a/dev-python/dirq/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>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="en">
-		The goal of this module is to offer a queue system using the underlying
-		filesystem for storage, security and to prevent race conditions via
-		atomic operations. It focuses on simplicity, robustness and scalability.
-
-		This module allows multiple concurrent readers and writers to interact
-		with the same queue.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">cern-mig/python-dirq</remote-id>
-		<remote-id type="pypi">dirq</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index 9018be5f2ffe..fbe0d72d4f88 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1,5 +1,5 @@
 DIST discogs-client-2.0.2.tar.gz 25486 BLAKE2B f901628a74b2df091e40eb3e5f5ef8a7300fbb9e372d044580f3b13b524b477e427feaf4cd5287d9782efed82032b93ed9c26071de7ec49e308c7bfdc7aa5e78 SHA512 00634eb95018ccb2ece0adf4b7e3ea96674f0c8dd63d9bd151cdf9c871898fa24379f78065ebb677cc87eaffa31e91ba60051622a38c6bd774e010c20229b16e
 DIST discogs-client-2.2.1.tar.gz 24645 BLAKE2B 310b2a23a58f58c0d258599ad88a8e44202a38850af72ead293bd5ac21a92521ee53cfd6d8340d4c122145b4f3797f905a7f5273c6b0e5e23e8aff43fdf09c85 SHA512 fa339b14d5655a36fdf252fd94c729ecb97e195c1f7eb2e5207355dc5f4fd89d0b738218ffbac71acab4f143870bdba5cf5ea02dff70166014f14c30481ae1e5
-EBUILD discogs-client-2.0.2.ebuild 901 BLAKE2B 3b73192dff2ed478ce2ec4a53dc780d82887d2eecf0231457890c06563841d95133f9062d4d74f2562c14f64b686debd4ab59d04cca78b67973fb5b0fb6727dd SHA512 4a3d1f8006eb83330405f0dd672914563a4f1d719aeacfad36699dda5eef3b458f04bbae9f3e4086c413cccfbe694d3347666e79f5249fc2d105672ed1238f1c
-EBUILD discogs-client-2.2.1.ebuild 705 BLAKE2B 12d9b48a051d06377a3df8d7b92113500374d74c71de4781440caa919a28935e7c15a808b5696ca2ab26f15ff38a2c37b06ec448712d66adc3d9c7f4f044e66a SHA512 0d35f2bd60affbed686b8d85f5ea56b33c11eae61eee56dcbffd2473f2d84c9f6f470ea0134b80a2b603b84e9b20fa7724c5caf22c7bc988a28d5154ad6779b5
+EBUILD discogs-client-2.0.2.ebuild 893 BLAKE2B 8ae0b24d694d641135b42402e0c1db38d7df4a1ee612fb84fcb8e38d96a9700b7c72bed6285f3beb0475821e9c7f1487981062159b1b60bda7daaa6604513c74 SHA512 e42dc16a6370028c9f6752099ae708315489c749842ace5ad954e497fddc78d95cc0befb5a957a67e17818181844c352b9b1d3828bc7abfd896048c4621428cf
+EBUILD discogs-client-2.2.1.ebuild 701 BLAKE2B 3c6c28647b460791590f0c3d617da10825059921a4ebdd4245b91f6fb9ac7d6803472ecd5b6bc0f1e90aa978a8dbf2044598c078ac130dcae2d35994c460c39d SHA512 ba9751f8ce85e8baa1812452c935a9cc4a2bf78e50adfb68420d0cc362a74aee1b8040c7f39fed8736180c63f81caf82a517ffe7582346781ba2b78b62ec4379
 MISC metadata.xml 391 BLAKE2B 49def6f22633b0f670c92c9abead7bd18955527bf30c08443d3fa161ef1e8a9508d540bbdf4fbaa801d6fcad0a1b3b26071c25ad081ad3eb62fcceced57838f0 SHA512 37252a778b2f529b74e72a6f873bb1bb693c339619a7d9c236ad96a8693d9ec04e40299f4be8a03efe48b3f0ea052a676b5508871e3d03c82d2ba814ac325bd9
diff --git a/dev-python/discogs-client/discogs-client-2.0.2.ebuild b/dev-python/discogs-client/discogs-client-2.0.2.ebuild
index 53f41c931481..dfb505c5d9d8 100644
--- a/dev-python/discogs-client/discogs-client-2.0.2.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 # Not py3 capable due to oauth2 supports py2 pypy only
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/discogs-client/discogs-client-2.2.1.ebuild b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
index 00d432e2a418..96302e4e1c00 100644
--- a/dev-python/discogs-client/discogs-client-2.2.1.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index 0cb593e045b8..e5982cd184f1 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,5 +1,5 @@
 DIST diskcache-2.8.3.tar.gz 438587 BLAKE2B 3b7b50fe6cabe8a4eb92b3dd72a2b99d6cedc8b7d055fcdf7b445f016957e6c7692571e9f83aafe36141b69a0e93f638b9e3e2f210bb56e6358260a5ff4130d3 SHA512 d96ac76dfb68cb817febd3f4ed8927a8409c02b13b4112a739528cade40f9a588c732dfc3148392dd12676380c3a2b006ee63b86f30ad70f5d205273003bf23d
 DIST diskcache-3.1.0.tar.gz 489821 BLAKE2B 56b54662f31172f4f746ce885d57a3e9f34af9d7318300fe6906aee1b3373919f6ee33922ab30b7979cc6e271f2f780894438b4114483a7c76f198fb7b2213c1 SHA512 30ea3e6c1ed6430c1a7e3bf022bd9233e89a2486308d1f48f6e2f0b50ccc1ee50dade7c55d98a5611ef384bd193cd28f7e65f5737bae00845b17c159177dd345
-EBUILD diskcache-2.8.3.ebuild 857 BLAKE2B c8523affab68bba8a607aea50266ad75f1f3455f8a3c3c36404cb0e5cb65df425d0f58c20e83c616736659ef0855cf62e1164fa4ed7f43ae0e3872bb5f46281e SHA512 db18ce60f93e676fab88afa908c122fadda34b8a7aed9864a57f9252358875ab79613b51fb6c09d25b18c43baa62b82a6e0d784c32051a91abda97a35008d9d5
-EBUILD diskcache-3.1.0.ebuild 881 BLAKE2B 83a92ba1042ed18aeaa75e57b7fa8f325b47160daf0b2397bdf6e0cb5af1d802a01b59af22a7ba204b9c30cc999f6db643f3fd3bf9b0149c066085654a48bad0 SHA512 dd13f8b9bf7f22591377acbec159770dfc89860810d2d5049aec1e07b9826d3e7f79b505a0d6d9b05632ad26f82b3bb4e354a2a8d575da7af523a9468f442bd3
+EBUILD diskcache-2.8.3.ebuild 853 BLAKE2B 4bd41f836063d77a33c783e63034e43baba46646bcc437b00846cc268595c54c83ba773b2853157f40d83898c820f029fec1f325440727ec2575919a2e3aa762 SHA512 f44d20ab34352813edc20bf8b414fa7599d3c54c877cd2f969fa0e231184b117c0489e578713c6a2bca19aa86635dc2919f90a0ee529a329f787fef250c13bd9
+EBUILD diskcache-3.1.0.ebuild 877 BLAKE2B 77ebf2871569ecf96854b2998a106a6b006feb4d003463aa01ba861004116d7691c7556379414d7d2f28f2efa9770cea54563e82736ad5da4ad5de3a0c159e53 SHA512 b60c5329cb611cb47bc4df264b0a4dd7489c7b2b21690b56b9a8cbbee58be480c74ff221bd2e3fccf97d89e43f8a383d5f9562224874f4a612c26aa65e955203
 MISC metadata.xml 391 BLAKE2B 74eba8c76944b17dd3b7a446129b9786a56e1afa0a787af75c8e832317b5051afa7e527ac8e7c04a2f9f4c36b0eb3bc72a61655f7de4a5caf9048c50f438d745 SHA512 0d088c14dbbf7c11541b5f47d193280c0f92f8f1b3ec62c8aad49648b3fbcc393ce639b5b9ae18533a4d4b9cb5ad536a5a847b705e2b4bd385d3b90d48f812ec
diff --git a/dev-python/diskcache/diskcache-2.8.3.ebuild b/dev-python/diskcache/diskcache-2.8.3.ebuild
index 916f64d802f2..cec791888f3d 100644
--- a/dev-python/diskcache/diskcache-2.8.3.ebuild
+++ b/dev-python/diskcache/diskcache-2.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/diskcache/diskcache-3.1.0.ebuild b/dev-python/diskcache/diskcache-3.1.0.ebuild
index 5cd0816eb49b..75f0ba257bfd 100644
--- a/dev-python/diskcache/diskcache-3.1.0.ebuild
+++ b/dev-python/diskcache/diskcache-3.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/disqus-python/Manifest b/dev-python/disqus-python/Manifest
deleted file mode 100644
index 0539916e4402..000000000000
--- a/dev-python/disqus-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST disqus-python-0.4.2.tar.gz 9751 BLAKE2B 976b44585696291b217247ca1a673d3aec3f5b87600270a6216d51b3c22cf3cac0cac79c8f25e5a4c07982bf6a1c387c2fcbf57589fe2c6ac93a628e25106e66 SHA512 ad55c5d95ff9b382a187cfa13b2cc41ec8e90acb6378ebe11a32fc2dc7b125e3e9ebd94d8f24d686f56e87808cda7642d1356c1dfa1e4b7f5d7e1ee9e7875b0a
-EBUILD disqus-python-0.4.2.ebuild 682 BLAKE2B d82f63018effa1487c5181ad03a1e1c2c950a97f671e7ec37935e07341e4b34941336c6c97dc2b89e64b2d83e8ce5dfc7f5f5e46ce50079d691ddd90f93a359e SHA512 d96750660855f2ae7d5cbe41abd0da4bf3bed23aece1f899fe59ba0b3b41fc887c8ea24c4b1befdca6afc4f1ae3eba35e62c31d589d189913194c0850afaee2f
-MISC metadata.xml 388 BLAKE2B 34d4d3ca0ebea7c37da09d09748f44ac442a959cc014bb966e24122ec6856e1d0dd3460084bb14588d5ca5dffb2300c7e59b78f8688761be8d89e1cc486092e9 SHA512 80dc55c5648da0fab5f055d9f882f7dd06ae4b5300c8c320ce93ddb712cbaf2689dd7fdb5597cb8edc653b056fe29424f3f4788af7cf21a036d5294c64a435e7
diff --git a/dev-python/disqus-python/disqus-python-0.4.2.ebuild b/dev-python/disqus-python/disqus-python-0.4.2.ebuild
deleted file mode 100644
index 13bfdff7443c..000000000000
--- a/dev-python/disqus-python/disqus-python-0.4.2.ebuild
+++ /dev/null
@@ -1,29 +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 vcs-snapshot
-
-DESCRIPTION="Python client library for accessing the disqus.com API"
-HOMEPAGE="https://github.com/disqus/disqus-python"
-SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" "${S}/disqusapi/tests.py" || die
-}
diff --git a/dev-python/disqus-python/metadata.xml b/dev-python/disqus-python/metadata.xml
deleted file mode 100644
index 88317eb4e109..000000000000
--- a/dev-python/disqus-python/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">disqus/disqus-python</remote-id>
-    <remote-id type="pypi">disqus-python</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/dissononce/Manifest b/dev-python/dissononce/Manifest
index 47588bc772a9..ade7cba5b273 100644
--- a/dev-python/dissononce/Manifest
+++ b/dev-python/dissononce/Manifest
@@ -1,4 +1,4 @@
 AUX dissononce-0.34.3-fix-test-requirements.patch 1099 BLAKE2B 9bd65c18b440181187dbce8f8d6c3c97902d127e904efd9514fd7d2c987b16c4f82ea10e7182ef3a72b73998d3cb76c3a3ee4838f4f3b3d83dfd40b1ad748273 SHA512 e875717877881372e3b446e5a1eee4f3aa0deaf5381e16c54992ecc0c0b8e36e44419dcda3a8603bbbed1cb3bcb8710f8cafc086a016a6c49267b10b443023b8
 DIST dissononce-0.34.3.tar.gz 594227 BLAKE2B e37ce7a41aa71f36a60b14b3da50df5c387aa64c472a48fe76d66f05ee495673b2719fb0ca0fab196992c4920eeba72701d47defceb70c2d85f5f894d13d40dd SHA512 f192c3f6abc3943fa8fffe959d3db74e810483c9f5868cc128a851ffc42069d084c0d935ca74fd45d5bcce3fe2cfeeb788094dc34f0567ed709ddfb57275fa18
-EBUILD dissononce-0.34.3.ebuild 943 BLAKE2B 2e7414501bb5ab0eb3d21b93d0f61512de2299973f3879308c42343485aaff2322a0a4ffeaefe44e0e8e4062c8be53e9cd5aa50c4be99bd14adea3763615e485 SHA512 d2a354cc2845f9b0afbbef2ee4c3f3b3264f95740b3c1b16e6c98c6004a6dd4ffaf91be7cb5547fe14581728994f2f88fb285e8dc13fc73ab9a3d127db40134a
+EBUILD dissononce-0.34.3.ebuild 943 BLAKE2B 20da615163a935280ee7f28dd3e3cd635a6e6bb4cceb3de253fa5b2ccdcd031fdec03dabdd1ce5cb8bd31944d6a08213e22e3964a0cfedc4ec893d3f4c3016e8 SHA512 a9ffe2865ed25f83cecb2e46818c2bae98276cbeb95bb15cc2ff4a5d49939c58be27904b2cfe8e26295aeb988c74d11b9757f9bcbb17c4c2caf94cafdcf53bcc
 MISC metadata.xml 659 BLAKE2B 9e628e24c999a14575817d45ba61f5ff0e444c222c67c3204c1c53a7c928e926ebf9e4319c3f450d30686eeb01c1b94adec2008d65e3275df09964a9b281aa16 SHA512 2bba877c4161cb766f935cbfb5b7b421cebca89116e9bee83655ded6bdcb332c719314e0c2c1cae010409e071e511bb1335f5118993b647b1c25a99076f072bd
diff --git a/dev-python/dissononce/dissononce-0.34.3.ebuild b/dev-python/dissononce/dissononce-0.34.3.ebuild
index fbb9a7559074..b57b081af898 100644
--- a/dev-python/dissononce/dissononce-0.34.3.ebuild
+++ b/dev-python/dissononce/dissononce-0.34.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 77f3acf4cd2b..ad07dde1f4b4 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,6 +1,6 @@
 AUX distlib-0.2.2-unbundle.patch 1284 BLAKE2B 994f1d3e035273bbeb0f8aec357a7ea62188d515ef7e951b773f8a87aeede8081a6e59928748961ed1e7b569212ab4521dafcf7d7f1fea5d9eec14ba7ebef678 SHA512 90ae9177e09a4ae23a5e1a90e5599602466ede4b9fc2b19024c00a187f7393fc2fb84795bf5bb699bdbe071a97514bf86e8da556c8cacb49db0985f2ed8fe18c
 DIST distlib-0.2.1.zip 542424 BLAKE2B 241b14519499b76beaa8994b30be8b78ea83f3073668174f4e2e02cc9609feb957b3b4fdb59e68943223e6fb8d0251a8bab990396c4e4297c683ab4eda8fbcc9 SHA512 f6453585650db242ad4a176bbd468cc6069ee0941b6ea23f24fc32000778097d8a100de82eaad7b3d8d998dc153d25f537505c7eefcc6f98f37995cfc9d5be77
 DIST distlib-0.2.4.zip 547411 BLAKE2B 763027059faccdcee682d5eddbdeb2c23cfefff178d992db811233b48d7a4d605626f8619d51dacc55ae5a016557e528b0bec0c625258e469f2fd98a9a659c6b SHA512 03f9f9474578226e1a40a85a490aead3ec0509ba444856a263d4f25b3c86b5f919a3e18ff715a3a329d80a3f20a540b8c57a6e3dff55703c9cce730e2d021084
-EBUILD distlib-0.2.1.ebuild 712 BLAKE2B b91f2657ebbbac2f7aba5d7e14bc4820396977560975473443c06323cead241148945faf4ffe8e85b2e57131cef73eef06f6ae61536ee48712c1715c358f351c SHA512 c4ed920e46819712da94c9de528e57801ef82cfb491b4fa40463be85290287011500e9a68d143d4418a26c2b7fe6f3f14a9dd3d5417cf41628abf7e3ab418644
-EBUILD distlib-0.2.4.ebuild 1244 BLAKE2B b41bb3c9afefacce2e3e4321d4bf1f6f73d40708ff66a4dd61e4d6cc146454ba275b2cdf9d71691fc0d97ee41d5e6b94899812470e7618a3ed5f92342b46950f SHA512 25464c938770d01f3e2dcaec1c0ed2415d82b826a2e026b6f044f777dda3744da40170a66a24705bd4661ff943376809f7f626033045f0c653af4297aa0e9fa0
+EBUILD distlib-0.2.1.ebuild 693 BLAKE2B 49cf056a18c327fd9bb1b3aa201ae636838b4fbd2d78d4b25bc459ab05ee1f8348690a6f06093f1dc57cb1db2bca47dced67a87218af90283e09a275cf82eb2d SHA512 598f3cf1ca9da41e1d4515a44fb5923baf54a87495295b4799581ae8b8a7ec3a5c42b45bb23403e766eb5edba7a2bd8f4474b6d34eca04e93691f3d0e4e700f0
+EBUILD distlib-0.2.4.ebuild 1224 BLAKE2B dd2bafccbb17485855ce00265846064ca92c0a3e62d45e64ae66306c8e6bbd8a37aed379b323f2506fcdbf20b77ae7547d7a31f33e13b59321642afdec74db5e SHA512 6c9e722a154ea2e7034887a4a5286c222d288680f627d10b4db153839c63cc0f02d835b5327d04974a2dc43f14bb439b49f2b8355f0040cd9025e41b7c3886b7
 MISC metadata.xml 426 BLAKE2B 58e513afff4bb2079ab3bf04944f3e0bfda90793443637b200eb3f52758f0ad15c8ef742d70724d368901382af2f6cf6fd4e8367d43f3afc43f9a7fa42bd1480 SHA512 08bab081b7287399834521ed7f3bad016a3c0be3b7b191875e23b4cb0577afc02ae9d553de80552212852ceb473a4ca424efecf226826eea80461a3fb028a36e
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
index a9c7d2515f17..ee69e966ec25 100644
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3  )
+PYTHON_COMPAT=( python3_6 pypy3  )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/distlib/distlib-0.2.4.ebuild b/dev-python/distlib/distlib-0.2.4.ebuild
index 1d3e6443717a..d8c26c345b55 100644
--- a/dev-python/distlib/distlib-0.2.4.ebuild
+++ b/dev-python/distlib/distlib-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3  )
+PYTHON_COMPAT=( python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/distributed/Manifest b/dev-python/distributed/Manifest
index 897a26ff9965..d5aac98b37bb 100644
--- a/dev-python/distributed/Manifest
+++ b/dev-python/distributed/Manifest
@@ -1,4 +1,4 @@
 DIST distributed-1.18.0.tar.gz 395888 BLAKE2B a1f84f93130b4e878d2b6a2059e71330fd10ac7be2c8e1d3fa06984e34dda4984180f496b9513f531ae21f3cc978f71f8e9492fcd5d644613a7d9ececcb5ecb6 SHA512 3603b22a454c7010c64fceb79b4aa024476bd038f4c27585c8f2dd51a2e4ace1c900dfc7c3bf096d4274be985003b72e9bd16af7b351ec9a65c6712a1f5e39d4
-EBUILD distributed-1.18.0-r1.ebuild 1331 BLAKE2B 33330d644bf79ca05759558524074c850a76db66d55da5a22e5a0a0807f21f8b70b218a8e3a111659e0701f48c8b28f38f0e696423ee49da3bafd75a0864bab0 SHA512 1c9efb2732a2eec0c733d5d724463847aff35b51d6d7c814829680a4c1dc73468bce1b1abd1190f162e5ecbbedcbc2972ff1f25053fb08e51e9f1a0d6ac872b4
-EBUILD distributed-1.18.0.ebuild 1349 BLAKE2B d7d326506aea80100c249a738391f76ab797676bef9cf1b8bd363f3fac7f74ccecbd91865b71bfa3ee5fa6f18daa7487fba1bf1ed140d80520859e49777002c8 SHA512 cbf0af758dbfe87f8b4a57ab1b82b30b4cb3a96c15e717775b74e67d3a02b9d294eacb9af8cc4a8c8a61adc8c34a88c3f8c8b8089bfa9468aa46be495d88da3b
+EBUILD distributed-1.18.0-r1.ebuild 1329 BLAKE2B aeff5be5480f98a77f4e83ff92b356973ebbf904502c2bb959ee6c1f7d8185f4d3b179b2fc01a0f5e69ca9208354c335e989682dd72652330998559307471729 SHA512 3dd1f1075b7f1f19017dca91e5c5b91e2885ba98d19f8e75705bd2298d9aeb06de6c259d3bd6bbc4396f0bc5269fce02ff83b924ed7099823d3cbbe5ce436e8c
+EBUILD distributed-1.18.0.ebuild 1345 BLAKE2B 68cf0b8906f55a09aa4ef478e859aad3a782ff44286632a228326d641046e183a4051594e1ab9865969c50997d92df623fb2551da9777f7a889e0dfd1966bbf1 SHA512 278d5e0f18470bca57d266feddc9ce70b4f19b37699065d5dfd8580881b40809a9c0194cf83ea89e7df91528a49faeb9ae769006c7f9b4b13e51715512ee62e0
 MISC metadata.xml 511 BLAKE2B cd7c1cbc44915c6a922c188703d69260c85f0f1d4a97606fccec97b2d11deba4ef25f91dffe7fbd407a93dffa4f69f50f9289d948ebf4764da2980acdebe5ffe SHA512 b512481cca22a1dffd5620312825bdec9348b1a469be61874211dd25befb2111fab1ea79596087f5226b053a2ab660174508828d5300de9ff24119880995a296
diff --git a/dev-python/distributed/distributed-1.18.0-r1.ebuild b/dev-python/distributed/distributed-1.18.0-r1.ebuild
index 577099d8d139..48b6bb8e415e 100644
--- a/dev-python/distributed/distributed-1.18.0-r1.ebuild
+++ b/dev-python/distributed/distributed-1.18.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/distributed/distributed-1.18.0.ebuild b/dev-python/distributed/distributed-1.18.0.ebuild
index 2e33c1a50210..f085b6ea7ff8 100644
--- a/dev-python/distributed/distributed-1.18.0.ebuild
+++ b/dev-python/distributed/distributed-1.18.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 13891500b747..aa0d62597ab7 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,3 @@
 DIST distro-1.0.4.tar.gz 28772 BLAKE2B 1a337c0a5c125b89adbd3173d17390c5cce12c8549a3e7d90d88fd71f53d1b4c7bc3d1fc87f7bec33d7b4b1311539deaa9414b143daf40108b15dd78370450d8 SHA512 466f2e14b169998e3ff7420e12bf270ad9f934962ae92c2d24bdd747897ad66cb348194dd1376b8b53ed298ea02039943c80d9ccc6b8a01c2bd0c6d2be82c7f6
-EBUILD distro-1.0.4.ebuild 609 BLAKE2B 8b0f70bd066261be3d7dda1840b53d095f754c2f6a13b1916545f9352f0f68869a7533dba87cd0663da9e68b337cb8cfe4f1b7c2b0405492a96e00f0bd9e927a SHA512 d8064c7f52b5b935584e8d3f6db3c2f5a8f34d191d4c0c6a30d51d385e738188bbada58374624e72d67c2c16cc01f995cb03f8c0fc54129dce1fc34b310773f8
+EBUILD distro-1.0.4.ebuild 607 BLAKE2B 810cec81b6216ede2d65d0de6eb1bf7368e26f9ec0ab4b3bd1f2cd1bd3bdb70a74d9d4b5c4c96c2f51dfcc2358e48b240cefed7e4507b0d5952e4a44d5f8dd82 SHA512 ff5b0e123e0491e10ab1a1f13e73a182800256cdb29bf9a47f26d1057875dd048b9ed28368f239cbbde8908c40a77e7a1a6fa998dd559522c9c9de0f437be14f
 MISC metadata.xml 813 BLAKE2B 7ca7237a784e0d321609382bb6427a39584f9ca36047975fc76926628d5b4b5d54543762bcec7a43eacfa91ac056a96d38a0e71a6baed93b18a9849b2563f502 SHA512 2d9fe5a2567f86d987d950a78d68f09ac45b1a50ff02d1f1c2849c381de1a5a2f164fd6850f427650789a0274af974e23c9b8ba7ef3b37c81ad653b3ba85e0b5
diff --git a/dev-python/distro/distro-1.0.4.ebuild b/dev-python/distro/distro-1.0.4.ebuild
index 7a03e0460e1d..c394b27e61ed 100644
--- a/dev-python/distro/distro-1.0.4.ebuild
+++ b/dev-python/distro/distro-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index fd23f25e2e07..95e12875859b 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-database-url-0.4.2.tar.gz 4268 BLAKE2B c9abfc50616baf8cff4f12c6ce2c3bc5914be231c67d23ef49c222f162109ae7ad730678c05d9596969d4dabc7d44a80711dc2fbc3e6bd74b99dd699ee554413 SHA512 d18fe4e0cd4073689759c302c22e0f128d4ed1103af99a1db4dbe645fdea601837131a3f8d215143dabda64903aaeeb4706bd2082810f904cc8e74b564c5f2e3
-EBUILD dj-database-url-0.4.2.ebuild 658 BLAKE2B 7b0d6ab7d59d6a55246fdbee4e5dcb000fa71c3c2863061c52e7acf2a729a5685b8c64ef18e7aac3ef7fa7b0e6ab87ce0cc3363e851aea4e40c37769e77330ad SHA512 a35758831bdfbb83f9042035450dffd2ece0aec5bece6b344cc2ec1e476f7ebc0d5c8131cd669a261fe1cf80a971cb315b6e40fcaae94880e68dbc6a9f3e500e
+EBUILD dj-database-url-0.4.2.ebuild 649 BLAKE2B 6a3da13e21a16eaa7fa3e127baae1c707321b39ce90070d160597c2f0da0c297848be757702e52ac8c94610f14ba43ef1cd01f4712d363aae9a344695d2c1abd SHA512 b37c3290603413b52b466e1bfa4033c7faaaaeb23acd9f66a922c646a0baeecf99be01172f85a64a96cd520cd63437138e18b775cdd0b9f7481238bd7672b476
 MISC metadata.xml 398 BLAKE2B 29d967c2376c10347e128d1e7cad28c9a8346b7ec4a1d616a121b676fd3d56b4c0a1b4bf890bfed47b3fb244d9fa0ae01bc28d8b4066fd9289c72a436db4f647 SHA512 c89283a38f9c6f8ac3cae38a7defbdfb1c5b9dc06f31ed8073fb12d879828976a57d4019a6bba5e7af74a19e9088ced1ca03e585d52c45cca67caac2839b64af
diff --git a/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
index 2dd78291ffcd..29dce45dca26 100644
--- a/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-appconf/Manifest b/dev-python/django-appconf/Manifest
index 9253f10224a6..128a870617a7 100644
--- a/dev-python/django-appconf/Manifest
+++ b/dev-python/django-appconf/Manifest
@@ -1,4 +1,4 @@
 AUX docs.patch 713 BLAKE2B dabe5ab114ea18911e9f7de38040348405116486bcb0cb0eeca8d2dcfd4becbdc99ce3a306338b03987064a53adec5fa7acc310f81de8e76d68582d91148d335 SHA512 af930dfca53b0353c7d0af3671a924174b5c2d6dbf3da299a77dfd603e2a510724024e2d6b1d51cb2ad6d7edff3f1bef0813b7f12af1d7628f022e3ee4667996
 DIST django-appconf-1.0.1.tar.gz 16743 BLAKE2B 0f40d2bac6ca596c83dd67b1109c0a298d845a8091565aceb57230132004f634e9227aeaf07766a3e690feae9833ec1395bc6f409f4412648d8e7df4c2533ba1 SHA512 b6075bed0372f7f9da7c7af49124a08a2d119533ea15b284529166bcc09e61a541ce179a696dd426a9323ea1874c219880869ef7934345f4d40b1b3201eb2c6d
-EBUILD django-appconf-1.0.1.ebuild 920 BLAKE2B b8cd9e3f0c848cecadd51b9c45435219316263941abbea05914d169c91fe299f093b95ef2ef16559b0104e9005a1b31c7332600130754d266af8945d4d136ff4 SHA512 9c0eca4f3e9bda0dc0e1d3327de75abe4450d598054906059173df449757464a3e18304fb3ff070f5cdd1d00525acc8f0e24b9b29b59ed287621dfe46692890c
+EBUILD django-appconf-1.0.1.ebuild 916 BLAKE2B 1480aa4a227e42b58a2c6d936cd4231630d3833fa1bb0f59e5cf5684bf1d237f228085724934d77ec051cacf95ddcf88394d112ba75e99109909b000e6fd4eb3 SHA512 85608df8b954e3bdd24d440a5bf10fcc91d80a285a185796ba90506301cf85f2ff4318ae7e2c418f686f45fdfb2f8eee05a1905962f20c65c2dc63ad9fd0af05
 MISC metadata.xml 390 BLAKE2B 86804c4033e0cc6649e2d0734283205ec8390f6d2067b51945944c0bcc30744ce45d8ce9ec229e007901ad9e01ba874cdac2ac7c62d176cc10850c243bb694db SHA512 2fe634938c78aa61b5d8f2bbe6e5ef4144a5d15c3e7c91691048427fa604cfe7229b924a0196d5d95488ffaea568a4a4c218056ebd010a36ee2f6b339785c66f
diff --git a/dev-python/django-appconf/django-appconf-1.0.1.ebuild b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
index e00d79d46623..65a8953807e6 100644
--- a/dev-python/django-appconf/django-appconf-1.0.1.ebuild
+++ b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 735d009f9bfe..06ae0ce53e49 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -2,7 +2,7 @@ AUX docs.patch 697 BLAKE2B 049d893d773ca447315ca5aebec808e6933dc39cc6ebb40b06291
 DIST django-auth-ldap-1.2.2.tar.gz 131086 BLAKE2B 78f93eb24620907f5b5671972e2b80ec6e59cdc42a455c298bef4c3215616228735a0647b0646b683357bc16ea6d03488aa86626e2ad51211a382ee2d0482909 SHA512 676d1114faeb9a2956ed51c586afea7618c1bf62867d3525596599391f8327b8f22a075c4203311df88279c317ca37b9097b59e55a64330afee6eb1c5a9c9ac3
 DIST django-auth-ldap-1.2.7.tar.gz 131431 BLAKE2B 03fac590118d25ad0d9d8a3ac5dd8bb24f138f193bf27ae85d4e2776be79bb31ca7efb278fd05ca1d45976116ca7ec79ec3b510ca380dd8912ce47f1522ad348 SHA512 2ca29bdceb4b2540f7c90c9dfdfd7a02f91e72cd44ae062cebff84199dab737ee69ada56269189ec0dd70ee7916c3373acba50866280ad080c4c68dd69dffb09
 DIST django-auth-ldap-1.7.0.tar.gz 48897 BLAKE2B b4b196e4cd0882a48d2437326cda57394963fa44a64a3cf5a0ff668bb86243da3979e2746e096a458a5bf1d3c8be687f3d3fe456f5a6b0ada11ebd1f4787e323 SHA512 6478b2ef43e6f49acff3dd2e3a2a462ae02a3f1475d5615ba2f14bfd5efe2b232a3d2008902177d90822fea6b096a05814a5f028f4eec5ee09c5e5a62793e73d
-EBUILD django-auth-ldap-1.2.2.ebuild 1119 BLAKE2B ce81969838ac90ac6c89e299802aa5c4ef3e75795fa451db86ec1bbf29f6b1b191b9966940628be3f09f6696f0d799faccd193c64f7afd2c6a899ab609d4f32d SHA512 219f42b1e5b4040df1473bc12e9c74961403018fc98ce8af9704bd1180491fa6a37d4d60108d087d9ea2f96e2484405fee38a273c6f9fbed75b4d9f7bbe557a7
-EBUILD django-auth-ldap-1.2.7.ebuild 1077 BLAKE2B 3d0330ad4f16ca839c19ccc5cc100a1ede24aa3327ef999432b2ec3132978595a0fd65dc0e5ff058920cfccd763e27f2a010aa0fb268c697a9d8babe3ffa071b SHA512 6678a340a480cce6e34f9ed9da95a6d411f007e25fbcf978ce7ef00bb8072613b5b8aa20ac0cc9f6d0fec50cb7b66a0535199ae707edc67326a435567a564317
-EBUILD django-auth-ldap-1.7.0.ebuild 824 BLAKE2B 14457834fdf184d103ae94ec578ae5b1208d99a3e6a6e6ef537b673eb9957193cc2e13480556fd3a2a8c2b46539f911cb8e08bc3f9700e5acdcae960bd4f83e0 SHA512 edc90be8109f5c5d370404272564785877fdabde5e4dec0568795ae3b8fd658002b181be9d958cef78019648b9d43170810843a4beaa9549885b2e8c918ee42d
+EBUILD django-auth-ldap-1.2.2.ebuild 1114 BLAKE2B 5a72f990c54db6b1cf3249c633f5a7aff2c10d07ffa025268a3eb98e2553acb3705bcb24b4a8daafe72d94974735e81bf48fb4ed8f51f28781e9e62376858667 SHA512 0eb83d088c1f1d4f8b1f2a6464d6210f066cce86a90751d545c484004f4737ddc48614a5f351d8f514879d336a4a6377d9f10f6d6b767a4eb40a38d8e26b68a8
+EBUILD django-auth-ldap-1.2.7.ebuild 1072 BLAKE2B 02b45c58db352358a09e3485709942a8b84440bfb06f7916a29f5157c1542c7165e1fcd3184f14a612789b6145ecf19b04dab160056664dd9d9afdbb6cfb40c2 SHA512 8420ffc74950507c5d6a17a68eead4a994f9789969e85c106ff730cc99ae7ffeec463f51eab5c4953e5497596a912a725fdcab1ae3fe8330ac35b2d624bb9114
+EBUILD django-auth-ldap-1.7.0.ebuild 815 BLAKE2B 7a714432e75e8d53a833064039be4334eb77d7c15a9075cf66ae35258ac69d32228296d021a783b4e8dabbe910b0f045745ae9ae32907c7319908649077916e5 SHA512 9597294aca51a9f1c2187c6f0e88735de38122e02724959559ddc15d53524481d88cbf24ef0cc2a1bb3c55017c2ad65d25d81ea7d77e3bf0e8014cb3c556af4a
 MISC metadata.xml 398 BLAKE2B 89e1948a1d118a27477e02fc01d630aaf7c9199cd913a08efc5510fec05996e1aef84fbac359d09ef73a5de083b1920747928c3626afe7aa9c1c9dfa720f16c1 SHA512 e3350f6ab3d2c07965eb2c6ba1d82a929bea8e9974d8a2cdc12acde88aab50f2c20105e90e847a23e5dea5f97a7ab6a7a0c9eb75e193eb90ea5453c53eb36d41
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
index cb9ae9528d40..e75848f809c8 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 # Although setup.py claims to support py3, python-ldap does not
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
index 0b5e2b24b544..db72fc552b7f 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 # Although setup.py claims to support py3, python-ldap does not
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
index 12370642b88d..c87198ee39f6 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-baker/Manifest b/dev-python/django-baker/Manifest
index 64de415bbd07..1584facb32d4 100644
--- a/dev-python/django-baker/Manifest
+++ b/dev-python/django-baker/Manifest
@@ -1,5 +1,5 @@
 AUX django-baker-0.11-py3-backport.patch 2127 BLAKE2B 07240892edb97a0f7b13aa1474bd6650ba573537f5b8e892cef6ad00593cccb7add8bc9a08553c588e0eb0a1ffa884b9aaaa1b3edcad3a6d8f83b16fa9b02b2e SHA512 bc5785df9258579b3f583f4573e8907f5794f2a09576e91f770fe2e19b74043db1068c493cf0c0d7f448a4d1cbc7774187b474dd3d3c1cf80a1a68e2d4d77c54
 AUX django-baker-0.11-py3-iter.patch 1820 BLAKE2B 61ee9af5d2691c7b4cc545a9c9db07811311a23782f6d0577235bdc0cd940cb88d943b4433806dbb06a88315d8d1e89275500b576c39fe6eb22ce0db194dfc61 SHA512 d20fbb4ae9de91c3af36a902a5600f3f4dbaae82e7c33285f157fc3a40cc416e3fd2ce0a453e6138d7381fdbe1834694eacb2214a49b9528dc0c8b26e5ac5f47
 DIST django-baker-0.11.tar.gz 14920 BLAKE2B 532a0a528cce8468b989d4fe876bea05ce11bbfaa39e15d23f730dd27329914b4c8e87e5b5c1df417939e937b2651a03d6801bbca0c3735ea1d11cdcf08a1c81 SHA512 98a64efec8a0cabe9c4091852f3dcbff95007c0ff2020b782f73ab6cc5e3d73cd52356546f1f64b55a69fefdf8f053d95d604584831cf07cb1b8037446892439
-EBUILD django-baker-0.11-r2.ebuild 594 BLAKE2B 9faf1d5b832695ea9a0bf96be672110903f4c65788a94589288e272834a80669b25ae037e12941954681e82eb2d685d3e7c13e03837c59acea9567deaa0781c3 SHA512 2662618cc69ac743370004749ca6b46a45b3bbca6d676e01bba6b0233e5523a03249b2b87927e065f2dd5efad249de2ec52f2af1eaf30726bca961731d97ed25
+EBUILD django-baker-0.11-r2.ebuild 568 BLAKE2B 742398fec378a48b68a636bf7d0b621c57ecb6fbdc0487a57dd905a5e74dc704be26f45ff234e9724717e40ef613724d179f9d7cf2972db040382d92aacee4ac SHA512 2ff20b82540b58005a133433d99d1a613c13f95fe4f234f57a9027af33111a393a62d7a8b20ca22f84ae8b4e6d92d7e40fc610d1c2f22daf92fa34a6a593df3e
 MISC metadata.xml 390 BLAKE2B 68a4ac0f10db2378637f420d4bc3d8d80fefebb51302c38d95611ebffb06ed816e68bc7859bd7929c8edfb3fb519d61f2e35b98372a6bc2dfc79ebc5ae9907bd SHA512 e36e22cfded440f5e241ac9ea3a4c1cc5a47155355001f5979dee66fc84618edc8c139ad7126d44a427f45e82c2fea5cc6d458ec01e6f1fad2d2c83eb94ed68c
diff --git a/dev-python/django-baker/django-baker-0.11-r2.ebuild b/dev-python/django-baker/django-baker-0.11-r2.ebuild
index 94ac541baad3..7afb5db2e998 100644
--- a/dev-python/django-baker/django-baker-0.11-r2.ebuild
+++ b/dev-python/django-baker/django-baker-0.11-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
-DESCRIPTION="Management command that generates views, forms, urls, admin, and templates for models"
+DESCRIPTION="Management command that generates views, forms, urls, and templates for models"
 HOMEPAGE="https://pypi.org/project/django-baker/ https://github.com/krisfields/django-baker"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index 53099091bef1..b74511ca9299 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,5 +1,5 @@
 DIST django-cors-headers-2.5.1.tar.gz 21976 BLAKE2B 554b6c6ed737d8bfe34f3c87f67cf48a5bb5b838c3054d908ceae5c8716a51a69e55b82e9dff8bdf186f23bb24ed32ab4e7f898b23f27a132330cae5323ccd86 SHA512 b321edfd69103e3389acdd3a552e9a36c8c5eb78be01230c5389716d2d2fc81c7cf64003b6ba3e6f46bed5f6d6b8b68b1dfa923a9e8f98c7261412e17f7854a8
 DIST django-cors-headers-3.0.2.tar.gz 24497 BLAKE2B 06cf666981542607a538550b2429cad7eb2ebe58bcb0eb3e0f4a6b59f17a91b3caff9123ab3c9b133814f8ee6cfa2ac7352f424eb8a676567fa1775fae708185 SHA512 fffe3be64ba095357dcd4e370a3aabbb848be5f886cd2beee8558d3f5f9aa849dacb2f40e0159013fa050eac42d04764e35893ff983a476b20783e3d8083e720
-EBUILD django-cors-headers-2.5.1.ebuild 526 BLAKE2B 19350fa886ed095b1f4df584128693338ffd4070593e6f945cbdcb45b3bde89c2f30a56e673d0a97031bfbf9dfc1831bde3339b5683f8f7fa2cf5e4a151a0cd2 SHA512 a1c095e20005240ba1ac4e7470835744e871dcd966d361dc24e09babbc773c286c1c0554eeb07863f5de7bd5595100e80c695ab0029d124f9144e7eaf296aea4
-EBUILD django-cors-headers-3.0.2.ebuild 526 BLAKE2B 19350fa886ed095b1f4df584128693338ffd4070593e6f945cbdcb45b3bde89c2f30a56e673d0a97031bfbf9dfc1831bde3339b5683f8f7fa2cf5e4a151a0cd2 SHA512 a1c095e20005240ba1ac4e7470835744e871dcd966d361dc24e09babbc773c286c1c0554eeb07863f5de7bd5595100e80c695ab0029d124f9144e7eaf296aea4
+EBUILD django-cors-headers-2.5.1.ebuild 522 BLAKE2B 088eed6a914b5e089672bf1155931826ed11826d7d2b3067a7211655a185e2ea2e5ec31f7c8c6c976a5461382ef2ecc605e776a8ccde614aa27b3a75be3e959c SHA512 09b08776fd0930dc39e01e9ab2bac4b6908efddde98ab5b8c0f3187a86b83b1ecd388cd436a55e74a58bfc7c4d68989ca2951dc52f37fbbccd85de37492801b8
+EBUILD django-cors-headers-3.0.2.ebuild 522 BLAKE2B 088eed6a914b5e089672bf1155931826ed11826d7d2b3067a7211655a185e2ea2e5ec31f7c8c6c976a5461382ef2ecc605e776a8ccde614aa27b3a75be3e959c SHA512 09b08776fd0930dc39e01e9ab2bac4b6908efddde98ab5b8c0f3187a86b83b1ecd388cd436a55e74a58bfc7c4d68989ca2951dc52f37fbbccd85de37492801b8
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild b/dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild
index 119420548730..c067302ff309 100644
--- a/dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild
+++ b/dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.0.2.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.0.2.ebuild
index 119420548730..c067302ff309 100644
--- a/dev-python/django-cors-headers/django-cors-headers-3.0.2.ebuild
+++ b/dev-python/django-cors-headers/django-cors-headers-3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
diff --git a/dev-python/django-crispy-forms/Manifest b/dev-python/django-crispy-forms/Manifest
index a495fb3c3a81..d01c2cb119b1 100644
--- a/dev-python/django-crispy-forms/Manifest
+++ b/dev-python/django-crispy-forms/Manifest
@@ -1,3 +1,3 @@
 DIST django-crispy-forms-1.6.0.tar.gz 118917 BLAKE2B f504542164a911a8bd682438a14c949072415fbc84b28683004595cc41f51142de77d894649093e96444f85076fe145df8ac974c536413289b905d2ffa09cedf SHA512 8fa46366d2f3376f4190c219a624eaf983c19243db25d6c1723917ab5f8c2d9087e2228f3208df8bd35ba26abe00f6cef46e1e3ca0c0097282d292a217f977f8
-EBUILD django-crispy-forms-1.6.0.ebuild 759 BLAKE2B d62af12152122ee92a81c5d0f87a66ea0e68eedff65cf3767913a5e468771d1c0c2733fc1a28a6f50161bb8872fcc00a686b9defdf4765281c66cb79b86b4ca9 SHA512 10c89611cda5a0f72ee7405d5437a39c7b33284d0b17b3f3191a154eb8223c1c9e9abdf96160caae42cd4005bae08f833a57077fa94d888496171906bb599e61
+EBUILD django-crispy-forms-1.6.0.ebuild 740 BLAKE2B 4668b3ff7684bcd62b4346f46d48667a640f96edaf1deb3a45708f5a90157388ca81446f19fd602cf26337d594f0e31800de43e36ed98912d3b2f1e0c7217575 SHA512 123f0c8915b1560d88706cb819857203d2d284c6f3cdbccf362ab166dffb6d64de96e9ebe81782c3a9fd36988a655e5fc0660a8434cf1c6c1354aef0bed83da2
 MISC metadata.xml 402 BLAKE2B c61be2e0f2d026adbe8e188417282dece87bf014f2d5f7b449dcddf8d05b5ea7d0c21fd53a6731862f55c894ca22bf4bf0d85e66214fde90a3373c765e391f9a SHA512 131cfc83f2e89f8bd0928d7663cb6272f20532b2a431a7a33171a9af76c6ab4edf02d2c81a4644ef132bc46cf7c0d997935bf34a665de8267120c11e09683ce9
diff --git a/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild b/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild
index 7f6eb860279e..4e7dbb1fd058 100644
--- a/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild
+++ b/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index 6ba949b602ba..f40ecaa3c821 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1,7 +1,7 @@
 DIST django-debug-toolbar-1.11.tar.gz 321727 BLAKE2B 89eab65bc0306da9fd81affbffc312eb99d04f19c66d9e5c6016df323a987e1b3fe1d177d409d68548aede869ed6d3e71adb5f4f4e5cb85a9ab431eca5664033 SHA512 8085b02fc25571e7b3bff02ff2bda8bec81a6000c6ed9e2aea10ec45eb1a3e5adf2ee95fcfbb0a11660fd716ebf2e35a9bdefbaf767b4afc732368a197857e62
 DIST django-debug-toolbar-1.5.tar.gz 315928 BLAKE2B 8dde3c655baa6bd5f3b5d3ae0ba57b8c5746fc41bcfae9f506ad5c49ff64cdb51f0b9d67ee42695f884493cf21bd76fdcf943d88d97641b5d804d54c59163562 SHA512 9a421b80016bdaee8dd3ba2a9b7c3b788b54a4f464cdd5697e36536268e4d3d926bf77088a715e87f192dc8a20a100d8adac68c9c26a1191a5343e377240bf64
 DIST django-debug-toolbar-2.0.tar.gz 321249 BLAKE2B cd4f9e7d55deaf404369ba89eaffe0c730a058450c8368e39bfe3f5562019f5978ff33b93dc0463dc0fa6e6ba1047335d45997929dc3d2b576a78ff7cd5f75f0 SHA512 8440705a2e38f2c035a1dde4eb14ec829ead502cbbebcae46889e26877c0843389107bf14249afe9742638c4880b362fd699aed935e271bc1ade8f0a54bfea46
-EBUILD django-debug-toolbar-1.11.ebuild 1301 BLAKE2B e1426c5988f311865d1972cc9df2cd82fbb23cad66c7ec94fa196ea03bc8a13fe9214fd1a1d2e271a2da758c60d759c0f1d22e195f363783d148fcb7255d649a SHA512 71294d8c6a94f953b2e1f21b4fffc92de2dd8d10db426290958fcb67679b1c77162ba282d16e1de5fff167e3ef656d69396bce77c0c30fb5329fbf38016bd5ba
-EBUILD django-debug-toolbar-1.5.ebuild 1313 BLAKE2B a9fb7d07e661e388456ab54079ce87063ff5ad9c3296d840c30c6bfae79a70805aa3ee0b63a4028c93697b287fa42e4f5ffc8807a5a70256cb756c8bc35dd7fd SHA512 897090a64218ae85228e6116864ab4b76ddf0dc2a512e57811b5197ffd3ef6d9d6f315e40515e6e01b55bf559c76c919c6511b79e4c38576e5d580f1d1d5e5bf
-EBUILD django-debug-toolbar-2.0.ebuild 1301 BLAKE2B e1426c5988f311865d1972cc9df2cd82fbb23cad66c7ec94fa196ea03bc8a13fe9214fd1a1d2e271a2da758c60d759c0f1d22e195f363783d148fcb7255d649a SHA512 71294d8c6a94f953b2e1f21b4fffc92de2dd8d10db426290958fcb67679b1c77162ba282d16e1de5fff167e3ef656d69396bce77c0c30fb5329fbf38016bd5ba
+EBUILD django-debug-toolbar-1.11.ebuild 1297 BLAKE2B 5aedb07036e862da7777f4ca3c7b517b6d2bcc86e410022dcf820a836fe9aa789c1c421435bb68cf156c6fd142cee0138d985cd4cfafcc73f2f7a0fd93a7fbce SHA512 0eae2860812de37dfd53874c046d61e9969530b77e5c71999f79630020467b7a9cd9284250d26994f192c996329c48a3ab0c5f1a114f2cfd5df9c5c1b3974e6c
+EBUILD django-debug-toolbar-1.5.ebuild 1304 BLAKE2B 42efdfeba090354dd1c38bbf97c53b89f33a4ad3739b552c3a4cffd745af91363d11813e5580ee197c808f0dc10c67d2ee592f9a6d9444b03ecd679eaa85fcf5 SHA512 90c1f39abf55da49a859e9aa14a8fede8ba89ba20e03844ec4a8490d7ccf3d3c6e68ea78fd25fa4b9fa36ac5886880c9cdafb6b555ad39a52ff6d7d560bee0f4
+EBUILD django-debug-toolbar-2.0.ebuild 1297 BLAKE2B 5aedb07036e862da7777f4ca3c7b517b6d2bcc86e410022dcf820a836fe9aa789c1c421435bb68cf156c6fd142cee0138d985cd4cfafcc73f2f7a0fd93a7fbce SHA512 0eae2860812de37dfd53874c046d61e9969530b77e5c71999f79630020467b7a9cd9284250d26994f192c996329c48a3ab0c5f1a114f2cfd5df9c5c1b3974e6c
 MISC metadata.xml 356 BLAKE2B c0d02bcf9ab38d7939a3edaf8eca080283ccee6f95f1e04ac96ce5870845e6a84d6672d6ac923c74d18c340326bca379691946aac7a51bdee8d6f4adcb45a50e SHA512 12686662e852b0283d2212f0db83c832c1248723a7cd751990e43b1641ddbad2cc2c71c17ac4704c01beec9a9366fc726504c10e9a9e56456b544a800cfa7847
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.11.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.11.ebuild
index fe591fca5ade..4de469ee23f2 100644
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-1.11.ebuild
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild
index 26b0d7172816..e0cda67f0415 100644
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-2.0.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-2.0.ebuild
index fe591fca5ade..4de469ee23f2 100644
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-2.0.ebuild
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-discover-runner/Manifest b/dev-python/django-discover-runner/Manifest
index d85240e7488f..8d135e323f50 100644
--- a/dev-python/django-discover-runner/Manifest
+++ b/dev-python/django-discover-runner/Manifest
@@ -1,3 +1,3 @@
 DIST django-discover-runner-1.0.tar.gz 9190 BLAKE2B d8f1c0b3ff65b7e0432f6f14a01ffd7309ff4800267a35fa9ef882c512c15e4ceb0013ed958b4bb908251376967f2c3a513c4c9f147a9eea3a8d70e089f8d6c6 SHA512 669287ed7f801dbfe949e2affd9ee1861aa6a41fcc2e2403dc2e106dee3d23c8400d686ef750242bdc74d23eaf316fcf36071c82d7c458ff724305e5fe27410e
-EBUILD django-discover-runner-1.0.ebuild 571 BLAKE2B d3eceecd8b9dfa1f17ef5d3ccf46a86c78f70f0c78caaa7ff0fa002d3b3c01dce61c2966c812c4a41742624844cc2406cb6cfd45f77e0c027227e3cc93394edf SHA512 81baec37ce245664bb29db13bcb6d657a8496a488d58f9118a4c2dcf80d6d4f89607a3903cd5a72fbb28db3dc9c1389bb9efb9f15d22a3ef4e6006557f6243d8
+EBUILD django-discover-runner-1.0.ebuild 556 BLAKE2B 46443f67cc79ee46a414b3b95ce3bbbebc5520cec7484dab4d9a597712704ef6c13de58232fa2ae1f9585559de20262f1aab1d06c90fe5cf2e8fca6a11bd3a4d SHA512 8ec3a1cfbdc62597f2a41f7e55775d0d71afab68573387558ed4a4c1b81619b2a6b618537bdbe7b5956609771604961669c5c9cc437a546aa9cd0af32c22ae8f
 MISC metadata.xml 406 BLAKE2B 2e2b7b5e85bb57395e115feefaf1781655817b3eb136084e91459025daef8f16be978b2d08e542d4a60fd65782a8b231e9fd6555bf38c2dfd4811de1024f7648 SHA512 13d865780d9fe9e3eb890cf31edde99e0b4cf16aacdd1ec6347caffd427cb867a038b28221a1a8fb3a62d0933700c7aa8831d5ca52c6fd9a822e5a113feb99be
diff --git a/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild b/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
index ee4e23a91337..ea83c0c6569d 100644
--- a/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
+++ b/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-durationfield/Manifest b/dev-python/django-durationfield/Manifest
index 4966cceda558..3dc3df40b935 100644
--- a/dev-python/django-durationfield/Manifest
+++ b/dev-python/django-durationfield/Manifest
@@ -1,5 +1,3 @@
-DIST django-durationfield-0.5.2.tar.gz 4324 BLAKE2B 392587843c863db5fd6263f4f7839dffa99b5cc4304b691febbf3921fe3893af459d64809b1cabda68614d2df4b9102b8401108a488b0c30235386e80c4a790d SHA512 de0ea6b9b86cf29d4a5813a80cf7a02f66d0774b58266799e83f8e734a1cf071352ae57d8f8ded8fb16f9a74dd284a4c146d98f75a78bf0463bf767e4156b3ad
 DIST django-durationfield-0.5.4.tar.gz 4728 BLAKE2B 446a5b361cc54bcc2ae375caebfe2eda64114e3e326e7d60fc8d4ebe5c6acf59d80e12e246ecf5ca7edf44a1f1068bc3b17d841b4d39c7317211c87fc03aacd5 SHA512 84885ab7bb07ed3c5a64094a2beb7d4adcf8b0f9f2933ad2c1d4654789bd71aa7d2efd5c84931f22f81a51e8aaeb3ed9415a12c69dfd7354c2317ea912fdc610
-EBUILD django-durationfield-0.5.2.ebuild 516 BLAKE2B ea5202a1e57ba2a29a9314776f37ceb2cf21c3d9339766529dcb2fc76059c90d11ad4c531fb62d85b0b3fd8846c5e789a44e9800cc6bff8e61489100d02b2432 SHA512 cdb7518e26e0937535cdd26bcd52664d80caaa754d13f686e93b588a76563a3bb56d2f1afbe50359a4f7956acac410db749be3320aee8c3dfedbb5f7941ce3e3
-EBUILD django-durationfield-0.5.4.ebuild 526 BLAKE2B 679508e6ccbf4861b453926ad9e8cea2f47f041fb95d055b5f8716bc4eae95df019584920ac519189e8cf4c82aa2cfc8b0af0854472044a54499746b7df803b6 SHA512 0d7880697d032dc9e3c1eaaf7bf26c1896bf0c779207ae136883f343c885e191d9743ed1dd9b54cef8894fb7abcaec565cf584576e7eaaf8d435946f3ae0ac24
-MISC metadata.xml 306 BLAKE2B d584c1d81a2a4da4af3930a9dfe07d77b74a3e63182e10a6e46e321d211d360d7e375d509fc4030d883c04a044711a4f3405e0c7ca610274c760be8d45121b72 SHA512 cc5573cdf78e3e807e1a8b908b4f7f10d59b30410f9e36d4b441057b06e535be150990d8ff3b147ac4ac0ff36f37c392c78bfae259a4419a8469631c99c432c1
+EBUILD django-durationfield-0.5.4.ebuild 516 BLAKE2B 7d93ab366d0184eafe9f099b70f0ca13a7abe0225b3f2a1fd69425692778900570448f96bc9c6dd914bfdf738ed4814c02fc9d936887c6a8305c7f57c7b683ca SHA512 aaaa624f412a0fefdb0ad0efcea534e58d5e6aa72e01e0bb34fc6115f877464ef083c29e8e6bd59a7e6ac83e22441e58a2b2f448f179d0d428772007d7af3451
+MISC metadata.xml 255 BLAKE2B 0924bcb4f88cae2ba7ac0c7b4e08370e7f6699507728964accaa7fba4febd141af2770f6015f2505089f0eb800a7fa5d163ea4f4fdb5b353da2f3f937f9f0d34 SHA512 5281390bd91b60edc73c823a237c08d70f70a721628c751652ded7fc4827d62f980d1be6660b79fd237cb4b022e9a979796c056f72d8e8051a2a922940d92678
diff --git a/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild b/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild
deleted file mode 100644
index a7b15fcfaaaf..000000000000
--- a/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild
+++ /dev/null
@@ -1,26 +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="Reusable app for adding a DurationField to Django"
-HOMEPAGE="https://pypi.org/project/django-durationfield/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.4[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild b/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild
index 00dfd96732da..2e15cf09d7f0 100644
--- a/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild
+++ b/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-durationfield/metadata.xml b/dev-python/django-durationfield/metadata.xml
index 1eb5e3f6f601..9243c707fbe9 100644
--- a/dev-python/django-durationfield/metadata.xml
+++ b/dev-python/django-durationfield/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">django-durationfield</remote-id>
   </upstream>
diff --git a/dev-python/django-filter/Manifest b/dev-python/django-filter/Manifest
index b98fc853e793..fc624239b2eb 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1,3 +1,3 @@
 DIST django-filter-2.1.0.tar.gz 142256 BLAKE2B 0763c3032cdd857be30050caa27af6bd938030c37cc52f30c98ab751c81dc8b2ce0c974ed19ae8c859347fbec2139b27a08657e99c83bc8e79b8883196050897 SHA512 e917ec0fb1cdb8f19e6a7e50989d2df3697baa0bb50eaa62f5916cc0fe000e1e3594672a312114ab761d49b9f83bf7f5c1f4a35f4014c113ac9387a9bf086e10
-EBUILD django-filter-2.1.0.ebuild 528 BLAKE2B 3ad2b28a68159a793a4de193499b4512997c6819f40a741f481219d2b852fc6783e297cbcf3255363641a1317a06e18ad0d3ff5510adc7a9ec19cf8176d63d1c SHA512 a806fd29cbc0493447d9d7a2651fc477c4a39c6d76384dc618875a23e7d56125384be507444b34051ae279fe38f7cda176b7c385c815b1a417afb80278fdb7b3
+EBUILD django-filter-2.1.0.ebuild 526 BLAKE2B 4e0985fc759b077956427b919d99ffea3b0b11b758ac932fd348c07bc7b22576d496e8dbdc74153205b665d160fe66801ba1115ba79a70c2ae2368dd3827c79f SHA512 3c9ddc959d9ec17fbf180868f69aa1f4d1f0d8e1e439ab9b5701d0093f43fe24d3e8a689733a744606b8b30ac6088cbb9b58fa75d992aeb8aacf4289f26260f0
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-filter/django-filter-2.1.0.ebuild b/dev-python/django-filter/django-filter-2.1.0.ebuild
index 7d8f90c3d053..7ef108480967 100644
--- a/dev-python/django-filter/django-filter-2.1.0.ebuild
+++ b/dev-python/django-filter/django-filter-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Django app allowing declarative dynamic QuerySet filtering from URL parameters"
diff --git a/dev-python/django-grappelli/Manifest b/dev-python/django-grappelli/Manifest
index 09843fe35cbb..f7124ee16ef9 100644
--- a/dev-python/django-grappelli/Manifest
+++ b/dev-python/django-grappelli/Manifest
@@ -1,3 +1,3 @@
 DIST django-grappelli-2.7.3.tar.gz 2288581 BLAKE2B be59c590ac7aa0ad429d6680b58b3c315e2c906641f4d532dbd343bf32d64f22586780634f49479ae6a208085098d13aeeb89d3c0f1f43b1ec1d3c5eb4a25894 SHA512 92b252b49c63bda836cafc87f4910b7bb59072dd5ec44fb3c17140706a838257c7c5ba19170c69bc788988cd29e06af2d72278ef1732d5a94f39fb121cb28d61
-EBUILD django-grappelli-2.7.3.ebuild 514 BLAKE2B 6054db69a2d85399995047afc7e70af004024764f599b365764389d4acc3691dd7c90b5b1c162601825c262386f20d9a8222f0fa54bee1a4015f825fb4919e7b SHA512 8f7ec795858a441d8612b0fbd40c0cde075198fff861c941e851185207821bd90beb71f3408907d8decac03ee7538d7eaa1fb4214a5ad9b0549175df2444a019
+EBUILD django-grappelli-2.7.3.ebuild 500 BLAKE2B 292f3dadbb2a88716e89ec41c158db766f8461ab625c93b9be3a79ff00103d03467483686dd75905f0995bf25869ec724c72a315322804adce50d9614d831680 SHA512 605a766090cec548804d52e8013b9ea65f8c37b4f9c9f3a312fa56456f580f5b8cb5b7dae8715e730ae873736a8143bb61b26845a185608fe8ffef824ba2e2b1
 MISC metadata.xml 387 BLAKE2B 89ee29482301cc67eb6a5bc474d5fb6deec4b0e7925708b35cdac828e7d14388607662eba6cfabe79258c74dc0b98567d611e71953a84c9e3e7bdcadfdbb30d1 SHA512 28da3373aa6c6d9353342e3ab185c4345ea881eb0b32e8b3b915d111d7a5425fed9fcf64b802d0bc399aee168f5f65649f05f46f398f3ea164e0a32be819d339
diff --git a/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild b/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
index cffef30fa3e6..90a264778388 100644
--- a/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
+++ b/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-haystack/Manifest b/dev-python/django-haystack/Manifest
index 88741b5f2854..c7e58f1b87f5 100644
--- a/dev-python/django-haystack/Manifest
+++ b/dev-python/django-haystack/Manifest
@@ -1,3 +1,3 @@
 DIST django-haystack-2.4.1.tar.gz 160757 BLAKE2B b45fa7f3db1b90736090dcee3a044377c3906c212df6927f9b712b8a8e6d82e6ce5a56e6d85c32281ec98e8df2a256ae9c0ed9d91fc5f0bf45cf47a1cb55e064 SHA512 5d711e13abf3fa7db5cbac31ddcdc2842aafb844cfafd8bad792aca8dfae8f91fa7586af8aacf266bb12e02aa04ad9aecfe903ae40d10f72ba38e0c4b1b1b298
-EBUILD django-haystack-2.4.1.ebuild 1227 BLAKE2B 284e46bb64d39e3322582b09f37e5df9d30f1d0e4773bcf4f441f1119e91fd6d6b45d2401165158af169876594293609352533b7362c813a0c6907b8861a59ac SHA512 1949f2d3b6e95a8d154949a37b293860533ef895875e9fc0cc0cc8c680b5175aa46056aadb26b19173b16f4d801c85e071c1f050f5ab97582546fcf38c646cd1
+EBUILD django-haystack-2.4.1.ebuild 1208 BLAKE2B 596847c0ee5e541021a37c097b2be73b8db6f25254dcd729da13a12bf2e4858baafa062694ee83e3179f5c7aa82ecb5b0a159adfb729c64f14eaf7e6a3925f3a SHA512 09be3d7f1b54ec3e352cbfeb1f83261037f5b58c9127f18576d8aa6981d555978811d5927ea0dfffd46d77e5556f4d080fe01a61990cf81d25905bbd236c77ea
 MISC metadata.xml 328 BLAKE2B 0bf2ad41ce29ce4889784f73dbbf4dda5b76abe4f066f178c926611a20d27e608cf94b30fda06761f4b26bf0ffd7a1ddb643b0348249d58f4e4283bcc44b89b0 SHA512 4e0c90a27864f5a2106e1b665b98a69de67b13bd03343b9c3b82eb2f7c8bca1f8cdc82245157d687148adca108ecaddfcb202440d4f049730375e4735ca92121
diff --git a/dev-python/django-haystack/django-haystack-2.4.1.ebuild b/dev-python/django-haystack/django-haystack-2.4.1.ebuild
index 4085bc78e95e..54d73485aca8 100644
--- a/dev-python/django-haystack/django-haystack-2.4.1.ebuild
+++ b/dev-python/django-haystack/django-haystack-2.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-js-asset/Manifest b/dev-python/django-js-asset/Manifest
index d8a1664f3396..676713341fc8 100644
--- a/dev-python/django-js-asset/Manifest
+++ b/dev-python/django-js-asset/Manifest
@@ -1,3 +1,3 @@
 DIST django-js-asset-1.2.2.tar.gz 4436 BLAKE2B e6b2ff1b2b90da5ae95af08b28eb1970e6e0edffee7eeec0a4697855040c4afd0febcc569d0a78c46bca80835b404367c426019016e5089b3aed984916e13cc2 SHA512 ea050c5093abd8312733b1402e275fcb44f0702c27e28aeb64d0470a8514cd85906707915556a9878b669c96918813c4bf2b69d281d33f18fcc7c143f8ae9f48
-EBUILD django-js-asset-1.2.2.ebuild 508 BLAKE2B d1e7dd5cceb71484db4461dc4b9715b7f3ef04af48a4f41c0ed17278452d970ba6d70835dd87578aaef194c823b2d5b0e65ef78b7dd99c7f1b9720b26de5b2d2 SHA512 c57ac5fd4fd45c1c78ff3a7e18b5c541e8173fe9f2777e5f4cb0aaf6cf55cccdcc1f40c4bb4660e2444c82435837d6fc62a978c02590bdba222348309568642f
+EBUILD django-js-asset-1.2.2.ebuild 506 BLAKE2B 0a3ae84b838fec557bb5d788f217e3de939e50dec95a96e57c8dffd9c02b94b6135fdc05d7c52d21ff7cb3ede0b92a3bf370275a959af345fe80ec6566d456fc SHA512 97ce93a17f2c05212681869fea7ee00dea93bdbb35a4f372b5fedf39f55a5cf5166a72d252174491f78a01fa3dc18c10fc7f3d943d68e706ebba880df0a266c7
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild b/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild
index 9f097d63ab2b..c252e0ece1be 100644
--- a/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild
+++ b/dev-python/django-js-asset/django-js-asset-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="script tag with additional attributes for django.forms.Media"
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index 79ffb8f0da25..dccfe247f2a7 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,3 +1,3 @@
 DIST django-mptt-0.9.1.tar.gz 95615 BLAKE2B 980bd2165a66da0af8e5cb877e42cb9e7deaf7c2bfc09ff0125753127a07f4bd546ba98e10831878fb9c5fd254bb95d5e2be0c2d574d35f4eb06fa6d4f9db74b SHA512 54e0d36fe4893846491cc253d9010024b53eff4c6570e77cde33257844dba36406ad56f4dc13a586806abbc4e53d4864101002227d5c5819c72926b45100914d
-EBUILD django-mptt-0.9.1.ebuild 565 BLAKE2B 68f180c0c178e6845f211e2ce8660fd9aaf897c6d9698bcc4fc71f1d47698853a195e5389164fb1fc77f8304899ae6d58db01fbeaefc9fece1488e65378269ff SHA512 bdb93db0d84e738feb0ba438b19b6d699060fc45e75c4a1e02fd81ba92eed53ecde2ffbc77f0c2ced6ef49e7a8298cb86682bd90b88e3fcab28af351a43f9d11
+EBUILD django-mptt-0.9.1.ebuild 561 BLAKE2B 4019b54e38fda09487ee155d7749c9711bcbdd9df27313379dd5b07877cb98599f7b214972145b69a4b4016e476b2a80215f8cf5d6ce868bbc53e05bbc0baf32 SHA512 7dd7055b9a3260f9a99a3e7d74059f1b117c4651a681073673120eaf6ec902362c0746e59f4890e3c4ef4172e23014b3dd26877190d8554f0c4593495d98bb42
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-mptt/django-mptt-0.9.1.ebuild b/dev-python/django-mptt/django-mptt-0.9.1.ebuild
index b091eb73e430..05f63059c92b 100644
--- a/dev-python/django-mptt/django-mptt-0.9.1.ebuild
+++ b/dev-python/django-mptt/django-mptt-0.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="utilities for modified preorder tree traversal and trees of model instances"
diff --git a/dev-python/django-nose/Manifest b/dev-python/django-nose/Manifest
index 0e3c1c7fada4..40f9368b9467 100644
--- a/dev-python/django-nose/Manifest
+++ b/dev-python/django-nose/Manifest
@@ -1,3 +1,3 @@
 DIST django-nose-1.4.4.tar.gz 44266 BLAKE2B 0c2785c98350b55df332eabb534ef3a614d961fffd8f44dd9e74c55a55e298b16c4963bfb389945fe76dc7ecb1e344104a8fe4afa35219ba748a8c7aadb97dc7 SHA512 b69af1e8539f7d792e6c9ef002cbeeee95bd144148d55850a49e2759784b68ce07e19587365beb06cc138136498c0e952f7b16067567a5a2eaa31e9f4d47b8da
-EBUILD django-nose-1.4.4.ebuild 753 BLAKE2B 507a6cb5c799ac769de148fcffbf9197e6b2c3704aeee2656db3dc5ee0e5295e4777ca44ffc46c8ff8d11ec32b6368277188736e2bba02f5622300d4e755e9c8 SHA512 d071de4dee485334e3c3d0174105bdaa8ad27662dcb3a88a48192057a68e1bf2bacb8bc4317900774c56ec3e3918f1a6f56e67a9fb9236c97eb1a838994ce0ac
+EBUILD django-nose-1.4.4.ebuild 744 BLAKE2B 189587d072af5b7d82ba3c310d07caec4a53778ffe68edd27bea5c55d3096e243fefb3d8c6f0c3cf0e584c31ca6cc311f4534e929c6708e518f7363920d78e4f SHA512 cfe92f9deef96d99830e9d0c17a07217ba100b9a6a6ff9adeabe0e809ae997b7a707bd5187f8c0af67853d92ec5e14921658a5a8991201830553881624b6615d
 MISC metadata.xml 385 BLAKE2B 776c504bb1b47f0bf19fa7e138b0ebdab5b8007e151e43d317d66f4cc9f3e5c273b710efd02edb57a923a37a1ce898a65b45d81232a4badb3b2da6ef7f77536b SHA512 39479b284469c8d29f60d39a8900ac5894c207706c4f141c565a52694b0fbf69b08ac77ca0dae44ec724e0548fee5a160a5d194033f06a53dea867787160a126
diff --git a/dev-python/django-nose/django-nose-1.4.4.ebuild b/dev-python/django-nose/django-nose-1.4.4.ebuild
index da15ae816bad..63446e95b0b9 100644
--- a/dev-python/django-nose/django-nose-1.4.4.ebuild
+++ b/dev-python/django-nose/django-nose-1.4.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-oauth-plus/Manifest b/dev-python/django-oauth-plus/Manifest
index 0654fad59df4..5ebe3aea9acb 100644
--- a/dev-python/django-oauth-plus/Manifest
+++ b/dev-python/django-oauth-plus/Manifest
@@ -1,3 +1,3 @@
 DIST django-oauth-plus-2.2.8.tar.gz 25911 BLAKE2B 5356257f2d95fafe40ae8d65e7baf5ca8b3b7269151acb81dc5eac74fd1bdb97100a916fd406a4116ba2df0b6c0f44f561abefcfb059cc1520291d04eab5a66b SHA512 9237a2e2e52923b2fdfd3b7feff63e11f2c06c871faca3455189edba233e2a6513169481092f413c3ddea1c919f4b995fb465a505935388f1d803d094942ee07
-EBUILD django-oauth-plus-2.2.8.ebuild 946 BLAKE2B 83854e9d6668582efff9b3c4f5d5ac1773a89c601e932d0de1d207b304f0754b7f0cb52dc9178a1378540a08cf884a9f4c55ee49166c1e390451b89732bdfa76 SHA512 4837c02f8d5ae43e42c77cad79b0e3a27c7e2f1655d64a80d2744ff2bef57686aae7ec2091420f7b15ec0d4e07f9f8f54e0751893248da136fde6a50e5ac45ba
+EBUILD django-oauth-plus-2.2.8.ebuild 941 BLAKE2B 89b994fa3269ac019a872ea14aab6d9d6a0f038daf68c4bfe92fa2d291d96566ed1ad32d3dee45eb3e666652c981c0678c63636e6bf110fe09f5291b08bff1d5 SHA512 0147fee851228d6e52f2faa1791fb119f83de1f54b62bdf2dc7f2c4b562a7ab24da936f8777426db074c62749ace794f61de5512c7d70829b296b82a530424f9
 MISC metadata.xml 320 BLAKE2B 5b0abaaa21ff82ce24003879834e0b77cdd6701e3665d79f06d2a21594c5f50cab033628ad7ef8fcbb2eb6aa387b96f569b4eaf2b3785aa7482da4d064bcbeff SHA512 c5ca167dfd305e47ddff6d68b5d473ec4c98cd869eba30148fd3cb82dd7d105717a70d5e50f519263c8fbac5e41108041df1ce972406262b170aeb2414406eb8
diff --git a/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild b/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
index ff7eed513bd9..a26ac9639ab4 100644
--- a/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
+++ b/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 # Testsuite written for py2 only, no indication given in source
 
 inherit distutils-r1
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index eee567d6805f..2cd6f3558e09 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,3 +1,3 @@
 DIST django-otp-0.4.3.tar.gz 42480 BLAKE2B 09398e4e06425fefdda45a3a200576efda9409a42fb8f1c640a996e066e1ad2cf47e6ee0879e4a61cdc64808fe8f030aba19dfd99fa4da7d3e86597bda881d09 SHA512 3f3ec761dc12ed40e8c757dfbe1fd951c7c6aed3abc311c823acdeca08d5864b54c8442a49807228be17b30c20093b1ba7fb8b2c0f86f00dc1cc215ccd7c28de
-EBUILD django-otp-0.4.3.ebuild 534 BLAKE2B 23c03b53ef1dacf6256f90582e9cf9b1b5d1472a7dc1fa45fcee7b75cfb399171823d0d86dd2166c1e4c4053e334cf33fb672e4095189e5a914f327b9ddd4301 SHA512 76a2d0263989851bea7141d8bccde325632452dfc0b8750b70f59870e6348da77d7b75929352fe85de3fda6d85786ecab06bc61581b9061d801d00b00fc93b72
+EBUILD django-otp-0.4.3.ebuild 520 BLAKE2B 31eed615988aae630bca6a43529942ae683040ddfb89cc12eb5e9650afea430e7783bfdd47413dc7794ad4189cbe8664ab47b0f5c55df23636d631e06ff1c2df SHA512 1ecc8d9ea839367fd9e56e8d1e41cb9353d4e69a36ed75d8e40d34bd525fb3c7974e50a0840f0af6afe5cb6cdbcda6f4ad5f6d533c996d5bd94f1a518fa3726c
 MISC metadata.xml 308 BLAKE2B 4ab31e91721855334918e7c51072069b20202977309fe1e9509952351500a59b7daea3adafff99e44bb4ffdef76e900716e7718fefe3f4bb3f790a80955baf6c SHA512 06e2750aa7131626332ae0b473edb21ebba3ab26aeba63fde2dea4520c38a8e3d94e18e5f4aa5c759493059aa127858e1595975503f6a723611774d7fcd2550b
diff --git a/dev-python/django-otp/django-otp-0.4.3.ebuild b/dev-python/django-otp/django-otp-0.4.3.ebuild
index 52f70437eda0..1ebfccdd56bd 100644
--- a/dev-python/django-otp/django-otp-0.4.3.ebuild
+++ b/dev-python/django-otp/django-otp-0.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-picklefield/Manifest b/dev-python/django-picklefield/Manifest
index 93690908f584..70ab9262b6ce 100644
--- a/dev-python/django-picklefield/Manifest
+++ b/dev-python/django-picklefield/Manifest
@@ -1,3 +1,3 @@
 DIST django-picklefield-0.3.2.tar.gz 9715 BLAKE2B d9a92ab8bbfa6af7fb6df18cc9b0d47e73183f9df7f7d6970cfbda8ba6b05e55b177660c97da9cd5c4337f4eb8effb635f6ecf0588c0dfb78d50750f8609df8b SHA512 4a6f3c3cedf3d44d232e5801a6041309949dfe551429ddb06535c97148010b14dd40ef6a4a8f1c126a35185732ab319dff53d14da243933ac3de561ad15c0c2b
-EBUILD django-picklefield-0.3.2.ebuild 560 BLAKE2B f5f1ad03057505ff0034ed6c4772060fad844207591c6b67718a42a8bc1469fc720617047b40a5a4735afc0e1bd25f9dc2f2e6dd2b04f7e5e25db129292c56f3 SHA512 1190ff03596207d89968d6aa37e8ecf161bb227fdc85a142543a32959f3492f1afd6a86a15b9bb104905b3272f4f778d35a1e89faadc5ac7faf88a2d7d8586fb
+EBUILD django-picklefield-0.3.2.ebuild 550 BLAKE2B c88211753a58b3b555298d3e4854047e1ff3b3111f2a18a50488aa258a36aff9ad0c06580a90cefc11e2ac0a2996fe0b62f9bf97b563272cba2b27547c493b34 SHA512 db0b3a6393a9b9b1806b413412c336fae55513d209f7bba65d266c5ff97ebcd046504fba9e89f12221f1d98d6fe4b586f3c87759331d9f4fb33743a9c4706731
 MISC metadata.xml 405 BLAKE2B e0c40e9144178d8e10da3b9a7a81e948c3d1cba633d31e10d8f654f3111137088485bf8685d5d20635128ab1ef767ae8e89bd717e1d8289b925d73a0275ddb99 SHA512 4f45e449d39c68d5bc139928042b1f94bafa15caf2626c871d03168df95faf3da9b3ca21e16dc61dcc115027823d0a92c38ebe9269ccb7e1c9285ebcea04f449
diff --git a/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild b/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild
index 07c5e5e56adf..3e50ea10e5f1 100644
--- a/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild
+++ b/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-recaptcha/Manifest b/dev-python/django-recaptcha/Manifest
index 697968275ecd..318b2744bbfc 100644
--- a/dev-python/django-recaptcha/Manifest
+++ b/dev-python/django-recaptcha/Manifest
@@ -1,3 +1,3 @@
 DIST django-recaptcha-1.0.5.tar.gz 12827 BLAKE2B d17799e891c083adb005de488b4d8f3d7113c4440296d2b0ba5d7a29bc0177a85543dda84511a7a80e82781133bc13be6eda63ac22ba7e471ed7e1a41a662b99 SHA512 2ccf0a6c25d242d86ef7e89705d3f299c94c0ee2fc40853db9bb8cf1f7397650dcde85f1a6d995d452d432ce947bd8fa850d64334d4c124ddc9315cab6fe222c
-EBUILD django-recaptcha-1.0.5.ebuild 758 BLAKE2B bb1578de0093bd7dd0c5b209a4b92577600eb2f9c5c961c34ffe54288bdcdeb5c41dafd7564f082b9a9b2dfcd87324198e68b2341a9e8ec6097e8845f9aca8e0 SHA512 dbcea77ffe541206d2721d0872bc40744600c8e00669f21b98335757e2b4ee91ebbdbf3308e6cd5a187446e3f8c3e90f643bf3535f0b94c0748480aba6216449
+EBUILD django-recaptcha-1.0.5.ebuild 743 BLAKE2B 48ee149dfe3170d2854cecabf9d776bf33e1c4df9578f4907b632dc746022ce270029c0652987736a00eb0b107c3472dfd7263a85ca8194bf970c272f255b8ee SHA512 a264a72290baca621642ea6f29fb78d48c7398e5d06bd00491d76795e1ab5b3cb7e972245b684872b909167b564bdbf7906a3598eeedef2085061d1e0c0b3039
 MISC metadata.xml 384 BLAKE2B 0b35dcdb2b5e934a3ca8ec179c7ae62b6810dc53ea51a58f1fbc5f30c9487dc0a3afc68f4183c3688a950115a00a867c77044f6df7e7d97f1b4bf7c915abc343 SHA512 ada7280319fd9fafeb8c9096a472bf88d1d49508733e7d847f08e33cc084f73dbd304af6be1725610127bc1ed054dbe66b74c6a3faf5c20520d4ea8d4e2087c8
diff --git a/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild b/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
index 7f4c92aa7875..20106016cf22 100644
--- a/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
+++ b/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Django recaptcha form field/widget app"
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
index eb67321ca2da..ae790688eb8e 100644
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@@ -1,3 +1,3 @@
 DIST django-redis-4.10.0.tar.gz 59208 BLAKE2B 76a6887fdcce7decaeb2c4b76ff0ff58b8b074e902f6ccfc57dbdd21aeac82fbe37367caaf0af1c6facd5b87db6bb053b2fc553ba87b3cca970f2c0b1f99e35c SHA512 39e2d72699ceb2b0887e7048db22a4067001fb5e2c10ae2c5d2d8a0ab71e862773e443ba3a109f7b874b994a842e89772b3e33152aafd2a98e1cd906d5d2e690
-EBUILD django-redis-4.10.0.ebuild 498 BLAKE2B e662a976908ae7a931a4e3cc55748605ce1e379bef8a9b31d0bdf20162455bb51e5ec5deae431f61a319650ef2ea4d6664cc6c2847a6665c167b850367c95463 SHA512 fb93326b120880402991936e82f5123fc28fb6b7b3d884d942055210691ca3008b5b4507217e264f1d0003f33cd90964673b9cb7de676a183126a453df3cb324
+EBUILD django-redis-4.10.0.ebuild 488 BLAKE2B 9734925e3c6ddb09df4f6976ff7343f765614984eee1a2fec4f8945294a896cf8d887389e3d5425c85dfcb7f8a6c456730e1f74f1033630b83fd4404c202da28 SHA512 a596767f628071fe8f69cb512ccfa3101f46fb35d06838e905e2321b5935709f4275d3b5b414ba23429db39d3a16638d79c9209693fbe990a15a1af072d52883
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-redis/django-redis-4.10.0.ebuild b/dev-python/django-redis/django-redis-4.10.0.ebuild
index 982a5193340e..6e4c252662ed 100644
--- a/dev-python/django-redis/django-redis-4.10.0.ebuild
+++ b/dev-python/django-redis/django-redis-4.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Full featured redis cache backend for Django."
diff --git a/dev-python/django-select2/Manifest b/dev-python/django-select2/Manifest
index ea3a847ab5f9..f73ff61bb9a2 100644
--- a/dev-python/django-select2/Manifest
+++ b/dev-python/django-select2/Manifest
@@ -1,5 +1,3 @@
-DIST Django-Select2-4.2.2.tar.gz 91269 BLAKE2B c392915030da188035b3a9e36e1d7f72f206ee697fa35de556cdb12f32a5183e8ad0f7663c76f1a18876d6287eab32448942ea96fc2e0438663afb804ea9ee3e SHA512 5262201804ac9cd9a13c228ba93d3753906d60bceb17ba860b855fb5106891223006acc79da9cf9d34ad32f6bcdf434f10d36135fab0305a8772f532d77982db
 DIST Django-Select2-5.5.0.tar.gz 16591 BLAKE2B 5c7ec034cd03c373d097b0959fcb827c04577c1bdea25e4881f0f7ad4839c3b55ef9bf48038729ef4939c204eba1be1b8968dc75bcad486c74c7cf76f7f45bec SHA512 c2b3fc97a520d729e8288647190042cd6e577649e9abbbd1d4ce39d9cb9a7d0c03da8f1e50f5377c67c0ea9f0d379c1f8c97da4cc477c365741a6c82bc8f1e03
-EBUILD django-select2-4.2.2.ebuild 530 BLAKE2B 77b06b7ce7f2d500c9221d7f7760ccf8a0a661fdc99c3b1548a944dfc041b9ea0f0f02064e0299e732dd722d11a1e66a6491d97d29f0542d55f709a1140a9670 SHA512 721f4180c866bfcfb89f4fea5cbf8e952e3603ac942a3c950e9f126088bfa90b147e2deb048dd2ea9054dcb06657dbb5c98363fd7b89a96aef93218e407af169
-EBUILD django-select2-5.5.0.ebuild 587 BLAKE2B 51f8096011a87dfaa7529215375555542c0d57e76a804bed3eea23464e69473f2dd120b5bf0627396733c054206b51f346064dce29c6b7a4c2b35485eb0304a3 SHA512 c4fd2c4cd97f419d2e406ca0af84645ab165a4a9e0ea6e2b74bc7bc682e59026c9a74d3048670bfa451e9874c75302950fe038b783ca4bad5c0cdca2c6b3ff68
+EBUILD django-select2-5.5.0.ebuild 577 BLAKE2B d7dfe798b5a47b1afc31fa14c508af6781d3b35bde06b777da450fa845100ec0c3eccaf804ccacb722194cc0014c4d4fc6eb5f24490985d4ecc0e9deaa32fb80 SHA512 c83fe52cb440bf62666aadef7f0eed647beadba7d2563f48c3bc8e852128871774038ee607bb78d282d4cfa1efafcc209c2680523eb8866a7ebe890430c1d4de
 MISC metadata.xml 589 BLAKE2B 512a75675314aecc91ae5f540c1f0783146f5ceecdc692e94e9f99035837c555e16db8e3bbb97fd36ad721720afbd55cf226130b8883dfe7dc03b5a12274faab SHA512 65f8b0662ed36fbf30d5b07bdff0fa8fc9fb842ba33b24e98c2b6d882020286ae9f858b5f06a9e61f53329d124e4a5e392c264f85c688ae117ec79fdb6a6c476
diff --git a/dev-python/django-select2/django-select2-4.2.2.ebuild b/dev-python/django-select2/django-select2-4.2.2.ebuild
deleted file mode 100644
index 3cc8d0994f54..000000000000
--- a/dev-python/django-select2/django-select2-4.2.2.ebuild
+++ /dev/null
@@ -1,22 +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
-
-MY_PN="Django-Select2"
-
-DESCRIPTION="A Django integration of Select2"
-HOMEPAGE="https://pypi.org/project/Django-Select2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-select2/django-select2-5.5.0.ebuild b/dev-python/django-select2/django-select2-5.5.0.ebuild
index 0348c11248c9..f01acdfc907b 100644
--- a/dev-python/django-select2/django-select2-5.5.0.ebuild
+++ b/dev-python/django-select2/django-select2-5.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-setuptest/Manifest b/dev-python/django-setuptest/Manifest
index 0689c4199cb1..407c83da5854 100644
--- a/dev-python/django-setuptest/Manifest
+++ b/dev-python/django-setuptest/Manifest
@@ -1,3 +1,3 @@
 DIST django-setuptest-0.2.1.tar.gz 7131 BLAKE2B 5afd3106c9f02da2b8d63a21e90c68db97a38f67ca36feafa6e798f9f3106f81cedc94a3155d777f78f43e549fb5656245518d5a812fb30513c59cb24d8da98b SHA512 de0ba14ca451974ffa10b2fe822e6a7a927f2009dd1cc345abd6d4b192a5d9dbd1c9034463cbfbc8b5b66ab35d694282513a33dc55e8c1b0385fa32619c3f31d
-EBUILD django-setuptest-0.2.1.ebuild 645 BLAKE2B 656ffb6178ab1875c65a97fb49053a22cdbb11d03d741104b41f2c7b403c4766b007896a454c6ffec756d4f1939080975ff186cb89369bf581ba753d5584a055 SHA512 b4d6f962c5f3fd34168413adc5fc05f3473f68d5abf83032cf7c509b9052b466b36f6999ae9591ed4526dc2503b62e66ac8d47eb3eaf30b7ffbcbf2305639364
+EBUILD django-setuptest-0.2.1.ebuild 636 BLAKE2B ebbe897a3e69efee7c5020bd3b5971a95af7484375446c0a84b8e02e9a7d4bfe0f06a1e9133cc3a679b5432d2ebeaf1d5ffbe3e5016c9c63c7b6bf3b39967666 SHA512 c0336ce1dae66904deb887546dc1e86fc08947a8c6037897c4f242b09ab166db647364da5436b8afe3e548fd6a6d93570412a656a7e4972b214af654c94caced
 MISC metadata.xml 340 BLAKE2B 77a7f56243e6f2266bb49641cfff0dd28418e4b9c9d9f89dd1e20bfdb9e3ada356288f2ff2d18b925a42701f4d0f77d7773eef117b1ef88e59d4b13341c698af SHA512 8c5b08f7e63678f303781866e98bc65821f09f296810a1b3ee891adf7c3a6cbca4202a85b0f28490cb79f17e7e452cd977a874187d9f18bc6ce341d5819a1fde
diff --git a/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild b/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild
index 76a7b7818378..a65802b12fd2 100644
--- a/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild
+++ b/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-sortedm2m/Manifest b/dev-python/django-sortedm2m/Manifest
index d009fe70f4ed..9f68cd72f9bf 100644
--- a/dev-python/django-sortedm2m/Manifest
+++ b/dev-python/django-sortedm2m/Manifest
@@ -1,5 +1,5 @@
 DIST django-sortedm2m-1.3.0.tar.gz 35519 BLAKE2B 2905722c6ea2b571ac4c6b43e140d58f33a8578355bf7a5459b670434c338b23cadff073732858692574b3d2e3022e608204c849acba6e858b9d061f72423a03 SHA512 e829ad54fcc2ef6475864d6085ee011e5146da1821095d8e9abddacf45f71890c8bdf86b028086170b6a3d5c9cdb576fb6029aa7be379eba6b87460c2d93ee3d
 DIST django-sortedm2m-1.3.2.tar.gz 36246 BLAKE2B c794373d3555010778727146717778130b311d3c1869f0539b07980de2222d69c1ad4dd508cf35da32f4f55af0ea6cbc0d322de40454548dc59f156ae7856f4f SHA512 3695cc0a565a6e1d47e3573dce1f8c860f78c8d11d248634a8ffd6534c621e7575b2333b7a83e6c521e6e737d7ffc67ce1bbcc8504542751d3cfb254b3d98584
 EBUILD django-sortedm2m-1.3.0.ebuild 473 BLAKE2B 25d76802f54eed500a98e4b8372f9a8ee9b6df66361870cdb27d1912804643040b6aa1abc8eea1bc4003170708e570fe5965b3368073ecd3878de5edb305a883 SHA512 29a8338024d89d420c4dc6528ab90dbac19a254eef6f63808d2886c82e4950135b7d0e938ffb8a75700ee32d7a0eb0411c2ddc8b4af6fa69406d3e6a85c7cf48
-EBUILD django-sortedm2m-1.3.2.ebuild 501 BLAKE2B d02fa9bf1c88d0de7146085a73421b23dc2ece9a8d01f2a11bc8275fedf0b30a186f0c6656a501e9122755eb8e1b56a423e21e0a72231315ec4ce22f42a4fa85 SHA512 e88bbb708d2d90758f3f5dbe06aa871b864044fcbec9484d2653e755169d64dc595cdfbc0bb3d8ffd4b8f17cc6c653f235537483656a65e98bc38af360f96869
-MISC metadata.xml 302 BLAKE2B 011925ae7b5f088db6f9d675c0a92d488d625dedb4a91fd9471e5806bff5f24b728db060c483305510bc816557285e7edbfec6e823069b76a981690758d50436 SHA512 6ba25bcd27645361c6a2d68c4d56e9d7043b03307a873b5e1fec765f6df54f35f82a74838c2126af3b523e9a4dfffa5cca433c96c09d57f68845aee5856d183a
+EBUILD django-sortedm2m-1.3.2.ebuild 497 BLAKE2B d29a47bb4fd473e0fcae61570fc8e4afa4fd49fce6e6db3df4c0f5c67e708c06c9dcc1372569f259e90a5c205a5ce65b30713e4db7a1bd7a93b1dca20a864e21 SHA512 afb82f4268ade1dc83879e15a46d21dcd9389776edc8193f541f8f260e930315460bb6fde96028e7295a1a22bce29d30398764f021b5c7a195395d84f83e37de
+MISC metadata.xml 251 BLAKE2B a609a079d9180c47a57767595611550b8e2696e147db89d7967bf6eeb3ef34a0ef66e0370d454f2b66f34f94f9c5a004df5251dd09b55672c785792ba194c8ac SHA512 74645854453d611ec6269fbd3c70d5f1ad44a8ac0aa5d9c9aefa6b4305dcc5d9f4efa73a3c937bb48d2cdfd61e29d6de9d78a24fe4f8df754dcbc379f091ff2b
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
index 6aff975c2e62..2284965894c3 100644
--- a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
+++ b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-sortedm2m/metadata.xml b/dev-python/django-sortedm2m/metadata.xml
index a6873a39df5a..c470419cd51c 100644
--- a/dev-python/django-sortedm2m/metadata.xml
+++ b/dev-python/django-sortedm2m/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">django-sortedm2m</remote-id>
   </upstream>
diff --git a/dev-python/django-spurl/Manifest b/dev-python/django-spurl/Manifest
index f97daaa16266..2966a123503f 100644
--- a/dev-python/django-spurl/Manifest
+++ b/dev-python/django-spurl/Manifest
@@ -1,3 +1,3 @@
 DIST django-spurl-0.6.4.tar.gz 15076 BLAKE2B e576d6b309c0ff03cbc095363083c7a71c9ae764bc3f92d0f8790d458e2173f5df8a4e89d6999c672180408b443b0d4f84617719cc4ff06cec24156c472c2584 SHA512 8bf7c4d4e7e624280f87584f70e73504a11973a44294591d9dd58dd563d63dd1deb395e42bb1110e0a534ac16b59280d3b29f4293865cc465ee1fce20987d267
-EBUILD django-spurl-0.6.4.ebuild 534 BLAKE2B 274ec599f7b28d07c2d2fb4ac0c9e7c9f21d65eb6c723f3d1a19a8a2f968e959977dd07ba72277feb475f685a9cde8eecdf5cd482210b77a34ebb8d3ad349164 SHA512 cb0e8d2cede6535cd20ebb829c51cbf0928503da0635e130b5d38ae7c088653a15778a0eec9ebf7172f13cc86dd2fcfd1a387602cd59fd750653efa381e52347
-MISC metadata.xml 298 BLAKE2B 7095175b4202b68a2cc1cef0a7bff2fa3adeb4fe3827f0687f46c3c443c741362f714893081383a28f9970a5957d9f3e889ffea2443e329ab80cffe7022b0eb7 SHA512 d4efdf7bb5f359e28303f9f16453e8ba64a376bf0b084803f0fbee8983d86fdc3d273379f3feb59855949861efcb41a4320195dcf4e7b0831cf473c14b05c762
+EBUILD django-spurl-0.6.4.ebuild 524 BLAKE2B 4d2d80487d61f098572e9d6d3343d4218a55cb88d4d684c5588969f7a93f4555f7f96a34435be4068912c9690183d510857aad26fcc3ba9c79526ccfa59e34c0 SHA512 797331b15ab0165414c030fd5cb88f624af1a4f6575af6d52b5d0a0ce5714cd64942e69450e1efea3540f0c7482906f86a9b78eaed568b6f74ea3ef2ef87da6b
+MISC metadata.xml 247 BLAKE2B 0eaac699b428b81f9354da6a73241692cac6f5a6f5cad4e7f5faddab7505370648dcf657476efc37d571a9aae5c9e207522f0aac19728ac3e008cc7a67869f94 SHA512 32a12996260b4437d594672a6a654d9213628b34f8b5419d4d73c1f54bdd40efbb0f292edca99f6bac1c3f5089cdf334008280321d5e3967cea51fb8156d60ac
diff --git a/dev-python/django-spurl/django-spurl-0.6.4.ebuild b/dev-python/django-spurl/django-spurl-0.6.4.ebuild
index aa1d8039a331..6c7b862a090a 100644
--- a/dev-python/django-spurl/django-spurl-0.6.4.ebuild
+++ b/dev-python/django-spurl/django-spurl-0.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-spurl/metadata.xml b/dev-python/django-spurl/metadata.xml
index 0764416afcdc..1115e8e9a3f3 100644
--- a/dev-python/django-spurl/metadata.xml
+++ b/dev-python/django-spurl/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">django-spurl</remote-id>
   </upstream>
diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest
index 49ada03f4871..5f3f095a572b 100644
--- a/dev-python/django-tables2/Manifest
+++ b/dev-python/django-tables2/Manifest
@@ -1,7 +1,7 @@
 DIST django-tables2-1.1.2.tar.gz 966053 BLAKE2B 0eb997ff660cf80c7f935945439c8a48b70d4a48531930582fce508e5618d5341350613ae5208fec469b07869a808937cea7e92d838d44900086f862a43bb02f SHA512 b82d9a4fdd27e37056effc68b361dbb708d558fbc5aa0f90a09850a20f0bca34ac7965000e72368e1a792fc6a893f83c64910dfb6569b6016ef1e5b20be0e5f5
 DIST django-tables2-2.0.3.tar.gz 8411743 BLAKE2B ee5f1a358076363227b080425a07cc0a037412e151400dda7fddab085586d97910f0cde03efc340f10afb1199ea3c55a63d34105ff47fa32e72689053bc4b10d SHA512 a1cee5b604fc8ddeae84b65026502fcc738506796f94e6f85d594c2ddb54451c12dfbfbe5c8e91a01ba5150a7c0a41ed71ce95f56dfb7fdefa13fb0cecbc237f
 DIST django-tables2-2.0.6.tar.gz 71283 BLAKE2B d72259d65930aac6856bdd32c1827ad6f659ca19303dcd10abbaef2ff5b49179aba301fd5b0159bd134b3cdec217980780ed39f96a2ba1876e306773d79e3f9b SHA512 d6e872226caf123bb0c560ca2f455e29972d9e0634b4538ab751baef999368ff64f1b5095397838fd1c2146a7e5528555e5c01c8d9ff9b2324a3d24da7557161
-EBUILD django-tables2-1.1.2.ebuild 573 BLAKE2B 20121fab59771b2dfe641ab57ea043d2279ea991742df59d0116afa75610eaefcd39c571d17a31f0e07762374c2082c2a30d800576adc64086d8b56d741bd75b SHA512 9b3ec0a49af257d517ce45ad4a8b0367fb2c6b4c956929a9aaf43814d9b526317865c2d5a359f209bb3b12246033d2fad0d93a559d9ff84a0472ab0ddcdbd9a9
-EBUILD django-tables2-2.0.3.ebuild 565 BLAKE2B 72e96c4ea71ee05b6d6fba261364c767eb68aec24b2dccfb9a6654088935230ccbefd94f49a6dbc2e0e5593b24c8f7d6cddbef7085cb65e4e604648e143b0b67 SHA512 a0ea628e608d4ab8f8924619e6835575d9420458e279c6fba0f759d49617b37ecdabacb98d118c3359d0f9024880432ba07112c682884d50cbff0ceebc23d1a5
-EBUILD django-tables2-2.0.6.ebuild 565 BLAKE2B 72e96c4ea71ee05b6d6fba261364c767eb68aec24b2dccfb9a6654088935230ccbefd94f49a6dbc2e0e5593b24c8f7d6cddbef7085cb65e4e604648e143b0b67 SHA512 a0ea628e608d4ab8f8924619e6835575d9420458e279c6fba0f759d49617b37ecdabacb98d118c3359d0f9024880432ba07112c682884d50cbff0ceebc23d1a5
+EBUILD django-tables2-1.1.2.ebuild 564 BLAKE2B 353959c80c51e6468898e3584a1b4a31ff86c926121825097e47149966801180fc56bf5a4e5e6c465a2923bd6f6e14685b3e2721d1db36692cdc6a285c7e5c6d SHA512 706876140801cf7d1d6cca01ccae6d93e5e6bbfc243f4a91c40b49af8796ba72387d0fde0855ed51855737d970dc5ce1415709ff0a14a326c81bb68fabde0b76
+EBUILD django-tables2-2.0.3.ebuild 556 BLAKE2B 8811711f00c1feef8c448e1ed001ac4d57a2b667ac9ea8c2dbb0fc5b0fbb76809a4f2859e10eac97e4e033392fa000acc28dd133e1b3f3dd31b13b95cc39d6c4 SHA512 be67a7d7187fb157d79910dc61409f3dbcde2f414e12a193d974f869e8ede690a40145f2346a91baa6bf0eb3b566934058c0ffe5a0a0b5415ea76fba848570c8
+EBUILD django-tables2-2.0.6.ebuild 556 BLAKE2B 8811711f00c1feef8c448e1ed001ac4d57a2b667ac9ea8c2dbb0fc5b0fbb76809a4f2859e10eac97e4e033392fa000acc28dd133e1b3f3dd31b13b95cc39d6c4 SHA512 be67a7d7187fb157d79910dc61409f3dbcde2f414e12a193d974f869e8ede690a40145f2346a91baa6bf0eb3b566934058c0ffe5a0a0b5415ea76fba848570c8
 MISC metadata.xml 396 BLAKE2B a6ed23b38481b6f9e777434e23eda14f005bb5a63bc1a9eda2a56b9fc6126b3837e0d499e2f6a92623cbdbeb12e909f53ac5a5438e5e8cf8537b6c0387c67b64 SHA512 1a44a48bf619579066e29ec19bf060321dc7b20ddc15798b2a8744b33a882c06d33b17bbf46191d75168fde5785029f3289f0f78dee96b7e2bbc81475eaecff6
diff --git a/dev-python/django-tables2/django-tables2-1.1.2.ebuild b/dev-python/django-tables2/django-tables2-1.1.2.ebuild
index 1305d2a14807..a9093a2837b6 100644
--- a/dev-python/django-tables2/django-tables2-1.1.2.ebuild
+++ b/dev-python/django-tables2/django-tables2-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-tables2/django-tables2-2.0.3.ebuild b/dev-python/django-tables2/django-tables2-2.0.3.ebuild
index 1e54153c0f4a..08d02db35e82 100644
--- a/dev-python/django-tables2/django-tables2-2.0.3.ebuild
+++ b/dev-python/django-tables2/django-tables2-2.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-tables2/django-tables2-2.0.6.ebuild b/dev-python/django-tables2/django-tables2-2.0.6.ebuild
index 1e54153c0f4a..08d02db35e82 100644
--- a/dev-python/django-tables2/django-tables2-2.0.6.ebuild
+++ b/dev-python/django-tables2/django-tables2-2.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-tagging/Manifest b/dev-python/django-tagging/Manifest
index 3bd830da3066..6c2635fb06c2 100644
--- a/dev-python/django-tagging/Manifest
+++ b/dev-python/django-tagging/Manifest
@@ -1,5 +1,5 @@
 DIST django-tagging-0.4.1.tar.gz 44260 BLAKE2B 44d39d44892fa86ebc4ea185fb53696be772738a60a29d121d883ed3f123914a4621701c2a1efc4b0e309cd02ad0f7d28fb468eeff15c1b147724e8f9dc36e9b SHA512 6f6899084fd5067ec2e49649bba4aad225ed738f39f999b7ea5156d38fa28c272d4a1f688d4de712db15fe8f2c2ecfd4532eb6e9c0c1de6dd530c09d7d767a26
 DIST django-tagging-0.4.6.tar.gz 45228 BLAKE2B 77ed033ad61d227f8fea9e794b888da5d3a81474330d56bbbbcb1ce457ecac27d9615decadaece3c8b8fd2864c53342b795e8a76528c42609b928624609ccabe SHA512 75abf4b57df52393c8eb1ea265344c90c48b4225151076ce874b2e43657dd6cf4fffa1149acc2e118d58e3701d18103a362f658ce5114d7f207a33e7f4903b38
-EBUILD django-tagging-0.4.1.ebuild 536 BLAKE2B fc0f9a814f80376677099763c02d99254594c03a53675b634bdd4ecc5805b1af73aec85bef76a72c6dcc4f12a307f7235a8a5655fe97c694502e0a480145e5dd SHA512 a1e3b0a6f5286bba8a741383744c31375e3d6bbbe0c5078637765c01f3fdfdfd1f4f417bd180434618ef2d8bfc9ae1736510f24a8bb8fd7a3a976629f613a8de
-EBUILD django-tagging-0.4.6.ebuild 784 BLAKE2B 557eaf97dfad0fe0a27c9a1732a5231414ddc64ac122143df9499c3a6f5e2191fc236dd8b85f85ed26d9ab00a95ea848f7c8a8af14d4ae212e26fabd62be05b0 SHA512 7567e2d516c0d62a583c20e55dc23e0d506c78d49ab34d62f0f6b7f0f6e84bcb9ab950b5afaf50a5fff5a2ca88c9ef659380564e6c52054e899c6cddefd2b2e3
+EBUILD django-tagging-0.4.1.ebuild 532 BLAKE2B 4260672fd79f2d865699c396f777925d11115bd76160274e1ede89cc771517898e457e7dca2372649f8ca71618c6675e6a592645be4eb325b8ec19c462847b9b SHA512 07002fa9d0040dc2175b9c64ed41c924a2ccdee5c64a30bb98055b5e7e78fa9fb482e8b2cd030111a90449561ad7b8ff4eb5472b5ceda4bd4156010ad02ac7cb
+EBUILD django-tagging-0.4.6.ebuild 780 BLAKE2B fed34664b577480e012d80e150bb5495387a283cc8e74855cd55ccff6bbc1f13595dc8aaca3756aad437c2e7c4fdf359e388ac1ffca55b7655a769a8664d2146 SHA512 fbee35fb43370a62210b760b02edafd2718a318b4275b0e6ea3b4a9fea5ed57908d6b20202fec0d060ae3f3184b5455d2425bd03dd19e25234284ee285d5dbc2
 MISC metadata.xml 394 BLAKE2B a5d5559d1e4c9a55fff337a585dfb731c84e470d6fed8ba651b59287090e99c1c2848c83faaa4aa720a37a1839f3ea18e4473ed8b0fbcf110fb214cae15dfe3b SHA512 b5bf9305f635c589639da4742fedb6dd1d001db05eb2849087af20466e5af151b1db55eecb5a3ac510f19c84cb64fd22a3e84e957d19e59f1729ad8cf9ecc8e6
diff --git a/dev-python/django-tagging/django-tagging-0.4.1.ebuild b/dev-python/django-tagging/django-tagging-0.4.1.ebuild
index b408d16c248f..936277e845c7 100644
--- a/dev-python/django-tagging/django-tagging-0.4.1.ebuild
+++ b/dev-python/django-tagging/django-tagging-0.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-tagging/django-tagging-0.4.6.ebuild b/dev-python/django-tagging/django-tagging-0.4.6.ebuild
index 023e2212e095..e78959913893 100644
--- a/dev-python/django-tagging/django-tagging-0.4.6.ebuild
+++ b/dev-python/django-tagging/django-tagging-0.4.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-taggit-serializer/Manifest b/dev-python/django-taggit-serializer/Manifest
index e2f284828925..bcfdf50ba248 100644
--- a/dev-python/django-taggit-serializer/Manifest
+++ b/dev-python/django-taggit-serializer/Manifest
@@ -1,3 +1,3 @@
 DIST django-taggit-serializer-0.1.7.tar.gz 5589 BLAKE2B 2e9fceacd1eb1908848da99d7ec6b708f4c37f64c7ccde9e1082356e7695430c4c1f436a7d1a37200a249d2736adb848c1ce4fe26f63a6b1748080b62c1215dd SHA512 90a3e39cda13826bfcdd0a6f262108112d261bc5e03f8ed973c0af0e1a6d8efd80e1e0926682754df4efdb697cea5453df39de70b0067c02bc452a8462ab2574
-EBUILD django-taggit-serializer-0.1.7.ebuild 520 BLAKE2B 11ae94490562f697051cb5d9d59fb4ae8e602d8ed74d248acfc2e6a8c6c7aff435cc6ece978074a8498ae4eb4543ac7002409e61e0dc80969873b951e6886971 SHA512 06d16171967cf396f78e0b4d5dcc87bd213013fd01ca7b129b349e32767a22d3ae200fade09edcfa43c93fd52b0a1b9768f3f938d2aa59687fda4d416297be84
+EBUILD django-taggit-serializer-0.1.7.ebuild 523 BLAKE2B f42880636805586789f246a21efd425475c58fedf960a29c3d472b14a6c729b76e6e2300b0b8fa99dfa3ad369d170dbc956462434c8c15c59fd2df78ec0a5521 SHA512 a1a718ea5bdb82149b8f5f741a316ca7b5615da18b4438fcb867ae9433c26fa5628eaeeaec34f0c89fd7f64435157f9870f08b9d3014593230278c8a3a4cc16a
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild b/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
index c45ffbc95471..ec615af36aae 100644
--- a/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
+++ b/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="the django taggit serializer for the django rest framework"
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index 7324f8c94334..1496d1dea31a 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,5 +1,5 @@
 DIST django-taggit-0.24.0.tar.gz 44534 BLAKE2B 7a7c756cebc57bc870407d85b81c527ca7cfa5933050e02e5ea5ad18e2879732ea8993c725a4a8b1ded95bcefae3a8f4afa7c38d323bde347be7fb8a5d36c229 SHA512 669fd69c8c66dc4561fa87e94c7277d3de9aeb14136e8911b542dd3e6af84751781f5985c63deba5defedfa80e6650cafd608e206932ff4dfdfc80f796035a8c
 DIST django-taggit-1.1.0.tar.gz 41780 BLAKE2B 9f9460bc2f8fe3e42ca3c9f206e23f48c3761b486db026a4818e0a3934064bbe467a477b81cca0d8f133233db17558de2dc40779748a190408af090f8ce942d3 SHA512 974c1ef77e28b764707aceb9c5030c531ac57ea25ee112e46bf6c100f9ccfb186fe8681042425de25850b04b8925d844af9d35d4221f86e4426529037a47d36e
-EBUILD django-taggit-0.24.0.ebuild 479 BLAKE2B 8999728bd585e2c06fc066c52dbade3a14d532788be43a09c3f5c31f43d19a00a6380b6c8258ce4380773da3b9dde6c1a0036f5b839e6565a5b4febfb28a65ae SHA512 f9ec71ad54d906cd7b24dba151d100afe72488209f7a31462fed04245812c7b3f6fb5fdd4665287e8a631ef6fcd90e76caf79cef5f5a1b0ceec9c417bcccedf2
-EBUILD django-taggit-1.1.0.ebuild 479 BLAKE2B 8999728bd585e2c06fc066c52dbade3a14d532788be43a09c3f5c31f43d19a00a6380b6c8258ce4380773da3b9dde6c1a0036f5b839e6565a5b4febfb28a65ae SHA512 f9ec71ad54d906cd7b24dba151d100afe72488209f7a31462fed04245812c7b3f6fb5fdd4665287e8a631ef6fcd90e76caf79cef5f5a1b0ceec9c417bcccedf2
+EBUILD django-taggit-0.24.0.ebuild 477 BLAKE2B dbd388a2d2fe452def9dcce0d6be74ad47ad5f53c74d482f102336c449fdfa43ec2df1d255f86bef1b6f3c4646d547adac8eec04aceb2a6b08d3e2e8584f577e SHA512 462a1b8a218a5e916b23d6a6a706705edef82779e7ed9c5d59ae28051c9643d506bfbea4225c086be7b8905f834e744c51efab520f81e9f20f22b0fcd7d6bac8
+EBUILD django-taggit-1.1.0.ebuild 477 BLAKE2B dbd388a2d2fe452def9dcce0d6be74ad47ad5f53c74d482f102336c449fdfa43ec2df1d255f86bef1b6f3c4646d547adac8eec04aceb2a6b08d3e2e8584f577e SHA512 462a1b8a218a5e916b23d6a6a706705edef82779e7ed9c5d59ae28051c9643d506bfbea4225c086be7b8905f834e744c51efab520f81e9f20f22b0fcd7d6bac8
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-taggit/django-taggit-0.24.0.ebuild b/dev-python/django-taggit/django-taggit-0.24.0.ebuild
index 8fe718cdfbfb..40006150520a 100644
--- a/dev-python/django-taggit/django-taggit-0.24.0.ebuild
+++ b/dev-python/django-taggit/django-taggit-0.24.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="simple tagging for django"
diff --git a/dev-python/django-taggit/django-taggit-1.1.0.ebuild b/dev-python/django-taggit/django-taggit-1.1.0.ebuild
index 8fe718cdfbfb..40006150520a 100644
--- a/dev-python/django-taggit/django-taggit-1.1.0.ebuild
+++ b/dev-python/django-taggit/django-taggit-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="simple tagging for django"
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index 04f8f8d3ce25..a1c388ead615 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,3 +1,3 @@
 DIST django-timezone-field-3.0.tar.gz 6217 BLAKE2B 4f4214ecd142284f7da89711535834c8d4d931a2532ff54181e6b072d7e636bcfaa1fe0cab5421d047fdd6d6ab472246054dd8bec8bb0c987df6e336aa269e96 SHA512 624e5b1e6b75ec40252ea7137608d9f62a5fbba1a136068c0c4c5e6192afa9756456cfbcba5ae3b00980f8e0ab44e507226815b25196bb58a39789a75036789b
-EBUILD django-timezone-field-3.0.ebuild 556 BLAKE2B 9f3d76becdee222960fb8cadb28c332fbe6a7e8f0d81adcfbe179e2f0eb592ff04bd700472a888c1da98a305f1adfe0a884f78efc09279989194a597d0d393e1 SHA512 c8fd8ea14f14ab71d823653580b6ce36889f2e65b6f835f897f9b6ff49e7b735096735239f5d7426c43b7b989ba0020b0bae8f1171ec672392c70f98b8e92200
+EBUILD django-timezone-field-3.0.ebuild 552 BLAKE2B a70cf209033ce296253d42fb9b36c667af8aa7bfc410722b1dcad0c2e5e18d4989ec8b73db163337f1d714cf28df0eafe5135bc4d85b04772c00a0500e55a830 SHA512 7598c4c1cc43f0c168e6b321b0aa22119c7457ed48f883656480cedbb372eba5ad3d9477efad5062866bc557c9215ac81a5be909e7acf8c4085ccde5683ea002
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-timezone-field/django-timezone-field-3.0.ebuild b/dev-python/django-timezone-field/django-timezone-field-3.0.ebuild
index dec1b78d4ddb..c465cd6c4df7 100644
--- a/dev-python/django-timezone-field/django-timezone-field-3.0.ebuild
+++ b/dev-python/django-timezone-field/django-timezone-field-3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A Django app providing database and form fields for pytz timezone objects"
diff --git a/dev-python/django-tinymce/Manifest b/dev-python/django-tinymce/Manifest
index bbc0e56bcdd6..8dd26874bcc8 100644
--- a/dev-python/django-tinymce/Manifest
+++ b/dev-python/django-tinymce/Manifest
@@ -1,3 +1,3 @@
 DIST django-tinymce-1.5.3.tar.gz 2456745 BLAKE2B 4a4eee710f47371225ae3d08ec3b88c3931e4180d18332c2b250a1a1ec0110e39b1a08a9c94fabd7c03f51963caf79984136ad106edda63e21de6862ab6dd74c SHA512 1fae0e40f0d0803a723753e25160950d4a8bd3b443e2d7ad9101558ad20ab3b43f792aafaaf7c064636166860c445b3bec068317bab6203f346cac7753331eea
-EBUILD django-tinymce-1.5.3.ebuild 550 BLAKE2B 69c4700decacf5284cf90418b14603e6cac7966e1184ccf7a34cb96576a4b58a82ad0fb8b099ef9f5d53fd738cb7e735b71a6442c321ea4f868bcf2d3e4d84a3 SHA512 6cfa7a9d6299db753aab024c6dd65ab8a8e53c0c292ec02901eb7c16180a370b12eff0ae15579c137713836328af780cbe69a85332d925d136bb0c0c4c8db7a6
+EBUILD django-tinymce-1.5.3.ebuild 540 BLAKE2B c88294afc6b80597a45aeb1ba255de7928847a27298ffeab61467b48938fd3f9c7bb18551775c751fc44e33dbaa2ec8777b6b807826c8959c462868f8d867a20 SHA512 4039d3fc69b658627fa42ff38652cd3ee9c8cde02a0d2df00f0e33e1b81b914df5636718faf9c627c3f5660df0f89a570705eac61a700918e0c47baee2c046fa
 MISC metadata.xml 336 BLAKE2B 8a7704224d42df5525fc2be6c22d91e39289101a24159fd94053387598e45ec6c05e1a865f1e3965ba074b1cb0069b512dd0960ff441132730fb9e787134a033 SHA512 c3a4ad3da6a4d3f26697bea5bb54e789c8bac7b1f28155046e9e73f6a0485a925e0d9681e036a2041475343c5cf87fc4aee299a393202a759d0cf236b10b7326
diff --git a/dev-python/django-tinymce/django-tinymce-1.5.3.ebuild b/dev-python/django-tinymce/django-tinymce-1.5.3.ebuild
index 1e1d410927e1..2c1d7dc83b1b 100644
--- a/dev-python/django-tinymce/django-tinymce-1.5.3.ebuild
+++ b/dev-python/django-tinymce/django-tinymce-1.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 6125eaddc8dd..cee83f961d06 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -6,10 +6,10 @@ DIST Django-2.1.8.tar.gz 8613572 BLAKE2B 543e41f1b4031b624f903f075e95af7e010510f
 DIST Django-2.1.9.tar.gz 8608747 BLAKE2B d5ef1aacc30067dfe5369655eb23ea67788f22edcf8ba070944c0fb4fdf2fc3628a364d480a3d47bae0339255fb66a3bc27f11eb5f07280812ab5f57b4367c64 SHA512 1f6ad122012d898da52ce44465700d2492ef9002d5c327b25e3edfe2116b8a1143feab79751a581029664311452d52d96fe116d8817edb0ef7d7dbddfc0a5ec7
 DIST Django-2.2.1.tar.gz 8973889 BLAKE2B 890ab092807a587dbaba69fb6da7a4c53c8e976d3a4c29003549d72dd69c374640df280885a62845dda0d00f432e398747b9ed652aebbd7e3434c07e71d9a80f SHA512 661ed7352847d2167f8d3410b476cb585a269ef5d3afe0cb59cf0c9a2ea22f0572f12825368bc222f33f8c6d4c71767adade97e25b69f5a619795ccb670773e2
 DIST Django-2.2.2.tar.gz 8841523 BLAKE2B fc498c19caed7fc8766b015df3049ce325886ebcebf02a1f6618c13ea9d12dea56ad65b860f3b0dee0b6532d97e754bb8cca2c3f0a375c630c28d52a2fd62a2e SHA512 87e0a7b2d0e6d6149c746a7cd5547351ba002c6eaedac160e72544b429d41b133da5c36256a07155b7b4743969e9ff4c3ac890c9925db428117f68a67104df0f
-EBUILD django-1.11.20.ebuild 3233 BLAKE2B 7c0f96ebb194450d1d4f98d7c9ac14dbe86094f302b1b19bd6a67dbd9b164ff4f2f43f45c2be9b1a22cb002ee7acacf187dbebfd6b427ed401d2dc2da4d8d5b3 SHA512 bccdf87c5923c2dbc5302d0f56e6d1db104bba46b01fe44828e3b3b2e456098180b55e3e3064e161d78337f34d4898f86c2db77e11d09f909c581670ca951624
-EBUILD django-1.11.21.ebuild 3235 BLAKE2B 0924efde9d3e3dc89b1fef22e66c9ebe86cc7109de091199220fadfc91bd2e6420082480a710af62deba3cade4e444804d134046c93d6ddd70291b91b15a8f07 SHA512 d1dff45fd45400c04e16834aaac70632bb669a765dd2f808fd5df09528faf8125ed2e1cb5e592e7a0880b71303020204c35ccfb5d8aa4adf02d208df1f647846
-EBUILD django-2.1.8.ebuild 2491 BLAKE2B 51c52a6a4ffb188c62a74b4d262895c3d92b6de1156d24cf7d1d8a6fd4b057489f38cd6947c05a450e05e6e6ceb4bda59430295a2d1614e7ef37b2546a0f6ade SHA512 19a221d7b4fa379dd4a79bdfc18854be82e4d5668f1404a77d3020f2628eee2d910e89c3b23e368a220dcb79242d8f712d98513a4fb30fa0cba6c4f26273e0ab
-EBUILD django-2.1.9.ebuild 2493 BLAKE2B 5e8ccc6001f35bdd41c2d3c02d36f8f16b6033e067094de524c8d6d055e519d05234fcb6e255282684fa49dd91e0287332a8cfbfc7404e7dfc0c809b7dac1d67 SHA512 a74320e407da4d8a4f64e7bd1751f2b72ec3d31135af609a6bced43bc71d374385e956dacfd75dfc617386022476d611f347757f1042bf0fab52a3afab02a0e0
-EBUILD django-2.2.1.ebuild 2582 BLAKE2B 0cfee4c39877e52c1052ee201ca20e1abf72e7824138c8b4099a255e1858107f32269a9755e9b3e1a37dd169e66e71540194faa89591c3d14c4540224ee116a1 SHA512 be81dd987884df346d37bb1c5720b27f7fd9395549e58fbbea242c9fda549c8cf36f2f97827ec0690b1c148ea240ec62fcbf3d51b707fadd776d7fb0ed423ed8
-EBUILD django-2.2.2.ebuild 2584 BLAKE2B 67e9293e7b57b60266ee0daaf21839ef71c883a3ee45bb7e2c4d6a583e82a3d45537ac17b7504ad3cebf8d3592dfa428aeef1b7d868ec93c33a37d813fb74303 SHA512 a71527365561eeeea9b40c25f15196b4d85f48cebc9499d05ef5ea5ffca2ad3d0a0c52afb9a6e87d81113886dfe183fb783b4da8eaab45b4d832adc442c986aa
+EBUILD django-1.11.20.ebuild 3226 BLAKE2B f606d94857cdf144c0f72e9e57584886f65e1b5c73a95a6e3867d44c07f109e629e98c1cea97a2c9ed490a5d72f6ed6b338526f26d6cfdb1ac6d5261708d0e73 SHA512 cd34f9b2f49783b968a890c87cd25ef29f7348463202ac4542f69c32ea720000306934e5861a4e0071fb3ca67f3a8fcd9e21ca5dd892ac25f7ffc842e3b33f70
+EBUILD django-1.11.21.ebuild 3228 BLAKE2B c0015da0478c4e4f79bce86240980649910918eb58061e023986364b8dc53cef7ba3ba77d94b30e7eadcd2f838228209052785e64feafdba1117a94872f4084e SHA512 2620d74437f255e0c11d72433ef3e4261bdfeee03cbac2bfd8e9c0d242e7b4bbe7b2a5208f0df1ec3eae01fc93918d993cff1734b7eef7ff2a6cbb41766c931f
+EBUILD django-2.1.8.ebuild 2489 BLAKE2B e831aebfa9693b11fea35aeacf2b5c5ede5b6ab7b4067f8d5d2ac2df10b2728f6e7d8d18eb71795942fe3152255966c1663114f2a756291d57de7d759b707efc SHA512 2be5f1b07ce2906a84ffbed21b10c76f408d63915f2637a260ecc7c841cce538276f31d9650027d12ad12dafc6336f531d4fdbde7b3bd2d44990cc3994d07465
+EBUILD django-2.1.9.ebuild 2491 BLAKE2B 294651ff06feec0a1d7b9708f3d33b1f592f9935173170fcce5e10ae9cda229df7382d562d58869c18636d60f4c40ab0efdd26fad2f0dcbc1040b02ab37245f7 SHA512 105312a796106b2744d375abac29f63cc078b837b6be3ede1b3605481a12d56d681d60e968f4d93ec2ea6381e664fe5fe4a69f79385dac9f0bdc54570f6429e6
+EBUILD django-2.2.1.ebuild 2580 BLAKE2B 4868266230b1e9df2f83034990bb2378b27d2bb155d85240c092ea200f4576134ea6bb2153e8703f98bc3a444ac440e02aaa314140bff4d30db60fb08969c864 SHA512 819b4a26ad6fc385a9617ba8fc4d620134bf0f8595a83df7a105628064ec3dd2ccf1bbdec97d2cd8b43cf323e9516c3f1cda61f3e2a12cd701dcbbc8f25d60a8
+EBUILD django-2.2.2.ebuild 2582 BLAKE2B 3ab794bf23f9c9b684ea7eea26115b38ad306d01ddc095746bfc712f63a81bf36cf9c6eef7c944c49b106f1a2128ba5ec33e2ba4f28eb2e4d3fb724850e1a5b2 SHA512 732ac5bce38dba3f5812a3a10d0fceeb746928ba50cc3fdd66aa2660da17adb021d9062c776652ccec206ad744635984a7ee63812d6e806fe3379e64e0f35873
 MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
diff --git a/dev-python/django/django-1.11.20.ebuild b/dev-python/django/django-1.11.20.ebuild
index 1f71983781cd..2c66da522949 100644
--- a/dev-python/django/django-1.11.20.ebuild
+++ b/dev-python/django/django-1.11.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
diff --git a/dev-python/django/django-1.11.21.ebuild b/dev-python/django/django-1.11.21.ebuild
index dfb6c4f192b4..e9d4601c3c1d 100644
--- a/dev-python/django/django-1.11.21.ebuild
+++ b/dev-python/django/django-1.11.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
diff --git a/dev-python/django/django-2.1.8.ebuild b/dev-python/django/django-2.1.8.ebuild
index 0a08e67daa18..bcefe68c8dce 100644
--- a/dev-python/django/django-2.1.8.ebuild
+++ b/dev-python/django/django-2.1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
 inherit bash-completion-r1 distutils-r1 eutils
diff --git a/dev-python/django/django-2.1.9.ebuild b/dev-python/django/django-2.1.9.ebuild
index 0c1045dd2c84..70bc05ed29e8 100644
--- a/dev-python/django/django-2.1.9.ebuild
+++ b/dev-python/django/django-2.1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
 inherit bash-completion-r1 distutils-r1 eutils
diff --git a/dev-python/django/django-2.2.1.ebuild b/dev-python/django/django-2.2.1.ebuild
index 0a76513f2ac0..6d91c5c7b1ab 100644
--- a/dev-python/django/django-2.2.1.ebuild
+++ b/dev-python/django/django-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
 inherit bash-completion-r1 distutils-r1 eutils
diff --git a/dev-python/django/django-2.2.2.ebuild b/dev-python/django/django-2.2.2.ebuild
index 45963469fc10..5bf0811789c3 100644
--- a/dev-python/django/django-2.2.2.ebuild
+++ b/dev-python/django/django-2.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
 inherit bash-completion-r1 distutils-r1 eutils
diff --git a/dev-python/django_polymorphic/Manifest b/dev-python/django_polymorphic/Manifest
index 0bc5a2266a30..2b2f3bfade9e 100644
--- a/dev-python/django_polymorphic/Manifest
+++ b/dev-python/django_polymorphic/Manifest
@@ -1,3 +1,3 @@
 DIST django_polymorphic-2.0.3.tar.gz 100447 BLAKE2B 0a86212810d5a51637faa5b431355fcbe66ac7a14fbdf09952edde8895c7d53f46de8dd00d0e778eec8c141a9020b7775577489d94f4eff6d129ecbebcbf5e5a SHA512 0ef4877820d7761bf603506d81fe7fe9121e8de9db7e0ef225f87f43a3c32b1b51fffbe4cd246fa94fac95c99b8a36f844c0109e1770eeca9e5051fe529e6f1a
-EBUILD django_polymorphic-2.0.3.ebuild 918 BLAKE2B 67a6c9f93ab013b03a8334859f0f5c58b659264aba38351899219b3de96967033ef9f3734a1355f0a215b998a6198ea0a007daf1bbe53e631a7d430b9ef77d54 SHA512 ee4f60066acd6f705c5da992719185f5626b5685c684d4d7fd962d40fa73cd88800a970b2b58ec0c1090207865c661761ff4adf57b093267063a403dd9bed8c3
-MISC metadata.xml 304 BLAKE2B e00d35195ae0451a93db9cddb09227e3e063027176a0fcae3abc0bb0cd7f3759277772fb4ea7996c51e3354ecbf7a486a83a6f45a8ef4141801fbadbf8231828 SHA512 81aeecce6bddd294dd7d7e212af8f8d1942f88aa9cd0c89b040e7c43fdfc028ab6d86e0ce3d7a8766ccc361eb00ef1e067effd1607532a64100d085c2374a836
+EBUILD django_polymorphic-2.0.3.ebuild 908 BLAKE2B e673da06b15d9174180e7b38e2cf6024e59ed44d5312193f1d8bec36d7e06c054fd9f6e7f1ce01d55e67f9bc13dfe0b7dad3ff57dd80738a8b065d693d4b3a94 SHA512 e6d9fe58eeb79d17e44c2c245b4f82996ab7c149d8ee07236039bb78d85735316511d0c99d874b65962af4c347ce97f51c6633a5493ba63afce7563c06d6b94a
+MISC metadata.xml 253 BLAKE2B feb3f7f1b1e501b9c59d68c719fe1f68125bb9f56fe79cf5d1ef35969fa3220c8dfce5345b3353bdff50187f7b152af013d8c5c316db4fc42bce2752fa2d554a SHA512 31517343215750f1c7aff61f255f60b688fcdd39a86ade106ef68ac519e57186a1ae5bd2eb6018c9e46743a6d5feeaab97f7d7dad3b16f4a01b3d2d77ff46b8e
diff --git a/dev-python/django_polymorphic/django_polymorphic-2.0.3.ebuild b/dev-python/django_polymorphic/django_polymorphic-2.0.3.ebuild
index 6f4b4d0a5f9a..b28e9c5f1571 100644
--- a/dev-python/django_polymorphic/django_polymorphic-2.0.3.ebuild
+++ b/dev-python/django_polymorphic/django_polymorphic-2.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django_polymorphic/metadata.xml b/dev-python/django_polymorphic/metadata.xml
index 0743b91ed491..611e7ae022de 100644
--- a/dev-python/django_polymorphic/metadata.xml
+++ b/dev-python/django_polymorphic/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">django_polymorphic</remote-id>
   </upstream>
diff --git a/dev-python/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index e0e16925bff5..a696a3ddb63d 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1,5 +1,5 @@
 DIST djangorestframework-3.9.2.tar.gz 785546 BLAKE2B b00e502a483894bfcebb9075a2534a68d0c48093b60482dfd2fd3b5653731ba5d535259451fcdd2f25f16832ec9e5a6b5e13b5e43095f770b88a0f251525a69d SHA512 cf3b23de7b27bca082df571a2cfcb1c593bebd36830b60238a2efa794ded762b22444a00885acac7d97db393943063a9f7a81e9dd32628afa7f1308008520a76
 DIST djangorestframework-3.9.4.tar.gz 779306 BLAKE2B 9ae955cf0145ad8b80b65d8b6d8f0b947e0e11ecb1b52939a1fd4d209d48d84a4d756d979596180c63f6caf25ff796503b0b3cc8237ec1bbf2d1787fae5a2863 SHA512 bfa269b1ca95c1d35d97f3fcdcf821778f2c2ba14ce79288b776ecff369922603ba9a2292a59ca8ad263eb3eef675420a2bb2e609e11e53e503a78bd365b2913
-EBUILD djangorestframework-3.9.2.ebuild 471 BLAKE2B 636d719602c0549df27ba449e726447e7101c3edb28f70860c800ddc9b1e13a4e7be7bf210bf017e2e2a9f9a56d66ec5fa57a5e12030ce0b3275c34db21b2a49 SHA512 4b062fb0a9dd7377bce41d7683ea0363f6640ba1dfe340c7ae4ffaaa1388d4f3aa9458f53e760a876afbffcee108445db401943a8fc21a4df136301e3a2ea67d
-EBUILD djangorestframework-3.9.4.ebuild 471 BLAKE2B 636d719602c0549df27ba449e726447e7101c3edb28f70860c800ddc9b1e13a4e7be7bf210bf017e2e2a9f9a56d66ec5fa57a5e12030ce0b3275c34db21b2a49 SHA512 4b062fb0a9dd7377bce41d7683ea0363f6640ba1dfe340c7ae4ffaaa1388d4f3aa9458f53e760a876afbffcee108445db401943a8fc21a4df136301e3a2ea67d
+EBUILD djangorestframework-3.9.2.ebuild 469 BLAKE2B 54cc48d1cc2a4cd5ea21b950d1bf3900934e7ff24c57167a3dccbb5b3a40ae045fe72ed60bf3fd3795495e313f4decb96352ca96b064278a95b03bc8b15433d9 SHA512 3f21c9748ec6b1c6bf8db5bd8306d9fbf864106d5097927aa5eed351058e7864890f2ec2c6a9cd32b97a298165e68850c1f9820f7480d25fbd409bb57c79132c
+EBUILD djangorestframework-3.9.4.ebuild 469 BLAKE2B 54cc48d1cc2a4cd5ea21b950d1bf3900934e7ff24c57167a3dccbb5b3a40ae045fe72ed60bf3fd3795495e313f4decb96352ca96b064278a95b03bc8b15433d9 SHA512 3f21c9748ec6b1c6bf8db5bd8306d9fbf864106d5097927aa5eed351058e7864890f2ec2c6a9cd32b97a298165e68850c1f9820f7480d25fbd409bb57c79132c
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/djangorestframework/djangorestframework-3.9.2.ebuild b/dev-python/djangorestframework/djangorestframework-3.9.2.ebuild
index 7ec25886c67a..45883f2ed256 100644
--- a/dev-python/djangorestframework/djangorestframework-3.9.2.ebuild
+++ b/dev-python/djangorestframework/djangorestframework-3.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Web APIs with django made easy"
diff --git a/dev-python/djangorestframework/djangorestframework-3.9.4.ebuild b/dev-python/djangorestframework/djangorestframework-3.9.4.ebuild
index 7ec25886c67a..45883f2ed256 100644
--- a/dev-python/djangorestframework/djangorestframework-3.9.4.ebuild
+++ b/dev-python/djangorestframework/djangorestframework-3.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Web APIs with django made easy"
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index f9d20b92a17b..68ac4c68ee39 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,5 +1,5 @@
 DIST dkimpy-0.6.2.tar.gz 39197 BLAKE2B e52df97b03075461935e82d2acd17c6eaff8f9fb0b8217b1803dc54434ce2c002e1aa419b0293bdb130045be4edacceaf447dcfc566bef4a5e16e0651ac7365c SHA512 7592153270ea11f59dc67e31a10c91345389d4391f3a9dc9fbd1224410edab4743935763ad5b1016b321bfa7b1c4c0255f26323bd5556f359b0b743bda4e515b
 DIST dkimpy-0.9.2.tar.gz 50263 BLAKE2B e18b1337699c1e843b4878cc84aa9988adaca475cd22b406b558c132a36761669c835dbb9718ba6c40fa5f78efe669d08c8517d6208f783399834737f4805671 SHA512 a1e7ac778f8cf0897793f296061ef67a6945b136db1a7aee18498ce33111d1a0d485b0ce32f52c22c0866be644065e000de57131301000a83a1b55b6a875bfce
-EBUILD dkimpy-0.6.2.ebuild 448 BLAKE2B 56b2378a6df2b9c46d0ab98ed244e11810175442efafc4b8ad9e51a7335af2242924d260e9ddb383301cedbeb6fe0f4a0567daca5a40a7d0b4dbcbc57930f9e7 SHA512 ff09b417f640387c21141ef4e15966f7e7326ac54c578d42bf7c4292fa4f61f32eb778ecb9c7bdc913eb10cc7326aedf869f0ba13593b1e1a2731c4c254e4ae9
-EBUILD dkimpy-0.9.2.ebuild 497 BLAKE2B 14c84d239793b125270fb9d6c568b78ac6e1346f9d1d1079be416d7c955944a57de3047dabc174ac7ab1560b53bc1f333573987f938392e83f85af373f8a9008 SHA512 022da9a3c8198d9d99b7e5956749d070a83fb4240b2baa9dfeec859fc8f27e380878f2ceb253e25c264b31fbcf9afb45367a233f2adec735a1df9c290c325bb6
+EBUILD dkimpy-0.6.2.ebuild 444 BLAKE2B ac0e222666dcb99fd46fdbc96727ec663664719a5a5de079934970082f4a8ec99d5a5709fa209aa3f7d668859db50dbf33837504c51fde01a29b5957e8c88558 SHA512 d6489fdf01bfec0f861bf57c3d0097234316b21c2f2876e292b2bf319425eb5ca9e04f7c17d2ebf04e9ef04658588ea95ebd7c18a197005a372ab833fbd2ddf2
+EBUILD dkimpy-0.9.2.ebuild 493 BLAKE2B 2e1a29228e2e3f3fac24c580a49e81389dcf292953099d35c9803e03f346b84435c990e1d411e4b05aea9709e480f8fc7152e8072ce31e92316fe7f42c843af4 SHA512 0bfbc47aefc572bd0cb24531e086ef0f980f74c3a50b2280ca9705965d62d35034aa357dde60c06f3172bf064b674b4bdce044d1a230e37a9becbd6857d34f3d
 MISC metadata.xml 1249 BLAKE2B 736b664d21c016a962c592ce53a86eb3b5de462f6d0ace935bd4b58bd241f961a8b36e652e34fd879d17142ada4772ee583cf776591413ab48f6129f1b18e956 SHA512 b26ef946ab562ed51c8437d66566bc25920428b8c87b27674d48b7e048bb28acae53e14d1b28d780bf8cd85f6cbe34021e80fdae1d76e29107e825cc0fc575a2
diff --git a/dev-python/dkimpy/dkimpy-0.6.2.ebuild b/dev-python/dkimpy/dkimpy-0.6.2.ebuild
index 8d30ba504e29..67f8b2723c7a 100644
--- a/dev-python/dkimpy/dkimpy-0.6.2.ebuild
+++ b/dev-python/dkimpy/dkimpy-0.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dkimpy/dkimpy-0.9.2.ebuild b/dev-python/dkimpy/dkimpy-0.9.2.ebuild
index 8c377b6ba9cf..a545b6dddbc5 100644
--- a/dev-python/dkimpy/dkimpy-0.9.2.ebuild
+++ b/dev-python/dkimpy/dkimpy-0.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 19144c1bc467..63e4a8cdde03 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,5 +1,5 @@
 DIST dns-lexicon-3.1.6.tar.gz 121560 BLAKE2B 08d02b962194914f48fd4b9f3b87f9a9b9b998ac419961b7a61e6dc273d1d8938207b791c58ae671775a6e2da78bf880e567cb5c33e62a457d849598760353bc SHA512 e4078756ad1029f5df5907cf6d2ef2eecb70cf421ff8ab74fa6b176b0b5d9e1fbf94ce0b62e497988f432228038e9fa02a1f5fe69d582e39efa9391ce47f4941
 DIST dns-lexicon-3.3.4.tar.gz 147008 BLAKE2B 14e0bbba48b8340ecb274c122363aef6490de539ea2c1ce7a4ba4ef19eaa69271ea22e28afd700dba0a1060b01211f8ac9a1081e21973f07abb9ca057638241c SHA512 274a1a4ffd1d767623723b6e9aee1e9f07022f3985cbc15f75cc410f477e1dcb7a674fa847119bdccab7332d058f77ef85771bd7bcdadbe2dd9483415a365a6d
-EBUILD dns-lexicon-3.1.6.ebuild 697 BLAKE2B 775aa9793a68fc65c2540c331b17bdb62694f9ff90c1cc26e9faf92051614b28cbe9671c8114ed3a0740f207dcf0a8c9fee79ab2debd0592271c100ec16aeb2f SHA512 335cd07a7a7e739f08c35ed9df8deff9f24041fb9d5fbefca8f5ba3b4a545ba79db89807be30b4dbd5364240e35f82686e7d84fb54b1917925fc594c07a29abf
-EBUILD dns-lexicon-3.3.4.ebuild 697 BLAKE2B 775aa9793a68fc65c2540c331b17bdb62694f9ff90c1cc26e9faf92051614b28cbe9671c8114ed3a0740f207dcf0a8c9fee79ab2debd0592271c100ec16aeb2f SHA512 335cd07a7a7e739f08c35ed9df8deff9f24041fb9d5fbefca8f5ba3b4a545ba79db89807be30b4dbd5364240e35f82686e7d84fb54b1917925fc594c07a29abf
+EBUILD dns-lexicon-3.1.6.ebuild 689 BLAKE2B 98e00566f6eb63d760d0a792a4662e693765ac966cf7fd17cac16e54044efe5cd65aa6135746fdce2aaeca02fbc0cd9a13f53b0954e8a1648b4fd3fb7ec7e9ec SHA512 18d45571928e084f4dd663b959c6a2f14effcc83ba5f0cda9dec97105d22717f84d518d5c0e89719cb4538dc52355b942e53f50cc30ed8b7f00bb427e7ab301f
+EBUILD dns-lexicon-3.3.4.ebuild 689 BLAKE2B 98e00566f6eb63d760d0a792a4662e693765ac966cf7fd17cac16e54044efe5cd65aa6135746fdce2aaeca02fbc0cd9a13f53b0954e8a1648b4fd3fb7ec7e9ec SHA512 18d45571928e084f4dd663b959c6a2f14effcc83ba5f0cda9dec97105d22717f84d518d5c0e89719cb4538dc52355b942e53f50cc30ed8b7f00bb427e7ab301f
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.1.6.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.1.6.ebuild
index 33d1e08db007..4ecb9e815a47 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.1.6.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
index 33d1e08db007..4ecb9e815a47 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
diff --git a/dev-python/dnslib/Manifest b/dev-python/dnslib/Manifest
index 40a8bff74ba0..e6106d85967a 100644
--- a/dev-python/dnslib/Manifest
+++ b/dev-python/dnslib/Manifest
@@ -1,3 +1,3 @@
 DIST dnslib-0.9.6.tar.gz 60079 BLAKE2B 203f765683cdeefb0aab50138c548c585352dd38fad3fe834dc4919584a5e8b3912451e09050d30f42ed301716dce1c2b02b15464881355ab893c601a4635790 SHA512 c733803a9b25356c82afb4ce853a681545aebdb5fbd4f8a544eea9bb61ff354acc044a43357435e02b8b787a17fec99ea7e9f01b1c1e93a2e39945657c495105
-EBUILD dnslib-0.9.6.ebuild 447 BLAKE2B 40303501e3d7ab06c9ecfd52d80681d6452d529b2c299f67a0e9b96aa803f30be81997d17be0c1c865290a56d6790a8b7fcd22831ef188465a2e3eae94f783fa SHA512 97a67aa4446523b2b47a642d2c9297dc97f31f34afd770eaf12f38e8dbea247c7a9b6de1d68b48d6e786deff5f0c8436e5be304cce78124b52627c0116c4a5e0
+EBUILD dnslib-0.9.6.ebuild 428 BLAKE2B 0d4bc64df0e7daae5797faad33f421f04496a63e9811da944693dcc9572c293436b03d40cc8851b3d716a3a791273b075ab8a8c10d96a4cc91e9fe680d92bfb3 SHA512 0cca9f9a6663715c57f2dd6cc48f0cb63390c7e6ee9b8102ed9a44fd449ae55a7d12e18185a8b134bb8aafdab5f70649cf97df963839b1f8f20af3d9cca8648b
 MISC metadata.xml 330 BLAKE2B 04303b87a464d7e4cf5004b89038dfaae01809763d44f1eb0fa23ec414826292c5f1b7601f2d96bf9db8ed39bd1ac0285c63fe41fb6f8f33af4f4d2d3aa487aa SHA512 a3d016fa988a8e573fb13dc86ba726c2ccae234c23dac767166064f83f49da7ccd9bc1313753efdcd02d4bf1816c98483396e21addc1c5e9846045d59d420b50
diff --git a/dev-python/dnslib/dnslib-0.9.6.ebuild b/dev-python/dnslib/dnslib-0.9.6.ebuild
index 20def32d50bb..1fd55ee66124 100644
--- a/dev-python/dnslib/dnslib-0.9.6.ebuild
+++ b/dev-python/dnslib/dnslib-0.9.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 95d409fa20a9..60eb919a4ae8 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,6 +1,6 @@
 DIST dnspython-1.15.0.zip 252157 BLAKE2B 6766c1e69bc4225b08f3b1b3871fac2aba7ae707de5f16718798ce4d6846308500c5341f9ace1b48d3858ffc965a7295ee42cc2c35ff23ac38d71927dcaecfe9 SHA512 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
-EBUILD dnspython-1.15.0-r1.ebuild 1047 BLAKE2B 9d9f2455585eee22646c4ad2613b903149edbf6338bb6c80e5c97aafebb3ccaa5d3f162f3dbb4dc4d6cd609565d94f93011b8c247905d014fc9ffa23cdcc7c4b SHA512 43050217cc0d7153a5a9595633454ec0d9fa51197e28d60685ef2be6cfda1ae4824187c27216010acf237176002db33e53046c369df19d6d20bb2c6122b18d11
-EBUILD dnspython-1.16.0-r1.ebuild 1132 BLAKE2B 6ef2c5eec9c1b6608aed6f030468575dce2a7bd59fd69d56115266dd4d8f5938cbf26b04c75ff680c0fe445687bf4916cc981a88b7e8e421dc6cd6e9522821cc SHA512 918210e99b8210651cd0d5730e669c0fd3c868ac174dda039b3b957e264235bb14b91af1aa7103fcfe7f0de531ba0a34df049f2337706b029c59cff7730bceee
-EBUILD dnspython-1.16.0.ebuild 1114 BLAKE2B ae215867b69fcf5f3031efd6b09e35ea21b9534cb41397c4583dc87c8ce83d377aa44ed64e9ab57e4cd9d14d2935c0e3b7609ed8f9f11ca9324807445cbd0139 SHA512 62aab93509e3451042c7b7652a693ef2caaf375ea7e5df1dcc6b2c29093e84ba3807c664f31b62746468659cb9293a05aa5c9efac778444cde9d83a69d0c32ff
+EBUILD dnspython-1.15.0-r1.ebuild 1043 BLAKE2B 98148ca63d2700dd3fc7ecd91a7d3ae70d158ffc297ec15318c16574b9a865084764746e9e3d8de0a705da65980f3de97e18fe4df33b460b945f79916f57729c SHA512 7149439bf07f1bc1f8e7fb5f0056ff5417b68604d43a05f28669c1509bc374a0415b0fff5806d9cb9e2201fbb6c327d7fa63fc03135ef3430d7b2344a0039227
+EBUILD dnspython-1.16.0-r1.ebuild 1127 BLAKE2B c85c96b947676d3860ebed78d86e60fac257e397ed74db5869ff7be94733336b3696e1e6ec5bcbf38e335d2a53c3a3daa8aa675e0cdca42d14415f8d346d42c4 SHA512 de1d87496c193811a9ee5f632f0133304006ca6f307486aeac28bce3bf6382cfaf7c25ede8c30ea2a992a6c72f2e81615d57beb4518c531692c7d88742f34773
+EBUILD dnspython-1.16.0.ebuild 1112 BLAKE2B bed3cb7120311cb822a2f3d88d715d46983f30863cb61a1801743e6e7eabff9de73366d1aabc42799f6c89b3261cf6274927ea999a8dc56358341cbdf379e9a9 SHA512 87fd614db6ecfc0d655b9d609a58eb8b27190864b0637b413cbbe93e63e066ef35438d4befc0228ac3f1a4b941b878286428d60cae7d3b5ac2a93cc4d471941f
 MISC metadata.xml 1458 BLAKE2B 9a04546a3cb62f7ed6a72a8416e7f38aca15733a444970e84fe0134d0097eca4ae8fab9433f66196539de66a4b6b92103a4531f9248cf508a2e0f4d16c85c172 SHA512 40c86234936ba4f0c01a98266e74d49a80a8a48d4761b887ec84fe3ff9b534e7b6daf3c317d299b1333132a6025e49abf63884e7d6d0634c876dc74b470e0a7d
diff --git a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
index 01a44cc94174..80036a43eb8f 100644
--- a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
index 3b57e85601a4..03b92222bbba 100644
--- a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/dnspython/dnspython-1.16.0.ebuild b/dev-python/dnspython/dnspython-1.16.0.ebuild
index 08b85398024b..dca21798904f 100644
--- a/dev-python/dnspython/dnspython-1.16.0.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index 86fe8b40434b..f3ba11eabe20 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,3 +1,3 @@
 DIST doc8-0.6.0.tar.gz 21547 BLAKE2B 84908a28e46fa970db7510d5fec7815028b9e65bec3cb5c0352f4ed88560765bde4c76aea3ba803ce737dff1856b702b21cebcf151587f6ae2870d4d1126d0a5 SHA512 1858334d3a0247d4d30c311bd7f13be66a6cdb6131f9d24dc10e38efaed6e08c8c7d11b776ff5dac7d6ae5eeb1cb7ef03523bc3e244794625a8ac1346cc05d75
-EBUILD doc8-0.6.0.ebuild 874 BLAKE2B 7572988739bf672cd787ae167b2510f0b4f678f667dfe8cec86962d8c36451f210447b44f3904671ce4ed8c52f39e2cdc48006277bd7aa7aa0613e99ced57cd8 SHA512 6544b0b5d60833b86702481089d9ab1eb758429b67f94e6ce749110aeeed0018728a5b80188cef9fdcb644ab5d0679bc5ce77284734c899e92797f5d5b705897
+EBUILD doc8-0.6.0.ebuild 872 BLAKE2B 4d1990dfea695d2cb892b56c4fa70faf9306fbf5cfa8b343d3c8c603913eb78ebce5623fc815d342d4df9cf88ebc283158626d294faed97d6dc9dc03c7d4f08c SHA512 dc0738af9ef4f81d4db50985cfacfbffe4ca61311e001efdaa236fd1a26bd836be26b728d02c239de398c7b2182c5ae5827283d5fa06eba7b2b001d09457de1a
 MISC metadata.xml 321 BLAKE2B 91708fe1c777fab5db78b96478a40afe8e209db0a4eabe6e6f76bba6efa7c81add8a4e9c5b91cb126d491826b9e3fc325c3e0adcf5fe6c00360cbd60295220bb SHA512 ada3a7f942be7daceb700085466dfb812b457c8d1af21047cf359786e8d9d6f122b84481bfd5c05f3d07f02ced2e1b91b9edf079bc0c0655097e3884862ebfcb
diff --git a/dev-python/doc8/doc8-0.6.0.ebuild b/dev-python/doc8/doc8-0.6.0.ebuild
index 9bc61226b465..aae2bece4d71 100644
--- a/dev-python/doc8/doc8-0.6.0.ebuild
+++ b/dev-python/doc8/doc8-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 042d08793e82..3f1af3037d60 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -2,8 +2,10 @@ DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4
 DIST docker-py-3.6.0.tar.gz 213435 BLAKE2B 28301a508ef346373f8ac4033b697a71092c4162ba1be81bc69c513d1de700326a4e8ffcb1c015e20516aa1a09d31162d54182985eea3dc1dc23d6e79ef28fea SHA512 b32acb2585995c3c5bdef95ea4bbb6bcadba3b9fca81a3e637dc294b5dbd3823ee6c98236c4bb197373a96feafcaae665b9c64b805abd52e1ae27aa42079278d
 DIST docker-py-3.7.1.tar.gz 220882 BLAKE2B a7547d2989b3fc2dfc38dfffb909508b7a5b3f8ee6b0fc874a73d0cdfaa17fe28c971f5a226893a41d893e75b1b2e4c74da806996e85b097b3a85b2d8dadcfcb SHA512 0a89c5fc05423d913b1029390318d9cd4ca54a3b4df1e9a9f459e27fa114fd7b03047ff95f3ea2ef6bb2cb48c5f6fe712da11c940249d3b253aa3fe74b8b1c98
 DIST docker-py-3.7.3.tar.gz 221311 BLAKE2B 6bdfc5cd53fccec6e060d08ebde845d373f961a8a418e3bfbeac79e736f64aa07807a4f2074d243765d10c0e4cc87c672d039cdefe4223ec1b33b56cf4ea31a9 SHA512 d3217361617f12e841bfa443c7ab4b44ca5f7ead8b40834919aad9043220efa7611a8bd18cbec6adc4d98f2551bfb169535e1eec904b90425648093c0d6a1722
-EBUILD docker-py-2.7.0.ebuild 1539 BLAKE2B 388eb2de15265da264f0ac2697f4e5a375ae2e34e9d532bc8ff41cd24cac4a8a9ed79682b8fc154363360917f4528ad7f43bcef70af296c580911b7a26a562a9 SHA512 cd06b09a2188616616ec2b534def5b062cb0520cd0d7a10ad27c95ea071d0d2b3d8ae2f1e9a7271f3a80bd8f27cea5c0e59766bd28efe8f79720a5cb56ab3711
-EBUILD docker-py-3.6.0.ebuild 1459 BLAKE2B fc791fd6cbc37ae9501fb7613aecbd7fbd63d3e3692b58892687e78fd605f7f4c3e31654c064f2720c6c1a1099ba49810474721dc78dc0210184e03fe19e1964 SHA512 d6181326179ea3de90f383267f451d23838627dddd0af3052f3b86f7d2a549e0f6350b61901cb3d0308bf7b5917d0ddfd075428b40ab7a0ed4d73bb4b950fe37
-EBUILD docker-py-3.7.1.ebuild 1460 BLAKE2B 36466f94b331395520624ae83477ef8df065c111e6fdbf67ba7097b854e99c31f4ea007c4dfbe205ef131fb06a896aedc77cf5e2aea4efc6f9d575f1ebb3b667 SHA512 2253716a557ec07aa12148ccc9c2d14cd4ead6c1dabc281b2e59335c37d183307a97ae4d8a0aec512d81c2310476f38030f04819fccab471aedebe0d195dfcbe
-EBUILD docker-py-3.7.3.ebuild 1461 BLAKE2B 3da08d34f1c39bd252a9469352d926d404491eac9b838621ae230e13c789dcbaa230818b7cfbeb82279ff3ceaea49729ee2f500947e78c25a432cc4f25ff31dc SHA512 61718cb9e4c9f9475a98f605306fa4d5fecda68a1f78d0979cf593bef7ddfabe50d288eb635796babe63c6b8e644c351b028393606263be57a0202d3f7978ebb
+DIST docker-py-4.1.0.tar.gz 229336 BLAKE2B 8a2e0333e0e90399c0c4267c5b5205f3639077384e882e920a613e2d30d7ee915bdd549ec89a4c0e34646edbc6dea450ce63e45cf9cbc1efe0e26ff6ea5961db SHA512 25e236bd5b429846ed45f26a303af02bb679c526f45f188d8df74d79fcab116b41e52e3a85642babff94127ae977dab6cc93e53bb78aab7be038190e161d25be
+EBUILD docker-py-2.7.0.ebuild 1535 BLAKE2B f6364e406ff7a26770c677a85fcf0ae2942554a92c2d830291b97b8d2061ed9ac242493187829ca2059bfcc0d3f2019737d08369f2f8c910401109d09d48c903 SHA512 c3d82a4faaa5b06a25bd04ddfd006112ebaf64ff6c5ac259ba7edbf12ba55ccf07bba9b36583c6c58b6e730512dfbd138b5ca1885d9fa1cc1d51db026dfc1a85
+EBUILD docker-py-3.6.0.ebuild 1455 BLAKE2B d639fdd7f4cf6c6e77dae996f0c39ed9e2f4ee8ead92796f8837c49b8a42c98b3c6d1d7aebab1defe7a707e7a1efe1599bd18cc1b63f169073e242d63d441594 SHA512 30383a38fdf48446b1549882f157105f5849e0b759485a6ecc576d84c12887cc7777178db7866dc9c8c93a5fd63784f1fde683c5e2c604742207204d535121fd
+EBUILD docker-py-3.7.1.ebuild 1456 BLAKE2B 0b826607a2281a8dfba84a11074ce948682cd37c30ad1858316ab03a6ae1a6095441c6530475d8ab643d0676b188f6af7b14b8c54b3192f6c60c310c14dbc1bb SHA512 064bb8b20be646b2b9ae4fcb013728daf921148e209df253cb59f5664c5f3590b51f78fbd29a0500a38e40a9d41d8a3f2d1daf083238b6fb6ee0ebe6b7ae2c41
+EBUILD docker-py-3.7.3.ebuild 1457 BLAKE2B 29b28fee9ff4fe0cf8f1f2370234ba10e13684922800483a29380dcb60797fc63488da07fa1d499d67c9aea1c0f9c910dfea247a89f355081144d81c6b4ebe00 SHA512 3dc50445965e4561cd063137352a80c4c818e7ff86a50645524a4dd19efb1917267eea797e0274a748cf7634fb10907c4ffdd3c34d5f5df6f8b160020bcd8174
+EBUILD docker-py-4.1.0.ebuild 1363 BLAKE2B 5739c6e68dbc7cd2ecf2fb91a2524478fe5e0104e1a0975f631fb48b644ac12e52366349fec4b5d4c192e51e72968de24ae82c480bf7d5f7f83d824f129d3874 SHA512 793a1e22a2159d0e64fc8e77837e1ac96b17e926a2fe12c9f7143d64ac676dfde7ba50a2761d8c5d650ac739fa88b91e4a635ab83e10bba1113776bd988c7faf
 MISC metadata.xml 319 BLAKE2B 94c736dc4cced0c42b48683b887ca3bca96bee3a8bb847c0af93764abeb55a14d1f8f77eedad59f68612550dda67b4b6c227c61abd0c7155932f22f463194de7 SHA512 0e33a17e754e136b13dce5ad5fe93b159951c834e1140a176c25fc747aaf4eb4de18112c62a7bc7eab3fcf3f580583a335b88e6ab35c52c582f627d0b81c35e6
diff --git a/dev-python/docker-py/docker-py-2.7.0.ebuild b/dev-python/docker-py/docker-py-2.7.0.ebuild
index 9a5f8deb604a..991185bd4100 100644
--- a/dev-python/docker-py/docker-py-2.7.0.ebuild
+++ b/dev-python/docker-py/docker-py-2.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-py/docker-py-3.6.0.ebuild b/dev-python/docker-py/docker-py-3.6.0.ebuild
index e2816c4415c1..427d7656a17c 100644
--- a/dev-python/docker-py/docker-py-3.6.0.ebuild
+++ b/dev-python/docker-py/docker-py-3.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-py/docker-py-3.7.1.ebuild b/dev-python/docker-py/docker-py-3.7.1.ebuild
index e407eb9892fa..26e4ebc62477 100644
--- a/dev-python/docker-py/docker-py-3.7.1.ebuild
+++ b/dev-python/docker-py/docker-py-3.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-py/docker-py-3.7.3.ebuild b/dev-python/docker-py/docker-py-3.7.3.ebuild
index 94687fd3c146..1e78f676fd4c 100644
--- a/dev-python/docker-py/docker-py-3.7.3.ebuild
+++ b/dev-python/docker-py/docker-py-3.7.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-py/docker-py-4.1.0.ebuild b/dev-python/docker-py/docker-py-4.1.0.ebuild
new file mode 100644
index 000000000000..ae65b322d32a
--- /dev/null
+++ b/dev-python/docker-py/docker-py-4.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/docker-pycreds/Manifest b/dev-python/docker-pycreds/Manifest
index 288ce87a2f14..5f610ac4570e 100644
--- a/dev-python/docker-pycreds/Manifest
+++ b/dev-python/docker-pycreds/Manifest
@@ -2,8 +2,8 @@ DIST docker-pycreds-0.2.1.tar.gz 7555 BLAKE2B e9934a357cb59d995971f0d3b247e6d84e
 DIST docker-pycreds-0.2.3.tar.gz 8220 BLAKE2B db645de930becc3ad6ecb2d6476d36d1845fbaa55b7c6d2d6590e45036713b6e215b189e6ea961c31c0898e8f231943e05abe96a63c15ac43bebf0f7787b954b SHA512 d4199a48a0bda29ac6126ca9a196c0722667a744998b5f81b360066d48f1bd1f9e6e423df2b53e37117316f3dada6fa47e956c6d2c7d90f851d97a434dcb595f
 DIST docker-pycreds-0.3.0.tar.gz 8544 BLAKE2B 88a950d7fa027b221ffd999283cb6ee4b0f23115167f27f163085372abccc4d9d5dfeb03ab5d99449d607dc69212bfeb870130d0f91843cca6b9b338d0f4f9ad SHA512 5fa81b375c3ddb6527f416afb11688cb703f75dbd3b1a9efba0cf85e8b3deb903670c94933777b855d48d607596192c72e4d5be96f91ac8e8334e634abf8d2fa
 DIST docker-pycreds-0.4.0.tar.gz 8754 BLAKE2B 22aba2a2a7c92c4e0fa7fec5df1a17fabd9320440922f542a4e8dabf90ec71b9b8ff744a7ef1d46e7d720862624c721f5d2e4057edb48a85e329665c477b6406 SHA512 ca5f68ef2405cc57c0b54224d4f8199c9a4c9217d78f627bffeb950998b09a69b608d1e365cac6859661346fd078c3d081828bb4ff2e18bf7a9384451ae2225a
-EBUILD docker-pycreds-0.2.1.ebuild 512 BLAKE2B e612938f13585ff102bfa8a0535d858381c399eb41cb8c01161c77f751d69ee3923eae6e3face0264c76b5d865abd7546c87b181aa4a7c857464fab3019c946d SHA512 4d1aeaff99eb6b896de9d7d407255dc09932a68d6a6be9c2099be75afee63652dfd3dbfb8bff60b7a2b118cec1ad96fa085ba53171af9108887710c8fc96b022
-EBUILD docker-pycreds-0.2.3.ebuild 514 BLAKE2B bee99170a4cf6fc6ac3db47d1dc5876e7b9b33ccb320c97ecd14d2af195fcac52aa0fc81ebc4f280762aacd108264cfc6172d2bcad89a33ce75e468047800ec7 SHA512 613feed54ed1133f4d5374f4ac66389c1ea963c4cae65ea8741fa71734f5db638c3c6affb561f84a69276ceaab0451f32b59db0cf235ddb3cc7f21175ca48f9b
-EBUILD docker-pycreds-0.3.0.ebuild 516 BLAKE2B a33748c4a2caafca4989b766cdb83b2577d4a2f052122002102e4c7ac471fd10d749382d563a050cb5aa1fa1681d2d7fc6676d6dd85bdfd7807de315142951f3 SHA512 71411cf173705519400198a1e0de7a87db675ae59065ae06536ad10f84cabeb41f866f79a31b23e5a7e832e48a3b68140a133f9ae1c074272e6725b43c812931
-EBUILD docker-pycreds-0.4.0.ebuild 517 BLAKE2B ec8e93131cf4c03e907a8a3cb1b7d1d765d0b811562706bc3315c453435e9b1cd9c49523c0edc6f09608740d003fefd302a56a871ddeb9f2c4d546cf1aac4f62 SHA512 65a118a5ee32372c99a4525c692377c3c6158194bbe15b72615453177d4bc524890e2bcfe3898cbf212d2a36ce6b906f8db826b0169520612680ea81e507f33e
+EBUILD docker-pycreds-0.2.1.ebuild 508 BLAKE2B f9086a14f9a6bf85c29618dad5e0f290d1af7b2fdd7eac2c84cfccac54f8ca62592deaa34bf0c4143e009ba5721f96079c9faf5d61ac258f1ca4642adc01dc9b SHA512 120ffcbdd7a37a160f238614548480c06e6f4dce27f7c843f56d41bed0ea60e0cd84388fb7bff74884e50e5a9cbe6cdd40db8b6320b33340f3a9fa31b3741abe
+EBUILD docker-pycreds-0.2.3.ebuild 510 BLAKE2B 00bf01a20f601800eafe4e7f6b5e7bb43beeb9f6ce5a3bb29b559baf883e93d7cd5d985c8fb4e72d5c93219573929ac40e48a200f8a3e1c6740fe1e66171ee07 SHA512 7ecdf33b2a126c0ee8a8712da90eedd3ea3aca222b60f4ef30acb5340d8ca6e6926032266b6fd52785dfc42e8c1af95f30d8154d68f82d564714ccec68a37675
+EBUILD docker-pycreds-0.3.0.ebuild 512 BLAKE2B 67b2ac388702410e31cbe7489731dd24a341690d10fff5fa59ac732aef8152dd0563d4094423cd17a825960cb844013ff49b84987e53a4feb4151763f831d8df SHA512 3275d9bbeabb163dfd379af97e8731e3d911ecff609b0ba6c9d7ec87adfc7cf49efff39fe9ef0b5736440b194a29014670553ad86a65b4a020c864ebf6d5a685
+EBUILD docker-pycreds-0.4.0.ebuild 513 BLAKE2B 59f59dac6a9311b9113c99a0cf6519ca7de9ad77752b849f16ce912bbe523ef0745757e653403d8cdb25814f500dee9bf30b20a3123a7c8cd80cee48067469c0 SHA512 37d794883ddfaddfa13f624b8d58140e2b19a9207491b6b7e73400077558acc628adda4eb0886766222acb2d55136d223b960abfaf10b409dd864c3cfeb8346b
 MISC metadata.xml 355 BLAKE2B 2bef9deaf5ab89b1e703b43844c6ee639cbc427727587b118688ca5005a9156042eaf455891f3d27fe007793aeed75e8626a66e1b3a42ddc0ccd2f21747797dd SHA512 a980d256f1c5a3a76a486cc97bc9394b02dd5042e001a03b1aa4834b040fa9abe3626549d09f693aade8c269d818c4da056990b88a8f2f43fa0211a8c5cf4dab
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
index a008455824b8..f783e6fca03c 100644
--- a/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
+++ b/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the docker credentials store API"
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.2.3.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.2.3.ebuild
index d3de83f7d2e5..1f09c4979e6c 100644
--- a/dev-python/docker-pycreds/docker-pycreds-0.2.3.ebuild
+++ b/dev-python/docker-pycreds/docker-pycreds-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the docker credentials store API"
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
index e6e39ec696ec..4d9f76624b34 100644
--- a/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
+++ b/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the docker credentials store API"
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
index b165e9aca8c5..441d8e5b124b 100644
--- a/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
+++ b/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the docker credentials store API"
diff --git a/dev-python/dockerpty/Manifest b/dev-python/dockerpty/Manifest
index 1711a5a627a9..72411a7a3e8f 100644
--- a/dev-python/dockerpty/Manifest
+++ b/dev-python/dockerpty/Manifest
@@ -1,3 +1,3 @@
 DIST dockerpty-0.4.1.tar.gz 19608 BLAKE2B 1c7229bdd18100bb75a8ec80f0b8a636137efce40affb2bbadf27eef5ee13322ab92f9a3f77db0ef79c35366daf700550eb9a358534f7a1f1c2b92ec2cd4d5d0 SHA512 1f27a1d1cf9bfa21a77f2c0695334ec09a81ed5b70190b16fb23ec0e2ab4cb84af334b5e9275265eff2d8014aac5f96890276bed5775bb805c3f30260c99da70
-EBUILD dockerpty-0.4.1.ebuild 805 BLAKE2B 4462cf84b49bbaab51e7cc2d218c7d4f8e4fe5f0e3bec73451d54451309181e3f1d826a75d0e51cd1f398950f94fa4adce4abed676ee02b3a7c70a29b5033837 SHA512 9e4385570b2dfcb51be40e4a584f1e351f088275139e37ed3096251a05e974635cf76e62323f8ec117fe81be6f1882ddf6ee7050377543172fa2e59a835ffd22
+EBUILD dockerpty-0.4.1.ebuild 801 BLAKE2B 3e39e8927d57d8ad346649d5dcbab9b460f76ec5e546c52dab342b51e1e6a26a49650485646879209e28d48a1e447ece3dfb081403174f381b8955bc6c6eefd7 SHA512 988fc25c1eb4431c4064b9deb28a6ad9ca5e482cf54ea69cb31d3aaf0514663bf4bb4b36fc6d3062312edd711896ba52fb236ad9af495f3f399372d36d872fb6
 MISC metadata.xml 246 BLAKE2B a3790516e837d7d62a7efa31295004ba64b36026f45d696d87b5fb83e0b08815b887209bd5ba4f0be5a8b1371797d4abdbd125f4f018b32dd95613b36c53ffbb SHA512 c9e4e7717be1b4f5571d287b57d59c6de4bee0f4bb0a21a55cbbc886f711d57e52e74761bcf7f1102e1efa4b0e56f508e5f15eeb69cb38866692bc232032f936
diff --git a/dev-python/dockerpty/dockerpty-0.4.1.ebuild b/dev-python/dockerpty/dockerpty-0.4.1.ebuild
index 4bcdf0afc23d..a18b282795b5 100644
--- a/dev-python/dockerpty/dockerpty-0.4.1.ebuild
+++ b/dev-python/dockerpty/dockerpty-0.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 1293fc121a35..c2798364bbbf 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,5 +1,5 @@
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
 DIST docopt-0.6.2.tar.gz 25901 BLAKE2B b44308bb4a6571ddd092de63401d16e31a9d9b93be9b132fb45503eb9d84273d7c1f20bc5b2e3e2d969506fcf760fff142c37197e0b92dc9e7f6f431fb0abcc0 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3
-EBUILD docopt-0.6.2-r2.ebuild 810 BLAKE2B 361e911194d5d0c344d7b0cd4e3bc2453e76ed320db691c129cde08bb50f7d9e7fd75cf61eb4feffbc07a56c8a37fd55cc80aa24878484cc0f665b233465fd77 SHA512 1c10a575765299cd32a0833f971b18d92707a7cde0b6462268209ed2cbcb11362dfbc6a16e5ad380e236f094b1e39641a250f80b6724a6bade8396b7ac22810c
-EBUILD docopt-0.6.2-r3.ebuild 756 BLAKE2B ab4268a0b061e562ebe8e5ff18563070eaa7220a8e7fb1c5e4a6c3d2c377a36a91cf68ae394fe4abb6a84e1f5d182c5924d35fa98e6c4b8ca14c534f98f90b5a SHA512 8ff67889bb72574a5039a046214fc5cc3d1bfbf744cbf2de4a4463d99a43143d4ab485ee5dae73648416665260d53bb99d76d97224d0d6b71e32f2b4569225a1
+EBUILD docopt-0.6.2-r2.ebuild 801 BLAKE2B 85c3f8d0c201c6fe6103237ebb34b0f035f0155a91c5030cb46d08ea7b574997c9a67a9fc27a3fc3d1c2800e04f6ff9ed555e00ec041894ec7ae41ed3ab3c7cd SHA512 95ef113fc318e1e2b1265f6deb71a237f660e9b474895a26906e6c9fa7d6b5b5c6413db2417225803523b217d38e7d924922f042b0fadf7282e13df4f669df58
+EBUILD docopt-0.6.2-r3.ebuild 751 BLAKE2B fa4b7835d1f9f70bffc5ba0b755234e4723965dfdb0afe855d9c9e66fe3e7a299ad4e5e6b0a3122a1bf696a485cc4f6b90903a305512333d451e4e186011ad65 SHA512 78bce02b70ed647e14210d479d0eaf4a496400271fbed9bb554720fd1aa1dea7a00ca277e6eb4f81b98c77a6f8e2a82bbad0756263f13b0cef94f01684789774
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
index b3a46b93f8d1..20e819abc732 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/docopt/docopt-0.6.2-r3.ebuild b/dev-python/docopt/docopt-0.6.2-r3.ebuild
index b91713d41879..c29ba52d0042 100644
--- a/dev-python/docopt/docopt-0.6.2-r3.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
index 726c01c39aed..ea9634cf28ad 100644
--- a/dev-python/doctest-ignore-unicode/Manifest
+++ b/dev-python/doctest-ignore-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 BLAKE2B a114a1724445ed2c5c41f46098d5930da8b255e82256ef686fa8567dc305608363895655ede36f70b87896f0ed22f1c8e1047632cff5719ef7417159b0a691e6 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3
-EBUILD doctest-ignore-unicode-0.1.2.ebuild 660 BLAKE2B 345f190c7dc48ed7d635cf8dec84a7d56459d209b1955c832bcf3039b6ef9a8dbf0d9f16216cc32abe7ca1d0cc59df0f0ffc5c1ed4edc31af144f9e7691b63ac SHA512 6a96e96509b6c1f2af0fd09cd8c2ecc0e04aa1c4dff4946e4449258f31c890d2f46d9dcc36a5d31bbbc17a4e399bc980e0c1076393dff9e17f50a5ebbcdaa4f6
+EBUILD doctest-ignore-unicode-0.1.2.ebuild 655 BLAKE2B fff958f94e91fcd7f64b1e6ce570c0d1ebc9fdbe2cf1875e0e632f5f5803e3353317135966f4c26f2ae5b2f093ef27f5df8c40d6b8a9ebd6aa2068ae4e3059e6 SHA512 ef644a589cb4bd70ba6d57c28d9feb685566f5f6516cf9ca7a1b2d260a5537411311bcb88a0afbd26708e69f4de1d8b594431cd2660ca212b7048bbe819ce3ac
 MISC metadata.xml 396 BLAKE2B 9d6ed08e6f963cb03406050e1ec934e9fd0484633e7989b52d5277e6668ebdc919d60f8b0898b0ccec076e9839ed07c6cf5273e14a289049f815cb119e4c13d9 SHA512 da8a39b0f46893a69b4e53ef6b62845f70b1ebdb0ff1c339f52b61b69c6a6e730ecc26d3f99db16a259c73ff454685faf546babc7afc9e804170a0e738cd7d1d
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
index e0f024570084..e71f6d0f8304 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -21,4 +22,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
+"
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 08394e97148e..013cd72921be 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,8 +1,4 @@
-DIST docutils_glep-1.1.tar.gz 6753 BLAKE2B 93e7fa03e6e5b4f7d7d338b04d906eac630d2a8e179af14c0c3f0d5f9926cc3705dcec84d2b9b2b7b3854bf9de178256ad2c4ef4bc567c6ba0d95d2abc32b8ac SHA512 7b06cbc7bf7a7f9002e1d61fbbafdb7ee6fa804145e7ce7edc547384f22cac8f9a9072bc137e201ab08a49eedb5e4f2ea8a1f02bd806d7d01525bdedece4afb8
 DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b921125c20913134500dd53ae04b0962141183cbcb9bd17af904196ead2228e4c80a6e256576b715ae6323afadc30 SHA512 696412447120893c198dcd9f13e042d20b35465e83ef8b488ee2f1c184b5fd3928ddbf10ed4e78886c4c72dfe1f9fa46c1f75c7997990afcc04353b5d59ebf9f
-DIST glep-0.4-r1.tbz2 4667 BLAKE2B 34041a972c1edae500d973a2002719a3208c84e042bad231746f83cde99e9b72db835dbdaef536c50bc73c6bbb27e4dc61fe7563bc520b006a04defa6a952c83 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3
-EBUILD docutils-glep-0.4-r1.ebuild 1131 BLAKE2B afd5b0da30124909967de92325141c0adc6459c55dce5b50efc8cad0070da3ef21f62765eabc58600b67de83fccfc6e4e1ae8d76cde3d5a3cea3d67a951ce680 SHA512 52f917a71dd35b5f3304970673872026bf5f83faafbc4ef6a603446c8f9f1377681c3fe9f48e7dfda17efa8d5bfa0d250c0d235b1186e424641618aaca0e2486
-EBUILD docutils-glep-1.1.ebuild 812 BLAKE2B e6acfdf7ffa5a24225b07ac04e710d720b69b9d3486cf8df94a6c1beae3f1f29ba22ee16ae1cacfd5f9f7535d96803fdf3dc3cd55d6982779015589df975ec0e SHA512 c0b66e264759bee849f68905711414f3bb3a9691fa1adcc8013e085a92d89012f0e90a63a4a36d1522a4496830be31d827f7fa680355142e482095cc473a47bb
-EBUILD docutils-glep-1.2.ebuild 812 BLAKE2B e6acfdf7ffa5a24225b07ac04e710d720b69b9d3486cf8df94a6c1beae3f1f29ba22ee16ae1cacfd5f9f7535d96803fdf3dc3cd55d6982779015589df975ec0e SHA512 c0b66e264759bee849f68905711414f3bb3a9691fa1adcc8013e085a92d89012f0e90a63a4a36d1522a4496830be31d827f7fa680355142e482095cc473a47bb
-EBUILD docutils-glep-9999.ebuild 570 BLAKE2B b4a1162f4ea5e9a4011ac63e510f3ed3f0695d495a6225b6a2aa5131556bd32d4aa7621bad4ae06cc2927712cd3ea498832bd7af01011358356ce0b0053cfad6 SHA512 658178776eca461abaae1f21726b22882a411ad535654886eb2fa16b10462629b559e1f1cd89419513f427ad24d303217b52e7e65ad00bceadb5838fef4c2d79
+EBUILD docutils-glep-1.2.ebuild 797 BLAKE2B a7df8fe31f6af4c637d3021de1d15370f3e6700e3afd92f3ad66cc5f938488d19cbede09e0954761c0c6da5e1da41d6d8fb745dc311c8d38e73843b4f087f468 SHA512 c20963626fb5b31df4670f0dc4093c75de35119259092ed82ce7b76759661f8a2ca61f074d2f0b32cd13d0378b0b41db669099cf2d79336ed1ff758bc32f050f
+EBUILD docutils-glep-9999.ebuild 555 BLAKE2B 55680c36b9d22e6b61b36db0a4bdf2df89715791c775abd0a05f9b5f924765cd7e6a349606c8f16a1e7208c7cddd66458bbc82e0db4203c65d44b0ad1d51d80d SHA512 df2932d8f62b9256429b300daa6b3f352b1a44b3ae5a9c54c677fc92edd7f6370d8d8b4ce729cffddb146970f8d35392c8e8dd43165d0e6592d1891d42ee1a8c
 MISC metadata.xml 372 BLAKE2B e34273d2456e517c83d2ed1933ccdcce21d22ce96cff97c691d920c144e921b4f49b0018b4d9d5dd72a7fb0f2578dc0ed9d4958915fb386d0db3bb134d592df5 SHA512 da8ea65057ab402c29eab6fe2bb7fcc6f82052cb4fbacaac99c955da80da7286cd837bf0489420f04bf41aac1789a349ea50f624bb105f44021dabb92340d1e3
diff --git a/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild b/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
deleted file mode 100644
index ae59276d7c68..000000000000
--- a/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit python-r1
-
-MY_P=${PF/docutils-/}
-
-DESCRIPTION="Gentoo GLEP support for docutils"
-HOMEPAGE="https://www.gentoo.org/proj/en/glep/"
-SRC_URI="mirror://gentoo/${MY_P}.tbz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# It's easier to move them around now.
-	# TODO: add python_newmodule?
-	mkdir {readers,transforms,writers} || die
-	mv {glepread,readers/glep}.py || die
-	mv {glepstrans,transforms/gleps}.py || die
-	mv glep_html writers/ || die
-}
-
-src_install() {
-	inst() {
-		python_doscript glep.py
-
-		python_moduleinto docutils
-		python_domodule readers transforms writers
-	}
-
-	python_foreach_impl inst
-}
diff --git a/dev-python/docutils-glep/docutils-glep-1.1.ebuild b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
deleted file mode 100644
index 01ae57043fa4..000000000000
--- a/dev-python/docutils-glep/docutils-glep-1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Gentoo GLEP support for docutils"
-HOMEPAGE="https://github.com/mgorny/docutils-glep/"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index 01ae57043fa4..7bceafc9a455 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docutils-glep/docutils-glep-9999.ebuild b/dev-python/docutils-glep/docutils-glep-9999.ebuild
index bbc620a682be..f6d958c0714b 100644
--- a/dev-python/docutils-glep/docutils-glep-9999.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python3_{6,7} )
 EGIT_REPO_URI="https://github.com/mgorny/docutils-glep.git"
 
 inherit distutils-r1 git-r3
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 1dcb55795c6b..7ecadba4abfe 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -3,8 +3,8 @@ DIST docutils-0.12.tar.gz 1618353 BLAKE2B c431e4f2d5ca21235bba860ae7aa4698af0f41
 DIST docutils-0.13.1.tar.gz 1735216 BLAKE2B 6229e7de842c6871bcc44a536333f005c5f4691423a4284d72f617bacbdbeb67c0e49e1ee74ce6ebf96e9329d0df2a5acdef306da975551108e74bd557aff4f9 SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e
 DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d7f4c300e08d50b730aa5f753e564391e796b71947c66179ad58fb99e17d11172867d804e0734a17be7dcef3b4b SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c
 DIST docutils-0.15.2.tar.gz 1797388 BLAKE2B d7f78c37346fe30156335f31bab0fbec420980e08b10806b62ca67135388c161daf758378d74ca4650546d519923444e9343605de125295e3ca271d6109adc73 SHA512 b4528c7eba5a27e40f290a9df6894c277d11906d02f6842b9f364b29af9aa1e46f6008c87e4355947bcfa9f2db1cae9f38cf9fa7b8008ba45fa6d685922003a6
-EBUILD docutils-0.12.ebuild 1785 BLAKE2B 41c300ba5131ae5e43ed0e56d286a743c29865d0ba6c44fbd2125ccc4f58e4c32e4db5a0c3e5f869379f96be0beaad4f65a0a9e6ab3bfce154e7d52121903bec SHA512 a34dc97537a6f039e023c60496187e8ed0ed58346ccc2c0cf1b1e9f3b79a857e0c13eb1eb5cfa9db61368dba878e89f176049cd428a406006ecac78e9cebca8c
-EBUILD docutils-0.13.1.ebuild 1799 BLAKE2B 7a0396b993588019fc2bf391bd5fba88fc75e3199d2d6feb43ec6359179fa20614ef5e93267c68b932077448de4d7463684f70a3c922cc088413f001bc07801b SHA512 d94979112f9e87a35ecac5369453f70820034289a47a9cbff69521557a8c22eae8e0e67a124db30866de1cc7be67825e12ff036f1eb6c6227965577f1b3a5412
-EBUILD docutils-0.14.ebuild 1811 BLAKE2B 4893bfed0ed2f30718141854cf405dae52cbfcd27af0e85355c92ea134a62e9b185962c403bca20a8f6af4d8396d907077cb682cb6a19e87c5e8888ce10ad31d SHA512 c4d32acd0fa96ff972fd33d6e98a5cbb52ef71eb6a29d7e4e4c8f2fcb71d0350fc7ef66d2cd8e28a216faa4ef437820bbf8ee4a4262bc282033ab6dc5c926bff
-EBUILD docutils-0.15.2.ebuild 1982 BLAKE2B e53f5f3740f1f0fc5779835ce075bb3889eaf5e0951cd243b31d57217193954d9e56adba648edd46f69c7ac94345535747f18943eb6c303e7c00ccca3e5ef3ed SHA512 be904c221a7bf34a6be83d03d36a587a58332d986e5f907ec0cbe7dd06cd4293e75ffb9ec07cc64c9a5d85df8a9c415784b29af8f75de70438fdf6c2b16afcf0
+EBUILD docutils-0.12.ebuild 1776 BLAKE2B 76bfd4892acb92dbd36504c855ea59601fc0abc0d9769fa1983dfe0d754baa02c2ce941deac0f9c7746b92acaaf8bf085b58457a096782d31a169e8443b2b92f SHA512 1739b6e407dc1851fe1b497a857cc4be9cde8a8a17191b829657dad3cb70fffd1b532976f84d4c9a0c87cd98c3cfa2f2ca236e231e7511af9bc20948db278277
+EBUILD docutils-0.13.1.ebuild 1790 BLAKE2B 131c60a3591fd290845f0c910cb9b8901a04a29c9da9cdefff5e0cd13a9d07bfab9e0b77e61e133710838b05122f1f01501e23fcf0b640a0408149d2ba4414be SHA512 342804a63d45e71bc96c013f7ed8ee0b6c9de12a54ce6ed2420cbd5c58a7888d83ba42212b07613ca9435c32426631d568dede611c5ccf014c92082d5df8b595
+EBUILD docutils-0.14.ebuild 1804 BLAKE2B 2712134182d30af2b61cc60f4d78a80bf6ef2dff65a6ae41842eb82489f38b5ef23b05c0c87c065d954f383e134a7fac7fe2481710951493eaf9a14a6328acb7 SHA512 796ba3648aadbb78a1a1ea74881a0fd933f57c623d6c11330aa68df468ba2f1a15d0d4e28b7a06344c637254e6fd5595c98957da06ddfaead5d5a52332a0950f
+EBUILD docutils-0.15.2.ebuild 1977 BLAKE2B f4e1bcb781297d27bb9ccddde008a8e80608398d7dcbdc65ec550352a6e0f69f483e197936d9f90e181873b1d4f3103c90116888996701f4f999d69bf4364d33 SHA512 d7d52542c22b91e44dc87e0830dc90a0482d1697d1caf1d9ba2ea2a111c81b2fa06aaa7873a72eb25aa3307a53e6816e43432ef17774945784fbd0658a2248ac
 MISC metadata.xml 318 BLAKE2B 396ae24ba924fbaed55e84016c94fdef294c87d791c3fa911f16ffe04b452980d112b27112b58b0092d1730cce7db36efae2851d150102046a3379b65d347de2 SHA512 3cf09c6d943288ec0fd9fa92d4475ac184a87b47b7bc8df80fc24a712d8bf0363d4c2a08efb2ace4d94adcd59fdd6f82ae9fd9bbe58561ead5715f7daf84a96f
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
index b9f20eb532ca..fc68b951c304 100644
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ b/dev-python/docutils/docutils-0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/docutils/docutils-0.13.1.ebuild b/dev-python/docutils/docutils-0.13.1.ebuild
index 7eb61b6a25e6..ace0765c5cd9 100644
--- a/dev-python/docutils/docutils-0.13.1.ebuild
+++ b/dev-python/docutils/docutils-0.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/docutils/docutils-0.14.ebuild b/dev-python/docutils/docutils-0.14.ebuild
index 9a1dc81001a4..59140ae284f3 100644
--- a/dev-python/docutils/docutils-0.14.ebuild
+++ b/dev-python/docutils/docutils-0.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/docutils/docutils-0.15.2.ebuild b/dev-python/docutils/docutils-0.15.2.ebuild
index 036c2fa367c5..dbe99849fadf 100644
--- a/dev-python/docutils/docutils-0.15.2.ebuild
+++ b/dev-python/docutils/docutils-0.15.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 5db3fe98c801..f7e242d5acd4 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,5 +1,5 @@
 DIST dogpile.cache-0.6.4.tar.gz 315533 BLAKE2B 92848b82d923c6d19bc3aa7f0f1c399f8d7131bc308a79686269e904520e6b690c8d78a3c715e3e9153f81f1478bbb6e82ed6caad60a791e2488b023f1fe3d8c SHA512 0e86ed6aacbfbbbefdc3622ac956679c4986c77989daa3c3e845d4b8dbbf7945b4d0764789f03540b2ff59712e2ee86c8283cc3ee8d9e950f9ef1772db7ea137
 DIST dogpile.cache-0.7.1.tar.gz 326127 BLAKE2B 358391033d1d22b2711052f1aa3003c0c5f2da42b33b3f4fbb2d582418b0b42695db5df638dabcb9ba81ba414d142ac7f52a6c80ea645f5fcba12ca21122a495 SHA512 39c0a1d3d5027bc61cc69eda46c846c72d09892b2de0ea2e9545b1f710911dce8726b4ee4a0daef0d3c409a16733920d437f6e833a5b3f55ccc80267bb0da39c
-EBUILD dogpile-cache-0.6.4.ebuild 919 BLAKE2B 13851b9bf9866bedbfdb29b22b5e5267eb821ba0afb83d4c6cc35b7e088bac03db3ab71858d49b705227f5f55fbe0d15bbe183388247b92d63363a2742ee77f3 SHA512 50b862c5506e62769b0e7204c6188d3df6cdb5fdb5e56899d6b9798dca92429ba1a6c47134667dac097ab78ba7e4c7d7c6c7598ed278b9d97c0a963869671988
-EBUILD dogpile-cache-0.7.1.ebuild 923 BLAKE2B 163bafd6268d738742a424e7452e8ebf2141fb25ab4532d533b73d4de4dd3aa4702bb8839cb00a5b8a199f3e0fb8b34723978e4e56e429bf5a57fe16fbbde558 SHA512 31de5ef21c776691d3d1d23ded3e8593b1bc39aca45692450958281b8ece6d65fa203949217f01e7aa5f480e97c48bcf197044dade6d98ed288f6b8d2744208a
+EBUILD dogpile-cache-0.6.4.ebuild 909 BLAKE2B 9d41d8245cd99ad02941d3e8d93837b77f5317ac953494b4527a9c94c163ed089f9af8307aec79115b83aafe8325b1bf1889e7cf061102b3add0f234bc929ef8 SHA512 9d3703ef23b021520b91b295a71ae747d3fa93449e5e86b35e44b9b1f9af0abe31b8423fb88766dda31cbb51b4b1d9f52aabf638aeb1dd17054dab4e3ddc8f69
+EBUILD dogpile-cache-0.7.1.ebuild 915 BLAKE2B d5568c37cbb7e3f159a1d01965d8be452fc4061f66c231238492477f43030f728737dfbc046a3b1bfebe4ee8514dd5fafe06871014bfbd550c5f2b75ebfe9688 SHA512 eb7af2e2b2493692d41317eeaa590e2605cebdb4128eed07cbcfe58a10ce19130766e0436c43c33df0a2794b6e776cd836b67e4b85d37f31c756b26d782ddad1
 MISC metadata.xml 716 BLAKE2B 790b3d6205c7f01a122bdc92250cb507408742e973a33dcadf4be9180d4bc4d6c77a9a9283057b88406d852a461dbc46d834b6a95309b7641b2ad78430b0f553 SHA512 7d260f1511dd2507f67149e1dda7a5ef5e5fee21bdd45832d141cfda5794b32b5b99a31e0f351da5f076fe481f14c7b420cf11f5b14587a1858b61325f4ff59b
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.6.4.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.6.4.ebuild
index f5bbfcffb8d2..1dab8134c6e1 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.6.4.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.6.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
index 4ab4585ecb1a..5c7a7cc3fbec 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dogpile-core/Manifest b/dev-python/dogpile-core/Manifest
index 85428f3590d4..47a52c4d0e7b 100644
--- a/dev-python/dogpile-core/Manifest
+++ b/dev-python/dogpile-core/Manifest
@@ -1,3 +1,3 @@
 DIST dogpile.core-0.4.1.tar.gz 99534 BLAKE2B 40f2bafbee07a4d66ad75f19a3587ae448d1bf22a57f9e8d12a102f6c5add9365ea9fa957432675b26600c906722c73a5d39d98f2e35fe8ffff07d48752f9da4 SHA512 f4c37297788677afe6ab17ba5aa928f9770b0edbd1a675cd4ad512ef0c15cf1e2d765d9b7a9fe3638f0a646e0ad51d54c9b4ded33611022744226bfde1aa9896
-EBUILD dogpile-core-0.4.1.ebuild 731 BLAKE2B 744eaa2959a820ace820c16d5ac0b5bb82d19e21104d3de5167cba29eb012380918dcf3ffe698f54e891c99b4a2739b64ef380224d0a39d11310784a76068511 SHA512 655a9766daa90f9702d7a96905670eae67c38a1950a5668ab93578bf0fb3668d2bb2f5fd7df1edb4a4a93290bf82c7862894fa9fde6a3caa89456c3427b7dad1
+EBUILD dogpile-core-0.4.1.ebuild 672 BLAKE2B 9498bd7fa0c7d6a9bfbafafa3d367a928085c9b80745ada95ad3e1e741f699b79f404a62121ac0b5d3bd8193a9ae7e68255e31f6c206c04bb566fc30a7f7d474 SHA512 81bdc75a3c1f11b2aa8d4de2ffc917ae88fea5e6350f3c8449d1dd8fdb00f348f5a3c46f3a6d82a4dac540b55b16b292f6cd7cb7be5c8bc7d5e9b96d7e3af2bb
 MISC metadata.xml 705 BLAKE2B 86ab8475e0633aa405da1b945ac6ad764d152d6ffb117980630923eae25752ed411ecbf63faa9510a4d0ab9c359f68cfe0ced19d9b43743733c5e7e602057b9f SHA512 1869aa6bde7be478ef26e8b4877a67e62e9b33249cec251f27ccdfb824d1bd7a377349245bb5b2f92698fcdfec2ee11ff2967c19c5f169adadafd41d0e81806f
diff --git a/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild b/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
index b9a85e397e16..51d1efd4fbdb 100644
--- a/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
+++ b/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
-DESCRIPTION="A lock which allows a thread to generate an expensive resource while other threads use the old value"
+DESCRIPTION="Copy-on-write locking mechanism for expensive resources"
 HOMEPAGE="https://bitbucket.org/zzzeek/dogpile.core"
 SRC_URI="mirror://pypi/${PN:0:1}/dogpile.core/dogpile.core-${PV}.tar.gz"
 S="${WORKDIR}/dogpile.core-${PV}"
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
index efecc7d619df..7bd589749305 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1,3 +1,3 @@
 DIST doit-py-0.4.0.tar.gz 16534 BLAKE2B 390a7ac17efc1938176ff6aad8fd404b8a0155e82dd2f346cd416d0357cc888e1b3e84dd9ddb19260bc9ee463e013ae544032199967a6ace7d63840a178e0933 SHA512 72aa850928c99bf43eefd827334b361243da3b26283fa358ed3f7fba72d1916b1cbe50e581d3d62ed3b4f0efb9b5d1e7f59c3dc913b2ee27e6503bf4e47def33
-EBUILD doit-py-0.4.0.ebuild 1063 BLAKE2B 81f039cba16edc041233d57995e6d81ca65da936dd6f6ea2f16fcb4414d847963ba2bd99c1b0d458156110ec5a5701440ead4587f8a4008ae0f2dd2099a08fa9 SHA512 4b0e745ff7a812f998442d4266d96ce911c8779e479510d081a9cda24aa31afd5b6c7683b708e30182fe01374c04de0c311229934c0b02b7fb6f63f0167fc033
+EBUILD doit-py-0.4.0.ebuild 1054 BLAKE2B 9cb229c574cb508ddc59dfc9f2f492116b8c3d5754a48cb607fd77694386fbcb780609ed9fd7ad0baae6f0e617a62a29ceab2b7866f8aa68b8406e9d431f30bf SHA512 a78d98143feb4ff4782eb139d0735868ac93229b0378bf8f283406e2b860ff4529f724285325b36f108e065f6113c70ead0025c3f39fb5b8fe315f87b1e06410
 MISC metadata.xml 237 BLAKE2B a4b0f86fd4f5d56e2c8cb4ed5cf0671ad2faa61567572fe1173d07d34fc8fd08790f53306e88c3f5135a5b099e10991358c8af0930c2207708c5a11f71e82c6a SHA512 f87674e3eea3a9ea242100ba88aabe10df84aada9aa7e6e2b4b89f0103b20dc5b4d52fa43bbbb0fd2c5356bc0e544e1955a8fa0cbfd06503b51752d571bfae1c
diff --git a/dev-python/doit-py/doit-py-0.4.0.ebuild b/dev-python/doit-py/doit-py-0.4.0.ebuild
index 9082cfa9689f..4aa92b6718e4 100644
--- a/dev-python/doit-py/doit-py-0.4.0.ebuild
+++ b/dev-python/doit-py/doit-py-0.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 0d700d08de35..ab403bfee1bd 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,3 +1,3 @@
 DIST doit-0.29.0.tar.gz 222341 BLAKE2B 8489568fe9236af04f87debfb4889840aa162d17d20f82ac0a9a22d1034b4c58976cd6829486a15b941ac1f50e7137c052fe332657c2b3f529fe2345bbcba2fc SHA512 a686457df31b414d0c3797789e0ae1ae5cdfa3674025236419cb59b254f342cd2db07911ef18b2cb576d8d817b44035b9372265b34b786b2779fb7074b394de1
-EBUILD doit-0.29.0.ebuild 1959 BLAKE2B 38d1131df9b051da0037918dff7e17ab5ed41b4c30e6b12becebb359efcdaee93079780f8fc4688515da9290d87bff49f4c971108b68dedf167f3f9f2a3d2e50 SHA512 ef7a2ee93fc106c8d1f58fcefc2d34ed2f5c577d124e32c31cf32aed2d406332fef4ec680c90d7a96966a77d3b2a1e3dd9918e3d329f7ac32eb9f4ee7c24472d
+EBUILD doit-0.29.0.ebuild 1950 BLAKE2B 11b8fdb08c8e092251fae2d8de516efcbd5bb8a78f6992e201deece848bbd3adaddb2ce97e69926e4487844576e298b84e156fb14203bd58794e1705ba4eaaa2 SHA512 85d5a9e5fe49dd8c266a161636037bfacf1195cd9e7ce775b2edcdad8daa1481c3eb5ab3bc419ec8ef5231a25c1a797937dc4cce1d7d5655e73714af5609ed77
 MISC metadata.xml 295 BLAKE2B 3613e0bcfa3a5b2d21fa4eeaf8eb44475f01a98462879581f558f1c7c9cf9ea9a8b39bcfbf0ded02f964d7d4060726c1bc4dc622ea19cf75b35afd1e1560a408 SHA512 67b65f9a4adc57efe3c9846e3088737b28b74d80025bf2647aac3becf7cf542f0dee0f32e4a5d05299c768a8eb65729373fbe4af2c72ab073df1f43040b0c393
diff --git a/dev-python/doit/doit-0.29.0.ebuild b/dev-python/doit/doit-0.29.0.ebuild
index 1c6cced8a8ba..f8c1f29e2285 100644
--- a/dev-python/doit/doit-0.29.0.ebuild
+++ b/dev-python/doit/doit-0.29.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit eutils distutils-r1
 
 RESTRICT="test" # can't work as it imports nonexistant modules from coverage
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 60722ba98c04..016e0cbdedf7 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,7 +1,7 @@
 DIST dominate-2.3.1.tar.gz 27887 BLAKE2B 3ac0820bd0cb79e648dc947d3cb69aa207e3c129cbae05daaca8fd3a6e22c67bd20fa350ce211986451caa7feb5b60c8ff692e568073e007c34de7cb8847b8a1 SHA512 599147cd9aabc7c3bc24e6c82a13b690808899107999a3b0d7d3f2f113b38c90f2c720298ffdcdf1933d2573cced05d730dab53265397b7fc010e57feabc10b3
 DIST dominate-2.3.5.tar.gz 27875 BLAKE2B 72bac3554888427a3ed46f8e6a681ff8f48d37043fecc3ff984e65190bfd09bd28ab887168d7e56e0ce2fe8f7c986a4f9d4f47d2041524f53960a5ca3751826a SHA512 a48fff16fc3430201d757a5947c08397f821acdc07a2bd13bb77d65b0d71919726cf4f4792d591cf84ca05912223f439e9cb63e9d18b9a743b217e21ec97d3c2
 DIST dominate-2.4.0.tar.gz 32810 BLAKE2B 07dcaa1c4c748951e6f1e7e650cc25df7b59a2933370df6f6da67c22edb05cfff35f0daa9137ec7a68061722006a3de2233dd4802ad4c9e587cda4284e4094bd SHA512 a14f5dead31364543839c54a6ea4e16d796c9c99277a8fe2cb29edfb2f8259f45befcb33923fe6932cc7da25d9c09cc54d1ea1bd12cc11c52fe6ba52f4f9ef8f
-EBUILD dominate-2.3.1.ebuild 628 BLAKE2B 4eb32f44163343581532992a211c4a2349f01aaac8b12126e809d58fa65aab9bfce8ce0f7af778c205a67f31467dd0a051e137a52df4eb77855e19a8d16ea9a6 SHA512 eec612532a405027b8005fc7c84b6f8519371646a6b9d2977a50d7a41b8126fc99c434ea884633cbd00f572eac0224e9e60373cc446b7a883e4c1eb6e6b52be3
-EBUILD dominate-2.3.5.ebuild 630 BLAKE2B 703d24fa3abfe8aeeae30e3fde4907de12fc90ccf6db86d5ae52287abcd1feea686a20e50be35654ddd57f616344d807e9607bee72d847c1a112a80c40f42250 SHA512 9d3725224835296ba618ffc86c2ac3be45b1960a276404178e5cb8858c08cd9ff9d06712de64474341cf5648c2c62aa7f77f3e55a42ed3159f0e02bb3d9fee17
-EBUILD dominate-2.4.0.ebuild 631 BLAKE2B 79e7bb05cc4590ffcdae05610fc8494ae3e8453bce920ea20de5c551b7d92b4fa8a4de9c9dd6baada7c73b0c9179536fcc6c580c1942c6243eedee0563be60b9 SHA512 2b0e4ecdd026aa933746154f153c5b326108ff36b6ad1e6127cbc74d4b25da64114c060e4350b0c69f9ed77aa3ffdfd446dad57c5d0a671469233083ceda075b
+EBUILD dominate-2.3.1.ebuild 623 BLAKE2B 6f2e5912163559a7ff197cd3f487bde94f99ea1d4c64f9e3f38a4656d968cfed31a95ceb60910b6809410de6b48c226e1b81e779724313e6e37e0f4b8f125778 SHA512 d7b78a9c07cd285b074dbc3b49fd85abc5053c7563b61d6de4d6b32056c1391d1922811099e3e017f79869fa774a41f1e14e057cfb395d2162b18ee42b707f6d
+EBUILD dominate-2.3.5.ebuild 625 BLAKE2B fabe2ff042fa08e4336e03bd953ba62b9f2092205a6d7b40b20ea45b4b64c4eee076d6ff1715c697be9bfd26fefca16cdc61e291cdb1dec398bd1fe1e24c4788 SHA512 e362ca62aaca31d5bc3bbe54fa27ed629d716d6c572fd315a149b391e19db0038dd3bd0a621bb5ca328cc4a67523849ece5e2faf9030580552fb25c79d55ae35
+EBUILD dominate-2.4.0.ebuild 626 BLAKE2B 96fdc9c21e479e9a1ddf14d84582e5aa183853b3e5429f37163d96bf8dfcdaaa73aad2673bed5f5b6e9a5fd2af85224cde58f04da3a93a5a54a0377d83ebeeac SHA512 c2ad7598f986cd49609ab92ccd7b6987f56d98e5e1d9cbf21dc8eb9501270338f04a04da115ffa74a222df39c80ac88cb7f1776bd5f4499bcdc0c071acd19fb6
 MISC metadata.xml 771 BLAKE2B b57440fdd8bad6140d982af019944cc740ba47183908dc2505c1436448e735cd63f537b3ef2158b6014c4dc050128b13881b368ef9ed5e840b37f7e88ac72a25 SHA512 2af8875459291f59c07ece49ac0edeab74408f54031878c1b03581bdbcfcb509caf37ee30d03e2f86f59dd67aba62c54808ca5a6c67037717113c3bfb6f9961e
diff --git a/dev-python/dominate/dominate-2.3.1.ebuild b/dev-python/dominate/dominate-2.3.1.ebuild
index d34ab44a6b2c..0998754faea3 100644
--- a/dev-python/dominate/dominate-2.3.1.ebuild
+++ b/dev-python/dominate/dominate-2.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dominate/dominate-2.3.5.ebuild b/dev-python/dominate/dominate-2.3.5.ebuild
index 87a7947b686b..71ad46f28981 100644
--- a/dev-python/dominate/dominate-2.3.5.ebuild
+++ b/dev-python/dominate/dominate-2.3.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dominate/dominate-2.4.0.ebuild b/dev-python/dominate/dominate-2.4.0.ebuild
index 5dcd55e13086..8ec031683b42 100644
--- a/dev-python/dominate/dominate-2.4.0.ebuild
+++ b/dev-python/dominate/dominate-2.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/doublex-expects/Manifest b/dev-python/doublex-expects/Manifest
index bb5d9ce1ad94..7086a950c94e 100644
--- a/dev-python/doublex-expects/Manifest
+++ b/dev-python/doublex-expects/Manifest
@@ -1,3 +1,3 @@
 DIST doublex-expects-0.7.0_rc2.tar.gz 6151 BLAKE2B 34d385467fec24a5210dcad53ef768d23eb5117b14679b89bcef721bf90ea380da50c62233afe92abaaf3bd015dc1bb021adedaf98c463400af3ec4e462b7aaf SHA512 94e499f01fbdc73f3f97bbfb64f299d43e3b767f8eb00eecb7c05e062cedd8fa84569cc97ef48aeca24df5ff94b1bfbb330a786500641c857039c2e7d287e952
-EBUILD doublex-expects-0.7.0_rc2.ebuild 777 BLAKE2B 27a12d9a3e4f9f47f31a51fadf615df7bb893bff624e86303a0c9b3c3baeb870c398a262d5ec81a2d1d03cc92aa6fddb9089d011c8261446dea201541f9e67e9 SHA512 59331da358d193c09eda2cef618feb263caf4c2732afa775de238b2cc22c64fa5a453d51ccc67db169c5fcf6705a18c8693914cea0c1cbbbdb0c4a497936227b
+EBUILD doublex-expects-0.7.0_rc2.ebuild 773 BLAKE2B 07f932e90638a9b6453480aab4aa02a2b17232f44ff53fe059df1709413490a6c70a2c87c832605c81bac127a43d7ee9c524c29dabac9de1e7d8ca8c843ea9cf SHA512 3707c393ef230b3f7efc0bbd8b3c7811913c474444c3b100e4e6c65d82beacc3f0f554694b506eb42853bb69c0227a88357a8af8773cf9d764d04693ada98d3c
 MISC metadata.xml 263 BLAKE2B b2f81a90ecd9e66c5495a4c8cf4bb7d0e2dbce41a5e5fbc172f1d2ab65569bf15223789dbc356ae93774af872c3267b756eddaec82014c64f242c92455e8f3aa SHA512 0281999c203e87325a1f2688efd19a57088305289308fdf2401b775a3ffe375ceefb200dd4896417a7e1a5f436e5681143326c74635acc504af8e25d3b876c1c
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
index 6847964a45df..70b71e02c170 100644
--- a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
+++ b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/doublex/Manifest b/dev-python/doublex/Manifest
index 739c62726df0..9cd01678630b 100644
--- a/dev-python/doublex/Manifest
+++ b/dev-python/doublex/Manifest
@@ -1,3 +1,3 @@
 DIST doublex-1.8.1.tar.gz 69685 BLAKE2B 38f80ac0cf68dc2401eaa8051542c91d382e9ba22ed229b3c12a192f0b180b33a5660e54f647b2273401500a3292619d918dde9b0f685807217bca40e1aafbfc SHA512 30d2b572862370da8402cc2cfa5481d3278f0fefd2d5b2f5be126a793c8e165df0e2ae6089ba321e71d994f14024b882933c1523f7a0b9e341bf75644b49e073
-EBUILD doublex-1.8.1.ebuild 992 BLAKE2B e5b802abc26523dfeeaaea630d6ee6a71cbc0d16f162659e9e8786760bdd628556bb5798eb0942435ce1c4f36bac3e7dbe7f53954532b2c014e58e047a9d11c6 SHA512 7a057fd6b15f5641e3f1811fd65ed1b80b6d7df39d5c2d4d9890b158f2d5e2c5c8d471b79c6173f03337f1c9d1abc1197fc06d6f39a34e8edb06174e7d1cf0c2
+EBUILD doublex-1.8.1.ebuild 988 BLAKE2B 1b73a6107a7333ad3bfda7fea89f6cbc4e519b3231317ea6500d1098733cdb099854d35c5c13c063b951ccb88a1330bb09d41f415f42c1cee0dd8f9918781df8 SHA512 9f22e055c16a046ae50bf21d5101c1b65462217b4a55b241b06f4ed2a9b2ee0eacc6400d8d6ecae0a1b93cf9295354c0a72d3b30b0544406789eaaae02826c04
 MISC metadata.xml 303 BLAKE2B 45ebb26950f3f4fc9bc3d6d99418f544523b778c3952e91e6bfb5f37bdfc13b73d25e24bcaf199d61a69cad733fe370cd19ad0c934b3d478097c52ede1316784 SHA512 efe73a700fe748323eeb26f9203b3aab0e189c8ceb56efba5ba97a91793a5deb0ad973dad345e240fc9c15803b929fd84f26524055de1f2290f40042f318d2c9
diff --git a/dev-python/doublex/doublex-1.8.1.ebuild b/dev-python/doublex/doublex-1.8.1.ebuild
index 64595f9d08bd..9b3a5d5ce3a6 100644
--- a/dev-python/doublex/doublex-1.8.1.ebuild
+++ b/dev-python/doublex/doublex-1.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/duecredit/Manifest b/dev-python/duecredit/Manifest
index 1062f9ef2479..914cfa5869ed 100644
--- a/dev-python/duecredit/Manifest
+++ b/dev-python/duecredit/Manifest
@@ -1,3 +1,5 @@
 DIST duecredit-0.6.4.tar.gz 65763 BLAKE2B 590e5736a2a65153078a515fcba64dc3a34aa058311276a4144a40788140be563bf689956067a60179dcecd4b58b371c811dc9b50a0c7e21f6cf5d3193f2d17e SHA512 4a11c743be40c1ef14e73d06ba4434964f9a62f6c19c8aa18b337b1f37526e770e020e672bcef5fc920a64c2a0f2a0eccec6917ec172078c4d3ea24ec0e1683d
-EBUILD duecredit-0.6.4-r1.ebuild 549 BLAKE2B aa2d20aca3bceb04e54fb70ce81b8d65b817ac601cb857312d3cff38cbc242e2d928cca22b1bcc7e34e9a7744f3bc542a269e4d620edb7a62ffa4070272a2625 SHA512 9e6aa206253936c97273564d30c2af3d0f1bf5a9572568ac95c9b4285d348e4aba13918e498bd7b6946d1de61206a1b1d2f66f8e61052f6398544323c69ca920
+DIST duecredit-0.7.0.tar.gz 66131 BLAKE2B 3f32c1a4e62d4650d6914f4e124907170a50d63900fbb009b870b3f9c9eace27b76500e655cb74caea0ce22cfadd62f81a84a438c1cb82092502661f1d4e0c03 SHA512 a32ead3e0710323d5ab3283a3b2d1cb03e03bf925f78fdb3b5182079851127b8b674492bd402667e57ec113d1ec05f9c3490642f8d0fba6a8f3ddfd706a052c1
+EBUILD duecredit-0.6.4-r1.ebuild 547 BLAKE2B 013c41a8428b5a609fe162cbcc716f9c3b25668cdd489a7ac941120da0b10515ff1e05f2f55db0182033bb3937eec712393fcafb9520516a12812ffeb9cf36be SHA512 d754a5a24d3b7b1598fc4f357b492fe11a43086bd229000619c2f6cf4114ba10d5376efbc3dcc762bd93d7c71fd4952c4facdee73f4bae18a058a7462f61d4ab
+EBUILD duecredit-0.7.0.ebuild 547 BLAKE2B 013c41a8428b5a609fe162cbcc716f9c3b25668cdd489a7ac941120da0b10515ff1e05f2f55db0182033bb3937eec712393fcafb9520516a12812ffeb9cf36be SHA512 d754a5a24d3b7b1598fc4f357b492fe11a43086bd229000619c2f6cf4114ba10d5376efbc3dcc762bd93d7c71fd4952c4facdee73f4bae18a058a7462f61d4ab
 MISC metadata.xml 433 BLAKE2B a1c9500ec6e84b027e6d0f2ec09d5a3b1a51818858401099e047a68b37fae0be7ba2d0b91b0ebe6509d992aa4617cd1a61b5b07a72e0935286e669853a7ed578 SHA512 7138c51966df35d8cf946b13e66b45eeea22e9d89aa899b14523bdd1b6871b3d78e1d2c8d76c989fa27adf0d1b8b5245c7b5ff3c735ad5b0d8466deb12ee26ec
diff --git a/dev-python/duecredit/duecredit-0.6.4-r1.ebuild b/dev-python/duecredit/duecredit-0.6.4-r1.ebuild
index fc106d66d2d1..3dc5dd555627 100644
--- a/dev-python/duecredit/duecredit-0.6.4-r1.ebuild
+++ b/dev-python/duecredit/duecredit-0.6.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Publications (and donations) tracer"
diff --git a/dev-python/duecredit/duecredit-0.7.0.ebuild b/dev-python/duecredit/duecredit-0.7.0.ebuild
new file mode 100644
index 000000000000..3dc5dd555627
--- /dev/null
+++ b/dev-python/duecredit/duecredit-0.7.0.ebuild
@@ -0,0 +1,23 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Publications (and donations) tracer"
+HOMEPAGE="https://github.com/duecredit/duecredit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/citeproc-py-0.4[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}"
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
index 59ef3a16cc9d..6e2e7704444f 100644
--- a/dev-python/dugong/Manifest
+++ b/dev-python/dugong/Manifest
@@ -1,7 +1,7 @@
 DIST dugong-3.7.1.tar.bz2 194243 BLAKE2B a7514f4b515fcd519f5c11b834d44d16cd395d9eada659dd1913bd07a9a072e19f6737a3d702d9ef2a63160eb5452f146a4b04e744610b8f51c9403a648aef9b SHA512 85c276bba85d650bf0baa6257bf0872cb2da546a23d19e0c94cc15c95721a8d9f6392db0e64b38ab2e801803e3ab7908e6a931d18736d33c87138eca35b4f27c
 DIST dugong-3.7.2.tar.bz2 206730 BLAKE2B f362208db26582a1d3681900e99b2143c779d4da1dff9f1a5bc21a2a00fbd0e0c1abb045a60b6cc29d173c0980c42c19f33d091c3b6f300d0e2d85b180b12995 SHA512 00b6d349fa7c5b8a356d663381a39bc40dd42fe9c01a92003c58437f4c4acc31fdde880b743f2c1035016e6f1e1d0f9cf6608832332f3a4a8640bf868680bea6
 DIST dugong-3.7.3.tar.bz2 206720 BLAKE2B 41dd349336ae37dd290c88233a4a1eed283a774a072396a03b0b97fe3aaca95a4aa90b2951ebc3d59c517221b1b1b77f90d64538f5a17fcc84fa927650af1fdb SHA512 b20b720fa18789ff137524b67dd7339ec3ad532cff164c03c74d38accc72e035d33ebe97df028f75d7d904f3d0d460f99edf7cf45abf9c4849a5a3a05529a7a4
-EBUILD dugong-3.7.1.ebuild 800 BLAKE2B 562a40735889d3f6b296446145f3d6ed5556bdd360697b8f412d1940a2731a12e3ba2df25940906cb394c0381bb4328d612504e273b523be13f811933a599dee SHA512 f0b359aad62447f25bf2c5e57feb185a07dae5604facf2bdaa97523d240f6b0067a60b4f4fda56b0b5a9d22754818f27c093b7aa4199a79ca677c39489193c35
-EBUILD dugong-3.7.2.ebuild 802 BLAKE2B f3a492be1081193dfac7a344523b63f4bff485574bba08bfbbd7a8d943c4ad7b80947bfa9ec6c20b896968844f35536a15d6d996bd5cd7956079ae854939fa32 SHA512 f40aa3974f9c1e06c783beeae9dba93604914160c7a55db0edf781e171f9ef6390ee89418e07c6a7f9abee4c5d45c0cfe0f8886d593264badd02ea1c09cf789e
-EBUILD dugong-3.7.3.ebuild 865 BLAKE2B f82e11b2c0419cb7b3719a1ba3709c247a23d95faa76b3233423919efdfcfdf96cd0c1cf15e52468f18eff607066bf918ca7f38851684ae2f9d1ad503276a160 SHA512 6ffc21c1b42bb571fd549909ec361071b71bc727dbe0b362ca0ec08b46ab147fce7649cf605dc2f011595879dc7705d95854f48512bb51aa9be5ec9a7b3139ba
+EBUILD dugong-3.7.1.ebuild 796 BLAKE2B 7d02730231624cb822df7283fb65c8222d2fd833b7e095f492ddbfac87a153c9d97117d79e607a5062be0bf73968e0920a0ecd6701ad7f98675a6d2ab5b7f7d6 SHA512 442a750f484d8d0e00dad0c4cdcaea78bf3d05bb6505c1a0fbe08bc5cc146320ceb7678500b4107d0305373bc7db79072fe5d4c99d010a79bff1cd81c4af6176
+EBUILD dugong-3.7.2.ebuild 798 BLAKE2B d47bfbdc3a971ee51e91da9307388eadf9fc40b6669f0386b8c64f41b9a1881849bf23ee95fba165cc4d43fd8de2904c7a574a9ec3482880c27f5e73ea9993eb SHA512 b8679bfa2b5a7e98b661b027e6e079def29c2627f55c7e6d4e91ce0322222738c3fafcbc48161e0059666bdae3f856c58f1a466ca2fa0e3dd70944ed7244137a
+EBUILD dugong-3.7.3.ebuild 863 BLAKE2B 4b59ccd1d401bfc904db4aa874bf247073b9644e73bfd472be7e7930d379b630fd7cda29fef450d2472268f76bd13f887d56145050ec363b80a83043f74f1b77 SHA512 54b51fbfec495588fbb0f3573d78122c3c57d17457db935b45fd8bffc55d60606fe44a4f014cc3e352d53c58fe9bd5ddba2615da63b3eae09c5773fa64158318
 MISC metadata.xml 388 BLAKE2B 1453af784bebfeee692394cd0a211776e2379f34e058c7a6182d75a9331a4b7571c5398295f4159fe18e4864d29627aea06e6ea2b74f87140a5767f0ba3e0ed2 SHA512 c900862d3b1ff9e43faecd6144150a49179ff3dfdc83b82861174a233791c6df8e28c619ddf1b15e8ce6e193a9dc124d0860b8638ea57a114a9cb59bf10ef0c3
diff --git a/dev-python/dugong/dugong-3.7.1.ebuild b/dev-python/dugong/dugong-3.7.1.ebuild
index 374b5c71f875..6c8ddea665e1 100644
--- a/dev-python/dugong/dugong-3.7.1.ebuild
+++ b/dev-python/dugong/dugong-3.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/dugong/dugong-3.7.2.ebuild b/dev-python/dugong/dugong-3.7.2.ebuild
index 8d0e3eaed790..7cd21546f1b4 100644
--- a/dev-python/dugong/dugong-3.7.2.ebuild
+++ b/dev-python/dugong/dugong-3.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/dugong/dugong-3.7.3.ebuild b/dev-python/dugong/dugong-3.7.3.ebuild
index 43f21f5a880d..a150394a8848 100644
--- a/dev-python/dugong/dugong-3.7.3.ebuild
+++ b/dev-python/dugong/dugong-3.7.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 9b4eb4b31b18..54e5051ebb6e 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -3,8 +3,8 @@ DIST dulwich-0.18.5.tar.gz 330097 BLAKE2B c29f3016ab63082051c8c4fc42301c12ca7520
 DIST dulwich-0.18.6.tar.gz 331325 BLAKE2B 781227bf91d8df8f941dd2eddb1682fb8c358d37f35671b08334ef197355e33dbbd09d18b43a179f9200cd6abca563a2fc833da68bd860859a52d951fe679ac0 SHA512 2d2120e23dd4bc2c9dcfe601f21ac757ee3fe2a343923c50b32c067f4d329ac89cdf0894bff450bf52c69e99759bb8692f0f14ed73d01be6bc3b0402d58d1148
 DIST dulwich-0.19.4.tar.gz 349813 BLAKE2B a14dc2dccdb68df639a6a4bbf3aa8314fe831f7086573d7cd194f7426eb0021b2faa1663edf318b37031be90121e64a1186c381bfb2cd32a3824abac2a3aa52b SHA512 42aa7d35a491f2d98a8afae6e0afc68089f9d37dbd706961359f1d624a47c627dceb73bb614b608d29dd28faf87406f2e81b1ddcec607aeb0fabc9744b733232
 DIST dulwich-0.19.6.tar.gz 349939 BLAKE2B a88836c8a6fa3f732643f88cb94ec37c138146336709651f7fbc604fe80ff3dcf88b24ffca5e5d14c3c947b847a9678fa8b431ef6be0b78e6046bcd3f7ed29bc SHA512 7e13b465672c5eee4f6d14f28e9cba63ceddf1ad119822fabd17b01ad6b89c6dd8c0bbf562bdf50e0ada5ce17bcad531549054417d744e5cf64a610e8a1740bc
-EBUILD dulwich-0.18.5.ebuild 1346 BLAKE2B 9635ee5a9c784919f1d93b4623520adeb9d482b5d20a49b854d271428d88e43f1f271862fe67cd9dfc428641bd671d68017538f2a41bdf459be1e5a714206cf3 SHA512 d986f68be1d7ee428e225857a810dda78e5d0371fd6f0940f18354a3d4f5b77d567f14081aaf6d3bad876ba853484df1ee732cf69859773ae433163d65be49c8
-EBUILD dulwich-0.18.6.ebuild 1346 BLAKE2B 977189e88afa3fb6b6930354ef18e5182e016eb472e64e1c9bae2d57e9c4e18d5e10a1b8ca4ca736f9bb38f208438467741269d049ffd3df19f01f2c702fa272 SHA512 0219309d139d579541870a6f1380e2a7bfe2eee93dfeefdb0d33a730ef33b466dc404938fe3c010b4de70da4ddb2408ac4ba271280b4e2ccc907fb982d83fbd4
-EBUILD dulwich-0.19.4.ebuild 1654 BLAKE2B 064903850ddd32f317dfe5e54db75bb8cea8d6acff2bc08a7d98fda02af785dcaa994a8cf429f77247e55b381be9f7d289e9500cfb77fa4292f1b39c798c54c7 SHA512 ecc993598f4e9bfe651f9c684259ce73ee044647361260925856f16139ed60c4fd2895d1d42ac1de3bdb8c1e6f8cd66fc1fd733b6844cded97f8cae1d4912886
-EBUILD dulwich-0.19.6.ebuild 1652 BLAKE2B 4a6f595d1d068e37ff4f5d2e9bcc321eba56121f18672ce2c54b8659266030301ddc7c954a810f9bc7612fe0d3bf4bc9f8e2ccd02ef69d54a4b15c68d0726457 SHA512 9637baaf78659c19f33c39ac91d523dd60277a8958dad1c5600be747401ef7be3f4081575a87a9b4a518fb26f899ba2cd3eedf9fd929ac4da7d600dca75f5c71
+EBUILD dulwich-0.18.5.ebuild 1342 BLAKE2B bcab56fb120feb09b05a984ec23aa441d4cb7099732e653a920ee1529b68c202691835fcdf1dd5ceec9a0b3309d9a0dfedd1a9e528cea1d525e23b9a87bc11a6 SHA512 ed328e30dd8a181492afdfe2431d75a7f86efe6f54a2665543acbda2348d13daa9e48f9f6f0e2c3cad8c247196006be6a382eb7c0dd8099ff983e89bae9f3069
+EBUILD dulwich-0.18.6.ebuild 1342 BLAKE2B ee4cad0a87e120b18a1ca088328082335b8f9d62f9d3789cd4e80cc15c94e898c081d539d27adca905131a4536d06905cdd275e10ccbfb2b08bd9cd3cea31da0 SHA512 a970792ad3485b9e0e4c85758df6cd272c3379e10a8e38dadb5450387aacb60af6ee78e3c8ccfd3f04685ed9227a2df84f418475aee96398cb9e6e2f4e0db5bf
+EBUILD dulwich-0.19.4.ebuild 1650 BLAKE2B 4c5c70a4dd825dce918cb3a306b019dc963bc8602b8d9ce22c0f4a00eb9ba4c13c306c23577f7f9e712f0c50d61e96ca7f9847118c1469b3b3f78085468c9bb8 SHA512 667f9b60d02aefb2ccd9fae390f2cb9af5fccd094fa378493d4bc9fa20de00f2a0ab689d65dcb001611bedcb94b98ae98c042da951c20c528c557bcb11e5a978
+EBUILD dulwich-0.19.6.ebuild 1650 BLAKE2B a0b85675f324c58bf431473b415662c08ffbaabadf98af804df3fadfdbb4fb310fe1e53a612ffb0fb2c8ae4440a4cc42fff79a0b2e5014f4bf053e6f1b74927c SHA512 0eabe7132be1153034559feced4a68a9d0dbabd6552c7418d8585fea535b5af0deb37919cfab2ca78d5f858ef35f1d144590a461cdfc7635133fdc66d7759ad3
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/dulwich-0.18.5.ebuild b/dev-python/dulwich/dulwich-0.18.5.ebuild
index 7f26969f98bf..d43a34c349d2 100644
--- a/dev-python/dulwich/dulwich-0.18.5.ebuild
+++ b/dev-python/dulwich/dulwich-0.18.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dulwich/dulwich-0.18.6.ebuild b/dev-python/dulwich/dulwich-0.18.6.ebuild
index f96bf713d3a1..0acb7f7ad3e5 100644
--- a/dev-python/dulwich/dulwich-0.18.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.18.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dulwich/dulwich-0.19.4.ebuild b/dev-python/dulwich/dulwich-0.19.4.ebuild
index 8998735f88d3..909fe415fc6b 100644
--- a/dev-python/dulwich/dulwich-0.19.4.ebuild
+++ b/dev-python/dulwich/dulwich-0.19.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dulwich/dulwich-0.19.6.ebuild b/dev-python/dulwich/dulwich-0.19.6.ebuild
index 38f2232c35b6..27d31728a85c 100644
--- a/dev-python/dulwich/dulwich-0.19.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.19.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dynd-python/Manifest b/dev-python/dynd-python/Manifest
index 96dab8f1f13d..4669be4cb1a9 100644
--- a/dev-python/dynd-python/Manifest
+++ b/dev-python/dynd-python/Manifest
@@ -1,3 +1,3 @@
 DIST dynd-python-0.7.2.tar.gz 184981 BLAKE2B 826a46c7c920533dbd64f310ce6136e37f5d3f7e2bb1190977c72e9c7b65aa9957547b02ca92f5aadc1db268ca4ceda9459036e9fe24a57e090f4312645d348b SHA512 e51df7b368b1f6869338cb12a2f093064b1e7531ef674a83dbc7b9cc1dc6143cbe12cb37273bcc01e7b1066eda541b3b15473bc01e88fd9a8d1b594f6f37eaba
-EBUILD dynd-python-0.7.2-r1.ebuild 1565 BLAKE2B 3b529cb0bc628c69c851794126e510e907b18e9ed8b2d2daed4dae3323ffa4fcda9a202d75b2d1eb26c2e56a93e824686b24ab5c74fa1ec7c8fdecb567999fb4 SHA512 c07b23d37e5f64038e99aa0ce6d15a5f93418903358a8527aa0230cb500bbdec28929ffda083ce70db2501482fcfe149d6c7695910af4276e2a3b64d8cc6540d
+EBUILD dynd-python-0.7.2-r1.ebuild 1561 BLAKE2B 5dd010bbcf489758db2829a6b8797111f3876b2bbd1dfd3a8f7925ff9d249d05b8f01e721cf525a778c1139e90c1020f95822018e1189b85c1489bdfdc1fc140 SHA512 65c28ea1e930b4389e9f37de825af0b1b96a44ebf79b9e14eb85fae3405622e8cea2ac6972246c6e2456b77203eb0dadecf3bad97c1fe9ae44d3c7595ffe74b9
 MISC metadata.xml 529 BLAKE2B bc365c7019af30defbcddf4eb0c590666199d43acba144d4b42f21fecea7c572d6122b60bd0b767437ec4b1887e7d3bc50c50b83f88deb99e627cb67030ec95f SHA512 8500904a91a51d552ef6f0fe17486b8d935bc4f50860120376ed40a31c002bda8ca66b5c3c8b8c244dccf659cbf8574f1e031e62a0a0b870af133062055a25b9
diff --git a/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild b/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild
index dfdc702d90f5..019d4022e491 100644
--- a/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild
+++ b/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/easy-thumbnails/Manifest b/dev-python/easy-thumbnails/Manifest
index 986faefc3cd4..af052dfe2f55 100644
--- a/dev-python/easy-thumbnails/Manifest
+++ b/dev-python/easy-thumbnails/Manifest
@@ -1,7 +1,3 @@
-DIST easy-thumbnails-2.2.tar.gz 71833 BLAKE2B 626702c5b704bda6daab1b717e6e5ed7099a4182401b3f1c6d9d756c151253eefd7dc73f43bb7c43505d11de3dc7b9a5a934017254465c422163f67738732c63 SHA512 d76f695f8f5159e8bedf5b30433834db6679e93c95448a6cca0670739284c5edca0b55f6fae6cfe687be4bb6018ce262992ee1d3099d6bb48df37ff9f1aa22e3
-DIST easy-thumbnails-2.3.tar.gz 76840 BLAKE2B adb0c5a5f6392e54f050b1b6a9414efb86239dd845b0650e88a957b3ff1cb911762b2be2bcaea77750c1084157c084502abb3fcd0f42d456f4b397cacad20510 SHA512 0e469ea907eb0b626660f2087a81055c651a9cb59b6511fcfa54dac014c4a8701c63f408f4b5e1a03552a048e194e9660f8b3a7cea24f6824fda42137cce8a70
 DIST easy-thumbnails-2.4.1.tar.gz 74236 BLAKE2B 2b148ec32aacef82414c31b46d30cb77980ca44bf6ceafff73511a3da06fd6c8ca78c6cae8778b7a7f4b03810ae0702d3800e8fe204cdd24f6a64e24d168a4dc SHA512 455dc483fd590a35aa931513f2e07c059a1f33147db641adf120cab9fe56a5c251beede4ebcfe2d2dcff095a06a5552eb06c6b4a371bbac922b0006f62c2e9d8
-EBUILD easy-thumbnails-2.2.ebuild 452 BLAKE2B fc28b836eb2d1f6ead37e6826586f26b4404f81952f276f82f5d3f089419cbba0188ad6c495c85855795c7a91161e201bc0c0cd09a863a1b2cc698c45f653db3 SHA512 e95beb7a82b0b0b945a7d46f2d3215f0b5ac6ed45011a1ccf9e5e3feae844dc12d849582e0c378f78e0b4ff5818abbd7ed89acf256529f0e6e5cbe44c209b0e7
-EBUILD easy-thumbnails-2.3.ebuild 488 BLAKE2B 3c4e3eb886aba8794903bfc26957c93dbf3c944a7aaaefb37747d1498512801cb2da001338d17cdc73363f9d5d448ffe127ba003577a7e80a7145c2c89c0826e SHA512 5cd1ab64cea5f7dcfe0bb42035317a4198a82c4ab775bd70c21ef139f9bbfb32f85798b49221fc97c84a48059756ddaa0369cc78f66560d4e07c2c504b40627b
-EBUILD easy-thumbnails-2.4.1.ebuild 500 BLAKE2B 4e79d7a485a5bbf2a8bc144a0a148a0ccd2c915f830a0184e6d5de5cc0d2ddeb67611d6ad612fd629660dd62d86da24c6b34556084c411aa04362447eee5da9e SHA512 c5d5c4f7d78df61d499178c7a1fd4b3ff03935355d68981d521d4d1adc9f5b61ea81b7a6871aba857dae8c63482346f754e41e54cfc1ba4bc19f17ab5433e164
-MISC metadata.xml 301 BLAKE2B be517421cd99e6ccd3ab3e5745183473a18034dad22825f0425759e0032ca36e89082b8342088524fbb6c7f71f63c478f8af85f39c68ea74eecdff96669fc67d SHA512 cece6f84ee8415bd2ba4f85de8b08f892c76351f3f8c89afb92263201d76d88ea4856ccf2316fc2c480765b027d1fe09783f3413892e8c9e53362af2fc724e7e
+EBUILD easy-thumbnails-2.4.1.ebuild 490 BLAKE2B 1a0a04f2b19b2d7c818b464b9fc71da268d362d4d617dc9500f02c535214fb3a88c065fd0bb150005025ee6fe59ee506c0ff3137ce5444cd0e6e50d29fa4d8b9 SHA512 499f0d9fa05a6fd560c740a8b6fca5162cb475f7c8a2d0bc089193993eea00904cd23fe5982d1d0d4f84ecf1a99180ec165e9263546f9688ceb468d455c566f3
+MISC metadata.xml 250 BLAKE2B 63cd8ed1aad1e55dbe922fd1bbbe643b6382ba9215d9d1cfb85e9af54eacaed699d429ec88a5bb62d6f42036fb0197e63f0f0a1a30cf22d982a6584ecb08794b SHA512 5e9c4b16bac2e756a9426d3924871a2755fa20b4036f66ec90228166c239a8950f6a1999666fd398a8f76b85771465ca34d7ec82a2d620501dd87f7a9f063b8c
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild
deleted file mode 100644
index 5b4c28bf3996..000000000000
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild
+++ /dev/null
@@ -1,26 +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="Easy thumbnails for Django"
-HOMEPAGE="https://pypi.org/project/easy-thumbnails/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.4
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools
-"
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild
deleted file mode 100644
index 0b8ce92d25a6..000000000000
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild
+++ /dev/null
@@ -1,26 +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="Easy thumbnails for Django"
-HOMEPAGE="https://pypi.org/project/easy-thumbnails/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.4[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild
index 3c961c97d48b..bc57aa918acb 100644
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/easy-thumbnails/metadata.xml b/dev-python/easy-thumbnails/metadata.xml
index b6052948d2af..0fe0ae5ca620 100644
--- a/dev-python/easy-thumbnails/metadata.xml
+++ b/dev-python/easy-thumbnails/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">easy-thumbnails</remote-id>
   </upstream>
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index 737c74ff48e7..65806dde167d 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -2,7 +2,7 @@ AUX ebuildtester.bash-completion 538 BLAKE2B b56fd67648a73b184c6965c1377066bfded
 DIST ebuildtester-0.1.12.tar.gz 13608 BLAKE2B 4ba39f8317028f906da54aca3a3cab466eeeed9b223a93e56b25dd8212c5266e593dbfdc96f8babfc3569bd9bf676ca255636ca1d285481972a794dd9d8208bf SHA512 62d9245c0e6dc428d3def73266aea83b73659318a5a771062b5dddb634398bab62ae12d8588c247377e84a4ba4088b0ef0cc86ff1d5774a306c43af8eb6fdecb
 DIST ebuildtester-0.1.13.tar.gz 14687 BLAKE2B d88c739707e6bc0dabaf5f03eb94a55c98f73b2dd23f311df6101556899b9ddebc4f9d40715ab9d2c2a01018fa121589e707afc28b59f18378690a9176b48c75 SHA512 88ebe3218d795e395eca2d048f74bbc0bca7c304e3b70d5a04e07256e8d8ae66feadf37d196f46523b9589ec9748aa47f8807e15479b9dd9f42871819f1523f7
 DIST ebuildtester-0.1.14.tar.gz 14601 BLAKE2B ccd2b921524dfb2d6bd1de862292e4f918d14acc806838018f2571a691be5f8226c5666a53e367ca687b3153ac8f568e13b3112a514afccb24c182c96535be81 SHA512 e01a614b00df8e1e5bc5a25e61cb2154c4f39caf2b42b2ba3c8d69341a3f105fa80988f6afff305a96a91d277b6132f00426cac290893d16d2ca2f37f4573011
-EBUILD ebuildtester-0.1.12.ebuild 696 BLAKE2B 35e95e5bb884b8331d72a2da5cf274ed6d8fa26c15a5990e23143cb66d370995f97c240baa35bf6318529e365fa70634ae349e39e35e1c740c19d95743819980 SHA512 28b79da91fc3d955f4af3531e7a8dfe203896bfe04ca4cb65d552d6610cb8145fd52e51216abf267923ff3b024f2c1115de5fff2e3cc882a23a17b89ea773f2d
-EBUILD ebuildtester-0.1.13.ebuild 696 BLAKE2B 35e95e5bb884b8331d72a2da5cf274ed6d8fa26c15a5990e23143cb66d370995f97c240baa35bf6318529e365fa70634ae349e39e35e1c740c19d95743819980 SHA512 28b79da91fc3d955f4af3531e7a8dfe203896bfe04ca4cb65d552d6610cb8145fd52e51216abf267923ff3b024f2c1115de5fff2e3cc882a23a17b89ea773f2d
-EBUILD ebuildtester-0.1.14.ebuild 696 BLAKE2B 35e95e5bb884b8331d72a2da5cf274ed6d8fa26c15a5990e23143cb66d370995f97c240baa35bf6318529e365fa70634ae349e39e35e1c740c19d95743819980 SHA512 28b79da91fc3d955f4af3531e7a8dfe203896bfe04ca4cb65d552d6610cb8145fd52e51216abf267923ff3b024f2c1115de5fff2e3cc882a23a17b89ea773f2d
+EBUILD ebuildtester-0.1.12.ebuild 682 BLAKE2B 51c9af44f515ad1b8e10010e7dea1f1385ce23eb35c04f0120bc7eccb116ec13e90bc2bb37c7e1929fb1438f139388a2042b6408533b2199e10dc8ebeec589ae SHA512 b17fb2295f4f56adaac947163c183fb4f63d2a295b05cc16381530aec60aa70a1bc8848d81f2db2452342262a1413db8b84387d8a8e3348155d4430656bc9e3a
+EBUILD ebuildtester-0.1.13.ebuild 682 BLAKE2B 51c9af44f515ad1b8e10010e7dea1f1385ce23eb35c04f0120bc7eccb116ec13e90bc2bb37c7e1929fb1438f139388a2042b6408533b2199e10dc8ebeec589ae SHA512 b17fb2295f4f56adaac947163c183fb4f63d2a295b05cc16381530aec60aa70a1bc8848d81f2db2452342262a1413db8b84387d8a8e3348155d4430656bc9e3a
+EBUILD ebuildtester-0.1.14.ebuild 682 BLAKE2B 51c9af44f515ad1b8e10010e7dea1f1385ce23eb35c04f0120bc7eccb116ec13e90bc2bb37c7e1929fb1438f139388a2042b6408533b2199e10dc8ebeec589ae SHA512 b17fb2295f4f56adaac947163c183fb4f63d2a295b05cc16381530aec60aa70a1bc8848d81f2db2452342262a1413db8b84387d8a8e3348155d4430656bc9e3a
 MISC metadata.xml 222 BLAKE2B aa232ff5c60f78800795caafa7e9ad7cf285afeca45a8d7d5d95808dbadbdd6dd1e7ca04ef38eebde2b199302691fe8cb0f1428150be4b29a8660a4f30f75709 SHA512 7dd37880388ed41ddfd8eddc790e4e800039bc34fcf03baf6d77865f081b3a8cf425060ec9a77182479fec918b7d04ceead69eae2b357f0fe7481be42adfe1c0
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.12.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.12.ebuild
index f7088968c68a..35359a8391cb 100644
--- a/dev-python/ebuildtester/ebuildtester-0.1.12.ebuild
+++ b/dev-python/ebuildtester/ebuildtester-0.1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild
index f7088968c68a..35359a8391cb 100644
--- a/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild
+++ b/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.14.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.14.ebuild
index f7088968c68a..35359a8391cb 100644
--- a/dev-python/ebuildtester/ebuildtester-0.1.14.ebuild
+++ b/dev-python/ebuildtester/ebuildtester-0.1.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 6af9fb784110..ce9f7e2e2c01 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -2,9 +2,9 @@ DIST ecdsa-0.13.2.tar.gz 61595 BLAKE2B 0a8c8a0609a680ab26e84963f84d6194eaeb8aba7
 DIST ecdsa-0.13.3.tar.gz 60477 BLAKE2B 4dba6c4778460dc8b778c2d7294e79a33d0fa23a50b3c04f7fe9011b2df95e9712bb41fa502043ec62efa8186374555c0eb4b59b96d2ae99d9861f816bd6c9e3 SHA512 621d36dcbdc0338b5e595e73337f62de0cc69febcabae40a6ba9292f2466f5d8818346d9d29d0b1c479ad4400fa57bdc52a7b264a475f8abed4c4a1161902b58
 DIST ecdsa-0.13.tar.gz 55579 BLAKE2B b8fab652527f945820b87931477d431bbfa605ec123fd5fea313b377edc118809c4109737ec6f6a97fb536f4aad193a4fd3154401d40f26fe05a336ab730e33e SHA512 f21d4d196404455135a1a2255c889ffa26160ea1e9b9d16c914ea82614831816acb6d27c86aac68cdaafa8b1d5fefe065b5f49ce45acaae4a035cd7f08a97594
 DIST ecdsa-0.14.1.tar.gz 100303 BLAKE2B f7f02bcd99752a7e0c7ac7d22625f5a42638fefb9a92fefda3da279cdbb76d1a5337df5abfd43eb1edccf794c5b2fe34e10df876696d74e921c5ddb35f61f3a5 SHA512 6a66e07ec75e93af73d2363dfd817b35a103f8ff8d62c5ce3af9e98e917d38213aa4f80d570f81c830938123f9599e24d96605a36650eaefd806ed07ab0c14a5
-EBUILD ecdsa-0.13.2.ebuild 616 BLAKE2B 0ff8a541ea8c5e3fe1e2ba23fcae0f2afcd4849c976d78ad84a1f98eb103e194879ce90522b913422d0bda54e9abd7ead53e68f78fced764a63f16003884fb46 SHA512 1466057033557acd1000abcb5aa25021b012799027c0505dbd675552922890b1469b2c7d35a13980371648434fe8ad2393ab4f06e317e447db63cfcc07a913b9
-EBUILD ecdsa-0.13.3.ebuild 616 BLAKE2B 52893c5430fe5197078754423c817c425da0f1738e5dd451b6ba7e401ef9d3caef51e6458650af957f2eb095c5ab6b31f9861a80e0cb1086717ab7b2f6070a86 SHA512 f8437c0b95ef6d301c6c2f8ebe53f086a07cbaf3167362fde816acb764fb86b0eb5b159fd55e8d9d99233fdd0488ecedb5d57436a06b1d474a51d84c30444aab
-EBUILD ecdsa-0.13.ebuild 607 BLAKE2B ae318da321cfedd7f5b61d836a8892002a43d917885770690bf64b199337b5b026aeb550f474121de0ffd31204a8ea81d6368b7d188a7d57dfca91568a38fb01 SHA512 3b0af9c22ddbb13bf703fa1a6a28769c09898a555c4346539b16aaafb7b7bd0b77dbaf46ce594add453c20eb7efc0e3243cf7c26036bfcca2ff9d41f229663ce
-EBUILD ecdsa-0.14.1-r1.ebuild 913 BLAKE2B 94f81500959b845b8cae9f2a3cf766945b71ba53de86027d4050b243b1a62a0105d94b6a9a66789aafb51a50a8987f2c6e23acc6f747d7cddaa04026b2f01ac2 SHA512 e399fe15a50775a2af63069c3888c72f334bd11a6faabd9befac287edd1fe622c02ebd712d4534ce2ce8fede2c39efb7ec3cb82044f325a3546d8489caa0b462
-EBUILD ecdsa-0.14.1.ebuild 607 BLAKE2B 631bfc0f98a3d6039d8ca510bd53caa556393b1db5a1f0bfe005ab548b05f586d469245b1289b86347d961aed4a8162260fef91ebc6887abe0bcac8808430823 SHA512 0cdc0d1e4af6949f4651489935f76b8e3416b0caf4f7333665daeff7d5366528f4442ef034ebdad2312d242773d90962f9066bd572bba4836995868a7b0a0f32
-MISC metadata.xml 638 BLAKE2B 70c66edf039ec739f21145846f74e2306ce879551a2ae39a9321b53a6f5a636235006146c2049dae41ecf3b77dad887f88f45cbf67ead493288570b4b79c6d2b SHA512 b08361b7b3fca4f1623aa71fe1090e3a8890f7b475ae2edfb5f0d7d2075be226e9826ad54b90756060be1d58aaa03a942d39834bf29c09338359b402db5ea7b8
+EBUILD ecdsa-0.13.2.ebuild 609 BLAKE2B be6b57d79ee0848635311aa32c39efe22af7494eba2a10f8cbf60aef190add07e1414238deaa2258847e1cf667ee845fe1a296d751a9ffe1922b7f1b59ec5b1e SHA512 5b5327df7fd715c7fbbc1e0a3dbabeacfba9ed59277454312f7fafd61d54513f9acd1af2d0711e088edcd3b3c0df89f145267a59101098cce24bc62daa3cf7a9
+EBUILD ecdsa-0.13.3.ebuild 609 BLAKE2B 02e155bbf17c08b5e306cbad75cdd01b8d10a3454ed9e41e8b9efd3f6d72e17e293dc8ed32a68e8dc6b26b8baee653f4c1c6a251578841dfe8cfbf4c8e97e26d SHA512 922f64395e2faa66c1afaabc695d0f7d40702fe9f9ac5f158a76050369ea7e44b216c743e9ebf0ea6e846b21b49f85e946c4d298b89ae47d83a5528e7dfb69f3
+EBUILD ecdsa-0.13.ebuild 600 BLAKE2B 45fea4880fff892bcf65574aa5f614ea52a0b5649b79300ca25899144796f9433501dfbaeff96e0c45eb306fef9f316117314ccb341ea78609c3a5dbfce1b45d SHA512 564f12da12e9f54a68ddcb5a7dd23f226287eb73cec0d9b9db1aaa148cc19f9658bb681df49921d53c68b15b46c434de6b5c126817ad43eef017ef870b3c4dd6
+EBUILD ecdsa-0.14.1-r1.ebuild 908 BLAKE2B 6fe4e0c18cc0528bae3d6963aeddbafb2725d1d2de899467298bc01d7e6febd493fd34a3280f3b93a0928a23c495d95d04635ca09bacb4df2610da8df22c28fb SHA512 97e7b8b787d78a7581e6310f4f54c137304488a2acc3692d1302dbed2e3bb1a2e284d8cefb6c759dfa309417fd726180d1ccd7d9d67102bb150cc7ae9466304a
+EBUILD ecdsa-0.14.1.ebuild 600 BLAKE2B e9251658ed3b1732e4d6453255caf7ae00579c6b072a77741650bd5a5dc0992b91ca4072127d0ab0bd56d974cafcd1e68b890f18283b81e335dabf5faa45fc05 SHA512 e915204a452942258381e149a56d16d291e7e65daf0d450f3b00e0499fd9010a8170d1ed4d769489835b3b1265c35f43cc8e1a4d731245d492dee1a3b47813d3
+MISC metadata.xml 519 BLAKE2B bc72643a47665561e24df33ae2964b153c329c7b5348baa2f1eed5d5c1b4942e8b7b32664fcc5431bb5d91f1be4ba31460c7d6c8bb68a73514aafd4fa09f850c SHA512 20703e64bbc5db257c79594875a9982eed25d5d66971c9d2cefec7e5e663b6bff31ebe6768496a3b6ddd80604624cfbb8cbfd0a0086010cd53b18415faaaa62a
diff --git a/dev-python/ecdsa/ecdsa-0.13.2.ebuild b/dev-python/ecdsa/ecdsa-0.13.2.ebuild
index 013f9bfe71c9..bff9c0832d57 100644
--- a/dev-python/ecdsa/ecdsa-0.13.2.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.13.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ecdsa/ecdsa-0.13.3.ebuild b/dev-python/ecdsa/ecdsa-0.13.3.ebuild
index 43d6450ce1ca..5a1580bf32e2 100644
--- a/dev-python/ecdsa/ecdsa-0.13.3.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.13.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ecdsa/ecdsa-0.13.ebuild b/dev-python/ecdsa/ecdsa-0.13.ebuild
index daef38fe1065..79266959c4f2 100644
--- a/dev-python/ecdsa/ecdsa-0.13.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild b/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild
index a67b935eb7bc..27ef62328d21 100644
--- a/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ecdsa/ecdsa-0.14.1.ebuild b/dev-python/ecdsa/ecdsa-0.14.1.ebuild
index 3b71df11c7f7..a3723e397811 100644
--- a/dev-python/ecdsa/ecdsa-0.14.1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.14.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ecdsa/metadata.xml b/dev-python/ecdsa/metadata.xml
index 0fd1912e9f89..09ecea64c51f 100644
--- a/dev-python/ecdsa/metadata.xml
+++ b/dev-python/ecdsa/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="person">
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
diff --git a/dev-python/ed25519ll/Manifest b/dev-python/ed25519ll/Manifest
deleted file mode 100644
index 3de005d27d03..000000000000
--- a/dev-python/ed25519ll/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ed25519ll-0.6.tar.gz 74782 BLAKE2B b00619ac41ce01d8c4c16adf78bb7568f037e96bcb92cac150d59258729d424f1830ae68028dc5441574acecd4de6a914a19b609dedfb8a151dbdb4478855f5e SHA512 03d6e1985371698d2fee9627fa24cd724ae2ce8399f55ef9c88df7166ddf88c4b56abbbf7971eb2c8591a6d703b92fcd52f743ecb5752841849eea23eba0978d
-EBUILD ed25519ll-0.6.ebuild 683 BLAKE2B 9adec1323bcbacdf221a0cc7b73c4e5074c40f5fa70571b7844cde07fcb393b32fa005ab80291988fe2eea6263992a7b7914bd426e4fb35ad1898ebaecdb3d78 SHA512 aee9d9d6a6c828b99451f2b6cf43c3ef198c2fa27352e7c3bd551f650c4573018a84d3deb5728888d007c835ea4cc1afb84e154f07e859dce743927ce85d180f
-MISC metadata.xml 507 BLAKE2B 3f844e5fc8384f78ce8b411fe0d368e7865df1145dcaeccd75c2d5648ff2d2062bfdab67a352803361bfd6ed7cd0e6b8b692617a5a2e0b75476e04135da0192d SHA512 a058610dfb8512ddb145083644fcaa685dc69fd9b1263bebbe8aeea0f7be9a683607cc5fd84a7c730b173989c745af928a13ca0b96913486c1fbc474ba32b37d
diff --git a/dev-python/ed25519ll/ed25519ll-0.6.ebuild b/dev-python/ed25519ll/ed25519ll-0.6.ebuild
deleted file mode 100644
index 6c33db4acf79..000000000000
--- a/dev-python/ed25519ll/ed25519ll-0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A low-level ctypes wrapper for Ed25519 digital signatures."
-HOMEPAGE="https://bitbucket.org/dholth/ed25519ll/ https://pypi.org/project/ed25519ll/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ed25519ll/metadata.xml b/dev-python/ed25519ll/metadata.xml
deleted file mode 100644
index 786080e13beb..000000000000
--- a/dev-python/ed25519ll/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">ed25519ll</remote-id>
-    <maintainer status="unknown">
-      <email>dholth@fastmail.fm</email>
-      <name>Daniel Holth</name>
-    </maintainer>
-    <remote-id type="bitbucket">dholth/ed25519ll</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/editorconfig-core-py/Manifest b/dev-python/editorconfig-core-py/Manifest
index 507edb79f121..b2d8a7b32d56 100644
--- a/dev-python/editorconfig-core-py/Manifest
+++ b/dev-python/editorconfig-core-py/Manifest
@@ -1,5 +1,5 @@
 AUX editorconfig-core-py-0.12.0-no-cli.patch 503 BLAKE2B 98c71ac5fba08ee58d83dba92c37ce4a1d232d96b5f0648102da5b749f382af93b45a59b73d7a81c322937dfc94566f45b6203bea3b286ed49e81b69fa590667 SHA512 3c8802b4df1799c5456e30cf2f62d8c7d5b939a935bd511e2b1dc4ee681131ea7da114038e67efc1938b2c4c110c11dd4cbee0b77024d311e9b50585c364b591
 DIST editorconfig-core-py-0.12.0.tar.gz 24801 BLAKE2B 10901b1595965139dbc3aa3227f335c2128b2ea83204ed88b0e799021f7c215fd13c3e2246cb9197ecb7c918aca2d6e9269d94298aa0665432ab091630a29dd6 SHA512 29c5f58bd7293052e4b1fbfbadcf4a148eb939558494d599bafd46151a4fb5af9cd07dcef477db9a709a0ea63dec0dd7e9d4071779f8ca6e3bd137268cc22f72
 DIST editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz 7900 BLAKE2B 9ebdb5e522948bc9e86ea84435ccaa11585a8a12f4cd6fe54c64d78917281c913568351767d8077623b1196d84206d1c2d0126a0510f70df484c1b55d829028b SHA512 ae5424b4926d6cb127cb3da473400ced4f7ccf224f7baa8bc5bde0317cc045bb7b99738a56efe5fd0e5a0fbe39b997b9fb1739d24713e7f83b58e987c5e56a32
-EBUILD editorconfig-core-py-0.12.0.ebuild 1383 BLAKE2B ebc4bc758c036e19557ee3dc7b440c6d2698f4bae3903051d1107ee4a415a8b1a751618537f83c9605b0a3f733fc7a1bd703608406b5891a2ec77fc84a69274c SHA512 08326ae43a067094b5f88f10c973077886be11d89dca516b044da4a7eceaef597fbbaefae52914e1dd861d2250cfae184d657485da61dd75070cf2d8940e36a1
+EBUILD editorconfig-core-py-0.12.0.ebuild 1373 BLAKE2B 72319ca8bdc789e70b6a21667850f9c20cabccf256ed930efc8daea5ee04a0c2587a040af004696328231e64033b0ae40bdfcead8b8241246ce73febec4de505 SHA512 b3cb110d35470c69e0092bbd5934b584586d9e37e01cacde57c03ead791d76fee625f17f8608ccfc9c66f731ba41c4a166b7e01196ed8e203cd1efd7202af577
 MISC metadata.xml 679 BLAKE2B e9d5e33c647f61258a1d8a691f98716030cf425e1b4279a6b05a0151dfc7ec4298ae2070f60316a983618eb9628b5e3c8e1149783cd7768547f8624cec504a87 SHA512 ebac6fb7f09e22832a5436aba0b445775800d377a794c0a5b32302f2d3baf0c6c09d70685bcd12f21e084b290915a43d729cd94b8e92246259446aa17548710b
diff --git a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
index c7edfe6e0a6a..98a568d05ada 100644
--- a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
+++ b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 TESTVER="abb579e00f2deeede91cb485e53512efab9c6474"
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Clone of EditorConfig core written in Python"
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 4d9be08320d6..407e8e3644f7 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -4,7 +4,7 @@ DIST elasticsearch-curator-5.6.0.tar.gz 221555 BLAKE2B cbf1f645b266d2d08914ff74f
 DIST elasticsearch-curator-5.8.1.tar.gz 231233 BLAKE2B d2369c18be69cc5c8e17a6d7a72660bd7165c349cdb06c740c8db9dd2b583f181a09ba7d53ee0f4692cb6e31d373274f0610f2a654ba4a6da2d0ca0ff22c7c97 SHA512 500767967f423629f34d42ee088a9c007e193216c42f5590364ffcacc9e1efeba65dd4d333f806250e3b7fe0bea8b5501d1e6f3bf6fb0b8c46a46954e92c4a65
 DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
 DIST elasticsearch-oss-6.4.3.tar.gz 33727639 BLAKE2B b4f4821af7a2447a6a16158c32bf676ebbfd8598fde8af558dd19d6e365df66be17d0984e3acb9380a0d5e0cff486b85f6edf96312bd3bb3fc5ae52c270306f3 SHA512 b1147baa95119a8a96779125351358b4c62f2a546b65a9750c11d1d1b9270f06db6da8ff1d9ad11efade1eaea8487087e2d8839b0edfc5da6d9b54da6c6df4e7
-EBUILD elasticsearch-curator-5.5.4-r1.ebuild 3664 BLAKE2B 1714647e31bc93192589bd89730a4f89463ebd0e1690e52047dc3bc86ea1be77b45bbd1b88d38f9cc472c0dddde381f53bb23b0d3dc6933aa6447bae30d71523 SHA512 d4983d75d7a447f6b368d907b5bae29bd495aef86fee9dd7d56c9e26bf22a57d7370ac9b486cf1e28f2be4082dba8c3416a62ffea4d06caa89f5043eb4bba97d
-EBUILD elasticsearch-curator-5.6.0.ebuild 4551 BLAKE2B 5c2643e3ee6ad4f9fb53a8a8a913029e5a2bcffe92d6455729c43ae73d4bda926ac3ae82bd505259d848c4384f5e8ae5d039bb2428364549f843a1c99e668d92 SHA512 bd3a0e8251aff67aebd5c287071b76401cffd781724298f5f0021df4ec5c1f90716d6320223605586d15bc04801111b126d709784b417e7ac48c4c19b9b6f909
-EBUILD elasticsearch-curator-5.8.1.ebuild 4909 BLAKE2B 12232f0fb9a09f46e9c701dcb2bb71239803f9671ca580f7ca6acfb83cb20f4a27c6c3eeb4b91f0cdf9e23f0165531307fbc0b98e5969138389ebec48902de04 SHA512 502af09f8105da601537f9b45167f22d4cabce006c78b35be5edd8b6c887b0f3f30cdc9e082262ef86b21e6b0172e8592e3a5d6144de4eb3f1f244bb4e4b386c
+EBUILD elasticsearch-curator-5.5.4-r1.ebuild 3654 BLAKE2B 4b7011dc3aff93076b543fda338a33e5674d2a2e9d2389a8b1d30a87f51b341a16331bdd2b2cda514b1a32a4515b15d31a5a0b71ff249ee112981229b6b51693 SHA512 e8e214f86a05d179078b65ea47910617aa2c3da1088d24f8e904e9867e3ad728b75eff559ac332321c43ab9db03e4580a0837bf501497aed0d9e56216e7e2df6
+EBUILD elasticsearch-curator-5.6.0.ebuild 4541 BLAKE2B 38bd02c983d1f25916186462974009d35c8786bf83c36d31c690da4cbc49a114017b564637e9942b42068c107ca34e547851dddc7e0d00c3e465d94ad3a10211 SHA512 c86e25e438aafb54c9a22a84c1dfa807f32d94c8d0d617acf1912631d371b19ba094bd115bafa1a4d52988255d8dfc664baca9db7810a61fab8ed9b4c443195b
+EBUILD elasticsearch-curator-5.8.1.ebuild 4899 BLAKE2B 88ba0b4f7a540dc4e51f51302b31b08f37d46eb331690c63ec7b54d72ea7bdd79fc86860b0a9d4b22464638e3e2fe24f468e03ef9e21f9c311cb3e5b32860390 SHA512 61397fccc9db37a5e745e622bc9f22bf6f4500755a842d6b68569586e16056e20778894a4d5dd6245926e4d90af8b80908ff4747125fe54e2e0cb30dcfd31d9f
 MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
index a6ba4d4c4380..0e8ddc5f9361 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 MY_PN="curator"
 ES_VERSION="6.3.2"
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.6.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.6.0.ebuild
index 0a4f8a645c05..b400fd65e48f 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.6.0.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 MY_PN="curator"
 ES_VERSION="6.4.3"
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild
index f822977ef921..c8146c38ac00 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 MY_PN="curator"
 ES_VERSION="7.3.2"
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 8329b430ad23..96fcf4150ea3 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -3,7 +3,7 @@ DIST elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz 68787752 BLAKE2B 63864de
 DIST elasticsearch-py-6.3.1.tar.gz 90047 BLAKE2B 765d0a34bd22067e07f4e862eb72f2b67bd0db3516abdf76cdc0d4f24de3db6941b4dbc6afb6315667d640514415cf08ff6de127c84ab36ef9bf062d4e687d55 SHA512 b975a6b446b760bf62289e855768a26b9e104aba9cd399cf275f59f2755efa00bd55c99a746751dad2f7a18f581a1b124c1bb9b91f5c3dc9fb00138c9d198aea
 DIST elasticsearch-py-6.4.0.tar.gz 97217 BLAKE2B 376768fab9bd7b4efd98f8cc24d4bad700f9bd2f9013a794e28986ee80463e5854399124bfde43a9a43d6773ee5e546fc28077452d2daab6e2e25810c045a986 SHA512 bb9a2fad3ca002b25fa58585cffdadf847a078f72a5b24297d58e1d598103cb38155ff61fd5802be8ccfec96daec3119ecb490f876c07263f103fbf26f6dc6d4
 DIST elasticsearch-py-7.0.5.tar.gz 110079 BLAKE2B 89f5f7434fae0c4d20c1780c0979a419278fcaa23f75d5241d48c695905e566742fac5651387f0b1cb665ab6e9cb299406ee7f0157facc8c4cf2c1f1a4a3e5d7 SHA512 c4224cee6f7739ad932036f2afc6ed20ead16829d42f40b79e08d6714b4a247f019175739fb5a93bcea5bba391bd9f54cadcd31d42ff9411da414d08c140049b
-EBUILD elasticsearch-py-6.3.1-r1.ebuild 2601 BLAKE2B d3447d9fc518bd287a5ac9750d8713cecaf3e9871b07750734073abae339a14ba49427fc921246da724b6d3d18cd6b38fbfcea23869386d12b2a7290eb671d84 SHA512 5e6ad003403b4b802abf28279b96f699187f1db632389ccb0965e072863492480270648ce1bf73693e3fb7e7cfecfe5b835fa613d11ee4929a22c19f7a4f2a04
-EBUILD elasticsearch-py-6.4.0.ebuild 2613 BLAKE2B 60076c1d7c6194ea67bf0f1c957ba8d8da3024c5e6a773fea5a2e765b86af569147c577a888bd4b18e2b926a3920efaec6a05d46cf0dce82c71330e83be90908 SHA512 1f5882255d6c651fb9388e4039f1a5ccbda33dde5f55ff571f566ecaa52370a3bc61892a2d0dfaedb0b3f033b23a35cde94b8f9400c14b4b5d407caa180bb989
-EBUILD elasticsearch-py-7.0.5.ebuild 2708 BLAKE2B 4c6c2d8eaca111767a0d7b36fb471d2771e6114151fb91cf991056a69f8eff5019efa6899fbc269161eea61dc63f18b149baf9d7518ae4ee81510b33f70443b8 SHA512 0d5ef6e0566e602f5cf621f5e484584d4aa997c5acdb9ecb037dd28618c086d433c7223b2d4a5b50a5fd2d47ae93e3d66d6dd4782d1776eccf981d6821bead59
+EBUILD elasticsearch-py-6.3.1-r1.ebuild 2592 BLAKE2B c46d606a61e72ee5418a471a41692a7934a0f10797f2c1a2bbc9fd05b702d23e69698f79a406f58731b97d99748a55d45e8f265e30cd89a1ec2061d7d573ef5f SHA512 a1e5df32436dcbde99303531969ebf2caf4a3640c81eab9707b4e42b3505dbf63ccc37ecddfd3c3ff983979647c771f408ffdd54c205bb59a37699b459703e52
+EBUILD elasticsearch-py-6.4.0.ebuild 2604 BLAKE2B 944a12e2f85742853908cd679e20a472646ffe01619942c376879b6ec43ed0d19534dff2a315c1c5c57a5bdff3386d2329a1c47974fcba659b30abffa26394c7 SHA512 cb3145f486596cbc1e599651421194a340cceceecbaf7b33bb1ff45a9854ce1522f17646f72b9558fc5f6d49db7c098e93603bf0530c30d915d9951f34a0aba7
+EBUILD elasticsearch-py-7.0.5.ebuild 2701 BLAKE2B b6fb0b2249d8c010d52d30fba4445dabc7322f1376b5f5d394bdd6a91aa691a5789c8986b235a2e4368297ab9058cdcad75aa9f7571db6a459a1082d6872f704 SHA512 0c0e5cd922d2c062c22c6a106837e308c0d32d302f14c5128080f11a4ecdc5847b5bfaa12a4a5d9629091b6f5dd7e2f30f1f9bcb4a890bd96e74b322b24ee927
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
index 897a34f613db..ffa0d68037f4 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 ES_VERSION="6.4.0"
 
 inherit distutils-r1
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
index b941a308a924..635ff2c7760d 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 ES_VERSION="6.4.0"
 
 inherit distutils-r1
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild
index f12fb68275e3..78f5b4415940 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 ES_VERSION="7.0.1"
 
 inherit distutils-r1
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 3a8d72d550ad..b40d8c3e6b4b 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,3 +1,3 @@
 DIST elementpath-1.3.1.tar.gz 100631 BLAKE2B fb3238006afb5100ad03314bddb16e77ea2fc7a91acf95e479ad67308456f761c53c64920266aa251a3f1b9bb6c6bebe39faa6413dd840a19ca1e9b3293f5253 SHA512 3beea19fe431514630f3957d2005d5883fb496a7192a47ea593d4b0df7a0050a19756275af7f85c7807c929482ddaacaba76ec0f3a715b6779d4aec125ee5550
-EBUILD elementpath-1.3.1.ebuild 886 BLAKE2B 7a23cd256352ed555cf634ce0595377a923d36290638edf1394e2a5d3b5b38d8f6820cf39fc9bd93544d2126826590f62a725a82fb6c3b4962fcafa6c0616878 SHA512 68a957dba7167c455301852cc08c864a8d2bb4ce1e9d56f48c7b3ce43dc92fab4ccc82029a4524bd5525dda5a3ea6bb775eb5636e31801f2d2ca5bb05cf67020
+EBUILD elementpath-1.3.1.ebuild 889 BLAKE2B a2d1326cd7723cca0a7d05b0c4b5b6663cd5271133f17233659ddebb2d86a0146d7bbd1fa07ee4ab2b2745c07702aa13826b511020fe9a9d419b31b365e34a7a SHA512 b57e0f3aa625a43c3a42dd760744b1b34e5b4b20f340b870729a75cde235661d18ac2c6a0d9df93bbee115999eae05efb0d11bc68a916ad9e60cc4543dd8711e
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/elementpath/elementpath-1.3.1.ebuild b/dev-python/elementpath/elementpath-1.3.1.ebuild
index 4884138e8842..5e43008a1b0f 100644
--- a/dev-python/elementpath/elementpath-1.3.1.ebuild
+++ b/dev-python/elementpath/elementpath-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
diff --git a/dev-python/elementtree/Manifest b/dev-python/elementtree/Manifest
index ab4b1faf590b..55394501a70f 100644
--- a/dev-python/elementtree/Manifest
+++ b/dev-python/elementtree/Manifest
@@ -1,3 +1,3 @@
 DIST elementtree-1.2.6-20050316.tar.gz 41752 BLAKE2B 41bb745d5a5f0eb0b3da96b3c6eccf97c23b45d2c886e0a6160fdc72c4f299419b2e7f1e36a6ef85d329d2b44e58ad74e105fd385fd3318d77bb6db89a72f508 SHA512 f213cf5bd9a79b59a2033c652d9d53087fd07dd3550db1771b8ba97168c3a5722d31ac5ff8699830df0f14a1d9f0caf8d237e8c6153568e16347d8b212771baf
-EBUILD elementtree-1.2.6-r3.ebuild 966 BLAKE2B e57dd28434205f3082b2e9b76e4fc9212d08396c066953273064b6e106f331c8927ed7bf6a3323cab8e639331f585bf35176d4863f1cfdbee639946ebbd40bbc SHA512 fa47b02a323dbc1d3432e666e9654cceea9ef20512892569a2e6bf7c23594dacd0b942626994ce6f40752fb4ecb499aced8d85b7bc85627936c91b15ef8a8cab
+EBUILD elementtree-1.2.6-r3.ebuild 958 BLAKE2B 2468d6071c0736b3d6ca22c273f14e245e15242f75b5fe42d3255768464eeaf7e9cec450d87e6fbdd2b9dffdfe73661a0770258d321490e1844e0893bc716cdc SHA512 808ab3236c8597a01fca2690bab1668c3e3fcc4d95fdae191af4637d38b5e451eb8570d5a8679ed164f52e2edcb6e39249bd9bb4a1123fd6f50cfa34e34dfe66
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
index 01658ad7b174..eea00a8d8c14 100644
--- a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
+++ b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/embedly/Manifest b/dev-python/embedly/Manifest
index cd0d2c275c72..09712793777f 100644
--- a/dev-python/embedly/Manifest
+++ b/dev-python/embedly/Manifest
@@ -1,3 +1,3 @@
 DIST Embedly-0.5.0.tar.gz 7812 BLAKE2B 5a8c08699062597d458a1ac41c114d07a53058fc7633515d68cabe975b90180529cf113c4fbce62ed687921a7cb436af197edfe6e70236ce24d2821f08d88177 SHA512 c85abacaa33b7897ccda79dc3746497f4eefe54bac3eef0aaa7c9120fec14ff6b7652a342303bea0667f60c2e31cb1591a22cddeff6827c87c6e2b1cc3274469
-EBUILD embedly-0.5.0-r1.ebuild 769 BLAKE2B d95f75178e4198198aaade796053bf6ec7820f77c38e81e25d764b4dfbea8da8d0f36ee4b5f6dbbf68c23cd0be7dd42a65501ec17902a4f88d3533c4bc44f02a SHA512 930e96b6de942607f9eab174e3a4d9a5c5e4983a5af28116f7d9d84a7d836b5b03b77abca5bdeb4332a4cfa116d51fde04c890f614e07b99272d915bb060961c
+EBUILD embedly-0.5.0-r1.ebuild 673 BLAKE2B 031ea81b80bd3bf174449ae899169583801dcc46e93a0fce5fc6b552f2b5d43b65c2ed6c0967c1b644d92f228e569789cefce00f3109d72b69faee5589508553 SHA512 d6725d62a98552452fb966f36eb07f3c7863d57a25ac06d142d697211f4c5ba15a790955319b11254139e2b10bd10e1d2dcb4655938b847b853553ccc3dea44f
 MISC metadata.xml 384 BLAKE2B ec9392c0f28560821bd01e664131b144cd48da2435ea44189274eade830351bfae24466002817d6c0ee81d09312f853e56cede2de6c597de907f5600ac1f35ad SHA512 a66f322747866c5740c53a0920008f2d8beade0c84d8ea3b5b247130b20edf0a74c3f154ee195bb76b3c7a9962761c2abe9ce57733b0590597434db3e4845baf
diff --git a/dev-python/embedly/embedly-0.5.0-r1.ebuild b/dev-python/embedly/embedly-0.5.0-r1.ebuild
index 313b05cf3fe1..121eda284820 100644
--- a/dev-python/embedly/embedly-0.5.0-r1.ebuild
+++ b/dev-python/embedly/embedly-0.5.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -16,17 +16,14 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
+# Testsuite relies upon connection to various sites on the net
+RESTRICT="test"
 
 RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
 
-# Testsuite relies upon connection to various sites on the net
-RESTRICT="test"
-
 python_test() {
 	esetup.py test
 }
diff --git a/dev-python/emcee/Manifest b/dev-python/emcee/Manifest
index c2c7e76b8657..ebabc9a7aac0 100644
--- a/dev-python/emcee/Manifest
+++ b/dev-python/emcee/Manifest
@@ -1,5 +1,3 @@
-DIST emcee-2.1.0.tar.gz 23094 BLAKE2B 302741e2edf29ab092974a240e8dba257caee60447218c7120df7386bfa2d3a52e037328578a12c00c3492b5ca919c95a12c4fab886eb18daf894bab3877ef3d SHA512 dff055dddec630e922565c38fd65d41cbfb974f6efd301d7779a3cc7de8372d7ca64ced91d01757b5b37c7a00eecdbbda74c1cd3a899ae8999959cfdc2e7fe05
 DIST emcee-2.2.1.tar.gz 24277 BLAKE2B 26572cf242caa2f9f7018e91434d7ff8b235d59349fb7b034e52bbab77098ff952e84eb96d013b66853a763c8fccc0cdd7121a5387b5081dd238df85416cda0a SHA512 8f612a135fe5fc2bc75c2bc231d9210d4a70a91f5d7b94ac2161618c082d18aa1b896604b7ece166b86d93a93902e89ee9961da2a3e65307880c0dbc63bea267
-EBUILD emcee-2.1.0.ebuild 666 BLAKE2B d76354e477bafa63c94e484c12d13453dcc964c02c1f4e5f488e0d7e4221ebb8a656cb52336b2cef401bfa6ebdc4fc2af1c82ff47ad0ea41012c333e273d43a5 SHA512 8dcf06debb9a063824991cc2ead4845d35bac673c72de48336f4a4e94498227eb1b2468de44851aa3e3617695c6293df2715c469dda04c1bd4062dfe14ad401d
-EBUILD emcee-2.2.1.ebuild 670 BLAKE2B 65130d4a7a87cc91c1acd51930c0a27ffeca665544bb65821fe5bf760dc5f34be89f23c362eda19722e02ae088c2e81ea77332618e6d62fffc55d7a01b99b4d3 SHA512 b3d6f3edded0b0f54470df68b9fbbd1b6fa27b536104ef936ea200462a9cc062d262bff03fb4ed42945448dbd68cd65f38470a2cd8b883b0cfcb05e45123810d
+EBUILD emcee-2.2.1.ebuild 666 BLAKE2B 43fd950dd580677e8426c98a6ef98b07ca9d226a5b979d19913c8b1d006cf5157afc8ce35e5f698388a19ce1831764ec18da5ab3fd3399eee75b21e65da6f839 SHA512 8a9b505ac87730cb98aefbfe686a1ac80736f50ee74353eee9576923187ee85a463977679bc0bc99e84056dfc604698ddfa4d3b616ca8cd1eda27048c1da60a2
 MISC metadata.xml 865 BLAKE2B 5d1067b3f5aa4969bf5e50ca73aceacdf45795f0e28562b8800d1b0c84d1d0df36d50f788392b3c508aae9c7eb3bc80d8115ea2becdca370f046f543d6f66112 SHA512 e3a8df62f73e85de2462f6f631706f2940cf7903017065e9b1c1e639e409bc7e99d2213ccbeba7da20f8ef15dd04ccb17be6664d2dd10b285f53b204f97e2102
diff --git a/dev-python/emcee/emcee-2.1.0.ebuild b/dev-python/emcee/emcee-2.1.0.ebuild
deleted file mode 100644
index 86a57297a1cd..000000000000
--- a/dev-python/emcee/emcee-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
-HOMEPAGE="http://danfm.ca/emcee/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS.rst README.rst )
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/emcee/emcee-2.2.1.ebuild b/dev-python/emcee/emcee-2.2.1.ebuild
index 894091db1541..651f3cc2f4ad 100644
--- a/dev-python/emcee/emcee-2.2.1.ebuild
+++ b/dev-python/emcee/emcee-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
index fd651a5d2f4e..c8e5a892efbe 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1,7 +1,7 @@
 DIST empy-3.3.2.tar.gz 138168 BLAKE2B 0afbe6f7939898013770e18a0296d45a7a4121a3b8deb66a40b6fe37a311f9c4df1f864f4d975549cf4f198494f6f069d7ec186dfa5b99e19960b0c52a7aff2e SHA512 d9098823bbb26e4447aae9042e389e000f893615117512f9b786eedbc6875dee6b7f6be50021f68a4bd6e200b364852206b36bff5c48ae1754c8f0d49682d5f2
 DIST empy-3.3.3.tar.gz 138429 BLAKE2B ed2ea352161bcd141620253e059255c6d6437d72d8e72075e1abc01efc496715ff07eb1e9baef70a631e752761f828f2f4750087da154c0a6df1434e47a8f0b7 SHA512 74c091d6dac39ad9ddb6f46963066dab1f8846565f77b1b0ad4352eda3534d4312b0e95d3682387d75c2f5553d678c6d3112471eec032e2bdea0e891dd8217b1
 DIST empy-3.3.tar.gz 137144 BLAKE2B 393f9033125459d6f3d5e9484d174980a00627508d083a32582f85eca9a294394ff028ee9df85ed73b8ff61174ae2068b0b943583fc86efa741bd2def63c215d SHA512 36304577839f5e6b2fb9bb2c2d72880e1f16886b2afadbcb38fd31a85620bb0369e837b8a1d74eab09a074bfe1f7be199b38842673106e0d26f1d9abc53987a7
-EBUILD empy-3.3-r1.ebuild 1136 BLAKE2B e31a65fac96c89e677c215af0dd7a139b8ebb8930252985d107261fa467d50e43f0743c52def437c60cc5600c1cc464206c9215a103135648208d219d1d297a2 SHA512 99a0cc0f4d40355769b00bb34af5f69e8c6eecc8dc653d55bd90202cf646c62e03c4e4207357f114b0d586ce9e27ac817c2fd5345687f14581c0e8b0bb882b84
-EBUILD empy-3.3.2.ebuild 1011 BLAKE2B db8244dd50160c4bd6e038f7bd95cfa29c9fe6474b9a0c1733b3c81777c08aa38a1f5b0a7c3de25173a38549e1c2b8736d69de4078aecbed7e3c75cf1d9c83c1 SHA512 0e011fa6a6d2e1ecc1e6849439412eedf3bc60e7283d1558117c2aec48e1926dcba4ee83337ffe86a48fe2e989938539142793f2230586c863da705283608cc2
-EBUILD empy-3.3.3.ebuild 988 BLAKE2B 9d0374f16bf75d1e5a5d090f92e1aa0ed6e0d24160ef0f72a94ddeb430a43740b48e4edbfee4a16d6ef34e6128b9dac93a0b57380b4ec498a304e6b1c9722930 SHA512 4b7957b8f38a3b4a79c935a86420cb94670f62ec01d2982f0c0bd1cdc660fbdc338d3434c328d020f26b1a04146c820e9d0fcfd0e9e54a857e004a02c761eaf3
+EBUILD empy-3.3-r1.ebuild 1128 BLAKE2B 66679ec3b2d7788108dd9b1780f9782c503906fdd111f1e593bbc9596accd424d9191e214520a44a76a18320507f2f48057ef53e2eb70ecbf1f3059d77e9a5f8 SHA512 212a46d7d859b3e46798df0647ef494b07a6274d5a066d7bda7df8037494cb0610177ea2463e1708eadf10411eb600f002f2b805be94706712f670259979530a
+EBUILD empy-3.3.2.ebuild 1004 BLAKE2B ecc56b8c53323d8e188fd8fa7e61ca69209be4cc8d5fcc0e45c7a8485d4ac88f07f825f3e25f71b648033a8578a1c10f3e1cee8ab33f4a05eac788a84c7d2888 SHA512 90489124bf648c2f59e972c02905a53a8da8482c9fbfaf90288cae53ecf02692ab6ca301e49ba65a83ab9389629fb8410c96e0dc29646b5c12fd2f4074087c87
+EBUILD empy-3.3.3.ebuild 981 BLAKE2B a5f0585629661a2352c9020b3dc3f142e62755d8a4de776ca6db4ce4ee152d9eaf2c89c316b7b81fb01aeaaf23fc32598533567c0b2de5233cebf237b761dd0f SHA512 d216f85e8e48ae2153f86adbd5f7f237a2c37dbfeb0e8c2c2f0878efa4e275f3cb4ae7d6ab042ffcd8d844237dae03550bcfa1ea9c773a0f21029b96e390ddc1
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/empy/empy-3.3-r1.ebuild b/dev-python/empy/empy-3.3-r1.ebuild
index 9cab539714f7..9d3614920a85 100644
--- a/dev-python/empy/empy-3.3-r1.ebuild
+++ b/dev-python/empy/empy-3.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/empy/empy-3.3.2.ebuild b/dev-python/empy/empy-3.3.2.ebuild
index faa2263d6e79..1083d80234c1 100644
--- a/dev-python/empy/empy-3.3.2.ebuild
+++ b/dev-python/empy/empy-3.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/empy/empy-3.3.3.ebuild b/dev-python/empy/empy-3.3.3.ebuild
index 7f30d9125165..1c7dde644f96 100644
--- a/dev-python/empy/empy-3.3.3.ebuild
+++ b/dev-python/empy/empy-3.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index 3525e72fa77e..2724a68c90ed 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -2,7 +2,7 @@ AUX entrypoints-0.2.1-init.py.patch 243 BLAKE2B 79706eacd51f9eb2b9bb319befc01c44
 AUX entrypoints-0.2.3-setup.py.patch 614 BLAKE2B cd5248f366546bbba8c068d8a27f5853ced0757528f95f082473ab086dff5145f7735d48bb29da92237e1d1f31183726a0da4f7a8a405d1635c23ae634414c79 SHA512 eff2b655b0b0efe32fba265ee7816e6618062a665f86371104862cbc2e1ef79bd6ded749084ef18c09c6a5a43f572daff4c3377b6fa39b6b46d926de5bfeb42a
 DIST entrypoints-0.2.3.tar.gz 11219 BLAKE2B ae7745a075d564b3cc25a0580ae9f30f6e1a0b4bca7315c4fc3700408e4ab3762831212a451eb937ab94096d1db5c1478980b216dea7cfb95a8577d6337534a0 SHA512 dbf8085652e50cbdbe137ae655ef765cff58bdaa6beefebf1383dcd96dfcbf9c92580c09e9a58de7893aebdd7b2a701ef8d13a56ef0fa9a3d9ef7a5bd1d9b11b
 DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
-EBUILD entrypoints-0.2.3.ebuild 1362 BLAKE2B dd7880bad5b9aedab071b4fcbbb02b00c7130a555acb1198344aa1c7e76f86574335e74cf334367b99641ed65890015415dd46de705cb8bb4dab585520cf3f20 SHA512 cc57a38b7fdad659bcec27de5f698d16f736b078709e75e4db6f31d6a45c57f4e471fc58812d1b4d6adc81a9a9cb4a496511a723cf7594485aa5e400195ca10c
-EBUILD entrypoints-0.3-r1.ebuild 930 BLAKE2B 4a44cfdf528c662b68908abe73adfa44cb90a58c8ad260559d2076b28de2901085903feac64ba66bbe831023c1c9ba70298299b9432e1a9b98a79cffae06f0f6 SHA512 bfca4b79c7bd4eb4cdcb6aef0b0f6ec92099a369cc75e6a52444f82bcc110b450d4ee49243de2bbfb6393c5f8888bdd587958749cf6abda779ef6bbe78146e59
-EBUILD entrypoints-0.3.ebuild 1229 BLAKE2B dd5281ed4ca9ef09d8163b7a7fa970069dbc276ca8192ba46baeab92cb2c6996775f78efff7d0039c2f5d8d09999aa00c16e515895169f698e9301a377117741 SHA512 16565039604bf202c11e9b795fc883a6feaa54f34326180ee637c03bdfbc96aa713475d65e3bcd3cd76430c4f641c43e75fac0a6b0999b2b8a3814ea7c813797
+EBUILD entrypoints-0.2.3.ebuild 1357 BLAKE2B 11258860058a99be69c2416ab04959b0ea2a8d45427eb2d499bf1f746c0d381ea8426f33e1cd96093d401c9ff2b0a85ec9465c1d6cfbe80666761a3a3664d519 SHA512 bbeeca80307a6e13fccf9310581713bd9cec9e1652ea3056778234663f38d72911b5c54321c52d7ce8855f198c5142b3f1d559bb949c598336463c99aaad7622
+EBUILD entrypoints-0.3-r1.ebuild 955 BLAKE2B 7b6afc9b86f318ac85da19b36730fa989485bd8c4f24e073db7dd7a80036fecd64839aca7895579680b7e6a8caf6817a736e95d622959897e057a959e299d8e9 SHA512 bd439f36cb0c68eae57bf16e2407370bbe53a3f29c3d81022e779b4be73a78754939fcb8d66bd5aaced65ddd284ed9c15abc6cb609c521dc25c99ee50e8d54a2
+EBUILD entrypoints-0.3.ebuild 1224 BLAKE2B 489a8b96463ff0ca2893c7c3b37b98f28f237326107fa20aa27b630fc66776c719c65473160c9b64899af22dc28f794dd474e50cf46b39cdc154c54874688571 SHA512 40dc544c73a96e5ec8499afea3dae5dc0b7dd21c80765189442110e9a50c57bfe24b93b03bf8857f87c5d131b1ec5dc012078a09c0da8e57b5a44009feb7df3e
 MISC metadata.xml 623 BLAKE2B 997ce85b64d32c5c365c929f73349582978e299e71b2e304c54e37b0886b19d468270a63d2d766ed7ee52de4a9fc45eb02d11e3289154b03769dab99306d0940 SHA512 0cba95670dc165b6d6d173947a0a6bd567db198cdc6f10617ed68eeb55f3ee4392e5f95fdd136a6a1886a2f9b1e33b0ba8e098ff8c07f7e11b2374ae544ad506
diff --git a/dev-python/entrypoints/entrypoints-0.2.3.ebuild b/dev-python/entrypoints/entrypoints-0.2.3.ebuild
index e1c09bde6457..61967611023d 100644
--- a/dev-python/entrypoints/entrypoints-0.2.3.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
index da55a0a76990..9c0ac636b370 100644
--- a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
@@ -13,20 +14,21 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/configparser-3.5.0[${PYTHON_USEDEP}]' 'python2*')
+"
+BDEPEND="
 	test? (
+		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		virtual/python-pathlib[${PYTHON_USEDEP}]
 	)
 "
 
-RESTRICT="!test? ( test )"
-
 PATCHES=(
 	"${FILESDIR}/${PN}"-0.2.1-init.py.patch
 )
diff --git a/dev-python/entrypoints/entrypoints-0.3.ebuild b/dev-python/entrypoints/entrypoints-0.3.ebuild
index 50ee9d9a4ca2..7d701043b4eb 100644
--- a/dev-python/entrypoints/entrypoints-0.3.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/enum34/Manifest b/dev-python/enum34/Manifest
index 3596fdf36bb4..5a9bc21dbc21 100644
--- a/dev-python/enum34/Manifest
+++ b/dev-python/enum34/Manifest
@@ -1,3 +1,3 @@
 DIST enum34-1.1.6.tar.gz 40048 BLAKE2B 3960e78f27f3ebf70e9aac5c4ced87d974cc61e5d9afe5d787188e3e877eece18153036035187e4d7ad63bf2a54c1c393f0f46f5ef7bcc9b67658b4ea441bb7b SHA512 51652525adc37bd1af1d81933f965dba9c508838d9f759c80ca1392991515a29c2c0263264a4e175b37a6ba11dca68c354774e448b19ef1bdba96be5474d93ec
-EBUILD enum34-1.1.6-r1.ebuild 796 BLAKE2B 1313bc1ce47ac037dc3e3a735b89bb38308bad79d312607246972d6148024addde644437432f8ad8971d4f42d97e64749c21bc0cbda596e4c2b5751864cdfe8e SHA512 b4d2ebe1c3da9f1ac0a6fff21a557d087efd93fa5d2aca2174d5aa3770d69958b5bb13542855628e87897e25c1b2254b5368f57e634f80e004375ae5f57ebcca
+EBUILD enum34-1.1.6-r1.ebuild 791 BLAKE2B a082364327071fcd1bd841c3d1dfac1a7ee12afe6bb01eb5d6966742171fae1f4197ff6294c7393bd3c2f0b62b39183386537fea4db4623ede4c4258f6e126be SHA512 077605fb328f24393142bd5494ca17c30e585bdd14ce380f09ffa7eadb681a4dd66f647b62106e02c7728d065dc564ac1a20453640b17ec0c11fc09fee0dc61a
 MISC metadata.xml 319 BLAKE2B 37b3564999c86bcff651225939b50aaba7aa54775af2bd02f23296204b49dcf8bc0434e48e05d820cda9c127983606ab1ecbec35a16dd7deebc9e32e3ed18422 SHA512 bca4e776e7253b8b88225336218101fe4ca88d41d0e597af7f0ca1129ee4916ee5a05dddc6ca1649b7cc3f62db654c9281b2616e807d6c178260296eebdc245e
diff --git a/dev-python/enum34/enum34-1.1.6-r1.ebuild b/dev-python/enum34/enum34-1.1.6-r1.ebuild
index 1aa16c0751bd..07f3883988ad 100644
--- a/dev-python/enum34/enum34-1.1.6-r1.ebuild
+++ b/dev-python/enum34/enum34-1.1.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/envoy/Manifest b/dev-python/envoy/Manifest
index b53e39c3df3c..715de490e621 100644
--- a/dev-python/envoy/Manifest
+++ b/dev-python/envoy/Manifest
@@ -1,4 +1,4 @@
 DIST envoy-0.0.3.tar.gz 4190 BLAKE2B 39ff1374c8a3e1bd7fb338b391eb69a1f10556092f463180c6a22f6115ec47f6f62d38fd92fc1a0e4f9789f04159db5668d368ec8fd91bfc4cd5ff2ca6064547 SHA512 3af97b95d61f12ef0d8dc71234023a69123667ef26feec9342bda4c3307629728be589be3ac7d118f6cf17aeb6b5ee91c23f37f84c411f117f5e76a5b024a967
-EBUILD envoy-0.0.3-r1.ebuild 636 BLAKE2B 526d772f740d4c629e47354643659cdd6aadbcf099e2fd3d31bed3aa599122487639639ffe0795003325089adf40024dbba20bd59e3d8f31e0a6da96e6431815 SHA512 6b3c8d658eb879e34f3e0d08c2979668b1cc563a83d7e796ba1b1a7b3ea89ca4aaab58ce24c9861baa60c34eb446c096430a890ff94fcd1994f458cd40ab994b
-EBUILD envoy-0.0.3.ebuild 652 BLAKE2B db317acfffa681422c1e6888256d8a216fdf44758e5a30f732d462fb7fb0f505f960483fd24c1f2ec2600e09d6bf6f7fa0a050e597f390f3ceca564801df07dd SHA512 206ed63973405e7b48e1acc3567ef98ae379fb844a4c5df4df84dfae17102186562e28c615740cf57190536b3821234fde849de6a713f80549d570d2864752bf
+EBUILD envoy-0.0.3-r1.ebuild 621 BLAKE2B ece1e0c892071bf2d4e37a9549a1a2c0992fb5334e21a58a684575dec75eeaab689a6a5b4ae904a387a29f5a0762b928284c45e6c9f572d68c528346a7e3ed37 SHA512 2f213b5b289d4ce68864a6246013a88e98f8859fcf22481c264b503dff14442a3119aa9facbc5b07ad4549e87fa01e89cf7471ceae840b6beab44f154a3ce8d5
+EBUILD envoy-0.0.3.ebuild 637 BLAKE2B c94bfc940e57396292d9479b644650c91c08454a84f6ca11c0cca7e2aabd31644037ec73b782650cd09363b17cb15a5a28bf6519a98d5ff23faa268b9c1380fa SHA512 7676494ab452b6fd45f5e24f647d5b8a007826d472b278b2fcabe42ac5436096a0bb16985fca486952733c9add6cc96319806b079b48037242727905ea82e8ea
 MISC metadata.xml 378 BLAKE2B b5022636ed5120ff6fad3c3438750653e5dd4e0ffabe2485ac71592382b307ca535bdc8e82eef2f3eb2f1d80439993be4e6bbdcc018f4c362e7bcb02f9960560 SHA512 f3c1a3d7c4766c7789e851fa17aa58ca1dcd986a0dcc9cc9f52e3c23e0cbadd2ceb15ea4b6b0adff9b2d71a096e129b4e5441a8171a932e0f10cd3690b8effd5
diff --git a/dev-python/envoy/envoy-0.0.3-r1.ebuild b/dev-python/envoy/envoy-0.0.3-r1.ebuild
index 2df8edb71b9e..7dad5d49de28 100644
--- a/dev-python/envoy/envoy-0.0.3-r1.ebuild
+++ b/dev-python/envoy/envoy-0.0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/envoy/envoy-0.0.3.ebuild b/dev-python/envoy/envoy-0.0.3.ebuild
index d46c2b41ddfe..42876a910426 100644
--- a/dev-python/envoy/envoy-0.0.3.ebuild
+++ b/dev-python/envoy/envoy-0.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/enzyme/Manifest b/dev-python/enzyme/Manifest
index d1db8e6577f7..3b37e38967c0 100644
--- a/dev-python/enzyme/Manifest
+++ b/dev-python/enzyme/Manifest
@@ -1,5 +1,5 @@
 DIST enzyme-0.4.1.tar.gz 47953 BLAKE2B e81faf1c0b3316511706c2a31f56cdc2230fbce468017134692f1892439c4aa043c5537b78fd267b83d84a1811e2c015aa37d724813da5864f14ae04a9fd961a SHA512 62a85c076a7eb320249a507dcc9dd26572e3a9b9643e0a960ed114a80c75213e6e5028a726fbcdd0c2c46c53af980a69828a54a66af9a17af3210273376395b3
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
-EBUILD enzyme-0.4.1-r2.ebuild 1009 BLAKE2B b8dcf37aa784736b1a2fe3afc29687eb057a858ccb121095655cd78bf2c4c00258cc40893db4d6b7e84805b333b416c717f274ff794b815d5c3e4b8a34b94236 SHA512 20f0a3a7a0724c95e6c6d538667bb7b16b28d599d9c7190d265c0e109d051f6cb2cbb16ab1d1b37d20c32710a0cdeef25d81dc7722776fed92e89f2008256e17
-EBUILD enzyme-9999.ebuild 1070 BLAKE2B 04217eb2fa4e476c2946f4f3be4de0e694190049dd2955d18c3b4361824f7a89b47859563e55cdcc90f36cd9c3ee043605f25312ccf3bd9245fba6dd2a842599 SHA512 5aa914d52a327245b6b9905ecfb3d6b442c82e2c2d61fc14fc1d8e677d3a74d010d53d5b4bdfba2c91b4c06245b980c10d7f6644f1ad51d8c64cf0880d7d4d99
+EBUILD enzyme-0.4.1-r2.ebuild 1005 BLAKE2B 24f97a8a6fbb442f518cc589db11a4838084ed26ba058ea3a80eda5902907d32b63c76bd8f04fba7ef88a59d7f3d8b771263c886f1b6e6af718821dc7cb8da3e SHA512 ce06d7cf8d94727d72ec11bc503ed9465526717df0d47b6a78c916992191daf5861a30f95b633106b274732c04c94b86c891903ca0543af64965312c6b2d0510
+EBUILD enzyme-9999.ebuild 1066 BLAKE2B 25095f86f48f8af0b2740a28f45565986521c7bd05e551424a5c77a3c1e5790be367d78abd928a173228ac5b46fb753a924b0392a0aade0d4fa029570554f916 SHA512 4e0b52f04289a7389e8dcbd5cfabfca27c649a87cd6da0a5bd995c8ae1a94cd6a4a537d97631d7c152f6b6171820aff1257f1600c9901b0eecdc152a3e8ad215
 MISC metadata.xml 342 BLAKE2B 1f5c47ca80b45dbb9476f33a22c12596c9b5c319bd278a6ae9e6910105a12aa3d6f15d4336c3fed77bfdb1501338a2514503158d3280e7163fb2b321c0e915c6 SHA512 4ed4ebc1027d54008738661d92361d44e317533fff94a03fc1c5d3e0c33f2cede8715947cf772593df0ab56d642aeb895a772250a31a946b49bad6ff07fa52e1
diff --git a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
index cef237174a6c..566e281ae1f0 100644
--- a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
+++ b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-9999.ebuild
index cafffacf8ab5..64797eab63f6 100644
--- a/dev-python/enzyme/enzyme-9999.ebuild
+++ b/dev-python/enzyme/enzyme-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1 git-r3
diff --git a/dev-python/eradicate/Manifest b/dev-python/eradicate/Manifest
index cfa8eeb8da50..9646a40feb89 100644
--- a/dev-python/eradicate/Manifest
+++ b/dev-python/eradicate/Manifest
@@ -1,3 +1,3 @@
 DIST eradicate-0.2.1.tar.gz 4357 BLAKE2B 8dd1854cd5a93940365048c1adcd8d05ac25cb511a14a278c083be018770088ad5bb888195ad474776026eef6c41405b515d5661244998286e8b9c29c01ea883 SHA512 726db51e1d5ecc89a256e2c28835c20e60f4f42cef55193ec8cd3323c06f00e7c1bc270517baebcd69a145bc189f392c96d60b4582f48aef10ece05582942167
-EBUILD eradicate-0.2.1.ebuild 401 BLAKE2B 4375e78259bd4e49dde1c0262417f64ce0011878d3d7488fce8b2c1cbc0371dbb9e1c2f958949910b7cc730999bcb71c689efe0afe1db39753a3c4c523cee121 SHA512 6ed73b8203e6ce8dd583a602e30fce788aff1528654d128c765bf9cea0a50128b0a9efc21b6889d5daa8b8c533e36afba6b75ff1a3cfba77fcc55fd84801674d
+EBUILD eradicate-0.2.1.ebuild 392 BLAKE2B 78bfe17f8691cf1980273bf3acc7d949664e919044e80d9c08d41d7518dcb42c8ea683e45474a2b0ba5b83f3c6ff5f13fbacfe2f1b1d1ea3fcb92eaef2bc2370 SHA512 c9a0d636f95cb6a8116121fe89ea9ed2bfed0327a40faa5ecd4089cd8edd5e42bb45ed7f6cbe1a91fa1845840cd314c0b6b9be39ce15491024df18641fd8fb0b
 MISC metadata.xml 371 BLAKE2B 924c04cdb095b17bac52491203ea5545d8aa7450aa910e247a6cc48f6180646a7149b161e4dbeb10b2489bdd39ee056383079a7892c12c8a524219d750b0003f SHA512 edb9d679a9edbbde36b66a12764c0e625b33087c7ad5b89c719c364f08f359862eb8f091c69061ab54d38ff2b83d53f660c6a3e0db03bf6408978e145b75eed2
diff --git a/dev-python/eradicate/eradicate-0.2.1.ebuild b/dev-python/eradicate/eradicate-0.2.1.ebuild
index 1dcece305f44..2671a4917c0d 100644
--- a/dev-python/eradicate/eradicate-0.2.1.ebuild
+++ b/dev-python/eradicate/eradicate-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/errorhandler/Manifest b/dev-python/errorhandler/Manifest
index e33668cdca3f..9ccfca7ec5bb 100644
--- a/dev-python/errorhandler/Manifest
+++ b/dev-python/errorhandler/Manifest
@@ -3,6 +3,6 @@ AUX errorhandler-1.1.1-test.patch 386 BLAKE2B 13699a957b74822e9e1cb6ddce1b42fad2
 AUX errorhandler-2.0.1-no-intersphinx.patch 342 BLAKE2B b2165e4dcc5acb49c7f456c9eb2fc918e9c764cc3c83a920cbde99ece65827cb3f44d3943783d484de75bed6214f3878d22848a6ed52b51a4577e2e9352c1ec0 SHA512 dacd25028b2afdafe7507e466914b37cade57f8678849946052b60fda817bd6065232dc83673f9377b0abf0015716547ddc3a03177eba081f1f01a63741559a6
 DIST errorhandler-1.1.1.tar.gz 8321 BLAKE2B f2b0cc9dcf9bf86c1b89356f66fca2d64d49acb919ae6bfc18b1dcb013cb67a358f2f81d47cd1c3bca601c85fc3bb5f870e1cc2452d25b187309a844efed15b3 SHA512 a2f875537103086be956becfdac25a43a646a89b404b6a7a2a243c6d2ddbc29d55948b781529d0a0fa82b163187747f3396b62ed0be98d39834de038cc4a1fd2
 DIST errorhandler-2.0.1.tar.gz 8534 BLAKE2B 2a1db016acef81b5e625800614b2b5084cb6e8175d623e42726a728018871d200709ec66db16847ae0cf604551925a18fd2207c861388844f324a6eaae4bbe90 SHA512 b2fe44f400551e2af8aa589aefce042ee761893678b211a0e3ec7eb4527803001ac930d0941425f6e1487d36493d0c8f439e0bf672536ec27f041309fd69420e
-EBUILD errorhandler-1.1.1-r2.ebuild 1129 BLAKE2B b04eb174321a2f870f1b8e0006f095dae3e6058f25db1c62a0672421437878844a5388640dcdb35e34eefda845b443068cf51e12d76ffeceb22995c38d42d098 SHA512 ed41fdced7f976173391192c0768f6da7e417147a981b6b2ac2ffa9fc2621e6b4ac1c2c563402cb76de9b14d6c7dbba1122e7609dff33dd4beafe599af96ed9d
-EBUILD errorhandler-2.0.1.ebuild 907 BLAKE2B 81a01e7f4fc0f705e5e3489715499835f37f65ad0bdb094f97f63b4addfcfc575f5ed3cbc23484c2376872c32b49cd058b4d9b0197c96e7c08d5cb48087d796a SHA512 cd8e04e49c0485947a0dabac0d2f2dcd1a56f035a72f4762669ff584b32d48feea915b1ad33ba168a9ff21d65bc5ce085bdab7f69837ec71c906618a4eb44540
+EBUILD errorhandler-1.1.1-r2.ebuild 1121 BLAKE2B 7bdecc6f330cd89f73020be9f3262c67b2fe061ddb7a5dee518b68e0f17b6ca652a6e23720a5c88cbe9340601fbcf6f083c91e902bd61fbf54bc553d187850b1 SHA512 5f94e6f7eb420eb950cca75640226849b23abb2ce5189f96cd4f6e7be1aab6a4e1063eae00af15fa26fc0d4bbaf29e6409ed3b6f9b83af1a7813b8098aa207bf
+EBUILD errorhandler-2.0.1.ebuild 900 BLAKE2B b7643f5e0a0571529e0bd60179347e14612a0dfefbdfd294351a7ca54b774524b68b91da6f99ebd50ea6dfa5817bf08a192d880986ebcbf6f9dd47609aa5fe38 SHA512 291783f471361073c80688003733130f0db5c4f3e44a01a9b0b8b8433c6102cb0d7f1b18d8b0947f6f3e31d831052c4437723a3f26b609aaaa0fc093d90bc051
 MISC metadata.xml 325 BLAKE2B b9d3bdc299f206991f900f0fefbf436445eedfd32b0c005919d37417003fb115d435924e424943554333fb65d6811d82e27436f6cd40b0818e204804da74ce6f SHA512 d7a0591bd66d48cab6821c9ac4131839a8b60f026ffbb677263f1af1a0f6f9b9dea2cfe3be003c40e2da7f16914ff2078ed591de0c6833406595010ed88479ff
diff --git a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
index 98478dddd8c5..b418252ed2a9 100644
--- a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
+++ b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/errorhandler/errorhandler-2.0.1.ebuild b/dev-python/errorhandler/errorhandler-2.0.1.ebuild
index 3338349024aa..bcf47ae3febe 100644
--- a/dev-python/errorhandler/errorhandler-2.0.1.ebuild
+++ b/dev-python/errorhandler/errorhandler-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index 98f21bf5faf5..71b234cc4b8e 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,3 +1,3 @@
 DIST et_xmlfile-1.0.1.tar.gz 8427 BLAKE2B 39677f4e8101eee012427bbc2959a187bee96bf052e14c47a2d5fc9000d62243e3842ce20953f7541ca534b151c025ee8cd8da96ec8bd82d926a21c68e8a0a04 SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b
-EBUILD et_xmlfile-1.0.1.ebuild 701 BLAKE2B 4e51a3f9768d512a3cd2d4422837a3ecf57dc22d81dea6c65afdba61848dccba496ff28f86418bef6a9b7ac190a9de9b5ed0d2c8c94207ab171c2189668fe8c1 SHA512 60878eb4303025420440402779f62d1d96869999dbe6ccb284a0cbbcbc6e507bd9ee6e4f2f05008adc069a276726c4c562b73ec58ac5410eed381cd9243148b0
+EBUILD et_xmlfile-1.0.1.ebuild 699 BLAKE2B 6bbe9e3df20eaaf862c2a19d321dfbdde9b2562297e23487ecc773496384e1130bbc0bbb558166c17f5de072aa9bf9d49c85093cdbb27f889216df1771b69056 SHA512 088ccf813f77e4c894a83ea37db5b08d66e87c48c26d57bd2eb948ead2dd44c51c5250bd0a7846fcc0935c12e94ef8141e67494ad94dd9cc77238b0860df2112
 MISC metadata.xml 387 BLAKE2B 3845ddfa1338a00f43db111a459108eeedebd0946dc93ef359f7dc01a005acf19d9985d7fd508853bb2a44de18579018450bd0f56850766bb7afa542ad8adec9 SHA512 777c9ddb70e315fa3d5a943a4037b2876361f9ae53db8d86fd84453d2ad21f10882e79b3f9148263bc2288e77382a04614a006797a35f8da810104063826d244
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
index 0f38d3983a67..d3842a50bb90 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eunuchs/Manifest b/dev-python/eunuchs/Manifest
index 5e97f4bea542..9a789c6ae21d 100644
--- a/dev-python/eunuchs/Manifest
+++ b/dev-python/eunuchs/Manifest
@@ -1,4 +1,4 @@
 AUX eunuchs-20050320.1-python-2.5.patch 262 BLAKE2B 9cbc91b19b83925718e2e1c4416587b601e2e68040bc38974081541654fc3ba14c965f8517047572bc99f8557422c1593ba63f1b95d196f0b2363048fea98bd2 SHA512 43d026c6a00d8ff660b07ee8bd4e7cb635cc5778d6c87054f90ba95e48c61abac874756fba111caa399da9d812ff1784b822a6214b10c94559674c2917df8ff2
 DIST eunuchs_20050320.1.tar.gz 8448 BLAKE2B bd2f28408ba8e709f37840202229641c22c0d5c970b90822f0ec6a4bec992c81c1ed4b756a29a937365eb15cefae26bd33a000a8a269c04e6aa7da8e4aaa44e0 SHA512 b3272de7ac2a41c2c632aa17424dcc74ef3b6d536be5684bd54e4f22ce2d7c6546ac7b1b7cef2611f00b467780b11a30eca9c8804c0f8839a13adff6894ce88d
-EBUILD eunuchs-20050320.1-r1.ebuild 647 BLAKE2B 5223ed52f627cd846a93b3e7b268f1d807b9d24510205467e86007356b97bb19dbfbeba47dbd98f120e8855eb8a2cf709330ef523fb08cf0100aa548196ff9d9 SHA512 58787766a2c500dc600dc6352103c4e95c4d47744ab0ae934d4305af971b8981f1fcf6b968cd8f5a825bdcf5303b0b24be22cd7216814bab217dedf260203f94
+EBUILD eunuchs-20050320.1-r1.ebuild 639 BLAKE2B 954cfbf0cbf909a8777aa93f749a2ed7a4153c79d18899f492b929fcbd4c1656a7a253cb8ee9e16892cb3c1e5ff4541acbe07f7aa2b7d091496b31990c165fc7 SHA512 9a407735df9ab67a45e6166fef844e6ce5400cd74b21ebbf2938d5d20bda88d135f61213b5ac64507a998233520a0e81c983073b0672dd21c7ab2b91a8621ab6
 MISC metadata.xml 658 BLAKE2B 0626c877770029e99b6bbe9c2f40cad0bcaa24dce5a4b2b2c261f4e7f69b5f670e095b3d4be74d24708a89f786a5f57f1a12b28612eec9d7fa8c20ec016e7e6c SHA512 92618daf26770efe92b1809e150401c0e5d8e987bcb1d1b497f7a9e1eddc39ee08ef0c393d17009c76dd4460ec778f50c6f540bbd89ad681c34d59423f8120c4
diff --git a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
index b21e7178c4f4..b58eecd16424 100644
--- a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
+++ b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 9737c3169dfe..c6f4a74d2f86 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -5,12 +5,12 @@ DIST eventlet-0.20.1.tar.gz 469509 BLAKE2B 727844b70c4e1874a58efc95551dd7f12bec1
 DIST eventlet-0.21.0.tar.gz 484191 BLAKE2B 07d3f5d1dca11032d51fef9ceb624e07da9e93bed914233da9abbdff27f21f2482b9e3417b50a63f383cae13615c6a781104a05dfb66f28d6ab4e469bce06ef9 SHA512 4ee682ca8faf870ff6f1d72e93527028f73ae13d7f755eceafb23f3cde48e52b83ff04b645b7e90299997713de93c52f244db8b81d6abc7788a56ea38c7b0f47
 DIST eventlet-0.24.1.tar.gz 391579 BLAKE2B f8abfe6d18ed3b2edf4b2fa3d197abdd1e9029dd10c035427a2ddcb70cdaa76da114083ce7016af7151927fcb2f93ce6ffa0417dbe1a125948318baaed2f6184 SHA512 867f8ead3a6c0dd692c5cc5d9f1181b04456bdb270ea95d84f7f97da4603b333df539721cda002437c035fac51134bee8cc3495e09b6a25ae1c46fdaf015d0c3
 DIST eventlet-0.25.1.tar.gz 392719 BLAKE2B 7dbc23e63e9dc8b8bb0b4a53fc07cb467661bd695b6c778b973bd690bd24f3dd0f867d7ed803e1a89ffd36e5597fd244ef2c616c663d3d9130033f5f5928e816 SHA512 936aac45e24b2797cc8b6cd6238d493ce5eb60a47096e13827b8be145bd8dd14503f5ae624485c87b163718a85733b2317688366ef5fdf347f7d367fbf4d521d
-EBUILD eventlet-0.18.4.ebuild 2059 BLAKE2B 4f95c9fb1106a5f8110be9312a7f8f63e7a02eaff802299be6900bbeb69771d8766ba729f2ce2a8299a1fe46165a74a8c22e5a699e9e2618ba058812923b514e SHA512 031699efa95ddb03343962331aa52521bcdbf1b0554a27aa94930217f2bd67192ec1c2ec2be9517b6b1953886235bf518a6010736d80d18e98fce38912d6096a
-EBUILD eventlet-0.20.0-r1.ebuild 2163 BLAKE2B c3d420f2e22a0c8ccf24a090f445dbb2663f4c95dbe8df23df4e03ed920d82ea62b8da8c70205cbb9d817097d7c37a7ff46b5b9359a720b0e8059d305e9dd285 SHA512 e1cea792d2f7a6f351cf52bf6d65ffe5df5806a64c9a2915a2c898f6c16bf68d75cc6d57a0d10fe5253f8cf93e095fc6cf328dbaed33527f515dda1c74eb28bd
-EBUILD eventlet-0.20.1-r1.ebuild 2179 BLAKE2B 1378aa6cd5647a9e0c519a62535bd0261f009078ff2c12b23197652fb2acedda9e48b15ce7f43c962b46b5574c969d597931e130d0b9ce66bb1418c15fceed3c SHA512 0d3be7f4f9cbdb33585515497be272791c0da44274f02a0ff5914d81ce99af5200c7b02808bd1fe8b4abda7186ee3265b9b2235d640dbbaf29b61e611c4231ca
-EBUILD eventlet-0.21.0-r1.ebuild 2181 BLAKE2B a2b9ec29f750c4a2262863b41cf16e7813c2c66f1013be3be51256ca9cae7d7bd1855de9d08234cb85ef0ba92f06b323a6783bd3461dadfcd55cd434e5f5da0e SHA512 cd4bd05c28d9dd0c5ad244f4264447fd0479daea40243cc758adcd8eca9a6858d4463af8ff0d80d46664f4e0184cbd24f270675f0fa462ca44a208fbfd293c50
-EBUILD eventlet-0.24.1-r1.ebuild 2380 BLAKE2B 4a2a86d6a6fae1ba038ecbaa8eebe39c55a1fb4e814d0fb4c01b097d34f65f06e624508afed6586c7b0b4bbe321899e42bac79040ec9767a1feb75e42ce72bcb SHA512 88eeed398ede737c0af68ff813675ce9d77167f518e8c4004fcd1544a71b28e6c7442f24a787257db10bc1d0ed9077582427919a3baf2fe26f037092673f60d5
-EBUILD eventlet-0.24.1.ebuild 2381 BLAKE2B 4f2980fad722e2f107a8ae505bcf9ff6f47a3ab34edf41720c55a4b8da86ea05827222287b85e620dd138a5a8bec62d8e85d35d469f955673218f86d537d1ff6 SHA512 f611ef460e86a36dca3fe6b3ec624e2dfca8b396974173b68184a0c57a2a91d66fd706c6ed6a804fdabde8d52a8f13dc1887fc4b54d61d46a2941012f8c5bbc2
-EBUILD eventlet-0.25.1-r1.ebuild 2245 BLAKE2B a886f5f602f994a8a138ed93ce9128ed8baae2740c4dbfcb30841ef3506559e0efe547033f76c1623185742df78bd99cf2479c6ae3ce942d5e5bec13c6dc21be SHA512 bb0c051e0c71e00a6a77e9c7d07e3d7990fcb95e4e1ece6523269568297ca379c6559f8ec9d741383f8ad8160fa0e535963c854cf56f9ea32db06d1249e2ba4e
-EBUILD eventlet-0.25.1.ebuild 2381 BLAKE2B 7c4bab5b200fc39f810b5a656677901d248bdebcfefdb416cf7d3a96b3cae6d846eec95a5b392d95e34900bf940a45ab6a6a0f5c3793f8cbce643f9240afed78 SHA512 e41e94211590c35afcd69237eb114ca20df432bd78ed663af961242f705e04f5824ad3da54156471ca8782049824d129cbbd8a6e27c059498cb68a0e887d5904
+EBUILD eventlet-0.18.4.ebuild 2055 BLAKE2B 10dcb528c8989f802855b079ce113d5faf5a4b76a0cc0dd544c6447afcadb88664bd4055842ef9208f3cb1c7fc716b6fd21b91c75f51e2d77b331d47a4bb6492 SHA512 f48f97911c23420c41db6b6c9d832005e00ea8dd77d365507be5c2d74f8d9adc1da31750e5b41be21a813cd9b5cf779273a0b6beb5faddfd89316addd48ca6c3
+EBUILD eventlet-0.20.0-r1.ebuild 2159 BLAKE2B dcf9f114001eebd9662be39d94682d0765a4db45c8a8150ed490721ffc449506d7cd92fe232c42ae3fece39473720b408feb430b1520b23354c18ce8a7e5a417 SHA512 ce0a0613954b1d895596acacb5ad27f9ad6996d2d464001bca32ee572de379f2c4d374de4efa1ff72113ec9f60fd9dac55ee3fb6f323c9b6a31e9fbb71021f97
+EBUILD eventlet-0.20.1-r1.ebuild 2175 BLAKE2B e78edefb4d0d18d74d78476bbcffb6e6e13ca1fc98ff19c65b17757934b49e98b065201238d40f2bad7410fda61e9bac8195f0fb0b8245201ec3e55621281fa4 SHA512 657f8328585ab23c97c8607fc127eead92488c721c058d2a5859dbc1d0f1a4b7a440c865672609c1c61c085d1372278ebf90cb6c454fb8a43305dca0c4729e42
+EBUILD eventlet-0.21.0-r1.ebuild 2177 BLAKE2B 020837ec0c4cd4059d554d31be0823e3b15adc0a908ce1f8ff02935dba8fb7b1c6f293eebed9ce8f3711ec1fcade7a509eb95e9d1d242fef32b7fffed9fbaf8e SHA512 38116452848c16903a88f6e938b4a4362ce0c350e4281fa57cf0e800b9784dd6d50d2318b822f7232e1e88764957ece03a1a72d307aec4c7183197d59f1ec317
+EBUILD eventlet-0.24.1-r1.ebuild 2378 BLAKE2B 457a3de1b8603c4d159f1ba56fd66390b4ee0b41a57245cc7d65b4fdb0fb41cac9037ab97e8af03ce4ce04dd0dfd18bfd9fbf36016274c68bfe32aeb8f47387a SHA512 83e35c3e60e9f6b100e4e9212045fc83ed3c7b7f98416152db069f0d4ff132979af77efae88512b94047f70c2e698766c65866f27e3f922994b3ecd353821f53
+EBUILD eventlet-0.24.1.ebuild 2377 BLAKE2B a1abb7317ceaab754f903d78909ae3843099833a6c41d465e469394cf239c41923eb577823d341dba385a61c16940f7820526f48a86cbaedcc7d6a977ee15ab0 SHA512 88ebef7b4e2d18a5208cd0e68cd4513840f901162e54875382715413baf91b7149a625eccf5c9e7654afeba326ad4528b74ebd09fffac97cc3b452539c89648c
+EBUILD eventlet-0.25.1-r1.ebuild 2243 BLAKE2B 4223c43dacb9e0a9883042b5a67154c11ee45340a34b7a35dcf461563b884da3cea6ce17b4c043a16aecf758766e8435f43e0918624e355d87381e31ba910f75 SHA512 ba6554e4ea4dae3831187dae24a89f0e535701aa022c64a8469ce4f644ed4ddb5b866d99bdc0347921de4b8c4d6eaf613ec6adec2ae22d3143108ebd935fe018
+EBUILD eventlet-0.25.1.ebuild 2379 BLAKE2B 2ec2eaad69705c9e243ce33283d9925a237dfc7815c1835db1a9469070de5155b608e9c15e87ba3ddce6c9773968592efc9b6c7456034fc4bfd092da72838535 SHA512 a5eb188ac203dd8e5b157821c8c6b2fc0ab0ad76355a7c762603f108c59d7ab0a583648ab0f674b2c3d2490d4eaafbaf9bc73ebc5e2ce90786ecb3f030592571
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.18.4.ebuild b/dev-python/eventlet/eventlet-0.18.4.ebuild
index 246d5ee98b16..c1924da953c1 100644
--- a/dev-python/eventlet/eventlet-0.18.4.ebuild
+++ b/dev-python/eventlet/eventlet-0.18.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
index f4b75e1af26f..a9771fd1ff95 100644
--- a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.20.1-r1.ebuild b/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
index 3d35e40da4bd..764fc8788727 100644
--- a/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.21.0-r1.ebuild b/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
index 0cc28ab2f4cf..8d80f39ee7a3 100644
--- a/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.24.1-r1.ebuild b/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
index ccd2dd92db17..b9a0764a8145 100644
--- a/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.24.1.ebuild b/dev-python/eventlet/eventlet-0.24.1.ebuild
index e8ef7a00a766..af59a138b59e 100644
--- a/dev-python/eventlet/eventlet-0.24.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.24.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
index 9d080f657124..2f5d7f5e8abf 100644
--- a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.25.1.ebuild b/dev-python/eventlet/eventlet-0.25.1.ebuild
index 3400a711e972..22de0a1f4b9b 100644
--- a/dev-python/eventlet/eventlet-0.25.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 4dca4f8df753..840551d9b518 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -2,7 +2,7 @@ AUX execnet-1.7.1-tests.patch 7299 BLAKE2B a2bf00a2b283dcebb777ff4743f6dbd522ddb
 DIST execnet-1.4.1.tar.gz 171041 BLAKE2B 7e51320969b0203a8ff55d69364c3fa69d747d67f5dd3a3aaeab7700192d63918bbc11ae29a1e26e466078f1ca87ea00ddcfe0f98132921bacfc95671c3ad7c7 SHA512 e8c0c32e873f8585ff4d4da3b9cbd40046479370f5653f67a98c9029d4535a619731d1b825332fe4af4dc5ebc9ab11ee879ef45df07f08943b1e1685f2255790
 DIST execnet-1.5.0.tar.gz 168497 BLAKE2B 1777f3a72cbf75e5bdef90cdda956a5d8101980f299a1bade6d6faeec52e1026a18a87c8b6b08c8d27073acedacd38473f68c6823908701816b4725edd3d9fb0 SHA512 ca2b571fafdf8f68b3cc7a04ee326e3255828d4cde28ead65d0cef325569c3a6dee09359e525152248038de65326ffc6b75c8362f53aa5c0b3f736eb596cb2d9
 DIST execnet-1.7.1.tar.gz 174157 BLAKE2B 0c2f7b8918bdd5a3cd1fdc49607e571874e20bd26a4806a6ec1a11359b912ed09244afb781670ff24fbee752516d59ab2bba7f662bbcddb802e7e6efd2c544ef SHA512 375748c03f8d955bd8fca90d5c6308073c31a978fd7a604257512e0a710f899dec5db8a91d5bb5f16de9b0656e1742da9ab513827a1a065a5125bafcf1e63a70
-EBUILD execnet-1.4.1.ebuild 1257 BLAKE2B f9fa662316ad31d0614a43c0cfea7c1112953d18d2047fc28093a4caba5248a17bb95ff014aa7303b2809c3a7db661ef499f08bea52e31066a0de48f622af22a SHA512 b517b123696eb9c6342b8b3cd5bf488cdf26eeb33b3d6e7a9e1496736d79a468c779cbce5c0a7fdb1ba12ef55533ac65257143eedad1001eb7332c7e7044aeff
-EBUILD execnet-1.5.0.ebuild 1270 BLAKE2B b4140a099a54a731a5bd207eb3fbf376b837791b53846d5ded8fdf086f21379217e76a35b85c311e6767f3f26b99466733b46ff62a66fd32cae5fec9cca6ae52 SHA512 e74bf61737cea6d78fb64339aec858425f18878f8e4210f7ec6603f0490fa6e36eddcb6f1e49bf999c6e92129d53cc19a84a07258cbf6e45e7a9cb9a01e4ebfa
-EBUILD execnet-1.7.1.ebuild 1181 BLAKE2B 2980e46a6cfecd73056614e462ad38e314653d952e5ba1e622d246a5a3b2da1a495d038ed9c7d6fb73469e6da20b8bf2308883405b6013e600be58c201d52a7e SHA512 59109e7e7829fcda3d0c207353f126f660e47ccd4bf86687e0d875d5b574dd957a281d0721a1b3780e91c9d84ae273fa66d1d270d2634f299a55b500cdb2cc61
+EBUILD execnet-1.4.1.ebuild 1248 BLAKE2B 4dd5394dd4054ceeeaa14250c80fa8e05e6c375856ba33ac3d570d98679c0c3cfd84de12fc3067eb68fbf242c0944cf7b53d2845b599f1bf621663f2b321b37f SHA512 2d0391ecf0cde5171cae8677b299e64f47bc64fb276af03078ed1cea54e134959da8471a1cfea335462c5f8af495279666718b97584c9373757508536b7bec60
+EBUILD execnet-1.5.0.ebuild 1263 BLAKE2B 3c8deaa0777436ffffd7919ff6b5998bf3302129efee4c7d90fa21b1ab95e368e89a45cb502942f0682fe4c236dbdc7add5279cb6079a4f79e0cf0b0125b97ee SHA512 0ba6dd3bbf93c51f47f58e094f4bc1c89f27d9adb3b0ef68c3c6c9f4f55275bbf59923311468756d0341e5f47a09b1778d0534084fdd4590069759e7b829be82
+EBUILD execnet-1.7.1.ebuild 1172 BLAKE2B 6b152da7d22a48b91a0fe25055c3e61da338eedca7d75e424b11b9615f5b16353e955f7281717b48a2ae69c19c1d92f1a4f6ab0b6f4eaa4529eff06ad8bf8db0 SHA512 2efbd402841568a101d021f1ec4d27111723ef3bd01de70ca277a8ece07db006c761cd7a23a792e6d6fa73ac69088539a68070afc933278b11e993c12743416c
 MISC metadata.xml 541 BLAKE2B a1e9f563cf102eef9dcde4800cca44d354e4cb7d77c20422074296c3eb2df1baa46f4cf5a803b07f454e98f902124f185ff24224f499d50577a2c2ed3cdbe21b SHA512 8afb04a008ce5704560a8f984dc5662abb01244b93bbf655bf0c66365a125a07dd1adca26f75df2bc89f923409b3687bc610f0ed739879a6f66167b799963091
diff --git a/dev-python/execnet/execnet-1.4.1.ebuild b/dev-python/execnet/execnet-1.4.1.ebuild
index f4019ccb045e..5291e08ecefe 100644
--- a/dev-python/execnet/execnet-1.4.1.ebuild
+++ b/dev-python/execnet/execnet-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/execnet/execnet-1.5.0.ebuild b/dev-python/execnet/execnet-1.5.0.ebuild
index 4a97605af7e8..10c8e587ffdf 100644
--- a/dev-python/execnet/execnet-1.5.0.ebuild
+++ b/dev-python/execnet/execnet-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/execnet/execnet-1.7.1.ebuild b/dev-python/execnet/execnet-1.7.1.ebuild
index fc19260a71da..e52da1925e8a 100644
--- a/dev-python/execnet/execnet-1.7.1.ebuild
+++ b/dev-python/execnet/execnet-1.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 
 RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest
index ad32a7608c81..4bfb310434b5 100644
--- a/dev-python/expects/Manifest
+++ b/dev-python/expects/Manifest
@@ -1,3 +1,3 @@
 DIST expects-0.8.0.tar.gz 27801 BLAKE2B 3371ad3b494a6cfaf463660d013dbd5c26d88e0cd7816be11a39466a831d2a3c19e9459967947651e004dc1bbc6f6e9a61eb0b9f69685482440056061fb9bd95 SHA512 c2379bb6b3b6181a0365a84b0602f2552de40760b7cbadd775705bacfe113ffbe55bcde818c5766f7079867ae38c8c02e318f3c9ffdccdddb58e6cf0559f1e25
-EBUILD expects-0.8.0.ebuild 838 BLAKE2B 6358be6dbd1a54607caa346b0d8ab44d33d5f589407f6a6237d16efd6ae5dbb80ae2aead77da7f616d00286a9da2620abca4c6d5adce003f2b778238cb2721a8 SHA512 5e8614cd992d832e111658301b6d0d268b255ba59631f79672024cecf369765f582549e9f1f422d7112e06db87c4a526b52b0969ea0adf314883f088ff0586f1
+EBUILD expects-0.8.0.ebuild 834 BLAKE2B d13848253b918ec9ab863d48cad3b7e4802f2479e9426030028f49131d82ef22e9d8597424c9b32a1f04654d043ce54a8d8333b8581b4468db3742103273f039 SHA512 4031cd7dca1a448c6f16e1becb6b2f0c92cfd9abaaf0d67c3b60d5d761e302e01fa472152594145a2eaaad5eb65c4bc936a5cc33df911d3f301d9b0f01fca7f4
 MISC metadata.xml 300 BLAKE2B 31a0397f19e9d532bcf03051b430f97e50cda0ad360e9ae6ffbdcd17ddc5d6067495ed3ddcb73fad288fd7a7c0808e6e08a1a629ae1eb8fdb92749ef423a147c SHA512 8540e7e195b657fce1c062e1a41b3e0bc988a393f4f251069f14379a072708707e4ffbbd5dbb80fa217eccbf887bccc4c6a550dadfcb9aba54a1bdd4db8ecca2
diff --git a/dev-python/expects/expects-0.8.0.ebuild b/dev-python/expects/expects-0.8.0.ebuild
index 8be339ff9348..c333518bd000 100644
--- a/dev-python/expects/expects-0.8.0.ebuild
+++ b/dev-python/expects/expects-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index bfc389876665..a0dd356fabce 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,5 +1,5 @@
 DIST extras-0.0.3.tar.gz 6231 BLAKE2B 28f60a341628f87f2fbd333de8f2d6e37d42890a186e42d262079f26beca5f9452860b9c434c6953fb8395d13903c2fe63969726d1c1cb4bcc0a469efec8fb13 SHA512 7b08d094717a27fbb522d49c0c538e98baccef6540216479d176b55b94f3f0b97c4b70ed48f3802a1bf08a58fe9a319a113d4ca04d9dadcb85e3a99bf7490a3c
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
-EBUILD extras-0.0.3.ebuild 735 BLAKE2B 3658d26c15744174f7c3681e09335f7dee29d413bc584724f25344686ff3879b09430366f4bf1563de03fe57dc1ba6d98bafdaf260803a5c9be3bcd418aace4b SHA512 e8cad940bf7f38774eee74e346ceed960b3d89e54b4594873d59418230a3f83800111ae6c9e0b9864fc2cc9c7905a6b2ba230e1fcc39ccdc671fd336912f63d8
-EBUILD extras-1.0.0.ebuild 750 BLAKE2B 469f4052d85ee837d7c0a12515737a90f47b7c4ba46e8622a1f52ca44021529b22ef01f81c5cdf42754756231e18158b0fc7972d8a3b39faa888db9a37d93956 SHA512 efb2d07ed63503e5308cbc604bae99338a8e9119b0e4873bc3b368d76f7a460120e393583b7d8159a9c31b893ecae6ade1fd856dd3cc543bd3651f39e22ee270
+EBUILD extras-0.0.3.ebuild 726 BLAKE2B d82872c1e7ab4b24a6b467dd4dcb7c0f34cfd4a81d4086a31847b36388a1b14ca006fdcdb0078e8f200dd1fb4f0a540ebb20013d9f2fc397850dd00c48696d51 SHA512 cad7c6a7bf01bab9b827b47661f8d7abc4c6757c2590d3bc17946598f41897c2909cadb1a6b1b109f5716702c5ec1f894c1f5c34c0e646833b91476435c2fc1c
+EBUILD extras-1.0.0.ebuild 745 BLAKE2B cd011ecd8d7c3c3e9840c8bc4a7e41871769d37237ea9314d11e207f26c8429aaa94b59642a1ffe83f006aabf1a4f727f7d9713c3a73448c5f822d5addbd2bd5 SHA512 626660670321def6d2e7a3c27b848145ca5f4be7af9c539bf1f89e6c40f18df0aa8885431d6208e8dc12c9b12264d3f3316d2d1cd4008d3960505747d4d9a2ad
 MISC metadata.xml 381 BLAKE2B c7f141d44f01d1f5163cf4f55c03f5a939f575297bfda8a6b5c59442372314cc637cd83f1f0b2fa4c21f70266bebb5645468afad0d747f8e15df689751b89545 SHA512 bd91400e2886a9f79e973f16fa5a84c6b3d38a3fab45db89bdc5f930e7bd8adff02fddbb9f8fcc72199dad32881a355b046c5cdc2c16e679a46c1bc9e08c3e02
diff --git a/dev-python/extras/extras-0.0.3.ebuild b/dev-python/extras/extras-0.0.3.ebuild
index 52eefd336280..5d1c2543dc38 100644
--- a/dev-python/extras/extras-0.0.3.ebuild
+++ b/dev-python/extras/extras-0.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/extras/extras-1.0.0.ebuild b/dev-python/extras/extras-1.0.0.ebuild
index 0d5c8c3a5217..81ab8c883b4e 100644
--- a/dev-python/extras/extras-1.0.0.ebuild
+++ b/dev-python/extras/extras-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/extremes/Manifest b/dev-python/extremes/Manifest
index 94b28a4490f8..375f067b6385 100644
--- a/dev-python/extremes/Manifest
+++ b/dev-python/extremes/Manifest
@@ -1,3 +1,3 @@
 DIST extremes-1.1.1.zip 10360 BLAKE2B cd7967dd044ceaea4aec009986c226afac964adbcb1ac750730b4554920d081d220bc91b1800661ed3e482d7769f0cab4986d7d59fb94e6e7ac52b20cdc6111b SHA512 a0b951306e9d5ef84c6498268a3476e7ed889f0be950a529774e2d8c4f155d4c10cbacd20864ed37aea5512ba65a267e414eb2b4f7cc6d67b21a020d82da8ec2
-EBUILD extremes-1.1.1.ebuild 667 BLAKE2B ae0a29af06a0224d08bca98f706a2ae3261c043b7e30d131ef265dd4f66a3c613d09848eb5e399b6ba80b44583b45f29fa39acbc1231e529588df59b7e603ec3 SHA512 aecc2b6556b716f80c67584a1e97aa05e5e62ce5575646a6e776adda3f55764897b132fd5dde8e62c77d20f6a44a7e5db4a0e1cc2f8258ad4372a82667cf9177
+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
index 913f2d29e9a7..709f62525b98 100644
--- a/dev-python/extremes/extremes-1.1.1.ebuild
+++ b/dev-python/extremes/extremes-1.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index d826aed7c292..61ec9713a010 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,5 +1,5 @@
 DIST eyeD3-0.7.5.tgz 221685 BLAKE2B c296f61036cd0e43f1820c830e9fa9630d8bb56770c36c922ec0bbbd2ed9566c4a0330677dc1c7fd6cc6fa30f9b415abef2867d93a55ba337b520ed52e330c39 SHA512 9f57e05e4db78618e73ec15ca6ac7b983e13c24ae926bfb9194ee4fc1d735f80308dfc5bdac6016f5491bdb06d46b645d7ac54247d581467a8a22129fae85ba5
 DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
 EBUILD eyeD3-0.7.5.ebuild 989 BLAKE2B c4b04e2dcd8b6f20ab0261a0eac723564c1c69bff7577eb56cd43323abfc0f836b8f5666c906f232e699275911b4e049bc43b2ebea43d2165572fd19bc0602a7 SHA512 4ee3e662e9b48f7e3720e8955bedd48a5c3df1949e13ade12bfe4cf02e354e222a86c8632ed2ff345d95087b1e93128a25b73b1638b7d262b963be9ce79562cd
-EBUILD eyeD3-0.8.11.ebuild 585 BLAKE2B 9aaa1527191d1878128cffa0fca14a987d86e0b5e5312edfc920a0711d4c36f70d9173d10d5517c12e7f96aca210616423eec14c5206b151767b3ca93fbd923c SHA512 bd60050283c8d58373ceacf1998bec3928bbb8e021803cc9fc5e12556c5914b1f5c9a96ca73f742412f5024949b711e49fcfef32a2d58a96e45ec15a42b2a96f
+EBUILD eyeD3-0.8.11.ebuild 590 BLAKE2B 81e5934880f1138e10291d3322a4deacf66cbf3697c7bcf49a35484c172807df7e24c2d6618385f254955fc69f6d8e3d52ad32c98cfef5c0103748d1c403054b SHA512 296e38193e3082cd4cbe2f787bade8a66be8f3b96ebb5ee2cee38c2d0b5d8ec28d15a016ac06683b0b72bdd6a5cc6887c216e8b9072c810e2fc19f6cb5229277
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/eyeD3/eyeD3-0.8.11.ebuild b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
index c25201b060e5..a18581249abb 100644
--- a/dev-python/eyeD3/eyeD3-0.8.11.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/paver[${PYTHON_USEDEP}]
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
index 54195ab453b2..bff05a79d76c 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,11 +1,3 @@
-DIST falcon-0.1.6.tar.gz 186870 BLAKE2B c0c48193cca6ee516f07985810c73520dd2b554725adf16fcfb60d870ca6dd7188026a896127d185d8c2dbf9c4faad13748dd9ab9bd0951f3c2003adbe4e03d3 SHA512 033b06d643dc910d62830d42a559a1fa1933b93c8f93b136c0ba89429cf3eadd912b5512f2add2ae904c3ff192046718a8d40a53d3a05506dfc2722cf5437668
-DIST falcon-0.1.7.tar.gz 193151 BLAKE2B 35d4dc329eda806cd193525c953b011770cbb5ffdd33d52f2aded8e92dd357aa1280cfabb2107aac9e3a1a33ff26ea3d8233798a258e478405c54a9f09b0f103 SHA512 665a0bdd02c8e9a0806c863164fde33a6a10a1ac8c2ec9c3194da0ca41e411c19ec5b2a84cce521abb510588c23b4bb5fab25af58d5c17fbbf8e7c3304839b9a
-DIST falcon-0.1.8.tar.gz 202170 BLAKE2B 3857672d39138b83760bc58a869a384f7305f7938e20f801b35e5777e3028caa8500ac045101a69c32f2925000e175eefaf4a4a5ac5488aa26d41ce2cf9d9701 SHA512 e0ec028c1d1dc3fba722bd91f9bb315523367313bef40238579a96ca49de37f4c63e53746bf6ab40add053320925378860e3571e32401151c00d4afcbad9b7ca
-DIST falcon-0.1.9.tar.gz 202209 BLAKE2B 89c786fb777fda3e4118271bedc979bbb4968defe40e863464d27ca7a65ee5ab1e4c0d694625b7c96bf492fb6b8f9cba15fde686af871ec3629477bf4bfc7655 SHA512 442a04c925f4af69bb0f1906c4123e68ef423e4040fbde82cecc200a44410665c0f97ad28e7f59e4139aae1209ba1df1dd445c5a44e6b975bed9416a97e681e8
 DIST falcon-1.3.0.tar.gz 507250 BLAKE2B 3ba3a989f2e9eb281f519e36a24772fe329fee849097028f3183b0e0c7908b7e06dbf0a70ba28cf7570dccbe88fa87703c47d985ea3cf761ea7d6ec3d41ac04b SHA512 a92d0b641152f653f47c9cb9b2e368d643aae14dcabe7028450d190bd08b883d37116d23d3a1ae4e092207f15926f66b12f57e38dd2edd347f6f8df48baa65ce
-EBUILD falcon-0.1.6.ebuild 1174 BLAKE2B f02a2222e8c0a974255492b8abef3534255907aed3d56f62fed21f2b2be1c359404b9f11e95bdc189986360116e8778748a20ea59780ea4d0ec5bf52dae28d83 SHA512 9ed1fbbcfb6f32900d12a9c36d18c5b13608eaf5947e7674461bb62099dccf7c069c9c4373e3fea5039927b8ca5313d5ea7193da3d95a39b10f4c49b999f710f
-EBUILD falcon-0.1.7.ebuild 1214 BLAKE2B 6495260181814ce0e20bc6e5d149554bb6bf4c0a9d44f2948c6db26b2d9808c267b2de7f2d2e65beb597966ee65d09d2aba078b2eb3590b20cd8a1efe07ae8e6 SHA512 e9eafd6c2e9920e135232333c76984ff6ebcc44d9498d377e6d55cdd3cbf4dea75e048e57b70a9f9c7408d2fd32821fe718b7e3967cec888ebeda74d122f4829
-EBUILD falcon-0.1.8.ebuild 1356 BLAKE2B f6d781b6680d5aa8925c466eda4b60bf1cd51f234dad1eeedaa9c9f7c00916a2c90f08c0d34c0afe19b70e54d5a99b9eb106d729886567ac454a1526518ec7f1 SHA512 63ca223f16ef207897185a9f9f91c38b15069288a0ba79a14eab6f18dc0a06ead5ff2c214332073b99f88cd753e3a55cf13bd1d2d201f3e1e1734facaf901f6b
-EBUILD falcon-0.1.9.ebuild 1362 BLAKE2B 2aa932dad77bd7db698af43f1b68210f9baf927feaa11b6e3b5aa563b70c8816589155664f354e06d38331d689ce2abb80785cb0d600787f6bd371432c204555 SHA512 78abb7ea66b1ffa6d4c90aeb0311b041ddc9adfbc8e01199927b1360a07e64f9febce5cf74b07a65e948290b1c83330a1a28db31fb19a89233f585189da53808
-EBUILD falcon-1.3.0.ebuild 1525 BLAKE2B ae67c68ea03a8ccc4d88fc032d88d9cfc8a963a9d4351ebd014ea2200b9abbee18ea3e342e42b6d88e32860ee4e0170b3240b08bd33058af428427e4d9b96ce5 SHA512 4b3e1b8e56c7ec7b70205be6afff49ba84b2a42f53e2d366f8b244513e6c9f6a6a4a061358affcbe0a87b0b6fcf0d3b92ee52cc1021102a409f97cfb4da56a1b
+EBUILD falcon-1.3.0.ebuild 1516 BLAKE2B aa8cfd4024583864667fa4823b2078cae9c49c0ae72557c9256dc8e37672ca6878c790db8868c4a08edfd64ffe1d328f51e9421345faffc212617772d442f418 SHA512 b4a1c61ef1fd9fdebe2321506b7d4dc4ca5ec0b7064b2fe0359b9b986600b5fc59d175efa0d32e57d2dae86b5c48de822387ab398f9781f14e6ac847b7054afd
 MISC metadata.xml 427 BLAKE2B 419677eaecb3e5eb3fb26781cc3df41cff373a70a4899ce89cef22efbce131c457ce2bdd489b92287ff80f6d12962bd210035a5db77e518e456898498a5eea1d SHA512 7221c24f2bfa8068d4f5516e094af7dfc01786c63ae8d3f040b8d1da0ec4a83a6c507332e524fbd78e0644c978c11c89bec8c9771e0247ef48de1f50c50d8fbe
diff --git a/dev-python/falcon/falcon-0.1.6.ebuild b/dev-python/falcon/falcon-0.1.6.ebuild
deleted file mode 100644
index fe4a67fb7944..000000000000
--- a/dev-python/falcon/falcon-0.1.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# Python 2.6 is supported, but depends on ordereddict, which has been in
-# improvise for months and is a minimal package. If needed
-# please let me know. PyPy also works
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
-SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cython test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	cython? (
-		dev-python/cython[$(python_gen_usedep python{2_7,3_3})] )"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cython[$(python_gen_usedep python{2_7,3_3})]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
-src_prepare() {
-	if ! use cython; then
-		sed -i -e 's/if with_cython:/if False:/' setup.py \
-			|| die 'sed failed.'
-	fi
-}
diff --git a/dev-python/falcon/falcon-0.1.7.ebuild b/dev-python/falcon/falcon-0.1.7.ebuild
deleted file mode 100644
index a1f2614f599d..000000000000
--- a/dev-python/falcon/falcon-0.1.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# Python 2.6 is supported, but depends on ordereddict, which has been in
-# improvise for months and is a minimal package. If needed
-# please let me know. PyPy also works
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
-SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cython test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/mimeparse[${PYTHON_USEDEP}]
-	cython? (
-		dev-python/cython[$(python_gen_usedep python{2_7,3_3})] )"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cython[$(python_gen_usedep python{2_7,3_3})]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
-src_prepare() {
-	if ! use cython; then
-		sed -i -e 's/if with_cython:/if False:/' setup.py \
-			|| die 'sed failed.'
-	fi
-}
diff --git a/dev-python/falcon/falcon-0.1.8.ebuild b/dev-python/falcon/falcon-0.1.8.ebuild
deleted file mode 100644
index 4b28fa1e9913..000000000000
--- a/dev-python/falcon/falcon-0.1.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# Python 2.6 is supported, but depends on ordereddict, which has been in
-# improvise for months and is a minimal package. If needed
-# please let me know. PyPy also works
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
-SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cython test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/mimeparse[${PYTHON_USEDEP}]
-	cython? (
-		dev-python/cython[$(python_gen_usedep python{2_7,3_3})] )"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cython[$(python_gen_usedep python{2_7,3_3})]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
-src_prepare() {
-	if ! use cython; then
-		sed -i -e 's/if with_cython:/if False:/' setup.py \
-			|| die 'sed failed.'
-	fi
-
-	# fix tests installation : potential file collision
-	sed -e 's@^where = tests@where = falcon/tests@g' -i setup.cfg || die
-	mv tests falcon/
-}
diff --git a/dev-python/falcon/falcon-0.1.9.ebuild b/dev-python/falcon/falcon-0.1.9.ebuild
deleted file mode 100644
index 613ba792d84a..000000000000
--- a/dev-python/falcon/falcon-0.1.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# Python 2.6 is supported, but depends on ordereddict, which has been in
-# improvise for months and is a minimal package. If needed
-# please let me know. PyPy also works
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
-SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cython test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/mimeparse[${PYTHON_USEDEP}]
-	cython? (
-		dev-python/cython[$(python_gen_usedep python{2_7,3_3})] )"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cython[$(python_gen_usedep python{2_7,3_3})]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
-src_prepare() {
-	if ! use cython; then
-		sed -i -e 's/if with_cython:/if False:/' setup.py \
-			|| die 'sed failed.'
-	fi
-
-	# fix tests installation : potential file collision
-	sed -e 's@^where = tests@where = falcon/tests@g' -i setup.cfg || die
-	mv tests falcon/
-}
diff --git a/dev-python/falcon/falcon-1.3.0.ebuild b/dev-python/falcon/falcon-1.3.0.ebuild
index f441f1b81505..33bc228d74a2 100644
--- a/dev-python/falcon/falcon-1.3.0.ebuild
+++ b/dev-python/falcon/falcon-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 # Python 2.6 is supported, but depends on ordereddict, which has been in
 # improvise for months and is a minimal package. If needed
 # please let me know. PyPy also works
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 4c10b8090cb9..1fb70351f582 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,6 +1,3 @@
-DIST fasteners-0.13.0.tar.gz 17510 BLAKE2B d964dc1faeaf24159ddacde835a37752c9ac8e5c9e7d1109488571e0624aee8d8fefcf73d5a11b45350ad304c3dfcca3ec4343040444f6f0e7bf6b704af7c6b0 SHA512 921affd29452548e97e0dbb2dc70d7f0df9c181b6f17da734dceef37f42f0873d4316da50905b56d9dae20801001d1fdde94569f6bb41f60fc211ef5bc7f161d
 DIST fasteners-0.14.1.tar.gz 17749 BLAKE2B a1367257b495197f974712a3444d4d7f02bff2e919ecd649aac5d0fd946c128dc7592afaed4ae5044324af5d8c63fcbca6bf56eecf04e2f521dfbaceae8bbe16 SHA512 a58c5f1658b1bc664c825f2237fa91b72b9f31590e7eb79c7ae7a86c507ebe84574ac7d8e837a7bec11ad32f04204ef6f5906219b00a6adb0732daee1eb6faa1
-EBUILD fasteners-0.13.0.ebuild 500 BLAKE2B c448d6c2ccdef06551de39662ae474aa35f1740974b2d2a90ee803222dcdec95a4f899c0eaa7a065626a95be2f4406be8de3b549a777fc8068bc6457418d7c9d SHA512 7962a4d60d58c3bcca0a7da353267eab5b7b9864201506fdd5313e82da7800f4afb661f316a2a9be16817e4028eb3abc163f48e9c70154f79bc838c34c79be18
-EBUILD fasteners-0.14.1-r1.ebuild 794 BLAKE2B 9372b241cc4f39b4bc3df38be4a1ee240768e1701a0053851cfe8aae882649ad98af80cbe611b43b55b3854759bd4bf9c353eb389d5fb30762a13c9e27532dea SHA512 54eacd49bd59bc67aa9ca4d0a0a3bd6b30a4a443a62cc0fe23e47d9f8d73686843512f0a0112c7b4f6c2bd1684e89f20a1c9cf31f66e7adf431400e75d6d39da
-EBUILD fasteners-0.14.1.ebuild 793 BLAKE2B c6977ebf3e5de8a7b01ebc17961fc130453e2a2dbf865043140bae9f3616aa4df55ff4032385268e064ad67e8f6be40f39070f1b74ac398bc95613338f3fb122 SHA512 39522549e81555559609ae20b4335f18b85674bcdbef27192ac64beef6d1790851d09b267b5c1007333a53dcf4e933b5fbc9eeb510040ecfdb49f78620596afd
+EBUILD fasteners-0.14.1-r1.ebuild 786 BLAKE2B 97d67407b983d09e8e92c7259785446cda61e56cd50d5736f736396952d50c9505c4edbf518161363e2923fc3989f2c87030de7a2e4f3770b20dd70db426fb21 SHA512 346b2d5d01a2f36fa07b36ccf7d20145ba58697a0564b8d206a1860f2fec754090b53ea095447ae293abb9ebc93c2043151f7d90a8d51d8c2fcff714af908f1c
 MISC metadata.xml 384 BLAKE2B 4f899480dbec1add7bb7cf4c55c303c56dc17b591e23f4f024a594a943654d8b4b35283454bba7260ce62645235c07c03f40be7a01c997c8ee523db942ab770f SHA512 ee6f6af5c106f8afb401defc7f8ad7f8801b8a84dcb3f3ce76520b46774ce363277f0383523f71ccb4b0d00ea4f358deb42fba64853498037375ce15b137a491
diff --git a/dev-python/fasteners/fasteners-0.13.0.ebuild b/dev-python/fasteners/fasteners-0.13.0.ebuild
deleted file mode 100644
index edcb8ef55f0b..000000000000
--- a/dev-python/fasteners/fasteners-0.13.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python package that provides useful locks"
-HOMEPAGE="https://github.com/harlowja/fasteners"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/fasteners/fasteners-0.14.1-r1.ebuild b/dev-python/fasteners/fasteners-0.14.1-r1.ebuild
index 156cb0c19361..cf34846d9a38 100644
--- a/dev-python/fasteners/fasteners-0.14.1-r1.ebuild
+++ b/dev-python/fasteners/fasteners-0.14.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fasteners/fasteners-0.14.1.ebuild b/dev-python/fasteners/fasteners-0.14.1.ebuild
deleted file mode 100644
index ef49731e5f0b..000000000000
--- a/dev-python/fasteners/fasteners-0.14.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package that provides useful locks"
-HOMEPAGE="https://github.com/harlowja/fasteners"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/fastparquet/Manifest b/dev-python/fastparquet/Manifest
index 164a42ca3e06..6f68275a1b2a 100644
--- a/dev-python/fastparquet/Manifest
+++ b/dev-python/fastparquet/Manifest
@@ -1,5 +1,5 @@
 DIST fastparquet-0.1.1.tar.gz 119573 BLAKE2B 16bd05061b64768278201acbf08fe13228d058b223d2050208b73e6af6ad3bb800a6d7edc1a15abdf02d8b508a75ed52962fb4b0c44a073b80451cfbf30915b5 SHA512 f8f052202ca095596870e6a10e2ab05e3c55289cd0ef3dab0502dff26052c9970f65f6b826d4d073c6c221827f6b18ddc83c47c04e84e08491f5237358f5860a
 DIST fastparquet-0.1.5.tar.gz 136350 BLAKE2B 2719a5da55c99ff6aa71792045f6622b7a1de81b6ec33804cfd36b0907cb44e68a7a5dcdec467c2e8c45790c062ca1d130fe3dc5c95e286bc437d449fa5211b0 SHA512 2d8f5375072125f68f086f316af87acf41e65479324828f7eeea244796311604425bbe53b9e2e67cc68b1eb89e390d9fbd5e201e5165aa22dd43604ac5441f27
-EBUILD fastparquet-0.1.1.ebuild 899 BLAKE2B 86b44c2edbad6e8de874410575aafc8dc108a67a30473d579c185c7811de7751d1132afc409fe6d9df3cfd2166e9caff36a5d137a8168217f75a4cd692e494e0 SHA512 dc977589378234cf19897bb18483eb4676df014e9dc3c4dda1bf70d7998771f3b5da33c25559cec6eb14f1e3f9b587bf9a0c8fee5ab1509cbfbf5c0265c19b6b
-EBUILD fastparquet-0.1.5.ebuild 1252 BLAKE2B d8d2edb656a953d8549238580dc5532344b67138475ebc689a1dacce968d72b6df93f9b713577f4d4e23951ea307c1967c004a4b276f10d7afba84da43cc2b36 SHA512 3b896112bf283588e9099c83ff48d39aff4286cb6a3f37f88e2e0c97a3737eb42010467a4a8bf944cf6e83626ad6197715429309e518b66d8106e3452c0ed412
+EBUILD fastparquet-0.1.1.ebuild 886 BLAKE2B 8fe71d69de1b4598711596978b405a292db0b453701b7664ff27d8755dcc8364dc89decf49a35743399fe1614297e3239a9bec064edd546deb2278b3f725b466 SHA512 d48572ed6c2a2bbb9ba803e20b26f8ecc8a436a77a3b823018d6a28ddd7caa0c5089d3e5f2259943c76de316a6a8c61f09bddc1cc5aafb10e08d8596e53020c7
+EBUILD fastparquet-0.1.5.ebuild 1239 BLAKE2B c31fa3125efac8cf9317cb0d1f860f9365e0e5b54c36d2b8efc61378c8b3ee386b83ab80d767c6d42b7852bbb589b75bf28448c2543c37f3e364fc89d2379902 SHA512 a6f2e0079d73c575b494b788b135088677099536f641b8c25e9e40edd48c9633a5553431ac9f1a71d723651998a055820746fb84f14fa81a0f8475ead83ed4e2
 MISC metadata.xml 892 BLAKE2B 959a41c003cc11f7309b421a3e86dffd5d64a88d220256f316712fd0d938befcc12904e0dae632f16cb4cc267894d0848a56d2b879cc4ce6f5c3cfe7b045b719 SHA512 30d0424dcd09b89804496aeed151d37d3791b42c83b1f66798051ede9c6b3c4963018f2a3cc621af817bf3b653fb53f1dce8f88dc7f7d23db5f8db586215b3dd
diff --git a/dev-python/fastparquet/fastparquet-0.1.1.ebuild b/dev-python/fastparquet/fastparquet-0.1.1.ebuild
index 01c8d3c54fbb..f5fed712ef60 100644
--- a/dev-python/fastparquet/fastparquet-0.1.1.ebuild
+++ b/dev-python/fastparquet/fastparquet-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fastparquet/fastparquet-0.1.5.ebuild b/dev-python/fastparquet/fastparquet-0.1.5.ebuild
index dbd31aefa218..460571dba349 100644
--- a/dev-python/fastparquet/fastparquet-0.1.5.ebuild
+++ b/dev-python/fastparquet/fastparquet-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fdsend/Manifest b/dev-python/fdsend/Manifest
index 5ef27bd24834..b2cb0706fcbc 100644
--- a/dev-python/fdsend/Manifest
+++ b/dev-python/fdsend/Manifest
@@ -1,3 +1,3 @@
 DIST fdsend-0.1.tar.gz 11394 BLAKE2B 32b6c763730a8269a23e9d245a1479700d45b294c1ffdf60cc642b88405a0e19eede519d3202cfac44915941d8fcd94cf39834aa2efbc4157acc9af98f95a660 SHA512 29193dabd2084d4c4f2468c27e0501bce69c340d0a5a30bbaf377120f36092c08190c53d0f85321a8615c9cae9aa5c91a1a261b438a83df93145883ece29bf4e
-EBUILD fdsend-0.1.ebuild 371 BLAKE2B 98a17885452fc6a66535ce01e499dd4337bc6f6e8338b5f0d3fc88a98b629719a155fd830a3460f71ac51721798b1eecb48d43801fb61c1ea3908ca492727b5d SHA512 9b8f96ef33ea172092d9977eb493ffaec6ba11f944a6d008837055e5b52ca629861eab3f224da69afa05591d58ff1fbde22c14ccc99a123c2dacd234c5d18521
+EBUILD fdsend-0.1.ebuild 363 BLAKE2B 16940cbc7264393c4add37e183841cf74efb6539758763b6768803662157c334e287a679ae9c2d2d326893d7114f82e5d3582fb25d1ea5de0765b80ba54bb368 SHA512 f94830c069b3a6a58c23f5bf4aef505d6f5b464098ba9e5f60028b8b606480d71d61a7436b20c4073fc99f4c92c51c917a27ef1c3dcec25c0a99b19452886f84
 MISC metadata.xml 250 BLAKE2B fe89695d5dcb55e3a59fe901cba061e1b73e5d09cc72d362bb3ec127aecdba741ba23920096bfad7a39c43e35ffbc006fe84f3e50a34c91097a32deceeb91e84 SHA512 c599b09b9aaf744dfe13d0707adde7d3dfd1a8a411e937fcba25e65c6045792cdcf6ceb9004e3dd38b014c486c9f1334bfc898419f59806ec6abebfc71bca382
diff --git a/dev-python/fdsend/fdsend-0.1.ebuild b/dev-python/fdsend/fdsend-0.1.ebuild
index 628d469d33d9..b5986963e708 100644
--- a/dev-python/fdsend/fdsend-0.1.ebuild
+++ b/dev-python/fdsend/fdsend-0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fedmsg/Manifest b/dev-python/fedmsg/Manifest
index e76f5b5cebda..e0ab94e06f24 100644
--- a/dev-python/fedmsg/Manifest
+++ b/dev-python/fedmsg/Manifest
@@ -1,5 +1,5 @@
 AUX 0.18.0-endpoints.patch 1251 BLAKE2B 80b31a396cdc1731c1f27c7cb8999506fa14fb3c5fe1625dc9c6152d0b5f20e25f085c41f9affe3a1c0038e3f14f741f2b01df495d6f4e60955f95e738969c1d SHA512 43a3850690980556e7a5ca8ae83359c7f9ef40d6556b590715ae40b5f1dd64c57ae4eef4898c935a556dd4230c53c75c246294ad30daa5a9c505c7ed3b1e39b6
 AUX 0.18.0-no_signatures.patch 820 BLAKE2B 334bb323cef140b011abf9c082738e66cbc254f7cd263667a601d2ea2c4de5adbe7b6c905dcf4e28b286d8003a968f7de08020413190c12a9c01dd403952de92 SHA512 d4869a6140b9594a6079257c55c86934f67c3eb69230881014501aac4c500efca2d20f1a2d3a69dc122444f63d14a42c87ba7eb3fd9468c8568d592378c6791b
 DIST fedmsg-0.18.3.tar.gz 540686 BLAKE2B 5d6cef00a4c87c48e38e6b8fdc880dc8b7f1f3fb7b9829979a7d2dda368cdb990559a13a5e7c95c6fe46dbd34d68adb59d9b987f7a9ed71e0c046f487c082a85 SHA512 59418b4da151c71962bf7d4d5c5005716c41578673b4786b0a6de3928b24e3de2976878fd66580f02848d453df4588d26d484d5eaf594ba7f49b1ba3a1cb2b00
-EBUILD fedmsg-0.18.3.ebuild 1036 BLAKE2B b2840fb0e6a8858474b0ecd46a08628e282b5e396804e46f5a82d05517a979e75bd941bd6b24b33232d573c4d605fc07d48bdc1f57d9c88f47c3b2dd794600cd SHA512 8e52c3b37062b44258f3cf434a391c87fb03454a06772b040505ce793b44ae0a9427b21cd0247cc461aba12e3222af72c71b21952f99fc930e7743d46aeff26f
+EBUILD fedmsg-0.18.3.ebuild 1022 BLAKE2B fc765052dfb1bed75aafb680e81d2293e271d59d04ef2a201747f04efc19af8d7f8d22564fe26f3a612a484b04283c04572b38b35545144138571a11d837cd9d SHA512 600dc165b259fe1ea08c4534dbc8ecde707ff6cd28eb0ed75a2f032ad5662d33902d360d7c2d585f3d2bce023156e49a0828421db7949a764b8d5ba9556d3144
 MISC metadata.xml 393 BLAKE2B d39ebbe4319ef5d0a883af556bf6d90c921dffea58f3e11ae07ac5602fa0af2255ed8c67d888c783c476b41f8ad997f3735397e23c6d8ee51a6161b34549191b SHA512 a26cb34971bbe8e273f3214ba98dee260a6175943d1c1cd2715b0ea7dfc9db1b18a615fa62617532ca0f6b2722992b6cb320b97339941a027bb58e2b6a458233
diff --git a/dev-python/fedmsg/fedmsg-0.18.3.ebuild b/dev-python/fedmsg/fedmsg-0.18.3.ebuild
index e3e681bf82b2..5155681fa0df 100644
--- a/dev-python/fedmsg/fedmsg-0.18.3.ebuild
+++ b/dev-python/fedmsg/fedmsg-0.18.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Fedora Messaging Client API"
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index 041d74218f05..5c921ab615a4 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,3 +1,3 @@
 DIST feedgenerator-1.9.tar.gz 4136224 BLAKE2B efb70a48a290fcbd959e4213ef2bb95138433a0b86ca000d7a498fed3705ef237690e81a6e2bfae0d050b2be89486f1c2d7d0038c1626dfbfa38842ddf5fc11d SHA512 77f4df51c6bdf261f0d1665206ab048a21f8660cf8f2c7abf3d71e17c63284240d0eaa690dd6d53b0b7d8ce9c9e0349094d5270c75c2a069608b7717538d7fa1
-EBUILD feedgenerator-1.9.ebuild 733 BLAKE2B 412c1c3fe9dcd72f94958a5e70d2b6040b9559e2540e6838bbdeb2cdb66cfa40ed1746688a845fe5daa9f1d7557540824e23fb8815b137dbfdf6fed86f2f3e55 SHA512 3d09a2ac04571035a985cfe987f001fc76bf93423dbc55681907091da6fd9d5052dabf1a67c3383efba638ed43d2bcb6e9d666954fdbe75e31ca2e6e4cf12463
+EBUILD feedgenerator-1.9.ebuild 724 BLAKE2B 1698a988d1e166a0316540d54d090f2f461aa7c1d92e89a073d828661e065c85146f6fdd277b7db0f7cb9c1ae74c8a0e4a1299687bd91b6c9859a7b026cb7b81 SHA512 2fc3b752487cc590b3ffa6d3b57909878d2b7b0c205f8330cbc9af83033cd2b201bf1b830d8dead102ac26a848fb61b007b072c9bf42d491bf306c015577fac1
 MISC metadata.xml 452 BLAKE2B 418a1e8ead7966378946aa28e1978cd64b2a85890e3b380b808d064d37597d60205a6457d626968e1831256ef48a82325fec6b38ee5710a2e3841cf6b5f49437 SHA512 d37223c168450987a8f3d09a34636cbf08b6e95622ba23aad3a0d240ce179fde3f20d0645631cea16b147215b91c8132940d6376cbd3e6a435dd4ee00524b585
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.ebuild
index 11099cef1764..028c1f7c9948 100644
--- a/dev-python/feedgenerator/feedgenerator-1.9.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Standalone version of django.utils.feedgenerator"
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 5b011223613a..52783c0e536c 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,4 +1,4 @@
 AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
-EBUILD feedparser-5.2.1.ebuild 1205 BLAKE2B aa6f6a43c6cdde9626cfedb9542178045a8dab020712d4b147f8ea6dd5bf05c4350b908562d5bc6ce7a7715f7f0001f5507a52ab3993a758fe682454207e2734 SHA512 665ae2ff87eefe0b8f05280a53fb0a990d3611938a5bca19beab9b4e54480149d60782a79a6f99abbddcec3726157892f51e56b672aac980f18ca53ea2dfd043
+EBUILD feedparser-5.2.1.ebuild 1200 BLAKE2B 4d36f9c7ebe68bb59c14b5787b007162ff466f12f9227c856e16ee6bb948fc44313630d8d9607d349246162ff7ee2ad9742aa9c4eb0b5ccb48e96433e11b32db SHA512 f20514a3143000ecf088a6a5fe6027303177950d062a5b99603155b54b4f73f0a25e656005e71109a3ef6947418d6b76b47ac0c4152ec5d1951ab4d49589e25d
 MISC metadata.xml 545 BLAKE2B 259d08b124b1ae245af79e6c014da99bcca0474a63cf681343152b225cf914001bc10bc59af5ddabaf7144979614507cadbf4506ffe0ec69d69d6bb28c090767 SHA512 529faf4a7612e461dbae6746acf9e886a0ea497b11996e0c5f89de5fece30b544226fdf02a4e19915d132e40b0abcc5b180cce36b5a9f172cd6364ebe3d3f46d
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
index 6153a6a15013..272de270aa06 100644
--- a/dev-python/feedparser/feedparser-5.2.1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index a9caae739f5d..51692b32fd92 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,5 +1,5 @@
 DIST fido2-0.7.3.tar.gz 188262 BLAKE2B c1d832229ce741be3b81e4cded65b77e57c008aaba8ccbdf640bae1c27f4d86f2c0ce7ffc83405e3693646a8f2868030619c958ecbaa58a6a6328ece2cf6d3de SHA512 715779ecc9dba19de0e45df13d018e7dd223f20f5662860874aa8aa6f811c1df71c07656d21b49a4b6f14a149134d8af6bac076a7f71cb7392ca2fef70b173e1
 DIST fido2-0.8.1.tar.gz 201198 BLAKE2B 33411dd05d7f513445afa8a6fc4bb90f3989a655fa05d2ba9da411aa7eea3b30ffa253fae6586f76c416115e5bec90f6f120472a49a0acfbd91020d2cba8f74d SHA512 fc0753ea694f2170d529129764cd9f9c5439cd2f467e4f384d7a698266ee8391a5c9c7c6e51d2dc2a99b93fca1c7d5288d5236e302672a87b8ca7704f328c0b5
-EBUILD fido2-0.7.3.ebuild 1141 BLAKE2B d42f14cfd22a914b2e2381023773f8caa664bca576510c3d9643c43eb0122c230330b57bf42d91ce9d1210da3afccadbfa8beca9a447f05991107a19df10e273 SHA512 6b312fc18dd0bd15dfd065a1ee1e85345ebb27a4edbe253d6793fc92b256b758fb2d0d0c6a091eb8f25ef9e35ae6021dd86ee91f91c558d6f57c6e98f76becfa
-EBUILD fido2-0.8.1.ebuild 1143 BLAKE2B 1d2d5d879dc1e27e620d4bd0bb8c4ccb7ad7b564ba612640507638e03f236f2a782faeead8962d752bfb284513d6510ea74ff20704d7ccb6c7a93254d484a539 SHA512 6ff8bc788691a42688ef4689aedd53f3b34bc227955ba8c0e8951bbeb78eee7405dd1b1f872ee9de01c51e855ddc51840de22e633275624178705b72c646459e
+EBUILD fido2-0.7.3.ebuild 1137 BLAKE2B 064eb31858b0157d404503148bd4be0701151dd969857c419d15540cc49ecfa1089fd33bfaabe3ad33bf245e9b73b4cc90a39af68e96ef31921ec6a31c10cc45 SHA512 eae83bab4fc89934285554b0f662450b5feac0b442be7721a8113c53a723ae25255e290847e698403e9e4a25123c5c12af2ccc5bec9481ef7d10e30b897d3852
+EBUILD fido2-0.8.1.ebuild 1139 BLAKE2B 1b7764ce28440814d6a1103468fc91df1ddc8c4e9b642e6b79d3deb55aea6b05ee1834b5e33980d0d63ef34430a36b9e5cf0f3b18b7a91a47eb1d29912e0fb72 SHA512 3da0403889563232c705d8bfdb7cdb8aeac895d93862e9400e74207ea654c5c50b74a182a73ce63c7a1555da0aee03191aefc3310a477430b5bcf1b617542d18
 MISC metadata.xml 516 BLAKE2B c8d1710daa727f863e8936fcd4d2374c174ba6f1224d7c66d498bd9353e165b5659d3239d730bf406cd18adaf0acbe1446ebd3d2e3d0baf4fe28e512ac70fea6 SHA512 18f926acaf096999fb70f2942e81ff76effd0f769defbc975653992282ede547c2403df64937edb4d183dc3e218c0183ceb39f343349502f6ff9052db1446090
diff --git a/dev-python/fido2/fido2-0.7.3.ebuild b/dev-python/fido2/fido2-0.7.3.ebuild
index 1e2a3a91e169..172b58fd1d47 100644
--- a/dev-python/fido2/fido2-0.7.3.ebuild
+++ b/dev-python/fido2/fido2-0.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python based FIDO 2.0 library"
diff --git a/dev-python/fido2/fido2-0.8.1.ebuild b/dev-python/fido2/fido2-0.8.1.ebuild
index cf5e5a8076d8..78b4fea9fc98 100644
--- a/dev-python/fido2/fido2-0.8.1.ebuild
+++ b/dev-python/fido2/fido2-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python based FIDO 2.0 library"
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 9efddc497a31..93e18b633bf2 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,5 +1,5 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r1.ebuild 809 BLAKE2B c8e10cae833624cf09ba3adcc3e64700bba3472ecedd5b7e180de23b618dbb3bf741cd0cfa3acebfcea75f72ccf59d80ef56a7ebe27a40722f3177ccf07039aa SHA512 b0fc0b5873641661f2fc3e910f5137ac04932169f2a57f56ea6d1dc546dcfa86880db806963c978fe2fc7eacd1be2fb109c01a1ea3d09d1befc601a69028592c
-EBUILD fields-5.0.0-r2.ebuild 848 BLAKE2B d4fbf39defc3e23ce19a76d4abe509b22c6bffe8545df08fbd8b49dea9b5ad8856bd04362ae9d0b0b3dd812f02b5eba4562353aa32f276de0e65bea2ea263f99 SHA512 920d97525398acc40564f677860c90fa79b66147dc0bbe30dff7d3ba2f2b8dc529ef570d69b8d1c0d5e58cb23b941b100bd3044ccbc0f061b1bf59522023da99
-EBUILD fields-5.0.0.ebuild 801 BLAKE2B 4616ff6c3d331046a611108daa12b0622cbf5e28317c9e44db92e4659f1fbc9a4ded6eb80f4d023357d6a27e79e75927a8103287209610a9f7e8db8e926967a2 SHA512 a9dce28b6ae76b6fef7e4f285cdb1da15d0dc192213c4d70ec5cdea0e276b4d201c6215b62a5afc87f39e840f095eae77f3ebb344281c39d6fe32f60a73b1665
+EBUILD fields-5.0.0-r1.ebuild 802 BLAKE2B b992466a383f15b0aef665ada74a6e087c32f5b9ee15979589375a89883c31f435e4009ed917142550f08c7ae3af95b50fa5d8b8b4bb2a0907ffc8662759d1d2 SHA512 4f2247775882cf51ee6a4f24f4d1b438ee6fb78135cee368e6774cdb939cc3ccf7f725e907766919cf95317b56b71e2c9c92d00fac9c4ec49cf5f08b9f8ce08b
+EBUILD fields-5.0.0-r2.ebuild 843 BLAKE2B f31530ac87519271121e17e49c267e65cf385c75281d2392f1b27f95ddc3e84e4bb212c32088e1f7b72fed1633ada7573b223879655004e4d482ffb7f20624f2 SHA512 a8b8d2177adb77cab3c706a7495f1fbc9eaaec0e4175c442febc81dd469407c25d56a5d77b795451640d8388271ead04db667ace35b6a9ce36dd8ceef996bc7b
+EBUILD fields-5.0.0.ebuild 792 BLAKE2B 0bbba3885637453972dd8df7b9b36e1c78d29997b89cdfae2b614b375cc42b6e662fa613d732a2623fe3aa4d7e32e3eafe98b33d9ee382c7c41932b992b855bc SHA512 8cce280c0788f3a9ba5cba48a057eb1462eadd11139b63641a21370a21bc1021353133cc491f5abfc0b88b2e2fda3ef32db2a7e8a33c47d0ae56c6635696b04f
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0-r1.ebuild b/dev-python/fields/fields-5.0.0-r1.ebuild
index 923609a8116c..32f5b7301e34 100644
--- a/dev-python/fields/fields-5.0.0-r1.ebuild
+++ b/dev-python/fields/fields-5.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Container class boilerplate killer"
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
index 80962dea5553..d57172d0fe26 100644
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fields/fields-5.0.0.ebuild b/dev-python/fields/fields-5.0.0.ebuild
index d38f9e90618e..2ed737143b1f 100644
--- a/dev-python/fields/fields-5.0.0.ebuild
+++ b/dev-python/fields/fields-5.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Container class boilerplate killer"
diff --git a/dev-python/figleaf/Manifest b/dev-python/figleaf/Manifest
deleted file mode 100644
index 29e798a5312a..000000000000
--- a/dev-python/figleaf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST figleaf-0.6.1.tar.gz 59051 BLAKE2B 2aaf02681ef720084189d980b9350a26a194d61600fc7e70ae44d76d945d4f2436f11c09a090dcc1920f1af79e4cddba346103444957f3340e20ec861462da18 SHA512 c759ff9c0946e05a913f85c628acfa1a5636fa422ca93aa10ed8999baafebef395dabf69cc0b6d740bfa11608dc6f2ad6e8001ca314f476d2f582f5d217b8937
-EBUILD figleaf-0.6.1-r1.ebuild 565 BLAKE2B 06a42b8a4719daecc7a6dcb7957419d6218b1ce85547a0629cf704aba7343644b3e8e93765c75992ef3b840fa41c3357b8ced146b69c3a40492148dde3344208 SHA512 2d5d7cdd05e212c4444c4a55f63ac145859ea5e8a027b5e437a95a013a55ae5a9801ac8434f870fd423b29eb0b231c17a7191a8d871e72b3152aa40cc94d9c35
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/figleaf/figleaf-0.6.1-r1.ebuild b/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
deleted file mode 100644
index 40d7a6fc9148..000000000000
--- a/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,26 +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="Code coverage tool"
-HOMEPAGE="http://darcs.idyll.org/~t/projects/figleaf/doc/ https://pypi.org/project/figleaf/"
-SRC_URI="http://darcs.idyll.org/~t/projects/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-DOCS="doc/*.txt doc/ChangeLog"
-
-python_test() {
-	nosetests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/figleaf/metadata.xml b/dev-python/figleaf/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/figleaf/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/filelock/Manifest b/dev-python/filelock/Manifest
index d600c22276b1..c2f93bf30f25 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,5 +1,5 @@
 DIST py-filelock-3.0.10.tar.gz 587469 BLAKE2B 8a116f038f344f282540243a757524bd2e72ab8419a0cbdc35910245b8794cab0f96f93d7d8e3b267018054aa1459892506edc9cbfe1099d141a44be9eaa937a SHA512 1fa4594eaba6689ea61149a60a71e86007297614a1c22dc6c94b4774520d396ff8ad03076dfdbb2ce49d2b6e42c374af065a115c167d81cf6107918abfbe52ef
 DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e697d5a710b87eb2f0ea0cf66f554b90bda2e95754b82e1544e45d0abd8dea861f52cdf9c7de0f1e91a8f5c8e0f9759c SHA512 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683
-EBUILD filelock-3.0.10.ebuild 1012 BLAKE2B 907739d2872ff857b1f65d4aa4e8a2aeed462526eae8bfa16b82aa0ab3fd9e0bde7b705a7ff68cdf8e8240b469350d0eb11df3d7cde610a33c37fa87303622ca SHA512 2a0e2a1a2bd40893570849239c8838ba01c17d0e47d58768fa134926789f1dd30b65f02a8fa2ac886c3445d4e1feb3ac5f375fbfe43a5aedf75445698877e84a
-EBUILD filelock-3.0.12.ebuild 678 BLAKE2B a608081cf3c75a40fa89512ba2a2201371a0e7be5e3e88dddd6424ed233f72ebf74d60bdc785fee1fbd41a7fb8c26c35fab35362d5e491b84434a8a8f775185b SHA512 d1751a001ea14a9b73326334b36c63baf85609d1c90d154f3b213613455346bc4e376b035a9f21922b032e9f1d109125bf3c81294ba3465ea812f18a9573eb34
+EBUILD filelock-3.0.10.ebuild 1007 BLAKE2B 262c18c5972a245e06cc3f8d9a3cdbf98092bc193af0308aca8b9b87ce5ba5ac88edf1dadf300c9a3037bbce4f1972be6e32bf9885c9d724cfdebf39e5fce757 SHA512 d04bec2a3e414751440bb46c04b0c92db2b96f4659184b856ac30a29c86cb955fe06e5fa1ac1a6366701270ea6677fe1eacd8574016919f373f5200c71eb9ab0
+EBUILD filelock-3.0.12.ebuild 671 BLAKE2B 0bfaf5f2576f02d59cf7427055d19d2bd757ab82db91854a5b84b5ff56c44b0b090a526cce3fc94d912e3b168a80beb67ff50032b12570fd8e4c08bf3fdd1e12 SHA512 e12d08ace64f79f24f2e62cdbf918967afb7af8110ab2259228151ad204e9889d2c9a4db7d4acf541198740ada1330cc472d3df1b4464078b7fdc4d57e10ec6e
 MISC metadata.xml 356 BLAKE2B 795142cf645edcb80e9a087e62fadbab50c5db359946ec290dc0c0b1c4ae12a666a0dbba4b2212a27310339c783f0c13e0a28a42df45a4cc9e781674d9514fc2 SHA512 3617ad60e67b84ce0d36bb1caef8a6b1dfac31d487ead4887b70f575726974b27d73208cc8ca0039a2334c6deb6609cf8ed85c8404c6b3a4efe0ad7bbc69507a
diff --git a/dev-python/filelock/filelock-3.0.10.ebuild b/dev-python/filelock/filelock-3.0.10.ebuild
index 9a5fc2c2bda6..5a9736ca6596 100644
--- a/dev-python/filelock/filelock-3.0.10.ebuild
+++ b/dev-python/filelock/filelock-3.0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 inherit distutils-r1
 
 MY_P=py-filelock-${PV}
diff --git a/dev-python/filelock/filelock-3.0.12.ebuild b/dev-python/filelock/filelock-3.0.12.ebuild
index ff9f692b30b8..6d60b1491457 100644
--- a/dev-python/filelock/filelock-3.0.12.ebuild
+++ b/dev-python/filelock/filelock-3.0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 MY_P=py-filelock-${PV}
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 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=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/filemagic/Manifest b/dev-python/filemagic/Manifest
index 8b7c62124579..49c98d1b704c 100644
--- a/dev-python/filemagic/Manifest
+++ b/dev-python/filemagic/Manifest
@@ -1,3 +1,3 @@
 DIST filemagic-1.6.tar.gz 16754 BLAKE2B 248de7f4c900f693d56197828b96bcdbfae451e17948abc1f59105b5dd78bdcb662e5d7751927128e7ae2b4cea086b5c095f34ba0fbbd73d8acce569e77e943a SHA512 2b33b55467d14697ddcee2b1cb69eb41dd51474d2d8d095873f6f6609d77efa295a91bc9b976c9af22983a7cc801e1ea1e55163c18c5b6a41c4e1ff9cf73bb47
-EBUILD filemagic-1.6.ebuild 649 BLAKE2B 57c9ed1a3c19f4127e81136aa59a6816fe47578d7886afd1ab8af600c3df31b703b977d40cbe752760f7fd4ff4b8dd9c1014252ab8f8a181866f536852cd9b99 SHA512 7bcfb39ffe909e4e5235432fed321d25766ce2d8eff4a4fdf68831a7838463fe6b0aaa07ce1ce3235c3343d40da3e936b157549278f4904532573c9064f26ad3
+EBUILD filemagic-1.6.ebuild 640 BLAKE2B 8f8a44da6b4760bfdb868afcc056c08669fcf298af62fbf5e68a363fff1fadce51c53dd180fb4303f735eb6e6523e55e929c310602359507ca4f79c9fa3e2825 SHA512 f085d6abe947d54329f6bbc9dbf71762f96bf1cb8442931b89ab213ff7fbe61c1e77298394f223c8482870384e0d50ec11c333ed3994cf6a52ebcf8b8b82b9c2
 MISC metadata.xml 420 BLAKE2B 870c83d63bedb0a2357ef11eebf51339d7cb0df8fe28a8b08d919e16878c131e40f3ea0b0ea2a1f811fa51104a8d13f8cc266a07e16bb5bfee7daa72e86263e3 SHA512 d5ef87b48a68d72cb02aa911d906e9914faee12fb43a5cc9d2b0710fe6dc7de592d3d2c99c163832a21811c65d2fd4ccb41a4c8feccb7e33114668d584039270
diff --git a/dev-python/filemagic/filemagic-1.6.ebuild b/dev-python/filemagic/filemagic-1.6.ebuild
index 65cc5be26d8a..2225c3055e91 100644
--- a/dev-python/filemagic/filemagic-1.6.ebuild
+++ b/dev-python/filemagic/filemagic-1.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A Python API for libmagic, the library behind the Unix file command"
diff --git a/dev-python/fitsio/Manifest b/dev-python/fitsio/Manifest
index a4d9d4e4876a..e32c6c281a35 100644
--- a/dev-python/fitsio/Manifest
+++ b/dev-python/fitsio/Manifest
@@ -1,4 +1,4 @@
 AUX fitsio-0.9.11-test-failures.patch 1560 BLAKE2B 3299a43eda8df89467474c51dec85af9edb8af52c93958e49834317439d440a0993ef6311002a4cddc4cde6aed42ed355dbafcf4f6ecbe98b81d60b9763c1c03 SHA512 224ae91e65d4b5f24cd64f3ab389940bfa58801822ad090966c4c570d5c9fb568588b3efa1dab73c2ebbbd0b5f802c2364fda31097811da78c09903814613c6b
 DIST fitsio-0.9.11.tar.gz 6020222 BLAKE2B a71a0a6a026999b06dce54beb48fab2f510951099788b51456a6e07057daa7c911d5a2841d5f15a397705459daf081ff91bff1014782c93cb1dd76faf0ef2e1d SHA512 751b9612fe051f128d8f5dea61e2d119409293051a130ee3e18836181637e8c8daea757a715012fd024678d00e234e8b6c0cc0c9229c2bd9a406db312e4607d7
-EBUILD fitsio-0.9.11.ebuild 944 BLAKE2B a297294453f75c5f39be1eae8d30ac23090e1ddfd4339ce382f734f64574257923515d1f11d2247533a87e2c6d98d57594114c0211270feeadb5fb01400eeb80 SHA512 bb5e7bc6d307595cd5ee9258bea43cec4213917d5efcd2e65096da7dc04fd95674a6fefed304e865e06436c2512c9ee2cd8c912228ae8718582a75a3f0c286ab
+EBUILD fitsio-0.9.11.ebuild 937 BLAKE2B 028a5b41dbee76ca4e31df0ad95cbd666ddac0c29f88f4969d1d6ae069ea2140d022c4532e1e5da3f733148f5dde06bcd8ed2ce21ac4dcc969b3b8dd34deffd5 SHA512 9867b33a13e8c8a4b21c924e66f1c3fca72cc1fa07be5d993a7a69bda91c15f267bd3bc9ffa10fe26eb636afe1dde5f81b013376c4f915995ee115cde79fc46c
 MISC metadata.xml 930 BLAKE2B 495700f368bc6c69ed91745ec7d2847c5cca1690c454bc3b69acbf34eefbacb5b398bf7b56292dc25f2c642a91acc0e2ca054a2a578827aef3c4f95a07a75bf9 SHA512 ef4d3c9838e4e151b16febdacb9fb3b3538763dfb0c08b43ad73a9d9ecbdb275d91152b64b400aec8e3d337f08f3aa46cc166251e34142a68514135d6ae314d4
diff --git a/dev-python/fitsio/fitsio-0.9.11.ebuild b/dev-python/fitsio/fitsio-0.9.11.ebuild
index cf3d78bf88dd..b413034e1d00 100644
--- a/dev-python/fitsio/fitsio-0.9.11.ebuild
+++ b/dev-python/fitsio/fitsio-0.9.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index 1c390ba09d0e..7324edfca31f 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,5 +1,5 @@
 DIST fixtures-1.4.0.tar.gz 50411 BLAKE2B 2dddd3ea21a4b7cf62d58563b67a99a9ead0c32b62b818818567133b72bd85d73df4399173e262683f02ee892842b6444e06896592e1968f219cffd39e6aec0e SHA512 62e314821ea507ab5c1465fb626c29c91430b36ae4670fd05a3aa7180452989c393d35ab623da3646b25cf671a84861ab68d9529d04ae759c0d38efca7c7d8cf
 DIST fixtures-3.0.0.tar.gz 56629 BLAKE2B 949c67c428f5e5ca0afc2f875dd4e2a212922415762a2528c185794e4ae2b74d32873aaf7132d97dec95a681bb4d87d85b11a39c43c64cd531dd4bf2fce75f87 SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695
-EBUILD fixtures-1.4.0.ebuild 966 BLAKE2B a75a3ff8ea82579714c00ce457c62ef0cb8ab74691d5410527bca7ff96c1dcd318324fcffd02b1288b39728bb547fe75f18666a462d3b8b209c6985570cf89b0 SHA512 be8a277c506d7c5a0d3cb749898d121a0bad71ea3bacb704631229de44ebd40db190ddc1a019e29acf0ec7b11f3a9dea29cdb60a738fdab8d8e7b679485a21ed
-EBUILD fixtures-3.0.0.ebuild 972 BLAKE2B 480b4ba48ff9d6e9ba656b2d1ee4d49a6dfebe6034bb643445fe2644149583edba239a20555c733385c8138437ccefc48b329dcc3dae77883402fe65dd00f93f SHA512 4cbba100c213d5afc5e122ad9e9cd718eb519aa2e0c39ee76f4cdb7ade069700c509d2f06f3031d9036b8c07657012f90eeced2b2e777839113299013bedadee
+EBUILD fixtures-1.4.0.ebuild 957 BLAKE2B 1893ca89a48611d268756c2ca17557b52ac6e748db5f531c6e71f4f39cee8e7933752b29be5b02cbe8e5b22a2a477e1e1802935f021bdf87a3193360a1cf82f3 SHA512 c583084141442d5b61c30da475cd6638e573652b4fddecce0751493c349ae1b25064667870b0022dd449168a8070cd4f309c9a864259fbc80274b578ac034dcc
+EBUILD fixtures-3.0.0.ebuild 967 BLAKE2B c833489c220b7ad3b19403420385d9899c9745a12b6fe3f481c952e3a867d4b32d0c702bbf280a489bda88de1ca87a5dfbf783c3431f03a9c1f28480312cd01f SHA512 6a30218aaea7b6dfa6cffab2e282cd209e18979864c364c0ee224bffc35dc63e55bdbc45b2f70fa7f27a55dd10e747f9ba33882dc401930972d82f8ada9b18b6
 MISC metadata.xml 889 BLAKE2B 4cabcada61b38bd01f30fe3f5f637abeab381b4dbac5c1f4999040afc02f22fb9ecc92930f724a26de040e1437b09a0cdcc67fc0964f92296061e0cc43b6decc SHA512 8887064dea4084b58983b19ff033b543fddaab24ee29e6b52dc4cde0941eac612fd5c7054bda842d69b900555e308f0b9bea388ee2af3ffb3eb04cf8f76a4232
diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild
index 1109dcccf667..4cf9c482da87 100644
--- a/dev-python/fixtures/fixtures-1.4.0.ebuild
+++ b/dev-python/fixtures/fixtures-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fixtures/fixtures-3.0.0.ebuild b/dev-python/fixtures/fixtures-3.0.0.ebuild
index b9c16abcebaf..5203a76fe0d1 100644
--- a/dev-python/fixtures/fixtures-3.0.0.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8-import-order/Manifest b/dev-python/flake8-import-order/Manifest
index 0264f90e4cfe..5be8eb69fe82 100644
--- a/dev-python/flake8-import-order/Manifest
+++ b/dev-python/flake8-import-order/Manifest
@@ -1,3 +1,3 @@
 DIST flake8-import-order-0.18.tar.gz 18507 BLAKE2B 01d9ea712dd5cc4177aec2c1ea2c2dfa72266edfa6b9143657076edab02548058a5bb4642a9a9b7c3dcad36cd76491114cc36a128d57076d09e4cd9e0f1568fe SHA512 8a897d42c81e99d9373fdf03e975b65309700fddf7c38294fe65562ce788e788c9d6c2ec8dd2c8d24e65b4360b3b3577a7a66eb279a5952f8b9d212b06047395
-EBUILD flake8-import-order-0.18.ebuild 862 BLAKE2B 7da4f16ca60c4f002950c53596f98926f9625959d2bdc75e4fa7a6e14532ed461a8f95b1ccee9976d7d26647318296321e69a5361cb61797eac245feea5286e6 SHA512 9bdcf58a14c1fc5e47b811fadfa4bd8115ea8b8482babb3f565dbd450c1a7973d142d12974bc8d36b540741a585cdbc0d4b26c4595f722aff46f16715a12f50c
+EBUILD flake8-import-order-0.18.ebuild 848 BLAKE2B 01732b2a7f947930b802aa5b4fd01da147864ce6840c13534410130ded3df6ae7ef2109fa2e83f4e66cf9dda807ee37ee36ff79acca07d2a7a53b18ec748e719 SHA512 96b33d0985a6d315169e383467c57d0e3ac8a3ab13b23d88f45ef48d064fc55e575188e264f09ca49c532246ce6a9fdbb94f1348dfb664175c8c6b24f49d20df
 MISC metadata.xml 391 BLAKE2B d16fa34c609e11492136a3f76ae408540ae909313b3afafed9a9f806b7addba6e8e5a00453d6dac9a32b6c93c3772ca7a475fa8b5727f2269eba78c32929fa86 SHA512 c485906927b34ab4e97c9361ea9f0a013f5e64ae9888074972a7db50bc3d3d7a592564217e7ba01894fc252690ab05c3029f0ce64fcbc73683f7f4a7ae541e7f
diff --git a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
index d06f09a5e6e1..c127f3092d60 100644
--- a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
+++ b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8-polyfill/Manifest b/dev-python/flake8-polyfill/Manifest
index c56ce95e165a..54741d7130ca 100644
--- a/dev-python/flake8-polyfill/Manifest
+++ b/dev-python/flake8-polyfill/Manifest
@@ -1,3 +1,3 @@
 DIST flake8-polyfill-1.0.1.tar.gz 8094 BLAKE2B 1e93503b7f45da1d2f8086ea7e2f619df73a68f6680e958fd1dc13dfa0409ecaf0a045e1a6fbb3634279b17479e7227d68412d97c16d3a87182ae2a3e2c7cc11 SHA512 cdb1530c004015fc44007eb4efb5a84b2ff6f22bf75b3a33ada0c0e80eca5e137a2504baea11ae186018ff7617c8935bc14c36703c17c533a27abc81f9856883
-EBUILD flake8-polyfill-1.0.1.ebuild 735 BLAKE2B 7d2fc30e899127b1b240caee2b99f28b5c25be5ed7a285286d697b411970794658755e064a19377ce69c2e7ce527d32f1cba69d50422c7f5501ed33c838759ca SHA512 0e234734dfd1f7071f566df4af26b784cbe5da0d940aa985568810b8ba39dbe334669750d0face2d8b01dd53b337c37e4b817ef141e85e522b870604e9aca990
+EBUILD flake8-polyfill-1.0.1.ebuild 725 BLAKE2B 0ca23517f71c06a12fa940157486e168df88aaf284c5476700693e2329cb02a802b1ca7e3e358bd16f4bbae99a34bf0bf1e4be8aa5916520ef97d343b67ca227 SHA512 ba4be817ec934b28501d5c75b0e40e9b2175614f4e472d151e7aef89f794f407ac8620cb110324138d0726c94852dbe15da578314155afa29ee29a3ee6bb2fed
 MISC metadata.xml 296 BLAKE2B 1b6ed3723bc9c8b200aa8edeac760400493117046f88144e6684c41326de6b5c0c17fb474e9d25a6f4b75ec55d3a699ea3f0134d204e95551f143f8bb935f5f3 SHA512 8a15e9dc8f9ff3ffcb88147950d11ab9dfe69124bb8aa9293c5b3582044ddda95acc0f62453667f53a732dc98f984ca40c8739e965edfa3e8db4f61ecebcdc1b
diff --git a/dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild b/dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild
index 7decfc5d3dc2..b12538191434 100644
--- a/dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild
+++ b/dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Polyfill package for Flake8 plugins"
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 51a7da1fbc5a..7fd48fd33176 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -4,10 +4,10 @@ DIST flake8-2.5.4.tar.gz 81663 BLAKE2B 89bd5965fe1f6862cadbfc7b614a819a13d4ab147
 DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1d6ee635591628fefad43ee1116256ae7f240496d93941800212ea2479be73fb9ee9bd03c9a54ab70bbce452f SHA512 ac5d1bd9c44ed76c9e5cbd941b24bb552aa76e156b24ccda6cc8440ee90f3a574fdb393665adc75298e4f57111d7ab3115ef21ef9088fb327d0a9703d442450c
 DIST flake8-3.6.0.tar.gz 144684 BLAKE2B 3a6edf83860c6c6a59c150cde47b22eeb17b9e83cb23e4d8f747715b8867093a7f1d1e2bc55c9f9cf43b69463746026d839b0177f2abef746581563a670c3ce0 SHA512 f4377bc7806074a88f88b3652c3061583e576ee515b2b741cee9c6dc18f84f34a7807c93fda9dca3d8b006e379dcee60bb3ae20e6a2e62fd216a82a2b36f2eb5
 DIST flake8-3.7.9.tar.gz 150123 BLAKE2B fd46710c0dcce7d3dcb3d5fc8ff7a83a35315679fa838e68abafd5bdc342c13218706fec0dac3fc9a6d919971f1f846c855f00cbd60c925e979378e431dace0b SHA512 c3c753ad050d8a8f87f7c28c8a1c953ed9bd04f08b09512d9323152b4eebb57d67fbfb0f5317d629174fa12fa234e1a86d6a633dd951fff6a45330b1c4f62850
-EBUILD flake8-2.1.0.ebuild 1101 BLAKE2B 45669a2d405babde95a72c9d414a2fefa031ce9d462e6eee536088e5195f602c64a567554b340c922ddc3cbfb8ed8f0e8bf34facbebd8b7f1e5a5ea57b2b6d0a SHA512 aebd937e5d17e21e8158d8c3f110d978b55bd690c66c058f47c416473682616a1b547d65d407cd0a38ac6267df61fc7ef95d46fe3ec1100fc57b9e447a436fb4
-EBUILD flake8-2.2.5.ebuild 1126 BLAKE2B 0ced2be5896ae9d98362cd4566ec25178d24e65c4482cc1ea4bcec3a1faec4eb57a948026569829c932e765e9bbf7dfa873909c0c877d734649ed92f93711201 SHA512 a5659f589678aeac2c71e852b309b1e3cc1cf68e867d16709dae770eb15cd4de372abd6be9d2a8e028ec595c679c1e1c0ad4d1d651b826e1bb8e4f28370a374b
-EBUILD flake8-2.5.4.ebuild 1629 BLAKE2B 0d8a1da8c74cd7b211159bd0559f78564da47ad5c4578924eed648e5386ad4a3a401f02863a157f317ff44d7818b7d1b7ed5b63e80f01e5d268c9771c7674fb4 SHA512 d01e40435d01e1789d091f3c2e0501bf045e2ba4fb1c7a1751c05cbf39b12c50cc5e1b6a7a06d1f9d5d36a09de82e1938fa2cf0df5ec43adca94d25fc10e2eed
-EBUILD flake8-3.5.0.ebuild 1606 BLAKE2B 0e7f66502e4d80ed8e2d5782970b683fdb229707ace61aeba3063226fa3c9a69132c74224fd4c51cc625e45539c27e58146f844c5dd19800dc92c550f124daec SHA512 9376d59420c1d3dd7e195f13d917b53aa003c0c122829ea23565535a3777da9b157445a849caa89074910aa61ca849cfb71e1f1fe80c6fef21921e88433b56cd
-EBUILD flake8-3.6.0.ebuild 1618 BLAKE2B 9248529358e67711d1d3e50e8032472b67d493054ce5c878148f8b1fdd63e79aa9cc481af564e659b28d7f65d4026296719d0b14d4a72d53befa046714cb4694 SHA512 f7952b8ef3fafd8f7befc4ef98222d9861fe24a923ed528a9c43709ac135a4d60cc2f329a6bfeec2cad366e33485f84fe3f2b8e802e2741054b8a4f74701c56d
-EBUILD flake8-3.7.9.ebuild 1585 BLAKE2B e52d4e51522bbf6c4476196ee66b0395d74bffc85bb002acd9ba29ebb7e2e34a09c7c303cd4e041bbf1e86556a70ec0a0c6680929a931ad8ecc8531fdea0092d SHA512 2d4078fa771f636deb9ab464afce05d21fac71aa76d6a64b9b4cabe4c522e8f371234e0a05decb4e927ee8d4ec132c08f9a26941ba88f103d8cef23c1a28ce07
+EBUILD flake8-2.1.0.ebuild 1097 BLAKE2B e90a1cb50a39a987321a497df7e0b10153721858e1fa1b7555a44149b652fcdcecb7716f556a29b8e66de1d2d0fd52ebc314ef59a71442b1a6bfb26fa974fcd2 SHA512 7002e42fe8859348daa24c6c233966f7602bf95647f9d0b5db3978edd4f30ef54de546410dbb78d757e5d632b3cb0c331e8858539ee07a6cf39548dd6b4c44e9
+EBUILD flake8-2.2.5.ebuild 1122 BLAKE2B fbc5b05cc55ffc0ba61c547604d4e16da2b388eacd918857cba8e5ebd5580dfd95ec222c1657d5c6fa2d5c7dcc58a16506c996a0a0fe799242bc5382065de6f1 SHA512 87b66eefaeb7fa10185c5cf06607301b328e9925de5116209a7f2b01b513abb1bf1bb46f98cb0cfcd560087d831a210b32591f1178b77b4adcd459fa2d45dd17
+EBUILD flake8-2.5.4.ebuild 1627 BLAKE2B a9bb2b883d489915e8c7d4494a993379281f1fbe25a98e44a5b8e69022a2b05ce39a229370097615a10481479bd01e0a311d080ebdae54cb5960feb9bd05f67e SHA512 16fdfaeb19f6c35deb7c8c4869cb0acf709f0765936bc7876afcc03624c8b3a29935b99f149af891bfea703cc4488ae7dbfc02715bbb66ecc88634ef7ee501c0
+EBUILD flake8-3.5.0.ebuild 1599 BLAKE2B d125e0bfac657484fae1031fe674f9b5962ba4110a27eaec07b3f09622dff6ea9901d1fe5508d7220884279d3b382707e65d3c56967e38095401226ab799598a SHA512 f24f5727f57be4bed5b340b79308da318232a064dd73e54d558404cb3496c2739a5a6ec48cc95125d4c24fd4840487a5e35b7968dd8d5090abed6506094ce808
+EBUILD flake8-3.6.0.ebuild 1613 BLAKE2B 9204a054483015b7d9bc98f334bd95c5849e5d392c2be6d970093b6f03e81a8a189388df57b771064a924ffa4c12dab167f47e6ed4783b704e2d52a1cd1e4841 SHA512 0beddabe54a578ccc650b9673d5f888f2f6b2e0880ed19f6975244a76d31c859359795c274d2c95621059242c6d60d17d578d81293edcabd2ee1092a86aa3c75
+EBUILD flake8-3.7.9.ebuild 1592 BLAKE2B 1c32be81f59edb2b1b942988c3f98c481f1e1494e0db81b9110588e571105a12946b72346df8701a6bed39a60f6b8466dbdb42832ecc009e5a1e11ee6ee741a6 SHA512 0c3d53a0e5dd0bc976b5f502a03389058bde38844d9a1d835cf20442d5d338660de7e88e281ce2feb139d23d31be25b91c66907f467ac34caea90d8e04c22a09
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-2.1.0.ebuild b/dev-python/flake8/flake8-2.1.0.ebuild
index fddc46964e72..c755bd34d173 100644
--- a/dev-python/flake8/flake8-2.1.0.ebuild
+++ b/dev-python/flake8/flake8-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-2.2.5.ebuild b/dev-python/flake8/flake8-2.2.5.ebuild
index f13332dd509d..b690049e9b6c 100644
--- a/dev-python/flake8/flake8-2.2.5.ebuild
+++ b/dev-python/flake8/flake8-2.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-2.5.4.ebuild b/dev-python/flake8/flake8-2.5.4.ebuild
index 032641a33f3f..850b6d0fc8b6 100644
--- a/dev-python/flake8/flake8-2.5.4.ebuild
+++ b/dev-python/flake8/flake8-2.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-3.5.0.ebuild b/dev-python/flake8/flake8-3.5.0.ebuild
index 0430deda4ac6..6615b0de01dc 100644
--- a/dev-python/flake8/flake8-3.5.0.ebuild
+++ b/dev-python/flake8/flake8-3.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-3.6.0.ebuild b/dev-python/flake8/flake8-3.6.0.ebuild
index c407431f4c71..2b23de610185 100644
--- a/dev-python/flake8/flake8-3.6.0.ebuild
+++ b/dev-python/flake8/flake8-3.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-3.7.9.ebuild b/dev-python/flake8/flake8-3.7.9.ebuild
index 773f3c0f88a6..032442b3ac5f 100644
--- a/dev-python/flake8/flake8-3.7.9.ebuild
+++ b/dev-python/flake8/flake8-3.7.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 # requires.txt inc. mccabe however that creates a circular dep
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index c50108af4f66..79e2acfc6e58 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -2,8 +2,8 @@ DIST flaky-3.1.1.tar.gz 29136 BLAKE2B fe2f47356e0279885cc294f22bc4588b502c7ada1d
 DIST flaky-3.4.0.tar.gz 29197 BLAKE2B 8f551a414cb06f5259d37785eb769a77105b1039398462288eeaeeb6acea8456c30cc7da6cf515cd99be2adb19a77282d2d0d3abe795761985f45ffd062de508 SHA512 14fda6312e4eb8260a8190204622a7dd274d0c946dda07ec8aa65e8c341f7f4a701c704c807f50eacf77589231b37c3bb06eec18d60a718f24e9b0182f7e8cb5
 DIST flaky-3.5.3.tar.gz 29320 BLAKE2B 6bd2095cd481fdd8311e08c3e8aaff78fe22bfefd8463ea3b8190a469d8f909039267256afa876a22a57eae9e390af8235b10211509fe8549d000ed7e9331baa SHA512 9ecb80ab1ec2e0db96b7a7a5856a147434c22d29a603e76d3db3f8d94ddea06ecab799943179910bc1d9d8d5dc1c7bcc94156628352479d67e2dcaaf5cbabf27
 DIST flaky-3.6.1.tar.gz 29501 BLAKE2B 57d8c1ed9f271688f8a6f2acf25456058b3a67c86ea7aac8c32fd52221d294b5226461b9260677e3ed94af84ff9993a02e79f0d6b01f05daee2992efd8ad03b8 SHA512 f14fbd9259759f3b6f18a7dc16e00717ce54392a10cd9b3225636e33c904e69c6b01398bfce96d7273a40b6c2cca897a05ad386a4d8a83bffee12fab322f9b32
-EBUILD flaky-3.1.1.ebuild 1410 BLAKE2B 2b6d0c15e0f0d369e8f30824abae3077c61d98c5d09e1f5ccd8baac48583fb7fc973ac1b34ccf7127022e64f54928fe4832188e7fa907431c6a00785b3faf5a8 SHA512 e81c626aa1b464fb41f1be32474b8709c78849ee40f59f3285bd81e0b3d6ee3a412baa84f5ef0fa00ffa1e7e5bed0402ca585194245c4c21c799684540b458e9
-EBUILD flaky-3.4.0.ebuild 1480 BLAKE2B 1ecfd81eb506d787eda53030f4ba3f0fa9e849b2eca65bb5853e696616b06db20e517a40f6bd4719dd8c2025139793edcc10393639c66f21a23c0893364038af SHA512 33271d56bdd819fcb5de0c00f9819ed9c418ff7fa79b8c9b40f507091e8bae9b36f6025641de19a20bc18198e84c91477326a85a11ab149994b477cccdc8e028
-EBUILD flaky-3.5.3.ebuild 1479 BLAKE2B 984a1d7197eb115e0691ccd96307f4d1a05ba43f2f56eb17d6c3571b5e1c3e129d1814abc4dca7d6cb33e5d99c89ecb2992b29e2da0b69e0bc1b2079968db8c6 SHA512 3d2f38e4c5ff112ba156551823645bbc84dbecf150254b7fbd2d4c2587c9aae30884423882c0e487c591c193b8d8e28858edcb23409c767901e319e3597fe889
-EBUILD flaky-3.6.1.ebuild 1314 BLAKE2B cc07ddcd1067aecab7a1cdc8c738388d7c20c435851ce618b1975b6e0b6e8770d9c32d8ae87d30bb672cf902c4475120b08d0f3c4ec1da5a442bd846ccb9b252 SHA512 369c5718373b23a00df440b69a5027230d177ec0a590536e0de9b40d037e18b08d1cc94f811a23cadfda488b037e06cb38a1f85bcc53808f10a31cfa10d0e467
+EBUILD flaky-3.1.1.ebuild 1403 BLAKE2B 08d44a46970c3f879980236b0e68c81f018f5351338bc539c358926ee5364f0e41f987042a81b5c8e8069ee777ea6eb37d23fd206274641bfca77a7a6d37164d SHA512 4eebe1df049b6c0d098ef7c762b91a3183cd9f604093c5a705d2151ba7f476e32a14ce5bcb5a6b2108855f1a7cea5fd33ffb8541ef69d340bbafa4fcef88c591
+EBUILD flaky-3.4.0.ebuild 1475 BLAKE2B 98831e09efde29e609c7ccb7e66c555d00cdd0f366c46112de3f5c2fc20aa362b059aa1eb455c94b45f2b0538a287b966537d514c1e67be2b3d8ad82d65430d8 SHA512 39edfdb89399109d407f1c1e385c671330ff3344d92556d60a60b68d5ebcfea679c036fa21786e3b73a66de0f704a529b84e5b60c9c5be323b70d90647a245be
+EBUILD flaky-3.5.3.ebuild 1474 BLAKE2B 8465994b9e02a5a09d666a393189096691508224ec4adf25469e7b588302dfdd52bf647ab1e613829d5cff1e58d0b50f1bc2b42fe6526e0c985208956513d4b7 SHA512 49b8700ce628806e8611ae0abab8ec08479773e589da31b4a6dc62ebfe732feebbf74d0d07f14dff775a1198cb87d491863c1faa73ac74b3d87d34b1090737d9
+EBUILD flaky-3.6.1.ebuild 1307 BLAKE2B 02d7c14e38e78ad1b414ddbd38f178e6f065c71328bb71937af80424acf0c58721e98c58153ed62bea46769965d8ac9167f666f5d3f44686349e2fe76fdbf13b SHA512 4080210d445c835056147e7b559252c604bacf7f45c645afa5425dbb84fe563b8bbe9216ec231ad583bb2463fa246a6fa801b7a763555e6ebbc68e322a7de9de
 MISC metadata.xml 369 BLAKE2B ffa607acfbc98fc2e539492f87b55cedb039b39b3cdb7ce07cf9dcebe1a1559296284b27d06fc6262f362c0ea8577e23f4bef07ffd01a94c4d981fa060384d5a SHA512 da1597d14b2e3f9bc56e48064718a2a52bc1615d982d679d8c971f1fb1b9c25169d5412f99542f808fa42f958e1bb589e7615a13077a7d1b0574acbec1d4b1dd
diff --git a/dev-python/flaky/flaky-3.1.1.ebuild b/dev-python/flaky/flaky-3.1.1.ebuild
index c03a15deba00..198d388fb64b 100644
--- a/dev-python/flaky/flaky-3.1.1.ebuild
+++ b/dev-python/flaky/flaky-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flaky/flaky-3.4.0.ebuild b/dev-python/flaky/flaky-3.4.0.ebuild
index 2c19f1f374c0..029509940bb6 100644
--- a/dev-python/flaky/flaky-3.4.0.ebuild
+++ b/dev-python/flaky/flaky-3.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flaky/flaky-3.5.3.ebuild b/dev-python/flaky/flaky-3.5.3.ebuild
index 63e1e860882d..19ea7bf31ed4 100644
--- a/dev-python/flaky/flaky-3.5.3.ebuild
+++ b/dev-python/flaky/flaky-3.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flaky/flaky-3.6.1.ebuild b/dev-python/flaky/flaky-3.6.1.ebuild
index 297a4774d97f..c82c11236867 100644
--- a/dev-python/flaky/flaky-3.6.1.ebuild
+++ b/dev-python/flaky/flaky-3.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flask-admin/Manifest b/dev-python/flask-admin/Manifest
index 01d35f6268ba..4383fedf1a16 100644
--- a/dev-python/flask-admin/Manifest
+++ b/dev-python/flask-admin/Manifest
@@ -1,7 +1,3 @@
-DIST Flask-Admin-1.0.6.tar.gz 235842 BLAKE2B d0c2d48076d8c5d6f5df4b779128d1b9ecf00d8a6ef01df1d39a75212dc99f08a4ba7d03a95c8f39c4b3442ae4651d7185bf3faf528804f78f46277dd18dc3e2 SHA512 a30e2678a063d45d55ccf41cfec07fd16973cc8c770b1e7f16d11b9aba693049b1d9d4cff81d8ae8f2548d019f977f0906728e98d23d229d76bf135a079abc8f
-DIST Flask-Admin-1.5.0.tar.gz 1598074 BLAKE2B a7ca1fab32621cacfcf691f779e88e134369be82f1904db02f72cd51fbbdfecb22b9da06800a9cfae99336ed2807914a6420248c43775c9ec37d65ce242ce17c SHA512 dbf5b97f27228eb000fd1298f4da8d4824196856e4ba9e2d8cbae6e562794ec2d1a998b382efaa84ec4fd7a74ae589a739c52e117efebfb171f19bc16e7350e7
 DIST Flask-Admin-1.5.1.tar.gz 1587527 BLAKE2B e734284d3adb7380b71df3718910977c49f76c7e561991c969b8e85952cd3963ede0e1e039c8dcb7c512c00851f1968a9c6e011ad1a064dd8fe4d00390581c31 SHA512 00e31f126048321114e422fda4a0ec84b5caa1a0c03afa17fc6a7078a3f99f843c2688b07462bae283533d52a575935dbab2ce6b731b1d1c3a1e93f315e37de3
-EBUILD flask-admin-1.0.6.ebuild 1208 BLAKE2B 9a04335ce3e698e8c2850dbc8665877fe3f28eb84b357b1e9e3a9f404113b8dd6349240142d1a541bd58c79e06c23bbff23ec138cd6f52e1372d4ceab3c071c0 SHA512 97ccf1e6a0930236ced56b88aac8b2c3a768b2082da7832d5eab1e1a5025bef126914209a640a1fec414f5543694de89716d1e52ccc71e5f731224f8d93c778c
-EBUILD flask-admin-1.5.0.ebuild 1578 BLAKE2B 132a601083685bc2bcb54b6e87b9edefcc46c2aba37539982aca622ac9c48d73ad6a7bfe2d077d0843f0744f8f1442717cede80788b0510605cbc19812a1af06 SHA512 e549d57de325584f7d3d05b4fa12dd83874dab05b05f6d8d2943cf82823796389734189222f8a582f72cfda517e8a779afda04c631f6848b827c0839113dbab1
-EBUILD flask-admin-1.5.1.ebuild 1580 BLAKE2B f34feeaa373e583cee8bf1d4c771eadbae7ec4abc55f49d0472d19af9417c7ec9e7064bd1917374d8ff0e183bef29eb9fc53821e6247a3f66baa4a54015812b5 SHA512 cd8c7c2e95f7d88e2eab0f184c7bc79a53053caa2f6cbd2a05ec08034282324f0666468b0076f8cd2e15fcd4d1bf496774f4bc3091347d83cba21c591056e3d2
+EBUILD flask-admin-1.5.1.ebuild 1570 BLAKE2B 154f891c23d7528157e3dcf1c879b214438563e09349a2d815061455271e6cdf7fe32358e64de8b904f37b2b4d8d3b20f2845e5875c446e3f113e2f1fc927b41 SHA512 10677e1b9019ccfd85f06d19d7611cad52caabae83dece9470e79c4e0ed0b50296f89ccf018fccf030df4f28c7bdd7797d343c076a0173a0d45f1a11bd9d9086
 MISC metadata.xml 324 BLAKE2B 55c4107d89499162e5db7cb618a5d0214fec80c6780bebcdcdf2fdecad7b12163e5e405935e1bdb1f37d687e23ccb72b4f9d2440b6bec1b906b0057fda96e9ef SHA512 02944086c5f7fbcc10241e5596db8caef60c142ddfcc28627c9e7bbe9b472663fc6be2f6234d0205233c7ab5e51b9a4a1c4f7f08256daf1314ae3f0274469ff8
diff --git a/dev-python/flask-admin/flask-admin-1.0.6.ebuild b/dev-python/flask-admin/flask-admin-1.0.6.ebuild
deleted file mode 100644
index e0e8d24c95f8..000000000000
--- a/dev-python/flask-admin/flask-admin-1.0.6.ebuild
+++ /dev/null
@@ -1,47 +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
-
-#RESTRICT="test" # we're still missing some of the dependencies
-
-MY_PN="Flask-Admin"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple and extensible admin interface framework for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-Admin/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flask-wtf[${PYTHON_USEDEP}]
-		dev-python/flask-pymongo[${PYTHON_USEDEP}]
-		dev-python/flask-peewee[${PYTHON_USEDEP}]
-		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
-		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed \
-		-e 's:find_packages():find_packages(exclude=["*.examples", "*.examples.*", "examples.*", "examples"]):g' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-admin/flask-admin-1.5.0.ebuild b/dev-python/flask-admin/flask-admin-1.5.0.ebuild
deleted file mode 100644
index 7dca645bcb29..000000000000
--- a/dev-python/flask-admin/flask-admin-1.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-#RESTRICT="test" # we're still missing some of the dependencies
-
-MY_PN="Flask-Admin"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple and extensible admin interface framework for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-Admin/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/flask-0.7[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flask-wtf[${PYTHON_USEDEP}]
-		dev-python/peewee[${PYTHON_USEDEP}]
-		dev-python/wtf-peewee[${PYTHON_USEDEP}]
-		dev-python/flask-pymongo[${PYTHON_USEDEP}]
-		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
-		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/flask-babelex[${PYTHON_USEDEP}]
-		sci-libs/Shapely[${PYTHON_USEDEP}]
-		dev-python/geoalchemy2[${PYTHON_USEDEP}]
-		>=dev-python/pillow-2.9[${PYTHON_USEDEP},jpeg(+)]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed \
-		-e 's:find_packages():find_packages(exclude=["*.examples", "*.examples.*", "examples.*", "examples"]):g' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-admin/flask-admin-1.5.1.ebuild b/dev-python/flask-admin/flask-admin-1.5.1.ebuild
index 13849ec1560d..96e1beae0bf6 100644
--- a/dev-python/flask-admin/flask-admin-1.5.1.ebuild
+++ b/dev-python/flask-admin/flask-admin-1.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-api/Manifest b/dev-python/flask-api/Manifest
index 981b0cfe9737..efa287a6d656 100644
--- a/dev-python/flask-api/Manifest
+++ b/dev-python/flask-api/Manifest
@@ -1,5 +1,5 @@
 DIST flask-api-1.0.tar.gz 180000 BLAKE2B 113bc6a3ba9f548e61ab6c1822491d91f8562c7809929bcd2b0ecc4160a2358532d5da398b7c876cf5e4f3d9dd03bc159da6a1f24621af1e07bc9d9680b87d7f SHA512 425669e54b9f5dbf548acdb9fc2c3c661b8cfc4631d7677f20a838729584c4f970f9fbd47621e5b3155124637f5b8f4b5cb51bc402f7f406108882d46e4908de
 DIST flask-api-1.1.tar.gz 235042 BLAKE2B b3c7e476c8ef1fa21f7e60aa1fb87ef5b40708ea96332ca0290d9355552bc5c195914da769b39ace1d34864c32989cf7f9856d070b1e6b690a6c1f60b495cabc SHA512 52bb983bf9a0f906f37b645ff907eaa6ee3bc557b51f8935817963f3d66d99689eeba6a3e17711974663ad5ede267f9c85eb1d11f27597fe63806dc9f9e7ea22
-EBUILD flask-api-1.0.ebuild 718 BLAKE2B 0358f62fbcd05811d50d653add627d04fe02fe9ba67f5f296487c0b733e2d509e83c11e5faf04c33c2ad84344d6017c4ebdc5cb9ae4a45c6f92c6dc5cfa80181 SHA512 2cf8229ce12c8c28c8f72fa44f389c8d6fafc883095bbac4d989840dac34c96ee7736eea9d308ef980ebc7b99b7bc1fc94ff8c022115fbc28817b782eb10dbb7
-EBUILD flask-api-1.1.ebuild 763 BLAKE2B 1424a59ac27f3763d2a7b26f6b33eff54caea4e75166ada74df3e3b2222c2176c8dc4bfb7278aa343cfc446cd0c8282fffa9a365d1bbda2704c5794ad003b206 SHA512 20b7264ae47e36a4ae719b3212cd14fd7a1558fa4c8870582eb7c779a7985c9e1238c4ff6261bbcdcf6cb6ee188828c9c92cef8b95141c2fb8ca19b4caeaff36
+EBUILD flask-api-1.0.ebuild 731 BLAKE2B 3c3388e40bf05914e658ec9781e31628a1bceac31125ac44d29d7768a80ef99e44dc311d89b4311214003e071607a225c405221c4b6385d64d071ed81eccacd2 SHA512 a4864455c7d8dcaf96312d2a74fadd6ef159f399bf4eb4e2f6404d1ebf6bb3c848785f45c8d4e3e8286f4f57f620622ef5cee5c970b6eb1a07778c4510934940
+EBUILD flask-api-1.1.ebuild 778 BLAKE2B 07461b75c179dc6ead1586d9a3da01b20e8d3da3bff939648a51dfcd5d7f0a8f3544fb4fa28f8ccea6c9283d936eda7a9548e9a56e76a7c6bccd51ca0ed5f63f SHA512 71e7e58397742bb6fa1652b46bc3701fa29a2b6dc3ab45b904b154c8a8af6abd0a22e6d71c1c28b6bd667c2d1eaea7dae12da0281d666541aa92667f03c500b7
 MISC metadata.xml 617 BLAKE2B 66fe82a8642db27cae5192f4842c284f9f93e70f007388f7baeb8a8c71c1aaf6144460d9c6ae801c941fcf5bdc4a10576ac21a45e01bef3a5bcb93861d67ed8d SHA512 f91e83c8e1453662a8218f421c44a98343c743322e2d39e87bc2a0c4b4bef20c96679dca05c381d8e91cc900bb9ec9de89685a7cbb45b00d78cb7bd1e3a349a8
diff --git a/dev-python/flask-api/flask-api-1.0.ebuild b/dev-python/flask-api/flask-api-1.0.ebuild
index 6574b8d59dee..d973e9e5ecad 100644
--- a/dev-python/flask-api/flask-api-1.0.ebuild
+++ b/dev-python/flask-api/flask-api-1.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
 DESCRIPTION="Browsable web APIs for Flask"
 HOMEPAGE="https://github.com/flask-api/flask-api"
 # pypi mirror don't have docs folder
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/flask-api/flask-api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/flask-api/flask-api-1.1.ebuild b/dev-python/flask-api/flask-api-1.1.ebuild
index fc485f63404b..69f4d0e2b650 100644
--- a/dev-python/flask-api/flask-api-1.1.ebuild
+++ b/dev-python/flask-api/flask-api-1.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
 DESCRIPTION="Browsable web APIs for Flask"
 HOMEPAGE="https://github.com/flask-api/flask-api"
 # pypi mirror don't have docs folder
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/flask-api/flask-api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/flask-appconfig/Manifest b/dev-python/flask-appconfig/Manifest
index 6ce012539f54..e3284e743d8c 100644
--- a/dev-python/flask-appconfig/Manifest
+++ b/dev-python/flask-appconfig/Manifest
@@ -1,3 +1,3 @@
 DIST flask-appconfig-0.11.1.tar.gz 14545 BLAKE2B 71cb3252707ee546aaa16ed36f1c605c5e90d49070a64aa381f23fcc1fa9147724a8794b8530738115c3b0505537487c63b3131c586b4383884b58f6141cd515 SHA512 9ebc42be5ef247b1f14b85f7b65600a1595ecdc70e792c0cd495347254b07675a3b7a306df8d2f2663626ceafa4ce7700f6f26cd0f1bcd974ba6bbab293847ee
-EBUILD flask-appconfig-0.11.1-r1.ebuild 1290 BLAKE2B 0db5331ae654c46a93182a911ca0dd7935666e12f8b4384be97c30a22faa3183f1b69fb5167858686262e95160396693aa413ea52b942fc8fd8087dd2e8c1766 SHA512 36ed9a0f3ae642563a7bafee023247b51efddf11fee581f3cc6d14f1e9337f47cb6356a11ca9a395e80c6ac8db75b51d97d3e24151dd977ed91a43fad77825da
+EBUILD flask-appconfig-0.11.1-r1.ebuild 1285 BLAKE2B 5572c2fcff993f95970ed0f87453f412397d446e6cf0470d23843c8f23200b092cb660a812971f60100429e2498ef6227bdae8f2682546876dc755335b8e0873 SHA512 85bf66708a96e70856e09b293dd1ab4a913ad85666793063aeb58dffabdbfd0cd1e56ca67e7d801828dbb31a23681dc3432c400ccd5613b3d1804fd70989e81e
 MISC metadata.xml 449 BLAKE2B 062ef689f336373983993c0c666feb9a5fa6a6d6a19d3509a6856c6f75a4b810fbf6ed6ea42511073691d83c23a63c5cf3a78db1f0e41d2001b146d8b950e30c SHA512 6a71fd90326834e06eab6e45aeddf17940a9140d7ac41e9fbd1dd8551042066a7fe4f6eb6840d5e2363deffb9d00d59283aea87c113b4b190590d545cd283122
diff --git a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
index b1e2348d1474..8bf5cf5b46a9 100644
--- a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
+++ b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index afc2d9ddeefd..eae4e5d48b7d 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,4 +1,4 @@
 DIST Flask-Babel-0.11.2.tar.gz 41105 BLAKE2B 88cd5f2f72c7533f173a3fef7acdcd9ee882b06111f112da18075ce007f94cb342acd16f35da138ca0548b5bd0fd8070d4b3b7941a136e5490c3b45d1351d239 SHA512 d95947983ff5bc33a28384f000512e85ed64c16555aa03e110a32b7c0c9e91eebc02259bfc69a0dbc84adb6ecf8155cffaecde5726658d64d36435060de3f22b
-EBUILD flask-babel-0.11.2-r1.ebuild 1134 BLAKE2B 447487984635b55c3bc27fa4822d624c04337694c694c7c3c2a1348705ae0af6cfa19b7772d33de14d5fdcc13038814eee88447ae897b228747094aab9f67aad SHA512 8a2e0bc5213bf5c2868b213b19be19dd7f0bb264e730889d7c1fe2be2b068756dcabb338240031c70138948261926daeec4a1c7fa565c836d5c66071a5c85202
-EBUILD flask-babel-0.11.2-r2.ebuild 1224 BLAKE2B 05f04ab53f270d4f268860fdab02f7709537485d11d01e5cf89f4d7e259c6d551960001a123e54e6418240d6d3c9e0fec43abd2815485350fa333f5cacb5e858 SHA512 836389abd2344252eaebe90381e432083f84555f6ec9576fb0ae152ff943685771a5e6f900d46d3a92ea5ca652862cb826f320dcf54bcea4da17412fb00c9021
+EBUILD flask-babel-0.11.2-r1.ebuild 1127 BLAKE2B a66bae094b465aa59dd14399573d12c6ca309f470643c3bf670d87e1d5004f0591de227bac0c18b859187dfa08e08234c815e693dfdccb2f71ab792939f27c90 SHA512 72fecf64261e761ca5470ce4c7be3a1d345ef69d29d018511fa91b064cc4c1cb33c2ad181aaa1386cac6650bf4a415ba336989151a649faefcf80968a3adc31d
+EBUILD flask-babel-0.11.2-r2.ebuild 1219 BLAKE2B e3062d5fb0d24825a31f632337afa97ff789f833f199600ca71ed3e138bba51a38cc3a0ede41fcf8bd888c536eba906d1d18dd578116282f1f171a76cc180ab3 SHA512 66632af47eeb000450567fb33d44ac487931a92c72402d285d662266e6ae8d7b03e29f8dee15afd934fc9f4820bf79f82c59bbea8b9b7ecd534aa57e918e9bcc
 MISC metadata.xml 450 BLAKE2B db38ca56f4b683429248baf7411355305672c23126c4b6c7486971fb1e099bb3117b9246870a24f6ecd66e7f27647e80285461d046c02e9227970a111c58dd98 SHA512 d6fb2f7cdf0a8d4b54dce372bbb3d9728a5ebb0e6d714da9c58e5215d6711e3f4211e2a6ef5390cdfa663d375d7e2942a210bfa2822489dd04a911d9e9c24985
diff --git a/dev-python/flask-babel/flask-babel-0.11.2-r1.ebuild b/dev-python/flask-babel/flask-babel-0.11.2-r1.ebuild
index 8c7d8f25ead7..e4ff093f6cd5 100644
--- a/dev-python/flask-babel/flask-babel-0.11.2-r1.ebuild
+++ b/dev-python/flask-babel/flask-babel-0.11.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild b/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
index 17dcbc9dcac1..b6da743c39cb 100644
--- a/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
+++ b/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-babelex/Manifest b/dev-python/flask-babelex/Manifest
index 192b2b819d26..48a992a112c9 100644
--- a/dev-python/flask-babelex/Manifest
+++ b/dev-python/flask-babelex/Manifest
@@ -1,4 +1,4 @@
 AUX flask-babelex-0.9.3-tests-fix.patch 1508 BLAKE2B 828c0932722c4a052e8360338a21f31e45e26d6aeb2e7ef18678dd159ac9b4ec4f2566e46bc088dcf556dfeefb25567227d28a885a00617c1551bef40328d728 SHA512 60761e4117919619562701c24ea2e7f7f55554da251b8144526063cdde35413ced741bcfb35c8666104b7f0850e665450a27e8f134d768b0c5d49d1ee6775ace
 DIST Flask-BabelEx-0.9.3.tar.gz 41040 BLAKE2B 010f8a7be2d59db143010456673a34e2a42f8978cf000d844f11d27969f120c0768038271b8c62b4f6965a3a60f9c845c4027daf26459fce1489482cad0f8856 SHA512 c759f990c4c96dab7cf2fbe83c1ac6dde4606adfd2f5d03ed293578bec621170be319b71fc3e38c1910d2edaba3e4394f32ede3754940e315abd917beaf3982c
-EBUILD flask-babelex-0.9.3.ebuild 1164 BLAKE2B 2929c3700b2a04c6b9312223d9e1e465a9c538644fcef737832a562e9a534ce54c5dc03099eb1acc38bdc2b0ecb206a0e42f55331db26dfceefde79e294a0120 SHA512 89897ac33fb37bcfc0b5065cf5944d99d6ebb19420c0b95fea53d74679ff227574126ef1ca049d6e826b0356b005dfcb5bd39937a89907739955d587ff98b3d0
+EBUILD flask-babelex-0.9.3.ebuild 1162 BLAKE2B 5ae393d8aad63dcbec4959afd77fa2789e35ed0e8eecc80131bfebdaa655367d9e176a8d150135ab93635068204561981163740f0181a282de6642ec800570d8 SHA512 68f161735d8e905b8e21e3079faa5985dd909c84b1d4abaa93936d5846c6cd9916ae7b5313e9b5f5980ba473389cc3a594c2a52b1ee889030a89701e39589646
 MISC metadata.xml 388 BLAKE2B c961ae85719f00427bb3c616873c4cfbb3d928d1acfdbdedc2abcc3fcff8d0ef4d406dccedcb18748c99b094735ca9dd8f42df755ba6fc3155f229202e13ab36 SHA512 844d8f6784fdeb00484620a822f16256cbb7f07b9c0da936a3cc1b158219839612439e8158b30c4b4c713a88b70edf64068e1091ed102f7b5ecac17b1ef53ed0
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
index d29852f89832..8f9800186d34 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-bootstrap/Manifest b/dev-python/flask-bootstrap/Manifest
index 32ca0a904fda..fbff306cf266 100644
--- a/dev-python/flask-bootstrap/Manifest
+++ b/dev-python/flask-bootstrap/Manifest
@@ -1,7 +1,3 @@
-DIST flask-bootstrap-3.3.6.0.tar.gz 489779 BLAKE2B ad35fbdbb8ce9700cf23759c3ebff11952ce5ba5c25628877fb7e7ec2032ac2e885579d8d9ffdd639abc842d7b7f06e40f695ab933aabbb09a2da300027ee787 SHA512 4cf08a6fd75185fdf5c89783cf8610d74835bf9dc07bd83b36819147bd40cf0e10d20f563a5fc5b8e799e2b87f1e80ad896c76930ca1bc72f74a94818ac708c8
-DIST flask-bootstrap-3.3.7.0.tar.gz 490438 BLAKE2B a254525eaa2a71abdd3d2a9964e79c734c59e73bc5fd7c3084c8ef4c74d07585b1af4421ea3ea5905a017708387c10fdcd76220be8da946f670f1fcc4020387b SHA512 0c7950d633d88f2e71eab444760229efde324b5169bc774215db4a5cd816d4b8eee8b5d55a68921330b2018d4ae57aafefa6e66cefa0ee822260103cf42143e6
 DIST flask-bootstrap-3.3.7.1.tar.gz 490821 BLAKE2B 48773fa1632a9b34284af90924d0d7c6bbe06e43c30b09e72747072d4cdead88a08a1d95a661548709cc46cb9d9c9c017835cd6537ec1a23993fe79cfef31662 SHA512 010c71f69a95cb51afb449d1b43cb345ad23815ea89b368281f721a2af13cf2c143d67b586114898450d8e7fec413f45ff042cfca3dc1183cb0f50566e39fdc3
-EBUILD flask-bootstrap-3.3.6.0.ebuild 1537 BLAKE2B e4c3293f4c0c7c3aa1ffcb7e13cefd1fad74a44f22ccdc0c336e95806448ba981f42d25fd85fd1171f8e83dc62304234c3801d1300494e0c14fc0c4ca58bef34 SHA512 867b62c926ba65b01464e381e6b5b082840fe06fd0bd017e42ca6c4a37023cbdcad993d9ff253ce5113b60606a6474e2870a608ce096c6733e43611e7fefd1e0
-EBUILD flask-bootstrap-3.3.7.0.ebuild 1537 BLAKE2B e4c3293f4c0c7c3aa1ffcb7e13cefd1fad74a44f22ccdc0c336e95806448ba981f42d25fd85fd1171f8e83dc62304234c3801d1300494e0c14fc0c4ca58bef34 SHA512 867b62c926ba65b01464e381e6b5b082840fe06fd0bd017e42ca6c4a37023cbdcad993d9ff253ce5113b60606a6474e2870a608ce096c6733e43611e7fefd1e0
-EBUILD flask-bootstrap-3.3.7.1.ebuild 1546 BLAKE2B b11ad5763a0b35d778c68f3a4bdcd0aa7a90901d1c234f78126bdc7dfe001fde8311d1211b337df3dcf2d69776de85251b2aeebd3fb2679052c9aea4e10c5c08 SHA512 9ecc6fdfcd8d6ec54a804a8a94d77f406650eda3282bbad612b8d737e582cfab73081b985684612c4e4f369d0c86c07b56ee0e22b5afbb7c60972a4cbbd68430
+EBUILD flask-bootstrap-3.3.7.1.ebuild 1531 BLAKE2B 2b1be758508068b095851aba75bfb95f8fea050fee7f96a93ebc9c663a45e9af668508114f92a7727dd7adc851240b2f30c861d605f97b0854009945cd19c12b SHA512 cc74398d2b45222d2adfa4a43599ec2b62e6c8d924cdd2b8a8409813bbdeaf4b43ead514aa2828055ed1469b863c407c007624e68f60d33ed831758667abd9ee
 MISC metadata.xml 449 BLAKE2B 9e9297b48e6a43c171d18f6d6b03767499c9edd2be418bd9493048906ad261c9b715f4d86cbebc478a76cd432600b9bebfa006926c65c9c029551ea24556194c SHA512 d0a640007c8cdfb9c950c2de71fc4ea97d8d2a2499bce05bc0e7ac0b4983d9ca9d8782f39129f8f664549f531be35ab471023e9f498498ff8aa821622d39332b
diff --git a/dev-python/flask-bootstrap/flask-bootstrap-3.3.6.0.ebuild b/dev-python/flask-bootstrap/flask-bootstrap-3.3.6.0.ebuild
deleted file mode 100644
index 71dbf8893bc7..000000000000
--- a/dev-python/flask-bootstrap/flask-bootstrap-3.3.6.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="An extension that includes Bootstrap in your project, without boilerplate code"
-HOMEPAGE="https://pythonhosted.org/Flask-Bootstrap/"
-# PyPI tarballs don't include tests
-# https://github.com/mbr/flask-bootstrap/pull/134
-SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/dominate[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/visitor[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flask-appconfig[${PYTHON_USEDEP}]
-		dev-python/flask-debug[${PYTHON_USEDEP}]
-		dev-python/flask-nav[${PYTHON_USEDEP}]
-		dev-python/flask-wtf[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Skip one test which requires network access
-	py.test -k "not test_versions_match" || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.0.ebuild b/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.0.ebuild
deleted file mode 100644
index 71dbf8893bc7..000000000000
--- a/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="An extension that includes Bootstrap in your project, without boilerplate code"
-HOMEPAGE="https://pythonhosted.org/Flask-Bootstrap/"
-# PyPI tarballs don't include tests
-# https://github.com/mbr/flask-bootstrap/pull/134
-SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/dominate[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/visitor[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flask-appconfig[${PYTHON_USEDEP}]
-		dev-python/flask-debug[${PYTHON_USEDEP}]
-		dev-python/flask-nav[${PYTHON_USEDEP}]
-		dev-python/flask-wtf[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Skip one test which requires network access
-	py.test -k "not test_versions_match" || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild b/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild
index 284d03052a71..253b8637e985 100644
--- a/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild
+++ b/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index 5087e33ba738..3ec60aa0f576 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1,7 +1,7 @@
 DIST flask-cors-1.8.0.tar.gz 17368 BLAKE2B e342a8d026cec1148448f49a0114c598dba7825d5a3c0ba3d92557c826c2474686741721a35dc5b8970a344b463c1fab21988527dc46846c5f84bfad1aeb096a SHA512 185a4e5785223d547373ff40d18dee2112a8da2dec2ecb39cb7b7c394e9220551e46302590870393c35902dd12e58d3d7cd4fb8fa052828b21d4107457a080fa
 DIST flask-cors-1.9.0.tar.gz 22846 BLAKE2B c0aae306a810fe39c9f7d374ca2af1a89f8ab6e51dfa03c7542ff0009e928ef47370d29543ebf6d457c4882cf25c2cde8df9095974db707f60e7e46f524f3bf1 SHA512 0ed2d4fdd80b43bbbcab4257c3917ea12b39a9da89989e3cad5575d1ebca1523f9cefaca6c36b4dae81629f65936b2cdf3af04c789b28cc03d5660062c2a0e56
 DIST flask-cors-2.1.0.tar.gz 28038 BLAKE2B ecba951b0bac645088658ea5dc4947c0eaf9d0adb8f0f70e3a3f68337e008cb04a5efab3cb8139aaddf380f9b59c2524d33a5c5ac851b98446dadff9aa82fc92 SHA512 235162749485588e9112a52a833a43e68ad1737997628dc51cc30358d01837f427ba33872ecb1fff8e821b84c3de0a15a1c89c57f2407ef0cacafae9ca354640
-EBUILD flask-cors-1.8.0.ebuild 909 BLAKE2B c0366afa30b8ff882d7b3ce7145b7801fbf62d993836196e923dab37c924a66c8a8ed3714977e8833f4b9fc2a53ffac1263c8a288297b01c224c6d9db048b4ac SHA512 28d89bf5d2e985c4b6614c83373bdf596d7a02806ac19c0d85dffd745a3f116a5edd547cb11d593734d514305d82ba01d7e83fe7a5c07a4218f098fc80699905
-EBUILD flask-cors-1.9.0.ebuild 1704 BLAKE2B 20d8ceea14eec140b5b7cee96d2d1fd76bde67160b67a9537f5e13dfcbbfc12245054544c142b3b4a186a89e15bdf5a7b97e3bf745b8442512d37c1cb7b75f1a SHA512 534f8dc1ffda63c11ce5f2746b3aa04eabbf0ddd5a4680c0d0f6f723422e5c4fb4e6bfb81e5a2a52827481c170dced36e49da0e67cbfd4341a7ca63b0c2d742d
-EBUILD flask-cors-2.1.0.ebuild 1712 BLAKE2B 585821dca9e68027b7079a35f30cbd99eff22deeb2f8bd91840c3491fb32b4a0886316120faa406e5fdc6b64f48acf6d8f660936b4827cebca536c3540148693 SHA512 e53efa0e20086069b1dcc5a427cf0f7485f55c65419caa5095eb106f0df6f9b6bb708918f86cec2c498c7d5999207fbfde894ababd68b1bfc862d01bc6be6245
+EBUILD flask-cors-1.8.0.ebuild 904 BLAKE2B cb7e3671c218590484c78a8b3fa57636368f40f1d62518f50efdc644c2680872d156131af40688f57b989d9a2c9fe1d35e503e18bc2e196589d3aaf5846ce584 SHA512 9f6a0ab9e512bcb8251842e42c5c11ce34c68354d987c01b199e96dcc0bd74016510170c6733d60cbf441031b3fdde48ad4bee3f71b5201e76efa3331aa692c7
+EBUILD flask-cors-1.9.0.ebuild 1699 BLAKE2B ccf8efe656c6641cb4a94cb517fbac93c88b6f8bc83e296de13c1769da6b2b808bb0821f5c1b5ccbbc197c6aaf8313f51aac25a22045923d2a15fae6ae9a15b3 SHA512 931a81602ab463df81728c2e5a4ba20c972aa689ce92e2d1850124583a3fe37389a87005cffcb80a3495f77acbe7f3b5a62e720308a89e31d377b4b3344d743e
+EBUILD flask-cors-2.1.0.ebuild 1703 BLAKE2B 2a1dedcfe64884b82bc4998b08a516ee183cd096d752bdfc75b12539e56c0f5c6e0f5c1f6e2714e7ca8f4ab5aec9dbafcec25214a8ca702e74fd3d64b4823c5d SHA512 6c6d4c63f04d8fd6378e97c4b0a7bbc6eab7c8e0ae79d578528865c0b07d057b7b4adb53aa84c28c1271d63919676de1ea8e343c4c93b58cdd72435416d47f09
 MISC metadata.xml 514 BLAKE2B 255de178f7bce4d4b4678199a8edf799c2a07bd79c8c518bf28a056a2166169864c3e70315d80a09db14ac15a858cc759f5e401ac9808dc5d7d3f2b1c8495dde SHA512 d91e721a0f45e423cb947f5943d9d0615a17f84401c365584ef3eb2b157259f5bf978a10c90e690a52d49f4160c1991f9edfb26e74768686200149f50a15a443
diff --git a/dev-python/flask-cors/flask-cors-1.8.0.ebuild b/dev-python/flask-cors/flask-cors-1.8.0.ebuild
index 11129c7c0ee6..5c9edc827471 100644
--- a/dev-python/flask-cors/flask-cors-1.8.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-1.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-cors/flask-cors-1.9.0.ebuild b/dev-python/flask-cors/flask-cors-1.9.0.ebuild
index ee4ed95fbf44..b1681d1c1f62 100644
--- a/dev-python/flask-cors/flask-cors-1.9.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-1.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-cors/flask-cors-2.1.0.ebuild b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
index dd7ed0fd32a1..ae79980eef17 100644
--- a/dev-python/flask-cors/flask-cors-2.1.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-dashed/Manifest b/dev-python/flask-dashed/Manifest
deleted file mode 100644
index cc53a253a565..000000000000
--- a/dev-python/flask-dashed/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST Flask-Dashed-0.1b2.tar.gz 325834 BLAKE2B 88538f4929f914799f08e3b62173402725fd1e087efd2a9173224c0e1e9413392495af89156c61d94d259b08d61a73b4689a7591a7cbf3a992c9228974a24468 SHA512 daccb1e4ac83a598c25c7ef202f50f08c19473aa27d8c936a9918b3e45bc9da06de7499a3976e6fff001fd81cec787093594a13c814bf26e2315793a0c8efded
-EBUILD flask-dashed-0.1b_p2-r1.ebuild 717 BLAKE2B dd7df98beb972479dfeff5474e1f36988885127c228afe6a78b7b4927212a18f203cfe052945a5b84b302cc9d625a6aa8b4f6416d44c663a6beb86dbf850f46e SHA512 22be2631434ac1be7d3f20c8b7750fedeac1bc236de734aaf6fec0e2122bb09c8abdda08ae8504c3b43b0af174695dac3b419868fbae5ee70c1c29f0e05c6cb4
-EBUILD flask-dashed-0.1b_p2.ebuild 699 BLAKE2B b3986ec0897e1bb8b6911afff923d73b34d8651f75eff4e4a4010593216f2ab449e934c5625e6dd20a18d6b00ddf8431da179445faa13586946abc51c2c64fbe SHA512 74ee0bd43035b86f2c2894210fc4b48cfc0ae4dee777995496c16da65e4280e5556c7247518b7bd052be3616be966a6541f8aae714c770a7ca932446599a7766
-MISC metadata.xml 325 BLAKE2B 6d2067a3a43825e4f3d6a206eca6896464bcc38843c242d2e6455ffae9e62466801c5a1a12df81415c80a432ce40dc31e78f33777f7cded405f7f0f2d81e979e SHA512 0b51bdfd9a4571b913c3107050aeab288dab2c2483ce1b608780d400229327fdbbb3c7d8e836f0e36a0617f6814b7c243978c7afb4454a00383d125b617dab9b
diff --git a/dev-python/flask-dashed/flask-dashed-0.1b_p2-r1.ebuild b/dev-python/flask-dashed/flask-dashed-0.1b_p2-r1.ebuild
deleted file mode 100644
index fc08dc5701c3..000000000000
--- a/dev-python/flask-dashed/flask-dashed-0.1b_p2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="Flask-Dashed"
-MY_PV="${PV/_p/}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Admin app framework for flask"
-HOMEPAGE="https://github.com/jeanphix/Flask-Dashed https://pypi.org/project/Flask-Dashed/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-wtf[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	rm -rf "${S}/tests" || die
-}
diff --git a/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild b/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild
deleted file mode 100644
index 863405ab1ee4..000000000000
--- a/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild
+++ /dev/null
@@ -1,32 +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
-
-MY_PN="Flask-Dashed"
-MY_PV="${PV/_p/}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Admin app framework for flask"
-HOMEPAGE="http://jeanphix.me/${MY_PN}/ https://pypi.org/project/${MY_PN}"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-wtf[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	rm -rf "${S}/tests"
-}
diff --git a/dev-python/flask-dashed/metadata.xml b/dev-python/flask-dashed/metadata.xml
deleted file mode 100644
index 970bb09cd936..000000000000
--- a/dev-python/flask-dashed/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">Flask-Dashed</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/flask-debug/Manifest b/dev-python/flask-debug/Manifest
index b0cc1773812e..837a604de0d1 100644
--- a/dev-python/flask-debug/Manifest
+++ b/dev-python/flask-debug/Manifest
@@ -1,3 +1,3 @@
 DIST flask-debug-0.4.3.tar.gz 9148 BLAKE2B 9263a4df08f1a9518a42a025a14a89b902c62ab08b25d79b3dfffb25675a47785d0bf9075290190ee4622a30a89e190a465a87986b47ceed7d724ce0b59ad218 SHA512 7bc1cf9f88f28e2ca5a24c1454dcdb4e2a450eff3c00329f299c3840032e0803079f565652974f4c3a0e5aac443365ce47a3d2c2fee8e21e2e0c7150367e8816
-EBUILD flask-debug-0.4.3.ebuild 1222 BLAKE2B cb35b6d85038cf220eaa64e2513b282faf90f728fad25d58304f454d9e19b9f1dba75192a153372aa3a2cc3cd281a153e6e5548441c67a87267ad1e3f401aff0 SHA512 b8cab971e18455f37e7a907e0d0a5b1f789428eca587d85ebb8689172630e1287376f364b7d03afb47d6089b505754e2dd5fe54e1c2584d015f17185ac3a3802
+EBUILD flask-debug-0.4.3.ebuild 1217 BLAKE2B 26c6f516a0dc18d6721d4135c14ed572b2d7fb2248d95849c1cb38ae4beb4648087a216970283c70d94b2fee1c69466f432e7b7574a4dba9a9d66a8729a3f528 SHA512 cd22abdf7f038bdce9af3df203ad413e98c88a144fb56ffb4c384d5a6531df0bdbdbe2c814e6329eded2320f826e93893946a01b2f461f11836231da60474c6e
 MISC metadata.xml 437 BLAKE2B a47818cc11d0365a7a03da5ea3c9fa7bb60d3ec783d63bd8780e11db56dd2093e39ecf4633f462f17cf95e97c93dfbc64301c1c321450a985dcfe28bd6a1bbb5 SHA512 93d72b4859ed2838632f65de971957dc279ccb5897b703b61baf5287a5748f33a7b94f484f8f457b6e4a4e7c5c25e7a5f35506c86e3f539ad7240bbc66748398
diff --git a/dev-python/flask-debug/flask-debug-0.4.3.ebuild b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
index 3afc356acecc..1c4d0a2ed7f5 100644
--- a/dev-python/flask-debug/flask-debug-0.4.3.ebuild
+++ b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-evolution/Manifest b/dev-python/flask-evolution/Manifest
deleted file mode 100644
index 92c9f973d72e..000000000000
--- a/dev-python/flask-evolution/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Flask-Evolution-0.5.tar.gz 3582 BLAKE2B ec09fa91c6864fc641adaea6d4d08c3db86cc87522678a2facb8fe862e9ac75625aadc77725a64d93236c33ec9da3ec842cefe440ecc3281926efcc8f342e3f3 SHA512 94c7861a218563e6e72b831728bd199d2eb4850a14fab5e144cde9d44fe2545ea739019250073a27bed588b2bbfc88da7067ce3495dab355398bc0aba5a5960d
-DIST Flask-Evolution-0.6.tar.gz 3480 BLAKE2B 97942798e3de0af38dc7d83dbcfab046f4b7d984b2ddfe8098d7bb69493497866a0f693613c909ea94649d9ebd370451bfa416dd4b0112ac916a88282ac0567b SHA512 04fd348b7ed0dc93d864bf012dd9708a8c4c0fac81cd31ddffe91159a7631f42095bb9d6bcacc08cc5498d836e3497b4ea9896f1df039a12eb78d5e2c236c7ba
-EBUILD flask-evolution-0.5-r1.ebuild 662 BLAKE2B a238cad1d3d4797d85001fa95187152d3097fa23bd60d6aad0368b4ab745e052a0bd71a780d7f5c619e00a3409355a0f47fdd7e402a73f83e0027346b30235af SHA512 fd95659fb4ecaab5f1bb8c608b1402596972d15c953ebf45776efae15a1ae7d8c0dfd3397816a053889df6433ac4e52607a99083c9f133a4359f16c8e6cec65b
-EBUILD flask-evolution-0.6.ebuild 664 BLAKE2B f521d23830afcf1d83661f9e077dc46251dc3a3616850f9798fff5168884a204b935019050dc92c3d09e7fe45535e06a5bdf3ea70ed0c8afbfd57a330997e986 SHA512 dcd3f030c19b8b3e35d4194a011f2464b2f466d43990e9e6da604a417f8a8ce62586802587c86047c2f226fb29f0e22bfb1ea72372907b3b3d04138e63990a7b
-MISC metadata.xml 328 BLAKE2B 1512ec1286bec178c16915f8df84398031330edcc7446f1f7d50bd3129e072ab9243da8e55f6abe7a35dfc753a8bc6ba8cdfbd98789166202607264e8b058901 SHA512 741ee52e1130543a13ba76ecbc075ebb4be4818d99741240d99c7804140fe6ce9f8fc404c14fffa62bb44bfde69444eccb0e90d4d81d7e0e6ed61a21f81f3922
diff --git a/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild b/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
deleted file mode 100644
index 8782153aee51..000000000000
--- a/dev-python/flask-evolution/flask-evolution-0.5-r1.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
-
-MY_PN="Flask-Evolution"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple migrations for Flask/SQLAlchemy projects"
-HOMEPAGE="https://pypi.org/project/Flask-Evolution/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/flask-script[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-evolution/flask-evolution-0.6.ebuild b/dev-python/flask-evolution/flask-evolution-0.6.ebuild
deleted file mode 100644
index 511bffdef127..000000000000
--- a/dev-python/flask-evolution/flask-evolution-0.6.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
-
-MY_PN="Flask-Evolution"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple migrations for Flask/SQLAlchemy projects"
-HOMEPAGE="https://pypi.org/project/Flask-Evolution/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/flask-script[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-evolution/metadata.xml b/dev-python/flask-evolution/metadata.xml
deleted file mode 100644
index 18f05ea414d6..000000000000
--- a/dev-python/flask-evolution/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">Flask-Evolution</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/flask-gravatar/Manifest b/dev-python/flask-gravatar/Manifest
index 5cec548706c9..926ebb72ce20 100644
--- a/dev-python/flask-gravatar/Manifest
+++ b/dev-python/flask-gravatar/Manifest
@@ -1,5 +1,5 @@
 DIST Flask-Gravatar-0.4.2.tar.gz 14216 BLAKE2B 3dd270e620c047990a099315b8273e60ffeac01cc2dcf152a30203027623a209bc4f895ad3c8a2320a0f0eddeb8c84765e46a601c99dbace8f6983914175bd16 SHA512 9f18faff3dc0b3a5fae4abd538b690c8000fe17e3ed0a9417d6b28e5a40f34143530916bc35c1bb302ed8a72e15bb8e0f98116e5bf7270f9671f8cbbf7671ba1
 DIST Flask-Gravatar-0.5.0.tar.gz 17299 BLAKE2B 7dc16c609cdfbf690a39fbb3bd2810398030bd5c7a54394468902dd131116509da8de448a55907e4738fc984ef422f3c7970b8453b27971eadb106cbb8648562 SHA512 bb4ff064489a030fd763a46fc045109104535474d115aaabdf5c4d1a82a1e3303ee34f590a3f1203a9d009307fc8c45c37af7c30e76a4fb10bc46dd684d37751
-EBUILD flask-gravatar-0.4.2.ebuild 634 BLAKE2B c0cfa66deb166ba1049007a727ce77c08295ec4f4afc832174b6f4aa8741849a1c191ef76d57b97d0bb350dbe6fc6ad9807ebf6b67b2e546050ec6a13fdd4b21 SHA512 463183ec037fe3d5d6dde827ee18074646a1ba2fefabdcb884bab8fbc64a60fc18e80bf16829ea97fae074b7437dcb298c406e969b7d460230bb8c6e46ebdc2d
-EBUILD flask-gravatar-0.5.0.ebuild 628 BLAKE2B 449218c6157b44a05dd26d4dc9580c8507f6083d07bdc47b888c862b99e7136b9f19efc29f45be22d9a48ce3200ee1c8a345d3915daad69ad8e7c694a7ff2e45 SHA512 97e2455f9368ecd6679abd562a81c375ddc611070f92fa0979156a9130837ab48b534c2b9277fb374a044da5be1838aaec0f09910f7b3c92d366267ead1668bc
+EBUILD flask-gravatar-0.4.2.ebuild 630 BLAKE2B dd3e97bbd34a0dc807ee20306e112c7c0668f6f2497d06ed0f6b5fccdffb59b3ce16b894c91b33cc13a17b0eb9f7df0f2800082b57ff19e149f4024fc25d0232 SHA512 e44877420a65f31cb41e8ed8e067f4076c39d2db8d832735e01b3db17ec0b96e971c209496fadf2a6d22b93d716ce8382ff2ed003f722c30d3362447133dc2e4
+EBUILD flask-gravatar-0.5.0.ebuild 626 BLAKE2B 591777fc12dd8ab725453f522353a064218211e4e9a22892536ec12dd5aa1988b78084bbae9cd65313c2409429d4c043952c5edef108c5f63cb6f99b8ac90d2c SHA512 b0165d934744623b0af62ef60fada09da2b5d99480d0a170dd56f340406381fbcb4b6910a13c841683e7bb5e8af2250577dbb3ab344495a356c0b1f4e3e95a77
 MISC metadata.xml 431 BLAKE2B f3d71b4c8b86528458a7dbbefd527c9b32252338950f799ec315351454219dafed0b84e74e1e2443b48114a50c8bade0953648cd5ec441b2722fee4e63e5beb6 SHA512 d6cc23df1b882978c77421c21b2a00ea7bdc6781ebd283b00cefdff1efd79e6822025e63f2fc64d2268237f114a6e0f6b451487060d66bfa30295312518f6bbb
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild
index 29647e905532..d3fe1f19d85f 100644
--- a/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild
+++ b/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="Flask-Gravatar"
 MY_P=${MY_PN}-${PV}
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
index aa5cd58512f6..27bb3a7103c7 100644
--- a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
+++ b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="Flask-Gravatar"
 MY_P=${MY_PN}-${PV}
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 163bf6b4a1c8..37ddb065897a 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -2,8 +2,8 @@ DIST Flask-HTMLmin-1.2.1.tar.gz 2921 BLAKE2B 61601aceb58545972469ca3482e7e44464d
 DIST Flask-HTMLmin-1.3.2.tar.gz 2991 BLAKE2B 2f7dd1bff1c67e7b69c3d0eb5517ddd1fa0a2c9f5b87e9017eed207c4536743cb73cd6962f7f6d82cf1e061ca5a4401154464bb59f834071aa33853f0be27a3f SHA512 cb8730506a445fd1709ecfb03b7bec37df2d610f4c0f42aeeea0fff2ba1e76b9d16a341afb8684792a4ee6e3852d5eabdf7b81b229533b35c28a5362f58a7f52
 DIST Flask-HTMLmin-1.5.0.tar.gz 3609 BLAKE2B 0e3eca5978d98be413d9e52caaa25ee7949fc3476e9d046417f1a2328e4460c60728c1b9e3e892b3549effb64e6a5b472832e9fddbb1a7e9780ac2a49f75a12c SHA512 73c551237c67d5a0162f0ac07b5b9a79ef06f082d6df985155dda283f2276b7272ee6f2b4c47fa755af30ae69c7aadc9f3cf595c7f8be4fe41aa06bebc15a66e
 DIST Flask-HTMLmin-1.5.2.tar.gz 3807 BLAKE2B 226d0ba30ce3c0f0d8077f67d3a56aabf6606ac31858fd051f46203123fdbb2e3707575a91f545b7ec57a1e6f4cf62f87c3d387cc7ec321d7f1f9e4b3c6038fd SHA512 b468b95329054f996ad275b00f58dd2cddf52a029eeb08ff83acc5ef37ff0557af4e98181c445a980da2eeb21dd913ec1da08e0953fb97765d4790731353dcc2
-EBUILD flask-htmlmin-1.2.1.ebuild 572 BLAKE2B fc3a70cb82909012ce0064e571bdc28fc6a4abd1765a3ce6fcd0bc58ed53887a85b890ff7f0dcfa42ab94af5b81a77263863ff0a9270ff5ab1e3a91f5a500cd4 SHA512 3274b536a8d6b123b0a5bf4ef8b0e8722fe3acd3062cf73f03d4733da56e7d959fda02dde4bd8d96953dec67464ab2507b9830ce2bcc18e3f4921efe5adf84c3
-EBUILD flask-htmlmin-1.3.2.ebuild 572 BLAKE2B fc3a70cb82909012ce0064e571bdc28fc6a4abd1765a3ce6fcd0bc58ed53887a85b890ff7f0dcfa42ab94af5b81a77263863ff0a9270ff5ab1e3a91f5a500cd4 SHA512 3274b536a8d6b123b0a5bf4ef8b0e8722fe3acd3062cf73f03d4733da56e7d959fda02dde4bd8d96953dec67464ab2507b9830ce2bcc18e3f4921efe5adf84c3
-EBUILD flask-htmlmin-1.5.0.ebuild 681 BLAKE2B de3c9a129b64ef7e7df0ba1b8ca7c882e88368b1586892aa922e6997c9e4ed172b6109f60a5134775c2a4aac7c276cf429c8a9835f4d0677905c4f2e673a9e40 SHA512 61f7b914d719f26e01564a112998c7822c9c3e2696d6c474c595a4140a3156712fefdb98f6807b3e3d550f59e65b32ce3ef6375ceb50b292dcd8720ec3bce395
-EBUILD flask-htmlmin-1.5.2.ebuild 683 BLAKE2B c601ff1f5eeeba57d6595015343d0f2a09baeb2033fa8ecc5e3285e9faf17383fdbff71a788458a98ffe1fa5364c62a71b64f9a5696902d6e6d715c9d7aa93ba SHA512 e39a966a8df41a4e28a8aa2fad00eec403d4b7f474b3a6f6213f6d4a2b3d9d68f7f4fe209ee521147206b1a91a3c2bd3817cca7fe0b4092993c5ecf87e65454a
+EBUILD flask-htmlmin-1.2.1.ebuild 568 BLAKE2B d8a413419da0817366ea689080d08c166240e0fcea66fee46ff7ba3d4f7ee6bc30f8f4e486038ecb92a4236cf837ddaa67a645c2147168840724bc79c3c4ac1f SHA512 0a2aa4b0f83aac94102daedea86df293c1d93fd4d7768fa92e25e8b11ceae846539ca752af5f81d46fc2f24b65ab870f310c2e69cd974eec8773707c46dc561a
+EBUILD flask-htmlmin-1.3.2.ebuild 568 BLAKE2B d8a413419da0817366ea689080d08c166240e0fcea66fee46ff7ba3d4f7ee6bc30f8f4e486038ecb92a4236cf837ddaa67a645c2147168840724bc79c3c4ac1f SHA512 0a2aa4b0f83aac94102daedea86df293c1d93fd4d7768fa92e25e8b11ceae846539ca752af5f81d46fc2f24b65ab870f310c2e69cd974eec8773707c46dc561a
+EBUILD flask-htmlmin-1.5.0.ebuild 679 BLAKE2B 4a14828819f58624f2ba60094127def750d1454c44a565172993f7cfcf92a5068284fa73b90960b0746914bce137c838be2fbd839b1ff611836f38d0e7668224 SHA512 76f201231875eb9b7d422b3571c41bd4871fd1c49051802517ebb4ff9da85d53d05adb615671d2077fb9cd20e036027cbdb4aa94e2565f089a6ad47cd9a80be4
+EBUILD flask-htmlmin-1.5.2.ebuild 681 BLAKE2B 9f88b6acc71f99336adc46e863cd6001f9cc47782d26796958fd24256b37f579156b0491a02cba94926e50b74544f0501f90a2c1cc39794807ba36042ae24988 SHA512 3e3e22a9b974261c2daf3a1ade0d666c2046c3d0f5328d5142b2bc4c62ecfe7115bee536ecdb3d4c1d716957d3599357ddb6477422fae6a4ad4ed9cb00e40db1
 MISC metadata.xml 430 BLAKE2B 5e46d9cb5b03bc29264074d3abad076a3699e6753679cacf19134355f35265cc70dbc8fbad591eed798a36cde80a44d78244e88dd7deadc830440ac7724132b6 SHA512 78c978ecd3f4ef205b0ddef1cec9e60b95988ce92bafefb5134e8a1f1f8fec8ef47f50af05ce3f71047b7f72ecae76a9f4d83add103ebedbc374fc4e49a24180
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
index 589a86e01e0c..defd667db78e 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 MY_PN="Flask-HTMLmin"
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.3.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.3.2.ebuild
index 589a86e01e0c..defd667db78e 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.3.2.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 MY_PN="Flask-HTMLmin"
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
index 130ecc91b1ca..e57214b19202 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 MY_PN="Flask-HTMLmin"
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
index 7d47d05704ac..22b4b07f3666 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 MY_PN="Flask-HTMLmin"
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 58e2f177ead6..861ea776e694 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,6 +1,6 @@
 AUX flask-login-0.3.2-fix-tests-python2.patch 1115 BLAKE2B 138cab48cbf144a3d4d4704ae293db79e9d41b30326bb2ec28c1c00e75ceec42a2b0eb46bf61ac369bd863406b9fa4a3d7bdb81421e1288ef19d03871e7f5d02 SHA512 2796244a27b504feba773d29cf394ed04b8d7812d8989aca9a5dcd58207c3b192545531c23883f9d6828320adfb09f31388e92af72da5d5a2d2e6df05b89282c
 DIST flask-login-0.3.2.tar.gz 38626 BLAKE2B fbcac55e4a8dc5fe78b4b5b3cb8acbe7293bfcc30ce5323ebe992c92407238198d34724179ac12e688875356e54f85f21a2870249ccafb48499df3880a6c2062 SHA512 c42af6ed7902145cc4778815f247ed88de6df7c929abe0a1f22aca0515495a54d298b2af2b74ba7d5e0ce9b453eee4c4ce03802a3e9ab531137e117e9dcdfc1b
 DIST flask-login-0.4.1.tar.gz 43679 BLAKE2B f30df1cc84289bc2dd1e59a30284d7152cee0731daf8b6e58b8203007c0ba74eb512bf9f2e41608d9656138038f5b5c752509ef5a203ef1e8bdba9182912b133 SHA512 c87a2948ac37439ddd76f3f11584bdd5910cb00e96a7400343cf4dadc5a0f9bc84d40bdc068d2e8c05bd5a510046e18473e9ad71502c5039a5f05b371ce9bb4c
-EBUILD flask-login-0.3.2-r1.ebuild 922 BLAKE2B 3b36b2d8cb9b7a292d0d037f23f7fbd94f35b86ec9a25dbf616abe362d6ce4d6ee1122b8690de0b8d4eca6ae3460e2e41a7c7e62e89265b975ab85f4b8fe79db SHA512 048d43ae6ea841517e021f1d4e345ec2afcf61a8ea2eb24e84622f2503ce6d93b3adae7466d19c441fe58ede176e0be312dfe1f5dfa19af80189211e6f0b49ab
-EBUILD flask-login-0.4.1.ebuild 1216 BLAKE2B 81ec00d8805f1262280b1664d55a07d56aeb8770d09f891a1706acc7d452a3193133cd84178726262c27fa30bdb2a70bebae4b76d219eecf02beb09487407d15 SHA512 0a81491d926f827f1b4ea8ab75be0c6b9364cf1dd3ddf8240720a5202a189f54348ae775ee4f3666c304366ab36db183a0d003d63f28fd5688f7afea403c52e9
+EBUILD flask-login-0.3.2-r1.ebuild 913 BLAKE2B fd31837e748cc80d91c3b09850891320eeb79e28b4ce0030e0d9bfbba64fb046a6abc69caf366f87bd35799974047f71ea9b1a5573fbb22efe96caef4f8b47fb SHA512 93af5fe9390c5a9cc79cc39c9f938ff3d4852c535e761e8edc4ce2972dc9456adc1075abd9980fc57cf1ece3d344af9098f3333e7e3515d2447c9a6696ecd473
+EBUILD flask-login-0.4.1.ebuild 1211 BLAKE2B 5201f1864201d15c60f41a4ab64bc62e71441210f956fbd88d735a631638f2b1180f1318ec463b3642a4dc66d52d2450977cfde6e5cdbe221f587aae79aea10f SHA512 1e972059797e155782b813489a68d25e2aaea4e4bb0de75f2df74f65a9a6616dd26acbcbe8e10d47a47c72b960aa3373926cd69410bb6e3324d516f0590c0d61
 MISC metadata.xml 379 BLAKE2B 0dd211944ab3c15c51198cfbd6a6bebfacbe3cc84c3f5bacb9d942c68ab1567399c5dac987bc8ba2e6c9a96eba063168689edd67563dec49946df346c38bc4cf SHA512 fdce43f3694a2e027fd12ca87bd0c964e243dac37a2d31a93c034cf7881097985402f9dc6ac45f02a157914705ddeb77965486506e94f67e0f868cb77a81f6fe
diff --git a/dev-python/flask-login/flask-login-0.3.2-r1.ebuild b/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
index e6f1be6368f8..debfda82ffe6 100644
--- a/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
+++ b/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-login/flask-login-0.4.1.ebuild b/dev-python/flask-login/flask-login-0.4.1.ebuild
index 374ba51babca..e32ff64de8fe 100644
--- a/dev-python/flask-login/flask-login-0.4.1.ebuild
+++ b/dev-python/flask-login/flask-login-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-mail/Manifest b/dev-python/flask-mail/Manifest
index 4c08d8ef98dd..22fc49c66c03 100644
--- a/dev-python/flask-mail/Manifest
+++ b/dev-python/flask-mail/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Mail-0.9.1.tar.gz 45654 BLAKE2B 4b7e352698bd9434c507d3a27b8e5b4976cc82484e86e64245423392b25000d904d19bafa07ea97a32c2a80ed6bbbbc59aed7386a8d5a2ad6b9b61b23fe4c5f8 SHA512 1d19f0bade77c66e73624d8af0919165f8b6f208a00c1e4025049b50ad56912557b8446cb80f8567adf697e92b126954a5f130bd9fa7a2345d4e98e35b29ac47
-EBUILD flask-mail-0.9.1-r1.ebuild 1075 BLAKE2B 2235ab738eafd4325cd955a33b91a9d1622bb014b7c79cf69f483faf920566e08683c83d61fddc044ee7fc297c03076c2f43869486b56c3f0ca6683cae2d5019 SHA512 9fc55a8d6624fee31001c852ac1b547212d5ba61151934047ce984ca3e96d5f805c09edb2fa17bd0767f73fd222cbfd7614dec9e9c1401b58c8b77ee74e3054a
+EBUILD flask-mail-0.9.1-r1.ebuild 1068 BLAKE2B 3063decf9ff3810207c696bc19fd07038e4969284322ff45cf0bf19f236526690bd6bedf146dfe14c2a72d8053067d4532c48c44efbe3c6be423105a8f21939a SHA512 05e8205478317e0274eae38b2c50a68bdad50c0c3dab2b0fbf64dd4f3c1a73b2e7b7ad72b1f352970fab889923f294b9b84de89d2e43b476393ccd271e59d43c
 MISC metadata.xml 313 BLAKE2B 750a760388ab833bed8c5bea79a563798f3f47790fcacd72779bcce17678a2df4214e22e3c5c636d9f0a1eb6892c235f9a573e991a518e68319d45ee5dc9f076 SHA512 b898617b8854d5d1abe05a263ff182c9734539aca8a7ed6721db1de0a9c76c5c90aca7867fc5a213b0e938d2b610ca48a79c3b71b01ff5291aadf6f46de93532
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
index 4f25a9f6a39e..dff1420cb773 100644
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index aa7b5f22a106..d99cde024b25 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,6 +1,3 @@
-DIST Flask-Migrate-2.1.1.tar.gz 15034 BLAKE2B b9cbf7bd15bd9dc8bba27e0c79800ec283b58e4fa9980a01f028e73225af1392b6271be0cd94a79de2cfc69fae1ea75e4ea1166b2a12cb7b398a6775f0f31583 SHA512 b5bf6b1b15dfa969e645640d14077fd4755f0db9279a75045fbc3ac685ff32ec19b3207b3d937e341e3546ba5c5c34e509c3964cc63d0e864f200c706b73d851
 DIST Flask-Migrate-2.5.2.tar.gz 12127 BLAKE2B 4c30cd5a3e59c890b0b3e397845cfd1424cdbdec1340793f406fb2e77cc3dc1c7eda777498d75e2250d09a310f28aea1b6ff5248df1ea151ff62bd7c7acabe72 SHA512 9c20fef77c1e0cd2a3ff14bdac48117e3d1610fe9417c928e111fa9c5761a63e67154dedbe83247bbea0f62796203bac61f4193478431607e26bdb253ee0892b
-EBUILD flask-migrate-2.1.1-r1.ebuild 867 BLAKE2B 440e1564e8bbbd99c6f6d69b8de3263731aff94954f9e61a7f98ce5892d768a0176a9135723b7fda66a83451e64234a13336cd53acaa72a58757713149723755 SHA512 b9db272fff91b77a61315abe64e1686e1a4773a37030e502f98af881c2ce6dd1c5d0dbcd644b9c363e218d8e94b45fb346a4dfd27635949829a871092b22d790
-EBUILD flask-migrate-2.1.1.ebuild 863 BLAKE2B aa923c797511d5630f37da51e24acbbb3d0eaa893c35e2d49594847408f852824644bea299b9a259f12705393cd7072ae95a50558af59cad1490eb756bcf0589 SHA512 0f7a6135674706ce5ed7d4a36da4ac417a42e619f9d2d06c93cda14f4ba1bd2868191c759764a0c9d99943d0b93d6d2960bc8d46f1c1fca343a06e380738679b
-EBUILD flask-migrate-2.5.2.ebuild 874 BLAKE2B cb2968de1424db4c2613023c12b897224a7c22463cc0694e04155708b07b2de7cba89cb0d0f395114c6f70b179a7505c2c75becfc297209d82d8340b307e503c SHA512 3bea8b456ef4ea47861b3962dc93712fe9d53affdccf0e89f871f13401249bcb86ee964f75fcccafd7b4c160a25d526c41a2db5e4ff2447f2433cb63ca70249b
+EBUILD flask-migrate-2.5.2.ebuild 872 BLAKE2B e3da80da7363b3c7c6e0136b9de899fab8111a9d9e55f11633060320e111c40186710d50fbee6a41f1b2ef3322683938ca6d62a10f17544b94e1bbb596c948b8 SHA512 c7bede253ce1d949ece81344b6a05aab011744ba783bc0511837c0f1276e6be4933c44ea14ef60604835cbdb25ef09ae260f3bfad2ab81da258745e21651fb35
 MISC metadata.xml 316 BLAKE2B d01833219129a9ba04f2198bd569d605319bc4c4d604e69cb6a50a5d855e0dddb6491f78a6674b939476b7128d15c11aa35d0f9eb44db149d3053c004ead4bf8 SHA512 1dfa03b638a9c39be69148ea8aabb4554326dc65bc3a004a2eb93b05fe4be8d667efc7470ea35a138bbe1bae17511a42d530448a98da5c5eaa3eb1c2d3126ede
diff --git a/dev-python/flask-migrate/flask-migrate-2.1.1-r1.ebuild b/dev-python/flask-migrate/flask-migrate-2.1.1-r1.ebuild
deleted file mode 100644
index 44c79a9af998..000000000000
--- a/dev-python/flask-migrate/flask-migrate-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-MY_PN="Flask-Migrate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
-HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild b/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild
deleted file mode 100644
index f6426ea8ceab..000000000000
--- a/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-MY_PN="Flask-Migrate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
-HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild b/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
index 12e2093b0e1c..55ee3028f874 100644
--- a/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
index 5654cebd409d..f3bd0e5c4347 100644
--- a/dev-python/flask-mongoengine/Manifest
+++ b/dev-python/flask-mongoengine/Manifest
@@ -1,4 +1,3 @@
 DIST flask-mongoengine-0.9.3.tar.gz 111690 BLAKE2B f94f057bb416715d877154bb2816308324d3f0bb41dfe2002b80ed2f078ab2bffeb62fc7bd53344b7d995111122d0b59a09dfe7700975e151e61fe60f2bdad45 SHA512 15b8031e4f8a9275fa6a602aed8466533fc9e6eb408d8f3316fc8814cc785feeee59dae25f40c1c30371e7e33bcc8727bb866bd99dbee0dc75cf15049576fb3d
-EBUILD flask-mongoengine-0.9.3-r1.ebuild 1165 BLAKE2B bb38dd9a0b7bf66cc89cb9bdf77a8956f35700a0216ebfc18c2aa821e01d1f764b14c7a8e1de9ff3f1f311fe00619c860f6cf0c4b18ea432f364df43250eceb4 SHA512 febfb3bce35acb4cc4298ee1b4e8c4b8e14e7e6e3d2980ee79f5331b2f3bd0ba7da983a10318ef608d8ab4907bf964ef5af62ff1dba1e9fc0a5fe1a94c1dd1bc
-EBUILD flask-mongoengine-0.9.3.ebuild 1158 BLAKE2B c33d1b36794b41d91b0fde6ee0859002f401795c42e4d18fd4ad41d9ee35a2bd2ba7c9c69ea5be5d8493c8b495f20a6dc95e71f17992c6a4b60626855beec076 SHA512 3176118d7e36d9036f6d41b6a4891cb56af046931ef3bc55fb0823ae968366ee961262f7b9b256b36ba1c6fdd3b7c5d59e65d768544f8e4dbdbdbe6b22d876e1
+EBUILD flask-mongoengine-0.9.3-r1.ebuild 1163 BLAKE2B 412749162e3a04136cabfaf643c9016e8405e7ffe5067fd43646ef583c19b863df767aaa0582158f36131bb19814e41731cfc71eadd4bc75577bafa74b01b669 SHA512 8c349010407af659522915326cbf2a3952f642028218d8c6829eda3d67bf4d3c8324c8557fa853a20578a471e7bde28b31e5a8012c9460530b58148fc278a380
 MISC metadata.xml 330 BLAKE2B 590f7ce9feffc4646a100469830bd4db174302fe419eb50ebc227fa9e7ae543b4d2a2da0d74b333ee4ea9db3c54a2ec9858f9f3cad7e6e063a4609ba11d18f00 SHA512 02da72329c4df28bb5298edb25f2a79117214feda68a264f7885406e8b8a5287ebad89c31f110ef2a409e1d3ecca525155ff2b6a7b2d2ed798342f02224b8b66
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild
index 09ac348d8be4..c84807b41ce3 100644
--- a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3.ebuild
deleted file mode 100644
index de2f0ea19122..000000000000
--- a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-RESTRICT="test" # requires running MongoDB server
-
-DESCRIPTION="Flask support for MongoDB and with WTF model forms"
-HOMEPAGE="https://pypi.org/project/flask-mongoengine/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/mongoengine-0.7.10[${PYTHON_USEDEP}]
-	dev-python/flask-wtf[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# fix distutils sandbox violation due to missing test-deps in normal build
-	sed -i '/test_requirements/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-nav/Manifest b/dev-python/flask-nav/Manifest
index df63011b8a73..6c37084a3bf2 100644
--- a/dev-python/flask-nav/Manifest
+++ b/dev-python/flask-nav/Manifest
@@ -1,5 +1,3 @@
-DIST flask-nav-0.5.tar.gz 11579 BLAKE2B e643a7b49214ae164da390ca6c2b6b00fde6fc0848b4ff2c74749034d0e225bd8a5388e64db69a88e8edba91af9635ef843b133ab7bfabb33f92eec562930133 SHA512 94ebd858754c0ac936b43762cf427c381faa40de86e73b487d6b415d099696e6216b96ad9fefa62516cefd8e51e7ef282e01e1a492783ab696a9fd3602de7e78
 DIST flask-nav-0.6.tar.gz 12270 BLAKE2B eff90b6fc08629139012e2d920b4d464ed06954040a5e97636a7aa4d59d11654839460ef52477cfcec967bd774d942028a53675d682e850f08f6359c5cfbb54e SHA512 a7930687425a53fac9ad9a7cb65c2e2a759a0c9660189965bf37ea6e9925dd869074d37a283801631b3e6c3391f9f4167e0a36294104f72970e876b5a7a0930c
-EBUILD flask-nav-0.5.ebuild 1001 BLAKE2B af98b85e039153685e81bcbe4cd0b3c130aab1caee3593d98b3c46dcb85f5b98887f185bd3244f5f9b7587a8a1d699f462b28961dcac4fad4055b30bdb01117d SHA512 2f228b185369924ad987c556341a05d24d665a0c2e5c37b199133e63f133938c02fb44dbb6f84503000579358ea749318dec03bfed12e259f0bdac65768568aa
-EBUILD flask-nav-0.6-r1.ebuild 1225 BLAKE2B 61b9ce41c537b0266fbcb7dad6ffed93e11f1821e5faf99b5a9ac46c6f5300be80d002986dafd8e9d455b9668d1eeb2bd2d7857122a85f724af363e6f6adf37c SHA512 04236df1cbc45a32b8931a6f33a13e039ce624d2b748f9c57709ea901e3be0c281e0be418c06c182ee6b096935f7988c00367f1be300f351b63eb7ff9237b89f
+EBUILD flask-nav-0.6-r1.ebuild 1220 BLAKE2B 12a0c429ab6066eab79f6f95a765f6044ef62b785cd240990e7bacf607cdb7726ad19ee4c8ecd44ac33b69bd26383e783670fa4a1a4d8fddd7ea847a59b9fd36 SHA512 f7f7b8e3adc8913c5d5fc1fa7402544df2954d2b45a6630ec55b779b36f630696b52b5912aaf8abb9676e8724961086d13d93253227c1041141f34b11dc71e7e
 MISC metadata.xml 431 BLAKE2B 949791299994b108e48e5bfc9076726ffac5a530783464f54b44deb95646492078e3cb608e99382c04b2ae825336e644433fa5ce7775e7f44d39f6e2840565b5 SHA512 aeae5220fab0583fb7b5f4a0e694791edbaf6b9f5f61fdb04d48b4a91f12726b3101e41097e26980404a19e8b6c5e43723dfc0b61f8d4cfea0f6a5924f8b67f4
diff --git a/dev-python/flask-nav/flask-nav-0.5.ebuild b/dev-python/flask-nav/flask-nav-0.5.ebuild
deleted file mode 100644
index 4529342cac2f..000000000000
--- a/dev-python/flask-nav/flask-nav-0.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily create navigation for Flask applications."
-HOMEPAGE="https://pythonhosted.org/flask-nav/"
-# docs are missing from PyPI tarballs
-# https://github.com/mbr/flask-nav/pull/12
-SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/dominate[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/visitor[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-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/flask-nav/flask-nav-0.6-r1.ebuild b/dev-python/flask-nav/flask-nav-0.6-r1.ebuild
index a9d937a83c5c..9c3f4f6e8cdc 100644
--- a/dev-python/flask-nav/flask-nav-0.6-r1.ebuild
+++ b/dev-python/flask-nav/flask-nav-0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index 05e1009694f3..4edc2c24b298 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,7 +1,7 @@
 DIST flask-paginate-0.5.1.tar.gz 5397 BLAKE2B 819740f6d1ff55331932dfb1a588fb0a92b2a6ffbf66c0ffcedddb2014c42c10f76ce50306fb9e389c66fdeba98fbf0d476915e935530bfeecc853ec25c1f9d4 SHA512 f17610cc3861d587e1940a69957a9266459270453d8f7c15ae6b6e5fa91633194e01384b1cec98647db70f38090d18fd44bf2fc4cbbd8d1d64cf541a5bd620c2
 DIST flask-paginate-0.5.2.tar.gz 5535 BLAKE2B c343fdbd04097ccbf187f7a0aa127157fd18e39e68c6ca6dfee0e30a31f6e6b25bac4f2d64cf7a88b4c9addb53e45f381146f9710d84335ceb684198ad164372 SHA512 03cdce455f64da226a64137c3a69fda23749280e52df5d4fc4850e816c38810519a2f5a79bdd06709fc686ff413bcbc4a1bf20da44eba7678c5f3e542c277037
 DIST flask-paginate-0.5.3.tar.gz 118570 BLAKE2B 0c6d1163dcd8144afa80b217ab3a714a39f4015aa732b4c32cf0feee0d7ee06968bd8549651f2941be9c60d3fd36a18e132dd4c174eb4148e63f83e461cbf519 SHA512 fe3cdc808459528c449611b2411c377d46bdef4995cd2851730e90dc0091da15479022f401e31113c4d39f766841d9701f285c81e0ec6293eddd4c8f0821567e
-EBUILD flask-paginate-0.5.1.ebuild 519 BLAKE2B 991a5e31ff7876609146937efbeff40f8d48d9f06f0c30f00215db77f34e42c9d832290d166f85b812d7b5f02db7f8150ba82719f46250199a080f54b7981daf SHA512 8b899d8bcb98aab56878e2d4fc71a6311a49a43b20053b29b8d96c4312e5eda32badee668105df44c1898b1c0fbb809147586aadff4aeee2c5c542791f93f8b5
-EBUILD flask-paginate-0.5.2.ebuild 556 BLAKE2B 345acfd9853826a8d0f1498b0855292d958310d6f5a2b7e1783fa24882d25d3723b7966c4039512003ccde4566dac79ee87a4af08bdca1abaa3ab3a6af0e90f3 SHA512 96a2b5f11b52a32c96899583363cb90c9c2878223e1aba448cd833a1db9e07baf762a0397b7fdb682c0f4df88b25961275966c454fbe7533c90e5ad8cb886167
-EBUILD flask-paginate-0.5.3-r1.ebuild 827 BLAKE2B 77a5a0bdde57c48d9a929ac3f4b023ef7b1d0a044261c6a14b33240089c102dfc6a5c542941cbb43e54fcd6fb272b280e93d34a069ddd8c3aa1e518979fdc7a9 SHA512 2ae81f1e0fe084a20bff0f09fe515770f3464654a6207e20c4263d92f3eeacc6ebff597e0b5d2e5aaf614c7a8f1f8675180a954586f1302898201ed5fd4b4b71
+EBUILD flask-paginate-0.5.1.ebuild 505 BLAKE2B 0fd2c287b10688d598026bb84299f1622044371efc4143d4fe252256f5612f1ec94cc41b50555bf28994ad43e49541cae81e44bc85e57ff532eaaae2261f48f7 SHA512 4ad3500ca1ffd19a59c3437ab5a73d29409d103fc329f5d802fdc89315dc12a434ff08ab16ee73e85626aa961a4145ff5947f69e944dbeb854a99a3bc7b6dde9
+EBUILD flask-paginate-0.5.2.ebuild 542 BLAKE2B 3d830fb2edb6e4c9314c4ddb61754c988b36aed20476531d1b00c647215d297aa23d5317504defadcff65d3f93600bcf32da3dd25409dc8d2a5db504f79df155 SHA512 ca6d3545e84c4f381fa72a8376ae86ec2d83012f9e24ec08e4a9fdfb53720b22d08a97d5f969cc254a58a3cd1cf44e4aaf5ad1114379a8d2b54b78cb0a4f55fa
+EBUILD flask-paginate-0.5.3-r1.ebuild 816 BLAKE2B 33c9a4ebd5f8cf7068236c541ef996453859a9bc2586eca36f57d8c8634b938ed951e516a11c3016f6109adff71646d8386d125fc54e546309822afc106275c3 SHA512 218bddaca192b67436a698c9dc7898d45c79b688623c39f1efbc5b9bcdebed101a8e801d087a196e435f9d45d36bf698fbea224f1984a72ea9d8f09f7e824c45
 MISC metadata.xml 618 BLAKE2B f9feebe27aa247c8458d416154475e0c0234e2ab391d6b9dcf06016c01cebd3d7078efde6079646ff3a8b718911cec1d0699bb5cb4eb2a319b14752718f8fdb5 SHA512 9f6ff105f8b01580628888ecba7a9175e42618ef17e96a90dce15f08335b5dbc76a6b09cbabfd9a7fb659557e04531e4fb46ec3856418d96e18cff5da7a61cba
diff --git a/dev-python/flask-paginate/flask-paginate-0.5.1.ebuild b/dev-python/flask-paginate/flask-paginate-0.5.1.ebuild
index 08566266ac43..34ca2b23698a 100644
--- a/dev-python/flask-paginate/flask-paginate-0.5.1.ebuild
+++ b/dev-python/flask-paginate/flask-paginate-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-paginate/flask-paginate-0.5.2.ebuild b/dev-python/flask-paginate/flask-paginate-0.5.2.ebuild
index b903ff10757d..7d13ed27e4f9 100644
--- a/dev-python/flask-paginate/flask-paginate-0.5.2.ebuild
+++ b/dev-python/flask-paginate/flask-paginate-0.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild b/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild
index f4051d490486..22d2f703dbb6 100644
--- a/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild
+++ b/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-paranoid/Manifest b/dev-python/flask-paranoid/Manifest
index 81dc7586ce7e..eb27a4e46fbe 100644
--- a/dev-python/flask-paranoid/Manifest
+++ b/dev-python/flask-paranoid/Manifest
@@ -1,3 +1,3 @@
 DIST flask-paranoid-0.2.0.tar.gz 101084 BLAKE2B 5f1f92679da5f374699c8acc97300085840d47e57f48d935cba60e78782109f70651bb7f804410dbb241b48c96ec08498b8b2cc8c18573f14d0bc7972b746d19 SHA512 0d642999fa4d5b795c3dcecc586fc1600cdfceec4adb38bb87ca8be9825d9ddafabb07d98df573a89e61a44a0abd27cbbd21524237b0e23b337a7d5e32ddfdae
-EBUILD flask-paranoid-0.2.0-r1.ebuild 673 BLAKE2B ce71541735fb655b08273a7c408dffcc506397a56974cc3347e0e26a50bde107181051a755ac9684751ab6b4d536fdebe8c5c49b1b27b6af4309ef5ba27ae52c SHA512 d515336ef14e265e4ab072b0473b41f98fab301bd9f4e02ba01c763f58e41196dfef10b29d2b6e501df2f01b3b32f41d8bf9842ad73470d0b1cb69045f7cefc4
+EBUILD flask-paranoid-0.2.0-r1.ebuild 671 BLAKE2B 1b3fb4962b5b3e5e91161a1541a3c8e7e0a9ee4b5fb46400cda54f41a87c062ef63824e6ac1300b00847398f72ca3cbc172e416225bcea60568b4b17f33606ac SHA512 03ff5f581e9891e314ca219b3ea3582497eb7f2e93c31786044d0b4128e4bf8389bd2b93681421feafc05e0cfb6e6176fc22d78ecffeb6896653093ca0634955
 MISC metadata.xml 431 BLAKE2B a011627716653140fc147c2bc05f1c949b71225fd5d83b389371bdbf51e1fea614dbec9269b95dffca914c6e952e712d400f3d63ad38a8c4debd994194080cd4 SHA512 52469023be87cd14845fffb7290a1c0fbf087bd60759fe87ae2ead185664f7006d899494f1c0d6c29dce49900cffa27526241fa9ac715efe27d23e0bd5dbf415
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
index 53fe8850e98a..527165b0801e 100644
--- a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
+++ b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 eapi7-ver
 
 MY_PV=$(ver_cut 1-2)
diff --git a/dev-python/flask-principal/Manifest b/dev-python/flask-principal/Manifest
index 9b8a0dd47d69..2f61a9052ed2 100644
--- a/dev-python/flask-principal/Manifest
+++ b/dev-python/flask-principal/Manifest
@@ -1,3 +1,3 @@
 DIST flask-principal-0.4.0.tar.gz 17287 BLAKE2B f5c44e21b4e8242122fc10c7c17bd0e6a4759eda555d4355bc340228eff18f1fc3f519f2ef822448b651c0aa3a00a16c562001d17d8915ce417eb56cd39d2adc SHA512 ed8cb28c4e8d936de96db0bf9f7cb45b253dc204c4b8f8dd8022ef1552592ff6324b4a33d3ee862794a6e20eb8c32a0365e7b9397d427da5022c5ded3dfa308a
-EBUILD flask-principal-0.4.0-r1.ebuild 798 BLAKE2B 3fc3dcf2e9f2fa3cc48537ec0ca59225cbba90fce430ca287541e0179193ceeea5236fa6d8f6733104581a0b00378e7fbcce609c3c4e8c22d9d9fdc62669bdb7 SHA512 1327339c269608315fdb44f0943d0c7578cc51292d087ea274d889b57b7f8ee71ce8a80334290cb4f34b239a45825bb6803a582d764dabe60fd9c0b11748ed78
+EBUILD flask-principal-0.4.0-r1.ebuild 791 BLAKE2B 699e72564ef46a5b4f438a2de3e8cae1b7ad66ea30d5f26059802dcfe07b287fd4c46a5c3d1b40de4a81682534140cbacd3fa7fd2aa2e31c723109eab7d982a4 SHA512 43bdda878818cec156a12c956923573ae49b736654842f0885b61dae49782e48109610f14d13272847e671875de26fffe2c456337c7432d4cac7a117a5270803
 MISC metadata.xml 385 BLAKE2B bd3864394906ea719cecc764a75db12eb0dc3e7e59c96859665e59fafaf206860f0a9be2a49cba98de5a3566b9fa7e8bae848de71bd06ec41797364f0c58b463 SHA512 453ca2da57ca6cca5d2b4d55f048827f0a62e5d629af12120a314117a2b11fa405402580ba5da933bd5eccb924816dd6471a64cbe409d13c22f3a923ba815f0b
diff --git a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
index a6b997cd98bb..557b45342bb9 100644
--- a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
+++ b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-pymongo/Manifest b/dev-python/flask-pymongo/Manifest
index e1d32a5bce12..231b01c03706 100644
--- a/dev-python/flask-pymongo/Manifest
+++ b/dev-python/flask-pymongo/Manifest
@@ -2,5 +2,5 @@ AUX docbuild.patch 618 BLAKE2B b2e228246d3cfaeb50783e3a47f8b826c0226057677563b26
 DIST flask-pymongo-0.3.0.tar.gz 21019 BLAKE2B 40d408926d6779d6c23de855e72b98af517927a2ceca3787ca5bd1cd9736526dae13e9fa76eaf71391e67f62c511ee2c9be9ff62ec93a20b0ca80bfe21eac9d1 SHA512 669e2c2df4c3378aec0a9f401120ceee2bfb0452a093beca6e7adaffd764bfe0a90a5e5b82d0945933693c3c179f3a0bf56cd4a2e03ab0522065eb650550ff44
 DIST flask-pymongo-0.4.1.tar.gz 22323 BLAKE2B 0a9a1362158f8a8842d746a1228eac6b8a13306202e2079fc466ddf89afbcfc1adf5d876c7c9e942856471595a0f140149fa47cfdcde71b0db6ed6d46dca49de SHA512 2d64ae430ee9592204462b5b81b4fe2d0f5fa8e17e03e1b139acf28b11330d7ef990108f1d49e3b968618acaa2ffdd4e26901b1e03b85f8f25ef05d59f5d6d83
 EBUILD flask-pymongo-0.3.0.ebuild 1077 BLAKE2B 9af0f5e894d71d7ab4696d95c92fcd0eab24564aa71ae041e0338fbd88c99a3bec51adf29a63c1d4a3c2e56f964934a47cc32310cb04b516b6e3ee38cf329b8b SHA512 0eabb5cfd73f4dc389aa0336fa73ce0e4127ecca4778db6d9d4d3b479d03ee10d855619f4f4e4060db959625024e886522f1ee9e9cff5dd26072ab44c5644048
-EBUILD flask-pymongo-0.4.1.ebuild 1127 BLAKE2B 730fa73c4ce00096300c5c9658167a71188f5330790121ac278a78158d5a32b6ba1eb1a46eb29653765cd764ef9a980647bcdbca3780215f53a9bc4685445270 SHA512 6d5179bf040fe4ca1a234c4dcaebd2dd925b0395386d49ff6619146bf258344fa917f677d90ff8196b98d8a9dcc3b31a7e5ed4c52cdbb3ec0281fb53cd7d513d
+EBUILD flask-pymongo-0.4.1.ebuild 1123 BLAKE2B 22f0d75e0aed3bea6ff6cc4f0c701a19662ec3d8455ff79b87dfe92a7a33ffa693c18e3f1a8329306eab6244366f0093932f01174eca4baa3f7af4ae4857ac84 SHA512 95f63cc08fb88950ea4122d4c517a88ce8aa43e233cbb5af1ed94e9a49d84b7671a9bb3c048b92f68e57936e478a83da88be79505b9c3662904f322e5ac40e12
 MISC metadata.xml 503 BLAKE2B 651357b95af5289d130566d5e9c9af678ad6b09a794491c9de1e726da1bad047ba743bee717d70b6218eb87e8fcdb7878af551aeb9c07948c40207f99bae5f32 SHA512 9cf902fcc48e65e0676376dcc1d7a943e5df0852c905b98cb312305e8b3d61bde14e85239e4976d0bc27f7205ac1c9dc84114177217397bf7ccb755744a36cf8
diff --git a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
index d80ee8302fd8..920a848ee2aa 100644
--- a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
+++ b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index b0285468e067..c977084d3efc 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -1,7 +1,7 @@
 DIST flask-restful-0.3.5.tar.gz 113214 BLAKE2B 0acf4d0449c55861b801a990bc3220d98e47ebeacb3c5b6452774992ae19ada97e31922e440a8a533bb1be68d4476e2654a8ca224b2369fd7733cc4c0da465c4 SHA512 a541e6739644b4db6ae97cf529bfc43f3136c97fc19a8538277d1f9be033b7c6dc3e39e1c4b2f313e099efbe750dbdc85c67b527224df557567ecac668e5969a
 DIST flask-restful-0.3.6.tar.gz 114512 BLAKE2B f03f7ed0fd521a265b8a2293d1526273650a38f65b28933b4d90d74f7365e04650efc89a743a49ab7c9fdd59d238958bb7bc03936f44af8728a4c435d2df23be SHA512 c5136302111e6c8953e038d31b42b029744111bb916dea7ec8bd5fac2de5e17a86d30a7d04a7335cdc5da25ee13f35ad9a6d284166e11cca0c6fec96d23fd977
 DIST flask-restful-0.3.7.tar.gz 114238 BLAKE2B ec960f060b3a1a36e538606d710a57e9d9fb3b1c2c1ee1874c5f7592e9ad8a9a2af4716f820f27ec1a9e55fcb0505ca711c6e045e6cb0ef8c9c64de339871710 SHA512 1d1d066dec5f39af3197b680f791d83df686602b703efe874ea0e81d7f3b65f605dbdb63f84fdd07e469c6824d52571e195ae70f58e1543b53f13a81e1cd8543
-EBUILD flask-restful-0.3.5-r1.ebuild 1308 BLAKE2B 684f8cf08a18b19ce7f59308a20c4ca242f534175c1d1333caa859c90526ded40cc4ec5dac82f013d54c8f2e836852cea283c18c51d8d77c3ee3636334f81e78 SHA512 c96a4a051ea69559f96168fba0a3dcafc93823442d950542339b5a9e1a9dd36c31046e4486205942ab21b32e2cdfa1d7fd44fbeb3ef248159a3564147a190e37
-EBUILD flask-restful-0.3.6.ebuild 1317 BLAKE2B 4672d58aef85b6b4872f53f8371d51ea1a6e68f77349db0719c55352798b99384e495a88994bd91bdd3d74dc17071842e3ee0ed0e4373c03ca9734e08e2b2b1e SHA512 369146e09e92f54a7afbb03416983431ba6238a73d92ea5621a11217e390b4ce4220363814f98b3cfca1694551a8205ede8a4aa8f6e729dce9809af9cca5b482
-EBUILD flask-restful-0.3.7.ebuild 1317 BLAKE2B d762aff2c5b32c4aeac79214568f4304937c47fa9b7cb747fb51bc1df7fc7a6aaee9a98e54380e83db5ecf01b11fea82e002cd31e0fe5f833f934af9db680565 SHA512 19cb678d187c524309fd9ea85529f583c88b0065da3162eb9f5607e1961d97061034b98ba827bb7a805152d71e7b8ae85bcbc0fe925f8db2053b903da6674743
+EBUILD flask-restful-0.3.5-r1.ebuild 1304 BLAKE2B 27e3d50cf4206d8420f852bf85aea38d5838ca4149d5e47f5ef5666f9f482a79c0272f36c3663555eff7cc4dc636667f9b5045f677ba798dd69dd8e658774d1d SHA512 9bfcb00ef219403049ec5b234865565f83148add48e8a470515ef70dd21e409dc978c2cf5cfe96622d3e12f409180e32b4ebd3083e99f3aac269d36f17ba8891
+EBUILD flask-restful-0.3.6.ebuild 1313 BLAKE2B 88def14488459ca470aa27a0e111ae577ca76913d05b29d45bb432adb69f3660628544648fb80df5419f5d3512ed6a4f7b6a3aca46b6c6692920e1a81075c77b SHA512 ac7cf84969108049b725c34cf5bcd00fea5c467a48b05d8c0f55c604beeba0c0a1f402eb7b2fb2cb464c77266b7ceb96c5f891dd4c243a8a04a2e026fd4ec60d
+EBUILD flask-restful-0.3.7.ebuild 1315 BLAKE2B 5754f681c3fe34f2b298c35e74b77eae68554beb531dc79fcb67c05d2f6883dfb5066a8b093e652d774eec7274773630b28ad95bd1e1037279473e6a6f0b679a SHA512 1e93caf84c4e3744ab2eb49c8c5f00334d8f965ee55db38877e6ca3baa33e329044bae45c18da67fe22772c4a4067181fc560a14154c48b4453a87af02a392a5
 MISC metadata.xml 400 BLAKE2B 73ff908518d52fcfb2aaf73571c5c1a36cf0cc749b0d1f5e2c28780323b096aed34644c8bf373e241112892e08dc184d0310bcce52aa583ad6301473cd7a4248 SHA512 be62c37c4d0fd8a051cc14fb2a9dec6885a1e83420bbe95282a0fdc7803d700372b345d83c3d648037c45080246d71b91086b3e4841d9e41fb3003d7c114e0c0
diff --git a/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild b/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
index 1a082901abf1..77fb6fbf84ff 100644
--- a/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-restful/flask-restful-0.3.6.ebuild b/dev-python/flask-restful/flask-restful-0.3.6.ebuild
index f64b2078e3f3..a63239373d1a 100644
--- a/dev-python/flask-restful/flask-restful-0.3.6.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-restful/flask-restful-0.3.7.ebuild b/dev-python/flask-restful/flask-restful-0.3.7.ebuild
index bf57ddf223ff..ec37d219a43f 100644
--- a/dev-python/flask-restful/flask-restful-0.3.7.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-script/Manifest b/dev-python/flask-script/Manifest
index 922d6a4f031f..133293c251fb 100644
--- a/dev-python/flask-script/Manifest
+++ b/dev-python/flask-script/Manifest
@@ -1,6 +1,4 @@
 AUX flask-script-2.0.6-flask_script-everywhere.patch 1792 BLAKE2B d3d674ad325f04b9338fd50850850173a3bb8c89de64702a8c6f5e78b6ad3945dadff4ffeb24bfce20b8d7e032338ae58695f9ce6eaa56f130286197915c3110 SHA512 83acf9eca3b2ee87222e6d307367f1aa789c8c89d6d4cba8dc93ff69a6149bf05e958baa4f9d7e71d3878e90ddce54a2d89b258024bf3bafc39de86814e4ad4a
-DIST Flask-Script-2.0.5.tar.gz 42580 BLAKE2B e614890fcf57c4122098a6181171d288c83bc80611ab1d240a41d57de522079fa1be68a679fd27a84fe36a843e5ddf8aa7b29eded66761e75b4b2e9771468074 SHA512 257b724c05dde79c99b028c7fa1980b700f273010de82fa9f1bb090b23519297d8bad87e436fa88a63feabfcd8908041d4a5ad9a673e08f4ed15e97310f16fbb
 DIST Flask-Script-2.0.6.tar.gz 43146 BLAKE2B 146a65fce432063e67e5b6221a0c2437f2a8df1e2b72a5e14fb382dc51ef3f0755e4d8a0a67831c6c2c61d07acc332e8c87b7c9df3443a9f22aa2eeb580c4086 SHA512 03c51213be8e2b86f1f4450565cf4d7e3d9d7257ac017bd53830be57620d581f43bcfe959ef7b621af722c688c56495229aad3dd9654c8a8a5905db0105275fc
-EBUILD flask-script-2.0.5-r1.ebuild 1053 BLAKE2B b111675c888eca9b99c872329d2b386fd30c570e4bc4a363cbaf67cfe1be1d7d9414dbb92704b93ed631a76dfd2c8464b75e7942f4911a7555756bc18a44818b SHA512 f431c8c8c0e102d6f909c8e673eb673927b99f207c99330b184a3a45492a8e6dd565b96e00a9b829cf0610b450a5b2017679173844959d83585694037e6f5882
-EBUILD flask-script-2.0.6.ebuild 1122 BLAKE2B 9e2718df8efda58d376f86c13b0b7ad5cf804690488530e44d72de651a8b496a1ef408d23301687d8e85780d7475587c9032c377b3a4ec66a5b5c5f181dc012a SHA512 77d3c11be69e28ee491c36e86b89f8ba76ab39c8384c4c9d75e74c51efa65bef40958f2493f065294b44ff03e9095962cbb811114e23e1f67387d50cad7ca560
+EBUILD flask-script-2.0.6.ebuild 1115 BLAKE2B 087b924b89fc60fd6c5e9a50b6a8b8fd19a81d58e4f1ad875c22502ff0a20c21b1ce90ca7b2fcb98b4ed7374a31ef3cd0e0f3677985aa4327d24192797cd9132 SHA512 a0faf47a00e69ac45733b63ef3a1d46677f5369decf9fb317b1a297ffb059e96d9525ca335a75ffd37ce37ac1a0141e3be6a4e0d99a83704df757a533a3ca72b
 MISC metadata.xml 315 BLAKE2B 5baaa0a40d2641eecd8e326c8a585457f539a890c47fbc0bb63d041cccecefe5c3f0b9691cb837eabf7718a05a5ec95c1806684d6d4950d7793361bae804bf74 SHA512 95cc9ed58105d822599495d5a093550da1665276efdf4e13a885d730265d229fa01d72322a33598363a87bec9cb1e112b9bae7b7874d1f03c6465089779483f7
diff --git a/dev-python/flask-script/flask-script-2.0.5-r1.ebuild b/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
deleted file mode 100644
index 7e2b014394a8..000000000000
--- a/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-MY_PN="Flask-Script"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Flask support for writing external scripts"
-HOMEPAGE="https://flask-script.readthedocs.io/en/latest/
-	https://flask-script.readthedocs.io/en/latest/
-	https://pypi.org/project/Flask-Script/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/flask-0.10.1-r1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test tests.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-script/flask-script-2.0.6.ebuild b/dev-python/flask-script/flask-script-2.0.6.ebuild
index 29e92f3e53b4..7cfd156114f4 100644
--- a/dev-python/flask-script/flask-script-2.0.6.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 2b39169fc693..52680ecc2e69 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-Security-1.7.5.tar.gz 42261 BLAKE2B b71170e83acadf036f8b7d2ab6d2cf6521ee06109bb1cb45801a10fa20c050ae5f933df4414ce57d1c9dabed60b068eeab3e0a0f6d318f092680ac7f5e775cfb SHA512 41fd806d35746bdc212aa4ab01af678d39765a6d4df42cd19c87b8a2060374112d3e8a5f2fc243e88906505d6a942b9a824cf19a29b2c0eebacde9299534ffc9
 DIST Flask-Security-3.0.0.tar.gz 160367 BLAKE2B c2e1449dc2807c2c40519fa3afb894157e17ecc9ff3f6dcf5ef0d02839a5988f827afd26c1d31af86d5e240e0ea8bfb8ed86354bb6a83535436b08721cac8f26 SHA512 09b94f0850372513add5c054c07aa465ecb95e8d1c414647e3ebee571ec08c94a29f0c138d092c02a55e242c422bc53f929ca066d671c082dcb29834ac753984
-EBUILD flask-security-1.7.5-r1.ebuild 1319 BLAKE2B 160ddd1ec38048cea74287286b72d3bc57418bbcfb11ef1897b2e82dcb32cca340543475f4fe241018482546277737fa2643540e0712dfd142d22a1d87753f5b SHA512 4fe7e37a765e7b7665c60506d8166f6dd5492415384641c7cc6d6c82d35187d43883b994a64d358fb00eaac816153700edc15e27269289d15ba5fd1e33a41eb4
-EBUILD flask-security-3.0.0.ebuild 1426 BLAKE2B d7de7e94caa90f84b95b42704a45dcdfdfa6e52a4bb2abe26516fb52a235da32c5d2a4de092ba06843b841837f123d50a93481e044e1ff02f244ef77a2eff6cd SHA512 6875d793f29909bf5c91c5ebfabb40344dccd7acebef96ca957e1aca5e110c7a4037a200ad569e9ea28024d0ec74e4b3a963325b0d7466f32d57748dfb92d013
+EBUILD flask-security-3.0.0.ebuild 1424 BLAKE2B 2f08d99995f1237a67f5cfff95515acf35b3c51e60dea4c9e62ac22b694701b246dcc1b6decdb84845ec852745293d983a1cb4bde7395f591456fdffc4f31e6a SHA512 37eea8929df1bf8841dcef50c96f816217c9c46c4e66f6c9da53bed05f21e9f1321e7a7b3956a2092288a0f15d795fbc4d507bf94c1eb16c9e645214406fa9e9
 MISC metadata.xml 317 BLAKE2B 4889668ab37b857d0e46000d1663eb953b8f54b20e9ea16979d9db73b6d96b3fa8317bbb5cb10d9e4b4cf0268b966531e33b1bc4a9ab9758768120466999e9cd SHA512 4e5d572e3b4c865bd75763af3bf90a1aeae9a74865ed3da3aa8d00956158cf842a7fb8f2ec837bd53fda5e2a3266777c41bc109d64f31fe75a5d219f1dba1ed2
diff --git a/dev-python/flask-security/flask-security-1.7.5-r1.ebuild b/dev-python/flask-security/flask-security-1.7.5-r1.ebuild
deleted file mode 100644
index b0e48bc30f4e..000000000000
--- a/dev-python/flask-security/flask-security-1.7.5-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-MY_PN="Flask-Security"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple security for Flask apps"
-HOMEPAGE="https://pythonhosted.org/Flask-Security/ https://pypi.org/project/Flask-Security/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-# tests are foobar
-RESTRICT="test"
-
-RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.17[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.7.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.8[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.3.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/flask-peewee[${PYTHON_USEDEP}]' 'python2*')
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-security/flask-security-3.0.0.ebuild b/dev-python/flask-security/flask-security-3.0.0.ebuild
index 2c30e4558a56..aee136435768 100644
--- a/dev-python/flask-security/flask-security-3.0.0.ebuild
+++ b/dev-python/flask-security/flask-security-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-socketio/Manifest b/dev-python/flask-socketio/Manifest
index 1ad4c38a70ab..f7d6805a2f69 100644
--- a/dev-python/flask-socketio/Manifest
+++ b/dev-python/flask-socketio/Manifest
@@ -1,5 +1,5 @@
 DIST flask-socketio-2.9.2.tar.gz 14361 BLAKE2B 0db8ddee5fe8c7dda384a22d2880a7ebf8d25b6ee76d257012823fbe4388bcfebe01a362521fb5e5abfeca72b7b3ca2a53493081e5d42f6443d410871b6fb53e SHA512 6fc499a32f37752e6d6d62fc52787cca795f3d113315402bab8063f7b7041785a7c90aff1bd393ef12ba84f2547607920b5f3146271dc536847c07ef0ffb0617
 DIST flask-socketio-3.0.1.tar.gz 14698 BLAKE2B 5d00cee05c2549714093a3fa680433e4262d14f73f268919efaf7c2345a393f84b8d735e5ea9da911a2e011c581e9eb5a2e4914bbdd8a4721b1ef81a071cbdd4 SHA512 3097f98e479bf1f24676dbecf9e151096f1ea59604396feb2d3e0509551b5b41ce3ac0926660bfdf7e113007633f6b02edb81c9c8656e06fe2f2a02a3e419772
-EBUILD flask-socketio-2.9.2.ebuild 930 BLAKE2B a29d0f03ddf4e01b10c2364efc2c6a78d29cd6d6db3a61d8a8a6f7be2f445b86df5f62b6f7ca29c00b4da7dfdb07970a6b1acb053054cb8b61d03422a22f4bd2 SHA512 1b077566941e66591b08f5bf3470ef4a1dd08c5850742bfb663cacc5830585e8b42cbea5f6e6bb0acc791c0fe45178e8944acb748f4bef84dd7a625bb5816389
-EBUILD flask-socketio-3.0.1.ebuild 930 BLAKE2B 056ca19ed8542058cba0a25dabda12cc40cebb1bd374e08d46ece2daf9e7042cfc5eff547b95d8de0c9d80af748074f60d3897191a17e2a079201b98d1401ecc SHA512 2e16b89f3a7c2e631140b58dd58fb7633aa044b2873830475845d7649a9039692c47c6f0945f36b006a429f8afbe8b603fdca23966bc1b7adeef9399cf36de72
+EBUILD flask-socketio-2.9.2.ebuild 911 BLAKE2B 2c3abf58f8174d8cacbc582a46cc254346b2d5a6589c84dedb85d683b37f29ce4d1021423cb9cb88c84e05905450253970e376e4aeed85e3ced88f3c51bdb90c SHA512 1e954dd34f82682a73fa36e656b1f6343c66601ea31ae6b43b5015d682c5ce06ba5fe9e947fbd62ac75c36844399982fe468262491c9f4e38b2624dfb9bd7fff
+EBUILD flask-socketio-3.0.1.ebuild 911 BLAKE2B 421edfad389295686cdaaaca35b8a20bfec41ce9e7c8b1e61853e8830c45f99add68b70b71e5aabd109b49648cc0bdd2b468676602923aea9decf4a62a7e9954 SHA512 0293067ebc7d5e0427fb16e3d45d2ae6815d1a199f0806b9b13e17d4fcba187a3bca4412c0aaf3f055244cec445c0b68fd0e47a66b05b1da36a8e3ce31ab9ae4
 MISC metadata.xml 464 BLAKE2B 0e2f91635e9905f04e94fe49e33e92f5ba4b0ba58dac83c5ff6b918403060239a4af3dbbffb1a9fe1837ab5e0034caae35d5f6937b0c1bfccc73d8201fea224a SHA512 3ca7417e14ca354f6bb0ed18dcfe733704b47df3e2a958c7d2bf16b3cda2197fdbfbdaf6652ebacd04c4dd60f9cb00d455dbbb3bc01108f75047f9ae832f38cf
diff --git a/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild b/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
index 51ad6dcc2c4a..37f29e78a195 100644
--- a/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
+++ b/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-socketio/flask-socketio-3.0.1.ebuild b/dev-python/flask-socketio/flask-socketio-3.0.1.ebuild
index 40d2ce71bb3a..ea9d01146fe5 100644
--- a/dev-python/flask-socketio/flask-socketio-3.0.1.ebuild
+++ b/dev-python/flask-socketio/flask-socketio-3.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index 35b7960388d5..411efddafbf3 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -1,6 +1,6 @@
 AUX flask-sphinx-themes-1.0.1-python2-encoding-kw.patch 256 BLAKE2B 2ed9a849832d3e5233494c053183b0f54fedc761efc27973fa84a0a9a19cd8182f60eda706f9e0f3f047e7d0808bf0f448f8a096da213f9f66bcb38fe8f10fb1 SHA512 c0d0421de3492f7cdf7c29790e7df4476095dcb7d3f310997eea74b3c2370d8e3ebb27e661024326e587a15d9f888096695624809f592e69b4e026695bef89e4
 DIST Flask-Sphinx-Themes-1.0.1.tar.gz 8150 BLAKE2B d228666424318552f3c865f64b0ad478a3794162c533ce7c4cb50414964c04d3a8ec84d64fdcd05f26bdfdb6e3ceeb9d96b9ee7dc7d632f07f99454f92e1231c SHA512 65ab8dcc75697fc61e6f6f78ec497ece99eba19c48e778f79e3883079cd0d5e42a2e0f1cf3d656dedf92423d1758caf6fd2279907dd87b50f3a79700f66c5e65
 DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
-EBUILD flask-sphinx-themes-1.0.1.ebuild 708 BLAKE2B 42e829d1349361d4a0c0f85e8ad8d914f848c2389788ccb51e74bb3fc25324d5149bd1ce60c4ad5bb1fe26481d57dbac984afbfdff7f7df177f03f188936ac7c SHA512 facff4fda74cc23d3f1444f6446dedc1637636f3005cf631bd7a49370e3734328f8b425cfaa6137e0c004b419756f96620fa6cc3d3502df911565f9a8693048c
-EBUILD flask-sphinx-themes-1.0.2.ebuild 599 BLAKE2B eaeb5ceeef2335a9ba22bd9eb71fed14093c9d446d6ce6498ac0ad26875a366b6cde2298567c10f80038da376c0d90f079b8b2d2d262a2af220311f5ac087b66 SHA512 261380246e0ef1e06a29825be8fb22b075e706afd52ad88e27dbf6536cccba225fc3c817226ef8cb65d1429ff42d4cb8ab1769a2e305cbb43cdfd8a1db935f16
+EBUILD flask-sphinx-themes-1.0.1.ebuild 704 BLAKE2B fe9bdbc4438c83cd077678c7949fabbb401a0bdb6d074f6911826d33d48a4582401a06a7fbcf8cbaaf7558e54e3fa8606b18bff36f6b2ff3016ef2e398a32db5 SHA512 1c221824a442a515188cffff9b299f2549368f968a0d7cc9ce8891e10cfcc8a6f15fa5054aca802fe8fcf82415af3dbec40f65f5530bf3dd167e7fa91c37bb08
+EBUILD flask-sphinx-themes-1.0.2.ebuild 594 BLAKE2B fd2546a27c70fd674c733cd0e9a9363919defdfba2f6d446b039905b542dc454f9d41b7082537eeab2e9f52f0b4b17231065c7758033adfc1f78ef63cb690373 SHA512 c38b334718d5752be1aec2491086ca247be9169f08bc652153fbb1a8282a3e07fc1c67a4f04ef597d7d26f9a6b8f6fb4d571a295c354110251c74ee362a949b7
 MISC metadata.xml 478 BLAKE2B 0842416a53a98283c3cbcdb25aa3e0ce1fb41e5227b326c2a5d60e669d270f0dd73950d79d737179a0209d59a82c1c0d1e680718dbd572fc0b4dffef84074c0a SHA512 6a8b152272da403e849cba183f6bd7b97caefe6be58a06b72c3d5e9900c56375ad4c384112803b1985e1740ddf3bb0ee2d6e650cf23443e4917a5a38ad59d0f8
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
index ecdfef913417..7ecf6fc508cc 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
index 893d915d62a4..7169f3bd926a 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index e3217e3ae87c..45d4802cbf12 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,9 +1,8 @@
 AUX 2.3.2-mapping.patch 647 BLAKE2B 4b6243f35ce87b21825aae761512ea2cbbbf11639bd60a53e91609f79eabcb598e07c8286c8312230e0f5e58d02cb2341c786d5f3513fc25d32374f01e5a89dc SHA512 6aed2dee97363ee6fc63aa2626931991e92d25b6cbf6efec702cb8878806a57ed0472eaa53c2557e7521be12921a544b90fa5619b46d44de001e97f97a1a1a8d
 AUX mapping.patch 756 BLAKE2B 4ba6e864233fb2b924f9e54ef1fafaea8b295adabff014b4e3a1d432dcc91d0280e692409ee8bf9650b19dfcf7e26f52ff0c992f98d63280e883cea5aea6b8a6 SHA512 050dd1e5378f0ad361c3524563693e9501c1826dc8f5359c4138ceae74e1ed9ddac88398dc744f400b8e941e018c9afdd5cab9a59df80f95389df1ff1c091b2e
-DIST Flask-SQLAlchemy-2.1.tar.gz 95967 BLAKE2B 1e316fb4b72f43f9342dcdc5e6c54b317fab2a9b83c315dd6323721506cc01589af7833409a0bebe82a87b924ace457d89d9de8b0d80b78d044ae73e076e89fb SHA512 023f3dd011a57768e921928dd3df791a54c64bb8a0cc1bb545dbb8e16dda263b730da74a0d400e5a057819830dd4cd014a642098a081c956a7ea8a2d37ec112a
 DIST Flask-SQLAlchemy-2.3.2.tar.gz 105530 BLAKE2B 2355c82b1ffb68429af4c16869e1a171aaf8b89f1dbdd48759dfe1e0a7021f17bdb301a45b837bd0d2de85ebd6ba81d4cd5a3d8659293f38f5893a260598b82f SHA512 e0c12e5cc5ddb3685f04c928185e4526fb6a94dedb5c53e2b5ece2e0f1cae6ea4c00b3f9d6863c1b6252357ccf2b5a4c1fca0185d2d741bdbc0ab62e2901d2ff
 DIST Flask-SQLAlchemy-2.4.1.tar.gz 128863 BLAKE2B 5ce87601a5dbeb8505144c0970eecd0bf553ad3feccd74e7de567a4fe0702575c6f7935d4812410ced17b7b98e6b8e6fcb67a589681cd82464fa4cf0dc09ba74 SHA512 a55e6fe563583e240bb594c157424fba1a8462f953fa0bb14701954bcb52d1e7bf71eec38f4037c1752ceab90e798642274de58e0f950d83e234f4c702e0b6ee
-EBUILD flask-sqlalchemy-2.1.ebuild 1045 BLAKE2B fc781a89c14ac9e6ad6f6a7200fe023264ecade8b523071c1d1ae0a2405b69d0a9009dfb1d82bbb430f901281adaa807fd677a649dd6307f1aa6843ee3fad439 SHA512 ab69862c457567bcd23ea99a6995c8a60162ccb40f55d7405a3c76d17df137030b99ecc5f0c13235d9f82e940aba3c9dcaed7738668b084ad257f2de20edf00b
-EBUILD flask-sqlalchemy-2.3.2.ebuild 1122 BLAKE2B 5858bdfafd033838fe03f91b124f44efa55008b3308c7305a46436ba3ab597a72943edc253bdb1ee0b26264b6569b207c10847ea79a5ceaf41c155eff2b49757 SHA512 2a6fe13eae163bd217cd988964c1f5061ccc8b23d050f0d3e7ff01a2cd799f2124b4630b939636221f6f3817a423df0ab802e108141ad7d105a36bcaa687bbdc
-EBUILD flask-sqlalchemy-2.4.1.ebuild 1123 BLAKE2B 7ed042c50d7b92b3b4a78bc56e4c9f388c98956187463aba9c9c03415618900f3b8c0eb4f17afabdd1dc37b9056e076e6aa6d9530d92a0446180adfba8860a01 SHA512 f8429fbd13b959089e66cc0fb651d89ff95cf5e9a099deef932dcd04a894b93b30de1ead153ae5e6592da6f3ed9a0a14cf79dc996bab6d86843a0d8b94305594
+EBUILD flask-sqlalchemy-2.3.2.ebuild 1113 BLAKE2B 8705de00c3a40596fece78dc6a46de5f49e807be5cdac509fd3ffac5e5b5a131c40c3ed2c59612e9740cb23a519ef2cea44b21c93e5a165911a5431baac3cd52 SHA512 15b345a548b3fe2f92dd42aff529690cc1da7f1f8f3ed7c8a6435d191803c095d2c96eb2bbf62583156e1791dcb8c09dd179522aa8607c5300f2892705ad4dff
+EBUILD flask-sqlalchemy-2.4.1-r1.ebuild 697 BLAKE2B caa5a663c9b2676c60023ec5ab7e6531ae61795a6c50d416caf624979d74d1c2a067d6f165191da75977191e7a8280db9496877ab22cb0d9e5443fc333ca4939 SHA512 4a106e333777eac469de7321c1eaf6a92203eb424aa878cab4d1bee89a21a721c2e315b301ad16eedb26e28f7642e7c37369e2f0f63eabb306963f25113f9c53
+EBUILD flask-sqlalchemy-2.4.1.ebuild 1114 BLAKE2B 456c068662cd4259baef892b3d08569132ca3e4b5bc251b0b9645d2632b92510ea43d7fcf66668724b5aa125e1762e4fbfdc397a0b85104fb150bcefa3aa94c3 SHA512 b19da6ec1bfe23e92091440f02565896551970118589cfb83648af347f2eeef37f27ee775137e8690dc3bd367f7141ba9654b076681a9e07a65c1119a841384b
 MISC metadata.xml 699 BLAKE2B cbe5227ca3a346d4e26a0df966a64337d037ed790a1fa3c6d4bf71cb8bdbd78a0f35b0badad7507352b92ebb2a58965a300fec0c49a5c916eb7ddcecd327f78c SHA512 7d116340ea46dcc4c739c63071923e235b31d3eac197d36f6d347fb500092cdb9bdf3365b9dcc5f80eaffeb2cc7fe6391fd31c1a48d009cff1645d7aa1684542
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
deleted file mode 100644
index 269eac37e6e1..000000000000
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-MY_PN="Flask-SQLAlchemy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy support for Flask applications"
-HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Patch out un-needed d'loading of obj.inv files in doc build
-PATCHES=( "${FILESDIR}"/mapping.patch )
-
-# Req'd for tests in py3
-DISTUTILS_IN_SOURCE_BUILD=1
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.3.2.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.3.2.ebuild
index 017e5ed3152f..c264a3b7ef83 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.3.2.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-r1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..47dbfb16db71
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+MY_PN="Flask-SQLAlchemy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy support for Flask applications"
+HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
+"
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1.ebuild
index a4403e40215f..89a31519e87e 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-themes/Manifest b/dev-python/flask-themes/Manifest
index f51a49a11daa..90677be0b1c1 100644
--- a/dev-python/flask-themes/Manifest
+++ b/dev-python/flask-themes/Manifest
@@ -1,6 +1,6 @@
 AUX fixtests.patch 1036 BLAKE2B 5049bf5a41ec630408b2ff4ddd8062529d615271a3d0afbc4a11e264f0ec3a3928deb393cde691351167414619848addac1243359a51afb3ea77be396413da03 SHA512 a3ca31a2bde1539b0ae2a552952f8ef82f7979446eaf7874029d65362bb30151a396becef07f97c12bd5d3264696ee66f2213cd7b3a305bc7ff6faa628320575
 DIST Flask-Themes-0.1.3.tar.gz 9723 BLAKE2B c141363ddcd4d0fa510845fcece4aedf831fed6c1ffac8a6b625265165bce77193ba6240bf5acc9ba990b914d88dabccb76871ac62eff629886348c3b4c7a382 SHA512 baf609b8b08446dda5b5d6d39bc0a2e7406f9270d70924c795243384be8967c82f82adcebe5e060352a0c33b763d600eeb5600d3116c10bdbbb3ceddfadf764a
 DIST flask-themes-0.1.3_p20180112.tar.gz 35526 BLAKE2B 71c606b8d0f2d2edf65594904c2ae11ca9236bb9386452592dae347293803e6c613cb2223e92e58f4b8a4e3b20365b17520889d173cd0ceb2255f849ea216ee8 SHA512 e7adbf309b07690906700608963f2cc8dd0fffb3edb061a10dae3b9d40f9ba6c6a56661ae47d34d808798d4ed168376c32642b47cbbab186d587bbedf1eba722
-EBUILD flask-themes-0.1.3-r1.ebuild 858 BLAKE2B 0f2cb864f0650db3f179ed9519ffec223d8aeea3e0aa2369b691e7b1e0953cc344c876e4591ca92853c805daaa17a5f11fc870dc4b458d7d6dd4e5e3eacef1a7 SHA512 55d7f468be5efd08b804adff1e4c6978e84a0531639044d085f5e459220f278063f36cfb99f79d702a58c5cfd94a62e3a5ee1b29c60999ca69b8427f934917f9
-EBUILD flask-themes-0.1.3_p20180112.ebuild 1288 BLAKE2B f98f294c8781150200d64bef5533b52e729189c2d9aa04bd226404e9039480d97f884bd0490fd3c911d52fe921e7457146f4b4d0f6b3c1a7747fccbb6a60d284 SHA512 dbd495c1b0183e30e4bc59649b487e1c61d122440b2ae289c3e1181b746b2c5118dbe8d13344f6d6be316d73d0b0e00dc1f54c4020687327fed071532909134b
+EBUILD flask-themes-0.1.3-r1.ebuild 735 BLAKE2B 5a3730a5fe933befab3258556482f33f71174f6b2ad12782965aaefb4367b253ab556242c5c477e16be56d7dda19decf80ad963c4df019ce60226c44d3169e78 SHA512 f4ed163de235a6dd505745fe95ec642044658f9e4be6ecec40bcd5274b7c33a5fe0884faa1150c4c1aab4ef166afb5bc8e3a7ea321ceaa82c459b7c46208b0c5
+EBUILD flask-themes-0.1.3_p20180112.ebuild 1277 BLAKE2B 07222d244357d6243206f0acd3d1c5884fa27dd32f9b79d442dd6affc0f6c941cd6cad8f8d613e5bfeb1d9b119a7c809cfc862d1e193dcf525ec6601252dec20 SHA512 b393a89918e1fd6aaf7b723c8dd893741425f109045df8365b1403356cd5ea4fc1f9f99f446f80f197cb683c68ad82812a5571a16b2c5795d4c98de6c2393e57
 MISC metadata.xml 455 BLAKE2B 81dd8f3a0b03e34cfa6580c83f493a61660814163ddf00014ada553c5de2035b02e659f1928868e4d33f9985a6ce86a39feaffb41b376e8e2806c757065301a3 SHA512 9626dd965d51739ba74c6009c3d1359236393ddec3cf63adf224458342a1d505f565fa692bb453862e63f213b88e8cea750a293882f58f20d5f76036a39d994b
diff --git a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
index c51b0bfa94e9..454357b287b1 100644
--- a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
+++ b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -17,6 +17,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
+# suite fails miserably under py3. Cannot even find upstream repo to file. pypi.org does NOT help
+RESTRICT="test"
 
 RDEPEND=">=dev-python/flask-0.6[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
@@ -25,10 +27,3 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=( "${FILESDIR}"/fixtests.patch )
-
-python_test() {
-	# suite fails miserably under py3. Cannot even find upstream repo to file. pypi.org does NOT help
-	if ! python_is_python3; then
-		PYTHONPATH=.:tests nosetests || die "Tests failed under ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild b/dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild
index 28897c00b361..c6e362f7ad40 100644
--- a/dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild
+++ b/dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-uploads/Manifest b/dev-python/flask-uploads/Manifest
index 4bce3ece1e05..dad179fd3e0a 100644
--- a/dev-python/flask-uploads/Manifest
+++ b/dev-python/flask-uploads/Manifest
@@ -1,4 +1,4 @@
 AUX flask-uploads-0.2.0-remove-deprecated-module.patch 737 BLAKE2B 9d4120f5f94439b65dac1b2ccdc10df974edb3b4950d5ca4d0a44278c7b68b97a8bdcc7cf2f00301263c1853888858b6995516342a6f4aef4ccd452403f71484 SHA512 d382208366de79e2cad19e26799120282b85a684ace4ac2d23e7a45661e1434805e4302e6c1dcf9bfaa0d4cbf9be8302804cf80f643d98122a5241722bb4f746
 DIST flask-uploads-0.2.0.tar.gz 23304 BLAKE2B 920005b72112bf6ee9cacfd49bd77be91f1282eb8b18500cdb7c4e9ee6277461fecd81ebcc6a8a9fe5c60a847985ad3f91da9adb59bf7d42e21f8412b882b45a SHA512 ad80448b111019a5e731529267a790d1dd95a356671780efc20f1dc830044e539ab348404b706baf3666c7407518ed04cd2871d811f72b6145261dcc307ffacc
-EBUILD flask-uploads-0.2.0-r1.ebuild 868 BLAKE2B 1046457c5ed4d29384741a6fa3a2fc8b654ebf795055fa24e72d5aeead69a5989b8c5fc53eaebf56cb78d696f064cf0007ccf75fc7b9521ede90e4363b4092ab SHA512 b2feaa86384c943cec768786eeb1d2b660f5d01c2f25354cd73e7b52a288ec00313d1efbfc2089637bed1afb345476ded35bac4a8a3e1924f50fbaf686ae877d
+EBUILD flask-uploads-0.2.0-r1.ebuild 853 BLAKE2B 33857e908c8bba5625bf6865bc18250e6a96cbb952878b179c78d245113bef23e2a9f06f919dc08868ebe2a30c5834326debfcf935ee1607143603d3c13a66f1 SHA512 23f3254497db893fcc0f544482fa9735a287cfa3791b9e0fdc4edd77be5a34d5801f463a5ac27f84dee8ae4ca74279fdf879c1039d29ce4c9ab2035fc0ba2416
 MISC metadata.xml 458 BLAKE2B 1a588f2294a606d9341ad5d37944c2676641da126c476220d29c943897a9721340419c69838102f58c3bb81ea141be5103c302bebf008921177cd898315a22a2 SHA512 731c3d6009d98a61dd00f29f563b5651ddae42e35a9b86da0653fc38ad416369304dc6dbdeb2e36fb2f6f3273032aa7f97d5a816a7b4d5ed5a7d642158ac859a
diff --git a/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild b/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
index 6e8490b2ce01..217fcff06d3e 100644
--- a/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
+++ b/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index a481770559df..d9ad4e931167 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-WTF-0.14.2.tar.gz 254903 BLAKE2B dd6b650d97622dbb56cc0bdd3c036f14e562181720ede0c48652b8fcbc88d2d684f013f0468e723b8b0746f2c6f44ca18ffe0ea353594680b47bc1212664ce52 SHA512 9d4b4b24eb24827aeb524699e6720eab384c42901a102daddd9fdc6b8dbc8eebec8c9d31a1e9052c9af4d61bd08eef8ef9dc4cdc8d9b950ff5bdd0201db1dfde
-EBUILD flask-wtf-0.14.2-r1.ebuild 1387 BLAKE2B 839ed387ed462f53417749d384c329dab11bed9d1e4c162ae97ae03bf774c59ab1af87cf129c78763007de7b2df5cf86691fddf0f15add085152c0365e6beb80 SHA512 9babc85f986c965704936fb34606ad8d46d62ca24c78e87a71f68a0491efe83af29520d04f04cce43809c638cd2fc8a633e9649153e9dc1e237a38280c7c5406
+EBUILD flask-wtf-0.14.2-r1.ebuild 1380 BLAKE2B a466a2a0297dedc1966822dedfdb588ce37ccc04d5f595765aa04d78b2087fc5f759f06bb9dbcaec9aa93e4f8b5ff4d7ce04c58c791ab6ba3ab63cb32e4497b0 SHA512 5a4770b183176546d70a158912b454851640ff2f1180b81abf9373a912e4cf96722f5cb66704705b3b8aba8ec152c54f826ff7625a085c2012cc1e754d1e9b95
 MISC metadata.xml 635 BLAKE2B 1914db37789f92c3a41a30564fc58298b32a6babd32c812f3c5be7dbd22e5ebbea6ff4c7139772bbbfefb502f8325ee9fda9854ce9b167305541e8f56596cb90 SHA512 67b6dd0104a4f949aa2df5f9de39c7d77c18ee1a20104e92b68ece9c9ce04b7d7d27721b4170b562855862c99f4080df0949935d23c8f82cd27d15d8e93972e9
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
index 2e7a68deff95..c62c1eb386f9 100644
--- a/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 6121e189b2a1..c626b05996b0 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -3,9 +3,9 @@ DIST Flask-0.12.2.tar.gz 548510 BLAKE2B bd92d0e7e6ff36d371ffd958708517d16e41d147
 DIST Flask-1.0.2.tar.gz 644534 BLAKE2B dd024f6f7a68691c759e3fd494a9482c4ab5216b5c7486fc1717346f953678c3198deedd657e7ddd3a5deff57ce31b1afdc40ef2ba9cc2fbed48f3afc223f6d0 SHA512 0ddf5d8bb0b0ae61f990096dffe3cf02744d7986015d05ae2cc09dfe0def17df44e2a4c58e330d17c7bd8c3eb74014dee5e2edef6e300b8e4ed756c251938f52
 DIST Flask-1.0.4.tar.gz 615497 BLAKE2B 4141de3754a8ce42c6978a72da80c991d13415a19946180f5fd8f08a1827209be605ec10283b78841bee94c5a2036b8e6083187a3e68c188fde93cb702a6d645 SHA512 2ed45ebdef80fe354a0a221f991560e17c442550f667fb76dd9c9631428fe8b6686127504f4ee81fcc6748f99cd376bed7a1ff4e0a9ae913cd70c9f5f4ac1c61
 DIST Flask-1.1.1.tar.gz 625458 BLAKE2B aea56848dd1f8bb2d96059adf069f8d19c55395e5dd0d98bf4e89c7d1b54241f1f476cbf7fdb91a2390cb5438a3bd7a5bdb58383f2a196b042e90f272cb39e53 SHA512 d4e6304bdb2e20deda5b9800dc9ebeabf0442528d6cef2d15416129c151b25ab32c41460939f64fb72b15ead8d4e9bcea5694039323d080d279bfba2f6266178
-EBUILD flask-0.12.2.ebuild 1859 BLAKE2B 1bcbbcdcbd8e218ed3257d82a50589b65cfeba01ace28147fc87947ca2738651c95df23fdcd484cb8e02ae431c44e6c60e0e08a6ba12fdb2bc5eda146b3df0e5 SHA512 e979ec60cb50f9a3f50ce26684cfece39fd69e3ff206b934e98fb9f0f536eba468baee44c32d3cbbc7ab8c9445fad635f8b191f1566112386bf21c7ffed34e81
-EBUILD flask-1.0.2.ebuild 1565 BLAKE2B fc51858e265bbbe881bc0dcfebb291284a8d546a9df87adb2a85d738d5427809571e430e17edbb5e1e97adc4b41d8c6e24f08b51ae661b2b3c803b8b78af0d8d SHA512 aae80a325018bd4d51044fd72a753a1e74d553eace6c18159c3c9edcbab69ff4217f43b104d95d0e9108d66cca061bb7108a4d8ac130055571e5804a380b7e0a
-EBUILD flask-1.0.4.ebuild 1571 BLAKE2B 14d9e4068ee905140e4a5d632abdefd6e58486a9e62aeebda4745d93c391e34955bf52da6315920cc979d6ba9c66cd995e0f29d764a9e6dea13fa735f32fe810 SHA512 adababc193243e801bea4f22555716fc05709fe7ca224a117b8835ff91f70839302d258ceb96180248bc8f91ec82b5c14e96e64ed1d73d46f7232ea3f02781ff
-EBUILD flask-1.1.1.ebuild 1414 BLAKE2B 5cf87a0f7121747ec886a3f2693b51e1973593f826610556ce9482c470582a896ce194daad116f6c61f21d44502af4c57664fb9d944039b78a7c6a7a39cc5114 SHA512 e057cff790f820e1e5dc1366b61606731559d9baea415348a2643bfff2b7220d7a0e7c42090138e55af69f8fd9dd75aa28c3ed44c961c7cdd635758f0afa4795
-EBUILD flask-9999.ebuild 1311 BLAKE2B 531cc5b3b8e0c21e5a255880eec7ec7c5d1df3f4b3265bc1e10b4eb21aba884c4aeaab475916cfeb63a7577cade27152f4d377dc52ae1e874e8270eab5b63689 SHA512 0e34fe92867543d812c61a6c40f3b27fb21d3c647c1a5b3afb1ca92fe1bcfbab24230331c2c926039fa49ff611772afb9eacf2fe4f86ae714b2b3ffb922422f6
+EBUILD flask-0.12.2.ebuild 1852 BLAKE2B 227bbfee82cafded94dca9fbd8492c5b14fe4921bc9eee93bc7559bd2af90c510f76758ff9a323f26698266e76533448be0d48936c66a19afe58e360a5aeadcf SHA512 76caa706a286644af614cbdd39bf9ef6e609ac8f98d9e7e5951db84946ba105ae6defb64a73d5af1c3106b91b2155bd24c5b820c70340cf88199193deb496857
+EBUILD flask-1.0.2.ebuild 1560 BLAKE2B 9a6c26fd51921b29c8fefad6a09fc4a9d9a8c16bebd3431194b872893ecf0012457167d20bb0e8820fe6d8a5cb6b25e5f1ffa95b5c279d5a36a69cccfb1b7b9b SHA512 bb44972822e4e0d2b09cefce23ed5f9c9964fcee15db9279b7bb356789aaa29e5b45d6b98b033108710852eadc730bb7454054885cc7019e50aefd5de9d5f638
+EBUILD flask-1.0.4.ebuild 1566 BLAKE2B d4e6a59a03460c2050de9f4f4c1655948df2375671d3d6509eba08ceaec8915873c834e315c6b6b448934ec2fac7f350d3a7caaf25a78bd8f29abc43bb8895f0 SHA512 7e14a329956f2bae023af857b1ddbd53fab8d3e6effcfc4518a3127e3cbdbce0313a659bdd33eb9071edb7340aee74367f504b6c7a57e22995cc490b0431b98e
+EBUILD flask-1.1.1.ebuild 1409 BLAKE2B f1f2a7b1f20715a6c85038c33d505c8e732251d75a7f5d6b615af92bc3e814f3d7cb1d234793001af0efbc3ecddc7f094a53a4103bd2dbfa3f48c88fedccbfa5 SHA512 42db66002f667a62fb8e6c503616054e129825209da5269556d88bacee84420b1ae0aa01bc9c484dd89cdf3aab94c7c8e0567c5411e2d70922a45ff694f29581
+EBUILD flask-9999.ebuild 1306 BLAKE2B 624eabc5bd3dc1dc8470f04b49c65a3dfd9ea1ea72e75fbbdb4130cb5e5790e299f4309f4088ba3e9cd13a8c2400c6bac405515b7c3b01b3963b21d33fb6067d SHA512 af1a02401a2b305f0579dddbfa5f5430df4a04b9309e704ba9bab37449f06894a6c4f7b6f2e1c1e7e7d1a0330cc8d36b1dee8ac5a7baa8cb3aa22b910b742498
 MISC metadata.xml 363 BLAKE2B f031e9e0d44bc626f4cc00538e6030e732f97286a09d061cfd8b7e03c8506cc9ddc8caab73d9c10363c5bd0eab1bfe6129a668bd6c66e3d82d9221cfd1175629 SHA512 33989d02b79b82d3256dbbf7402d79580d529e728222d74dbb80f740dfc1f8f1357f03ab5da857ff1821f2bb90f7b7eeae71d89e237516da62656d3d124ef4d6
diff --git a/dev-python/flask/flask-0.12.2.ebuild b/dev-python/flask/flask-0.12.2.ebuild
index 910edf128854..a836fc690f4f 100644
--- a/dev-python/flask/flask-0.12.2.ebuild
+++ b/dev-python/flask/flask-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask/flask-1.0.2.ebuild b/dev-python/flask/flask-1.0.2.ebuild
index c7d90235cdb5..edaf31dd5b87 100644
--- a/dev-python/flask/flask-1.0.2.ebuild
+++ b/dev-python/flask/flask-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask/flask-1.0.4.ebuild b/dev-python/flask/flask-1.0.4.ebuild
index 309a5494f244..62cc1ea9b48d 100644
--- a/dev-python/flask/flask-1.0.4.ebuild
+++ b/dev-python/flask/flask-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild
index 3cfa93664536..308df9bac228 100644
--- a/dev-python/flask/flask-1.1.1.ebuild
+++ b/dev-python/flask/flask-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index ab417690d6fe..b6b56fdb7ec3 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fleep/Manifest b/dev-python/fleep/Manifest
index b1f7d79018aa..ae65eb80b47d 100644
--- a/dev-python/fleep/Manifest
+++ b/dev-python/fleep/Manifest
@@ -1,4 +1,4 @@
 DIST fleep-1.0.1.tar.gz 6547 BLAKE2B 75ede77464e32404b3e1229adc9484d1d44b33323ed18f4be5275ffd1c8f63863459f46ff9cbf4f90d0e1387c0e5c967cce13ac8f6ce65710709dd227c04df89 SHA512 ba56f3a6c99f4c793e9f5c4ec04f7a96effabeadd92b18aeb7689a75d8504ccfca086db635d33e358ea9f67887e904c141e259ce2e9b9f3ea77f9e24c1b0eb27
-EBUILD fleep-1.0.1.ebuild 502 BLAKE2B bde0bcbf9b3095823fcacb1608967b0a3f001067419c216efea08b9873d2dfbb259dba701ac91c1d3d8f1d54bf160043c4ba82cda705a7df5ef5b6cc0b65f7d5 SHA512 ca785fbab990f5681f77da48e564424c3b5852d4d354ca270eef4d028930d11032544c27e27b57af71c8e9354f98889c3dcd649e095fd17d261d8306afa16419
-EBUILD fleep-9999.ebuild 502 BLAKE2B bde0bcbf9b3095823fcacb1608967b0a3f001067419c216efea08b9873d2dfbb259dba701ac91c1d3d8f1d54bf160043c4ba82cda705a7df5ef5b6cc0b65f7d5 SHA512 ca785fbab990f5681f77da48e564424c3b5852d4d354ca270eef4d028930d11032544c27e27b57af71c8e9354f98889c3dcd649e095fd17d261d8306afa16419
+EBUILD fleep-1.0.1.ebuild 502 BLAKE2B 327699b975965519ac0deeaa68f49bb3bf0ac26382be8f54e340b28275395574258f44ca392b517140b739a76d842d82618dec3cdc24788f8bc11071beb8457b SHA512 396492cfc0df32ba3d55dffdf056064f03052785c3c7f597c05c13ef09a13f71dc94fa00c42d6a733297785fd95adc342c1f1b44a118c43e63a6df9028b1d9f4
+EBUILD fleep-9999.ebuild 502 BLAKE2B 327699b975965519ac0deeaa68f49bb3bf0ac26382be8f54e340b28275395574258f44ca392b517140b739a76d842d82618dec3cdc24788f8bc11071beb8457b SHA512 396492cfc0df32ba3d55dffdf056064f03052785c3c7f597c05c13ef09a13f71dc94fa00c42d6a733297785fd95adc342c1f1b44a118c43e63a6df9028b1d9f4
 MISC metadata.xml 326 BLAKE2B 165baf53562230ca992f549f9eb81ba297244f399f1c76356ac7b1e7afc0ff979a3bf923c43ce3f85f8ef01599ff6a7a1134758e4aa3052451024bdcf748982a SHA512 47fa850b90008ba48db395a4cee9b150da6d201b829f3507d39577e4f2d3296beeabf3515557b7816bad6c23c75c8e395fc00e62dfb3e6b27dc172d94eddfbbb
diff --git a/dev-python/fleep/fleep-1.0.1.ebuild b/dev-python/fleep/fleep-1.0.1.ebuild
index 3482940aec1d..41bf60a740cd 100644
--- a/dev-python/fleep/fleep-1.0.1.ebuild
+++ b/dev-python/fleep/fleep-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fleep/fleep-9999.ebuild b/dev-python/fleep/fleep-9999.ebuild
index 3482940aec1d..41bf60a740cd 100644
--- a/dev-python/fleep/fleep-9999.ebuild
+++ b/dev-python/fleep/fleep-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 9c372f431f52..2f4ce2130f58 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,7 +1,7 @@
 DIST flexmock-0.10.2.tar.gz 44425 BLAKE2B e49db5b7a4a739f72a2560c52d0493cc284641f7c54d11e67a4c40ae3681ed2ca22fdc17c9f8ffc667bef409e1ecb5e36acdcd73a968984a38992927ff7c416f SHA512 6824da47af260a93ad685b66bcbd2d9a93f98eec218242e0dd9ef885594d9218e4c7170c832a0b3ea3cf201896ec1efc2afacbffe1fc5dab032240369d7b3ac3
 DIST flexmock-0.10.3.tar.gz 45017 BLAKE2B 03e6a709bd6c7889fa91692c27041f3d8109a57aa188a7043d5f45f757dd2bf929f80b9e57375bf7835ec4a88f032ed026c183320098546862f30c6bfedf6e8d SHA512 9c19e7a6765e57789065e6f5940270f5c0395194eddd8fedaf0abe52e0ffaaa33945385e981285caa1b7facb58be92b76dd0f370c242216626a30ab97b926bd1
 DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
-EBUILD flexmock-0.10.2.ebuild 617 BLAKE2B 9b3058ee99b3cd8e403044a61e85702713ecfd7d7d5037c776f44ec2d02992251014f37107c956a14d780762d36ff3d12f261a1bffa703b9c544860de19ef918 SHA512 9c0202e6080168a69d4518c7bbeef3658bb09d0bcceab09cc9a9196790406401ef247bbb28bf24ed1ba494032c57092d3311d4529e81b00aa2218e99832d8654
-EBUILD flexmock-0.10.3.ebuild 619 BLAKE2B 212a84be84b043dfcdea7dd938efaf381673acac77bf21518a9db7dc1e862d087c34c27c44983620a5bbb7ade580cb416e017a62573b58d92f5a6a15b55d2a0a SHA512 887e89766365b42fde10269d8ba95097a0ba8340a55242b4e4ff0415e169092e1317fb47ee48304adbb13ba712f27c36388fbea9ac70620dd06a1200630d1674
-EBUILD flexmock-0.10.4.ebuild 618 BLAKE2B a1fa9ddbf9159a28ebefe71d5ef2cb8fea49ef8524c007050249ce1a0d1e6f586797f90ab05db1557e3f460551a9260b2355cd321181ea4f9115d82dcad5f837 SHA512 ac7b5186a5110401a8da08d60b859c465a73174632f2679cf3466c6ec0f86bf815e48769564cdaf9aa231d04b9da2f49e4399367f09283b443b4429d59036d8c
+EBUILD flexmock-0.10.2.ebuild 613 BLAKE2B 7a932b91dc803c0c3ca63b7318f542b80fd6f6c7152bbd114dd80dc09da100794100caecab8dfc39df14e5487a2a1bdec41f35fd139347d2f620853e738faea4 SHA512 f32e2e1c5e15e973661cab04aada1e2da83880f12f416b36889ed2b33eb78b0dfcb32b07122d80c68021a12b492dde7707290152b855740751764f3bbb6b24d0
+EBUILD flexmock-0.10.3.ebuild 617 BLAKE2B 1985bd8a4c713732e561731a86a6c5a347e7fe68b837549c7ed02ba1e59fc8099436ec7ff1df1642132f43a2d7c50b019c77395392e6cdca39339402d6e83e6a SHA512 b60c6e3fb414616c56ad6bf3e1074d4b82c10e3a4d89a0d1c54dbea046aca89c743e5ae2dfcba8bd0b4ec81ebab73805d510637767e651fdcecc3f307c3008a2
+EBUILD flexmock-0.10.4.ebuild 616 BLAKE2B 2ff180504ac8bb83ca78257a500cc4749255c237d5af0478ddaccf833749fad6c56ce382dd91f909e7f149b1f062b6f46a67816d9620cbc1e5fb05b7b7ea62e3 SHA512 84d6ad45d7002f0ad7e7e01e29d8e150b31d253b223b596c4d7bc825a9bfbb9f1b109e0263580bf82ed553eec2c3f0dc0bf19ff07cdc172d9c6f731458d04c1d
 MISC metadata.xml 603 BLAKE2B 7bc248befb25b5071da321c7ad0cbefb6c57ee6f4fb9870a27c4888dac3239c90cac23a7adb0cfe41f7301edcb453463decf1c1b2be644a5e0c2fac5a41c0c0a SHA512 30088206cc5e7f24858f474160bc646e4744a0ebf14ac39048d5c31cf767da5f97d02559062c1002abba59d0a1ecd08861e52c3d2a29ad6b7e9d1d35c06e96f8
diff --git a/dev-python/flexmock/flexmock-0.10.2.ebuild b/dev-python/flexmock/flexmock-0.10.2.ebuild
index b6d6d260e2a6..de4e9ffcb5e0 100644
--- a/dev-python/flexmock/flexmock-0.10.2.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flexmock/flexmock-0.10.3.ebuild b/dev-python/flexmock/flexmock-0.10.3.ebuild
index bc53f3f97bbe..d10ad94be30c 100644
--- a/dev-python/flexmock/flexmock-0.10.3.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flexmock/flexmock-0.10.4.ebuild b/dev-python/flexmock/flexmock-0.10.4.ebuild
index eef14b90cbee..bd88e29a25a5 100644
--- a/dev-python/flexmock/flexmock-0.10.4.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flexx/Manifest b/dev-python/flexx/Manifest
index aae2d88da869..48233c0bf0dc 100644
--- a/dev-python/flexx/Manifest
+++ b/dev-python/flexx/Manifest
@@ -1,3 +1,3 @@
 DIST flexx-0.4.1.tar.gz 287596 BLAKE2B 768100f6ed38ea7639e79c23a74a2ba38c41e4450920be4c331c159fed92ee8fd143de28c33ac7eb2625717c2fd53b90571a0a9064b36e5c9be4883d6e71468d SHA512 af9d84876d2c6b5f8b9fe7967dc282e4043456606c1574c10cfcd15a3f3d0d3f8f889a41ff254655eed06200b5d9c10fa27249343ee689ff62346031a4ed607b
-EBUILD flexx-0.4.1.ebuild 646 BLAKE2B 01e8323982f9bad8a8825c647182d4773fa4fd831dfbf4924c25ca5fe29d724f466ea8eb9511ba19a3349e49bec2d5eec227914cf92f0fb977f33f99b8c89016 SHA512 10f6032d38857aa4b5f757e5c60dbd5cfd4692b8968a5af4c0b01184ecf6cde9253de4277c9d999e42058e9639f0546cdef0c3ae4188d3c3ec692327e0cc7e87
+EBUILD flexx-0.4.1.ebuild 642 BLAKE2B ebe4ff62a7bcc9daec86f5268b83638f2c83a805b47d3c069dd79447dd09ce0f8c6de0a411160165fa1c88c6af4a7d7e010f0e4bda3040971622932d0ab3875d SHA512 8b480a80abb1534f14cb3d058a9c07083d6da6cf73da026fb79aa6126044f0d43436058267ea0706982628bcd2fad8be5b85725bec6ce9d00d6ee2e3b16d45e6
 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
index 8cc11bac12bc..4a302dfadda6 100644
--- a/dev-python/flexx/flexx-0.4.1.ebuild
+++ b/dev-python/flexx/flexx-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flipflop/Manifest b/dev-python/flipflop/Manifest
index d4e4690ccae0..4b209c853a6e 100644
--- a/dev-python/flipflop/Manifest
+++ b/dev-python/flipflop/Manifest
@@ -1,3 +1,3 @@
 DIST flipflop-1.0.tar.gz 9991 BLAKE2B d19a780df94aca46c3e207ce1b7c9f4cc56871924fb716a2481421c0c0490914e1e34bdd1b89a5a075bc67e030fa1c85af26ff7e4c9be48dd46e3c4c5e2a44d7 SHA512 cff8e6e0ecfbf633aacbfe7612837cc85d5208b1dadc4b30a20cc4934549365a066df9ed66bab4e760b7fe73d7ce796de6a53fc01cec742d81fceb17e2529267
-EBUILD flipflop-1.0.ebuild 351 BLAKE2B 2f0e980500ef34f86bab4c210e48ac61eb7d0fcdf5d94623ecf19a0fed3713c98d65cf8cc002e8eadaca4a34b7e3b2b1847af69251d71dbc66a129c53da90518 SHA512 0343a52d0941c82ee486cca3b29faafb6c2d7670a316a3a5617bd33924c6f7896df7513989110a3257ace5f6024f9bbfed551c284445661f3bcf4fbb52261762
+EBUILD flipflop-1.0.ebuild 347 BLAKE2B e396cb8ea5ccf3b271d3be64376f3cfc16635a8e2ee0110b542bf43ef044b1c6ec96f0497cb527e93da4fe54991b5ab19f4071ce67287266a5d6eaaacaab2f6c SHA512 cc467968f299b2ccd5d6881cf244ac2d28e9bfbb05df17c67be0455c2ee282b09045dc037bf04ded7145c7cea5ec191941287192d0690e4be94d0b33a2097299
 MISC metadata.xml 343 BLAKE2B cfb1bdbc82e71581cf1975962c909eeb81c62ac87c34252a8545419b5239d1875958e5a121ece891878b1ed116a563467d93d7b6d8b152da394bd2c8e77374c6 SHA512 6dfff49a804afe29069cfe7d93b61a823ff29d7b09f4055188bc6306131a794b9add9801a942cd0ef88e2360a966689b41930615dd4f53bcf5405115beca9ffc
diff --git a/dev-python/flipflop/flipflop-1.0.ebuild b/dev-python/flipflop/flipflop-1.0.ebuild
index bf969939eaa3..be6f85f38d30 100644
--- a/dev-python/flipflop/flipflop-1.0.ebuild
+++ b/dev-python/flipflop/flipflop-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python3_{5,6})
+PYTHON_COMPAT=(python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index fa817be17982..93042c53f91b 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,3 +1,3 @@
 DIST flit_core-2.1.0.tar.gz 22978 BLAKE2B 87cb5ced56666eb9ae4963628864b66c77758c823b34712770a61a52cb7916196c0d6f51e7b2ad9804b853f27a257966aabef7dd9c95155af8e76f5100b1c9fa SHA512 dfc11cdd62af367b56773e5e0b28763554cd27a272a040a5dd35c8fae4f1e6695b2e2b15b6e63f6aa52df9854874eccc31f6eaf5b349ed85aa33cc5e1d2e1acd
-EBUILD flit_core-2.1.0.ebuild 1003 BLAKE2B ea5b0259884628f203a3ab3d867e26e768505957d2e742b8c75365e68ce993d6b555c2b1cb86a986b94c13c314e7e5cc4dd4f114354a3867d44fef2fe0cff09e SHA512 9e6ef22a384e04db09b355ef858b2e8033ae0024605c0832f00ff5916d81c796fd77e06654473b98c47ce125ddb4b34c596226869d9c54c0ebc3edd37428b0f2
+EBUILD flit_core-2.1.0.ebuild 1003 BLAKE2B dd2111d382d6ccf9868a86243a4716e1d7f1bf1505ebdd94a65b471aca0ceedb5d7cb4cb116f560ed246df684b6ecf7df577184a216f893b573a572b79fdb3c5 SHA512 502085c5fb418007f1cd406f851499f9f55b10917053af1d0621541b7468a4ec05b0f547eb0e8086fdce672c88e67588a4b37587fb1b69e1c393dae6e904608b
 MISC metadata.xml 387 BLAKE2B 80b0a547d8f1c60916e68279805d3d60473d0674de329a5c3077e4dfb3aeb1285f9236c825e121f9b56f3ee16f9a5dcc65b667cbfdb230b99f430b38735d4bf0 SHA512 97c77a9eb206814534d35eafb4f64a3a613d7e2bbff8de5f929c94cc0e9377c13e7305c2e5f05911567172214566f4d7ec03fe1514ac307fe59b3a457cbbadbf
diff --git a/dev-python/flit_core/flit_core-2.1.0.ebuild b/dev-python/flit_core/flit_core-2.1.0.ebuild
index 837b6cc3c505..2d758c09d79a 100644
--- a/dev-python/flit_core/flit_core-2.1.0.ebuild
+++ b/dev-python/flit_core/flit_core-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simplified packaging of Python modules (core module)"
diff --git a/dev-python/flower/Manifest b/dev-python/flower/Manifest
index dfc4739c5d04..c1b0737789d3 100644
--- a/dev-python/flower/Manifest
+++ b/dev-python/flower/Manifest
@@ -4,5 +4,5 @@ AUX flower.initd 508 BLAKE2B b398accfec2ac5690ae2905fd0dbfec173dfa8475691ca2c344
 AUX flower.logrotated 85 BLAKE2B 145c99ef3e2345782f8616695bd4bf6f6fd9684df57bf2e95b22e67d5efc38afc7fd891079dce6c057ef82113b09f58332d96918e86897bc1dcff04a06d764d4 SHA512 ff230e516d0aeffe9bb7d43bd847abdf1d3bf0f0fe0a6aec087fa7f08e2157e7f15994997ba76fc57a03dc34a0271cb9051bba938138ad95fde46c9774f05ffd
 AUX flower.service 331 BLAKE2B f097ef9602998f77248da33e3edda6e2e31957653fe3d9416e6295b61e50b891a069c96da6fcdd53142b312d72894f0bea82f1363cae5a60e00e6c4749004849 SHA512 894d9e3cf4c87ba731ce8089efdce7e5d6f536425ce368825f750fe5367707a12b3b99221b7d9f3ebebf6881fa7bfbca6e13654ae878b046bfa94376c00039c7
 DIST flower-0.9.1.tar.gz 3880608 BLAKE2B 4451601285472fa61577d482ecda11b20244e8050f349ba1e81601ce9a3ec0126a13ad055545d4adb5c1201b6c457919bc5f4b8aa7aca700f3bfcbc3373c6c0c SHA512 519d92209dbdb7956fde30c604956d1cbbc8ec7180ff160ea088847b5b63310cd42dc949d02eef1197588b0353470a0f3ac96b44b2e3ebb093a254d8f94fb407
-EBUILD flower-0.9.1-r1.ebuild 1423 BLAKE2B d90c4f46b31a6924593d857a21f4f766ae454f7d76333d372effabd34580334a60a7de71ae37a1e3eee3ec8d43eb4ee08e04a64ceedb81a851875e6c805744f8 SHA512 e4027ffa99bd0da41ccf9d87ca0ee05964e81fd709e1c2a8e96a660244c794cce37b6ef299a169804ae80069d3fa03f952433be43abc8a18d28ccb6f50eb57fc
+EBUILD flower-0.9.1-r1.ebuild 1409 BLAKE2B e44e45e12560669669ec539d1bf647fdee4e55ef001d8f24fc14f970be48a40fcd9528e701aacdec4a5fcb8b243147b0dda170f39fed0f827ffef664e4e148f2 SHA512 18d5e099b11a3b485f31447b9cae34b522ac31e12b680ba7fcb07d98caa31e2281a0141361f6e1d5e7b8f7b04e6d3765da62b85aa6160ec26cc704ad4a6e015f
 MISC metadata.xml 348 BLAKE2B 912f96c87bcf9ab4cb89f34a4c84042ba7b0774e85c123e79c2dd79e04b5fda8a7d5c0a2bb8691756fc4553a80ff393db9a53fb3e370e95b184c036cc216d27b SHA512 3ebe07dea33229439c0e810bebe106316ec29481faf9c39ca3449228979d160d42a81161ed59b7109bf0731664d122b68b3ab5a6ea39aaeb35fe9feadf304a4e
diff --git a/dev-python/flower/flower-0.9.1-r1.ebuild b/dev-python/flower/flower-0.9.1-r1.ebuild
index 903147e4b090..18ff6c254650 100644
--- a/dev-python/flower/flower-0.9.1-r1.ebuild
+++ b/dev-python/flower/flower-0.9.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 systemd user
 
diff --git a/dev-python/flufl-bounce/Manifest b/dev-python/flufl-bounce/Manifest
index 72442eac907d..f825b585ac8a 100644
--- a/dev-python/flufl-bounce/Manifest
+++ b/dev-python/flufl-bounce/Manifest
@@ -1,3 +1,3 @@
 DIST flufl-bounce-3.0.tar.gz 89156 BLAKE2B 02ff80f4ebe42e15c9e6a7ed192d9a032e800b2b1da874837da5e6d5c156f50455795469c1c782bc7070cba3ab66d11ee576b8e95881a78bd1a479c825939dbd SHA512 f6effe38c80e1e5e1119d7951a1a32bb9b91fc52db0887eee4ebb74e005ad5cf48351311985a3169649301efe9273d3fe480b3dded7eff3b77b73312d0416f45
-EBUILD flufl-bounce-3.0.ebuild 599 BLAKE2B 470d4a17e14002f298ced9e0aceca74449548ed59e7f916537d89891a1884fa5654c839c85157b4115fcb7aa6ccd56c18113d2527f3670bd25f353894e396d3a SHA512 20e6179d162d3950a24646f3b66ce62373a5164d73fb10739f705f8335d8b904edf2274eaf93f63d2847a5d5648debb2530b724fcb93d57b9dbdebd66812c143
+EBUILD flufl-bounce-3.0.ebuild 589 BLAKE2B 679b4b612c2b1923ea880e15c3be53fe692689019b893429d32c32b56f4a000f718d042c445623671ffaa98210b0d4263ed29d81b942ea16f88981048328d12f SHA512 002483ecd081a3dfd5f09b0e2687ef235dc56683e1231bff6bbe7870cb1492a5b57a8090dd62e903d30e61c139f1f78d535b40ffc9e754b813f1c67670fe51e6
 MISC metadata.xml 408 BLAKE2B 20a2b1a31939b4725e08b910cacf65699183c76febfad4e940769dcc61c0e5da44729b70f5087267dc4db302120f8a20066a97fb4999de647a398e4c0283a6de SHA512 02d72e8e77cf28c4ee9bfca5dfc1d53e26b87024122046000437f63ced756a6ceaca988d0eca49a153a1e628674e1b7495e4131b149f298378268ffed2c8bd10
diff --git a/dev-python/flufl-bounce/flufl-bounce-3.0.ebuild b/dev-python/flufl-bounce/flufl-bounce-3.0.ebuild
index 2e6801352008..ce9ad1a931e2 100644
--- a/dev-python/flufl-bounce/flufl-bounce-3.0.ebuild
+++ b/dev-python/flufl-bounce/flufl-bounce-3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/flufl-i18n/Manifest b/dev-python/flufl-i18n/Manifest
index b9de9e9b8edf..a8e9cf5df51b 100644
--- a/dev-python/flufl-i18n/Manifest
+++ b/dev-python/flufl-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST flufl-i18n-2.0.1.tar.gz 18572 BLAKE2B 372240eb6cf3778844fc0d5b59a60e2fd50498969165a6ea1096e1e333a536b177cbd9afbad14bfafc2cf7150923c8bdf0c84944d1426f0ae284028b406559e1 SHA512 372a27c81c0c58994b7b4b9ddb177f6acd3106536391c82c61cf1ba1b8b2e920be559720d98046ee9aa977a9119f231f7bbe71535cfb538d8563fff1da737ee1
-EBUILD flufl-i18n-2.0.1.ebuild 575 BLAKE2B c4d5207a9da534f0421736fe37757acef829c3af5ad6742efbbff61b91626076e9548af8e8e2ebd27172d3ee888f8976165a207489e58f22c328b87e95abd2e9 SHA512 d6bcf2b63cc77f0a3e22bef742b231bca1f03f2a1a4e6a2a472182b9da81e3fc00418ec702d43a046722b67990ccdb681ef53fd457efd03e9eb0b96d1fb85a0f
+EBUILD flufl-i18n-2.0.1.ebuild 565 BLAKE2B d34298d5805c08da60dda30f5acdae1c7bdfb55e1a6ec06eb235bbd0dfdb1ec36ac4a10cae59fd2e08baef0f4d3514dd7486e96ceb14ea2ff728a1bbb7760682 SHA512 17352318a73c76db98d90114e3762136247f3b2f7475c8bf5b7f608286001c1a81881292765b5382df9dabe6352d79d8ccf77585a9ef11d21fbaaa1ceb998667
 MISC metadata.xml 434 BLAKE2B a3e675acd9060351b3e36563803043a4b0de06edcf37d06a3c296bfe2e503c0e0e273aea08136f7ebe892cdf710f13fd9af53600ec151c604f4b8c69ee28ff03 SHA512 631ba7e31bd357d6118ebd6872b76162cb579bc162f2c0a26437eff21ed11b69bfb513839b81c1a937bf981bc5c1569aaaf205cae76b4ed2707eacd5f9eb8f2e
diff --git a/dev-python/flufl-i18n/flufl-i18n-2.0.1.ebuild b/dev-python/flufl-i18n/flufl-i18n-2.0.1.ebuild
index b3be78ae1878..b182d9665ef5 100644
--- a/dev-python/flufl-i18n/flufl-i18n-2.0.1.ebuild
+++ b/dev-python/flufl-i18n/flufl-i18n-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index d8b12dd7ca77..bb2bf0928353 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,3 +1,3 @@
 DIST flufl-lock-3.2.tar.gz 19250 BLAKE2B 230d7122fb6db1b4002e5732a878d597837f1c8cb10b85f4c131f793f820dc0b76a494504aef89845be4f7bdfab94b17573f83002712c245206c9ce25fac893a SHA512 496195e1c52f628bc6c0e8fc3dcd5373ed01cfee35b6165cae37ab4b90d70265c6a0aea565f1e0663277c2b9e9bafde8af1420133a15e6254275fad2f28a56d0
-EBUILD flufl-lock-3.2.ebuild 580 BLAKE2B bc041aa1dbcd635db41ff352941fcb86235e86c2266f331a259412c24ce04dd65c4eb44aac703d30f48e100142222d7939255b90724ad8cd2a2ea7846e103682 SHA512 069a5077965ec776b109230690821fb2ef105b9e05aa2e725d966d08bd8b7e8c657d4217de34b863c0e714d595056a5e60484a58fec3ca677fe93f4443f44e8f
+EBUILD flufl-lock-3.2.ebuild 570 BLAKE2B 6fce0a7d6a69babf340f1857595a53a4f931127a4a2da97e527b28dc457df358720b387d66b9d680d050446b1ee9d1402fdfa96b0dbbbcdf469e0305edfea65b SHA512 772d4f06d6ff37e6e69a5a29db104edaecb835f037e2a0a84e83e95caf420cd93b6542d9f96e39cc05dbb84e40a95a378b59f4247b5e03ccec7b08a3ff7512d7
 MISC metadata.xml 439 BLAKE2B ac364f01f2831f0bf328429ccf9254134ed961d04e6a2a7cd09d399c6d59be0085dd23dcc379d390de5e81ef99d6e0d19138dec486cd3764e34e9c2299fc09db SHA512 0021f035c2b525bc71ed0054caf093bb840a8e360b7aebfc0e7b0feaa111453b26c590d16a383fc0bfd97c0d2bd435308895d98fb43ec58360d8091bff88d0ab
diff --git a/dev-python/flufl-lock/flufl-lock-3.2.ebuild b/dev-python/flufl-lock/flufl-lock-3.2.ebuild
index 401bc7ca4c92..a8f7e86130cd 100644
--- a/dev-python/flufl-lock/flufl-lock-3.2.ebuild
+++ b/dev-python/flufl-lock/flufl-lock-3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/flup/Manifest b/dev-python/flup/Manifest
index 87336ec8d488..e1e52a565f69 100644
--- a/dev-python/flup/Manifest
+++ b/dev-python/flup/Manifest
@@ -1,3 +1,3 @@
 DIST flup-1.0.2.tar.gz 49051 BLAKE2B e3acb1c1a4028ed8eea5381c55d25f2cebb050a5ce9e18f74612d50453238338aa52b268059581a56438a1a0e42ecaaa0d747bc3bc2779ec0646daf1df3ce02c SHA512 65c610f9ddc3df6ed6deb6753b2b15ce4f4579efd9dfd25166d3b6803e5d7058fee6617388c9c67c39f7db54da5c918181dcbddfbb7be4a78cf8b65501af4c4a
-EBUILD flup-1.0.2-r1.ebuild 524 BLAKE2B ea6c41460b023ff50b70a865c71da3c81dd9216c82cb8f0b9bc7f8cdb10117b575980382eed2be12bfd074160d51c2f77ac8ded9b5ebcdc573205722a1a3932d SHA512 f66a708201b63934fb03c7292d173eb58e7ce9892dcfc3e0a5dd6aece56e894cbd6c589a9bad5d3d84f71f8f682becc2b2187b36183c5f6350aec5208490207b
+EBUILD flup-1.0.2-r1.ebuild 519 BLAKE2B 19ab6d2b94f50e56e1d664ca83bf9f7d9374753ad6aa71d0990c20c162fa2db10848141fcb4120254f0b771295eeae96a5e9cae25a3db05ea0d5e2d3f1b432f5 SHA512 d82c849baff570fed4500fa8ae5125b26bb2fcfa8323e33f1d4abbde0d66d654c7fbb92ed3badd383644ecde83c47096acc2f68cea859e19b6c9f99e05bfd51a
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/flup/flup-1.0.2-r1.ebuild b/dev-python/flup/flup-1.0.2-r1.ebuild
index 750272b76fe6..60c309aa5724 100644
--- a/dev-python/flup/flup-1.0.2-r1.ebuild
+++ b/dev-python/flup/flup-1.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 7b9feb6597c0..6e177e0f5dea 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,7 @@
 DIST fonttools-3.44.0.tar.gz 2040100 BLAKE2B cdbebe8b38929ed8f436b899a9f5c7c5cddf546558ffd9e347fd41fc06dc4521741dd80d4b8c1cec4f996322ec09e8892174c965ff55bc6e4c7e4c5f44be0fe5 SHA512 ce390ccf69a4222ab8042f72c4e2495e39cb6907fafaea36f505407c7c6cca891d43374d648ae9f1a3119bfaeb1768b34f7c0340fad4fd158722cf2bfff425f7
 DIST fonttools-4.0.1.tar.gz 2240578 BLAKE2B d7d735c4edfc09d90e2fd5b05e195e900f4f96e7acb52d0fdb00d95e9a39fa698dc853908b93f6f54674d9536caa9b7bc6c2b487565443b3e115a5ab3237eae7 SHA512 ae8a956ee03923ccbaf9d8950361cf0a2e3b86d61145298de07e8f4ed50680cea07dc56802663e3edf1fd9f18850983fac5685036f3c99fc454ea72591646eb0
 DIST fonttools-4.1.0.tar.gz 2253792 BLAKE2B 470207d74404851aa111142ad8541d45820ded0212029867c289f2e7741d4b41b4ac824f65555a23d4f3dcc974428537cd319a8787bc4d80f2fb67561a21d1ee SHA512 3d9485cd34b5ea3dfdcc26474e0b21a96811b84eda16341c39165aea72bb09c3cf3360a069b316ae6575a399e26f6518c199180caec7bb959f245ced7ca45e3b
-EBUILD fonttools-3.44.0.ebuild 1479 BLAKE2B 81662e78ed574cc0377e38be3b1f41b896cff9ce300c07acfed8992326a6f58ae05c7413990cf6dfb38401c56ea81a3192dec99cefddf749766f9c77a4404197 SHA512 583b8d949eaf0b5497981a68319f86a32df01adc505487309e0d826bffd9460cdd1f76ab5dd3fdf5845c45dd75e090e341d4eae0d831e1abb09192d6d97f3290
-EBUILD fonttools-4.0.1.ebuild 1388 BLAKE2B 065474e8ae4c107b50d39421c3c92107c60d81e8cff77a8d457eb6c0c1bd92501f59acf46552d383b9059a2b5cd8b7b9b1e464c7422140a7459d0009acbca083 SHA512 6eeb194b8312b892a5edd619ce5e1be1745dae27bc5d2e45d7e3225e2555388458f2af6f4e88a607fa5322a7c9e5ac80ca1ff2885311117707c2a366e8d371af
+EBUILD fonttools-3.44.0.ebuild 1475 BLAKE2B f72e45b09e084fae9034c640f41bb45e6432742ae0adf32b9f642b105fdfb41966712a461fffc06d22c82521ac93a507b8a2a3382a8871bb7edf997240eebbdc SHA512 423dcaf5d2e6a4498b20d46acf330062d3c0388a0fb06d452f9d53e1736adda46c2b5606a59df9da2fa5feb6c329b6c6036adff529e1c114fc93c0b2934c820e
+EBUILD fonttools-4.0.1.ebuild 1383 BLAKE2B d7ab1cbc8facd281330cfe467fe16b4cbd06ac04b78bd6ac0af32efa911c04def6ca460e9bef7ef279dca85fb0d316a5eaa7911dec27185a7fc6be09dadd1f56 SHA512 f5cfb97718330382fdafdb44dadbc5af54d1c0e8255505368d9cbf6e1b4b078548143f44bdf5940f0c682cd6f5f35852c0454d49a83c2403c3e55849b0f177fb
 EBUILD fonttools-4.1.0.ebuild 1386 BLAKE2B 6c702fa823426d5aa59d1aa8c2237039a4af1b1bb0a21a5195a2d39a0c456aa0c8fab2e31f786d5564e3bbc1c3dc2e1481ee414e57741ffe953294c5123f7347 SHA512 d2b6f1bd6b1104700eeb8a3609eb90ae151208f9947d100f15981053efd086849750ce9dbde3532f06a354bdcda52dc7ad8188c81eddaded0e7dafec963922d6
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.44.0.ebuild b/dev-python/fonttools/fonttools-3.44.0.ebuild
index 14c286579526..7e8a180be3fa 100644
--- a/dev-python/fonttools/fonttools-3.44.0.ebuild
+++ b/dev-python/fonttools/fonttools-3.44.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/fonttools/fonttools-4.0.1.ebuild b/dev-python/fonttools/fonttools-4.0.1.ebuild
index b798b62b0282..7bd58ebb8848 100644
--- a/dev-python/fonttools/fonttools-4.0.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 virtualx
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/foolscap/Manifest b/dev-python/foolscap/Manifest
deleted file mode 100644
index c4115762ce1d..000000000000
--- a/dev-python/foolscap/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST foolscap-0.11.0.tar.gz 491916 BLAKE2B bf36442b4274943c00df244c2880dbf8f16b67288a6b8391c8f3e8547ab907ff6de3e1dd92e7173c5801349d1f04f3789ef1f95b5baa32dadc3c56d3dd5b5d0e SHA512 577cd15e7f9207a9675999590cb1189edbdd77a2daee5cab80d66d40b1343bcb338a064eedf372ca7f8a102ed1cef0770923d6dea27dd6c3b37c0717cdc912e8
-DIST foolscap-0.13.1.tar.gz 524167 BLAKE2B 4d68b0a969dc90fdabadc38ceb7a912f7e0c25f2c1206d4613d3bc314a907832de02656c32f32bd2361e519476e1178a80c2d4ade7fc1f17caeb6ab7b4b72dfc SHA512 aa77fc22d6c1c32e1361f0ccc42902f25cf18ac917f81428d32f1170b75ecb4fe73f639e8bb641822775326ec920f14308ad7f4c5c01cd8051305fccde9c5e9e
-DIST foolscap-0.7.0.tar.gz 478999 BLAKE2B fbe3979efe8533a7727703af79aa3074f5ff54e4cd42cee4e981d8b2b73c445272792472236a52dc9fa69e9a25bd8cd30972d1fd2f37127db857ce5d5d3e7f6d SHA512 b2eb5415376d4e8e4ee3fd9ecef80a02d195d6b44059e5292c2daa7dcfdea9deafd8678ff89391128244a8d41fb6a69a92f9e4f07cc599f7358783dc8cb70f15
-EBUILD foolscap-0.11.0.ebuild 1292 BLAKE2B e829cf2e1bb640c5dbf99400c55fe0f5cee414c2208b092dd135d2af4629ddf20a74a6cc251ab3815ffbc2747646598fa0c6aea2fe449155b607312c9d0aa52c SHA512 3687e1058d8ce3e227b86db51a3abb1bf93254565a432970c29bc59a626c31f77b525b4517dd45aa5f086975bdc2ad2a787a432fe826a7b4d4397569d5676593
-EBUILD foolscap-0.13.1.ebuild 1280 BLAKE2B baa2aebad2976eb72c1b172cfabfe836683d2b26ec5026075decf303fad0ac4d8aed978a5f1661464477e6795c93b22c6b855718717564d92d39ed0c9d727d11 SHA512 1103feefe4b6da74d3b7dbb5fdd2bf150e7bb80b73a6212476f50dca69b295e14c274de85ae82eac7160a530a20830331146d4d9a230673a84543af4d14efc1e
-EBUILD foolscap-0.7.0.ebuild 934 BLAKE2B 1eb1b57d4aaf96dcd2408f181c819a44a94bf815638c02c166ea4efddb722f86b7ec61b5869213f474e0969e877adf7a98d021988131ef3a3c8450ded922c165 SHA512 01b7c93cb119d639f358eb8fd36fbda787a9c7e8c4dc3a0d75c8aac3db9b591bbf10d0b60dac0ad51ffdcc5e45e1d1be67f976226c201db32d2e0cca52e8df7d
-MISC metadata.xml 1272 BLAKE2B 2e8117819b9d14b123baeb54170b7e166c591af67d1d53911add7cf9cf1d7f5a1e23b00a4f32792d3109750a474c97341ae4d57db400c4884e2c212bfaea1547 SHA512 5509a54a69ca4d5c6898cdf125fc62d974b494dcce9117e9c66fc2e4e17b7f0d07e423739c9ea8b81cd2b3f16012400df9f764a5e2a4ab939edb2f8a3428ced0
diff --git a/dev-python/foolscap/foolscap-0.11.0.ebuild b/dev-python/foolscap/foolscap-0.11.0.ebuild
deleted file mode 100644
index 6fabb0687bef..000000000000
--- a/dev-python/foolscap/foolscap-0.11.0.ebuild
+++ /dev/null
@@ -1,54 +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="RPC protocol for Twisted"
-HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.org/project/foolscap/"
-SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc +ssl test"
-RESTRICT="!test? ( test )"
-
-# setup.py stipulates >=twisted-core-2.5.0 but failures occur in testsuite under -15.x
-RDEPEND="
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-web[${PYTHON_USEDEP}]
-	dev-python/service_identity[${PYTHON_USEDEP}]
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	trial ${PN} || die "Tests fail for ${EPYTHON}"
-}
-
-python_compile_all() {
-	local i;
-	if use doc; then
-		pushd doc > /dev/null
-		mkdir build || die
-		for i in ./*.rst
-		do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-		popd > /dev/null
-	fi
-}
-
-python_test() {
-	trial ${PN} || die "Tests fail for ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/foolscap/foolscap-0.13.1.ebuild b/dev-python/foolscap/foolscap-0.13.1.ebuild
deleted file mode 100644
index 39dfee6a6758..000000000000
--- a/dev-python/foolscap/foolscap-0.13.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="RPC protocol for Twisted"
-HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.org/project/foolscap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc +ssl test"
-
-# Many tests still failing (#657604), others rely on network
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/twisted-16[${PYTHON_USEDEP}]
-	dev-python/service_identity[${PYTHON_USEDEP}]
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )
-"
-#dev-python/txtorcon[${PYTHON_USEDEP}] will be needed when tests work
-
-python_test() {
-	trial ${PN} || die "Tests fail for ${EPYTHON}"
-}
-
-python_compile_all() {
-	local i;
-	if use doc; then
-		pushd doc > /dev/null
-		mkdir build || die
-		for i in ./*.rst
-		do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-		popd > /dev/null
-	fi
-}
-
-python_test() {
-	trial ${PN} || die "Tests fail for ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/foolscap/foolscap-0.7.0.ebuild b/dev-python/foolscap/foolscap-0.7.0.ebuild
deleted file mode 100644
index 458a37b04f4a..000000000000
--- a/dev-python/foolscap/foolscap-0.7.0.ebuild
+++ /dev/null
@@ -1,37 +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="RPC protocol for Twisted"
-HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.org/project/foolscap/"
-SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc +ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/twisted-core-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-web-2.5.0[${PYTHON_USEDEP}]
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	trial ${PN} || die "Tests fail for ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dodoc doc/*.txt
-		dohtml -A py,tpl,xhtml -r doc/*
-	fi
-}
diff --git a/dev-python/foolscap/metadata.xml b/dev-python/foolscap/metadata.xml
deleted file mode 100644
index 05b50f1ab47b..000000000000
--- a/dev-python/foolscap/metadata.xml
+++ /dev/null
@@ -1,28 +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>
-This is a ground-up rewrite of Perspective Broker, which itself is Twisted's
-native RPC/RMI protocol (Remote Procedure Call / Remote Method Invocation).
-If you have control of both ends of the wire, and are thus not constrained to
-use some other protocol like HTTP/XMLRPC/CORBA/etc, you might consider using
-Foolscap.
-
-Fundamentally, Foolscap allows you to make a python object in one process
-available to code in other processes, which means you can invoke its methods
-remotely. This includes a data serialization layer to convey the object
-graphs for the arguments and the eventual response, and an object reference
-system to keep track of which objects you are connecting to. It uses a
-capability-based security model, such that once you create a non-public
-object, it is only accessible to clients to whom you've given the
-(unguessable) FURL. You can of course publish world-visible objects that
-have well-known FURLs.
-</longdescription>
-	<upstream>
-		<remote-id type="pypi">foolscap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/formencode/Manifest b/dev-python/formencode/Manifest
index e4f9b0e74c48..de76f477d446 100644
--- a/dev-python/formencode/Manifest
+++ b/dev-python/formencode/Manifest
@@ -1,3 +1,3 @@
 DIST FormEncode-1.3.0.zip 347674 BLAKE2B 27cf411224338403036fc99eac5bbaf3d24d211afafae2689e638ea2d9c95f9475bf42246c9bbd50d748fa1d8aad14633da686f63cc409520455b593da0aed34 SHA512 12c7c9fa36173c209682a6e1d68a074c64c9a5bd30e4f6b6b851b55d43c350ce1f79f666a9176add65f6bde554bc5deeb82ac965005f9457c4c2b0447af0cea9
-EBUILD formencode-1.3.0-r3.ebuild 1284 BLAKE2B c2825d2688e12c4c012dd5a6075d136ee99466a61adc68be23027d36ea7535a90dee9f46c64a632f0816c15390a6c0da18a7ecc06b925d1017df94654d72599c SHA512 a88a527d409588890fb5f8ebea066d168e0a7cb0591b0182c429f7b34a386536ee68923a82721da3cd1c3303ca251ab49e0b4d5dd1b94b5c3597d20740d3f64d
+EBUILD formencode-1.3.0-r3.ebuild 1280 BLAKE2B 0a3257c7ea6f57a05fed0335d1b4082a3284d8eb656f266c5125fffa24de5d234f591f33cb164228e9cc2249f9bcec27c0c5429cf559adec12e3da8e572e832d SHA512 26bdede9185b05b5f607f3fb4b17fa2eba498039979bfb88529795ef4dfc406cc22d371a8b8ad5394e403f4fdadf6e3571209f5e389ddb2a537e4e0605af0080
 MISC metadata.xml 313 BLAKE2B b2afc0db55b4200fc468745d4798933c54abac7014e1d3e87080d1601101cff2c6642b31a83b620e9b68b8181dfeeb0f6d8eedec6bedde9d3c5716ccaec7d229 SHA512 75c69f2f2ed7d4415bd057215675f4f4ed90b7c6ac1c402e61c6c2404600a5676298d3f0eeb58d287113ea34304e34ffe3731646d96264f776a37b0812d4db9b
diff --git a/dev-python/formencode/formencode-1.3.0-r3.ebuild b/dev-python/formencode/formencode-1.3.0-r3.ebuild
index 6a09d0e8b3a3..6f62e4aed8b6 100644
--- a/dev-python/formencode/formencode-1.3.0-r3.ebuild
+++ b/dev-python/formencode/formencode-1.3.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fpconst/Manifest b/dev-python/fpconst/Manifest
deleted file mode 100644
index fae9cda67302..000000000000
--- a/dev-python/fpconst/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fpconst-0.7.3.tar.gz 9697 BLAKE2B 69b2d00817d33b8fc0830a02961717e98c15e11f9db34338fafaf5b55cbb6b49907ba17c0f7f69131a36f44b50592856256073af0ce6a5dc325701517a62dadb SHA512 c6394ca2bd5d431bd7902a35bb31b976d1ef7461b4b576c77859f4132288a288ccdcf38805cc9f49228a989b94d74846cae3e99b382a5546866f327b436c5cdf
-EBUILD fpconst-0.7.3-r1.ebuild 769 BLAKE2B bc84256d8f7e83d57c1672048ac3c52e4e81045b93ccda349654ff9fd42a97e573f94eb4db4a6a8c5ba71073b8defc22ae7ee2f2b0c07c8105466486965921d6 SHA512 5de92e1554ff0c7c61dc0006c59aa549b337a461444bd5260e51b0891e76e1ccdee28fdd69c6e9aba00e56029249599d43e94aa29b60cf8428da9447b0cccfba
-MISC metadata.xml 315 BLAKE2B a996a5b0348bd99a57864c48ebece6fd508a6e19efede679bcbc990163dc5782aedcc625058d5271210f387ceca904cc10955bd3472808d6488b11dfd1a6bb52 SHA512 03c0ea04bc047530329ef73ae2c0d1c687bae54031e0ab4fc383b13d00f97bc144ae8ba8f66e97a0b8f9b2aa804c4b38bb09023b7e9fec6838ff867de0e119a6
diff --git a/dev-python/fpconst/fpconst-0.7.3-r1.ebuild b/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
deleted file mode 100644
index 21ad939bc4bb..000000000000
--- a/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Module for handling IEEE 754 floating point special values"
-HOMEPAGE="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/ https://pypi.org/project/fpconst/ https://sourceforge.net/projects/rsoap/files/"
-SRC_URI="mirror://sourceforge/rsoap/${P}.tar.gz"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS=( CHANGELOG README pep-0754.txt )
-
-python_test() {
-	"${PYTHON}" -m fpconst || die "Self-tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/fpconst/metadata.xml b/dev-python/fpconst/metadata.xml
deleted file mode 100644
index d59f19460f55..000000000000
--- a/dev-python/fpconst/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="sourceforge">rsoap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index 62b4d32afcbd..f77b6554dc7c 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,3 +1,3 @@
-DIST fqdn-1.1.1.tar.gz 12056 BLAKE2B 8f78e16b73239ec7dbd2f1565026459c08b80245999b4bd93fe7119f45f604c84ae9d60cbb42aec147d5096bb1a6b1898a2d884db244e1ad507ed516aa3591b3 SHA512 46487bcdf2639b84023f710c323b33b8bdb9a3a3d6e7f22c1e9b759940193f9473d3bd639678ab377741ce84c180bc18eb7e65060fdd59189dacadcb50df317b
-EBUILD fqdn-1.1.1.ebuild 640 BLAKE2B 0c00f1631709b704216cff51d62fb55ecec82047215ecff87efe69191f587f6b7450bd76f8f17f3ed89d4555a5cd460d7c169a0e059b9af9b66025c33468a1f9 SHA512 4e5543ece0191cb78ee8334a6a93d12f6fd9345dbfda717f658eec9d6c3f544462e99054d05e05fa0cb4ee6345fe015a43c656a5800731a9477d546f626e3ba0
+DIST fqdn-1.2.0.tar.gz 12275 BLAKE2B 0bc862863ee3b196ea08a1f4f50f98dca88e8b81f37d2cb97bd3fd74ef9844157ea7a9f38707047fad17b95fb95c2f0e7ace8ad2c2310171cba6ff43471ae63d SHA512 ddfcfd82860d597075fd2d989d4bb1cd8c1dc79b711da432732bf786032e78b9356e04851a491c5299b336dcde173a66ddae0e23aea59b67c758d997554b494e
+EBUILD fqdn-1.2.0.ebuild 623 BLAKE2B 1873b41d1717caec4b15bbe05617c7c9cb2eed2ed735516cc3919310ddc8efbc4e8ea947e4809f784e0afc07ee457c45160de8a3e87b0e3b5660a9148a20ac10 SHA512 f69b029bdd4a25dd72bce9a95e540d133a1635e2e3081e6450d035724584c19c88416a636dda509d105f3e7826ed562c05eb8bb183d0992346ba1f2cbb972ef0
 MISC metadata.xml 526 BLAKE2B 1fb86ccea80fe5eadf839fb67a10f428907b402f8559935ba97ea054012497253b3b139818d7cab92f3375fae374772b8e90d470be10773998ec554b3407c401 SHA512 d9107d31f2e828667938b86209ecfe70f0eabd8c10517e3dfdaceb63ac860c314e4889a1b06ef680b2a9acd84212aa0f703147c6180a9b7e031bc4579e93e6a7
diff --git a/dev-python/fqdn/fqdn-1.1.1.ebuild b/dev-python/fqdn/fqdn-1.1.1.ebuild
deleted file mode 100644
index a32fb6b8dce0..000000000000
--- a/dev-python/fqdn/fqdn-1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="RFC-compliant FQDN validation and manipulation for Python"
-HOMEPAGE="https://github.com/guyhughes/fqdn"
-SRC_URI="https://github.com/guyhughes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/cached-property[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/fqdn/fqdn-1.2.0.ebuild b/dev-python/fqdn/fqdn-1.2.0.ebuild
new file mode 100644
index 000000000000..44be7d78fc50
--- /dev/null
+++ b/dev-python/fqdn/fqdn-1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2018-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="RFC-compliant FQDN validation and manipulation for Python"
+HOMEPAGE="https://github.com/guyhughes/fqdn"
+SRC_URI="https://github.com/guyhughes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/cached-property[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index 5f055f0347dc..a2703bd0f9c8 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -4,7 +4,9 @@ AUX freezegun-0.3.12-tests.patch 431 BLAKE2B 42719249d4498d44f2810436b11e53b4b58
 DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558f5c848f5c79dfc48e3f3e3cb71ff9c71090705167d4252edbfee040ef52a7eafd33073011c07337311a7e0ec366 SHA512 64364459dc72484e2124a20a0a84d2b88617efd0578fba687adb51635d578a1e36a00cb119998082610c608e7b6c3589bff5424e38845bad026e85449c8065a5
 DIST freezegun-0.3.11.tar.gz 23382 BLAKE2B 759cc0355c8600fc46124dfb73b46a771de5cae4e66f5826c175295da96190920d7ff45b6457a061276c0c698bd448e294f29f3b89a0ed8fe76db58e1180b080 SHA512 e8b392176641d52f6ed795c9af5fbc0a62892aeedf32b42375b56ab44a9ad7a5ecd3bb81363ed0ae65204aff2ef894cd7f2e17f42be72f31d3409b2bffa59ab8
 DIST freezegun-0.3.12.tar.gz 24346 BLAKE2B 09d7c662a82d7b7fa6ae56c09bff0d73e2b63fba2b492620cd8e68ee06a15129a7e901418d1881e65b440babcfe0d014ad3574ab8dd2c7eab8486b3d868273ac SHA512 f7d98ea84735b24380fa53e1e62622fe91be5a35cb75221ca4cb02418add9b0a4add9b2f691242be75acbc45d4745fef82ffe3c89890dcdffa4405940e527af4
-EBUILD freezegun-0.3.10.ebuild 953 BLAKE2B b57ac38fe16e8bf255e317f8bb5b6fa18d3546a5fa853c721548540fea27434d83d77da97feff77744eff53117aa21f3e5aa759596d8857b072d370fd8402c6d SHA512 f466ea45fc4d8880f327835483109c49da31b738f2d34aa281f7c0e44dfca44f7448c859a321d23463d13474848188bae53e36b2de42492f3c15d77252851966
-EBUILD freezegun-0.3.11.ebuild 908 BLAKE2B 7133c4b2ef60a147479ef362174cf49a43feadcb709b753eb3766685568bea95e258f3549a0fb3e2e7870547f991407d6620d7bc342db4832971a34778685f91 SHA512 fa7f70603226bda71b641daa8fb6bde0b06b446950065b4ff189b6d7d8ea5e877882bf57ce6b61b06e9fa85d5b74527ae5d773ec701b9eea429894a79943390b
-EBUILD freezegun-0.3.12-r1.ebuild 1306 BLAKE2B 6695516c7d81a5d1cf3e99408ef4bb80e9af7b7ea7e529c66f28399869fd31b05f94afb0bfbd81299465b491679dbc2ff96d9a7302c8eff82319d10d3bd6bb86 SHA512 294298ffedbb8ac583e8c8d3d0aa0e857155d4fc1490e6ed5c68cc11481a4086d8f50285762a2b74d4416e34c3ad96feb6ce5d78ae814767c4b187b59def6aec
+DIST freezegun-0.3.13.tar.gz 25419 BLAKE2B 8334f921609463bcb18779b61b234bb80406924578ccd43ca1f4a10c65eddf87f399fa7fb285453808988c6f74331345a373cbdcb29f3bd412f3a9e472fce43c SHA512 682f689c475ee574e7a466bfa102b96545cd8b7f095c4b5bdfda496ef667c712248db414d66c9f17fdb1a492c0deeb87a07d8b2a4128d7fdd771f89d5ea8277f
+EBUILD freezegun-0.3.10.ebuild 946 BLAKE2B 32d543940a7b23525a9bd96f216935b95755f9317b21e574fc16ad8a46b39e26bbd0ffb5a98ac3439fda5d9269012b8c393b4e03f751f13db7d75136c2ac8e5f SHA512 2734f2a4bbd8df2ef5cc8c92c405f1a4167ae1e4cd0212e19c39ca424fe337c7b32693d19751c58207c4a47682a915d94e47e9f564d4ce0e51bcb877eedc9bce
+EBUILD freezegun-0.3.11.ebuild 901 BLAKE2B 141e5fcd1587c0eb4efe509c542d472c84e9a0cd0eae618cc952a5d72382f1662babd712ee7bb1ff6c66323a3b9d825b0b1492fc8bc99d45bc1adeba6f10b3c7 SHA512 46992699d6de127a767e4f6ed08187b93b65debf9e878beffcf6f076b998a474120c238ba6935d8dd9595746e632e563c7c952a1810615fd1cdc12d0b9870a7a
+EBUILD freezegun-0.3.12-r1.ebuild 1301 BLAKE2B e2ec979db1167999dbc968c202658ee7a7d7a812c1570d3f213ea26c7b500156b03bf93d3629eea1d3598dc5b5d6164b82add882bb453bf3024f4fc4494eaeb7 SHA512 0a9b44480f6d8a1992148e261f351873422f204c5bf4514bf072b2ca3f20c401610559ac13c69dfd2ab21fac3ac96cdb4f391ed06016ec7b590dbfba3ab3a087
+EBUILD freezegun-0.3.13.ebuild 1126 BLAKE2B 40c8161324a4f52d7799043c3856b594e1049325a3b4d0694371fc027cf5ff75d96af515763b36f1872fac37a02c442356a7afe23451766258d0a2e9e745be81 SHA512 9bc7cca4f4cce9a8bde0389ca6ad72cca53283082dca05866ea26d0225f6b63f2109d1e9261b20cfb9922b6f5316daf11c0b6e389f227995b578982c14472244
 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild
index a398a264edc3..399af5cfe6a8 100644
--- a/dev-python/freezegun/freezegun-0.3.10.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/freezegun/freezegun-0.3.11.ebuild b/dev-python/freezegun/freezegun-0.3.11.ebuild
index 8211ca08193a..7fbca36505a1 100644
--- a/dev-python/freezegun/freezegun-0.3.11.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/freezegun/freezegun-0.3.12-r1.ebuild b/dev-python/freezegun/freezegun-0.3.12-r1.ebuild
index bef9ce1ee62a..b615b8ebe7cf 100644
--- a/dev-python/freezegun/freezegun-0.3.12-r1.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.12-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/freezegun/freezegun-0.3.13.ebuild b/dev-python/freezegun/freezegun-0.3.13.ebuild
new file mode 100644
index 000000000000..c069ad36b75f
--- /dev/null
+++ b/dev-python/freezegun/freezegun-0.3.13.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Let your Python tests travel through time"
+HOMEPAGE="https://github.com/spulec/freezegun"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="
+	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r \
+		-e 's:(python-dateutil)>=2.0:\1:' \
+		-e "s:'(python-dateutil)>=[0-9.]+,.+':'\1':" \
+		-i setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	# optional and only works with python3
+	if ! python_is_python3; then
+		rm freezegun/_async*.py || die
+	fi
+}
diff --git a/dev-python/frozen-flask/Manifest b/dev-python/frozen-flask/Manifest
index 5c3da209ca0e..d030b85b0d12 100644
--- a/dev-python/frozen-flask/Manifest
+++ b/dev-python/frozen-flask/Manifest
@@ -1,5 +1,3 @@
-DIST Frozen-Flask-0.11.tar.gz 106927 BLAKE2B b23caedc0a60ebdf089753b698ebc04f2d89c8fbea58819a959533c68a181ca73dfc66c5d263b7c05c84c92b8540e00d3094992ff0064f7edaec1fed42fe1ae7 SHA512 a734c6e090f08b01756b677a577c013e0198272a9e469410be81e5214eceb34d98e163410e8e04850036c58c5e7c9e718145e69cd26dd9e30c821f6949aede76
 DIST Frozen-Flask-0.15.tar.gz 477516 BLAKE2B 1f9ecc59cabc547f7c4358c5fbbde0c57264a6c8e45bcf567c00f5c20eef288b8d261edf878e1295ef702d863c16dd605b59982abfe4daf9f073b29787b01921 SHA512 8cb80ccb5018abdaaf53a43c219504d57f2630af3d8d5c7bd6bee44c7cf483f50530bc00ff49fd674d54c0e1f6a5e0caa004bff04e95dec7f58a8bb443a36241
-EBUILD frozen-flask-0.11-r1.ebuild 1087 BLAKE2B 48a18b760a079d5a76666fb389a5900f6fee605f10df6920d7b1834c88be3228ae3a6682323b155d97259aa1bb6bc4c311e090e7f484bd03c0ae720d5f86e8f2 SHA512 b234a776babb0d1514a173e42348fdefe10a81c4abe156d5cdcb3607c6043a805cc72b714aa299040e4c173bdaa9a1e13229b1a67f649b3cc4e4c51fbde4e1fd
-EBUILD frozen-flask-0.15.ebuild 1023 BLAKE2B 7e3fa0f0babcc63572eaa3dd812312da4cc4732b457fea1a9b6dba24f41c6a7469b4acf8d6db558aae6c972ee24f76e0fa0610c445198089df6b901df207b84d SHA512 118c6c9f5e57c8b80a7f5c4392baac924edcfae663a101893391b7df8cb410c6b9412109d28398dc627bdea9889c505244b2dcfc6f5d3be73fbf5073ffb04dfa
+EBUILD frozen-flask-0.15.ebuild 1016 BLAKE2B ff5a39699a081b4e03acc7c8c876a03d6a717ce3c5a3d80a480ee9891ce5a577bae682c138a0a86ce4f8e83e652f48d74247fd29da353665d88334063081f812 SHA512 997af45ec0b6b96d6177762810c766789bd6654358104d7282c07e8781227442867d7fafb79da2dbaa3261fdf6e805a5e4d00f18fee276f2b043ca09b5b7a433
 MISC metadata.xml 390 BLAKE2B 596dd147a24653b5cace2a55534505dd497afe299a31962db838e5b9333e84a6cc28f5b933886b78f4cf082b17430cbf0cb5131350da1bce501ff2a9acc85d2a SHA512 d8c13cff6277121723990211a23849cedef64a6571ec745233d65ee8fd11f9e3499436a9ca7fd2f98ff47f65de0147a7df870ff23455fcdbc684ae7c6bda0857
diff --git a/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild b/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
deleted file mode 100644
index bd6ddcdf57ec..000000000000
--- a/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-MY_PN="Frozen-Flask"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	if use doc; then
-		sed -e 's:^intersphinx_mapping:#intersphinx_mapping:' -i docs/conf.py || die
-		mkdir docs/_build || die
-		sphinx-build -c docs docs docs/_build  || die
-	fi
-}
-
-python_test() {
-	nosetests || die Tests failed under $"{EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/docs/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/frozen-flask/frozen-flask-0.15.ebuild b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
index 001c24b4870b..17779b8d3e03 100644
--- a/dev-python/frozen-flask/frozen-flask-0.15.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 689a3eff3cc4..8c1fd80abab7 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -3,9 +3,9 @@ DIST fs-2.0.21.tar.gz 115844 BLAKE2B 0f7b3fa087c89a68c27d350233e3e73fa54b761bad7
 DIST fs-2.0.26.tar.gz 118831 BLAKE2B ce9be9d52882916cd73262556936d55c78fd245f20bea7e7cfbe314d6b1e7a43970ed3758bbd781736b344b65ca03c53ef7b3b5957e93c390b733b7e6ad5bc70 SHA512 2efd77ed968a6d711f6020c84a4418aee32f2273dc246fc4cdbf5daed9d4b5ff86b1c22d2726b637031c398bd1d3b03216c70a47248c793fa3b72c678c007d6f
 DIST fs-2.4.8.tar.gz 124808 BLAKE2B 30e139fe577f90632d04d471edd08ed8113e2e07e9273c58cfde5674b0dd178322ac388738b2220fbe44df4ac89e30df2b879f7566bfe1d8bac72ba18c41a67c SHA512 11e8589f6c078bbc0543276d511dd3fc0762725bd78b46a3fa1cdfb3c8712a2d82675c58a8404d9f12e9b6932ffeb971ce0127df2b9da3ceae68568194d9a385
 DIST fs-2.4.9.tar.gz 126022 BLAKE2B bd7406ee0c22171af349bed6096f58bc749af30f3fae6b8532d7a2b07dd7f0a55165f4b4ab413d6ff7c8861fbe7784ae383a984d26c1cdb1bdc9100c4ae0b0df SHA512 594536eccc043547df4ec4fd1fc507d3fad2838ebb46768a11f142c68d42a776f9fa3cda8651421c6255314835a0283407ea49ebdce04af84a1646efaf5391e5
-EBUILD fs-0.5.4.ebuild 987 BLAKE2B 777f766d38815ff454e1918107b71568a4ea2cf7ba5537158d637008bc3810a66b468489a081c5c7e1981b90ece402e0ded30e357a86139ded8d6739d38f181f SHA512 bc23d52fe682aa1df344a469d3be70b58f6691b58c28f2f722be78b5fe24f28c7d38ae5536793abc85c8598e441f1ffb6a6eba9ece4ceea6d08a26657b66fbad
-EBUILD fs-2.0.21.ebuild 987 BLAKE2B 777f766d38815ff454e1918107b71568a4ea2cf7ba5537158d637008bc3810a66b468489a081c5c7e1981b90ece402e0ded30e357a86139ded8d6739d38f181f SHA512 bc23d52fe682aa1df344a469d3be70b58f6691b58c28f2f722be78b5fe24f28c7d38ae5536793abc85c8598e441f1ffb6a6eba9ece4ceea6d08a26657b66fbad
-EBUILD fs-2.0.26.ebuild 986 BLAKE2B 7d86c01e0869da0a344e0de394c26c26ab490b19340901e426aa75607ed95d93b4f4d1802277dbd79d1b68dc999cfcbc7add921f84ca49598057ab51e2c78bd6 SHA512 e40b8465422c7dfeadfccb01b179277ec88a21e5e443d66ed219b78de37fe5be0aeac155cb3837e3d23d6f77456e73a9427b9a923988ca5c7edf6389e81a9442
-EBUILD fs-2.4.8.ebuild 1054 BLAKE2B 2b43ffe0d28a690b226885696e3d5ad786bd367cd6d1fca589861cfbcbb9278dc626e260cf7db246bca31b222d22f0956569f43a6770f16d819d8918b03cbe02 SHA512 d42ede850f0929201b44734c31d0f64a435f658220e9c275df07318e0c0b5a09cc6f6d9faec52e1fe80fa44fd3bd4b7c3a659c176a8b658cdf61363b8e164fae
-EBUILD fs-2.4.9.ebuild 1378 BLAKE2B 93fe5a3c71b6f2694feb7377794136239e9b2832883e90ebab6b6204f5c098bc80de5c2e6672eeec3d2a5ada4254d447106039dbd3676f1ae7fb8ad67bcca694 SHA512 47a8d7b6b137db6b5ab4cccad9a8f183db43febe9eb4f07f056b5cffc3425a4ddccb578166a174da6a3b11fc11df18fcffbf3a7f76e0ca76cd6d713f2429b8ce
+EBUILD fs-0.5.4.ebuild 978 BLAKE2B 0760161fb608108890044982901ee1c5ebc3cd10541bf791daeefc33ef5bb43a2d57cbfd2209575636edc961504ee842a4e8156688ae3c40d8ba902bb4787592 SHA512 31183798bae3e5b43cc7d376046d0f92578a40401ac51b1e63bc20589d59c485b59f9171e782365b0c236baf12b4c631768bc408d307cf04208e1089b03a6bd7
+EBUILD fs-2.0.21.ebuild 978 BLAKE2B 0760161fb608108890044982901ee1c5ebc3cd10541bf791daeefc33ef5bb43a2d57cbfd2209575636edc961504ee842a4e8156688ae3c40d8ba902bb4787592 SHA512 31183798bae3e5b43cc7d376046d0f92578a40401ac51b1e63bc20589d59c485b59f9171e782365b0c236baf12b4c631768bc408d307cf04208e1089b03a6bd7
+EBUILD fs-2.0.26.ebuild 977 BLAKE2B 89acb35a3effdd431abbfd728547e5801120fcebf62ae4dd163fe1810eed0b723729bca82dc7b150acd44a6d6a2d763c4ffa4e4416c4e49c5cf0398c7c55f438 SHA512 6d4ec0dd22d7616adb86c8a7b2db097ae67aa04e9b2842d883c67f5acc12964179cac3d46dba8a292a4262c22c107623d2311068444a7cc04c761cdbce05c42c
+EBUILD fs-2.4.8.ebuild 1052 BLAKE2B abfcd90148f4e21977f5d683bb8ee986dfc5a59ff648cd64dd03b22e91457d3067aa6ecd84cfbb9f65a95b1a56418dfbd08a382d2c235a986cb320e0f83c3c04 SHA512 568528e4e86acdec377ca93e59d6161295bcf0f531ce02c7180eea91781cee9e04b75809d5296a5ce32b5c85d92280e7fb3a4e7be630303ec865cadbf016ecf0
+EBUILD fs-2.4.9.ebuild 1381 BLAKE2B f88566eca3b20661a4cc158e726460059a976b0ce429b0fccbea3a571dfbf2a4f1cb001b5e4b2ef58a92810adefacd8ffeecc3e20f82eae92757d8e3941e18ac SHA512 ea9f881d99895d68508a1bb40e0884a7b50fab9396bef0c425fe3c069e4db21c699540e811c1f4eaf56a13fe9953242522e015b9d6974e3b6ea457cf6996f764
 MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
diff --git a/dev-python/fs/fs-0.5.4.ebuild b/dev-python/fs/fs-0.5.4.ebuild
index 9c44199bb17d..0b4e761b20a0 100644
--- a/dev-python/fs/fs-0.5.4.ebuild
+++ b/dev-python/fs/fs-0.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/fs/fs-2.0.21.ebuild b/dev-python/fs/fs-2.0.21.ebuild
index 9c44199bb17d..0b4e761b20a0 100644
--- a/dev-python/fs/fs-2.0.21.ebuild
+++ b/dev-python/fs/fs-2.0.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/fs/fs-2.0.26.ebuild b/dev-python/fs/fs-2.0.26.ebuild
index 9677543fec84..3eff80a72e86 100644
--- a/dev-python/fs/fs-2.0.26.ebuild
+++ b/dev-python/fs/fs-2.0.26.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/fs/fs-2.4.8.ebuild b/dev-python/fs/fs-2.4.8.ebuild
index 954b646005e7..1806cecc14e6 100644
--- a/dev-python/fs/fs-2.4.8.ebuild
+++ b/dev-python/fs/fs-2.4.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/fs/fs-2.4.9.ebuild b/dev-python/fs/fs-2.4.9.ebuild
index 357dbf314795..6104a59572b4 100644
--- a/dev-python/fs/fs-2.4.9.ebuild
+++ b/dev-python/fs/fs-2.4.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1 eutils
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fudge/Manifest b/dev-python/fudge/Manifest
index 87257a4c3282..0942db995cb6 100644
--- a/dev-python/fudge/Manifest
+++ b/dev-python/fudge/Manifest
@@ -1,5 +1,3 @@
-DIST fudge-0.9.6.tar.gz 81653 BLAKE2B 106a0c774f9eb2f90beabfa1d84f55febaafa6c6e650b8d194464d9b7bdcf3b3ed18b943d0b7cad143f87febc75047d956d66521675c1f917f7835bf8585edd2 SHA512 69b2fa5bdd678779c0a8d9863a67e1e6724828720d2764f9f8958bc3598dcf39b22f9827efccb03014961d27d6e214c2125f639bab200b63c824c2306e3bb617
 DIST fudge-1.1.0.tar.gz 86418 BLAKE2B 3264b693bb8d4e8a0849c480b48ee79e4e99a88a819f94bfab9c098fd8ccef1171f3f0a8ca7632f29b2c22998d0847e53fcc613bbdf8ac4c1fe33aeae406997c SHA512 061d9303d28509d4e22eb2036d041359f872be85911dd85bb16e4d13bfc1cf27637f8206f215f4a37d63108ab2500d2af3f6a1a3e206fe461ead9163e0519417
-EBUILD fudge-0.9.6-r1.ebuild 935 BLAKE2B 0a847cd2435da507645be194c6808977d23ce8e2719758ca1ca84eae98e894c87700e2da12145456752fb148a8564e6d4b5e599512e3c2df64a8f8c864dfe32e SHA512 27ad709e73f64c99fd1fcf20fda6338efa2f0b1f16ecc7de98e0c45a47bfb4f2bf9e24bad4585af6b3323c96de560134b20c4c3ddb7b03292589ec44f114b6c2
-EBUILD fudge-1.1.0.ebuild 894 BLAKE2B 1a894099892ae2757d114453c1cc06fbe2abf91eaf80c130302e109e470a26d9a0d1bec084f9eb431f3d3d6430508ede8f14977cc6fbf6f9f48f0c8431be0605 SHA512 bc0cb8a1905913f8403a0160308f3f80de0a9fd707643bec0b1f172a7bac08f19e0be2cd4b0480a02ef6530f757dfe7ed3415a94287e6745fbaac79f35b713d7
+EBUILD fudge-1.1.0.ebuild 879 BLAKE2B 366f9dd0c6d672c0410e5505b27081e399b6f0bcb3016de994d5cbdb5818971eebfc676f3335512f245300cb48fde58215223d5052b643ad3b9d873e12927633 SHA512 c5c4b698897d22ed243731e9fe1f70b4f25450c6db38f5ac76b01fcccd37f0161fca128a3da4458b588b0cf11a10cb5c75a4ae6987f901642b3040b6a4947a5e
 MISC metadata.xml 308 BLAKE2B 515b12cd0857952a40c85fdb530340408506cdc4b33f54609b1489fd9ca458f8ee25d195f7cf3b151ca2d219451766714406d7788d7fabc718d2f0f234e5e588 SHA512 b453f365fc5bb8e91cf95982d92096d7f952f4d4cdef59ec1cc41e53a6e2e4861d815db845174952791a1ff67007c8c076151b2a12a1730d3ea03471cab02c56
diff --git a/dev-python/fudge/fudge-0.9.6-r1.ebuild b/dev-python/fudge/fudge-0.9.6-r1.ebuild
deleted file mode 100644
index 91e4234c05d9..000000000000
--- a/dev-python/fudge/fudge-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
-HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	find -name "._*" -delete || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -w "${BUILD_DIR}"/lib \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/fudge/fudge-1.1.0.ebuild b/dev-python/fudge/fudge-1.1.0.ebuild
index ccacd3ce7396..95bdaf07f19e 100644
--- a/dev-python/fudge/fudge-1.1.0.ebuild
+++ b/dev-python/fudge/fudge-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 93fc4afebb31..545c8d80d9eb 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,4 +1,4 @@
 DIST funcparserlib-0.3.6.tar.gz 30401 BLAKE2B cfce97cf08914f67ba3bd743bd3d6e7e7a03599ddc00d58a884aa84118d197d92bcc67a93ff1f7a2ab2074d66704078f5392c1d846004a5cd6eed2a423ba6b61 SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24
-EBUILD funcparserlib-0.3.6-r1.ebuild 699 BLAKE2B 80982c444282d30f6664c22f3c3db7a5c7badcf3290151ed103dbde0f30253cb9835f4cd2d7e90dfd4f54aaea4f67b2542131d9b04c94bef83fb1309a0895a17 SHA512 5d1cfd8d000bc573de2d8d82684c76e303851acbff03174301025a084dbcffd088e3fc10305e2b018f4ae57c665a7c7a325b61cfefabb9c23e9fcb684488e291
-EBUILD funcparserlib-0.3.6.ebuild 736 BLAKE2B a5c5e849862a838634f3fb592f6dcc3cb7f7d5f2546ddb4016434f2167b76f368989509f9211ae9f7fca4220a383a9cdd980c90e2456541f9e0b2000ac8791ce SHA512 02e3d3713701cf01ef5c29e2cb1d64bf59c4a5dcf80ba8f93a8cb6d38f1e4bfabd756b16ff9a149c269ee6bbca674055b02ce29b92e403556c4889257895208e
+EBUILD funcparserlib-0.3.6-r1.ebuild 694 BLAKE2B 36bc7494ada7b6a1dde561ddb2c1acb0152567f9c9270c07f2e85e6eb78e6f75744a54984253dd307dae9fff66279357fb8d400797768427b04769af8622bab5 SHA512 50a1b1e0eefab4f4034bf82e0be47df1f6c9f83ba9aff38d74fc8da1ec561a87ec3e90cd0c3cf0bea20d8a4524704df94ac366eec554a7ea03762fde0dc0c791
+EBUILD funcparserlib-0.3.6.ebuild 727 BLAKE2B 3d2cec34ec81f170256813806a049aaf11b2578fc4d041b54a3436cf6e8e8ed182b6cb1cbfe717a08202a35e61fe3b7ec2ac8d19142d8b40675f9aaf45002fa6 SHA512 35233bcc225721ad4bed24dd4adcb97f6b86ee2fb6e6610bfdd113af72d6aac59a149dd2740b9470b89e4aab341aeb063a5f65ec535f50ad3994e2fc7f491ed8
 MISC metadata.xml 316 BLAKE2B 1899ee4255eb25643967fafb8aa09ea4b8e6319074de967e512d98ed182c2c7f7992c11c6689000f7bd2076b7296fc544fb8aff86fb03c86d661ce183a41c9b1 SHA512 9fe54328f405d097056ad5e3e0795ded4e3eacd72381dca3298a9af0e7c78f11eab97548b251c6bfaa9144dd0b00c00ac4292ad2ed5e84c31ab6c593a26b8caa
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index d43775d3201b..d892853dfb29 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
index e26854da0950..79de30f06534 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/funcsigs/Manifest b/dev-python/funcsigs/Manifest
index d813fa936d29..952f3a767632 100644
--- a/dev-python/funcsigs/Manifest
+++ b/dev-python/funcsigs/Manifest
@@ -1,4 +1,4 @@
 AUX funcsigs-1.0.2-fix-pypy3-tests.patch 3154 BLAKE2B face7accdd8bc2c5d3ab9dbcf9fa172695901768849d9278b0b384819b4c6ca3409f8dba3d9ce058f16e88f0696d1fd7dd6d3b7ba119989fb8b3e97fa0399635 SHA512 f4f93b2587fe2b0a41dda070d827f663785c367fcb3a181c0f461175ebeff47147907cc901954cb98cb7cce25754535663fbefe9227462fa2963d3ed572a852a
 DIST funcsigs-1.0.2.tar.gz 27947 BLAKE2B 3006d46018ae040b930e397c3f11575ae0ef18a8b2c9b6c10075804d83d23bea1fb81179de85180146673e0bd4c775a68c0ff624cdaceb1894efe5b2c8fd753c SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda
-EBUILD funcsigs-1.0.2-r1.ebuild 960 BLAKE2B 1e6712d85fa1688e0c787744f4c34ea12e16e78b1510350c66dc81c5446a38a212be2f774d2acf391138b8d6862d3bf3893884e8e4b8740cde1f48bc3fa7ba4a SHA512 00407eed8d5983d8d15e2fcf51ed443d476cf085966d697447bac1c93abf7af3fbdd3699f57e6601539df753620cc4384d8f84c9aa399ace5bd7e42555596a71
+EBUILD funcsigs-1.0.2-r1.ebuild 953 BLAKE2B f6967146df88131587e33b5d989097166b873440858c7856b3dba44de99b49ff3d54376612458421ec694448a621e269d22486e74c776ef3d19cd7595f5b98a4 SHA512 a92783d176fc3ae3b77a0023717f73881ac930eb6eeafc9cb32d0c5d92fec722b09732daad690799f23255c3f98f1f92be755396faa9e91d7ea69400b4c43156
 MISC metadata.xml 321 BLAKE2B 8aa6245455756e5d3a197dfb37bb706551ff8ea0c6beb047d0c59c54d2ed74853e6d9857d37a531a5313a7a85a0849f5e0b308a58fa98a3cce6040b5b91a1a80 SHA512 a3df23a85e33881f6ac0da0b0e33fd69de760c79e636574982606964134d303bfa219f429006a54ad71622c05c07b6eb233a1e8918f4703257b0e8c389acb6d8
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
index 95d90c123eaf..e09064d69432 100644
--- a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/functest/Manifest b/dev-python/functest/Manifest
deleted file mode 100644
index 8e8bd4429585..000000000000
--- a/dev-python/functest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST functest-0.8.8.tar.gz 9972 BLAKE2B 41c6e56acf61491d3ea6c40492f25f851c6b235cd0c5aca8e374d355d1de8fad30271fbf1f71435bee2b2dc2d8f1a834480d11f44c997f2414699c2b021037ab SHA512 31b95b90222044d4f7605c652730ea463fbc22f0fc3369afd60a870cd12c5edf333de15490d324a7d68476a82bed87de0f6dd30fb710af2e5d4338d7acbfc27d
-EBUILD functest-0.8.8-r1.ebuild 740 BLAKE2B 5e19daf46c3c2ca352d8ff648260d7aa652630151b4e941e1744c3c590374af6866beaa24ee7882d3fa012b865a63092521f0b5af646991a35e3c24015bdfdda SHA512 5451219172cfcd2123471a915ac158b0d29d2e4c639b93685b33fd9cefacd5ef0e659f4ef1a5a9da8aeb078041c591f3287d973d96ae21ed386786135add7f64
-MISC metadata.xml 311 BLAKE2B 0fe4a84860f885c1a7ab5de423aa135356ce4f109a220b1bc1852620c87e5f561aa7e8c76cc9e8319e96ad8d502f62f7b373c370ae12373e529e00743b23fa29 SHA512 54b2c606b837dcf3ff6281060f848b19a96df0214fcc676c57bb2dc098d3633421868395a15f2ed746723254b78e50347030b485b084f49651bb114fa3e61072
diff --git a/dev-python/functest/functest-0.8.8-r1.ebuild b/dev-python/functest/functest-0.8.8-r1.ebuild
deleted file mode 100644
index 9ee5be32dcd6..000000000000
--- a/dev-python/functest/functest-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Functest is a test tool/framework for testing in Python"
-HOMEPAGE="https://pypi.org/project/functest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_prepare_all() {
-	# purge test folder to avoid file collisions
-	sed -e "s:find_packages():find_packages(exclude=['tests','tests.*']):" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PATH="scripts:${PATH}" nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/functest/metadata.xml b/dev-python/functest/metadata.xml
deleted file mode 100644
index b743c9552700..000000000000
--- a/dev-python/functest/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">functest</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/functools32/Manifest b/dev-python/functools32/Manifest
index 6afada8f1b2b..23129476c39f 100644
--- a/dev-python/functools32/Manifest
+++ b/dev-python/functools32/Manifest
@@ -1,3 +1,3 @@
 DIST functools32-3.2.3-2.tar.gz 31171 BLAKE2B 6f228a7ae4977f333a4979b583e636394691036670f8ab330450153e77262929d981dd0988dc00ab245df6dd0667f5ae12d296bc72513a4ed5b031159e332a7f SHA512 ad944019f4aefde292b6872bfe06862d01920a2f44adf8740c36ed51d16d879be7638591aaddf9dac4ec83b6f05bbf81972d5f32854abedcce3dde080459f7f7
-EBUILD functools32-3.2.3.ebuild 603 BLAKE2B 36f218273853b378501d70c72e946b9ef2f97a91bcfca8a31efda30da801c975ad698eeff41dceed9e7bc9074ba38463c8ca169fc7777647fe58ea3f793acd5a SHA512 a3f68f6fc18e310ed5b681f8a06004c5fd26bd16db637fe136f0e1b5d191fd1d73f165639b99dd146d7c8479282c796e146a8b78ddbba4cd53add6b1fe1fdb79
+EBUILD functools32-3.2.3.ebuild 626 BLAKE2B 5677a435366a931bb253fb61a385d9c05f95da7f28e9722d23381f3e1f829d263cfe09b0c72a288cc2a18594f0a57138715af906f30eb3dc5738abfb3f48b043 SHA512 0e7140083f6cbc03db751753b35c15805535a14ec7f15b814a28f8526184ddba842a5ebfa793587313e2ba1bbae96fc4acf1d5f40edf1346c52d96ddc1242f9d
 MISC metadata.xml 380 BLAKE2B 112a93cd4165bae11a99c2668c01427f7deaf5d2d780c0a7a2d5d8a5f6d6d9e1e3609b1ca7bd96f1f37e718121d6284a3094fa87d376348cae1176b2a92b425c SHA512 665568fc9ce82f570e4601ea9574856c6e1d3db18e79a04ea46888b61ddc6da5aa0f73950346a8940a32ccf1c832981e6ed18ad547fb2f37edbea9b123b0fcce
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
index 75d446076b66..2a2b0b3aaaf3 100644
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ b/dev-python/functools32/functools32-3.2.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 pypy )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index 1999f95d1348..49fee92c71b4 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1,5 +1,5 @@
 DIST funcy-1.10.1.tar.gz 29657 BLAKE2B fb2de795a5564f7009ff5717b8eadc3cb24a2cd4c30b9b9627861d7c8bcffdc1ea27f480c2895b8733f6dd965fbf9ee0fd7f12f8bbd3cf5f0d291829bc852f4b SHA512 123a5a828bd3cdbd38926923eb3979c4e5bca246da93179321eb1619df22cf6f722b5971d1309a1bdee2eeb362fc7fa85c6769a60efdd668350bf6c7d95e184c
 DIST funcy-1.8.tar.gz 25642 BLAKE2B 5365dd8b3428feb70e9b921008dc48b206b5ba1e5f083e67fb2f7f9677aa84499b15cb168911db7700d98ed5a911899bb5d9c4f94f70876d0da769ccad7594de SHA512 21e3447426376cc3d9f06d57297fcef346431a33e0488f1cead2aa7d8c281dd65c2b33af3638c21639d2d7d667b9c1ea6c7e2eabefc5635d02ad92ce7107f839
-EBUILD funcy-1.10.1.ebuild 431 BLAKE2B 2388dd596831fb0ccb4e01678c374f77f4a8d27423de492c0976990e01f305fa97bb246b7e8d37e4b8da869817627d8bfbb6d90b0260281ee819b7436c6efe32 SHA512 7299b79b6a7eb4d5def7ae298f3bfd0e4a58d23a7561fc71f5cc848cab21d072352cf9a13cd1fe9f7afe0ffcbfb5fe5e78cca0d88f215d11f4e34ea916527bd2
+EBUILD funcy-1.10.1.ebuild 427 BLAKE2B 1b459827ddc132e8695728996593e72e0c5b03f6c0f7adccd6652cd5afded3bd9d3e5e2b186968a14844a8394f1fec288992125d167f0ccffc735d54ad926623 SHA512 b9fc19f2fb9ea8071de3e2104521f25b172233db54629f2251aa4c15f407de830e57a13404eedf91e2bc9e439166303548a9947799bf5d0018f8e3a1fa5746cd
 EBUILD funcy-1.8.ebuild 420 BLAKE2B 73d1c97033613661fd52e7cd99bfe68df40470f07f3a71d7681afbc741e4fe7b6c7d866e3235df6cd40423d3bd8948676a292d5930bab2b23ebd82e288c8becf SHA512 d24cbe97a6ca21df716b003b9eaa68967a40a3f8a96b7e5481ba0c9ec07189e56eb34bb7ec00256bcccc895af1b5f445728f9cc725c83473acbf972497af8a4f
 MISC metadata.xml 362 BLAKE2B c57bd6319f39820ab9596061a44d95ada10374f1a5f4538b131b96e1b537f2c9889094ddcd8df1d812ee6afa7b94aa1c81243e603f248edd316af81ecb66b2cb SHA512 2491195b4476b35a3871d8cb8d461c2822d102597b24e4c73203ef87261367c49d9891d72d3b8e9d4c551410cef3377b46c2aeb8dad9147510dae5e050254931
diff --git a/dev-python/funcy/funcy-1.10.1.ebuild b/dev-python/funcy/funcy-1.10.1.ebuild
index e77f54f8a1b2..1f8ab7fb85b2 100644
--- a/dev-python/funcy/funcy-1.10.1.ebuild
+++ b/dev-python/funcy/funcy-1.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A collection of fancy functional tools focused on practicality"
diff --git a/dev-python/fuse-python/Manifest b/dev-python/fuse-python/Manifest
index ffc95f3fd3ec..66c20b4f6d5a 100644
--- a/dev-python/fuse-python/Manifest
+++ b/dev-python/fuse-python/Manifest
@@ -1,5 +1,7 @@
 DIST fuse-python-0.2.1.tar.gz 57833 BLAKE2B 99da322bfbfec193d2e4dfacedfd4e08a885152d1f1ceac19f49288be642c722d7776208dfdef5019b28a03cc00432e898744345041a7d615582c34668fb47a6 SHA512 f89c738352ca23e92b5c0222dde0a13bbee4d86432e9c339080203ed5bf4f885c42a0a3a252ed485f26b569d87e68dc0d78c55d8f7b2f3ce0cbac8afb251bdaa
 DIST fuse-python-0.3.1.tar.gz 45391 BLAKE2B c89d53bc99dc203cb56288ab36ebc6acfa1f5f7a21e10ff6aa12cb601a363d50b06b361ee17310c55a886592b13c789af4f5e86592b7f7af103fd56aefa6402e SHA512 88c01c1f9ca3cd9738711a621b782ec190adaf068a79fdea2c362d865c38fea73706dab48b8346b21502d6b4d404403a261f96e2570254809976a3018060e188
-EBUILD fuse-python-0.2.1-r1.ebuild 406 BLAKE2B 1fcda89353995a57c036f1917f7b86bc416a882ea5ac1ef3eefa7d68c24e943371c155971fde7decf6c417044252febce7a0f774a7a8986853f723d04e843238 SHA512 2ab2f2dd29b167ff026baaa698038e481d2de2266feb87ef9e2c71bc472bcefc5b397bad6a3154d74e6a8774bf855ca3b7a0ff94f72509b38e0112ee8180ed44
-EBUILD fuse-python-0.3.1.ebuild 553 BLAKE2B 34085f9447c6d77892091d5755101f243b20e9a53778f4dde3a4146b7526a4e590930caabba2fb74582a34a0c545ae656dd000ae3fd6dac3c2f12c0caf96252d SHA512 f65f2f6f2570f1f8a0e47da89e414bae4f1b1ed48d0617a29e5f5978f8d8317eb9566630bbe53b5cc296db8cd9a63a5b8a66fc974eee4f2c0a81e861b0226473
+DIST fuse-python-1.0.0.tar.gz 46275 BLAKE2B 109202ed60df82a1a637a02627657c27ef48e55225c099385ec4d74554912d89dfd6238922a7588ff8de27e4c700a3b3832e204455997375dc67f6ca36590ae7 SHA512 d5e91be3e43065988053390d97ca6483ce38924bf9a49f694bf911080b7e75c836224e83d09dcbc6fab8d63781b4cd3ae016d66b65b88dd53106b06f91a6ad5c
+EBUILD fuse-python-0.2.1-r1.ebuild 401 BLAKE2B eb593ededcb36194a369ff11b1d05db8f37a6fd10e63e92b90f9f3acefa356c4ebdb616aa9ec21052fff15a7835adb0518efdf1ede1c5148f5a8ab44720dd470 SHA512 bb6cffb1aba15cf368d77772a859d815853c5746cd24dc8c9f831e1b448075f9dbd9d4581a615d5d47b7d92c1522b6bc2a5deca21efe25c1d17b0fc49d6b7fe7
+EBUILD fuse-python-0.3.1.ebuild 551 BLAKE2B 9ac809cec8e530deff1203889caede146062346fdfa451cfa698b2986671e4c701cd95da4380e669fe1a53dd99b6e82928c9a7391aaf3a6cabfa5e340efceeae SHA512 84549849f08e4a8c8f21f03dd0103bfa8020b10af2690a2f260ea51cbc4b6a861560f1e0463957380792afc9c34f6760222c304a6255e573e016c687282e13b9
+EBUILD fuse-python-1.0.0.ebuild 504 BLAKE2B fac8fb53bdb4a16013de4bcadd11542dc9a619ba19fb1d92c3cbb113578848c656465c282d7b277a38bef088020115278ffa7df1e849270144f8a534f25bba01 SHA512 c0d3b19dc22cf7be202e49f58919ce3918c2778fba3ed1a8bb8f16ff92c7870bfee295867f6d2e8b13e6af52c286ac7975795026c53be326999f32c31f01adfe
 MISC metadata.xml 241 BLAKE2B cacf8034dd7b4cfc624467a8d32b4a0f0b97ebf3ba84ee4572d491ab3da93098f7ae1c765efed3a6c2372cc859098ebf0853753c35d7b23d9c92bcb04e426f11 SHA512 fae6c0b9c2f7b479a2ae029b5e79207756486f5c59a9fc5a2094b239464270eb7a18928a34c11237811a3d1537cd35839778da6704ee6ea3fd806c76e3e6bb6a
diff --git a/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild b/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
index f20fac61e99d..b42922d847f8 100644
--- a/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
+++ b/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fuse-python/fuse-python-0.3.1.ebuild b/dev-python/fuse-python/fuse-python-0.3.1.ebuild
index 74f1bc069539..e9209aec9131 100644
--- a/dev-python/fuse-python/fuse-python-0.3.1.ebuild
+++ b/dev-python/fuse-python/fuse-python-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fuse-python/fuse-python-1.0.0.ebuild b/dev-python/fuse-python/fuse-python-1.0.0.ebuild
new file mode 100644
index 000000000000..2a22b71a21e0
--- /dev/null
+++ b/dev-python/fuse-python/fuse-python-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 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="Python FUSE bindings"
+HOMEPAGE="https://github.com/libfuse/python-fuse"
+SRC_URI="https://github.com/libfuse/python-fuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-fs/fuse:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/python-fuse-${PV}"
diff --git a/dev-python/fusepy/Manifest b/dev-python/fusepy/Manifest
index 71cc217b96f8..aa4b111a0663 100644
--- a/dev-python/fusepy/Manifest
+++ b/dev-python/fusepy/Manifest
@@ -1,3 +1,3 @@
 DIST fusepy-3.0.1.tar.gz 11519 BLAKE2B c76319b0d0b64a8dc674b803551f32352fed9a1e6e050110963a159259c3fed8fefbb63cfe6dda689738f07cb796c6b9da14e3070c4a1cf5b70892a6ebe52cc2 SHA512 f913dfd9f29412daa8239548c8ad8bcc64f8fc7be1425bf34cd40a5c4d22faae67c5d5575c187395d911f64ad0dda186614ada598b38b9557e18794639d43767
-EBUILD fusepy-3.0.1.ebuild 516 BLAKE2B 3cef91f3d2fee215f33723cf80ecd22560e96a441a13d8456a3d4f18485929d9fa926ab163872db4eeb80b603b4dd857d9d67a12c3368e56539b13034bf4878d SHA512 d565bd3b0274bd1effdf7ce0cf0d7c7ded4be212ae9bb008d49b999e5adcbf16805474c09e6a15f434d2a2e8b360d398c8c84cf087907a61472c652a66741ab4
+EBUILD fusepy-3.0.1.ebuild 504 BLAKE2B 052ead5ff081239fe7de63a916fd89f793ee753fac831b89ccc2a58b2017573d2c2955381af2ee4327d4094fb399573a80bbe0fdb0191289c3c3d338fc681366 SHA512 b62001805e0a2f2a56e023394eeb1ec82adf2cca74ab88fc15be30a585b1b7e8531e33569e67c966a78007e4f1a8cd7aedf2a095487cbe8755c62ee98835b982
 MISC metadata.xml 493 BLAKE2B 139e250725d882e24e06330f3d584c640640a89c7225a5e23b207929705b1575cf271b1825e41b5bb0d5d0696653158b1c750352a8fe36427c712144237873d6 SHA512 5594136f5a9883936577a26f48e3cb67cd68be17bfc267d48c2107bd170b713ed9b3a7fb8418421ec6b6d522b14a26a325d84880133f4e12c05df5fd2b20c435
diff --git a/dev-python/fusepy/fusepy-3.0.1.ebuild b/dev-python/fusepy/fusepy-3.0.1.ebuild
index dff543e781d4..4eeef7ba4637 100644
--- a/dev-python/fusepy/fusepy-3.0.1.ebuild
+++ b/dev-python/fusepy/fusepy-3.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index cf17d4974e36..b7595d5003ac 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -2,7 +2,7 @@ AUX future-0.18.2-tests.patch 11773 BLAKE2B e2b9321ab2a04e4567c312beaccd23886c87
 DIST future-0.17.0.tar.gz 827812 BLAKE2B 14bfce4927386b157da91e6bbad547e21bb622f7e81997bc4ac400842cec5f7a50d7a0f5a743c4c76a7b80be0dcb6f54c06901311fd27781d89a8d2df1cce7e9 SHA512 f2396379e8e36753aeafdf27225c2551a31b10036f21201f1c24d63c1bb318dbd491ec977af514a19a4d477b397df9eed9711be797a64e86fc00c4692729d876
 DIST future-0.17.1.tar.gz 829119 BLAKE2B 95210b5128d25d6c189cd38bced873f096802690e8fab5f4591c08fa913c41dc255e24af1931cad91d872a286f690f47bf6e0aa365e2f6508b03b0d305779c26 SHA512 50094c44db81afbfd37ee25e1710ed11ecb2c2d64ad076fb62a2688dd36a9696ab26b0d7989bf1ecb10da251961a0ee6bb37c4dbd115f70384cd8c9a675d0b2d
 DIST future-0.18.2.tar.gz 829220 BLAKE2B 68574b589bf54aa8dacbd162a54885589faa32829ccf212f50de5bf036ebd8b9aba0c13e63e80d34e507cc0dae4d8d3d47fea33433b17d2c2e6dbf6c37f66d8f SHA512 91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2
-EBUILD future-0.17.0.ebuild 1063 BLAKE2B e2cd787f349b76f6b7fe1da85d520976dc2c63a11fad671358469c573579e0eba2be4b5b3b41b6095378b43a7391715ff199578a53cc54a4fe27b389228ada1e SHA512 3848c27fb924ab7bf1ed3c99a2f7ce73999c22a0a368476b7bb6398f47876eb59003f99e136ff1a60b21dee4d2459c5e71b084b546fcdfd91daf03eb179d3554
-EBUILD future-0.17.1.ebuild 999 BLAKE2B 2391df6454881b02d1f61b018785137351eef7348b222b66395ab78e06c1facd7c39355becfb9fa2c763699bb9eabf5aa6585a08c9e6803fa85a38ae6d268808 SHA512 7922a028837078ffb725506309c95cbe5d15b436813c8a3d47efde02e7b410958a8687992cc494574d7ffba61e5d07b19a2976085e0ba4bdded5321014f9398d
-EBUILD future-0.18.2.ebuild 1125 BLAKE2B 10343789a5ef333a1210892407f712db8c8c49def73d7d2183cba1e9245b70cafc63f4b509d477383619351e85680a23c725ea0a90b9f3fb56e0eb8d120c0b1a SHA512 ab4a4278d0cc10a733d2972fd8dc7e6d6f7696d57159afb6e300fd40c510ec7a1fa1db4c8e981e3ff799fc122b84aff4d761f9b9116e78a4c2f44ebe62886057
+EBUILD future-0.17.0.ebuild 1061 BLAKE2B a8bbef386fec78b6d3891de79da2eff2fe076b84cfc60dc6eb769d4b6f18457dd0a1c07991c4c69c5428dbefa8a7683866635d77631e6c05e33ac227be5c21e3 SHA512 4a3b8c4fcb99cefd5b160a5b2beac8e3eda96e38f0eba2e928c24a018c440e9b70df51c7e5de3d779ef17485024564bc11b5512310594d9f34131c9568bd3618
+EBUILD future-0.17.1.ebuild 997 BLAKE2B ae3fb84fcbe455b168a1978fc5122abf5d1bd439a07029d4650727b881c1cf495e7fa10b89858f2ac1baf6cbf852f25272e572421f0b4426052b0c80a4f9e117 SHA512 425d2f8cc60f252bd8e0f708c1716898b3eeb7cc324bcd5768253c2cff50c195322ab55832ba5033d9eaebf002e4a71fd2969b5bdbd78af209d099b3191e01d1
+EBUILD future-0.18.2.ebuild 1120 BLAKE2B c44c2393ac46ddebc60f0dfed005bc5820b5d138befd6582f7e57b0bcd93728c31f5bc1a3b039d84a6dacd080462b9204b8d09781a4fb00ddea4d41503cb99f0 SHA512 6783a23c7218b89cf73849235fd212368499b1db36970f50654da37de39b81a96306c4ff859fc85ec713fd4c3a1fa9f1176294a508303a4bd7b6e4ff707f61f9
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.17.0.ebuild b/dev-python/future/future-0.17.0.ebuild
index f314fd9d3021..3f8e75d94012 100644
--- a/dev-python/future/future-0.17.0.ebuild
+++ b/dev-python/future/future-0.17.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/future/future-0.17.1.ebuild b/dev-python/future/future-0.17.1.ebuild
index a1b80c57871a..889324f6510c 100644
--- a/dev-python/future/future-0.17.1.ebuild
+++ b/dev-python/future/future-0.17.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/future/future-0.18.2.ebuild b/dev-python/future/future-0.18.2.ebuild
index 91b1a6a29af8..36ec2e491515 100644
--- a/dev-python/future/future-0.18.2.ebuild
+++ b/dev-python/future/future-0.18.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/futures/Manifest b/dev-python/futures/Manifest
index 81950d99d65d..ec73f4d74f59 100644
--- a/dev-python/futures/Manifest
+++ b/dev-python/futures/Manifest
@@ -1,5 +1,5 @@
 DIST futures-3.1.1.tar.gz 26471 BLAKE2B 53c7678cec213351bc1c172de857c60bbcc392f24a0a6d1fba42eb6190f82d8f01977f8b830e9db5ba0628eb50f2d6dcf0d0421c4b06e42adbd1d429c0c28281 SHA512 7ccb041271ed2688591942f46ab2d2c92d806efbd5209ff9aba77c6d5d3c1a1495fccbeb1718d914894b0b8d936438687e8f3cc22b7ab6625fb518321084ead3
 DIST futures-3.2.0.tar.gz 27320 BLAKE2B b2a6c380955ce29fd434e30897d39d1fe1dbe758ec663bb243c4891849f3e45cf5eba10b71a9e6a028b32f20f876d5662188ec387d442492c7f4b73463b2f728 SHA512 e8c08ebc38d7397b5c2a5dc8c22567af1a1b6d5ce6fb8c189f663fb25b96f1ebcbade1ec0a95e9970dfac73606ecd5d7c6f79cc010fd62930a5b005d9babdde0
-EBUILD futures-3.1.1.ebuild 838 BLAKE2B 65189a2e9ccd11d6eaeb7d63fda1e5b07b23b0d805f9d045867dd5893b2d033b9bb27706c3ef87df8e5bd0736cf1cc59ce1a6994e909486da6e4fa8336ef6d18 SHA512 d80f8cace93b66c1bc6152e08b94659d07f8988a2a9714b5b5ea76ef0b99259054b17a93b413ab2a1f6fafa6ed1a3e052481692c3f2ba36ebbe84092d3333451
-EBUILD futures-3.2.0.ebuild 874 BLAKE2B c8a21ed9eb1fe42165e1e00b5d11f402e0f216d7f959699269f547d9ffb192cf2c5cfd2ceaa365f6e6085e23b6b2ba986dbb0e1eb86581fb9355fe86fea7999d SHA512 68a0e8694e1585321d74088344c4dadcd39e8b5b518076199afc27f6fe1cde2ce3473e3361057a83361a5bdbd8811f80e152f870ebb18def0978f902ee27e81f
+EBUILD futures-3.1.1.ebuild 830 BLAKE2B 7b99d66fa14c2ae59dd0bef0c71bb2bef9adcf71fe58a3a676184e93b30d0b0d57b0ad63215088d8d86584edabf5a48843189c98dc6145ed6f3f41ac94dabd89 SHA512 d60152721e7f3645d0980dcf579ada3a4e7629d50faa72881343fb832e340bdca91b273db13c1d910f0ed8451b845d2e01e41bc1dd41a7758e0bcc8e71c25685
+EBUILD futures-3.2.0.ebuild 869 BLAKE2B ad3441994bbf21f036b9a8c07c4e8e15e605b8f102cb33565770352cf1b8634c28f92704880e11bd85a21f2bbad87af60d57479a747226f617927e2459abb48a SHA512 0f313d902efe0bdc24fbbc8ce747703dc61cfafd7df191109c35f75a26b3e662e4a4451391db95615a967dee547b15624bae27fc5da22b38f809e79c249e0e0c
 MISC metadata.xml 373 BLAKE2B 1e9903ae68ebe8e33d96f6e6f811fe125edb4f81b1c84c21fa9f962ce4fe7053269d00f29ef5699fcab98e70a755414ad86db30afc528be60ded71e6f60f9eea SHA512 df8ba320e5dfd914b6cc6cb15dbd5efc19047c0d57c44a60fd401de9a7f9c59e06b5975dd832c78202aa34fad94e0771e8a5ff6f16f246c220c5640ec2c84921
diff --git a/dev-python/futures/futures-3.1.1.ebuild b/dev-python/futures/futures-3.1.1.ebuild
index a90f8eeeea18..96b131d7da42 100644
--- a/dev-python/futures/futures-3.1.1.ebuild
+++ b/dev-python/futures/futures-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/futures/futures-3.2.0.ebuild b/dev-python/futures/futures-3.2.0.ebuild
index aa649438639b..52a0ab0b7603 100644
--- a/dev-python/futures/futures-3.2.0.ebuild
+++ b/dev-python/futures/futures-3.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/futurist/Manifest b/dev-python/futurist/Manifest
index 5ad4fdaca221..c85c2419088a 100644
--- a/dev-python/futurist/Manifest
+++ b/dev-python/futurist/Manifest
@@ -1,7 +1,7 @@
 DIST futurist-1.3.1.tar.gz 40927 BLAKE2B 7a746bc7dbdfe1ac9ff2fcdd02a0f4f6e0caccadb52b46439620bc5daf736545de906d0a8d159d39fe7d0ab8eda05767aff4723607dc777ec5c1b43a1670c277 SHA512 88b3af8922542d0bcc3e3e1ba8c456adb6233a616c1e14b3b49b11162be5b65855e7088ae6ce573d42bc80675f51070270533fea65e70935304954a3889db3e3
 DIST futurist-1.6.0.tar.gz 40372 BLAKE2B 295a2a274de8a613025c6c46f6abd048cc6d988e9f4c5dc2de9559d295d88f2d93e5afc017dbd8c9c20a6bb50a63567d42f3ac46c61fd9b0d08a028dbdb2c5bf SHA512 fdbd93e3ffa61661218e4a3f180a448b1d8c75126847c50a36264543bac02f50984d4e493031c0ce3257d16661f7b4a4463b5b3dfd7ae7e2f974410e0d1234a1
 DIST futurist-1.8.1.tar.gz 42430 BLAKE2B 4584d37dd2a5de41be576b1233a50202c9c134b0a7e6c231e028224413f2a0c6e2ab22e1685e5fc974cded3e70c4fee6cbb9ae1262f167455a40a39eeec8c904 SHA512 4ec292284a1a6a7675bd9970f391bfcc47841c42beedac8348b23755481c4f87a2467dbb0f8c963c4b9fc8148a8aaca43e3c166878d07c9e48720481b0f73d9b
-EBUILD futurist-1.3.1.ebuild 895 BLAKE2B 4c2984fd7c1414adc8144e7d0b486126806b2e4f4c8a2954c973d5d97633b41ea641e3f49a1d2046df908c56943ef8a7c6028b5eb368099bd844309aa8e0c490 SHA512 26c5dbc85b05f7d748233f7df0a89113096ca34c9bb9e14cfe181d49eb1e1c33ea68188158f1e1dcc55f119a62eef8ac4845e39c2550e87cee64b6ea05c3df42
-EBUILD futurist-1.6.0.ebuild 849 BLAKE2B 26cc3bd8af4202f4d430a96d892af4bd1399c1a4ff917936cf528b39fa6acfeb217aa53604198c5068f2f5b36de947859613eaa28e27b31a910a0a8e1888f13f SHA512 4558ec056f81c09b5e317898e32f4c28c77b04c47047cb19cd5a72bf71fa8f0e409ab9d794b4be88b871adb41312fe5c6fa4a4bfdfc0d97b812279899809d2b1
-EBUILD futurist-1.8.1.ebuild 858 BLAKE2B a1e8047f4a902a026837531dfcf6bfeda2c1a94da2be579f050758f91b5f633e583b64cc587a20d7243c0b3ffbc626f4ff36a6fc0520f37b0c72cfdc6999ba77 SHA512 ef3089ee40ad6aa75d5fc0cd78082696d4eb9c10a1858caaf7e4cc7b704e76df4328b92a69b001474b38f51604c8237dd123a4ce77a1eab9d787f6121926e715
+EBUILD futurist-1.3.1.ebuild 885 BLAKE2B 1857c9f601da8723368d602db353fbdd67a05ee92ce0ea971167246754f624c42fe6d4d45c8a8ab959519754206e7f370ad5d2ab1c767563b73ae1774d19aad1 SHA512 83c7d6b5e086003cafa95be67da7b5d5523bf587ba7c4b2cc397c3ed1d248c477019460b14489438b6f4ecc0de6e7b7ff99a7ed552cf5951a690e6d45852d061
+EBUILD futurist-1.6.0.ebuild 839 BLAKE2B 307ec0ecc4da04b5e2cb738f8b4db3ceffb6bb65466dfc5ebc3158ac1866905c8c4378195684c65c5f9c6e30abeeb2a6c6adfd113357af41f5c461f992d4d4d0 SHA512 d68d013eb4860b4d9c2697c9c57d3d0ee3e900fcfe983f76fbfdc760822b1fece14b920b0eccb3754a2fc35ce024c4b9330138eb932d516839926b950fe02efd
+EBUILD futurist-1.8.1.ebuild 848 BLAKE2B 2d10c61c587bdcfcc0478e670c9f58b75569e83201543308b5d4426a6bf297678da4707f993bd0e96561f1b86791241015ca62c827e87809a8827c601fbc8e18 SHA512 2fcb0da3b6dcaf58e9c9d331363aef8c745058408d2bccae47be46db2c5940da8d56ae1af430c831fdc08edf9d2198b66e91e6ce9152b9b8985373bff66a4f18
 MISC metadata.xml 325 BLAKE2B fd30488beae3d9648ca9812b6b719c85c4b8aa98bd1209400fcfbc729955ffd8d3690a145b26fe5404737d2b2df346a73547abf3b519e0f8d6200686a4bcb62f SHA512 4d4d42c2821349f1a2144c297cf80c572482eff31cd1fb4f43f43c503d1533a1ea53627528cfac417ab0d1c174f7924f951f823c9577ebea86ce7cdd88195bed
diff --git a/dev-python/futurist/futurist-1.3.1.ebuild b/dev-python/futurist/futurist-1.3.1.ebuild
index 506da1caf498..3ec42d128c21 100644
--- a/dev-python/futurist/futurist-1.3.1.ebuild
+++ b/dev-python/futurist/futurist-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/futurist/futurist-1.6.0.ebuild b/dev-python/futurist/futurist-1.6.0.ebuild
index 7d9bb360090e..86e3ee9b3f85 100644
--- a/dev-python/futurist/futurist-1.6.0.ebuild
+++ b/dev-python/futurist/futurist-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/futurist/futurist-1.8.1.ebuild b/dev-python/futurist/futurist-1.8.1.ebuild
index 7a758b38892e..5610326a7703 100644
--- a/dev-python/futurist/futurist-1.8.1.ebuild
+++ b/dev-python/futurist/futurist-1.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index 5d78aa4a14d7..9c234fe52a1e 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,3 +1,5 @@
 DIST fuzzywuzzy-0.12.0.tar.gz 25792 BLAKE2B bb800d0ff020bf7b3b4b0374dbfdbd788da6cb3d72e5a8a63e331c1a1a38d6317c6f56563d36015d72b86c86755552644958cb84b99f27a6b739f372a3207ed7 SHA512 d4312342af9e3fc9383e1967e60b2856af73e8ad869f6b694d3f737d0280cd840dc42779b0407aefce2571d98c97ab780912943078c4d94dd77502c4e28bd2cc
-EBUILD fuzzywuzzy-0.12.0.ebuild 531 BLAKE2B 3e748efda6caed10999bd2f7dd9ec330f9c3ecb8cd44cb3741c0af83ed938d68a14970370efec1d753e6f1b3c86d64ee34ff5aa914bf05dd30897f8ee2ed1f9a SHA512 09ea99e86667d1ce40ab6ad784c752f24cac3ae120af7a28e2dc91218a4857cf4fecd322d6a07340a31c2de7d5c49152faf2479a4fb98c1b72de6a67cb439b95
+DIST fuzzywuzzy-0.17.0.tar.gz 27321 BLAKE2B 640f38954501a19cfabdb302faf93c57ca62f60e8aac576cd5098e947559cbedd2a769cd2e88f7bc71071ce61aca0a6c075ed9a8fcfdc57f5b90d4579895f346 SHA512 10fb91d85f2e612885543a442959f3c88bf9d3dc468718a1fb92bf443f1753abfc04a9b07935a0d523508b38fc1ba9a7ba391a17b5f01160c26cc2c98d1f6c1d
+EBUILD fuzzywuzzy-0.12.0.ebuild 517 BLAKE2B 19bc8a0f756ac0c35368c41577df11828923d92b923bfd1782fcfba99dbd74403e53a116f772e12cd1e87d07c69560285b6294927210a2d3982199891ed6cdea SHA512 96eae09bf1df4678776baed49cc2571f7c52934e00a96e7c07d76b9deffca3222d89c6af3e146785dd778285da45d826d01de047bfd2e64b91f622b952c103a6
+EBUILD fuzzywuzzy-0.17.0.ebuild 632 BLAKE2B 0ee1b1a878f031a23928d51b800a3ebb492157277399c58142d071213c8e86741c008a764d2750ba53383dde3ed11694c753a78c00dec4375be8ddb94ec161de SHA512 99d3357c0cbc48bc7b22a4891433c3df7540f61795e0eb2f63ff42e14e9a1339bf412d18da1b3fa3fb5f4657e253c389e960225d82cbe213d6b77fa2feb51d4a
 MISC metadata.xml 350 BLAKE2B 5be22a76bb8ef1192943820a9912f7f70c7effdef36090c52641717ead53cf8b74c82f3a6f1a3718d4c7a93f6b5acc1b367b43ee022d05d427a8de3f61b9b4da SHA512 556e5115df47dafe0ec68cde9cc9e452c5c25adb6dbbf6699e9cc59937ac5ff334a65b94d9310d94c2cb2a491b9ee0f84c6ce9787fd1d5d799b9dcf796eeedbb
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild
index 7cf848000cbd..f09a2647f96d 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Fuzzy string matching in python"
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.17.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.17.0.ebuild
new file mode 100644
index 000000000000..2746b03dcfe7
--- /dev/null
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.17.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=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fuzzy string matching in python"
+HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-python/pycodestyle[${PYTHON_USEDEP}] )"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test_fuzzywuzzy.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/gammapy/Manifest b/dev-python/gammapy/Manifest
deleted file mode 100644
index e32d37a2a137..000000000000
--- a/dev-python/gammapy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gammapy-0.6.tar.gz 950419 BLAKE2B 51a3a288938d863c99f4826aaf1839b0376b0aca3b421ebe129adf3c1ba89c698dd7d0937f92333c3ab128bbdf35fa40265b7402369d8cd9a99fac3fb4957d65 SHA512 37e660ab23614895eb033949d737b884968e1d15a21a146acab65250248585c9cfd100026d5ee7473b2db7b3b56777e1953fbe876fff1983cdd72d624fcb9bed
-EBUILD gammapy-0.6.ebuild 1874 BLAKE2B d745fe6f82ec843bfbe1ad9a958717f8b9e267c793afc536b047d300938a17848131b3446fc958b6ed340e7ebe44dba04d4010ddbcbf15af3dd7801d47de00da SHA512 101a1cf361eba0a5663e5a0e2fc829452c78db1c98b003a1710fe689b0241800d02382b4955ae934169a8a7f0be18e85f5c79efc25cbfa19f02a8e3e603a115a
-MISC metadata.xml 667 BLAKE2B 22ac5c81df7c518c751127661e667c853c18957e048cb63280d8ab80b48e4a1834e0d442c679b2a7cc34952364be25926deb146c6f011dfefe4a0563dfacfe09 SHA512 858634d57feea0db252d21360a9ea790059455e803a83aabbf08437c2a8c668c0e49a1e28c29ae57b85865ce402b8888d2a8af94f97a07821f749cafa1a6da5c
diff --git a/dev-python/gammapy/gammapy-0.6.ebuild b/dev-python/gammapy/gammapy-0.6.ebuild
deleted file mode 100644
index 221018bdd0e2..000000000000
--- a/dev-python/gammapy/gammapy-0.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1 eutils virtualx xdg-utils
-
-DESCRIPTION="Python package for gamma-ray astronomy"
-HOMEPAGE="https://gammapy.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DOCS=( README.rst )
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/regions[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "${PN} full functionality" \
-			   dev-python/aplpy \
-			   dev-python/astroplan \
-			   dev-python/gwcs \
-			   dev-python/h5py \
-			   dev-python/iminuit \
-			   dev-python/matplotlib \
-			   dev-python/naima \
-			   dev-python/pandas \
-			   dev-python/photutils \
-			   dev-python/reproject \
-			   dev-python/uncertainties \
-			   dev-python/wcsaxes \
-			   sci-libs/scipy \
-			   sci-libs/scikits_image \
-			   sci-libs/scikits_learn \
-	# not yet in portage: sherpa
-}
diff --git a/dev-python/gammapy/metadata.xml b/dev-python/gammapy/metadata.xml
deleted file mode 100644
index a1fa597d52c6..000000000000
--- a/dev-python/gammapy/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 type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    Gammapy is a package for simulating and analysing gamma-ray sky data.
-    It is currently designed to support users of telescopes such as Fermi,
-    H.E.S.S, and CTA in primarily Galactic plane survey studies.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">gammapy</remote-id>
-    <remote-id type="github">gammapy/gammapy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index b2bfb45e003d..f5c5da10fe7a 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,3 +1,3 @@
 DIST gast-0.2.2.tar.gz 10294 BLAKE2B ad81309b1dd938a07f0cd39c21d4f89af6d902c136b8fe12afc5b26827c778f12561e06c66648a5b672b1c9d9eb79b3dfde7cad0acf8c7099451841b67c0daf4 SHA512 0be9b2b66b7815153e6f294b4db6b028c321d8a94d97c89d89b026df73e0c95dc2ee8af5c10f2eee51cbfb94af4b5a0da8a682896861870b98dec4c6c59a5dd3
-EBUILD gast-0.2.2.ebuild 471 BLAKE2B 771ce1bf9c7232df1bf9a52837144ba81ba633f3d8b9c6fc5c3605dfee2ae8c633eb69947770b0411bcb3b3cb71cde3f4634aa36265c5744539b48921b76f353 SHA512 755eb466c32495a9265160146d080e7f333d0607bd9f182926c0f394132dc02abdd80f2d2fbe53db3962a1e4d8260edac2c425555a4bf63c0a7366305f0be74d
+EBUILD gast-0.2.2.ebuild 467 BLAKE2B a55861146fcc2c9350d093b0a294c4af7eef79e02ff4149a05f9281b6257b4a80be982c0624ba7fe2f1f6055e7dbf31978f074dfd75be285aa7089e21f8fda84 SHA512 536f1b7c524ca20165ad15a0f7e3fe22013d1f5072b77512042be3095a64c48f2b830dab423d80083702d312e0dce44a2b7d9c0f2ab54052c97b2e6453ee6ebd
 MISC metadata.xml 484 BLAKE2B d3b8be13b37bd1a2ef98b2f164c901cf21c8b73ef9b13914200c85ea26eb07dedaaca66b008dccde88dfa1bfcb733e25aac9920704625b87ce0a11a04e02b489 SHA512 5a3d09427a29d39047f396c91ad544a6cb5568f2af06216fcabc1aa12d9e4d34a71cda272d38667d8fb0114d54971626ad3de0c9d71a708cccd825ea1d7e2504
diff --git a/dev-python/gast/gast-0.2.2.ebuild b/dev-python/gast/gast-0.2.2.ebuild
index b3b470284f93..0cc600445e21 100644
--- a/dev-python/gast/gast-0.2.2.ebuild
+++ b/dev-python/gast/gast-0.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index 7e312a044406..32bc44434b61 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -1,15 +1,7 @@
-AUX gcs-oauth2-boto-plugin-1.13-py3.patch 2606 BLAKE2B fdff321a4533b2a8df51e5af780e7ed0cd4e4adf9b1a3c61007037f92da08372dea5ebd66c7119d4a98edc3ea896fc9e22265ed7e282bb9dfb809ca221735fcd SHA512 d215e1ef13a4f513f11dce6311352b808bb3f6b991a452fca1becef56b106529606a7a0ec065292e72fb47e6b04ed854293a43cb14ff74d50102d4b43225390a
 AUX gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch 347 BLAKE2B 5f0062699487ce5f73a2cbba96a6e8ca30f00a3bdd73b7fd5949eac518e01fbc8912a462951b7307a4da02d6016c869e829040ba530974db579d2d16a8c73197 SHA512 b7354d7b195382213018ac4c6924a042da106affb2b9058f664ab5c57b521f0b7164a5249609ecaccfa343114fb8c47d687a861a17b31700c75ee7ca42432bfe
 AUX gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch 345 BLAKE2B a743a19b84ed84b2eb882da4d1885f6d931543815a48b38545b7a60f0702d8e23b16490fc1ffd9763d4540f0e2c1f83399b9a572772dcf070289d4491b5d2cb8 SHA512 cc1dc36815a4ffd42867d398f00a702c0677bcfe54ce772ea93a1e641fd9f2ea0f146b25947587c8d40f66a9b45ff1c4038002c518110bd78808565e120f6230
-DIST gcs-oauth2-boto-plugin-1.14.tar.gz 14980 BLAKE2B 1123633b419291433d7cfa9a284303a7ae2a6b407f487b45897df6945a63f6b0cce733a5940e74acb70bcd9740a7c0cbd3828abfb4163f7ab845a9ff2c652a1b SHA512 86804a599c969c63587387df21a2396a27509981cc13a3f92bc98a645757362e77c63b68956ebd2663a721bb51993c9e61679db85a67de48d017ddad7de044b7
 DIST gcs-oauth2-boto-plugin-1.8.tar.gz 13248 BLAKE2B 831a1b88035d6331ac2cb122fda5ffabd6319b7a030ae8c46dac32be571bdff034d6e60830e5e4403b65a414487c874cd4743f537a9c1d3674bcb1461e457945 SHA512 5504fc38d58ee68a78ee2b8e6c3757045494d000748382bc26888a65085cec08d2d137c63cb51afd1cef72d31b3f0cac5d40014548cca47c5322a67a7f1ef204
-DIST gcs-oauth2-boto-plugin-2.1.tar.gz 15789 BLAKE2B f98eb41d07aede9379bb256723c217be1c2fcf2cda18e555a5d7e85bb402215052ff4d7770cdb4066fd989f7e78d070ea19e1a469f5e6dec2b94a367a6dc3c19 SHA512 26b519fa2987e83a687907aa72e0c9eb8b2a2c48143bc1bf13bad79791379daaae190a23f9f35d1a570e21c6800d5860bbb94f3c3f3b2ff7bfcfec8a5a39af7c
-DIST gcs-oauth2-boto-plugin-2.4.tar.gz 16721 BLAKE2B 38816f6f3e5a857967fad6698aa9a35df8d31d42f083584c1e24c4dcb9379b5e8dd18fbbcf0533dccbc2db9f5e4f400d8cd1f8baddf582894af918a2d2d1b23c SHA512 e3e6b7ffca4405a4c41ca1408f05e3c61acc342d236dd2dd857854242694fdca68e155baadb8be64239583954297dac82a07a73d6391cfb93a53d29f9bf67c99
 DIST gcs-oauth2-boto-plugin-2.5.tar.gz 16739 BLAKE2B a8ef124670063eb19119f7ab6cfd3101f68815a61ec183b3c9ac79ac158e3e47f48349b4f3faa0cf83ce9a203ab2f350e61fdd8a87872962bc1b24a8182f741f SHA512 db6810351c8364c9b217e092aa83803cdc7831136b3fa1be4c54f978f919e2e33bdaf32b8d36db359c5a328eb57f7ad2cee219b94d7f60403f27aaa6a6fd53cc
-EBUILD gcs-oauth2-boto-plugin-1.14.ebuild 1432 BLAKE2B 9e1041feb96197c6ae9503cf2490b24323366dfb18c00a3429c0fd38f77784529730f89b4e6f6b76230e5b099831ccf4417c1e990a58258f596ee0c280af7cda SHA512 2c91bebc4c002fe06ebf114d427a70b0e0b9fb43b7b1f7f29fd5e4682a1d0622eabae9d6b3693a0799b6ca47eee0a7ca3c058b82847e5724ce4602204ba49c7e
 EBUILD gcs-oauth2-boto-plugin-1.8-r1.ebuild 1039 BLAKE2B 861b5581f1522c8e648b1c081843071f30bc066a53d26e6826494760258a3dbafb71500ba9bc45267ca026b1e5b519ee4b17105a96b2f48a81287aabd6abd3eb SHA512 4026ecf2f8380a7371cd87dded9837632a5711cd098d4d2bfc214308c2ad687e8c0e452f120029fddbf3fd47085b9d65aca011a22d79ed520d4f0ca52eebd6cf
-EBUILD gcs-oauth2-boto-plugin-2.1-r1.ebuild 1426 BLAKE2B 574206de51835a545fc000739988caa19ef5ec1ee0f38813195ddb9fd48b85652355971d6670b3c54e5dae3ea434662fd09fd0663864ac5a4139f17af316eba0 SHA512 c421ae4414c936aa7538726876ed8c06c9e34c69819ca4f29a6b2182bdbc58227cc26142b6f0e265f583412516c8af94bf16518417464dd9d0d425a66d3c932d
-EBUILD gcs-oauth2-boto-plugin-2.1.ebuild 1371 BLAKE2B 09657eec356085f0bb06a5775ff0e0a1c2f4bd74095a01f628c3dac6edd073daaa60c3ec3eedea82d3f138a56244fcbae201429d545c736c98623922b31b7b97 SHA512 4bbdc2cff8e9389f4e88ddfa01621c8b53f9f779a83014a1033534536549132cde93daa6bb10b9b80075ba9c43a18b409d21e58590fdf40e649a6dd8d7e8fa6b
-EBUILD gcs-oauth2-boto-plugin-2.4.ebuild 1431 BLAKE2B 6246d1602f7fb6e5588535a0bda145a245681299e81e27061523aa829561d216678939ae4807423e0dee47b18a88e7a6d604ff7614c25bc93195c2284ef79eff SHA512 cfadeb0d16991cc9f897af2da1725d370c0d108d569fc1145492df2d034451c2dfce89e51a8dfa5dcdff5f1135ead75cb802ec43e786642810ecd9b6e4e800fb
-EBUILD gcs-oauth2-boto-plugin-2.5.ebuild 1432 BLAKE2B 0aaff15d3d41687ea29813eaa3396e7d78043a231da4f8b60751073d97d4c362dec593b3cd061ccd6416afa3669d861f4bba3a093a864b552a753bc395ab4256 SHA512 de1af33db83e88ad183549afe1fdca5e4d1a75f8794a9f24a4ea84c390a813638c73ef1c5b3a1c0064552a2ff774cd3ff96115472aad3ac563d579cb54a822b5
+EBUILD gcs-oauth2-boto-plugin-2.5.ebuild 1428 BLAKE2B 34e5c371f8385b09d54bd928c0089dc13b01f9bf4dfb76a173ba86c9cba54d9609cd25244ec527c446ff9f62eed0d42ba394ebad644142f3613c6d7b6a5f3852 SHA512 fe5e42268a0fa546c23001b433e6d7c2837f58d67c67317da73270fee77daf838295a0cbe1c5535aa4d84c48cab5c617b72f990ec667683b30cf868031b3e95e
 MISC metadata.xml 335 BLAKE2B 11f766d7bfb5e7ddb78ea1d749d3d2d79496d69e07b1054bede831ba7824d8705e064e5842c71206a0c35cea37e40558a6cdafd8ebf8460ee99ff8dce3f26ac5 SHA512 cb494f35eba6442585175997cb16c7d4f6eea841e56f2828386f0894e68a7d917c010264bea46d7b6ae1957633763c66a5b669606fd8b0fcba3b4555fa926807
diff --git a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-py3.patch b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-py3.patch
deleted file mode 100644
index 15f6fc373779..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-py3.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin/pull/18
-
---- a/gcs_oauth2_boto_plugin/oauth2_client.py
-+++ b/gcs_oauth2_boto_plugin/oauth2_client.py
-@@ -122,7 +122,7 @@ except ImportError:
-           retval.token_expiry = datetime.datetime.strptime(
-               data['token_expiry'], EXPIRY_FORMAT)
-         return retval
--      except KeyError, e:
-+      except KeyError as e:
-         raise Exception('Your JSON credentials are invalid; '
-                         'missing required entry %s.' % e[0])
-   # pylint: enable=protected-access
-@@ -274,7 +274,7 @@ class FileSystemTokenCache(TokenCache):
-       flags |= os.O_BINARY
- 
-     try:
--      fd = os.open(cache_file, flags, 0600)
-+      fd = os.open(cache_file, flags, 0o0600)
-     except (OSError, IOError) as e:
-       LOG.warning('FileSystemTokenCache.PutToken: '
-                   'Failed to create cache file %s: %s', cache_file, e)
-@@ -633,7 +633,7 @@ class OAuth2UserAccountClient(OAuth2Client):
-       return AccessToken(
-           credentials.access_token, credentials.token_expiry,
-           datetime_strategy=self.datetime_strategy)
--    except AccessTokenRefreshError, e:
-+    except AccessTokenRefreshError as e:
-       if 'Invalid response 403' in e.message:
-         # This is the most we can do at the moment to accurately detect rate
-         # limiting errors since they come back as 403s with no further
-@@ -669,7 +669,7 @@ class OAuth2GCEClient(OAuth2Client):
-       http = httplib2.Http()
-       response, content = http.request(META_TOKEN_URI, method='GET',
-                                        body=None, headers=META_HEADERS)
--    except Exception, e:
-+    except Exception as e:
-       raise GsAccessTokenRefreshError(e)
- 
-     if response.status == 200:
-@@ -695,7 +695,7 @@ def _IsGCE():
-     # this approach, we'll avoid having to enumerate all possible non-transient
-     # socket errors.
-     return False
--  except Exception, e:  # pylint: disable=broad-except
-+  except Exception as e:  # pylint: disable=broad-except
-     LOG.warning("Failed to determine whether we're running on GCE, so we'll"
-                 "assume that we aren't: %s", e)
-     return False
---- a/gcs_oauth2_boto_plugin/test_oauth2_client.py
-+++ b/gcs_oauth2_boto_plugin/test_oauth2_client.py
-@@ -248,7 +248,7 @@ class FileSystemTokenCacheTest(unittest.TestCase):
-     # Assert that the cache file exists and has correct permissions.
-     if not IS_WINDOWS:
-       self.assertEquals(
--          0600,
-+          0o0600,
-           stat.S_IMODE(os.stat(self.cache.CacheFileName(self.key)).st_mode))
- 
-   def testPutGet(self):
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
deleted file mode 100644
index 14f5c9c593a7..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-# The tests only work with py2 atm.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
-	"${FILESDIR}/${PN}-1.13-py3.patch"
-)
-
-# Keep versions in sync with setup.py.
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	!=dev-python/oauth2client-2.0*
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-	# Make sure the unittests aren't installed.
-	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
-}
-
-python_test() {
-	${EPYTHON} "${S}"/test_oauth2_client.py || die
-}
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1-r1.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1-r1.ebuild
deleted file mode 100644
index aebf3525f13a..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
-)
-
-# Keep versions in sync with setup.py.
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	dev-python/google-reauth-python[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	!=dev-python/oauth2client-2.0*
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-	# Make sure the unittests aren't installed.
-	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
-}
-
-python_test() {
-	${EPYTHON} "${S}"/test_oauth2_client.py || die
-}
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1.ebuild
deleted file mode 100644
index ccc056b649f9..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
-)
-
-# Keep versions in sync with setup.py.
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	!=dev-python/oauth2client-2.0*
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-	# Make sure the unittests aren't installed.
-	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
-}
-
-python_test() {
-	${EPYTHON} "${S}"/test_oauth2_client.py || die
-}
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.4.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.4.ebuild
deleted file mode 100644
index f4f84a4ebab2..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
-)
-
-# Keep versions in sync with setup.py.
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	dev-python/google-reauth-python[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	!=dev-python/oauth2client-2.0*
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-	# Make sure the unittests aren't installed.
-	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
-}
-
-python_test() {
-	${EPYTHON} "${S}"/test_oauth2_client.py -v || die
-}
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
index 598e50b72a0e..1801721341a1 100644
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gdata/Manifest b/dev-python/gdata/Manifest
index 31713499a08d..ef19eb5c7278 100644
--- a/dev-python/gdata/Manifest
+++ b/dev-python/gdata/Manifest
@@ -1,3 +1,3 @@
 DIST gdata-2.0.18.tar.gz 2475552 BLAKE2B 8679667c427aea162a13d56bb6e88d3c092960c3d0b15d4f297b6a96ea63a96373469e875629386d573a0a97024d16ef3d42798749554dc09b621919b98a4f65 SHA512 57d01a8e41fd7507621c10a4ea3e66223aa1d481365269daecdb5ef1bd725915448bcfa5aca9bef3a7fb4b735627d7916b7f971f1c05d7bf840069346e98ceef
-EBUILD gdata-2.0.18.ebuild 817 BLAKE2B 731476d250c69d7b938fbc2126396b07465b71f25eb90c14834a8d8e9ef509f1832ca87cd9622a31600e818e735cb142b2882aff0ba51dc29416f1acebd4c95f SHA512 d96d28f525da84af6b117ffbe3fa09b30cd80727ec6c2618a41c8f1b71764b35ba8cb2d0737a5625c72946638df81763e9308c5b9f2cb231e1b5a0eb27d87222
+EBUILD gdata-2.0.18.ebuild 809 BLAKE2B 10ee41e3cf5dfd13f9691053e60b6ae21a240a0c9591953d92a812a2370eec717bcacc262635141a03698d41d88defe80f9762bf421c405baa3b7491b515b56c SHA512 4f3429e5f0c23c88f1ba8e6413b3bbafa533ccdddd1f89d2e0dbb4f2a4b2bc33fc33f0e23d699e5279b6f2985678def400803622a08bb3e6a429d026907ffa58
 MISC metadata.xml 374 BLAKE2B 8034fd862b60a12ddf48ae0f61c5cd7b4c8f5f537e8ab6e2d5e8a826889d39f106e96c03114c5f99a265cedb2277fdead21316a39722fe3d7925f5aa594aa4e5 SHA512 d4c66573bcdb0cf9b1f9c61539180de94c57853fbd6241c4049247ca745779284072b39087d90b79ed79f83504dc0551fbc0c62b9a52b5572ae1681af97c41dc
diff --git a/dev-python/gdata/gdata-2.0.18.ebuild b/dev-python/gdata/gdata-2.0.18.ebuild
index a45b44e92614..045a7e761cb9 100644
--- a/dev-python/gdata/gdata-2.0.18.ebuild
+++ b/dev-python/gdata/gdata-2.0.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ssl(+),xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/gdmodule/Manifest b/dev-python/gdmodule/Manifest
deleted file mode 100644
index e4920ae71674..000000000000
--- a/dev-python/gdmodule/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gdmodule-0.56-fix-libs.patch 2629 BLAKE2B ea89424775c3461a06cde21e5b0f8dd5d7e3bb35e5404b5a93be42a9509b01d32d382829a2360fc70ca43cf633bde99833edb949b8387484142e6c314f9f609f SHA512 eb8993b77f5b893b568d87e572a19caf84ee11e4c0c76a13ef81e7185678bf007d7967e1d68ce56f869bc83cfe502b8f67ab0fee2f7f477e9aa2b4f0017e0a0a
-DIST gdmodule-0.56.tar.gz 48748 BLAKE2B 56a348a3a6c62a6d805d13ce80dfd2082af4a103d08d9a2466aa719d07b1bf8d52e0f08b48738377d1145a467b78aed0d7607f450c119c1a9c0eb9c2b39f038b SHA512 9570a9c06a1c7d76af760fffe30cfde9a840620c608f0d55123898e030d6f3ab4c91fe75bf02b326f13f4a85ea5429c6a0ec0cd20fdc27fa83e656b81f7cce88
-EBUILD gdmodule-0.56-r2.ebuild 1101 BLAKE2B cbb58cc33ab4dc6f7839180abc10df9bb777641b756e63ca800f4238fe58863af75fc27052a4b48c903bda986b123626f869da5d999fd03817668ce1333bce31 SHA512 9401747e451b3707b8cfb6270bc38a100657c4a7cd6ff1110478acbae558536d2389e7634a4d418bb611ec8652aba9e51a806f97fc3e7d30708314dd7f14eb99
-MISC metadata.xml 450 BLAKE2B 47c85c159ef7d3b0c873eb7c4e22a73133288d28f776b7e5bafc4f6dda97b97f8b6740a291de0b1d9a70bf958d6aab18b7dc9d693eff76da3ad678d022102425 SHA512 58ab6153c0955e9d9e37fe1b43c3b92cfd3133bdb9f0b52df7618d21fa14170cab255a06d88a110a0bfef09da6cf51c13bc8904d15d1585bd4cc1743b7846900
diff --git a/dev-python/gdmodule/files/gdmodule-0.56-fix-libs.patch b/dev-python/gdmodule/files/gdmodule-0.56-fix-libs.patch
deleted file mode 100644
index bb46490986a9..000000000000
--- a/dev-python/gdmodule/files/gdmodule-0.56-fix-libs.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- Setup.py.orig	2005-03-11 04:29:59.000000000 +0000
-+++ Setup.py	2010-12-06 07:15:26.332707178 +0000
-@@ -1,102 +1,11 @@
- # Setup for gdmodule 0.50 and later
- 
- from distutils.core import setup, Extension
--import os, glob, sys, string
- 
- # version of this gdmodule package
- this_version = "0.56"
- 
--# directory existence tester
--
--def dirtest(lst):
--    rlst = []
--    for d in lst:
--        try:
--            if os.listdir(d):
--                rlst.append(d)
--        except:
--            pass
--    return rlst
--
--def filetest(path, names):
--    rlst = []
--    for d in path:
--        for i in range(len(names)):
--            found = glob.glob(os.path.join(d, "lib%s.*" % names[i]))
--            if found:
--                rlst.append(names[i])
--                names[i] = None
--        names = filter(None, names)
--    return rlst
--
--def remove(itm, lst):
--    r = range(len(lst))
--    r.reverse()
--    for i in r:
--        if lst[i] == itm:
--            del lst[i]
--
--# library_dirs option is rather non-portable, but since I am targetting
--# Unixoid OS's I will just look for the usual suspects.
--
--libdirs = dirtest([
--    "/usr/local/lib", "/sw/lib", "/usr/lib",
--    "/usr/lib/X11", "/usr/X11R6/lib",
--    "/opt/gnome/lib",
--])
--
--# include_dirs are also non-portable; same trick here.
--
--incdirs = dirtest([
--    "/usr/local/include", "/sw/include", "/usr/include",
--    "/usr/include/X11", "/usr/X11R6/include",
--    "/opt/gnome/include",
--])
--
--# Try to identify our libraries
--
--want_libs = [
--    "gd",
--    "jpeg", "png", "gif", "z",
--    "X11", "Xpm",
--    "ttf", "freetype",
--]
--
--libs = filetest(libdirs, want_libs)
--
--missing = []
--
--for l in want_libs:
--    if l and l not in libs:
--        missing.append(l)
--
--if missing:
--    print "WARNING:  Missing", string.join(missing, ", "), "Libraries"
--
--# hand-clean the libs
--
--if "gd" not in libs:
--    print "Can't find GD library."
--    sys.exit(0)
--
--if "ttf" in libs and "freetype" in libs:
--    remove("ttf", libs)
--
--if "Xpm" in libs and "X11" not in libs:
--    remove("Xpm", libs)
--
--if "png" in libs and "z" not in libs:
--    remove("png", libs)
--
--if "z" in libs and "png" not in libs:
--    remove("png", libs)
--
--# build the macro list
--
--macros = []
--
--for l in libs:
--    macros.append(( "HAVE_LIB%s" % l.upper(), None ))
-+libs = [ "gd" ]
- 
- # OK, now do it!
- 
-@@ -111,8 +20,7 @@
-     py_modules=["gd"],
-     ext_modules=[
-         Extension("_gd", ["_gdmodule.c"], 
--            include_dirs=incdirs, library_dirs=libdirs,
--            libraries=libs, define_macros=macros)],
-+            libraries=libs)],
- )
- 
- # end of file... I guess we're done.
diff --git a/dev-python/gdmodule/gdmodule-0.56-r2.ebuild b/dev-python/gdmodule/gdmodule-0.56-r2.ebuild
deleted file mode 100644
index d1bdbc4c7272..000000000000
--- a/dev-python/gdmodule/gdmodule-0.56-r2.ebuild
+++ /dev/null
@@ -1,41 +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 flag-o-matic
-
-DESCRIPTION="Python extensions for gd"
-HOMEPAGE="https://github.com/Solomoriah/gdmodule"
-SRC_URI="http://newcenturycomputers.net/projects/download.cgi/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="jpeg png truetype xpm"
-
-RDEPEND="
-	media-libs/gd[jpeg?,png?,truetype?,xpm?]
-	media-libs/giflib
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )
-	truetype? ( media-libs/freetype:2 )
-	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-libs.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	mv Setup.py setup.py  || die
-
-	# append unconditionally because it is enabled id media-libs/gd by default
-	append-cppflags -DHAVE_LIBGIF
-
-	use jpeg && append-cppflags -DHAVE_LIBJPEG
-	use png && append-cppflags -DHAVE_LIBPNG
-	use truetype && append-cppflags -DHAVE_LIBFREETYPE
-	use xpm && append-cppflags -DHAVE_LIBXPM
-}
diff --git a/dev-python/gdmodule/metadata.xml b/dev-python/gdmodule/metadata.xml
deleted file mode 100644
index 6304ac511407..000000000000
--- a/dev-python/gdmodule/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  This module is a python wrapper for the GD library.
-</longdescription>
-  <upstream>
-    <remote-id type="github">Solomoriah/gdmodule</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index 62d04dfe3101..94ff9db6fff6 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -4,7 +4,7 @@ AUX genshi-0.7-issue582.patch 12766 BLAKE2B e92c3777b5ddfdf3cbe91455c541639b0377
 AUX genshi-0.7-issue602.patch 4504 BLAKE2B a65d56df060e32083d9836b65c96f9f45f90d6ad27bbcc465e1bf9782b0c619a0b2747c0a7691a52390362dc9034ff90f4fedf01a1e8dc51c6d2ae2c8b3d2413 SHA512 59a47ac114065aa398b4795880a02ee98d9605b1a52b53221c4c0efde28b43473d773b9f84ce7c1b954160b5103f53566d739fe39842e6dc6efb6edc61172999
 DIST Genshi-0.7.3.tar.gz 271238 BLAKE2B 20addd3243980574e6e2024a7c275c157392987c5265aaa71527e78b92bd25ec476de21d08f6b442de420a925654a064a0071bbd8cf056c0eb18cd8fb085af8c SHA512 b153a9755f9791f349dea35e3ab3099af66b1be5b83bdea9d356b456ddd4e1ff88f7a85e822a2c06aea936c2f843bdc8ddc91c74de2a72111896d8db9a195b87
 DIST Genshi-0.7.tar.gz 491579 BLAKE2B 1ef490d6badcd483ab01e46c361964154bebe79ced78096a3e7422394d500597f0095bcbffd9f81ea3a58bc651f131698e539409101274c568135e833adbdb04 SHA512 2d0042d4da4566725ddd80b73c5b7be09f479f5529e4aa69903edc2a98905ff6de42a0d5a6f02986d7962deb7740c4a3acf6955a8b77fdb42d3cf4ca037de6bf
-EBUILD genshi-0.7-r1.ebuild 1076 BLAKE2B a35de3dab5c170d802f142b93d34995d56f6bbeea98a0c9ebf0f92feb8ca2a5d6825fa3bab6a99bdbe8e150b9f908ab50db5e9e229616312c92b52c63a4cf728 SHA512 45c85e60742a1271c94005e904b7e141a777054f1ccdd1c378ba4dec7880d4d04d88f05174820fec7886631abe3dcb843aaccff0987ed7de337f60c4f795b9dd
-EBUILD genshi-0.7.3.ebuild 854 BLAKE2B ff95ff6623bd1a652a129b9416d26480ee8751d855920447a03651821b5d7375e03a83f0d55dcae902704d236735e0e65f61b868d5297b6152a783b9ee045fc0 SHA512 483bc6a8e1d389a2d0194eb31d31537c19635c60d9db39bf90e305af4572a09d7f465a1cfd8a8e6cd6bdbb688769d3524f7297f8f8afdfb393afd59dae38919f
-EBUILD genshi-0.7.ebuild 856 BLAKE2B 45a50b3027ffb26c05e2d2d663214be4590e3f8545adac39af15bacac533b5c6f38529e2ee4910dcb1a8196dcd8818f62422af3191998eda3f63bfe8a4692d26 SHA512 351a57bd1a59e8dcca6ea797549ae275cd1a20a74681fd98a804cad48bc36f78f0d6877ce55dea2dd137ea4d7206ef51a74cd1a5bdd90bd40f7b19bdd556d64b
+EBUILD genshi-0.7-r1.ebuild 1067 BLAKE2B de303a7d009004f15b2d51da204d0c324fd28cac28cb3ff3ded99f635d18beda954cc7c5f70c7d7f36164f858bbb1d42fbded71144957b399d00b7f0fddf5925 SHA512 4a346871a97d4b9b18e4c4772f17ec6fed8ed2e9ea8a950faa207db62c0f85d59551db0b4c8b3c936d42a3151329763b62ff4d1406815f678cac5484c2e89fb5
+EBUILD genshi-0.7.3.ebuild 849 BLAKE2B 8f7275f80efea4ef42106fc9d2c4f30ea7a70fa9efe8ab31c89b9bc7a096872305f6213b20133b8821d6435caf9a974508b22401e40d4143b2806203ac57dc6f SHA512 aadadbb21e02af5a6ed4434106d9341c706cf7e2298fb66e271b6dc9ea156d953da6b813a9c2c574fe3f561445030d88e92e4f52225dbf83f3c0c44464d7ace1
+EBUILD genshi-0.7.ebuild 848 BLAKE2B 6dc82c64ccdf52dd95019b8095455d55b53578ebe404baf3688c58daa585e3f5e78d1c9eac32b3377128657dc965e127b02bd971bfbe8dbae606e5be0adb193c SHA512 e9aaa4b7cd03146141c22c1d9b9025c7c8ccc9cdedc71a6152e84f4e77dc293ca910bcfb69b80afd471344f6bbb1c5455ad083e1b4b7ecff663d5dced2d3a2a0
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/genshi/genshi-0.7-r1.ebuild b/dev-python/genshi/genshi-0.7-r1.ebuild
index a283969a87ef..f5e11517b053 100644
--- a/dev-python/genshi/genshi-0.7-r1.ebuild
+++ b/dev-python/genshi/genshi-0.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/genshi/genshi-0.7.3.ebuild b/dev-python/genshi/genshi-0.7.3.ebuild
index 0d336271b507..d1f54009a6ce 100644
--- a/dev-python/genshi/genshi-0.7.3.ebuild
+++ b/dev-python/genshi/genshi-0.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/genshi/genshi-0.7.ebuild b/dev-python/genshi/genshi-0.7.ebuild
index 830959047e59..9d0b35ba0f25 100644
--- a/dev-python/genshi/genshi-0.7.ebuild
+++ b/dev-python/genshi/genshi-0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
index 4dd46682861e..1a835e9215b4 100644
--- a/dev-python/genty/Manifest
+++ b/dev-python/genty/Manifest
@@ -1,3 +1,3 @@
 DIST genty-1.3.2.tar.gz 20818 BLAKE2B a3344869e63f4f6e564836fdcf5e36b3184f5df2a20994ded3a20ee0ff1360ea5e9db574bf6097f5b47673fc7db70bb9bfd3238075fb0a3b7b722a6461f09632 SHA512 cfe984dfe5af48ba9f4f959a1d0ab1d331d3c2fdb64c680572e5652b845e5c290097ec3ed2b4e472a563cd6ab79489124f6eb212902a05a2f1ce5ff254a82e13
-EBUILD genty-1.3.2.ebuild 755 BLAKE2B 1e64cfa1bef9777446d3a5c31f61bd220c3ce26cb0f92df96cb1a6191b853751e591821ff8b9c6e1f62aaad2c97a6d4c7db478aa0cc60e2ea8492654d263e4e6 SHA512 8a32740d5e9530c003ed1824e474ae59345208f03851ceb2a6387a7700d4a6d3e91c59c69e8f77fb3654177e40e321389174f2741656f12fbad2d0d603a8c864
+EBUILD genty-1.3.2.ebuild 750 BLAKE2B 882614576de348d0f7527a900a3eec143538e9e0a5748f01e44e9079d8292307660cd461843db924a0263a5da5254bff44331f7d4110875f5651abcfba7522d8 SHA512 9ec25c5d2caaa44227d8aff3472a60e83c60101f8ec3ac0fdf8f056ec2015bb709d7e7c890629f2500a8fda63a144ab55c3b252dc9a9ab5d54c44e9ea8d2d2bf
 MISC metadata.xml 357 BLAKE2B c4b7d3382dabce66ab01fecd442eb82e979d27434b0888c06d75d138ced20b984c67367f632a9fe00602d8d385f2222af1e195b8cb5e8b8b7e50494b9b018627 SHA512 ba3b3f11913ffc8848a7d2b1637b028812badef52306565f5d0462314d97ddb5795219cc6f674f3dfdc47c3d9b0bce602425b25df99c7227dcc166f1b1f536a0
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
index f4eb0a58b1bb..474e3d64f3d2 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/geoalchemy2/Manifest b/dev-python/geoalchemy2/Manifest
index 83f55ff0f9ad..430713f9c22b 100644
--- a/dev-python/geoalchemy2/Manifest
+++ b/dev-python/geoalchemy2/Manifest
@@ -1,3 +1,3 @@
 DIST geoalchemy2-0.3.tar.gz 93256 BLAKE2B 4d33ad8b1211f2c23da7ccb8945a051bcb58a1c4963f3c45ba4d20d26658bf0cfa983edd256aebf9ee86a768c7745f21230ba199437bff514d720da7aebc640b SHA512 5f94f6459eba1266c3b31b6d0b1f16478c1641a29b3dbe26cfdc3983d3aa5642b075871fb4722e6bccca7d1960ac1d87103351d846a061891f17d407df4867c8
-EBUILD geoalchemy2-0.3.ebuild 791 BLAKE2B c1e0d4b98eb2bf699147c643401e36b652e9e16aa36bbf3b140406f02decab7cecace6bd2a7f163e2af7790fc014553b1e832df654a6d878456cf020f8d81b96 SHA512 6dadbc704e74255bf9218517f77f77d1dec03d4086bc2c08335c60ed0bdd86ffd30775d7e2e64e338bc90d0aef6085bfd9c3f45fe695bb876a79ed43b0ce47b2
+EBUILD geoalchemy2-0.3.ebuild 787 BLAKE2B 31c5f11e2fce568e768e6f79b2766760e302b963fec4bbb53996f29e233b337d209cb495928a3085aee0704f2f589efead61ee04c80ff0aeaa4e3a20eda5978e SHA512 5f431ee6cec103a73a8d28ce8d3949ad0db889783217e67ff568419797d53b996e52296c307c15c9edbae503f91d416e1355d2fcf68b2ff555e7e2018a5c4b08
 MISC metadata.xml 388 BLAKE2B aae7ecb5090864e223172cb34f0ddbd114be20417c40f932a5c354804ee049a637eca182b9e33e564f60e7e6eae502c73cff77644dea4ad4498ce89c6938a54b SHA512 fe5d16f1006eea8b0eead7381650b7a06f547dde06224daede90460e2319b8c3f5eb527125f1004d56d866587003aafc35c0c17518699617798d5d05b3fbd254
diff --git a/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild b/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
index 39fc316a5f70..9108b4f9d322 100644
--- a/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
+++ b/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/geoip-python/Manifest b/dev-python/geoip-python/Manifest
index 94398d5dd8e0..13890e746d45 100644
--- a/dev-python/geoip-python/Manifest
+++ b/dev-python/geoip-python/Manifest
@@ -1,3 +1,3 @@
 DIST geoip-api-python-1.3.2.tar.gz 35674 BLAKE2B c6c4469164347c8c1a8a5231be25370e806768d7f155832cf759469320d8adbd5efcd002d14d1d95522e8bcb4db12668b28b437b45af669bb336024662908498 SHA512 284209a6894d55ef95844c5c4c7aafff99ebcb13996e5ff64a0c31b38677e13c11d51fd8b0250d0fa097f15805c27b572d5aa12c2b217a839afe3cdd0851c414
-EBUILD geoip-python-1.3.2-r1.ebuild 919 BLAKE2B 007d927b2b473ef4a067fa935460890bdec7721b2e002ee962661cd236595823f21c459b5e8da8ec314f2621ddd0b421ac883db708a361c074ead4d126df4e63 SHA512 8d8375de6ef352c0c507221d2f4fc995adaa7e6f4ddaead6037daad1f7b717b965051f840ea18dee27ab74b8638dacdf8706d0f2f01a132075ecc5ac52d1bdd5
+EBUILD geoip-python-1.3.2-r1.ebuild 910 BLAKE2B 0159280c8c3f5d58d9829570dc2b6a4b14930527413352c44bff41fac929297415e49efe6b078da17b4e029d380d5ae37e71fd72fe779dd3cde7d69d4b8bdef1 SHA512 b195018bd613edea2df4d71e687071d22919defa94aef44c2c4d5c0b153318ae3cdf4b38fc0f6ff854c2e4a0e3e35fbe1161d645ac686079c803c0cee89b1b59
 MISC metadata.xml 372 BLAKE2B a64a0eafc20c11334ab112844de60a58eeaec62d2bb88ceb0e72efba9fae4cfd0bb02a169f4913299534cf3243d740a6f0f96fee1448a55bb8d9bffe3ccf3597 SHA512 dfcd2454bac4830995eda03b9fc585ea4f19f3e5fc90c00b57ee75d8d9596dc5dda9294f770481df7b9c6e27dea45f7fcf1f8d6094703121b0eab62f2fb055a0
diff --git a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
index 12825543a2e2..f2da64580553 100644
--- a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
+++ b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
index 880556ea53cf..0e587f5f272f 100644
--- a/dev-python/geopy/Manifest
+++ b/dev-python/geopy/Manifest
@@ -1,3 +1,3 @@
 DIST geopy-1.11.0.tar.gz 72035 BLAKE2B 9d0ab7407f629ccc942e55d3529dbcfa792c50046aad7a23801803085f21675ed4bb3b734c430c5f7842a6f1f69d679a5ab9b37e4e60eefd48efa30a11468557 SHA512 b3abbf0ce4ca08eadc03a97876a662bbda1901660ea03329aace30bfb5f8af17c82653273e4d2eab9aca5e817f50768dd742b4865083709e10b8599331d5573b
-EBUILD geopy-1.11.0.ebuild 2311 BLAKE2B d3f001155df01e5afdf2049b9c95adb556759fa0c0791707c0fabf1d5406d02f42bcc8ba872b14b31e0295e1c36c20a28b6b0ce5f7570ebbf796e3a8583ee7fd SHA512 6c6d76805d5e0655aa6ff9abf6c1ed63dd8336ddd7bb52bc4d02b4950e121305bb7f1a01b3593c1d929b1dc5ce16334cc5e5b5c13996bfaf1f0431eb342dd1cc
+EBUILD geopy-1.11.0.ebuild 2307 BLAKE2B 829291ec65fb91f0a088d7fe567f7bb163b3fbbff582e3b677ebde9c3a28cafb628afe087e494535f856f524c8463c53d4cba67cd690422bee673064e7103f00 SHA512 5b1982975d758750768297d3fd10719d4e95396ce5a7d0d48ebe562134d808f027a4a8439397d0fdcff4fa841e84af2a074d6832aca324f8812a4d21fb71783f
 MISC metadata.xml 566 BLAKE2B ea35386f802c3a3d619e8531eabad55dfcc4da3ce7895859aab57bba610f52bee9f026513ca8a983a19a7eb52e6464240d629577381e1ba0030dfd4c8577a659 SHA512 37c883926b9a90ea8357aa2c307bef10ce6f419acb6bae4f4bef43604e699476dc1d5a258a3279e3b029d16097168bda3beeec924111fbe185be82017dbb8843
diff --git a/dev-python/geopy/geopy-1.11.0.ebuild b/dev-python/geopy/geopy-1.11.0.ebuild
index 5ab26fa0c206..f9c142975f4e 100644
--- a/dev-python/geopy/geopy-1.11.0.ebuild
+++ b/dev-python/geopy/geopy-1.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gevent-websocket/Manifest b/dev-python/gevent-websocket/Manifest
index f20ec28048cf..38ff6adaced8 100644
--- a/dev-python/gevent-websocket/Manifest
+++ b/dev-python/gevent-websocket/Manifest
@@ -1,5 +1,5 @@
 DIST gevent-websocket-0.10.1.tar.gz 18366 BLAKE2B bf811eeabab247f97946c971aabd3e4a5cc6034f0874bdfcfbd83ebd08a276d72f70c97694da5fbbb96c988b288d45f55970949d9f4f75bbcb62c027f13aaed2 SHA512 4f25ec1646c223b89ddbb7cf4decae72cc4baa6e872443dc05994987f509068a806c8b5e135c433d631e35b3902227f0e4c89d8071aa74e24c06b0e543e8df93
 DIST gevent-websocket-0.9.3.tar.gz 16463 BLAKE2B b5def54cb76c377e04210e3490e69d7daf73fd38c3f0d4e632272cbe863c50af50cde121bb493121ee24ac96d3ae9da63ee52a12d40718c1736931e0f2adf7bd SHA512 71d6a81f04bae36e7122890b37082df188c28f5901bffcd8c774b2bf1cbcc603ff7ff9f854ab17ef00564d36b19787e3a9267e6e299f9837c1d682e63acadb73
-EBUILD gevent-websocket-0.10.1.ebuild 533 BLAKE2B 08e313f9164a802d37d14730f9d99fee9a474879d03ec19e6c21d4972c019e0afaf24aa7b7e5427757ab611528667405edbaeb4d7d1d3d5a3e140029e00a35b0 SHA512 a56b16dc7a7b9518e5bc5839838c324f39081fae12d819dac0d57fe05fa03f6923eb3da6db6fba71ebd1ef25104655de40ea284abed605a8ac1ddb59de0de570
+EBUILD gevent-websocket-0.10.1.ebuild 531 BLAKE2B d393f86d507f9a7daf7810ff2de64ca58bf635ce136ce53dad6af8e1993198af37531cfe50c9f372766679ac4f7de6d302316b9374a1305908a22f28a3c6985b SHA512 5c9ed8fa6ca1775be58277e9945c5bd01767e6fc3318b66e65963df0036f51d8afbea2f08293a4c34ca565c5ed513a07a507c17f4a1ce5c04945a9d0840ceb23
 EBUILD gevent-websocket-0.9.3.ebuild 514 BLAKE2B 3040755b6a7ad1342339486a5167bafa96b2473424baf178b950b9fdfc1db0e2553f086f277ae6664e2b87ae86eb8b6ba19c7fa2fea8e60555c6829dd77f98c6 SHA512 4a86af2f7f20118fa8689676bf9c38afa738de2aaaf9d9dc6ac476e4feaaa45e81ab13dec119cf4848406b8d5e571f45ac9d8790c7b11b55456d92c8de71c649
 MISC metadata.xml 503 BLAKE2B bd191adc93cb5d0b5a604fbd2fba07ef21297adf7f5e20f0c2b3af579db55251c6ef9167fdb8f3a9167a8b3d67bfc4ee08706d84483f66bb326f851838f6f688 SHA512 5e0df66113a0665e2e35d10389b05acb19caee9f0a2e38aa9d605e50f2d695e4f0a6dd938946fff548aae99c3e2b98620fd740e15d351c52c83387c18a34fb3a
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
index 46ebdfeadad5..8723a4a8b4b7 100644
--- a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
+++ b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 6b8891bb4771..32a3e1f180b7 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -4,8 +4,8 @@ DIST gevent-1.2.2.tar.gz 3108671 BLAKE2B f80df00f58ae2f65aa7f65fc9eac5cbf63a0084
 DIST gevent-1.3.5.tar.gz 4609085 BLAKE2B 55cb4111c9eaf9bbf636c9f1ef8d695def15a92e5591a0c441aae27f41a126487b37b8cc7a701a43453109f24114e3a0c584dff4b9b202018fd8334f0bae8e8d SHA512 4fd6d66e62437c859d653de4e981500fb3a025e6608b91fbb3d5ba4d8f0bff7cce980c03484c1c160a608427979ca763a6660d40ffcb45df4abe5f152ce65d1c
 DIST gevent-1.3.7.tar.gz 4614437 BLAKE2B 43d50c36fba2bedf41a7b33d38180f096b18846146953fa68325155f4a3cb6edb7352b9bb4cff5c7eca7a06ac25dc5b3e82a04545704fd0d6f43e9839a8749a1 SHA512 6dba487a9527eb352dc6a5f57120bf7973da655b3a331cad6637271b626c6e9e5439b20ee8abd9035ecb36e5259c99c69dea5ecdb8fa7ad0dbe28876c4d746d8
 EBUILD gevent-1.0.1.ebuild 1463 BLAKE2B adffbb36780aebdf3f577e739dd41861f1f563ef06fa09668b6ce8dad0d8401b6c6173a77f9b15e69b2735ebe317b5bf2b6f680980f3e293ea68c12e34673470 SHA512 f64ef864e05898bb2cf45683d7193f5f618d5aa8781ba8c40952d771b608431f095cbf3d5abba50b08c680f1ab0d0e55742e615a3c086fa62419154aa2f7564f
-EBUILD gevent-1.2.1.ebuild 1840 BLAKE2B 513ca1516c4e9e9b33f051bb9c166a17e54275a329513c7e0541e653601cc39dee60aa2e091f496f84c407b9f4fcf63f8114b816b8a0e907437b2dc0b3491330 SHA512 527a74b7272e921b3e93a69969c7fb033a9b8e044b34926b8c3c2490bea92e2682c1fb9b103fbe0712c9f58f0b7cc67c3bbe9a15dd3c4302cf461f07f1221a8b
-EBUILD gevent-1.2.2.ebuild 1851 BLAKE2B 3e26da4f75be46fa0177fd3d5ef106c478866eab3a11f93cb2e1e9c287cfa1c61b3161d9148ee5371753ed4e7abc6eac4098d730237711b87cff8fde1923950f SHA512 82a02c84360e9296c1a80453d9aefe8efce89ead2fafbb31a125fec84579ebdc4437701f24812ac72e03379561d7fd44c2082db6d811418baa4c9776ef722c59
-EBUILD gevent-1.3.5.ebuild 1786 BLAKE2B b8f319b82eafc154d083c6918a66aa92dbd108392121dadda2c808c332930a15aa5d3922abd3bc37706c3e95dd872285da433f6a1b2ab1aa19b8a4931d23fd11 SHA512 912c5e7d2f0f87720d72556035acc8cbbf956ac3e7418d2a96cf13f94343602563f6f0bce00433c35de13573a9b7c15f8a8367cec465154775af9e257a7a1281
-EBUILD gevent-1.3.7.ebuild 1784 BLAKE2B a7df706922c1a24ac1d34d43907d815e49861eed74da50e4a6745ef813ae527b7e8aa80c96bf8493f8cdfab8875a4cc57d62dd34459172c53a599a5512b667e1 SHA512 3a06ac7fe234b147b6d787bac29bbe5bdc65de478b3b1c470aa2849a7fb7fa9b662e0ea03f244052879f581cfa74f28fb49a32b2f8b0268d41e0e4a2068322a5
+EBUILD gevent-1.2.1.ebuild 1831 BLAKE2B 18501c089850b5a01b61abd9a23adb50ee44390da0b9b609dbeb2e1c4527a69e809272d94b992d08c7c52de7fceb393e356e3c37a7583d604ba5c340ad7b4d29 SHA512 209a468635cd1c67036cde289dee61f900b121080fbd3fa3592262e0e455f5f9664c1da61391363521d9f48bceb2e70de376c8696980503db32a934924a2f72e
+EBUILD gevent-1.2.2.ebuild 1842 BLAKE2B 4a3df21765214b39d1f2b9724f933c5a423dbdca89ccdf05858df4fa08385e279c5084f5079005a35a387e09faabc8c295ea2d477e66dfb5dbd53ff38e7a09b0 SHA512 bdf22fb998632af60cf2a30161a8d70f6a9541cb9b9bd10c4aeb484b7bbbc2347b18bcbed59c580ef8fb5c9eae493f6a39a9be0509bcf05dc1586058fc85fad2
+EBUILD gevent-1.3.5.ebuild 1779 BLAKE2B 8e8f5b8fb3846daceafe41094a2efa7ca73ef34d03e8037406521de3a06b938b4bd58f43e9b35774e5b2a446854fccfb4e4afe4130df6667bf877c83b32654f6 SHA512 3a6d3f20594ede48a876e3a4c0bbb99b8a4bf6e87b910e0337510dcd879268336005e9b831d5a0269f2f9cb5b378ef3320746a410b7f4c1921f29cecb31253e5
+EBUILD gevent-1.3.7.ebuild 1777 BLAKE2B 04977e8b830347446b2ceb406891ea30f8a6a22acf5bf43ab319037ddde4f5a7f3d3ee24f31a4c4e79f2d3fc11dbb9972c48d6157329d9dfe5887838923b9a54 SHA512 3201001a405b4d06e56af485cd34dbf043a13dd6afff8e1e69af5c70eca8e7715c65c0b27d824a12fe47762652e0b1be06b7f0cdfd31a78e38521c467529d22a
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-1.2.1.ebuild b/dev-python/gevent/gevent-1.2.1.ebuild
index 5759c3d5a988..6aed75ee923e 100644
--- a/dev-python/gevent/gevent-1.2.1.ebuild
+++ b/dev-python/gevent/gevent-1.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # http://www.gevent.org/whatsnew_1_1.html#broader-platform-support
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/gevent/gevent-1.2.2.ebuild b/dev-python/gevent/gevent-1.2.2.ebuild
index 89ac50099639..40ff168f0c85 100644
--- a/dev-python/gevent/gevent-1.2.2.ebuild
+++ b/dev-python/gevent/gevent-1.2.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # http://www.gevent.org/whatsnew_1_1.html#broader-platform-support
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/gevent/gevent-1.3.5.ebuild b/dev-python/gevent/gevent-1.3.5.ebuild
index 9df00fd9462b..f15030e7d9e0 100644
--- a/dev-python/gevent/gevent-1.3.5.ebuild
+++ b/dev-python/gevent/gevent-1.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/gevent/gevent-1.3.7.ebuild b/dev-python/gevent/gevent-1.3.7.ebuild
index 0593ffadee32..fd2c7bc272bd 100644
--- a/dev-python/gevent/gevent-1.3.7.ebuild
+++ b/dev-python/gevent/gevent-1.3.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 49e387c6ec94..e033fd54ddfa 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,4 +1,4 @@
 DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
-EBUILD geventhttpclient-1.3.1-r1.ebuild 1472 BLAKE2B 1fb08758467e2599c42301191212047b258dffc50f1133af192b50995c99457c7dea2403a2b737edee1a95f98df4852b092a21299f3d3ee4e0a5f8b4ef6d3404 SHA512 a0597cabaa2e75a45d330fa1d32865a3a88a5cd6bf896312225bfd03edb2285b0ce4eba548ef1c2875e8e0f24a5dfa2182a7f7990daf2fc836d29b0dbd49c8d9
-EBUILD geventhttpclient-1.3.1.ebuild 1226 BLAKE2B 061ab78e552c8f16960cb6f1b044c06e745d67e9697941ad0c690b12ed7f34c4cc5049c4adace1e2eca2cb8f98fdc5fb89b76ebc7de166fa5a884f1319c48815 SHA512 ba496009e624b9205e7c0a36904e6a488db894837526a651817a54be57998f417ac63d10af63188ec51be1f6df3c07790b641c2637343276fb2a2057a0be331b
+EBUILD geventhttpclient-1.3.1-r1.ebuild 1470 BLAKE2B 71822aa16cfd550f74bb0139a405afd1a735d271f9441c3189361dc23559906c1dec80b5eb60d022660572f52c1970a04caf15a8318765946c2c72066d6d724e SHA512 1c0c9f8044fd9726a4bbda235d118b9a1ff6b2598365706ad40045914b5f2ed41babc7e967188d09c7dee9fe2dc50f50c287128cc03e2aa8c9f603702562fc04
+EBUILD geventhttpclient-1.3.1.ebuild 1222 BLAKE2B 4d42ac8da7810fda67ee0622571cc5a87c4341048fe32860c232224f88871494b483eee070695d9f4262847882f8ad1f605a16a087e99242bc0a0b9cb423769f SHA512 9a30cf1330871362f15414116ceb3c21da35cd6c52b8d746c16065f166c963bfc5ebda7a0aadbd58707f12d84ecf529e5ed75a8c3a2f637fb841185bc406d8fe
 MISC metadata.xml 454 BLAKE2B c0c62b4bcb9e480cdbc6739010039421f139999d7df9673d260ee2365073a108479892dce53e86e1f8ec721c9a33d3967bd41e468994331970a583189aa8c0fa SHA512 1739f134e47ed32c68fce16d76684f6c2393f1e25fe0b098499b1362379cca9b7522950ef77afd9d8e063e1e0335e50dc3cd44192d91ef01adfae68c02fd9d96
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
index 8848ebc00731..e8b00c55db84 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild
index f919e09f222e..eaac2cb385a9 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
index 916463f53e28..2aaf6ca4d936 100644
--- a/dev-python/ghp-import/Manifest
+++ b/dev-python/ghp-import/Manifest
@@ -1,3 +1,3 @@
 DIST ghp-import-0.4.1.tar.gz 5002 BLAKE2B 667a40c0d852799e97d295df76d17d50017880afc9b2daa27d49444da84c791af619dea06b282e15c4d627a9584a23c2aa9fafcf45d9e0e924f9a6a966d071b6 SHA512 8b0e6578f05dc74449082a840ccd609a43fba3ca1c4dffacaddc4b27d2e9e3eac565a5c9672734e6ec5f2e8872b13ae0bb8a5d6bae4ee6c4cf41ef7d2c0b2eda
-EBUILD ghp-import-0.4.1-r1.ebuild 707 BLAKE2B e671850d756dc51c03872187f114778a6796ef1136d0ff27c6d8ee63e9e67520c673d335b70b3450f50171c9917cb0502d977675ecf074232e9fb08f5f4c4a5b SHA512 0a3842c01434eec9d1ed012f9815bcfef6dee8aca78f8ea1c852537d814631a6dd36adf1cfb496a23d4231d52cde104e78dc0640c30bb0374032d7a7bc282f41
+EBUILD ghp-import-0.4.1-r1.ebuild 703 BLAKE2B 96b064729c8bf7050ca69b49aaee7894013aba36a398dfa8ca9002b33f240e05a9d47ebf1a1b5c865dba4e860ddc4a62a0a147b1545fcb7bde6225de600c5d6f SHA512 f0fb1e20f6a9ec2a28b0ce28d2a2295d19f76b71f5d1180b3f56e9e0431200d5983b2026349b81add91ecc1d19bb7d153ca39d29ad918689e67139b80af2f3d7
 MISC metadata.xml 295 BLAKE2B a35ddaaaa21dbbb41d120d1cc45ee75b667bac1b6de115a587c9e46d8a86665560d5972db14b83af7a12e17509cb0414b889151cb63aa86cbe5a8d7db6d5c754 SHA512 c97c267838cdf557698e371efe5c544c787b53d3a7df771d718bc593be3e9eb948aeff7f3f9a833b6a9da19a5b380a954794f36b773e779a8b2dac752055f012
diff --git a/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild b/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
index 1977d178cc42..06c153b35727 100644
--- a/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
+++ b/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ginga/Manifest b/dev-python/ginga/Manifest
deleted file mode 100644
index ae0629a9f451..000000000000
--- a/dev-python/ginga/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ginga-no-roboto.patch 597 BLAKE2B f3e688971c9d3920be0813a3815f36a8c766194b8116d1fe1f1a4aa986d5f5ee69aac13edcb961638d65d4f7bcd2e906ddff3402e95fbaa41dd6473a52b18f60 SHA512 e4e03b31ef61b3c71f5a049d23e721634d5c54646abf35d13df05423f2f215ff50aa7c867077bdb0216e2e8482e5a2bd75d24c505fcb09cb4ce96ac21d327c0d
-DIST ginga-2.6.5.tar.gz 19969984 BLAKE2B a28dcd6216274eb442fab74c28a5d2acd37cdf3fabe5aa470533c3bfd3b4b43227efff9fee98f03691acd1449f8344094f24bd6a13628c0fa5b8a18e27dbf78a SHA512 66c55662a8ce1fe683cdf6a83511f39146fadf10d1fedabd6d6c5c46662a3abd2496bd1f0200612a84bdad246f960990e242bccee7a8a13e3aaf88a4884ceb80
-EBUILD ginga-2.6.5.ebuild 2013 BLAKE2B 87505674cc5ab40cb3934be47e1c2e88a9f42f4f3d513c4bb85fc80f39e8bf3843461d16293e4cdb169ac42231612914f8c6d5680ec73afc1b31b1b7e6addb5d SHA512 278defbbc237571f6b1bc3cbeb6e11123dde941910e8a9a33ef8c42a974c30ab081cee5709f32206832a45e5964e5eea6e161ece49439a970311655ce8984125
-MISC metadata.xml 849 BLAKE2B fc93ade01d6eef46d4e72f2031d96523fdf12bec759525fa7e750d60d4eb6e619253678c58821dbad6510a18f68827dfd19e8b3334f7c5e0c1e5aba283575f17 SHA512 50343b22bb87eb298d17182553ddbbec417198e65f6c86177760e3fdc1c117f2e40dce6b539831d6dc85f820efa13b0b4e739dc40222c7ad2f318c81b78a2d33
diff --git a/dev-python/ginga/files/ginga-no-roboto.patch b/dev-python/ginga/files/ginga-no-roboto.patch
deleted file mode 100644
index 36b222fea5e2..000000000000
--- a/dev-python/ginga/files/ginga-no-roboto.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Tue, 2 Aug 2016 09:06:36 +0200
-Subject: Don't install the fonts included in the package.
-
-Use the package roboto-fonts-unhinted instead.
----
- ginga/fonts/setup_package.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ginga/fonts/setup_package.py b/ginga/fonts/setup_package.py
-index 9dd1e93..fe0ed0a 100644
---- a/ginga/fonts/setup_package.py
-+++ b/ginga/fonts/setup_package.py
-@@ -3,4 +3,4 @@ from __future__ import absolute_import
- 
- 
- def get_package_data():
--    return {'ginga.fonts': ['*/*.ttf', '*/*.txt']}
-+    return {}
diff --git a/dev-python/ginga/ginga-2.6.5.ebuild b/dev-python/ginga/ginga-2.6.5.ebuild
deleted file mode 100644
index 1c995325c2e1..000000000000
--- a/dev-python/ginga/ginga-2.6.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE='tk?'
-
-inherit distutils-r1 eutils xdg-utils virtualx
-
-DESCRIPTION="Astronomical image toolkit for Python"
-HOMEPAGE="https://ejeschke.github.io/ginga"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples gtk qt5 test tk"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	media-fonts/roboto
-	gtk? (  dev-python/pygobject[${PYTHON_USEDEP},cairo] )
-	qt5? (
-		 dev-python/PyQt5[${PYTHON_USEDEP},help,gui,widgets]
-		 dev-python/QtPy[${PYTHON_USEDEP},gui]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/QtPy[${PYTHON_USEDEP},gui] )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-no-roboto.patch )
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	rm -r "${ED%/}"/usr/lib*/*/*/ginga/examples || die
-	if use examples; then
-		dodoc -r ginga/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	domenu ginga.desktop
-}
-
-pkg_postinst() {
-	optfeature "Pick, Cuts, Histogram, LineProfile" \
-			   dev-python/matplotlib sci-libs/scipy
-	optfeature "Online help browser" dev-qt/qtwebkit
-	optfeature "To save a movie" media-video/mplayer
-	optfeature "Speeds up rotation and some transformations" \
-			   dev-python/numexpr dev-python/opencv dev-python/pyopencl
-	optfeature "Aids in identifying files when opening them" \
-			   dev-python/filemagic
-	optfeature "Useful for various RGB file manipulations" dev-python/pillow
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-python/ginga/metadata.xml b/dev-python/ginga/metadata.xml
deleted file mode 100644
index 9b4ee82bcef3..000000000000
--- a/dev-python/ginga/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="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    Ginga is a toolkit designed for building viewers for scientific image
-    data in Python, visualizing 2D pixel data in numpy arrays.
-    It can view astronomical data such as contained in files based on the
-    FITS (Flexible Image Transport System) file format.  It is written and
-    is maintained by software engineers at the Subaru Telescope, National
-    Astronomical Observatory of Japan.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">ginga</remote-id>
-    <remote-id type="github">ejeschke/ginga</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/girder-client/Manifest b/dev-python/girder-client/Manifest
index 0a04217f7160..48daf7109cea 100644
--- a/dev-python/girder-client/Manifest
+++ b/dev-python/girder-client/Manifest
@@ -1,3 +1,3 @@
 DIST girder-client-2.3.0.tar.gz 19976 BLAKE2B 4b6c1bb36a9c904dee331012a4060bc7e4cc381ebd1a74a9ab98a54a1c84ad41015209397fe7b1c12241176511ebf624d0ca4d43ce042d17a9b0388d9d6a325e SHA512 68bbb9aa328b9021b8d3604269df75f67c63631aebdad3b2268e8b170cc65ede911dc57abf049c091f033d85f7026c0869c68ceaed4ebf830f3f1d34d7e59fbb
-EBUILD girder-client-2.3.0.ebuild 837 BLAKE2B 84b504a7ae9da184cd2ab35b0ba8d573d84f6c6b234d202fd78cc6bb7b82c3cc14944c3bb96819c2aa927bedd5fb7196679fac15304c43f3552b6e756a6fe882 SHA512 85f31606df6a9ee8725ffe9e706c813c30dea00e87434004899b12432e43fad008a2d206cef16c33d8f59e3b185d6fc80f301f7bc8ff0745cce947cbafdaed44
+EBUILD girder-client-2.3.0.ebuild 830 BLAKE2B 0e2fbb263733e928643242b5f751ed225c4265f3c6a7112023481a4f153ad52b494efbd4dceac636362d3dd048cd0c2b90e4ce98c84b9a7f67587002e0a23eed SHA512 901436882387ec6a1c1625bae9cab475bd423bbad47d3ba22a2adafee5e7dc60a59314abf732d5349cea9cbe6a1473f361207c3fe4ee5ccf20f6cbda76bcd820
 MISC metadata.xml 515 BLAKE2B d14fe42614c20fac115740485ee00d74505a1b06d8e4e6cd12ce378b30ff4ad5f02da6d095fe49b29128eb930b490b2675c675eb8fcee1dba71a0cae3c012f67 SHA512 908a914fefa0d9d1cbb822dae3bb5e0f6385c85f15d59504cb40fdde47625513fc6603fa865d522dce9936d4e0a23523cc6a510cb7f87601aa42bb7acfce5e62
diff --git a/dev-python/girder-client/girder-client-2.3.0.ebuild b/dev-python/girder-client/girder-client-2.3.0.ebuild
index d035026db7bb..66c8e1286ab4 100644
--- a/dev-python/girder-client/girder-client-2.3.0.ebuild
+++ b/dev-python/girder-client/girder-client-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
index 00540bddc105..52643a5220ab 100644
--- a/dev-python/git-python/Manifest
+++ b/dev-python/git-python/Manifest
@@ -1,7 +1,7 @@
 DIST GitPython-1.0.2.tar.gz 387615 BLAKE2B 50915f5ea98a47eeaf086f57ecc0847592721390b7eb38bc3d03e8258c74b4708cb3043142c160139d399337180300037db874d126abb5e54bbae855cd4e8039 SHA512 faff50d5272158f1d05d932e7827c05272f9a28772aabbcabd631b735bb4d8306d2861d13c327d02a4c554bd9a9902c473fb282318036405497dd8bf0fcc51a8
 DIST GitPython-2.1.11.tar.gz 428531 BLAKE2B 18b00f1e622c6588c14e1625f944d117348fb77e67161117510f42c8381db8cde8c6e16fa911edabfc4410239622fb845931b247bab4133585d2ec27969fea4c SHA512 5f964ee56c3f27c28f502150216af29b8463b19d9c0f773458dbabf17ba8587ee5c5e3fbcb31ad46c55e202d06bae447fd40007890a1bc116fe0370cdfc6401f
 DIST GitPython-2.1.7.tar.gz 426362 BLAKE2B 1d543b760bc0dbfdf95b120876c1f3454442a2e2bca69529229316fe5345129b852f4f6195066bc4750ac650083750c5ae0f842aeae871cba969aaf4c6563899 SHA512 3081fcf4944d49042fa95b55f1f0a152b405830fa592fbe546710798388e2bd7422bd2c62f5a7545f0820693fe1948ef31e1485d7b6bc2b37f2b807962e7da83
-EBUILD git-python-1.0.2.ebuild 1068 BLAKE2B 1f8d1575d2a59f9eed7c7a3a59c591ab969e3241bf6400592f090c81789274dae6216f8a8ba9db25fb6b31458f3f713adea976ec6c99cd05ec6bd99b297070a5 SHA512 82b435a1a0d5bfb7d3f8a34dbc0254e748250bef6ea9491d9d10d4c3ef7f30463e6087764e299250498238d4323cfe65b849dddb6d045690c691645b33cee127
-EBUILD git-python-2.1.11.ebuild 886 BLAKE2B e0d5277d8d1615501a5b4fc8cccbd263a856723f7464f6e067759d76004d31edc67f330b82a16ec5a360e48187b43c3714df38bd1500f909e85c12c9d2b1d7fd SHA512 e7481907bbab06adeef1fc8bca8834e111c51f792d47fe07795d55a30377c57be31d0602cc8179a652e43c0369d446f8737e88bb993771f131cb447169b6967f
-EBUILD git-python-2.1.7.ebuild 887 BLAKE2B 97c1e5644347f58239ca65723a6bfd8c6a3f7b5a5cf2ee051d0bb46c5bb255d927db03baf0c6f96cec4bb081f10d63faaf3949fe26d6bb9e25ea64f39ec02588 SHA512 5caa8fa064b6b565797e54fdaac020a23585c61f7b4d7bd7601fb62bda9d3ee38ddc0d7a1a24ad7a34d9697907913e3e9710ad0a1e1709e025816ca0724fac10
+EBUILD git-python-1.0.2.ebuild 1064 BLAKE2B 23c94421872e14baff18ec5bb87eee1ac9eb49e8d3ba45d08b8956947d6e0535ca5252f74c80f80d82c2929a4c81dbe7f6e5c81d53636f5af90a91b591bd0938 SHA512 3417bc18e44d63da20bddcabac30006d1e45503323f09036b8eeaa189274164412a7fb92801d30e6f1c4c87bcbc424cad2c3a4f06d7e15935f7f73f5f5d3e095
+EBUILD git-python-2.1.11.ebuild 884 BLAKE2B fccdf1c791b3e8d88cbfc758c6e9d110892daf4675e8245c9c0d5a5b54d68f07645770961a5dff75dbcfadd49ee31db835acc445c892887d597ce22b6bf83eeb SHA512 3ddb002a86275ca4e4a9a5f8881c16f5267a5209f8150a61ca4a8c8e183987a9c625cf349282cc185fdeeda9b42268322cea26c75c3efd704344f30ff5c43f71
+EBUILD git-python-2.1.7.ebuild 883 BLAKE2B ace8c92288233151f62298ebb6f51ad5b48f44efe19768ab529317195953142db111491698186056a6dde6a0a050d4abae5df7eed494405b32d43892fec1f41e SHA512 c2cb237dac6fa87ff114d87ffeaa739eab9142e8b013402a961d0755ce92cb4c3053d7836c991c0590f51a5b439b42c255d77c93d0e39f5f62471d3bbdd56c31
 MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
diff --git a/dev-python/git-python/git-python-1.0.2.ebuild b/dev-python/git-python/git-python-1.0.2.ebuild
index e0289c706b4e..a9272b7f703a 100644
--- a/dev-python/git-python/git-python-1.0.2.ebuild
+++ b/dev-python/git-python/git-python-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/git-python/git-python-2.1.11.ebuild b/dev-python/git-python/git-python-2.1.11.ebuild
index 9de8c4880fe3..50bd8d006a11 100644
--- a/dev-python/git-python/git-python-2.1.11.ebuild
+++ b/dev-python/git-python/git-python-2.1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/git-python/git-python-2.1.7.ebuild b/dev-python/git-python/git-python-2.1.7.ebuild
index aa14eb9c8e20..34c1d99d1ab9 100644
--- a/dev-python/git-python/git-python-2.1.7.ebuild
+++ b/dev-python/git-python/git-python-2.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index a3c6d76336f2..0490f48405fe 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,5 +1,5 @@
 DIST git-review-1.26.0.tar.gz 56557 BLAKE2B c8af82d7cc222078c1ef470da0ffac7b698df91ed991ba43c8d34a64bbfa3996bdbe475d9965d6d1ef8cca84293613afb92ac6405c0397232e568d2ec2226202 SHA512 74b2366d7884963caaa9b4614301fad56b7997d1cb16ef333cd2dae5df5a5343e5b891fc089078856b57db0083584a8b4ceea98dd67c401651a100fc4fdf7d81
 DIST git-review-1.27.0.tar.gz 58471 BLAKE2B baace809949fb5bdb22c6cca251deca7a200b070573840f391ad24ad045276d376616c58355c5159086dc67b481686d6382c71604f2bdc8adf0b2799240a976d SHA512 e9fff7e54457b300c269378062e5bcce28511dfd6662035dc8d276e33e6a0f6b6c68bae98fb3a8a36e468f669c4eeb461e96cdf073a831c42156f8c0ef14fa0a
-EBUILD git-review-1.26.0.ebuild 660 BLAKE2B c43e02f5f93f363d5c07368a900e33317ff30e63c9a36020ecd091175b9a9b22e39ffb1263bfee5de410fd932cd224aef8c5c0e183f0435b08d4d1f166e491b7 SHA512 72ea110f91672ad032213b2a0e7e5845fabf67f9a1da3fd88a08df0535ee2ce2b6c33259a9220db44957349fb486d3ad1e41ab93c0b6493123ad73a6e9113a98
-EBUILD git-review-1.27.0.ebuild 696 BLAKE2B 169eb7f9dadfc8b87ef67332de23d6057ad81ae6275818d4b3847c0f4f7f9f5ec363200ad2465f425be67f5e4bb98f0625f29ca251874583ee2d2dd2e2fc546f SHA512 274a9ec4c1cbbc0e4dabd2208c76a3261dbde7c112513d5fdf07929daa53ca1bb8e0b10d9f1cf6a9a6bcc0fd4e4c9642ad30ce2e6b8753026002fee3cb24e44c
+EBUILD git-review-1.26.0.ebuild 646 BLAKE2B 2b1e8a28e847a2cb0a86f4e70be86851117cc7857de7776e9584221205d2235759d3ee4d98d88136c51711797e309dcc5a437b4c334ad97a7e37ecd410309acb SHA512 597e9511a005b0b063b6ed14df79b83a900a73afbdb1ed9ad135226d21a67f0fb9d00758831814d0323db97954f59dfb5af8324031a93773947e694bdeb474ad
+EBUILD git-review-1.27.0.ebuild 682 BLAKE2B 5f8a3883573e0268a409741e323bba59b0b0107d6a8ee179c529dee67eb1d2346c3387478c332964d025e5bae17e2a3f6c5fda447bdf34c66b184bfab3a59c5f SHA512 955dd19ee1cb5ac0ae2179117fd51b8f05a184bffb9adfa6d07ee09a12254373c4c028019b52dc781e584456df87fd0b5160ba097335f04e53febab16640b7ba
 MISC metadata.xml 337 BLAKE2B abf6866cf38fbd7925eabe5d6f2a4cd5887dc263d419cad65ca4105a20ee975ad41e1a661696520fe016318ce55651dc123ba7e6a735335a70d3aaa1b10f3320 SHA512 5bb1243f031097419ceadb6935e12567d359790e5fe63c19687f1cfe4a64f5dfa23b5704232d5777c6dddc1908b0856a780129dc08b787d786d2b867dc40ff46
diff --git a/dev-python/git-review/git-review-1.26.0.ebuild b/dev-python/git-review/git-review-1.26.0.ebuild
index 28dfcf4daf6f..a79a7b836832 100644
--- a/dev-python/git-review/git-review-1.26.0.ebuild
+++ b/dev-python/git-review/git-review-1.26.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/git-review/git-review-1.27.0.ebuild b/dev-python/git-review/git-review-1.27.0.ebuild
index a238bf2d7236..b2af9dbd87b1 100644
--- a/dev-python/git-review/git-review-1.27.0.ebuild
+++ b/dev-python/git-review/git-review-1.27.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index ab43aacc6e2e..d489eba6b6a4 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb-0.6.4.tar.gz 400506 BLAKE2B 5c6f1bf15e597267bcefa6f77bf4829f13673a0f6e463b2d62a469cee3cf8de866bd88a59d9308211a03587fca18610b10a044d579abc976f40f8e1591b4f292 SHA512 2314ae70ec26c46c559cc69a1300ead8cd65a0a22425a3bb36b04edb73bd5e2628cbdcd8e515830c74b21af2badea662c915a727d9a46ed2f92f169eb71bdf62
-EBUILD gitdb-0.6.4.ebuild 702 BLAKE2B 6ffbc81c1bdfac41581de08065087c8c64828608d643dbb24ed1f1c98586c1a4b7a7003ab36cd83ff915c2729b1f01484b3eda6f9c3041fef2c38735fc72a21f SHA512 529138c642aa6be5272cea4352b9f4a3b9743e2fbf94a7946f255f91a1350f4a9444cc8a1777b10fa4f40e5114098f0626d8a628859ef5feed2e0e2ac169d428
+EBUILD gitdb-0.6.4.ebuild 698 BLAKE2B ffaea409a45aac62321cf3eb93b10327a620d23992c959fed8251202a0871ad6d06f891f599690b85ba246fdabc8fa35045dfc40b6d29509f7c6cb206d549b03 SHA512 4ea1b3e38436164c5234c2d0a14febdbd44e2b6d9b82404dc1a1cb6761450a5b019e642c9e3f2e722b41ca2a1dbda880778b6472090f30fbd4cc0cf9feedd871
 MISC metadata.xml 386 BLAKE2B e2ecd87d0601911cc37bad5055be83f73a24daae101ca7ef85d948d21251a14028947c285b0812af717b58eec399aee6cbc7a1cd67f58857d090d4142198429e SHA512 b9c7e7c5575d60c1f6f50f5577ca4bb9ba64285555890400edf4a7118d9a7546d71eaffdb9cc222e464b9397496ad832595e8d4f864228421a764b9ae3c3ad87
diff --git a/dev-python/gitdb/gitdb-0.6.4.ebuild b/dev-python/gitdb/gitdb-0.6.4.ebuild
index c9d4cafa4fe6..1d1e9ac89f7f 100644
--- a/dev-python/gitdb/gitdb-0.6.4.ebuild
+++ b/dev-python/gitdb/gitdb-0.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/gitdb2/Manifest b/dev-python/gitdb2/Manifest
index d3d5085a775a..908bcef1d754 100644
--- a/dev-python/gitdb2/Manifest
+++ b/dev-python/gitdb2/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb2-2.0.3.tar.gz 392632 BLAKE2B c1313a8f571706cfb651dc114df98e85e385fbd7df40688386faf290cf177d282e6e3760ee43eb54d1562582755b6070a992f1f55a1821fef1e0e015f5cd09b0 SHA512 4be643b933b47f5511702aa9df5c3210847f059dff9a4794779040660cd60c5af7de5072eb18bc17971edba9a5551e9ba51dbe360194b7d454ee4f23348c8063
-EBUILD gitdb2-2.0.3.ebuild 1258 BLAKE2B b2dc02d6f011d982079463b81ed2e4546ef5c721d64a7fdcc374390c5c707108bb55b827da656b45de9f0c964fc4bdd1685102ee31c86b478314c889df613935 SHA512 3a79f2e958fc4a21432d19c7fa39c9137c39250bc3f44f06f27c37955e99fb3bf5b798eb53ed3eaed9d8ac8a5f1d3bb2bde49a2f8b393d1232f08d71a04b1d70
+EBUILD gitdb2-2.0.3.ebuild 1256 BLAKE2B d52f86ac5258c3ae2366f1db0be65f57a73d27c78fdfee3980d6c322dc8dbbca9d2814abfea4918b7c373652a44c3ec2292eec4e6b4e116d5264c83c9a6b8667 SHA512 97887b19a3a5485130104a3fef8621db091e2dfca85f47734acb01615f35e9244cd071a26142f2ab5ce44fe38bbff21642d304a133a49224c200ebcb75f5413e
 MISC metadata.xml 387 BLAKE2B a311347a5b3a03d6941a6607e6c1368ce24f4ee3238ce4ea33072fc0c3dba3e5037843f82f1456e722ce93e449d8678dba2432bdd90f6d62b1dbfffd435e7c29 SHA512 09f4154dd271adbf328fcc0ef35267b1c3648c919f6c5d3de480a815f5d5b49b4c4f6661f9f1839bede87834c01c2b27145c6295b8f99804aa45df3eba669eeb
diff --git a/dev-python/gitdb2/gitdb2-2.0.3.ebuild b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
index f0e1a31b7b39..e0dbc73a88de 100644
--- a/dev-python/gitdb2/gitdb2-2.0.3.ebuild
+++ b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/github3/Manifest b/dev-python/github3/Manifest
index 7290f7db5b9c..b64f26b786de 100644
--- a/dev-python/github3/Manifest
+++ b/dev-python/github3/Manifest
@@ -1,3 +1,3 @@
 DIST github3-0.9.3.tar.gz 783446 BLAKE2B 976013511e30a4e373ec4f986fd615e27d866ed38a4cf08d53f24be527b5c8ced38cc63f49eef7b6418d9ab5df3ff7d631e0abaabf10c20472eb9a14c212d3a4 SHA512 23d7ca5d9e5c4efd37541ec0be56bcc50c36d141999196ea2f0c17068ef1235e758d48c3e4fe9c8e204bac98931995913a4c3af227cfdbb7382bec8ac91b3c19
-EBUILD github3-0.9.3.ebuild 653 BLAKE2B 793f2e2bade3d199ead411c06f6b340b1e2de6dcec5c5a30672e0ba1ff0bf18a1d987860f5bff2878db9cfea99ee6a990af6fdbcf77227c974a9cd97fdadc854 SHA512 8c3e9aec1670b466f0a1c66802b1120997f750d2b49eb9130d3e06786f280221f77967f52356d2a07c92cc7057afad769417b680d5e0573e64eafd55f03b5623
+EBUILD github3-0.9.3.ebuild 649 BLAKE2B a24151281bdc28d94821319661e1def66a013c1a1347ea5ddba39c6299a2aed0579c8c65a89a7379356310b4448cc38c4ede5829b25a0af671810260c74f5044 SHA512 caba910c0e2c2da50ebcf0fe74f1e21e2fa85aae6baa6f6ceab74ebad3d9380c56f8289e637825a80be069e331d1a6694095a1ccbe43a047204fdda3d0c02254
 MISC metadata.xml 626 BLAKE2B 8e8b580d120dd5dee945bebb82e5b8183621a378341bba44918be642a5ada8ecbcc7634824bb0a1b8dcef8dfe8b8effca2296abba3d4d7132a1508b9478c6b2c SHA512 e7d2ee56150217ba65f153d875c0771fc99efdcf5a29682369e1b22d121fe55d77c38f45586f6b6e3723f9356e9004e4d3676ee09c21bda4ce5101b8ac551690
diff --git a/dev-python/github3/github3-0.9.3.ebuild b/dev-python/github3/github3-0.9.3.ebuild
index 5009949f30fc..1e75dd056df9 100644
--- a/dev-python/github3/github3-0.9.3.ebuild
+++ b/dev-python/github3/github3-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gitlabform/Manifest b/dev-python/gitlabform/Manifest
index 9d90d8068716..8667d6cbf5bf 100644
--- a/dev-python/gitlabform/Manifest
+++ b/dev-python/gitlabform/Manifest
@@ -1,7 +1,7 @@
 DIST gitlabform-1.0.7.tar.gz 19416 BLAKE2B f7b71de93a2fb524bcdb0a4899d82bfbae1f0dab2d263483539d9d18b5d46af04e0099dd9d1ff6ea0b00e5fb966541bba595f5a19846480ec1704450b0023972 SHA512 a3ee818aef6f792a1295eef0d3edd43eb7a46360ed2155fc459ee60dc3ea28b5b15fd0fd2a9c9ccd38deb385f8e37767202c23c2b885a5c2d6325faa5071443b
 DIST gitlabform-1.3.0.tar.gz 20066 BLAKE2B b4a158ac91140e1b26b75a85bf79b0978ffccf6095477b7238b93d14205ff6ce0c9dece951999bcdf938cb2470e2e24d48ecc2c307d31c7edb5214c90a95821d SHA512 9ded533fc9bb4cb910d3e46620afa6ab237db94678ddb045a526ce4e02da8f0dd2f4458597aa8a5732cc89bb1494db5f3179074c3103f862e47566af93c6a5ab
 DIST gitlabform-1.5.0.tar.gz 20583 BLAKE2B 670046f0dd8e366a7fd3cb34ee0df61a83b201c10b2859d69a9ae1e82878f6cd42214c1c816da02fd33262533db58aaf07cbe056802cd1ae72a3b5afd4796a51 SHA512 93985c542b6879eebc7b28c7b842252ee6464d526193999d8611e78e48189883b6e6a64a1f7d2a5079f40ed5814dc9b39200eac68dfe16039ae4c2ff7b2c06da
-EBUILD gitlabform-1.0.7.ebuild 873 BLAKE2B 6955d533fe2dec7d6f1779afe93c1295657be569cb5c2fe9ae799136aa3745b486c93f2b46d19b2eb1612200b6829711873d4f8d89d2b7168da6164c3f4190c4 SHA512 f39c596b55b1e9f9b6a450394fafe34f5112b97bb603774fa56802ba7edd7242aed1cf573ebe54f2339b54fbf4000aee34c43c84f9477c68e1c494f843920af9
-EBUILD gitlabform-1.3.0.ebuild 873 BLAKE2B 6955d533fe2dec7d6f1779afe93c1295657be569cb5c2fe9ae799136aa3745b486c93f2b46d19b2eb1612200b6829711873d4f8d89d2b7168da6164c3f4190c4 SHA512 f39c596b55b1e9f9b6a450394fafe34f5112b97bb603774fa56802ba7edd7242aed1cf573ebe54f2339b54fbf4000aee34c43c84f9477c68e1c494f843920af9
-EBUILD gitlabform-1.5.0.ebuild 918 BLAKE2B 77f44b9f0b0606b380553469334a29d5eba26bf8be8f2e5f3f76a00b896e7f398776cd206e0a1e48efa25f3f532b88d46c91f0a128c8613ec48798ee7afa0934 SHA512 df8eb5f159e47d0cc0ade6645304e335e843afcc4362d55c925987de100e2db4880702b0361906d4e6c0911a3c136365b1bae7fd16aa792c6428705f5e007c0a
+EBUILD gitlabform-1.0.7.ebuild 869 BLAKE2B b20075dbbf9a0ddb5ffbf20d2a686f995985511c91d24cf99aa27975d9c9176a066a857f12b009bf0c857d726517c091d68c5bead72190453eeaea7d9f6c0cb0 SHA512 6dcba60b4ba02c90783958843e9bcc53c477ee346a57ef0cbd3930b45faca32070c3364abe2aa48a8438fc5b3156e13684505e1f1ce4b98c29e840de2c97a7fa
+EBUILD gitlabform-1.3.0.ebuild 869 BLAKE2B b20075dbbf9a0ddb5ffbf20d2a686f995985511c91d24cf99aa27975d9c9176a066a857f12b009bf0c857d726517c091d68c5bead72190453eeaea7d9f6c0cb0 SHA512 6dcba60b4ba02c90783958843e9bcc53c477ee346a57ef0cbd3930b45faca32070c3364abe2aa48a8438fc5b3156e13684505e1f1ce4b98c29e840de2c97a7fa
+EBUILD gitlabform-1.5.0.ebuild 914 BLAKE2B 4cfaafaad7e9a79a994ceb0dc4a0b98a00b782b2ace2adc26a631e9a0d0044bf9616475db81085692b1b82a17c9925735a120c433e20087678b662cdcae6fa08 SHA512 5b90a3a06ac0c34f93c1b4e5455c2e18dbbc00bcfc6413e486c05e70574dc42ab9baa5980c45fcccb852761f6e4d0b1c3d9d9a9a6df4c192496cdc21dee2e26e
 MISC metadata.xml 300 BLAKE2B 8f67fcdb13c36ed0169762cba3ac1cb5bd5d090f784f8a535e34f9d62774790dcdecf18f93a70829c6d70ba22b3061e7c9764afe34755474302c0df85eb16cde SHA512 0f23dd252dc9da695e45a9ad35d01029b71d658e9802f46744a65dd21195a95d3af5987721de65f198a8c7c5bbdfcccbd48216c674d25fa24aa581552b426126
diff --git a/dev-python/gitlabform/gitlabform-1.0.7.ebuild b/dev-python/gitlabform/gitlabform-1.0.7.ebuild
index 509c2995ef75..d54c61de22d0 100644
--- a/dev-python/gitlabform/gitlabform-1.0.7.ebuild
+++ b/dev-python/gitlabform/gitlabform-1.0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/gitlabform/gitlabform-1.3.0.ebuild b/dev-python/gitlabform/gitlabform-1.3.0.ebuild
index 509c2995ef75..d54c61de22d0 100644
--- a/dev-python/gitlabform/gitlabform-1.3.0.ebuild
+++ b/dev-python/gitlabform/gitlabform-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/gitlabform/gitlabform-1.5.0.ebuild b/dev-python/gitlabform/gitlabform-1.5.0.ebuild
index c250d12efd3e..3c72fb966e80 100644
--- a/dev-python/gitlabform/gitlabform-1.5.0.ebuild
+++ b/dev-python/gitlabform/gitlabform-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index bf5223fc930c..699851f060d8 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1,5 +1,5 @@
 DIST glance_store-0.28.0.tar.gz 183622 BLAKE2B 327bbb498d9cc1e446361d026f2dac4d4cd057745790fdcf032583ef0869c302a453e1331028a47bdff34f4bda9f1c27d9c26a005febeecbe5e4d786d08cbcf1 SHA512 3ff1bf64c75c069f6bb22ad72438fcb97e569d8de10cb85065ee0f1f8f9e948cf6b895a184460080f90f091e082deafcee70730b8dd954a6b026a1796b70ea09
 DIST glance_store-1.0.1.tar.gz 185244 BLAKE2B 4841bf9db07df06fe4f0dedc9f06e6aa768118aa363946b3145c90f7d58f452c3b1f419bd3545681161481d88566922f8c3f4eb0612c77a0679729fc460d6169 SHA512 77144f41996e8fcc7b5ec3e4246305e6887082a8f62a84c73d0b546c9f635e8f43b95e45a5e3303e504c01ed3608de6358398eeffee226f640035df2f792dc8d
-EBUILD glance_store-0.28.0.ebuild 1762 BLAKE2B cd31a90bccdcc88157121d1e71cb015443b43ec35dd6c15fa3c90ce5042fabf96a615c2e8431e002cf91c38a35ab548016885adc8f7c94352f0f5771aa11ff48 SHA512 ee074a10071db60ea21898175944a01473388aa764454039592f04aa043432c9d601907456b392aceb4bb7c26ce822cebebfa1c38276b0b2a71ccc091224ab11
-EBUILD glance_store-1.0.1.ebuild 1714 BLAKE2B c431c8bbbc8f50ef9ea8210e4e92786455d6850b2210958ff9476514879d9125d5003f4c0a4a58caeae8940dd897edfdd290d0f6f43cc128931397dd71ce9022 SHA512 a7410b14a4ea26211f877698e0b22ee12830dc43bf00259c4557bf000edfa1cd75d2a573a3d56725bbe3de1bbd0b28e57c8a2bcd1c2c5fedab9e95f7556248da
+EBUILD glance_store-0.28.0.ebuild 1750 BLAKE2B 4be224d66c22cbec887135866d0ea2665a53739a623c44f01a9d7234e043b88b5e6e0e8a3cc352d63d53b83baae67ab0b4ce46ed905e4037b29383664d5f8b91 SHA512 1941f9b0233e7ef4e4cdb8f9a00a3bd4d16a88d8de75e0f1fea48a314bb1fbf0e0ea66f9a306971ae92126f538310f3f06909fa55d4a27f38be05ce69b4d4ac4
+EBUILD glance_store-1.0.1.ebuild 1702 BLAKE2B dfceafe8b64d2b77945d81f4ef23b124012d664326cb89bec22c2cdf38b573aa7bd3157355c00cdb6bf63ba6305974d7eab75e4d633c0b103d79e324d1619e96 SHA512 f06b3f4aa563bb1cecb86d0b5b97a8d8ade9693714527fb31d5f977c0889f1c503e9923302bd2a8b1ec2951b79da08fa77a9ee187f9ef0189588efff31584f2f
 MISC metadata.xml 807 BLAKE2B c5195ef9669d04dc0f81f47b07e802984114b15bf4dedaf99b7214187befb556765a4b14c7d55c9bbbf1dcc2acb4f22e7c5a12a65912cb9f2bbcb73d1cafa4a5 SHA512 3479866f525828fbd21f7d0953088720d0045bf2e00d8dd4cb5bba25f7d5ba939c4bc9bac89d1f9bbf5c3a815f0d5199045f6ad0585c6712843dc1f26135705d
diff --git a/dev-python/glance_store/glance_store-0.28.0.ebuild b/dev-python/glance_store/glance_store-0.28.0.ebuild
index 6180cb8ec0d1..568b6b7bd36d 100644
--- a/dev-python/glance_store/glance_store-0.28.0.ebuild
+++ b/dev-python/glance_store/glance_store-0.28.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/glance_store/glance_store-1.0.1.ebuild b/dev-python/glance_store/glance_store-1.0.1.ebuild
index 3b5ba366c17c..e5271a50542d 100644
--- a/dev-python/glance_store/glance_store-1.0.1.ebuild
+++ b/dev-python/glance_store/glance_store-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/globre/Manifest b/dev-python/globre/Manifest
index 893f0924a847..e8b0f4245fe0 100644
--- a/dev-python/globre/Manifest
+++ b/dev-python/globre/Manifest
@@ -1,5 +1,5 @@
 DIST globre-0.1.4.tar.gz 19274 BLAKE2B 6b05f531e9a3819f9916d16679a39c2a281056446afc8f395ba16dcccd25878355c749820c8b1fcfdd1e855ec7a8d0f10cc5a23e3a4e77c877e0e7180e9c24dd SHA512 288b2a6e9e1b7e646f7b06db73b255f9710007c0305466a8d4e26245ab73efb14e5b543291937edb3f0d1dd9205391a08a073d106f4ed687e2a21d181a83840b
 DIST globre-0.1.5.tar.gz 20388 BLAKE2B cc3dce578d4c30d0309a60a054dfea11b53d5039adcc3251fedccc1ee8a8ceb70e844799e8a7fffb398d0f8022a51ff2460a74102d1c39f1e49d5fa2eb8fe07b SHA512 8b102150acd17a77c8c3ce1f01e36f0c9258a051b44348b6d9494ea9d2f8247bb534de250c5d506641d889042107f3b93c05a313ed46ae54f6fb47ae997ffdfa
-EBUILD globre-0.1.4.ebuild 696 BLAKE2B 725d0fa7310215aac6d77272100e1e9c9d4098d6c6ece2331a00eb1bbb5f674539a06aae1ce43bbb927b069cfbffc2c2f280e20e1c97c50b3c5e9f0379b12313 SHA512 d7370bd9160c9704ece4445138086699fb5013f91326b23806e969bc0bf662c8aeaa48419b078679b3bc5f2a1a9e5059d0cc896b9e74925c2ee945495f7b7b8f
-EBUILD globre-0.1.5.ebuild 675 BLAKE2B b0c0774f6e0c1cb567e3a46068c1035a990040f3d0428eaf10eb84783feb945c12faf47f605c111cb04f236a3cd7fa12e819aae0f874bf00958f5ae3cf3bcc59 SHA512 0b9934e7fdeb7e000137395371a688f42d30b524db3eb6e6b96ed12131c5173bb3a8ea6f660492219605765b0d719e416a7c04680de96a06b73f7f5ed8716cb1
+EBUILD globre-0.1.4.ebuild 686 BLAKE2B 0c8562a34a5a3cdee1e71cc37343109ba5b8c46d7ecd636bd78a709ebad07157bc158e1e4204c5d08a0b54907cba0b3dcf213c15b7c227ce9e3898af41a2ea9b SHA512 c2600eab52fdba48f2492989d94fe0b7924d5d23fea3bd378d515954afba79900b2739193fab074101a08d21591b4b47b1c1a364260b4bb54ae5589c71ed947b
+EBUILD globre-0.1.5.ebuild 665 BLAKE2B 6f0587c7ff546a64fc68415f923fec68c76da66c65c77cc6d683b5cca73537dd6caa9bedcd20c007e576c17631f6bbeeef89381c3cf257aff7729fabd96e4199 SHA512 193ec2cde0aac788d167ca70b7eee075aed206ae409f1c66aaba4c873aaf1fcce0f97329d5f408c6f6c16e6a6d3cab13d536ab2961e5090a3ba97cfb702f4a41
 MISC metadata.xml 367 BLAKE2B fe876ca7eacf8c0c26d7d7198a43457c2e07749a9eae4e48c844a3daa998938768068893eeacadffff1dfffe1b68d17f937effca43714790a5d6e78d9ac4ea9e SHA512 d6d5ed219d18649e5c54e8a8b7aec3119f1af0dbaeab04953e88ee825aba9ec309374ea32249f8f3e36bf80b6fcd91a345f9562ec757efcd691ba8dc5a684257
diff --git a/dev-python/globre/globre-0.1.4.ebuild b/dev-python/globre/globre-0.1.4.ebuild
index 4b5fdd63769c..f3dfb0cf8c61 100644
--- a/dev-python/globre/globre-0.1.4.ebuild
+++ b/dev-python/globre/globre-0.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/globre/globre-0.1.5.ebuild b/dev-python/globre/globre-0.1.5.ebuild
index 07e2e5fdddf3..fcea07af31d1 100644
--- a/dev-python/globre/globre-0.1.5.ebuild
+++ b/dev-python/globre/globre-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/glue-vispy-viewers/Manifest b/dev-python/glue-vispy-viewers/Manifest
deleted file mode 100644
index e9ebeccc09c2..000000000000
--- a/dev-python/glue-vispy-viewers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glue-vispy-viewers-0.7.2.tar.gz 682795 BLAKE2B 2c7a2a7f92405b2e30a74fadf748bf0ec73655642198e25a14c46aca94c29536056056a6ef01316758b0ab581e13e277afc21af2bfcb19d77280414e1a1fd978 SHA512 687bb732a55d18c50aa16aec0b7c1b56712e84556f60c6ea8600f0c2c5cce9404c54f4d7a6b9d193f94202b16e9902045c3e8c3fc0f0347c3a30ff7b21177c27
-EBUILD glue-vispy-viewers-0.7.2.ebuild 1024 BLAKE2B e365ffd738b7f4af7977a2f958b506af8a2d471ea6d1b2f961f72f0fe1c42d4831549a86ae2b1868690b2fd8a67b08d91ba855f37409fdc2450cd8faf00ae85f SHA512 bdeabfb99eea9cc59becbb062f759bd0692fbc5853148ba7fb5f55420eab759ee744fc8f139d144a6ddaba2c9b96581929df4be0f6435df81a11ef0f3976aa16
-MISC metadata.xml 529 BLAKE2B cfc15f2ed57fe05e8ad8074a9e527d122438ee1099a64a2da98248b64366e8658d9926759eca82a76b980b51620f63e1a6436d1ad1edd02ec8d3f85a904922b0 SHA512 4682153ce74e9d7276224de2f44d8e6a091d43d9705229e538350b3f968151c497f310ac2f1a24a3b980db9d4ccdb45af7ace313e739e665bf456d4af45657e5
diff --git a/dev-python/glue-vispy-viewers/glue-vispy-viewers-0.7.2.ebuild b/dev-python/glue-vispy-viewers/glue-vispy-viewers-0.7.2.ebuild
deleted file mode 100644
index 75f5f073939e..000000000000
--- a/dev-python/glue-vispy-viewers/glue-vispy-viewers-0.7.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Vispy-based viewers for Glue"
-HOMEPAGE="https://github.com/glue-viz/glue-3d-viewer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DOCS=( README.rst CHANGES.md )
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/glueviz[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},designer,gui]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		  ${RDEPEND}
-		  dev-python/mock[${PYTHON_USEDEP}]
-		  dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	echo "backend: Agg" > matplotlibrc
-	virtx py.test
-}
diff --git a/dev-python/glue-vispy-viewers/metadata.xml b/dev-python/glue-vispy-viewers/metadata.xml
deleted file mode 100644
index 5b0df1b06b07..000000000000
--- a/dev-python/glue-vispy-viewers/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    Plugin to view 3D in Glue visualization toolkit.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">glue-vispy-viewers</remote-id>
-    <remote-id type="github">glue-viz/glue-vispy-viewers</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/glueviz/Manifest b/dev-python/glueviz/Manifest
deleted file mode 100644
index 10dfc90ea520..000000000000
--- a/dev-python/glueviz/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glueviz-0.10.4.tar.gz 2395 BLAKE2B 954d3ed2e58cb85e35842ceeace39010e01b354d7c1a6a0dc1581a210f9fcc7abeaf25f8a4553f2b4b93e1f2b359bf459b01ed1b9b3c6a55631779459f8a80ed SHA512 c372e04a52a1e4609a8545f3330d539f0afbbe30b09d4f3c0be28895bab82ab1825cb907297562adaefa11c0c94b25c74ccffc31b5a272eb45724efe6180e8f6
-EBUILD glueviz-0.10.4.ebuild 2051 BLAKE2B aeab10a19f5970a24946d006d603022cb05f14a6f79d21d87e05bc588e391e8c3d4ffa3e3370c6e48e2c8841bba2e65e3e6970ff32cc8de5f45a55ee9b9a3efd SHA512 86f80f976cd65b357900bdd1c27bed741a84d9f07de6dd31f75f5c450d6b9833db4d37615bb7a9bf068dd00ea1a0eb4a2f71073f5f3de52f752564d0fe321055
-MISC metadata.xml 590 BLAKE2B 9bb886d14d02ac1d0a70a19338506b5b9c175502bd900e99b010130479938e015796512e2d77e9fa41aebe36a281aea1131d64afa1cb998824dd3b372789f2c3 SHA512 c7e9cf9b5889352b5f56bd3945a46ca22ba51c4f15dca335beedbf83eb34f16da61a5f8d7ea7bfd75a1f8168683088411315b28e2d9005f2771067624e52a0c9
diff --git a/dev-python/glueviz/glueviz-0.10.4.ebuild b/dev-python/glueviz/glueviz-0.10.4.ebuild
deleted file mode 100644
index a905c23a3e74..000000000000
--- a/dev-python/glueviz/glueviz-0.10.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 eutils virtualx fdo-mime
-
-DESCRIPTION="Python library to explore relationships within and among related datasets"
-HOMEPAGE="http://www.glueviz.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="test"
-
-# as of 0.10.0; broken
-#RESTRICT="test"
-
-DOCS=( README.rst )
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},designer,gui]
-"
-
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		  dev-python/glue-vispy-viewers[${PYTHON_USEDEP}]
-		  dev-python/ipython[${PYTHON_USEDEP}]
-		  dev-python/mock[${PYTHON_USEDEP}]
-		  dev-python/pytest[${PYTHON_USEDEP}]
-		  dev-python/qtconsole[${PYTHON_USEDEP}]
-		  dev-python/QtPy[${PYTHON_USEDEP},designer,gui,testlib]
-	)
-"
-
-python_test() {
-	virtx esetup.py test
-}
-
-pkg_postinst() {
-	optfeature "Interactive Ipython terminal" \
-			   dev-python/ipython \
-			   dev-python/ipykernel \
-			   dev-python/qtconsole \
-			   dev-python/traitlets \
-			   dev-python/pygments \
-			   dev-python/zmq
-	optfeature "Parse AVM metadata" dev-python/pyavm
-	optfeature "Save ${PN} sessions" dev-python/dill
-	optfeature "Support HDF5 files" dev-python/h5py
-	optfeature "Image processing calculations" sci-libs/scipy
-	optfeature "Read popular image formats" sci-libs/scikits_image
-	optfeature "Interact with Ginga viewer" dev-python/ginga
-	optfeature "Export plots to plot.ly" dev-python/plotly
-	optfeature "Support Excel reading" dev-python/xlrd
-	optfeature "Used to read in spectral cubes" dev-python/spectral-cube
-	optfeature "Support astronomy dendograms" dev-python/astrodendro
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-python/glueviz/metadata.xml b/dev-python/glueviz/metadata.xml
deleted file mode 100644
index 6138cdefa33d..000000000000
--- a/dev-python/glueviz/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>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    python-glue is a Python library for data interaction, it blurs the boundary
-    between GUI-centric and code-centric data exploration.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">glueviz</remote-id>
-    <remote-id type="github">glue-viz/glue</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/glymur/Manifest b/dev-python/glymur/Manifest
index 0948b66168c6..cf22aad589b4 100644
--- a/dev-python/glymur/Manifest
+++ b/dev-python/glymur/Manifest
@@ -1,3 +1,3 @@
 DIST Glymur-0.8.10.tar.gz 3410241 BLAKE2B 137efe4090a572e900a320b0ac6651f82400fe1c8d0fdfe35f9e6684e771520289e825a02f774cf500fd368608269e646f4574773094bfd940446496f742b771 SHA512 8912e22d76b9de4a0bf8ec098ce1acc9bb0fa70b3b42ddb9fc1de5fc01653478d813429a00ef7502934af34eb78423881a31282e550e4f49c2c9f7d7c08b0016
-EBUILD glymur-0.8.10.ebuild 1025 BLAKE2B d6c52669a823d41897a6a6603274ea421020b7f100fcf903ddd0f79b3712d64010d79ba3fc689cb946eaa4703e1e86bbc809f9dd18e5f4594999966ed683753a SHA512 19a93f34920cdcb1a437795c145e26da0893c858f02fc0cb5340c2da19fb24f7b55dbb4684ebedbd9695a37524cb01d0670e1112c791b77c77c1ea259f62096d
+EBUILD glymur-0.8.10.ebuild 1021 BLAKE2B df9c4f7ba138019d7224ab265d609d45964e7432715787371ec877cd08a8a6fe519d69f78aa6553671e26a3d10186a08fbf92d581c98e2b607eed4c45660bd22 SHA512 c100a097ac2b3d0de0c7629b5d7b5fc58a408591bf6f03ac8f64cd595eed1562809a7282464c1b945a4b3f7fef2d835b3b08a2e8f6ce302e978f6fef73acc8db
 MISC metadata.xml 381 BLAKE2B c1c488ffa38e039d5b0fbd6c47ac2f1536e48b2d2efcbbdf76303e77113b1eeea3e4062584ce94e7fd8062058d2ea58278565f736cfaabe135b463b214f19acc SHA512 944aedc2a2b05937971ebb61246c3c74dd89dd97bc133386af6a1eae8f6c1c034f49beb31f6531b5192ada3ddc1999963a6b36066e877ffe8fe2584267014edb
diff --git a/dev-python/glymur/glymur-0.8.10.ebuild b/dev-python/glymur/glymur-0.8.10.ebuild
index 417bfaa8f494..bc7d23c8301e 100644
--- a/dev-python/glymur/glymur-0.8.10.ebuild
+++ b/dev-python/glymur/glymur-0.8.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 MYPN=Glymur
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 3c30993b8a14..2a25f3bf9b61 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,6 +1,6 @@
 AUX gmpy-2.0.8-fix-mpir-types.patch 636 BLAKE2B 3f9a73390cab39ac02c9cdbf6c78381a14e861b15c4e0194e9727b3e801817111b6ece399a2479c0880f84d542816b2e388ad15e8f9786e2ab63b5e893f31cc1 SHA512 701e985b1d8f1d3ed0efa48a9ee225bfb9a06f5a19f53a8a1ec6c525e74fb2b6fd006f1bba28188926f77faec6cbc456985b810b7c774aef1699a0ab2c07896d
 AUX gmpy-2.0.8-test-exit-status.patch 1482 BLAKE2B 5fce4170ce1993cf7e44077b81ecf45b4c8d3b779cb8744c6deef6444cc728a4cf7831aac0cc31a0b6315518bead442ce232e0052e72229f397691c21afb5890 SHA512 bbb708c0323167cf86c60ef6d398a588adc9a7ccc96eb1cee9d36c38b34c69c896a7df99f50611b29ba6ccb79f77408d274074bd4878e86b8f3bfc38675b74d6
 DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
-EBUILD gmpy-2.0.8-r1.ebuild 1540 BLAKE2B 300fe0934b18e9d263b100cd7ca1ca83b5c7b10fb13c6c81147289680ff6bdfd486b44eeccb0544a4f46e4af2809ff0993bf2e8240a3dab701311793f2f7198a SHA512 738ca24b2b960a4574408bf9ad4d85a43e3a13842c60ec75af47e972f97d71c85a757885c82eff009f99386f64340c75cf27614c52a34a25d70a23ea76df384e
-EBUILD gmpy-2.0.8.ebuild 1827 BLAKE2B a9715787ab247684dd59a34a90387a1f9503572699790605e539d375682e0222d0d22b8270ef4182fe422f3c475118a1edb36a26fdb00c28423cc63a5282595b SHA512 7e56d0de64797c50863c6782fefcbd2d751d91b8578028942976a3ec5c8479c78c372d728b5dbd6468bb2b82336d0b0128dfe2f7789d605c6f87cbcfa51e466e
+EBUILD gmpy-2.0.8-r1.ebuild 1538 BLAKE2B d689752129227512511e0f6ca73d7f424403279ee7e684560583fc003fd56ca089daac29cf82927f9d25cdeda169e5c0a72db92fd6d0f73625bd75885766b3e4 SHA512 5bf14c51485abcb1ae6639d1304e7d5956b028ac94479a4e791f46c503077bc267d13c393ba74f50a0a358c6f4c6921bc681f519af402cefb2ead112f6d1fb8f
+EBUILD gmpy-2.0.8.ebuild 1825 BLAKE2B 42415775d1b35070fb4252770928d93c7c5a81d0979621f1007548a9c5d3ab920f618acf97e1bd7851dedbb7a2e133e3da593bf7833c8bcbc3459caad3cf6417 SHA512 8232f0c0ccc87ed2ef23875f2fb0dd2c64b53c9d9136a0fcbae9f329d22b24c32a93d12f8ee7df98a94b840398e420d630c8148eeb410a0c08436281a34bd338
 MISC metadata.xml 795 BLAKE2B df987c466b2666db915c405dea507c17f90181c2e2948885292a6de44ba0c4bec640fe25bea3b8b8105d035c3ff999750b747cfd7f4caaab561f459056823eb5 SHA512 e7f8324cdacceed22f28e27a224668f59955fb5a639d26376da037b0d21437ef57708c7c325e00c771df9e11050be8dc423a3d4b631599da2cc1ef3f97cf3795
diff --git a/dev-python/gmpy/gmpy-2.0.8-r1.ebuild b/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
index 206a2329c1f9..ff8b5e254fb1 100644
--- a/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gmpy/gmpy-2.0.8.ebuild b/dev-python/gmpy/gmpy-2.0.8.ebuild
index f4e4508c5246..e92fda760e0d 100644
--- a/dev-python/gmpy/gmpy-2.0.8.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gntp/Manifest b/dev-python/gntp/Manifest
index a913ff6f16e1..33b2101e7ffb 100644
--- a/dev-python/gntp/Manifest
+++ b/dev-python/gntp/Manifest
@@ -1,3 +1,3 @@
 DIST gntp-1.0.3.tar.gz 10839 BLAKE2B f427096ff1e0b81da7f3a6c4f4a477bdedd7c69f632d8ff7bb7780a0b31726341d78852f3819e5ae8764b96513b27c5e3a261e0885645b60b5146d3d36628a14 SHA512 77f4f3801e183eeacceedd2c0588e571e3ffb1d81fc13f222fc593035ed767af487c2242b8cece697b430e04a6dce589c3e91fd5784f29f477964307197053c1
-EBUILD gntp-1.0.3.ebuild 457 BLAKE2B 76579f3cad807f50c51353c8c12e7341f51fc598d7e83f500159bf461c40a185fab1b37a6beb06c8b0309dd6ecba33d0421782740db99ed5d3c3e8ae50723e22 SHA512 f487f3c10a71ae7cd79219607bc965b546e3defedfed4e323859bf5203cd0e00d80926472fe3e4959392af24d4c6c6e9b0e5cf18074643cd5d0c56c66bf7ef6f
+EBUILD gntp-1.0.3.ebuild 453 BLAKE2B 8b3b3de7aee603e45e4b7d0014f7c8130d6239337a425ac9b2799c6656e9e44462a70d870ac446e2ac07c691620bfec6d88b25cd620d10891d73e72d50d90f22 SHA512 0b13ab3d011cd1231b94512fba2fbcd5895a5ecc1e107053d5e007d0cdf0de2684183f98fcfc3265b98bf9c5d2180e18a0eaec7671ce02bfc0c40f82266359d3
 MISC metadata.xml 372 BLAKE2B 355ee3bad65b04dc623309bd6b14ce8e25b0b16356b4ef6d08cfebb5f2e3b7a9959967e69fb66faee38eca60a6004e03e205400814cc136911bd46b9cc0b9a71 SHA512 c247337a79257cb729b1439a90f977f650169abe6d685edd8f74bf2841f3274579df2b2a3c32ff4a8c2c9771220e6f115295671407829ce145daecf652f43621
diff --git a/dev-python/gntp/gntp-1.0.3.ebuild b/dev-python/gntp/gntp-1.0.3.ebuild
index ecb496913566..200b45fbc221 100644
--- a/dev-python/gntp/gntp-1.0.3.ebuild
+++ b/dev-python/gntp/gntp-1.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index f7999213cd86..74fb006d54f6 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -3,9 +3,9 @@ DIST google-api-python-client-1.6.2.tar.gz 4262337 BLAKE2B 0ae3e5b1c6bbb80999cfa
 DIST google-api-python-client-1.6.5.tar.gz 4255929 BLAKE2B 4e2197fe56f25cd202f7a0b3f64b3796158d798bfedb9c0690a59c24bd5ce10fbe0300093ebb76cd343dae5eea2a0a360903cd0890834241926fd55a7dc07ea9 SHA512 b2f2be81e6f54ee3065e75ea064ea3ae49cb983d401ac46dca8459409dbd6df7c3ba07798285b5177bfa632a20d43aaaef3a7c73d5d565796567b8b305737565
 DIST google-api-python-client-1.7.0.tar.gz 4259363 BLAKE2B 0a6129e5cfa002095c18eb17c28b8f576f69c6aefa20cb752ce1b529cf5c6ba63f9d213cecb34340fd8224387c7d06c8ad3b4f493e32d26afd14e8e12b4c7ded SHA512 3dc0323ec8816725cc46ad75735b81c2b1e97d1dfc8964f9852f8f739dcdeffffcec461deb7e77b759d66b1e711ffcd948ae45df1e870cef9d6966ebfd793a40
 DIST google-api-python-client-1.7.9.tar.gz 4142239 BLAKE2B 1754162cd7ae5aa64e105e4842ac415473949064576241453ba5aefcc9c53e3a070167d4210f49509a5f63d4b9e79fa5377119ccd53acafe24eaad4a39e5f8c7 SHA512 1e4410c5e639a6bd3cf12b3e648a63e0098182bb52196085dc92597a38e98984fd349adc282d688aa58ec263502d984f54c7827b7ce53128811e7137234358b6
-EBUILD google-api-python-client-1.5.3.ebuild 1154 BLAKE2B a0ab8d27ad0e4f8682eaf0f31cbdccdf56e7ef17415ccfdb3a25b51e490f55550e10f1d17a0531dd6e80f8609bcf8a40fc96b15531dbb0495bb2033ec2d369ab SHA512 e46a6434118917b14024eb8bcbd68e6dbddcebd6016731d6875b3922caceda9b6ff6c9b0a159de4b84ee7362dd0a23f6512c92dc927ef5efeded59efbe8376e3
-EBUILD google-api-python-client-1.6.2.ebuild 1216 BLAKE2B 723207875fd96e63d1e2b09971dbf694f4952d33124e0a4e1051080390d5e8ad58a01b6e44c06455f43e4082058d754744011ade1232db8f74a4fe7d5fb52ec6 SHA512 bcb0ba08f40f28e4e1962cf174b06dfbdcd632039d9d6d660d0605b5beb132b7c04d131ecb69054ddac3044227f05c29124aded7e9f9d865f0e05f10bc922323
-EBUILD google-api-python-client-1.6.5.ebuild 1218 BLAKE2B 8298a51e466807493de208ecec926bd94b6ba6ca8525f8592ed3ff40d8bf7e61a11361a63c67fcd61193926beb2e14b1478255b66713a0fdaaf4444677990874 SHA512 997c714a805daea5ef04d945b1109e344308aa3730cb9e66a4b6b08711d9b31a8c00d59bd2be9b4420a67a36cfb657fd7e6f6dc994772e484fe209d6c5f6d969
-EBUILD google-api-python-client-1.7.0.ebuild 1236 BLAKE2B d0e57a01fa02fa12078be562bdf907d46184286cd956fb5193c7eec46fc7c4f755b9c8482dd7a17db2d9e507f8554869a22e589ee86dae09c824900fbd1e6951 SHA512 8fc4f79bc06bd3f26c93d17bde8416718f72a88d101d5bea1d484f7379512fe8f439be96acd311bbf8abc3359e1943d83fb3f4d7fa01ea68abc1bfffe2f868c6
-EBUILD google-api-python-client-1.7.9.ebuild 1236 BLAKE2B d0e57a01fa02fa12078be562bdf907d46184286cd956fb5193c7eec46fc7c4f755b9c8482dd7a17db2d9e507f8554869a22e589ee86dae09c824900fbd1e6951 SHA512 8fc4f79bc06bd3f26c93d17bde8416718f72a88d101d5bea1d484f7379512fe8f439be96acd311bbf8abc3359e1943d83fb3f4d7fa01ea68abc1bfffe2f868c6
+EBUILD google-api-python-client-1.5.3.ebuild 1145 BLAKE2B cd6f7fde51443c0b10c1d7be6ad7c2a842ada712e1b4213fde46665804d5208e941ba2ce8a4c2d22e27b1024a4344f8da4731f16cc3ab34e12d6047906a43132 SHA512 f31091a35877aac1338ced37bd9971b9e0126e46f78ef53f308c2647a023452aea3a675b8587e2ee34f801e3c25789845688dde5075ca8407998606981802e57
+EBUILD google-api-python-client-1.6.2.ebuild 1207 BLAKE2B 12ebc0a2b391150a6f6173fa6a228176f54e065df5567f2d428ee616d12c298b0b7b9bd2d2b5581b305bcb8be2434d84769ccb624e9201d91a0d938711ef214a SHA512 39dff8e123caab937b06ef90739a88115b5dd0079aff4006cc10b38dbd2ce9ce24abb899add724ea9499f39de9f963eb338470eebe38b717173cde2209d43dbd
+EBUILD google-api-python-client-1.6.5.ebuild 1211 BLAKE2B 95249d6a43c63ac84039ff0c8f905ce54803f15ce2ebb1247ae0bafe784a0b80d2fe713c254f2d70e668e69002655b72ce7143d887f8e616838d94fd761a2e9f SHA512 b8c9ab036c1b91e39a7f6de42b62b6ac5c0b53a747f6d589923b7f5a98efd2429ff5dae244a0bbccfb4d636b4c222318cae8a481f0349ea3c4e1ba224e066888
+EBUILD google-api-python-client-1.7.0.ebuild 1229 BLAKE2B 68d0ffd5c354c137026bb5339d66ebfcb65245f838316eb98cba66ac92c9fb13a0052c8ca29207e6cfb04085a743cef6c770a0d48d23737a5c1a9a66f16594d6 SHA512 284fee5fa3fe346263b799b7a6f688caaf5557edaff7f4f787b3471b7e8d5abc28f7350bf368a37dde4496322d551019ea3bf0b90135704ea70564e6d7c31103
+EBUILD google-api-python-client-1.7.9.ebuild 1229 BLAKE2B 68d0ffd5c354c137026bb5339d66ebfcb65245f838316eb98cba66ac92c9fb13a0052c8ca29207e6cfb04085a743cef6c770a0d48d23737a5c1a9a66f16594d6 SHA512 284fee5fa3fe346263b799b7a6f688caaf5557edaff7f4f787b3471b7e8d5abc28f7350bf368a37dde4496322d551019ea3bf0b90135704ea70564e6d7c31103
 MISC metadata.xml 356 BLAKE2B 57ec373091acbeaf75beafc097b6b84f56bc052d9c27b0386e12579e3bef8ca955413d38344ecdac04c7f5a0ab463295a827efd5c6691db1cb958fc4a7f350f6 SHA512 e45fdf92fc9a3fcf08b74e9ac07326cced2cd7971b16a6cc4f96203199aafb9d72d36a29e3a924a43ce8dc4f3709add9c8bfcc8413bef028408cfb899eec9338
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild
index 6dfd5120449a..e77c75887077 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
index 552155460e6c..a89e87eef3a7 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
index 5597d7a5e0ec..531e5b76ba00 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.7.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.7.0.ebuild
index 0eda25639f69..1c8b3d211e87 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.7.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.7.9.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.7.9.ebuild
index 0eda25639f69..1c8b3d211e87 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.7.9.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.7.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth-httplib2/Manifest b/dev-python/google-auth-httplib2/Manifest
index 9e442bb5337d..c0e74113b91e 100644
--- a/dev-python/google-auth-httplib2/Manifest
+++ b/dev-python/google-auth-httplib2/Manifest
@@ -1,5 +1,5 @@
 DIST google-auth-httplib2-0.0.2.tar.gz 10830 BLAKE2B 7f2092d83c318510b9140791681a58bd3e436f3b5966c8dc53aa5b041e50fdc4f93c276810a0e6ca20b14a919eb37588ae1d027b5eba74f79f44a6809909dd4f SHA512 ec111fdad930bfe3f8f97df70a8bef955920ab2cb0c383d7888ff444f19e5c176dd5aabe10f9a870c86035791a2b27e3e8e1276360626ff5e430db823da5efb0
 DIST google-auth-httplib2-0.0.3.tar.gz 10914 BLAKE2B 20473182a5bd4633d1ae16101d81520ddf182706d478c066e533a2eac3e28fccf2bbaf733eeb4f7ea14d658fe29b9b0c656307bb555aabd2d1a21585e3e3d3ba SHA512 dc39626961dfc67ee56d1c74b4e37e6c6a81ec3c8ddcc24007535acc6a973f2cba5e65a9ece323f53d4dcb4f7bca948d65bde4ab55b2c002432d020cba9d914e
-EBUILD google-auth-httplib2-0.0.2.ebuild 1183 BLAKE2B 7950fe1aa511d04c51278b99166d35ac9d2a76e86b0f77f14b6fff87dc2160918773a0b3c78abdff9ef8898dcb114ee7184a0fac1dbbf93777f101d8888ad1ee SHA512 7bdc578ff403abbf78280a0ed38b48bb12c791876065c2ba9e2136ac21ac17307c3aab4f03db0fedfe17bc28156b97113da79f3ac127a8a9e05a09718e1b4066
-EBUILD google-auth-httplib2-0.0.3.ebuild 1189 BLAKE2B a5c6d0198f6df28421059adbfb622dfa9b91824ad9756e7eb7483ce392f82db599848c5415edd45bc4206c0fe78d02f7fba58e3a0af63b96364c924e051a4a08 SHA512 8567144907d13ed2a3e8ad64b86329f16b40aa01d5b8b1c7d6f99cb381d3c3f624bcbf8d0e4d942b088aed381f4f31c9933352c98ef4c445b72bf64fef3fbf05
+EBUILD google-auth-httplib2-0.0.2.ebuild 1176 BLAKE2B 8c35d272fe67e754f73f882115c8f5a6cca784bb41834dec6f413e5255f41a145764889f20c54814ddd92df3a35a820271d6a9e7531146bdbc26dc67d05e5f8e SHA512 d9dcf08777e83ab375414db33f7e164bf6a981d480afd3dbf4d0090ec1da42cf5a40e66f22c6127703528446894216cb1481376590e591571e65ebe3f755ea19
+EBUILD google-auth-httplib2-0.0.3.ebuild 1182 BLAKE2B 7a59fa537ea4df5b954cc8852c07abe4a37fb714e36f889a8341e476d308f2ae254931d038b79bf5a9350332d3d7aa184818e63f9a7c2513d574fc8408db755a SHA512 9cdb9553b7367e32402c2236ead7841796ca0ccd548b093e64700712b0e7eca2ae36405a3555b5c7d4f1fdce5b66e69af5042613c64054a139b301490dbfe668
 MISC metadata.xml 422 BLAKE2B 4aa4a1542a90ed8ebc399dff1824e77e9f695104e4e59317af95e21719d993ceea8c5ed512d15cc2d9d4085bdd1afcc70a58e2f0d7ce673508e2cb6f52d3664b SHA512 bba9deccadfaf0b663a2f6239633f20ee02838d98cfa25e4d8c399e5635c4cd0b811dbf821f18edf98b328a56a37146bc316aceed6b5b057ef5fd2cd151bbaa2
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
index a82bed81fc9d..e395f1623b0b 100644
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
index f47ccd9b9594..30b3605f14d6 100644
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 48507e4b8a15..5076bd9af20d 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,3 +1,5 @@
 DIST google-auth-oauthlib-0.4.0.tar.gz 73664 BLAKE2B bc98af5a85b26ced36171dae4e9a498b08ddfb92cf557805a238d68fe8bc251c61be6f051db391f4c30fae0aacf139cd0cd88c3e42cdc73efeaaa36407c9496d SHA512 49760914c02b41b7252062c8cb99b133b342463aa2b66b42dd5f320320010425e6952009514cbf89a4704648113693b35db1d3aa3636fc1297a25e59635a7dd5
-EBUILD google-auth-oauthlib-0.4.0.ebuild 639 BLAKE2B e86e8c87bef47600876fcfc58d1c827bb44688da47f44e80fadfe57a9ae8480b279f87d457e4110f85ad856b90520fcde76e664c0138fa8d234909f024e84926 SHA512 31449383156850ebaf0f4761cd95f1aaf44f8023cd0196a0f3db5a07032b5329fc3d30e1e183a8c2b9036200102fac6f4b5e7dd35406c4e9a9cf88646b510418
+DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
+EBUILD google-auth-oauthlib-0.4.0.ebuild 635 BLAKE2B 4a2c3a2f907c7c76d2a82db975ef29449a009b75b991d3c64641a0b7050258716dfe82d734b0169a323f1f733ff19b1069eb34fd3aa41a8147cb983fb9ddf49b SHA512 8ea139f9aee2435973200ddfa0c150e3d943be731288116194d9f177d31f46ddfa6a62aa7b5a29ea3d98ad7dcf4ce88b2319820957cc861e81cfdbb6cc791d9f
+EBUILD google-auth-oauthlib-0.4.1.ebuild 639 BLAKE2B fc64473c6282e6249f2bc4af62f8d912bf086bf6f8bbbdb1c877bd1fbc02505449e8ba37cd1829d1f240c07924efc07263736c57d1130c98b632eeadbaff46c8 SHA512 2f71d9cb4c50220ec03664a77efb774622bd305851d4992e71f08caddda8a6f32a297082d03a5e90fe6e205461a51aab67465d6fabc6b43585a1e9d20fe3b61f
 MISC metadata.xml 470 BLAKE2B 36db489a9e55bd13107658ae61a02e1ab39323c8eeda79b918b193471664adb2ffc2457324be492619a387d600e5dc72e08df323f17e0141793a12cdda79b89d SHA512 79b59e2f899a165f0e3a98ad3f3e809e264fb6d9b0d399329b19af3d2ab2c1628d99d9574fe4f9532646c648b6392a9cdbd9bb21739cf5d37b19c56438e185b2
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild
index 65c76d3333d9..1d783fffbfd6 100644
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Google Authentication Library"
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1.ebuild
new file mode 100644
index 000000000000..33d8c12b6cec
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.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=( python2_7 python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/google-auth[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 41b4401c032a..fcc31a318e32 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -2,8 +2,8 @@ DIST google-auth-1.0.1.tar.gz 133903 BLAKE2B 0a99dcdb37a195f24077162ea8191e2eb12
 DIST google-auth-1.1.0.tar.gz 290602 BLAKE2B efc1ae38b29693f035ea9d19af83bd0e098dacb143192d77140ea1548a17dd051b344b6b34044f6d02e5bea631fe4026dda4ba7c1053535641f34aed08cdd48e SHA512 03b4021f5bc3c60671e1e528642af4682828e3a83a07aa9dea8a28b3f97c4020ac47f325c8a952f366d45196e6a9a78a78e1abcfc8d7f878f7b6369434a0b79f
 DIST google-auth-1.4.1.tar.gz 74272 BLAKE2B 8b9c8f59979688bc8a28d3f6c32eb06aa527b3cf9a515ceca51aa346d70622786292f5be5a4bdb2ca266b777d5d5fd41061af3afd4a2608a6673192ad643ed8f SHA512 cba174049a331c8c0ea5b82da0096641d975f59f1f2c3237c32b1730b4c9f9d12f3bfdcb6cc9b9f9c87109d509dcd423d0a4a4d98200e707052760c253f3ee45
 DIST google-auth-1.6.3.tar.gz 80899 BLAKE2B 71e9ef4fbb8803dbea96e1b9b3183f9bae8a9bd7e29eda1c9ee042c7abb3e5011ee4f461ddafd3295119e3a5a451892b8a38cb49702c59828baba1af35403c25 SHA512 47a3e9390428ffa58946c348d4e1a1bfe1290d6e06b75924bbacb37d5af929050690ef5c13820468de805646f4686c035b00dfe947c090d53568dd85d804af5e
-EBUILD google-auth-1.0.1.ebuild 1376 BLAKE2B bc534a3325a575f4b584491e2bb704f1aaf5c91c307cc74a2ce99892ba807e9789e93289fa6c5cfa64298a55a3f4600827385d909b0df2d784d94bd9c75d573e SHA512 41d567e13e1715d203e1e1f61b433dd8302da95772aeae6f19dd1e2db1b70864f6c10ab087e84db578c2199191fc6552a332ef813a5bd5f2e2a81bf54a887c1a
-EBUILD google-auth-1.1.0.ebuild 1430 BLAKE2B fe2964ba3da632bea6f496d4dc617ba153902015a95bd99264d4a381dac13347f421ac4c469e1be65f9667640a66859d054ea7ff2472f09c434cfe4c066c0c4b SHA512 d2793caf46489a4fd867064910a13aa5b26ce62023f0a064b14cb82c3c3af1546f3fc7e12a5130b5c6e053cfffd3c0ec5ce52be5e13c90e2dcd048d71558e471
-EBUILD google-auth-1.4.1.ebuild 1251 BLAKE2B 4fb284d2895ef38ebe26dc04a11fb100600f56aa3f61d724fda4e37ee7c4273f5384291175405d95cfd7f5ba87f286c3d08b560d21062a94b4ec974e33ff0b03 SHA512 fa2deedafe50c880a00a61432ec9d26a42fdf5d35992e1fea413531048237b9a11f916c9d95d0b852aa027ad54db363f5c363a7e9783faa1cbad8d30df56d127
-EBUILD google-auth-1.6.3.ebuild 1297 BLAKE2B f5593b095530579717ecb0af200d67acf3df78cf0ee92f102084efa8a943931621cfbc7e07791aa929a8e65cd78dc3bae2994c2c67964c558ba6b002ae80fd89 SHA512 6595a39429bef377e7df772505e17b7e590b5d90a72ce13a0be6642a8d205cff37526edfc1a8e65edd48fcb4a5f7bacf45aee36fc8bc7759af4f569d5465e5f5
+EBUILD google-auth-1.0.1.ebuild 1369 BLAKE2B 7854caf2b9f9dccf9767111206f627dae308c41e0c7aa8f373c54b6eb480bb0189113dfaff361940dd1b5199f5943691bf79c6fc707cd237362ffbf29aaca368 SHA512 fc8bde0eead54d9a46d579447e638ecd1e4cf2210c85791f5b9950a8b06800073e8e2c329de848da95e899287a3dff2eb35d91b736fba2f7433fe76fc4b0f1e0
+EBUILD google-auth-1.1.0.ebuild 1421 BLAKE2B bf24927f9542c8e7ab4fbdae0f8a867a46b08efcb8bdff10d5f606bda3815c069da263748ff2d6ce4656a01d2c65a28c02ac293ef57ebcb463b6ca0a4e29b363 SHA512 6854207612d74fe510ec9df8c124017b98dd7f695d2069b92bc03a49fc85b8f59f88014b9865da8c2b80e14771f32290fbd3d8bb10f3ffef0e94bd68c4c51fbb
+EBUILD google-auth-1.4.1.ebuild 1244 BLAKE2B 73d810b6d1a04bbe55d25d8ee11d7f67448a597dbb4f11f4fc0e1dcf76a8a54decbffd3daef0c80c45ed6ab3fbb30fb6ae506c9b7128328aafd69d22378c42e2 SHA512 97660abbbcd0f1ff6685b601b2c10eced8ab17631cc9a756593504462ecba4bf444e9d5bf00df31d82fa47c8431e49c8730ab9ed94ffa625c1d6eec4b0a97459
+EBUILD google-auth-1.6.3.ebuild 1290 BLAKE2B 6860d25d2f7f4a953311e82fac90908fce3ebc61939a1646f7edd31488063efacf5a2fa30a7ce2b924e65d6484c262ad100298f5c3f858271877b5ef89c6410d SHA512 7780b12aa3d237640e83adfb528fe38e8befc72504943aea4ce871c34202c98bd4228207970e323de6896561a3834d87841db986f223a7e4c6e906c1a2cbd50e
 MISC metadata.xml 404 BLAKE2B 5a7234bdd9c08a076980997db1c4fa12d2d2ee37945ccf2308e5bbd92bd01b5cbccb195a1a567f3ab82b71a1d64bf63453b4dffb2e2d7e93fdacc322f8612896 SHA512 ba3c9a09c5bc382da4c8594011872eca305111afa671adffbd3d4c04f8d772cc37d43d83385183f38311e9549c12ccff14f44f85352c49f778766134075ff32b
diff --git a/dev-python/google-auth/google-auth-1.0.1.ebuild b/dev-python/google-auth/google-auth-1.0.1.ebuild
index af55f7df3e84..3439a9b7bde1 100644
--- a/dev-python/google-auth/google-auth-1.0.1.ebuild
+++ b/dev-python/google-auth/google-auth-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth/google-auth-1.1.0.ebuild b/dev-python/google-auth/google-auth-1.1.0.ebuild
index 56f453796211..f36bfdca3b9f 100644
--- a/dev-python/google-auth/google-auth-1.1.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth/google-auth-1.4.1.ebuild b/dev-python/google-auth/google-auth-1.4.1.ebuild
index 8cc3ff5c8462..3d075164ca22 100644
--- a/dev-python/google-auth/google-auth-1.4.1.ebuild
+++ b/dev-python/google-auth/google-auth-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth/google-auth-1.6.3.ebuild b/dev-python/google-auth/google-auth-1.6.3.ebuild
index 3b9006239375..1baba96c4b41 100644
--- a/dev-python/google-auth/google-auth-1.6.3.ebuild
+++ b/dev-python/google-auth/google-auth-1.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-pasta/Manifest b/dev-python/google-pasta/Manifest
index 9f87408d94dc..f2c79eff3c21 100644
--- a/dev-python/google-pasta/Manifest
+++ b/dev-python/google-pasta/Manifest
@@ -1,5 +1,5 @@
 DIST google-pasta-0.1.1.tar.gz 34476 BLAKE2B 04de1237eda9449e4648af0fc43b538d4c71f43b1205fbb531981c773266e404d9673adc9f7c3e74706b90993cae31d7a2c812c3ee5a02edce6ce669491f2823 SHA512 94a5016acbba72261ccd488f788b23934651149c7d763aed4f998018bdbf299261fe125accb1359f70d024c3bc3db0f1279e5e780e1e4b87b328f2c473a1b003
 DIST google-pasta-0.1.7.tar.gz 37090 BLAKE2B 55d1846a733d3d593e0df16f360a55879b7d5c88a1df410b2f86e97dbcdb01493a7abaebfa57f0f39cbe0dbd081847bce41d8862dea30cdef65d745870ffd89c SHA512 dd374fd039b7b6bd5ca9821dc8342854277cdd7b58738532cf0a39458c3021a1d5011f147c5a3fd1936023da7890636a65d4026af7da65194bde0004ec0caa35
-EBUILD google-pasta-0.1.1.ebuild 495 BLAKE2B 4c39578ad68e1a41194519bb8b3603e83374026480d7912e2e7d32d67ec964ffe98ea33b3ebbb0a372620d67eb52f6384578e8c110f6dbd1f128e85b9f90d1e9 SHA512 c1fcabd29fd74e9b8419a9b92a30fdfab3859b4d848d1b137f302a562b37d8757cd6c7fcd9dd340ec7dd17482e6c662dd511bb057af4b75b312155976b6a57cc
-EBUILD google-pasta-0.1.7.ebuild 497 BLAKE2B b8183fd2909429ca824cc798ddcfd861ffd82988453c744898eec77374048a1af1ffff0890950dd54e1da3e45083787b706704ff4859c9764c6a756ad37eca5e SHA512 ddab5bfb96f67ca15c478caf63691bfdce29be7fe926ef0b52208ceb29c2c46ea6828809af5bc1c6ba7241ef7b69ce3f10e8d36d9508c21a432e590c5d47d666
+EBUILD google-pasta-0.1.1.ebuild 491 BLAKE2B 8c8e3c75369fc61ede336e6a13f055724c5bc92169f59e959bdf41282b5f08025ea994efdec5b8f4f8a804f24186f15c27cd7ae781d6f0ec49c3913591131ffa SHA512 3c139842f618d794a087c051f4a4410dbad537d7c16fceb830131c0860fe88cc222e740abc00113ff96b163f014be72b9a5e4e75f4c072f47df41151668fc600
+EBUILD google-pasta-0.1.7.ebuild 493 BLAKE2B c34883ec0b54334aacfbc75eb1352f167317256ceeda0a46b1959ce0c6e8760df88735f166fe82524e465a755125c4c43c6fad274d474ba35464fd944630b6c8 SHA512 f7d87140dcc34dfd5955810b0f1c36f51592596a53581bdd6b4af0916d33179a7a79fb373ff6e27894b4aab971dd5e7ad8c63e793153617cafb06630c24f3617
 MISC metadata.xml 347 BLAKE2B d79fee4b6f6d09c97796965687666f353324ddc6e1f83b6a1f9138ff95ab07a77bd66049d5398d39220e7685412ef79111f89aaa11045efbebe55a7c915592fa SHA512 c0eb9737d40e4e982775ca900c962b676b1ad863c1a48c170163f42cf42ce385b44f2d7e2eb26fe955e146015fccaba6d25aa3318347fde65aa999baaa722f90
diff --git a/dev-python/google-pasta/google-pasta-0.1.1.ebuild b/dev-python/google-pasta/google-pasta-0.1.1.ebuild
index 23b503560644..8851ee16a2d8 100644
--- a/dev-python/google-pasta/google-pasta-0.1.1.ebuild
+++ b/dev-python/google-pasta/google-pasta-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="AST-based Python refactoring library"
diff --git a/dev-python/google-pasta/google-pasta-0.1.7.ebuild b/dev-python/google-pasta/google-pasta-0.1.7.ebuild
index 6baf55a5779d..a99872c0eb58 100644
--- a/dev-python/google-pasta/google-pasta-0.1.7.ebuild
+++ b/dev-python/google-pasta/google-pasta-0.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="AST-based Python refactoring library"
diff --git a/dev-python/google-reauth-python/Manifest b/dev-python/google-reauth-python/Manifest
index 1e9ed07ef0f9..6c22af6e4517 100644
--- a/dev-python/google-reauth-python/Manifest
+++ b/dev-python/google-reauth-python/Manifest
@@ -1,3 +1,3 @@
 DIST google-reauth-python-0.1.0.tar.gz 17720 BLAKE2B c78a43f1062988ada715c9e1bb64c2252a3debd5b9b366df9780200717a006c5e4957bf37d81e645989c6fc74c5e5b4354c88244309bb1a22a936ef74f6172c8 SHA512 b92b822b5c59d74f7ac747e66f35eaa906a0e18ccbb791e0904551c6ecd9b904ac7602ea38333a16396ffa49638a1b4991827429c7f52311b9506f55400bf117
-EBUILD google-reauth-python-0.1.0.ebuild 1131 BLAKE2B 477d6f5b36a0967e14547f01c6ff5b33568e0ab14427991a03763ecc10ad69c89651d79b476fcef7bdeb9d9ef9ebeb99542cc1a468baacfe2afd3a1587fe4db9 SHA512 6a8773b9363208ed813d1d6ff72d4512210019c382cfca23fdfacaa0af2c22a993a0a986f3f6594e1f7a0a03c2317b84e5d1e1f7b9fd160afa58cefdab90a020
+EBUILD google-reauth-python-0.1.0.ebuild 1129 BLAKE2B 0830762baff14331781ab071d0952f16d1cd1f1df9a9b8b13f3ac6febc814e14b216a5e63d131097dca5b9f2c4b72210813de274228878c35015a0de9d818df9 SHA512 c5840af96f773d49dd1e6fae71fa1aaa1aecf6b8107a5223a47a80cb0c70a281c9d1e6716180f12126a9251f134804cca0f05f842179a9c37efc8ccbe9c7f03f
 MISC metadata.xml 387 BLAKE2B 3c273fa005cf2d68f977f8556723ae4577d05998471f3cd845f7335c84c610d4d4af9c971b6ee2edcf51b621e24eaf2083c20dabad714111b2d21cc99116d376 SHA512 7fcd5ff43d0f70d110f62c197f5e8f4ed6bf3192c457402c0d4bfdda66f32ba5144008d07e87d1661289ffaf1f2b637f7467dc1a50b65cf6606c17caf283b96a
diff --git a/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild b/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild
index a17d9437d2fb..df26df207def 100644
--- a/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild
+++ b/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gql/Manifest b/dev-python/gql/Manifest
index d28f405b7c86..c72b94a45682 100644
--- a/dev-python/gql/Manifest
+++ b/dev-python/gql/Manifest
@@ -1,3 +1,3 @@
 DIST gql-0.1.0.tar.gz 3925 BLAKE2B b463235b5c9b6af8be77340d219a60e5886389fc18e066995a56d1ae80079a8de80336ae56d068c403d62f994d17cdddcf4191b0884ae971cecd23c5d17dc66d SHA512 23e35587a61e982a017260525ba9bd5d78a006eb35aae3d1cf48ba92fe954eaf14194e8f19e99813f44386b2440cda7701c85618043514a0f75101654c9145d2
-EBUILD gql-0.1.0.ebuild 660 BLAKE2B 7d4bfc8d4258fd6b2630bf2150981143775bcbaa5ca48e1542ae9d79e15adcae5ed976953ffcd6712f0a6790f11bda32d757e3b906bf00f902909627429b465d SHA512 9314592388205d752a3be6e4f0f005ed909847ecd1f1bdc5bed485d96a3fe71ee3eded6f46825629dd090b213e3ea08613087efb2fa13de54666cfa2d26df663
+EBUILD gql-0.1.0.ebuild 646 BLAKE2B 92a4b7e06c365903a8986e32995478e11866c7a24d1187a8110c951a70f0c92efa2cf0d868077e0b0e07e8a14eb1143d5b65626ab6b0ba5f4d22853efa17158a SHA512 bbebfed6a9e544d42dcf32b180fe85c6354a88af298fcc560ef1c4489a3a5cae8eff229f1b7b073b8b63693a4007303290dcc65cfd46d336fb641a868254ad01
 MISC metadata.xml 328 BLAKE2B 1aba0861a5311a449a387615db179898725d66ddfbd75e4cbb28ef6245d54373c6eb413cdf2b5f36a708c6db697b4d761ca961f44e58e8f8579cdcafb1e4b546 SHA512 065fcfa59f0f5bc7e5beb66b531255219a4753b92105f9d9d343238c883d1386497cfbc5bf7ba1c295c7b348dfe1ce4ef616f69e250f464fb8d214aa07921fe2
diff --git a/dev-python/gql/gql-0.1.0.ebuild b/dev-python/gql/gql-0.1.0.ebuild
index 7b641920f69e..95b959caa927 100644
--- a/dev-python/gql/gql-0.1.0.ebuild
+++ b/dev-python/gql/gql-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="GraphQL client for Python."
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 53216fb54317..ab71d8dddc04 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,4 +1,4 @@
 DIST graph-tool-2.29.tar.bz2 15068583 BLAKE2B 28eb191d0f9c049eb5e5cd70ff30508bc6347566e757f11dc21cc7775c40ee1a86490516f6616e0dc7086983e510785c695db4ace64aa2c83b67c3ca1f534ad6 SHA512 f7a40f0ff5cb5ce3fdf39cf38744a91f7936e8d1dc487f0428c9f29893ad9d5163d5b76d7c07e3651ecb7035bea4166ca8e169934be54247f3285f4e0fe7269a
-EBUILD graph-tool-2.29.ebuild 1754 BLAKE2B 6274f8ca68cc14342d264900a1a39d23615c7a998ff04e719b93c464668b10d6cddafed5d417946026b74ab62b35088b1c9b98629d4745af9cd7194c68cc9f55 SHA512 aad5eb3671441c32c54dc5f82dd7f9133f9bc2cc7b3928cd79ab6321033ed0ffaffe5432f9c4268e6a1c2b6573676252ede5facf30a44c82f3c6b48f4ddb03b1
-EBUILD graph-tool-9999.ebuild 1754 BLAKE2B 6274f8ca68cc14342d264900a1a39d23615c7a998ff04e719b93c464668b10d6cddafed5d417946026b74ab62b35088b1c9b98629d4745af9cd7194c68cc9f55 SHA512 aad5eb3671441c32c54dc5f82dd7f9133f9bc2cc7b3928cd79ab6321033ed0ffaffe5432f9c4268e6a1c2b6573676252ede5facf30a44c82f3c6b48f4ddb03b1
+EBUILD graph-tool-2.29.ebuild 1752 BLAKE2B 04ff30a44486c2391264d6ce714e6b011d78497aefff87c535a4571edf9d541e9c919ea8929c87918115e6b03fa3b089187a9f9481eda9da59d21a2ae19a3a82 SHA512 aded5c8318ae872d7ec2bad39503769c2be3f5f758c08f6128b223d73ce7002bf852d7a333be81a4ffe9b05f8004f91cdbce718e80dded21e91586458097f91c
+EBUILD graph-tool-9999.ebuild 1752 BLAKE2B 04ff30a44486c2391264d6ce714e6b011d78497aefff87c535a4571edf9d541e9c919ea8929c87918115e6b03fa3b089187a9f9481eda9da59d21a2ae19a3a82 SHA512 aded5c8318ae872d7ec2bad39503769c2be3f5f758c08f6128b223d73ce7002bf852d7a333be81a4ffe9b05f8004f91cdbce718e80dded21e91586458097f91c
 MISC metadata.xml 354 BLAKE2B 7b0030598a6adc4b25abaef5beb3a7cbf24142a41f3272ded30dd4b9d8ac1e0ddfb0747affefead95b2ecf2a7540308a2e1e9c3dffdee610a2542054e9ad82b1 SHA512 4f8b73df8933d138d1d86ef9436bca38dc449b035701b51ea1d3ab666f3348a21fd3ab09817358d8e6e15a9189a7e61edc3d9af42755e4de472f1acc59852f51
diff --git a/dev-python/graph-tool/graph-tool-2.29.ebuild b/dev-python/graph-tool/graph-tool-2.29.ebuild
index e662da499d0e..90b94419f20b 100644
--- a/dev-python/graph-tool/graph-tool-2.29.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.29.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit check-reqs python-r1 toolchain-funcs
 
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index e662da499d0e..90b94419f20b 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit check-reqs python-r1 toolchain-funcs
 
diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest
index fec6bf61a05d..29983a01a29c 100644
--- a/dev-python/graphql-core/Manifest
+++ b/dev-python/graphql-core/Manifest
@@ -1,3 +1,3 @@
 DIST graphql-core-2.0.0.tar.gz 156989 BLAKE2B 8ff0d64322966dd5fadfeff586a73db770f02337f899c7326ea6e584c093ecc237624f116d31983960ed4683dd53b6813ad99ab1173857e828de98f35eaf1f74 SHA512 caaf1a32550a671048224f37f75ed2a374290d763f9594a5f0bcd102b54f4cbc491005bae102d648c6dfaa052b5bd06f939f8638d6c895d5c133710dc2b0ce67
-EBUILD graphql-core-2.0.0.ebuild 908 BLAKE2B e3fbf2cda9378a038e199d8d433637ee72e5fada0e6092dbe9254cd5f3e8e29a42f31e3af08e151ee517514f070a6476a2f77a2c349a8b12f23c14525ffe6f73 SHA512 c825b2e5ed0d6e8edce4b4f6c3997090593250bf9444d4cbff7b6ac59304761be722e2dc205f29941ab0c0e40c27dd4d171bc641a5bf85421bb3cf845c833dc3
+EBUILD graphql-core-2.0.0.ebuild 901 BLAKE2B ba6b78e4cf9cd482b8046cffcb68c7c1d9880f60da33a01344873c07ca51ce8e84028a265e72274551739bb2a0610b9259051dfe9f71f3b9bc99e04877e199f2 SHA512 a40cbf14a2262b826549e826b2b8dc61f540c0a5b4d7e1dd7fa1d88b8395f66c19921c13a80e343e4a967464413abd8daf02be94f9a3eed6aea098fa0408250b
 MISC metadata.xml 337 BLAKE2B ef6b015336e3997873eced370a205310ba3b98a9607c7f22497f3348a96dd3c2c0e404ef09ccf0106eafebc69012efc5d64a2384ca0c4fc42702c42d3947d313 SHA512 93e093015e1cf58ae9f19c625eee6f89186a91b35eae980edd70e6742c80f08e5f1c7ba9f8cd5f282ec88f13655e4baf7506e8bb990ee12cd0750bfec01ff0f1
diff --git a/dev-python/graphql-core/graphql-core-2.0.0.ebuild b/dev-python/graphql-core/graphql-core-2.0.0.ebuild
index d73013847a56..c36c0cd5606a 100644
--- a/dev-python/graphql-core/graphql-core-2.0.0.ebuild
+++ b/dev-python/graphql-core/graphql-core-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 41b39cf2c3e2..45b253c09c4b 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,7 +1,7 @@
 DIST graphviz-0.10.1.zip 167590 BLAKE2B 4ca344cffe042bd16de56c15ae8056805e7ea82c88b0a9b535cc42d77038d1b54f1f4102630df3b3961e2edf7ab36e2cab75aea6a73a98c603609e0df82ab1fd SHA512 49366190fd3bd703c3d85a9220a63e5a667dc35a41037a54167f3ba96098945b2331294ece4ab260d7006b260cfdd0558b007768fb5f51aededf0b2c0d302eff
 DIST graphviz-0.13.zip 181039 BLAKE2B 6484706c706941891500350c933cad537e63b8f6bd602c46d493ac211842bd9762ff25d7b97c8eda9b8f345e20712971e79afbc099087a8db2fcb3e734591b71 SHA512 3401aeebd6b19f487998aeb4cffcf9598ed31a861b6d335fc76295474512068692371b061a83fb001098010813c0ab61a06c3f2c410c9c9d108000a6b2ab6631
 DIST graphviz-0.7.1.zip 100779 BLAKE2B b981953160f1978fe62b6c2cf422fcde78cc4de80a5274fd6e59c15f8907b34c68b0413d2c538d507d43bd8761349cd7fe532744d2e5ad737f403e52e1fca7b2 SHA512 e8ba326060ff3039f74902c01cf3d96c9965ce2259d0d5a9594e399added05c7e25b0f6c4b0be9ab21c1d37bbfb69e9c4856a7bb457b545185d48838d34cac70
-EBUILD graphviz-0.10.1.ebuild 776 BLAKE2B 64efbc186aa935282816532666838f06555302cd50574d20b19eb9b28e9a16e7ce18e1b8b8c08cbf04f347a59082eb33a754aabe52c19b481f8eaf4c91916caf SHA512 589e3609cf7151e0dd761f36d7f515b7d34e81fae10c63ab66d9e4a1dfa80bdd958cd9fc16251fb55e490cef555037cc0c3fa5275215959360b40bf1f36660f5
-EBUILD graphviz-0.13.ebuild 781 BLAKE2B 9de6c7187f261f07474756718f7845b8ce6738b8a95062e4a86fcf5cc588c4c3fd6d6ae20a9aa483cb0e96c752b1b54792ae01a887d7950f112a691be831c6a1 SHA512 85538c4148c9e7bba3a212403404cf599ec7e3e1a03502bb27b1fe7eec65b555bf6066a17609bc5d2a822aa6bf94eababd2592f85654f5c56ffad4c9ad17b68e
-EBUILD graphviz-0.7.1.ebuild 684 BLAKE2B 89f29dc6eefc160de01efe24dd9f261ebb69495855a30ddea7132646cfabf0fb2907f7ff1f3abc37a3e5fcb505e7d9ce44f224e1f5706799760b5cffc6af6c64 SHA512 5180cd6555f831f1e51f2a89ee145127d34289d8cb4d47bafa1794bf57269d76a28471b47581aea9ea1ddbf79b29d6a092122e26e6f93b597d3e33f57325e8dc
+EBUILD graphviz-0.10.1.ebuild 766 BLAKE2B 643c0dc2f1eaf18be5c571d056879091d98c26d88da8b31f36e3fecd5e38440469f5f0879a8f6e9e7915ccf49a8d8a9ca4a3c8419a9b7d5ae19d1d923745d3d5 SHA512 cf9add4791719e2b9225e428a2d4fb6feba57251002dccc51b2366f8c6583c41fd6acc302e9ad56fc97fb68e91d14c94a31f20c9b5fbe0e3fae0c03e77813cd6
+EBUILD graphviz-0.13.ebuild 779 BLAKE2B 6568d5dd2653360b0af507a706158e072d4b61e763a9a1421431be4e6f27a9a37efc2e566bfe1c68a1aaea2d9258139afefd242b76b2cb66f67e28e94d6721a6 SHA512 ddbe25bc9395bf2606b7d5f7d07eda379104c8f46c0c89f871801e424c95be63f194ab48856ba975a22bc71cb5a2d74a8103adc8947165dcc9ecc41bd00a2442
+EBUILD graphviz-0.7.1.ebuild 674 BLAKE2B 462beed8f06ff1c29bb64778b8b45e8161ad4822cba0562f134d57ca17a79651020e22ee1c5b94d11163b2d02d020df488c7500704e599fc5e17b29f98965a44 SHA512 8056d64f16211830a7bb2240daf34efeac8c4688e5562d362fb0431a2f597da4b8803219e29c6c4428eee3a2b04941c321bd33c3a386bb45afb18d8d7823f5f1
 MISC metadata.xml 527 BLAKE2B b9c6fc9921bfbde8dcde78435394cb97b88d65cd6691bffe94d03f5b22127753333a93496b206d7efa7aef31ffce26d7dd212e3f244f9d111bfc006baf4fff42 SHA512 ee156200f5de25536c3de4de57d0cdc0e01fcbf5b3ef8cd0baf15f7aeea29ce178e393c2ff3f409a93ad3dacd099664b9e72c43c259231b59668f08504c21c82
diff --git a/dev-python/graphviz/graphviz-0.10.1.ebuild b/dev-python/graphviz/graphviz-0.10.1.ebuild
index d1dd3aef5b2a..7c78f24cce27 100644
--- a/dev-python/graphviz/graphviz-0.10.1.ebuild
+++ b/dev-python/graphviz/graphviz-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/graphviz/graphviz-0.13.ebuild b/dev-python/graphviz/graphviz-0.13.ebuild
index 4948c11342e7..5760f7d75dfd 100644
--- a/dev-python/graphviz/graphviz-0.13.ebuild
+++ b/dev-python/graphviz/graphviz-0.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/graphviz/graphviz-0.7.1.ebuild b/dev-python/graphviz/graphviz-0.7.1.ebuild
index bc752435e77c..a54f1dd57c5b 100644
--- a/dev-python/graphviz/graphviz-0.7.1.ebuild
+++ b/dev-python/graphviz/graphviz-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/graphy/Manifest b/dev-python/graphy/Manifest
deleted file mode 100644
index aabcd71bbb8e..000000000000
--- a/dev-python/graphy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST graphy_1.0.tar.bz2 69099 BLAKE2B c14e969c7eb3713c9eece2a7b05f018e5a72cbd20b1ab1bb49897c7d569bd9a63b3b73530983d4015a92cbdd0c76cab9fd4aeeb1b0f7525eb2226732947a1452 SHA512 39b85b21dd0e984a3b7895a090d6676d2fc12e629bcb5f2e486ad02b6cacdd57ab150c1aa4364cae571cd8e6fbca20b5744c079be532b6f4ea2668899c9932e3
-EBUILD graphy-1.0-r1.ebuild 907 BLAKE2B be9a3845842b256474981a50b5428389d72ed05c6e5b434e624bbccd46ccba6df8e6e8dae2e7173ec3b64c00dea5f4ca66ded66c721597486b563b07b714362d SHA512 42e76ba2ebc22fe16e7ab91dbbd6c295f686103310491decc0c9b871a717bbbba69acaef4ed86f3a488c8a6c4fc90150b89bffa184c1833ae770379ad86edf4a
-MISC metadata.xml 326 BLAKE2B 7af692f2b9ede8b539ed85fde2864db5c211fb3fb5d11164d97c9f2c19213069dc3701a6b6b2ca556c14bf92d172eb05d38e663b3e4c42f2705ce104743a06cd SHA512 013f991fae51821c931d805c76bc412a131abb57390dbe03f47f6ed3cb32ff3b7608b6878bdca8f8d675fe09c6c5ecc694c476adddecef3411177e87393a526f
diff --git a/dev-python/graphy/graphy-1.0-r1.ebuild b/dev-python/graphy/graphy-1.0-r1.ebuild
deleted file mode 100644
index 67fe60064caa..000000000000
--- a/dev-python/graphy/graphy-1.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Simple Chart Library for Python"
-HOMEPAGE="https://pypi.org/project/Graphy/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	esvn_clean
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	:
-}
-
-python_test() {
-	local PYTHONPATH
-	mkdir -p "${BUILD_DIR}"/lib || die
-	cp -r graphy "${BUILD_DIR}"/lib/ || die
-	"${PYTHON}" "${BUILD_DIR}"/lib/graphy/all_tests.py \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	python_domodule graphy
-	python_optimize
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/graphy/metadata.xml b/dev-python/graphy/metadata.xml
deleted file mode 100644
index e81f2f46b144..000000000000
--- a/dev-python/graphy/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="google-code">graphy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 97cb79e772bf..fa45aeeb4ad2 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,8 +1,8 @@
 DIST greenlet-0.4.12.tar.gz 57319 BLAKE2B 8260e495bb67e1a2b5b593d3513c3e2157a7b68b71fa3cb2a77de3b4ccc21b5d56bab26b6f0caf00cb669f051d22d7d6ad2700059a3d23b9ad7591f3d6608f43 SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6
 DIST greenlet-0.4.13.tar.gz 58382 BLAKE2B a4afd9621ccd6444738c9b536af7ad5ceef5d3c8c4193ce637b4a8580c7070805419a917bef131f397286fae13f6e6f23409f5eedb814a41fcfee98356c0951a SHA512 625aaa8875b408442139191e1a63eca71c668675229907335f5caee623487aba5305c1d53b51e1764ad982b8edd07d04f984e08a75318a0a5672805667917a61
 DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21b8884f304f5db55ce6ba6e56446525e3adc96743566b03bcdb9bdea7c47fd144554a7f60825cb191e19d6e177b SHA512 a3b7856aadc988fe153f5cf62552dd6219358f35ee2ca136e5eb5c9871cb7545986753af299e6b3e95877e9aa564559e95c548785f78e680766630b047a1ec89
-EBUILD greenlet-0.4.12.ebuild 1077 BLAKE2B dac747755652b26cde4f7576fc247c30547d05f5eb78732e3824a72acf482efd1640d686702762f51fba8680687ff2361780c1b0de29969fc1743298541636e8 SHA512 651eee03b86310e1a85a48c29d4bb1afb92bb70587e7a52a1d49fab73956c61354125eb18aca519a65e97984aefd3a62882db94c7963e8888f8ca364a790e7e9
-EBUILD greenlet-0.4.13.ebuild 1087 BLAKE2B 487cc0c88bf867c491f31516ad72a3b81d8a4530886e80eed51edd95d089e0340dda110bb698fcca7db53a3d34e9a55da50e310f74d5e33b92b9a9ce79df8e7f SHA512 13dd1e1c46613bc765d597a7533324f9fa35a99021ae177516f787fc0b08201b1d3dba54f8cd10a9d34ddc55110a2de8ce4e6a8380c18d16c09a09a0c728f4a5
-EBUILD greenlet-0.4.15-r1.ebuild 895 BLAKE2B 812d92fe284d428561c429cf00d9d755d4691f039308bf7ab6e2ff3799873cac4a42220aefda400607fe339c9770512f8da4b75153ac38ad810e63660d3ecc5c SHA512 6d18b7101e18d306f8208ea92f8dcbfa0b29bb2cf1dc75ca9833d2855cf0904bbc1b57bc89bec859e7fb28cf801a4aa4fdc53fb8c7a7eca337a179e4e8cf4019
-EBUILD greenlet-0.4.15.ebuild 1080 BLAKE2B 009e82c1f94ebdb4bf3de26cefa373ffe7a4aa460f93f28e2c69cead49810e0e91f7218502a5c44c513ccc3c1e958377779c028911ccf90aa5cd6ba9283c3f2e SHA512 7283aa4463fbda22fb49f38626329e2c71c651369f0f148abb8c1cd695c381e4b72aa3ac400054d494a584bb35ef3e60c1d8f676921935a4f83170b9742e023a
+EBUILD greenlet-0.4.12.ebuild 1073 BLAKE2B 22b92191689b0d60990e13f0f57de8e06dacd85546bd44ec0abef3a9d32884c1af8cc95b02029658f987b3ad8548e0e6a50d366abc6349d9d76f8f286142cf8a SHA512 96db6871dc5c4be3af81f95c001f7b317418238cbe6d2b624d39b8460ea27a86c905056d046b461a7991ec7e5414a6086d88a72faf490267db80b4eeb8fb9b53
+EBUILD greenlet-0.4.13.ebuild 1085 BLAKE2B be12f66555e768de5b32bd55dedcfc033208aaca1d6342125fd481889715bc5824d26da64e111e4c70b694a33c300b7158aeffa804a4453d088ac26b0cd55ac9 SHA512 76ec6a87b04c7c107a4b774607253532b921ac8907dd7de8435ff05355b17b58f96f74145c3d2c8840a9a316c2154b49bc99217f5c3ca812a8006dcef46ad82e
+EBUILD greenlet-0.4.15-r1.ebuild 893 BLAKE2B 26a5f433116c6ce7de33d98098ee9583316c663eb2a8afa2dcb7156c447aef7a2eb33327bf51660d7209a8265dc8102a6f193fd664cb7158e847c8deeaf591d1 SHA512 b173362a8858a910494886ed8957d52385dd1a9f5244df6a3c020487e0f6415b270c5a5da795f48a7d6c4e8dea246817b16551a5038c54a469c86751f66bfea2
+EBUILD greenlet-0.4.15.ebuild 1078 BLAKE2B 9358743d448ce37730284759c21b6c8f399a0ceb92239e7d5cb6472b7971ca55924a7ef6030bcebc4b78e0fc3c95a0d9e7687b689692f2aeefd12b1db7eec4f5 SHA512 ca0a5f838972a9302c1f29f0066048dc3262915df6f428636d6a7c824ae1bfde352d16f8f884e72d70938873e42a18aadc802058ec1a07900bcbee410b2537cf
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.12.ebuild b/dev-python/greenlet/greenlet-0.4.12.ebuild
index b0ac93b69098..dc2af69268c3 100644
--- a/dev-python/greenlet/greenlet-0.4.12.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/greenlet/greenlet-0.4.13.ebuild b/dev-python/greenlet/greenlet-0.4.13.ebuild
index b6092ba3b1ca..88fdbdcd21de 100644
--- a/dev-python/greenlet/greenlet-0.4.13.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
index e123a0d5fe0f..3aa34d752648 100644
--- a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/greenlet/greenlet-0.4.15.ebuild b/dev-python/greenlet/greenlet-0.4.15.ebuild
index 4a95dcd17db3..0fbfb93370d8 100644
--- a/dev-python/greenlet/greenlet-0.4.15.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.15.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/greenstalk/Manifest b/dev-python/greenstalk/Manifest
index 853cb8c44f51..867d759cb940 100644
--- a/dev-python/greenstalk/Manifest
+++ b/dev-python/greenstalk/Manifest
@@ -1,5 +1,5 @@
 DIST greenstalk-0.5.2.tar.gz 5317 BLAKE2B 1dd461f0a3a97210cad1c2a1957483477334c015e97184db22c3048c5152b4b7a2a0a5768cf79190c4f8c3115fc61557d3cb453fb56194db9906c5d29e7734e9 SHA512 a270e0c6aaab1ce93e695413c8c12a2546cffb5d3cd11b20679c1f4f8238a68b8e9ed59c0b1c5ec3ed3319d3cd32e8bfef68533e092645d2832546024dfa68db
 DIST greenstalk-1.0.1.tar.gz 12898 BLAKE2B fc0b90ba95b09e1490025175339c3f9eb7afed16db40ec34031305a3d487582fc7305b1990424f53a06887a34c30ab4f957db01a640576aa1c5db30511161c0f SHA512 8b57ec0c7fd3a60c24e8ddd7d51f31c0986317cbceb0f7045bbd720ca58e8f3c896f2f9924de7b1e8693844c814ecdebc020972d895468d1b0e7d055bf628b16
-EBUILD greenstalk-0.5.2.ebuild 468 BLAKE2B e7255d89a1de96ce313ec2d22adeba6b9ce3cba61b189682d0b6451e97ac00fdbe58b1076cd3cccce4a550dfe60931b27ccfac2e9243e7e7db0d29c24c0148dc SHA512 d947c6cbec0eec880fd8139153f82923c9707fe4bccf7100b09bc88d95331fd1c6772cbc52ad82507aadb94fd18de50ef83d91cc2a8c0a39f99dd8ef9b870537
-EBUILD greenstalk-1.0.1.ebuild 670 BLAKE2B 115420b4c3edd2ecf108a4b90908f11fa61293bc04ececb4e10c84da2c87e0e9eff6f5b5e8821c7d53882ee382539f12bc10ca5860cb97c73ca3b2ed505a24e3 SHA512 6ef4d67c8d31691eb3987cef7310e3692d89834bd92d47d70395376484ca629a48f7b2ebf23774bfcdc5e22fec5bbee14ff9f4b85950b24220b663d18fc839bd
+EBUILD greenstalk-0.5.2.ebuild 466 BLAKE2B d099e4437178cc12d49d524e5dbba2eddd2eb76d96b64888d64fbfe2fd64ee63aacf244fe1a028f61614bad70d19a64992b64f1fcf8e6cfeddac6a0b35b104d8 SHA512 752994ed8da57fb0e4911b982cb87c0454488edaf311487793f81a29864573e0269beddf4fc4561fbbae5dd9d8187300182274c5cd3e779cfb12d6f544d21a96
+EBUILD greenstalk-1.0.1.ebuild 668 BLAKE2B 9c4e7f340ad96ecee86336847a48e89f87613bbfd39326fd0e42eae606b641dd66554453155d193b7e6135798ffe2cfa8ce477c8b087f5b9d29df9506bed46b1 SHA512 1dde1893e9bb0350436fd70fa53ed096dcac3a4b07259cb4776d9319bfe048735f3a3eb6733fbae6566a4a401d067b9daa0e6e5b9cd123a543927a21d4a4f32f
 MISC metadata.xml 468 BLAKE2B be86df42ba2a9a693ef6d6ff7dc2840a5a8ad749978f4ce6a77e43fa7ad1f0f14c0a3ef7fed355ce17cdfdf94bd40d1650851aa3910c6a7f85af36753f329505 SHA512 e484b320e2e44edc72cf5cdacb7355cfea180a3193738f233667cbc28384933d4defa8fd3415032cb863acd4d2cbbfa3992e116ec6b14f29a34078a56fab9264
diff --git a/dev-python/greenstalk/greenstalk-0.5.2.ebuild b/dev-python/greenstalk/greenstalk-0.5.2.ebuild
index 1aa08feab7da..356c4e7ca548 100644
--- a/dev-python/greenstalk/greenstalk-0.5.2.ebuild
+++ b/dev-python/greenstalk/greenstalk-0.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A Python 3 client for the beanstalkd work queue"
diff --git a/dev-python/greenstalk/greenstalk-1.0.1.ebuild b/dev-python/greenstalk/greenstalk-1.0.1.ebuild
index fc13a4a44871..8c32194fcabd 100644
--- a/dev-python/greenstalk/greenstalk-1.0.1.ebuild
+++ b/dev-python/greenstalk/greenstalk-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A Python 3 client for the beanstalkd work queue"
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 98045cd220b3..5c5fd426b092 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -8,14 +8,16 @@ DIST grpcio-testing-1.22.1.tar.gz 16718 BLAKE2B c90717c5910be42a161fd08746b898a6
 DIST grpcio-testing-1.23.0.tar.gz 17042 BLAKE2B 42eeaf657355c569dd62e0acdad99449b2d70d725f493a727168314ca8f4a8016b3a39521b8796cc6160472e455385004079857ed88e796c964304d99b5361e4 SHA512 3eb370f5a6568a22a87c72c8bad1c4ae537d36b19fa45039620dc3ae645561bd4836cd430fdf6f64a7687178412c4a2e51fb6474d470039e310f639f86c351f3
 DIST grpcio-testing-1.24.3.tar.gz 17066 BLAKE2B 9f968ce096b70d7b3a01d9991d2dbd70aa73cb39dce4ea1aeb36e65f6e33180b0e7d126c18029da6cb1c91bb4371206cd3481ddaf0014c24e463014d6e990a08 SHA512 265369f696ecc5e3fff35027d951c405e62e7c8ac61145813d7eca66db6e91d0ebfc39ef151cedd9c67437688898bde02656fdbd547718443f2701ab18e68a1b
 DIST grpcio-testing-1.25.0.tar.gz 16469 BLAKE2B 00bf64f79c073b2bce8bac519555ffecf4701f5d99d58bf15fb5a12acc71639b014986e4699f8ce8e0c68606ee6582c7d214474e88120a51495b61a7e03f2612 SHA512 11531ff2dc58f3ed7eba4ef3160dca475a5dbe76ff6570337005e7c3e276a6e7efe33556151fb263c209eac2bba1efb7ab611744405ab97eafb78edb07476240
-EBUILD grpcio-testing-1.16.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
-EBUILD grpcio-testing-1.17.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
-EBUILD grpcio-testing-1.18.0.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
-EBUILD grpcio-testing-1.19.0.ebuild 522 BLAKE2B df149020fd4d3b66348cd08db83e3669cbfadb8c62110efb0e643af2737be7eb2576ed04217722936cff8eb6f11fac521edcdf22aebd46245f845ba0ffce6410 SHA512 90ad1fbbd670eb50c52d02a51963aec60287d8b803d99df335c84436fe7476a376c312ec1e1d68f285838ef7bcbf4719516879ca806283e1dc8d49a833ef4a7d
-EBUILD grpcio-testing-1.20.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
-EBUILD grpcio-testing-1.21.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
-EBUILD grpcio-testing-1.22.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
-EBUILD grpcio-testing-1.23.0.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
-EBUILD grpcio-testing-1.24.3.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
-EBUILD grpcio-testing-1.25.0.ebuild 536 BLAKE2B 1334c659d73dbce494144f30b9acfc7b8d1aa3d1acd07573e93d11be9d41cf1c0e1982b0047f6856fa29f7e8ce0d6fc7f1cd6f44a936326ccf58c8031d9d4f9c SHA512 2ba3e35b88065743ee28e78aec2fb4e18757ed386b6e86744733209832c14c76362588e65cb974a0d8696fa82a5dede46a18e252b65fe56002b0ad84f0b21df8
+DIST grpcio-testing-1.26.0.tar.gz 17018 BLAKE2B 5747cef7d45ebd5deb0f86537fde2994ec7d4b0eb94cfbbfd3f9ad869e43a549d7a289477f76fc87d0c72a3a232bb643aa64c97e2ce3cc80ccb18368b276befb SHA512 7fae8c2e5dce79562005ae0c5e779e8ff157e245d849b573376aa36cc98fc6efa126f2aeed9431d2c41535ffbbac017ce69d83b5fffaf7f75b5493e778e8caf9
+EBUILD grpcio-testing-1.16.1.ebuild 506 BLAKE2B 247ca8c34bd56603c7f419ee73a2f238121bd8225186dffab7c6d33999927c3be2d9082ddbd5f0ea6797c3d25697dfd1f31084d5630436a460c1b06f03c42dd6 SHA512 9f3164aef3fbcefd822adfe33e5d011536636ff35b3dc7a0056c9c5b2632d17139d1558f6bbe2899e0d9e20bbd486bb9cc93518437f1ffcaf99d5e7df8d8e40e
+EBUILD grpcio-testing-1.17.1.ebuild 506 BLAKE2B 247ca8c34bd56603c7f419ee73a2f238121bd8225186dffab7c6d33999927c3be2d9082ddbd5f0ea6797c3d25697dfd1f31084d5630436a460c1b06f03c42dd6 SHA512 9f3164aef3fbcefd822adfe33e5d011536636ff35b3dc7a0056c9c5b2632d17139d1558f6bbe2899e0d9e20bbd486bb9cc93518437f1ffcaf99d5e7df8d8e40e
+EBUILD grpcio-testing-1.18.0.ebuild 506 BLAKE2B 247ca8c34bd56603c7f419ee73a2f238121bd8225186dffab7c6d33999927c3be2d9082ddbd5f0ea6797c3d25697dfd1f31084d5630436a460c1b06f03c42dd6 SHA512 9f3164aef3fbcefd822adfe33e5d011536636ff35b3dc7a0056c9c5b2632d17139d1558f6bbe2899e0d9e20bbd486bb9cc93518437f1ffcaf99d5e7df8d8e40e
+EBUILD grpcio-testing-1.19.0.ebuild 510 BLAKE2B a8970da62adb33be2d09be71148a76478fd0763d01bd1fa26a4c8623aa5f57c0dd40b89e22f3387db8feb466cc01551281bb79f27db77aae7d0ef264cc5d1d7d SHA512 025bcfda6e6421ddb1bbff2fc84ac29447a30cd0e9e098c06f384cb00ff5443afa3f63beb58de96a8e13c766e1bcfeb261d46e8854eb32b8dcb0e62c31265222
+EBUILD grpcio-testing-1.20.1.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
+EBUILD grpcio-testing-1.21.1.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
+EBUILD grpcio-testing-1.22.1.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
+EBUILD grpcio-testing-1.23.0.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
+EBUILD grpcio-testing-1.24.3.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
+EBUILD grpcio-testing-1.25.0.ebuild 524 BLAKE2B 0284886370b09a6985d65872807381960e526a05cf7ba7faaf989707f81cd23f4bc61b268dd99df1bbf6ec12b867b64a2349f350b2fe468afce226c0fb21092a SHA512 1742977cfe2b297725e2faca31512c2d2ec47157b5efff27bbeee6b32c59f3bb06fcd8fea6e1b0f0512a125837a4e5174b79b39f7c35d49c5109c07bff81bc16
+EBUILD grpcio-testing-1.26.0.ebuild 526 BLAKE2B 48a7270fa3f6e8fcf6498bb5f059da45d9bd1a413fef8c9ade410127464951c2d05e231c770117ef00fd3cf37a9c95da1bb4a867edee36bbe787194f6264ed1b SHA512 b7cd30215fa0d7cb66ddfc7cdb3b32f0dd5d2f0752c23d8d65108fd539da6c57d375f4c6d51be9aa5cee68d379d100ec41d24ecc0ef10bb6f0c6d5f2a620f905
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.16.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.16.1.ebuild
index e19dec664a7f..bdd4e0587a9e 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.16.1.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.16.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Testing utilities for gRPC Python"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.17.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.17.1.ebuild
index e19dec664a7f..bdd4e0587a9e 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.17.1.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.17.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Testing utilities for gRPC Python"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.18.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.18.0.ebuild
index e19dec664a7f..bdd4e0587a9e 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.18.0.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.18.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Testing utilities for gRPC Python"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.19.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.19.0.ebuild
index ad6217a42d40..8da00c9cda1d 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.19.0.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.19.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Testing utilities for gRPC Python"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild
index 0f6ea5237441..b50c6a08499a 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Testing utilities for gRPC Python"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild
index 0f6ea5237441..b50c6a08499a 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Testing utilities for gRPC Python"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.22.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.22.1.ebuild
index 0f6ea5237441..b50c6a08499a 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.22.1.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.22.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Testing utilities for gRPC Python"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.23.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.23.0.ebuild
index 0f6ea5237441..b50c6a08499a 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.23.0.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.23.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Testing utilities for gRPC Python"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.24.3.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.24.3.ebuild
index 0f6ea5237441..b50c6a08499a 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.24.3.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.24.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Testing utilities for gRPC Python"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.25.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.25.0.ebuild
index 74459df67806..4c41b42af387 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.25.0.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.25.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Testing utilities for gRPC Python"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.26.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.26.0.ebuild
new file mode 100644
index 000000000000..4ac3f66d4e6d
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.26.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,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index b79a6b57d1e6..d68874a20f95 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -8,14 +8,16 @@ DIST grpcio-tools-1.22.1.tar.gz 2022553 BLAKE2B bd94ece55c5e9e41c923c1beb5a2deb2
 DIST grpcio-tools-1.23.0.tar.gz 2025916 BLAKE2B 7dc3854e29731f7736ef08526142e31e9b14df2b08367cddc9dd69a0b5ebb53938a9a24284e5228fd603402960507d7903eb7a6c90a1243ed311cd595eda0f26 SHA512 306e1de073bffd036643dee6fdaf8c2f48cf810fc4403b02a5b2aa44ba77d8c985181b23ec20d787261786b1c6e4930f8e5a253752da95beeb257ff0555175cb
 DIST grpcio-tools-1.24.3.tar.gz 1984292 BLAKE2B f9ec935f0ea8af31ac5f60909551efc403241917879fb456ea88ac3fc58cd068f0263726819f0e6500d6ca11ae38cd1799db6af4d4f822002d92fe7a16d01060 SHA512 89d12beadead3c68532a769795446a9edca96be495ea2af42bf1934e86cc06d06fc345f7847b17a088d66a2c4390461533be075a93e3d5c255c625da097812ab
 DIST grpcio-tools-1.25.0.tar.gz 1987671 BLAKE2B 3f5d0a7927e8d10a3951d494884fcfbbc9bf531ca3e63324a1c4923eea47065f3db665f26f968e778bcea418cc6b801bd1c863ed2ead1aaa123205a4ac6a97f7 SHA512 9f17e1641766537002e595e660e384dab54c5c36f17b2f085348392171bcbcaacbb0a55f77ba6eba50603faef59c5436c784b6c1a0de96597d7701e1bf82710f
-EBUILD grpcio-tools-1.16.1.ebuild 678 BLAKE2B 08cf87936b8367382223332522d1ef2f36d4bccfeb63ab9b57dcf45072aa0c8cb62fb3fcdadd8c57d0f84426e9c66988e5a25524222d40b553f5a1fd614e485d SHA512 3c6602867b69f2a6a99a467c5472076fa8bc1ec7ab6bd56418756fccf9f059559b130aaae82183456a6741a5d43f11c46f01634f2215ef8b4e3b9c379f903acc
-EBUILD grpcio-tools-1.17.1.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
-EBUILD grpcio-tools-1.18.0.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
-EBUILD grpcio-tools-1.19.0.ebuild 759 BLAKE2B f6e127ee9d8d8a98a5f810ca27ac3bf15041a58d95abc247e6c79fc1d7045c71919a29a92a8e54f08707ca16d9cd069bb2c114ea900aaa1f042682ca6f9c261a SHA512 124ebbaa082a3acfb3a033d1ac8210c6f7d22a79b99494bbe6da518c22650d65fa5866b514c9b420640a23e3e1d6b2a065f0a97d956e76dd07f27bf3d240b6e7
-EBUILD grpcio-tools-1.20.1.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5bfd0d9c5afa0ca5674f6e3f05dcc52f8d477f1fddd2ff59765b019c1cd72da5044b1f816209942c8399532599425451 SHA512 0ee07931ac0f0c54fd445e0baf0b64b3fc56651011e731301cc99bf4fbc747df94f226c1310c6d0e8de48c27986749be76190ce8638fa38e8721d848f370ebfc
-EBUILD grpcio-tools-1.21.1.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5bfd0d9c5afa0ca5674f6e3f05dcc52f8d477f1fddd2ff59765b019c1cd72da5044b1f816209942c8399532599425451 SHA512 0ee07931ac0f0c54fd445e0baf0b64b3fc56651011e731301cc99bf4fbc747df94f226c1310c6d0e8de48c27986749be76190ce8638fa38e8721d848f370ebfc
-EBUILD grpcio-tools-1.22.1.ebuild 750 BLAKE2B 4547a8a98b268186bd0b0c0f33dae4cab8fe8cb166a7b91fa1890337688f4993763387ec2347c8ea5dffe8e4047f2f0fd893265c634e83854f2de68bcf8e5049 SHA512 1030458099fc0f1a1c0de8433aa1350ea465e9060d8cf94b34f2043418313a57499ba99974113c970ed265a71ae8f09007664ca2a3232c476636dd75cfc27c9c
-EBUILD grpcio-tools-1.23.0.ebuild 750 BLAKE2B 4547a8a98b268186bd0b0c0f33dae4cab8fe8cb166a7b91fa1890337688f4993763387ec2347c8ea5dffe8e4047f2f0fd893265c634e83854f2de68bcf8e5049 SHA512 1030458099fc0f1a1c0de8433aa1350ea465e9060d8cf94b34f2043418313a57499ba99974113c970ed265a71ae8f09007664ca2a3232c476636dd75cfc27c9c
-EBUILD grpcio-tools-1.24.3.ebuild 750 BLAKE2B 4547a8a98b268186bd0b0c0f33dae4cab8fe8cb166a7b91fa1890337688f4993763387ec2347c8ea5dffe8e4047f2f0fd893265c634e83854f2de68bcf8e5049 SHA512 1030458099fc0f1a1c0de8433aa1350ea465e9060d8cf94b34f2043418313a57499ba99974113c970ed265a71ae8f09007664ca2a3232c476636dd75cfc27c9c
-EBUILD grpcio-tools-1.25.0.ebuild 750 BLAKE2B 4547a8a98b268186bd0b0c0f33dae4cab8fe8cb166a7b91fa1890337688f4993763387ec2347c8ea5dffe8e4047f2f0fd893265c634e83854f2de68bcf8e5049 SHA512 1030458099fc0f1a1c0de8433aa1350ea465e9060d8cf94b34f2043418313a57499ba99974113c970ed265a71ae8f09007664ca2a3232c476636dd75cfc27c9c
+DIST grpcio-tools-1.26.0.tar.gz 1990162 BLAKE2B 3f07f5d5be14851a3df276865b9a4d93222f0d4bb95610600ac56efa268e46225c2095d7112612296649bb48afb53a35b73febb3b379f05ea061e269c3546f03 SHA512 d1780a0103b531cc4416b4524c77bd96ab6aac3c081a8ba8c402c10909eb3945d9a3caf4ecc8f9f9c8ae216958405bb98fe1b1874af46407084ed3a65128e105
+EBUILD grpcio-tools-1.16.1.ebuild 674 BLAKE2B c92416cbbded800b3a426ee3eceaea27e99d82bee0e4224e6054e7df24cd6bf9393807f26eb74a1a6627d9a0c5c60b645f4224fceb48f1d9cd9fbdde46982686 SHA512 b892d2f2c9212d9caa2f04a2220d08babfdd01d9a7051eafa4cd57501afba4d047c6ed16ceacc3c96f99a5310c61d548f27a8e6408a7a050cd701d712717b941
+EBUILD grpcio-tools-1.17.1.ebuild 753 BLAKE2B 0b586314ae3aea59b721d1a85a87d32669bbeaad13f32b77539f764ebfa1ee53b8afcfb3c165ab5a46205358387f855379303b62f10a707bc01e9b07ae2c9e3e SHA512 e729f26b58856452a31c13929ca64cbf6da8b526482517d08ad14bf6a75396fb905216018f7f91c6c4b519f14a86582a207d907d478a759e89d21ad3c76f5855
+EBUILD grpcio-tools-1.18.0.ebuild 753 BLAKE2B 0b586314ae3aea59b721d1a85a87d32669bbeaad13f32b77539f764ebfa1ee53b8afcfb3c165ab5a46205358387f855379303b62f10a707bc01e9b07ae2c9e3e SHA512 e729f26b58856452a31c13929ca64cbf6da8b526482517d08ad14bf6a75396fb905216018f7f91c6c4b519f14a86582a207d907d478a759e89d21ad3c76f5855
+EBUILD grpcio-tools-1.19.0.ebuild 757 BLAKE2B b0e3df112d5084cecb91dd6abbe96a32dfa62edc21df0e9c3e83a83d8fa487a769418bc5de5b89ee7282788287b3cc0de04935aa64053aff30b490bbd3029057 SHA512 3c1f3041ba038d19e149bdc24f7f61f00af3b117b2bf21b8e88fb78a84ff738cb6d86fae8da1e3aff7a5932dbcdf99ef17775f057074cae11bb4ef606c61db93
+EBUILD grpcio-tools-1.20.1.ebuild 741 BLAKE2B 61959ffef1fc1d2aaffa5727048c5f3c27a5b3c966249f6a8c40fa6ed7d0fd97dc4764c477185d981b6823f29af8d0ae0bae17d510b71061d8fbe2edf2c111f4 SHA512 4cf1fa6a8e5a918a13cf4163819f65916f05b0efe3048a2a1dbd1c948c39ce523502874be2afdc42e26422ca237ea2f0f0a09a699953c5166335147430e11cda
+EBUILD grpcio-tools-1.21.1.ebuild 741 BLAKE2B 61959ffef1fc1d2aaffa5727048c5f3c27a5b3c966249f6a8c40fa6ed7d0fd97dc4764c477185d981b6823f29af8d0ae0bae17d510b71061d8fbe2edf2c111f4 SHA512 4cf1fa6a8e5a918a13cf4163819f65916f05b0efe3048a2a1dbd1c948c39ce523502874be2afdc42e26422ca237ea2f0f0a09a699953c5166335147430e11cda
+EBUILD grpcio-tools-1.22.1.ebuild 748 BLAKE2B 52cab7dc71c1e99f560f8c4c69125889bda51eb193009631f7d38613991eeaf593e2f89256d17c257d7a5063256f5af036121611397f535cba3e82ae16fdc7e5 SHA512 d8c41f2c638d1c69f96a74d19c936c98adf8d97e2191f0933db22366fa2a717c04f62a7a41a973755bdce52ef745873be61ae5c9b40f8a9e1cfdf4db04f8bb24
+EBUILD grpcio-tools-1.23.0.ebuild 748 BLAKE2B 52cab7dc71c1e99f560f8c4c69125889bda51eb193009631f7d38613991eeaf593e2f89256d17c257d7a5063256f5af036121611397f535cba3e82ae16fdc7e5 SHA512 d8c41f2c638d1c69f96a74d19c936c98adf8d97e2191f0933db22366fa2a717c04f62a7a41a973755bdce52ef745873be61ae5c9b40f8a9e1cfdf4db04f8bb24
+EBUILD grpcio-tools-1.24.3.ebuild 748 BLAKE2B 52cab7dc71c1e99f560f8c4c69125889bda51eb193009631f7d38613991eeaf593e2f89256d17c257d7a5063256f5af036121611397f535cba3e82ae16fdc7e5 SHA512 d8c41f2c638d1c69f96a74d19c936c98adf8d97e2191f0933db22366fa2a717c04f62a7a41a973755bdce52ef745873be61ae5c9b40f8a9e1cfdf4db04f8bb24
+EBUILD grpcio-tools-1.25.0.ebuild 748 BLAKE2B 52cab7dc71c1e99f560f8c4c69125889bda51eb193009631f7d38613991eeaf593e2f89256d17c257d7a5063256f5af036121611397f535cba3e82ae16fdc7e5 SHA512 d8c41f2c638d1c69f96a74d19c936c98adf8d97e2191f0933db22366fa2a717c04f62a7a41a973755bdce52ef745873be61ae5c9b40f8a9e1cfdf4db04f8bb24
+EBUILD grpcio-tools-1.26.0.ebuild 719 BLAKE2B ff6836309bb28f04991fba285ca56e252184216a6ac89f90d33e010c9359528c61e37c77070de17c9fea5ad74e8f65bb330a54558ff2e6f5e2c0460dd53486c7 SHA512 06dfaf049de150848a20a387a945cdad1481a2995c3027d4b4603b6717761b435d7b03004fa29c38eb97258d77ecf3cee7b545ba1f1313f41df52b56a72b42b2
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild
index 5ea474da86e3..c6794ff39729 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
index 55d28e451d57..f51fd367c529 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
index 55d28e451d57..f51fd367c529 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
index 54eb74fc6325..a70e95e02637 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
index c9f032bd7710..5dba4c0666ea 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
index c9f032bd7710..5dba4c0666ea 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild
index 36d23bc9bf4a..6ee574d98442 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild
index 36d23bc9bf4a..6ee574d98442 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild
index 36d23bc9bf4a..6ee574d98442 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.25.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.25.0.ebuild
index 36d23bc9bf4a..6ee574d98442 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.25.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.25.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.26.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.26.0.ebuild
new file mode 100644
index 000000000000..aabe7f2b43ce
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.26.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=( python2_7 python3_{6,7,8} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 59e49449d970..b5d8a039eedb 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -9,14 +9,16 @@ DIST grpcio-1.22.1.tar.gz 13923342 BLAKE2B 6d211b93a7597f568d106e0d6e3d30b90d7b4
 DIST grpcio-1.23.0.tar.gz 13977223 BLAKE2B b9f95aaf397eae9610280937980e4b2694af98e6cd5f80015dd83c67ec6bf9c41e76474f873627d6c6cc35fe9af3b45f14aabb6ea809b51cf5f0bb0f3b702794 SHA512 ff3cd9d2380a158ea7a49ba2c9cd5bd1ec98194aa48cf2d45596ab93f0e8a6d6ed0291e5dfc52bca79c62950e6a0ce387819d19f036c0dd1e6dc7b737c1ee97f
 DIST grpcio-1.24.3.tar.gz 14030592 BLAKE2B aa9e61c692937d7fc06d0fb601f7632a6ac5fb165aabec9e7993cf1fa41254b004fff89f650f390544e5fb1972dca542169ce0fdae79a71d775fe3cbb44a2d95 SHA512 0dc90de5a06b9af7fa91d3e96117f69813e5fee31499e8e48daac7d164856594f164a434d3dd28d6e0220e417926aadceabb9b7597e86a6bb87d8943e6661dce
 DIST grpcio-1.25.0.tar.gz 15358518 BLAKE2B 84ae22faa25dcd961c5cd0e6db68c48df4b64a529673d729436710e0fa08dd6119304dc7905f46ce4f92e6bccbbb05068d7fa04da4c579a1d59c4717623807bc SHA512 bb0241905bad15d6bd019323f1699b95f7cd047aec227197aed9f0bfbca923788fbf59052ab604718542ad69767877560853ef563613ea0490cee2e9f9e9206d
-EBUILD grpcio-1.16.1.ebuild 921 BLAKE2B b6299a97f90c14a8fd60c148cbe6449a8025b391c69a7f3a9fa1201e06317a687982c873437b270ddceaa5470d5077cc840cc931c65a6e7cb442ad7342f75c8d SHA512 70b3fd83bc2bbbbd2e1cfd93624a5f6a18e2a126165ec5d2d1d946e5f77a672ecf2a2ddcc3f21e29d14e0d3e65e97edb89f98034b0b81644adf516ff3ae48259
-EBUILD grpcio-1.17.1.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
-EBUILD grpcio-1.18.0.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
-EBUILD grpcio-1.19.0.ebuild 1097 BLAKE2B d9eec593595d99eecc5ca5e127f1ab24b015715bfd76b19013788c793aea428732daddcd6458889142a1ec542cc82bbdcf1f74d6b0f158faf4a4722efedf5d36 SHA512 353cad322f66ea4dd434f8c26b29220b5911a66e53228b6f87b34fbb6fa143e9f13dd78be15b9e1aa60b912837e73c7e0554a015c6c788cd8421b416962a9b7f
-EBUILD grpcio-1.20.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
-EBUILD grpcio-1.21.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
-EBUILD grpcio-1.22.1.ebuild 1160 BLAKE2B 0b6a41225f2177c211b218a9f21120369adca0f373384069ec08ab60c6c9e338121309ba6ec813b4fdc67a81da3f6242546f556491bc37ef67a67674b245b1e7 SHA512 8372b6fefaf920796dcdf1888f70ade08f15e823166ab197e77db2e09c9596597d6fc7f35404edef51e5c67360014d4467e6ddba32434c431fa93ae41c24e9e4
-EBUILD grpcio-1.23.0.ebuild 1160 BLAKE2B 0b6a41225f2177c211b218a9f21120369adca0f373384069ec08ab60c6c9e338121309ba6ec813b4fdc67a81da3f6242546f556491bc37ef67a67674b245b1e7 SHA512 8372b6fefaf920796dcdf1888f70ade08f15e823166ab197e77db2e09c9596597d6fc7f35404edef51e5c67360014d4467e6ddba32434c431fa93ae41c24e9e4
-EBUILD grpcio-1.24.3.ebuild 1097 BLAKE2B 2e1b29cd0aa175cb628e5287fd919f8b350c6f97c9f0bd2e39660784e592109fe6d450d1ecc9c3908798dc4924609d9a28a882b92aa8a38a681beafc80925570 SHA512 bd4edf772ac2693f09a1f12480de5d1d4ad993199f4cb6fe1737602763c1815211f49340c8ac053cbfb61c5d160b3175c103021849854985220ceeeaae74eee3
-EBUILD grpcio-1.25.0.ebuild 1097 BLAKE2B 2e1b29cd0aa175cb628e5287fd919f8b350c6f97c9f0bd2e39660784e592109fe6d450d1ecc9c3908798dc4924609d9a28a882b92aa8a38a681beafc80925570 SHA512 bd4edf772ac2693f09a1f12480de5d1d4ad993199f4cb6fe1737602763c1815211f49340c8ac053cbfb61c5d160b3175c103021849854985220ceeeaae74eee3
+DIST grpcio-1.26.0.tar.gz 15406206 BLAKE2B 4a9031e1d9e9285d1c1ee90396ae339a47715fa2c279f5bce517e3ea02bdc755e3044e3e402f73b3d797a6b1415f58396097a55ba16200c7f9d4569b0b159fe3 SHA512 df3b6787449c202f3e70640907c76231dbbeb6b411167300ba8a53c17f7d45ffa513a81046a4a66a368f2c17c2d57a48a07cb236f44a005e4073bd5d8aa3865c
+EBUILD grpcio-1.16.1.ebuild 917 BLAKE2B e49bd79bee74d9ab000268a8141e281f6c424e07950d986ac1840dc1fee14a12cbc607e0706faccd5effa15878b2d046dc0050265486d2497d399f7b513a02e1 SHA512 9ee995095da345d92874acb40dd7b64b68e508013296d25d3c8bde98bffbb4e9e59273762974ae7b293192f94bff3f7350f407b8adaadcf85d6a7be068e3175b
+EBUILD grpcio-1.17.1.ebuild 1045 BLAKE2B b7988458aa5d2e7ea98f2df305da1a5ccecd7a409b7ec9a167b9712a14311d7a6a996e9ce3faf168df21f95f8ed00b69711141cc42e5ab8c010c65fa5cd8d9cc SHA512 f17c047b9327e242cc571a01a419e0d18e4149be98d4f33c82269b4afcbcf13c51c2d9ea3f505a864a21a48206fdb0c863d8225cf8be67c3b8ae6b18642c520c
+EBUILD grpcio-1.18.0.ebuild 1045 BLAKE2B b7988458aa5d2e7ea98f2df305da1a5ccecd7a409b7ec9a167b9712a14311d7a6a996e9ce3faf168df21f95f8ed00b69711141cc42e5ab8c010c65fa5cd8d9cc SHA512 f17c047b9327e242cc571a01a419e0d18e4149be98d4f33c82269b4afcbcf13c51c2d9ea3f505a864a21a48206fdb0c863d8225cf8be67c3b8ae6b18642c520c
+EBUILD grpcio-1.19.0.ebuild 1095 BLAKE2B 6a18ffd2597ce22aab59f8a3ffbe05b5861767d14561dde953218980ba365e6c0245ce2c45a67f8324e962b0526d6b31473f066c457f2c3dda1cb21d47a6a90e SHA512 8e2601f847cdb7785b2d5a9accc058a876fa9834174b98e92d7ba36455987a71943baec6c35fd74b00af43d07dff63c570d535c22e69a4c544e44e7469c030b9
+EBUILD grpcio-1.20.1.ebuild 1088 BLAKE2B a1f943f6d5dec36bb1239e259624fd0335a7ee488294f2f666b5319d38342f4ab2e9e53a3a489e7bb334f7d6fd2df2abde115ad7dcca270946253884842a4971 SHA512 730e3bb58cba42dd629fdbdbfbf0c52eecbfd06496c3363adbfd6805032bd6241b6d1187977eba519efec55baf3597b90d4c5a4e98da56d965ace952cfa6bbf6
+EBUILD grpcio-1.21.1.ebuild 1088 BLAKE2B a1f943f6d5dec36bb1239e259624fd0335a7ee488294f2f666b5319d38342f4ab2e9e53a3a489e7bb334f7d6fd2df2abde115ad7dcca270946253884842a4971 SHA512 730e3bb58cba42dd629fdbdbfbf0c52eecbfd06496c3363adbfd6805032bd6241b6d1187977eba519efec55baf3597b90d4c5a4e98da56d965ace952cfa6bbf6
+EBUILD grpcio-1.22.1.ebuild 1158 BLAKE2B a4c697bb7ce0f65904fdb3d2171aa8f2989939203a1c8893f31a67f3670899998d08bf24bcd7f9f1761fe8506b5f3d175ddd3f4870940189b65a62ccb7ec1de4 SHA512 ae2469b3a517c4e58862f947c21025696daa5d69e0eb7962dcfdff38ca06f0a9ac1e152afef9b59ad2eb89dfe2a0f43dd9cc1211949e9d732b68a3057e8824e5
+EBUILD grpcio-1.23.0.ebuild 1158 BLAKE2B a4c697bb7ce0f65904fdb3d2171aa8f2989939203a1c8893f31a67f3670899998d08bf24bcd7f9f1761fe8506b5f3d175ddd3f4870940189b65a62ccb7ec1de4 SHA512 ae2469b3a517c4e58862f947c21025696daa5d69e0eb7962dcfdff38ca06f0a9ac1e152afef9b59ad2eb89dfe2a0f43dd9cc1211949e9d732b68a3057e8824e5
+EBUILD grpcio-1.24.3.ebuild 1095 BLAKE2B 7b257ac71d358dbca74dc997715d3e944e55fd5318a668c1b560ea76a1d71a8cad59b8d63a5244b52363a531b1136a06731a72029f5838b8adbbec57cc79e27e SHA512 7c0ccaa5f955e8a08cedb844f687eee2044fefaa08bf6cfd0a1f1e167d4c601d9f37d1063cacad9d26b61c790d4182a7216333711d0a4729807303aa531efe7c
+EBUILD grpcio-1.25.0.ebuild 1095 BLAKE2B 7b257ac71d358dbca74dc997715d3e944e55fd5318a668c1b560ea76a1d71a8cad59b8d63a5244b52363a531b1136a06731a72029f5838b8adbbec57cc79e27e SHA512 7c0ccaa5f955e8a08cedb844f687eee2044fefaa08bf6cfd0a1f1e167d4c601d9f37d1063cacad9d26b61c790d4182a7216333711d0a4729807303aa531efe7c
+EBUILD grpcio-1.26.0.ebuild 1097 BLAKE2B 5d5772adf8a85e68149016c0495fcc3962bc7d3844a8927d536952a528004054a2c76ba4d9b993bbff18bfb4a108451f6b52a231ae7394b554709899b6d8765b SHA512 262c129fff62903a8c327429e61737cb4772c4d58db42f1c9e0132da22d9cf7044761e1c95059d37185bd74a8202fe4b132690bbe89cf8836de0cd25f85b7f82
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.16.1.ebuild b/dev-python/grpcio/grpcio-1.16.1.ebuild
index 230c55bc915a..e8077ccb0f3b 100644
--- a/dev-python/grpcio/grpcio-1.16.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.16.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.17.1.ebuild b/dev-python/grpcio/grpcio-1.17.1.ebuild
index 77cc606e199b..6466855a8e69 100644
--- a/dev-python/grpcio/grpcio-1.17.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.17.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.18.0.ebuild b/dev-python/grpcio/grpcio-1.18.0.ebuild
index 77cc606e199b..6466855a8e69 100644
--- a/dev-python/grpcio/grpcio-1.18.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.18.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.19.0.ebuild b/dev-python/grpcio/grpcio-1.19.0.ebuild
index 8ab781b2bb66..2cbafa2f243c 100644
--- a/dev-python/grpcio/grpcio-1.19.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.19.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.20.1.ebuild b/dev-python/grpcio/grpcio-1.20.1.ebuild
index 095bde11b67c..292b0e89dc77 100644
--- a/dev-python/grpcio/grpcio-1.20.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.20.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.21.1.ebuild b/dev-python/grpcio/grpcio-1.21.1.ebuild
index 095bde11b67c..292b0e89dc77 100644
--- a/dev-python/grpcio/grpcio-1.21.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.21.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.22.1.ebuild b/dev-python/grpcio/grpcio-1.22.1.ebuild
index cdd2bdd1ec3e..ca59b7bff1fd 100644
--- a/dev-python/grpcio/grpcio-1.22.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.22.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.23.0.ebuild b/dev-python/grpcio/grpcio-1.23.0.ebuild
index cdd2bdd1ec3e..ca59b7bff1fd 100644
--- a/dev-python/grpcio/grpcio-1.23.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.23.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.24.3.ebuild b/dev-python/grpcio/grpcio-1.24.3.ebuild
index bcf535535b98..4fdd980f433c 100644
--- a/dev-python/grpcio/grpcio-1.24.3.ebuild
+++ b/dev-python/grpcio/grpcio-1.24.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.25.0.ebuild b/dev-python/grpcio/grpcio-1.25.0.ebuild
index bcf535535b98..4fdd980f433c 100644
--- a/dev-python/grpcio/grpcio-1.25.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.25.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.26.0.ebuild b/dev-python/grpcio/grpcio-1.26.0.ebuild
new file mode 100644
index 000000000000..17a9aec6e892
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.26.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=( python2_7 python3_{6,7,8} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	!<net-libs/grpc-1.16.0[python]
+	sys-libs/zlib:=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index 949ebec98e5b..caa91da9cee2 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,3 +1,3 @@
 DIST gsd-v1.5.3.tar.gz 240114 BLAKE2B 076d888f03350fba2388c907787354e878a1536c7d85c759eb3513102ee2abffe2c9313a6e9e208726d66d6324dac02ae70d8872342f9bcb162ad13d9a23dbc3 SHA512 893db74dc481da47d6c51ea0d0d9faefbe164edfaeb5a2ed73e25acbd9dc42c3cf28cbc0d9257c6bf0cc0e9911ab85cfa72997886350c0e7c125d30636ec432a
-EBUILD gsd-1.5.3-r1.ebuild 548 BLAKE2B 91ccaf113d6267a7120645aa0160051abf8002d358e79becce1ccb992543e17d6b055f46645688b48e3a798d63984eb1b149eda632dfbf723084c35aeea3e9d9 SHA512 6541bd51207bcd3533180998931f910d9ad23a52f74aae27e86b48dd789fa66bb96bb3257deb49fca5468b0c9a1294ab382a07f7b74ee2b6e95bca45a1c2560a
+EBUILD gsd-1.5.3-r1.ebuild 546 BLAKE2B 8de097667b0de5ddc51ffc4c01e0da9df32027509ba285d37d582b5fd15eeddc97f04075bb96dc32a4af0378647fd197af0ac282e2c58e8235050db561de08e6 SHA512 d460b57f6c7c578d27b1205ac62e43bcf2a880b0092ad38e555e94e75abd75a66401652c1d5f444b521f08b080f14a8bea9eee52c9b6f8651c73256031458ad0
 MISC metadata.xml 349 BLAKE2B 92fd987b0f0f73a6f07f9a3002cdca45698f61d9129cebdf2f1756bbe4ac926494bfcae209d18f6283665a95090be82ac6b34c0189da6372368833b62b67b626 SHA512 851f80555da7cbd3b2c2e696eecfe8f2cf19b61359c71d67c917c44a18f55c13aa5047afcf95afe0468ddb84b741cb183244889cd44e80810a0a82756fc033a4
diff --git a/dev-python/gsd/gsd-1.5.3-r1.ebuild b/dev-python/gsd/gsd-1.5.3-r1.ebuild
index caac808feb22..eb2e214fb735 100644
--- a/dev-python/gsd/gsd-1.5.3-r1.ebuild
+++ b/dev-python/gsd/gsd-1.5.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="GSD - file format specification and a library to read and write it"
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 288dcb31cc6a..d31db2ee2c96 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,3 +1,3 @@
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
-EBUILD gst-python-1.14.1-r1.ebuild 1749 BLAKE2B 270176cd40f5c6c8c9d8d9251d057edf2b213afa5f84836130911007ca09f21aa6da6cc50ceaf63abe2e379493f002212ccac82730ac0cffe0d2c165ae6aa2d5 SHA512 58baa5d5a7c0c36352c43cd1ca8afe0f4dc64427430f60d11b7c2a2d4fc21b29e64d5d9128a82fdfcf3022027fffbb2c7b1d42cdbd608fedea431802b43df398
+EBUILD gst-python-1.14.1-r1.ebuild 1745 BLAKE2B 56b2a52e1ae418b7c823c0b4e451a112dfce52bfe07ead6ac77139dcb3b59407ea635d7730a74c7ddbe29513e461addb1084aaadb9d30f6c839d5787e52b90d3 SHA512 695217b951b41f866f0fb1d0d34e2c66b18479819e0cb24b4382a24982a58089e0b26a335cb409e76be8cc9a6898694245471de2f87f97e4c2095b28cb022e85
 MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
diff --git a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
index e3f7b6251a8d..19e446a45e64 100644
--- a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
+++ b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit ltprune python-r1 xdg-utils
 
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index e640ad3cf46a..8d82d1ce2a3d 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,4 +1,4 @@
 DIST guessit-3.0.0.tar.gz 133379 BLAKE2B c9d7c2def91dc301944b951bfa32810b9efd2348fa9a016015dd75c03b407bf3e17cc5cb93baa1d4cc5b6fcb76790972f2bf7c14af2c0cad419f6a98bdda3d6c SHA512 87f19dc1c6b4f46fa1f2682f7c3bab91cf094df06904b8d9771159f346612b9d0adef4aef55315dd00d07787319d17008e936b125941abba5b869df6a91cb1c6
-EBUILD guessit-3.0.0.ebuild 1232 BLAKE2B ea27c92e4e135214ac71adcaed7ef71ed83248b508d9c62959c8bb9c526e2c8af54b05b51de99227d753b670b3eddd0e343f77e4a2ff38323a76cd4c3067564c SHA512 166671df666106e5f2ee667f0e7447b4ba4e525d8688e7920e9d5a7567374968794162bf1054834c84821ab0359ba36cfb014778f9dd07bb959cfaab8c5a6795
-EBUILD guessit-9999.ebuild 1258 BLAKE2B bc2e4c93ba25052e46bbeea9ac2adc4df29309bc84d7b2b3d8a05de528497d1d3bc558a3ecca978383452676f70f409f9394e1544b68171e47d0c42b1583c88f SHA512 386e10eaea3a604cd48486613a13cde90613ff9c4c01412eeef4be1cf73c82c1c766d3de885da519bfef9f707823ba841534a489d9a52534fefeeff1ca4c3157
+EBUILD guessit-3.0.0.ebuild 1228 BLAKE2B e78b2d04addf2ca0db959a99129f3671764938cdcc3187ea18949cfb267eaea3c69db280f54d3fd239d47d226d3d370cd98b419e8363095d171f63804dafb84f SHA512 8a6681d1bde4e686ac66c3b42299fe0aa35a69cf75cc8e8f70d5287f49e83d8890236e8022d7ad9bf95dc5dd3a9c42cb5b67ce75e4959a5a712e793dcd603ef0
+EBUILD guessit-9999.ebuild 1254 BLAKE2B 8bef5a097059e539f7931ff747f84b041a5cc07057aa52cc158520892e14f2364cd5f638bc45f9aa465b3d4ba295f689461b8821a1766d3b5dee6a1e60a0ab8b SHA512 f7a27c4264c49a61b3d127bccd57a8f19199b5bde5dc9fb06a160737b35640eb480ca213af00f375923c71e6ce54fc503bb2fcde957074f84bec11aa2ff5c5e3
 MISC metadata.xml 295 BLAKE2B 446d2e040963e8316736bb91746ebaeac79cce3bf604cfeebb022dfa74fecdcca9649b824f15231a721267a0f7e6c37f373cbe9324d89a5697fea21f18761b2a SHA512 7990fc5949ac120c94d34714036f6b272bc4341c65f14f7a21cdbdcbbae210af60b3afe0a8bc56078410ff3e5b37c641f77a0a727794b90e35da91f80c9db2e9
diff --git a/dev-python/guessit/guessit-3.0.0.ebuild b/dev-python/guessit/guessit-3.0.0.ebuild
index 489270bf7e0d..5d72beeaa2f7 100644
--- a/dev-python/guessit/guessit-3.0.0.ebuild
+++ b/dev-python/guessit/guessit-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/guessit/guessit-9999.ebuild b/dev-python/guessit/guessit-9999.ebuild
index f89e9b071ec8..f574cfa5d6d4 100644
--- a/dev-python/guessit/guessit-9999.ebuild
+++ b/dev-python/guessit/guessit-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/guppy/Manifest b/dev-python/guppy/Manifest
deleted file mode 100644
index f8aeb4e69529..000000000000
--- a/dev-python/guppy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX guppy-0.1.9-rm_BrokenTests.patch 1643 BLAKE2B 4f40742c9cbb8238cebe96838bc8d37f5f378803d25222c1b2695e0897e0f7d03e1305610e4356448070aa8e5dbf1dfce3c91939406977d0904c7436417c40a4 SHA512 ad6f5b126c84062a5d29a45f23fdf5d91c63a305bb26d7ef1ac1e5034505c79498c7da393b17a04118762261c0cd74f4360e18b49cf292805896dd1f9294097d
-DIST guppy-0.1.10.tar.gz 484906 BLAKE2B 6408396cdc03b8f7106a5f34d8e3792760989108fdba9b58084028eabfca8db80363d315a451cbeaf56dd962d67ef46854feb8d95ddb8b5cbbfa701bfd44eaf3 SHA512 ea48fd19d7fe9a24832364599b8843304e95ccd1ccf3a9a475456ba25af2a4be94991dcb61deb854b740c2358d280579e756177236b3c73cb0de100bdf0286ce
-EBUILD guppy-0.1.10-r1.ebuild 1276 BLAKE2B 2634520d7f4a5cb9f2212eb9357054456fade788650dfd42266f2075649d94476e5de005423cfddfb96f99188bcf329e5eed99e75ebe9e954c7fdc363c4f185c SHA512 9e6f6d2ae52f0d03cfb54865584de3541373a3e76cd59a74b28c92bd6572375252fb59e12b994a761c54ae8a9241d0db00d9839f87f66d7adaad2c871310f506
-MISC metadata.xml 691 BLAKE2B c29bab3bd28127fe80120ce3eb878f9ccdc3ba4028263989e9a15d4394d2e7ca74985e05a8b748bc0e03af8ec9740cd8a0b7a5dec967eb7407437daeaa607a14 SHA512 df184d2e1d689a4017ce29f754d7cf85ebf3adc05e7b441790c1e7dfefcd42ddf247bb754298e2302bb6d34dedbb53bafb0d7542d600a4377d71870a0d002ab0
diff --git a/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch b/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch
deleted file mode 100644
index fabbe4cda512..000000000000
--- a/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ur guppy-0.1.9.orig/guppy/sets/test.py guppy-0.1.9/guppy/sets/test.py
---- guppy/sets/test.py	2009-06-23 21:48:32.000000000 +0800
-+++ guppy/sets/test.py	2012-11-07 16:59:38.383392670 +0800
-@@ -4,6 +4,11 @@
- # so wouldn't check so much with python -O.
-
- import gc, random, sys
-+if sys.version_info[:2] == (2, 7):
-+    import unittest
-+else:
-+    import unittest2 as unittest
-+
- try:
-     import numpy.random
- except ImportError:
-@@ -211,6 +211,7 @@
- 
- '.nython off'
- 
-+@unittest.skip("Class broken")
- class Test:
-     faster = 1	# Set to 1 if test should be faster (less exhaustive) than normally
- 
-diff -ur guppy-0.1.9.orig/guppy/heapy/test/test_View.py guppy-0.1.9/guppy/heapy/test/test_View.py
---- guppy/heapy/test/test_View.py	2009-06-12 18:20:53.000000000 +0800
-+++ guppy/heapy/test/test_View.py	2012-11-07 17:23:52.289280501 +0800
-@@ -1,4 +1,11 @@
- from guppy.heapy.test import support
-+import sys
-+
-+if sys.version_info[:2] == (2, 7):
-+    import unittest
-+else:
-+    import unittest2 as unittest
-+
- class TestCase(support.TestCase):
-     def setUp(self):
-        support.TestCase.setUp(self)
-@@ -55,6 +55,7 @@
- 	p = iso(z).referents.indisize
- 	self.aseq(p, iso(y).indisize)
- 
-+    @unittest.skip("broken test")
-     def test_horizon(self):
- 	iso = self.iso
- 	h = self.View.horizon()
-diff -ur guppy-0.1.9.orig/guppy/heapy/test/test_all.py guppy-0.1.9/guppy/heapy/test/test_all.py
---- guppy/heapy/test/test_all.py	2009-06-18 21:44:11.000000000 +0800
-+++ guppy/heapy/test/test_all.py	2012-11-07 17:34:04.036233306 +0800
-@@ -1,7 +1,6 @@
- import sys
- 
- autotests = (
--        'dependencies',
-         'Classifiers',
- 	'heapyc',
- 	'ER',
diff --git a/dev-python/guppy/guppy-0.1.10-r1.ebuild b/dev-python/guppy/guppy-0.1.10-r1.ebuild
deleted file mode 100644
index f4cbb03c3eeb..000000000000
--- a/dev-python/guppy/guppy-0.1.10-r1.ebuild
+++ /dev/null
@@ -1,48 +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="Guppy-PE -- A Python Programming Environment"
-HOMEPAGE="http://guppy-pe.sourceforge.net/ https://pypi.org/project/guppy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.9-rm_BrokenTests.patch )
-
-python_prepare_all() {
-	sed -e 's:_PyLong_AsScaledDouble:_PyLong_Frexp:' -i src/sets/bitset.c || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	"${PYTHON}" setup.py build install --home="${T}/test-${EPYTHON}" \
-		|| die "Installation of tests failed"
-	pushd "${T}/test-${EPYTHON}/lib/python" > /dev/null
-	"${PYTHON}" guppy/heapy/test/test_all.py || die "tests failed"
-	popd > /dev/null
-}
-
-python_install_all() {
-	# leave the html docs for install as the setup.py dictates but rm if set by IUSE doc
-	if use doc; then
-		local HTML_DOCS=( guppy/doc/. )
-		find "${D}$(python_get_sitedir)" -name doc | xargs rm -rf
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/guppy/metadata.xml b/dev-python/guppy/metadata.xml
deleted file mode 100644
index 041d6c710310..000000000000
--- a/dev-python/guppy/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 type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">Guppy-PE is a programming environment providing object and heap memory
-		sizing, profiling and analysis. It includes a prototypical
-		specification language that can be used to formally specify aspects of
-		Python programs and generate tests and documentation from a common
-		source.</longdescription>
-	<upstream>
-		<remote-id type="pypi">guppy</remote-id>
-		<remote-id type="sourceforge">guppy-pe</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/guzzle_sphinx_theme/Manifest b/dev-python/guzzle_sphinx_theme/Manifest
index 256a62129ba0..a87679fda1ca 100644
--- a/dev-python/guzzle_sphinx_theme/Manifest
+++ b/dev-python/guzzle_sphinx_theme/Manifest
@@ -1,6 +1,6 @@
 DIST guzzle_sphinx_theme-0.7.10.tar.gz 225764 BLAKE2B 37abd8b864b3c976498848f339f4761f22d8acfa7d8702e0948e61739bf6805331822c066529f6eb21d55484ddb7f16fd82dae740b1d152e398a74b222374213 SHA512 a21867e93ffc80e91b85a0fc33cedb21ba9e1d2912b6d5d6226e5ec93550564a1a9321eae09aaaddb61f36ce051017c33b750c52d609cd604a5cc4bf8ce5248f
 DIST guzzle_sphinx_theme-0.7.11.tar.gz 2548612 BLAKE2B 797e44806ddf3e5f8dbd131db61e3fda33c5936b69a8672b73ed518557a62fbf35f968237ba508cbf1e447aa558a6cdf06e65d86ea52bb587b7c87a446047f20 SHA512 9aecdd4cf8ae286c9dd59a453790d957e96a57a9c9acd3aa38ff8fe64969cde4619c4154cd7304dd1c5bd0ea58fe71f556701b7a9b12f58fe3f5c1bdd2681da5
-EBUILD guzzle_sphinx_theme-0.7.10.ebuild 476 BLAKE2B 1e3b9ee5bdc01f5eb148b219986d45cd9f61fda24a4eb02ebe6e362d1792fbf86841b0738b6fb1694b36c3a875824040450b82f7d436ab08d22fe2566f23f80f SHA512 f9bcf124d608fa1dcb641679082ece7d2b016cc871f91658fd458f0a55fe19bc342956161c1672941e2ca65375ec638c0e0ddb4a92d78eb55cfe8acbfafa78c8
-EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 514 BLAKE2B ac9594412b6cb6918a88f212492a5dca6d35567bc695819f4422a5e28646c39a79b068bef40caed0ca88287c0a7bf1faa6cf171a246f2b58f1a21da3c5f3083e SHA512 f37e0e93b03af10d3145e65b9390b04182a87192ff84056750732884ed397079b6ad7c8f684aa32d4cdcf55e87c87df297b0e3211984ed1232e152d3df1c10f5
-EBUILD guzzle_sphinx_theme-0.7.11.ebuild 510 BLAKE2B cc7dcd5266773a3c58f89f42163e83d7f623dfae274ba320682e841954eb6f32975bb75c6323acc0c8584d67ff783f218646491ce8123c12dc388c25145f4d5a SHA512 aa17784e15aa358c9bd87054260355afe299f90dd44e84c9ee29e3a186d3e0c228b23326c3b3dcfa272060ed819ed243aa8ab61f7e242e467d6c07e9b8de0482
+EBUILD guzzle_sphinx_theme-0.7.10.ebuild 472 BLAKE2B 2899ba5252584e1f805b9b509507bb3edb6b26dab24de7f4d6e6324cd655f1271b63ebda741286f76f28305aec10daa69546433a751c21ebb3f11621c3ed43e9 SHA512 07dbebf23f17063a4336aef05bd95578d2d8e43b5573a9a187b570a3fbbdcb1834565425140e5f9b5080be27bad40333aa1f9adbd3c568812688d67ed3ebd526
+EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 510 BLAKE2B 8d4c8f0423e4435a257873d4910d9e20fb5d16842a18ee30e97ed630eaea1932d0eb836cc84cdad5036636e40e29bba708bd0abb9f5659889e4dfb9c0c7744c3 SHA512 07ce58ff8ea4f325195dab203488f4db09208e1a1bae6826cb7355ee2adb04705cc9b4c59b0a9b50d018fcea57cc42d966039d847e0c6c48c43a7a59d089098b
+EBUILD guzzle_sphinx_theme-0.7.11.ebuild 506 BLAKE2B 941e353b7f93bbd2795de44309e0c9b2510fe2ce0b3708564f72f204ee1dce06117a7345edde3460cdf174ad9a4d854dcec7aae66f710dfddac0807599208683 SHA512 3e4d04d11770b830817a38ee29a12623abb1b877ff6838ce958d2dc5b2c7a9e714fb62db78e46b7cf76b4780619531ffec19bb4b47fa88edf5c4f5adf9b671e2
 MISC metadata.xml 423 BLAKE2B af845fa73d257d2ead2fd41a6ffd50b1e0c29140c3484c7199ff041b9025e9e297a1cc849e136733e3271187fb44c09a36d9fb705fceb82b6771bc29deaef52f SHA512 fb05cc6b19cdf522010d886649146cb02ac259c53e54111dcbb0eb16109d8bd1832b80e2e763d57fa425b05cf232a8b36710c9cc0cc20e38bfa548bb51abaa3b
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild
index 2c70342e4398..a9e66eda0e54 100644
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
index 4297c204cc85..97f8deb8fb0f 100644
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild
index 143c3663d2e8..b7e91a44a20a 100644
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gwcs/Manifest b/dev-python/gwcs/Manifest
deleted file mode 100644
index d3d58ac15c24..000000000000
--- a/dev-python/gwcs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gwcs-0.7.tar.gz 276681 BLAKE2B 23985cb7adae038c08edd42bcc5b589f4534aea070a49d8e8e0d70b06424564dad333945dc852c4fa4025d242bb5293ed4dca030784de7d3579d78f2c6f56cac SHA512 fe7b11c748f76175ea7a3d0a584ac61d783ef06db849c7dc77f220e40e8e9f44a5090f3f2de50a51d0df66e04f7aec32aac14fd406d4d41d32d70c53f04a9961
-EBUILD gwcs-0.7.ebuild 1325 BLAKE2B 11cb462f44dd0dafc6d34778137fc4d52c657a93d5817572a8074e373b674d5b19bf9179d4d3af0a1e813e688c315daedd2e5e0f333a8f4bc6a4f4266746c6d8 SHA512 088664b19429dbf2c3ab01209807b9d359c9fcbff0ef6072e2bcd9820f3817cfaae37a11216c8b30fa7e077138986429a5f83e7aa70936b19c744e46bde3f5d0
-MISC metadata.xml 801 BLAKE2B 0d0ea1c1a90acfb7b12826a5e670429314012319c83faaf791824d71858a8daaa87add995fa0f5e175d4374b843494759784bae5f69a5093c7f1539a0873b8cb SHA512 9a20c6faf196c7076f94c28ff3dbb1c63ba144b799b6d4c35051afb39d3cf90247bfe38fcb5ec4a53f210d629f5d86c38282eeac3cb24913d1cab0fa58e2c273
diff --git a/dev-python/gwcs/gwcs-0.7.ebuild b/dev-python/gwcs/gwcs-0.7.ebuild
deleted file mode 100644
index 48adb12da4ec..000000000000
--- a/dev-python/gwcs/gwcs-0.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python  for managing the World Coordinate System"
-HOMEPAGE="http://gwcs.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/asdf[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 )"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${PN}-${PV/_}"
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		PYTHONPATH="${BUILD_DIR}"/lib \
-				  esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gwcs/metadata.xml b/dev-python/gwcs/metadata.xml
deleted file mode 100644
index 033a8d077fdc..000000000000
--- a/dev-python/gwcs/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="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    GWCS takes a general approach to the astronomy World Coodinate
-    System. It supports a data model which includes the entire
-    transformation pipeline from input coordinates (detector by
-    default) to world coordinates. The goal is to provide a flexible
-    toolkit which is easily extendible by adding new transforms and
-    frames.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">gwcs</remote-id>
-    <remote-id type="github">spacetelescope/gwcs</remote-id>    
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index cce1edd56ed3..72c400c04993 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,5 +1,5 @@
 DIST h11-0.7.0.zip 105979 BLAKE2B 46922a67a8496254845562e46432596cbc400e788adddc5df1b84583d16a090fbc1ac6a4dab1af9d05263abb33d2505627be1325ca9c3f6dd27dd3676ca99027 SHA512 abf9b8f7f12870804539049c3bfebbbe476e394636aed9967aa725d501fff983f28c7f14b4b882c17914d00fe3e74417ff8922128d0e4e07bf042a7db6d0b100
 DIST h11-0.8.1.tar.gz 94009 BLAKE2B 34c43874ba8d1e59f89d9d71a5eb8033583aefc6659f6cf645067267a68769f01864b997623ad175e263d4918e2e572e2af49f4ddf743608fc259ab7b4a51022 SHA512 3310dcd8552de4440ed9669fd37b3fc4d76073a9801decb705bceee3c1e98ff83470bd124ecf36e1ec3457ff2fb4da6f4fbf077daa810c28ab73044dfab709d4
-EBUILD h11-0.7.0.ebuild 629 BLAKE2B 2c4ef83e269ed9598687d0a48f4375ffd6443ee340b0ec06e9535be7d88edc9960ff4d46ab692b0461a84b9ef77abf1a0b0be3f1b4b340a2beada04e65bce7d3 SHA512 fb69d7c8f6a6b5fb48398c951635fb25491ec46a3b9cb49e610581c80f15dc1b935cfae6b2dfccc49c5c05bad63fc657b6707156d7c10eaaa1504a12cb4cf243
-EBUILD h11-0.8.1.ebuild 632 BLAKE2B c55f0c5123df1c5ad2b26b737a91210072e8af107ecfdc8521fcd7c846a57948f81c983f3ad1329e9099f7507200fea609c0a5dc5571b17850990faebe2942c6 SHA512 8ec31fe3b6afcb9c04d767714114367dfc8b635f59b1b6793573bd4aa81d77aa27dc6f6b36b36c80048b4c788642077618d568ebc018565f1b347e562daa375c
+EBUILD h11-0.7.0.ebuild 627 BLAKE2B b2b95412719a89e06159255fe74076acb079471a7bc7a53692b249645c2fec9e4295ebf21d57e20e0afc2c5ed3f0c1e490fb7767c1b3a062ab18814b58c3f66b SHA512 5a3fddee7083749ae927fddc32ae36a7e85c7c725a6587250140df3d95e847ad65d6da263d4f29c1b7c95f61750cb3ef5f92bd66a599c22f26667530ff0711ea
+EBUILD h11-0.8.1.ebuild 630 BLAKE2B bab00211956a727c4932bd3705902b31df559c965d16d671d412123a94b0a7eac73615db2552b260ed8f10342575b8adcfa900d44a536712620187a6e019085f SHA512 29c02a81347fc3fe740cb1feac4edbf05e2ebcd06896236ceed5cba2d35b78c39953f41b6c95758cf02fd7b82c34e68ad04fe9b542cfa103ed9105c9e1e5a98f
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/h11/h11-0.7.0.ebuild b/dev-python/h11/h11-0.7.0.ebuild
index 86df9481fae2..a1756f43f79c 100644
--- a/dev-python/h11/h11-0.7.0.ebuild
+++ b/dev-python/h11/h11-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/h11/h11-0.8.1.ebuild b/dev-python/h11/h11-0.8.1.ebuild
index 6d5225fead81..a53ffeb33faf 100644
--- a/dev-python/h11/h11-0.8.1.ebuild
+++ b/dev-python/h11/h11-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 89e582108580..2488b2f0ff11 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,7 +1,7 @@
 DIST h5py-2.7.0.tar.gz 256471 BLAKE2B c232eb86d00b9d1bb76903ea04bfd384bae7c9eb7b301de6aa450a46918f69132ab8d8d5a3f9b54095feee436a8aa9e9045c27ca1a120d665d6031c14218f0f5 SHA512 7c1e5d8b47c176521f5f62cfc4f782c09a0e003c5cbc07a673ccc3dfbe97df930b33801ef7311360892e3fad1d7d72561a8578aed9cb630d44e1a73543bb5da4
 DIST h5py-2.7.1.tar.gz 264225 BLAKE2B ffb0b52127f6cb9634b5ac3266a36bc0003144d302bdc300fff5f6f33e52b5a12e954cc2ef9fdfe9dfa0eddc810b30ee3f556cab2a31338500db666b87e64ddc SHA512 b702e3875c2767d2fabe66601820c517671fb5fc3321334aba081950b625435a1262554f39187cd1b41c6069e2b3826db6f0b610bfed2abe5db8a4dd8a29ecfd
 DIST h5py-2.9.0.tar.gz 287853 BLAKE2B f1e5c985ec1431dca2b14490711ec7f125620e67ee6cecb56306d19cc8fd1d1c33d313f6477e98c4dbb780cc50c3a4ca073cfe69e079187f8f52a301aab60467 SHA512 73b1f59e3e2b3eceebf7b97e49bd8f5199afafd7ef29917af05ff8415c2f2129a5c59db9658944370c9bcf8fc04ab26948ee27fc6fd948a22d19cace1ce8c853
-EBUILD h5py-2.7.0.ebuild 1405 BLAKE2B 51a4511f12b870cafb34f48e3d837c17360055c7d5a7819da66dce498a47ef4b07a77b8a2dddffabbb4f23e8948c92936a233dc1721c2247783d08f17d1c0db1 SHA512 41f365f92175b4eb4fc8e10d6628175ac86f0906e9ae0c528ab5ea43524b76b2fbae7ba7ac78faa7d14e870b50dbb0b41b959c4393715de075f553ae66c127bf
-EBUILD h5py-2.7.1.ebuild 1407 BLAKE2B bdbdf47ca21de9ee396395c65a84e20f48fc4dede339779a9884ec5a27c6bba0c6f2fcd48f5b9f4fd1b679f924f940667e466173214d5fc1d464b0eaf91fd65b SHA512 105739fb71bf127883d078ed24a122e590f5ec0fbcd54a12c1d0c6a6bec6fa40b063fed4214ad3a87ee00fd036377128af60fdad14eb3a2bc07e31bf489e39ce
-EBUILD h5py-2.9.0.ebuild 1407 BLAKE2B bdbdf47ca21de9ee396395c65a84e20f48fc4dede339779a9884ec5a27c6bba0c6f2fcd48f5b9f4fd1b679f924f940667e466173214d5fc1d464b0eaf91fd65b SHA512 105739fb71bf127883d078ed24a122e590f5ec0fbcd54a12c1d0c6a6bec6fa40b063fed4214ad3a87ee00fd036377128af60fdad14eb3a2bc07e31bf489e39ce
+EBUILD h5py-2.7.0.ebuild 1401 BLAKE2B e64c58b3c7abfe3c18944a15dd2eff74913b855065ba24212d4250a1323237fb6353a5ce3b52ac892eab55c5bc547cb59539e1328baff4e8445a5597747bff67 SHA512 8f2af16f0265f2b707a12b77a1511c38b5e147e2fe4126fb65f21cbe02c21c376b080722bb30657e44895533d69a5b09a1d6f07d79b89e1d876f5fd9282bf2dd
+EBUILD h5py-2.7.1.ebuild 1403 BLAKE2B 1818e5fd2e43c69b8ff73c882ec0d92b53d7e80a35c6274314044e6ff02da75cc275356eb84251b5b7fdbcff6f127253f78b43ffb29b0192f12d4d9246c7d42f SHA512 9a12317504cc737db630f39665fbf28526757480177c877274ec40117e319996f40030c9b8c7b06bc7df8e47a1f9a4ae29fa1f47d54634e6398e3f9e60ac8017
+EBUILD h5py-2.9.0.ebuild 1403 BLAKE2B 1818e5fd2e43c69b8ff73c882ec0d92b53d7e80a35c6274314044e6ff02da75cc275356eb84251b5b7fdbcff6f127253f78b43ffb29b0192f12d4d9246c7d42f SHA512 9a12317504cc737db630f39665fbf28526757480177c877274ec40117e319996f40030c9b8c7b06bc7df8e47a1f9a4ae29fa1f47d54634e6398e3f9e60ac8017
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/h5py-2.7.0.ebuild b/dev-python/h5py/h5py-2.7.0.ebuild
index af6a18ea3e92..5af042c901c7 100644
--- a/dev-python/h5py/h5py-2.7.0.ebuild
+++ b/dev-python/h5py/h5py-2.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/h5py/h5py-2.7.1.ebuild b/dev-python/h5py/h5py-2.7.1.ebuild
index 97f144b2efe1..05ebd1a3899a 100644
--- a/dev-python/h5py/h5py-2.7.1.ebuild
+++ b/dev-python/h5py/h5py-2.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/h5py/h5py-2.9.0.ebuild b/dev-python/h5py/h5py-2.9.0.ebuild
index 97f144b2efe1..05ebd1a3899a 100644
--- a/dev-python/h5py/h5py-2.9.0.ebuild
+++ b/dev-python/h5py/h5py-2.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/hachoir-core/Manifest b/dev-python/hachoir-core/Manifest
index 605528328f6b..fcaf878b533f 100644
--- a/dev-python/hachoir-core/Manifest
+++ b/dev-python/hachoir-core/Manifest
@@ -1,3 +1,3 @@
 DIST hachoir-core-1.3.3.tar.gz 91504 BLAKE2B 179be2f6e295aa285f143c9a2bbaf57f877611435887d31efb2a8fa296db62531c547129a2b03dfc63b3775fee70119fbbac9233afb86ec065333454b8db6701 SHA512 71c24c4c4612ab544663ddde4aa07bb7514fcb3b86596ad67d6b48e0d8590b1a9d8c88ed4007c2341cb195ef825e06634bce14c62cc2c5200b6d745d341cac51
-EBUILD hachoir-core-1.3.3-r1.ebuild 605 BLAKE2B 20e4173deaa307dac9d8b4d05a2d72735ae9abbd058120a945182d81dd04a5e8a9261873e22baccb424c3839df56fcff9977c7fce4d950c01204593099d12afe SHA512 924faae8e0d54fe50c6078d71a98e316256002216386b5f14fbb82dee83d191881a05851b08c0568959ccf0d86fa0c40627c99faa379d366c292fb1506d7f75b
+EBUILD hachoir-core-1.3.3-r1.ebuild 597 BLAKE2B 32fe1b36de6c7a528bbddc3ffff7e554db9dc2e04b44bc63bfaacd3728e3b686ed4d8bff6eee983eaf72d1c98f39f9b4a2cad00d84493c2cb3a153cb7a6cda97 SHA512 37d63f12480d4ef210bf28b87304539f85dec0263c0cb9b88a50a5722b6fd051d695d0fd3af16f6d615acefcfa3a6c60df946bb05feaf11a56235e7df2f362e5
 MISC metadata.xml 645 BLAKE2B 1a63b0df4d91683860a880dd9b6a3a34afa051e7d47023d01b813e31755c4a430823bc7dc8f6d17f78d6df3383888f51508f6916b11dc9f6a5a64d53f60f17e0 SHA512 dbcf61a4c938389b5384d946390e2a16b17bcf45561c824a7fcce1bfa5d9ecb0b43975a0b08cab29bc04c140cefecc8cce6d13e1a6dfc8dba58be2c2e7deafa2
diff --git a/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild b/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
index bce6a2f3a663..859e0b33b1ec 100644
--- a/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
+++ b/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hachoir-parser/Manifest b/dev-python/hachoir-parser/Manifest
index 0154ae9435a1..aa10a853d317 100644
--- a/dev-python/hachoir-parser/Manifest
+++ b/dev-python/hachoir-parser/Manifest
@@ -1,3 +1,3 @@
 DIST hachoir-parser-1.3.4.tar.gz 359230 BLAKE2B 58bd279e41ddf073c56570bfd3adffe4d43dd527f92e76efb5ebbf42a69064df72269638d1595d14ac5f385b35f53535e4015cacfcffe0df63f1ac8f99eb02ee SHA512 d1c01af0fc7dc59fc4fed57401cbbb3ba498d1a6de78322f47ff139ac10f1ad1d5713011c04fde610267b40188c84ff79397f9c8d309c1ab5cc3384c03577948
-EBUILD hachoir-parser-1.3.4-r1.ebuild 584 BLAKE2B 932a82d1a8e834be72036a44d4ae68a05de1aa013ce9c692908231c48f0e6fd3c5333a5610d102972ce558fe0bb68d83af304884078294f93cba3e7bbfb1bedf SHA512 4577edef3c9dfc08e2635261000caf1ca39de9691cc1461867bcd569df2bc1f9bf9b6bdd26d64a5bb3f13264d2c80efa6251bef947de416f51b00d24aed8a2ba
+EBUILD hachoir-parser-1.3.4-r1.ebuild 576 BLAKE2B ba12038e789972be36a59883bc4c1e37d1daddcee22a79becce433fb86280081eda4e7c2203353f6a6cd5119bb6689e6f1aad5ab4d20dfa116e662fe61972c2f SHA512 9bea4a35730bf2cae19c2babafe98c63dfecc3e30e64f35f5a8068b458c845df601e7415a28e3dce21d2f8bedcf78160a7e287ec03139806acfd25e445177596
 MISC metadata.xml 623 BLAKE2B 73a2bf0b3b3f69a953d7f184c6c5f29ffbe6dac3cc8f75d92a445fcdaf6ad3e34ad4846b5f25d05729381789f62b45e946f31891727b8c1d758423a7f84b4f9b SHA512 3edf47f4e311280a87c43944f80ac9fb99318be777b29efb0d2f8b510b65da4d73de0f0c04412530732c8688dcb9ce9e412c518fe72620fd85427638ce93dd65
diff --git a/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild b/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
index 132fbd59bff1..bb8013eb62f2 100644
--- a/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
+++ b/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hachoir-regex/Manifest b/dev-python/hachoir-regex/Manifest
deleted file mode 100644
index 219b22f4e192..000000000000
--- a/dev-python/hachoir-regex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hachoir-regex-1.0.5.tar.gz 22156 BLAKE2B 9f62866f37b1448bafc0a26ee5b807f7f310c3b5a046fbea5add12626c81bc6f148d8cbfdf4ce002d4e587f3938fa4c825b825b11951bb8ff150f18d2fd9ca01 SHA512 eee781ea9665c41e8a2d02116aa0af0d734e6e1ecdb06aaaa69fe9a54abd3ef16590281570ec0f87a54903c9849c12387626c9fc78f3523eaf13a5a77cae1610
-EBUILD hachoir-regex-1.0.5-r1.ebuild 593 BLAKE2B 122bce17b185325cda42d5a36d655a8f38b3e413d66c1ebe5387d98696dbd36ac85ba1b01692e0d85cb65cbbaceb3ece54bd7a6dfdee93817f2c67599ba046e2 SHA512 e686a25fbc1acdc08315b0eb6af8d5f3b1f31f24e9e513c1a965155cf79bb6909aa83a6d2faef3771784624dca83985d8f718c0dc888aaedafcd0f0799705aaa
-MISC metadata.xml 530 BLAKE2B e4a6075a7f667e4e82115bb114880b80fe7bfe82457b9f74c00fed57e83266e7b06b5bb983c7681c20b4a95599764dec0c4caf80a95596c3af87ddc1003037b1 SHA512 fb0c48fbfe674d66937f07c03c365386d60dbc26f9a68869e99be67e39a9e6c0a19667455d5a7d9a9e3615073209a5a459bdb62c1f8f5455118c223606d1c88c
diff --git a/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild b/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
deleted file mode 100644
index 195191fd4960..000000000000
--- a/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manipulation of regular expressions (regex)"
-HOMEPAGE="https://pypi.org/project/hachoir-regex/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_configure_all() {
-	mydistutilsargs=(
-		--setuptools
-	)
-}
-
-python_test() {
-	"${PYTHON}" test_doc.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/hachoir-regex/metadata.xml b/dev-python/hachoir-regex/metadata.xml
deleted file mode 100644
index d81a69990448..000000000000
--- a/dev-python/hachoir-regex/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">regex manipulation Python library. It's used by hachoir-subfile for fast
-		pattern matching (find file header).</longdescription>
-	<upstream>
-		<remote-id type="pypi">hachoir-regex</remote-id>
-		<remote-id type="bitbucket">haypo/hachoir</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index 50382777c350..b05aa9ac640a 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -2,8 +2,8 @@ DIST hacking-0.10.3.tar.gz 41119 BLAKE2B fe43b31f356c9469925bf43ff381c1e24d69769
 DIST hacking-0.9.2.tar.gz 43956 BLAKE2B f4bad9ca0ffaaaf05d9f0b8536ccc72c51de4547de8d38ea31f9bae1ebbb52362d75fc286075b13631362fa00e3a7081db6a128584067896bf4daf7b32f4bfeb SHA512 76aa59b4cdfb8036d6471e35cba43d502de3a72edc3883a05822063cbb92eaa072cef3144d21ee82ac763c3385c65bc9dec4b66fda5a5a2090191ba5b6388d41
 DIST hacking-0.9.6.tar.gz 43287 BLAKE2B e67090fe103849fd9cb4cd4ea36065d49500448cc291ffa2c36273095a2de4a704af2f3a926aef0ffe4aa4689ef7f810f317f0ed46e9c7143039ab776b04bfe5 SHA512 e4225754a85ff474b724130a0c3d6a6b9c480a953ea35a18833378cf2a5df4687819f510b50a95f42890cc69836033a8af933bc0a5a4e330ae94532bcee189b4
 DIST hacking-1.1.0.tar.gz 55620 BLAKE2B 6a6f30ef8a1eef3aa1b1b630dd43e1d2e9adff1623d8db19a545f186f60ce367e4b820582893e6444b7d58573b4a70a47a30cdc8d2ce1202666cf6e1b0e7456f SHA512 d326995976c04469c9d164ff31d02471346af715730d97fee23261988100156c4598ea8968cb483e8f386ee3f94a6bdffb5f67d8a7dfc238f4607fb7fe09e128
-EBUILD hacking-0.10.3.ebuild 2143 BLAKE2B b18d31f55684c89c4b641a436b5cba3cf17ade4ee406fa359d5eb7893cb5eeb985e811d221f5ccb06a9b05707c60ff4b026aac1e6893868c3643f1a7a29dcb9c SHA512 2b572e8933ddb272e0acef86e215da0da2d8d5bfc426700c5e26bb7676c18e1b42fff2af45ba7891f328cbd732c24a8bf0c1a3373688e612708dfa4430536295
-EBUILD hacking-0.9.2.ebuild 1964 BLAKE2B c4bcc48051236c58b1661e6eb8c1e9b3682aad6b8979c0fd44e001c266289da7bf52a70b2595b451cff4cf076fe7f5ab9d1f8e67dcc0f0bc960e731010671c0c SHA512 6042f1f1897a59269432b291c5b5c8bbd24a67c31bbe20355aa4a81a139c07d4c4399b014e19b9d4c995d4acb3031120124793a2ef398d57c8458e63341d32e8
-EBUILD hacking-0.9.6.ebuild 1955 BLAKE2B b9c3a1b0828132609166f4541bee7eac401ca23c2dbeaaedf2b980e27baed04882d119cc9ef0e0e7de7be6de399112cc5a84f3400eec0a36cfc7c82f2f064de9 SHA512 20ad1f492a1b5d4c294526d500293519de7d7ff445661101c01ba039b3ee7b39a11f26d5ea6db161a45295e97c343f5ba7331e117c9f9fed1756786b9bd74356
-EBUILD hacking-1.1.0.ebuild 1760 BLAKE2B 1b785574e886c432c04e2f2200838974aebbddb52e57201a474dc3dd5684f1c9bdfc361ea107a739e62cb06e54a7d83ce5e72c7bd76cdc9062eb5228cd3ab111 SHA512 d384179e94a0c7fec96d175e513664bb6de3b3ef18b57f8e86709ecfa28bb35a6d69b400ca4e5c54ae45bdcfc2a04d35f926353429895d949bc946fc5fc8c4d3
+EBUILD hacking-0.10.3.ebuild 2129 BLAKE2B dc8ea1ef953a3e7140bce6393068dc0a9f6d39a10c5900536ce37be887d300550154ccf8609db7d3c779b2b2d30aef0c13c7bad87d7403afd6544b217fcf9222 SHA512 97c8b6238dd38e4477360cca312acc7b5f4b79467c5fa92cc5bd5ca4b47db94fce6198c9753cf3ec1081db03be7339af340d17dd7e68e0bd71267770489fcfaa
+EBUILD hacking-0.9.2.ebuild 1950 BLAKE2B 22819bef7fab3a4d69fe9d342f6ee29df70ac9e86c96126424f0360e265ccb34e021f224e8a87f2cf685899491fa6075124588adbeb5f049434b82904c4509f0 SHA512 0f6531b003d659763b92b40120f0f95658f8fc138c15c8691d30ea6f1559a312355c9f92c7b7425f68e495a930cb974254b603210b66a7fdcbe792cbf33695ab
+EBUILD hacking-0.9.6.ebuild 1941 BLAKE2B cb87554c06cba525552af3b33cfcb014a093d0526f193a22a015f1c6b3f4e84f6e710a99cabd8f1c009dd7a3f5788f5ffefa3980269c84e987f83ffa94bc5d6d SHA512 ae4d6c696bf75dfbe86fadb95ef8916731da038ecc3888a5122a8915088f7e24ee962c004cacf48fdfa767bf222a4d471cdf9701a91010a55e24390783ed0d1a
+EBUILD hacking-1.1.0.ebuild 1748 BLAKE2B 25eba7c6d7732d8dc7d332634afb860fa7135140594491cf4861c96e41d9fb995b59527d0e128d17d71261adb46fe568ac4fc8463a2fc30d3d9866b1003e6afb SHA512 fe77ca29a0cdc84f10bad23f560ed8a8c93af6f77e08f950f10a4b1f2c40cb83e9da8412e430edd5ea060a8d3e11b08147b8b2b439fc274a7589ab529dfe5aa0
 MISC metadata.xml 749 BLAKE2B 29b4d37179a1c8f36f3c66ec80d0c2044f3457542114dd8753b1c50303e3dc5fe499ff52d4554f434a89026c4aee544ccb5049d0b2a8e2ea98042228234de01a SHA512 723ea94c939f789ba8112fc54d2de3abea87795407ce15ea8982140ce3bd446cdca885c2680471fbb70551e275b426fdab219f1f0394b581bd495fd643f5e0c2
diff --git a/dev-python/hacking/hacking-0.10.3.ebuild b/dev-python/hacking/hacking-0.10.3.ebuild
index e734f197a820..70c5421423ad 100644
--- a/dev-python/hacking/hacking-0.10.3.ebuild
+++ b/dev-python/hacking/hacking-0.10.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hacking/hacking-0.9.2.ebuild b/dev-python/hacking/hacking-0.9.2.ebuild
index f57d6aaba5e1..b354c8fcd79b 100644
--- a/dev-python/hacking/hacking-0.9.2.ebuild
+++ b/dev-python/hacking/hacking-0.9.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hacking/hacking-0.9.6.ebuild b/dev-python/hacking/hacking-0.9.6.ebuild
index 27990230103d..82e43007dffe 100644
--- a/dev-python/hacking/hacking-0.9.6.ebuild
+++ b/dev-python/hacking/hacking-0.9.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hacking/hacking-1.1.0.ebuild b/dev-python/hacking/hacking-1.1.0.ebuild
index e95f7811d8d0..806a3495fd58 100644
--- a/dev-python/hacking/hacking-1.1.0.ebuild
+++ b/dev-python/hacking/hacking-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/happydoc/Manifest b/dev-python/happydoc/Manifest
deleted file mode 100644
index 8c38ae4ff3d8..000000000000
--- a/dev-python/happydoc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX happydoc-3.1-python-2.6.patch 726 BLAKE2B 15cf7457474d5314aa51fedd435c35f8985c75760845615de37184602da5878e7d8a1e8c6e17bd36e36b3ddad410a8347975443bfe5759e0055273e31e213bd8 SHA512 b47a45271cdf0e26167562302d82eac8198b3dcb74cbb6315ba24b0ac3eb66a5a78bff3259b926528cde8d78d42480b1ff1930e7d27fdd1a67f9824beccef8b1
-AUX happydoc-3.1-setup.py 4899 BLAKE2B cbd6b098150362a603143c52d6190eae1d12172189b93dccf8fac9d0df264326b70f68098f9da6244e41b4da664e5c088f7ff3d6f680ed9b03220ce9ee0a1549 SHA512 536f165b37a6508e1d364184474e69ed410c56bd7936bbbf041d1541af41414b156b5f079c39917b12fb82f377ae52dcf50c7a3d260e911a6d0bb38950d39469
-DIST HappyDoc_r3_1.tar.gz 732849 BLAKE2B f5e77215fed9b188672458ae9be6d96f5332bf5e2897b202516bb706cd5aaacd25a51aec4e5921b9ba8899ad4a38e08f9edd9346cd00cc8abccb95db179c23d9 SHA512 5f526f90225f189f59fdca24b3db1cd73c7346b859cc3b8a00ddaf248c2e0901ad048c1a83ec1b9ee3f950f1260427b0fd1d6f4b1e6c4b772615f6ca799f86ff
-EBUILD happydoc-3.1-r2.ebuild 1031 BLAKE2B 8cde458b99e5ae28d4c717968c1695d33de5ee4d8f0f0e1ec54ddd6928677dd3312134cf9863a4162aab88644324152650755e58fc6775417c2648f6cafd1add SHA512 31a40af952be0b89883aa8838e4f02cd150021cc27f0c6fed51c893f6f127e86d99a618ef3a28dafb26762f24f7358a4ce936996c13a6e9e823b258d1a728272
-MISC metadata.xml 318 BLAKE2B 61a8e30c9e34e77e6888037ac00b669e9e786c0b5c8dcf7bb2c709dac8e4f4dff2a5e9fd3527fcbdeac9baa8129e87cb9653f677c5f16620e71c949fb977e65e SHA512 9b9ddb517c3bcdd431de07987594db7d7ca25f5cce3550f35c9731dbd72ef5301330c97138dee8bdf369c55b219bb4da71048419c5cfc2f15f7ba1e174b3eb43
diff --git a/dev-python/happydoc/files/happydoc-3.1-python-2.6.patch b/dev-python/happydoc/files/happydoc-3.1-python-2.6.patch
deleted file mode 100644
index 4cced8e25833..000000000000
--- a/dev-python/happydoc/files/happydoc-3.1-python-2.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- happydoclib/CommandLineApp.py
-+++ happydoclib/CommandLineApp.py
-@@ -102,10 +102,21 @@
-     #
-     # Exception names
-     #
--    ReservedOptionName = 'Reserved option name'
--    HelpRequested='Help requested'
--    InvalidOptionValue='Invalid value for option'
--    InvalidArgument='Invalid argument to program'
-+    class ReservedOptionName(ValueError):
-+        'Reserved option name'
-+        pass
-+
-+    class HelpRequested(ValueError):
-+        'Help requested'
-+        pass
-+
-+    class InvalidOptionValue(ValueError):
-+        'Invalid value for option'
-+        pass
-+
-+    class InvalidArgument(ValueError):
-+        'Invalid argument to program'
-+        pass
- 
-     #
-     # Globally useful configuration stuff.
diff --git a/dev-python/happydoc/files/happydoc-3.1-setup.py b/dev-python/happydoc/files/happydoc-3.1-setup.py
deleted file mode 100644
index 40ea5d6cd25f..000000000000
--- a/dev-python/happydoc/files/happydoc-3.1-setup.py
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/usr/bin/env python
-#
-# $Id: setup.py,v 1.11 2002/02/05 19:59:36 doughellmann Exp $
-#
-# Time-stamp: <02/02/05 10:00:12 dhellmann>
-#
-# Copyright 2001 Doug Hellmann.
-#
-#
-#                         All Rights Reserved
-#
-# Permission to use, copy, modify, and distribute this software and
-# its documentation for any purpose and without fee is hereby
-# granted, provided that the above copyright notice appear in all
-# copies and that both that copyright notice and this permission
-# notice appear in supporting documentation, and that the name of Doug
-# Hellmann not be used in advertising or publicity pertaining to
-# distribution of the software without specific, written prior
-# permission.
-#
-# DOUG HELLMANN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-# NO EVENT SHALL DOUG HELLMANN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-"""Distutils setup file for HappyDoc
-
-"""
-
-__rcs_info__ = {
-    #
-    #  Creation Information
-    #
-    'module_name'  : '$RCSfile: happydoc-3.1-setup.py,v $',
-    'rcs_id'       : '$Id$',
-    'creator'      : 'Doug Hellmann <doug@hellfly.net>',
-    'project'      : 'HappyDoc',
-    'created'      : 'Sat, 03-Feb-2001 12:51:26 EST',
-
-    #
-    #  Current Information
-    #
-    'author'       : '$Author: neurogeek $',
-    'version'      : '$Revision: 1.1 $',
-    'date'         : '$Date: 2009/02/25 20:59:36 $',
-}
-try:
-    __version__ = __rcs_info__['version'].split(' ')[1]
-except:
-    __version__ = '0.0'
-
-#
-# Import system modules
-#
-from distutils.core import setup
-import string
-import sys
-
-#
-# Import Local modules
-#
-
-#
-# Module
-#
-
-BSD_LICENSE="""
-
-                    Copyright 2001, 2002 Doug Hellmann.
-
-                         All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that copyright notice and this permission
-notice appear in supporting documentation, and that the name of Doug
-Hellmann not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-DOUG HELLMANN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-NO EVENT SHALL DOUG HELLMANN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""
-
-LONG_DESCRIPTION = """
-  HappyDoc is a tool for extracting documentation from Python source
-  code.  It differs from other such applications by the fact that it
-  uses the parse tree for a module to derive the information used in
-  its output, rather that importing the module directly.  This allows
-  the user to generate documentation for modules which need special
-  context to be imported.
-"""
-
-
-def cvsProductVersion(cvsVersionString='$Name:  $'):
-    """Function to return the version number of the program.
-
-    The value is taken from the CVS tag, assuming the tag has the form:
-
-        rX_Y_Z
-
-    Where X is the major version number, Y is the minor version
-    number, and Z is the optional sub-minor version number.
-    """
-    cvs_version_parts=string.split(cvsVersionString)
-    if len(cvs_version_parts) >= 3:
-        app_version = string.strip(cvs_version_parts[1]).replace('_', '.')
-        if app_version and app_version[0] == 'r':
-            app_version = app_version[1:]
-    else:
-        app_version = 'WORKING'
-    return app_version
-
-
-
-if sys.platform == 'win32':
-    platform_specific_scripts = ['happydocwin.py']
-else:
-    platform_specific_scripts = ['happydoc']
-
-setup (
-    name = 'HappyDoc',
-    version = cvsProductVersion(),
-
-    description = 'HappyDoc Automatic Documentation System',
-    long_description = LONG_DESCRIPTION,
-
-    author = 'Doug Hellmann',
-    author_email = 'doug@hellfly.net',
-
-    url = 'http://happydoc.sourceforge.net',
-    licence = BSD_LICENSE,
-
-    platforms = ('Any',),
-    keywords = ('documentation', 'extraction', 'source', 'docstring', '__doc__'),
-
-    packages = [ 'happydoclib',
-                 'happydoclib.docset',
-                 'happydoclib.docstring',
-                 'happydoclib.docstring.StructuredText',
-                 'happydoclib.parseinfo',
-                 'happydoclib.parsers',
-                 ],
-    
-    package_dir = { '': '.' },
-    
-    scripts = platform_specific_scripts,
-    )
-
diff --git a/dev-python/happydoc/happydoc-3.1-r2.ebuild b/dev-python/happydoc/happydoc-3.1-r2.ebuild
deleted file mode 100644
index 1b3cfd122e31..000000000000
--- a/dev-python/happydoc/happydoc-3.1-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1 versionator
-
-MY_PN="HappyDoc"
-MY_PV=$(replace_all_version_separators "_" ${PV})
-MY_V=$(get_major_version ${PV})
-
-DESCRIPTION="Tool for extracting documentation from Python source code"
-HOMEPAGE="http://happydoc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_r${MY_PV}.tar.gz"
-
-LICENSE="HPND ZPL"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-# Tests need extra data not present in the release tarball.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}${MY_V}-r${MY_PV}"
-
-python_prepare_all() {
-	cp "${FILESDIR}/${P}-setup.py" setup.py || die "Copying of setup.py failed"
-	epatch "${FILESDIR}/${P}-python-2.6.patch"
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( srcdocs/${MY_PN}${MY_V}-r${MY_PV}/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/happydoc/metadata.xml b/dev-python/happydoc/metadata.xml
deleted file mode 100644
index 2d122c86dfd5..000000000000
--- a/dev-python/happydoc/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="sourceforge">happydoc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 201ae944c086..afd3fd1b9b7a 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,7 +1,5 @@
-DIST hcloud-python-1.2.1.tar.gz 63592 BLAKE2B 9a6d2dae97ff405ebd9b92bc833c9d953c13840e68be4eb43fed375a60e55cf4bf9b4b742b26fb03401f631b7f7127815961861cb673adf4839c829141c8ed00 SHA512 cb70d190350457fc3c6e474bc6c943070102762595dac2f386041956f64255f390a928a2f2411be861645cd65b015ab9e0c931b36aeed0076b06d9f67ac72d1c
 DIST hcloud-python-1.6.1.tar.gz 71866 BLAKE2B 0a1d37d4dc8be4e28595385ec7622ec65367c40f9cdd455e03827a5ee2983f43026b1dbb7e9bd20d241ed9a4748015d33bdcb53b15ce148c401984960e158716 SHA512 0b2ecaa311b4dac44b3122a45a38f76f8377bc189b1550f21327ea3f56fefad624ea6809c4abd6bbaf5c8fc23dfa5e6edd352dcbbcfae6c87af897ff376ce2cf
-DIST hcloud-python-1.6.2.tar.gz 71887 BLAKE2B 2c423b0b83cc8c7bd5f0d4ef7db59516f125ff975e8cb82f38b340a0f448c20dd374a1edc7a486d18af3d438722b77f32f4ab6191966e3ada13f437f2d8a29a4 SHA512 ae2da263a038add593c7e302057d6e5e34258f180bddf67fc23edcc8c287c67d91aa190efeb1190af2596017b8964f4623d9cc03c4f1788c71c7d251f2a5422d
-EBUILD hcloud-python-1.2.1.ebuild 1056 BLAKE2B 94a8aeb9cf22f4263222ab52e186c8604912c1a0931d96e3a47698019245d318753fc5d5686255fa0ef6f9460fe55a94b2125804407da5f94ca92f4577189a37 SHA512 ac4b6bb887fb0b1ff076c4ba02dd1a33256f238eab49f250db3b8a1908c68784dfe5c51b5dfa2b7db7f5dc57496e472c8be8d50d152392984c2f2c6674722e18
-EBUILD hcloud-python-1.6.1.ebuild 927 BLAKE2B 951c1adde98b5ab1e6528427b686052e624315d9796ec0893ee37bece4e252a622c6c1e89e138e7f09674d6eb2a6499ca6bcac4009c749a5adeed132fa762bb2 SHA512 d9c6f88f6e5595a8a906b98246fb8b77a6097b06bb80a87aa852b1b9b27182a2bf4d90c8c11e863248e0a0c333ac1375e009fa83a7fb21c0374fc3fecf72717b
-EBUILD hcloud-python-1.6.2.ebuild 1039 BLAKE2B 3e2505436ef1b63099bd6e0cd2a31a15e80974a354e0f68aefa1aa80d1613779c9ac4de0c2d7f2faca739c3948cf1111cf306aa44b0e03bacb106865b244645a SHA512 18a740c72ce243b7f203c05190de1255f2be00d41c92a4696ac0e10f4171b47590d3f7cbfea7c18ca7a77aabf160565639b48c6ee19d55309ad30a2536ab23c3
+DIST hcloud-python-1.6.3.tar.gz 71575 BLAKE2B a6c969d713d1351bba0cebef8752abbbf0805b4a39eedc918767ccf60d590ac8259e1405a25c2c563923146d52ae1318d6362cbaee311bfe04bea5afcc18951b SHA512 dec3f16197de9f02c2707601e1cad40289d3ccbd6256887da50b84fb8fe6b0fb98f708c9ba0cfc2ff1308a53b9997cfda579df3ec79a1d28686a3c43f4124e74
+EBUILD hcloud-python-1.6.1.ebuild 917 BLAKE2B 0bd428fda988bff334f8b1c5f8b640e917177d88617e8e917ebd6ab5e8b7bb1397f547a44a8513216c12f23e1940c6ffbfaec554b3a5ca5385f8955851ba6078 SHA512 678a457dc582700d175fe6e469487151f2c9f3c847beea8e7748e4ff8b05e3a78c7ea5ef39eef4894cc80333bf74a668e0939e444ee72a7870ad87a66c2a108d
+EBUILD hcloud-python-1.6.3.ebuild 1029 BLAKE2B 9e50bd30c67891c3989ce21bd9b9b97fede164f241c6706e5c5a7e4903f2a9d851be317830a5699663e7fe8b9641dd7262b87b02400c800ccaabf9423c70e5db SHA512 a9269769845ab954fb71ebbbcfdeae89be78ef6570f47fd32b5d5752ccef5d1f186be7205a0b7bce42b4141721c6b0dcc52e2080556e49bdf807e96355a8b8c0
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
deleted file mode 100644
index e2e7a998b313..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples"
-
-COMMON_DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/future[${PYTHON_USEDEP}]"
-
-# it can be delete for the next release bump
-# https://github.com/hetznercloud/hcloud-python/pull/41
-python_prepare_all() {
-	rm -fr tests || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.1.ebuild
index 65c3b456a996..91e6bbb44264 100644
--- a/dev-python/hcloud-python/hcloud-python-1.6.1.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.2.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.2.ebuild
deleted file mode 100644
index d6166ae001a5..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.6.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples"
-
-COMMON_DEPEND=">=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-2.9[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	<dev-python/future-0.19[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild
new file mode 100644
index 000000000000..e1e37a93f177
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Official Hetzner Cloud python library"
+HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
+SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples"
+
+COMMON_DEPEND=">=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-2.9[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
+	<dev-python/future-0.19[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hcluster/Manifest b/dev-python/hcluster/Manifest
deleted file mode 100644
index 98283bfdebf8..000000000000
--- a/dev-python/hcluster/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hcluster-0.2.0.tar.gz 453082 BLAKE2B 70dca30b3a841235226a49a1af3c484f96ad3d5f88ea430dd0170e16cd562c1084d4402ddbbe64a472f37f880eba26eb0b68f503a0a2eba9a1b8121539292bd1 SHA512 b7794e7032099d7f2f9acd5339f7ab70bfbd69035d9c1fae0166c2c03f8420ae25f8111f5db4c6eded9f8c32991154a20c6fdcc82104116710b52176e3c2033b
-EBUILD hcluster-0.2.0-r1.ebuild 545 BLAKE2B 9ddea0286f448d99d35d758d72b08f39a50f135e51b61fdc8aef3f152e402ab3464e08b2d5b09214d7318e53e64913604042930e0428073f1d1585ffcc989132 SHA512 8699e3badf7be868348993f8e2fefedae52d361671fe8ad10483aabe4a7f9a8c8018f300bbc20a8b12a9dd2a4332c9d1343f749aa3f99a31bf5fa907107ed0b5
-MISC metadata.xml 962 BLAKE2B 075de014bc80f5fac99907876b57a503b003b87ad1acddf0e89777f90c537b3efa5fffd3f2e71e8671d7efdd5a10799137e7c5db5116fa2a810e68cfff4af6cc SHA512 882da1b59710230fabf72fd02988fe08c151d2b197e8c5efd7316eb8afd106e1d9a221372db025252c7b3dc4500424f72cba53ad7d56a7d7bc88a2357275d018
diff --git a/dev-python/hcluster/hcluster-0.2.0-r1.ebuild b/dev-python/hcluster/hcluster-0.2.0-r1.ebuild
deleted file mode 100644
index bc8f6180ae66..000000000000
--- a/dev-python/hcluster/hcluster-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python hierarchical clustering package for Scipy"
-HOMEPAGE="https://pypi.org/project/hcluster/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-
-# Tests need X display with matplotlib.
-RESTRICT="test"
diff --git a/dev-python/hcluster/metadata.xml b/dev-python/hcluster/metadata.xml
deleted file mode 100644
index 611f8c440f1b..000000000000
--- a/dev-python/hcluster/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">This library provides Python functions for agglomerative
-		clustering. Its features include
-		* generating hierarchical clusters from distance matrices
-		* computing distance matrices from observation vectors
-		* computing statistics on clusters
-		* cutting linkages to generate flat clusters
-		* and visualizing clusters with dendrograms.
-		The interface is very similar to MATLAB's Statistics Toolbox API to
-		make code easier to port from MATLAB to Python/Numpy. The core
-		implementation of this library is in C for efficiency.
-	</longdescription>
-	<upstream>
-		<remote-id type="google-code">scipy-cluster</remote-id>
-		<remote-id type="pypi">hcluster</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/hcs-utils/Manifest b/dev-python/hcs-utils/Manifest
deleted file mode 100644
index 9895f3e805dc..000000000000
--- a/dev-python/hcs-utils/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hcs_utils-1.5.tar.gz 23316 BLAKE2B 9c43ee5319d6bf2ded8d293732a8345fca82a8f38a309ec58146a837f968875607d494e301629044414377b57cb75e26dc2576232455b2db18f24136ec036f44 SHA512 9a8fdddc47e5b4f89d52b59af66594e9b9a3adcf9d0ca5894111a0d359e8c18930e2d38027acfacadbdbf874a281d0f2ce88b310dacbab1f2a39c03bb2fe6fbf
-DIST hcs_utils-2.0.tar.gz 38187 BLAKE2B 7c00f7bdef623d6568c1e7bfa375fd7638ac60240937ed75608cdd4ff8d2f68504126a1d03cfbaf493d57b8d7283498419d1fe8c3018f8d0ece390474f665485 SHA512 63b2ab16c8e517563dbcac4b85e781da5bd40fe20b5c41c449a20c07da5539ac37b622d7bf4d421f3721ed13bf4227aa9ebd5607280147f3723c31ce965d23f2
-EBUILD hcs-utils-1.5.ebuild 713 BLAKE2B 2f8d4579dccf05edb02e6dabe006a8ebb96392830b8456a652b332a7309b0310f9326175f520297d6a8508cc7e318e8c9345012d08571b19a1a1d8d6bd74c594 SHA512 17ac18dac881b1b944aed61294c4a5084b80b775ffa8666f7e5c0e691a58f281a88903cc0cadd3061e2b20be4a62e260ec9bdbe77d3e50177e710089c3a08516
-EBUILD hcs-utils-2.0.ebuild 711 BLAKE2B 61a8e2d59ad1a72e852b47df5a2cf2278368887ed86c5a723fd6b368b3f31849e206dde5c3b5df7ff3d8d18ad4a4b42c9800f0abb642967baf3c1ca7940d68ce SHA512 fb6cb168c9f16e1276c87a39fe4cf11dfb1d4c30120ffed547ce9a3a80e036425d26988a8231d8f7f4a7a7adc34c184c5baf0a322ed2514bf8b62d984fab61f6
-MISC metadata.xml 312 BLAKE2B 66d32c13dabfbbfda76ad97a455f791cfd79d10ab520123e25796761f9c4895e6f87c6bd0724cd6a1df35a7e7843ec9b31d3e44013d2387a956b5a058d32447c SHA512 6a0f224bbd633d17f96f5f8984e5ae48e7d830668c6b79d424202d0bd588cb1b4aa3536a39a018369a4cf6ea944f84082c39fcbc2ec1b55ddbadf1ca8a8e299d
diff --git a/dev-python/hcs-utils/hcs-utils-1.5.ebuild b/dev-python/hcs-utils/hcs-utils-1.5.ebuild
deleted file mode 100644
index 9da66beeb923..000000000000
--- a/dev-python/hcs-utils/hcs-utils-1.5.ebuild
+++ /dev/null
@@ -1,30 +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
-
-MY_P=${P/_rc/rc}
-DESCRIPTION="A library containing some useful snippets"
-HOMEPAGE="https://pypi.org/project/hcs_utils/"
-SRC_URI="mirror://pypi/h/${PN/-/_}/${MY_P/-/_}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P/-/_}"
-
-python_test() {
-	pushd  "${BUILD_DIR}/lib" > /dev/null
-	py.test --doctest-modules hcs_utils || die "Tests failed"
-}
diff --git a/dev-python/hcs-utils/hcs-utils-2.0.ebuild b/dev-python/hcs-utils/hcs-utils-2.0.ebuild
deleted file mode 100644
index 63d221dafd40..000000000000
--- a/dev-python/hcs-utils/hcs-utils-2.0.ebuild
+++ /dev/null
@@ -1,29 +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
-
-MY_P=${P/_rc/rc}
-DESCRIPTION="A library containing some useful snippets"
-HOMEPAGE="https://pypi.org/project/hcs_utils/"
-SRC_URI="mirror://pypi/h/${PN/-/_}/${MY_P/-/_}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P/-/_}"
-
-python_test() {
-	pushd  "${BUILD_DIR}/lib" > /dev/null || die
-	py.test --doctest-modules hcs_utils || die "Tests failed"
-}
diff --git a/dev-python/hcs-utils/metadata.xml b/dev-python/hcs-utils/metadata.xml
deleted file mode 100644
index 1b9790b37a1f..000000000000
--- a/dev-python/hcs-utils/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">hcs_utils</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/healpy/Manifest b/dev-python/healpy/Manifest
deleted file mode 100644
index 289db4e63c30..000000000000
--- a/dev-python/healpy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST healpy-1.10.3.tar.gz 4018897 BLAKE2B c736e4cd445d51af55b76533dc2090e7926907ba9ccefc04d60576047c72e39e93c532980e24af10d548954c4bd5d580a16a3601a675eb0d7d965e3a8d1df4ba SHA512 c5862fceb597ffbc5c53204479fa9dba19287e3c08744e25edef3eaecfa726e61e8558d50d73e2bf4d19b7d0adc0ac928a38c4808fc92fe855f5eae101e18baa
-DIST healpy-1.11.0.tar.gz 4033412 BLAKE2B 3b0631eca53ab9798cf03b9f66ea9bcf1f2df16f3639fca353a14204e566027e37419e27f07a579f3cd7b05c4eea84160f4aefc5f9706e1ffbc553db68d8cf90 SHA512 35926c769f2fd4ebc3cd61357d742e9e1747325187e465bd3be62b4281506bd02cf3d8b982583819219e994dfa3936d6bc61914218325bb6b4ddfcffc50c802f
-EBUILD healpy-1.10.3.ebuild 975 BLAKE2B ea917c9d26a3d0bce799191b9589195c76958efae6a85f7686463e811f641fa05ee4daab72843312c802b362ad4596fd59d3f67f12ca5c40ffcc9d6860cd9cbf SHA512 b9aa4a6521d077cb197fb2367e94ff5655269483c9157042ecb7d45517c81f8cf2643f711ac42f3b172b8c4da9c46c846a22b6e6e0ed929628dba56c56c0fbc5
-EBUILD healpy-1.11.0.ebuild 1070 BLAKE2B 16ff14d480fa892749755b3b1831fd5b8c6371634405977452273ca17cb4ceb4928794446e7b3a8671586f807fea25f23c863a41bddeb217141cfe213bfed217 SHA512 33ee52f7eb8fd3df87d825fab4a0c93999068d4ba501004415c6ee029b12a4fe7d2c0057378b47d093aa8e5a4e31961635cff33f24c456ea43ed94d86cb83ec0
-MISC metadata.xml 609 BLAKE2B ddd0006b243a7d1cbaab4d33d2b642b967edff7fafb729fe5715984aa36a6ed22f1ce11e6c0e566d7e0b3a1d2a437a2fa9ddd923ef61f26229c0665c58160635 SHA512 e8d86f81b4a62f3f15bb2210cfbc9eb51568525349c34e10bc32de76654f18c7937ee1c5390915c8a225be35baefb8b45d8cb982a41e314da77b91c30ae8749f
diff --git a/dev-python/healpy/healpy-1.10.3.ebuild b/dev-python/healpy/healpy-1.10.3.ebuild
deleted file mode 100644
index 80c87493bd0f..000000000000
--- a/dev-python/healpy/healpy-1.10.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for healpix"
-HOMEPAGE="https://github.com/healpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-astronomy/healpix:=[cxx]
-	sci-libs/cfitsio:="
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( README.rst CHANGELOG.rst CITATION )
-
-python_test() {
-	echo "backend: Agg" > matplotlibrc || die
-	MPLCONFIGDIR=. esetup.py test || die
-	rm matplotlibrc || die
-}
diff --git a/dev-python/healpy/healpy-1.11.0.ebuild b/dev-python/healpy/healpy-1.11.0.ebuild
deleted file mode 100644
index 048844f7e336..000000000000
--- a/dev-python/healpy/healpy-1.11.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for healpix"
-HOMEPAGE="https://github.com/healpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-astronomy/healpix:=[cxx]
-	sci-libs/cfitsio:="
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-	  dev-python/pytest[${PYTHON_USEDEP}]
-	  dev-python/pytest-cython[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst CHANGELOG.rst CITATION )
-
-python_test() {
-	echo "backend: Agg" > matplotlibrc || die
-	MPLCONFIGDIR=. esetup.py test || die
-	rm matplotlibrc || die
-}
diff --git a/dev-python/healpy/metadata.xml b/dev-python/healpy/metadata.xml
deleted file mode 100644
index 39b8f2351616..000000000000
--- a/dev-python/healpy/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 type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Healpy provides a python package to manipulate healpix maps. It is
-  based on the standard numeric and visualisation tools for Python,
-  Numpy and matplotlib.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">healpy</remote-id>
-    <remote-id type="github">healpy/healpy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/helpdev/Manifest b/dev-python/helpdev/Manifest
new file mode 100644
index 000000000000..4d83f82bc272
--- /dev/null
+++ b/dev-python/helpdev/Manifest
@@ -0,0 +1,3 @@
+DIST helpdev-0.6.10.tar.gz 12864 BLAKE2B f022e4a76b8f416e806bc11c11c27e4ee1c2a92cdc2a19561d2e8c0de60027eb03ae6696d968f7dcd803d2a9935c4ee9b3a0f8248f4cb8ca2afb13ff58d8be46 SHA512 6bdd51e573ec656de12e5b4c17e0de7c2cbfc26e696bb6f62eacd148fecde1c8c239879a9d44f8a30b12d744ab40e225799fe6176805d676cecabcbee6c1e4ff
+EBUILD helpdev-0.6.10.ebuild 498 BLAKE2B 8c06dc2fe8adc2f71e397a985ae4857fb150e8403804fa188d254b69da4eb5738260fc314c9415492e00af506ac48b33a6d7920fa617892e6897c9f6748f8472 SHA512 bf0c1b0ba45282181e6d2e26536d31e4588856d72f40b590a43e941877adde2d423a945a04dca948ef877f26f0a3bfe42683c22b9617480d16ad27e599c52a03
+MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/helpdev/helpdev-0.6.10.ebuild b/dev-python/helpdev/helpdev-0.6.10.ebuild
new file mode 100644
index 000000000000..b2e84f080a18
--- /dev/null
+++ b/dev-python/helpdev/helpdev-0.6.10.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 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="Helping users and developers to get information about the environment"
+HOMEPAGE="https://gitlab.com/dpizetta/helpdev"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/helpdev/metadata.xml b/dev-python/helpdev/metadata.xml
new file mode 100644
index 000000000000..dd0bd9c021f6
--- /dev/null
+++ b/dev-python/helpdev/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+    <maintainer type="person">
+        <email>andrewammerlaan@riseup.net</email>
+        <name>Andrew Ammerlaan</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-python/hgdistver/Manifest b/dev-python/hgdistver/Manifest
index 1da7b7214922..38152fec43f1 100644
--- a/dev-python/hgdistver/Manifest
+++ b/dev-python/hgdistver/Manifest
@@ -1,3 +1,3 @@
 DIST hgdistver-0.25.tar.gz 9879 BLAKE2B 71caa059359b8ea1be58b6463b260741586ab81e6d8afac5dcadbb35604a564b947032ae645cec683a3c692de8307b23f7abea40d0a1f3802b5257870b7e3e02 SHA512 3fef872af3c8fffb3ba612d2505260468b510c17219257640a4bcf3dc6568fdf59eb3cc544ef41b7eab32ee6cedcd81bfffce753c98bbc7d1e538fe4937d039c
-EBUILD hgdistver-0.25.ebuild 821 BLAKE2B d6a4985040dcd6e956f1d982e804857c233aa33c99f8f2c94b2601e332de1eac7ae8d3571063768d2126ae65b17bbc728661f76d30097c4f306dbdc980b1dd4b SHA512 5be45f938fb34604ac28d64223d03cec02e6961c5654ea4f30f5c267837331f1d839c1c70b32cacc9d6d8068d7fa511bdd821f1de72b6360bc0ae0133f5052f3
+EBUILD hgdistver-0.25.ebuild 814 BLAKE2B 7c4d6fd981b2836eba943dc4d8c16eb1eea58173e6c87e88fc489223f3129e89d324a05d2895ee44fe05199cf2b4e513521a5f87fa036637830d6ebebeed6aaf SHA512 d89ceaa5bf7eafcd95f00e3119ad6896fb472eb979820231313001458000ef15bef4bd3ac5c49a46e69fc1c57949bb9f12242446af1803bed0d1f21a38026f33
 MISC metadata.xml 394 BLAKE2B d2ea329a11dc2b88867e41b22717505a260db3715d8b254fd4fe51224541a428fe7d6b6180dff00ce82b74309f51fb5d8c3a47aa8664bb3492155e8282a112d7 SHA512 01c27a5f8d42a579acc1d21bd2f4b7a569183652c9637403b3efe7dfa515b9c86cee97f505ed909f0f34443cf2912cd1ae6b568a11954b6cf756815a5db82cc7
diff --git a/dev-python/hgdistver/hgdistver-0.25.ebuild b/dev-python/hgdistver/hgdistver-0.25.ebuild
index 59c225d7bfa7..65da3e47357a 100644
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.25.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hglib/Manifest b/dev-python/hglib/Manifest
index 411b8fa881b4..d32669fba1a2 100644
--- a/dev-python/hglib/Manifest
+++ b/dev-python/hglib/Manifest
@@ -1,5 +1,3 @@
-DIST python-hglib-1.5.tar.gz 27812 BLAKE2B 35a411f91d3e915d6679ada6ecd28798dad20a6082d74661168d15a084fb0482cba0623948fb5be38fc57a4b744a021ac10536ba75d230c493c0c1f1f7aaf8ca SHA512 2506e2ac95488830b90f5f099d231e45833a8f19ce14fc2f3391ae1bf48ca72187b6b57afb633ecbe6cd2c6f3d3f482d75e03ea36406b3a07085ed1b4ef9c6b5
 DIST python-hglib-2.1.tar.gz 29030 BLAKE2B 3603e4030baf1f542c7c4b2123a78e3567141af8e84709eca38495ecea264f85c870005b39f8fc1bb2afc611c9a2c428971c8d783bc2595e25d83b9fcb5a2af6 SHA512 82cd00e4184a8a002ea0bcc2dec4de06a705f5f6cecd1ddbddef08ead2817f673590884aee5187fbc3496ced3f27ca8c8d78e0436fb97205ef654cd28d912e68
-EBUILD hglib-1.5.ebuild 853 BLAKE2B 03eb02550ef103328d16ec44cc138b3fa8d4df50670246b210cfdc24f3b467cfc344d94d2e09c9d7aba4a27b9e505d28830e7267f88e1127cf7cef8105eb0ebd SHA512 2970048e6f1aba7b1db0a3fac1349994813dbc5d2ebaa6ab587a93f988c7eec5e0c0b2bb3019746c787010b21b93e899638ce84d786750bcc0ed27ecb4577b6a
-EBUILD hglib-2.1.ebuild 859 BLAKE2B 8b47a3295119a0a1150bb45fdcaa4f85a692a00ab35822f231cc81779e0e36bd77325d23233fc9a07c64605168f67e3bc4b76e7e594192dd201d62425f5fa060 SHA512 621ff28188bc4cdb71c50b677af401a67b1baef154176bf02d218fe77a812fdfcdba558487d81c3cc3ae23503986849fb54f7f2a8089465b251a0dd185f63d47
+EBUILD hglib-2.1.ebuild 844 BLAKE2B f31ef90a9285a211bcd0d7178fced7d996ebff0c553f8206838c0fb86ccc94675dc28c49f586b69645e2ac5a5bc776b32cff85c0441b30ce16de22f73c5eecc8 SHA512 d7147a9d8c33102d45cafabb4fe8e3d21ca6fc1ff64bea13e471e3d06eb799851fe5347935bd78eb8d43497bfe4bcb14445b25cb2d9f05d225b090c03cde9915
 MISC metadata.xml 554 BLAKE2B e418d3cddb3b00704b929f94523e09562a7b2c1e6fed7882ebaa034d11ab5034782d7d377438e7d519f78b89da7b07e3826b1f100b4722f6666cffa8b1b68d26 SHA512 421fa6d625b36970114ae407051d4363367d6a6a2e53cbd87a5a996ef23fdfaeb489342fc8af6e64aa074640b088097ea54397ff09351a6902fc502c5d1146bc
diff --git a/dev-python/hglib/hglib-1.5.ebuild b/dev-python/hglib/hglib-1.5.ebuild
deleted file mode 100644
index cdc81cf4c88c..000000000000
--- a/dev-python/hglib/hglib-1.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-MY_P="python-${P}"
-MY_PN="python-${PN}"
-
-inherit distutils-r1
-
-DESCRIPTION="Library for using the Mercurial Command Server from Python"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="mirror://pypi/p/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-vcs/mercurial-2.4.2"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	if ! ${PYTHON} test.py; then
-		die "Tests failed under ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/stats.py )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hglib/hglib-2.1.ebuild b/dev-python/hglib/hglib-2.1.ebuild
index dee6a7d387a7..bdcfa5b8738e 100644
--- a/dev-python/hglib/hglib-2.1.ebuild
+++ b/dev-python/hglib/hglib-2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 MY_P=python-${P}
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 0ce60e9ea2c5..778346072c97 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,4 +1,4 @@
 AUX hiredis-0.2.0-r1-system-libs.patch 746 BLAKE2B 5819aad60d449d6516587855bfe1d3e873e58e06c86e523964f2b79a6c4de7b14267f63f5733313dec32e081133b8413cc36feb5afa61ff5fb43cc0a4da622e7 SHA512 4679b5b45654c22856278c59ddc37b405960504687cd0f055e74946fcc8e48e97d78f44a664e197cd96cc0ed73ada6ca9d48df05e086e98fd2139998d31a7bde
 DIST hiredis-0.2.0.tar.gz 46113 BLAKE2B bb0479f99f5f705488846ff5e7b52d6e8a5c34519936aa747027e8a597271d3ba70efc2455f54c24248091a4477ac2a307cad7d89a03c96cb7d331e6b6e82a30 SHA512 9eb18ec089517340043d14938a213b139dc948dc9cf2f9c65e632bb4694ac22543b87a5875c1cea083e2bc8e303103c749047889cdb3e9d5680b586d34330c86
-EBUILD hiredis-0.2.0-r1.ebuild 613 BLAKE2B 85b60462fba3c0008a66822f4a80d966cf3f9700bc8791dc76791c573690e662f8c9d33ddc91c0cd764d2633e117605238322def6a5630c8bc5c6365c1189155 SHA512 abc9e2e0d5778abc443499ed17ac6a9e5975d3c7f70ddc90dc700dd222bd3911dd9440bef2be45b24723cee0c97e10a5bd17e78bc468499791011b4b52dbc8d3
+EBUILD hiredis-0.2.0-r1.ebuild 480 BLAKE2B 90dcbea628e512b32100197a0f59c23a69b20eeef514f2adf8bf15db58d1f40dd60ff8a3e0573ce9a4af658d9a4cb1b9824dfb89f1a51ede235e7b263cf1483c SHA512 b7174432df609364de2661780e47d5acf74c05b1727a67506e338b1747e75dd36bc5b3846a0c2a0c14f8e1180afbc01f7f7c30e0030d57f7a05e8d7b84e815a6
 MISC metadata.xml 494 BLAKE2B 066e1d365169e3818e9b5d37f7a2c7812af63ccd2ef79ce1e8dd224b2aa4d110792441762e769791d2c93f5f90349390cb04671ebe4cd199117df20f6fa7d8bd SHA512 f378121293d91d941dcede71f7e7a1a3e6fe906aa5963bd2388f8538d4e696d0bdb16c4f44126105b43ec81b1ee9e36e9549e7557d76c6a032c1cae3a4103265
diff --git a/dev-python/hiredis/hiredis-0.2.0-r1.ebuild b/dev-python/hiredis/hiredis-0.2.0-r1.ebuild
index 1ac28728b1f2..b3bde25c0dd4 100644
--- a/dev-python/hiredis/hiredis-0.2.0-r1.ebuild
+++ b/dev-python/hiredis/hiredis-0.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -19,9 +19,3 @@ DEPEND=">=dev-libs/hiredis-0.13.1"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-r1-system-libs.patch )
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-	distutils-r1_python_compile
-}
diff --git a/dev-python/hiro/Manifest b/dev-python/hiro/Manifest
index 57048969530a..7946e3ee128b 100644
--- a/dev-python/hiro/Manifest
+++ b/dev-python/hiro/Manifest
@@ -1,7 +1,7 @@
 DIST hiro-0.2.tar.gz 9384 BLAKE2B 1acf2bc8a02206e3591de77332ae62f1c635b82b2ef076fb820e49b4e696959b293ceb304701c069afb2437e871bcacebeb1da8b16a75bc8d9b4ffaae84ff540 SHA512 69a66223e678c87363ac4beab8a58bec7976b93fe1b354ac1030842e31463adda84f444732ac48868f6b4f11f4a132a1142889466474bff2a77964449c710b65
 DIST hiro-0.3.tar.gz 9355 BLAKE2B e13119e33396436c35eb7b73549af956b63ab57abbc69589c7abdd97a3e5355922f5697f2d751d3a3507bff60ac162d47541ca85a34a0c77f611c6785515f959 SHA512 c5ace67410ac0e946aa7f93b61448760ab9bba5610621a585f17d1ad99444161a2495a73e20b67d50f1b8b0a4c1b54a9f25732319431905891b7c5fc58c6000d
 DIST hiro-0.5.tar.gz 11022 BLAKE2B b09f5f27b82b5e435823f69ef4dd3e325be39175955fdbd8ce5b3278a7d3879548955676201473f8b61959220e4d9aee1737dce40d2989e1d34fd772aa4bec39 SHA512 0cc84a1da36bbd2f1f59635c26530813f2c48a44fb735c56dbed9d5cc53da52341a60cf21e1796777b5e66bae628fe2ecaf5fce6a9ca6b5d2577d77bf2c8a4ef
-EBUILD hiro-0.2.ebuild 548 BLAKE2B 32f09349852a1d60ca3b7c6a9dc900e0d4ddfd8073611da0c12cd9d9dbcdd363427aaf86bb7bcb4a021e2f62a06de1fdc2f578ae17752677a5ecbaa715c464fb SHA512 ac342075028758804f1800fc4668775f13a21e13f93609e030d1d3333404fedd2c9969dbc5ce835b220d9b4942b9896be7b7dd549e80af683f915ee6755eacdb
-EBUILD hiro-0.3.ebuild 550 BLAKE2B 94fc45ff2dc08b4fb1544d667eeaf534a46d296c214e9d82ce8fb96723fc60b067b7f86f1d1bb40f9ac615b4a87b72e67ff52c24098a52df600bd3f7d52e1842 SHA512 76d94c754644c4ebe4de5caf3de0238b8a2e9064af2b81ca255642dd046001e27c19b5f4a97a17f41c9633173af53edde3aeee27072ad1df4c5e390c656d2cf8
-EBUILD hiro-0.5.ebuild 554 BLAKE2B 93b308019361857d21ab68e9e91471a4800fd03149114be8604568b42efc4bee2d0e5b0d3bfa34a36fddce39663a56dbb86c4199517eb0a96be3857c55d4aded SHA512 1508af17b52dfa0018b95db85c614039f22a327736ae4bc84ef0341dbf64bcd6a790155487f4221ad80ea6266c480858692febc54c1af972dca38801254e8598
+EBUILD hiro-0.2.ebuild 538 BLAKE2B 7764dd96eb1ce522e8730db8c8caaa6dd64e0fa0ea9becefb715500afde95ed7ac480913b90d47eb8767a82fa803e5446d9bf9f32914c3930fa7f5a7338c9291 SHA512 3d59ebf12855b81133a745519784dfc0d7627d5e85f4c993a4efde4eb3088e1bbb682a2490ec2c737a53f95a59ef32ac1f2a7ffdf640acdd9b2b9dc27334cf8c
+EBUILD hiro-0.3.ebuild 540 BLAKE2B 10c74e27ed81b85f95e643f1df793145fdb4a9a54407269c4831a3b5ee9c88aad667527ee37c41795895666f3388c9934cf2abee9b8bf76922ca52abb7933a3b SHA512 6b9e99762cdf8c6f402e899c5f12fbe876720ab87bd57e879bd7f77ef13f060f021dc1e9711a999da95fb9008c94325cceffee5bbbf9139b5e5aa6ddb456023d
+EBUILD hiro-0.5.ebuild 544 BLAKE2B 070447513db26ce2899ff5a31bb1e32abdec568f3f4063846417279c1f72587f1b73f92d7a7722ae642c09e46dab95efa6d10ae860aa4b1f5bdbf7711339368b SHA512 83c2c6f4d2275b04ce2e27fbafce2c1d0f7a71107a207e5ecded3b14de25d4dadd99188d0f75441215b611ba239ea0cf0eef8dc681ed1670c5fe60561631ec7e
 MISC metadata.xml 361 BLAKE2B e809785fc4149bf6d7183792c63f3a4b6591b9dbdc0079c45e80bc5da29f7f146802f9b16a04a8713e968abd83d41b8811f833608763b8a56f474c4ef454c536 SHA512 dd0603e5ffcb021686962cba814ad6631e0affa111ff455c1465d0c245c14e3a8d92947257ee90e5737b58f0c8d452ab6e48e5fcd0bbad9e62ea170207e70f45
diff --git a/dev-python/hiro/hiro-0.2.ebuild b/dev-python/hiro/hiro-0.2.ebuild
index 3961a05b0ea5..746f31866a75 100644
--- a/dev-python/hiro/hiro-0.2.ebuild
+++ b/dev-python/hiro/hiro-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Time manipulation utilities for python"
diff --git a/dev-python/hiro/hiro-0.3.ebuild b/dev-python/hiro/hiro-0.3.ebuild
index f42df1b21a82..3d61cbb2564e 100644
--- a/dev-python/hiro/hiro-0.3.ebuild
+++ b/dev-python/hiro/hiro-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Time manipulation utilities for python"
diff --git a/dev-python/hiro/hiro-0.5.ebuild b/dev-python/hiro/hiro-0.5.ebuild
index 5ead98b371b3..fda46a121642 100644
--- a/dev-python/hiro/hiro-0.5.ebuild
+++ b/dev-python/hiro/hiro-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Time manipulation utilities for Python"
diff --git a/dev-python/hp3parclient/Manifest b/dev-python/hp3parclient/Manifest
deleted file mode 100644
index a68013d81a8f..000000000000
--- a/dev-python/hp3parclient/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hp3parclient-2.0.0.tar.gz 42167 BLAKE2B 9460bb57194536666b8a810cb1879c4cc3b906d89ef984265c9a4367ddca78782f1f4dc008b1352a90154bda2b0fa012e44f954da8f9beff9e6469f21327b1f5 SHA512 8bc4903e31f3f8a73c7656c1c6d722dd5baff05d7fcab1b22505843f0464e207194a333ba86bf487ac44219a9f792d8384cd0a3aefba292013c66f2d798d9552
-DIST hp3parclient-3.0.0.tar.gz 40895 BLAKE2B 5847808b045d7e3dcf9c47aefefcaf3b2f107564cb75f33bb982ef0c00dc4d725a959b5183a68bec8e01242652f47cba8ffc4c82fb31f0431688752c1eaf9400 SHA512 976f28b96ea18ef7995b327403f9ccc2d3322296d4d4ae8c66018b7810adb86f582aec8aed59ddafaa0f8a5cc73b1ef40cf916ad3210a74ce8dae3b1f7f7adff
-EBUILD hp3parclient-2.0.0.ebuild 982 BLAKE2B a645786013901bac1c187860595b29b59e5f295fce6afc660da7f284fc3b456301c99ab0d027ec6739875312c6cbbbad51a5a367c763da7c6426c14d7da04546 SHA512 f2014064f2db7fc1f48e9ca0b717c34d4c26509bd3fd133addc53fb07cef55d57877065b3bb62dab86bfc3379cc750fda049e2f7f030951feb99ad25f842a30f
-EBUILD hp3parclient-3.0.0.ebuild 1068 BLAKE2B a677b761895b6bfd27bea2cfda7460a4a5ded8038130fafc17d97e87e14ed86d1559818bee040f2e8d47c170ecc053e237d3ca228148739aa5b702873a7305cb SHA512 acd7d6bbad7da1bc66d8c09c93315d2a0dffe777c75d0a91a00b338969045ff1f6a9a7284776dc2641094d6727f65fc9abcec92942e7693a4ae89df7853ac479
-MISC metadata.xml 331 BLAKE2B 91f95c97414841a35af1a5eef97e5627ffaaefaac0845198a726e360180bdb128562628ced57b7ad60fc26c3864a3b48786e5d63fb461dc2c731ba705b82f6a5 SHA512 7871745a798e87553a4f378e5c689df0e8e33108138731c39fdc76bb7951f15f29848a4539de3276702d6b5a6254ec974673b2bbd9219dc12ff6736b6928830b
diff --git a/dev-python/hp3parclient/hp3parclient-2.0.0.ebuild b/dev-python/hp3parclient/hp3parclient-2.0.0.ebuild
deleted file mode 100644
index 654b1c4d9e8e..000000000000
--- a/dev-python/hp3parclient/hp3parclient-2.0.0.ebuild
+++ /dev/null
@@ -1,35 +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="A python interface to sendfile(2) system call"
-HOMEPAGE="http://packages.python.org/hp3parclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-python/httplib2-0.6.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/nose-testconfig[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Instructions on running tests are utter nonsense.  Tried and gave up
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( samples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hp3parclient/hp3parclient-3.0.0.ebuild b/dev-python/hp3parclient/hp3parclient-3.0.0.ebuild
deleted file mode 100644
index bb3201fee6e0..000000000000
--- a/dev-python/hp3parclient/hp3parclient-3.0.0.ebuild
+++ /dev/null
@@ -1,37 +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="A python interface to sendfile(2) system call"
-HOMEPAGE="http://packages.python.org/hp3parclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-python/httplib2-0.6.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		test? ( dev-python/werkzeug[${PYTHON_USEDEP}]
-				dev-python/nose-testconfig[${PYTHON_USEDEP}]
-				dev-python/nose[${PYTHON_USEDEP}] )
-		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Instructions on running tests are utter nonsense.  Tried and gave up
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( samples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hp3parclient/metadata.xml b/dev-python/hp3parclient/metadata.xml
deleted file mode 100644
index 1cded487a3ee..000000000000
--- a/dev-python/hp3parclient/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>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">hp3parclient</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 3a4109c35905..d12682a67140 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,6 +1,6 @@
 AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65a82f8cd7eb7ef6140224070c0680b6c4646c111a063ec6a8c7d51ed2e56455eede1696abf6fb82f9d6d14d5aa81d58619b0c802bd SHA512 a1510a688d000b8f45ac48c39ba46336859f952356cf776d5204b512496c523e5dc622d16b17b50d0d6318bd94b817d52683e5f56287f0053ced2508cbf23259
 DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59bb1b21e619135ef33d282d4cd24283e93c71bb71c89d7b5b2a3f8ed36f6d406751c54247472a75192bf50b SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
-EBUILD hpack-2.3.0-r1.ebuild 1064 BLAKE2B de6d1135df9e31e20cb7ca982919bdaba07f828d439ec308badd5d66b820a3da54d9fd8b45a8c71038d6979327756c53670a2c074d61bcf51c3a9f3774ef9671 SHA512 c5a73dea917b82bf713c5562d77703dbe9de7215aa9fcf54bbd7ff3ce83ca6d6dc40417f667a97710c95400d8ddf6cd040b050e8fd40c7d92c1c171d1ab7b2ed
-EBUILD hpack-3.0.0.ebuild 1160 BLAKE2B d9b0eb6231c6599b5a2a413cbbb4d2d2a2ac4bdd2ce985cd8d23649c4cc0713716f79965cc4a7ce68d3b0556009828ffa1c0732dcb593b5e9a714cddee6f4071 SHA512 abcee4af5ffaccd10291636ec176b3e2dd33db3b8dc963e8b89232e1ac8baa696cf194322b062cba2d61d7b3af32d16ccae9bc1e4f8cff815b4d5f74a4e8d5b8
+EBUILD hpack-2.3.0-r1.ebuild 1055 BLAKE2B 965eeac6519ae8db66c5b5eeeda4344a532fbbfa26eb53f89e4e3917b45dbdc8aab1fcc1948172889989d0ca453dac8f1e134dac4615d0ab4bc7d6a457040a7c SHA512 8be2c1861f979cbe1ef98bd2e0d63a30c05e998d67b3e8d932a45f6832cee508f9b0c5a532c5bf3a1937c514bdf0a7117281c4d4ce2f992ab51a3409cc1b521c
+EBUILD hpack-3.0.0.ebuild 1153 BLAKE2B aea59b356f1fa044534bf5d46e88d3c1bd1255dfaea85a83d78f85f638a2834ed97d744bfb05dd4fb8966b3feec5efcee6c43eaa67b546c36c1ba4247b7f3f8a SHA512 b507bc9d1685ad1d44aa153886211c65b65b086ea0d7bbd72197cdbdcb4a5bf424e4868976c172b36077a1edee11106ed0f198db6ffd22975d3465a31c33f352
 MISC metadata.xml 677 BLAKE2B 1440fcf100740188ffc8ae85da9bc014004feb2aa04d5f5db73546e62a01ffbe0975b9b588e6d579c45a2b1c803958999dbdd1cad8c1cbee597a3202556b7d4b SHA512 b7d64d3fa13e9e2f7a794aab733b511ec37809294b0c353d9cff55950dca47e57da8b5b5b80ffb0763f509a498816f94586c11dfdb569ecc6fa604f75c7a6132
diff --git a/dev-python/hpack/hpack-2.3.0-r1.ebuild b/dev-python/hpack/hpack-2.3.0-r1.ebuild
index d6771987760b..524cd585e0e9 100644
--- a/dev-python/hpack/hpack-2.3.0-r1.ebuild
+++ b/dev-python/hpack/hpack-2.3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index 8182bbb647f3..8b32f9ce0ba3 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7,8})
 
 inherit distutils-r1
 
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index 9461cb363993..da0199dcfc29 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,7 +1,7 @@
 DIST html2text-2018.1.9-1.tar.gz 51173 BLAKE2B a21cd3e579d47081e669fda3f3147fc28d816478885942565a1b93b86292e2729e93bfea6b5326703e575f209f5bd7dd905d72011b8153b8c40d31c83acf9057 SHA512 773b508864a2fa31e961e132118702429f5b7836e90bd521db2ed6b4215de49d63991a99b7ad7d5aac3074a3c14e4d384557a4eb5b43c7e2aada46d5434ed229
 DIST html2text-2019.8.11.tar.gz 48721 BLAKE2B 6a63a9608c29374a510d7026717de4b94eb63d366513990623b9bfbf679680c85f5cf06ec7076143397d160a5c484bf5dfef3e24b1862be09e0cc0d7cd86051a SHA512 f405bccea18b2898fc8816483e8fa8912b2d508f139d7a65c54218acc87006d8b89e00a12018dc7b911f729036fe4e8a5069242dc00edb40171d4bc149e39ba6
 DIST html2text-2019.9.26.tar.gz 48634 BLAKE2B efece48c7b05171f9bae833663292d7804838b5a791f1f734b3a258843a71616ada2ebee7cee406e0bfa1a3dce67040d41621bd87be100a2c0d4ca6d75829aa9 SHA512 4c6a52e96d3997a6ebe41c2955e2f6bd5189f49aadd7d7afbe67b85a2f61a0aafd0fc09fef184cb9407b9ab26f120ef235294e4e9d8f41e3b6b8f6fc29aa386d
-EBUILD html2text-2018.1.9.ebuild 931 BLAKE2B 57fb5d8bd7d7123eb81fff832f043229c1cc52cc061e422978af1d16a4970677d44fe5baca51e64d365930ae9019e9fa7c362e338db2420b54ced463a21d2157 SHA512 76caf8cacb1f38867d375561dde5b24fdd76607b624c972b584789fd7f3835475e621ce22aa4b0ada86427aa1a0e8963f1003cf153ee3e50ffbda7717017260c
-EBUILD html2text-2019.8.11.ebuild 975 BLAKE2B 0596cf86fcfc3fc6a9fdf76f1d5f8a3364e58d2b80f6e03d24ca60b72f84d7447c63ddf5c84cbdaa614812d8929180c81bd65980d87b6f9527ea46b776ed725b SHA512 42a50ee24ff715c156d4c28cf6f24c5d1e3a1f3b0958f63953edb55dd9b46c03837edd2794de3d9e48f2757dd09c927d4436041c586b97a1d84b649dbdbc28ca
-EBUILD html2text-2019.9.26.ebuild 961 BLAKE2B 5e77053b1534d403e58eaf4c8d1f703e6c4738c527476e2d3a1370ef413151e96ecefefb2e1fc6efbf9e8ec3eaaf598fc71ebcfb6d434ffd0811a03573ccda1b SHA512 e3b27394ff8e9dac8832e8fd30cb68748d343c5c3bf012ff8b55830e3c51aaf0861a331ec00fb6547ae771af6055a9adf982cc70d781a5719211b8c001ae0f8b
+EBUILD html2text-2018.1.9.ebuild 924 BLAKE2B b7a75f3a201c2d92932a7eb9645c2d28873198abeea9bd6f9dac6b0a42fe0220ca5aa541fec5a41d4024f35f188a8462abcda409aaec1d74df2f81cc7e04ea69 SHA512 824e0a4e2a8661d8c95af2e4bde31b32f0f511767898b69db31ab7beb5d105677a58363c86e6078ea3dd7b01f37a7a3a3297dff739ac41856275c0bd53c3016a
+EBUILD html2text-2019.8.11.ebuild 970 BLAKE2B cfde04cc5cf11f82ed7fa73c45e2044f12f2aeac9ad565d6cb12d987e2ad4ac99a2bc7855ac7690c6fd348fb556e487412e9fcc8af2fd3578dc7d57b4ef158e9 SHA512 d908126f00654c5f086fd66e0fe472e1af88451da328b3a975661792e994081e1c142566af20f4e7987fd64e9a2d0cf541645c538723fbfac257b63c3309c910
+EBUILD html2text-2019.9.26.ebuild 959 BLAKE2B 1d9396614b9f267896151d27057e6744722e9259e7e10d77192b1cd0fff964a7ecfa775078838a2c701554dd8a3e2c9004a8ec9116930c1f132b1005c7c913cb SHA512 dba23ddf39b1e01d2ecf47a1e921e9614cd1c3c885c64e69708292394aaadcf2e6917b7c5c833773dd8916fca24d63cb09d83a41c37e4f7d4f0b37bc83615018
 MISC metadata.xml 369 BLAKE2B d4f2c4f645c20a9e803e76df75ca78b79d8ccebe56ee8430d38abdcc096be85397b6541ddc2f25cb2c79d955b9ee913437edda69956cb78c1f0c38256b311be5 SHA512 dfa2834eca444d2c56f36b11a193c4e6b012b3a3afab08034c87d9ebb442010f2454788416380a4caf78ebaf47feb2212643977aab3100971fa99f29fe29955e
diff --git a/dev-python/html2text/html2text-2018.1.9.ebuild b/dev-python/html2text/html2text-2018.1.9.ebuild
index 1703ea13150f..c14248bc9280 100644
--- a/dev-python/html2text/html2text-2018.1.9.ebuild
+++ b/dev-python/html2text/html2text-2018.1.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/html2text/html2text-2019.8.11.ebuild b/dev-python/html2text/html2text-2019.8.11.ebuild
index e44c8fcbf968..484d4f543a38 100644
--- a/dev-python/html2text/html2text-2019.8.11.ebuild
+++ b/dev-python/html2text/html2text-2019.8.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/html2text/html2text-2019.9.26.ebuild b/dev-python/html2text/html2text-2019.9.26.ebuild
index 8cb53b668f84..bf119c0911ea 100644
--- a/dev-python/html2text/html2text-2019.9.26.ebuild
+++ b/dev-python/html2text/html2text-2019.9.26.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index ba8a95d71dc6..5ba5e92f0a41 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,5 +1,3 @@
-DIST html5-parser-0.4.4.tar.gz 267787 BLAKE2B 9fcaec9faa906914d43f2b19381fe3095d4cd009bfb534537d2eabb420195276b3690d760c1defc92ad00e4965b3eb34ce4700d54f4f0291dff88026d890c90d SHA512 3aaeb32f360d2c131ecbe11fa1dcd3dfcd62c9ca046fce7dd4ff8127d0e62216f666e83bb20c7809c6adc591e1fb2798e382e78a1cf6129b1f0a09a71377f8d4
-DIST html5-parser-0.4.5.tar.gz 275587 BLAKE2B e26db3b6c55d43e26eb08076c59012814c2dd8739d6cba591e34cf8e304aa78bdf3440405668875acece2c21425f26ed9a0edbc5bb1da55da09c17eb52fa74aa SHA512 3c0421dd228ba5f3544f188fde5391d6be0fe92b879cf1e7697b5e5612a9e5bf08863bcb76f4297a59bfbfc69010a95f5d97fff78a7e6d26c889e173b07e4ae5
-EBUILD html5-parser-0.4.4-r1.ebuild 776 BLAKE2B 62b026b9b79358198eb0b0450d4a22ef45ce36666a00f964fa0169533becb166a0481e77a93de5c3a197494249f19a163c4ff416d5061e50fcb3dcc6846cb756 SHA512 550c670b8b08c2824c8e6cbeecccee7608829655c934489844f65961d6dccbe1ebc0cc04fb8f7c5b646dbce435fc96c05d022252be2481d8273491561e9d6cbf
-EBUILD html5-parser-0.4.5.ebuild 867 BLAKE2B 48a11f287812ce48cdafc41d1d77cbcf361463bd03ccecf7934e94a6d19f62fbb8926601e16c8e131b89928982a7b50290797088d6876a8fe4f846111aea26f4 SHA512 a42cf59622a319aed35ec89c4a1dd40e5b893c41fa1e213606a07ffb1ecb5337abf19eb4c9c137c45e5bf4ae6da2924cf4433b8968519f0cb5b8b1d5b8acd4f5
+DIST html5-parser-0.4.9.tar.gz 274597 BLAKE2B 7744798d74db1d591490c75eabae5333e90f053a8ba1c5517f08c1b9c253042796e42618ae0a674e1b1cfa97390448ffc595e861234f5b980a1f7c0b9056cc88 SHA512 0fce4b1a18b29a9fa94e3769e2443601a502158056be1c93c1c1ddd5fe84d11d5d6dcae6338ac0a21aae7972625f28c0ba66099fc51081f504cb596626de990e
+EBUILD html5-parser-0.4.9.ebuild 865 BLAKE2B 6a19270a69713aa88f79c0bc6c95878f32048c7caa9c6c53f60bdc46c441a67827785be3d990036280bfb8f709b57e83b0f31063a38a2de11b43aea3d5afb5c7 SHA512 9183db0f165948b84f18614ee6ecc4a9c848de9a384ac6b4f6e08f22a9372c3136f1efb023cd9bdaa0a23bf6f6b93061cebff184fd06362a8f69ed76409cdd9c
 MISC metadata.xml 356 BLAKE2B 8e97cfc61c6249d06916c0c6464637f4d776d81ebb060409181ba40eb91a65485a3c067b50f18dc9d9c9bf29f5a98bd40dc6ff89a0c68b30bc00353917db4e08 SHA512 3452ea432c8187cf09b7ce3b70df1c951ae243c153300093583efc337d9f6c42c41082b34ff6a81c19337ef508c90cff4308d0da63a44f4976d11ff57779baca
diff --git a/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild b/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild
deleted file mode 100644
index fc72f6f9e446..000000000000
--- a/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast C based HTML 5 parsing for python"
-HOMEPAGE="https://github.com/kovidgoyal/html5-parser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2:=
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	# Soup is not used when lxml is available.
-	rm test/soup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/html5-parser/html5-parser-0.4.5.ebuild b/dev-python/html5-parser/html5-parser-0.4.5.ebuild
deleted file mode 100644
index 80cb6bad74b6..000000000000
--- a/dev-python/html5-parser/html5-parser-0.4.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Fast C based HTML 5 parsing for python"
-HOMEPAGE="https://github.com/kovidgoyal/html5-parser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="dev-libs/libxml2:="
-RDEPEND="${DEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	# Soup is not used when lxml is available.
-	rm test/soup.py || die
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
-}
-
-python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/html5-parser/html5-parser-0.4.9.ebuild b/dev-python/html5-parser/html5-parser-0.4.9.ebuild
new file mode 100644
index 000000000000..68b69b2f7b81
--- /dev/null
+++ b/dev-python/html5-parser/html5-parser-0.4.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Fast C based HTML 5 parsing for python"
+HOMEPAGE="https://github.com/kovidgoyal/html5-parser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-libs/libxml2:="
+RDEPEND="${DEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	# Soup is not used when lxml is available.
+	rm test/soup.py || die
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
+}
+
+python_test() {
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index 73ce00b1e46d..b1aaa399c481 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -2,8 +2,8 @@ AUX html5lib-python-1.0.1-support-pytest4.patch 13579 BLAKE2B 723c8a77f200897837
 DIST html5lib-0.9999999.tar.gz 889312 BLAKE2B 49cbab503692a1044ef37b11d9b776fb0378c19f1cbe05b259b4653d248e3571e5578d7879ab3ec5df2e750db74c353acc98d1d6e8556949c1b1efb62f38c116 SHA512 1748a1921f4bc93b7f208d89701eeabfe507e40515dd2e88ece239ba7c1704c8ae9dc4eea310164c7b207225dce910f78a8b34f826f4f87a2992365c07089c28
 DIST html5lib-0.999999999.tar.gz 245488 BLAKE2B 3d2409f18e7ff6b6882e163b782703a7d2b2d42f8c131ab05a51499a4cd23d75ff8d097c1ce87e9f28e8ce649bec8099d364f4d01ee64d0efdfc75fba1d01067 SHA512 b30d9ea74d0ad03e07ebee0d33caefeed717e6084f2ef44559ebf73948563ffd60e40c774e23c8964a32b0f265d1d1f0b98759861acaa208f28e5ab2813c3ca0
 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
-EBUILD html5lib-0.9999999.ebuild 1095 BLAKE2B 3a2e4e21a3c911559dfa7dd16727c22f3e8761d39e0fcbc895f1dfbd840d5bd9ff39ab0260a101c2fd2448ba3c51dd779af5e71b793ea861ee344a37bd8b39fb SHA512 21b594c6b3a0a1a0f6cba47666cddfbb6baed899d150950b50c6a5bef862c31f4bb401f3614d0211a17ef9486b6aaaa6a772735839c0752fb3ce31c2ae79743c
-EBUILD html5lib-0.999999999.ebuild 916 BLAKE2B 5431a1cc42080e77ceae07b2e2ec490219784e2667afde114b886f50c3580a53492a74a2b1781b7cee9f01199405d334a4832ce51f048e32c774a53b22d7f5af SHA512 07a92d47da5f65b734c9392f9cbaad6e38c91cc8bde9c59652708ff83aa6fa754d9984ba5f20a019079e108bf69c6ce418048572d2559bafd9aafd64a27ca99f
-EBUILD html5lib-1.0.1-r1.ebuild 980 BLAKE2B 957c04fba00898c68ff659fc05ee985937293c0f885f73f2f7abab508e9d0581b622f145ec05e40a0e90488045af5c51a13a4c509ccb8861a259cd743c0df8f2 SHA512 76bbfd794d79cc14745e39386cce6d86f6d115315a641a7e2366371dbf4b0b3d71b754f9b867734391582ec722d6a133d8f817eb13eb42927ea6009dc11d67a0
-EBUILD html5lib-1.0.1.ebuild 916 BLAKE2B 243bc80cf44ffcdef9fe18a9f9ef09da4c309e841ae8aaab4d20bdc3debd1864a0fc1e7a15c8e9d591e0ea837eab19570f774616f7e1a1ce37c8a8b28c9a953a SHA512 1526660605fa25448660e8cc9fdea3d3ece8fc7c65435c6ea13d891cf82988da2a50a15fe34d418a74130db4653e63215d08eef2c54b962e9e0460f60ea8cd25
+EBUILD html5lib-0.9999999.ebuild 1086 BLAKE2B 06cd9b73cde0e8e62f5d5f6f299a503c3d4f4bac2c7aab76c838d02cc13664daf5f365832344f8ef517450a8fa7163da06f1a9bcc38108a98b3477424b1325f8 SHA512 cd069fad6f42e1754ed7cc465a1d11fe6f20a977e7a86c1cd39895c0e7c7ac6466de68fde0c760ae418082be8776221c175cadf586c0490bcb1e375a5c7890e7
+EBUILD html5lib-0.999999999.ebuild 907 BLAKE2B 53f1f0f29ccd6a236de8cf0e2b008a274ada60dbfbb6be014782ca1f52172170eb5ab172046d42951c316f20e0864088fdc9319c9f1ef3fcda22e527fabf3d24 SHA512 cd8546d1343b2af05a5b63e5ec7558f4b13198334602d0e1be5b9747103af45850107acaf13f8ab9364aee31541092fc6305f0d9c0d03dbeb8cbca201673808f
+EBUILD html5lib-1.0.1-r1.ebuild 975 BLAKE2B 818d5524163846aead7be1f617e0f8124994637e96dbbf902ab3dd2f5aff9d1a8ba49080404517a602a2d4f2846123cd59fbad893f22075b3af1fa24f043bbf0 SHA512 5893214862f1fae557fdc2f2606f00da31910a3802772a0f03b94073792fbcaad44868811f375e2ad023bb8d74ff4b3e9e2bff264bf01174b4fe83ca9331fc10
+EBUILD html5lib-1.0.1.ebuild 909 BLAKE2B e10d730c41fe478685879a467c91f671dc48cd8732642a4ca830218c10e96c5e7abc1ecdf2d40ec1c18289df916345f075b17b8911b9de17cb541f10dceb2835 SHA512 954494cbe252cb8875fb7bb2fdd7f6cbfcde2c1a7aa0b43b6c02ea51590f8faba845a14e31dd3906044c817c2176cdf733ab5df30753edc0a3b930230f194727
 MISC metadata.xml 589 BLAKE2B d98d80202c045607de5843e34313a06e9493c50bb1154e3f90a7c1c9236de2b4369827d35cb8540125524b54c0453ce56ca7ecf3a359bd9bab6e548ea1377f9f SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a
diff --git a/dev-python/html5lib/html5lib-0.9999999.ebuild b/dev-python/html5lib/html5lib-0.9999999.ebuild
index c104dbfa8838..1ca602e5c392 100644
--- a/dev-python/html5lib/html5lib-0.9999999.ebuild
+++ b/dev-python/html5lib/html5lib-0.9999999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/html5lib/html5lib-0.999999999.ebuild b/dev-python/html5lib/html5lib-0.999999999.ebuild
index 1f16891c8f27..427a82743f70 100644
--- a/dev-python/html5lib/html5lib-0.999999999.ebuild
+++ b/dev-python/html5lib/html5lib-0.999999999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/html5lib/html5lib-1.0.1-r1.ebuild b/dev-python/html5lib/html5lib-1.0.1-r1.ebuild
index 751b9bc332dc..3b5031979f80 100644
--- a/dev-python/html5lib/html5lib-1.0.1-r1.ebuild
+++ b/dev-python/html5lib/html5lib-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/html5lib/html5lib-1.0.1.ebuild b/dev-python/html5lib/html5lib-1.0.1.ebuild
index c67285351b05..40b15cb66978 100644
--- a/dev-python/html5lib/html5lib-1.0.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/htmlgen/Manifest b/dev-python/htmlgen/Manifest
deleted file mode 100644
index 6f311e1f5741..000000000000
--- a/dev-python/htmlgen/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX htmlgen-2.2.2-python-2.5.patch 5226 BLAKE2B 9b724899e92734150193b22d2e80db27c1ebb13cd42fa4484f30908335b7d070f67ef1af9a0d18e79b5c1a5d575261172fbd2959999a50721322a52798cf21e5 SHA512 340cc8603aa112b82a366b820691a49be62713d5d3611944d842b5170b7a267259dc8af75fedf30cbb8af9c514cc8f102caeca9e106a7afa8f154f0601b9d947
-AUX htmlgen-pillow.patch 1621 BLAKE2B efcbd0729a18edb98206a407fc6caf3412cabefa426f632b176f2e44825cb09e6a0677a249e15aa2e8ac578b225364f676217871f13be1cb7f3b1f1947090cfb SHA512 160896ecbac5135730ba06765d108e223f56b7fdc38595ff3a575639a7562e2259afad37ff3ada3633437ac01596501c044fc1a0438cd5a24a66ada98f41926f
-DIST HTMLgen.tgz 316415 BLAKE2B 8a01df9243f32628437bf2a83f906e946da73f0fe4f8e879d4689173da8fe877b28a8941473e3ccc300009a94f777bcbb438dceb52bc7e991796ffc702474574 SHA512 8301d4a28c29f477f07eedee2bffd6d07e345f08c056402098fa966f0e61895ed4dea60b653793b30d8457a7d692e3af772514d86ae440950fd52719bbadf942
-EBUILD htmlgen-2.2.2-r1.ebuild 1510 BLAKE2B cbf19eceae3729c52a74e4409606969fc5a14f2850ecf30ebb4b456d5bdedf23260ec669eac46e2b344da191200be2ed3fe9e64dc199ce4a5c45f48ac3797e13 SHA512 e869760d9711a89805fc7b763b348b8fdd4b253ec74935832c459e8321012404714173dc2f735af3c1f9dbc406de4ca46faa1cb3d5c249a2b7c654cc095db872
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/htmlgen/files/htmlgen-2.2.2-python-2.5.patch b/dev-python/htmlgen/files/htmlgen-2.2.2-python-2.5.patch
deleted file mode 100644
index 7bdff6815011..000000000000
--- a/dev-python/htmlgen/files/htmlgen-2.2.2-python-2.5.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- HTMLcalendar.py
-+++ HTMLcalendar.py
-@@ -212,12 +212,12 @@
-             return value
-         else:
-             raise TypeError, ('cannot convert to int', value)
--import regex
--datepat = regex.compile('^ *\([0-9*][0-9]?\)[/-]' #first 2 char date field
-+import re
-+datepat = re.compile('^ *\([0-9*][0-9]?\)[/-]' #first 2 char date field
-                         '\([0-9][0-9]?\)[/-]?'    #second 2 char date field
-                         '\([12][0-9][0-9][0-9]\)?[ \t]*:') #optional year field
--daypat  = regex.compile('^ *\('+string.join(day_name,'\|')+'\)')
--timepat = regex.compile('\([0-9][0-9]?\):\([0-9][0-9]\)')
-+daypat  = re.compile('^ *\('+string.join(day_name,'\|')+'\)')
-+timepat = re.compile('\([0-9][0-9]?\):\([0-9][0-9]\)')
- 
- def read_appt_file(filename):
-     """Parsing function.
---- HTMLgen.py
-+++ HTMLgen.py
-@@ -924,7 +924,7 @@
-     def antispam(self, address):
-         """Process a string with HTML encodings to defeat address spiders.
-         """
--        from whrandom import choice
-+        from random import choice
-         buffer = map(None, address)
-         for i in range(0, len(address), choice((2,3,4))):
-             buffer[i] = '&#%d;' % ord(buffer[i])
---- HTMLtest.py
-+++ HTMLtest.py
-@@ -2,7 +2,7 @@
- 
- """Test script which generates the online documentation for HTMLgen.
- """
--import string, regex, regsub, os, time, glob
-+import string, re, re, os, time, glob
- from HTMLcolors import *
- from HTMLgen import *
- import HTMLgen  #only so I can pick off the __version__
-@@ -232,11 +232,11 @@
-     doc.email = 'jefferson@montecello.virginia.gov'
-     doc.logo = ('../image/eagle21.gif', 64, 54)
-     # parse Declaration of Independence
--    re_hline = regex.compile('^--+$')
--    re_title = regex.compile('^Title:\(.*$\)')
-+    re_hline = re.compile('^--+$')
-+    re_title = re.compile('^Title:\(.*$\)')
-     font2 = Font(size='+2')
-     s = open(os.path.join(datadir, 'DoI.txt')).read()
--    paragraphs = regsub.split(s, '\n\([\t ]*\n\)+')
-+    paragraphs = re.split(s, '\n\([\t ]*\n\)+')
-     for para in paragraphs:
-         if not para: continue
-         if re_title.search(para) > -1:
-@@ -263,7 +263,7 @@
-     #Ok parse that file
-     f = open(mpath(os.path.join(datadir, 'parrot.txt')))
-     line = f.readline()
--    re_dialog = regex.compile('\(^[OC].*:\)\(.*\)')
-+    re_dialog = re.compile('\(^[OC].*:\)\(.*\)')
-     while line:
-         if re_dialog.search(line) > -1:
-             role, prose = re_dialog.group(1,2)
---- HTMLutil.py
-+++ HTMLutil.py
-@@ -19,7 +19,7 @@
- # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- # PERFORMANCE OF THIS SOFTWARE.
- __version__ = '$Id: HTMLutil.py,v 1.3 1998/05/28 20:14:52 friedric Exp $'
--import string, regex, os
-+import string, re, os
- import HTMLgen, HTMLcolors
- from types import *
- 
-@@ -79,7 +79,7 @@
-     """Determine if the text have been marked by a previous gsub.
-     (ugly hack but it works)
-     """
--    if regex.search('\(</?FONT\)\|\(</?STRONG\)', text) > -1:
-+    if re.search('\(</?FONT\)\|\(</?STRONG\)', text) > -1:
-         return 1
-     else: 
-         return 0
-@@ -125,13 +125,13 @@
- not_backslash = "[^\\\\]"
- triple_single = "'''"
- triple_double = '"""'
--_doc_start_re = regex.compile(
-+_doc_start_re = re.compile(
-     "\(^\|" + not_backslash + "\)" # bol or not backslash
-     + "\(" + triple_single + "\|" + triple_double + "\)" )
- single_re = not_backslash + triple_single
- double_re = not_backslash + triple_double
--_triple_re = { triple_single : regex.compile(single_re),
--               triple_double : regex.compile(double_re) }
-+_triple_re = { triple_single : re.compile(single_re),
-+               triple_double : re.compile(double_re) }
- 
- del not_backslash, triple_single, triple_double, \
-     single_re, double_re
-@@ -150,13 +150,13 @@
-         return (None, None)
-     return startquote, quotefinder.regs[0][1]
- 
--string_re = regex.compile('\(\(\'[^\'\n]*\'\)\|\("[^"\n]"\)\)')
-+string_re = re.compile('\(\(\'[^\'\n]*\'\)\|\("[^"\n]"\)\)')
- def find_string_literal( s, begin=0 ):
-     if string_re.search(s, begin) > -1:
-         return string_re.regs[1]
-     return (None, None)
- 
--comment_re = regex.compile('#.*$')
-+comment_re = re.compile('#.*$')
- def find_comment( s, begin=0 ):
-     while comment_re.search(s, begin) > -1:
-         if been_marked(comment_re.group(0)):
-@@ -166,13 +166,13 @@
-     return (None, None)
- 
- Name = '[a-zA-Z_][a-zA-Z0-9_]*'
--func_re = regex.compile('\(^[ \t]*def[ \t]+' +Name+ '\)[ \t]*(') 
-+func_re = re.compile('\(^[ \t]*def[ \t]+' +Name+ '\)[ \t]*(') 
- def find_function( s, begin=0 ):
-     if func_re.search(s, begin) > -1:
-         return func_re.regs[1]
-     return (None, None)
- 
--class_re = regex.compile('\(^[ \t]*class[ \t]+' +Name+ '\)[ \t]*[(:]')
-+class_re = re.compile('\(^[ \t]*class[ \t]+' +Name+ '\)[ \t]*[(:]')
- def find_class( s, begin=0 ):
-     if class_re.search(s, begin) > -1:
-         return class_re.regs[1]
---- ImagePaletteH.py
-+++ ImagePaletteH.py
-@@ -70,7 +70,7 @@
-     return ImagePalette(mode, palette * len(mode))
- 
- def random(mode = "RGB"):
--    from whrandom import randint
-+    from random import randint
-     palette = map(lambda a: randint(0, 255), [0]*256*len(mode))
-     return ImagePalette(mode, palette)
- 
diff --git a/dev-python/htmlgen/files/htmlgen-pillow.patch b/dev-python/htmlgen/files/htmlgen-pillow.patch
deleted file mode 100644
index 0c4f3daa27f4..000000000000
--- a/dev-python/htmlgen/files/htmlgen-pillow.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Fix PIL imports for Pillow compat
-https://bugs.gentoo.org/show_bug.cgi?id=471506
---- HTMLgen/ImageH.py	1999-04-20 22:40:28.000000000 -0400
-+++ HTMLgen/ImageH.py	2013-06-08 14:00:49.261734532 -0400
-@@ -576,7 +576,7 @@
-         "Display image (for debug purposes only)"
- 
- 	try:
--	    import ImageTk
-+	    from PIL import ImageTk
- 	    ImageTk._show(self, title)
- 	    # note: caller must enter mainloop
- 	except:
---- HTMLgen/ImagePaletteH.py	2013-06-08 13:56:03.476318926 -0400
-+++ HTMLgen/ImagePaletteH.py	2013-06-08 14:01:26.564871622 -0400
-@@ -87,7 +87,7 @@
- 
-     if not lut:
-         try:
--            import GimpPaletteFile
-+            from PIL import GimpPaletteFile
-             fp.seek(0)
-             p = GimpPaletteFile.GimpPaletteFile(fp)
-             lut = p.getpalette()
-@@ -96,7 +96,7 @@
- 
-     if not lut:
-         try:
--            import GimpGradientFile
-+            from PIL import GimpGradientFile
-             fp.seek(0)
-             p = GimpGradientFile.GimpGradientFile(fp)
-             lut = p.getpalette()
-@@ -105,7 +105,7 @@
- 
-     if not lut:
-         try:
--            import PaletteFile
-+            from PIL import PaletteFile
-             fp.seek(0)
-             p = PaletteFile.PaletteFile(fp)
-             lut = p.getpalette()
---- HTMLgen/imgsize.py	1998-05-25 13:56:37.000000000 -0400
-+++ HTMLgen/imgsize.py	2013-06-08 14:01:48.731358969 -0400
-@@ -15,7 +15,7 @@
- 
- try: #Following switcheroo ensures that if PIL is installed it's used instead
-     # of the HTMLgen-bundled copies.
--    import Image
-+    from PIL import Image
- except ImportError:
-     import ImageH
-     Image = ImageH
diff --git a/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild b/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
deleted file mode 100644
index 528d9be0955b..000000000000
--- a/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,59 +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 eutils python-r1
-
-MY_P="HTMLgen"
-DESCRIPTION="HTMLgen - Python modules for the generation of HTML documents"
-HOMEPAGE="http://soc.if.usp.br/manual/python-htmlgen/html/main.html"
-SRC_URI="http://starship.python.net/crew/friedrich/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
-IUSE="doc"
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-python-2.5.patch"
-	epatch "${FILESDIR}/${PN}-pillow.patch"
-}
-
-src_compile() {
-	return 0
-}
-
-src_install() {
-	# doing this manually because their build scripts suck
-	local files="HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py
-	barchart.py colorcube.py imgsize.py NavLinks.py Formtools.py
-	ImageH.py ImageFileH.py ImagePaletteH.py GifImagePluginH.py
-	JpegImagePluginH.py PngImagePluginH.py"
-
-	mkdir htmlgen || die
-	touch htmlgen/__init__.py || die
-	ln ${files} htmlgen/ || die
-	python_foreach_impl python_domodule htmlgen
-
-	if use doc; then
-		# fix the image locations in the docs
-		sed -i -e "s;../image/;image/;g" html/* || die "sed failed"
-		dohtml html/*
-		dohtml -r image
-	fi
-	dodoc README
-}
-
-pkg_postinst() {
-	ewarn "htmlgen now resides in its own subdirectory"
-	ewarn "so you need to do \"from htmlgen import HTMLgen\" instead of \"import HTMLgen\""
-}
diff --git a/dev-python/htmlgen/metadata.xml b/dev-python/htmlgen/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/htmlgen/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/httmock/Manifest b/dev-python/httmock/Manifest
index 691f14c89c33..000fce09c16b 100644
--- a/dev-python/httmock/Manifest
+++ b/dev-python/httmock/Manifest
@@ -1,3 +1,3 @@
 DIST httmock-1.2.5.tar.gz 5409 BLAKE2B 06ea90b6553b2d97b72944a05587e07c4c6ffa9282a81dd976c8f875ae92fbeded10dde0c060b2c9883bf2827d7233cde337f3d995e30d9057119632a49ee9cd SHA512 1dc3bd506f76f2e57db5268201faeb7038b9a62873f0113590023c7b889903428fc3c796db4accf74f53cae60a258160c3698dd9cef71024183f0c6f05040b80
-EBUILD httmock-1.2.5.ebuild 542 BLAKE2B ef86577050b855e042a783490c5364153b6ac5f951e65b3b40dc2e2c5e209caf3e766bcaf95a31db78e67778d7a5fd0caabc5d46dcb5ed5f98f05506ac8d1c5f SHA512 93fbe7b51e9ff38d05ff42baaf6e372356d631bac72d6261b471ec5d311309ed53baa0806eabb58550ac8ae0ee3afadd4b252610b23bc52636ce2b1bf746e656
+EBUILD httmock-1.2.5.ebuild 533 BLAKE2B 87efa16e7cc46e55e71ba8c4c2c23a10524697ce304a1730ebc229ec6d77a67844ba0436d1a585a51f320b03826c2f605c3e23e1a5c0869ae40bcfc14cfcff9a SHA512 6fd729aa4255110d856e0496b014d19e6a85ff86c7bcb88c75b9ed9c983235c30163f83d262c76bb4c7f974b580acf412fe30f38045ff28ea1f8b616a196e19b
 MISC metadata.xml 246 BLAKE2B 7bbbd7b1426aa97da0217eb9a4693facfd85920a077235778070e692ea562e596cc884db84f66223af907824cd0b97f8b1617fedff2dff37ab8802cec0874cd9 SHA512 8e33ef8d63dacd3d70b04a4b0f2e206148f09bb605a51e1d51d069351b498238bfd205574f45a0cd606422364e093023b8dc40bbfa3ab0afe26ba8e052df4f74
diff --git a/dev-python/httmock/httmock-1.2.5.ebuild b/dev-python/httmock/httmock-1.2.5.ebuild
index b44d32d1bc3f..1554818eae02 100644
--- a/dev-python/httmock/httmock-1.2.5.ebuild
+++ b/dev-python/httmock/httmock-1.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/http-parser/Manifest b/dev-python/http-parser/Manifest
index 72c69231c77e..810c66b569f0 100644
--- a/dev-python/http-parser/Manifest
+++ b/dev-python/http-parser/Manifest
@@ -1,3 +1,3 @@
 DIST http-parser-0.8.3.tar.gz 83040 BLAKE2B 8ccfd15154e34756229159576340536e447a1b76375df7c3f56b96c79957a3b28569fd4a4e77303fd1d254aa5652478f7e319e7556150de563f5b12c58482de4 SHA512 aca583d976dcf172244179cc4199336f296dbb2e2838dded23e64d55f23298fe600f9c24ba6cb6d1d5faad3022710154949fd39adecaef763f7589a58d03fbd1
-EBUILD http-parser-0.8.3.ebuild 894 BLAKE2B 94772ca2fad379311432f369548794be29de69a8a7b47a94b9a9bbabc32fa1ce4b671341e19babd5321e9be5edcaf5a9e348b847ad3b757df53e2ead97a652b6 SHA512 e2f8e99defdbeab80404952eac4ac097b9ad5403d0339aac415857054aed40afb132ea1cbb2bb9c79580844047810c792662354b64566e35b940be9858e04b12
+EBUILD http-parser-0.8.3.ebuild 885 BLAKE2B 9ad2fa9d269b4e41ac57a617cc1e65507dde1646b76b452f6ec376dbb34be94c91737462f3f0ef1eca201546d2607a855534566b91f0795ae6a8140f5b0996c4 SHA512 504542506fa4f437df32f0fc6a476d6981f5868c6d68b57d75e2fc9021f623f76317a29cc64c2b340b8a76145d99d107af3931af91e99d09368eec4b3aef5433
 MISC metadata.xml 385 BLAKE2B 16371b248416d43a094b0038919816277b3dbced190f2684cbc6d0ff9cff6007cb7e5e44d867eff942f46173edf5018a4b15383454344fcfe003544aa3e64fba SHA512 5b4b7b992bf4036ee076a2714bd0b91540b071fac6194ade8327e71062d7dfc5597f68934c275d72756c5ebb25e334059df4112946a1a84ab20ca0710ee16760
diff --git a/dev-python/http-parser/http-parser-0.8.3.ebuild b/dev-python/http-parser/http-parser-0.8.3.ebuild
index ba294b8c58c4..534c30604b62 100644
--- a/dev-python/http-parser/http-parser-0.8.3.ebuild
+++ b/dev-python/http-parser/http-parser-0.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/httpauth/Manifest b/dev-python/httpauth/Manifest
index 6f8135ea6f39..de90294735c2 100644
--- a/dev-python/httpauth/Manifest
+++ b/dev-python/httpauth/Manifest
@@ -1,3 +1,3 @@
 DIST httpauth-0.3.tar.gz 4440 BLAKE2B 41c9ba9ee50b7fcc4ed409f4b34897b5243df4065fd081cd5c0951ebe2719a34a424e59c21adbcd9be133c8fe4fa4ad9dc7bec561285b873987f982f684b3682 SHA512 aa35148322a1c5ffc22a132d3062d300118aa23181a0008018d0aacfd473758d86d50ff1236d88126858a53e2f45aeea938988b2d1a8f62f80a97d8c2cc69822
-EBUILD httpauth-0.3.ebuild 637 BLAKE2B 5329d91f6c0c69e3af50e11c35ec8c526d6a3fea782283ac04a2a1143f0de6ce23a4174018f4703c089d99c1d69ae4c2f60adde0bc6fc1c2d293bc54ba84df9f SHA512 414a1cad30d1e5b012d16c8c4096a79929c4f41c3092a49f7a946c206b2a18fab28e16562d0d8a1cf1ac37977c442b971fdd5804a1ef2e55db8b7b6795ed19b9
+EBUILD httpauth-0.3.ebuild 632 BLAKE2B fce0efd1a0f0186425a593e40f35d4a9a844d562b195661da6aea7c6b26c907b134be05b900e6787e275eab18517f8f42461ec371963ffec61e3b116baeadda3 SHA512 dc75ed2ad9336a15aaf194b566a0116e361307a4521dc718fb1ead3398ebebb6554dd2cd3c94b2f2a3651bd3a5ebe85a5ef29ba36b4d4e08a7326e360970883e
 MISC metadata.xml 440 BLAKE2B 440d03c6243a6b43d9b8d033ad41383a2f3a1c375ad085e7c9241fc85a301ca4bdf2d1831e76dc55e6f17975e560fb90d6cd88bc1df57f31a8880068afbea80c SHA512 572f2e592e08ea0316f9df8fad23e77dc78644adb664e975631944d06d8ddb3a560724d3d241f33fd323fc83877b75506527960c4f3790fc650c88b461770a82
diff --git a/dev-python/httpauth/httpauth-0.3.ebuild b/dev-python/httpauth/httpauth-0.3.ebuild
index 89227248334a..7ebdcafbbddf 100644
--- a/dev-python/httpauth/httpauth-0.3.ebuild
+++ b/dev-python/httpauth/httpauth-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 454056c12290..182efb2176c9 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -2,6 +2,6 @@ AUX httpbin-0.7.0-optional-raven.patch 841 BLAKE2B bdf8cd94706b08d6706349ad47121
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
 DIST httpbin-0.4.1.tar.gz 88101 BLAKE2B 3df333ba92d50e065a598b2dc51ff3355eb94eb4b3a3094ba79cbe95fc11424e05f187e434ac299023dfbfd790b32db070a37e08a962ac19d803de4405603bb8 SHA512 feb519ee909c5115971f4bfd488ec0f9e987cd473464721f4e343e09b9d8fc592cf48b50ff3a2960bb67310521d865091cd766ed351ebfaa2dc8193115e9f052
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
-EBUILD httpbin-0.4.1.ebuild 895 BLAKE2B 4c5c5ec61394a4f13f81d1f240fb8967469d863c734c36ed1bd02370c3d5e533b885d8a7aaa64ae19ead1afbc6fcb67d9b0ac42b8fed3f0660ab4dde4e41b9c0 SHA512 49a277badcbae212f365d58afdf744b03f6c32b42837a93633b75f4564464e14872817f0ff0c104f9b5accb33563df4b82b29595f6efe3da317966269ebb79b3
-EBUILD httpbin-0.7.0.ebuild 1093 BLAKE2B 2758d9b884ab296fac377be24db8ca5479f7fe03293d9e35a8dbd2814b18261d9499e3f362ab20d09b7c424c560744c901fefe5a015848138c4b6dca20fa9d99 SHA512 24897c347df5c8884867caa654e62485c273f5eddb791f91b0e1c91a1b9f84de05f8274d2eaf8d93e3f30e02dfe86528cbbb9dc0cd24a283b1a67be5fd0e25cb
+EBUILD httpbin-0.4.1.ebuild 886 BLAKE2B b9e4d3eecca2d304f859ea3dba91f8e57db42717d7d37299afe97c5e68dc41035a9c31f522d0d8bd88806eb2b31fd637b9860895dc6f49b6f4af46e4c8eb4465 SHA512 90000e61376c4d32b904a19148bf61a79cf7fad83ac1ab473f3fd0226ec3de4cd0e59970567e706a064ef7ad04cf990684110b6896bd27b0a2e1fd7a8ce57f25
+EBUILD httpbin-0.7.0.ebuild 1086 BLAKE2B 056bead1ffbf8b7beb6488058948edcf6ceb3b0c7837f0ff91610c1bba5c3fa504683a351a34c5c43a8afb0bbd4d8f7ee3447fb76e63ff322e8190e8ead37fc3 SHA512 f9436dfa703520ce5a1c7788c3d65456b107c505ad438e7e3de7c38f566a517d4b9e8a955a9ae2d33f26a692679e2587b22ad32020649cb62123dc7458a41fc2
 MISC metadata.xml 500 BLAKE2B 1270abbd84e19a72d75a2955858c49c6b33a8c92da7f86fb7853fde55968a840d941fe9f7cd1ec2718e8cbcfede6166c412aac7fc40e483043330935720dd898 SHA512 014a5e115d2cd225618e78ddf226dfe4f8772815efc3e9ecf49883701127335d9cba5e216daaba3f15de2944074c0041e5fd6eaf26772f0892da891570f841e1
diff --git a/dev-python/httpbin/httpbin-0.4.1.ebuild b/dev-python/httpbin/httpbin-0.4.1.ebuild
index bf83eb39831e..9491c99543c6 100644
--- a/dev-python/httpbin/httpbin-0.4.1.ebuild
+++ b/dev-python/httpbin/httpbin-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/httpbin/httpbin-0.7.0.ebuild b/dev-python/httpbin/httpbin-0.7.0.ebuild
index 949dc757b7a9..75a4c951d587 100644
--- a/dev-python/httpbin/httpbin-0.7.0.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 12f8fee9af33..21b66dcb757c 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -5,8 +5,8 @@ DIST httplib2-0.10.3.tar.gz 204500 BLAKE2B f71d679b42865bd8e56f708e71d475bfc6988
 DIST httplib2-0.11.3.tar.gz 215815 BLAKE2B 912d7cf56b941cc5ecaac23e16e20c17a31dc81b1ecb755cd3be36f0aaaf62302a760ca82104abb9052ee5c7d0c91baf04425303d124165085a06a20a66e5ba1 SHA512 e74be0ba945aaf5836ef14f4b8262e2be4b7f2a1df52b60f8ae7109d9727e117a69a8b7e4f524fb91997781af031a8a7c2112a7ab2b5d9f5c94b04a56aa04659
 DIST httplib2-0.12.1.tar.gz 218582 BLAKE2B 98c41a96b4e78897e803dbac3d6fedb25ad78f48d0b14ea29340f18da66be4622c7f0ae49acb2f4abca9542a174295d91aa21a6313b15501c4c1e590720a40bb SHA512 b083f0f5e22b384fd61eac428c1c60209702cf595762eadf6734afcf3cef6c3df8c7f2bedc5d782a4a6120a1dec51f910298f678c634c6b5e5d31348d9e10d25
 DIST httplib2-0.13.0.tar.gz 219494 BLAKE2B 5bb46582b9962266c9b431be7d323720f780075d6c60527e29c45415a001fc671b4bac95912f023e198250013a3b5a2442c02fa3284abba19bb3828bbc96ddb6 SHA512 b447531f18eb7d288cce9b1ab4b59c4302bd8db8eb095a102f9d730cb49644a1dc531ca007bb9c9a7321c9876ec0ce953317561fc94a51b02bcb749d2de1fa83
-EBUILD httplib2-0.10.3-r1.ebuild 935 BLAKE2B e2257cc6984e94b06cc07a6179501a9aa83b947a05f9a30efd93f8771e733e516c588361e62355ed89e27200c6ccbd505c3edf14d7ef5427875c64ab8b1c6b46 SHA512 3842aca942c11e96386e9d8aad2939816ada9cc6b97089d226044bec978be8b2d6799a7628ba45fda20596745e46d4934aea8b6f270e5e100dccc702de83241c
-EBUILD httplib2-0.11.3.ebuild 961 BLAKE2B 63cce5b170da61a1f6992e7e6a3a416cab109771062cda3abf73c69a9fe6ec7d7b41a18efb6354f5472534108976f6e91458ce22a9f54f0a214ddb3a85761717 SHA512 56807467df22c7e8f34378033c74e9b87850a0a1b64a0d9ee1f3454607eae9da2878c21d90cedaf120b76fc9c986a1c98c989ef5d00e9729d76ed53d99f8db48
-EBUILD httplib2-0.12.1.ebuild 952 BLAKE2B 9cdc1c7e6d3f1640058cab2570f36d4540fb4e8d2ba5f65e26f2edd814d8d1af7df7665c958dacb5009a1db74f49ceca3ec67e56e7d9a739efbe1f1f07dc4ff0 SHA512 c55a1e98b1e6b71a4399004b099280fe3140ba8f2c49f472f4a5db7073be65fe712f66a445b88ae15b06dabec0e46649beba2812dc78e7748ae14d1b73122363
-EBUILD httplib2-0.13.0.ebuild 963 BLAKE2B 24c61f697fbac86b648c65f0c71efbc28be209dcf322d833527dc7c9d9820f259b56d4b8c2a90007e544d49c81c645019eb99205ace746664a85aa3132cfafb1 SHA512 2c05b09e8df530940f5d74d8cef08c5a9d8632d5c77cea35b9646cb5c517332d51b1d21f71f0f9329b1a331e289afeac212b5876cef96c8e104a091f4e9dbf5e
+EBUILD httplib2-0.10.3-r1.ebuild 926 BLAKE2B 3ba91deb362386250de8a21e76b55b5aa816662efeb307f157c923299e1bdb20d6f466299f519cb25dd948a2ae9b73ebf91a94501d44dceb0a2e0285c10d099a SHA512 5af73f0dc629295f882ca340ae2b865f213f243051e04ffd45c18527e8391f65610a33240f1db6a23350dee414b6d6335f76c86ab65e3c8471a885a8e8ab4d16
+EBUILD httplib2-0.11.3.ebuild 954 BLAKE2B 94dc30544e82c5e7e5444545861d2170722d72804dcf338cd214b05938077dda1bb034502f4e3a1f28261b68612935e8db9ace4209b50f6353f4ad6ffe528a4d SHA512 852d8ded1441461dab19cc6e7118ddfc90709b8bc8f31f6015aad4dee9a33e1947d2751fef051799b619d8ffd1a43ad21343992e20feec767a9c8569d12f0d14
+EBUILD httplib2-0.12.1.ebuild 945 BLAKE2B b0c5bde70d8ddea785dc98e393c7b988529cb2b0a72b49d24d611ef1b615f6732ed0486f8021708aa9fc9affe32f58cd2ee24313277b307c4668bc271e67a3ec SHA512 764c19166af2427f1bafdb9f4d816645061c3b6d06aad039b3579e9d6e240773ef64de1862ce9b4a1c6872374d19378571ec96a86243c3baae7473e74ceeef9f
+EBUILD httplib2-0.13.0.ebuild 956 BLAKE2B 619e9f0f2a2965dc81313a3a3719f19162f38e1c60211a7c79757a5a50b620b1f41a38e3beaa8fb70c2f665d58f13e51e68d6e6a71293c575d9e991a515bd5c1 SHA512 2470c3a9bb9ff4ad9de12b05f0a1b4881a8eb690c91f8c37027b0cf5d3e1ce46f54423993055c6f285ddc40bd4d28faa7f23bce7af23f6afe054fc882944d16d
 MISC metadata.xml 437 BLAKE2B a688f70bc4de310ac3b250f2832c0803e25ea04fcc6a2b5569fc18f90b46f01ef0978bbccae980faaf74f385bed83b3da8179434614851da491ec62c0cfe92ef SHA512 fae017eb657512165f1d931910349a683417f98de8d70248d6b898a1e038212b9c2b1baebeae818126badbb57efb3b3ba1d647b25b759376ba5c3a719ed900a9
diff --git a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
index b0d66b2e0c5c..a36898d50317 100644
--- a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
+++ b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/httplib2/httplib2-0.11.3.ebuild b/dev-python/httplib2/httplib2-0.11.3.ebuild
index 7c0a14635e85..1906a6e08e54 100644
--- a/dev-python/httplib2/httplib2-0.11.3.ebuild
+++ b/dev-python/httplib2/httplib2-0.11.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/httplib2/httplib2-0.12.1.ebuild b/dev-python/httplib2/httplib2-0.12.1.ebuild
index fe9666fe0263..c8627d19d77d 100644
--- a/dev-python/httplib2/httplib2-0.12.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/httplib2/httplib2-0.13.0.ebuild b/dev-python/httplib2/httplib2-0.13.0.ebuild
index 677fe073c48f..52e96383798e 100644
--- a/dev-python/httplib2/httplib2-0.13.0.ebuild
+++ b/dev-python/httplib2/httplib2-0.13.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index a8e6ca022bdc..94fe97fe5c16 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,5 +1,5 @@
 DIST httpretty-0.8.14.tar.gz 43574 BLAKE2B 4015bb234c2fe3017a43fff6e3b51a7f015d9d133756d4326750da1ea06ce1910d91d7b47625a08ec85856d156a0d8b3b18706e582578e3d186994b8e4f55c69 SHA512 5adab6450e8360cc21bab4136f64cd11757b9f292c7e27980fe2561f3e705baf4f0211b9e6ff4ec9ba96a788a6c5b5b1d26657972b67423c9c25491927b0884b
 DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
-EBUILD httpretty-0.8.14.ebuild 2260 BLAKE2B 7e696d913a155ac8a1d663e4cfdcb497bfdb09c5a55b3a435ca198dfcf8ba0390da77710e19866bf7bb1c46b3d1d81212e4903301ceef3bb50e58d4d263a37a2 SHA512 bd8b5dfcd66ab94acb56592a7b98c3f71ab5de0db186956806e00cb6adc221895b50c012632bc52d29597c6f7ed6648962bb83a350478d835ee7d80ad05db1c4
-EBUILD httpretty-0.9.6.ebuild 1040 BLAKE2B 1638bbb6c7eced3db0624a8c51c51df94acc7df7da14bc10ca288adff37ba08b9bc0d739ba473fbf6cc768bf673c1462ebce8f40720bafca5ca1b559760a3d35 SHA512 aecca182284976cd9a8382aaf1e8953380f9bba6d8684ee50b6b5451943cd4bc8d13d7db531f2756b9431d7071ee13ae497abf7ed1a187276bfb8b26ae064c50
+EBUILD httpretty-0.8.14.ebuild 2256 BLAKE2B 2a553811b0824fa80abf5a70ff9cf7ec6b61acdd46825ccb6d377e4eb3ffa84e07a4e6fda3c32d04a34458c6eceb453bdf72ad360a725a7f8627aa13aa32541c SHA512 148a5ef6530975a99bdd0cba8b84f2ed840659dee5ead44028b1dcfc68f3627f5ef187ade81e43ca913ac58131f25498764d4891b256dbec61ef6258a02701c5
+EBUILD httpretty-0.9.6.ebuild 1038 BLAKE2B 1ed250b9421695a3bbda31c36b9a0d075ea339c334ea2df914a03012ca2fad120e2a0a88c6dbe2929bf91c7ddec5d84d6a25645739ee45075c2135217bc97cd2 SHA512 06faa1d183316930818e5ffab390eba49ace5e0bab3b7200ff20f2bad861aebcebc74048e194b56662b17634dcf4c61dc98f809e2d19433584960f2e11bfba8a
 MISC metadata.xml 590 BLAKE2B 60285c5aaf3d213457a6a12c9db5c19cf174b02435277f43d2f7a1eb0bf93d95c915f9aaa63692bb8274a1ebcac8ce1f9e71746668f20914c98bc98fcaf9a44b SHA512 0e7a2237bda277a4e295ca8c5c9e5280f0620821b03901eba1d8c73735868b5397256679ae64b530638c0805b68822493ca955bde37eccc67cd101ad5ecf3674
diff --git a/dev-python/httpretty/httpretty-0.8.14.ebuild b/dev-python/httpretty/httpretty-0.8.14.ebuild
index fc47b91c7afa..dfc81e357fee 100644
--- a/dev-python/httpretty/httpretty-0.8.14.ebuild
+++ b/dev-python/httpretty/httpretty-0.8.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/httpretty/httpretty-0.9.6.ebuild b/dev-python/httpretty/httpretty-0.9.6.ebuild
index 8235b58144e8..6107ecbba7b8 100644
--- a/dev-python/httpretty/httpretty-0.9.6.ebuild
+++ b/dev-python/httpretty/httpretty-0.9.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/httpstat/Manifest b/dev-python/httpstat/Manifest
index 05bd7b26ff3f..d7f129aa1101 100644
--- a/dev-python/httpstat/Manifest
+++ b/dev-python/httpstat/Manifest
@@ -1,4 +1,4 @@
 AUX httpstat-1.2.1-gentoo-tests.patch 838 BLAKE2B 6185274643fc1e67d5cb099f747bd595ddb38fb0ce2f335b3472952298dcb47dac63009d48fe328d22465e777e80b23af1668a6c1da1c62b5208648cb439e9d4 SHA512 a38e8984b9e06b47fb076f449ebc651646b68be448481ce9f197bf995a81c0b81c4ce3070508f597e4dd4bd9e7b5f17f8ae602c4d9978ff3e05b11f7ad7a048b
 DIST httpstat-1.2.1.tar.gz 97012 BLAKE2B 2c2ae97fe7c5f6563b3b29e8f40ec18ca62ab0efecd81bda404a57f594574d1647b9f72bea644a3e934670c0d142e4e1f9b866ed6cf215cd4183d6f574b252a5 SHA512 58636eacc7ad57fc6ab5fe477117547c515828e1dd50980d7c1d7c70d2fd04a8539339331bbf4e8a9ac9fea199626a45e7c3e2e458e11b78fb848027ff7c6a76
-EBUILD httpstat-1.2.1-r1.ebuild 691 BLAKE2B aecb7b95f2b4fddb8fa20645a1125b14c19f66fb2c7317710685dd8ab3c0c4deb300a54de8c8674b2ccf3af8a09ac73701b24215d6ff2c7e2b52ce75f3666cb2 SHA512 be3e34d8c53462eac3b349bcedcee3d567c32b954703beec0ca0742a1be8abebd057c97b6484e5fcf761474b40bb2d72b79376855695ba7393bbb9e706f0a2bf
+EBUILD httpstat-1.2.1-r1.ebuild 676 BLAKE2B d53fb02fdb7a7b32347b88f6688d12c4a8b6a88fe18702c152a47ec50b7069cfd08b8db4601af8fb6d7a8fa4a2564666ae376f7fbf7dc249585ff2a0d07be9b3 SHA512 7fbffb8fc422c27ac8639c9047676539b27a37a5503737c136920cc24716d8498ca5dd0b41f3bbdae6a44670e89452e9add584ed1196d41c7cd9b573ab3b8f33
 MISC metadata.xml 392 BLAKE2B 31931fd92505a57b10e74968337224c5bc19b3377e622ee8711ee56797e101797a4697f59a0ce38228472490072593b4b44042c8f904d432d502d88ad5297b19 SHA512 46e595a4b6ba41d5353316332d273c063103f39ca04659b56b95fe935603b5441ef5e317ece03de6469240091beb5e12e419fb7e7c57ebfcae7629f74004d7d7
diff --git a/dev-python/httpstat/httpstat-1.2.1-r1.ebuild b/dev-python/httpstat/httpstat-1.2.1-r1.ebuild
index cde2ea2a485d..ea72561d50b3 100644
--- a/dev-python/httpstat/httpstat-1.2.1-r1.ebuild
+++ b/dev-python/httpstat/httpstat-1.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/httreplay/Manifest b/dev-python/httreplay/Manifest
index 7489b7108ca8..c4a844c9f773 100644
--- a/dev-python/httreplay/Manifest
+++ b/dev-python/httreplay/Manifest
@@ -1,3 +1,3 @@
 DIST httreplay-0.2.0.tar.gz 8493 BLAKE2B 14b7ef227ee2184195c24fe1b219a7aec0aeb68bae9201dc41323bdcd8e74acbc6a0203201a65a2dcd2dbbec1866befe6790efb638ba6edc085d6b0da0a58e6a SHA512 0a035425241d34aeaed2ec219e7fdb7894ba09b711ccd60ca909f4f56467505bc39a8e77999a9196280883ff818165f9e4fb581e93df5d85a1dd30a0f243ea6b
-EBUILD httreplay-0.2.0.ebuild 452 BLAKE2B 1b4e817fb8b592268d92db86e65baae10d2d660c49d652612d87f3d986daa74a45a4b36417364ea5a0a2c4c8e547936b5a31c8226ba9b9034f439f632a98d3b5 SHA512 8205b24c5bf8612dd769b1354d8069bc18d4094d64e288acdabc2ae54500885ba5c53ee5d26ed55b4fca97a5d8977f551db491d9763cab818ec71f7b5aef7bc0
+EBUILD httreplay-0.2.0.ebuild 443 BLAKE2B 7bf93d428948500eed3ea13c0e83c5e272d14f50b882988f71241598a36ea5409db376a505f933806e9df2547eb6be09c21c69cfbe14d4ce121c2897c027ce9d SHA512 db7aeb2da35f6484dceab53ea3bf68ac4c1a880092fe1c5df6bc69ea695be5b8c1bada5024ee69c292059db2e0894870c6e0b1fd134812176f8b7e567d6fe29d
 MISC metadata.xml 527 BLAKE2B b55e74fdcf3071d69fb63f910791d7b0dd9d7cb8e4695d46f4a9eda4aa8364aa58d0077294f33c6aedad2e4ef281d652848a6a1a20393b22034b2c98687ad166 SHA512 89795450ad897b311a286f6936928935fd19e62e4c55604bce548409154340afa6b5813b62045d6687339acb6f373b6b289d4addf11bcd0faef8c193c20fc3fd
diff --git a/dev-python/httreplay/httreplay-0.2.0.ebuild b/dev-python/httreplay/httreplay-0.2.0.ebuild
index accd3c0a40ad..242af0739e0c 100644
--- a/dev-python/httreplay/httreplay-0.2.0.ebuild
+++ b/dev-python/httreplay/httreplay-0.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index d59f593069d9..fa47327f52ad 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,3 +1,3 @@
 DIST humanfriendly-4.17.tar.gz 344455 BLAKE2B 985ae142ea5378fcceb9f5f28773ac4dcaf0ea55ef1a7269fd1840a0b7119b54362aa93c330aa62e5424cc6f329e88717b45255c62b8e1d3f9ff5dd43a3c16c2 SHA512 a5786f28eaa0ff33919d9164ff30037fef5dbf60a31aece7679d1dddf3239f5a0d27209c710053cb0ac6779c1ef39102b1441fc620063283e90ef2ae11f8b621
-EBUILD humanfriendly-4.17.ebuild 928 BLAKE2B 74934236a45d9d0032561f72ec9422cb91aee155c37a42d7b777bcff8c32ee3a2e6e1dfbcc157f49d4e80eb7e5a184a73fe59b2aa64bc7ca856d2ba466cd61b3 SHA512 be503674d08c1c5eaa30f23306dea3a5ff2417b2e3f3c33d0c642bb4988bca2701ce19a0bfca85b7d6b080367531ea60651f1edb991a31b6e8eff6977200ad19
+EBUILD humanfriendly-4.17.ebuild 924 BLAKE2B c9606e6fa95529ea7e76a7db53a9daa9640cb4ba3ec1bc2d042081e4e5d263ae19693ac0ecce8de73d33896c46f6924cf3631785f39bc425fb23ab85c17a58d7 SHA512 5463f5b5b3a9ed07594cd70974cacff8237e68b66d8b591c498e9e87b975acebbb6aa343dbe3da27768d54f4ef1da2c910c0c67f27dddf9ab4121ed5f7655499
 MISC metadata.xml 326 BLAKE2B 5db2fb344393d914a42d1b9b256782d2e8286daa33ff4b8687d23e613ae8d168052dc310cab48ef0c49c524d3b5115d2a17cbede518fe93e944c0067c94f9c7b SHA512 1338df242248b37b4d016d8f9a31ffa004eed60a9122ed9ec8f94103271b3136b698a613c0f7c91411f43d96b136777e0ffe808c250f9ece3d29922312457f47
diff --git a/dev-python/humanfriendly/humanfriendly-4.17.ebuild b/dev-python/humanfriendly/humanfriendly-4.17.ebuild
index 42b2b72f8640..2b7465a35b7f 100644
--- a/dev-python/humanfriendly/humanfriendly-4.17.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-4.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index b3e23e06a400..91fb95871db3 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1,3 @@
 DIST humanize-0.5.1.tar.gz 20507 BLAKE2B 55d7b598b32658b1d4c4741b37b5c33bdc9d63a5a779455e2fb93e1e4c3a0d8fd58e8522ef82734e1ba2b161fd881829373ba3569baffd9ea3271ad7ed3e7568 SHA512 dd7ad7f3c564cc6abcb6b128e50dbea7f19f7f418bfd936aae2472961c53ec71202133c5c2b5b930ef41ef807b51d6ba1210565627ed32c0b41acc0abd32a2d5
-EBUILD humanize-0.5.1.ebuild 888 BLAKE2B 18bdbf9e5776b81a00bda7e6167e43a26daa98b631b681dc17423cec1359103a626e8a0a463e26fcacce63f736b2f8c6b44205e15773b7bd7b0bdb6f2d633bdc SHA512 024a7473ac6555b49a1cd61d805b96476fcf07019b3f5c7f5d3bb020a08d582e91590d62875ef3cdbe22ec9bdafe20506d022e34ee4621ba87d4e08a21859a47
+EBUILD humanize-0.5.1.ebuild 883 BLAKE2B 069b8e65ca938deb7f499949bd9bff552f112046ff7d843f955cd346849b6f0cb7553b6977b4deeb5c0e3065a2029b69880fce608f6a9e8a423cdf490f79a508 SHA512 6cabdd75522bd0de90f1c60d117da4072f4cf9714be168ff82342ab780f1b82d0009c708dc3f94d7c0f230bbfba07b4f9eb68feebb31b86bce2450b2c3654960
 MISC metadata.xml 436 BLAKE2B 79f8554b22e171509667145d3270ea7068ff215fc9d999f2cf654cf42948ba49f850efcdb19cb2a3fb41347612a4d3f178c529410b42238555b20b652b40900f SHA512 871a75a8295b80f9884f191f2264329be5a2975429e35b1ded2e085771284cfa76e230d2e7784a05524ec51cb809fde24e34d6caea45904f5fed3b388fe855a2
diff --git a/dev-python/humanize/humanize-0.5.1.ebuild b/dev-python/humanize/humanize-0.5.1.ebuild
index 4cede29ed9b8..b15f1b06682c 100644
--- a/dev-python/humanize/humanize-0.5.1.ebuild
+++ b/dev-python/humanize/humanize-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/husl/Manifest b/dev-python/husl/Manifest
index 538e337d0d4a..5e5e7eb44276 100644
--- a/dev-python/husl/Manifest
+++ b/dev-python/husl/Manifest
@@ -1,3 +1,3 @@
 DIST husl-4.0.3.tar.gz 3880 BLAKE2B 9824a50904c880d35a0a0b1efa402e7b5267db4df2ddea2114acc14b416da8bdac39f1383703abfd3a64f55680ac398e3479a6f2c9df1017b9eb265513172462 SHA512 1df5e08b24c3b815e4bf643d8bfc911aeeff25328565123122efb2a7042aea1e6e7709ed9d2c6a42390a0cece98863813a83952964c7df1dfcdc566671858034
-EBUILD husl-4.0.3.ebuild 416 BLAKE2B 94f6fca528153e4b33106c3372659930828ad502cc61bbcec05c5c178a07425d109034fdacecbb0b707cb0c4a333521976df141e63de1c9b08f998bf59a5e637 SHA512 c72c8df79f1cb95a4e3dd071502aa02c64f63da81bb31a8ee71cb8bbd5d91132a6efe24b1b6a9b5363dfb0c56c7fd3e801e2ba38d97ffdea6b422e7ce50e0fff
+EBUILD husl-4.0.3.ebuild 402 BLAKE2B 9f2a2c82b90c615c0dd10fb688f8f8a00fb28b2c0199eae4367706057e2f6b8a2934937b70f3f605aabbffcd041cd31f28bf5d6e5a7f100961bba6471b85e635 SHA512 a467de6b6e3542500feafa0ec5e20ad8220bb8f88a2dff827b90ae02fd4a571cbcb3cd9d25420404de725e271fb76b593fe12e418ea30684cfe737a28b447404
 MISC metadata.xml 485 BLAKE2B 1dea2e42422c95a795ab35aafecf89451dab48582154fffa60c9eb2adb21e27d5a817d1d8d6a958de4680446d1ef6319dd53ded6bb79a0489d3d97e18956ddcd SHA512 71a3691718f4f980d590facfd9ee7a158b97abec76c8094957584c0c48128b9ae4fc5440a13b6e60fb2cd160e1080ec79974aa366493b2aeadfa970e2a799d89
diff --git a/dev-python/husl/husl-4.0.3.ebuild b/dev-python/husl/husl-4.0.3.ebuild
index 5fd34a8ea0a3..aa2238f2b752 100644
--- a/dev-python/husl/husl-4.0.3.ebuild
+++ b/dev-python/husl/husl-4.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
index 2efd1a249f40..a338f6cddfa2 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -1,3 +1,3 @@
 DIST hvac-0.2.17.tar.gz 9884 BLAKE2B ddd40e29d7666a9d41a040f55574be82f32fb27ec4b8c65c8a360bdc924a5a7e0d8a36c32d0f663871406dc8bcd315c2a64fca9d852d24d3b14b1db464b182ef SHA512 5c35cf3cc2e1e08a9ffa0f485da89725b84753822165a2d5ba0de2db616281beb12acff85d4b091234f2127df43d409001716eb95c9277503c45771d1d2be412
-EBUILD hvac-0.2.17.ebuild 679 BLAKE2B 9789163eb15a06a2fb93fb99689ce078100d7d8f11acbacd38ca732c31f430dc1b335df36e74c6248d8fc2ceacb4acf2de4cd40471237f191c14409c6b26e1e2 SHA512 41e2ba75a7e6075dcaa53d8e58051ef5ca9f823f9c6e8626812bf45c31a9e6ac64a2060e8d2afa8fe2b818e1b50eddf426cd6050508ba03bccf93141484b3739
+EBUILD hvac-0.2.17.ebuild 665 BLAKE2B b00a682b51c6b8ae853e9024172458f266f9e285b54c8616d92a224e359f3d381b1cd961ecf952ffb68a39dc62b1e9b10b6ffa81b34e389ea20b36777c225749 SHA512 15ac083d63713fc1f9c2cf998bcf83320da7691c8228c0c1794397bd7c467496925f46bc9ecbc3c281840a74051b53d61b79d1fa412886ee854c8ac0fc877eb6
 MISC metadata.xml 318 BLAKE2B eab978479ceda3e002d7f433c43f07c770d5a6d04ecd47562a8235f59799eb6429861c8f1d9a4ef033073473ab212d77775baf7e3cc9327f76ad46c6477f1c33 SHA512 b39506ba5cb096645fb3dff6b16f333216464806289dd293191405bf8e6008e91d89bcfe0aaadab46db10bc6257b08f9070555ed520a5144f2defd586061fc34
diff --git a/dev-python/hvac/hvac-0.2.17.ebuild b/dev-python/hvac/hvac-0.2.17.ebuild
index 047a37a236c2..500ad544e727 100644
--- a/dev-python/hvac/hvac-0.2.17.ebuild
+++ b/dev-python/hvac/hvac-0.2.17.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
-DESCRIPTION="Python 2/3 client for HashiCorp Vault"
+DESCRIPTION="Python client for HashiCorp Vault"
 HOMEPAGE="https://github.com/ianunruh/hvac"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 47042fd5af32..37e17ea33a76 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,7 +1,7 @@
 DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0ad280980cb8b7d03d1c6f75de59e188745e7cc29fb36fd8c0799f9d5cb50a94282c70f045289daccfdcc12dabd SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c
 DIST hyper-h2-3.0.1.tar.gz 2198911 BLAKE2B 453ce1bf8e6216e2852f49c5a22ec5cfa487a744a818e82929dd0c4f03280953c1f742890d74f771080987e2f70d9430e4d66481501357f0d4c5ec490fc5fbf7 SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c
 DIST hyper-h2-3.1.1.tar.gz 2202601 BLAKE2B 62a7a9ff4e1295d279fbe7c02da6d60d97984caf8f4eee6fa69de3974913caf57d7933a991825296e96b54b4646139793529e839e492d440874aa134cdb7e96e SHA512 153c450ef918cc7cdb5d8efe61692a646925e76e6255ef46f679091590681be7d1f9319b37f6521c56207cf35e7d9e56951e4e3b55a24fe89d9e6aa28591957b
-EBUILD hyper-h2-2.5.1.ebuild 964 BLAKE2B 57d1688669cd75c8ee2180c25933d2d0268942513aa84c409daeabe1297f311f94111e2fc1a15d8e92ec03216f67b20df48fb869d01219d3685568f55ef58a26 SHA512 86feeabc22c851bd93af9c4208a08b582df60e865d24d10867ffdda2602b80c9ac66eaa0de3bbc8f8320f3f4d8a86aba5fde0f2b8032ca647b18b50fd6fd6d11
-EBUILD hyper-h2-3.0.1.ebuild 1105 BLAKE2B 20779ca48a4822c8499f46ef030106f281919b3e18c773aac8415653bdefcd15264166fb0d601c302f17feb75101b7574b8294f9b18373c3c7efe2fd26421afb SHA512 88d67ded112344626f420dc17e0082dac9643ee40a41540af129a4f2cadd99852cc8c88952e33edb969f8f9dc6d8356376bfc6d1b94b321043ff0b440ef4d9ba
-EBUILD hyper-h2-3.1.1.ebuild 1135 BLAKE2B 66ff353b9f583596b40a80d202826d37806257cb814c39b18b84f5df3e413bfcb5b48d26c3ca1a6ce38c1aba55444426b0c59571a3cb5c8e5f43ae35762ab474 SHA512 bd212c03e4da6c0249838e70012e0b1817928adab8a7f83ebb17c7230e76d7bf20e4b3db44ca6f755f89357e6f423fe7bb534d39ded6601ebd956407f61e5f5a
+EBUILD hyper-h2-2.5.1.ebuild 955 BLAKE2B 3edb24a84241c4f0f85761558827f49d2ad37d7a405bc3f92125368154f2805451fc86613ef94d963cb7398d9fbf1357c5526f39ade2703e11b802f2af8c10cd SHA512 2c1695211e4e05bf5a9a4f27bdd233ff32762be93d845dda690f1784b2f620021e6e7fc736f99ec94dfbf368e14d8380ccf4fc10eeff486ae282c767f4dbdea2
+EBUILD hyper-h2-3.0.1.ebuild 1098 BLAKE2B e73f26475184a898076092aaf35f76f28ff7986900939b520267981aac8119fccf3d919177be4a61744432db746e0234135657d035e4e2a56278e60bc1e41fb1 SHA512 ae9a01f0f89040b2037683c7b147b98a3fbec42a824a222729f100e530ccb3e0e03260d7735a8fed36419335819db2872921359009c0e2085cedd7ef899d595c
+EBUILD hyper-h2-3.1.1.ebuild 1128 BLAKE2B cf7fddf40986d8b08a392afd8d74e4fe44dd5a8778b21a9d35f821fd650805fc223411e3711348323d0aa20733d8d4337ff5833a70da3416e0043fd60727ab99 SHA512 f6a4a5deb00a24c4ff52ada9177282bb8e893cd2a1fecd39b9f1d2178a0954f7a1f820cf8510cb35a6e061ece75c95c8f24b87842e1b36df6699a3d0f037c066
 MISC metadata.xml 669 BLAKE2B fb8b8c6d1e8ae5cd8a0e6473c84a3d0e161f17ca671b24cdad86029af14936aab6cfaa9c119536980a69d96ce82fd296e407d8bc0d7eb2c5f1cebf37dd7a8f99 SHA512 ecf3d13974ec803b298d9be9898e5dd70c9bb2d9eb5f89ed37fd46e05f313ff3f8a4c6f01453dd92d7b5f74271516a2cb8d152cb9c1b2f26848b909525a038a2
diff --git a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
index 217b12d4937c..65cc6b823c5a 100644
--- a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
index c557ac275bfc..455744ef8e0a 100644
--- a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 
 inherit distutils-r1
 
diff --git a/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
index b3fadc409ed4..6fefcb85d3a3 100644
--- a/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7,8})
 
 inherit distutils-r1
 
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index 911d5bae19aa..a9f73170cbff 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,7 +1,7 @@
 DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511aef2af2d3a55a4aa7609f86c067d14821b510b0ca1433a9de9213be6a0048f2e1eef4e25676807815aff7c14e27 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9
 DIST hyperframe-5.1.0.tar.gz 17851 BLAKE2B f9c938b74699029bd39e2b1541f18111fea5ac760d9047fd09341e199948da13795d786f5a0eb8e85d698f90d07ffd02776fb82638ec1f1eb564059401291253 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b
 DIST hyperframe-5.2.0.tar.gz 19115 BLAKE2B 6dfd7c6e7f07eb52a499794709fb498a30bc4b534fb49d57295cf280afa200342139fa6c794613e518bbd0e2301672b05826d2adcdd7eebf528469af5e9441f7 SHA512 2e04b48c6d31adb0893a3246046b447c32f3d4485ffe9b08370b6c534ed4273c19e2e2c1a23d48268e333d91d8e911578829776076d8f73743cd9ef597926e3c
-EBUILD hyperframe-4.0.1.ebuild 493 BLAKE2B f487d6df62a188e5940c43eb31f3bea742bc0fa7bfa5eff909844d6bf09775f10a229687b34c2d0593c575e5b86b2e8314769a126813a5a9ca10513a8204a84e SHA512 40afb635ed0e71f490fad22aa79aac908bf11065c87d3052bae365a48e832f484ca736a17e07b3eeca10b4c299af606077904f88f91f9c8fb0fb14f7310bffa5
-EBUILD hyperframe-5.1.0.ebuild 656 BLAKE2B 624b52773b29f9a1bca464396a1d74df4b6cc06996da2d103443b0c21265f0c13f02ea010488cbbba87cb80b69a3695482bc0d5b491cf728bd74afeac7d6b636 SHA512 42b9a04e3ede6aabe4cad9ed96b36fc4817ee05612e976a5884942e64e30cb40819cdea7c19ee6a8223dc85cd62a57625a63a28cfe56a82b5d110d1427e17048
-EBUILD hyperframe-5.2.0.ebuild 554 BLAKE2B 6a21b72fb847ba2c71046bc01ecc5cef9d7202ffa501d9031e9d5b1119ea2be53fd5eedf2da5923f698b6d2e5bec17b29cfef6b99d1d8ae79dc14539214106a3 SHA512 96b420def52b3247a433d23e7e05bdc3398d715acc89b39d6028ca0edd4ede075c3e04ef0296f941723f11698f01a00ef30ce0c90bc617eb44baa36726d79b81
+EBUILD hyperframe-4.0.1.ebuild 484 BLAKE2B 7fc565d37e48751e60bc1f4ac5ee21bc8839eec9a63ecc7250273b340e4bfb47829500d8f03febe7d308caf6889197e950746df83fec3f282d055a69a9c62221 SHA512 1c0ef2bca52fc7ae86dcaf61ff74fdfd8fe31dcb04aed885093fd641a9d979928ad8b0e66a3d0535823e72448fccbb6455819236b471680fba03f4dc755fdd66
+EBUILD hyperframe-5.1.0.ebuild 649 BLAKE2B a2d46c18eb5564196dd8b8749ad59e2a612fbaf4db012fe2399fd15c99aadcfb5ab2fb1db4e95ad0fede13a3fa2e9129288c39727de1091d53fff67be8d0c394 SHA512 39916068d23c3d7a716acabdc9f354f98b86df9488cff2b7fc769fba8cf1763a7591d0b0c43126734b1d71bb528eae005547ae0175a79c60047eeac981b226c6
+EBUILD hyperframe-5.2.0.ebuild 547 BLAKE2B a884a287ea54bb36757ec467f80f8926f74aa3867c2648a841d81ae81568401e1abb9a16295c0a45f8a35d1bd4bf776ed4ab84b1498c5c57d0f39be325471b3f SHA512 bbb881f1f7a19e5c612fe1efc26d991f9433a0750127e06d65651cb0001ab94b6bf768f86c70b6fb69d8d519f1695adff1b1f4b8d3c8fce2b8c5628ca19322e5
 MISC metadata.xml 624 BLAKE2B 8c5eb7949a6b19a3341658ac90103bfa5829ebfac29aea3c5b1bb7861a0abe6d562ef304b3182d31402a45ad142f772c2887e5969f93ab4c8301abbe0d65cd44 SHA512 11667c2401c1c98563d96e63e08f9a013330c29688219dcf502afd751cb2259c688c55cae250f5ccb676c00dcd8bdc59988ec9bc9f8f92a25a985a784031e562
diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
index 89848e2a42a4..c4e8ff509c0d 100644
--- a/dev-python/hyperframe/hyperframe-4.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/hyperframe/hyperframe-5.1.0.ebuild b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
index b251734971ee..97d2841f5091 100644
--- a/dev-python/hyperframe/hyperframe-5.1.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 
 inherit distutils-r1
 
diff --git a/dev-python/hyperframe/hyperframe-5.2.0.ebuild b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
index 11e82e823425..aa24552e65d4 100644
--- a/dev-python/hyperframe/hyperframe-5.2.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 916592d4ebab..eafb9c195211 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -2,8 +2,8 @@ DIST hyperlink-17.1.1.tar.gz 23067 BLAKE2B 8bf1e61c6ba72c1cef4a9df62168b513004ae
 DIST hyperlink-17.3.1.tar.gz 91359 BLAKE2B 46ca9ddf54b8e5cd68cd5dd821b7a0ea2b218f0ba6d4072c7448433c6bf63891fb59999358c5efa605d21e28ab6e39a87cb84b1e3c8e2e8fce24892acf2eb679 SHA512 c0c9d99a530c938b1d1e97b8344c5a0fb18f894c8b0b294cc8ae6aa6a550a5a0272cc6be7a913d371f3ce3dd8695b7ed239999f3ae5e8ce97e3693625ae761bb
 DIST hyperlink-18.0.0.tar.gz 97625 BLAKE2B d189445c7375657614c38db9045d96789b78a2d4ebe67e23b897a450588fbe1e3916707bb67916eb893e93a716125e606ff8be27e63f3db4e63b8bda1436fa59 SHA512 21b5f88f7aaa3f2b0b60566fdb0fefdf6d42866060606dac181c8e3d357c76a5c23fa5dc982812af2b7d49dc1f9d623bd5bea89bf2cf31916c855bc4ae85589d
 DIST hyperlink-19.0.0.tar.gz 99099 BLAKE2B 1213bbc404ebf04f178e3f8b986c343f64cd6a75202942d1cfaeab640d1523388beaafcd2662f414c9fb1eb87f746f3edeb5b5e395b9fc0acb7e82697f45f7a2 SHA512 5d5723bc0bd0c381edd3a9ef7bab3ba9ad4252027d5a4afa61e6cfff3e5b8457994b6dd36ecc356e638d41f797fe3367a3010249e0e77bee6e9e94336c1e7c2e
-EBUILD hyperlink-17.1.1.ebuild 778 BLAKE2B 932def5df488553041db69ec9dc35b48a19ca07fec5fec0a7cde534139c82d7388a3f63e5be2d420cfa53e4bf374fc2e1dafea3009965bf31dda627b58ef50d9 SHA512 f230727d0d7b5f235b70af2d9d18084565965dc650b562edd9a2aea54abdcb4e8c9f9b7948db20b35c1014ac7247c40c47e8040c32ac95ca266c5577e7d5d613
-EBUILD hyperlink-17.3.1.ebuild 790 BLAKE2B a06bfdec08859c31d02657ebe5b7c963cd4f3e7716e720062a8693959e0edb9c2901d4e3cff212586114885b66dd215b90b0a4c0cdf836c7af5867c3cfc8c8dd SHA512 588896bebeed47de8ec655024007e60082a34a266d07aea25ab231ae2ba355d91c22f5308b633463ade58f04970613708bbc5ab0ead4586f3e627866bd90211f
-EBUILD hyperlink-18.0.0.ebuild 753 BLAKE2B 4e62133f9fb9a630a84fa1b6e408909c8ec8ce50da3c6ecf10d3d9a4e3da1d8a2114cb657721503db654c9529335ce25eff67b2501effa58e2e32b147668a3bb SHA512 1d540cf7e24ae72d5fbcca2eaf3682a544dccce2c8b622c2d273849abb020d28754c52b6adcf104b835631441904a4a2a13e1671c547c7c48392ea2b4cdcf613
-EBUILD hyperlink-19.0.0.ebuild 640 BLAKE2B db3654b0784055332e48a49c22b0a157e429b41955e838a1171f9c8abd4a6c61ce396282445ac7b00e520cc75124cdc8cd57d19396d9de92b3650558c3d5afe6 SHA512 21f760b0bae261e46f732197457e60fd6f42e8e2433f1170a59f9deed6295e572fc63f517b5fcd9463b8e66551df5987eaf234fd8a4394039a71d42c38fc6353
+EBUILD hyperlink-17.1.1.ebuild 769 BLAKE2B a1a61d231ccb02401e9e2db253891a197b22d3e8f182a256f0165a334efbb55d3b5728ce22c83d2088cfd9ce09065436b5ae610727378ba15a5ef2452182eab8 SHA512 a11fb6db5d646596d2db2788f77d745940998f6569d5ac246833516009f365d8d813c99f9ff9108cc77333ec29f7e1e4bfb98160986ae08ff341ecb48214778c
+EBUILD hyperlink-17.3.1.ebuild 781 BLAKE2B 00846f0737f4d76ae24aa3ea81131ade562882dde900b586515a4b6cd5f0bda33f78cdacacc48b1e1dff59e4168c7e5b8dd704fd557a1583a9eef66e0adbeb10 SHA512 e1d25eb551e8e615a518120ec69078ff7efa761c48d5266eea8913c511dc0fec0fb1e04149d544b540de3e6b19568d1ac93a54368caee6b769cc2737cad69ced
+EBUILD hyperlink-18.0.0.ebuild 746 BLAKE2B 9529dadaa95509ad3b3ed99358d1d2fec0b86c0211e8fed1f50da9c250e30e9a9835d652ce58d21c4a9dbd22bf11b9b9646291ea011f4249691df6889a1f573e SHA512 ad3494e61a2a545a98df57f2a894cbafa6c3d898d967f37ce748097ce6e075268ca551c18fb913e87ca486317a116278772f98a8ec846eec36bdb2b3c101a601
+EBUILD hyperlink-19.0.0.ebuild 633 BLAKE2B 209e5772e80acd1e06480886c603b7d09c30b634c330cb1435331ce685eb8ad216eab2742f31d079dc8312abe1274ee68ed19db4a1720d6618254fd5efbb5c56 SHA512 809642010890977d9d2b5f95f9b22cee5ed79f8e71d9da56f449da8f252ccb3e7af7a779ba02189f1310867ed03b6e0b8b1a66810207f04f9e5fb5afbb02662b
 MISC metadata.xml 673 BLAKE2B 054899b405550c1b1e891ad235cf2dd553275aa2d791c874073c83510123d4c995656d9777b022211369b705b3c068fa48abf2b6f3f63e5a78bd0a77fa367248 SHA512 4ddbf3e9d95f7699b5099d8c296aa3a777d9685e93e7f84734773c49d2a9174055cbed229cc0a1ddd2e10e3f414a6c93dd08eb3bfbc0717a4bf828ccf350060d
diff --git a/dev-python/hyperlink/hyperlink-17.1.1.ebuild b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
index 686fd8268efc..c371206436b3 100644
--- a/dev-python/hyperlink/hyperlink-17.1.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/hyperlink/hyperlink-17.3.1.ebuild b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
index cbd27b9f1002..b0caf3c58097 100644
--- a/dev-python/hyperlink/hyperlink-17.3.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/hyperlink/hyperlink-18.0.0.ebuild b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
index 111079333ff6..b1035c424b39 100644
--- a/dev-python/hyperlink/hyperlink-18.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 
 inherit distutils-r1
 
diff --git a/dev-python/hyperlink/hyperlink-19.0.0.ebuild b/dev-python/hyperlink/hyperlink-19.0.0.ebuild
index a6aad48d6c4f..2e2723e063c8 100644
--- a/dev-python/hyperlink/hyperlink-19.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-19.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index f0854b077672..9fbe71c4301d 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,18 +1,15 @@
-AUX hypothesis-3.74.3-no-werror.patch 646 BLAKE2B d398319202a662d87018d99919ba0745d628c08afae85fda67113555f61babd83cae5dee7a79b224d7aa5ead73f29a91441f0de27086b9a4f74a3b53dda05be1 SHA512 d25646d35b94dc19b8c9c7a97601a7666ca6140b6a22a4f6b0bf232a7bd3a75c533f53feb9758cc8d5c9189163a0d90149f57c08dd945b763c0920aa361f2bbc
-DIST hypothesis-python-3.59.1.tar.gz 500529 BLAKE2B 5c171045e363f2337d7ca30797b9fc7f96430c805dd4b3ec78fe927247d2c2ba4a216789a82f1e956b89d66c5ecdb2050a5f93467f2d557a05d1d48507fc06db SHA512 c3aad4cc54152963806e09af5f351e60e30cd64ad48ba3d922451b10dbb1747ea3e5d432ebc611dcb0646687d7e8755051b967304e74798d091be0b2901c832f
-DIST hypothesis-python-3.74.3.tar.gz 552616 BLAKE2B e19a0991e7ae2fa6208c81d336cc66e3392bb78663f567fe28b570a1463a5359ccf713776f1f9cbd19a27a53b9a71a5be6eedfa05599fa12c047c373aa339592 SHA512 f4927d6e908a9222fa06f82ad6e4cf90c62a0a3d0c7632c17ee57a3705239901fcb5dbbcfca402c153bf2bea9dde0e51c852d2024ed5a236888327963fe13a3e
 DIST hypothesis-python-4.15.0.tar.gz 1175925 BLAKE2B f3e3888b3f4e542d567bdaad2582eb23bd8ab2e218f1bde82ba1639123f32e8c147313c22b15781d8986574813b5f6eb7c23ce28367e86bb304d33a23f179fa0 SHA512 7d9788b351196fc20e66e210b7d60b4ddb1507b85cf5a29de228600e07f676ccd1352f5d2ab0820b3c8c1a1e8ff145225f00a25aec5f325cc7405ffd0dfcd9f7
-DIST hypothesis-python-4.44.2.tar.gz 3240386 BLAKE2B 3fe3295ba1f7401e1fb74af894d91eda525f8ef51eb893f1f8e5224cead8572f3c06f6a4bb345c123e56ed06d0676c85dc4477a80e54480baa6bd9f5f2bc069e SHA512 bebc5da337fa74a75d08cb57531c2f6b8ba1ab16d1a3d9be8348cd56ada1ab25a34e3b812a4aa71bf172bc97ebc8df0accdad37466f9162c3f8f2a8edbea9da9
 DIST hypothesis-python-4.47.5.tar.gz 6805022 BLAKE2B 737a558c794f3ac428bef4b38858d47fddba613ce37eb9a9554afa3c189776e9172965dd31f8497747ac13b2ab1d34ee6de8671646972e71b82c5260db489b9a SHA512 9b6920181dca75b9e551ae5e598101f35cfc26e9e3a1b20cab652c151bc6355413d0c9602d3242fb23f808ab00335793009df938d55ee19a6af1ce2a8b085e3c
 DIST hypothesis-python-4.50.8.tar.gz 6814518 BLAKE2B f2c39cae3708fe88d1854cda97633ba420c32fda38093bb852ef45929762cade0f7f0d1ef696ff96f7ebe7460e8bf53f63de9c959bbbd9e8ec162196d307aac0 SHA512 8c77439fd029e2380afbc059d2edf977414997ba81ecdfde14dfe9dbe9515a92e701751d13879c6b879271f817e01926c2dc66945ae76eb141818da1775bc545
-DIST hypothesis-python-4.53.1.tar.gz 6815720 BLAKE2B 6a569bdb003efd4fe12f074ec15b5a7d5d92af3ffadd9a7cecc8cb4eaa9ecc4ef206151408c7c78617235658c9725f3e5fe6b33668757e74dbf0c8640ac141a4 SHA512 56839be12656d5a970e0d9b97ec3e7b8aa600b88bfb53d09c09270ccf5abcf5f25ec7c33b01c5c30a1a5450903b919dbff2b1e709937000ebcf434235310a8c9
-DIST hypothesis-python-4.53.2.tar.gz 6815827 BLAKE2B 219ef79b8575f835e5df835a25354041007d44fd517c0f38b1686f5a74660b8f489eb6ceb9ae9a48f67792ec62058647ce76e62c156400fa0de808b03ad41630 SHA512 d2ff624c10e13ff040bdf05b9082f37b2e7529bb9cc98f3972f8240d3802a034580720983e98b7ba6165a98e64ac5692b1e14f5c490f8aabdb9ea7c19364b66f
-EBUILD hypothesis-3.59.1.ebuild 1145 BLAKE2B f42287ae99cacb4ef4b117a48587b18965b6d84bd2c15901897876e1cf8db6755d0c032863d7aae0e8d56a5e8205bd941dde5e4058bd543bbeb6efce7e64c3bd SHA512 08331c50fc7e3169b94cb3ed32c95dba578915bb293afba510207a03733c2170a69f6d61b900d6a85d9b88a1a5566896bba4ed3950139d341cdd746e6fa503f4
-EBUILD hypothesis-3.74.3.ebuild 1599 BLAKE2B 595579389557f85fa0902229be998b9ca0a366b54b33ad6162d120552eafa3420eb614fb73d232bf9c56d26b0f6eb91043ceb4a636da600e8903dc4539011604 SHA512 7b39b0dcbe2e3a263fddf52641b5e9e497830170d4f6e0f190fb8c1e895127dea2a1aa022b05606e89f5b07289dd981dd82c5b6b8ca912296530c83d67bf264f
-EBUILD hypothesis-4.15.0.ebuild 1483 BLAKE2B 8eea3ac62a7096a761a7cc1ede4999d23bac38c1a53190ed39946d6c8507a86dbc8c418b4acc304e2ca1a7d62aefc236c5b5985e0a8a97df40fa204c9afc50d1 SHA512 50e771884ad665bc4fe3038fd4cf35291672e6c46e91c758507cc2805527d2c9f0497606fc4497c52f03c3a8aec3c7aff8458710a7b6c73c447bb8579c6448a6
-EBUILD hypothesis-4.44.2.ebuild 1698 BLAKE2B a8371d3017c0f419e1481ee3a4ab8389cece64bcb93151b986303426e9976d6a684ba32d27f64fcf3a3e5953a85edbee1ca7df1e227daf24c4d700064e70e989 SHA512 413f1ef75237aa1581e433aea1adb38a9de65a1922b88b77ec634cf312924452b50998e3fc31c124e1ac1ce9dc98581edf75b4458a98b1999b89e4df0f01d4a2
-EBUILD hypothesis-4.47.5.ebuild 1729 BLAKE2B 7abbcc34b1fadb73a8c0aa2507bca2090ab4e6a30ba47ac90095f259be56cf38637d340c896f70706e176edc09bcc6f8230e44504a04a8e8ece13bcf3010ba9f SHA512 767d819d7ccb0c8cb27a373415a662169d08510582e20255ebf1cbdd4bda55780ffc476ac18948c9ed0d80193c689223a9ff6d4e2b1eccd2fe2a75f4bb245870
-EBUILD hypothesis-4.50.8.ebuild 1729 BLAKE2B 7abbcc34b1fadb73a8c0aa2507bca2090ab4e6a30ba47ac90095f259be56cf38637d340c896f70706e176edc09bcc6f8230e44504a04a8e8ece13bcf3010ba9f SHA512 767d819d7ccb0c8cb27a373415a662169d08510582e20255ebf1cbdd4bda55780ffc476ac18948c9ed0d80193c689223a9ff6d4e2b1eccd2fe2a75f4bb245870
-EBUILD hypothesis-4.53.1.ebuild 1729 BLAKE2B 7abbcc34b1fadb73a8c0aa2507bca2090ab4e6a30ba47ac90095f259be56cf38637d340c896f70706e176edc09bcc6f8230e44504a04a8e8ece13bcf3010ba9f SHA512 767d819d7ccb0c8cb27a373415a662169d08510582e20255ebf1cbdd4bda55780ffc476ac18948c9ed0d80193c689223a9ff6d4e2b1eccd2fe2a75f4bb245870
-EBUILD hypothesis-4.53.2.ebuild 1729 BLAKE2B 7abbcc34b1fadb73a8c0aa2507bca2090ab4e6a30ba47ac90095f259be56cf38637d340c896f70706e176edc09bcc6f8230e44504a04a8e8ece13bcf3010ba9f SHA512 767d819d7ccb0c8cb27a373415a662169d08510582e20255ebf1cbdd4bda55780ffc476ac18948c9ed0d80193c689223a9ff6d4e2b1eccd2fe2a75f4bb245870
-MISC metadata.xml 379 BLAKE2B 3623a13a813bf71f9474fa018b2f83392ec168193b9853cabcf112267d38e7278e97a415bb8b7e52f9ebb28864b8709a64996dcb0d97e1f03b3ecb31a944d74d SHA512 40bb5c1916d9027ff81cd32073de34753a30d8430f36d0fd16667a111af8fd222379dcd817edd723d362f5ff5578ad7b212f98388c00de6dff1a64bd2c3978b0
+DIST hypothesis-python-4.55.4.tar.gz 9004357 BLAKE2B 93fe51581f044cf5f416d9b74b82ce2f9b42e7391beae8f67debdf50494e662f07bf109274d4e29fcf3a1c1c944597cde2a4ff9e7ca65a48f1244c3205f365af SHA512 91d7d2cda32fd40d5368fdd1e60b990b8307573782d822113b6817a5c0b670610693a2f2b013f828913549946fa3dc15f45303bf7d3226bdc1e4527bc18981fb
+DIST hypothesis-python-4.57.1.tar.gz 9005030 BLAKE2B 3d318896cbe2d24fa6847e764a109791d3acf3821852f8e170991b0be5b069f166e16bdacf7a82fbe49bd9db5188315cdec7cdb4592647571233949ec5732991 SHA512 28622ce8a1d89d09df65f3fbf7e92a1ad98dac140ab646fe11fcb15e6aa9a9672eb51d459f984384d92b819f902de911b06cec2542582d529dd556d2f99ed952
+DIST hypothesis-python-5.1.4.tar.gz 8989696 BLAKE2B 9d85cb1473654e36a235a07d2390fc967d6d7f2944e5294dedbca15ddb3c49901b04e9277ee80ff7591aa2b81ea0e2d537051f96b685900aefab5db70d135ac6 SHA512 25d0112f7b7a13221b8b68d553f4085344f1e8681c8795fac0bcfd714400a828539298d2919d3e638979eadd5daa65ef7ee8b0b946df076145e59c8bb7058a64
+DIST hypothesis-python-5.1.5.tar.gz 8989752 BLAKE2B e1dc2720fd8500436ff0ec0fadd8c7986f279be125f8cebf376349d6c6d1d28f9225cceb2fa54ab66e92c6750832dc6d157cf156980e7f58aa7251a1eff625fd SHA512 89edc57116b3c503df2f0c6d4e60637ace6a7fc5c4ece6b426362b01a0be11e79be1e95784e24d849ac120000165ff46efd78c6cb6b163aebcb2b5a8c8d4c8e1
+EBUILD hypothesis-4.15.0.ebuild 1476 BLAKE2B a0ee1cc8df99b8aa1e039860901485dcb64f529162d3364a236332483b128f2c6253d4dabcf48696e853f90a18d9ebd930ee5aaceb890c2b3c1e17d08533846a SHA512 5ab62b67f9fecf815f5bdcfa27d9102f0cd1baed8b2a624bb912eeecb69aec047ac834d1956f521f63c78cc1d7cae3cd7623dafa6cfb9dd990a948e0e9e4c981
+EBUILD hypothesis-4.47.5.ebuild 1715 BLAKE2B e11813476869c123bce76c05955412b1f6697df88060b5e9bdb205b4bca60c9042194210106b6ecb80e5465cd098821189f1dbe2c1f31d4336e7d0b2bb58abfd SHA512 54049e33fb298392b89c992bf3c73cb928716076060f4fa7b65ab8680e52dbae16ead0affdd5ccdd03550259faf5629d43b30d57a944cabeebd9751e8be41b16
+EBUILD hypothesis-4.50.8.ebuild 1717 BLAKE2B 97201f02ff2fa9b0618fe299f0859ff63065a179d145c101240f72c5b2b46ceab075b7cb20d3e5e5acfdaedb62b5c1ddc117a69e9f43ffe29aec65e57a62f0bc SHA512 60ec681c4eff1ed0d84c13353ad790ce45751eda94a55434b10d67d10ab4e7af381a9157f214bb6bd79e40f8def2ef8d098ae1dcae7f85c7fb27563afe728363
+EBUILD hypothesis-4.55.4.ebuild 1719 BLAKE2B e3021ac093126b60814311860311efc7d60a992b7b08031586e5e7c39d1ec20617fd756088d5d66a1f18ce16f96348c46589992d60d25776be6b7266014b1a5b SHA512 c83975840094233883fcdf731fccdf3d5201cb23b3c7268dde4395e8e8ac8089c0085ef3e01b47dd1e51946277892da358a847d71bb7ad243190778fabecb366
+EBUILD hypothesis-4.57.1.ebuild 1711 BLAKE2B 439cc7a17ee31d84e5bd6e006ba0776c178f86d6ff23d640391892cb746690aafd3eb2109dccdb7004cdc9651cae7386b57231bf5fdc8468e683b72feb861294 SHA512 fe47bcd1a9d9cd7d8e3d106ffff5b87005758c678440b82a9508e3233a545c9d9075a474378b9e69ca62ef511a031e58892496ca76e568f4a8f50fef8dd67ab3
+EBUILD hypothesis-5.1.4.ebuild 1573 BLAKE2B 48a8d18ca4b3b4a903054280ad67d99028e08312ceb9be6d9c996cfb22408f7810895e1139f42a0cd7f75e74ac555c03a26d78457cede9c78b15c67e4795c551 SHA512 0d38b8a3a4182ae256a9d0ebc909e95bc42a74ec439ed2c783064c1cd773444c1aba3b9efb29e76b8f0b29547fc69642f1ba134e1b7364bc314f906c59a03822
+EBUILD hypothesis-5.1.5.ebuild 1565 BLAKE2B be414de6457f2af9a6a0bceab7bdda3a560a561a35eff503fd5e57c2155f6a7833e0c181f0f7c7aa06e0a60e439c8cee60a1ce2110b5d7113e74f4d769f724f2 SHA512 092fdd3e00d77c041470acb909a4f49091a04d238a3b92f266d48cb14995092e8ff4d0339ccbcd52bdf57dcfba0b39866c30af3fca9847da9458d178dd5ec3a0
+MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/files/hypothesis-3.74.3-no-werror.patch b/dev-python/hypothesis/files/hypothesis-3.74.3-no-werror.patch
deleted file mode 100644
index 1e09133c6fb3..000000000000
--- a/dev-python/hypothesis/files/hypothesis-3.74.3-no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- hypothesis-python/tests/common/setup.py	2018-10-09 15:41:19.106029968 +0200
-+++ hypothesis-python/tests/common/setup.py	2018-10-09 15:42:09.464413825 +0200
-@@ -33,6 +33,9 @@
-     filterwarnings('ignore', category=ImportWarning)
-     filterwarnings('ignore', category=FutureWarning, module='pandas._version')
- 
-+    # Fixed in recent versions but allowed by pytest=3.0.0; see #1630
-+    filterwarnings('ignore', category=DeprecationWarning, module='pluggy')
-+
-     # See https://github.com/numpy/numpy/pull/432
-     filterwarnings('ignore', message='numpy.dtype size changed')
-     filterwarnings('ignore', message='numpy.ufunc size changed')
diff --git a/dev-python/hypothesis/hypothesis-3.59.1.ebuild b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
deleted file mode 100644
index 68b87fdf87e9..000000000000
--- a/dev-python/hypothesis/hypothesis-3.59.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
-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"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/coverage[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-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 "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-3.74.3.ebuild b/dev-python/hypothesis/hypothesis-3.74.3.ebuild
deleted file mode 100644
index 26a6aa58bddf..000000000000
--- a/dev-python/hypothesis/hypothesis-3.74.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
-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"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-# See https://github.com/HypothesisWorks/hypothesis/issues/1630
-PATCHES=(  ${FILESDIR}/${P}-no-werror.patch )
-
-python_test() {
-	 pytest tests/cover/test_testdecorators.py || 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/hypothesis/hypothesis-4.15.0.ebuild b/dev-python/hypothesis/hypothesis-4.15.0.ebuild
index 28eac10d0e99..80f9e91406fc 100644
--- a/dev-python/hypothesis/hypothesis-4.15.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1 eutils
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-4.44.2.ebuild b/dev-python/hypothesis/hypothesis-4.44.2.ebuild
deleted file mode 100644
index f4686aaabd7a..000000000000
--- a/dev-python/hypothesis/hypothesis-4.44.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
-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"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-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() {
-	local pyver=$(python_is_python3 && echo 3 || echo 2)
-	pytest -vv tests/cover tests/pytest tests/py${pyver} ||
-		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/hypothesis/hypothesis-4.47.5.ebuild b/dev-python/hypothesis/hypothesis-4.47.5.ebuild
index 3def9e851218..7d204a43369c 100644
--- a/dev-python/hypothesis/hypothesis-4.47.5.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.47.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1 eutils
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-4.50.8.ebuild b/dev-python/hypothesis/hypothesis-4.50.8.ebuild
index 3def9e851218..ed9f59113c75 100644
--- a/dev-python/hypothesis/hypothesis-4.50.8.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.50.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1 eutils
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-4.53.1.ebuild b/dev-python/hypothesis/hypothesis-4.53.1.ebuild
deleted file mode 100644
index 3def9e851218..000000000000
--- a/dev-python/hypothesis/hypothesis-4.53.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
-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"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-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() {
-	local pyver=$(python_is_python3 && echo 3 || echo 2)
-	pytest -vv tests/cover tests/pytest tests/py${pyver} ||
-		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/hypothesis/hypothesis-4.53.2.ebuild b/dev-python/hypothesis/hypothesis-4.53.2.ebuild
deleted file mode 100644
index 3def9e851218..000000000000
--- a/dev-python/hypothesis/hypothesis-4.53.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
-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"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-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() {
-	local pyver=$(python_is_python3 && echo 3 || echo 2)
-	pytest -vv tests/cover tests/pytest tests/py${pyver} ||
-		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/hypothesis/hypothesis-4.55.4.ebuild b/dev-python/hypothesis/hypothesis-4.55.4.ebuild
new file mode 100644
index 000000000000..996a19c65c46
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-4.55.4.ebuild
@@ -0,0 +1,59 @@
+# 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 )
+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"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+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() {
+	local pyver=$(python_is_python3 && echo 3 || echo 2)
+	pytest -vv tests/cover tests/pytest tests/py${pyver} ||
+		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/hypothesis/hypothesis-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
new file mode 100644
index 000000000000..f88fa930f933
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
@@ -0,0 +1,59 @@
+# 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} 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"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+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() {
+	local pyver=$(python_is_python3 && echo 3 || echo 2)
+	pytest -vv tests/cover tests/pytest tests/py${pyver} ||
+		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/hypothesis/hypothesis-5.1.4.ebuild b/dev-python/hypothesis/hypothesis-5.1.4.ebuild
new file mode 100644
index 000000000000..24078c547ce7
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.1.4.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=( python3_{6,7,8} 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="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3[${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/hypothesis/hypothesis-5.1.5.ebuild b/dev-python/hypothesis/hypothesis-5.1.5.ebuild
new file mode 100644
index 000000000000..963f87ee74a0
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.1.5.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} 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="~amd64 ~arm ~arm64 ~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-4.3[${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/hypothesis/metadata.xml b/dev-python/hypothesis/metadata.xml
index 3b9d8f1161a1..51edf873f002 100644
--- a/dev-python/hypothesis/metadata.xml
+++ b/dev-python/hypothesis/metadata.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--
+		This package has a very frequent release cycle which makes
+		it hard to track stable candidates.  Please do not bump it
+		without my approval.
+	-->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index aa3e79c51ae4..6246fc7ba774 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,8 +1,8 @@
 DIST icalendar-3.11.7.tar.gz 78330 BLAKE2B e6186f58903d835ac3357db959b6fef79aba34bb9b692128b6209b9c8139f7ed2eda81fd5cc54b6f3186d055e611f1489fcb61b1a10f914ee4c79ba8b31bf67a SHA512 445dc7b9c8c7ee2ad3345c5a4e4bca92633cdabae95f3cab63dacf549d48b7578242566d236cac8d5a9df4158387cadc0f09327e1b3e5038d223687365bec884
 DIST icalendar-3.9.2.tar.gz 66283 BLAKE2B 487a8fdf04f028de30003762860640b8983df026aa7a5ba0efe3a57ddd09c51bb406a5e58792203d3a0ee3d44186b0b6dcaa7194fefcfed85c3ab714129f6b4d SHA512 da50bba72f7a114263672ebd45cfcca5f7c2eca48538901f595b26ef18bb21a6290da4392c62cc27d1202083fcab7f5bfe6c9a463df38087de0ef764999f7eb1
 DIST icalendar-4.0.3.tar.gz 77899 BLAKE2B d4043914b85359a8309dd7c8acce55ec5921508319342f2ffb2e16017aa5aa164ef7fdd44aee7820a971516a3e157b5c8ee86732e669c8eac4b5c4bc1767e334 SHA512 2f0ac5a7f36c7d37047ba20bec3f2ca7df51a9e3ec3f29751c71cdd264c01f7e0abd6efc298dac5a7c87911cb4916e56bf77716d6ca05a2d090e26486e6a56be
-EBUILD icalendar-3.11.7-r1.ebuild 1365 BLAKE2B 2196ea94e95c93f165f8242ee5a40d793e39b13190c38367f79e2493129124e7d47b97dd5cf665acaf78a219d20f8fb1486d5d7ad79370caf6a9e1decf9f3449 SHA512 0750058da23feeea8d8150e4ac396c6a45ab51d5561104af01f30290b84850f05c6b7a550fbf97a852ec6d7f142090e07c83074d535d423318a31bf9f33e8e2f
-EBUILD icalendar-3.11.7.ebuild 1315 BLAKE2B 3bfeb95a30d765259c5e54f4d51b5c3ea1ca78ac6254429d6ebb3df06b45533812e3d6eedc22c69116339696effa14656a842736f78578b8e798b2a6bcd55a1d SHA512 012441929759ef5e454e6063575f2d76d1b31325b8cbc1e793009de8303e79d57e734fe09e525a22853847b6ba6bfcd3d62d0258dad3576c4f3de596ceb71737
-EBUILD icalendar-3.9.2.ebuild 1313 BLAKE2B 0bbdfdcbcc82a1219f42ff9ab08e96bdd48b1de261b6ff7dab9a2b116cb3c36364dae7519e880eafe20a293c1d721d4e80b23e71b9917b579f2c8d3f1a773314 SHA512 e955e4dfccaa59e55bbdc50f9087e1fbf456217ed6241ad226db1ddac94f41dd3ee2a93d24e596fe20ef306cd3b3bd5cbfb5c8034857120eceb1064e8e2c6c99
-EBUILD icalendar-4.0.3.ebuild 1142 BLAKE2B 572bc87be0d1988d159264fd86cead5f7dd41463bb119bea2017db67d9fa3185cd6a8db8f608e86028991c77188d4a1e4f0c319cc25e86c61fbdfeb1563d429d SHA512 47d79ebb3a282bc505807d86a4622f59f06f459a6127cdc6de99cb5ee3eea15244774dd75bfec75169f9eac1dde8dc418f391225974bf2dd7f78b17cf0edbe3e
+EBUILD icalendar-3.11.7-r1.ebuild 1356 BLAKE2B e29d10e11f946f541610234b04fafb587b079ff562176e99d5e5d57ed34682f67f2645b1a84c01ef2bf5caef942fef18fc6aae21e39db3f8ca277062f6cd29a9 SHA512 974b268e2d31559de1fbd389d27a4d74384851b80cd45caf0baaed1bede20e35cbdbe98318c9f9c2730ba830cfda4996c02a7a63644ee68affc33c8ae096dd6a
+EBUILD icalendar-3.11.7.ebuild 1306 BLAKE2B 73c2b8d1c3346981d67b4895c1f979da35871e17b498b58038972d54b8179feeb6ccb35f561e78a6901c650e2c81c5993ae46e0c1efc89e902e585efcacddb6a SHA512 dbf68a51d435688ba50c6e1ceb4b07ce3ac4b205674f971d6066f2fcc78fc5205824adf4cbbc45a50960efb7d60452102ddef854625e07507ec3d01d4cc14299
+EBUILD icalendar-3.9.2.ebuild 1304 BLAKE2B fdf999947a9bed801c7daa3cd8c49039c81747cc84368767170da188e1c28c93bf1568e880af99897742a2b5a60a0a68a39a114436a855226f6d24983492590e SHA512 501e550866cab0797806ece56e9f136bb456bc0f96f0ffb01a9ede0563c27ce05a4ef3c70cd4cbb9c713a5501fcefaa42ab44e387b0a1ca7158fc13ecfdb5da4
+EBUILD icalendar-4.0.3.ebuild 1140 BLAKE2B 3ae1312b2aa3f74c6a1ea0b7a27e984b74e19a75d917a23197bf8942f470cf5b1bddd6815461ee435af730e67f96a2dd42d28e0d136118096bb7aaf084cddfa8 SHA512 2cf6fed90f142962988bb773cf3e87a678412fae5a9b88f29d7db2f9efba2710bbab1a397e59da4cbcabe22f5594ae33c9decfe3c42ad76d52570926ad2e173b
 MISC metadata.xml 477 BLAKE2B ba3e50265304565f743e67aab83f0c5457a0db7a104ab8a0d7a85f5d610e49b61a3314e4f037c73e4dff469adcb66ea6c0de6a0027c3fb487637edcd74e1f84d SHA512 468420550f8bdacfb0425ea8df443f1e25552f3e2c132869dd12a1cd74cee4b8174c2dfff2023a80d17f570e8c6d0b0163968f603086d8ea30f61a50e174ad22
diff --git a/dev-python/icalendar/icalendar-3.11.7-r1.ebuild b/dev-python/icalendar/icalendar-3.11.7-r1.ebuild
index e48220570506..afd987ed9146 100644
--- a/dev-python/icalendar/icalendar-3.11.7-r1.ebuild
+++ b/dev-python/icalendar/icalendar-3.11.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/icalendar/icalendar-3.11.7.ebuild b/dev-python/icalendar/icalendar-3.11.7.ebuild
index 441d319017cf..55f6fcbfa51b 100644
--- a/dev-python/icalendar/icalendar-3.11.7.ebuild
+++ b/dev-python/icalendar/icalendar-3.11.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/icalendar/icalendar-3.9.2.ebuild b/dev-python/icalendar/icalendar-3.9.2.ebuild
index d1dffad19619..2276d819c576 100644
--- a/dev-python/icalendar/icalendar-3.9.2.ebuild
+++ b/dev-python/icalendar/icalendar-3.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/icalendar/icalendar-4.0.3.ebuild b/dev-python/icalendar/icalendar-4.0.3.ebuild
index b9f08a775ff8..86719bfb57a9 100644
--- a/dev-python/icalendar/icalendar-4.0.3.ebuild
+++ b/dev-python/icalendar/icalendar-4.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 DOCS=( "README.rst" )
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index 413e1b899cdd..50175f674bb2 100644
--- a/dev-python/idna-ssl/Manifest
+++ b/dev-python/idna-ssl/Manifest
@@ -1,7 +1,7 @@
 DIST idna-ssl-1.0.1.tar.gz 3385 BLAKE2B a14a73b7aa79022c3831e3c66cfc31fe6f2f64474039712aabc0aac28c5ad9c98ba360bccfcacd5b37085c48c8db1f4184f7406489306dd7b87c1ac9599e8c28 SHA512 57a6891543c561cd96d35f3d01f702e8c54c592f0174f34322fd0794df8a80ad0117b558f2d0078d22cb8e0114aaa9b72c7217c91a40f02475334d7a94429c2e
 DIST idna-ssl-1.1.0.tar.gz 3377 BLAKE2B 4a3baee5c976bdde4092eb3a980e555a72fb74395d3bc673ccd6e986e003b696cabdeb41061ad9b5f8da62074c034e4a07298fa993d5fff185f723ff4cb5f432 SHA512 f9db74cecabbbfddfd1817bbd8434ef2aafeea433c3eefff3f94c7e994da40e3f315fcda527f3a0c3743028f26bbc934f1dd21f94134123c3271975d0527cd35
 DIST idna_ssl-1.0.0.tar.gz 3375 BLAKE2B 28ecee9e271619b7a4f3698aacbdbf0e953ed9b52640818007dc86f34145d8ea000260991d44cfa4cd896b74172b0a32962c3053152558b8d621396df2e248de SHA512 d1f7479cc3edff164bb26deb05af757906ba91241bc668f1b087560087a89f741a0b36e166bfb8142128ceed6008621ab36a2556ed2304ea6374c19982bc663a
-EBUILD idna-ssl-1.0.0.ebuild 590 BLAKE2B c6db9cdacb6682f76d50404d294270a0ab7a7a89c69f2393c925a31e054f6a073ffddabb8d3a9129a2a0ae6cbe491ac7c6d3cd2a3e16ef03fce8859c5321582f SHA512 d67f8321eb4fea63e04f20b53089c5a8a536557d07785dba33ebf59b4ab0706f1500bcb02c8a8ca2a1a8be626d13b226ca5c57b4e59b2992cdd4e98d9c75ddd0
-EBUILD idna-ssl-1.0.1.ebuild 525 BLAKE2B f42ca98ebd8dc26f0cb58d621acd7f1f68163776a99973a943fd3e77b1ab16f12c53cc8b433c4cb1b5f50becd2d599d66562fc8fa4472f31a4863ca4f264980e SHA512 a235a7adc2e600f6a289feef6aea72d18851c5630d811de44897b843ce0978effd874fd0aa8dde65217d9e2cbfbb404b213a3fd34874a65f5743c6cca0fffd3a
-EBUILD idna-ssl-1.1.0.ebuild 537 BLAKE2B c00eef54ffa1cfbc755e6291aaa2d2918cb414ae3eea1977418f33f1e42393bcf8b8258d7a026261cf89282171a34b9b76fff1bfa8e11f28977098271e426603 SHA512 c8acd9056562585be4d6f2e7a0452b97a5ca938af6047709ea261fa83de983b0db0318deb401a76345db83fa55d4e2be695f7fe422f1a66d8ce308d0103fc9d1
+EBUILD idna-ssl-1.0.0.ebuild 586 BLAKE2B e0e23a9acbfeab75857df911f9d2b9ffd53c40ba74e6b9e8be35d5b4491add8ffa06ae8ac827d28a5a2fda814b6100ab79e56f7f960dc9efc463b3584ba092dd SHA512 49c3fd6ef75b7fe5d4f1f5d53f96080602d84daf9a0d34abfc1ed1c1684c27e27fa9a3ac99ef3953d7e44be837113c0076aeced2e1ff63f1792193ba9b55b89b
+EBUILD idna-ssl-1.0.1.ebuild 521 BLAKE2B 04ec7fa2b4640133406e64ce77c81aaffa3c8d352e8fdcc625d722fce595e35a0cab524f5aed88d3c839d3cbc690f78d87c72ac37fd161ebc0366b4b1bd6323e SHA512 821a90440fd214e8484579e7996c4ccd28c91db4859b832df5748d969d1dcf40528370ab2b38f74785045b8ab95db53722012856ce230d9c2e322de5a0ad304d
+EBUILD idna-ssl-1.1.0.ebuild 537 BLAKE2B b203d4ebfa0f9a091730f83c03e5d47c7f57413505037129c9026350c35dec427ca7dbb9e29e371dce0bbb552f601a5c2aeeb59589febd06cf1ad7fd4b418f2a SHA512 13b1170c089edc01391f05ea953c53a1212092b8ffba4558b99fff5397427c64056dd4c11c24e9f05d6a9583148b2e2718c438b4a29dd1bcda9c5c8385c8d2fb
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
index fa444573f311..9a29e92bbdf7 100644
--- a/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild b/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild
index 94814baa2d1a..c028a28ac0c2 100644
--- a/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
index 835310677387..c4270a8e234a 100644
--- a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index cd15e261ea57..034746189faa 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -2,8 +2,8 @@ DIST idna-2.5.tar.gz 130211 BLAKE2B 3b00b76f9d86f0961ca4613c4239e39fa19c28f60640
 DIST idna-2.6.tar.gz 135992 BLAKE2B 1397c93eae23a9ecbcc001205e83fd684cbdb4f0c916c30b7d80dc7fdd43c588a9a81a620a39108a31707c1aee8c4a315d1988ae5a8cf1f6519bb11bad6dc3a3 SHA512 cb5dbfab44c4d11521c67f9d29391f184d1267a3da6dc89f4ed12c60a7a909d5c7474c3ea2bddd0af7063f4f620e87a8dd586bb07e8b961b30b1dd7c969704c2
 DIST idna-2.7.tar.gz 172698 BLAKE2B d0c92988d78629af3b87b8b4842757395c1f439f25d77614ba05d48e57d7d9a414c5be33e3fcf191f7dc8fea7325c801ff9c6f687204dec3735406f6e2342923 SHA512 34ba985862e386243f43616586e53830177cf4ba0925b6054198dfa63c085ec5c6c5b54c2b3c0989bc768aacceeef76b84471e58a16183b960dc4b8812cd1c61
 DIST idna-2.8.tar.gz 174481 BLAKE2B 68e5dddaae30097522e4e661438d7f89a391c5a0e2f72a99e1da88e0af9380f15958d5315fccb4221e7d44a6390a7b0daa537a4752c26cd915bf2d433a4f7cc4 SHA512 8ca5cfe6350c51250bafdac7c6e4ddd54c4a5d6bf7acbcef896760a759868c8e9df1fdf550121d8512fa3eb316dcf031ec6058e03b4f66eadee21b63e2187d33
-EBUILD idna-2.5.ebuild 598 BLAKE2B 8c0e326ebdf4a8150713aa03bdcb1b8a9df2a72b240107cfe7d34ba40ea0525b08b87aa21a6355117987d9db1c1ce91b2632579b4d5148ce76828d11b5e8b2f9 SHA512 0e754c62ba11d5f21fd61d1d0866b5e41c1187bd12098beeb46a214e43aebb3fdcb2c4039786df12f72b910493f6dfeb7f6d5f6385a46208022958ad76e7fc43
-EBUILD idna-2.6.ebuild 651 BLAKE2B 4477503c9d418d93a2c34d9c9aafa7b0ed5dabf697ce3143c8eee4dea2a93b6a9e1a8eea9198928d9a75f71d5199712ec3327ab981a557e53a70dcb45b13b212 SHA512 cf8e431cd774d3dbd90a3b5a0282c48018d8f5fbae67fdf908d608c43095b6dc41cbc132ab88982cc0eb05c8aceeaf193bf0e27c2914909d0cbec9e39b600f70
-EBUILD idna-2.7.ebuild 709 BLAKE2B b9266405a6177adbf45c322f54825dc750d7f0e5ec665b1c63340e0c3a5eb3594957aaba076053f3053a696ea767910fa3c49b1a2559981b34576572e3891581 SHA512 fde116ecdb1669efbb6ae55c9cbb5aa84970b48bac88efaaa514eb8f6bfe9850fce36180f3cc3449be9e8e825bd949227857902e1c7dfa960632a7460eabe80a
-EBUILD idna-2.8.ebuild 703 BLAKE2B 267209f5019de507d5c9efe7d99e8afc6158a036848afdb896a8453ec30f04e48e6e510d525fd5301c158089468fabf8f7c6c0f4050ef62ea6b09299ec3c64e6 SHA512 9dc981d75ec44cb2e7970c5f291549695dca76b3da5dc962b64ecab3cabc905c2c579e1667ad02de685d2efc211baf778178a74ff18c16b9ef45062a60972368
+EBUILD idna-2.5.ebuild 589 BLAKE2B dacaa320b0bf195e3bd19515069d8ad784742895daf5b76e57053c0078c97b36cf7fe614c16d6a8ea13440b16ff4033dce67ce3b5626a94a3ae3c7e21f23e46f SHA512 da63b2ca2eda6a54decf98654a2c45183ca6dedb65d8ba26d7d537a98ddf37bf56288e392780a57fb25638ccac85a69681b9cc685b373eaf5302f681f7df9692
+EBUILD idna-2.6.ebuild 642 BLAKE2B 3ab26fa60710d7fc7054846e9d757041e04c5bfec0c09a4567da92d48936b9db6a7409bc9bdffc6f3380161fd5106746405efbc3ff7fe208352dc01609454581 SHA512 d335530638e9a2578d548b69d82b509e9fdae5ba86ed87291c6469c9e3c3a9bdb8c63a6eaf1f481df445de46bf716b2b432c256e74191c4d65840485d8d41173
+EBUILD idna-2.7.ebuild 702 BLAKE2B 95d99f4cc03d5e2f8aba53faad25e3d841768bd8c7a0dd36a1209d52e5227412b43579b0c3585b373c612a36deeaab18c2ab4089a4a8cccd1b97345ef4dc3432 SHA512 96e7d4de081ee1f4cf8472aa03f9abdf98f9b309367389d2cbff34795523285b49d963a8337c41118fd5198772faad765352f686dfe5380e0f877784ab23e59b
+EBUILD idna-2.8.ebuild 694 BLAKE2B 49a8763981ea87b579bbd940c3408cdd37dcc3b592d3ba778149f6b46477d77416fd25035570704e7a6ee2e34b7648c1f6870314aced29cc1e7982846cd94a5e SHA512 b60347ea588ef06bdaaa1332a2daf93bc2c8cc563c36b71420355c798a0ca2e2e9632fa87368a2464de58c96084a446b335a52d9b5f0378683c999432989d7eb
 MISC metadata.xml 367 BLAKE2B 363038f61cdb96780faecfb8c92d97d0cea8146d37374a731daa9618150b3f41c0bad724619d7bb353141834df9fcb88f075ece91a742ccca2da1621e5b8e2fc SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e
diff --git a/dev-python/idna/idna-2.5.ebuild b/dev-python/idna/idna-2.5.ebuild
index 455d9ea515e2..8e2fa883fb12 100644
--- a/dev-python/idna/idna-2.5.ebuild
+++ b/dev-python/idna/idna-2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/idna/idna-2.6.ebuild b/dev-python/idna/idna-2.6.ebuild
index 9a9109e2d648..12b09556b060 100644
--- a/dev-python/idna/idna-2.6.ebuild
+++ b/dev-python/idna/idna-2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/idna/idna-2.7.ebuild b/dev-python/idna/idna-2.7.ebuild
index a5c492e68fea..a62063f31c87 100644
--- a/dev-python/idna/idna-2.7.ebuild
+++ b/dev-python/idna/idna-2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/idna/idna-2.8.ebuild b/dev-python/idna/idna-2.8.ebuild
index d883bbc95039..b11e6d7bb1cb 100644
--- a/dev-python/idna/idna-2.8.ebuild
+++ b/dev-python/idna/idna-2.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ifaddr/Manifest b/dev-python/ifaddr/Manifest
new file mode 100644
index 000000000000..a9e06e981e70
--- /dev/null
+++ b/dev-python/ifaddr/Manifest
@@ -0,0 +1,3 @@
+DIST ifaddr-0.1.6.tar.gz 6526 BLAKE2B d30b955d42d0266a197214bbe16ff2a8b11e33b4305ae9ed128fca6719e2c86026c97b278b0abaf5f5f35f4c9b744e5b500b4a4c1783dede0ebd4aedff62803f SHA512 911f81c32e808b9e61f7e98b8c67dc9b40cb64de864843cd7239f08538c9ff7cd45c8f16428b2ce200ea5f213a539c7ed8479432e02feb5e82e917f838ee0cb6
+EBUILD ifaddr-0.1.6.ebuild 496 BLAKE2B 0d57d9f216caeb7013215424fa66f80b6c1ac9495de49a6d87cff348a65ba2b23d3bc81a6449754116bb8c113c361a37fea4d08d8ba1c80750fafe9395c93a03 SHA512 8d9608cb0fb1fdd4b0334198e10de9172123e1a2d868cb8955721bdfbcee593520ca723a949ff885e381b9e23c2a37880254924bf75285051af2538c69854c12
+MISC metadata.xml 452 BLAKE2B f30dc1cb3a45142daaab071a2397a6210c3aa48b363228a25b6bb5d11f331506a78e1d52f79780f6be6c160e6e8f9a6cf1f81e11dbab2f879a916b3745495d4e SHA512 528af68f1d6a498593329c687dffa4bf624d4de2144d1af1563d7424207fc0eaa1a6ccdfa4580c3e5cd2d0225394afd152543ebfd2af000a4796c6d36329eed7
diff --git a/dev-python/ifaddr/ifaddr-0.1.6.ebuild b/dev-python/ifaddr/ifaddr-0.1.6.ebuild
new file mode 100644
index 000000000000..1fc689b62b20
--- /dev/null
+++ b/dev-python/ifaddr/ifaddr-0.1.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Enumerate IP addresses on the local network adapters"
+HOMEPAGE="https://github.com/pydron/ifaddr"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-python/ifaddr/metadata.xml b/dev-python/ifaddr/metadata.xml
new file mode 100644
index 000000000000..93a15d138a16
--- /dev/null
+++ b/dev-python/ifaddr/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+			Enumerates all IP addresses on all network adapters of the system.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index e10530698935..b0702198c53d 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,7 +1,7 @@
 DIST ijson-2.3.tar.gz 11800 BLAKE2B 0cdd2a40c483341dd9dcd4e7cb52c38752886d02e5b0c5982bad975487391cac31e2b5993118fbb526f91866dc8441a711ec16e0e8f1d320d32eb026bb4c8b0d SHA512 4d6647cb72661b26a3b36addeabec79fbc047a6c3b86aa419c178dfb8ef09bcdefdf37ed729f26b4b6b176cec06230ef3dab53bdff4c4b401bbc835eb486d038
 DIST ijson-2.4.tar.gz 17570 BLAKE2B 98301c5572597ab9a52c33dd92e1a2bf1fa9956415f21a49b13de438a6f295221da43c110f94aa280834b85993f4c8a3cfdaa060f28598e5af50510e7657561f SHA512 c93548a0719a9de30d504dd6179dbffedfd91228ef57fe6600af30eaa2338a2b720e6c9c5b386868198945714a725d46dd2dee6a1ae6d6a0d61eb0230eb35608
 DIST ijson-2.5.1.tar.gz 23258 BLAKE2B e41cb4d903399384a1a1d18941a2ecf36e80c762e5d4e3e854e9337f3a72cab3a61576d9d5170b11e1513bd82ca0e2158b8a88d4c30855674366fbc9172c5042 SHA512 f8d2cf0496357d3385e2744a4604cef1fd6fcd92cbd52c8803d7e831c091c18b718ad0c1dc8735c3f10df04e25fe69ef73d6935b2df6f67845493935e2ca529e
-EBUILD ijson-2.3.ebuild 572 BLAKE2B 83129c0128d58ad72e59247802719fb411d87df199049b8da127fdce10420d44a64166a612ba57482608457fbd7bb9295353c7aeb2ba90bbacb136e927926968 SHA512 34ab27be8015a47e18d149cc874812b45b67721c1a70a62264836360516fb12aabf336cd70d79f6dce3ab2f2676a60012ad12dab8f35532ce1fe5cf8285df77b
-EBUILD ijson-2.4.ebuild 617 BLAKE2B 58c80d28c3a87add553363b1046ad4b32f7cbec378fa45beabe53c0a8ac13421db9dbec1ec04e43858bb49636051caa26034c7b64226a53154b4069f48d38bbc SHA512 183fd41f6d35bac0111ed3c14cf1e2d6c13f6f30f859840c7ddd933ea18c10bc4f5a6b1ffde094994ec9b5016b31ea7fac22f1c802f35a313e0140f4ad450665
-EBUILD ijson-2.5.1.ebuild 587 BLAKE2B 2fba7d9448ce618819e438eb1bbc14f8cb710c96ac5f93cdba71d22f630934cdf3696fe5a501464053c2e7b282199d8c671544e5149b5a82f3a6586da31d64e4 SHA512 64fe70951eba5ff1a14612420f39c4ea1902a7599290815588fbe27ab590783539ce70874a6a3876e4d31132a0c3f4c9d6730cf70e1438da45aa2dc4cf3c552f
+EBUILD ijson-2.3.ebuild 562 BLAKE2B 0682043bac8837067980551df47d69ca1e2a6d18ad335e6311a2217c7d32d93da62b72a1bbddac85fa472fe72635c13277d6fd6f0a7e2918e5e99505aade2821 SHA512 c1da1ba44a0a9b496fd41249ffc348c984790a4835f29a13b6f56bb016100af696804186a5866acd68db07bcb28eab1225b896854f88ee241222dd957ca14edf
+EBUILD ijson-2.4.ebuild 605 BLAKE2B 6d56a898fa75631197a229fe746ddc533fc04ec4c32daaafe279e000fe2331e1e6e842543e16fe66568a9dd827118686e27d02016507ead0a2ca127e0220ea90 SHA512 0a1adb81e84c9addf482e20e57079748c92a34baed98a4716c13051e08ef9df6441fa39066ee07f115eac62fdaef336d84f0a8e7d45b282e1c83b4a63eef583f
+EBUILD ijson-2.5.1.ebuild 575 BLAKE2B 6d0b25d50d02ca515597a1ee1456b57c9b02d0c6c3b883b55df7c70e4652de103f12f9457283966fd877a005a351405834a06e0a4fbe47e6647188ce474d6a7f SHA512 3c98ed16057c13a94a9794bbb83059fa9d0cb3627533c99aade134b255ca250a71e793f75024b615345c0bbfee9c13995e08ebe5cb36082830db62c9712066a0
 MISC metadata.xml 371 BLAKE2B b69568a1fd9e7578de49b729826c1bae5b6aef3c6e34d3c32adb9745e4bbb0541fe1e43730fff84aa0dc85b3b116c1e4fb9d9301b3c0f1f8c615c24141b1657b SHA512 874354dc3c06b919b563b13b0b0dd64b9e5af1fd759d199691d2e45a3ddf3fac61412452a0c746c22cb43c3eef379f3c391c2cb04d109ad6859ca279566e1108
diff --git a/dev-python/ijson/ijson-2.3.ebuild b/dev-python/ijson/ijson-2.3.ebuild
index 8fec102a73e2..86629248d850 100644
--- a/dev-python/ijson/ijson-2.3.ebuild
+++ b/dev-python/ijson/ijson-2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ijson/ijson-2.4.ebuild b/dev-python/ijson/ijson-2.4.ebuild
index eceba6c8c743..41ab824f9dcb 100644
--- a/dev-python/ijson/ijson-2.4.ebuild
+++ b/dev-python/ijson/ijson-2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ijson/ijson-2.5.1.ebuild b/dev-python/ijson/ijson-2.5.1.ebuild
index 91941962119c..3a645df60428 100644
--- a/dev-python/ijson/ijson-2.5.1.ebuild
+++ b/dev-python/ijson/ijson-2.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 56af9cc7519c..8b1fe32c065f 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,9 +1,3 @@
-DIST imageio-1.5.tar.gz 187004 BLAKE2B c2fa082ceef7be0b1571fcdd4b0a30f46ed027838d1a80aff4e379f07b031e8d7e99ff0c12d6b6c7f67ccc0e06a231e97e12ea5311715cf06bc78cc064fc380c SHA512 2913353c02a26236f254c6cefce72cb8179cedeac4e1ebae435218dddfc35cbec9e806eefe99e174ca9c572c09725a697e1165f6be0bbdc657a9fcf2312c7460
-DIST imageio-1.6.tar.gz 201043 BLAKE2B 0ab903f159c7e99bd22aff7b56f7df2afa1a9885242a346dc7e1c58240b1e8c67114f422cd3861de797a817df3e45352978448fdf83cd4f4ad0878c3b2b8c60e SHA512 bbb22a8c48f54e5bec8475eea041ce361b259cd8113463fb85e6c02b9c5a9805e675eaf2c693a26d51d1609071ce92d54fe76ed5563ad48f562b465ab586bb43
-DIST imageio-2.0.1.tar.gz 224487 BLAKE2B ca6247f3cea3edc435d8ef8790d49fb3ce722229e45df7032fae9fd05d01b8ec1ea02771ba2ff3713ba54fcf01d22feb60093f7d063c32f5cc263cf8eab9e640 SHA512 8adfcdb897d898806ef4a3227730a45a663eb485e126db62d8c5f79063aa8aa2b83f4a9c27d4ae47b4ca8e2ed82125d04642952c62fb29dd1fe8dfa11430bb58
-DIST imageio-2.1.1.tar.gz 227148 BLAKE2B d7ca2227d5efa05dc9fcde7d1edbb1c2a818beb7b9f54e8f2f1c9694b403d66c0a80954ab4e1c3e3674f7ec31ccc0caae5737c6f6f7b4b2afa56e42562ac5721 SHA512 a01ebf8fe9cc3761b0779107bcd610ecf4c9a5e6e789bdc15983e2f4ff65d03351266431391519cd637a98f48a1a9f91a2123191d0aed5790bc731b007a85d29
-EBUILD imageio-1.5.ebuild 546 BLAKE2B 94a9fe0cad2595eb5a72730d48f3a44e6a0f51e1be801c6278f9e31e44a4ce716ff889d55bb8bf5f771afa4229e016a8388e805a759d69c8c0e094404defd019 SHA512 6487ac5cc088be30d1b26a175c7b66b776a246c11f005c9963d3db0f9f632f0a1c5071509e00f3ce712e684a2caa6be7d18db145e5dc35f708d16b7917b289ad
-EBUILD imageio-1.6.ebuild 546 BLAKE2B 94a9fe0cad2595eb5a72730d48f3a44e6a0f51e1be801c6278f9e31e44a4ce716ff889d55bb8bf5f771afa4229e016a8388e805a759d69c8c0e094404defd019 SHA512 6487ac5cc088be30d1b26a175c7b66b776a246c11f005c9963d3db0f9f632f0a1c5071509e00f3ce712e684a2caa6be7d18db145e5dc35f708d16b7917b289ad
-EBUILD imageio-2.0.1.ebuild 546 BLAKE2B 94a9fe0cad2595eb5a72730d48f3a44e6a0f51e1be801c6278f9e31e44a4ce716ff889d55bb8bf5f771afa4229e016a8388e805a759d69c8c0e094404defd019 SHA512 6487ac5cc088be30d1b26a175c7b66b776a246c11f005c9963d3db0f9f632f0a1c5071509e00f3ce712e684a2caa6be7d18db145e5dc35f708d16b7917b289ad
-EBUILD imageio-2.1.1.ebuild 549 BLAKE2B cce1441648fbc39d0c3c27459708797e1f2a3411cb3a2b49da2ebd13fbb4a2b7018c06c8575bfdedb28b52296c50d0fdf01629ee20bd0de9b5b5f2fb2493f279 SHA512 d4985ea9a1484152b07d44edd63cc9a8d22f1cac4c5406717b19b3a6e06b5c26dcbdc82c1731be18cf106403055d9c5416128867b1fe6cd92938be6dec7f6955
+DIST imageio-2.6.1.tar.gz 302911 BLAKE2B b0ed781b9edcbb93af664ea4e815cf90e56ab2b31abdda88dcd142558efa1c43afb89886f6b3a372fddcd200df802e45c7278fe13067bfeebf119471f573e668 SHA512 e4a4510a9fd0823914a9f511011cb9c191bea1cd78b2c2bba5d559fcdc89c55cd1dbb03a81eaf82c460ebb86cde518f44ff02766a9935d4f463e81a52007fe25
+EBUILD imageio-2.6.1.ebuild 550 BLAKE2B cdac1fce16de3aef43192f91a95ff04e00b9e3676e76184e1f3984371ceb65690160f9f9357cec664737676ba08d5096f5d5c95e4ed698609b112e234c220a06 SHA512 1d99f77dcd2d2b6ee21b15a492f05b95e2d205f1570ec02890039d79fd2dcff38b83d5b4b080b8f3224d35b101b523a97f23b72f2582933836b9b2cf99ff56f7
 MISC metadata.xml 763 BLAKE2B 27b20ebe876a614cc94676106128147bdfb59ac16e1a513b1d868922ecbf7ea8c61b4a27c973a8321a29c8f2d2dbabd92974f403d1bd036937ddca6d43117dca SHA512 b6729dbd110c5d7c977618ba6fdc7585609e4bc69f93d904a8796781273b38c9dd0e9a29e782f47e36d49dc72032d6967803f88e418a6a1ea8715c719342136e
diff --git a/dev-python/imageio/imageio-1.5.ebuild b/dev-python/imageio/imageio-1.5.ebuild
deleted file mode 100644
index 5c9887ebb9ee..000000000000
--- a/dev-python/imageio/imageio-1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freeimage
-	"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/imageio/imageio-1.6.ebuild b/dev-python/imageio/imageio-1.6.ebuild
deleted file mode 100644
index 5c9887ebb9ee..000000000000
--- a/dev-python/imageio/imageio-1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freeimage
-	"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/imageio/imageio-2.0.1.ebuild b/dev-python/imageio/imageio-2.0.1.ebuild
deleted file mode 100644
index 5c9887ebb9ee..000000000000
--- a/dev-python/imageio/imageio-2.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freeimage
-	"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/imageio/imageio-2.1.1.ebuild b/dev-python/imageio/imageio-2.1.1.ebuild
deleted file mode 100644
index ce7af14b0e18..000000000000
--- a/dev-python/imageio/imageio-2.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freeimage
-	"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/imageio/imageio-2.6.1.ebuild b/dev-python/imageio/imageio-2.6.1.ebuild
new file mode 100644
index 000000000000..19e88cfe45e0
--- /dev/null
+++ b/dev-python/imageio/imageio-2.6.1.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="Python library for reading and writing image data"
+HOMEPAGE="https://imageio.github.io/"
+SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index 2d2bac4bf4cd..e024374d66f6 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,7 +1,7 @@
 DIST imagesize-0.7.1.tar.gz 2871 BLAKE2B c458527576b9e55d7bb501667b1283a6362b408339c385c6dc1201538668d0c4708973c8b94faea7151195304eac78071770fc068a65f0b9565f50ea7808395e SHA512 61ff92167cc90bb1dcc78bb358419a526f09dc567709548bbe399694aa15dab63744f56c67bf33a940f5f443fd3a5ddc08ef9e17799b6fede1b11c0ad6a17f75
 DIST imagesize-1.0.0.tar.gz 465373 BLAKE2B aadb78abb6cdba8083c123313e4e35bc2d83cff4034357c6806c9231e6e0be570c871a5ed2e975337a91741aea6ac7643c4cfe3a19e12c184cab0b2f3f51fdd4 SHA512 1111d284cfdb8b14bc09dd0dd569434c62225f0b8da5ca5c00a740fce095c382efafcba73a4000e38b91418775518707693675c2d3c2dafb1036fc4aadb91e64
 DIST imagesize-1.1.0.tar.gz 1275201 BLAKE2B 32169ccbfee5080d98b7304a2eb7c437d223a9e538281bd0a9ae1e35f5defb71d1abb7e6307057f7e41d199eda402ee91a2a91eb3d9f74cb8fb1df5c4c966072 SHA512 11af71a5120decb88450d1bc7609e25e560e448fcaef72c273690ffe3ad06856e6a172e20738a8dd5650efe1ba8d599e797692eb5cae2b7d74a71f1f55438a03
-EBUILD imagesize-0.7.1.ebuild 644 BLAKE2B c95b5cd9a16e64d996e928c2e5afce166892c4e7e6289cba57c5483ff506502d3453ad86586ba60b696d464b166dd4744388c4e4790dc4111850f33385e9fe1a SHA512 8935c8fd6126a0c2296a5b3d8e77f70f837276e0719db3cd81b8f2715ebe65b6f5c9a87fa6fb4f5d41a79c012c9650d12f4864ebb4f535e2f5e36ad9b0d26ab0
-EBUILD imagesize-1.0.0.ebuild 717 BLAKE2B 6ca4e4396b04829463d49909128922b3a69dc7b0eac1e9c92aa1466f128242bb5e12d718194b343949d4a22ecd9b42244e05000b262b1ba5a6ea625367967160 SHA512 a0a37acb88346c7c0be46490e0b819672a51dd66a05540d4e9ffb8b8ee7541c34fb878527392bd577a7b6bda043eaf2c0649ffcbc5b56f82facc06cd039f720e
-EBUILD imagesize-1.1.0.ebuild 577 BLAKE2B 9365fb34a3686f84ff484f019eea8a60689c987021364d9bd809ba97ed10a38809ebf5d5eab36e90f6797f70524b5f08012704a256e31bf890bce3f3ac2aaddc SHA512 7854a04b536b57a8b54a36a76c49fd4781751b58691406a411c78bf885dceb3a0066ffa399636943e814ab20402b617777df2b731a1516fb70d2c588e70ae6cd
+EBUILD imagesize-0.7.1.ebuild 637 BLAKE2B 0430e648a2b4b57a0485f683c95270566977e4e492c6ce153d2c059a74a6f1d799f68aa09f450572db24ccdde26e98011e6b224fb5a094f3727db3ec930970a1 SHA512 9d610e32ee836d01f796e0cefc0302c51b3cb27c5b6651cbf8c3369ea4610f5392bd70237c5c0c67e5ca6943c6c7910190353bb57ffd4443060ac9a40835c4c1
+EBUILD imagesize-1.0.0.ebuild 712 BLAKE2B b8525e26e1b49ed25071872faf4b13e99f26618a17fb1f45979ef7671866dd213720e5d42f7804c234d4801e36830b59e720ded09f0de51b03e9e7db43dd04b4 SHA512 f683790a4eeefeb492a06dddefd7f0a9882688a0bf2f8c0d8c1548960cd433b097fa2f7c455a28d890c174b12a9fc22042a34842839c866d6b61dc8f690619af
+EBUILD imagesize-1.1.0.ebuild 570 BLAKE2B 0bb5f183206b39bc0529d3bff30092ad6b43bf7cd40ce2aa9172a7b28dd0723e63fb94761943feadf7e0a41a4608bd36bc59f319a1f9c07e2e1af12a43851571 SHA512 2c94c9f21f0eb4a9321880a9c9320c60b15c7311bf6da77615da3e0f05409e889fde581870e70ebbb597f75ffca8425b1e44dee796cd44ad74b6d617b78d17ff
 MISC metadata.xml 434 BLAKE2B 946bd353c48c258821176debdb575437e538092c2b0d618355ed90883cb5b6e91a6de1f9f842c0c6df002e69ed6bf37bf9a087ab4fab4c57ca36bb918f67d723 SHA512 3c4d3637bad987db6e9c46a46d51cf59cef4e067b5bc6b6e47ab5da5f257db8dc67c35c0f52f7f4ec0522acb527beaacd22bddc6c47282be6e1552bdac5003eb
diff --git a/dev-python/imagesize/imagesize-0.7.1.ebuild b/dev-python/imagesize/imagesize-0.7.1.ebuild
index 283a891a9499..1153d0c92c00 100644
--- a/dev-python/imagesize/imagesize-0.7.1.ebuild
+++ b/dev-python/imagesize/imagesize-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/imagesize/imagesize-1.0.0.ebuild b/dev-python/imagesize/imagesize-1.0.0.ebuild
index 6c418bc1ee4f..0f1b5305b96d 100644
--- a/dev-python/imagesize/imagesize-1.0.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/imagesize/imagesize-1.1.0.ebuild b/dev-python/imagesize/imagesize-1.1.0.ebuild
index 2830e1a04af3..27066755bb2d 100644
--- a/dev-python/imagesize/imagesize-1.1.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index 7d0d0c52ffa2..a2a0f9577db3 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -2,6 +2,6 @@ AUX 0.12-tests.patch 1596 BLAKE2B 2150cdfd5ae8135f83bd77f6260ab9bc4c2396c9ec6c7f
 AUX imapclient-2.1.0-py36-tests.patch 1224 BLAKE2B f3a9a7257f8eed538d9c030e1c8682da0a507d5d9c6f1a92f8d42daceaab214c1d033b4ddeb8f6f5081c53f7e464f72830202b048067d8685eaf761f9aa1bdb3 SHA512 cea2d0b0744cc76d52abda07a031b0e61a96e6019172e0e5490f6e32f757c6850344caa41b22d0db9fd814153c1f78d9d48260281d362ebf1eb2d9a05f9b4800
 DIST IMAPClient-0.13.tar.gz 102427 BLAKE2B f087b6e89c45810f359bed889345e6748ebf9ae90f6e3c4e013097a4e57d3f5ab0ec21906cfdccc03a344d92ccc442d58e38e687cd0761d86956047e89fedb03 SHA512 daebaf7f4180b6c9c6f4a486b313abfdd06f3ed8ece18a19bf46a50e56c2094e85de8a8e4efb8850566378eba016c10816611d03852caf637ee1d43f3c8a418f
 DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
-EBUILD imapclient-0.13.ebuild 1734 BLAKE2B 3c7fefd4df5f4e6148a78011e769208d7c882c441f397cfa50b6e3f24c43be3f441e7f849a94fd3ad4e64b288deea8af6ed6d3c2616b70d3d749dca0ad662d5f SHA512 f735906d9cbe78756eff0d78d25bb8a472424fc91fb0faa3b63c5d7af2abab4ff74dc692d5cdc07b505657662eba1c9aea6b2a218a58323856f54efc0e554fcd
-EBUILD imapclient-2.1.0.ebuild 1140 BLAKE2B df8cc1340163531ea67869bed6032736b5d1bf62e6495047a5affed7cb7f50492e1a0acb54dd739f703066fd74f959738ee86c4792904fa1cf79436d59b3739a SHA512 047114d4503888b5f39a84eca490d62f6ae3f51fbea2dba7cfc0156f24e668eab6ee13e1b4916934f66db6b31f3023f049d5a2b623cca74dc43ab46328646578
+EBUILD imapclient-0.13.ebuild 1602 BLAKE2B c42b001329983cabfdd92998fea541b5ae79616db4bb5f2cb5f6c15c1fde71d05a6f56d37059efd105667812341fe88fb576e1080a3fd869430a867e279226c0 SHA512 81363697a5d4c46921214c4ff76dc2c30fb05978185cfacc531b4d08dca7fa559ee905495290b68687701e89bc8478691193b0601b3d0a7799354d14b0d94a10
+EBUILD imapclient-2.1.0.ebuild 1020 BLAKE2B f501b0e3f2d7276f7595e2ad14440d396e1563b9f2ee409c0786bba754f958eef04e1aa9b639fa0000562620432de11e2587dd6ec2b8891adaf6fd3f9cf5e02e SHA512 2b536f7c46131b63f91679b4f46ae010eccd3c6bb27521f7f8115b804162542f3ca6bbe5b83e23586682be1731f790d133a33b6d66dd4bfac27ee4c4266b95f1
 MISC metadata.xml 313 BLAKE2B 89d6cfc58f1d5e5e5e0737bf8fafc74e26800234041390fdc259aaf4a49b9c8aacbf9c5c2c55e8ddac4b5010dd70a2ca349f41ee15a0812335522354381bd151 SHA512 b8b32e8bfcf59a3f7134ca2f562365c02e590a2d6e8e5eae9c6d3dbe2d4918b973b614aa38650cc67a5c34167b6293f4dede92e53f635f079a050bb26289d48b
diff --git a/dev-python/imapclient/imapclient-0.13.ebuild b/dev-python/imapclient/imapclient-0.13.ebuild
index 6d307b59f89f..2ca1822e0e13 100644
--- a/dev-python/imapclient/imapclient-0.13.ebuild
+++ b/dev-python/imapclient/imapclient-0.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -17,13 +17,11 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
+IUSE="doc examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/imapclient/imapclient-2.1.0.ebuild b/dev-python/imapclient/imapclient-2.1.0.ebuild
index 5742007c8532..f0f2091172d7 100644
--- a/dev-python/imapclient/imapclient-2.1.0.ebuild
+++ b/dev-python/imapclient/imapclient-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -14,14 +14,12 @@ SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
+IUSE="doc examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) )"
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 PATCHES=(
 	# fix incorrect assumption about py3.6 behavior
diff --git a/dev-python/imexam/Manifest b/dev-python/imexam/Manifest
deleted file mode 100644
index 41f9f1e5c228..000000000000
--- a/dev-python/imexam/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX imexam-0.7.1-system-xpa.patch 1902 BLAKE2B 92717b9bb17af55b30a936712113ef50fbe079dda5b4a15085f32f65e8a1fc95b936d4a4be316f423b3ac7b9e5cd686a5725b4d75f0062d3e0f34fdc94a8bfeb SHA512 c0f337fcae6db9eaac30e54f57efdc53a162be1500aa67bb7adde152af6a53560cb1449c95e1029c16584acbdbf6e5b7b55e6a720cb9a8e4a8255beee6d6a992
-DIST imexam-0.7.1.tar.gz 20264259 BLAKE2B 0cda1ca386997b0e98d47af47a549993fe4d23b4d5e7a7620b1077adc7d51301009a5c57a7a79776ee15a8efeb572a8b1628d7b21a8b404a94f53ae525ca8a16 SHA512 cb09d1764de19333fa6be1bbb9e6efd3d59943fdef4ccac4e8429e436dd615fa5be3a06c9473cc2c3ff1de1a8987d02ef24765de5b36131c31451b013be8d776
-EBUILD imexam-0.7.1.ebuild 1457 BLAKE2B 9d4f2b777fb6350131330b46b22f466fd91d5f008efb31e651854c68effec3ee3ef44ec21034714082dbca8eafc78f221b33160b5475a26e45071fe78774816b SHA512 bb9a5027b158ea7d051d847065c0085fa22b834f15fc8924264b441c8a8cadd71f46a842aa8f8f56619de4bef79e5f64a8d0c4f67179340d2a1f5b1d38918a1a
-MISC metadata.xml 903 BLAKE2B 8e0b16ce360a799e0c96cb6674dad4b05aeb1a30d343c75d084f203ed536137f47d08fcc1e443bfb642f77653271e427029060150ef67f6433b828ee91dda8f4 SHA512 40598f07aa51ad664d0368303e30ccda539db5ad0293e6349fc02b0555a6562c6b58ddda8fea6c31d80c96dffdf7262a68a516fac1b2eee9d0e0d3f4daee7417
diff --git a/dev-python/imexam/files/imexam-0.7.1-system-xpa.patch b/dev-python/imexam/files/imexam-0.7.1-system-xpa.patch
deleted file mode 100644
index fc90ffef7f34..000000000000
--- a/dev-python/imexam/files/imexam-0.7.1-system-xpa.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Ole Streicher <ole@aip.de>
-Date: Fri, 21 Apr 2017 13:40:06 +0200
-Subject: Use external xpa
-
----
- setup.py | 15 +++------------
- 1 file changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index f0dd5d5..f291201 100644
---- a/setup.py
-+++ b/setup.py
-@@ -121,24 +121,20 @@ if not sys.platform.startswith('win'):
-                    xpaio.c
-                    """.split()
- 
--    XPA_SOURCES = [os.path.join(XPALIB_DIR, c) for c in XPA_FILES]
--    XPALIB_DEFINES = [("HAVE_CONFIG_H", "1")]
-+    XPA_SOURCES = []
-+    XPALIB_DEFINES = []
-     XPA_SOURCES.append(CYTHON_SOURCE)
- 
-     xpa_module = Extension("xpa",
-                            sources=XPA_SOURCES,
--                           include_dirs=[XPALIB_DIR],
-                            define_macros=XPALIB_DEFINES,
--                           depends=[CONF_H_NAME],
-+                           libraries = ['xpa'],
-                            )
-     if use_cython:
-         ext = cythonize(xpa_module)
- 
-         class my_clean(clean):
-             def run(self):
--                import subprocess
--                subprocess.call(["make", "clean"],
--                                cwd=XPALIB_DIR)
-                 if os.access(CONF_H_NAME, os.F_OK):
-                     os.remove(CONF_H_NAME)
-                 os.remove("wrappers/xpa.c")
-@@ -147,11 +143,6 @@ if not sys.platform.startswith('win'):
- 
-         class build_ext_with_configure(build_ext):
-             def build_extensions(self):
--                import subprocess
--                subprocess.call(["make", "-f", "Makefile", "clean"],
--                                cwd=XPALIB_DIR)
--                subprocess.call(["sh", "./configure"], cwd=XPALIB_DIR)
--                subprocess.call(["make", "-f", "Makefile"], cwd=XPALIB_DIR)
-                 build_ext.build_extensions(self)
- 
-         cmdclass.update({'build_ext': build_ext_with_configure,
diff --git a/dev-python/imexam/imexam-0.7.1.ebuild b/dev-python/imexam/imexam-0.7.1.ebuild
deleted file mode 100644
index 9056407c41b2..000000000000
--- a/dev-python/imexam/imexam-0.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Simple interactive astronomical image examination and plotting"
-HOMEPAGE="https://imexam.readthedocs.io"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/ginga[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-system-xpa.patch )
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	echo "backend: Agg" > "${T}"/matplotlibrc || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${T}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_docs --no-intersphinx
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py test -v
-}
diff --git a/dev-python/imexam/metadata.xml b/dev-python/imexam/metadata.xml
deleted file mode 100644
index 6a478af7b2bf..000000000000
--- a/dev-python/imexam/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
- Imexam is an affiliated package of AstroPy. It was designed to be a
- lightweight library which enables users to explore data using common
- methods which are consistent across viewers. It can be used from a
- command line interface, through a Jupyter notebook or through a
- Jupyter console. It can be used with multiple viewers, such as DS9 or
- Ginga, or without a viewer as a simple library to make plots and grab
- quick photometry information.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">imexam</remote-id>
-    <remote-id type="github">spacetelescope/imexam</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 948667cc4bd7..a74a4514f82f 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,5 +1,5 @@
 DIST iminuit-1.2.tar.gz 931630 BLAKE2B 77719b00ba2356ad51577308a470d17e22ac898fe49fe15a31cdf1a4e8e9e4ca023e7d255e87f62f43d895c6ee18892f46e8a5ca7a70ef3d6335e28bdd369b64 SHA512 b9836abf57a3c33bfdf044655e3b8f465cf5252a10a50c17a70f382b8283754095f083e523060fd6d33c7e4c345b8c9923255408120e8bcfcedf1eee8de2dbca
 DIST iminuit-1.3.3.tar.gz 498456 BLAKE2B 3e10ed6d9166c05810e1ec8a2efda3743a3fcf01a738c08312f178dfa9d463792f77fb7e9f6ed6b07c0f98d618d168b32b8269a0542b3ec066f4696710282cff SHA512 8da6c6383bdb24caba0b346f4e0ce1ea027b460dd8ff8f1dd349f678ef55e4d9a693eca143045eea632a5cf7b5f2c10627b41bad208aa128b717777557b2c306
-EBUILD iminuit-1.2.ebuild 737 BLAKE2B 2aea2f20030940a3d2905d857979967edff70f64eaf2f9a96af059b07e8ea9a907aba1053fff6f8283f9c92f22f9ca9518ee5acb2c5929467c5be342a7bec535 SHA512 74457603136100c5dfa718ded35378aa5743ed822d93c5291e9c0fedcac7d7a00b00a010ec3e8e699860670fbfba55302f11fe30e8cc200fc7656c7982422a06
-EBUILD iminuit-1.3.3.ebuild 737 BLAKE2B 2aea2f20030940a3d2905d857979967edff70f64eaf2f9a96af059b07e8ea9a907aba1053fff6f8283f9c92f22f9ca9518ee5acb2c5929467c5be342a7bec535 SHA512 74457603136100c5dfa718ded35378aa5743ed822d93c5291e9c0fedcac7d7a00b00a010ec3e8e699860670fbfba55302f11fe30e8cc200fc7656c7982422a06
+EBUILD iminuit-1.2.ebuild 733 BLAKE2B dd6de95c4afe4b0bcab8c5d37538698e3520307ffac5fa272a4ca50dea570e65941533b927d8af00036d07a63408e17a1a3ce613928c9c52c8b1b458ab7237df SHA512 b27535e146a193bfcecc61744566fcb6065f5b76700a7201ceba4116b2c98a87947f625aa85eaa91cad87c90ef5f27c25f878a0a24a1a8db285e6e9956cc2b04
+EBUILD iminuit-1.3.3.ebuild 733 BLAKE2B dd6de95c4afe4b0bcab8c5d37538698e3520307ffac5fa272a4ca50dea570e65941533b927d8af00036d07a63408e17a1a3ce613928c9c52c8b1b458ab7237df SHA512 b27535e146a193bfcecc61744566fcb6065f5b76700a7201ceba4116b2c98a87947f625aa85eaa91cad87c90ef5f27c25f878a0a24a1a8db285e6e9956cc2b04
 MISC metadata.xml 383 BLAKE2B 93614e2da85970259b8fc57ac6768553c070f90e0e97997f8d043c6ccc25d2f3daf62afb02043266ce4294e1450311be62ea9635e54d282ea2963d65d8b9f96b SHA512 8a2f70c08231e482c3121380f52f405d5606aff28379d7b306a95b1cf6c092594e1713554409245e870352911e610de977288c58570c57a8d1546653fd7deb62
diff --git a/dev-python/iminuit/iminuit-1.2.ebuild b/dev-python/iminuit/iminuit-1.2.ebuild
index a0bc2bdbccd8..e6e54cd9b997 100644
--- a/dev-python/iminuit/iminuit-1.2.ebuild
+++ b/dev-python/iminuit/iminuit-1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/iminuit/iminuit-1.3.3.ebuild b/dev-python/iminuit/iminuit-1.3.3.ebuild
index a0bc2bdbccd8..e6e54cd9b997 100644
--- a/dev-python/iminuit/iminuit-1.3.3.ebuild
+++ b/dev-python/iminuit/iminuit-1.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
new file mode 100644
index 000000000000..6510abeb777d
--- /dev/null
+++ b/dev-python/immutables/Manifest
@@ -0,0 +1,3 @@
+DIST immutables-0.11.tar.gz 76589 BLAKE2B 64d7ac89dfe680d1fe78704c165a1fbb15559203980f1a8edd65fbd74589bf2038c799037189849a917555a67483e0cb352664b1d44f3ce161db6c88b878ae5a SHA512 fceb1feb5fd8de4444681cb89c6692206042d0f8f404d78848c379ca3afbb07425e2ba875f7b7cdb42bf126ea0b9f682c0b873c4867c5266cc77da28d29f6ab5
+EBUILD immutables-0.11.ebuild 461 BLAKE2B 6c6ab0e6fcd1c982766c149199964c31f64232f1b878064e9741d081ccba024973eeb8988483cbca30f1642788e32296563265c75965a18f9eb36039740b67e9 SHA512 1e2d551b8a83eb3f96c5421593013f66ba0ca70b6b6efa080c5054e97397f687b5ba6b75776d7a5dd33106b042d2044311c806f1b4d17d70fb59a1bc04588778
+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
new file mode 100644
index 000000000000..4bcf99f9087d
--- /dev/null
+++ b/dev-python/immutables/immutables-0.11.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,7} )
+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 ~ppc64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/immutables/metadata.xml b/dev-python/immutables/metadata.xml
new file mode 100644
index 000000000000..074b37f1f2a9
--- /dev/null
+++ b/dev-python/immutables/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">immutables</remote-id>
+		<remote-id type="github">MagicStack/immutables</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/importing/Manifest b/dev-python/importing/Manifest
index 7384b618a2ce..7159a3c1a139 100644
--- a/dev-python/importing/Manifest
+++ b/dev-python/importing/Manifest
@@ -1,3 +1,3 @@
 DIST importing-1.10.zip 17138 BLAKE2B 3f8dbfc469c6c2a0499f06dbfc79cc83e078ced4a5bd03fd79b4f641eea23be83f8796eb4784e39fceb76673a1a40be1c8504d5ae28947f6daf7d57b76eb7b44 SHA512 628f4c119c8d0cf558580887fe30683223dcc439ca7ad5f7fa442d87452f3aa7b2f8ad200634c70a969dfdef7ef5938fd51fd36044d311296a8df73b5f2851cc
-EBUILD importing-1.10.ebuild 559 BLAKE2B 7f9962dcd0a3ff20b8f5a413c16ac72749fa9b0c782e15798b3199390c7f8b8067d943ae36577a4c75858d89e1e94bdfc81eeef805383c84689209ee321d23e6 SHA512 975b16fcc379c71bc1e7ddf116cfb25f681d22c4e686ffd48fb5c307eda08752268ebc63903cfe4ed56cd36a10728651c8653a5c9c96a39604a8078e94dcabd2
+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
index fad2593f6827..23d055e58748 100644
--- a/dev-python/importing/importing-1.10.ebuild
+++ b/dev-python/importing/importing-1.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 276628f6313c..7c78b3756f0b 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,10 +1,10 @@
 AUX importlib_metadata-0.23-py38.patch 1069 BLAKE2B 1286d00ffda07aace5c10bd5f72e4991f7853292a633d495415dc60f8210b5bddbd02b31d0547c2d4fccabee88a12fe74341edb3854f1756da9739f8368c34ea SHA512 0004fba3856134614124c5fe42935623ede41ccefc726c8ddd177749f307761af5872c627092dee126b1dfe506aa49ac9a1577c773e22d25d01f9cb99fc35e24
 DIST importlib_metadata-0.23.tar.gz 25172 BLAKE2B 8b88081971c658a01fd1c47cc664e54f4b42eb209ac1ce00af1dad5c15f66b661b20fc287abf818d7e4ef2e92447bea713fac6fb89a98d5ea7ba93e74134e4d6 SHA512 56594dfd67733842d83547770a09e12b4e4e3c000b7c9743206e13e4629906bb7271065e03c387f5114bac7f673fc17594d2ef90af23cd34b7ededecaf3fd47a
-DIST importlib_metadata-1.1.0.tar.gz 26005 BLAKE2B 7fa48797833f9d7768d3a5d8fcb22f3f8add2c0b93a98a7830325a1d9d601ac54cf9a6c7c3d5895616bd9202845b5651b18235a14f2f58bb320f6e2a662350b1 SHA512 3f11be78b3a51f8e3b91edaab59850ec6b418dad2527700bbfe7334ae3f49fc8f4937685e9306b31231a22d68df7f28d1a26f6f56ae4ce309339e8b8f28f3aae
 DIST importlib_metadata-1.2.0.tar.gz 26110 BLAKE2B 00f8a1e02c8bc0878dd0e5b1fcd11b6b30fb270cb6c528c0270a3e49dd7f27ac39c991bc442e648bc86116c6ae0772114fe60beb8b8b6274efd3d8cbc668d71b SHA512 27bdf882995f5efaf9a117650dcc36f32dc373e30d3ff973da5d9b9b160625904d165af98adfb9fa1681cdd10a88f22105eb8117bc9c682f9eb0b8d06e148037
 DIST importlib_metadata-1.3.0.tar.gz 26323 BLAKE2B a460a78856966fcbb20559c12f5da9ccfe82c9faa3745850e156a6b07db5d597138c1eaac583838ea24835e6c45c4cf8aab8474e5e15ba7de981eb1ad6b5de14 SHA512 45d09cbbbceee80a4769f2d374a3c4b511fda56a100ad1a6fc7cedf9a0cd251600c960430c608c7bcd60bdd9a0117f83025ed7b05f9f6a53edc791d128e8b0d7
-EBUILD importlib_metadata-0.23-r1.ebuild 1420 BLAKE2B 96230378e08741e62cad928316cf8eb154682403773930c12675a2082440de2d7916829713e13a218f8f73c96c71532a9b9374be625b249a66aa9ca2e98a1371 SHA512 ef0f3d59111d559538e2ae098e14f128bee05f226c73b13c22ed402577cd6aaabdb71fa04e70c98d1cfa5424f3b545a7635b04252dddce6dcd46d8eac2e1a102
-EBUILD importlib_metadata-1.1.0.ebuild 1092 BLAKE2B 8e0d6ed29af4445cf1b1034fc996813a01869c8aa4e0fae1ff4a4182ccac59308212a57239e538493312691b305a135a40955a9fa6a2957b372f5c3853d8dad2 SHA512 618b2a5bd8309c0568342bd5e1fc13b7b9a5622b3df23f10ea3f5d0b602c7307633b8c40808ccf98437654e9428ddc3051e2bb81e103bd37a78196379c80911b
-EBUILD importlib_metadata-1.2.0.ebuild 1092 BLAKE2B 8e0d6ed29af4445cf1b1034fc996813a01869c8aa4e0fae1ff4a4182ccac59308212a57239e538493312691b305a135a40955a9fa6a2957b372f5c3853d8dad2 SHA512 618b2a5bd8309c0568342bd5e1fc13b7b9a5622b3df23f10ea3f5d0b602c7307633b8c40808ccf98437654e9428ddc3051e2bb81e103bd37a78196379c80911b
-EBUILD importlib_metadata-1.3.0.ebuild 1092 BLAKE2B 8e0d6ed29af4445cf1b1034fc996813a01869c8aa4e0fae1ff4a4182ccac59308212a57239e538493312691b305a135a40955a9fa6a2957b372f5c3853d8dad2 SHA512 618b2a5bd8309c0568342bd5e1fc13b7b9a5622b3df23f10ea3f5d0b602c7307633b8c40808ccf98437654e9428ddc3051e2bb81e103bd37a78196379c80911b
+DIST importlib_metadata-1.4.0.tar.gz 26380 BLAKE2B b185183b5a71b822f068856a4b1af3fc833a0cfcad65e522d3034022c20ab382a02b232cf3b365bfadc971d4a150b93d7e3b0ada7645dd33f201ffec976117fa SHA512 859faa1ef9cecd6b2ae88fff9d90d72e54e6f0ce3025b09e8a22d8f2b0d7c204c4041aa6a1f35ce79751b04ae482e406d2157f9296d4f8b579b5b29591b39089
+EBUILD importlib_metadata-0.23-r1.ebuild 1407 BLAKE2B 2e4d29c2677331817023b7258a4a741019ad14c2fd2b81f2b4ea93ddf25d99a5e0f543c65663ed5929b84200897a64b58e0fad46c625984d4fdac0f561127323 SHA512 c24af8a052681a6c454db5dd6678945d2985966b45297de7b012f733ed79b5c29c8b209f767c3dbe8232021b34a6669222d741072fc9440e0ff71f10823db5dd
+EBUILD importlib_metadata-1.2.0.ebuild 1087 BLAKE2B 10e14b865623dabaa7cdf12d5ec40a3af4a637706769273dc75183c706ba6c2397e704ad2e42d84972fa065cef7cc0d1e6021145de7d0d935f201f29f6dbe6ba SHA512 a6e567ba8160a0772357cd7464638c510c4c31fd4bb802a0472bb9b1dc0949993b6d18813bc46c5b662ac2cc251f46dbb988ee51aad69500611bbb2b75b4737f
+EBUILD importlib_metadata-1.3.0.ebuild 1087 BLAKE2B 10e14b865623dabaa7cdf12d5ec40a3af4a637706769273dc75183c706ba6c2397e704ad2e42d84972fa065cef7cc0d1e6021145de7d0d935f201f29f6dbe6ba SHA512 a6e567ba8160a0772357cd7464638c510c4c31fd4bb802a0472bb9b1dc0949993b6d18813bc46c5b662ac2cc251f46dbb988ee51aad69500611bbb2b75b4737f
+EBUILD importlib_metadata-1.4.0.ebuild 1080 BLAKE2B ea2268dbf02eac4668748e89a95042f8dda276cc7da1dedba1d3995c8c4c474b2803e2fc3fe7e060ae0393ef449535a53d0a365d34f2c662126833ef9b9d6aae SHA512 f18cc1420679cb859f9f423f0a156faaa8a082e3c5916f093178b272d2f3dd23bd9140b57351bd0b038d19aee9712be950de81873c5b507e443038fd68fd38f6
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild
index e67f26aed31d..bf98c2989273 100644
--- a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.1.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.1.0.ebuild
deleted file mode 100644
index 0bdc8cb3113a..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-1.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy{,3} python{2_7,3_{5,6}})
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx "${PN}/docs" \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests unittest
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.2.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.2.0.ebuild
index 0bdc8cb3113a..62551f93f380 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.2.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.3.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.3.0.ebuild
index 0bdc8cb3113a..62551f93f380 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.3.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
new file mode 100644
index 000000000000..6c2b6ac13254
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-1.4.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=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://importlib-metadata.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy3 python{2_7,3_6})
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx "${PN}/docs" \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests unittest
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index b7f40bc6e2ac..2d4b7fb84952 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,4 +1,4 @@
 AUX importlib_resources-1.0.2-skip-wheel.patch 305 BLAKE2B 741e9825c64a88696603d31d9b749fcd3756bcb44755730b12d22afddf911d178365904885d2323aa5b331f44f20b6e3306ad03adb60794c6c83cd1b0795c902 SHA512 6e3f90b1544c6de97768aaae708d1bc93494dcdf1cf10d59e48b55406c9a6c9bc9eb5f5c0d034bcff99eae5274c1f1a467a9bd2a4292f0eadf0686286b879f77
 DIST importlib_resources-1.0.2.tar.gz 23602 BLAKE2B 24c27b45ec56d3838b039baf2ebc1e0c5ec582d5cfdeb5cf26587255bf8b32aa1fcf43802cabca3b82b3ddec8cdf2616d10489c3c1aca77c9fa91af1f25ef9e7 SHA512 50bfc5130a2c9c9354efef1cd7132e805ed0f13467ba67172f83e11d907212bef3957aeef51fd904b73996c8280008d99c918637956a470448dfd67ef4807f82
-EBUILD importlib_resources-1.0.2-r1.ebuild 1269 BLAKE2B 5e5817cd61f99107fab1cc49f812acc3bdb3f424e6d1ab99a606d017b4ef886a04f869bb7f0cda08b3af7ce158a488b9764451446949534d07cb9008fc99abe2 SHA512 0fdf71ceeebb73de54801025e238bfb50815d2090c6955c6755884efce1c63628f4852dc2b0ba1347cbbf6088b85679853d8f57243b103b8a0cea641f8c800f9
+EBUILD importlib_resources-1.0.2-r1.ebuild 1254 BLAKE2B 295ecf68ea748305ab37ec0b1aa5703ebc9c62728b6a6053cf82561b44d09574d7e5c257b134fa33c7ce950a9f2b83a99bb0c6f21cc56396c97d1f1c8c085c47 SHA512 98e853072c15ebe11dd3091cc6d5a980b35e72b08e4a3330ddc2ecb718493fe87a3f9b9dc879b4bf391b64e53dbebb367ede494b27ede0abe4c5b018f63d4694
 MISC metadata.xml 1121 BLAKE2B 51c2d6c7fbdd7da49d9eb489e8268cb7d5ac85c0ed2505784b377cafed49c29fbc895ae5aa831418175f6f826822a92b6491fc82cbffea428a33b9cba76d0408 SHA512 99fd2fc5abc3deafdfc7eab5e159c80836c3b58ddab63e9bf74f102ca917567be0c5068870206410e82937cdb05d68cb9964402bae9291bc3028417cd316f8cf
diff --git a/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild b/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
index cc6b85dbe12c..9fdb80048aa2 100644
--- a/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # This is a backport of Python 3.7's importlib.resources
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 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"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index c683f050cc11..b5618ba61b78 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,5 +1,5 @@
 DIST incremental-16.10.1.tar.gz 16066 BLAKE2B 86bd85f9ea1ffe92a572b1744588f34f21e4bddc4aa80373dba47a59961183a77a338212500829440d216582ce15ab1412e9994f89486861297407f22eb989fa SHA512 b60ebc41c32f27da5a489ebd76c7fa1707a5a38c32097bfab20f355a86b490ce21acc7be157d0309a30c63b85d79f72f850587d1449110bd1a8075ca3586db5e
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
-EBUILD incremental-16.10.1.ebuild 601 BLAKE2B e4ac8f04289e31f2c5d49baa67ceb1fb916ce02de98f00a99e7eb837683ed30a1070b013ab820745ea51f1baeaffc5ee6ca9691bbe60c87aac5d48e88daa68c3 SHA512 6732f772a2cfcb1887d8301d71372c0f3d659434d9a2d6b5a7f404bfbdc9bc90b39fe067afcdc9e5b3958fb40784af1063bd8abb361998015b84c49a2915853c
-EBUILD incremental-17.5.0.ebuild 633 BLAKE2B bbcf4d582d80dbdc69c323aff6a737fb6ef8b388be5f49137a27af0c0d390e16744fbdd68e1372cb8a336b8103027a154fd2f21844dfa9a79257133d843bb952 SHA512 8695596c465330e7154494f188d936d93e0d70a6c4b5aefe68b5fee78006bce6d5f9ff7b2d215ef191b698fb0989e92f00f11d290852225cae2e0a74e971aed1
+EBUILD incremental-16.10.1.ebuild 592 BLAKE2B aab41c2c83b879ec2ccec28aaae5a2120bc2e88d245324c47dcfdd62a6fbfa56e585aee932a82751735b455a0a803acdc2d924f21cca98ef7673b897b601f746 SHA512 cca3f0494dc1527914bcaddc74e344ed0e0941df7d89fcbfec27dae8461dba4ba648fe4831eaf1c0ccda4c942a8a912a78d9ca7c389e2b2f87b2ebf92b016a59
+EBUILD incremental-17.5.0.ebuild 624 BLAKE2B 24945cf2cbdd62438abfd286ae92a35d8e6249bf8bddbc494bd535a36ee56dadde60b331b1397901d00e24bfa085208943206b4eaf2917964bd628bf229029a5 SHA512 dfc187342b464b213d2f1eb3f55086f95039c74c0a0b2f384c3f16c87766e95f016ae9d63b80d795d7ee16c28a219a6c45bc2373c0f9f719bcaed7379b3ae2bc
 MISC metadata.xml 476 BLAKE2B 0735d3636617ba9b856e46daba71508248af3f6f8f4edaf0b09fbbf14a08704876ff40d2ccd0df5f8804120f63a4869bfb9411c3f8ed2206179ebbacd21375cc SHA512 1ff0b8bca8dcb14df175291256c1c429e18799429e395230be47dde473c1541ba2e1a229513fc079ea4465e92dd82d974a65e055540b9b4cc423160ad8c1343d
diff --git a/dev-python/incremental/incremental-16.10.1.ebuild b/dev-python/incremental/incremental-16.10.1.ebuild
index 53b610981087..b2ebcac74e2e 100644
--- a/dev-python/incremental/incremental-16.10.1.ebuild
+++ b/dev-python/incremental/incremental-16.10.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index dbf19c768be7..e034758aabca 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
index 907a6fdfadfe..4323ec3e99d2 100644
--- a/dev-python/indexed_gzip/Manifest
+++ b/dev-python/indexed_gzip/Manifest
@@ -1,3 +1,3 @@
 DIST indexed_gzip-0.8.7.tar.gz 77640 BLAKE2B ff35693204a41df439b835f232b4e0ad5ceab19532a7f1f4a4aba5cfd810f447ea56c0f6cc0c5600f32317c5a4f4283a3dd5bc791dc9aec5742303728e76ecc2 SHA512 90872898b69269f42d28f61f7840879c1942060da923e8d5480c4f99feb160c1b03412378b1dda3cdf94f64434d81e4cdc524e19c268797f11444362149d0e18
-EBUILD indexed_gzip-0.8.7.ebuild 862 BLAKE2B 038ab1274ad7e5461ecde8b33f2c3f1998a28c22d1af40563475ce28c031b0fefee768b7feeb3a2f88c4f08b6188f2f690c91477043a5e35c980a3fe0c3e19fd SHA512 94928d70395816767b7e8a53f83e751ea8a8fb33864b0eba24db802d6281fc3ef609e22201087c24d2c43cc6a20e625c8f77163716530526a253fe33c2139372
+EBUILD indexed_gzip-0.8.7.ebuild 850 BLAKE2B a6dc1fa7549b8760810478d581442e2d4c107e30d9e7264828148ec5c2cb337e2aac170a884efdb8233e09a8448ed7f09634a2fddd20a70042ac07d0d78e9eca SHA512 e3e08aedc4a483d29d1088f53ac90c906515cbef299f28f7f68e5c2582215f2455522b5e142250ed76da8cb11fb96e65690cba55fae62b9bdf5147811bcb2f27
 MISC metadata.xml 902 BLAKE2B 8d1c493782d05a3c3626279266a44b0d0954977dccbd9d0a87e2f1e744dd6b87c21a8d61d4967da6ec278d09b87c5939b7997ab1138346e63616aa65de6c9b4e SHA512 c6bc3e97af583690a86620ed44925827d3320bd295018c44c7dd057848c6c9833906ac35e99404032377b8f6584b2bce92deb1465dec9e0f7daa21f66c52120b
diff --git a/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild b/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild
index 3533fde36c98..e18054409874 100644
--- a/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild
+++ b/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 4e74c43d06af..f74f2c548eb3 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,7 +1,7 @@
 DIST inflect-0.2.5.tar.gz 109756 BLAKE2B ecb64b0fea04602f112dfba11ade6828eae7a7f3f44d4c4fb15c2300ac18025ea4c51f9c36aae5e7e92bd09e24d08091ce096b888a520fd2d4c40374356333d5 SHA512 68371158ac90d9662c19657cbf697f44ee9ceac090286d53e29ee04252efbb7d0bfbd99ae6847e6eec1991ef4ef670eff60693d1f0a301885bab2a09c7ce4616
-DIST inflect-2.1.0.tar.gz 98767 BLAKE2B 2cddbeb7d4ca5e150435e42b75e0eff2e2b20a8cf38c89fe6e8958bc52d69aa070f7ba5c6c73bfdd2dab585ceb32006542f31abbeccc2375760742c70e0c6c50 SHA512 c5230ad6f224a6e9667ce3c135bf43d09939bf457f68fb3d52a4278b110df10c9ddddd05e68d94f04a6902319ad71440440bad019c081d0d781a2dbde9ab98bc
 DIST inflect-3.0.2.tar.gz 71546 BLAKE2B 951eb818ba1645a9e426468811ad449378aa5a7341575ac2aff5e9d1e06237fe8e96fa64cd678665cd6c05e1dc5e477a65b261b9d8bd170be4fb923d5fb90e9c SHA512 5858548e947f742b91630fc584f568a2221057ada7cd4a55f39de1b52a82c97884d6a78c2f32e5995e354fd1c4eae4d5b3d30491ef57dd5187fd6baca93d2779
-EBUILD inflect-0.2.5.ebuild 579 BLAKE2B 9ada69722ba9ebcc419160e0f6cb3e17f85553ebf4b9431a3bdb546f9f681bca11eb017ad59723a8c53df1c668154159639138b51e01793ada61e3c9b6b28d7b SHA512 4077d30330a5b8f05bebf0844069bf0d8e7ec9916f3ee0a66eda4be0313cc394e356cf6e1aac70694260afccc63e4fb4d2506135b69c12a6f1f1218b05111b47
-EBUILD inflect-2.1.0.ebuild 679 BLAKE2B 1b517e4b9a9385fc56c13d2fc43529e4bd5d63a9ec9dfba685adcf7d2616789bc47975ae0dec47c912b71dfd29af316044f24d73b0984bc6d8d9e2a42342a3e9 SHA512 ad612210eb83d25d575dbc1fd78e1ca6d2d072cfe2fad11404eb328432bbd53f12b7ca4ed24fa410cfc0331809e279f5e911230a5b7461d01c7e30b22c888d0d
-EBUILD inflect-3.0.2.ebuild 1227 BLAKE2B f6ae9c321e66848c7ea5501a3df36025ffc6f100bc9007ed466430663277449c59b3b5a896c1a8b0c7ebf9ec70511cf40ce486c20c0d48e5c3f7eed9748f5468 SHA512 3a4d006b4c3385f4d7046f90bf70b7da02e4d98166a20cd69062d5f3546e8ba443d3ec573a0dc4ea4909083ca93de1f1afa8a96b5a51f129ca387292dd432563
+DIST inflect-4.0.0.tar.gz 71091 BLAKE2B 597db3d84cce1660ea92b84af5d07d77f537b2d738caedbe132ed9cb074a3c80c2f9e1cab321f0e231b2a29803f3b25206f27b78672c4917873007f3a56f1a8a SHA512 7d9ef9389b9301e596165fcb1774467ddeb421636094a0f0cebbcaa11558b4529ccb90644e1097f91cff3316911c98f4bb1df92180193a5313ca7da91a282e5c
+EBUILD inflect-0.2.5.ebuild 575 BLAKE2B 3b08519374ff99105001452bb98e23afee63434803d8f789913ab3a9099911c5d10ddf0981ccd926d084ccf686a6fc11db14544855c0ba13c55a624d4c196d6b SHA512 c45ec21562859554af7aca682f34e6f09b2a5b2fd8fdd22bb1dbfa2266f9ee8dacbb182b368f0395fe584d7d2cce2868a0f9a76b6e765ec8618692a077add8cc
+EBUILD inflect-3.0.2.ebuild 1222 BLAKE2B 075da95d632a0e250a9bc9654851417ea25237e8debd4d92e8e271aa456696a637e43f41920ac32d0e569d873b2ec9570272e260401e53cdd2ae32a3cd016426 SHA512 cc7f57360900e5079734dd1cda1ba4e97e2ab8fe0f3997253d81f4aad7ccb30098c22ade0826ae8b4c3f14a28396a43cb523acf906ca726b116afdc6afad1e33
+EBUILD inflect-4.0.0.ebuild 1119 BLAKE2B eaf9e27cb9e4243fe003bf514795e3a3a2d9ddd5bebb75ec6aca39370896bac86d006746af2bb0c8f006529088b0ef26134902cda648843203e4eb71761fc11c SHA512 93a848083e049760add722cfdd81a97ca22dc8eb11ea367d4562f38fdcca71738c8421e47276ba216bbd8d076d00d4748f318ea90bd2a8fe15528adbce11d3e4
 MISC metadata.xml 371 BLAKE2B 0c72b1b5bfd404e494c2a6e2f48cf56634981d6ac86026dcd43f9c81804099b0a4693d4971f50db501e1f9421b5952ee6ab65805fbb17213cd0af75f4cc5aa1b SHA512 266d5f9dd95fc339a8653f0f8342996d194565a23e8e024523e1e8880f900301ca796a2abe5f550c51281be0df59d1704e44bb1bfed000d5a880f1a915b8af07
diff --git a/dev-python/inflect/inflect-0.2.5.ebuild b/dev-python/inflect/inflect-0.2.5.ebuild
index 92e9feb41e35..707c55335c8a 100644
--- a/dev-python/inflect/inflect-0.2.5.ebuild
+++ b/dev-python/inflect/inflect-0.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/inflect/inflect-2.1.0.ebuild b/dev-python/inflect/inflect-2.1.0.ebuild
deleted file mode 100644
index 470adefdb043..000000000000
--- a/dev-python/inflect/inflect-2.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="https://github.com/jazzband/inflect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests -v tests || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/inflect/inflect-3.0.2.ebuild b/dev-python/inflect/inflect-3.0.2.ebuild
index 9058ef631cda..fb4d41585408 100644
--- a/dev-python/inflect/inflect-3.0.2.ebuild
+++ b/dev-python/inflect/inflect-3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/inflect/inflect-4.0.0.ebuild b/dev-python/inflect/inflect-4.0.0.ebuild
new file mode 100644
index 000000000000..d7180e8c2c94
--- /dev/null
+++ b/dev-python/inflect/inflect-4.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/jazzband/inflect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+"
+# six can be removed in the next release
+# https://github.com/jazzband/inflect/commit/407dfa7e170a562012f37e9bd65c3b50cd3da0cb
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9' dev-python/alabaster
+
+python_test() {
+	# Override pytest options to skip flake8
+	pytest -vv tests --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/inflection/Manifest b/dev-python/inflection/Manifest
index 5d7fb4e7f93f..7feb023d4d03 100644
--- a/dev-python/inflection/Manifest
+++ b/dev-python/inflection/Manifest
@@ -1,3 +1,3 @@
 DIST inflection-0.3.1.tar.gz 12943 BLAKE2B cffaba9dc22444abda6cef04bc7dbd420abcdc0edca5c13bb734edd72aab631a2b50d3c37f9bd914cc8956f8afe951734db764bcced9e0837bfe75a90c527f73 SHA512 2a69a6228f2d44a5afecbd3ef51a51b4d5f63f69ddc844f4abfd6f326cb25c518403e8c5b9f98589885777d41d8fea31bacab3a5a3ab80db411960238d2f49ad
-EBUILD inflection-0.3.1.ebuild 889 BLAKE2B 26ebb77528b6e6516998f8df5404f0f6185e8637d8076cf4782b3230b6bb08f6c047f764697c03a0d8759a812ee9aaf74fb708cca33b4e5de24b91b9604e0ba0 SHA512 4adc830d1c3c4bd1b854ab6bd640c8bfcaf842ef47943a3cf98f507a30bbc4f2820ba30c364a8b8e1ea574aec1910bb125fdba89d2064b0833df0947a7bde0ab
+EBUILD inflection-0.3.1.ebuild 884 BLAKE2B 9971a5c87e4885c70836c4f35bc2a512289eba2e6b430dc178bba31f44fb083285efe10db629e6bcb69a007ac72421c0d0c7e0e4e2a536de83f1857372d567be SHA512 6b8ef91f4f8d146fff7109e2a5dff36b912f93f8e37f53d84406934e4ff54bd3948b98cadc75a73da73f5ad3f749bdb12ad6bd427b9a4d51281e59fd1a898f14
 MISC metadata.xml 444 BLAKE2B 8127165e52bc2ba190021733ea594cf8da0bf3f2d878fdc191cda3354d2093c239cd5bd7fffc0c2bfe3055eff103da4bcafefc215576a28cb83e852aeb43cd57 SHA512 2175dadc52b8a381bfcbcd3a390d99f8582aba44870c29f5addf25880df9336d9bd16bd2120ad283359693fef2b0e65b7cae315fe17f042c17a512ea0352c352
diff --git a/dev-python/inflection/inflection-0.3.1.ebuild b/dev-python/inflection/inflection-0.3.1.ebuild
index f868e5b62c64..512a2d3f53cf 100644
--- a/dev-python/inflection/inflection-0.3.1.ebuild
+++ b/dev-python/inflection/inflection-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/influxdb/Manifest b/dev-python/influxdb/Manifest
index 86879a98785a..828e7a51b46d 100644
--- a/dev-python/influxdb/Manifest
+++ b/dev-python/influxdb/Manifest
@@ -1,3 +1,3 @@
 DIST influxdb-2.12.0.tar.gz 48091 BLAKE2B dbdf19b164aa721bf1fd8b03c83413f04125244adfc690e4d300b64302890b427086826c274b810ffbdd547d04b16c906188d25aa5b805e3d01d24c618c4bd5f SHA512 2975cbf606833f56c30572cfb377f3a9b69b0e8c228419d5d1d93196ee55ee38e1455838b47c0834f7f1021da72ec721aa73d02934718848271a2287ccb281c6
-EBUILD influxdb-2.12.0.ebuild 874 BLAKE2B 1f509c465cf4f69f38f496c33c972cb92c0e60009f8a07fd4d9a74bc5f12c93d1f952e77c4dd69a0d245d35f5b1078d1be68cb53bb8a6eb5e64f23b2be4a6eb7 SHA512 ac70cccf65cfebf888bd6a711ef77b8a1b462845ca4a2dde97efbc99884a0751759690957772b30b6967f578310055ffbad0f07cf517e508a24fbdc8a0bb615a
+EBUILD influxdb-2.12.0.ebuild 864 BLAKE2B f7aa5581bf5c5bb6979fde7fc69a29230f8c8bd2581c827505d8afd6068d7b5687556e272cedfd975397f71392a799c159947b9d6e72c331e269396f4bb8ca9e SHA512 857c98013edfee8774a3a21d977310860d62825c5035e96af699330f032eea3ba54f6790c7235640b9734c4d8987fc4db91275ee60afe53b3e582341fe8e998a
 MISC metadata.xml 387 BLAKE2B 0a6e6577a9758f2e7069e673bee741ffdcbe74e1abbfc5a563b731ccd189ffd6f4748f927a4730480eb0092d4c10f89753c9c5abfc05fa113fcc56f0af347d3f SHA512 0aceab42b46030b04172d2158cf57ab28e53091ca57a6c4a989b65594abda52c2d924670b37775e6bec5cf77841aae575c73bd2f66ce3329ffb3216bc093939c
diff --git a/dev-python/influxdb/influxdb-2.12.0.ebuild b/dev-python/influxdb/influxdb-2.12.0.ebuild
index 5dbd75dd1c44..33634ba9048c 100644
--- a/dev-python/influxdb/influxdb-2.12.0.ebuild
+++ b/dev-python/influxdb/influxdb-2.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/iniparse/Manifest b/dev-python/iniparse/Manifest
index 25579c6be461..c73326ea5cd4 100644
--- a/dev-python/iniparse/Manifest
+++ b/dev-python/iniparse/Manifest
@@ -1,5 +1,5 @@
 AUX iniparse-0.4-python3.patch 16919 BLAKE2B bb33df2937755ab4381adcdc17e3ae72eb08f0f7d22d640aae06fbe52f16f90218e298c674a030fcc299dcf7107b1073fe4e3ec8f34683d283b9586316bf9aa5 SHA512 ed292dca5b124da5de1617cb2ad4f743b836607226805e488572b37cb08e9a71595ef2e008a26f99f8dd0acaa1308a77cdf58b48cde231524d034138df26ef7e
 AUX iniparse-0.4-tests.patch 779 BLAKE2B ccda778ea17d34d59fe16e0b63fc140ac12c1e06756e1959327787e8f7cf17dd070857b15ee62e5f6a62401da64aedd8819adc2db54936179b0b7b76001e5692 SHA512 543770491ca075463e4947d7adff0c846e31e03ba7b263c37d9728b93486ff751d8066cb5cdec3a244c30e00f6f1edbd39ec6ea1188340d0a3edf460af147ee3
 DIST iniparse-0.4.tar.gz 31278 BLAKE2B 1d92322cedd115a68f4133f477ca772e4d24b48991c07fecf3d22e86ac39f0626ffa7cebecfa15a200dc9fcbfac205c1e17aefa35e335a1f86f3919a3f9c1d58 SHA512 d59eae7c1ce474c89eddb0b0cbff5973444571728aa0c6ce5b3632984353415f7eec4de63cf007c276df0d1bb914b2ea5dd0acc00f3a261285c8e2e9883fbe9a
-EBUILD iniparse-0.4-r2.ebuild 640 BLAKE2B 23f4a9f716fce69e834a592a31431fa28cb614efa7723da4ef23f6d5e38d28de0ee98daad230aef2909952f9556b3475cc84ab2b2d79095d79cba6f8f190cc45 SHA512 f7b4128b80cbae447e593bedd43d4d5b98d56a411a7a3010a62cff20ccd6bf5d12650e6421fe319e2e522401d33cf303868e4437bcb7b464a0a11f88180c993e
+EBUILD iniparse-0.4-r2.ebuild 638 BLAKE2B 0fe579d8f09b6719f1cd123b881ab473e9ba56f2aea5c5be34b84dc44cf0899bfe3b7040dabb491901bef3aac91ece564d5727e3feaea7f51eed19480e1fb074 SHA512 67e0e9d7e7d1be83cbed8b06a32327c4e88a7ffc1a5c627ecdc311c7f1c62fd39c942f8ca6776617727414f7a6b0910577270e65e233b800e68603a690556b4f
 MISC metadata.xml 311 BLAKE2B 04891a9e61e3ea4e639f43044579b5ad5bb5a0cd0b1b9cef41e49b896b73c8d8ac22962f202764082de0355ce7bfa3ce1953a7c7d6d1d3523d4cd8d58fa06ad7 SHA512 f29afa7ed4888925433a7af5746a6d707c51856a95bf08c6f3b705e721091f84e18b1654d5e0cfb2e00d50d8eff2fa169d94a3642c5903e8cc503ff2a833ce72
diff --git a/dev-python/iniparse/iniparse-0.4-r2.ebuild b/dev-python/iniparse/iniparse-0.4-r2.ebuild
index b00850921307..2ea74c03eb94 100644
--- a/dev-python/iniparse/iniparse-0.4-r2.ebuild
+++ b/dev-python/iniparse/iniparse-0.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Better INI parser for Python"
diff --git a/dev-python/inotifyx/Manifest b/dev-python/inotifyx/Manifest
deleted file mode 100644
index 84576b908936..000000000000
--- a/dev-python/inotifyx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST inotifyx-0.2.2.tar.gz 11831 BLAKE2B 66acaa3ac972c8c722f9552bb674f86a6d0ea8819e73654b9a43e74f311bd8b569ecc9fc0196166ecc89eb5cf16cc3b87ee72638ad48a9e5413f26c4975e298d SHA512 a00a947da2bd31d9b867f21666aceed48b0bf9be6b1b3643676450ed68bd71400601e57e004bcd45e93274cabf933694887797f3a4e334ce6924236763112c56
-EBUILD inotifyx-0.2.2.ebuild 508 BLAKE2B fcb392cdad15572b7b99897928d1518cd4d27d0c36a38349b10107179244e1676b591dec24964aed15b009388764685a93262c31fd22e2d10dba2f57f7972a90 SHA512 fb7860d61572027442475c9a95a9e85aac34446ad8d93c1beb77b857e9e95adf73bebc4cb20f0c11d22ca0d73d76ba364ddbb3baa8ec03f5c0af17a256c6a283
-MISC metadata.xml 325 BLAKE2B 95c3686f920461287205583a98837099317f34fbdc2e2de3376d9087909fb57732b563ca3b67a647a4620fe6b7191b712c5d13a2f1c843c6627c8724db906acd SHA512 60447839a97f75c1649cdf8ef33333a70fafce89882c97ee3222996834246ce2bb92605c2b47fb1ae57507b8dd4192aaaf90c7d2bafbfd1fad4103a07c7b6a7d
diff --git a/dev-python/inotifyx/inotifyx-0.2.2.ebuild b/dev-python/inotifyx/inotifyx-0.2.2.ebuild
deleted file mode 100644
index 75739d4401eb..000000000000
--- a/dev-python/inotifyx/inotifyx-0.2.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the Linux inotify file system event monitoring API"
-HOMEPAGE="http://www.alittletooquiet.net/software/inotifyx/"
-SRC_URI="https://launchpad.net/inotifyx/dev/v${PV}/+download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/inotifyx/metadata.xml b/dev-python/inotifyx/metadata.xml
deleted file mode 100644
index c670c9a3466f..000000000000
--- a/dev-python/inotifyx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sping@gentoo.org</email>
-		<name>Sebastian Pipping</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">inotifyx</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/intelhex/Manifest b/dev-python/intelhex/Manifest
index a6fac9aa3116..6e03702823a5 100644
--- a/dev-python/intelhex/Manifest
+++ b/dev-python/intelhex/Manifest
@@ -1,5 +1,5 @@
 DIST intelhex-2.0.tar.gz 69410 BLAKE2B 190ee5c4cedb8bd84983ea9534dbe7c07b9c536f86e2033f4496a8df0275ea86904cf6c3d0a5b602c8f19bfaace8f3abe7e69e008442224e6bed203780215acb SHA512 3b3d70bd758e5780922277a8f153467568d7d7d2517528848c7f6d8c137ef5e75612f0b0653f89b277c68e421785611cdddd9a0c924061780279f1fec2319c86
 DIST intelhex-2.2.1.tar.gz 41191 BLAKE2B 2c35ec5fcc9d4fa99f7ab3c76f2d0d6055ca0b1812dbb77c6bbc33a1d48df77e8477db6cabd61afeaaa41503cb93d919b0fcb47ceb247409e2163c3f101b611b SHA512 50a08ab65d7d7d6d6aa49c92ac0c339a71d62d546cc922b006eacabb04630b74bc1538f2e461982d0ef1d613ebe43bc25a3424934d84029cd713773c08f57ed8
-EBUILD intelhex-2.0.ebuild 430 BLAKE2B 2a2ca0da337a1772eed1303022272d4ac2f573273688bbe5991870fae7d1ee824dd006aacfd379ae1fbf5c9159b822c70bcd703e40dbfc6f0046326952b192bc SHA512 d88e7d6349ebfc357c294c444555fb0b9231f364e8075624b571b2259628a3c429b2cdc88356f474975de595e0e81b47b2cdc3319a5d390d2f2a0ecb5f220843
-EBUILD intelhex-2.2.1.ebuild 422 BLAKE2B c06ac7e2b7a303926cab36d2c68f62db7bfd304083d9c0508b982df39ed2cf0a85a8ed6449ffa5b3638886a69c165529bcc781e9836529f39823573a0f277853 SHA512 1dc196ec974da61c139d8a14000c361df3c4fb55d7e5cc4f118b67e58628681d0a0166ab5d31edcd639b1c63052993bc80f918bcc994154475e57e44ee274882
+EBUILD intelhex-2.0.ebuild 420 BLAKE2B 3686b582d121b89f5ba4b5bc5cafd5444e680ad85279529977bde218dbd18955743c214a83aaea26bae2105f715e522d435dee2741e04d5a00748df8f4cb4c81 SHA512 a316c2e22d46acf37369de1904aa0e8d40166db0201bf1b8e3261d983e1f4ff643d7cbad70eb652877be0af0be05c729f0f29cae8b88edf2dddd4dc168a987fc
+EBUILD intelhex-2.2.1.ebuild 412 BLAKE2B a90ab2f6d306812d12c35d1dadd62d4701a00e04f1f6b6d920e239510ca981342edaa4e3fce35a6f927d91faf4fdfc3ee251d76a942e901503e8db37856a0242 SHA512 91a68ee4253e2e74eeb7b3007166ae091453a3445278f18da719561857a56faa645f443275c3421245d1f93be1c742a549b8e33829b2a119c820c3097ff06726
 MISC metadata.xml 358 BLAKE2B 4ce62564d3b3d112f1103655cacb01b74d4c4c6b2b9a37f52166be12d40e3c8549e7dfb7fa93aa0e2c42a920b21b5a0832940cbc5d987b74f93b065514ac0c23 SHA512 1861f321df055b65260a63d65807468a38823cae9c51fb159c836333c2db3715bd75e1570b896cd0e15130811aec691a326702540055ed7dfdef5bec260fe96c
diff --git a/dev-python/intelhex/intelhex-2.0.ebuild b/dev-python/intelhex/intelhex-2.0.ebuild
index f9ac87b0a07a..70d47b5cb518 100644
--- a/dev-python/intelhex/intelhex-2.0.ebuild
+++ b/dev-python/intelhex/intelhex-2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/intelhex/intelhex-2.2.1.ebuild b/dev-python/intelhex/intelhex-2.2.1.ebuild
index e43b69d61d6f..2b8b2111c4e2 100644
--- a/dev-python/intelhex/intelhex-2.2.1.ebuild
+++ b/dev-python/intelhex/intelhex-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/intervaltree/Manifest b/dev-python/intervaltree/Manifest
index 12e2706e99d6..c70ba484cbd8 100644
--- a/dev-python/intervaltree/Manifest
+++ b/dev-python/intervaltree/Manifest
@@ -1,3 +1,5 @@
 DIST intervaltree-2.1.0.tar.gz 38404 BLAKE2B 2410f9e1a374f654936f3b2f53423f453042e5bc4a39ab89e57b889c22508652b8fd348a4beebb10e80b7d7d7c41d4cfed12db77b49105edf5311208e9b9e035 SHA512 983318e23c681ae53371125700bf6f2494467f719e5ffce661564e117d2a7c711da17e74a5793ce2688d8389b3373f17fbb384ac0b37d2be10d6c0a6ec5ecd29
-EBUILD intervaltree-2.1.0.ebuild 650 BLAKE2B d5d51cccd23edf2d83aed284128a2890b8b852daf9f9d594c335dc7aa2e41a80cf369a2851b88bc887c8586af3b51f80b8223504279f4ee6b4640c62dea423d8 SHA512 ecc1729529537fbcf0d86af4eb4ddc6c0cf7e1ae4e9afa04a450e15f50a9f9fd37be27615c56523d7430264b5ebfc289c2a156d10ef624ca493f5eac2413468c
+DIST intervaltree-3.0.2.tar.gz 30663 BLAKE2B b6d5e7a029e1d1aeec60eaf28c1e40707c655f0eca7ce889a9c0d85a9003ac262c3aa49c396b4c42ebf70bb63157e098addec69050d01ae42a6ba37ea76e1ea5 SHA512 51d6aa302c95c9a573bcf594de390037ec1a6d674061e6a0b4025fa889dfd0187e37bc0331f13d6703340973e4c539aa1349431b14c742de9d2050cbb53d8255
+EBUILD intervaltree-2.1.0.ebuild 646 BLAKE2B 3d61432ac6291b39f5a11f54b0812556b95cd9381d7d0f1dab68b458f4d90af5eebc624dcb0da5110786e07ae79c191ddd49113c95a0934d294e75777e3eb4c3 SHA512 9b5635dd24db64747a43a53df3accc7e9ab596fc336da120f4fd54d8de430568bda932e93f8ce5d001257274c0e4fb8cc61e2b58358a59e203440bc58371eb07
+EBUILD intervaltree-3.0.2.ebuild 485 BLAKE2B 487fcb16a63c8ac6bcce229f35e58a3d5b8701d6baa83bc37c4c5ea12884778327809922b292d0ae2c8499455c0e0f75c77b37c01438d0427d6503c08b2ec369 SHA512 6946301a5dc6b2ccd338c967b18f466954b83d340990f81d41ca334d548c03f9598a47b85cc5d7f6627ec4ef913ba91f66a20ef8814db4c54cabc442e256b539
 MISC metadata.xml 336 BLAKE2B ad3c5d5f7951cb6e6bdbcf930932da989f42fea6f01fe9d31c0a6741b1f9362de9e5af66d2a610692290537f7dca53f468c0845d3ca931b8a8204b91770ef7cd SHA512 4149796fdf18a600f444b1716e32116eedcb71a535e206e3e1233b91071967fb8419b5b15710710508f25fef609a8cb2a68baafd4a91d72e962acaf42a8feb2b
diff --git a/dev-python/intervaltree/intervaltree-2.1.0.ebuild b/dev-python/intervaltree/intervaltree-2.1.0.ebuild
index cc1d1bd7cf78..adc107b44577 100644
--- a/dev-python/intervaltree/intervaltree-2.1.0.ebuild
+++ b/dev-python/intervaltree/intervaltree-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/intervaltree/intervaltree-3.0.2.ebuild b/dev-python/intervaltree/intervaltree-3.0.2.ebuild
new file mode 100644
index 000000000000..34ef54643405
--- /dev/null
+++ b/dev-python/intervaltree/intervaltree-3.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 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="Editable interval tree data structure for Python 2 and 3"
+HOMEPAGE="https://pypi.org/project/intervaltree/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/into/Manifest b/dev-python/into/Manifest
index 98c5b1d349d9..c02ae00a9481 100644
--- a/dev-python/into/Manifest
+++ b/dev-python/into/Manifest
@@ -1,3 +1,3 @@
 DIST into-0.2.2.tar.gz 85008 BLAKE2B 988ed26dc80259ddd0f0585a87e611bd2773971f5da0c8a63632b9751717d1b1c5568b3ff77cafc2a56fd95f722cde9014cbc6846eb63cbd2410d31f2aeeb02e SHA512 0dc43e55dcbb6264c226c1b4d893b07fee9e90304e293953b26764d90ba211ed65eddad68c7fe4f2eebe7b57595bbd12131665394ce4f339da0cf77337ed16e2
-EBUILD into-0.2.2.ebuild 690 BLAKE2B 84711a6725d5bc879adece5b19c1d932b2ee37d16aa34814fd5c7011ff7167eee3a2fb88cc1c3430a26ddb940f7ca68f1f6a24b01e98de89d654fa5104f74966 SHA512 7857e231a22525e65c2c74767568d9245f1f2242773a1bb127dbd912d62edc44b5143270a8997974b3141ad6d046b045dd9973874728ac0cc3e4e1ef766d0e0f
+EBUILD into-0.2.2.ebuild 624 BLAKE2B 354caa0cd23225a461ba9dc97bed6bd1223dbe90e4c6c2580e5fc088277aa36083cc5f5f1d73bf51356dce3080af8a0b3c7f3f14f3c506f574f025c86583d887 SHA512 13545df0f8e237b0aedbfbfa64aabd5c17e529c49e934a2b4b0525f6c8058f924db568690891e4496d5fc51b9f5436fad5ac46bbfb32bd97202efe894b2d8750
 MISC metadata.xml 317 BLAKE2B 5cea2513b352f676b7b521cc60fcd6e11aafd9a5a320950940b02c7da284cf9541d321d9a40b3f00ba4a978ee61ec294e2889c7b4f4e80af08c65a758f20c1b6 SHA512 41ace180fc3b6550d60bf8969358c4220acd21c688decf0d47d437dfa2423e7cf5a015bd163108c7e5ef028fba1ae0383754f772d9de954e35f840d09c97ff03
diff --git a/dev-python/into/into-0.2.2.ebuild b/dev-python/into/into-0.2.2.ebuild
index d6446d941ded..8d689ad13283 100644
--- a/dev-python/into/into-0.2.2.ebuild
+++ b/dev-python/into/into-0.2.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Data migration utilities"
@@ -16,10 +15,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/datashape[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		>=dev-python/pandas-0.15[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		dev-python/multipledispatch[${PYTHON_USEDEP}]
-		dev-python/networkx[${PYTHON_USEDEP}]
-		!media-libs/urt" # Bug #552448
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.15[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	dev-python/multipledispatch[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	!media-libs/urt" # Bug #552448
diff --git a/dev-python/intreehooks/Manifest b/dev-python/intreehooks/Manifest
index 212bbd990d60..358397ec7d66 100644
--- a/dev-python/intreehooks/Manifest
+++ b/dev-python/intreehooks/Manifest
@@ -1,3 +1,3 @@
 DIST intreehooks-1.0.tar.gz 2701 BLAKE2B 2c82bae05cf3fc3bde13e8dd2ffb9d1ef79edc6711b5038f6f9b3dddd863492be24a425bf848c9868ecf730f813243fb5fa50ebfad52b44341be18e72727f195 SHA512 5a020dd6bd7994eca5f476618f57e2d86567756fae74f6fa50b6fbc96accfe8db910f3175bafa3ce85f37b05edc05ca1042dcec78407a241cfaffc0a0e997f4e
-EBUILD intreehooks-1.0.ebuild 872 BLAKE2B bb3d9072b269035e3daa90bb4a79201508973860404ef327b4447f14589e43a0de8e845ec38643b1faf7e9f7df13395c72453f75a8121f453dd550a1a499bf78 SHA512 53e036383980a0c7875cd53590ea09bd1564b8f8ffb64ade769e1789da993a6783bdaf9d539a75a4bc0b70b4d68e41f34b6f0a6453a457fa33e5a69d680bdf2e
+EBUILD intreehooks-1.0.ebuild 872 BLAKE2B 033bc6d08735e612ac6b18d29126897fee8f1754eb6d772cb1d5ba42d67565e0205cd2e5d3c33ba3169019c02762285b13d2e90c04193783582a1e5880367545 SHA512 5b6e93a9af5619fad78a52deca30fd2c38c0e65abb6bcd1a2498736af34afe3784cdce06cb8f9b36588df6524a5901953ebd83016f97d67f7dbb220ad8731483
 MISC metadata.xml 396 BLAKE2B 8d8701c70f58552593bad0d44e6408b468d08af5d9b9bb6a2ef893a76e1f63abf805d3398780d696f97cee05f6309952347c68a9e3a7e50024ac4c504a082340 SHA512 a683537e004fa251701bd397f45f00a79cd39b20a94af709893c571066ceecd2a4b120641454a8311c6a12fbc9a7c8d1f6df3050e900db393a17b50e59e79274
diff --git a/dev-python/intreehooks/intreehooks-1.0.ebuild b/dev-python/intreehooks/intreehooks-1.0.ebuild
index a2471a84947a..1ba877949d30 100644
--- a/dev-python/intreehooks/intreehooks-1.0.ebuild
+++ b/dev-python/intreehooks/intreehooks-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Load a PEP 517 backend from inside the source tree"
diff --git a/dev-python/invoke/Manifest b/dev-python/invoke/Manifest
index 8b48f95d9318..bf7cd3f43832 100644
--- a/dev-python/invoke/Manifest
+++ b/dev-python/invoke/Manifest
@@ -1,3 +1,3 @@
 DIST invoke-1.1.1.tar.gz 311831 BLAKE2B 2918c1a03cccbd90be6aa495206a2714f45c9690d8ce1b063adc0cacfa4c7accd36dd94863a83e9cc0c05aaf889bd746c3f528fad5af0db9f64725438866f81a SHA512 2dabf88428a53f244cab45cbc073b3a91fea5dd97a7590a58701a32bfaa14a4afe5d6a2e4ff4ed03ae38e1dfecc5a7c0f811bb18313e0af1f4e116f56c5e9ba7
-EBUILD invoke-1.1.1.ebuild 494 BLAKE2B 4e65c7b7ac0f52258728fca4dbdd951aed8dfd4024cf85310e5bc6647a31965db3216847d99ab931c6d908d7ec6133389461673dde11b5270103dd76fe49d3b6 SHA512 2f300bd21e36773d907dfff067d5f9e9a65b63e6ae3ea4285e2c4289a23f7cf7f5700a8c77baaf6215a619bc28d55b4624cd3ea7b774b082b4038d1fdd6b2421
+EBUILD invoke-1.1.1.ebuild 490 BLAKE2B 057411e8321b2ff08b2fb928c55d7370b050abf75290e940393dff1836e2d9b7255360e40afbc89fe7952f9e665e7247991612d7cf82b4d4befcf40b826e2f7e SHA512 416058c854be12b693a1e99ab6a2636d4e054a7fa8704fdc99ed271a6a8f069b9d84dfd68430e6006a1356ce7b90c17f7571534c255d2a0ddd57f27afc07de0f
 MISC metadata.xml 438 BLAKE2B fd7de2d82839646be57042d5db8b2d4a27f9e3f16bad202dc068d2eaf590e04952003d67614c98554c631668c0c31927a7e3a4f73ec15761a66631d01cf6aef3 SHA512 eb37fe7d88bec1255f2579bd9e60054b887c466984017501327a48a6a8ae6e3a3b3b473c850db94b0dda7bdeeb63b8c60e0cdae041fa034854fb68ee416fc9bd
diff --git a/dev-python/invoke/invoke-1.1.1.ebuild b/dev-python/invoke/invoke-1.1.1.ebuild
index 3f4449f2ebcf..7a4b48cf5db4 100644
--- a/dev-python/invoke/invoke-1.1.1.ebuild
+++ b/dev-python/invoke/invoke-1.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Pythonic task execution"
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index e9d8643e99b0..f57b4fecccdc 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,4 +1,4 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
-EBUILD iocapture-0.1.2-r1.ebuild 716 BLAKE2B 35ce978c7dec93fd73a259b33d379133710b3b741280fef7fab51806769207857e533cc4ad16f4c81dd4ac1ef05c67bac2a7cfebe20e98851352a7db73ac683d SHA512 57e25bb10fec166b837e276126f6c463f351c9c9cefa41dad03f34fad95d805e38785ab5d964a2b299945df6c04078f69e4ae24c3add5f8010b02e1b7e107b6a
-EBUILD iocapture-0.1.2-r2.ebuild 685 BLAKE2B 25c47bd7263e7962a4a4a4845b692a9ad691448b589cf73cdb96e46c315e9f13a2c943321c0cfad0a068317b146699709d2ef8458bc468e8db7f7f5c4cfb5f6b SHA512 572545776f58732b7936a6a999619f4e3bd8257c8ac1271481e698f740394690e95c46d6864a257ff6160f4bf2983d242e7a5a5ba2488fa999b6f624dd2b9824
+EBUILD iocapture-0.1.2-r1.ebuild 707 BLAKE2B fbd71f4bfda0cf7723b3f7f0bb456a5081d5524afc85966607571c4c54b39555534bf068c88706ff0e0dfec4f2811f6154d9a539d676ad52d7ea4721a6f6db98 SHA512 043dea17c13e29db3efc4c60a632e672f10221a64f52b13e9d9e347263e8dffea37a1dda09eaa94bbe9f2f8354f9f673c0433c9b7db71b6539c2ef6c39bff89e
+EBUILD iocapture-0.1.2-r2.ebuild 676 BLAKE2B f47db82ea288ff1a7c69ef642a271271bbd20f305be859d78f3059478dc5b1059663a3d50d9c46bf28762b3d5f500271c725b5b47c826f19cc85433cd3af3d5c SHA512 1eec0701e1241a65addc55080a10ba66551d1f053c2b2b96502b8e71b1c2d780f7423db588bad627f8006da9b509c68f68160d3a7dff1f2fba96bbff7827bc1c
 MISC metadata.xml 368 BLAKE2B 69295da6af2e74122fdf5f62eff141417283e7e51729f0c35ff593387fcf3640bdfbeffe079427b368e175f3aa80b97637d6cbefd68e2a3a9a79155735570560 SHA512 463826d4afeb4be68800318809427cb4762f9fb7e14f6f4ed2fe84a7765dfb5acaf9d5fe2f1e339e06a092d8a4dec5d21b3a9f15fc10c9112b69e85f4903b932
diff --git a/dev-python/iocapture/iocapture-0.1.2-r1.ebuild b/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
index 68fe32ccb9be..23a082522173 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index 17e51fd67f0f..5108a5a0bd27 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index 822bab1c4b37..6c9d9d7751a0 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -1,7 +1,7 @@
 DIST ioflo-1.5.0.tar.gz 765559 BLAKE2B 56b3e26b6155cf8fbc5f159909d3a82a6c9b47251c799e4f6ef300015d0b55f54882e26534314fc3c04e20248aaedc9a35a1ff1c574cfb5dd3d1f7aa887340da SHA512 114dd5ab3ab5bbe66be7e639c2018256ff1c8ab18ba73931733dbe23c8f65631fd630f278b0a186303e288a6f49cd6df224dda462973cc258b3d07114e70c991
 DIST ioflo-1.7.4.tar.gz 834916 BLAKE2B 241026d18f8caa6acc09f312a285a3f824128d6018ab19a8704296f916514f7795b8f2359dcf46c04d01735140a75c980458d5589d72de59fc73f13c59b50b14 SHA512 415b43b66c1be479e8ba4fc993f180418f95f1ae0d16ff8c496476da7a04f6caa0f918a064c60034cd926f4f49c1112946b911b57339a76ee5b0d2564ade224f
 DIST ioflo-1.7.5.tar.gz 838342 BLAKE2B 2eff6af7586400ff562999679b861079184757c951e006d2f300ec894dd17fa9c2ed975781109f6d3bd2cabf0e038ccf81d9f9aeac742313eedaabb59b5a1c82 SHA512 886767d72c4067727d47652fba157a76ecd8a6a5478a761feb3923992ffc585addfe892027ade104c5d44a56fd1645c0548ce3b554553f58e1104864c359470b
-EBUILD ioflo-1.5.0.ebuild 480 BLAKE2B 59465bd35a5d1f15da3a17738eef39eb60240cec969b5c4040451cdb3cb6ee32ad644c38d036d9aa773b0c4e4ff06123469338c6a8d6b4100d36042b0e62778a SHA512 72f8ec06d31f3bb801de9f032b5ba13aedf25bf200a6d7cfffc984de7a7affa95477010b13daa662f5483903d3521288e83c2acc79ea50da583dbdc3e6d75c65
-EBUILD ioflo-1.7.4.ebuild 597 BLAKE2B 56c7f2af07df500f76b863b46caf1923db577794b9f921b8fa5e84a93e03356b9ad0562bad55365eeac996eaa82a591c6a7320b18c8715103cd571b07e914776 SHA512 60c12dd2f1ccd5e684dc06e4579badbb02d1e3294381baff69c48fe342f5b95fb023aec700f8320ff53f2a949e47a2809fdd254706a5bafda4e002779a27f7d5
-EBUILD ioflo-1.7.5.ebuild 601 BLAKE2B 88925fc81d9817288ab1efc2d52b0301ae4c8689a35e4c4b81c809a50cc367dba3f3a460dc059a810c3fa528923cc623da9853c15fff74e3441d3d07dc49bb83 SHA512 bfe75412e456b1fe293fbe5e29c88fd7b418966e190bcc537bf06e3319cc14a214a400a9e0f268582dabcafa24c6fed3438d821c34cc5b286884a30ba2ad482f
+EBUILD ioflo-1.5.0.ebuild 476 BLAKE2B 714ef0d66796dc3623cd1c5af6a6d184efaaaa18444c1086ad01d62bc962fff4f6f4bd5f00caaa0a8d381ffb9a8a078cbf1eafdbbcebc13a9d652faed5640efe SHA512 cd285b901a283a094da35e90aa7528ee137e410ea2952335fe495a672e7f6e3f7b0e6515c4e57d3a811727d10695982c5d996f68fa37f7ab85310cd28faa69ed
+EBUILD ioflo-1.7.4.ebuild 593 BLAKE2B ee86a4acdeb00a6a2675c702cd0e8f40e445b1f1e0cf07c7e1a211feccf40f98e029fa46f8495c408f9dd975d11302d75632742b9aae2acf118e9ac83adb160f SHA512 4a0b76a61a75c07aec4143e919829645e3a7d23d788f3f7a48b1926959779f80c78bdcd1cd0a640a9255989e3447698f4072e3cfebe5c06694883fa0fdc9b89f
+EBUILD ioflo-1.7.5.ebuild 597 BLAKE2B 4270ab847f07d57d15a8a0c66a95b4281dde94637305c16ccb53153bbf357a01852cbfdb0b7980f334ee182ffd6ebc00a9f224caac5bf796513b69ec1d7b4274 SHA512 5599b2d263489cccd828386e5cacdbe403891b51b0d21188bc1c8ffb09f061b883d9e9e852632f946448390aa5b4cee9b8a527908235ce18b04f90515f1ba16f
 MISC metadata.xml 442 BLAKE2B 26c46608c3b6b62389b07f8a089a0dd6ba91701b3e18758d39a82980a16ce7fd03f4a080e15dc37006919904764a4fe9ce31183d31423e2c177c7c154d2cdc0a SHA512 8d6a727c351749f21566b4085b2355611b40e7a962e99d1a0e52d19d96f3d64db66c17ef01d08b82b4031bcdc637ae0a074423fd1eb92323334d6ee36d004742
diff --git a/dev-python/ioflo/ioflo-1.5.0.ebuild b/dev-python/ioflo/ioflo-1.5.0.ebuild
index fd227b7afeac..207ea5e6768e 100644
--- a/dev-python/ioflo/ioflo-1.5.0.ebuild
+++ b/dev-python/ioflo/ioflo-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 inherit distutils-r1
 
 DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
diff --git a/dev-python/ioflo/ioflo-1.7.4.ebuild b/dev-python/ioflo/ioflo-1.7.4.ebuild
index e669142d0362..96666ed9c415 100644
--- a/dev-python/ioflo/ioflo-1.7.4.ebuild
+++ b/dev-python/ioflo/ioflo-1.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 inherit distutils-r1
 
 DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
diff --git a/dev-python/ioflo/ioflo-1.7.5.ebuild b/dev-python/ioflo/ioflo-1.7.5.ebuild
index 7c1d5d221669..3a203487fa98 100644
--- a/dev-python/ioflo/ioflo-1.7.5.ebuild
+++ b/dev-python/ioflo/ioflo-1.7.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 inherit distutils-r1
 
 DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
diff --git a/dev-python/ip-associations-python-novaclient-ext/Manifest b/dev-python/ip-associations-python-novaclient-ext/Manifest
index d472ae786975..0ba5b20703f5 100644
--- a/dev-python/ip-associations-python-novaclient-ext/Manifest
+++ b/dev-python/ip-associations-python-novaclient-ext/Manifest
@@ -1,3 +1,3 @@
 DIST ip_associations_python_novaclient_ext-0.2.tar.gz 2362 BLAKE2B 59f36ea7db01a3157bb1c20cb4740bdc660751aa005d826189cca132e56faa903c0075d8f03646740dc9233172d804666364bd3f34a5832b19fc7760d31c51d8 SHA512 533910e50508f45dab14c4000c26b9f66311a14554df0358c3fee5bb8e22296dabfe10afd56f2d79ea6015122c4172829a2a38ae4656924563e064f180d7056a
-EBUILD ip-associations-python-novaclient-ext-0.2.ebuild 666 BLAKE2B ea8ad88232cb02f9475d3371741e46e4ad649e8b4ab49984e412447e5c42367a0d6fe470901ec2f86128c2fb986fef61f762b00a74a510922721cb8a8872ee30 SHA512 21970f1fb6658fd9d488cea843a245587bcfbecd3c0f9c325b0da5bc1f81802fc8964b112ab480c9fc10b88b358ead997af7c01058777ce1d5ec665eb8f19867
+EBUILD ip-associations-python-novaclient-ext-0.2.ebuild 652 BLAKE2B 0b4fe68e4046ceb87e80aad40abaee36b1ab6971b124f56625b65517eb71f3804e0f298a86046e10f481041a93564c97234a39f5f0bb28b7d2307ee64e501702 SHA512 735a8f21434e73a318d3000811799c9694bb7e2acc05aa1c85dbe3aae86f8b2fef68b6e69907afef2bfc52966e2fdf112613577037c99e56f2a07d899b74d140
 MISC metadata.xml 567 BLAKE2B 10c3d3b992fa6bbbdd3436ef29e36cf1daa124c663ce1b5fd294d562f1f5d4e2299a20df2d45d5226ba8e493efb441f0059e5491b4fd5f639e67ca718622f61c SHA512 8061c87d531af77b266e34c6fc66f7ed3a5c569da23ce681398f0610eab645d69e13bfe629e5a4c3cdf89c37a63c2dc1e404e3c199e60d39bbcdb69d4ba33dbc
diff --git a/dev-python/ip-associations-python-novaclient-ext/ip-associations-python-novaclient-ext-0.2.ebuild b/dev-python/ip-associations-python-novaclient-ext/ip-associations-python-novaclient-ext-0.2.ebuild
index aefbc6209457..e625a3f79e8a 100644
--- a/dev-python/ip-associations-python-novaclient-ext/ip-associations-python-novaclient-ext-0.2.ebuild
+++ b/dev-python/ip-associations-python-novaclient-ext/ip-associations-python-novaclient-ext-0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index a3a6a7b1a281..9e72103a4a6a 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,5 +1,5 @@
 DIST ipaddr-2.1.11.tar.gz 29046 BLAKE2B 8196898209d580ce25bc2ccb05b2e772c42c053116749bb5137a87b6648472c4fab522d76405510cb2304859b4179c593b213739e9294a1af1d9894cac7040ab SHA512 a97b0f760f0d7fac549e5edf17b644c966a8858c145b8f9472ddc8bf4805c9d537f6f8755e3716d78b729b87e84149f8b73c7f98c0deee4fbf266ccb7a206bc6
 DIST ipaddr-2.2.0.tar.gz 26266 BLAKE2B f12807beb52c5cb3c7da2afa4b61b264fb58f0100900e5ca062127ce218f9f5710f38ac7c7183a7aa08b77757c39866d169e6e39c3bc5c6c55df003a9b414ec0 SHA512 5adb117c44e6e5dbdb9e96543aa7a34f35b4a4ec9baa163a25448058c34091bf4019d24f0250928291e4d4bc97dcdf75865daef739e2d94f98cc584e6e6c50dd
-EBUILD ipaddr-2.1.11-r1.ebuild 712 BLAKE2B a62fdc7fdec44e02e13d1a344fd3eae08911c9443fa17a66d17da506960083415ae4ff60ba0bf16e5ebd01864361dbe4f9b9378f14f45ab1419d12b336aedfe4 SHA512 3cfca8d31603c82c31e847830e036fc8acc2166144a3a24f92822b00d3a6f7386149655d36b47aed66220d16ba7213a254239b1fdfccc91deba3f765de102592
-EBUILD ipaddr-2.2.0.ebuild 687 BLAKE2B 3c7f69fbba5f392f2b06321303e06780c22b8f75787c33586400e195be2f7321808cb0434bd349b256a2047d46631c35c0a10e8fe47caf443690a6fdaa38e598 SHA512 dbeb0a0badc8dd8de168150a2523930e88e9edb0e9085e41c5c46efa572169e2096d9396e0c72549bea690fcd0025a3e6df9d80bd9579867739ff23f3dd0e5aa
+EBUILD ipaddr-2.1.11-r1.ebuild 703 BLAKE2B 695584aad5d7f8f2e87cfd464c9d27cd69680ced5ff753a51e7a9f175933d2cf7d693e66ce7439f9f073306cb689bdb7798b600866b549d4f4605d39bc45a027 SHA512 34330a8735f686a30c7594873fad3bc2d6307f52f0bb124ad3adac2ae021f002d4b4c4ba4e7f17ca2e0935b19b68e28f775f4b29742153cda7db6fc254158909
+EBUILD ipaddr-2.2.0.ebuild 663 BLAKE2B fb7ad95a87e805723b8b6e0a6c17fc629c8bbb2f49bc988ccf3a468fc0cb82278e4abaac174a0535d31b0d74919d8c9ed87d7e07a4efd99efaab7d8fd8200197 SHA512 95f026c3d0c389e94763ce4831b814bf67645b5d40538e7e4b6546bf0bc0e1a932bd8592d035a5b472da0f2ca31d61f7eff0a8196bfa83c97e801f574c74d071
 MISC metadata.xml 490 BLAKE2B 53a6608c229686c6cc8b3b3c225aaadc4d504781c0ae48db832dff28294101463d3ffa36eb9da1f76c8b419bf422dda668e278eb85e1300e65256ca5aa13f63d SHA512 e1b60dcbd70386a4adc9d65c4e530c38c4477611739baa8c82812ef77373319016d1d41bfe564745b535de6ee5d2ca7665825a455a72ef4403edcb17b26447fe
diff --git a/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild b/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
index 35392f696437..e94a6e557c71 100644
--- a/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipaddr/ipaddr-2.2.0.ebuild b/dev-python/ipaddr/ipaddr-2.2.0.ebuild
index 2f58f9b96872..a32e3daaf606 100644
--- a/dev-python/ipaddr/ipaddr-2.2.0.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.2.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -13,9 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 python_prepare() {
 	if python_is_python3; then
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index 34439f3dc986..7391bc4d9dfe 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -3,9 +3,9 @@ DIST ipaddress-1.0.18.tar.gz 32475 BLAKE2B 7d116b1aad36bc58f9a6769b562e0b6dd260f
 DIST ipaddress-1.0.19.tar.gz 32854 BLAKE2B ea6bd0ac5418dca343e39c12e31a96aa6b13b091da05b7afcb3051251d3c8b8ce76a19f1d6b7ad2caf3f0077f6b522c4e0915a7a8eae28a72700732278ae4c6b SHA512 e49d0d0b76c108f985a5d209092495b5839195d9c4d5c975cc17c89e98d9b6bf0983f71f3b183c3974eccf0529cfb22aa8fbe384485be019da3fb74d50f1f4f1
 DIST ipaddress-1.0.22.tar.gz 33051 BLAKE2B ae9145a275d373f07ad3996b9c06007259cde7a03f6389fed2a83d9210dc8f135026d931b2ddf408f5f465b37861c9e998ae2eaac782741a0fa6ae07dd4259c7 SHA512 b0b0bae50c0819c46554f4ca2d14403a054d73cb9df7efd8bde03bd32b7599510a0e8eb7a63bd7cc6af45a035a0fcce38058b0625732472c7f252f72b88a6084
 DIST ipaddress-1.0.23.tar.gz 32958 BLAKE2B 96f8f3065aaa082c67c5468598e78bf928653588333f8f96c47aafea30c6aa5e3abf419f98e6388b9791a8f7e679f7fb31f36bb1d6a274a19b0e8ea434a8cbc1 SHA512 340e2a8698df1868038f55889671442eba17f06ec3f493759d8d0a9bf406eefbe1f67c14ca616f52e5bf2280942dcece7e89fb19de0923bee1ee20e60f48896e
-EBUILD ipaddress-1.0.14.ebuild 617 BLAKE2B 77e3ecef32c54642bc2e5ffeea21ea424118a86eea0cff1256b2515e7781ce7cb0c619e462753dfc92160b55ae6ddcd30576cdca424176734774e0d20872b8ba SHA512 7b21d5cd33817248dcf66651222695cd198009682bda5ed82c0013593557fa85daf7677218c58c1a635e035f4adec9ee093dfc719389f7aa6d0517156b06f08e
-EBUILD ipaddress-1.0.18.ebuild 644 BLAKE2B dfed5985b25c655115d45727ae3944b03f93ac1ddbc6420848421f0edb25cef18d01cf843628b3304b2d59420086c299579fe5772787216d50cf75149c96f9a6 SHA512 d262a8c0fae37a5f242025c2adbed08e5b1d2a5c9521747ddf6adc5236c3cd011e88ac9d3d418f901a92296b13d25f6c22a8fca5a20026aa67d239e91d19de5d
-EBUILD ipaddress-1.0.19.ebuild 657 BLAKE2B c631e0bf18a75b8fb006d5a5ac60c702cd85174c5e1429493344880f1764dec6aa922a1b17cdd377d5f056d20c4498e571494fe11f3d4772700ff53d81ddf3bb SHA512 679e4ef0c11100e37191f78363a0556ae3aba5b5ad01148ea4c1a92a1329f26158d1cce9d66e96d0b7bb898e3df2bc34502b974b17462453b7d8c259da8ec481
-EBUILD ipaddress-1.0.22.ebuild 722 BLAKE2B 9c600a90e545b00ecbd44b1cc0070d43f8ae4f08db42c050df79e0827e27db27e64277f7a94f10eb2a13d9856573f5b01700e233888f263c9569227be1fc8bdc SHA512 2e1753c0a33ddaceb1f82078e33c869210768264049efb4af8f9d9ba3979991e4bea3f4cae7ed7b510f36ce93d3c9c0d768e04310209bf5c19e8ba6a73306bed
-EBUILD ipaddress-1.0.23.ebuild 863 BLAKE2B c56b14d7bf9e8e7cfbfa70839f8e9e81f98dbd12054bd2a42f0716021d4a0a6f1ebd040f705b31080a58fd4daf038fe3ef0d5e7d83cbcc801c65abd58312c2a5 SHA512 eb05c362f106f4e2607e98e7051ae88f2766b8c05474d4462f1489653782a23446541569e90080fca4ef6358cea6c2957cdde9283204e1dc409195aeb6f31f98
+EBUILD ipaddress-1.0.14.ebuild 609 BLAKE2B e38f982db23fa58da8882db6384ca7d12434ebf725682b5fe7d8a72cbf53b720378043ccdaaf5ffdefca0dbfea515cc44a18c2092f3f6070db57cae7ad7d8788 SHA512 e9ece8c60b7a56ffb104810a48f31dc92cd64c49117f28095eac181b427a79a4b3a82706a24ccc42504ffa37de8dbdca3511823c852a3df36d872d66b8e44743
+EBUILD ipaddress-1.0.18.ebuild 636 BLAKE2B e6cbfa00f070ec144158f580eac46bf119a5eafd8e58e8486056a682483bb3a1ef9d644a99a885b8292d6c1b2f1e75b3ef7a5666fa1f8f84004d7141fabb5612 SHA512 627ffe7ee6ef48205499dc312761544edc72fa69a1de8bb020048de4176435d2b4e908730227e16020b646ed86bc2c5471ffcf7853c9af2762cfbdd95e68132e
+EBUILD ipaddress-1.0.19.ebuild 649 BLAKE2B 6e50b2efe2054650f90ead390f51a46bf96ed3cfdbb2d3eca911a8c416f73ac110dd0ac80e51d5ba2719c34ec2d7b74491b64e15ac8ff314535d90a642f75631 SHA512 37f9603f549fc95daa45c381d16fdc5f54964a1aa0e0331451cbb792269645bb651e71b56f2acddc632c1ec89bb50fa74020098b5f70698f2d38196f2845a33d
+EBUILD ipaddress-1.0.22.ebuild 715 BLAKE2B 7610440fc2b625093623b268b2bab6794b965fa9e195d773a9b1e125be613f2a743faeddeaa8dab9e8f67191341e3c9574849bb6fabbf17dfe0f3d127ca5e015 SHA512 6776a219c12cc5c6c61b109210d3463afe76184b90e7a6304a2f54ba5d72da82cdd1603449c2e223ca91912148e69698d45af014ad7d6405a5403064760a37fa
+EBUILD ipaddress-1.0.23.ebuild 858 BLAKE2B b82a8bc81d5dece59c10781cabcdfd76592da9247df14c0d4ed9ad81ff80f90f9677a354ce46ae7336fcd34bb8436c0b01dddc7adb87c8b36ae351bc551060d7 SHA512 648b235ba6321177c2369f051f53f17f89bfa86a0c588f2b329dfd6e780e4227bdf4ea824a9263fab0c9977da3bde6abceaf4ca5a5badd0c08ae7506c183a158
 MISC metadata.xml 501 BLAKE2B a1528e6bef6960599198e71c0bf4ef65b0feaf042d588e5a29970141703780892f907ac73aa247a94a14d00ac7e42d393ede430c39c9c322cc45403c22844182 SHA512 e3b1bcf46848fc0b6faf58d4b9df44df0d0dfb6649a6c7f3806d1ca148528ddccefb4323ebdb046ff4469c07f081a0ff0ef32d767b37d6539b77c356371ffd12
diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
index 60fcc9bea0e2..327a2f64681b 100644
--- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy pypy3 )
+PYTHON_COMPAT=( python2_7 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipaddress/ipaddress-1.0.18.ebuild b/dev-python/ipaddress/ipaddress-1.0.18.ebuild
index b10f799666d5..ab39d296e557 100644
--- a/dev-python/ipaddress/ipaddress-1.0.18.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipaddress/ipaddress-1.0.19.ebuild b/dev-python/ipaddress/ipaddress-1.0.19.ebuild
index 1f2b850feffa..b4e3574c2228 100644
--- a/dev-python/ipaddress/ipaddress-1.0.19.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipaddress/ipaddress-1.0.22.ebuild b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
index 70e888be3801..06388262ce35 100644
--- a/dev-python/ipaddress/ipaddress-1.0.22.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipaddress/ipaddress-1.0.23.ebuild b/dev-python/ipaddress/ipaddress-1.0.23.ebuild
index 1a0f10bccbf9..febe02b7822f 100644
--- a/dev-python/ipaddress/ipaddress-1.0.23.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipcalc/Manifest b/dev-python/ipcalc/Manifest
index 6fcf1f3e8b92..5736f6f90a53 100644
--- a/dev-python/ipcalc/Manifest
+++ b/dev-python/ipcalc/Manifest
@@ -1,5 +1,3 @@
-DIST ipcalc-1.1.3.tar.gz 8099 BLAKE2B 27ffef8ca70db237c4d22a8ee1f91a167446e6135d70d7ca435222a52a0451557c8c60fca64655535679fdd231585a50b2322c3e5b87447f5699d1021d5201c0 SHA512 f852e93bfa4994e424a8aafc74a1e8ec9488d4c60085fbc53e0587abcf8fbfdc7a35d7a20e67cd4dbe0d8484c0e7bfb11b5fe3d6934f322dd818273e3d64c2c6
 DIST ipcalc-1.99.0.tar.gz 12120 BLAKE2B 43afe713c32eae9465e4baacbea24205e73cea989921a27e56fa2182108bac46e4c7f3376bacc5b891e441fc23f502ed4248121d27a565a0f28eca197ad5f9a6 SHA512 a7d9633fd464a0d5c5cdae9552edfe42a55906f5d378c676dba14552d4214590d88f32cb43cad14181d55ed3c3efd95a2fad1535ab7a8bc2bbb092b2bb4748cd
-EBUILD ipcalc-1.1.3.ebuild 347 BLAKE2B 729de03073368b081054aa7cc6f6f9937c2d71b05717fe849f1ecd99d3a760df7afcbde2bc09707cff1f6f3fb5452a77db6ca81f5a41e15893472f370da45ef7 SHA512 9a9d07370afb6110c099027a20fe6a7f2b97bb08ce80b338b0ddca8d1272729964b6a4cea7587cec0dbc7a7db67b7bdb4812e1c9912fa388e623b3f1462bb61b
-EBUILD ipcalc-1.99.0.ebuild 473 BLAKE2B 9c937d79682487b7ae1bab67b5449d14d492b787021f4e1d56c63cb79e717c08731ffda63b146977f601e5582daf0d971a3757a8b2366e2d6819fd03e1995660 SHA512 85ae16d7ba652e01abaf1f7e95557753e135ebb614f61366193b9742f0f62f4f5794b8783c2d578347e1a665fd515af4306c8279676df237da3a5c992dd4595a
+EBUILD ipcalc-1.99.0.ebuild 458 BLAKE2B b2edd5d23a3e4edaaae6a7b58a83c69ff45f59297c74471b3f66b21abceed484b72f3c68eae4f5226fe39cc7a1e7087bdc0b2a5b45ee7ba7bb15eb8ecd7c2102 SHA512 5b18a9499769e7ecf6df68d2747692a490178464631b58789e4c299db7cdda652a1173e4d82367bce0cd49e56a7cd0240f51e620dbabdd80aa886ea27f937040
 MISC metadata.xml 525 BLAKE2B 372a04ba496d2b0846cfae334056c96e6e32ea0b4a18c1c9c3b6f38803357e4727d6bb79d04b4c760dae53ca64e7d59ce43261e6209e832922a7a90aea5d27ef SHA512 32b6b0941abd8b1a9bc3fb81af8ff97baf7a0ea1e02a86a5b73da7bf34daaa09188622a82c019c7f89fc6c8635dc07d04692f0ba59f0dcb2cbbc54e1e0108808
diff --git a/dev-python/ipcalc/ipcalc-1.1.3.ebuild b/dev-python/ipcalc/ipcalc-1.1.3.ebuild
deleted file mode 100644
index bdd86bb3f6f8..000000000000
--- a/dev-python/ipcalc/ipcalc-1.1.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="IP subnet calculator"
-HOMEPAGE="https://pypi.org/project/ipcalc/"
-SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-python/ipcalc/ipcalc-1.99.0.ebuild b/dev-python/ipcalc/ipcalc-1.99.0.ebuild
index f97e3c665670..4956861bf023 100644
--- a/dev-python/ipcalc/ipcalc-1.99.0.ebuild
+++ b/dev-python/ipcalc/ipcalc-1.99.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index 76846239a3ae..31242f1a0b17 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,3 +1,3 @@
 DIST ipdb-0.10.3.tar.gz 9356 BLAKE2B 50afece454d55ce3df13251afb625d93e11f7ae8d0e563ca7007e7abe0ad46b59f2e93318578992c5c7d2d25fc815d53ebed8801530d74c4fb30cc150246f415 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3
-EBUILD ipdb-0.10.3.ebuild 653 BLAKE2B 1229f53588a9c8ec7e18de93720cceb3a32cfb04048c71ff60777e59995e6fadac842375d8b3d8847da6a42c47cf20b88c75ddacbc9db40dd232b486dadccb92 SHA512 3d35af9646c8e6870cbdaa53fe31deed348c128fb2ddf2ac1a89cf3b991a2d672d9aa57308b561a3429957454c3b17754d8afa6f1da612350ac4534e40b4617b
+EBUILD ipdb-0.10.3.ebuild 649 BLAKE2B 717a06c68f1bb4c0acfae8bb0152cb19d34d506ba10d6859f5b84a65d15c86d3b0bb1f39a59569766d6b4d05dcc7dd514f2ed6ccfdc313471c7cd30eb8b2ceb2 SHA512 ba3f991eb8074e3881572e10e3439f2b9add58a14f9c5081e4b257d22f7a7096dafb076f8269010e68d889af368260b6bb5f82085c9064927305d086439af236
 MISC metadata.xml 307 BLAKE2B ec524a1b59512e5f70c0d7138fb3d5ec9f8116cec0c22a3b37c335c99766c3ee338949c4dfca60f78249610cac48f4d40bc80da68ba0b5efbcb3c2d8eca3f5f8 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9
diff --git a/dev-python/ipdb/ipdb-0.10.3.ebuild b/dev-python/ipdb/ipdb-0.10.3.ebuild
index b560c8ea1e51..13126f8f452c 100644
--- a/dev-python/ipdb/ipdb-0.10.3.ebuild
+++ b/dev-python/ipdb/ipdb-0.10.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipdbplugin/Manifest b/dev-python/ipdbplugin/Manifest
index 008179be984d..d3b90621120c 100644
--- a/dev-python/ipdbplugin/Manifest
+++ b/dev-python/ipdbplugin/Manifest
@@ -1,4 +1,4 @@
 DIST ipdbplugin-1.4.tar.gz 2473 BLAKE2B d69c6f2a45738bf10a18e9db194530efa21f8d32bd69d5ccd279eb50f07bd5c8b369bcdde92dc2e9b8b417864a49c308c83649bb66bcaf8ec380101284363c7d SHA512 5831d1e9aceb2fe4db272975d4d792622822049813ba76bdc0ee48dee001339084efddf534882775922ec178c1bcd52954bc2df1ce42181cbfdd1c3c4b944365
-EBUILD ipdbplugin-1.4.ebuild 676 BLAKE2B 48b7169ef158f8e30e66700684e0453a4b07e3ccd5dbeb79d4a0e76d3ba3d2646e062ce3978eaed9a56d1ee9ba050dcf742c20f5fead2be6c70cfefff135b85a SHA512 9c7280d7d3000e91982b99b54784ee09f4f7cc57af877acefa573cc4c5c7e8faa28a455c33de975d601ca356ae46a544917e759e55e0f965a7bafe752fe73909
-EBUILD ipdbplugin-9999.ebuild 676 BLAKE2B 48b7169ef158f8e30e66700684e0453a4b07e3ccd5dbeb79d4a0e76d3ba3d2646e062ce3978eaed9a56d1ee9ba050dcf742c20f5fead2be6c70cfefff135b85a SHA512 9c7280d7d3000e91982b99b54784ee09f4f7cc57af877acefa573cc4c5c7e8faa28a455c33de975d601ca356ae46a544917e759e55e0f965a7bafe752fe73909
-MISC metadata.xml 296 BLAKE2B b72da86cc7ade1273813549425c808e2aadb083ebd37a6e1a7de697735c7f2af7bd130dd802c033c2efe26cb1bad44c62fc8f66da94d92b3e23bd68d7ddc155a SHA512 c64bf334a8ee1242a8f26e916d2d1458b57aabe24890c1e79e2b7fef812a2a2f2ece2ec3d5795ce3838b9a0f27c16a2fa01aa36b12e7c8e69dc1ba2d9e409929
+EBUILD ipdbplugin-1.4.ebuild 670 BLAKE2B 9e0d45a3268a5ed0837f05720f4ae1895c07bd5e794f734b0286c548b50fac47aa0c96be0827f4d5b63f32bf80667bcc1276e65ecdc309b116e18a732362e40e SHA512 0e324959a366f604ef9286cdffd099245969963eb4ff2a77064a9c5a074894f106ba123065fce56849710aae3b033af39405bb6cb4d505d2eb716cb313994d2d
+EBUILD ipdbplugin-9999.ebuild 670 BLAKE2B 9e0d45a3268a5ed0837f05720f4ae1895c07bd5e794f734b0286c548b50fac47aa0c96be0827f4d5b63f32bf80667bcc1276e65ecdc309b116e18a732362e40e SHA512 0e324959a366f604ef9286cdffd099245969963eb4ff2a77064a9c5a074894f106ba123065fce56849710aae3b033af39405bb6cb4d505d2eb716cb313994d2d
+MISC metadata.xml 245 BLAKE2B b0cfd1b7f68084367724fc1a2d0076946c66937084ff87a414ce4ba7b5e1ca5d1801d21d055e1a4365f6eab8cbd67438ebfcd95360eefdf885e67e493ce9121f SHA512 1669d436830384740f9cb2ea1bf022da4275adc965d02fdb66a5996bf70113f337b0ed8161852511c7a997a4956b76642286a5838b7d70e2ece631012cd07c91
diff --git a/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild b/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
index 10837e83c15d..f7201a9866fb 100644
--- a/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
+++ b/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipdbplugin/ipdbplugin-9999.ebuild b/dev-python/ipdbplugin/ipdbplugin-9999.ebuild
index 10837e83c15d..f7201a9866fb 100644
--- a/dev-python/ipdbplugin/ipdbplugin-9999.ebuild
+++ b/dev-python/ipdbplugin/ipdbplugin-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipdbplugin/metadata.xml b/dev-python/ipdbplugin/metadata.xml
index 50b1d3e8f984..ed2f4d2799c6 100644
--- a/dev-python/ipdbplugin/metadata.xml
+++ b/dev-python/ipdbplugin/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">ipdbplugin</remote-id>
   </upstream>
diff --git a/dev-python/ipy/Manifest b/dev-python/ipy/Manifest
index 3e2dcea1279b..b2b6d51c3c0b 100644
--- a/dev-python/ipy/Manifest
+++ b/dev-python/ipy/Manifest
@@ -1,5 +1,5 @@
 DIST IPy-0.83.tar.gz 31816 BLAKE2B 89ca11d292ff3ed6f633aacc2c689e710c5ed43ada32e75425f653bfe87bcf6eb777d5ede33133362833099e51b2248f5e846bae82b28a6050500f25679ddbfb SHA512 6bd69d96fa77dc4ceaf119b81c19a524b871badb37665a763a055e1c8b2ce3433c6e9534f03aa64d02e559dca2fac2c4e1d09b7fd78ed79c0fded88f803ad2de
 DIST IPy-1.00.tar.gz 35324 BLAKE2B a0e04201a59c61e5cc8f7ce2837c83dded99d0d786406e2e341183a0903d43ed5496ae8ea05d1bee019007bfef7420be623ab3dc08cce33812f1720a59ca413d SHA512 94a8f26cad0d966fdf8d4e57284eadf4cfde88515af6f5aafc8f9597eb0758324b876039d1a121021ba1ac26be2e2ffa89a3f5803dddefdee03fdb5d65b07a81
-EBUILD ipy-0.83.ebuild 1077 BLAKE2B 0e15cef3684e87f53f52ba17d2c306548815de937b5c05b6cdb62e7c08a44f5df9ea8a959d9fbdf4c947b9bbc648073d86c1849eb94408b17b61dd6738bc1c57 SHA512 fc2b1295e303690ccb08dd286b0e71260b500dfdf1c14f01e255d0847c4ad2aa2df737094e9dd5b13fffbe308615a110d0da093fafc23fdc4354dbed279d3f5c
-EBUILD ipy-1.00.ebuild 1104 BLAKE2B 423ce62bb2e2be7f7ea2a86fcc7205d14f714eeff059768704aa8fe3b310168dc2a2bf25942b182bf8df35cc34233d2a5e838bd6da68c85815736f52c7e51ccf SHA512 43ed92b4fbf4361f1f33b80c639b4fb4527fa5bed774a6a3c3c2e058bccfc95f0bd65cc8400983429d16ace157f3a7f67dc09f96c37b294da08ea0b9aac06855
+EBUILD ipy-0.83.ebuild 1068 BLAKE2B 4e88507b78dd89be810b5e6e3820fe1d294fd67f1e293349291eb8721e88244a2648f332e502b75f335b8910d4600cf31ace92b2db8e243b65d4bc877fc91b6f SHA512 9d17c5a8f1d511d6f08b6051a15abc24062d05ab642ab54b62987b3fb3411248cad9edb9c44ed601411d1b95f05a83a0d1104ee5bbc7e0019378203875e01285
+EBUILD ipy-1.00.ebuild 1095 BLAKE2B 877d05a21a7424a19bd77333c33caca64a5be98dcc33955e3c43e42cd26fdcd29a5afeebce7212b8556bdb02defa21c72b70012e4fffab845ce05e13bf57e07f SHA512 5a889eec499c03f9ff7a9e77488a9942784f3f4886602cd7155823469d49564c3f544c85d4064df9017448a593a0a4a366699914770980c9e5f386360dcbd98b
 MISC metadata.xml 374 BLAKE2B 89f26050a20821b1ea3b45177a02c91f3682abd65aaeb775bf6d03688a37a6fe57b8a47037ffbf1f7deea7ede60fc1e3c95b74b76f8be28afae73ec87be5bfcc SHA512 8c12c38a49ffef811e6107d003f44cd8174bc95fc71dcc3296511e3356a0203cf12479a36c7d649f1933c6a90820c3212de25166b61eac8de06728cb8cb25566
diff --git a/dev-python/ipy/ipy-0.83.ebuild b/dev-python/ipy/ipy-0.83.ebuild
index 97b895732f3a..a1e459131372 100644
--- a/dev-python/ipy/ipy-0.83.ebuild
+++ b/dev-python/ipy/ipy-0.83.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipy/ipy-1.00.ebuild b/dev-python/ipy/ipy-1.00.ebuild
index f2312104ecf0..42ba2236d026 100644
--- a/dev-python/ipy/ipy-1.00.ebuild
+++ b/dev-python/ipy/ipy-1.00.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7,3_8} pypy )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 1d5c8c7bf0d2..742c94e5356c 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,9 @@
 DIST ipykernel-4.6.1.tar.gz 90591 BLAKE2B 9d66e569e416e30fa0af93e9442326a081638e55e004c751d38b3e995e2e1c6baeba5b61e125ae8484a31344ca541070035154e4453f9eda30f7a2ac436e7f1c SHA512 3124534a8a059056211ac573784c491ba18d6e936292523382a9604af10bc2c911b14f49f7625242e29189b46c673da25244f3c9dfa3148d460ba4e466eef001
 DIST ipykernel-4.8.2.tar.gz 94441 BLAKE2B cdcf08c114c6c53ce4ed9829f3c2e0d2184f5b89b54556f92df25ecefadcc38955f992572a6dfb9ee49477e9a2111304c9b4f636edc47c0c0a26209c5f616579 SHA512 6542b086ef14abe70f51393e585c1e02eac0967b863c2e3de2dfdcbcdc2f4c01597bd035990f09f07d76005628a3345be97d1b5e5ce7a772ce7074bb31b4d4df
 DIST ipykernel-5.1.0.tar.gz 101198 BLAKE2B cfe0593d7de3eebf9ad43dc80d13f53dab0bb599836ea43c8e1263b02e78f6689837bffcea3c275f2241e370d67afb50510980940aea5a2b29a6ce674509bdab SHA512 0792b7f86d81b178c46522c8d6cf5fd57b0e411dfff13832d4e3d38782bae743fac7390dd5f2e2e738db66ce1137ec26e74511896b47667c88e23a245606a698
-EBUILD ipykernel-4.6.1-r2.ebuild 1074 BLAKE2B 73b83c0b071b8f911b165b577ee5b4e3531b5f53fc0b691e7c51b546967c880de9ec4d7b2e4df65e7e9bb1d5f819bab19ed84b3d5c836e94a63d5c5aa659cc33 SHA512 411d3ae99f2f53e917b3ac0353b5f001f3ae877d73525c2142bb2f80eabc1ef84a14a62a50cddb99338f0134746133b91d14e1b2b2104c245e572a2bd1247ff6
-EBUILD ipykernel-4.8.2.ebuild 1074 BLAKE2B 319f708b3d4b5103bd861bb2d1657d4d203f9ccba6932d3bb2d6d5b83275b7497dc7000fa0085a4992d8424ce170583b2da31d50541ca8d1a5bd27299972a2b9 SHA512 e8fff9684edb6bc2b6a726fdb486db6c5473956fa3a2a8a4ac7632a9b7dfba7e7341f55ddc5a995f3f52fbb30a138995aa40ab62593efd6057a8e3307a421257
-EBUILD ipykernel-5.1.0.ebuild 1077 BLAKE2B 6388020aa58aa913c0831129fdfce931d12dc3aca732b37696d75ca3ecac21090fe22e5c87ac33a55264d8f8f364912f7af7c73f4ae4d6a171a56e2e05b9c92f SHA512 0b30225cde850549f19eb6e1ece55354536f2b53098236b7d2883d6b404ee0cf195ca1e4059aa44c6ae2059b110c7837c73d28b024da4dff4285eaca206bfc7f
+DIST ipykernel-5.1.3.tar.gz 103924 BLAKE2B f68b0299cfbc3e8dc5a4feb08ece6c8a6d0ff3cc6d08a696707ac4c07c1f214dd39b33d61f58b11b4be7fc230d48980fe766209af7eb8302e1d3088e5d879658 SHA512 0fe14aaeace83af4488a53e8710868e67378fedf1ca6fec6a1b8fad6a2d3d4d2a2bd087a1169fb916288ede99d86d3e3ea2ddb6679555bef6d7e75fe55befe98
+EBUILD ipykernel-4.6.1-r2.ebuild 1072 BLAKE2B a5d8f6fe957eab471c538bacf72b24acfe3f37534d69ac63eff38c7b9d051b8b01a237fe98976bf51a7f9954a7b343f8f13802c7f8977cbe61dc71825408773e SHA512 4cac17033ded0eb7b4f21c95374a184765e0d6a8cc9d9c24d55a839d98e381ba3a449d59e23a92a75c28c29ac898aac6a95cb37f8fec6d4335c5034fedd4c63f
+EBUILD ipykernel-4.8.2.ebuild 1070 BLAKE2B 048402bb348c3394be25f16977ff32858245ba299d8e19c42fb0231bc3103bdbf9eb5e7ddcaf2b79aed7fd4d102c56ff98b79cf7cedfd8e5bece55ee440a2505 SHA512 b5b222618dcbd81b137ff83cf52a06c80459e1d05efe6464b7028fc40531c31f6ee5da346cad529db0a6988f013d95f7855c968bece8efce868b5cb13395fdc1
+EBUILD ipykernel-5.1.0.ebuild 1075 BLAKE2B 9b9f6773ad4a1e8711752488f0a52b215631a5a6f116ad0b77afc49f6a02c67a56ff9a62e5a4a3867edd7810f8debfc59cb52a38a0841e9c9d7e9a24f66f4efb SHA512 a4727e6627c7b08ce769bcf1907c07ed2cc83d1e9be808b4da21a2e43bb765cc6a547c457cb1564b9cbf2480c2b90d149fe2f27a718241ecc0f01b54cc6835b3
+EBUILD ipykernel-5.1.3.ebuild 785 BLAKE2B 77e969979703dbad45f86d45033b7bd5a68a5c58a17cc9403114b23aff63ea1ed8a91314cf23169b04fc938f16c467a81dafbbfa2a4e8c48077c752b4efd270b SHA512 972bf09b66672797b45c26ab45f16944e5c6c459f0c13294bda562225ad0d3ee7bf041dc5525918496d7fd9c71c64bd723517e3837a056ced2e1b3e5009d8480
 MISC metadata.xml 493 BLAKE2B 46ff719452b5145a401147fef18fd62fc55542b2edc27017f2f8729d04f304339ccf5ad63de07efbd9c5419d663a498c76f9ce312f06869b3621a17fb72b14dc SHA512 f4176cf4bf94b2a2859ed74298ad8d1b7beb310d9a00f499c32528beb46014aebe7705d47f01bfcc6273729271360a404aa7cd03e046918418d80b8b6bb4f269
diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
index 874b8614ed65..78065f9f8b82 100644
--- a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/ipykernel/ipykernel-4.8.2.ebuild b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
index 244ae2be52c9..c68c7e78f398 100644
--- a/dev-python/ipykernel/ipykernel-4.8.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/ipykernel/ipykernel-5.1.0.ebuild b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
index 677a27f5c0a8..0d9b33445c53 100644
--- a/dev-python/ipykernel/ipykernel-5.1.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/ipykernel/ipykernel-5.1.3.ebuild b/dev-python/ipykernel/ipykernel-5.1.3.ebuild
new file mode 100644
index 000000000000..66c8297d35ae
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-5.1.3.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,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 "
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-6[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipynb/Manifest b/dev-python/ipynb/Manifest
index 3a4eddf41fbf..3c83fe403713 100644
--- a/dev-python/ipynb/Manifest
+++ b/dev-python/ipynb/Manifest
@@ -1,3 +1,3 @@
 DIST ipynb-0.5.1.tar.gz 50890 BLAKE2B 57c7d680b467b67baeef8b36f741cd1f396c716b20efe2bbffdb889a1e78ff81ce10dd52bcc01450279bda5bdf17b39a0ebd4d014e884fa61a8c884d9042c04a SHA512 30e4755661795401b6139e79b8046cf1d157660cc1effee4c19fe62fb1b0daee4daacbea3a6e7cf0c16d7efa6d82d83becea11894bfae6557a1d6cb04efd18e2
-EBUILD ipynb-0.5.1.ebuild 468 BLAKE2B a25b40b88a141a006610ebd3757407233f3c8a85c60ac3481ba5713a6b204080224a8400f4bf8f6f158c0bf550fada898b24132fdc2c232d17579a502cd84fea SHA512 5de722c9117db581e72959f9699548f717fd788e4620542ca1fc24b9dda9ae4c4089646f24f34701d097d82223967eced38a019c61748bade6aa788ba7e540f0
+EBUILD ipynb-0.5.1.ebuild 464 BLAKE2B 894a120f1a5836531f6aa2d22a7092c4731e957e13341a60b936d8dbbb43581968df49122ad9a3de8c4c593263d0f12455db4b3cbbe67f9dcc566c3651650749 SHA512 55069795ca8bad6bea364c661ab9f2ddcca9829eeab6e796f9190f2b62a6f38e7c013f763f3c70b8f0a4cf5f9cf050daf2e3cdbf6a786cb605b296180366e6a8
 MISC metadata.xml 552 BLAKE2B af3199bc2d1056f824ea7af9d2028e279f9137914df7295fa095795b472ac32cca48712c53567220d22330478c66af505020f17f1519c2bfaa7ae851bb461192 SHA512 dd576715c94368f5e15a3433f3f1896e7630cb91a6247050ca4519c6eba4086df52f9198d5dbce26ffe7de31413f6e46b4b7cf3eb637077d92ffc99ae5868a29
diff --git a/dev-python/ipynb/ipynb-0.5.1.ebuild b/dev-python/ipynb/ipynb-0.5.1.ebuild
index 4c09a45b2001..b01ea528bf20 100644
--- a/dev-python/ipynb/ipynb-0.5.1.ebuild
+++ b/dev-python/ipynb/ipynb-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index f6982a77e23d..d3af90cae9f7 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,6 +1,6 @@
 AUX ipyparallel-6.2.3-disable-broken-test.patch 1063 BLAKE2B a80674390818474fba63c0b86c822eab8238713b96b2d6713478909da57bc4ee1c5bd1fa5da9fd7baff8d84b3ffd313540ed8287bd1c19dbeb61dd69bfe53dbb SHA512 c45c51b5c3fc1512d6bbd7bd557a91de50a1ae172ad465bc4f5482d6036f287ad17cad20406fbd51d8740eabe11a50584040c362c32f1770db69f4cbd9984681
 DIST ipyparallel-6.0.2.tar.gz 2366627 BLAKE2B 333d6043c1e3635a37ebd464a5eb6bd0d21d0815abf106f8a7dd138128790d89ccb856dd981c281ce023cded589e6352fd6cd48efab61c8955abfbfea157eb35 SHA512 2dab781eac81bb3c2d4eedff9689448ed8d4317b47a1e8110a0b16147f986428f6fefe13acd12ee8604ec7775aee46a5f62c7d6a676bda7f8d3d39d95d90f28d
 DIST ipyparallel-6.2.3.tar.gz 2371030 BLAKE2B 73f96bbed280def33ae243e592ecf2e298afe92287cf3a7edb966859c38c6dcb1f1a43082ab83907aa00e06d571f4b750df28e6885a1c2d1fd1489fd4472a7fc SHA512 ddf479a7776c2ca9fd37aa5b7dd402c136ce62a479333f5f56dce413649f9b928daed56c173ad5325268eaa58667d611257b20c8269899cc06ae2829f973b4c1
-EBUILD ipyparallel-6.0.2-r1.ebuild 1707 BLAKE2B a4869bdc9bafc3a4a4e9eaace28455c7e78c2e4b1eb36852fec706c42a7dbc56a73f45d2c1b734d2a72f9eb97061ffaa24d486498f9b3959e56f34a0137a2cf1 SHA512 5737f087595be8fdfd20c4ef01836d20209c70fee1c5865dac656597e5e16c686dc939dcfde8425f353d96d1c3f4239401f7ac5292ff88dd8d1b1c9626c84363
-EBUILD ipyparallel-6.2.3.ebuild 1982 BLAKE2B 5eda5b8c10a4572355971a5ed6ffe9f91111f67610154d12aff012636be50e0df74b895e865608c397c5afe9da3265783ccb9d317f0cee75abfe0b8ed115537d SHA512 34afa35206f22806616b4e49b42ad27866056ddf2fb71cf41b0310fc99afb240f78a7537eb85ef5958ceacfd7a2fbf1b36127e4067782cc5dfb7c982c06fae1a
+EBUILD ipyparallel-6.0.2-r1.ebuild 1705 BLAKE2B fb4e3d8fe1f6a9fb8dfca6cc14c7401f869ca9ad3f5945682556c114711db4a2d8f5094d77968bd6d74e623224cbe48584f454b3d284a0d6c8e77a0e02099555 SHA512 4c58869db311776b798790d72dffc698c50033359c4ee235818cfcdef63d4d0f1b7d7e49436d585a9a2e35dc08f145cec06e1893ffccc5eb144dc58c94f26dfa
+EBUILD ipyparallel-6.2.3.ebuild 1980 BLAKE2B bab06b1b78926d272213a83d6d8b8cead7b92a32fc1eb329953e8e65283cc4159908f3679db68dec6815542d7dd190eadc0d5be537489281846ef004f7c7751f SHA512 a326372d380ecd99447a60c707b93668710f7f8ea7b96be2d64763209fa2621643c2eefda2007db681c3908e2b3bc91531992fd1970f4387551e660ac35a9374
 MISC metadata.xml 541 BLAKE2B 1864cc5953409eb51527e721ab298f8296453190f32fbd620da058a2907ffb3778ac1f6723b1f50cd86a27d967d62d882cc5d0cba2709f653b0bd7328288f69e SHA512 47be22e2e5c3d43e92a6e9fcdcfe936ac7690499b850920196fca218b326f708d2350ec23f3084b58d0c9630f8dba06b90414a2e325811467034ef9f35a07a9a
diff --git a/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild b/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
index 3c087618a2c7..4d3e114a30a7 100644
--- a/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild b/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild
index 7ee65d4e2aa0..66651d2a5ac4 100644
--- a/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index ddc754f97cc5..63f1617b8a34 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -2,7 +2,7 @@ AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc
 DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
 DIST ipython-5.8.0.tar.gz 4977824 BLAKE2B cfa0592e8b71f82d996e6e961c3ac478617132f569799916a8794f1af733f3e40649fea763595b58dd8a10f31869d280338b81d15c3d059707a66ff7dab889f5 SHA512 946afb8f1623c8a7564ba2d782e05f5c961577dfb1e4a0f27e4a10e2932d5d041035c12aea7eb3e1d61af87867fab85a29919499822f93f638634bc343084b3e
 DIST ipython-7.5.0.tar.gz 5118610 BLAKE2B 3f89babc292ea55724c2333076a673ef7fcd0a7a468e972a50c962194a71a0bc3cc9bdea4f96db4c21fe475b4d79dc87c124bcde53e1bc3ae7066a3c0c136e0d SHA512 564027879e53b3716ebe8cb1ed4b516835c15f326c865fd664aa7a4e5f26e1a78a329ff8e19d4acf6249e2acf7382501114cd2258c38bba89f0f382f7dcda09b
-EBUILD ipython-5.4.1-r2.ebuild 3623 BLAKE2B 384c7c8a6795a0c65e666ad40b2a47bdd19f6f0015b19a73590fdeb5615c043aceca91f4328534a97d254f693b3c63bf8b5133832aeb79e3963e857d006a701c SHA512 25dd90c22e5fc4eaf0c7b54e11188ae1afa2b8da25413ff38ae15e3cb066f5583d6c1ede1a75aca03316dce3269aedaa3334d7f6bdf0ed7213df1d6f29bc97bf
-EBUILD ipython-5.8.0-r1.ebuild 3680 BLAKE2B a2d2fbab074725bc0c8bf29b5f133d3126d6b0d88e6bd996e85083d49437cf2ec7ad7b040255af1e4b20cb918bcf2c8a57a69257ed1c54ad7251b0d0ec3b935d SHA512 4040bb472e5bef56f207a5dc6ce942b6112b1295150bbc453efe5d8024efe121f2a8851d262701c3c80275e01f427c63bcbb0b70eb11a2fda8c661afaad0b4b1
-EBUILD ipython-7.5.0.ebuild 3539 BLAKE2B db87c7f6eeffc4e8692451ff57d05874e5c754fb7006ee173365ca7c36ede16d220220b30fce0d4e84fb7b9ee7881a218228468cc95e42949553c0d259fa89a4 SHA512 c20b5dee2b8a1f8ad18fc58263e1a97fe86475f9babf3f7f65cafba1a5c086802c0a3b5a543c3d33c250919b263adb14cd5d1c82f84a385873190b67b2b6ec31
+EBUILD ipython-5.4.1-r2.ebuild 3621 BLAKE2B b859edaad9501cc86b0b134b3276b3ec6ed37b02dea16bbf847141e5797b07f7f4ce94081609f813d9ece88e33ec3ef66d104f25900de7841db236763e6df05c SHA512 29b8b675923ddf835b5bf8df9a2c12be694765e03dd5ff9ac257ce0295404de450e8b9987526555aa643193dcbfd28e9c0f1ec77fb9af33582164454063a8bfc
+EBUILD ipython-5.8.0-r1.ebuild 3678 BLAKE2B c60214573da973a159d96b743ec6bfd1892a46b1597acc15b58cf7bd6581b9959f85a7c28c1d754d88332df9afd35e398ead164933e6af16abd2528397d74f45 SHA512 ab2f5dca55819e73a37db20fb3af49a369f96669e56c8fe63eff983022418b78c117d49c6953425b24dd8cb49f7e08b3985ed39a2da02f12c3a729c9c23540f5
+EBUILD ipython-7.5.0.ebuild 3537 BLAKE2B 9a35e4d2b14b954d62c189ba905b9b1046435879878c509e8fca5af13fcfe5825c57a40b1f9d4b72ec897c22b145cb78d00d9337eff45d667381785aece08c4b SHA512 8f7dd6abafc133bf88322db364e3317ffff59500425e03bf967a09d57d8ccdd54a1bbd607cb14bfe619bdb0fdeec8d4f7d382cf03d4eeaa0a323587632b6dfdf
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-5.4.1-r2.ebuild b/dev-python/ipython/ipython-5.4.1-r2.ebuild
index 4c6865ef4d4c..80caa6cc7007 100644
--- a/dev-python/ipython/ipython-5.4.1-r2.ebuild
+++ b/dev-python/ipython/ipython-5.4.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
 inherit distutils-r1 eutils
diff --git a/dev-python/ipython/ipython-5.8.0-r1.ebuild b/dev-python/ipython/ipython-5.8.0-r1.ebuild
index f30f2232d004..c4bd28f89435 100644
--- a/dev-python/ipython/ipython-5.8.0-r1.ebuild
+++ b/dev-python/ipython/ipython-5.8.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
 inherit distutils-r1 eutils virtualx
diff --git a/dev-python/ipython/ipython-7.5.0.ebuild b/dev-python/ipython/ipython-7.5.0.ebuild
index 75c58af6c00d..a6b7035bbce5 100644
--- a/dev-python/ipython/ipython-7.5.0.ebuild
+++ b/dev-python/ipython/ipython-7.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
 inherit distutils-r1 eutils virtualx
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index ab49e929fa40..f3e1dcab5091 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,3 +1,3 @@
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
-EBUILD ipython_genutils-0.2.0.ebuild 645 BLAKE2B 2946145677fe87ca92ab0b626ce49a24319b24aceb653a9cfd9be3f1c2eb070f9f7bb4c2855f8e7763bfe3925c50cb03290d5a8af449fa6b8054f573ca56464f SHA512 e8c62884d997b7aab6762e26417a43d2f361c7fefa69196b51c432c6e74012aa59763944c459f2969d40101ea0d91171037be9c8634e58d4cbfb0b383781b316
+EBUILD ipython_genutils-0.2.0.ebuild 643 BLAKE2B b70f3de80f31debc2b8cea8962f248d2d9263f688b364c4151165c30ad10de1cb938b6907e198341ba81d57aecd7444ed6ede5ede37f53bc020e1cc52afcba1b SHA512 9eedd0464449bed3a6bd527d0453c8edcc01f88ab6c053b6f02128442a9ff2b73f18f0de13ed716d891e4679a08aa6ac0d28dadbeaca3597d26378698e796276
 MISC metadata.xml 729 BLAKE2B 91bb45e44e2ccd4686308049920a2a9bc9a0334af7b2cec5365c35d3462782c9f1c95b5496d364ac1b92bf1514102b4e5d6755ff8beabdf5887f0262cdbca889 SHA512 13724fe12d5a5053947c38bec58984747985fee21954ff33072c954bf6e9bb53c4b9d23dad194c4cc6b1151ae83d1f8f53c9f91368a370aa51f84c7ced0178fe
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
index 39a2bb5c913d..0308a9c4a088 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 1a8ca3e8c83f..1df854b8bb03 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,6 +1,6 @@
 DIST ipywidgets-7.0.0.tar.gz 1006851 BLAKE2B 2ee86d0459b6c88b351994dcb4385d31378235a0be157387d90a476e49958bde25df941aa92068266df377c75dac13925d15ba2f8da0987d70adca3e726fa1a7 SHA512 39219478c12f26a2bab0e975b6fb53a7f9ee92b10fa05bd885b21c7c981a4402ad65f497223a4a2c30a7d6d18bb56bec715a20659926075f2e3730e72022ade6
 DIST ipywidgets-7.4.2.tar.gz 4114472 BLAKE2B 45f946da974c1f7c5422248bd5f2eacb92a6791f089d13fb17e025b94058d97210561a6291a6c5b8c7e8e484e7128f5315db2af6cf212762f36e6d884929686f SHA512 ae5ef0615a9771cd83ca17a2a364bd5d6ee0d934d82adf2c70fde84b7c9b000d7bb32595977a607b5439423e0553c9bb8293617b43d0cf322f6bcf4b3b912eec
-EBUILD ipywidgets-7.0.0.ebuild 936 BLAKE2B a364093155a597ce92ea30758569be9b792157bdd62b94c1a1902c88cb9af5e9296013173e87ced0effa93e6935abcfe7e44418d8a544b3e320712c643c2c94d SHA512 2f033d8b83df8b9e84a4e5895635444c9519656228bae9e7cd5311069a8cd21a0ec8614249308acfdaf2758008d0399f6c4ce338409e643a0a3dc40e662e1b45
-EBUILD ipywidgets-7.4.2-r1.ebuild 783 BLAKE2B 4a9750d05a7d841ae3cf1166a4d302009f87e07bce53525fb4e3e4d719ae1b8488bb651f30c68c2ddb40eb4a0b3d9578b951c9390598a154d0d74ad06a9b1390 SHA512 eb301fbe41ef8e93c0549ec4d65fe69adf2e2e2fa27cd2454f961b4996d7cf1c640d7db1e7cb6d48a1d396e91587afacf402d99b4c3092eec1834473c3757a77
-EBUILD ipywidgets-7.4.2.ebuild 938 BLAKE2B 7754599042d3d0582753f390fbfa51e54b4c4bf7c28b10d593f36ae93ef60c448dbb14d63c08920aaaa744d8bdf1eec4beddb038bfe128da43419d842177bec0 SHA512 7634b74788e66d7e3c4cf2fc5d37102dbc0a7baeab1d703d89366616e2a80a14a19840512536b2f28d5cd94819a2dbaae14dcac39a7add9b76e8ec8496aa1682
+EBUILD ipywidgets-7.0.0.ebuild 934 BLAKE2B 55fb6f451cfd770709da9050ffa685ddc5aa48a8e752e70a4f85a367b5c20152ebfec9d734ee55514e62a2b56a97fb7662fc69557a6af9de1e909821d3055f7b SHA512 6ccf943dc0ec7e59925ade1e791b39a313306af95d41fc16fc0591879f63f3ae0f63e057b17053bcfbb41e4fec276885bd658fada73b8450eac7a029bd1ad2ee
+EBUILD ipywidgets-7.4.2-r1.ebuild 781 BLAKE2B 71d7ce23fd5f1807faae85d54def0a2cfb045caa75bebf59cf6ed5c2758160908d82c73e8f669d7d00245536a69e584259f4de4d8c671a8d6a2911efcf3b396b SHA512 20b13a958d1e5ecabb77874dd410ee3033ec30fce1b1ec79c3c53b023e9796dbff151471f90ab25bd8a79ecda6cff9057a925b5315325e1073791fe99a0eb016
+EBUILD ipywidgets-7.4.2.ebuild 936 BLAKE2B 2d2f6321f6c429e43028d20d0c538279faa9b174ef6d734722d6bbc1183bf07c0ca8f48c23c12935b9b5fedbc517d72e615af30e1def1ef7a16151a495435361 SHA512 5f99623afb59f053d1b30679bc555f7ea8476d079eadb19c7d5c4bb3bd30b85aefec49dd91382015c60bea564872b69c603661320ce5a2af30755e8367952826
 MISC metadata.xml 520 BLAKE2B f8892f1fa8cc869c859fddedb9aa976d5a564586d23d30b758301810ab21bab4b28067c7411de000ee16312b3c12d16ef9fcd927c42601cf4d4560dbcc242cb9 SHA512 2072af0fb3f92af2e73edc7d2e69b9773325ce5c1bb8046496fbeb4908789ad2896126c78c5bbccc475e57cd78385ea15c03e4c4318325912cb23babff45b10c
diff --git a/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild b/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild
index aaad0d6db818..b8e1e3cdf6b7 100644
--- a/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/ipywidgets/ipywidgets-7.4.2-r1.ebuild b/dev-python/ipywidgets/ipywidgets-7.4.2-r1.ebuild
index 2264ba278d4a..273266670df8 100644
--- a/dev-python/ipywidgets/ipywidgets-7.4.2-r1.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild b/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild
index 693a45753b70..544ac2fdd413 100644
--- a/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index e55fd18af2b9..f60f0d65953f 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,7 +1,7 @@
 DIST irc-16.3.tar.gz 87067 BLAKE2B 61d8b9cc20390a3eb918e5593a167b28f37154ee05cb4d7a72f8901509d3345e8d6bee9c17b66aa6c71fad4608a9f98eb3848190f82eac7db6f2013227979c25 SHA512 84b5a56a441cdf22396c10b81c115cb2e297ac082785e9baf0bc73d655034be1ff3f553d44412f066ab4b74530faddb66a9cc2f511a332e87fe49af0b6e68e5b
-DIST irc-17.0.tar.gz 86522 BLAKE2B 1fc1d2faa4e13bfdabffbccae0c40ea7dd477894a5b6f24370950d4bce5e833103fcd2c20d39e2fd0490975b1f36fb234bc354d08f1524062f4dfe7195158750 SHA512 7afef790048b6905d1ae1fa559fa100f57a508586a9d3641890c578730677c965b5c1dc9e00927c8178955632ff919c00484c535eaaaa5c411ce15f68a7d3f93
 DIST irc-17.1.tar.gz 90266 BLAKE2B bcee4710527d718c43fd836f36c48af4bd3b92aee202b0197be710ffc249b3b24d6bfb4f092a102ba0789325e0322b23d65af3fd5d7aa45cf0174d278b5d5282 SHA512 8c6a7d1e302ddfdb86808fe422f922a4bf088dd2890e5ca7a924ca960e603c78e9aedab202c895c555e3ad569e6be133aff652e0a374a16e3ab165100e6fecb6
-EBUILD irc-16.3.ebuild 1702 BLAKE2B c4ea0cb372c819a9c9652fa7bd123a10a8e2666223d20a78fb1a0db5c1123e5946f1d34c77a2abd85e433aae5db84406fa7ba649fa273d9db07eca5882c1e076 SHA512 efbc9afab10a162fe1e9e82f03b46ff3f1c5fe17e2ccd63d3093e0399bff2b3a2da12e1f8ecdf70eb7c9807efb8240e47f27faccd82ec1ce81c4654571555eea
-EBUILD irc-17.0.ebuild 1665 BLAKE2B b578bfb57a990a8a2778805594cd746912da36a5ab0e603b4939814ab9b3289258dfbf477d487d0db835abef47460bdd412a1b403fb2ec646c23848f1ac18b78 SHA512 8bcfcb11a10b7305907112b3e4207fc1b63dd298bf4c3faf97117b5ec36b824f1ac03d783fa8abdd05a28524131e0c34dbd78f4f5f5ca8763c76a8cc074cb205
-EBUILD irc-17.1.ebuild 1715 BLAKE2B 1b73627d777934995a838b69b14d3c95714dfbd056da446f083df3fc52306ce39d31b93428eabaa000210ad1b77b6e2f957e9b3376a10d2ef534a5c407b9dae8 SHA512 1b06a82e7e8f1c31afd55008ee351958c975cc7d3500510ce42337d782584b9da00d00cafa964fc14bb1e772791c0561779107d08da0a9055f12ab97f2166cd2
+DIST irc-18.0.0.tar.gz 91529 BLAKE2B 91e7f9fe38b46f836eb902c8ce4ca04706e673a8a9372c743e9b6be3b400e4d84a0d841b72e2b8444e055a69d37b22d48fcf33c7bd51375dbf0dd4a06b3ed5dd SHA512 a424f1261a09246dd2cfd0b717d4fd9bbeab9754d1f480c870c2e131354db85268bd010ec6b7cf2c59a0c32057bb290ef3ffdcb30cca8c0d833e1497bc89f58e
+EBUILD irc-16.3.ebuild 1700 BLAKE2B a8975570c31d232e5e9bd40f68a887ca5f69bbdc03a03e05b805f053507b1c47ab19fd4f90ae78762f3104b457500986fb736766285789e06b7d09a7ac6bd12b SHA512 d377ff996ce35f5b8f7fd77e1e08bfb84e5f1b25d6f66b0fb5e0f28b74e4d17fc1e542d6209b1daf3ba6c0f89db8ea3715c4eb235d8982743baeb6ca79be7ef9
+EBUILD irc-17.1.ebuild 1713 BLAKE2B e4a88b51c44a7f1ffa5400c415af52d10a9eab3563a817439f11031a8d7f2fbcd2431bdaa4b22e5116fc2d99386e7e5678ae1d7eb09d395bea2adbfc8532cafb SHA512 bd890c2e3cfb6e4d91e615cd9a556fcc574713838bac08994a32b950327a4dcc179dbba064393c171d1535734f71f89a116f32577e518f6112dd7ef0d20e3f35
+EBUILD irc-18.0.0-r1.ebuild 1686 BLAKE2B ba7de13db747de4ac4c6b590831859eb2b51240895cdcf03ea3a6028ea8a38ab64562cf401816b372cfd338b935c497191292af26b303b96d589308b5cf37057 SHA512 3768540afb7e2f5b72376d93bb3511e72d48f8bb6813508f4bbd8d302e3691a12ab318990dd41ed2666ab47116a1277c6bffee2f34e306b8a56da90851c3b327
 MISC metadata.xml 690 BLAKE2B 5bee1fd162cf7a46ee59a40c945991887fe187d09b647907a2e05b80dbd9327d039d40986b5b5549e27f8729153880a234ea50c9601e171b5cfa13de295d6ba8 SHA512 1aadd270ebeedd1ffaea3f62bb804e48f94f822ac6f4d8502753259c098c7b18a5a94d0643f35eab2df47ef3537d513e37bbb9d04b619cf88580a4d5a463095d
diff --git a/dev-python/irc/irc-16.3.ebuild b/dev-python/irc/irc-16.3.ebuild
index 449848bcb3de..9e1351a244bc 100644
--- a/dev-python/irc/irc-16.3.ebuild
+++ b/dev-python/irc/irc-16.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/irc/irc-17.0.ebuild b/dev-python/irc/irc-17.0.ebuild
deleted file mode 100644
index 253606a72f7e..000000000000
--- a/dev-python/irc/irc-17.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="IRC client framework written in Python"
-HOMEPAGE="https://github.com/jaraco/irc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
-	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	dev-python/jaraco-logging[${PYTHON_USEDEP}]
-	dev-python/jaraco-stream[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/scripts"
-		dodoc -r scripts
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/irc/irc-17.1.ebuild b/dev-python/irc/irc-17.1.ebuild
index b534d09c2a25..9a603ad04654 100644
--- a/dev-python/irc/irc-17.1.ebuild
+++ b/dev-python/irc/irc-17.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/irc/irc-18.0.0-r1.ebuild b/dev-python/irc/irc-18.0.0-r1.ebuild
new file mode 100644
index 000000000000..bc2ceafe82d0
--- /dev/null
+++ b/dev-python/irc/irc-18.0.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 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="IRC client framework written in Python"
+HOMEPAGE="https://github.com/jaraco/irc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
+	dev-python/jaraco-logging[${PYTHON_USEDEP}]
+	dev-python/jaraco-stream[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+
+python_test() {
+	# Override pytest options to skip flake8
+	# Skip a test that fails with 3.8 until it is fixed
+	# https://github.com/jaraco/irc/issues/165
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		--deselect irc/tests/test_client_aio.py::test_privmsg_sends_msg \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/scripts"
+		dodoc -r scripts
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/irman-python/Manifest b/dev-python/irman-python/Manifest
deleted file mode 100644
index ff1e4a0bb990..000000000000
--- a/dev-python/irman-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST irman-python-0.1.tar.gz 16390 BLAKE2B 0ed988fd383e29b8c0d6dbee2a294777a818414e765abf17a104358c414a94995c1c813661bdd1df5d55e7dfe30620fbd47ef813b00a390ada86c5b19b485771 SHA512 7e0c80252c471419400ca80215c64f84ee89559496f5d118f860ffe9eb7078c029d8c5b5f75b55ccb6d21917bc91314d6e8ef3523d260172c22dc0beb13c794c
-EBUILD irman-python-0.1-r1.ebuild 475 BLAKE2B 2b38d50dc283e9b9bfdb0c9949cf27b55f97e48ce337bf071e4ac54208335fc06a4363cb40bcef0b20315084632ef88e3202094e57b04ce1f2a37e14cabb9e31 SHA512 4da9c32c5a87b6a7842106466448d61320101d648cc4aff2664516bdc60615097f55f120584891c8071f1b19e7247aefa97ed097d0b063b785dce8b9359f9312
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/irman-python/irman-python-0.1-r1.ebuild b/dev-python/irman-python/irman-python-0.1-r1.ebuild
deleted file mode 100644
index e14874be68d2..000000000000
--- a/dev-python/irman-python/irman-python-0.1-r1.ebuild
+++ /dev/null
@@ -1,20 +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="A minimal set of Python bindings for libirman"
-HOMEPAGE="http://bluweb.com/chouser/proj/irman-python/"
-SRC_URI="http://bluweb.com/chouser/proj/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/libirman"
-RDEPEND="${DEPEND}"
-DOCS=( README test_name.py )
diff --git a/dev-python/irman-python/metadata.xml b/dev-python/irman-python/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/irman-python/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/iso3166/Manifest b/dev-python/iso3166/Manifest
index f666a008b10f..77bbd4de5cbc 100644
--- a/dev-python/iso3166/Manifest
+++ b/dev-python/iso3166/Manifest
@@ -1,3 +1,3 @@
 DIST iso3166-0.8.tar.gz 8930 BLAKE2B 9c66786eb81568f4e042cd810e64997f44100d65f223b5c9e664d45388910878e42bf00a43130fd1b8a3137d03e0476f05018d9203a92eac913e31d5889c6932 SHA512 ccb49bbdb1a2751816b095141d4bf566761df4d3857923d3444d5e12b915c4d92e5aefba16c4680a4876862efdfb6c928b50f5ca675342d5952c1b446012a101
-EBUILD iso3166-0.8.ebuild 503 BLAKE2B 42b5db8c7580c454450ce1e16dd6754f7baece45e882050a97858dd7253df3a9331d6f19b3e3e26ab35aafeb924bd8b33d6b186f87c65d949124420bb16b9925 SHA512 f34e9fd87eccb59e24cddff221fd663ed20cf8164fc049956aba7fa3136a7602950655ea90d545fe70c59ae9a192c5e900fd0e7feda0b73ffa2d8b837d073271
+EBUILD iso3166-0.8.ebuild 488 BLAKE2B e1d3a77d50e6e291b924f5d142890f185b8337fddf5218865fec50103b5f6d8436ae7f39dcf668fa38be9658ac59de993d46d54a5bf4315274ce3f55f1994c73 SHA512 3c9fbf82a551add8d1ebe35ce6399c39a95c8ba01477cbf8aefe428bfa4255139080f92b9b8ae58bd21afaac890072b4fc46989f10d66eaeb7a46ea8749823bb
 MISC metadata.xml 376 BLAKE2B 0d078d1bf861c9943848a1a7809fe053eb1bbcd41ec40542db0e1bedff5bc9a9c0fe1ea49b5cc640a95cc741f7db198954a08d65d1aab9ae74848e6f7eae8168 SHA512 2c490fa431919280ca2c84b5ec638fd49657c9ff8f79ef131df0c5d04e65b60a8adff3692723850b7a048b6cb2398a5c87c06048c69919d2bcac43ba7af407db
diff --git a/dev-python/iso3166/iso3166-0.8.ebuild b/dev-python/iso3166/iso3166-0.8.ebuild
index 75be06210aa9..82dee212331e 100644
--- a/dev-python/iso3166/iso3166-0.8.ebuild
+++ b/dev-python/iso3166/iso3166-0.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index 5853eae5c12d..96fc2663e34f 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,7 +1,7 @@
 DIST iso8601-0.1.10.tar.gz 8405 BLAKE2B e9831b9a4cd8a6fd8bb1717c182f46250017a84efc3000484a395ea2b9353a279d0087b7ad8b5ae5153b767a69992650d62efd25c71a0967c217e09cc6cdfa77 SHA512 5a3635b3daf6c5ccfd0dfdf47bcd60a0841c06137b3ee334ec024909fa24c8fe4a1da1fa253e0a5dfaca173d4b10dfd994b83a031b2a0385406ca92987098168
 DIST iso8601-0.1.11.tar.gz 8725 BLAKE2B 7eed190b8876ae86f8b551676ce69e8bd3a09156ac44567bbbf48d77229f9b52f9fec62ca3c1fa620bea8c7afe2b62d2d6c5ac22a3e5d88adc6bdcf2b6bf0b89 SHA512 19f5443aae4e3f93b0521a7215318c2833bcca5740ea05f9a6d5771bff2aaeb5626ba26e5ba64efae135bf9420a1810854969dad845aaf67089d5e6898a254a0
 DIST iso8601-0.1.12.tar.gz 8868 BLAKE2B 5463af17cfaf2c1f256790ec11dc50f808857abdf0a341f2c88033e9e94f09069ed570223c3743007e0fff8fdd9a714bce0ef3e88a961c2bb131b79e88a1424f SHA512 d64f3a83fd3a678446e17fb35265c0487491a53a2ec306fe2332c59e9e471bfe8580b3280da7ae13664f07f7f29edb0347196351ab698849ccaefb52d6ce6613
-EBUILD iso8601-0.1.10.ebuild 767 BLAKE2B 6720c3fa4fd6e1f22d9cad9d281f3b3253c30d4fab6d35139dcabb2dde138e31d5b69179d1369efc4c675aa485fa28df7ee077d147aa7972c43591cd2717346f SHA512 279e2bc043658086dd8e4e1081e129f301d777390ee100ee3a2e260a78dd55674aaafe068fbb5a5bcd135d4235fcbe62283bdd210d94f5328261a93b60d9c50e
-EBUILD iso8601-0.1.11.ebuild 777 BLAKE2B bdad3c2b9b4868def6ff1802555305b910ba7f22d72860d0dda83e448b9636edfbf7bc24b3da8154065a55cc912d5ed8e4c14358fa11a9ebad1f81995ae7eaa0 SHA512 ef521d2fe4b57691b87722680176af92cf56491549413192abdc3113033f13f2ab6bc517b4835b859351c9d3d5a2c0fedf78961a16264d327dd94173b3431c62
-EBUILD iso8601-0.1.12.ebuild 614 BLAKE2B 4848eb6e58ea093a427078d083da3d71dc162bb26a0a553d40f9ca0c12e485c144f882b372cb50c321f8e4c5f002c897254b0cb3790ab57cbfdf9049a47272fe SHA512 f67d0e66c0c5f3abc7f61515943b4ee40e202669c8e9af782c142f37be3e8ca701f2a57ddfeb30092e6175efc8d573ad5839a688a7105646907f5e2cdc75671f
+EBUILD iso8601-0.1.10.ebuild 758 BLAKE2B 2eb53e8fb32bc88e487c400e78a65a12cf81d4a5265641f024606732c3b2e509cf9b701394895798e10e0a2eaeb1764a841e0b40ee708a8f8f1e44c733a76bf0 SHA512 803d549f74b362bfbbb3987172406d4a147e16ad12bc78915167c59cb240048a76ea4b548cb6d2f2b4f2016ace38163933635238ddfa646e11ab0df6b3cac6c2
+EBUILD iso8601-0.1.11.ebuild 768 BLAKE2B 7cb2ffb076f7f714e8146b50f67148ef4bbf194967c4cdadcb38232f9a6f8acd9b2a2daa836ffa75aa453676f70aae59d68ac80a170f84282a7aff9f1d46dfdb SHA512 52c304379d3782abbd74e568d6a7e9cc989f6248d30010a6dd4c87c50ad7687f6ce001b759482f66f89a25e34821bb92e08a75de9989a135064db13dd2f6f9ae
+EBUILD iso8601-0.1.12.ebuild 607 BLAKE2B e19905e0034ff361ab4f2442dfc4d42432da785464b72db610a84500c02557e94a49ac28af7d3e779531bf28be25f28ed381c6d4bc6ae9bc63e0f25017be8192 SHA512 564b721434700893bfd656d5df15d784405ba8b3d4f43cdec4a59d3522f9247fb3c7f03018db33a728115c4def205ed59da4dfe83ad12fe338693c4d999d3f8a
 MISC metadata.xml 334 BLAKE2B 5e73aa36a751a0547b8c8d39ef2a9cd3c9b4b5a41cda2e4ab47850fb4ef86fc4a9fa0f819329409b6fa34dcb031b38cf2532bdd33b59db85e61953e08b5f03de SHA512 70d83069bca1f66a6229800c51a0f8a5081a23072eb9d432e07c9945500899f769217ca989de90886896371d5f7d9a95cc976048035d1d6d615fe602ee471589
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
index b54a20197bcf..284460ad47ff 100644
--- a/dev-python/iso8601/iso8601-0.1.10.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/iso8601/iso8601-0.1.11.ebuild b/dev-python/iso8601/iso8601-0.1.11.ebuild
index a69b72ef9608..6ce307618ff5 100644
--- a/dev-python/iso8601/iso8601-0.1.11.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12.ebuild
index e54fa1b15919..6cffc56c9b80 100644
--- a/dev-python/iso8601/iso8601-0.1.12.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/iso_639/Manifest b/dev-python/iso_639/Manifest
index ce421a06838e..e8e9f6c11a40 100644
--- a/dev-python/iso_639/Manifest
+++ b/dev-python/iso_639/Manifest
@@ -1,3 +1,3 @@
 DIST iso-639-0.4.5.tar.gz 167421 BLAKE2B 4fd2721a733386fcea3bddf555c4139f78b67a9af2fa890b71098a1ac567c8e0194bd3d1f9276f77716e83bccf4482bf1fa1ee454550c2cdf744a60957d9a677 SHA512 5b27cbcd39173f03d6d54e1ecddf879b630e985c549d6084dab29134d30bcd0052f902a2c8ca5a0db891c197deb1a00f1acda880cf728e7589f0471c42982f73
-EBUILD iso_639-0.4.5.ebuild 551 BLAKE2B a3388906b2f1ea53ea982613113fd1456046013bc1c0ce448f81da58a626fb9c23f208691032f52248a38231f31b5f602244c30e4c8c56d578aa2eea30eeb4a7 SHA512 f1197eecd27371caa011a284ffc0c1faff4ff5d5492140a97e3f92b2eb2cc22bd0ffc88ef30e30aaa84f636a470f9ddb8f0732dce8f2b6d88cfff25a5b6fbd2b
+EBUILD iso_639-0.4.5.ebuild 536 BLAKE2B f1f17fe0cca2869ff2a19cd8141f69100eb71973f11529959c1b84951f59c16c8aea717dcfe12ec566629a8e882e22a5cf471579698b2824bd24d715bba4d8a6 SHA512 79b556b16a72cba14e88064558789d3810236cd288cbec895517d0717c9965253f3045be2042ba411b7b76ae1af069ddc8e84d4f7d52e1a80ca0fe9fe614b7b5
 MISC metadata.xml 363 BLAKE2B de8034edc72d9707e5f47a16beeb21080ec3ad529cabd88e29e7660c0dd9cf357649dd59d46551296a5cbeaa6ff36a18dc280c03f4f812479959ca33a1b2dcc1 SHA512 a01ca49ce0b5ca24d9edc382cb561b32b4e8ed3114e21700c477a3ac3fece85345244e7781bd11fa74fd3be2f7efe65126a1792b55c946035d9888ebd0bdf23c
diff --git a/dev-python/iso_639/iso_639-0.4.5.ebuild b/dev-python/iso_639/iso_639-0.4.5.ebuild
index 4d4a60c1bcd5..11daed843617 100644
--- a/dev-python/iso_639/iso_639-0.4.5.ebuild
+++ b/dev-python/iso_639/iso_639-0.4.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 MY_PN="iso-639"
 MY_P="${MY_PN}-${PV}"
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index 383eb30a3557..341c8d88cc59 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,5 +1,5 @@
 DIST isodate-0.5.4.tar.gz 27691 BLAKE2B 91c05cab9a9d7313a4a98bf6843c4a6baceae86e2f030c684d0b7046d6df9e446124fa7704fe2c4689f2ab10da6c3ae96922809742cb4efcfb04a50f48bfc610 SHA512 ef5fd27ffa61ad10abf499723c452fd8fd6c2f08a0d5aca6ead88857e5d159f50a3d01769b9fe0aed59a57b0f89a70b359135b0d7c5e6a75d023daa824e5d80a
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
-EBUILD isodate-0.5.4.ebuild 631 BLAKE2B 11a0983e72bb75eb1dbb8fba754f17528c726238aca5fbf013e08f17df361e0419ee1b1721f91b33da90f2c0ab4e17d45315d02072d554a0ce0c40c1dcdcae3d SHA512 ec54c6f2e42630d7670a6c281321e8a8b0bb5e4eccf9ab9adf0e8b12defff39971b203fa4880d93e9fb054d0fbe85b1dec2eb8594c39eefe7b53867a45b8da20
-EBUILD isodate-0.6.0.ebuild 743 BLAKE2B f435663ae335bb493714899bbaf28f9418e678c0e779189dd1ef62de12094b8bf64d07c0563608ed631d7931df1a6daf705c86aeda9f40da374ffde9d25646a1 SHA512 caa0312244a85b62b79c75b46968d4acabdfdca288effec364e0ce7911f185f702b91b47233cf3d04c6b66acd6c3f973d1f9411935883434b63220cb14862a08
+EBUILD isodate-0.5.4.ebuild 622 BLAKE2B 87c69b5585928bf370cf9dae784aeb35c4eaf65197b4d0e35e50edefe50f010c7bd2cd0ff11b74a54e56c13a3b7e8acd7f832834b941ff3ddadcd69414669dbc SHA512 799ca850509ad983f87b7f58e0acf8bb17409fba133f3dd0578a69ba4d9b825b80f4e7dea67337010b49531ba2494d4a348071e22940ff3c5fcf09322d08fd32
+EBUILD isodate-0.6.0.ebuild 738 BLAKE2B 72c9ba75969b75ea3427a487628ced51efcf8312bf7b2876169b12619ec5da1413d0a7d8a042c482fb5deedd73159c3cab687ef4b6784d7e0b3e1a43d42b5207 SHA512 1e065ba0a73f7586c757d58697c1e6173aed5bc75a8facc88e1c0fd361b517867fd623f249554c6952850cf60dafb761dd97e9fcf14d2aa6cded285e11289492
 MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
diff --git a/dev-python/isodate/isodate-0.5.4.ebuild b/dev-python/isodate/isodate-0.5.4.ebuild
index ba76f79c7163..245bcf2f926e 100644
--- a/dev-python/isodate/isodate-0.5.4.ebuild
+++ b/dev-python/isodate/isodate-0.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/isodate/isodate-0.6.0.ebuild b/dev-python/isodate/isodate-0.6.0.ebuild
index c691e90abb99..69dfd14ee227 100644
--- a/dev-python/isodate/isodate-0.6.0.ebuild
+++ b/dev-python/isodate/isodate-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 2e06ebff4a71..1f299ff4ac0f 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -2,7 +2,7 @@ AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e7
 DIST isort-4.2.5.tar.gz 36361 BLAKE2B 7133ab999200412bc880a5413de81ff0b7718383eaf7f50dd1ca12da4d7ee24f8d47af60e7416ca6898a32074779c4f293d897a0f7d62c2539b10a686484c121 SHA512 ddc8e859bb421e4179315d74896958c8279394d42a75494db5dc22c58422994aa249b63c03645626a021ccf9142941bde51ad400256ab1c6be29da8110375f40
 DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
 DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
-EBUILD isort-4.2.5.ebuild 469 BLAKE2B d3285b6b12cd641d1823945d78829ead7e8d5f7811c0daaac20ddd75650aa4bf80d5924f7579ea67cae090c112a1d75fb3a0b7b93016ea5da30a5c443e23f329 SHA512 07cce8f7c209caca4a8e587ba28cf77a9d40993a9d7b95a9fb3e56574520e07a362a2f7dea4f1b73a6eec967b43121bb6d49ac712074863fc7a7a85b0b61c067
-EBUILD isort-4.3.15.ebuild 469 BLAKE2B 90af03eb5ff9649c98891d9b0da2c2d8e5187b82a6d5a14c4288d93f074046176b0fc7ec1ac082ae12564ec8eff4d6c5595c95f382ee4ca34484fd19f4336829 SHA512 494b4449c0c7082c1f47bfb0b99c6fc8e7ec7240289ff3ead40781cb592b02058719dff49612c949adf875d2e6ff941fae76caa6ee4c898dd26890a6d6d58943
-EBUILD isort-4.3.21_p2.ebuild 805 BLAKE2B 4d9d319b4eda2fa11e5669b5f3a6ed99c8b304d282b509661e32e7701e83850aa6e43bc33f391e244a12ab605dd859c34cbf543aebfecc0f2848eed668c5ccbb SHA512 ea5db193b7ed28e4c1a7a2302b69a8226eedecfe9d729c226238eb2d2d028bb9e8319200df11b6744399c5a5b791592d532e43dea1016fd9f076f12e5f89c4eb
+EBUILD isort-4.2.5.ebuild 460 BLAKE2B 2ee2fd50ab4bf0c415a116d8da8927cd34bf70e53d08f5933c186d5a47b1637187f185945c73a89443ba2d22dbd8afd79acff210ab6eb2a051c309a4a177af45 SHA512 d6d2da0180207a5c243e9203616dca78a83f0520337279ef0127c979fda14993b2daceec5c09896a234d8b05e902b44d6e6227c89969920a1d3bd92a0c86e4eb
+EBUILD isort-4.3.15.ebuild 462 BLAKE2B 63bac068380b5466dccdafcba4f0b1e39a83e6c290b6773c2d6d099db0a021a2fe312c03628df9177292a8581f5b82815c2b9fae0988616ca35833dc5f111701 SHA512 2144ca66ebd8f57a53e2f8bfdac65c0376580ecf2da35e03510025ea840c3a238ffd9b562a8039fd119e301353900056969223de135fb30bcffb0f5c2f258bf2
+EBUILD isort-4.3.21_p2.ebuild 826 BLAKE2B ef04ada9e6d6cf0ee294171fb523f420058276e0cfa124e22a396872ea2fb8f40efd27ea8d29dfb0945930cafc9d84e35af6283d8c0463faf0c016b6cb640de0 SHA512 27f57fa849b4bfa5c7102161b97b8aa763a9f74fd17773ef7178d69ca81868045f5dc90b420eec63f44f63f479e0e81ff981597f1fd352441b47e1f276cdd328
 MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
diff --git a/dev-python/isort/isort-4.2.5.ebuild b/dev-python/isort/isort-4.2.5.ebuild
index 8895b6e7b029..bcb94479fbd6 100644
--- a/dev-python/isort/isort-4.2.5.ebuild
+++ b/dev-python/isort/isort-4.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A python utility/library to sort imports"
diff --git a/dev-python/isort/isort-4.3.15.ebuild b/dev-python/isort/isort-4.3.15.ebuild
index b018acbee5ad..0c4b6b3ae1ac 100644
--- a/dev-python/isort/isort-4.3.15.ebuild
+++ b/dev-python/isort/isort-4.3.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A python utility/library to sort imports"
diff --git a/dev-python/isort/isort-4.3.21_p2.ebuild b/dev-python/isort/isort-4.3.21_p2.ebuild
index c55537150d53..e25a7d403960 100644
--- a/dev-python/isort/isort-4.3.21_p2.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index fb5af955e9ca..c81f76c71d8f 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,6 +1,6 @@
 DIST itsdangerous-0.24.tar.gz 46541 BLAKE2B 835a459128188083ea048fa26ecfba1e01b67618838230f9cc53b93afe540a38856b48d6deb404f19564fe79390d109bc3c7eb8738e83ba828f21a33aa94b050 SHA512 2863b6e5fda178db59bd214c6d24d04422c1021bb41bf11598aba1cbc43053aff3bb1e0539940b5769de04b68c03e8bd01d728dcbfc4bd0ba05867688574a297
 DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
-EBUILD itsdangerous-0.24-r1.ebuild 832 BLAKE2B 5011259eb6ae8cbc008403f245019ded5837d84d30c99d8141e5e97ce1e7fe28124dee7dbd5525b5781fddff1af70bd7cab66cc875af5e1076d7ce6fd25f0c99 SHA512 bc6acd677fbb8038b9651255bec8a4c474e92f875585525d5780558ab649e1b587b998a62a965d206f11c7ad179fb7d3724ab6998998bbe401857bcae347d4a6
-EBUILD itsdangerous-0.24.ebuild 825 BLAKE2B 295dc367ba3c68e5cffe5d97767ccdaac5b651d50f65794fca0f6c608955e579756d4cb8164acf9333fa46a43dfa38d65dd45543b64817631fb68d11504c53a9 SHA512 c7f44a448ab75d0f509b994abd46b36d8670ea2a0bf9cfd300ca3b3503885f6a540860ca75e34796841ca381072df4d4c05f069398de97dde5e8da3f47f390ac
-EBUILD itsdangerous-1.1.0.ebuild 692 BLAKE2B 123fa18a2e8ec6f09e9e3154ddecbf1b459860bcda6a1ddd6c09995fb5083bc65c54109294d7b6447d12f688d5b8fb73ce05a19d8f45e6d96b6c6821560ceba5 SHA512 b0739a4957de4f5a7e52fa8a3a3c732ba9f18e071e24ebd69cd97c8551bbac026ab2852f4a7add27291d6bac3ddd281df21f5cf64d6e29991fede5ab0555b61a
+EBUILD itsdangerous-0.24-r1.ebuild 825 BLAKE2B 30d819b0841eac35db873fd20661b36de7962773d5b3bc5b017c237ad97e6e088c3619080f17f8ab941903d158088b48b101825067f1790fc4f99445ed6ac5b4 SHA512 6a5ada4b7fdf658f40cc2d446514353de647712b9b1ba2b29fb1fb67c04a1040483095bcaa9513a72e247c1ffb3cd686f717ed85434da036b87e4268e8252945
+EBUILD itsdangerous-0.24.ebuild 816 BLAKE2B 9babe4a3145dfb3fda2e714e82da30fd2244d016106fa7621bb723b4c3ad466207c45d1afe3227652e85750d573696a3ec3d3ab741e485a45452f21af7c61cc2 SHA512 ed8d5abe1a48cf6d7a40673494950f66bc0189995e00b2c9a977d9f2fc834707ac99202a0f53f5891455c7c86d9dd055488425a641dbba8dcf868f55eeb20c34
+EBUILD itsdangerous-1.1.0.ebuild 685 BLAKE2B 0c55fb2ec5700072fee26d5b64570d4cbe8b70e845d140083afd9069d416ef842f266ffffe0b881b7c93ca67cb0dfc5bc1ed34b0ec86ef3c78f8077106e42582 SHA512 9ca7c5015da9ec79aa6882f8fd0b49cdbfeff8554af9c6b753682b0805a0dc970525814acdd1ac4ddd36f60c8e7fbb1677bc6ace2e785a101b41b69b4724ab43
 MISC metadata.xml 325 BLAKE2B 77ff2333a1e15eb410f0c320bf5b62c19568bea653b4cda79294debf6dad02b774f914ecfb3cecbe0adb1630e36bc82727ae77ab09f2b8314fe2ccc101df6737 SHA512 ea6c9ac90af243fc0367615835740108e37ddb9547dd9f288572af097c978e11c3fb2a17398950fbf842e6d1a4fb0410a74e769ad7b0c103b2d9301497578e22
diff --git a/dev-python/itsdangerous/itsdangerous-0.24-r1.ebuild b/dev-python/itsdangerous/itsdangerous-0.24-r1.ebuild
index e9e48ab961b0..b09cf1aea0d4 100644
--- a/dev-python/itsdangerous/itsdangerous-0.24-r1.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-0.24-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/itsdangerous/itsdangerous-0.24.ebuild b/dev-python/itsdangerous/itsdangerous-0.24.ebuild
index 63dc2bff4bdc..2a6ce1110d46 100644
--- a/dev-python/itsdangerous/itsdangerous-0.24.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-0.24.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild b/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
index 3365bdd8d133..3bce50f7ff6e 100644
--- a/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 0eea4562616a..d6fd55872799 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,8 +1,5 @@
-DIST jaraco.classes-1.4.tar.gz 5171 BLAKE2B 193333a9a543328b6f781888ba7a6ae3cf0b1ae7cab078c9da65a1ed26cc71164aa06a31f2495b62c7d7a388b6fc075e97c7af58f7d67bc0ecc1785f9c7056dd SHA512 d434b470424c104f91e9a4a5e3a1f2109b919a35edf45540ad1ef8600f0b10864f32aefb411d747e13b5d99ba06601ea7abe5032e24e5dc6b25254b4e68f8a89
-DIST jaraco.classes-1.5.tar.gz 6710 BLAKE2B 884e756c7bff272a0b35d9ef8cd30538eba793e6d838b7bd409a59fde9539776906aeb95a456f7095178ce0623e20634fe1a09a8f3515d4b661bf702480cd934 SHA512 8fe3d40863424547e5396fd6a2b4ef3f27a92185ca82206bb88de2716419a9c2dc917fc945c732d5dab1a1795727a12014e0bbaceee7834896351de05491f99c
 DIST jaraco.classes-2.0.tar.gz 9911 BLAKE2B aa5e5c90f16c9536239ed61e6dccbc426244c98a33a944de32239bd42a0a4944e5df3529cfd525e05cf276a4a4b028edcec734006b549053ac8817032f52b2ea SHA512 83c9a570f951ef6c3708243dce6397cfbfe963db5920550ac807878a69860b34831af5f277f956fd0b327d85462676fd6386a22d6d97c7616e01ca81d7ace694
-EBUILD jaraco-classes-1.4.ebuild 1093 BLAKE2B a49cd36cb00bb140fbd954698de12cf6e33f0e5dbdf9e3a5c810693280d3b26ca086f5ad9d312e219bb8ea551e1a202031beddc7e053b0f748191a966f3a705b SHA512 a190fbf0e54d7bc9db7edc8e030a3d8785499c89739035cbe7939da7692d3e6a9ecbc9ef8cb2e55bbd4f146eec4491de16749f83f2d05581a3a0eb9ee53e79cd
-EBUILD jaraco-classes-1.5-r1.ebuild 1393 BLAKE2B 307c9bf10b3edd80d082194897d3d58c0b3d04fef5f45e2ac197b76c84b2fed7b9e3d30cc34761f52642b1441648935eca42400beac5d6e9bdf876535b36109f SHA512 3eb1eccc36e937f87577163427e95dbb80e156032563a7c4fdcb133eec4ff605ea861ac3c648a172676d795bb9701f8fdd37e2db867242eb3d92eebeef17d1e2
-EBUILD jaraco-classes-2.0-r1.ebuild 1645 BLAKE2B 5ee07b052fe18149a3f50125f82dd7545e3a88ae11144a88d5596ad25f7664ebde1737fd2092c1a8392b7474c1d98273a7433d42712498cb120993c4fea48989 SHA512 f483b85e73c222dd56cdc9cb6b1bb2b1878d5df025bab5ca1e774bca7ad036af850ae4c0d7e7860749377deda916943a96524842165bf0caac5369e6930abb6e
-EBUILD jaraco-classes-2.0.ebuild 1583 BLAKE2B 120221858090c3998547bf8c08559c7b5b77177f645d9b02822b6e606a8bf483da06155a984fdef83444e1fea2fc83cf82daa5db265e8d32d97c7c081502bef1 SHA512 07238baa45fa598f74dcdec0fe59c7be182d18008c3f6bedca30512e62bfb3eee944315d871469daec8dc875b5f6629bf090c29238a9b6c96c458e2c8d94f437
+DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
+EBUILD jaraco-classes-2.0-r1.ebuild 1642 BLAKE2B a87dbe02596455066b9c3b5693af53107a8b3109e95e743dbbe82b59fd3a10c01d951ccf83853e4871cdd670119e88d83b9cb8a5f9e27ff3bae38969acd558a2 SHA512 4f333d58699a384668472e3a00ec6b0175622141c13eaa7123e5f3f16193804bb1f87323f53fc7d6784e23e41044e4f7e99773ad27f1e04ad24b5957c2bafc95
+EBUILD jaraco-classes-3.1.0.ebuild 1644 BLAKE2B b9553c119981b5479e8d0675e905de540a62808ca0603fa59ff73e18e2332d450bb7651b2fec4d14a3453c5373ed8a53d9fb0a139ec2dd4984a27f72c5f6ad7d SHA512 357867a1bdbcfc549865a71199554419309581c6ad6cc351bc223fb41cbfb2323e54aab6fc1763694e7c5964d8b151616dbba121a60ade3de6765b1118a91523
 MISC metadata.xml 452 BLAKE2B 21134cdd1ed697f4c18617cf812678e3369ed58334419ce74ec5bc0956145cbd8080085d207d37d257d5ed480bd81670f98a38289c773ba7f8b905cbb49077d9 SHA512 0107c5f161fb935b84251fe078da9a6be29f4ab53fc16c8f9f4aecda8e8de3df00b396c54ae53461a76cf794f6bd0f96697ac1ecb2bc59d2cbdadc8a6fdfa2da
diff --git a/dev-python/jaraco-classes/jaraco-classes-1.4.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.4.ebuild
deleted file mode 100644
index dd721310ef54..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-1.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.classes"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild
deleted file mode 100644
index dc9fa4881702..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Tests fail with pypy
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.classes"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-			cd docs || die
-			sphinx-build . _build/html || die
-			HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Avoid ImportMismatchError, override pytest options to skip flake8
-	pytest -vv "${BUILD_DIR}"/lib --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
index 229e130d8253..2bc0ef26fc64 100644
--- a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Tests fail with pypy
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-2.0.ebuild
deleted file mode 100644
index 6754edb9c766..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Tests fail with pypy
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.classes"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-			cd docs || die
-			sphinx-build . _build/html || die
-			HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Avoid ImportMismatchError, override pytest options to skip flake8
-	pytest -vv "${BUILD_DIR}"/lib --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	# note: eclass may default to --skip-build in the future
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
new file mode 100644
index 000000000000..01a50f67c596
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Tests fail with pypy
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Classes used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.classes"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}':" setup.py || die
+	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
+		setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Avoid ImportMismatchError, override pytest options to skip flake8
+	pytest -vv "${BUILD_DIR}"/lib --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index a1af84828041..754e31d47559 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,9 +1,7 @@
 DIST jaraco.collections-1.5.3.tar.gz 11669 BLAKE2B 2dbcac99edf28f4544e354724f8d95c0cbcdd793b33bcf892b403e72410f3b5b72b6eae62a49f0e56991cfb19b4ad5da0e95a3327f11fe5ae885e9a0029a92be SHA512 6e1fa88b468b9d971a7a302ebfdf8b9762404c2fdc1b003eee6653704b9f385f0f2e0c84ac075bdc81f8693195781cc5532c4adb31bcabd87974624a14e287ed
-DIST jaraco.collections-1.6.0.tar.gz 11991 BLAKE2B 8f8b3da18641d6348a28ef3792afabd504771f31f1de17ebb621aff493cbb7357e11d49d8b3f4ab4fc7b9a662986d10a90d20734cd802c6d34be1d169390aa96 SHA512 9bd472b51668129f12fabb90b86ed929e135a17217bc850d67d945a786d1952cf1f11b0cd8f5d4ae16b3b19ac35cf87e0584df622877185362e93ba3915dbe6b
-DIST jaraco.collections-2.0.tar.gz 15102 BLAKE2B 61fa35070b2342f95b3e6e571417ab2cd62be439250d8f2077b379316488a4af62d943248bad80d0a72d9aab3010c6982fb4a51fa4ddc574ab72943e37ddeb6b SHA512 1cc3482bddf6647b7fd183f091db7fe89e9ad1ac416716a918626134835837c2ed29d533bc00052a514d64c94343a070b9b501984b3dcc5caac87066d9c335cf
 DIST jaraco.collections-2.1.tar.gz 16026 BLAKE2B b79b57b6bac1e18b6be44ea0e5ad65e46228c7fb4f47be90471cb7a2f85e4c5b10cabe47f1fc6287383b1184db85e5d286d219def3a5f5bfca10e354510d85bb SHA512 64fd3f4155dfc64152dcfb7970c26c7e3e098b0a8282556d17be2aeb80dcac6092b6dca11bf42cda268e0ddda67f2117704c81218c4b6511236e57b1f602da47
-EBUILD jaraco-collections-1.5.3-r1.ebuild 1451 BLAKE2B c4d89c36a73ba69daf8315b5ae10a6a8baabc121a5e6f3e4c8707e628f119e13aa87d8ae0790024689cf1c577ef1c3b6f69cbd23fccc515235dfd0b55c268b08 SHA512 91418423be9e321021a5091f29160bb7ec26dbaff59b0488673974dd3d8c706624a9290bda0554f12f81e6d9d69362a1174334d5b19f5cb17b73582189004bf8
-EBUILD jaraco-collections-1.6.0-r1.ebuild 1453 BLAKE2B 4f5ab335ddd25f60e1708ff269b6d6f35bf1843ee60dbfb882a403fbaa59be3c8174e11e0e9152d78150e1b9e1b42a4ea611151704e2ed936b7bbd2c07e9d17c SHA512 3fcf4a24087d8723a1e2299a0253cc88a3eb3ebb936ba0ce223589f1e004936e286d7549d38cbac8a6b30f00b5ca0b47d9a4dab8d27d5cf8464e3c0c32e07816
-EBUILD jaraco-collections-2.0.ebuild 1613 BLAKE2B 7eb41c63df3ae73afa47cb6be67f8545d9b5adb5aa652b67bdeb930adc8f2be61f45152203fef0bd2494daf07cb0ed2c99b609206a0e7c0a99e75e94260de1e6 SHA512 b9238ecae0fa73beb3d2ec125b27fef1031a66b222d055b6cf7b61d11a18ed055123c52aefa0bc6cfe5c5b498747cd0ee97366630d8353f782934c2f4e6a7d00
-EBUILD jaraco-collections-2.1.ebuild 1613 BLAKE2B 7eb41c63df3ae73afa47cb6be67f8545d9b5adb5aa652b67bdeb930adc8f2be61f45152203fef0bd2494daf07cb0ed2c99b609206a0e7c0a99e75e94260de1e6 SHA512 b9238ecae0fa73beb3d2ec125b27fef1031a66b222d055b6cf7b61d11a18ed055123c52aefa0bc6cfe5c5b498747cd0ee97366630d8353f782934c2f4e6a7d00
+DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
+EBUILD jaraco-collections-1.5.3-r1.ebuild 1449 BLAKE2B ce170d5cfd4158a9f20a8df0b29cd85c8fc9eadc7db083454725223c8559d8bc1714dfbb8cf1e66220ab1b92bffee850ac7b982ecec116505245082c17e686bc SHA512 7013a09df735a13281b0152c659eaefbf501516409142f6897ce0f9336bfc83e365cf22266740935d5926d4e6d6adae9eebf3899e5dfe356f64a0d66654df2e4
+EBUILD jaraco-collections-2.1.ebuild 1611 BLAKE2B b24f439f3ab2af4964c1ac0bd70832581d22bea7c1122b67e97ec76b78d9645fce37d8555cc641b79a5ccf67a0f5a3fc81b124c8c17d063ff851ec3df1c2001a SHA512 efc915c23c5e2f96f2808e1e4dc64d8973cc1a37ad4c71473f69e0de1a29094bbc71978a7e56941a2273598d40d74373b7f40ad6a7fbd21456e41ee613a10889
+EBUILD jaraco-collections-3.0.0.ebuild 1489 BLAKE2B 0361148a9fd2343c71727b9409c07cf00c2dc4ce4976989b5453f64635476656a3b6eab5242b68ccd2387c648cacefc4b5e9e730c82deca1dbb397163525bb3a SHA512 165f5505bbac2b44190169d64bf9eb3c20bfdf4c6205152dc8707050fab763c52e37a424457cbc2aa7fdef0e62f42b6f6a95beb70b0ad90823a0fcb6added845
 MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
index a621fa6ef219..ef88383b500f 100644
--- a/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.6.0-r1.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.6.0-r1.ebuild
deleted file mode 100644
index 142dc8be9e57..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
-RDEPEND="
-	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${PDEPEND}
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/jaraco-collections/jaraco-collections-2.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-2.0.ebuild
deleted file mode 100644
index 70b22bd7bcc4..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	# note: eclass may default to --skip-build in the future
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild b/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild
index 70b22bd7bcc4..521e7e3fbf1e 100644
--- a/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
new file mode 100644
index 000000000000..a2dae1f444d7
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# TODO: remove six when the following PR is merged:
+# https://github.com/jaraco/jaraco.collections/pull/5
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index ecaf368697f4..ee350c0f9e1c 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco-envs-1.0.1.tar.gz 8133 BLAKE2B 05ec6b0ea7532dcf6efe32fe7d1d6a1346d60294ed09743a6f7a47599406bb798f1250525b241aa24b971849f485f89440a56e8ca6b94b2f6847c48aab281be8 SHA512 df5aa3fe06be5091745697cb5f9dda6110fa60e1330515dddbb3e8441eb2232ba1036cfaef7ac8f054958c1a890601330b04b81a0887c4ebc6b41f29335df76b
-EBUILD jaraco-envs-1.0.1.ebuild 1212 BLAKE2B 7b32434bbef660d8720c02bd29ef0a23a9fb9e5582e6249e6433ea22391753ada0a1ec193b7163322f88d3c60f047e934e8e05d3941ec86706116e82865c383c SHA512 66d976665ca2ac35891426df9e7941e4a9f00abcabb307b93405f91816ef249ea2a444b85b8d17bafac715f503f186ae276f38c622cc9e3033f458dc9ee77a3a
+EBUILD jaraco-envs-1.0.1.ebuild 1207 BLAKE2B 590d8c536792f8f4f286fb1361f8d67273c0d4286d6dc05e7d4db5c3706e0e6774e233d4abe2f80b2fef4fb49efd5ad242b1154f4a0edef85082e7fdf2691292 SHA512 b9bedb9613672a1ac51f1c3357e413c5b21e3cd3728eb7087f322d792dda5602813772fda5097a830d7b58b5f519439f4a6eec4f7b361ab6e9a8f5a548c77267
 MISC metadata.xml 372 BLAKE2B 217b1b3b2a1884ca5bc3c4eea5ce22fb8d529f7b29fbf02870b5c9b88ed0e6aeb5dca1e88997fdda5d00f0bda6aa627f4195d51863dee3c93c93addc0d0025f1 SHA512 693e651230d179571ad77d6ad9fcf48a5b4bd2002b9d3b017ba6999538079ac10ccfd014542713d3ca5c438f127cb1b53d2ad04b1f137b353885e43bd4aea798
diff --git a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
index 8c85a3de844b..72f6fb35ce81 100644
--- a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 MY_PN="${PN//-/.}"
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index eabe04f989e9..f94e5f246c80 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,9 +1,8 @@
 AUX jaraco-functools-2.0-fix-py37-tests.patch 1120 BLAKE2B 8fe7c807d7582ffd2c3240e3ab74f58dd76f87ea6cbd6a8a5d2b0159579df71001993c36451f79547e674a4d19659646cd86c1181787de0fe5a3b963e646c07c SHA512 6c743bbce1f369e5369ee34a788b7966422e469986e7c5f3d7efbdc1ebafc7487a929fa0a1164aabd3da3a5f9f3c120093cfd978554e8506d05604dec2417bb9
 DIST jaraco.functools-1.19.tar.gz 10588 BLAKE2B c71eb4e0c611f6a0bd82e04cacb7933961ba5e50091439c274bd8ceeda68b69789423994fe43f44af6cdd643b7a04418bc32ce2f937d118520298a019c5c6638 SHA512 7fbf1956ff8a132021e1f7fae5e98f40199a5d0e705b08b44ad5b2588fdd7d1088db9d7457b985c1852b50285a8f03cc9795fff0c4f53f9155f7c8ec371ff307
-DIST jaraco.functools-1.20.tar.gz 11063 BLAKE2B c202c3cda86c0f32fb3299a083ebb8d584eec444d9d8f0eff536f5e663634dab03c5831aef18d683dddde7eafff311b66a724d9004ad46f5ef92e90df16a9c7d SHA512 ba17b567dfcadb0d8ff1cc7a6ed07f2a23abfd42e73f3d815a6fa19d9be97d6af0c90bff7fb5e7ef67012ea5d931e9babc963da8a7105ba6a92d5c43c7126e04
 DIST jaraco.functools-2.0.tar.gz 14340 BLAKE2B 560490b1150c2385f9c4d468fe7ab4fa84475ad43e1ebed784343a71742976ed0c18df3f6240b1d5b69106a6835c0248838331a654f9d3fdc863622c3dda33be SHA512 dce30c08f0e9f3c7b682c78fc3a46a26d9972706f4c8449a12ba11aa5ed130c6d9ca405213fd93b6b4110ef9cea549e5fa925c96bfaf18681cd6957d8ba0889f
-EBUILD jaraco-functools-1.19-r1.ebuild 1584 BLAKE2B 19dbc26f0d326e2e1fe3a5e3e2111eeccadb423dafc4a108deeaffbb8bdf607a2c96b68477f6d45a0e4206f6548be2b9dec949ae45077061bb54752b0e77ea08 SHA512 f366964ea4665920d0f215e5ba8c35bbf8610c2483ffa70efcffaba6244ec0ca6950806e1d07876905ce3a5f05022b5263c8192ea218dbfd54f76a866a807ce6
-EBUILD jaraco-functools-1.20-r1.ebuild 1598 BLAKE2B 39587a96b71237112d3736608acb69f94b6318919c7ec9d12fc9bd90b8f025aa31f3a6d3fe9a029d67cb81fdb0c2e359fb7c7c0c1ea70c179c153c6fee536c4a SHA512 47941e1d0e771f478478fb2e73457df0897cefd78309236bc6f750e9527a4f4055845ea81f791b44cfe50b209bdad5581fc7b50514c88c83270acf706510e54a
-EBUILD jaraco-functools-2.0-r1.ebuild 1914 BLAKE2B 62f3b086a3f939320ba35037a41a4716a7a4e1cd0f13a4967f52c91fcec16b9a665dbe4353a39bd82f5c561d8d8ae3a00dcc0b4a62065a3ef2a4b197cdc5420b SHA512 93b2b6e1e8ac1dee7479e38654e941460ff6469412dd3a3efac6f874998afdc82a401664bbc9e3979a143f10abdb49d320ddb7f9c2ce5ecff1993fac8e063de0
-EBUILD jaraco-functools-2.0.ebuild 1832 BLAKE2B b5dd674f8b233e6025d9428723542c3b0d2852d3d2cf3044ac6fd6cd9cc56a3e56083d1e59f7fa7e8f46f68fa2081a0759b7937a73b6ef6927395db13c147087 SHA512 03f076df7ac91d39841717a1a03ba3edb06fe397bde01d42b691924ee8a2025f40f8d1e8ad2a9024e3a8a1a365dbf56cf2beb22eb3738e0011dc598b33342306
+DIST jaraco.functools-3.0.0.tar.gz 15618 BLAKE2B dbf542148d18069e7e78c718f3f6b62c7a07c674c96d54dfb3c1cebded13f6e24ca579844453352d001d312e718acf58d311c198076e85217362ee1a1446dc23 SHA512 f1ec725e132477f7361f7d0a77f72b69603499c24df25c9e8e0cc9a6d34a4bd4bb10fde60dc324b8176c46035e2babde04de90fcb0aa82273bc2f8559b8b31f5
+EBUILD jaraco-functools-1.19-r1.ebuild 1580 BLAKE2B 4aa6db85e981dfadbf90253251ad85d205f4bc3050f928ab918036d6248a931f3e7a7381160f3d5fdf81a925d24b4a32c73fdcf2cfb4deed1134ea28d79d9f62 SHA512 6450ee7269e094caecd7a3b5350a370abe5f4be638074e8dc20679b06e25294a0d8ea88ba828cee1568312a3e00d3bb72be69852ef2ec9d6799cf5ee8e8de87f
+EBUILD jaraco-functools-2.0-r1.ebuild 1912 BLAKE2B 377b9f78b93a865f8c32b045a33506e4aee354cce779e156b2d823d0177625b8353207b2609e64df45076cd9200ce35268b9815e26c8cdd87129d88b881b5858 SHA512 faaa510ad73e3a83ce62417f7c29d959105076a9065e0245863f6f5fab21856540f239253f44314bb49916c1d17461b3cae288ae257cf08f5ebc6df0747f2955
+EBUILD jaraco-functools-3.0.0.ebuild 1744 BLAKE2B 006802b1d2ae65f738d67e371bda4424b7b6e4a38a26d0a6608b472058c57655303fa0ec90335268684113c97a2e77b23fc5c0a027b7721e51a807345792fc29 SHA512 391deb43e1f6ded933a91ced2ae0b31ec96a564b5a57ba659efb174cccdf6dd9abafff1c24a65b48c08b122e551cadb6287f8b5bc1440a7109924147d5b8b0c2
 MISC metadata.xml 550 BLAKE2B d8c0bdc0a3d2c0c3d37638bbc8534233acb659d38e0ed9e9e757ff35b261f241e213b73a5c55aee059aa7e73e71e574e4e4e52c12f3bfd9e6c3ac0059f2ec0ee SHA512 2fccec87fe5c57aa922ea30710d802c438f86fa3a72492dd4d2fc8917cc1a1a92ecb12fa5e9160c6245cbd6ab557791ac6f575de8a7a001842618f8d00343476
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
index 8d6cc4c81dac..99f489e89c43 100644
--- a/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
deleted file mode 100644
index fba36e00fdd5..000000000000
--- a/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.functools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-	}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
index 12ba71c5dadb..7b3620197655 100644
--- a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild
deleted file mode 100644
index 5811de735c6c..000000000000
--- a/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.functools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-py37-tests.patch" )
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	# note: eclass may default to --skip-build in the future
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild
new file mode 100644
index 000000000000..24d012e5188a
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.functools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+"
+# TODO: remove six
+# https://github.com/jaraco/jaraco.functools/pull/14
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/jaraco-classes[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
+		setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 1fc022396194..3b854275e3ab 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.itertools-2.3.tar.gz 12857 BLAKE2B 714b123965af3ff593205aab373f3097709729377cd867ca2a7ccbb7795b1818f47b0b316d4c927c9aec4eb66fe1da63b44c1d60db310dd97b5444b01f7db04d SHA512 070a442531fd079fefcb61bbbdb0cc98bc88cbc5f23f6cb40ee1fafbc9a259c69e0a373e949ab54d22836f54b0de41e1b09d10692f92d18030825ca09345be48
-DIST jaraco.itertools-3.0.0.tar.gz 13461 BLAKE2B b6b5146ea2fd9aabe72da85be84224d1c06b71278661183ea52e6ca7c9032c4ca33310d61eb93ceeb14edc4f5923dffc5af25cc8f3345c7453921d85f20ca22e SHA512 91ffcfd2e734fe6647115b54a0eec45b58176681208a48705600a7293484fabdb5190f6981a985f35048bbc2fcb66250fa8a0d862ef41422102cdec1acdbfa41
 DIST jaraco.itertools-4.4.2.tar.gz 19431 BLAKE2B d3493380f9522d436d4d8dbcdf484e7fd4fa223e96fabde0d7f3803c395e56d0bd28f49b9a6bfec0b680fdff7f5d145c85530036157f7976ffa82fc4851e3105 SHA512 74db7a3c7595c7deaf2a0c9ba68e9b02d02ccbc6c65142de34a5339aac679c2d71f05b27e27632d265de4f78997e11d7dc43178bd0d64f3010e1568a5085812c
-EBUILD jaraco-itertools-2.3-r1.ebuild 1404 BLAKE2B 2ae18f3755cbaf76527ee2e1f9575b83f5d86ac0b5507b644e02e7693fc75c547dc0f72a1ac30977889c034b28339f146f38b6c8ca6ed1416d3ea732f15e722a SHA512 3fadd65f64b0424182911ed7fd430ed3de4996b1b3252c59b2dc46fd12914e82bc0a6799cf08ef7eebe191d87e68ddc5bfefafc77a7cfc7c1b1547cd47ef403a
-EBUILD jaraco-itertools-3.0.0-r1.ebuild 1471 BLAKE2B eb320ffd38b66e384de129eff07a8d419b8ea420108c1fb72c7f6dc2801b38824f0e6d967ca919bbb1ea732662c2855cdfb63761c89286642f0184aa9b02bb98 SHA512 8e048cda2d51ad0def3ff59eca42deb5444a3d400f6d0b4e728d2664a9a739b4bb4c642c4df593af46dbaff17a43a4069f227db1e7db9555814a0cc697a12096
-EBUILD jaraco-itertools-4.4.2.ebuild 1658 BLAKE2B 80e94d4679df1b6611366c9d6a8bdf55e40574489616c430fb25e93572b12062c9dacb1719ee7ccaebd718af681de44893916bace2e90f3d718e84114c811a28 SHA512 29f9fa3b1a4c193389e04c505ba3c2fc81529eef15548a1b87a6cefaa2aa8d9c9780618a924251549e37c6c2752198a35899d82d4c9d5106f9d99e2e16013652
+DIST jaraco.itertools-5.0.0.tar.gz 19517 BLAKE2B b38bbb75daa53ce9390a51099b3ebad16696924c26c6674a7c5b9ae5e219db6560d1bae24b4c491d6e424b7fecea66dac2eab673d0cfa91fbdb3a4246b852944 SHA512 38ae2cbdd436b277e3d3c252fadeb5239e2d32b2291686b2a3dbaca69328392eb1db4318b2144954b17302e5b15b94ad89f1ea8a1b2e354deec7d4516bd7ec85
+EBUILD jaraco-itertools-2.3-r1.ebuild 1400 BLAKE2B 42d68930b42184ff5c3ee7521c91db62acce6881469a2fc6095beb8129b59b427d649d01730e82f4c3d8c35d88462742626b0d32a6a8fe8630f22bc9ce6216af SHA512 fac80eb3ab79ea825660d2de8cb5d5361f84ed7d811a178bb37b7799e7b0bf289888692f9ffd11af39b2aae9792f4eb6278b7b669bf974b4f5d1410324477225
+EBUILD jaraco-itertools-4.4.2.ebuild 1656 BLAKE2B 4c21458f3b12ebbabcf65aa3b2ae1c1120c6f7181fdd09d08157f1be773cc2baa76e9fc53aad929f488bb3170380163d2d0d3d46e7c9096522bb44b106b0d070 SHA512 e86386d409c8cf6fc56a9663e2dff7a85d599b061cf2b43a6c3a5f3e358ac6e50137555e907b55d4dd5ea4fe4ddc95cbb876d0f3945cb42fdea9e42e3bac4b93
+EBUILD jaraco-itertools-5.0.0.ebuild 1492 BLAKE2B eaaf8c862caad50afb8a17bbc07f4d68a4f5ce4dba74ce54ee30d556dbcc3843c656e5482db292f3a98192b537d1d63539fd98a77051dd92ee6e51ab51ef4a0f SHA512 4335628e851694feabca7429268f49e3614c6b9ac690d55582123f91039b9eddb2313f4499b1f39e2c32a541ddffd3650fe6fbb8d8ef9b5c6c0e79ae321fbe1b
 MISC metadata.xml 550 BLAKE2B 9a0db00bf8d20a8942cc362092d64aad0a91d47e54fc5a7c3a6d444defb32a1045f0993d3ad2c61f6edbf059c633388ff4109e71af3454824631e79388bcc5ed SHA512 f60f044460ba89008629bbde7c052af0159ad7044124606a7cddbba403c9a20bae9b91839ab76e48e1b0481f2a6cabdbc4ca0e00e636955e2149f5ebddfd964c
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
index 199ea810629d..a5217730a581 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Tests fail with PyPy and PyPy 3
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-3.0.0-r1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-3.0.0-r1.ebuild
deleted file mode 100644
index 5b1ed0d5e538..000000000000
--- a/dev-python/jaraco-itertools/jaraco-itertools-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Tests fail with PyPy and PyPy 3
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
-HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/inflect[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
index 805e75d860aa..2b82805b2df1 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Tests fail with PyPy and PyPy 3
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
new file mode 100644
index 000000000000..427399b7651b
--- /dev/null
+++ b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Tests fail with PyPy 3
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
+HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# TODO: remove six
+# https://github.com/jaraco/jaraco.itertools/pull/6
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/inflect[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 22d1b3254900..780b74a9428c 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.logging-1.5.2.tar.gz 7135 BLAKE2B 5235566df80008270f2f28101ab5df1d7fbc1446f138eb4cb851c9bb464b741c0ebb8528d3502130b5c557f30214ec27ce1ea563e09e78776e22d37811da21b5 SHA512 3299adc9c9ca6113198cddbc34147afe1bf453edee16a2d6bfcce64e63deeaff7f87beb74ff44f092435f3433a921b19167fb45778dce444512807357bce1661
-DIST jaraco.logging-1.5.tar.gz 5707 BLAKE2B 853d2747ab92754de4480871355180a33a7a6cbf69fc3d32ba489ecac27dc55ad92d94bfb84e411ee13400d82d162ea400be1027c3002f317a97e00b849484ec SHA512 18f267bd0c764f38ff5223d4fd6e08d7d9fa568691db285155d7b955c71439474fd84edd61b20d57f6eac77394d4b3ddf9b35d8e6ba08a2db5dd4b2ada6e0d68
 DIST jaraco.logging-2.0.tar.gz 10356 BLAKE2B a7522fa9895784a68c8c0af265ad5a82ba27f69e90a17ba18b4a579e1ca5785ad11b7718273adb33661e45e780876b885b581af1b4518ef5322c077ed76242ba SHA512 9262575c3071f78ded2284ebef3a1a80c8ffd60addecf9b215db04471672bd892f6c6bd06a84f9a82e872adf31d45d4eb3faa2884815fcce608840821f49954e
-EBUILD jaraco-logging-1.5.2-r1.ebuild 1386 BLAKE2B 362629e91e1816ed16045b5ac3a8029cb705067f69cf4863fd56ebf410ccfa549862113c7b64aa0de324595b349cd1713b75dece8e05a62af53641cf378ee2c2 SHA512 69f962ff702c39e6510a11eeb4c0ea23c5247883472d4f8ab3615638e4b1a45d82be39bbc59031c6694e4199bf3a980c917f502a5ffb019d4b14a4e062eb293e
-EBUILD jaraco-logging-1.5.ebuild 878 BLAKE2B 2c9fd71c2d9601e9cb0275d62319d6861e92f1babf0b5794b727cde076f010ec0f52a4343c3129e3b9178bc11969eff2fb4db7e01c2ea586ed479c2a7e3599f4 SHA512 a6e6d8d93076712c950b7c64ecc7590f55e54712792f9732c9171d45b54342117f835bb7a8255d009f792e0e05cffa1797cfbdf6e48b656661ce9221bbafbf2c
-EBUILD jaraco-logging-2.0.ebuild 1571 BLAKE2B a2c73489c6e89f2114192f15f149734fb7f5a8c8c7a36b98fcc3b267d9f00eea9688336f4fddcc18bb2b5b712da0756e642384f595d54de181985ae7496908c2 SHA512 bfcac8aaf2a29dcefa08bb489f23b73b3095a7d4f3525d7bc59186fddf6bb839d8288c49e351bbda1cc961e00c52b9f1004c4321ddae4987f7ed779f98396ef0
+DIST jaraco.logging-3.0.0.tar.gz 10739 BLAKE2B c5cad0b6d7702a1216869dd0cd388d51a0a8e7bd24000108ef818623b54d23ce1adf0de2e017b869d764342484bf25d676ee18af9647b82964933ebb184cec0e SHA512 bc0edeef6223d0eb78110d51159a70afd16542e830e3cd37dec7628e582bce44218cd7669c03c41125db9824b6fc774f608dd7f6540224659f4dc2f1927d681c
+EBUILD jaraco-logging-1.5.2-r1.ebuild 1384 BLAKE2B 5e87332125522e8583b671b1a3f8a60a3f31044f49aaa0afbca09417311b482e7673e0f13c47b97161248549130d44d4f0c713b51289352d94e00ad34e1e9272 SHA512 fe4c5c76c3162a7b7f1de757cb7478a36a19987342444df848da6d1150aa48daf71203928f9e0aefbeb27bacb45f16bf1059f3503a088fb47ef142bd0702e3c8
+EBUILD jaraco-logging-2.0.ebuild 1569 BLAKE2B fd0950a3c3939ac044bbe7236b80680527f2283636af20a40aca8a9d4e713f44db3423641008eee2fe36e2622ccf1831a8f8804df1cea81c83574d12ffe32f3e SHA512 30c4372a90232f9a48730da57022cb1daafa9fc774df88be2cc9e8eaa189662d335eecbdcc9e692660f608d1f501f0224b7b582ff1cf0416c746971fd474036e
+EBUILD jaraco-logging-3.0.0-r1.ebuild 1402 BLAKE2B 54955bfa8cfc01e8d04e561e3db5ca8479801745b3eaea6906a0668d058d92727a66d742577b00fab483cacd8b8ca207611cab7af759b4e1f090dfc1dc3838e9 SHA512 057685a710de19477fcdfefd2be91bd71004985d060305a1365ce315adde539ba5fbda053aa9e8c9eb0bbb43b6420375fe8b9bf796a92be58e8ecb4235dcacbd
 MISC metadata.xml 452 BLAKE2B 6beacf543b6c6ba9482609f0374283438dab3bff1ba25c53f1ec6c6441ddd0e185336766eaaae3ef89277874c6f12652a68b79a934919c8fe70f8bee88872b43 SHA512 447053b09d211ddbe1b2e98f7c1379395291f1331c75837ba1dc036a3b5d1e05e1f78717c419c4dfdc7d687001992f4c926cfc61bf267aa925024180646a3296
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
index 3d50cddc4334..ada9b1c5b8fc 100644
--- a/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.ebuild
deleted file mode 100644
index d0254baf0f62..000000000000
--- a/dev-python/jaraco-logging/jaraco-logging-1.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
-HOMEPAGE="https://github.com/jaraco/jaraco.logging"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tempora[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
index d8619de4e9a9..64dc195c0301 100644
--- a/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..f2dc6af3ffac
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="https://github.com/jaraco/jaraco.logging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# TODO: remove six
+# https://github.com/jaraco/jaraco.logging/pull/1
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index e59064e84a88..7da24c382bdd 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -2,9 +2,9 @@ DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945
 DIST jaraco.packaging-5.1.tar.gz 10393 BLAKE2B ddef0ea4006b1a114d81238d5182c03cc50186452b326ef9a02f1a2e745bc731fc6969475a306b25a22d6daec5951e8d11cacd61d519e82cb461140e5003813d SHA512 d86cf6fce8037a9a5f2dfe29c7df810376127b3e02d270bfbc11e16bd43c10e0ab76f2739e5cdf904a9e54ca8d7fc3559e51d089ee39b4486c84902b23be530c
 DIST jaraco.packaging-6.1.tar.gz 14736 BLAKE2B 278ab889f236b4a53e6f3978b876952e83777da2e1c096801712bb6833fc85b342fe1c18bb7b1bd78a801c6216dbae74a75a416ef29cd4ec0a7017b8d5bd73bb SHA512 a84c71bd880879f172e6527987e9ffa681da28803112a0195fb21153cb6cd1b3d5c00a6d21c562d7c5542349f335bea4a349fd22662f22dd7bf9bef7b6b0f7d8
 DIST jaraco.packaging-6.2.tar.gz 15408 BLAKE2B 21c63b4e400bdf8b4b79873e6a96c7576b91500624c942246a8f64fc06da22e90203832c3c3084803c6ee23af8f102bb23cb12276cd3bba13446815f4a71f0dc SHA512 f8496a9dccb29dbac24927b40bc29d472b8c6bdb939bfcacf70196130ba9c961747a8b75c63574352a8bfeb2a512eb849dfba3344e942f1338ea1538e0767f33
-EBUILD jaraco-packaging-4.1.ebuild 1212 BLAKE2B 1bc4dcda55919327faa4ccb4bb4d522248316da2fceeb0ce14562cfa15075ad43c470f8e881604f65a21e1e4823f7dbf0ae92602e91cc3631f7d460e809f162f SHA512 84a6cb9d2b81611def3b500a778ebc2d4db177ee4cd4c830b6ab6d6d79e47847df89b9d13a8f9266467d49d86e26a0e21d3cdfb3f9c183af27a4618b3e950616
-EBUILD jaraco-packaging-5.1-r1.ebuild 1337 BLAKE2B 6d04eca392e3e8d2969fe5c867aa8e5bd1dc76c0d67b1f6166604655c539fb334b58c18c25d841b31c6c367322225c4fdd3376fbdab203041326178f925a524a SHA512 910e0c6613caa14838ffccf51a7e705e5c9cc2323a4edc38c2984f55c75d5ca3fb8838cbec0d4d60330fc6809743146ca113901b290db2a0192304fd34e40fc5
-EBUILD jaraco-packaging-6.1.ebuild 1617 BLAKE2B 766c34232f93a26071f5ecd3e5423ffe9d0d54fd29ca56e87e1ba98c138294a16d7507a6a8f934f8793455e38c27880702c41226be1aed0236447d9559fae140 SHA512 27bc99ad703eeb24f6a6ab6ebffa012aa9ebaede3242fa0ca621d9db4d14c9e6f18964a1726384a899431c42d78f68b1b081236b14a7766f7ffc635304b3cf86
-EBUILD jaraco-packaging-6.2-r1.ebuild 1732 BLAKE2B 744db4ef0165b10dfbd9d23261434afcf1df5c170843045d32f3cd370b6343a6b2e284427367b5f3cc3ef689cca410549bae452bd31515b6a47e8533f881acd7 SHA512 87f1269dd95372c2acad1d42429f751a2c7bf752e3785492b219fcc50ee8c5c11b902419afa98c590911d4f3a896108c5ea1709c03dbab47e4822dbcd9da6060
-EBUILD jaraco-packaging-6.2.ebuild 1666 BLAKE2B 06a5a4aadf82727b694e4fe09f460f01ded03b605f14d33cbd6aa12dc9961e9311d2358a3a3c3d987a9845e6d6b67fc313314904ae0196da35d94af3d363ae9a SHA512 db41cf2de81fd0e6cf4934523c06d3c8248d7a97edef071782b42227681d9ae79f60ceccb3f78470ed55ae7d4bcd266288b11e12135f7ba42f2cf4b08297a29e
+EBUILD jaraco-packaging-4.1.ebuild 1205 BLAKE2B 2f00df414cb950f8f9c32eafa7819d79229cb4016e62c09b29ab0b0bf30fab2508df5a8cdd66ec292a9bb8ea044ac83293065deae66d17c37f5b0badac40e368 SHA512 cbe32315b870fa05b36979be16b9a367706a743505c87e10165327f415d62612cdb5f42b510762ff64cfe99ef587220cb640e7960215ac0c5c6e4ebe6128c628
+EBUILD jaraco-packaging-5.1-r1.ebuild 1330 BLAKE2B 0722babd07ccdf0ba7fd202ad550f202afcb68673e721b62ef1f22090edda54e80aafa5335d2a6e140450f847ad9b198fb0d2ef2d0e63d306bfc60d44a4cfd2f SHA512 b39a0970eda12e343df2cbf6e21e038768e17c93d302e37c1f4f2a4a898c5ea8492ece5ce526172edca8772441179c4d7164eda306e7869d124803223e6f0d14
+EBUILD jaraco-packaging-6.1.ebuild 1612 BLAKE2B 7b13fc1abcb4e53d299f409435acb643ebfa199b2036944f950de499eb0b58f579dd8c5f21c94803a85cb33e148d924d7f664177907443e66a378fc6b74b304a SHA512 95e662c374f2a49b7ddb3520e60df1ed4b0deea415005240ce9def7be4e856e6de4b55d5f0db75ef8f66e12d84e4b44fa5e462c303e32066bf4e1f8337fb3446
+EBUILD jaraco-packaging-6.2-r1.ebuild 1727 BLAKE2B 1da0a864b60b5300d3bce4aacbb8d3e582e327799669ee108a6d11a81c795bc1def655c9ebe89cba7d0d89266a966b6794182e542360d983fe616a72c68a3368 SHA512 09be3398abaae66b5ada39e9e7280f1b2c1a424ab1592319ea8e721ff3d6b32b63747a8f89bf9a7c323c6be336449ac0bb94c95c45e87a0d74faf2dcc5955b63
+EBUILD jaraco-packaging-6.2.ebuild 1661 BLAKE2B 55412f653667ce109e246215786bfcb70c67e622444cedd766fa21435ce48eba0e38cb5380edb06629dad9260063a4e381f501b0aa60a4aa83bdc5e9f8de8a32 SHA512 c0791a2da97e6bf40fd84122669aa119af22209ebc20a15426c6cdbfbdc62fa3f25399cd3b65727cce915cfd404caffc59c71666fbe1d22439274e0952df0855
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
index cf31bc4548eb..4f939ee5b58b 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
index f5d708e9175c..839fb09b1129 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.1.ebuild
index 1ba725d1e32f..1f732fa28f6e 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-6.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
index 0f9cb42b34cc..f976824f28ed 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild
index 65be69a03f70..7ad193b4b3ae 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index 7277b77872fa..ec2bbc6c45c4 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.stream-1.2.tar.gz 7696 BLAKE2B fcc1aa8d26da17635b9ee7c68c278ae572cbe36a108cb30f5eb98c7ebfd2255aad499bed38ea044b28e820646b92e64602db0e2cdfc430169035882f7b6abe9b SHA512 47a96c1de12eb64e250c85d97429218606dc9bb212cf7b97e579763dd901ee063711c00307b7442be400856d3fd4e5994afbe1cb91a99e233541ffd7ff4024b9
 DIST jaraco.stream-2.0.tar.gz 11061 BLAKE2B 86cc9958e11421fe839551e029f839c16a12b80d329466b44224d145be6c2a15a63d03f426a9b8d1510249ea6c129e892dcfec41a32dd5c3c3a3b66acc21030f SHA512 d379d07772d739abb275cfc8ed7809583c728af695294b9d12ae1276add360b9559de64104cd20d05d82a3250237ae1f6eb23420970a95e9fdf6346ef9312331
 DIST jaraco.stream-3.0.0.tar.gz 11838 BLAKE2B 9d26ff8f78a3f090d79ccc8cbc41819a8290ebdb7770f56a57938ad9311ca1fd168d633fec78ee102c2c08156c9e0ae6f521dd5cafcb9df22928ba9f3f832734 SHA512 f2ce7e65d9a3bcd81985f45d03f7cd56b2f2939f13a423b8b65714f19eb249493d89cad774460dd08c1345124d3d10f85ce6875b5f7049705f993c0a3146e5d9
-EBUILD jaraco-stream-1.2-r1.ebuild 1440 BLAKE2B 509d38057ef8c5fab598737e1a29b9b68b3f1fa7e8f141807f1553bc8b37535b6c94c389dc08daba612e20d7a0f2aa57c121d42c59591d8f71d6b1b83bfe3fe9 SHA512 e3b377d60f56d22fb7e1777a3d30decf6db1d8a9b7f9761150fd5a69bfff4df62a55fd74fa1d12987c0d248f4ee7844feac033c0f350961f49dc04b096c73ec3
-EBUILD jaraco-stream-2.0-r1.ebuild 1629 BLAKE2B 735fb25b1089185419fb0afb71748883420c7bd93df2fd73bb3d3221418e0f126bfbbb495065ea6313f99df547ca4670917cc8f567ed4031102de568239a19f7 SHA512 d689acbd5522c40d78e976cf6f68dbf29472fea763ecc1b9bca8205c9d859bdc9279a70b30e56d88932cf4e5b3c33fab4301b11056a9f591913b8828e0acdbc2
+EBUILD jaraco-stream-1.2-r1.ebuild 1435 BLAKE2B 8986d650dd0cc6d70a5fd7dae35c5443c7fb5bd60b915e68e2321da8526f72e7726068451861b0a72f2831f20a424bf9157b46d5d7005d7cee6b95664db2dfed SHA512 a1cf70172428b7e88aa68195cb3a86179cfd0c217a2116dd3530f4bf1daef1503cc2bbfd66a428132b44c95e6b6e017563176c5173aee376413015b9640bc98b
+EBUILD jaraco-stream-2.0-r1.ebuild 1624 BLAKE2B daabce62193a4fbe1625ae6d918bccacc64bc9774a89318e171b7a3eac9c314882b0f5da52032ebbce2433c00a3cd5758a6f6507fd513b9d80b7c4845f3873ef SHA512 e434fdccacc9fed40e5cb0ab8db3e50d641f5bd89c05a13baf1181c95552fceaf45c98268180393a52d45e24fdf4d1cb8587b3568c1f75fa4021084d8803a39d
 EBUILD jaraco-stream-3.0.0.ebuild 1404 BLAKE2B 0394e1c75242e107a6d92e0a5ab35f48ce50a631542f9621794d4fbd40b372b7da3421ae517d1edf91777f5e59879f7f13e7fa646900118081204142af3bedb6 SHA512 66b5ddf6f945d3480cc7db8ffbced27444cfb75fd3492caf673d57cbd936fa118fe25c0836d96021bb2ce7230d9be35c369a3b7f531b76ffca0e17a3df1e0410
 MISC metadata.xml 602 BLAKE2B 3875bfb93914028b263ef5b6f7af81ee9f3fc08f1217537363a02b12e69f273ad9344c5078ea284ed5edfee1389bace975f2745379c3b4b17db4fbeee4045494 SHA512 3a6635e6f38260c76979248878ff326451273bab021f3e85c23a0ae7e29d71daa53ccfa319c8d8457faa00c6fdf5ad3dc68e0693e951ecdd419182f1861a36c0
diff --git a/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
index 7d65d1251a30..562fb71de447 100644
--- a/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild
index 98e993bdea70..6eb049a889ed 100644
--- a/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 4449484fb04b..9fc0e673c78d 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.text-1.10.1.tar.gz 8790 BLAKE2B 268c13a9a84c4b29ac9141d8a43c716d8248b87c2b71f6bb8a34c2cf1568acdd012e84b1be0469f70ee8e102f723e218b6d551a9bd0cab5192a28d712ed39f03 SHA512 5c09b90f586d5ddf7419013f7e36814598337c257e6bd1c1eec993d7df021440798ec9300a6d45c960c5458c4197b458d1863f478b60a9a003241e98a644f28e
 DIST jaraco.text-3.1.tar.gz 13220 BLAKE2B f52ca11b8b20a42d2c36102d4d48cf27952314bf5304521fde020c6e52e92bf6f534b2c6c4d8cc0b73aec8bd118030e455d8a5eeb19fb4e927105fa7e4477817 SHA512 9edd50e3b67d40a1a5dfe8796dd55f80aac52cef9ba2f1ad565cf597c1ff8824d2c61900cedd104210b60dcc6dced8c01321af67e2e1a755be89e1c15945da1e
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
-EBUILD jaraco-text-1.10.1-r1.ebuild 1406 BLAKE2B 39df4a1c0182a428a7af5e43b114f3db480999464e28365444331107079bc196db88ab51802d4bf2e3dfa781e359298f179e42194eff77447babec63687120da SHA512 149042ece67cc168a21cb57e58db809fc81c37aded5997d11594ad2d008a9aa6d09ffbc8d03708903aafbe0f698cfd74cdbeb686c5273ed316bc23067ed46c5c
-EBUILD jaraco-text-3.1.ebuild 1669 BLAKE2B 2f684c6b5403bb544dec9fd7cc1ae40f6c9f4b9e386e8cdeb930b19c7dc8481af80e99345a95b027928fcf0f5307a609475bd868db9ae59dbd0aa4241091c0ac SHA512 907a477e14dcd7e835fccbf215a8faef3245fe4a4e66b38b1b84c92985a1634469a4f7b5c17ecd8fbe6673a15639f4f5030250136a69dee38c5e766f3ed3aed1
-EBUILD jaraco-text-3.2.0.ebuild 1471 BLAKE2B c275cad64a56658a94d7300ca3f585fd6689a337b753609e46f0ffadd1ab8cf55e1c7944ee7cb951401ed97353dbbd3e6033dbda652880a47d7cbadb539e0bb7 SHA512 0ad6436fd1a90ffe9c3f537fbd066ac8b1221e600b5ac44d912efd15a30618ba8aa401fd054b7860fa9120841737c2543154353dd99653506618452589c1946d
+EBUILD jaraco-text-1.10.1-r1.ebuild 1404 BLAKE2B 9754edd503adf9b7cd5b3cf04acdd3a0239d1769552dc34fd57e0db373e1707dc9837a1c0f4a5d21e1143ad3e047b7d3635f42c257ec3e2aa5894a77fa4a2c85 SHA512 bf8eb3b1b01dd2acaf96d2d50e5927dd2a95347a604da2dfeecbb586646e0fd2e99a69f50d163bf3d2a08761c5f600cc54bc9f17e5ede08ac2995b87931ded06
+EBUILD jaraco-text-3.1.ebuild 1645 BLAKE2B 865a3ffd140fa0b139d53c8047001a8f67a8c39f02262c85db5e6cc87770df7b1fe278c77c0b5697833b40378090f9c0ece0fb45d58ac9823eae24d99995bb9d SHA512 4b669b9d94290319228e8a8d34d6a75f7b9f8f3ca4f351dc83e438d2b3e00992a07bbbe62c709088b11a19f62d11dfc31e4151e6fbd4d836969363bc5c6ae97b
+EBUILD jaraco-text-3.2.0.ebuild 1469 BLAKE2B 5a9248215a50592d7fb5c3958081477de1b5e206bb3afed8f54163493f23f1379bf90a29219fa48ae26be7e9ca3d694fabc47f50df86734eeebb388223deb6ee SHA512 d5a43fc854448b60b6d77721ba3488c723ae563bc989fa917de859d2c79a4d055e0d1ac37e78c901f770cedf9edc2c42dfa74af839ef39802de6a1f2fb74729d
 MISC metadata.xml 530 BLAKE2B 15328b15f81e40af54c52ceef75adc55cc83d04c2ca52c8bcfe85d5fce1e8b70efb38b4a15c8390d283e72a2496dc0b148da0b51b3213440a6ca8379d091c927 SHA512 00c56e02c156ed1b402475dc24dab7c1943bdf6e3067da3f02fe91af0789cf87041cd7191869ab9a785aef21d4e696fc9b134a48fa769ca1f0d0337d1cdc5969
diff --git a/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
index b1e961411893..3a45f1e7241a 100644
--- a/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-text/jaraco-text-3.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.1.ebuild
index 7a2066c941c3..1c18dab01a72 100644
--- a/dev-python/jaraco-text/jaraco-text-3.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy pypy3 python2_7 python3_5 python3_6)
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' -2 pypy3 python3_6)
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
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 af0f4eceead8..6c67340d3efe 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaxml/Manifest b/dev-python/jaxml/Manifest
index c4d538e7b90a..947736ca9a6f 100644
--- a/dev-python/jaxml/Manifest
+++ b/dev-python/jaxml/Manifest
@@ -1,3 +1,3 @@
 DIST jaxml-3.02.tar.gz 27718 BLAKE2B 283f07fb9e09a4141dc9e45d143e920153e587f6e521f3ac4ab7c85afd09ef29b0db412cac46caadd990937f656b304a0b66a3570e797c3dad78ef4e4ff0c4d6 SHA512 e23b4026dfb7b7d08cfa7ebdda11b66ad7dfd5a158495d90d73988e9b9d5ccb898cc7df112a78c6f3724dd04a0fdef24129e3c115b230e56b184acd28f844597
-EBUILD jaxml-3.02-r1.ebuild 532 BLAKE2B dcd63df9ac86e15ce626fdad78b4b32dcf2065b90c3c98563cfde13a98c163f6655b7d1184d3e2763005f3129eeb1ae5845b6437badfcd55e226ce022a67c731 SHA512 dfe3d73be03d3c049e6b9583a24366b98735d4c892bc361d8a82fd62238bd42bb9f0c34ca67737f1860b983a6450f83043e3623820360c78a2d832b85b084f14
+EBUILD jaxml-3.02-r1.ebuild 524 BLAKE2B 0dad424667b5147c1292727db657ab0b1e61faea384ef7b4e2ee490dd3a4aac5812267a4bfb9a7bad54a15304ce4e982afb75b1f35c3e65be26192704eb7acf0 SHA512 07ec85ab5f4c5c677d3bb0009c1d796fa87563fa2d0cf2bd5abcc45e6497fc57d918fa9d1554525e59c6e8d8165b43853b210e5a9cf759d0a8af4cf96c9aecca
 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
index 40e9b3195c50..9ac90dc7817e 100644
--- a/dev-python/jaxml/jaxml-3.02-r1.ebuild
+++ b/dev-python/jaxml/jaxml-3.02-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index 42167c154c14..a5d0cb8c4e6d 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,7 +1,7 @@
 DIST jdcal-1.0.tar.gz 5677 BLAKE2B d45ed1955cc62fceb07dae87ef4c97714ebaa9e5462d647b7f09e87c1f607d04c488f13ba74272e0783ffab218513e87016e0bce2bcf6c00f2fbff0a291772ab SHA512 5e9f865a3c9a123a56d084c9ddd325cfe6c246e1a9162bb8f000abaf7cdf376b1e38f7c2a97f14a13d2f4b3f3de4e7e3773a903f905685ce76f541b50134a408
 DIST jdcal-1.2.tar.gz 7059 BLAKE2B 6795e5511349490bda9df4e47566d3d65d9a69f654466d6c0090cae3b21e4be38090e2582b753f5eb04fbfc4ba33183a69b4e658ca3125f6105fe0b55b6d1d4c SHA512 cb7805229968cb9f5822e97c255b3666e50ac424725ece20ec3b980b87b84334bc13f2e772a4be2a0341b31f569edc11779796a41ae22d85cf822f9aa0a471af
 DIST jdcal-1.4.tar.gz 7545 BLAKE2B 20c3e64a0c1a2cb2078c3058b38a7ae7337880703305ff26d4b0990f4efe1532ebbf8dbaf666a656f7d0176011b651d96853db0c0713356f46191c849630a041 SHA512 d49ac3cb4241556900c0a4dcbbea0ba621206cea767e272fb994c7ec76edd6859b184cf17ea5f9a42ab2134a5be13bca4b6d74021d627584576c01f2cded438e
-EBUILD jdcal-1.0.ebuild 428 BLAKE2B c893c97e93cf409865362fd6952d5a70fc79496ee10c629039bd927cf5bd03911923ec935682902588d76921b9077d7aa69d5cb495a35297e33c83d7c365ea89 SHA512 3c38f193666c2bb3b9c5eeaed0980d79084ecc6905d6ca5f66c82dcde3f32d0abab8f02c6df07255ea7480b19e229be3ebf8c69ace1d8830a02eef154905f7a3
-EBUILD jdcal-1.2.ebuild 430 BLAKE2B 0772bab727f4566970373a38c55e147b3e9f1a7491e2a3afac1de59501537298bc59574ca00d38ee04ff0287faeff65179fa6b359046d5b01dbfadc53ba7b72c SHA512 1a70bb896498ad6b54a2e1b58af9a7cc66e2f9f97c7aae86fd8bbdf4580725803e4c9375c0213358c6df39812cbab0e988cbab7bc7cb68106482ab1ad407609e
-EBUILD jdcal-1.4.ebuild 604 BLAKE2B 9a8bc8abd6dd2285434583c7fa7374b8e32dac8dde5776b6c349dbef2341ba5ee332bd562726568da0ede97393fe9d98c18d29997e89da8238342626726e4ab3 SHA512 b4163325fcbd07a91616ba269f815589ea1ee0fc34bbf12a1a113995f7ddc62c7a20eebe7d8ec2a92391e00f3e7b3097e58662d56fa7fbb836d1c5be8e7d78b2
+EBUILD jdcal-1.0.ebuild 419 BLAKE2B a17ea4246c3b79a70989e2c12ab82cf13206c14f8511c62b70250bcd7bb923c6f267837d429d0ba77c4f0a4420253cd89bab35fb7e424d5de950882449c8626c SHA512 7ed225cea5c5b3108146c9b343425cdcbcbda7a1b8073001b48404c6251018c69935bcb8ffebe1704701d73927163900f036d373149b24e10a8367ad1dfb804c
+EBUILD jdcal-1.2.ebuild 421 BLAKE2B 438f390cd9fa673236ef215e14bc50a64c33f714a405db27518594a80aef76d8a127145190fd1b8b068e455d724f6eac325b526b1679a5bba13ac2c745794b5d SHA512 13c8dff8191f7ff015353275288756849fda6357f0f6850954470dcbc3ae7a0f020685c477e50da0b5dd5193eb2c1eaba95f8386e017b1a239586b87cfdf0f09
+EBUILD jdcal-1.4.ebuild 597 BLAKE2B 3be3797a1aecbd04aaf1c0a0d17a8237c762d9f143049b65b67402dbea4680bb973f0e50e77bd11942521cbb71ac857e3b7ec1f8bde3e1bf2e2d549f09896731 SHA512 e4bb5b6d2957e7161145dd48bcdd2d78485274372853991fc82d32fa09cb13f5006fa20f75bc14eff3005eac3fc522ac4e86dc61d7cbc8465a94f01fff7cbd8e
 MISC metadata.xml 369 BLAKE2B f0096e762647b29c559df839d2c8cef8c42c846e8b19ee151efc141d72270cfe31a5e90eb0545f4a9b79582f1169e1f8ec797d918079630ca4424e8d3b6bc113 SHA512 dd32db88be812a5a89482abf0c22de65201ebc26b6caea99ef3cccbb170273da086b9b6380a7e8894574c96b03844a76256498941d9821cedf817126d6594a8f
diff --git a/dev-python/jdcal/jdcal-1.0.ebuild b/dev-python/jdcal/jdcal-1.0.ebuild
index d762e517dcc7..07f45c5fe3ee 100644
--- a/dev-python/jdcal/jdcal-1.0.ebuild
+++ b/dev-python/jdcal/jdcal-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jdcal/jdcal-1.2.ebuild b/dev-python/jdcal/jdcal-1.2.ebuild
index 8f19823728fd..cc08f2532a32 100644
--- a/dev-python/jdcal/jdcal-1.2.ebuild
+++ b/dev-python/jdcal/jdcal-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jdcal/jdcal-1.4.ebuild b/dev-python/jdcal/jdcal-1.4.ebuild
index f9e7c49fb431..bcffc2cf62b3 100644
--- a/dev-python/jdcal/jdcal-1.4.ebuild
+++ b/dev-python/jdcal/jdcal-1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index af8d7a7402f9..50f273331609 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -6,9 +6,9 @@ DIST jedi-0.12.0.tar.gz 354329 BLAKE2B ef203f2ba57a90de1e16b80c8786fa25d6d459244
 DIST jedi-0.12.1.tar.gz 356736 BLAKE2B 515cbc27e065c24fb2cebae5a3807d2e025f22110f3de60d26a74475eadc985bb32bea60b691c580473fffe2fdfc86705187dea1fb730ef3f510b7bdb52e0d59 SHA512 92f9ac34abf908a8143dff360400dd8d6643dc3502bb7973f92bd05db94c2af151c2063f2de0481a14e26d11c009cc39c46189e1ea31d274b80802e3a10cd665
 DIST jedi-0.15.1.tar.gz 412356 BLAKE2B a7738e8825b3f578db5e64d50cbf65219b4d2f2f81c45cbae9e3dbb858b0e1ef26d76972c112bfae839daaf73bba0d00b30b5708404d16b0385452500a1c2d35 SHA512 0f6e0185f3f10dbc000f09ddfed7b9596fe5dc270682544173dc156d505618ea14f1f44ede5d2357745ab8ded0b15b2788d064ca4db39fe70196982dd0a16893
 DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd38a44e40849e4efba352a0be11c4511fc28d77f32308a3f136cd72833f937f802194ae57f1cdf1d53ae7824ebe4f4bc323 SHA512 46250822eb4aa20203db9b99626e33f2b60ec77072e20dbd94219d782cf204e2cc5a94579b1753c634f931445ad4ef9f0bd7ccfed287d86bca96b945d2eb27c1
-EBUILD jedi-0.10.2.ebuild 1010 BLAKE2B b792034b1548f1c99f2f949f15db5a55980c003eeb896fe157de3caf2be43b77e1731cae7f6cfdaac931f79652806f0b2ec1803689761064932f2363c2fb9dde SHA512 64711f34814b8fe92b572c0652afd63660379d29041ca27087b1de62369a1d89438f050b4027945cb6fb964d99f03b4c1609cab0a552deed2d83283226275b01
-EBUILD jedi-0.11.1.ebuild 1169 BLAKE2B 5e7b7649293d1fc5bf1548a3f16da5e2b86442c6acab689ad94976c4ea9dbe33f67498d8e018aeea25f69a760db8052eeb810a6977b1c1e962acf258c0106e9f SHA512 fc704a7d885c23d35e8996c37561d856b918dd059e5b5f6ad39d73b1c406648a333d3c7b593ba28dc3ccb1547b92fbe8dfa455bdfe99eb069745b6a38b9167e0
-EBUILD jedi-0.12.0.ebuild 1032 BLAKE2B f019cd50fceb9c4667a7ba4c1126e2036e930ced9b12e2da3bf5dc87103285cc4ec69ea247dfa8b34f531cc1c3d6d9ab3668e315399ec70d816b1c4ea510db5d SHA512 2d2ec11f40735fe9b211c7aa6b5aaf5ad5880803fbbcbcb585f0fde214fb29b9c98710852844de43f3474e39ddca0f977d0531d10674f90edc6a211b31ef8113
-EBUILD jedi-0.12.1.ebuild 1765 BLAKE2B 4a76b77e78432fb36e3c1efd1444c8626a70a525de60edd9226ca3a0a62ff423fcd2343100f2b1018fd17d1129e2b17a347b92b890af3b3712eb8cf7160c4243 SHA512 35892f353d6472eb46743b65aa28ef9745989ebd17ad9c8c3950079146b050e7ad7ac38e2c842fa85bc1b48f678b56294b5c4c0732e2b9c9d1b63582d582c63d
-EBUILD jedi-0.15.1.ebuild 1890 BLAKE2B a9837eb57ce9aff18c460de8022ed9837cb440463024763139dd0070559d8cbfbf9a4e0578444d475dba9ace9e21e243c500f295e9368e32dafebc47153390f4 SHA512 bdca2cf4237f2ae957a2f72de5e1a2ce558929680d9472dabb2fb39fac50340f75b5160a94b53fc06de5044e9dfce49c43527e18ee20be204e4c825cb7ea2311
+EBUILD jedi-0.10.2.ebuild 1006 BLAKE2B 9fbafe6a0c6e6e77a56390c749147a8a2b283f6831a6bffb81f8882926cc6f0991bfd3db73c67ecbb4d36c09c78bcd83b0319f5777ce091a01cd83262271fa8c SHA512 92e521a5e1dfec2dcb62887532c3640df8ac8712f6abcac93ec3162d046a84442e1c44099386cbfdb7301eebf2dec152d20cec7bcd7b3a1ac11b73dda0ad23d0
+EBUILD jedi-0.11.1.ebuild 1165 BLAKE2B 42b86c5cda3a5a4588ef62d698de0a6c6ec837ad9ff4db5b3327cb129ed14f787e6862ad6485f869ba7755b3eb252ca992a7558062b0f70e79058c0301e5a180 SHA512 b7c458df3115c25bf312751d2c93a70a8d47930358c87fbde01be9cbb0dc022de57144c3a8913f7ef77de0e68fd35d18a05a8a0ab270c5ebcda2c246c6512140
+EBUILD jedi-0.12.0.ebuild 1028 BLAKE2B dd6fec316193257b72abfbc385a170355056f640150683e2276ff632813c1a6fb14ff57c0a1f2f46611e1dec17b41d5192f91df8fe2d1d9dedbae2f03eed0b4d SHA512 41adf08f95c8760cb798a86772d14adc3b64ff08a181368f45697f37f6746332e00efd54b0c5e89b10b7f3bcc7b15ee1eb66f5b7b57622ce2a33795b20bbaf8d
+EBUILD jedi-0.12.1.ebuild 1763 BLAKE2B cd23e9619d02c9c7af5567ba9c5efbdbf1be6e8be33a8c4aaab6cc77b49ed93297cab094e7ff339311669564006387b647ec729ffb282db8d49fe95615d383bf SHA512 97f2a9f8e9af4e75f87f3d890345b07fbe76211df58dd0bafe0496e99c40914ae224bc8b8c33154d91a5f23725c63cfc303729d6082da38c43ec8abea404ab76
+EBUILD jedi-0.15.1.ebuild 1888 BLAKE2B e61208594a9825809dd6069baee3fbf9867742b1aafd42ea6b61a151d44f62329986faec7b8f26e58e4b0449ad55cc9061481b16bf43d1f1a413c16af042cc21 SHA512 49566fb478ca4d726abf7babf14d6887aa1dab3e6c9afc0a77a58069ea691ef42570fb9f2b98952592edd0c54cce8959e71676bbbf23e0ff340a9f3b54d3bd5b
 MISC metadata.xml 375 BLAKE2B fd65a43f1efc2cbde98dd68be5a47415ecec66d4d2b2c878235a1e77b24311062d6d9c16da79bdaa358b7910612a6460ea5cbc9efdb03a6fff5d2299d734841a SHA512 16271d48499888ad36f71d79301ddc361831a7263f3d0ad19d12c29b51c52c24806a7a366c6e263b4b6d43e28856cd336b0bd728fa00a5fe5111b505fdc50977
diff --git a/dev-python/jedi/jedi-0.10.2.ebuild b/dev-python/jedi/jedi-0.10.2.ebuild
index 0af08cfafe55..545a27e4779b 100644
--- a/dev-python/jedi/jedi-0.10.2.ebuild
+++ b/dev-python/jedi/jedi-0.10.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jedi/jedi-0.11.1.ebuild b/dev-python/jedi/jedi-0.11.1.ebuild
index f1061e309c02..6b7394cd0771 100644
--- a/dev-python/jedi/jedi-0.11.1.ebuild
+++ b/dev-python/jedi/jedi-0.11.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jedi/jedi-0.12.0.ebuild b/dev-python/jedi/jedi-0.12.0.ebuild
index 3fa169996a02..66e53e4f9b00 100644
--- a/dev-python/jedi/jedi-0.12.0.ebuild
+++ b/dev-python/jedi/jedi-0.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jedi/jedi-0.12.1.ebuild b/dev-python/jedi/jedi-0.12.1.ebuild
index 2c05636baa09..db6ca80279e2 100644
--- a/dev-python/jedi/jedi-0.12.1.ebuild
+++ b/dev-python/jedi/jedi-0.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jedi/jedi-0.15.1.ebuild b/dev-python/jedi/jedi-0.15.1.ebuild
index 417f98aaef73..0552dec16048 100644
--- a/dev-python/jedi/jedi-0.15.1.ebuild
+++ b/dev-python/jedi/jedi-0.15.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 90f10ab16b7f..64eb8c5dd57b 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,5 +1,5 @@
 DIST jeepney-0.3.1.tar.gz 22271 BLAKE2B a8de58e4ef4c4d1874c8995e3726a4bfa26a8db4a63040658c4edfd1742fa1c22de52d8cbee4913b1973279938544481fe2c2aef3138dc0ef724f7a99a39c617 SHA512 ad1a2d220a7626a3bdadf6fba6a591d1b498a9f6bb34607860213efddf49bbe67a4dc2d504decd906c560c519302f1fa45b85ba348156e8bec288f525d502e82
 DIST jeepney-0.4.1.tar.gz 27706 BLAKE2B 152bf872621a0e023b9f44bb165113b2c3ef0037f66cb1c2aa15423d68ae5c295ad100aba855f061840054a25c3ed30a2d1faed09cf2130235df72c70738c791 SHA512 46aed19fd29df724af0e78ec0acabeb196324444e682817c330f3fd290a52cf6a6cb639f8c76f4ef5311817c4e051d7231b4f26af3cb6768bdd8c4bec7589210
-EBUILD jeepney-0.3.1.ebuild 1107 BLAKE2B 2f13ca6a791546ab140a4df5fa56c764b621b6cb8c0cdfc1550683306d3ef55144a162e5c35500a5cdce21a2a3bf2d81cce05b179df9a6575ba19fe1ea0e0530 SHA512 233fae0bf74c6548e6206782d864dfd32b941b5f4cd6aa5dc800d79615c31b070ab60f79ceeddd23240038233e98be8eaa525337a23c0ef4111d56d47c7482bc
-EBUILD jeepney-0.4.1.ebuild 825 BLAKE2B c3322b7bdc8169fc25d294e40368eb1e20db15ee9a481cb036c79f4130afbdbffde9c7119f9853382cf22435903da16d8b1a795e2c6058b77bedc5c518b295d4 SHA512 68c470b22503993db99ba613314c31c597acaf0bc35719c8af3adf3c3a5b54fe11b967e43660e3512ae047c4ae322539b3436f11a886cdfb8c6e4f2499dd9dde
+EBUILD jeepney-0.3.1.ebuild 1105 BLAKE2B ab3b335bb4b89b62fed78561bb36ccfc0238b8c32eedaf783ae3c7bdd878ed1dca596372ac8debc07f78efe1fa34d9ddfb687515e5a2d920926f49743517890d SHA512 3cbb2666b9444bd23bd6860554d8755f8db345920785e74b2cd8c2635a5f1d2775dd71e7bc375398ea6b4af7c127489a070137975afed19001f01f8e0836e140
+EBUILD jeepney-0.4.1.ebuild 823 BLAKE2B dd93bc1e3d6222e1152e0f3c74adf41baf85c00a357d60aa543b0d1f43e313600e255259975913d9290413df52e0286e636a31c0599378aaeaf60f9b5e6ced5b SHA512 6144daf542c0674a717759e1ceee403ece569d02daecc3cfe9749720ac3b1615b142630bc4f40259b9fbe38c60ea09cb18ccbc0ca39e8f038105156961375e40
 MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
diff --git a/dev-python/jeepney/jeepney-0.3.1.ebuild b/dev-python/jeepney/jeepney-0.3.1.ebuild
index da401a0b16ed..ad3185d614f4 100644
--- a/dev-python/jeepney/jeepney-0.3.1.ebuild
+++ b/dev-python/jeepney/jeepney-0.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Python 3.4 and older aren't supported
-PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jeepney/jeepney-0.4.1.ebuild b/dev-python/jeepney/jeepney-0.4.1.ebuild
index 48c7b3cb6c42..9cc48a55bc89 100644
--- a/dev-python/jeepney/jeepney-0.4.1.ebuild
+++ b/dev-python/jeepney/jeepney-0.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Python 3.4 and older aren't supported
-PYTHON_COMPAT=( pypy3 python3_{5,6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 7f1c0d4c0493..db304c4c708f 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,3 @@
 DIST jellyfish-0.7.2.tar.gz 133320 BLAKE2B 094610c79e8c7f1caa94ff6c8f6936c3ff26c8d8ab8a7605c145e8293d1ebc28f5d057a603f7d8392811aea5d31a87ecb3e3d9eb682e2fd8a3222f23fbc7c3f7 SHA512 5fa19826a3adb16dea26855d733bd3e8ccce0c68652249f7bcc06f9b5d5ac36919152301c9afafdfca9877cef6614dccbe8e46a51ab41c1fed493374929c3367
-EBUILD jellyfish-0.7.2.ebuild 937 BLAKE2B 23386ef9de91c3e2c69474c18193ea50e1eb57ef70f452e35cc3722d83f5ee006a4591400c4ced0c4abddb230a410def0b7dc33787723b317043c2edc871b096 SHA512 083946d0bd4ba1bc53454a3e4cc5978a5f282eab5335c6b196d5623d2214346f3b176d37d48b4d715776266fa28aee8d7274219b2485e1c2940ca49db5d8ab0e
+EBUILD jellyfish-0.7.2.ebuild 935 BLAKE2B 9fa8cc992e2a9af8932ef653dc60dd5e3ff24106a2200f4d91e9b473a2b4c81e75669c02c0ae3c3e9ba5642f7ac7ea4b40d96fa1706405d4a58c01791bf4c4c4 SHA512 175fc3a58aa147c5e6435597213e4703569eed7aebec7a5960c6170c5384fde75e0259e87f394e984fdebc9d9ce564d0f1c744cba5934e59dbaf97b24bcf7148
 MISC metadata.xml 503 BLAKE2B 5233c8c8b58779463d926f276a3fac04e25f70ed8992e75aaa4963a259de9d525b3dd4f040e0fd2aca83efc5bbbce73b7eb86d5b59cacb81f9aa1f82c7949850 SHA512 47e552f516be95767e3dfe9b5b43ea36b02369cc426cebc25d66ed6c3e449c1041d6c79351669d80ac13d19a45f699a719a80130073d02d14459c4630c87736a
diff --git a/dev-python/jellyfish/jellyfish-0.7.2.ebuild b/dev-python/jellyfish/jellyfish-0.7.2.ebuild
index aa2fda3ac965..53caf0c99ab8 100644
--- a/dev-python/jellyfish/jellyfish-0.7.2.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
diff --git a/dev-python/jikanpy/Manifest b/dev-python/jikanpy/Manifest
index b19e7f80f90c..d59d4ad73636 100644
--- a/dev-python/jikanpy/Manifest
+++ b/dev-python/jikanpy/Manifest
@@ -1,3 +1,3 @@
-DIST jikanpy-3.4.1.tar.gz 13653 BLAKE2B 9e9e5b9f6f5fc28a7ce98a6ab79254aafeb7d2a77e0bdbf7790b3c9a19e41caca1002d53a2effdafba13db1271546ae104cf9521afcf4fe2b02effd2c4e38163 SHA512 fd5703f86b439185f46e563cd32ec75e176138b7128f3c1c80dddccf569a066da7e493d6b48979a69ec5f55c0b2bf1396676d4da2529ae16db106b6cd6170c5e
-EBUILD jikanpy-3.4.1.ebuild 552 BLAKE2B 6d1ce8c5d2f1bb2afaa9df98aab730fa84ab1c70fb3d01949613b0e4ee51642dc20237bf6c817f8a4b780fb24dfc8500d2cbdedf48f0ce57ce517bd5ee975482 SHA512 0b222da55f4974d31bc840f1fe8ba61a829ecffbe1e4d1d49a5c851f7559e1fdd9130c87497d09b84b11c7a6796666259d64fc2419ae8cd485c7ab91a95b4aa9
+DIST jikanpy-3.4.2.tar.gz 14132 BLAKE2B 4a06cd0ac37968c26cf062c7aa7b42a23795f372a814641d373097e67c0958ea2e640b9945883552c6997285fb3d19991482ed4872c5c74097940121edddca4d SHA512 cff23a20a331da55036875c2ea34e3bcf7c28592b625bb9c3fc453969db2f232cd30841757ec8d75807f323a2caa0f591f91e71547b29d07694560462c561d30
+EBUILD jikanpy-3.4.2.ebuild 459 BLAKE2B e8e00cadc1404dfe5f5878efae1e5b97cdbefb45e1d3d2b7e6631ecf3b159560eb412f9f0e5004d4d30a95ff461aced1816d11f858bbe23c7a5a72a1ac79c73d SHA512 b37a73eceffb0e257774ea9049b30720d6f3a3abf916ac809d73f97fc63b00fa28916cb84fc2d62b6e844b9f7bbf5ae9f634381fedaa0e07e53ccf5a562fc005
 MISC metadata.xml 378 BLAKE2B a984a5ec0db760455227f9506abdd294feab0fe6e5c18c1a489c789e80b38c0ab854b0c195edd7c132932396c4c5628be65677f6ab945371d0d8414fc08a03a7 SHA512 4ef2469712d9af410a4000b3ea5bbac2bb3c837042cf3bd0348b53d57ba463652eff2ae5dec045fcfc897740f2810a43c03b94e79a55b72ac15154e31be230be
diff --git a/dev-python/jikanpy/jikanpy-3.4.1.ebuild b/dev-python/jikanpy/jikanpy-3.4.1.ebuild
deleted file mode 100644
index 52e861dcab31..000000000000
--- a/dev-python/jikanpy/jikanpy-3.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for jikan.moe API."
-HOMEPAGE="https://pypi.org/project/jikanpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jikanpy/jikanpy-3.4.2.ebuild b/dev-python/jikanpy/jikanpy-3.4.2.ebuild
new file mode 100644
index 000000000000..ab08d9233e5c
--- /dev/null
+++ b/dev-python/jikanpy/jikanpy-3.4.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for jikan.moe API."
+HOMEPAGE="https://pypi.org/project/jikanpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 7af1165b9366..0a90b8d2e9d5 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,6 +1,6 @@
 DIST jinja-2.10.1.tar.gz 267828 BLAKE2B 0cd7e2880f1d41f3a6aafa0878343c2ff017099de6b2ad607baa3c9cba9d58c9241e1ba65cc23ea16244a1b3ea8720933f45f1061811e5f1abdcd881c4017bce SHA512 71c90be0b2aeefaa80279cba55f7827b5a42455f9dc55de9ca7e9e3e363678caa357426955267542f3c8a9b775e61aca55e439af192ed0a67f592be4ef91aff6
 DIST jinja-2.10.3.tar.gz 266316 BLAKE2B 0d8c10bb866eb887fd1c88ca5c5304f46d27930d8426587185ea72c0b79b512919bd5fa75987c26e433be049fd5764fb4ec08d42a4ec5ed00510fe8051e10f5e SHA512 566b781218b533c16b107b57e0252da5947fad262fd8d3fbb134b5916939c5e5d31c95e34bd6b14eec333d2ba3b4a6faa4168497a1ac774e7044f8220ac1b06e
-EBUILD jinja-2.10.1.ebuild 1622 BLAKE2B 7c00ca9bd1b7a9d711d34a0a2d6323fef753d9ccba27a1c998e89b5a99ee99c43c776b5a5601b52790eacb2065b1bd80220c3d9142221b00ebd4833e3dc4a01f SHA512 7cd433f46d8270e5736c980c53563f4322cd254d17537120e617bfe414c3419615e59dcac6728f764a528253c05b8af76fe97f7f3bc041bc0f73b532ed7cf836
-EBUILD jinja-2.10.3-r1.ebuild 1935 BLAKE2B a0cd0264c2c6e1373bd7991e0f17486b7e6258e155dbf465af00b4ddaad618f9683a43f5cf2cdc99b88b498370f04d70119b65b7d1804fb973cc1e56991a8ff2 SHA512 489e41dafb6289383d71a643b1566c5a038c7a7eb632ea7e29e9961f215108bf05ec3830fc19669dd046d3eaaae4c536d8143c2fbdeaabc76a14c43762c6e37b
-EBUILD jinja-2.10.3.ebuild 1758 BLAKE2B 1e1ac9dcf56902b1c030961bde39d4219a71726274ee65555f8f338eadf20682042ee3195a729cb198d42a6911cba7ce10651b4d3fa551ff44860c2fd6c2d5d9 SHA512 f7f4a756472300c1bc8482fa190bbd3b2449bd429f327b54a187ec84a480c8d1f46154148a9b45f28964c29c5055a1584550e94df7cfd5ba3a3585322759b1ae
+EBUILD jinja-2.10.1.ebuild 1615 BLAKE2B ce26d613bfc8b5cb168dc04621920f4501b72c5ef6bbd46ef886921e91698a31342abddac5e555b9d462f37d898c86c715ad35caa387f97aebd3b0b14dfe1328 SHA512 299f2c7aba212fa32d15c540882e41fbf770ec22fb71477824b6995d5efd25c7ed7ed23127331ee0e5720942f14450dcc37f0198e2710ddfdaba895e9684fa38
+EBUILD jinja-2.10.3-r1.ebuild 1928 BLAKE2B 3402ee683b2716210e1be8ef209008b80167714e75b1a9882a1fcfeb141238d24877061dd85ca5033112a7456562d32b5a19ecc38e9647022a895e2773fc09fe SHA512 39e8671a2ae672761c05225fb05e52a2575ef0223784e48c311103af23fc430c48a3091c3ea5a74b32a1c8b994ac0ad0494714bf6c6b01f088287924beb88858
+EBUILD jinja-2.10.3.ebuild 1751 BLAKE2B ac3b07a4cb7036cdc59e610f0c91f9d54e90954d5109217c384ad472fe5dfbc8392cd448dc1b49f0b40d39e1b7cbf2fc32efbb59810d2b204672f8744ae216e2 SHA512 7a557463a07e567d9261a63f0d8305784825449ded2a6cf2553b4260c585a4bc24ca6be331306c4ba9300797de351a1b3bef2d1d0375fed919ebd2ea36e95ab9
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.1.ebuild b/dev-python/jinja/jinja-2.10.1.ebuild
index f28a54899037..a608230ff660 100644
--- a/dev-python/jinja/jinja-2.10.1.ebuild
+++ b/dev-python/jinja/jinja-2.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit eutils distutils-r1
diff --git a/dev-python/jinja/jinja-2.10.3-r1.ebuild b/dev-python/jinja/jinja-2.10.3-r1.ebuild
index f021773e3385..c23ba3eda257 100644
--- a/dev-python/jinja/jinja-2.10.3-r1.ebuild
+++ b/dev-python/jinja/jinja-2.10.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/jinja/jinja-2.10.3.ebuild b/dev-python/jinja/jinja-2.10.3.ebuild
index def83f0e623c..aab4e4ac76c4 100644
--- a/dev-python/jinja/jinja-2.10.3.ebuild
+++ b/dev-python/jinja/jinja-2.10.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/jinja2-time/Manifest b/dev-python/jinja2-time/Manifest
index da12e9c30f0a..80a4c3e4f9bf 100644
--- a/dev-python/jinja2-time/Manifest
+++ b/dev-python/jinja2-time/Manifest
@@ -1,3 +1,3 @@
 DIST jinja2-time-0.2.0.tar.gz 5701 BLAKE2B 370318000b1c91bc3460861d389da667f6d7e840c4f9d9d1661491c9bf1b422b8ecff12d1da2467e7a9596d12832790e314c3298672d70b38b92a53198df0156 SHA512 8ac4686312cde689f7a431001833d5d477030c4f5e9470d949bd07a40fcb9521f6ddcde37a72468093121ff9451e352a0bb43d20a796d7a204cf94e8a7545f2c
-EBUILD jinja2-time-0.2.0.ebuild 643 BLAKE2B 17383b46b10e905bd0eaa614851af960b3a7232081f84fb341a05003ab409b0f16760648ed14690d841b1aa5f9789300a2846fc5a55bf887482e7725841aaf2a SHA512 3043e614bb6a001b59bc89ea8a115d2523172ead49bb3ba62854d0577fd7153250113422f412e58259c2557f62c9571227e502fb2b43fb765c96ba2070adba0f
+EBUILD jinja2-time-0.2.0.ebuild 637 BLAKE2B c8e52dfc6003c743f9a4771ece7d90798b205e348a98cbaad75198deb9c78a1d9de08456d37379cc86e938648f7b7c0af7ed7cdde6519e89b59dd7308fdf482e SHA512 f2bc435c5fd3475d2565d96be1e151b10204cd8e512978e80a44103f3e25ebe9c088425d4f0ede64940540a1f3038733d8e87b81627b5808b5d394babc4d158f
 MISC metadata.xml 375 BLAKE2B d28fc82eb5b6b82faf9e3874182b44290f10a1d2c2e7bb58e32cd46c6d724028e0bdf27670052f1665655ea0843900a1b978534ff8b32db986aa49531d4db76f SHA512 23697fa9d297ce1deaed947d2f5c98cfd85d9f10e4f703259db15d6deeacbed1ac4f297eed4b58d07b23c798ad738680c945395dc68f15cb0d083f7acb6d99ce
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
index 4261e83eb300..dc6fc327bf8f 100644
--- a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
+++ b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Jinja2 Extension for Dates and Times"
diff --git a/dev-python/jinja2_pluralize/Manifest b/dev-python/jinja2_pluralize/Manifest
index 0f959c29d96a..059ab705873d 100644
--- a/dev-python/jinja2_pluralize/Manifest
+++ b/dev-python/jinja2_pluralize/Manifest
@@ -1,3 +1,3 @@
 DIST jinja2_pluralize-0.3.0.tar.gz 12638 BLAKE2B bb7399d287cf0d1bfed5398c0ad7e6994dfe1d8e942d82190570d0b40d8bec4939d497cb2d9d4415c913f3f3f9c11b017035941755219effa8d92a6ef188dac9 SHA512 8830c01ff82befa353302cadc305147a950038fdf3808632f22dfce9a564a6ba7967781f579a2d94fecb1b5bb01f80d2a53ff082332b94c6e6e3f5f4106e7313
-EBUILD jinja2_pluralize-0.3.0.ebuild 595 BLAKE2B de28c0eb9d70fae6ce7498bbb7533e30d099c13d7aa07de818f26e2bb1df2aea1cdd44c470320569f091e02cbbb07af4d07d71b1c0b7742236b64c1e05a92ab2 SHA512 a81a1f6b025774dfe2d0b2d4585d41ff528564f466ce42b1c3217a320e5b4eba7e896c571d15d2ea822d38123a52d2fa0fbdf8497ac90daced2af0d294091e03
+EBUILD jinja2_pluralize-0.3.0.ebuild 593 BLAKE2B 23e938ccb95f2e1e9e8327a4f6baa748d3f712d409ce9e119f780e7e54a41501e77b6e95fd85223a26dc904ec5b2676f36bd42b3475411b0eb022b1c29f5a8e5 SHA512 b7b9defdc5b660e422286f2f3bde24767be22b700d69796a49a5aaea922d21af73dad4df977d9f9faf2a82b5d6b72b6394ae96221dae2452907f643349642927
 MISC metadata.xml 387 BLAKE2B bbf1f15fabc767c47fdfb69fc1dff3722cde37c075f15404667ed1a9e51ac3147bb093247af3941d9165e26118dd725eae8ad7823be1f9d7a9727ddfc2777e04 SHA512 1b5c9b39ec7a445d8cc673517d3552a9f256804ac8b4f24be6fc7a19d5c7df9613eea3f15e44009c19df3944b9a14a8dd353407bee415883322dc6e973e403eb
diff --git a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
index b6c1ddee4936..4eee89a2d341 100644
--- a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
+++ b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jira/Manifest b/dev-python/jira/Manifest
index 4cbde82ca368..878377f2fe4f 100644
--- a/dev-python/jira/Manifest
+++ b/dev-python/jira/Manifest
@@ -1,3 +1,3 @@
 DIST jira-1.0.14.tar.gz 151627 BLAKE2B 018d6a2a3fc782254c6c1b67adbc01e045e748ed341a7f93d3fc9546e25a083b931747fb9160ddd7e7f1b0a2f8992d25980dd647222c2b55ef8a1c9813f399f3 SHA512 baa5a1bfe60147771643c544f1dadbf28c66124da34fe907e5e8daf48ad8edeae0730f255e811c4de377a18883083a31efedc33dcf09b8875b9f018bbf65b5b7
-EBUILD jira-1.0.14-r2.ebuild 1278 BLAKE2B c33004c79a1a6955834a711b7be35840cec2057d2852c4fca81d8d4f3b1661b432ed1d72e24821cbf04f683bd80a088afa56806c6bdcb59ba5324b2112586cfd SHA512 fd91f7add482fbb7e75751334018854a67c2f1f1c157d491e5eccf4b3205d571579164a85c9e28fbe9d01c1a4f994a999cb6b4399f73a26716714add7df51635
+EBUILD jira-1.0.14-r2.ebuild 1105 BLAKE2B ca6d2533138c83d6f6b1b22edb701ab4b03174e1840c8436bec9ef80c561ea7d44f975fa255db34c4a7e2aa74c78603ea4a59fd1b118a9efff7d146caafec32f SHA512 e0918b711aae9518089bacbbfd08b181d8377294f7d8fa144f26f128f1dc2621a3f70be920026d364a31787cd28f2761d2484ad0152da4ccdb93ade45cd06e83
 MISC metadata.xml 723 BLAKE2B 85cf014be8766e2abcb4765c0f6e236f71520a34553897d73048c15b018cf582464877be52bb123359965ec2f9eea76a7af31f00868976c3fa91ef2f66a4a72e SHA512 7cf12e1c5bd74826450dd2bd69afb563269c018d12114e79bd5cd058260e66390750ea110ca1def5b7f257712a68c9987286ebe744a8a4c1ad3275111454e36e
diff --git a/dev-python/jira/jira-1.0.14-r2.ebuild b/dev-python/jira/jira-1.0.14-r2.ebuild
index 69e2892abc75..a5d891928dcf 100644
--- a/dev-python/jira/jira-1.0.14-r2.ebuild
+++ b/dev-python/jira/jira-1.0.14-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python library for interacting with the JIRA REST API"
@@ -13,8 +14,6 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="magic jirashell kerberos oauth"
-REQUIRED_USE="kerberos? ( !python_targets_python2_7 )
-	jirashell? ( || ( $(python_gen_useflags -3) ) )"
 
 DEPEND="
 	>=dev-python/pbr-3.0[${PYTHON_USEDEP}]
@@ -28,14 +27,15 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	magic? ( dev-python/filemagic[${PYTHON_USEDEP}] )
 	jirashell? (
-		$(python_gen_cond_dep '
-			dev-python/ipython[${PYTHON_USEDEP}]
-			dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-		' -3)
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
 	)
-	kerberos? ( $(python_gen_cond_dep 'dev-python/requests-kerberos[${PYTHON_USEDEP}]' -3) )
+	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
 	oauth? (
-		|| ( dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] )
+		|| (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			dev-python/pycrypto[${PYTHON_USEDEP}]
+		)
 		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
 	)
 	"
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index 0a6d54c95fa0..8d18b4942e3f 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,3 +1,3 @@
 DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
-EBUILD jmespath-0.9.3-r1.ebuild 620 BLAKE2B 10e4e911253aa9958aae2a0bd0c9c5c36cbb1a21ba82139b3b08d79b7d0ac4377b1cfecbfe06242345f52de33b523f632543e6f4aa92ab2b010dce2d431df74d SHA512 182928bce0dc6de139f9492ccac617a51c7179a901257c89dc1c77d388c4576ce9b5675b9299e13297549b494f0ce788775c8c69ea808fa9b71fdffa08060a65
+EBUILD jmespath-0.9.3-r1.ebuild 613 BLAKE2B 82296106009b22d927bca4cb64e6033f64c9b765502e36e152a094fa661e476e8a5e2ed51d6a9a314a3b1a0311b13e1cd4e485972e70a9923d7acce73f0a93b8 SHA512 232d8845ad09cb880c065f0546a7b398b8bb73a6f5ac60341994350ca37514ca096e673fac5b4798fa80988f4288a63df7bd54f92e824f7f2877d64e293a3b7c
 MISC metadata.xml 570 BLAKE2B a6d5d0e838a59de2031b7df52ac683dbc5a7d692ed96a6334bafc5e76d0018f32990913a49539e7d093f195f548ef4ab55e8cdc93c1fa1779d87140336e40a8e SHA512 dc7e96be59813dd79d3492c619d3080c0858711b948843a12a2b9043b853b99885b780b130425ed0f437d2f51139e0024c3f37623cc7c4794e86568995bea36b
diff --git a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
index 089ce0920d5e..4e0c73110773 100644
--- a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
+++ b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index a6b0fe416c11..70c5771bd6bd 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,7 +1,3 @@
-DIST joblib-0.10.0.tar.gz 480797 BLAKE2B 68ec29df4470e69a430a329f85b96448d29e11d09b9fcee03451ed9d0607ab61af4db6b0973c6a56c49a12120c082dca056d5fb37d88ae1e53c40b8d9a5e2d6d SHA512 a1f06c531973cb6f8af2c3fa62eaa18204a16ddc56b05de38cf84f7882f4820d30306f4aba52241f57f43c46c2b2bdd6c66459cf6bfa9c893b5750ac059c41a9
-DIST joblib-0.11.tar.gz 213136 BLAKE2B f23260ff16fab1ec775fe6e31c824f33cd6c465bceb84a7c7e0aff4ab4a4006b5f13d22d4c969b111aeb440dfc292e41ab7273a9fb7f1c9b337b4fa0e8b52d4e SHA512 8374a1e2445b9734a5af1d9f17fda057722f4e9e257819084aa7028866a8780f358fcbab131b13c2af315bbd953f8474e4ea698efdeda2be8699c3c471d9465a
 DIST joblib-0.12.2.tar.gz 289249 BLAKE2B 247a8bce753ece235877540b829bdc9546b3a6d7610b09592217bf9d47fd038a5e75f649224b76832825e77d76ae46443984de3d83558cdbd4d816d8f610e8b0 SHA512 9bf93c89681f59d17e735c228d3379df5dff67b4365b59ddea1a062f9547c376e5870e4ece83af8e7cda1ae30e2a2893a4a009e03b7fec798d3574e8ab060267
-EBUILD joblib-0.10.0.ebuild 1231 BLAKE2B 46c25599a04b3b974b0298905accd46d6bcea351c541a2b7421db1747a6fc1e7cf10b2f5d092be6c6399c27cf0099d27f6ae902a06ce09dbe595dcf52b816043 SHA512 a190b5a03bc39a09e805d890b7b890f32c69af50a8f48a80f86a73c603ec4643d015cd0f2b34f42a4d5b0930109466ba119339412dfe5a2cbf215c14a828630a
-EBUILD joblib-0.11.ebuild 1158 BLAKE2B 977e64af5508817b2caa55f6a29f68fad0d45c198e9f69d6f384d540137020cdd2381f10affd9b66f62b50eb1410b27cfb56f01851ad48cd4894c7add33f2af5 SHA512 a9cfeb78e16e04285d0e7905abcc0a6949de3545dd4e4f5358cc08f7c33dce449e8875c1dc96bc739137ff0aa3cda2c7cc6e31775cc20574dc88e2323f5176e7
-EBUILD joblib-0.12.2.ebuild 1161 BLAKE2B df97ba6b430725624ebe542d39dc9072dcd9bc53d00623fff5ccbe7d0a14da4e1d2fc068dd9bfe98284c0f75ce1e8b04bed02443fa238e2bac536cf25a2de472 SHA512 a9c33dfde93e6acb92f49cb0e1bb130413c6b52b54a208eea7c778d6c650ca43908ea8d2b2263bfa251804a4f5fe4ecd4de122e97297e5bc49997223c909b287
+EBUILD joblib-0.12.2.ebuild 1152 BLAKE2B 8783121711430cc68b5e32725c6a43cf677e30c4f89affa3f4329ef209d920de5061d94e6e053d5dd2b4c1e619e65c2a4df1cd5aa1b931ce107308b76e75d1d9 SHA512 bb2d4b113099115907cdb2c3e378a9609f2ca83e2d13e75e0fafc881cced47742f7be49776b73490082b8daf0b309d7aa4427b1774bf29e9d0bb57b424865c2b
 MISC metadata.xml 832 BLAKE2B a05bb08a1c94c3c589a2101ddade1fb6baea3a584ffda3af9374788ebe9aabe334697e5f44700261881324448a8c91d819046785fa29e2bf39e1b944bf7572e8 SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353
diff --git a/dev-python/joblib/joblib-0.10.0.ebuild b/dev-python/joblib/joblib-0.10.0.ebuild
deleted file mode 100644
index 7637ee9cf1e3..000000000000
--- a/dev-python/joblib/joblib-0.10.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-# Usual; req'd for testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/ doc/ doc/html || die "docs failed installation"
-	fi
-}
-
-python_test() {
-	# https://github.com/joblib/joblib/issues/143
-	if [[ "${EPYTHON}" == pypy ]]; then
-		sed -e 's:test_func_inspect_errors:_&:' -i ${PN}/test/test_func_inspect.py || die
-		sed -e 's:test_parallel_pickling:_&:' -i ${PN}/test/test_parallel.py || die
-	fi
-
-	nosetests -w ${PN}/test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/joblib/joblib-0.11.ebuild b/dev-python/joblib/joblib-0.11.ebuild
deleted file mode 100644
index 4f2b2acbb0ec..000000000000
--- a/dev-python/joblib/joblib-0.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/ doc/ doc/html || die "docs failed installation"
-	fi
-}
-
-python_test() {
-	# https://github.com/joblib/joblib/issues/143
-	if [[ "${EPYTHON}" == pypy ]]; then
-		sed -e 's:test_func_inspect_errors:_&:' -i ${PN}/test/test_func_inspect.py || die
-		sed -e 's:test_parallel_pickling:_&:' -i ${PN}/test/test_parallel.py || die
-	fi
-
-	py.test -v
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/joblib/joblib-0.12.2.ebuild b/dev-python/joblib/joblib-0.12.2.ebuild
index 2472da1dfddf..b146494cf10e 100644
--- a/dev-python/joblib/joblib-0.12.2.ebuild
+++ b/dev-python/joblib/joblib-0.12.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jog/Manifest b/dev-python/jog/Manifest
index 9faaa294b1d8..5dd7687d889d 100644
--- a/dev-python/jog/Manifest
+++ b/dev-python/jog/Manifest
@@ -1,3 +1,3 @@
 DIST jog-0.1.1.tar.gz 5684 BLAKE2B 5c2955060db8bdbafeffc99ef39f5a4b39bdda3e1d681ce52f147859da2d1dfa335e13552c6b54e08800653f902b922b3f0d395c93f45787f2955de7ddc1fc78 SHA512 570c780611a15c1a8ed6db62f281e3ee8cb6a86b4fb926132aa16caaba66c079627de89cfa4308fff927d0bd969acc57bf4439f01c7e2bf4d6f12ea5c3efaddf
-EBUILD jog-0.1.1.ebuild 373 BLAKE2B 1c63ce6ca02d3e40ecc915e2772d68fe6e41e5c9457389489cea0f7ff2f55b7abd6a75b32b1c455f52279abb0257ff85d95a68155c4dde697b2e8d8060ee47f5 SHA512 db22b233e64cc3b5b25c8a2dbd538dd0ee37055789b9ca0d361e7652d3c3eac677ac6ba6533f853b868f718313fe9ddcd9c1f9b179084bd46218439850f30b98
+EBUILD jog-0.1.1.ebuild 363 BLAKE2B affcb83134de375551a0236fb19b11b7f925308565438f269389609536abca50cd21f04a33d1a0476066da3bf33faa450842a2802d8b53408dacea302c832c8c SHA512 f196553b0535ed3cda0135b134596ba8a9fb5b30b403767f00e7c7e16be64f7a0cd37ced0ecaaf87844b92046074686f66610e954cd4622e57c6adafa318e96a
 MISC metadata.xml 316 BLAKE2B 3dc76d751c1f47b3a83ae9b2a9446fc4b1a2055be3c7dca82e1f951d5e95e34f2a6987501338e8f6284468d3c9d8e214f4d8dbd5f104b6f63bbb91b4ade26a53 SHA512 825b8c35afaa305d0b038ea57a9f655e5b5ee14bb4fb6d21d8a5e3950b8344c5421b92a4309842281ae33aba92161970cb9b54564bf17f1117b2f72e75123fa3
diff --git a/dev-python/jog/jog-0.1.1.ebuild b/dev-python/jog/jog-0.1.1.ebuild
index 31ca75410282..0a2245926efc 100644
--- a/dev-python/jog/jog-0.1.1.ebuild
+++ b/dev-python/jog/jog-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="JSON Structured Logging for Python"
diff --git a/dev-python/jonpy/Manifest b/dev-python/jonpy/Manifest
deleted file mode 100644
index 050b0d664690..000000000000
--- a/dev-python/jonpy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST jonpy-0.11.tar.gz 51496 BLAKE2B 10a3156df0f04606084658c10944bb17f35a6a11548eefaf91f48836af3b4ff88b061456ab20f3a743c04acda7b881a3ef76068975aac9823bb96e390445f37c SHA512 9fa925259a5d56347b71845fc0ed00f16f4b411b350a08f0779f8f867fc34d0c6164cb0dc107410b6b88d1565fc504cabd102a0c7fcbb86e7163319a235d89ee
-DIST jonpy-0.13.tar.gz 22107 BLAKE2B 530944d0f30982ff65387bdd2ed2e46ecf30e1789b800a2e877244753dd5d46618866a07c08657ffb53550cf8e55efa321d72b655792b8af6204e5f604724c7d SHA512 b46942ce186c325feb2483425a9163f2e871eec3b6cac79ed20e6cab15e22c8fcb4a9e7829ba4dddbe5ee3bd5c2e38c12ae0115ed2456dc3957a4e5a4564dfbb
-EBUILD jonpy-0.11.ebuild 608 BLAKE2B cff8930423a4dda81bff2e7aa636451fcc9360f59321e05a7211831bfa99508168a692994734efc3424e6e5eacb32967088b2109c09ba1e281cbd92048e72524 SHA512 1b939d302d754c01fb529ee9e64b99fd747eca982a6ab76d2740ce5e73ffd853aba718e4c297e6017725c7a5edf813e960627c00c6193543761ef9af7634a933
-EBUILD jonpy-0.13.ebuild 610 BLAKE2B dad3678fa51bcdcdac949a2168530027a225834933c350a123929dd80e4c3e0c4d83ce6ac88f8f14c1043289f39def12c7d5142a47e491257fbb674f3c6847c3 SHA512 23614818d0ea4dde3ed0d06f1297c61938a143898d0dba46f00ea42cf51e480471bc0220040f27f9094ca8963a9c295e087cb8011459489e06de576bb882d754
-MISC metadata.xml 370 BLAKE2B e89e90c21ef4b773800e57a002ef39cda52a503be93dbb457233b5c8b30d58198cd849b435db819a8419c3e4f104dd4373cfafdf623314bd5fdef36d245d0e41 SHA512 31957f1fb378433322e8e4a83fb89e9d97a0be9b9f38ef823662ded6f320ebe45ce83263af09b7d8f00326dbec33c5aafd9cca645b687a144f162fee3f3bdf4e
diff --git a/dev-python/jonpy/jonpy-0.11.ebuild b/dev-python/jonpy/jonpy-0.11.ebuild
deleted file mode 100644
index bd7f0957f0ee..000000000000
--- a/dev-python/jonpy/jonpy-0.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful multi-threaded object-oriented CGI/FastCGI/mod_python/html-templating facilities"
-HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.org/project/jonpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jonpy/jonpy-0.13.ebuild b/dev-python/jonpy/jonpy-0.13.ebuild
deleted file mode 100644
index e43339d67032..000000000000
--- a/dev-python/jonpy/jonpy-0.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful multi-threaded object-oriented CGI/FastCGI/mod_python/html-templating facilities"
-HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.org/project/jonpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jonpy/metadata.xml b/dev-python/jonpy/metadata.xml
deleted file mode 100644
index 78935d8ce56b..000000000000
--- a/dev-python/jonpy/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">jonpy</remote-id>
-    <remote-id type="sourceforge">jonpy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index f45d1520f6c1..62566ea17adf 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,5 +1,5 @@
 DIST josepy-1.1.0.tar.gz 51286 BLAKE2B 57da7c74308b7698e84e19307283f9c09e61ee4f99ffcc98f02f50c24a96efd485540b878d5d52248a51f81356ab406654c6016614e32a1810cc1ff46b49ba39 SHA512 eee886565b1cb92e6d7a42f1e3666a158c162fb891f90de844118ac32b24f6deccf2eee5990ba100827109203f7da99c2b55735fb7bda05fd7a447dca39d6362
 DIST josepy-1.2.0.tar.gz 53130 BLAKE2B 1308ac60d32c65d8117e87474ed178f3e582de1f5bd958f31cac9a5837e0006a64291f9b8752ab1282d7f656d8931ecba54cb311888106618da993ab5bd773ff SHA512 1e746cf8e02c86a728d1a502000bba3c7db829f29dcb49ed40c7398d2ec904e830d267c60b444d57c3cf44d6ae829d3f3f4fd4288dcb3d5f47ab96d06a2d6bc5
-EBUILD josepy-1.1.0.ebuild 664 BLAKE2B eba819fe93372091eb15d7f823a6c1358510bf3b63a9a3f0eed1820f268439819d80e4ef1fdbc500d9354a676f2f3c602fcafc19c1ea9b5fdafc5bed052af125 SHA512 d9249729b1802dd9c536e191cce9d07e68cf1bfcce978a1379e3a29d85fdafd7949f390036e424deed14fb863595330cbfc0178c8f23ff3a3c97f41ee05dab85
-EBUILD josepy-1.2.0.ebuild 664 BLAKE2B eba819fe93372091eb15d7f823a6c1358510bf3b63a9a3f0eed1820f268439819d80e4ef1fdbc500d9354a676f2f3c602fcafc19c1ea9b5fdafc5bed052af125 SHA512 d9249729b1802dd9c536e191cce9d07e68cf1bfcce978a1379e3a29d85fdafd7949f390036e424deed14fb863595330cbfc0178c8f23ff3a3c97f41ee05dab85
+EBUILD josepy-1.1.0.ebuild 654 BLAKE2B 61955f926db2ed79b94f9a272a10fd5be466a2e9561277aec72bd665cac6e2eb31e57ea0f897fb65b6c2c83ce9492b2101bfecd063919af341c60b54fb3d216a SHA512 bb6b6fc21122b02a565eafd9a05c2389f8e696676d811722f761ee1e1aaa72ba16e41156956513f388d792239c5bc3f90966ab9ee5bf3ab377706dc50033e1f3
+EBUILD josepy-1.2.0.ebuild 664 BLAKE2B a245bf284cb179f5b766685e5d90312e71dea37b0f455d49da4bc33f8d7f0efa23901a78d3a0df9575fa04e1e67ea44074a7edc48cf66cb844c3f97054b09a12 SHA512 7c357aa5e6c1ea875eaa4bf608931794b043bcb16ac40c886847bad5afea8441c158608dd4af2b6e71760dd2d65590d0ef808e0927de77762e6179bd0508bfbf
 MISC metadata.xml 510 BLAKE2B dd45e914009523f3f80abf257ab42238c0e033978f344e9d4dc7cf28293f39dc0e5b195129ef065fbdcc979a48166fdacf3c81b1fcc808017625595a5674170d SHA512 0742fcd82de64649d12f10a2c7b20baf1a928943f4ecadd4995f23e13471d584f17ec188b0b98aa1f675f9b44d7d8446dd4525b2b7617ec6b547c0074d6c9139
diff --git a/dev-python/josepy/josepy-1.1.0.ebuild b/dev-python/josepy/josepy-1.1.0.ebuild
index a345fc6f3611..c2fe54ce2679 100644
--- a/dev-python/josepy/josepy-1.1.0.ebuild
+++ b/dev-python/josepy/josepy-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="JOSE protocol implementation in Python"
diff --git a/dev-python/josepy/josepy-1.2.0.ebuild b/dev-python/josepy/josepy-1.2.0.ebuild
index a345fc6f3611..34d9145537eb 100644
--- a/dev-python/josepy/josepy-1.2.0.ebuild
+++ b/dev-python/josepy/josepy-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 )
 inherit distutils-r1
 
 DESCRIPTION="JOSE protocol implementation in Python"
diff --git a/dev-python/jplephem/Manifest b/dev-python/jplephem/Manifest
index 9af38e211c16..21df00591821 100644
--- a/dev-python/jplephem/Manifest
+++ b/dev-python/jplephem/Manifest
@@ -1,3 +1,3 @@
 DIST jplephem-2.6.tar.gz 27587 BLAKE2B 553fdca55378bbd12e09df572d52b0721fb3a05b358adf403b202aa78411a0d4a60ef9b5d70b65b02605e8bbc65b8d12dc6ef90aef4ea37696f691b4cbb221ed SHA512 037b3b6571936f1a6bc07b156bb8a0c9fb0a51cc8c74e7a2d35f0ac28138223d5479c6fb964f017ca88ff56c7fb757e932d2a922d126d5dd410dc122d0458d7c
-EBUILD jplephem-2.6.ebuild 528 BLAKE2B cb5da18bb0ad790d8a07101a64ef18b6f105c10ee7e9e26dccdd4acba2085b6971d4ee5aae92efc2c4733ae2e3029f317a0eb87e98499b8fcb6abf2209da874a SHA512 5598fd9dae14431f449e4f9892b106e0fe0c8e153b8e484eaba875e4e2435da86c45ce2e7ef5279c0385bba9908ddb83de85e8d31b6dcae5c9b97a3dcabfba2e
+EBUILD jplephem-2.6.ebuild 524 BLAKE2B 197a6605602e0811fee87624c537c87c67eb1dcf329131808df2cdf17548328ba428b6009ad46ac7da6095dfa85b3e4b98d185699c877eac7ecf3b8a9bc0659c SHA512 e0e8f169afc0b3db1f25a569f5b83ca64518671f64341122144e11f07366a5485c1f0ceeef4f42e686a3304a9700c77dbaf724798308e0661408984f2a125f72
 MISC metadata.xml 636 BLAKE2B 962a5d5dd152fc2e9d220b8d103142d2cbca00069cca126441bd6d94aba0baafe29f76444c53172cd46799f3986b24a424051031b2d8943bf305661d06a6bbcb SHA512 2c406f9486ab5c05c126f371546e4dda63f277bf2e32346b3889b8ffdcce14339ad51740687302a2c41a4c11c700200ca4afc6a0474a329701f28036d5aa5e6c
diff --git a/dev-python/jplephem/jplephem-2.6.ebuild b/dev-python/jplephem/jplephem-2.6.ebuild
index 04aa58ed3eb6..058ec80ab8be 100644
--- a/dev-python/jplephem/jplephem-2.6.ebuild
+++ b/dev-python/jplephem/jplephem-2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jpype/Manifest b/dev-python/jpype/Manifest
index 84480f799008..3887619f705c 100644
--- a/dev-python/jpype/Manifest
+++ b/dev-python/jpype/Manifest
@@ -1,8 +1,6 @@
 AUX jpype-gcc6-noexcept.patch 1792 BLAKE2B 6e2e9d8232cb2f502b52d97e5f9f1c3bc4f848ef5c50daaac4d04c42f3d1937a0fa3c0c5e48ec27975205c19a92e5479e9e341a722801f60ce6b553ca6c18432 SHA512 cab22d5247a30cce362fc7ad705aa8595a79636715f64e78c274061b9cf6a2ba679bbfd4c0ff20e195a59ed2c6a33170fe69021ab9675890ac75296b24280e03
-DIST jpype-0.6.1.zip 251407 BLAKE2B 9dc866c1dc48a3c7d62fcbcfb84ada447285c59aaac02d551054d02c40ebd32f9fc662c8da371a35679d7b54e333c2da88025961aa5808d158967d16c5f2af06 SHA512 e3cdae95a394f5b57049f444e4da442a75938279f77d74304ac6a45bf00eb4110d3a63b5580e30d82777764f195f848639f6b4e973e48510d0f5cd60c475ce2f
 DIST jpype-0.6.2.zip 260812 BLAKE2B 1e432e9d299b88d8205a2f8088123b61460772abf4fb04b5094f15c69d205d3393c2b9a31654bcfa7be4ee85d3acb702960526a14d95018c48dd012665e858f4 SHA512 f4ce5fe6e0f920f6c17bc8815c09fb54909f105fb4cf022856482680f24305a002ce00354cf44c730b34220d12f1d926971b246d0a938bb411401b0656486091
 DIST jpype-0.6.3.tar.gz 169886 BLAKE2B 26a7cd583bfb40333de99658130a6672c87998472fbfea12de888bfe9a054206d13d8b57896a7b74b79d38280f516cb6e498cd2b1d7549930ded5bcc615619a4 SHA512 49664083db6db309c56068ace713059be1fede721c7368fb3fa0ed5cde0aeb6782b2953be9c0d71f8f8028e909e67e525338da0797a5b4bcfc2325614d5849cc
-EBUILD jpype-0.6.1.ebuild 905 BLAKE2B 26a2cc8d9df24b4c9c921097e7f32472185fd54d44fac12b9477bafdfa88bbc705aadf13b1d74ae34a9517bc42269c6aa2302a0ea469630bc0d93b7932273e1e SHA512 958c6d30180bed82dcbaa74b42f45b15a2ce138ef32b9c17dbc1f645387b89b5c8be8a0d39f2acb961b487a74d9c1ad41909f43499581aa77810eedee4f9497f
-EBUILD jpype-0.6.2.ebuild 909 BLAKE2B f9dc95f5dbb63068d2bec4f6552e65cf87f7aec1a9253103eac719fbc5b19f153d7834b246cf991aac8b0823e133bc358d3b73b29c07b1f6acefb2a02da1fc52 SHA512 a9d6dec3efbadcc56cbcf4600344e207f14852c1b93958082110abecbea002356cc6027c4c0b7fd53a63abb8a982cbce0d9a702ab03da68827cd4393a7736466
-EBUILD jpype-0.6.3.ebuild 918 BLAKE2B 6bb51de2efe785b4b0520bbbba92b1f1631e5461d1d66287bb4b3e4b13e1ecf1e89552ecd2c35216ef8d2dbad3a549a7f0e61b94b9752882977992583e29260c SHA512 45bc348bea8e2a79f53fa15c20defd2566d0d8cfca1b3912c9eae6cfa95c06d4f0b9cbd8f63000bb7a67ca36fe948ebcbf32ca23afb83353783822b32767bdb8
+EBUILD jpype-0.6.2.ebuild 740 BLAKE2B 73b5c8b24dfd0e04777fcb4f2799414e04cace1487b56441a0353dc6387abd485795a7196005d72d21c35f2240865dd0452012c5b648baa182ec81f6cf771fdc SHA512 875bb878da66b23de993d988628275e61333a237d040a371510c88ab10718b534bc431b2c600e5ea3394af462ba6252a6f3e82fbbea8527d74c40b8f0d9b6af8
+EBUILD jpype-0.6.3.ebuild 749 BLAKE2B 896cd1fe18ca4d7d34aaad1168d1bfb3f0eea6bb8e4af64a915d62080e51af801359a500d0b576007bce2c301d6eb9fd7469626dd7e3422a926d3400b9ae6b7d SHA512 eb909355ae6d71a24367382777cfc4e29e1e65f7bc6de97f438f1fb6fd10a35a6b9ee0d5a32a32f84e35a47bfbb7915117e561a5ed6fa28f883f4a14e969f738
 MISC metadata.xml 529 BLAKE2B f4ae7198d2acbd9e08274027da32f551a641ee1fae1aaaa377d9f70a8260256b4a033af2c87128e842494bc05fed02945550a1dfe02d475131fbcd3cd106d854 SHA512 20e1dbd02171941eb65d78af65539692ab39c21e7d800a730f96c4186ef3e9cb01d499b6a938c04fd1da424fa253b12799b0209523054db4837ddaec3aab4b23
diff --git a/dev-python/jpype/jpype-0.6.1.ebuild b/dev-python/jpype/jpype-0.6.1.ebuild
deleted file mode 100644
index a2273fdac726..000000000000
--- a/dev-python/jpype/jpype-0.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit java-pkg-2 distutils-r1
-
-DESCRIPTION="JPype is an effort to allow Python programs full access to Java class librairies"
-HOMEPAGE="https://github.com/originell/jpype"
-SRC_URI="https://github.com/originell/${PN}/archive/v${PV}.zip -> ${P}.zip"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-S="${WORKDIR}/${P}"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=virtual/jdk-1.6"
-
-PATCHES=( "${FILESDIR}"/${PN}-gcc6-noexcept.patch )
-
-python_compile() {
-	if ! python_is_python3; then
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-		export CXXFLAGS
-	fi
-	distutils-r1_python_compile
-}
-
-python_install() {
-	use doc && local DOCS=( doc/* )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install
-}
diff --git a/dev-python/jpype/jpype-0.6.2.ebuild b/dev-python/jpype/jpype-0.6.2.ebuild
index f22d95317f78..fda8e06d3cac 100644
--- a/dev-python/jpype/jpype-0.6.2.ebuild
+++ b/dev-python/jpype/jpype-0.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit java-pkg-2 distutils-r1
 
@@ -24,14 +24,6 @@ DEPEND="
 
 PATCHES=( "${FILESDIR}"/${PN}-gcc6-noexcept.patch )
 
-python_compile() {
-	if ! python_is_python3; then
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-		export CXXFLAGS
-	fi
-	distutils-r1_python_compile
-}
-
 python_install() {
 	use doc && local DOCS=( doc/* )
 	use examples && local EXAMPLES=( examples/. )
diff --git a/dev-python/jpype/jpype-0.6.3.ebuild b/dev-python/jpype/jpype-0.6.3.ebuild
index 49ac5fd6f988..82ec219eac24 100644
--- a/dev-python/jpype/jpype-0.6.3.ebuild
+++ b/dev-python/jpype/jpype-0.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit java-pkg-2 distutils-r1
 
@@ -24,14 +24,6 @@ DEPEND="
 
 #PATCHES=( "${FILESDIR}"/${PN}-gcc6-noexcept.patch )
 
-python_compile() {
-	if ! python_is_python3; then
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-		export CXXFLAGS
-	fi
-	distutils-r1_python_compile
-}
-
 python_install() {
 	use doc && local DOCS=( doc/* )
 	use examples && local EXAMPLES=( examples/. )
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index 7edca105e60a..e7cd66de38ab 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,5 +1,5 @@
 DIST jsmin-2.2.1.tar.gz 12542 BLAKE2B 17586d8f9f7a5725a8fcae041a63fcf0d7a297fedc19271a1db417b1f847abfa30477d256aed474fca73e9e1484b47368458bfe2469dd5166b9b25535cbd4c10 SHA512 b70a72d5dbe37b34cac186967b151a79573bc060a1b814645b6d58499ec0e087f7a5941b00755258cb05e8a092f05b614de1253038140e773102f5312fa6a3c7
 DIST jsmin-2.2.2.tar.gz 12705 BLAKE2B ff14d28c753443c4a17e19b7205b739d5a177eeb8074e4b16c7ae7e5f816758e1f54e07ceddf90dde70cc2752f9dadee0dc71754b2de3343256f3b1695187bba SHA512 e4fea940d7b5e1c0d7dacad70d90a242a8ba178423c886eb60ed7a36b1fba9ca67b5118f26e9a96058b86d3f612d40a21e62cdccd5858a2012a8f222fad3277d
-EBUILD jsmin-2.2.1.ebuild 501 BLAKE2B 3b10f52212e99372ece88d62abfc65b92d3fd55e104cbfb8c90932595903dffbcf98a6ebb8904f0e77d05a2ff0d4e332be384492228a109221bd8e38f36ba52d SHA512 e29d8282b8c01ca1f844b312ba252b631c9351e200ab28c08360daef8344bc2a3eb397fde88fbc44288e0b533bc1d3d2e407cc108dc553989b6b807e4562c12e
-EBUILD jsmin-2.2.2.ebuild 503 BLAKE2B c18d5bbae0378513dc01c61d00ebc77b48d1d83b2a8410c021ebd00458f48e3106f13c2134d44ff3cea958ce6ced609c6f8f7b0d74fcb1d3ef7c019be776c486 SHA512 b80f92e3ae87c6084626156e5a484118ce543b70ae9dfcdd09309f49a2c1424382d599a823cfa83224918d2908cd72d2e6b3773388b0d87af6faa5f9ea52a157
+EBUILD jsmin-2.2.1.ebuild 482 BLAKE2B 06500d233538097888b031d574d88226342338bd3b60b501abaa2453a371ce5c027dbc6f352dd4114fc9d3f18d48e58b33678428b600aeca6e7756a500ecc086 SHA512 9be37a4c6a51d0d9520c6fa564e335e2b553c38dd2a0e56c1cd82555dfa890315154fed4a043eb5ac44d4ce43bd5caa171b5b9b0c473ae61fac7e98096ee9ff9
+EBUILD jsmin-2.2.2.ebuild 484 BLAKE2B 5ada41f918762a409c1d2d954dd427f27e9328027a5a900538d480f2f901c7727eddf060d7e3b8b246345504ad7dc74c875770f1b0e0d970fc3d735662c2097e SHA512 fc9d41ee5df06670f2a66c644f5b6afa3ea98e43b98a41cf5bfc9d558ea2757ecfcb8133956969108b018e763c4084856828db0998a00f76e9d919e6297eaeb2
 MISC metadata.xml 372 BLAKE2B bec41151e562694fd012b685bc171021d83ebfc80cc83f86a48d2150a4ab8e0d15f3c90c177387ccb2fd489230bb5613dba941f38bdd07ff1ed9878ce2253914 SHA512 3719ee9f00f088f6c8e0086fda757322717e177b4534877667e4f2606de6f97add603be1958c0d33a9189157184668296ced776f63fa5257bbaef5c3b0edfa31
diff --git a/dev-python/jsmin/jsmin-2.2.1.ebuild b/dev-python/jsmin/jsmin-2.2.1.ebuild
index 092192625bf4..d4b8650e1988 100644
--- a/dev-python/jsmin/jsmin-2.2.1.ebuild
+++ b/dev-python/jsmin/jsmin-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsmin/jsmin-2.2.2.ebuild b/dev-python/jsmin/jsmin-2.2.2.ebuild
index c0ed121a12ea..76dc206a48e6 100644
--- a/dev-python/jsmin/jsmin-2.2.2.ebuild
+++ b/dev-python/jsmin/jsmin-2.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/json-rpc/Manifest b/dev-python/json-rpc/Manifest
index 64fe034111cb..3dcb44907dc3 100644
--- a/dev-python/json-rpc/Manifest
+++ b/dev-python/json-rpc/Manifest
@@ -1,3 +1,3 @@
 DIST json-rpc-1.11.0.tar.gz 29442 BLAKE2B b2a77bdcc2f5efe64527feb29b28c0add90b9fdbd5aa73dce18c33e9a10342c1e6b04ed5d53c110e3f1b6287cf1fdca9db77e38a04651e0a522b76c0351ec993 SHA512 aa5a467ef0e6e556612f77855d38f0dfb76b22556490fac5f0989d27b7608aed8389042ded1a0d8fcbee1f20294c78a6af3c030f41c4e30ec1effae8e51530fb
-EBUILD json-rpc-1.11.0.ebuild 848 BLAKE2B 620b0b5948470bcfa7af90b5b2bf2abd8e4cb531e38444f0fa041376c0a49ab55af8f24251d1a701cb1d46bc67e70f2c23c9f4941f95b3d695fa5e9e8fa31303 SHA512 30f83b9c5c42361dad01ddcf3145a871ec93b38f8db65d685b5bc608282d4cf5654373acd77af2f6262cff6208efae34f4b13b2e8aa27254f4292d5dd4c2b19b
+EBUILD json-rpc-1.11.0.ebuild 834 BLAKE2B 85b84c868d06a39d0194d11b43afaf4020511e5fcbbcb1a0b06db914a11ffdb8bd5a4490a322a6ebda0e9d84d366a72c6eee9db27145246e24c3263cae8e54bd SHA512 598f8fc8e390b8f41586e5ffc08fd183528847bf6bf13ef2876bd9fd05f2b03fa2e3f9f039f73d95685df6e9bbe871f9a0ba018a9f28c9ca40f00f194120e5e7
 MISC metadata.xml 794 BLAKE2B c3611b6095ddf17e030c993775e3fb0b9a7c2c7ac22f5486151f2b9ad03f73bf6b0f6e467cd6440e4a6b726f4cef597cc48dd35d8973c4be941f2615b9c2b208 SHA512 68c309e9fcd29a2182d6eba1e9e758971edc2293cd3c044852de9c938ae0bdbe6ea8805b32e76656d809d6ab3d636a274cd2e65dfd21ce3f026bde5e9ae02266
diff --git a/dev-python/json-rpc/json-rpc-1.11.0.ebuild b/dev-python/json-rpc/json-rpc-1.11.0.ebuild
index 359db38a0b80..4c5cc11feda4 100644
--- a/dev-python/json-rpc/json-rpc-1.11.0.ebuild
+++ b/dev-python/json-rpc/json-rpc-1.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/json-tools/Manifest b/dev-python/json-tools/Manifest
index a70d98eeee57..dda98340cbc6 100644
--- a/dev-python/json-tools/Manifest
+++ b/dev-python/json-tools/Manifest
@@ -1,5 +1,5 @@
 DIST json_tools-0.4.0.tar.gz 7277 BLAKE2B a3c953ee96c2c7a0b1a267f524aa6c1d45f1a947dc8c4f9885a1ec6993e07f7ae38915a25bfdd6bc0795bb0fe1a40e9450648e1e7fb8213fa047e7c28e790228 SHA512 b3f86493d17f97eeaecec6572adfc6e16c113c1755f49655863e84f17467c9dae9a57911d66639eb6e6d8548a99887adc827ff28bd26b6180e523b145bba2d5b
 DIST json_tools-0.4.1.tar.gz 7222 BLAKE2B d883f5bd2317fc92ea888071ec8ac0531b855fab2379b47ee52cf8d45ce3a4b9aa520c77265a9baf51b5cb32b23b64574fec90f50bbd59a4e8c5d21e11a90155 SHA512 12b5e3b611032b87ed4ed68d8bc30cea161fc80bc73b0724ca6404e8d651e4e6941ab4cd9466efa0da4d2c5b58166944ad2ce954f620b249b9fb7bd637353fe9
-EBUILD json-tools-0.4.0.ebuild 840 BLAKE2B ee83c98547265050f2f851cec7d4bf9a5d2e95c798808a43dbd8100bde33db48e15f1a1c7d99cd1e8c82d3f37a86b9fb3a3cb8a8fd9ea16f0d914d0fd17465f4 SHA512 312048fc80bbebdd51caa39f67a09c1639e81023e8077efeffeae82a5174e495d0cb0b74288c3fed9751cccd72a7a96523621b89d4f7f577ca1531e024395cdd
-EBUILD json-tools-0.4.1.ebuild 876 BLAKE2B 21d3897ddfb06955524144f7d5dccf8e2f19c292b699a0d36eb624ef9aa15aec726c2729935bac6541e6c2061207b9cf3313978060ab198eeb7b733199f86451 SHA512 7d6d1dd2529599ed5a632942498a4f7831a7f83199dd4b60574f4aa72b287a1ffa3f5c0399472a2fed0bc31c3151678173427fcfe7bf58ee6a6fb611f80596e9
+EBUILD json-tools-0.4.0.ebuild 830 BLAKE2B 67c68b23d8c37b086d4e81f0c0e7867262cfb6c64d9301c67196f9d3a7b07f973db8f2bb2568bc045638c1f39760d520af09e4c2ec15d3b722ecb421fdd62ba2 SHA512 6e9910d723c9202770a47e2c5aa80a1d26d405f1117bdd6497a00c0cf7b6e9a01d2ff2cbb4166e339d5351f2f7ad161419c7ff8366f0ea98817d896aba8f07ba
+EBUILD json-tools-0.4.1.ebuild 866 BLAKE2B 4cd9370e8ad8968d7dba219bd976209f34ac97439c4e05ae1f8d275a6af8586c1f1e3554c24ffad1c9616a461040a4ed15b0a2db8a88608099abc5bdb5993ac2 SHA512 7953cb21e7a02b1c39a8ef62c9d6692ed8675348aad90c060df39c8d782455505ff02debd893a3dd1be6d59c9465c5bf30b19139df278c2eda9e247192bb7ff4
 MISC metadata.xml 392 BLAKE2B b152e41d776f32f0a50caa01e902befca368710b83a9096b769b693775aff25a0f86b32eb79a40dfaadabd11aee44fff58c08836814ad017955acb1d1c155d8b SHA512 66769c970cb91b5eeba9870de3774f0f3f1e7fb9ee95e01af16293293874441c00efa233fffa9c9fd84c5e1e40518d88beb04f0f9d220b7f453c2bacb3272d4d
diff --git a/dev-python/json-tools/json-tools-0.4.0.ebuild b/dev-python/json-tools/json-tools-0.4.0.ebuild
index 512094807680..d8a5816e3fce 100644
--- a/dev-python/json-tools/json-tools-0.4.0.ebuild
+++ b/dev-python/json-tools/json-tools-0.4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 # 'Programming Language :: ...  in setup.py requires updating"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 MY_PN="json_tools"
diff --git a/dev-python/json-tools/json-tools-0.4.1.ebuild b/dev-python/json-tools/json-tools-0.4.1.ebuild
index 7dcd58cf695a..98d839e4355e 100644
--- a/dev-python/json-tools/json-tools-0.4.1.ebuild
+++ b/dev-python/json-tools/json-tools-0.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # 'Programming Language :: ...  in setup.py requires updating"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 MY_PN="json_tools"
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index 7221b806b2c5..c532876a5e49 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,3 +1,3 @@
 DIST jsondiff-1.1.2.tar.gz 7803 BLAKE2B cbfcfdb2c6c3bb721b4db43aca1d66649257db2cd9feb9655015e621fcd90c72af087696b9553a10ac89cdaf5f23d8748463e1a13bdb19207e34e12e66629544 SHA512 ca96bb80a6f7a34c8c5bcde74856dc1c4935b3e2979330ecfc33432aff83968e671b2aaf310c77f2c7d431be1ae6e20a960879700ba3c903a09a48b23d4c0288
-EBUILD jsondiff-1.1.2.ebuild 850 BLAKE2B bc74275bdec736747e7607022c16d0ebdab4e097fce4e63787db9e719790ac28fc48ee551fa2c67e93576793dda58f9721cd0c69b0988986caa31e65df8000da SHA512 ed1bd63e25afe9e68e1d3e221aa1d97a26d1282ba1e587b1073384fd59aa8f222735a539a47915701f62bf9947c79e029f4c420bd02c0e998c8422e5f1d7c2b0
+EBUILD jsondiff-1.1.2.ebuild 848 BLAKE2B 9981c72f2f403b6016395d5b1e88dfb6a23934be5a7b1757cca8ddf188b407f9a897f5c26f53f22ef2b4030d53192e4c0ae819091773389f876c2b823b39ad1c SHA512 f65798f2e7101edf3ec99866f51d2e54ecbbb2c75052cc7bb93d3391d09dbf1f2c379a0cdba54dff753be2acb1ee800e709533d2b2cbc09953eff64584f059d6
 MISC metadata.xml 435 BLAKE2B 3ea5af8e9063a07c6d3d93225a712395a351a368bf689e512b45e6225e23a543771839e756ee53cf51142b6309f0b1ecd20fff6203a69ae754c44893d09c5274 SHA512 d1b50f01a0a5f2381fe41e4da073fd00afd4443a76d692c7a2227e50b178e9b990c4c40b72d1beeeab7cc8e5f1a9a52beb758a5adbd088eb787b9f2d08844eff
diff --git a/dev-python/jsondiff/jsondiff-1.1.2.ebuild b/dev-python/jsondiff/jsondiff-1.1.2.ebuild
index 4f246f930991..9e632c5023db 100644
--- a/dev-python/jsondiff/jsondiff-1.1.2.ebuild
+++ b/dev-python/jsondiff/jsondiff-1.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonext/Manifest b/dev-python/jsonext/Manifest
index de7a81e7826b..013a48be7498 100644
--- a/dev-python/jsonext/Manifest
+++ b/dev-python/jsonext/Manifest
@@ -1,3 +1,3 @@
 DIST jsonext-0.4.2.tar.gz 9574 BLAKE2B cba417bc116e572f383a6d396d33fab0f6b63534ae89c402b6cfc0297a0c2fce336bf63464252fe9c87a9617f7f00ed82fe9de9d4e95356b60ae555963d4951b SHA512 2b47b48b529ad8f3b9662ce19f6ea9250648e17cb94e4a59a52ab6a9aabf64abb74f3c76a1edf274fe1e52863352456c0f95c5cd7406c44ca917b6addd09a2a7
-EBUILD jsonext-0.4.2.ebuild 588 BLAKE2B aacaffa3d88776f11f2bf6a3603733af21471b47e2f4fa4bf3ed70dda2a2eb5de2a3bed7ad1343519b134193d2bc14e7d7ff5bb3b7354866a54f513cc4825bba SHA512 0da76230df7a16d9993ee5354153cec819f90ad371c4b060c82451bb31b45511f8faec700c98d897a8b9d8c544ea37c25406c46d40ffcb04258bc448857a31fa
+EBUILD jsonext-0.4.2.ebuild 583 BLAKE2B 3fa51e13ebf412ce12135c98b5956e47b7385d7d2bb43aede1e525978ff84d0d6eb46a209f64af4a148b77e4b75b54943e320a69cee0f02ffe73eb34db701208 SHA512 5cdca928767b337f6902e0dc01144f345ce0222a35a22fe04154a424b928ee18bc90e2937f2a106a1bb4e25d554083f10a369dc37a2655ad89c06c05bb0d98a4
 MISC metadata.xml 478 BLAKE2B 917cd38f6d39c8fb63724e545d5a0d76a173b83dd43543dcc0400799c2cfec8966496e8656696947fff61f7fb25cdc4fe64ee73ca787d9072acbbaf376817a9f SHA512 819a01efba7324a2b5dc6829a882b1d8ec22588a0b615abf44a83b1e1ea517b463f1d01fae40c6fa3309ebe15f2797065575e9b34dc53944d7b44f860b36a6ed
diff --git a/dev-python/jsonext/jsonext-0.4.2.ebuild b/dev-python/jsonext/jsonext-0.4.2.ebuild
index c3df7420ddea..5959457d7f79 100644
--- a/dev-python/jsonext/jsonext-0.4.2.ebuild
+++ b/dev-python/jsonext/jsonext-0.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index d3afbf95055f..657065beb18e 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,5 +1,5 @@
 DIST jsonmerge-1.4.0.tar.gz 17953 BLAKE2B 625c38fc83bec73f1bca3a8950ec2ee2294ab7da665f4c3b7d78329e5df8a0ed6ceef723eeb5757463b1d702ecfae4a2fa7580915917a7c621c762b90c257504 SHA512 ad28e01692189863f38f363d22b6bb3cef0b0074e5f6092eabf7c58fb242085fa2ac26506e5d816daebd85049cf6fdbb62f9885d66e545c49e2ffeaf589cf122
 DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db
-EBUILD jsonmerge-1.4.0.ebuild 675 BLAKE2B 1efef2b2c522ad0b803b34f9f8c5a5adfb31684d3831b3ec6e44ba81843c3d32a364d976ee9d76f0ff1b0efdc946a018d92b2468477d04123d11feabbe899ca2 SHA512 f9a8c6ebeaf101f01e7fd06c0d4772a3e1cdfb9915e49be8d6b70459bdfb4ff0d9b1b1f370e9604fadcb4c743c783274dc070a9f7725a8726662281f7b357389
-EBUILD jsonmerge-1.6.0.ebuild 678 BLAKE2B 4172542544204328205cc3d267c9e63d6a169a449e05793010e1410cb2f82d9c8ed8570b4b6cfbf469703fa055a2d769c9ce081b00a3120d2b04450fd0812185 SHA512 a7b625fc40c42e469aa8f6d3d48a303de6175d8b9e5baf6442079cad9041dbac8efb35df1145eead49074821ae3b8f7c5f2d5f2242e948555c128afb08648809
+EBUILD jsonmerge-1.4.0.ebuild 661 BLAKE2B f5878effa050cf72c79a91985098efa88a05b952dbf3dba493614b0332299f455c90917a480ca597c7c035f5291b9359ee89b33b80f212e2b15eef1c28b27b22 SHA512 5b7da9155152ebae46d21f92548435a8034b082fb8177dc8d5c5a3c8895b55fb4979cb302b4fcde254750178d7ee55c76280d3bacecfffb1bcd61899edc374b1
+EBUILD jsonmerge-1.6.0.ebuild 666 BLAKE2B c372e50a769760a082db30c65bb685209e5dbef0e8931b8f666445a08c6f9868b9907ab5ca418f0d1fe2ff7a19cecee926e6093957ce284223cdb3f5d324689f SHA512 d7ffa81d3005261ac6cc1eb31e075b33c527ee3b42b941f954a075a380e0d39c1c6ba383b46c387b571f659b4ebf9485b32e491e8a4042d9ef00bc111be68370
 MISC metadata.xml 372 BLAKE2B 1490ad4a4f5950599628f9bbd3f7cabb2ab2cd52e0cea7fdb814674d3f50804675bac91180392a013294c72e3b7b4d551b0ade20331927ad9773ae4eaf2cdb3f SHA512 ecf2f464f37f4f00ccad0d697216fdb669ab31f26a571023597f8d7bffe2e9101bc618c437ce381879c64701f13d3b81c03dba57bf1a67df5b13c81a137865ea
diff --git a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
index 3e8a8ec3465a..eaf6ca230675 100644
--- a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
index fa454e60a611..6b51191e57a2 100644
--- a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index ee1438d4470f..f4ae664b0742 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -2,8 +2,8 @@ DIST jsonpatch-1.13.tar.gz 15119 BLAKE2B 70ddb570451ac1f3d218de0f79f0a639eb922ce
 DIST jsonpatch-1.15.tar.gz 15544 BLAKE2B 1b9facd2a88a997356aeace8ddec9011f4f3c4df812fb157cd22f1210ac2e2502e8b9e18e02ea477c869758cdfc1dd0b6b4c8d76ce59ffdd68d4db14c550b572 SHA512 c5df880764b14a2fb60bb46e319bf006644ce1472d0413cf08ad151cf386e5be9fec197fd9efe0bfc3aa22dadf4078344c11211c1e8a3d5cc3ddcb998795dc91
 DIST jsonpatch-1.21.tar.gz 15208 BLAKE2B 88af93bfd7c317319d958bc3386f9551279af2fa9631c24c49231eb67398fd80f298e26957f232c9705219d4fa7033bb62f98b5d5391f6eb9f53113a1d351876 SHA512 dc902b750241833a68612430f07007080ed56dce8a7a4bdd1c042f944cd6cfdc03f4b422cc6bed6bc3b21ea390c5a281cd08181e27d6b57fc5fb657787c1d740
 DIST jsonpatch-1.23.tar.gz 18162 BLAKE2B 86322a4de88d37eb674d28425d3aee4ad3b589c724b124f37f16e8303200c742404512b9c675f5b5eb8d8f7916469ebb7915bf289c8190092bcf48a1cb9ca7a0 SHA512 da612fc043e351087fbda26cd5686743107dafca1223e784626c39113dfb4770647db1420e9ab9eee93d12c608a6e0812f0825229ab092962cfb390b6b1795ed
-EBUILD jsonpatch-1.13.ebuild 796 BLAKE2B cfaff54a94f30369ac5a4f4cc97d2c87ebbf858545ea19a274117ff49da48f205a7792abfcf49177625c261b17ee60d6b1c498898ed755c728bc50979c33ad3d SHA512 6faff114933b84902d03eba04b0c0aa93949b4d31c361c2619b058c1dcc7f9445339cfec28a780a90e124fe3a5c96434487bb315d89b87f29299ea84643e2d32
-EBUILD jsonpatch-1.15.ebuild 804 BLAKE2B 1b45338496ac7865249646b51242571b1ae8c37e335c29e365edfa7938474fd5c8b0886127c58df54d73f3a1ad88b0bc523dd1883a376bc760ad6cf2a85d166f SHA512 5e256adb1fd419dd77418c1b56d5eebc8e1cc190bc28c5d559997a6556abc198f0b624f90b0df99f11bf79837faa2cad7855996f94caa8a7156c6683bdc68713
-EBUILD jsonpatch-1.21.ebuild 793 BLAKE2B 518fc1940720b5af590a4e77339588d1189473abf88e4795be32cb4ccf8587026372c6a81443a4404df50e0539b5f5de047ae35c4a3ffe3ce482db36e204a72c SHA512 3a977ae207c84ecf1dfbfce97e788963b48840c32e2d16bd5bd14f5346b0e086efc1437453c9f17ed2ce8c7405d80c48d0df8c9730292295bf34aad8fbaf4bbf
-EBUILD jsonpatch-1.23.ebuild 795 BLAKE2B 2bedb5d8da320ca4d5bc6639f7baa6c992bd4e99ea992e19f414df9cded5b2f7863ceea74534ca70bd20ae054c2818657b154587d4c9ad1a12a800efa6b7a57a SHA512 c7e18332f52a06383cb381863a44b885d4946e2ddc8bc33e34ca58a997a28c391927fe83131ca0ef5b578d7596ad24c422d9acdbcf7949dd9d7bf33ea99fd240
+EBUILD jsonpatch-1.13.ebuild 787 BLAKE2B 0fd66d85f737fbbee7301fc0c511ad171bdd5e97d217eb8df812d99f6fd62d9c07d568aaf59f4a739708c43e539810e566dbffe9c75c8b2a700433b0ca026615 SHA512 3a4487cd3430111ef57f0659cb209501820923e973d4dcb2f7c5427e883acb5f7aba272b75f21e64e1b8a4bcf72a2b59d2f4ca7796e9fd48da6fda62ee747777
+EBUILD jsonpatch-1.15.ebuild 795 BLAKE2B b096da01e4aae53a31354d1fe6061e05b091e9828baad6abc833731726fe0a594781a98a66af609f141a75277f3da205ef77c7da103517bf6914ba2af7066733 SHA512 2068f5dd62aee8597350bc4a3fcca37f7f7c207358f0acaafe37bde2e9a5f5d016239e114cc2073a094511b09ada5c1736b5fffc30206dcf141b42bb14e61a10
+EBUILD jsonpatch-1.21.ebuild 784 BLAKE2B 1d9db9a78ce21adbacdc3115ebd6f6be9315db315d4b36c81660d1ce301f467757db071e8827e78e158eae928c15ff45a2817207eb0a697c8468ecff32ee1fea SHA512 611d7c8ddd08e8a8f69a08563b26743c92519d45c1345866aefb189af470bafe3c2662e765c9ec366757a6f349e20833d6121a9b092925aa81d78022d0b4831b
+EBUILD jsonpatch-1.23.ebuild 788 BLAKE2B 7cc1254613f42e75b30f4279c4677f85040104219325ae794c44c0a431bbb390ddb45fd6a4bba7837f7d37c277bce3fe87d5eacd72802b0f1d4f2ec0c0da20fc SHA512 cf350aab9bb2e994ef77618feb3ce8adbb4824eb4e67738bed901b687730f21a9910e3abf27747a7f3a7fef52455de7c99e8a08e05510a6acac166e0e7effa87
 MISC metadata.xml 679 BLAKE2B ecac7a9a6da1482f0585c29ab1e7f1ea3729dc4c2b4640440b0a1a5eddbbbdc7d2c029c4318ab3645a4025b5e21d11015ec76b21f5b069d49a37bd74dcad6e1f SHA512 37946af836c2d8b521618688ffee4b33c1864751081c1f1cd86442e6eb6cf822cfd9dbc228f834fbd31ca63b1dd24927cdb680076e2bd7ead941558ac1d2e436
diff --git a/dev-python/jsonpatch/jsonpatch-1.13.ebuild b/dev-python/jsonpatch/jsonpatch-1.13.ebuild
index 868a8a3e4e31..359b638f6b48 100644
--- a/dev-python/jsonpatch/jsonpatch-1.13.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 RESTRICT="test"
 
diff --git a/dev-python/jsonpatch/jsonpatch-1.15.ebuild b/dev-python/jsonpatch/jsonpatch-1.15.ebuild
index cdcde0d0d784..afc9c529f93d 100644
--- a/dev-python/jsonpatch/jsonpatch-1.15.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 RESTRICT="test"
 
diff --git a/dev-python/jsonpatch/jsonpatch-1.21.ebuild b/dev-python/jsonpatch/jsonpatch-1.21.ebuild
index 2c0a9e7cf171..858be7d7a100 100644
--- a/dev-python/jsonpatch/jsonpatch-1.21.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 RESTRICT="test"
 
diff --git a/dev-python/jsonpatch/jsonpatch-1.23.ebuild b/dev-python/jsonpatch/jsonpatch-1.23.ebuild
index 2f161cd1bf93..9076661a498a 100644
--- a/dev-python/jsonpatch/jsonpatch-1.23.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.23.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 RESTRICT="test"
 
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 8436da310691..5bc03f3e7e00 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,5 @@
 DIST jsonpickle-0.9.3.tar.gz 60489 BLAKE2B 4767809a3bd5816343e9081bdaf45cdec8dfd1e28b832675e01ae415c1ac081d0a84e2827051520999d11d0dc28a62bdd09285cf384fff0f941d3a571064e2bf SHA512 38de2ab2c15e0e28323a8cc83b0c0b0631f2f678f620e8738fee19c71492f011aa7eec428b859574a0066b9e24a08bde911a283736757964035befe3042f2e06
 DIST jsonpickle-1.2.tar.gz 74693 BLAKE2B 65f9c18b8693351995f84815d27f2d86ab65fe7a620cda0d346b88db56de45ff6aa21b7ae941e8820e16e184d9a5ac55d56caf112f3930083e63b50751fe2dd8 SHA512 0a5bfb2e77175c9174ee1783301c613e25fcfa60f07e610206d1e1e34053e90b21b12bc1b1045dd03ff2d4efe5940d85d852800037ca01397994c022f0ffb2c6
-EBUILD jsonpickle-0.9.3.ebuild 1567 BLAKE2B eae8822925fd34fad332d435798d7fa5379be6a8cc077253162928976c6df593e625e85540cd54af6b72d29e69510a1986250d17017afbdcbd8dcfad847c4a7b SHA512 402860c71c01cb10235b530b9eba2b04f7f7aea9ad4bc96b3a8e21d700ce880c171c2718d4b952d5509144de06254856a362033f1d56100c2fee34588bc992fa
-EBUILD jsonpickle-1.2.ebuild 1559 BLAKE2B 2ab10c96cb0ec23830ca0a8a627aad0612180ba13cfbbe700366d9bd128f2f416b3eb7116325b9eae75bd4b217b2ff89303c96942c495c7adbc8e6e1a869d2e7 SHA512 058d9616849a1ec2dbee4e9ea8a50aacb448ec5e9cdc15e07d5902b670e22ff822ee49ee0d195ba00751d3e1a98e32d33dee7a9ad0d8d688d8190d409a3dea64
+EBUILD jsonpickle-0.9.3.ebuild 1563 BLAKE2B 6e8d9bdbebd50aaacfae7ab4f7d64a478a5dfb5d52416e1d8bcd50932a8c443c26c2525581f2343957046449eadae5db36298bf7dccea121c5b4b23e163e43f2 SHA512 e81fc0a4cc0f1d273f43e24671b9ab140802a7158057a199d1ae3714630cf26cd7a9554c65861d59f0022dd012a032a80070f77bfa09b4c241fcbfd0dd9f4140
+EBUILD jsonpickle-1.2.ebuild 1557 BLAKE2B 23ba29e4d041c23e27b3778b87e15d7644267221dc8ba011712339608966ee4df17be19c5f50b14732e2daa2a6d09e7fd84559287690e6d780e1274ebf4972cc SHA512 d10aea6c84661fa6efd324791b3f977d43342161f346f3ccd0c4b2243d65a307b1563a2a67db1e6a6817f729f7e75c409e666bd0d9f42c81638a03e7c022daa0
 MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759
diff --git a/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild b/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
index b3ac82beafcc..f3ab073616d6 100644
--- a/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpickle/jsonpickle-1.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.2.ebuild
index 893f7cb89ee3..5e9f42cabf98 100644
--- a/dev-python/jsonpickle/jsonpickle-1.2.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 1a016fcd34cc..4f2716ad7330 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,6 +1,6 @@
 DIST jsonpointer-1.10.tar.gz 7577 BLAKE2B b4472cd9ead51fe75f2e53690d4c0378cb6b5dccae240bc1bf264bff9df15bdfab379b1043221e66074e08c3393ecf729e4f95721fcb324fe8b710cd49d7f064 SHA512 b2df5f19b14b670825b18f7da4ca50b089beb2ccbb1c69acfc904eed82b5315ad19940b4aaa8f8504c2fc7d477778d65e31f492dd30ee8b5ba95ccfd0eaeb9b1
 DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137
-EBUILD jsonpointer-1.10.ebuild 638 BLAKE2B 2ebcf0644b5d6cd7baba9c1fb7276b4fa1b3ea22dd545f5cdbf1d56ca51ad4ba60c90aaf48a8f42df44ae456da5bd891b24d3cc1703c22a1c4e0a288c9228388 SHA512 a09d13d511454edb9fca25a01e64e4b47bb8e976d4cf4c063f7b3d85f33407ae5c1ade3342c79df5180c0185cf2394fe4ac9378b0b538e9905aa6942b55aca66
-EBUILD jsonpointer-2.0-r1.ebuild 645 BLAKE2B 6c0692c55d1371340be9a16669479d454cef008f630ef24bcff8abe845ac8c558c3bf5373f33802e7d40f76ab82d4d73d95054603c5b6107472ccd135e1a9dd7 SHA512 e29d4e9824bcf9dbc17060823dcd02fd62a57767f85ef1ad08252955b979b925f60b971fdf9b888a983e0cc956840b52cf7cead549655fd2a06b1af13759962a
-EBUILD jsonpointer-2.0.ebuild 632 BLAKE2B 155809e8ca9ec27526b9642fa878c2aece07dbfcbb2a08c1a82a23f52d1cc4076684d04db0f188193b92d1d548d28a51da939c260175812a0709f36962ec4d9e SHA512 5bbfeacf0d847f965ad2be8470b1cd940c9ae3e3cd4fd9b16d9e00f6abdea5430ae625bc427cf4a6414003b3ad0b7201773379ba9836ae70603a6d9a6b91c474
+EBUILD jsonpointer-1.10.ebuild 629 BLAKE2B 5bbfbbd9a7741a8ae5c52d86b525e531618e8d8717e7c99b47efad9fc1bb16f17acee07e49051a75231bbc4358d9828b9726565c6b84ed5055a98aed1dca31e6 SHA512 20c14ec9c1c955266941591157e71c2ef127380ded0bb426a80a49f62841cf7dbc7d48673c3416274bc21fdb3c2f877fb8f7ad8d1a0a31861edf1e5b93266514
+EBUILD jsonpointer-2.0-r1.ebuild 640 BLAKE2B 2aa939b9a86f22649673e17110305b44b0e9bd21799b7b951bab659a3b76d1f623d01a17379d72103b2960bd6de52b8ce9a6091ea61655e85633df88383d53bf SHA512 71629dd582376c774373dc70d484f1be408f81eb2690e119ff22e71d4b18dfdb21e86c1881c08727fb85360df85cce7f35875082e9c33e7ee90ae312b5377fde
+EBUILD jsonpointer-2.0.ebuild 625 BLAKE2B d411c533826cc23808cbdfacb38ffe6d93bd63c663abf1bdcbf6ae12d36e8e2e2708c2cc64db493faf2f1ab279e224df31a4e7349ad60e84dc8828119927ed3d SHA512 3c21bb33e6bba667dfb62ecce849781b869c1bbd39071564df3f5e6b8c7491662d3dbb62de22673848aaa9aca8b9f937201732fe0f1c9fe5d4df3e14f26eda35
 MISC metadata.xml 702 BLAKE2B 20a9bbb2163d360f6797170b59d71a8233c7e7bc9f66f1809bd5c70d4c460a464fc0d8ad831f4ff08bb28df0c2ff77c0a0fd483a6295a7090fa73d1a3a4902ec SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8
diff --git a/dev-python/jsonpointer/jsonpointer-1.10.ebuild b/dev-python/jsonpointer/jsonpointer-1.10.ebuild
index a5287de43875..08366cf2baf7 100644
--- a/dev-python/jsonpointer/jsonpointer-1.10.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-1.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
index 53f3cf518fe5..dfcefc1b625d 100644
--- a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpointer/jsonpointer-2.0.ebuild b/dev-python/jsonpointer/jsonpointer-2.0.ebuild
index ca6ccf6a6273..dd6130470fee 100644
--- a/dev-python/jsonpointer/jsonpointer-2.0.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonref/Manifest b/dev-python/jsonref/Manifest
index 1e0a83487884..32d4986aae45 100644
--- a/dev-python/jsonref/Manifest
+++ b/dev-python/jsonref/Manifest
@@ -1,3 +1,3 @@
 DIST jsonref-0.1.tar.gz 12296 BLAKE2B cab2b4778b8a0184989ed6ff520ed6f12a68e9109a92aa0fd5521b69ea14cd5b6301ce61bf98f0d0d4d44fb016f7d6bd99fc804975bddf1c350bc4b46d62f77f SHA512 9900601feab0c20c902a6d5575fd411898af126a650d0c9ff955f50f5bd1f5da8e5a071ca86cac31ce3c5fb35a516f849cbb70098cac2cfdc910ba33a1f7411b
-EBUILD jsonref-0.1.ebuild 568 BLAKE2B 4ed25085d60114d9b68e03e755611721b0a7616b431e298066118617662821e2b993581181ec2c60fdc1bef95884b0f9bac7a452bae6d611be97ee37141810a5 SHA512 9cc1a96df3dec7aa6f3259c34044a0c5b3ba982ca82a8357be89066197ca8f793cfe7f992090fc80a6285982674f822106ebd2a249343280ef1afbdc107d0201
+EBUILD jsonref-0.1.ebuild 561 BLAKE2B 65146d6e7161f2bce50abe01f4baf5b523048359406543030279b1145f4051cfd9c326c503e15ba00c839c50c101dadcba1cf0bf154e4aad74184f8525cd368a SHA512 8ffc298e654da6cfb01ea6e719c291a5b156bfd7f829c5adffaca9d0bec8e40c7171090b43af0c1323ffcd910c544cc10119ac9bf21df9fbd71f3b658e3b93a3
 MISC metadata.xml 772 BLAKE2B 48b8cc40f83a1ba2d3a4d7e6eed3fed74188b8a9ac8592009084eb692bc2902896692f125d986ef6418c4b1cf68abcbde0648cb3b0ec7a6609d40387105c0ff5 SHA512 59433a3ba6fbf178eb55dd21ff25e503235065d312a930818a85776079d0cda7d0a06264f83452302fa7897ead09c6414e53e7554547b6dc58d026a93dbe8d29
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
index 0145bc8b13a3..72b6299b47e6 100644
--- a/dev-python/jsonref/jsonref-0.1.ebuild
+++ b/dev-python/jsonref/jsonref-0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index 39e90dd76e05..6e110d9ef9c1 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,6 +1,6 @@
 DIST jsonrpclib-0.3.1.tar.gz 42704 BLAKE2B e3c83bb25ec83a93fdde8f6f4b8b18de0d0ddd0cc35c04f9f83b1f0e75803211a6f6b85768b0c7f9de4bcac18df721df8057148aa7aa0628dd1d345c2e4d90e1 SHA512 7cd44d44f3952ee7ac4006904427ddd3a69b60e6a0a4eaff4b75d03b1c30f7a65debd69552035a4ee375a33c80ec428fc1ef10979f55316bcfd015603c62304f
 DIST jsonrpclib-0.4.0.tar.gz 57944 BLAKE2B 3458aee2dc27980ef93d7ae650f7d7485983598c8276f08b104a5b44d5dfb8f6225ba649dc7f6537fa66f6ba86d7082e11e23c7ca051c876a96d1b25efa4fa0e SHA512 357743e34447cd6dbe330c5adfa5541134a0ff8d82549ec47ed741ddf54a7aabb8cd417c501cb9ab814ce2cb90e1c2d4d4f21daac3b379f38be03c38a7ed198b
-EBUILD jsonrpclib-0.3.1.ebuild 702 BLAKE2B c9e86bac9f0c65a7b8cd5a9f248ccd4bb727cf704a8659c80a3a28efd99d81725ac0c1d46f893b5488f705fef4607f05f99b55aa1e0e83deaf2f988fb06a115c SHA512 631ab17f22389cf551882021db4cd20ced366f7d21e28b06d370f2e677cb17af2163a29d7c063e39269726e734d152b6ae58071fa1f2b1edb0cc403da78420fc
-EBUILD jsonrpclib-0.4.0.ebuild 771 BLAKE2B c03171093ef38950fe210ef51f01de32010a8eb9ea6e168a8e4f947085599532908570128bad7f4d8afee175b5fa71b76c9b0192795cf08d356aad3073ec62da SHA512 af0d6b88e2c113cfaa6160fd168fed7d00f13d0fb6605716fe13d5b6955fc741c8e7abb43ae37d91f1bfc1231fd2927cffd0c355c56c682927358a750b9cd540
-EBUILD jsonrpclib-9999.ebuild 766 BLAKE2B a2a5bf75799f123d6eed077e2e11a86dea6c284ec32b4a6a213a58dee0c494687bbbb24b950bac2b9e54ac0465d5aeaf3926e17cd0ca81b46263c9d4d6800cc9 SHA512 c9707058624093b11e8c8b4f9e1d9153da6301d0af4842f57a0c9d107796e7c4c5ef571f31b560cd5fe294c2d01d8bf5073b09f2abb5d22d294e70db5301dbef
+EBUILD jsonrpclib-0.3.1.ebuild 698 BLAKE2B 4b0343079ea22baf7a1a5067d8e10fdde867d2c4e607ab739ecdb6f1f2024de4db9e98eb53189ddfcf3e970faadbabf2f66428e96b54540360ec925f42ef7981 SHA512 a82884c2eea22dfc31c4209364cc54c8993658fd7c087153f2d9bd37222d4bde318fef59b3bc5e12fc791ffd4f3d2b51ba74a1a154ea09da27d905502d193bdf
+EBUILD jsonrpclib-0.4.0.ebuild 769 BLAKE2B 3d9b18049ea7bada9b1fa8738d16d614ccdb7c9489bbc415f0a26fe4ad957c1398873be4574a4e3d3ced7f86790c0bd8203f128ba4a0518def4e66423e062bdf SHA512 0b03b5e112181815feef75603059dc370ba0cbbd510403431f2b57de9417e251b2fcdd9f2881a5f8d4dbf2cea07bd6e7567d16d213239b2df47567159508edfe
+EBUILD jsonrpclib-9999.ebuild 764 BLAKE2B c50c1d6697800cad7dbe22935d1157c69142eadc872dbe1b998e89c19e598aa0f309e2c9dc6ac23ee7b814a6a5cb3be41ac78ac74db8d15c5206ff8fd517d103 SHA512 72a2236b8a22c986f0138def4a117fcfe3a61e1a187bf91f92360a6ba459a2a4bc03ddbf8cbc56df53c6de94eeaf5901f636baf1fe8da0c8ca7e156777fa84d1
 MISC metadata.xml 453 BLAKE2B 852b07f16a1773b07d2efebb8bb338c972a807fe2c7cb99fdfe62a2c6cdcb63098b9b76a2e9173af8f397ab5aea724732296882689fa42dd66381543d84246b8 SHA512 5ecbc0cc593546cfc7bb86cb789df99aa25e38c215971c35e0dab83d6134348f591db126f62f4a578728922b2aaad0d664b797edd85324b51c6b9e6ec0cd264e
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
index 69aa8c335989..4b06bc13c131 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
index 90a5531a70c2..555604f61900 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
index c7b359ea5372..7ce2952d724e 100644
--- a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 0760f2ddca2b..9d01914349dd 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -4,10 +4,10 @@ DIST jsonschema-2.5.1.tar.gz 50855 BLAKE2B 552c8878aff8f67db6011abfcbda73efac82b
 DIST jsonschema-2.6.0.tar.gz 53252 BLAKE2B 38d2d1d9f91e923e66aa44fede2597b129813b18b39133da1935758dc651a0e567515e8b97bbd0cb4f0a2cb652c635446aa3dd4026066dc3d996e32a33495af5 SHA512 03f916abd023b32fbe60f91718d6f2f94d8834bd1bd8ec85ab02f591a145161275c2cde25b037c4d2e94703b870159feb776d3556f011e4c394d2e20ab897b0b
 DIST jsonschema-3.0.1.tar.gz 120834 BLAKE2B f99d77847a697bb28bac39b7b9a2c6c80cf93eb09a5d585e1f734ebe7d1bdb732b8fcd0c945106ac55c6d64a236def0e1d803a18a2df5e27322a2452ce99a55d SHA512 564e7385728b15387cd44c06cf50c36342fe4c6f497d208ce3d611d1659023e95ff032b2609a786cd9610bd915f878d138eef47913f18cc56eaae0651eb6efe8
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
-EBUILD jsonschema-2.3.0.ebuild 692 BLAKE2B edf332e92d264e6bbeba52d49c890abe881cecadd409f9a741b9613310b4cda9f0df0b30f5f39591df2e0a2c0fa3ba0f08cbc2f53f9b1be7b40b508d5f28f6ae SHA512 8d60ad06e6c4e02d94770e7caf51278aebd4cbdf1e8f37afb2da1c5616c091beddd0ccd739dd043b5530140b50649e48ec13ef0049c2452a9617f582933e0182
-EBUILD jsonschema-2.4.0.ebuild 570 BLAKE2B 9f46bdb8844db9604e4d7da36d795cc1a9b4bd771e3fc2a1127fc33a7b353a584a5fc09764f6f221e882e29c9fa55d4856796ff28cec16ada37327468b2f9f22 SHA512 9a039532d9799114aa4fa2f0e51d3ae20a279538d462d23fc86f5139e35bf5c7cf097516ab534c22210e5a7d6e02ea35fd4968d27c8f46f24d9088dc2f71c722
-EBUILD jsonschema-2.5.1-r2.ebuild 1031 BLAKE2B bf99f70a330c536f929c8af894375a4373f7ecc845bbd5b881d06fc0b87661801f5286907297571e3b36d8a34730cbfd23a48369c371c4093fa67490d03a4e28 SHA512 0eec27c2ec4112bbf2d187416fe323c4a24a550eabd8e92aa03cfa1e4c60c8b2feeb5ab35d93ada252c874fdfe6f459170b6c8f5fc053c17e237f1f9892eb326
-EBUILD jsonschema-2.6.0.ebuild 1048 BLAKE2B 2c1a03584ee0c2677382e6c3a4120a3155ee0d00fb256d54e16b5358b2e63642b84f961a00c6230ef49eb1259b2056d84d86049432190f2042614ee33e08ea14 SHA512 1a355af458db1d56502763c9717ee228e65dd740153678f7080ba82c0e192592da5d2db1527f0b75745b151f2126a773fb5978b0d5287bae85efef3dd12716e3
-EBUILD jsonschema-3.0.1.ebuild 1200 BLAKE2B f6eeff45cd1d8c4e325921b220b65543db696b80e4e51d27db756276097423e70c4cdf7af17ba2431aa6c4258b54469e54e2f69f29706ed0fade22577acd6d17 SHA512 996ca746ad54404b14fc8a61daf192b24684fc160e8435403319b272e8b4f289d8f5d7889506dd6c2262fcf1a1778778b7633a0992e611b33a560175e2617723
-EBUILD jsonschema-3.2.0.ebuild 1559 BLAKE2B d1b421fda76da813e70911a257a7bafe3fbbfa61a06b271987515fbcc0424b4a24648231d82341e554e997de340439dbde72f8240d86b0604383441a313bff5d SHA512 678d629edc5f3050f894a2c499b75d208aa12a14b226cf6c7e3d28de3f33bf111bb6a4cf08a8e4483dde3983b2a113b720f4b2053907f940ea23aa659b40bfdf
+EBUILD jsonschema-2.3.0.ebuild 687 BLAKE2B be0d1616cf323f5a1b478f6a98c712568f3b58313757052f11405ed319426073a8b7ef20cdb85ebe1d573ae0de02d53fa1b282c813d9e351f1819c6d47e02cbb SHA512 e3c5679eced94600b57e78da474abeffc6076d4bd445fde7db1b33011366e82c378b4b8674ac8128c1a7f29e5ead348e195ddb5e8e1c241e31df59c9175f0e3b
+EBUILD jsonschema-2.4.0.ebuild 561 BLAKE2B 3f941c12adea187348f4ba79f22c1608d5e02f8407a5b126535cb0399d5308e74816c47fbe1af15357f94cc6a022c0bf78ec25d7efccf4559945d8b74fe83cd5 SHA512 2acf14f52fbfddc8af7cde759fcabc87c17293c36c5a2f47dc3987543cc3b8d3193a5dda2cc48b7673ea4840b25f867410b98aae5e4dd6cdfccad26e5d165ae8
+EBUILD jsonschema-2.5.1-r2.ebuild 1022 BLAKE2B 61374c73558313637e8f6208ad57e5d177793c75ff3c605c99f482ebd50a4d0191a2ed4f363b6aa9a572699077405db80e0296b282f975f621895c19978546c9 SHA512 3233bc0c828e259509ca644c61302c95f8dc3461b01c9a6ba59297a0ddb12f8cae9e6c9175c80f4dd8a3ecec641a7632797d7e42375eb145f79bd30ffd8769df
+EBUILD jsonschema-2.6.0.ebuild 1041 BLAKE2B c9b65b75e69535422ca41678e6eb13681620e37a5855b3ddfe342a21d7d444dcdb20506157e1b2469edede08a2ffa956bdf30274aba574c947a5ec5988cd8213 SHA512 523558e3897420e3b8a9d291bd8dbe609105fc8832cd0a84101ef286387f66ddcd06c9f6a1238b18d8d84c85f391248a018cad66b18c80c88fb7a636cd50aa49
+EBUILD jsonschema-3.0.1.ebuild 1193 BLAKE2B e794968d6e67e80d03c011d473952620824554969ac9060d6533bc617667d6581313253fed1ae1773656f9177f70715ae1a794da8898244d97ece6ee3744c70a SHA512 36d9254597100030ac1ac974f95a682a1421a2f4352a07af018a16222282ee206de665e50bc52ee363a06c1b35e6422de601f6b9543ec34a6374d4ab58379a2e
+EBUILD jsonschema-3.2.0.ebuild 1557 BLAKE2B b503bd7eb80b75f3761edb61e9c7b0229e3469d002102f464082d39b35397bea8179fbdbd9e63388b303a15022a0b63573d2dc06c6bb8e94b36c3102c3d7dfbb SHA512 9a8cf3f0c9dd7bfef100c60b593c6cb17611edecccd59ec6cdae2691007b16974586676e3e3dfe6dd71b0236cd48c961169c94484ec50a761f717102d15c09fa
 MISC metadata.xml 559 BLAKE2B dbfd5c0c2d3b9e3ea197db40ca1c1ea22e63e61bb540646a4b7dd711ed4e5a8a3bf5cc149a90e9911de76db8895f4a807b7ca1500d8a3937527902b0036a8360 SHA512 6824c104780402599891db143c021ecb833d2bca3dee97a6d12cc51f23856f6e9dcadd2a438ca8ad13a6e292048cb5bdbdf024665b06da547fff1c7b9f5090cc
diff --git a/dev-python/jsonschema/jsonschema-2.3.0.ebuild b/dev-python/jsonschema/jsonschema-2.3.0.ebuild
index 732de0fec5cb..a68173a0b00f 100644
--- a/dev-python/jsonschema/jsonschema-2.3.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=(python2_7 pypy)
+PYTHON_COMPAT=(python2_7)
 inherit distutils-r1
 
 DESCRIPTION="An implementation of JSON-Schema validation for Python"
diff --git a/dev-python/jsonschema/jsonschema-2.4.0.ebuild b/dev-python/jsonschema/jsonschema-2.4.0.ebuild
index b027d9ef7817..539b80ec4540 100644
--- a/dev-python/jsonschema/jsonschema-2.4.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=(python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
index fc1012c726fb..a7ede4fdbffd 100644
--- a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonschema/jsonschema-2.6.0.ebuild b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
index d7cd1854e4ae..ef3f34fe4724 100644
--- a/dev-python/jsonschema/jsonschema-2.6.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonschema/jsonschema-3.0.1.ebuild b/dev-python/jsonschema/jsonschema-3.0.1.ebuild
index a642c5eee676..08d340d3912d 100644
--- a/dev-python/jsonschema/jsonschema-3.0.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index 1e4c2f053da5..2bf5f57a11ff 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonxs/Manifest b/dev-python/jsonxs/Manifest
index 28d20168c4dd..6fcb234d276b 100644
--- a/dev-python/jsonxs/Manifest
+++ b/dev-python/jsonxs/Manifest
@@ -1,3 +1,3 @@
 DIST jsonxs-0.6.tar.gz 4071 BLAKE2B b19e6049be686abfcd0ce4dfd70b15c7367addf80ade80d3cdc3b3521885d15d92a3c5f71e80bb34de5a51fe8effdce3f6caa05ea5f7b60fc2ada536d98d34e4 SHA512 6dd5cb58b3f5ed00166bae175ef8daa4a4c18970c44afcc197bcc502433b164d5e3a6dfbd2f21f944a9339c257aac8af7bf1df8b3f1c2b12cf17777fc99e2272
-EBUILD jsonxs-0.6.ebuild 441 BLAKE2B 7f4cc8139329273d81fc90652e622bd73bf9e4485e2d698d9c710f77b7b3b7397b14f683970a11976606ee2fdeb2861bc343253ab2ff573592148e76fe60f3ce SHA512 0aaa3fe7c66e52c51c6d281040f636ddee4ec4c4e262e284233e85d77fa8a9f84f1a6e9ece0ad0f91015db476d77ded5a0fd09bce67a16682c0ad68ca375349b
+EBUILD jsonxs-0.6.ebuild 432 BLAKE2B 04b828a6edc03cdcbfed626682fa83de1c9570d72ba3eaf368f5f216bb9f86915daa96f4d0b3fd804bb7f4b7b74e2fde69f66e25873cc64b3be066f6d8ac6420 SHA512 8e8aee5fed57fede360b869e1930b9b60bf26c416fbe26e3d9692609a58c132b8b4ecd0c92ebb4ea2f10c1b8f9dea267063e9eff23eec0cac053933c60bad8da
 MISC metadata.xml 364 BLAKE2B fb2eb258477bf4ba6b46d289e3371ae0b5789749c410b091305f0d626509d297c923ac33493662010ffde395d914871dac995e9c66a7dafcb487dceb594ded5f SHA512 64ef116db1ad26b23d117237d4e2a76d9bb05aad9c9a0885e5e22b93aea2eef7187feec1566541b0cec4451de43d24668e6948d3378035e0217ac2baf4c3c849
diff --git a/dev-python/jsonxs/jsonxs-0.6.ebuild b/dev-python/jsonxs/jsonxs-0.6.ebuild
index 92a157d6d8cc..2a5c8d589155 100644
--- a/dev-python/jsonxs/jsonxs-0.6.ebuild
+++ b/dev-python/jsonxs/jsonxs-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/junit-xml/Manifest b/dev-python/junit-xml/Manifest
index a27a2032def1..bd6260e3d9b4 100644
--- a/dev-python/junit-xml/Manifest
+++ b/dev-python/junit-xml/Manifest
@@ -1,3 +1,3 @@
 DIST junit-xml-1.8.tar.gz 9995 BLAKE2B 29dcd9053e3d02dffce537318458f9924aff78df2f465ffb1a92affcf84734c81cd9a951523fa8b6edf09e871acaa426d7a755ae167279c9954660737a44062c SHA512 8fcef94ea73a77ad597bb3280578f0fea86573b779eb4aea1e458e55f1866637a7b43aa04502a65ecb1f2a7403cc61a76ccd35feb4b69eeb6fdc8352914d61a4
-EBUILD junit-xml-1.8.ebuild 685 BLAKE2B c34d75887c9af9ed78e24b968d5d23fe96f99173b12b14048e2302a97223c7cbc9b960448f06726b6901b3a7a9b009f70cfa2d3c0690fe53f65dc4d64260201b SHA512 d4423b430ca59a16ccbedd6ecc96cfb37bdd553d22c388d32ffaf7361d901e0bc8211273fe775438d96b41a396250c1379456ab3af694adf1c07204a29d9dd91
+EBUILD junit-xml-1.8.ebuild 681 BLAKE2B ead0c76a46e44ff447212062f19eac09e3d59326388ec05fa22a29b75a62b1bd12492520f242fdf5dea930cf27db08e258c29f7c01f6b7d71cbeb45b6a0052be SHA512 fbcbf12151eb00a9a88199e704b086efa630ed00766b8fe22a202667638ab02cc3d1289b83630058b48f513e9a40751b629875d107d2ba7fe6c1e47278db1e41
 MISC metadata.xml 394 BLAKE2B 6b67025e70bfb33452ef3e9a6b3c953ab975a88264148ce1c3cb022acb74f54bac8e84cbf66a8538c900c2d6bf1bdfeec9bb0de00ae231d22909b494b75e6ff5 SHA512 f5a65246be9868f444ea3e828df737912d18f26bfe766f0deec8306d2c6aeb11a645b630cffa6d6fc486655b122bc46d64956cba07a23c15fc7d97e9f81fc23c
diff --git a/dev-python/junit-xml/junit-xml-1.8.ebuild b/dev-python/junit-xml/junit-xml-1.8.ebuild
index 8c7e819d493b..881504a7c35c 100644
--- a/dev-python/junit-xml/junit-xml-1.8.ebuild
+++ b/dev-python/junit-xml/junit-xml-1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
index 1f334f60d210..158ca151c822 100644
--- a/dev-python/jupyter/Manifest
+++ b/dev-python/jupyter/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter-1.0.0-file-colision.patch 1727 BLAKE2B 59bf5e567e6da9e9f3d84178942993072e1697c1c4c06e06d606dce7bdc76d296d10c30cdef2865bce7b4c26136a1b0a2860f009f1530c1815b48b3300401501 SHA512 a6b4cc6b91bb9941f029963cc3e3b7f415192f64788a34dde7828d450497987f92c25655c5ca183a7408fb1fb439917ba0f0a1ef1db3fe3bec1fc46d9ad2cf4d
 DIST jupyter-1.0.0.tar.gz 12916 BLAKE2B 36476eaf0119613ba6d9f153aab1658f43951dc3879cb6a9e90d8fba14cc1247305e18fda2251127faac4e68867efd3ef57129675bbe89a17a6469255efcade2 SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520
-EBUILD jupyter-1.0.0-r1.ebuild 1288 BLAKE2B 31d4af4c53df48254a832e484de652ac98e842c0fb034d679060d6a12c03e6e5353fad6efe550ca5f47b3dac87d65842a73ca854ecd6f4d40f911f208b23b449 SHA512 17e33c8ea42ed3f239a39f7be823594bd1c4d854b451b9b138089030a378ca238346092f171f05d673e169d6c94104fc29ba9250e1ce118ee10bbf79efed7aa0
-EBUILD jupyter-1.0.0-r2.ebuild 1288 BLAKE2B d449cdcf51fca9dd3e6fc7103947e69b5fde877d98c8df09ea4ad7224bb1742d0d7a3f561caa08c475974cdcbe0bb6b4f39e0b13b6ad5282d1d836de64d3e713 SHA512 28ac8c0fbf26c70d262a0c69b4f23ff661c398f363fe5afa31b24360c7da87ed83333a0b1eb52acb278409cb201b1712edbc25bcaa5cd02b77ff21ea0172ab5d
+EBUILD jupyter-1.0.0-r1.ebuild 1284 BLAKE2B c53d10c449faff81084447dda5a4bf060cc7eca94c455999ec63e38ed6e6a7a5c0283a298b124c75ce76109516678fdfaeca77f7a7068efa20bd7f17ec1397e0 SHA512 a66983c898c9b6d85bd56fa6da2edf1abaf13593858429441a189220c35453f151d23f63d75dc5712f1e37c82f5d6b939486a7532914f3414e1ee2de4c1b0a55
+EBUILD jupyter-1.0.0-r2.ebuild 1284 BLAKE2B ed5719afb736c002ed2603b92e882c9a2da2810b162737edf2016bf6dda89ebeef65a394aa1a580d338933be7c5aed09b101e0a639f796e06fd872a5a20959aa SHA512 5c76f78b5fd5d8c744cca5740dd7a32c03708788f9cf9556c95d863850f6433d0212cb0c4e11abbc5f27d813952307398bce4358cf72082624b2cc5848f8dd90
 MISC metadata.xml 518 BLAKE2B 9698e2cc9423ef542d9cfb8b19be99b925a4098fa1350ad0806c384c495aca26852cedac070d7b83db27444413f72e201f7daac1ce30d05bffc09ac8270b2d7e SHA512 3838bb1bd86e45821a6793faa2afcffa0a887876e35fd36a2b21e6e6312256f94ab79026232197752c922ad51208dbc04a30c43e0bd0ab8d7945ee4fe2947999
diff --git a/dev-python/jupyter/jupyter-1.0.0-r1.ebuild b/dev-python/jupyter/jupyter-1.0.0-r1.ebuild
index 3f1326b4bd70..816b444bd17b 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r1.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild b/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
index 608399551755..32ada3178bad 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 0dd612ae6a63..c84fc7523db7 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -2,8 +2,10 @@ AUX jupyter_client-5.1.0-setuptools.patch 1062 BLAKE2B 1d01f2b7382d19f63c8bff813
 DIST jupyter_client-5.1.0.tar.gz 265233 BLAKE2B 1f4533e1c6578e61b1a7591889805d5e324a3cd368cb3998131f2047056c87984ae26d83c9de0277aa6f19b61db4c4d9b39083b795e0891ef7d5394949b5fa44 SHA512 eca7adab1f8aae05743c341a257d4ca4338b0838cc3441939dda48229cdfa13b267bdc338b951bc4e6e139d03d26b40a1294140218f84ab800d211f7e0d8bfc7
 DIST jupyter_client-5.2.3.tar.gz 271787 BLAKE2B 36761e53050874c141c38f545f8f6fb53c144c30f686b3706594d124a65e410c205379b7ecbeed12f1520f0f568c7db3c802223f6fdb8f76407074beacc21918 SHA512 89b980ecc281bc1512e1fc4ba35862cc6e541f825ee07a1382d300c8088f24611225ab415d6a7c1e4209c47a74c113ec95f863e8fb0b33c6db9eb9c3521fc0ae
 DIST jupyter_client-5.2.4.tar.gz 273397 BLAKE2B a63e13fea7bf121cfe0191d702bf5398a72902e075d560ec235eec6c28492a89753a90efe642fc207ab23357e74aac566bbfbeeb7970b765bf53641caa7ac95f SHA512 a8bb322e4cbcfa5ab9ffbcfdbf2e2ea60e7923f415d7574a93866e99c03a8c5b0a11d7c82e9c4c1c69f4da1261563f419877dffd5347294a58a744c445271a53
-EBUILD jupyter_client-5.1.0-r1.ebuild 1021 BLAKE2B 38cc4dcdf693a3d702f0a02b34d78f49fbbbb5eb7bf17a508f8db8c7660d2366c289fb051b2a66816eb8d09b82f4bcc7fece59dd2088639a76d4e47d1d77d78a SHA512 c15ca57ef1104f7443656ed248fec013858dcf099c1625ac0d45b68738e087919a8bb69f8266fc7cce5167cdc546e9aaff04753889f0a1365707f3ac8fe9fe46
-EBUILD jupyter_client-5.2.3-r1.ebuild 835 BLAKE2B 2e1dc0bc72954c61f6302ecfcb1277f453682d21c8998b0cb027d8d399e896cd382c158cce5467bd198a304bf9b7f535eeac6d1196130ee76b1c0550dab988bb SHA512 fb3ed3bf6121bfa356f2d05818bdeeba1e72da5efcae2f653afc2011384e653a0a94801f0e3e85865d57eed7ca9a33b4420a6e2dccee3ff1ea52381ac4a760bc
-EBUILD jupyter_client-5.2.3.ebuild 967 BLAKE2B 8e31d810e5da1339c066726edacc8f4814d96cae8e7b880257ac0d157ce14224f32ae2198ff8da848049e05fa2d0ac1c68f0549377dd3e7581f060189f8887db SHA512 d34a77ff68bc76dd2a48e348508187fa5a1b8369b72befd8c0e2d010978a9483de73f40400b0d5328e08269cf0b3a4dc26005aa887159418d5108a16420eff42
-EBUILD jupyter_client-5.2.4.ebuild 875 BLAKE2B 80ebf96d6e60ca5d61b962a6d8aded68104195b4e51dd5ff5ec20cee83ca7d624dbe9c3ef9b2f1972f3e15807890f5dfe61a4d30f70445f498a0fa12ebc497ab SHA512 353b680cc43b17566bbf4fe29d60be87f729402ee1f3ea51ea0ff67895dacf8bf68804f838cf408263cd22e54d5249a747c6739e19fac4ab9f6e498f27deed16
+DIST jupyter_client-5.3.4.tar.gz 275850 BLAKE2B a0884fb6cd2858b3ecf8353c6dc180370a53b4d59f77fdeb33c972c72857650e2e8b64ac5f6c9d223a99f30bb9ad9e06673cfe14b2d79abc0e4363104ffd15c3 SHA512 54b5206c08f5119feb50deb2d815d79a178799ad5c1231a0d03fc950ebbf6cb2f7c3a757024f788d416f808c57aa8476fcfa110f63182314bf2d5cdeb9a006cf
+EBUILD jupyter_client-5.1.0-r1.ebuild 1019 BLAKE2B ffa20263db71f70d3d636d223c97e7a6153637f6cbc1bb1cda0ca15bbff9a9055f6449a0d3a4dd0f55ca95afacc61e320af2b0334c50b9aaa26a5b9cd72d65b8 SHA512 ef5b41961b6aedb1028026275ef615fc09d9a2b4cd4017896114706d4a45e691519480f7ce8d5bb5f4b13ed9f6925d9ae1eb623c1b4c4a755d8eda67c337b17b
+EBUILD jupyter_client-5.2.3-r1.ebuild 833 BLAKE2B 427357ef092b90c9ff5c629c8240c20621bb0e02ff6a676eb20c397282966b79389348f9697236520cf7bc2381f9e7fea132e8723b6bff96a8f87482a807bffb SHA512 85dde8847a8ff4a1d4bd2b9857a56f876ca0e5fcbc82d797ccf3f4475ae4daa6a49977d2a509aab36c340a1362efd43dd18d432732aae2586e1a0cb712289436
+EBUILD jupyter_client-5.2.3.ebuild 965 BLAKE2B 9a6ee3f798dec3a4cb01b1638ed11eacda28e8b0527e55592dd69cd34492993270c80490d52ea494ac010e35948ef660033bbf60775d73fb1124ec5779dacdc7 SHA512 8bfd12c32cc18547696c90145fe8a1844e7d6b8c4600b882b892835c85873d1e29429212572f0542347d67d654e5046c356b8f7abe19845b9018f4e859787b5a
+EBUILD jupyter_client-5.2.4.ebuild 873 BLAKE2B b04b8b46f111d65865bc314732b24bdda18593a4f7f7563de531942b978b5d19ff368e621f2878d598305579181edfaf3df2291a8c05287f2838b9565baef51d SHA512 654fa4fcae3d6f407bf3b3cc5e69adc056927f9e462f6a30fa9332f02309da2d351da8d9a33202520f1292bc5321f6b84b9263e8e3cc8241f4f04a60146d8d89
+EBUILD jupyter_client-5.3.4.ebuild 870 BLAKE2B 6960d8a8f239889ed954687d846009a54a87c3682036d4898e235b320e60dce6a4bd0c4c2e3f7645ba1f08a71f97c47ef20f09acb409ae88846e046c32adf87d SHA512 4e2f667b9a12e19c613e1b5d4e7e80c8fc9a46aa3bfff543d6b4fc51dfc57f641017d2a91a57ad13b96bef1c5d9a4f03ea502957a8556bb6b260f33b3d16ff1c
 MISC metadata.xml 647 BLAKE2B 39c5be4c32d971bf1aacf3d384b370fdcaec2d77fc675a71065bd5b124559b174b3e4b7f1ef8bbdae4fd3f9b873822f4a2af68b1a9e5c05425c67cd67b226ccd SHA512 ffa9ecee1da3f5856daefeedbee972936ede17b2a828acd2ae1f80a82badc834afa2cdfef6f4a2dd70d29babdead8de8f5f60b888f0ff5e72b6b3993142177c5
diff --git a/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild b/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
index aca0e398b346..0c18291426e7 100644
--- a/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
index 40e09303e681..784a759e2564 100644
--- a/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild
index 99d44b9c1caa..74eee18533c7 100644
--- a/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/jupyter_client/jupyter_client-5.2.4.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.4.ebuild
index 79523cd41607..ce3429206f4a 100644
--- a/dev-python/jupyter_client/jupyter_client-5.2.4.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild b/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild
new file mode 100644
index 000000000000..d15d23de24b8
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-5.3.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? ( dev-python/ipykernel[${PYTHON_USEDEP}]
+			dev-python/ipython[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv jupyter_client || die
+}
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index e342dabed82a..271ad7b9c7c7 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter_console-5.1.0.tar.gz 26661 BLAKE2B 075035d02fee640ccf9a2a7bd22e5872727380bd54b1fed48bd53f6bee12da8ff3dc5f4ff258d0c03f7260e2b495d8cb313a4b4f49e4eb644f0b15988fe41577 SHA512 208a31886eb58c64541048e1f7ed75fccc888d34177f86dfaf10fb7dcd603130a8b3ecbe23cf4d80a75287b847128425f853715c494d2a7e4b4eed8a31058b5c
 DIST jupyter_console-6.0.0.tar.gz 27780 BLAKE2B da2b58461caa987bea0b323cedbc79ff24f31cb928602b8ae6dce1ed615008a8227d7a1bab47364e6d182cfd3bd6f548e355430efc505e7183a391ef26c08375 SHA512 27b333f439733c33062d3baa8b49ff673b10e22cb8c28c688ba604799838e899f93372bd2eaf4a94c97260d6dec043d6aef4421388d77e625b1ec43a3dedfa3f
-EBUILD jupyter_console-5.1.0.ebuild 1272 BLAKE2B 0028c2b5780eb36c0c74c69cb2afd0ea2e9f01962722d8cd452893392aff6bcb42989f67e14efdba06430ab27d3a29c4ae474f7901d88e99cf171f808afb7c2e SHA512 b8d25a6fe03ff75dc1bfbb5e4d247ac80294097306863d54312ac8d50bafe93d257bf8ae6ce544f682dccda1e82099e79295ce378dace676173cf41417df497c
-EBUILD jupyter_console-6.0.0.ebuild 1272 BLAKE2B 0028c2b5780eb36c0c74c69cb2afd0ea2e9f01962722d8cd452893392aff6bcb42989f67e14efdba06430ab27d3a29c4ae474f7901d88e99cf171f808afb7c2e SHA512 b8d25a6fe03ff75dc1bfbb5e4d247ac80294097306863d54312ac8d50bafe93d257bf8ae6ce544f682dccda1e82099e79295ce378dace676173cf41417df497c
+EBUILD jupyter_console-5.1.0.ebuild 1268 BLAKE2B 6254eaf9b173f043f445dbd356a0ee402a579a99450d0673f1762add4220e757c64aa32f6f45872c6c6a3de5e04dbb1eb88470ef4911c54a3604c6b185007f73 SHA512 69a08fed8fa7c3ec7550de4133f95676b7b83c37e8364a320a90f20e30e816ffe66c1f5b4a9650932d225ea78887ce7466a0b696e26c589c377a48d722255b6c
+EBUILD jupyter_console-6.0.0.ebuild 1268 BLAKE2B 6254eaf9b173f043f445dbd356a0ee402a579a99450d0673f1762add4220e757c64aa32f6f45872c6c6a3de5e04dbb1eb88470ef4911c54a3604c6b185007f73 SHA512 69a08fed8fa7c3ec7550de4133f95676b7b83c37e8364a320a90f20e30e816ffe66c1f5b4a9650932d225ea78887ce7466a0b696e26c589c377a48d722255b6c
 MISC metadata.xml 569 BLAKE2B 2f205ddc11fc56ac1b708a0d4e786d1e04051faa47af17970d4ed0a2088c4159a1b3199f2581794884463a83fc33926a053c55b4e6b265bdd90539a6d700d977 SHA512 dd29f7ff9dcca2afaa4caf814f4792391560a33b485d9a6de539a36c75df7b63e59d3eabf7bcb020b48ad30a7de0ac28137f54d96023fbc435e3a6378cc79b10
diff --git a/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild b/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
index 063642fe8216..2945c032b016 100644
--- a/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
index 063642fe8216..2945c032b016 100644
--- a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index a0b04b8d9d2a..01d2353b0dc1 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,4 +1,6 @@
 DIST jupyter_core-4.4.0.tar.gz 63613 BLAKE2B 90b5d6c855786beff0ab780e7a894e1b24f6d6d1c26be6ae8da73e82a87f966f1155498c581314d37db845e293be7bc4d085e03991cdc7adfbba36409541cd5b SHA512 387f7f98f640b85ff0a24f11e1beae5a851d7eb3ba4a423be028940cb018c0d0ddf42ae8a1c397e3e4cafa560d3a5385b39bb8794448c7c010be7f0ddcba8a9e
-EBUILD jupyter_core-4.4.0-r1.ebuild 1136 BLAKE2B 8245dc0b49886e67b24bd3fc27331f7c573e1df7262f9d6d7a3a12832945169f419b2a5ef41541b21f5f59990ec8949a91b2e65cc2585b24d09fdfe84472dc24 SHA512 bd5b4b2045f825018eae4e3c348dda4fea10ce0095aa898b91ea0a674a0e1d3a01965685a57b8fe16db2c9bca72692f1eb0559073f86aad4ff2a1f93c5899396
-EBUILD jupyter_core-4.4.0.ebuild 1238 BLAKE2B 44f55664218c232abcb6ebab8892989927064b5a7607c8941ab7bd9f23bcf457b4092d0df896f5e90547ba1ece36e02df19943c6a92e5cbaa1bb0f2a3cf6e3fa SHA512 dd16386f1253b432b22e3db2909253252d5a9e7022da65981c63c6667d769e66d109098c66ad0414b8da1ed187fd2c87832358ea9d9770ba40fdda3ae33a3f67
+DIST jupyter_core-4.6.1.tar.gz 66693 BLAKE2B f4338a015ac4b3e0a7cd2497a660bfca0deb96ffa2371fa9c72656f8a68b6f80fe5d494be79c8fdccbcb51f3d9122fd7d4b3e36864d38e7da1c5029c6b1aa24d SHA512 baf0c5db4f78a3cee83940ace80b48ba308c47eeafcf584120b8ba82768c15448fb789ec5b9ac8d541cbd1bfdd47a988f79130675c5943a67d3135d428b43cbe
+EBUILD jupyter_core-4.4.0-r1.ebuild 1134 BLAKE2B 00331f7ded04003c44fe418afb0b98003e2d45f7015b0eed6cfad15a5553f993c9ca2c35f96f60ecb3175fa2b2b7244dec8fdb488a24ade33812d45fe4e67f8d SHA512 772c014ae03dd56e05fe07165f6abb25f92e99e001b90613189fff225a61e6853bca713dc401c7afafedd986267d3adacee366f835b9b92e8a65483fe72ab2e0
+EBUILD jupyter_core-4.4.0.ebuild 1236 BLAKE2B ae168710631dafc88bc3eac0527bf21d19da901cd0955491179e05109a21ea8636cfa6b64f9773c9b22417fd9fb4fdb140744f6a21648e0733839873737d43c6 SHA512 c4fde0c4ea4871bfa3cf61a66e709aeb18237e70af55dd75f981577a33e0ba71c36cc9a8c0ca339dd64e5c37b152e906cde817b20c73ca0a0673c9ada732962d
+EBUILD jupyter_core-4.6.1.ebuild 1046 BLAKE2B cef88700d2a62a9919f9441a1cf9b9ba2fa8db7721703d55110c58bb966a8f061db9f5745821612e69dcf3fa1a164e81a660e7556ec00f7b809e504b9544fdfd SHA512 aa3f282fad81aae4987a0c2d183873bdebd504dc759ebd5384bfde16179b21c7f2f114025b2474fa1da8e7b9708aa4cb95ccec78f60a1f5cd3c8308adb35a8c2
 MISC metadata.xml 626 BLAKE2B d12f30014d60ed759b3d618b4fdb38bdf6d2d28738bc8c910d427d72e43cf792164cfa4811dd8c5717ecfc9d4705f6b4fce682be6d841b7185adc2942a62942f SHA512 bdac450a0bc297c925ea6431253eede78d61623feb30e1901f51a9e31722642741d5bc009162e09eb5b0fd9ca094e2eff54846b2612e99116239d764abb05533
diff --git a/dev-python/jupyter_core/jupyter_core-4.4.0-r1.ebuild b/dev-python/jupyter_core/jupyter_core-4.4.0-r1.ebuild
index 994c0dea0944..e142d74680f9 100644
--- a/dev-python/jupyter_core/jupyter_core-4.4.0-r1.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
index 189d3de89dcb..83e154d8729c 100644
--- a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyter_core/jupyter_core-4.6.1.ebuild b/dev-python/jupyter_core/jupyter_core-4.6.1.ebuild
new file mode 100644
index 000000000000..e574140b6fba
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.6.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-github-alt[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/ipython-4.0.1[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test jupyter_core || die
+}
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index 509520bbe71a..572654947c5b 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,3 +1,3 @@
 DIST jwcrypto-0.4.2.tar.gz 74332 BLAKE2B 4f779d00d58b7b17210042e7de943afcd766890e97859c487244899c10ee222326c68b74695b83034c09d00fbd43ad7108a5dcb84e019a8422722893198858e0 SHA512 38994a1274ce3a66d3a6a3e36f83b311b172e260129c94c70ae02e6d62b7a2fbcc07fd4353d3bf45f0c7f40c63322a3f489c8b1bda80c7511ae7a2136a2415dd
-EBUILD jwcrypto-0.4.2.ebuild 678 BLAKE2B 8c43020e387df64f113897fcea09b464c8149da8ddfd1f133c2b9a46a012482b09bbc0d70476b6fc0a1ddf49fd67b01fa9cc808e96f4fe3ace377296d82049e0 SHA512 ebd95cb471b276bed63f758fc1b95562a5cb9dd10effbac5636e308facd232f2eb54f457583736a9eb437858d59dcc25fe7c197340c1382a50b31572c703c7d0
+EBUILD jwcrypto-0.4.2.ebuild 674 BLAKE2B 3f50ae15026a62f788042e6f9cb5e0ed908add9dfde8f626cf9789a7b34f3ba160c6d373bef8c747a149aa074f38af0e3e293ed5193c847d39d813a8e0d4f998 SHA512 66f3e180bf96a7bf877a9ab34c9dc59204aed936eb1508c7b68b6c8922f718e4d9865d35a9fdb049773c28abd3469fe7bd70d620997408c9ce7f07f0a8d3fb2b
 MISC metadata.xml 368 BLAKE2B d5656c56c5a851d766c1e6588409d4864688de0c3acd4f28fb00ce22a106e5cf7f3ca8d54a4e448250cfafd04f4a0acced22db2a99879da67eb80c03f141ca74 SHA512 fe3492bfd6ba81846e7ba185468617d19f06eb813d55e87ac8ac9d5c7997d069e2b0f90dbd11ec5508b1da1ddd1d6a291fbd524f0c9dcdbdc8447ca639b78735
diff --git a/dev-python/jwcrypto/jwcrypto-0.4.2.ebuild b/dev-python/jwcrypto/jwcrypto-0.4.2.ebuild
index 865385cd5a9a..886733f05c90 100644
--- a/dev-python/jwcrypto/jwcrypto-0.4.2.ebuild
+++ b/dev-python/jwcrypto/jwcrypto-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
index 3ffe3cb64d84..5ec0dee8605c 100644
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@@ -1,3 +1,5 @@
 DIST kafka-python-1.3.3.tar.gz 255686 BLAKE2B 01ce6d3faf55988f291a0aeb26f6e5e01407c02d440f21622e565a124595e2df46e253c539ef1ffe44405960249ba49f426f25a6a6ef3b67d3f3f1bf6fe37aee SHA512 19b43ddc7a1ad3fcf58c55198de60c4434bfa3747d5bbc40f1acf0aa28225eae87effbae69087919b111cb739010bd4087e2497fdc78987f4cdaf33e81e516b3
-EBUILD kafka-python-1.3.3.ebuild 771 BLAKE2B 2cc3ebc625e00c2c9169397b9166a98337d94d07388b3263d3ca814a7745ab95a435e88299a56f11c1c2dd439854302cd18ece36ae0ea30b60833430c7d112c4 SHA512 2cf2e181e291e5054915125dc7e989099b94fe468aa77e46e0c353e304ca93baeab7162f7c0d9c9dfb5a6b193d8da61440ca08969d67fe78d57f828d62505fbd
+DIST kafka-python-1.4.7.tar.gz 352844 BLAKE2B 812c185bf19f3398c358722a44feb572693556ec671d07f2d74d63e45473f5b6d35390cc0fa2c95b8c42a15b635237ffa3c3829adde1f60a7611ce4fdf06f587 SHA512 5bbf9f998fba12e8e7c67a48e82b04e745f1ac528684e91b7454e825656e4a68b8c369984308cff575241b7f808f52f16ab02b7effd6d6b4319215f44ae4748e
+EBUILD kafka-python-1.3.3.ebuild 767 BLAKE2B 24dac7fd85c6d7e298023a62dcf95f7ed27349946248604893fc1b24c87ab6a536fb41becbab0af297added906a0a61c13543e8d6242d1665e194c1589ba53b8 SHA512 819d54ceaba8a41f7e41a8e1bc99613f73c61bfd86bc59c8cb5d9bf5b9aaca56ae0ba545eeab891163b318858835d5783ea29ace613cd7b3cf1451bff6c18eb4
+EBUILD kafka-python-1.4.7.ebuild 771 BLAKE2B 18caf23b3d7217a903400c61ae940bc9cb10fbcd2f07e9da6db170091b714dd6939b782563469896fe356bb7ccd7786772c30b920c16f7ccb252b4da622ba010 SHA512 db4386d593609da161546043d0c3adff5f5dd6cd45ba6389285fa5b08870ac9ec1898a03c64b5da852b92e458158930993c134c1a955b7bccdd84768a1d13cd5
 MISC metadata.xml 384 BLAKE2B 0fb6669950cfee792645c9dbefbd9bf6291e69a48294b4696729bb8cc9c4c7d21ff01cc570d62e74e2f3b40f8216f7351fab6d20e0f3267a49295818c4a6a781 SHA512 8544992c46b3ac30d3ea25c9ab5005d39636e30c929d6fc8be8e1942f8ad008f4e95b03a52facb31e5ba4a982c52567a78f63017d3936986e34a08c40d3817bb
diff --git a/dev-python/kafka-python/kafka-python-1.3.3.ebuild b/dev-python/kafka-python/kafka-python-1.3.3.ebuild
index 62842c0eadae..4163d163c471 100644
--- a/dev-python/kafka-python/kafka-python-1.3.3.ebuild
+++ b/dev-python/kafka-python/kafka-python-1.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kafka-python/kafka-python-1.4.7.ebuild b/dev-python/kafka-python/kafka-python-1.4.7.ebuild
new file mode 100644
index 000000000000..5a21f667e958
--- /dev/null
+++ b/dev-python/kafka-python/kafka-python-1.4.7.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,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kafka protocol support in Python"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.org/project/kafka-python/"
+SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="snappy test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	unit2 -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index 9a7c59895d72..2605794f8a66 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -1,3 +1,3 @@
 DIST kaitaistruct-0.8.tar.gz 5158 BLAKE2B 802435e81c8ec2544f26109762d43d7761c8672714107861e5f981583bf38ab85b3c2f1f3be5d25429287b380b756599fb51cedd130870f2cd9cfe221fd2f509 SHA512 8361e30c5bec9a7c57c280d277232ff4123686f29f3813e61cde9bf7512ead2e2f447ea1e18b8925aefe432edbbd9682a690293dcb928a9049c4c81832b5666f
-EBUILD kaitaistruct-0.8.ebuild 409 BLAKE2B 1b362ad75c715d1e9a95c515bd3fcbb44a55537166ee9ee7a45ff88e998bb6f4b19de304ef228459d2ca1b65406643babf3bce54b8e99bfd77328d04e64855f9 SHA512 df55dcfe64fe675707f1d9db5f45a391c7a324978a4f8414c273472707f32cd29a4b727aced508b3fdd251abb877a54a873a6cd1334afda203e83f0ced479b8a
+EBUILD kaitaistruct-0.8.ebuild 400 BLAKE2B 19a90529b1a67c4378ccee75df17a1972df113a15eb66002e7bd7407985995dd99d43e8fced36c7ae1b73fc033536d7bce310baff41bcc3222c0e720205ed819 SHA512 0c563a6f561c4f9b6b34890bbee1fd6746933716b30e64d1c4ca624c140d81589637676906e2a780458fb1aba832cfc687e86423f998e39e0b370658122f54da
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
index e423550c4319..8ab274c95693 100644
--- a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
+++ b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kaptan/Manifest b/dev-python/kaptan/Manifest
index ff6d6d6e4ae1..d6b9c6b13bc4 100644
--- a/dev-python/kaptan/Manifest
+++ b/dev-python/kaptan/Manifest
@@ -1,4 +1,4 @@
 DIST kaptan-0.5.12.tar.gz 10539 BLAKE2B 678e1aae6053a7075218a0fd9ef928685e7ce9ebf385c6953275b06d1bbf67d4c8434838a7a8f0b0ec8b02e7bef434d7f68698060bea2b4232cd5ef7fa83f0b3 SHA512 fccf767749e9473947bd7cb493ddb30f7dc1b2e10ce932ca327ae3423bc023fa9c76910ac249269ee546eb9162e4ce151e2ad0b9685d888854a7185c855ae143
-EBUILD kaptan-0.5.12-r1.ebuild 525 BLAKE2B a0a874851f89509987371faf1ab724f81144926ceb1474064a5040bc19dde1cc5eba8db58f78a038ac9332217bd7e324bd564582fefddf75f2acde2716631fbe SHA512 6cefe2967828b222a108119ddb3dc32855f98dce83b09e22922b66b289c3a046e46461c02a87db600c628dcfed42152b700e60c13307161315f19c869f2fb6c5
+EBUILD kaptan-0.5.12-r1.ebuild 527 BLAKE2B 2061cc7d034493cee4945b7230314b7f9aae165eb6f22601d2a8a2adb6e2b118f737128c105c7cbeaa03bef2e8b2e436a8429c7ba302f601ac3bec86260e4710 SHA512 dbc2d260bed6f577e94709d0070a91e31269ee736dd4f1b53cb0a890441a927fada69c6ac5a3eb75d6052841d3d50b1286155ab474327039683f75a552c9f392
 EBUILD kaptan-0.5.12.ebuild 638 BLAKE2B c4d2d7a3a3ac8de3cdd99a958d26c8ef92a04fa4ff9437f7b7bd513f5623db293292149d3fdc7ec10ec5eb5df07ad1ab71cd1b03f4cadd5f11abd1dfb3733b78 SHA512 cc773a86970207ee5802bc1864b5f9ac7afa6ce7e4a44156fe6b6cae20c81f17f2426cdd112a91cbb580506ccfdd96e764931e06b1fcd5ec8c9af0e78c641004
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
index fe0a07f9ed96..9b14f41ac57e 100644
--- a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
+++ b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
index fa0e1f9864c0..4683ad83833f 100644
--- a/dev-python/kazoo/Manifest
+++ b/dev-python/kazoo/Manifest
@@ -1,7 +1,7 @@
 DIST kazoo-2.2.1.tar.gz 108037 BLAKE2B 23b6b762469df40304cb0d9228dee63875e7c062557e0dcfd383db792c7544b19fbb4fc91a62035a2455b5a2715a57bcd4a68521cf698f01815cec20765420c8 SHA512 a2590441a9e3bfb3d14913051453e195d275b82bd6a4ce5e32d0a7bbc09b00e475ffac68fd06cb065aa439ea580b61bbeaa3ccfefa413723e46f4b1d3ce05707
 DIST kazoo-2.5.0.tar.gz 147189 BLAKE2B f90662d78698d4ba8c9a88cd4eba826df104dd746323ce92644707e22ab711ca5fafb79bbec71c4059637232eab4b510b9544871201ba8d6758618d5a79f97c8 SHA512 cb85a33f2d0aa71fc5a82e7046e5d331417df865c1a4bc18266cee65ffd6c36e12cd4058ee591214ec83225a9b3ee193587f3d07b5c1436cc715a403364ec1af
 DIST kazoo-2.6.1.tar.gz 157425 BLAKE2B af05ee5fb1d532ebc3352de004062f1ff976825f564212f2db76efc153566106ffa520745a8e8cc6a78ca2bf0d17556f978a6b462e4153e9b3ee5258e78a1d82 SHA512 613e8271bfd6c8f5ee976b6ee460478c7faad46b32995125a64312208b38755888690cd46b913ff44ba52aeb36de3ec3dd8e222985af77e99f43963a3eb48d48
-EBUILD kazoo-2.2.1.ebuild 1113 BLAKE2B bc1f4b0001c28f60b378a520fbab5e2397fce4c22577855fe3b50326e3a7722663e8a32ad95dd9088e712643ef3bd34d2b1ba1fae2644d7ebb5db8acb33dd9a4 SHA512 0ad1297de9ef1cc4726e8dd8e9f3235eac7cd3adc9303929ce04d331a42d8f3b12a0d438d31bd7a70a78ec619d841cfc3a8206cad32eab80fdfede4fdfadcf9a
-EBUILD kazoo-2.5.0.ebuild 1116 BLAKE2B 284353a5db0b6c6b84b19af1d02d6a51d86a55ec7114166d60044fbf38f3ac6be46c697b6c57219e255240f578651344328969521fd2945ce453b58b0c73286e SHA512 3c12f20f16aa07b0d185322130fbe372e1276bf044a86dda0d465a857b4b97f3dff02d1a14a7daf5d7640a25cd597839a93859af86ca8a8e9a4e6e322d46b0d8
-EBUILD kazoo-2.6.1.ebuild 1392 BLAKE2B 7ae9f14177458c63fce41832ca33d35bda794939c873e493c48ae5d6edde51ff347895e43bc101221c0721decd4484e538defffbc76c4d561d90d7c25a23d57e SHA512 b179681cd656d7f11a6cf65c0e20a0e9e9fc655b9954af14f0725283018dbc942966f2838bce94045842e121e46d1f00412b6d4831af56f0bcfc9971a6fae898
+EBUILD kazoo-2.2.1.ebuild 1109 BLAKE2B 16301fb851fac4c7f7f04774fe21297c795f45e2a1c8bc02e6ad3778b5fe26d40cbef3ecb2f5bccbf7856f88b78ccfdc0989cb56e356ced1ca2fa366d2d8398c SHA512 fbba57836df5383b04ffa911fc4d08e3cbccef46447c17f5af11f469761d6957a0e1155a48e2c496789de7d96beebc54cd216c5cdb075111953fb05fb245697f
+EBUILD kazoo-2.5.0.ebuild 1114 BLAKE2B c5f710ed3cfbfda5ab8451c1ec33dd12fd2366bbe8b1052ada71b23c14fb565145eeb694d940ab058952dd69ad84feea7f4ae68a39f9995a0312b815af05a8d6 SHA512 7530e318c57e8969bb1f125885f3a3485e194d8119810e05778f9336757d20f97fa9d8c99ed2045e32a129b2d51433a76207969c1e96d5de01976524a6a6e16e
+EBUILD kazoo-2.6.1.ebuild 1388 BLAKE2B 3c5a758f52e9a45bdcf4e93f3441d044d817f4d9cf40b59fe08cae76b5018fcf2babc385442cd395bfae322ac1b437ff6ffb7e9a8d0f8d05d93a2e4581be7300 SHA512 6a6cefb3ce8afd69e2512f1f2ee0d21ce99719168ca40190a5fa5d74dce2b602757ce42887b3330e8798fcc91b4e6779535b454395192b1b409c3fcc684437a4
 MISC metadata.xml 467 BLAKE2B 289e2184ed4d8b4435da2edd6698d915a26f2dfbbba93aba0aed35a2adc5f5ef20a95d70e673de980e08d58252ea8f540b913a35a46eb1327821dca49ad36f60 SHA512 3028edb8107a980e1573f283e9f47a408b9c4ef9bea0ee452f25d908665220ea6cd43b70e2d85d339d553e60426f9d45a093eece38cd0a67f2f416db7580a6d6
diff --git a/dev-python/kazoo/kazoo-2.2.1.ebuild b/dev-python/kazoo/kazoo-2.2.1.ebuild
index 336aba07aa53..4353704e41ab 100644
--- a/dev-python/kazoo/kazoo-2.2.1.ebuild
+++ b/dev-python/kazoo/kazoo-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kazoo/kazoo-2.5.0.ebuild b/dev-python/kazoo/kazoo-2.5.0.ebuild
index 23625d9ca179..91f07befcbd8 100644
--- a/dev-python/kazoo/kazoo-2.5.0.ebuild
+++ b/dev-python/kazoo/kazoo-2.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/kazoo/kazoo-2.6.1.ebuild b/dev-python/kazoo/kazoo-2.6.1.ebuild
index d022ee5b2a43..a81c1fbe6c78 100644
--- a/dev-python/kazoo/kazoo-2.6.1.ebuild
+++ b/dev-python/kazoo/kazoo-2.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kconfiglib/Manifest b/dev-python/kconfiglib/Manifest
index 633de1eba9cf..f934f7487ae4 100644
--- a/dev-python/kconfiglib/Manifest
+++ b/dev-python/kconfiglib/Manifest
@@ -1,6 +1,5 @@
-AUX kconfiglib-12.12.1-setup.patch 463 BLAKE2B f2e781ea3f2e28b308424b1688b9ccb575450bede07c4f00fb24a8196c3f8c514e3d4af222d86203f369e5dd9f2b97f778cddac757d1591d1c4af34a59e7e631 SHA512 c3d0c56bf3a84af57f0ef0fbdd987b3cfa8acdf1828efbb4e66d928256d47a64ad116cd7d9c66d19b5a8b1dc167603e0f8db1aeec2ddbcc0cec98235771e50f1
-DIST kconfiglib-12.12.1.tar.gz 181307 BLAKE2B d256148bd6bf01f7951c78751604eae1be4c2fc156b815bdb570e6fcf185c2f5c97259f6ce0ed275104234ff7180afa2000a81feb281e745a8a0c4db162f57b9 SHA512 49e8746e6c83a93b7500130b21b864346ab8106c0c161de0ec62b3efff794080e734d34d88cd9c816c0d6514465729fbc3a4334fcc9c0a68f17c1688bb210325
 DIST kconfiglib-13.2.0.tar.gz 181115 BLAKE2B 81aeab65c4d7008dad33d508eb2be5ed53187943c1ec5112a87a47a5f9bb661c521b0d61a3da63da3233f168d62ab6bb5cdf6e3702e53f960159b7ca13c8a0cf SHA512 9d8c76014aa7faa93af216849859eca9bfdc0d4cd3e030e47b72acfdd4981ac1581747adf91bca58a4e8d86b151988309f36c3f94a1ebb216a1412fd004fafd2
-EBUILD kconfiglib-12.12.1.ebuild 1049 BLAKE2B 34797f558424ea5b8a91ded661b7f180042c78d65dbae66ed37686ca4438066b9e53ff2795af642d96ca1e819d41f10668e47ee7b08e7a657b1227829d87c452 SHA512 ec2a600938d4a8296952aba0d88dbc03ce499824db71ab775ed923b4aa62af04de7928ce8919f262924d3ed10189254a3f860c1e8635e38456f1e7a199d34243
-EBUILD kconfiglib-13.2.0.ebuild 1007 BLAKE2B 14612230b04104b61d32aeeb17ba3984ef043ec9fca26dc766eae9cc85ba6a078bb2e1ed687bdcd2650484c06a0a74b3b2b25211fedbf0d83ebea65ce68b3e06 SHA512 de14015813ef853ab1cdb9773dee243e2075945621e8948ddd63af87afe8663ba6f764b1a7f9fd8372442d49b44f7f8c28a69865ed62676b6d2b14655bc28902
+DIST kconfiglib-13.7.0.tar.gz 182782 BLAKE2B 976a8e4e377933e42dc45c79598a175d302d34f48bfadd764c0cbfa2ddd4e15ae6ba22467c50d41657abbaa1f4495c556fb4c1deb9c96e1119a7bdd6ae8a3378 SHA512 0376b2c4e68b7ce4f105f52a3b4793a23cb844dbd9ab183abbdd79e2f7958e3be372024ce82295902af974f010c73c4ac97a4147bdac8ee9b52900bc15b8bb6f
+EBUILD kconfiglib-13.2.0.ebuild 996 BLAKE2B b60b5f99229287f2cb90285539c71f40baf5631dce57e9a7c83f8f7bfd5497971650fe31d68613d00bbaac0dc223205a00e213d3535f1aa9144d20b9fbee8642 SHA512 31fe781535f2795a1a89d5a928a8dec1e0a52c8e41efebaef69d496a913d9c6d168c9d0b365255be74e3e632c9bbcdca892d64fb44a3abd0e3093d4c45e7211f
+EBUILD kconfiglib-13.7.0.ebuild 998 BLAKE2B 1481ffcb51db9659ba87c2c42d3a5c7350c2d3d88a819effca5926400bcbb1bd1213dd0b08a8395c398c1f1a0c626dd0c99a77e637cf331ffebbd97b752d9843 SHA512 a2db1ef99a9972295694ef9b81aa83d3586e40b2f2ac3476fe1a0b6e3ade62018e14aa2104171ba27c7a6892303c85f3281f74708dd597eb2fa4e2fba534fc42
 MISC metadata.xml 331 BLAKE2B cf19e7c3a4a2511e58382941904de06eb12e21c0a1f27c89fd3f61ff1e2f96d9e8509aba80f52080ce4a53da8f99e8a15685803b143fbc9071d33ae6e815a1e1 SHA512 453f9a6063705a3f9db24e5c0658e31c73d234dead14ccecd8d46fe56f26b16729f4f46c0ff7471689c60eef5d9c006b455a14f349f1249ae2e9f0b677ef80f8
diff --git a/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch b/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch
deleted file mode 100644
index b5225e90d5d9..000000000000
--- a/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Python2's ConfigParser module used by setuptools throws parsing errors when
-encountering tab characters.
-
---- Kconfiglib-12.12.1/setup.cfg
-+++ Kconfiglib-12.12.1/setup.cfg
-@@ -1,6 +1,6 @@
- [bdist_wheel]
--	# We support both Python 2 and Python 3
--	universal = 1
-+# We support both Python 2 and Python 3
-+universal = 1
- [metadata]
--	# Include the license file in wheels
--	license_file = LICENSE.txt
-+# Include the license file in wheels
-+license_file = LICENSE.txt
diff --git a/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild b/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
deleted file mode 100644
index b1a5baccde7c..000000000000
--- a/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="A flexible Python Kconfig implementation"
-HOMEPAGE="https://github.com/ulfalizer/Kconfiglib https://pypi.org/project/kconfiglib/"
-SRC_URI="https://github.com/ulfalizer/Kconfiglib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# pypi tarballs don't include tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/k/K}
-
-PATCHES=( "${FILESDIR}"/${P}-setup.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# hacks to run tests
-	mkdir Kconfiglib || die
-	ln -s ../tests Kconfiglib || die
-	# don't run kernel Kconfig compat tests
-	sed -i 's/run_compatibility_tests()$/#\0/' testsuite.py || die
-}
-
-python_test() {
-	"${PYTHON}" testsuite.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/kconfiglib/kconfiglib-13.2.0.ebuild b/dev-python/kconfiglib/kconfiglib-13.2.0.ebuild
index e519c27c57a6..614c8ea8a668 100644
--- a/dev-python/kconfiglib/kconfiglib-13.2.0.ebuild
+++ b/dev-python/kconfiglib/kconfiglib-13.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/dev-python/kconfiglib/kconfiglib-13.7.0.ebuild b/dev-python/kconfiglib/kconfiglib-13.7.0.ebuild
new file mode 100644
index 000000000000..e40d76c01b67
--- /dev/null
+++ b/dev-python/kconfiglib/kconfiglib-13.7.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} pypy3 )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="A flexible Python Kconfig implementation"
+HOMEPAGE="https://github.com/ulfalizer/Kconfiglib https://pypi.org/project/kconfiglib/"
+SRC_URI="https://github.com/ulfalizer/Kconfiglib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# pypi tarballs don't include tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}"
+
+S=${WORKDIR}/${P/k/K}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# hacks to run tests
+	mkdir Kconfiglib || die
+	ln -s ../tests Kconfiglib || die
+	# don't run kernel Kconfig compat tests
+	sed -i 's/run_compatibility_tests()$/#\0/' testsuite.py || die
+}
+
+python_test() {
+	"${PYTHON}" testsuite.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/keepassx/Manifest b/dev-python/keepassx/Manifest
index e06bf1e092a3..cc085679859f 100644
--- a/dev-python/keepassx/Manifest
+++ b/dev-python/keepassx/Manifest
@@ -1,3 +1,3 @@
 DIST keepassx-0.1.0.tar.gz 37022 BLAKE2B 38661e3ac525b20e4be74701ea0691ee23e67b04b940b895a7c581e274c4f7e72701c6571be23ecf141115aac4c3817c5a15ff4bbac0e84541e23d0e2b52ef39 SHA512 635f98d2a95a1e5cc4a5c08f8d261cdf5be9e5656df28c070250aed2dbc058c85b9d7ad81e69de1d9b095b0aac5e3c6bf3a6a54b0b4de9b5664348ca42bdc755
-EBUILD keepassx-0.1.0-r1.ebuild 940 BLAKE2B 2032770d02aafa274d138497ef804a4195f7aa68706ca7d2739dce664259acda6b212476980ea92c21005950b58f4cf0f5e66b984edb6adc585931a98fa19837 SHA512 a58a4c5058e82523eb6db131ca433515676400f894ef4c1f10b2a239f951534f36aa7ec651aa229f1b87dd82ef20831af2b47960d82f514a5ddcd3c666d02e6b
+EBUILD keepassx-0.1.0-r1.ebuild 930 BLAKE2B 6c72c5e33b718433733c7bd55dd45c459bf8caad8a8de1cfa2ec3fb153db27be5a50d3e54ae989355974e33d284029f2d1dc1d161ead6fb26e67d4e6beb80ce0 SHA512 9441b9b9a7dcec2aa6c3077a42e1de088ded3a4319d175e289d7a9dced65452a98f984a5c9d2dc92320fdd344ac4b6bb3ea4fde22d95f78fc9cec333cc8e122a
 MISC metadata.xml 386 BLAKE2B b21c70340895d868c4e99c25b6b2764d719e96cf9f406332adb12f5e15670312b977c055e4d6c16283efe3c6ec5ccb8bc81930b572b4012662e21443748110ca SHA512 c9112d8355995023881edd537c958839c09e5079128350df3e3ea0d9a0bc7b856af9c89f6343f998e6d3905196ac1fc456b941168999d7608523c79785929cc3
diff --git a/dev-python/keepassx/keepassx-0.1.0-r1.ebuild b/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
index a7fb7f17d387..0f91ccc53e94 100644
--- a/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
+++ b/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyczar/Manifest b/dev-python/keyczar/Manifest
deleted file mode 100644
index 593edfaa8e61..000000000000
--- a/dev-python/keyczar/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-keyczar-0.715.tar.gz 242151 BLAKE2B 7f955b5c7b3afcc59ee856b5500de89037ffbc4185062a176d1678d482b89f4de411e9bf19b8f7fc7c31dafd6cefd5514dd262901892b5b4e357ce509ef9e909 SHA512 e0733ad488db2a2803227db6f140c5f316425782a780070e6fd4227d3b88d523e2c41743cd3a6e14e535c7dbdf7b50b428d15d26ca5cfb35e2841a5f71b709f3
-EBUILD keyczar-0.715.ebuild 890 BLAKE2B 2f47309f36d70ac6e14bfba665646f3da7f309e01bb107722bfbe856da6752ac73fbf73ac5d7279dd67d04edce2aba9ccc874249556406a829818e22c9c9af79 SHA512 e50b818e151895a5a5442f92380ee1a07563cdaae1a7211457633b0ca0fdc29e5024eae168431de563eb6f928d1f796c4a8152deed26d7d4b2d5a0f38afa9a76
-MISC metadata.xml 317 BLAKE2B 3395ee74678e4ea41bacbfba190d54fd41fca72148cb0edba3024adc1703fab00ec2c36c2c720c4a718b9eb36149ad99f1dea85105f982bd6a5fb8df91a1964a SHA512 30948aa22ead2cc18fcfcfcb94027e183839d0e668d4df9636e5c0f7332417a61a968ab158bc7a9ca27e90518055651e6b14b2234374159a3c32888badf138c2
diff --git a/dev-python/keyczar/keyczar-0.715.ebuild b/dev-python/keyczar/keyczar-0.715.ebuild
deleted file mode 100644
index 5d1f82dde01e..000000000000
--- a/dev-python/keyczar/keyczar-0.715.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )	#appears py2 friendly only
-
-inherit distutils-r1
-
-MY_PN=python-${PN}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Toolkit for safe and simple cryptography"
-HOMEPAGE="http://www.keyczar.org https://pypi.org/project/python-keyczar/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=dev-python/pycrypto-2.0[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	cd tests/keyczar_tests
-	${PYTHON} alltests.py || die "tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && dodoc doc/pycrypt*
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/keyczar/metadata.xml b/dev-python/keyczar/metadata.xml
deleted file mode 100644
index 832d760fb83a..000000000000
--- a/dev-python/keyczar/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">python-keyczar</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index c9984297985f..bb636be2f513 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -5,10 +5,10 @@ DIST keyring-15.0.0.tar.gz 42547 BLAKE2B b9200f61fcf227ce82ed05db15b8a03754a2d2f
 DIST keyring-18.0.1.tar.gz 48559 BLAKE2B fb9e8df5ae04b4c1d646b4129cf34d420fd05783724dc2d10fccfaf11ddf1a17048c2695477bc1f4cfcd6d08ed48b6d552d19862a0510d8e12fef4e17b13087b SHA512 62091fc304ff0d4a1dd5db3e1fbae7e02edcb60442f19d7408ba2f115226a8282ff67df55334f019da3cccae858cd5e4b0c0ece22a7c66768bbb85018728be30
 DIST keyring-19.2.0.tar.gz 41728 BLAKE2B 24a8f095f4009f37fa6d5e7bc2b12be816a5db2abfa4416fc18203a818296c775fe34a2936a71b191700ad511e01059974aec374aea5ee312507a27bd8be76b8 SHA512 5104423289b9e537e64760afed38e5851766b9c955c0659b078cdaba82813e93922e488b5465157cb930285416feef07c0b559fc49909f58bc85b6f30d55dd75
 DIST keyring-19.3.0.tar.gz 43587 BLAKE2B a1003aa55ac48f39e84431c50fe3e24e1da76a0db177eed08bd2c2110b78d10cbfcf7188519435732be68452a0318119cca1563168410b16fc529a3a7e98125c SHA512 b1d26f665203b11712ef91057ecd78cce58b35038b259605c42997283f6c41449baf242ecf43510b29598559b8aecf733eb66be6e0c439564256f40eb0f6982c
-EBUILD keyring-13.2.1-r1.ebuild 1208 BLAKE2B 7baff144faf1881ada3a5fa735d8821bba3149f32ff513e14c4280152c1ccebe1922c72ea01b584a2124988398a515c2713104d0363db31de26e2e39db2039f1 SHA512 4da8dbf0ec4ab152187a0a329d578f516ce625623f3158bc84200506c15b081eff8eb596a7f80586128c722f4bc3f27a26ad5486ff6308a198da7921306b7d2f
-EBUILD keyring-13.2.1.ebuild 1043 BLAKE2B 46003fb7415626e02055a61ff5d4b6b558c4271862386b68e08913ff6be4c1fccd1cbbac29701171f566fbebb156f997f47c54de6a63b23835b2513dba3a6093 SHA512 21bc3f2d24508e52b271839aa4770482a82fcfbe65d6b2d13138b92646e3e4e3464e0d072303f88d4eb0e2f1d78e7948b2f2b94cfbfde74f2266412b66971e5a
-EBUILD keyring-15.0.0.ebuild 1214 BLAKE2B 3a57aeb5a7a9bf7d2db6d39c552ddc8f8f3c0b7e3f13d4db506c3da230267fa08d2ee6b479a949855393e83521b1ebcdd99e96645d83f4a77e877877f4a70033 SHA512 c0ad72f8f91b47a0a6bf06e8be58dad6ff08a4403b2c28cded68133f0a6db921df3ae70c74af6b01d8ab17e50235467ba61450f3eeae63d80176f751dfff1881
-EBUILD keyring-18.0.1.ebuild 1231 BLAKE2B f3fb8a8f2e2a4cfae92f25330b8fb9f0965cfc3bdadcb44621675dfaa9e2c79f1a59f8574d61fb436fbc6155c8b0de595adf7f8d99aa2046986860cfecab61ba SHA512 b8a173dbbc57a49430c6bf80f762d91ab8b479a442e25263ea31aacb65529a9faddb1f869ccf6f2a5b0f2d4be97994eb126e8a1dbb7e03cbbb0030d0ed6a9bfa
-EBUILD keyring-19.2.0.ebuild 1481 BLAKE2B 4aaa4e04ab9c8619de9877c72196c809097cb767fc23777287a0a41e13f385ebded6cb90d045ca86076dba7c351cacc53f42e871a6bf4d1f93a4d37e4887326e SHA512 516a56534d88be20f6785634bd01372935e78033b21add2d090826b47b666c95e27f27f1832b24bce8be3a1c8271205dae727269445c5aea5a81c03bc415f17a
-EBUILD keyring-19.3.0.ebuild 1713 BLAKE2B 3a40ddf8eefb0931ec666c4358825e67d4525915e13184302eb1533ce10e30badc1f2257ea91030821587283dcde17b406190b735fd1d634f73118a1ac30d1cf SHA512 48c40d3eb07daae1abbe7a3449aea1df7b72dc4175b3e8940be9e4c696c621dcd6d03a77929b672713be2fc854cc962f9e75a52593d4b13fb3bfadddb47b60eb
+EBUILD keyring-13.2.1-r1.ebuild 1206 BLAKE2B d58a9dfca3fb0c5bc18320860dd4b449c2b894a52b3c9e30d2ad79187a3e1e0ffa79e96c4fce4933af8837130d69cebe7e1873edfaa47f1a2c3e3fe3fb5e5c90 SHA512 438bcf7a540fd4ebe5973de06b3b701d1a76516f3f49bf8d5bcbe428e31579c96f92d65e6deba4c97b109fdfb5453231b1a52a1d6e7452442ed6cc4948782bc8
+EBUILD keyring-13.2.1.ebuild 1041 BLAKE2B 225dc2f072384d1bf6adc54a5bc76946853f6ba8a77fc197664f596aabe49640c7cddbde2cba53bb821e4366e8c96a7a47226a06c14c5041c07123a7a36e8d4a SHA512 9890114565c7c802ad2f5ca704e2de3638f28822b43ee925bae80b9475e8c2629cb30ba2821721c135dd69f1a8cde285035f4483ae9a1260ae68cea33328941a
+EBUILD keyring-15.0.0.ebuild 1212 BLAKE2B fffd2ca5ff0739806636894bd3b7adcb78b091902502d4a823edce89e19f654aa1743dd7bd7698fa0071a8adc318b90839723b426b3a889da84c773176917659 SHA512 21a6f56b1cb751430bd68bbb29cbd6b7de82b5968514d79c8ea9227a552d12aa7ddbacf97f8b8782a1ade02cb67ca6a9f29656ec04080de0b7c86ff01601d4d1
+EBUILD keyring-18.0.1.ebuild 1229 BLAKE2B 9432164b90a9181d9fd8c5cbbdc118bb80a27c2ea933039652ffb03cbbb418ea3df42c504f8fac18cdc6aa4e8d86a05f8bceaa40edd26ad514f83eea43b33129 SHA512 24d2965f17fca86cd6bc4e4a51be90f1755c1c6cad8c01ca7adc0a40e780a5d35609dcdfc86fee1c96c9285a0a1e0f162eab51e80c6a3fd46fa650ae14e6abf6
+EBUILD keyring-19.2.0.ebuild 1479 BLAKE2B 98ac7371595129323f34c9ced7b2bfedb4d45b55bf68961cd4f14532198f4b9c7de4d9e4b645a2c3efd948333abf3480f498388922fb04dd7c38327df8097412 SHA512 832615ea9a3912a17f48548bfd14c30ec62d9dde442b4d3924ab0c326abfc70730fd0505b1665af26eb86aeb8cfa55830910e111e226f311dde6fd130e0c85f3
+EBUILD keyring-19.3.0.ebuild 1711 BLAKE2B 12c286be85937cb0cbd8f5a7f242ae40e74398a61aeaaac932a40478bcd2bbdabb22b3a3856f585635037053ce707839516f9b3083bcbbfab12b97b7ce8dc8f2 SHA512 e54ef32be65b1121afb852bde379b38da0774dbf5ad3b2e0d01982da09e6d79c9fe89e5e50734d21d46451b5905c9645ac579aa39a5c207e33b7b4b1c14f7ac8
 MISC metadata.xml 773 BLAKE2B 0a0957f622a38547688b83092b5961f3fa8f3c7a71cb628c6e5525b0a95f37345b5de0cdb5f5a80ce30a96150c6409920dcc391e230d8fbc6ea385b055a30add SHA512 939015ee7c67aa097663ef547b0726f7c7fc95d659b5f71f414b503e61f28604c05a252a084b65044ee2fc331005c10b5c8af4b4b361527b4a42e061e88b5018
diff --git a/dev-python/keyring/keyring-13.2.1-r1.ebuild b/dev-python/keyring/keyring-13.2.1-r1.ebuild
index a2ddfdf7306f..b5ffa64b892c 100644
--- a/dev-python/keyring/keyring-13.2.1-r1.ebuild
+++ b/dev-python/keyring/keyring-13.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyring/keyring-13.2.1.ebuild b/dev-python/keyring/keyring-13.2.1.ebuild
index 3d2fd4e8a798..7000b2538916 100644
--- a/dev-python/keyring/keyring-13.2.1.ebuild
+++ b/dev-python/keyring/keyring-13.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyring/keyring-15.0.0.ebuild b/dev-python/keyring/keyring-15.0.0.ebuild
index 9db3a228e23a..f02054a3e760 100644
--- a/dev-python/keyring/keyring-15.0.0.ebuild
+++ b/dev-python/keyring/keyring-15.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyring/keyring-18.0.1.ebuild b/dev-python/keyring/keyring-18.0.1.ebuild
index 28be4645a8a2..a4b85f02c9dc 100644
--- a/dev-python/keyring/keyring-18.0.1.ebuild
+++ b/dev-python/keyring/keyring-18.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyring/keyring-19.2.0.ebuild b/dev-python/keyring/keyring-19.2.0.ebuild
index 452524c6e5d9..b62c93da3e54 100644
--- a/dev-python/keyring/keyring-19.2.0.ebuild
+++ b/dev-python/keyring/keyring-19.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyring/keyring-19.3.0.ebuild b/dev-python/keyring/keyring-19.3.0.ebuild
index 73c4ca0d8931..b5a602bbe10e 100644
--- a/dev-python/keyring/keyring-19.3.0.ebuild
+++ b/dev-python/keyring/keyring-19.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{5,6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyrings_alt/Manifest b/dev-python/keyrings_alt/Manifest
deleted file mode 100644
index 6217fbf9946b..000000000000
--- a/dev-python/keyrings_alt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST keyrings.alt-2.3.tar.gz 26170 BLAKE2B 5459bfbde787b82021c04394ec475a406805a97cf3ac5691aaa654790800b155291500946f29eb12cd0ae33061c0b38ca65c5733ca144e75e9047381d86ee2d9 SHA512 593194f0b3e64ebab9950b1ee674e43afecf6410110e7c683cdccaa121eaaff864ef07763363c0b0ac25b94e913d6ba2e1bb1ebb428ba14e81e3c29335b81807
-EBUILD keyrings_alt-2.3.ebuild 1232 BLAKE2B a834aec6394feb37d263d3ba725346218acf2be7a67ceaa7a8743853577bd7ee53b0295f447c27d3df2e704d224cecc38945221aecb7dc95792cc2687f2d3f02 SHA512 ba7cde7279a400f3276e1776fed714b2c51d6d2832558efcb42b996e749e43aef77ec915ce0c1ffbbac004cac58eb83999ec95ff0fe34c0a9ee9e663a81ff797
-MISC metadata.xml 565 BLAKE2B 577c4bb77415ea0862b4a916665742d20d0c9b7289ab9828f37b1ac22ad97bb6859b2745475b10acaf52fffd1d9df3d9bcdd53ffb4213746e62a528525d65938 SHA512 e1513ec8f623dcdeb869e49e3bb1325bf8192075a0478d89101f9430645537768fc25d2adf579783b03f8c7848a4a7a67dd4bf006f662f31b92c934b24cfb531
diff --git a/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild b/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild
deleted file mode 100644
index 30d38355c21f..000000000000
--- a/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
-
-inherit distutils-r1
-
-MY_PN="${PN/_/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Alternate keyring implementations"
-HOMEPAGE="https://github.com/jaraco/keyrings.alt https://pypi.org/project/keyrings.alt/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fs-0.5[${PYTHON_USEDEP}]
-		<dev-python/fs-2[${PYTHON_USEDEP}]
-		dev-python/gdata[$(python_gen_usedep 'python2*')]
-		dev-python/keyczar[$(python_gen_usedep 'python2*')]
-		dev-python/pycrypto[$(python_gen_usedep 'python*')]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-# Multiple failures
-RESTRICT=test
-
-python_prepare_all() {
-	sed \
-		-e "s:find_packages():find_packages(exclude=['tests']):g" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/keyrings_alt/metadata.xml b/dev-python/keyrings_alt/metadata.xml
deleted file mode 100644
index 26ffbe2b93a2..000000000000
--- a/dev-python/keyrings_alt/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 type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">keyrings.alt</remote-id>
-    <doc>http://pythonhosted.org/keyrings.alt/</doc>
-    <maintainer status="unknown">
-      <email>jaraco@jaraco.com</email>
-      <name>Jason R. Coombs</name>
-    </maintainer>
-    <remote-id type="github">jaraco/keyrings.alt</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 66ca75f48a31..e0bd6388f73d 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -3,9 +3,9 @@ DIST keystoneauth1-3.10.0.tar.gz 242560 BLAKE2B 40569c8078ab851d93ba2e4ecf3a3c77
 DIST keystoneauth1-3.13.1.tar.gz 246906 BLAKE2B 92877ef5a0ded692372521244c006f0a8ccbfc648c1ce058d8915189343d70278f529ced99f94ebabaefbb184490ea22546229c78f00e494011e5490886b057d SHA512 ee83652b67032cd04e88c8c4fcce708d113bccd17cb62843b4a03845ffcd40632a10613759946fbc684a80c2391e144dcf37aecb41eb151ebe83e08f9e08a536
 DIST keystoneauth1-3.17.1.tar.gz 253985 BLAKE2B 4df40a5cb993d6bec3972152d7557c03b9283621f58f4c6d29b680eafabaa0ee4ec60dc52851738f22c6f3182339e6bb0554e6a4ce9ace30473a902b74a57b52 SHA512 ca2f5a46450ed9a772bfbf882ab23ac4f251b2209ad038190fca41af0626616ae4f607ae03fb837b1e7bd87c2c239dfae64bc122ffc8db551451d95353743016
 DIST keystoneauth1-3.4.0.tar.gz 227170 BLAKE2B 57f28ce5a36362f34fcfb2f456a19332df6851a4d372fe890286b4d48469ff69a3ad7281b55d4aa338f61d437f5e07908fc55210e2085a6d9a974cf0bf451c81 SHA512 aeaefb0e5b369e36e06adc1bada104dab2c2aed22bf96cc3e20a5dd4ce8ae10869eb73ce4802faef70f191c3bbd38e3b5c3dff3606c46956fb350c0875cb7a7d
-EBUILD keystoneauth-3.1.0.ebuild 875 BLAKE2B 2d0066fa9da7ddc896e8cb8e86493607bab6f9d2dbf573555994f995722504415a69e72ebb7a5a9e9b672a328009b2c5ba5a14dca5611e8293492c26e08775dc SHA512 ba5f5dec402f66ecfbe89e8c55d3285ec716d4507018e931ff215a7ed3e89a390a047d9c4deae2218a8b37fcdeec7366e76dc9cc5547223561d9a18fc93c981c
-EBUILD keystoneauth-3.10.0.ebuild 892 BLAKE2B 66e95ad85087f263e6ff8362732d0206803d8cf153f0d94546daa9d3e56c0e98da68c9bf4d8a08da5c8f5161c7dfaf782f850b34bdffd1983c29cf91fd31cfe0 SHA512 d8d45252acc920486810aed22e2427b350a94920d0d2a7219ca6f3e90ce7b5aeb97b17ee0605328a53bf832746a3182c012398232a793c07281bf2ccb68edd18
-EBUILD keystoneauth-3.13.1.ebuild 892 BLAKE2B 6d542a76f6ade7ad39fb445c5bb33730e60e83ce9c3a639102ffed3c8088f06a60677e2cb0a3bb61386bbf8f33f948e82d83a7f2c4e683538a3295b57477944d SHA512 e125524332bec12b2d606369745db71c1d9c7ba02e77b4e75b7abc910f4718c2f58cd04ac05ef26d6939932c4aba4ff3f77bb5825edbb2e9a5dc0264d43c726e
-EBUILD keystoneauth-3.17.1.ebuild 892 BLAKE2B 6d542a76f6ade7ad39fb445c5bb33730e60e83ce9c3a639102ffed3c8088f06a60677e2cb0a3bb61386bbf8f33f948e82d83a7f2c4e683538a3295b57477944d SHA512 e125524332bec12b2d606369745db71c1d9c7ba02e77b4e75b7abc910f4718c2f58cd04ac05ef26d6939932c4aba4ff3f77bb5825edbb2e9a5dc0264d43c726e
-EBUILD keystoneauth-3.4.0.ebuild 827 BLAKE2B 231931b5564237bc5f801b0b635646d36df95620a6caa7e40cf4e02e41b01d7d7622a24769aebba73e772f9136062331ba93ffea7efa14b1374c70c076c0044c SHA512 27ec3076051d78f5a93d0b9548020ea8eb34bbfe1a95b5ce2231788cdcb346bce4acfdf984a35df657970da5445658f7f036e1bc8148068f9314fdd2749a9098
+EBUILD keystoneauth-3.1.0.ebuild 855 BLAKE2B 6c95358085c9f74b28596a0260c44e379240fe35928941e802da64f189603e172a881cf467a65a101ad838bda09ee1cfb3d168f563869d272a8d243d5b79ead7 SHA512 c681d23858a5a8645bad06d21b0326be54e1c0a677454e1fd473a876c2196bf3376f697e4e66ed256be79d660064f8375815b38c7b7c86adad53b2bc791511ea
+EBUILD keystoneauth-3.10.0.ebuild 872 BLAKE2B f9899c38409eccd2955a182bbe0e1e626263341f680966a1c86b7765429ba83e406f1f8ba01d08af8d2191176d9cd53952ed59d1d14c9a02bc6a2ce19d9de1d1 SHA512 1a7965d08d31a3702cad4a51f29f1f1d3cddf70cd0af8152117b6b354302a5772e3ed97a44254f61279ac3391827a7a2d27c0cad69f1b09ddc3b73b06ded1b91
+EBUILD keystoneauth-3.13.1.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
+EBUILD keystoneauth-3.17.1.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
+EBUILD keystoneauth-3.4.0.ebuild 807 BLAKE2B 4f3610d7b920935423f91fbc88c93215f7cc0786a14eca40779c3a5203528e3bb4649be0813d20020db6f37b91409e328486eeae57c9a38ae33affac5bc1cd15 SHA512 e39d10d017426400cb6dc489a86c2239a64aadfdcdd9655ebcb73af1c8b964b434fea1822948b3e0892b1b94d0e91754b4a03bd26b2689f1eca92bb210866da4
 MISC metadata.xml 519 BLAKE2B 22f32029ae01c1067c8ce7c4ea3adca3e462ef4f274b278dcdbc45f74325c719df3ed89b77a6f5f40a3fdf2219b7ed1b1272a944b1e30ea2d50f4ab2b206e000 SHA512 8a00d549ee4cf755cb819cab370b9e66cea6d3396d7c15c3b644731991ad292b0a2c862b2be42e045584e1a429ff5b8950bfe55d58a904cbefaeda8d117ac117
diff --git a/dev-python/keystoneauth/keystoneauth-3.1.0.ebuild b/dev-python/keystoneauth/keystoneauth-3.1.0.ebuild
index cfd955471fdd..c30d5bd027ff 100644
--- a/dev-python/keystoneauth/keystoneauth-3.1.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-3.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/keystoneauth/keystoneauth-3.10.0.ebuild b/dev-python/keystoneauth/keystoneauth-3.10.0.ebuild
index 27f449d1d6e6..e16c23beab6d 100644
--- a/dev-python/keystoneauth/keystoneauth-3.10.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-3.10.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/keystoneauth/keystoneauth-3.13.1.ebuild b/dev-python/keystoneauth/keystoneauth-3.13.1.ebuild
index 5b750dd57a1f..60b0dac745a6 100644
--- a/dev-python/keystoneauth/keystoneauth-3.13.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-3.13.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/keystoneauth/keystoneauth-3.17.1.ebuild b/dev-python/keystoneauth/keystoneauth-3.17.1.ebuild
index 5b750dd57a1f..60b0dac745a6 100644
--- a/dev-python/keystoneauth/keystoneauth-3.17.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-3.17.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild b/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild
index f15532430a83..70637cae17ec 100644
--- a/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 925d608ea245..04f1927a6625 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,9 +1,3 @@
-DIST keystonemiddleware-4.17.0.tar.gz 204603 BLAKE2B 37c3de6b5151b8e6d6e53ae70836f2d8a068472822cf8fdb71f38bea58099281a4e2648b11605d5952e65baf1722ca539e06a337d6854136e84bfdeea149e309 SHA512 ead2eb829a2189efddb6cf0052d86d32eaca0ae7474cf0444640c0c976df66bc1cf61971891639b798ffb6745fb510fe6499e42e94cc60f2c2084ad7f06c7ab7
-DIST keystonemiddleware-4.21.0.tar.gz 207164 BLAKE2B da9e55170c4af189661b518c596caa216d44df4caf139992ddd3cb9de0f14799cb08fb02e9bb6472df1a68aff7971687109002e6308009afbd2532e32eebebb4 SHA512 2746c2524559d6de18433d3718c7caf887fc92499466c04c65bef38467e9d16f80b1907c663b47c148dc18c2aae6192a79b4d5b2387f575a69cc837971eddf76
-DIST keystonemiddleware-6.0.0.tar.gz 208974 BLAKE2B f8a92ed31ef5d8385ae28bbc909d4c3c3d157c9b879d3beb0b3b87665381ac138c0f0a114e0c095b663f51cf4c1973f8cbb06eff3ca21feb998809bcb73d83cd SHA512 e2fe230da87de7f4ee768ba93dcbaf5382e44972a84914d6c0fbe0f13eda14ff74642594cfbbed1d6ec359eae4158bf9b798b48d362becdd6bad84ec3015db3b
 DIST keystonemiddleware-7.0.1.tar.gz 177439 BLAKE2B 645cade35a1b310b9a897b17fc96a7f1f33ca26efd3dbe482c8d76cca9a9639364cda6d2798c0b2956f5b905c166a67fe3f334cd0ae276e7b0124956f9a9cfd6 SHA512 2c3890a395fe03c19e121a1d315180bf2bf5004351a5dcabb1f455bf22514c682347a3c387da361075a81c3e931f6ac802aed1a95fa3763b90a2ac77adbec306
-EBUILD keystonemiddleware-4.17.0.ebuild 2877 BLAKE2B cf9ebd052664dc1f6ebf2e3cd0855e6031572b88fe391e5d8a1d28ba38b3d1fced91e6fe5eec04a28b72583bea82b8e086457b4a2873336617cf9bb22fe85d65 SHA512 ea01f3d407a4e4c51deb523a8d591e437b16fcf123bad4a687e22c6515c1a4e2d914f95ae5b42e995820ac6f14c17b85953710d8881fa4de6b2c8fac87061bdb
-EBUILD keystonemiddleware-4.21.0.ebuild 2684 BLAKE2B 463dbea97c6c8aff0179a8e52773c8e2baf264e82987faffae017a42f601628557c57b882f506c4ef409f95baa50aed0d6cd57865862f6080d4ea35d62ab8607 SHA512 185cb82e78e21f4fe9c0d9e4100bee213829aa825500d8d019586fe0ae202a9c4fa3d4a3b2a9ab55bb2bf2b70c7e390c446494da4b5576fab181e275c9c03dd7
-EBUILD keystonemiddleware-6.0.0.ebuild 2469 BLAKE2B 5c1b995172c915e4e14cc5ddc14327ded4f38c2e53eb2a1127530ce89c893e839f7d8eedba3062124a314e4b9a409fb6c08d3d1ecc81436e69827a1c190c772e SHA512 9bf90d2ec6a3100c4f54ced09c76f14ca6f7b5f85e1191e3112f9db41e2311dd5708773b8d2a5a25cb518b26aa026d254ad5ebf830b2e2f115b41520e4be2ea0
-EBUILD keystonemiddleware-7.0.1.ebuild 1478 BLAKE2B 69661e85171d4fd938cc0a0eca3741b37deec294ff0e2125ca06d0a3aaf5fe2769b4b9b8636b91c494d02fd47e2d9b2987b0801ce4e0a45875e353a03feb0378 SHA512 f9384ca0f280f09c0706761b1dbe66f6bd9f82ff074fccb05477ee8fb76c80b9616b0bae289f3d9892ad36907e77252b08f2c034372a6e45c1294609905ea684
+EBUILD keystonemiddleware-7.0.1.ebuild 1466 BLAKE2B 3be59200a860cb8097c5bbff3774b3e80b08fe85d9e4b3e04838dc3d1f7d27031d6f8dd11fb63fd5c2df04c1272df28dcc81ec1dc80836b82f32298fee393d39 SHA512 7771e244dac935eafc985eff418dee5b4bf6babecb6d19f1880e29132d1bc5679c3b56b517d5a3be53392a47f1590af2cf361e70310a60d2abf5bf16504a15c1
 MISC metadata.xml 624 BLAKE2B 9431121807a163b4dac75bfe53e40ee4b86412db23d46c8fa6318ec6e0d2af338eb6423076879bbb863e7a2aa173d484d2f1a3c98211021e5357e07f9cae481b SHA512 5ca1f6ea10053be2f9f74c797cd1143f6b3ab267d0decb66f3609973c20637b55769bcb305ab70693d99d3ab09da6aa6ac7d2acc66431a4a52f6dc9aef79aa6c
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.17.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.17.0.ebuild
deleted file mode 100644
index 86ec621b4549..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.17.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-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="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/keystoneauth-2.21.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.21.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.21.0.ebuild
deleted file mode 100644
index b48ce9b71dbf..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.21.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-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="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
-		!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0.27[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-6.0.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-6.0.0.ebuild
deleted file mode 100644
index 3659332520a0..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-6.0.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-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="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0.27[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
index 719f91a0eb89..aec07f809a6a 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/kitchen/Manifest b/dev-python/kitchen/Manifest
index d96792e22a6d..663350bd3e3c 100644
--- a/dev-python/kitchen/Manifest
+++ b/dev-python/kitchen/Manifest
@@ -1,5 +1,5 @@
 DIST kitchen-1.2.4.tar.gz 187149 BLAKE2B 5ea3fa593ee22680998cf9ea08b66faacc2f7e20d70ec5823a6c29d8358991e98fe79cd4bd761b04b895dd1d87b1a21e2dc31ef33c0c47a05973ea4e9b884d7d SHA512 790f7eaa16820d3b12f740d2ac7c9d849d40eea91527b7fc011270bd46af5038e987cc1b170c75c2175dc627f99a52bde52b9f276db8dac5d9d7df59ef9a505d
 DIST kitchen-1.2.5.tar.gz 255350 BLAKE2B e4054c03130dce3fab3593da86cc9952cd748d0d0b300b7ade7a16bd433f7558045f10eeeb0c8840f59610140bab268f9e75e49f0f9504e221d886edd2b2a3f3 SHA512 f516d66d142b7e5d448abab911d08dcd4fd671144d0e734f12523248641b560bf451581704841225b46ec8b168cb716dea661c6c4839052900ccb1ac204b79f5
-EBUILD kitchen-1.2.4.ebuild 425 BLAKE2B d64538a33b7072a86309b5046ab1d5f881770bee8bc707862eb352b6757ede8b91f55e6dc70a70459ff7a9839fd02fac1c1f4eba1566b9d1cb34138b765672fa SHA512 f88aa28cec77f2086d2b41f98b1c3246dfe097ea2eb93310d6aa09e4893a6aa9b94cbef5ad8c0d47d9d3d7ae708ba4797ec0bbd580508e75203276382e624a20
-EBUILD kitchen-1.2.5.ebuild 417 BLAKE2B ed685b456e6611faee516d3a230acf1323ebe2b79dd409089c48116ec967f9f32aaf6bc1bbce4754a40729bd5db3b9ff9c86d28b977c60f6b3dbf0ca62a6f937 SHA512 e2fc5d290f0241b74e237fdd41f55e60b9f112ad781b76b94651005c77115249e7b9fd2f38470ed9c67a69fe9247deb77d0b5826aa552149a02adc54a34d7afc
+EBUILD kitchen-1.2.4.ebuild 421 BLAKE2B f7308502f4fc27554f06e96a22a776b2683989830c48102924b23db71a71f277cc4ca6461d5cb7de647f6b79f8fba98dfc6f3bba043d260be681e3ca10243788 SHA512 e6fe95428bf90a3f6e1423de129d4bbf60c6eced0645e954fcd26c0d0e4a7653fca903a8124ba97753df650bfd5261dd343e138501ef7403141e68ab05c2ef69
+EBUILD kitchen-1.2.5.ebuild 413 BLAKE2B e0cd91ecb8fe59a3390e84a401e35bb15ec6295880f91e3e3d9f9fe51a9fcd671496896770457ff1120acd8038e6aa13623d0bcce5663c6ff3fcf2de21c6731e SHA512 81294fc391479c1aa53f29880cbcb097fa48f7070044287e5fad6b00dbcad18d6a3a6d55f020165551b156e7f1acbf927b294bf7dfe62573ce76803b06297b22
 MISC metadata.xml 394 BLAKE2B 7dc512534576658b0235d756ef866ec734882a11ed3c976751b0c724cf01c9a4ac1fe828bdd63f98ea91d240eeb478f9dcba07ad3017af16cc7e53a7fb7b381a SHA512 3ed7d0541ef7bfe4a14a04c54ce9ccabc08d47c29e2cf821848f53e3d3efefdb577e8dca99e6fd063d222864312bc8f1cae627037ad6abefd5c195276872429e
diff --git a/dev-python/kitchen/kitchen-1.2.4.ebuild b/dev-python/kitchen/kitchen-1.2.4.ebuild
index 6def09d90473..c7781b8ddb86 100644
--- a/dev-python/kitchen/kitchen-1.2.4.ebuild
+++ b/dev-python/kitchen/kitchen-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A cornucopia of useful code"
diff --git a/dev-python/kitchen/kitchen-1.2.5.ebuild b/dev-python/kitchen/kitchen-1.2.5.ebuild
index f88e7a145cda..ec7319b41b17 100644
--- a/dev-python/kitchen/kitchen-1.2.5.ebuild
+++ b/dev-python/kitchen/kitchen-1.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A cornucopia of useful code"
diff --git a/dev-python/kivy-garden/Manifest b/dev-python/kivy-garden/Manifest
index d93c08f5b2a2..f0430aaf55e9 100644
--- a/dev-python/kivy-garden/Manifest
+++ b/dev-python/kivy-garden/Manifest
@@ -3,5 +3,5 @@ AUX remove_bat.patch 338 BLAKE2B e4d40146e08de4f6bb013ced86bb9f15fbe1dbf31a9e6ab
 DIST kivy-garden-0.1.1.tar.gz 5789 BLAKE2B 559f9cc2e58a39881bb08729913a154cdccfdddc9f0b0f6b5f594d2688b37b8ceee463b12998832228b1a925c441aa31192064c2f9974c6a5db8e4242db082e2 SHA512 d551e8fdb08c7c1810972df04b024fb59554a94b9d6dc98a1438620541c13152e8c7de4cc603efed4df00e3d681d8545939ab417266459e26e116ff6660d8013
 DIST kivy-garden-0.1.4.tar.gz 6849 BLAKE2B 944d84ce9057db64c1435d9e4f5e4b8d7e812cac39a7ef536974f5b4a4e525d2ed7dc8c214db75d20cf87bdd1effa9e1312d979e264bb93a5edaf4cf43c7441d SHA512 69b8fa2e2e80cc215eaad0eca78e1e207726ef2f611ba328863191580c19e77de970347b206c82927d92fbc821811956f8c45ac3613dafb2db706a491c50585f
 EBUILD kivy-garden-0.1.1.ebuild 548 BLAKE2B b0790f8897218c8b6f2829a8915e88663211cc69801f4032540580151b2535da5498c88bb9def14d6e94e612f159c4902da0c349de83502ef41bbde2973cfe53 SHA512 6695e9d381f4c50fb56eb6e2031ca2cb94bc430d37b194bafaefba36d9dc0e1d24f06aab539a98eba4f043ba1f2f15b9bcd4ad4d6f9cbe1407211713f7662337
-EBUILD kivy-garden-0.1.4.ebuild 753 BLAKE2B d35e252db749a5264521d67b14551e5d6a979dbc57a4436e4440d84b14ff33d35b3f3529dfe667bcbfb19ca5ccdf7ed31e444543ce62f393eee95bb31dfa0dcb SHA512 ab857245f83d0b47a0e41046266634acfba204c4529939c601c0e4e9cad778b45721e1a1ab975334cf4fcebe65cb5d75d7ffbe6f34fcd0577a86c1c3d40e088b
-MISC metadata.xml 532 BLAKE2B 3e8de0d4a423d9da19535cb64cd3178bf990e0c34fc592a907733eccf6f0598671e59befa54903e0b61fd4d2aba61ccc64b3f2588ee83f9234250642c78a420e SHA512 91e074fe17ff264c7d74694902dbc6711373d275ffa90d7d470faa145699224a4d1d4444bce5aac423f7401c05aa27c51fc3ebf95966401a8c0c852c439ecc1b
+EBUILD kivy-garden-0.1.4.ebuild 749 BLAKE2B ee7f346729e5ecd892808ac7b9cf9178020557b6ca70501f5162a87c6970a805f5e4cbf4ebc8ecc0608ed0afeb59180167f21b89ba45699c1dbb1fe4b1c49024 SHA512 920d33aa5d7de91e90df9fb8a8c9c6cb08a650aaaeea3aadfb635e86a7db2175a2dd41ca993704b8e3953de8e1e8ed227e367ef10f305716e7ac32e72c24e1a1
+MISC metadata.xml 481 BLAKE2B 52d95945cbd4b1e43d1772a6646044e4881c3a2d5b99867f8ec429a14d988d2d8c8169da2cf7308a13814ee45a9970570c1b179797f206c9003e8fecdcaf3238 SHA512 9b5a266a1369223bdef871fff1c7c6b0136a7d8243e20db29b2b8f718436661572d5c149fb05debae03414e57807d3ecd52fd4ecf25f44a3740b37aec71850e2
diff --git a/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
index 9abbfcc23835..eae27fc8e7cb 100644
--- a/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
+++ b/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/kivy-garden/metadata.xml b/dev-python/kivy-garden/metadata.xml
index 2fc98962afb1..d34379f1b682 100644
--- a/dev-python/kivy-garden/metadata.xml
+++ b/dev-python/kivy-garden/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
     Tool to manage the installation, removal of flowers at https://github.com/kivy-garden/ 
     They are a set of user maintained widgets, extensions, tools for kivy(http://kivy.org) framework.
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 59abaf876438..9ccd3a22916f 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,3 +1,3 @@
 DIST kiwisolver-1.0.1.tar.gz 34783 BLAKE2B 104fb7789e004841921bc43fe98a98b247c7f0506a94b07d10ff1e758287a272c9d2f119b7a086847653cdf1bfc9d5c94823d1eb0b4a30ea93cf2b8b05027013 SHA512 01002ae1dbf6482ed68c49ad3da80b772db84ec221c4b111c42f1b493f19299e0ddb187e43e64b380eb2ddc292d5848d6e09a5a1dbfaf68950a65423a913ec18
-EBUILD kiwisolver-1.0.1.ebuild 540 BLAKE2B 7df51ed7b64dd1f251ee06c95fb2151ec5bc77297f884ef63d563685007b024be7afa9197749de5de441c3f2c86367bd929111def387775d5ca2b92338c89332 SHA512 f96a3fc0694a0875630de0ebdc91ed5bb636ca9d3a389f01284f6bb37a83af766230edfd657321005a18a265236197cfc09d5f1ed673549ea8022fb0162e0aaa
+EBUILD kiwisolver-1.0.1.ebuild 538 BLAKE2B b79352b1c0dcd18240b0e93277b765a3d2e00b83462426586c52cec9534c33aadcfa912a7ca984dfd38c7b6aecdf03f909945b8882555b9fbff886859f0d288a SHA512 c6ac78627965c73122b84c78cecfa92766c55b9c6ed2a0a6397edc6880bebd3a60943e16830b671076bc30d77dc107a6b29d56ec8b4660f1be6c8d87696e9221
 MISC metadata.xml 297 BLAKE2B f3bcf69a0615862f39b7182500b5f2b476786d974a7dac4ae07d7409610659ecd69bbfe13a926615ba5ef59a3438cba37ba246ab1dd3666e84bcba8efa03357b SHA512 8e2af9d77af6a660d6624bb67076747b79884797a2a1cfd32df0301e7aff0d2d4f8dfe48acb8f3a2de5d3b4c51ed647cb2a373d04e5a5d1e3abc763b270197af
diff --git a/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
index f4e0ddfbf273..d9bc964d733d 100644
--- a/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 0713a9c261b4..a6bdbb2e41bb 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -2,8 +2,8 @@ DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc5
 DIST kombu-4.2.1.tar.gz 423926 BLAKE2B 8566e3d81bd77c93982f54300e837e2aaac1d1fbfc716c87607fb83b86bc80148afc37b11145ee33ff3a6cef9fadb6178c370dc5b47c0774a56e6b08b6bf951e SHA512 a480444199aeee4e0048803a49ee85f2b348734eccf0e746189ea7db3787cb27baa89765a71cf88288ec7171252d55e13bc787641a543d3f91d6eb3d30c6a90c
 DIST kombu-4.4.0.tar.gz 435287 BLAKE2B c87154f5f8862af9e0381f1f4eda6016e5ed69605a39b682c9e648003adf4aa4ed8ebbe7f6dc38b293ab013d8f5e31bb732cf47cc4aab7738be7edaaa25ca750 SHA512 2f7bd71f848c7bba0643e47c43af79ae09373597bed86786e3a90f2acd69414583021e7f5544e47bf01f760b1fd9788e89e88a32cd22a3d74a34845b7917e10b
 DIST kombu-4.6.3.tar.gz 427754 BLAKE2B 0db078eb8d6afd18a5e9b48c970791d2c55c46f5f705e8e0737c8685c2415e1ca974594377a54764f744cc73ff607668ece3c0999b1a7dad6a259567ac1fd319 SHA512 35113c4f19fe6bf94c374477c89a629f565975a23c16a3cedefa8e0c2a800cabbaa8917d48f732cf28e89cd5430fe8408a3514e055b1858c216b6ea31b4c014a
-EBUILD kombu-4.1.0-r1.ebuild 2316 BLAKE2B f60336f1e13a1a9d9a4672347a926f132f107174e3778425cb051e93a5de6e0ea84b0a5fc3ecec65b805b2bad7d504d30a356b2f5fa270683e67144dddc02808 SHA512 58ecd1a199828f3a3c5ce0c22b40a18a6a469de90df160c587c0f0cc61299e2006f4fb0e3bdf2d778235b59e8bd686ce5d80054e083094fa8309e21310885159
-EBUILD kombu-4.2.1.ebuild 2316 BLAKE2B 2343a2ce95e96579d307cddae090e72c45f1431303dbc52b93b3f897caf287ccd6c8283e926382a4b3879d854b104ac4d53c621de54f08fe42639defe3335238 SHA512 f32d29f8d98d633f6709d2fbb000aecb74ba57f45c7c9912494009df262f43c9efdeddfa6065acb54450356b0060d8c05a786dac060c04b9e49b3f7acb8ae5e2
-EBUILD kombu-4.4.0.ebuild 2316 BLAKE2B bfe064deeb7fce7a971d57f2803564443627c02ff13b6c5f060708e4b825d50d99620c14113c9ad57ab755210e3f8484867cbd7043517eca2285d1a212c2cc7a SHA512 3eb157ad3d4e3e56657804efdb0aa2193617be26b8cbc1f6f7c564f223e2041c2e9d4fb2f6b26a89930410d34741794f65a67498a9af22cfa307eb7f697f0fa0
-EBUILD kombu-4.6.3.ebuild 2323 BLAKE2B 171e1ca2091da71939e6d721df234358a08b09deb3355e020cc1d83f3c92ceff7a94e8bbdc5ad6e7d7313c603c9c5c2b486356099f6cfdca1dd3f95c3c550e56 SHA512 76c8aa32215339e83b844f4aaa9588c1fce0d543db7250c106fd0fe9699caabfc848ae2141b765d7603ccf30d4c92d44796fd07fa37317ea363f580504a3d6cd
+EBUILD kombu-4.1.0-r1.ebuild 2312 BLAKE2B c5ae64d170d40321d11e03fcdf7f075307852609daf0ec7995f803983156f040959928016dbfa99e4ebc0ca370471053359f65c5171f01b94e3a783550110553 SHA512 7157e878e4ad438ba996be82dd5d7d2aa7ebc5d6882975a74684ab313d396030b26c6e14a3e99d41cea548068f1c5c5d8e8fe0da940e6e863e3633d88aa242f0
+EBUILD kombu-4.2.1.ebuild 2312 BLAKE2B c872414990381677cfbc9c691bb798cd1a5d2706f7591ee23060fe8855f551a33b56d4177a0d611f3054700c6890446ca4e32f9d80dd3d8cf0c2aa63a320d0f1 SHA512 10820964349d9be1fb99fd04856386d03ba114e6adb8e7f740230e3c027e988a108586d0715434ff47680c6f67a20c491d1be498c0f972b0597649827780bd52
+EBUILD kombu-4.4.0.ebuild 2314 BLAKE2B 409bca41b8a40cd9625c19299cad0e7dc794b92f331240ae19f95a62303f8de0eb1f138f99ecba927116cf58e6751e6f0662aa64b70ea244b8eca835bddd016d SHA512 7660303891313a42e35df8ff172a62f0b2ffde136ef1a62114a1b7cf3d9050fd37b2db1aec20af02d08cef2173569e7a31f4402566208ab0fb4b3e43e9aa0b76
+EBUILD kombu-4.6.3.ebuild 2321 BLAKE2B c57ea918f66f41c0ecfde70a9d8de3a3aeb419f5d48ac475b315905d1e1b81b75f2876ea38e283431652e4c0fa4ecc01c722f3f08c5701637d32b565fcd2fc3a SHA512 7becb075e3a26441ad39336866d16091d609bf1d73d7e64f8be113be8d3bba85d4cc70470111d98719c9b6e08d9c60262d36f52eb6cdca04fe70363f88753842
 MISC metadata.xml 675 BLAKE2B 6bab5465ca22ad8ab27ff08418abb6c6616972605b2b9bec7ec559f887962c80df01e6c9aa8eed5b1ffcbc392a8476f86ea477fa3c4084ba37e1ba350786f8d5 SHA512 37288783570daecc3bd70a8f5e9b96e652cd2271f1a36f9ecd644b6fb98f4dadbb2f2cbe36457c46d4b99d67fc5cfa6fea78f37bfd96b3b639cd26de4e948541
diff --git a/dev-python/kombu/kombu-4.1.0-r1.ebuild b/dev-python/kombu/kombu-4.1.0-r1.ebuild
index 62ce4473535f..0ec84117cd48 100644
--- a/dev-python/kombu/kombu-4.1.0-r1.ebuild
+++ b/dev-python/kombu/kombu-4.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kombu/kombu-4.2.1.ebuild b/dev-python/kombu/kombu-4.2.1.ebuild
index 9a01b53918ed..693a1e87d4f2 100644
--- a/dev-python/kombu/kombu-4.2.1.ebuild
+++ b/dev-python/kombu/kombu-4.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kombu/kombu-4.4.0.ebuild b/dev-python/kombu/kombu-4.4.0.ebuild
index 150bcb6f11c2..387f273a303e 100644
--- a/dev-python/kombu/kombu-4.4.0.ebuild
+++ b/dev-python/kombu/kombu-4.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/kombu/kombu-4.6.3.ebuild b/dev-python/kombu/kombu-4.6.3.ebuild
index 76cd369ab368..bd142f3dbdf0 100644
--- a/dev-python/kombu/kombu-4.6.3.ebuild
+++ b/dev-python/kombu/kombu-4.6.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
new file mode 100644
index 000000000000..0a282a69ccd2
--- /dev/null
+++ b/dev-python/lark-parser/Manifest
@@ -0,0 +1,3 @@
+DIST lark-parser-0.7.8.tar.gz 276204 BLAKE2B c2d103f41b7b6ccb988c5935c53e422d495980c1d64cba125e9d27b9b7bf03c0864904e6c2c6b40ec56e8975a8051f1a18c9da126d02fe149dc3684ea7d41c30 SHA512 52eed1a5f26fa7ba79820298a8f6f7594b2351797abdaf8fd96f76e15a11711805955e055164ce287f7204edf3d19116562795cf56db464b4f2f15e40e1da561
+EBUILD lark-parser-0.7.8.ebuild 405 BLAKE2B 435ad90823354a3f90a1462832e1ab2da73f6c04babc2b2181de7fcf7b3b721640c986cf897cacb4874ab12d9a0049839bcace046baa64c6d1ed556dc558308e SHA512 8cc8853b17474539c52ac81626fc6c8bfe0cf1d3fa4f5f1ff365faabd4347539218faad57a8ef4b7fcfe1e13511136f37198a4ef94229c3ec7228ab79940b81a
+MISC metadata.xml 503 BLAKE2B 99d3c5991b02f4c0b0daf656b1e6f38e38f04622715b0ceab73b40951f4bf1e97b52e6ebe06767948660370c93382a294efaa7d768937659e66b3916a44b3a31 SHA512 11eb50053b35b3dd0a92f0923d3e7c00abeeee046cc3a1113c5ae33993627e778fa58699b90bf0d4915b00ab8635f2200c4a4637754d9752a60874c419c6d4b0
diff --git a/dev-python/lark-parser/lark-parser-0.7.8.ebuild b/dev-python/lark-parser/lark-parser-0.7.8.ebuild
new file mode 100644
index 000000000000..d85e3e03e315
--- /dev/null
+++ b/dev-python/lark-parser/lark-parser-0.7.8.ebuild
@@ -0,0 +1,16 @@
+# 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="Python module to propose a modern general-purpose parsing library for Python"
+HOMEPAGE="https://github.com/lark-parser/lark"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/lark-parser/metadata.xml b/dev-python/lark-parser/metadata.xml
new file mode 100644
index 000000000000..2b5b3fe9fe82
--- /dev/null
+++ b/dev-python/lark-parser/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thomas.andrejak@gmail.com</email>
+		<name>Thomas Andrejak</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lark-parser</remote-id>
+		<remote-id type="github">lark-parser/lark</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lazr-config/Manifest b/dev-python/lazr-config/Manifest
index faea5adafa9d..c2f333ff4e1f 100644
--- a/dev-python/lazr-config/Manifest
+++ b/dev-python/lazr-config/Manifest
@@ -1,3 +1,3 @@
 DIST lazr-config-2.2.1.tar.gz 31761 BLAKE2B 3980e75677a5260dbecdaa59dba0a01fbaececbe217b4147199ee5e11396ca74f55df9cd23554b54eebe844b287dd6fd90e5c0755c405930f225b6ef61bb54fd SHA512 c8708bcbe371c731026489aad0fa2857ddc4ee0d13a468c33c3551d928318ee6b00f23eb20c44ac4ad9ea77a4edc8ffc2fec1bee9f018d27902940718825c4fb
-EBUILD lazr-config-2.2.1.ebuild 670 BLAKE2B b2dffea1d3be9353f7e8b5e9db32b951e08e78572872a060be643a1b2d83fef4b124d27d7ebd09b96ef697c765a4181e0632a1d44200dba4a1830d717412cb84 SHA512 4027feaf02ce7650c26086856dc05c962402349b406471fb5421e95654874693ba4e67e3f0a33050984efc056b86bc1981877bbf1496b1b6c68af97f6bbb80b2
+EBUILD lazr-config-2.2.1.ebuild 660 BLAKE2B 65554e8c73d2f7398c29becca4508ef86346213583df1312ac0c454507f17ee52dca45ce5ae4b62bfa1b750723865de19668ee2a6d1ff801e2bfcaf2415bc9c2 SHA512 1432e5fac3ab7242bdfdbf08e3e105d0cfe773414136adad2b1d5f47b922c0c595c0422bf3877df663634002de7dde8586d2e3d3c31296e1f91204d227ac4d0a
 MISC metadata.xml 455 BLAKE2B f897ae39a752d337a92e2ce15baa3cc30217d8741d9da23345b8a4a62122ac87c0d38fe1780a89ff6ade706b59634d56c8cf4a6bd77a362f4319f83d8776ef43 SHA512 85f0af921cd7c83999cd0b302842276fb463c2881f3af7700676711a162804c2db3ecb06d89c0ccd3e33527ab7147723d5e9d7292cc0f26ba8f12438484a7301
diff --git a/dev-python/lazr-config/lazr-config-2.2.1.ebuild b/dev-python/lazr-config/lazr-config-2.2.1.ebuild
index 42a1e77fd35a..b2ea284f5a80 100644
--- a/dev-python/lazr-config/lazr-config-2.2.1.ebuild
+++ b/dev-python/lazr-config/lazr-config-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/lazr-delegates/Manifest b/dev-python/lazr-delegates/Manifest
index 4525827baad4..7eba255fc2d9 100644
--- a/dev-python/lazr-delegates/Manifest
+++ b/dev-python/lazr-delegates/Manifest
@@ -1,3 +1,3 @@
 DIST lazr-delegates-2.0.4.tar.gz 14168 BLAKE2B b9388a869e7f83e0bc30dc5a0cfb184a935db2b6272c2a9a93bb12d3db375114453a224703ef05b3f34232860a16fc087b7d398e94d164fbf77af61ba8abf102 SHA512 0c0b32a4fa4c132646d601870be0f0c1f1856aceb91bf979faa9a675fcbf94f76c7c6f548978a402842633cf4e53275c052cff7dfd776a4246691c067eabe501
-EBUILD lazr-delegates-2.0.4.ebuild 636 BLAKE2B cee4af29ac8fff923221e93e787b4dd27d93fcfda35ba1642b39a90b628bd962cb742ed0dd0d7b35e33b0f8a48c41505c6914c1123b286c685f0df72f0f2efd2 SHA512 2d156a43dd8d4df7aefc6fcbe949a8d0ca61141c136f63e082f19e91820ae2c3587b85e5838b01dc40ec10bfdd1ecc3e7e66f5e5c8586fef3e5b3f426f66bf4e
+EBUILD lazr-delegates-2.0.4.ebuild 626 BLAKE2B fdb69dad83c6f9fc1ea97b326829505bdd60e3b1dcaa5b70f06f1e43493555e6ac868304945822bfe12993d0d8da0dccd171d0b84b6a95c2457ce43d9265b420 SHA512 25fc34900a6cff0631f6b085a03fd7da993f0fe3931a7bd99c8ac112991392cafcc4fe4489890a4a654a8ba6af142d4e4acffbf870ed8fbace705f55a1503729
 MISC metadata.xml 428 BLAKE2B 9156e02f1e687a320435ae677b8b357a0d101e670ff1e57647aa54012dacbab33ef9145f38b01b3c72d33377ab79cef1f388d00a758d4424f8c5ac38f3f4226f SHA512 e37d21627228729b1f9434288e81d0950505606f0394cf7793d49e217503244ccfcf8aca0ec3354d8dd0c9d7a511680800f6da5a0de423c187c1884e40b0bbce
diff --git a/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild b/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
index de49527ee86e..c5a0941c7b85 100644
--- a/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
+++ b/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index c49295a009f1..6b75a0d3c6d7 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,7 +1,7 @@
 DIST lazy-object-proxy-1.2.1.tar.gz 28860 BLAKE2B fecf6830111c9ac317fae2ebeae624b4b62494eadeca08bc6cb63bd6a23132cd954a55c97efbede3b136f4bd20d2c35c861d3f89022403d7d777bf762c656e81 SHA512 60813fea51e14ccfa22974c547c7179593da25e4ba65380c39493d2b91558bfcdffa298fe0a043170414d897bd72fd22f0bc3bc3fbdc8202873fab6c2a8e45a8
 DIST lazy-object-proxy-1.3.1.tar.gz 32237 BLAKE2B 3052c6952d80365c6698f50c5f4508d7448a68b33ca899d251477e9a728fa740a0bd1d3a85f5ccab63905fbd062e5c37da59a827ca58e25268e7ced6fd9a961c SHA512 9ea4fa0185431859ff79fd6dc59106c2b64e372b5052d034b3638e362695f10b27b59f57c5aed73bb2350d3963f98190e3069f9129b9f3f4932212f9b5460962
 DIST lazy-object-proxy-1.4.3.tar.gz 34888 BLAKE2B 43f64fcd6573d4a4cdc2208bcd882714cb21474e4274d53b955664b05525ed5d1305ed4121f6ee319aefb3ab7827bc9b2073d32dc4c67e969adb5367a16d4cc1 SHA512 c2c8ad8286776d61def222b394cab27647b7a1bf4b3915e169b65c6022cb26d5ef286f1041adfddaf8a78a2410c11424983b3580a019561eda5f2e4c3a88620f
-EBUILD lazy-object-proxy-1.2.1.ebuild 994 BLAKE2B 3d1fc8f9c73215b1b2d4ce46fa19b6b2acc990710563a9ef8a0c16291491c7cc5770316ee786aa58d0a6bbb2b31b2aabb3bac37296ae615fc2a28b2dfb03d58f SHA512 d08b9d2b910ab69f88618504bbcef2cf814c38f20d7680a43ad678034f9b8b7330bf61e8e395f0b3e6203b2b0c05dbf57bcb502d849f0f93fa721384dc57e9c5
-EBUILD lazy-object-proxy-1.3.1.ebuild 1024 BLAKE2B 56b978afc5a0003fcb9eb2a00f13739817d6a473173b19f493ef08e600f22fa3f05f6cbceaa63abb305fbd6d1e4f3b062168bb37f19d0a133f66a755314cf1ce SHA512 718f96f0411c73d6c16114fc5025260ac5a17611761d90c7e2f758e69e20bc9a7a18135943ee5d42cb41c7fd7c805ee22f9537a58251b4f0d38871e0bbe6216f
-EBUILD lazy-object-proxy-1.4.3.ebuild 1009 BLAKE2B 1f465f0392c495a4c1567accf5ae7ed272d4998df94d7c040a7a5e9e985f1f739bfd7d70bcfdf7570741425c45ef9ea6e23d96a0a8a4c095d5bf439bd431b84e SHA512 e3870d24e0277ecb4973b9018cb724427bdbe0e69fe6c0c7682a67340071d65426e3c3d462a3d8b7211b8d96704696b963e5eebd225366900bbdf8bce7aef3dd
+EBUILD lazy-object-proxy-1.2.1.ebuild 985 BLAKE2B 1939270791e08e15eaee56121e028c25070ca3afcb055d262fc1274cd5dc4ee67332dbd5ba138d2587593ec1b622cf2b4e0a5346070ab5b689e274442c7100c4 SHA512 939f83320c8f79a97e72f915f1bf4b57bac792f4138ef7a85cd7b56e05ffe97f4ce9329a40425a19b9fbc2eb25e02f00a8d19cd6bffbfa235c1d15f0d65cd084
+EBUILD lazy-object-proxy-1.3.1.ebuild 1017 BLAKE2B 6e7ae178b8f48c39007d9ae9eb428783769ba9cec6b919ef7abf31af3e1debc43d7b3c3f73805ee5cf55c34471cef0f82726f91cdd7a78e3478a8e14f6b95e82 SHA512 96a3b5e498eec9336391cd7a7cdde8bf1a522c7e6f68fd8864726e21e9b82b3d9d2b7256df8d0206ea5d2d26325f4509cacc03f7a2c24bbee30f92cff236572b
+EBUILD lazy-object-proxy-1.4.3.ebuild 1004 BLAKE2B d070eeb7eff82403e910e074b8cc12ca82de60c64bd797895b5544655dc67362a17efae9bdb4f06f3781733f552356163eb5303def02c1418eeb098830b05398 SHA512 44f64442eecc93d51e8fc4b604b0a12bcd977ef965e5fa51c3ecc18e8cf2aea38637e5bdd894b1fd940d979411bbb4ca38aab9553811d34586fbcb360208e60b
 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
index 8c061bc6acfb..434b20bf38f8 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
index 6fd3c6aaccaa..8e36640d0258 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.4.3.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.4.3.ebuild
index a4a663a36d7f..5cd2673c6b0b 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.4.3.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
index 4fdffbab19b4..54c48a06e6a4 100644
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@@ -1,7 +1,7 @@
 DIST ldap3-2.2.3.tar.gz 331483 BLAKE2B a6479e6a02d0a0682b809cea2b63ff9ff3935f2d083b9dff3a02468d3a27cbc75dc69dff64f523c0b077f288b3e1e565433af13a607568617c309c3e894d7a62 SHA512 a954f6c582e88addf0bd6dc6fb24108d76d134b80c14a3dca0f9f667dbbfee484cb7b0444822f7e82a41af7dacf61ba111b6dcbf215b7f6df26a3784cfd2fc83
 DIST ldap3-2.4.1.tar.gz 345220 BLAKE2B bcf2ea46d483fd4fbfa7ba48e2a2e72061e82b56ac5bcad0e28aec0d52a723d5e5b2aad1f1c335977edeb260264a5603aa2a2bb726c08fd46a0215c46ad2f287 SHA512 716671c2d07c53d1953aab4668562a1b59a1e642b19d50f3cf05d44c74b6848a34b4197aa2c77f5b1d6b556ec0ca473b0495c24da74e2395aa20dffc8a0a360d
 DIST ldap3-2.5.1.tar.gz 352262 BLAKE2B ddbc2146ab23ff2532290e54e8e92c9721c3a312d327f6ec408330335d7b8f30a698e38ea07d0bfc3b603985ce0b497cd8f69e0f0093379191f614fb8e02514a SHA512 8cf3e656f3b58ead391f45c44ec2175ecb7abf29047e4eb03d9f95983cb01900159a4e27bef596df5ffdf7fdf3827615663872c35bd57dede8c9b789aad191e7
-EBUILD ldap3-2.2.3.ebuild 865 BLAKE2B f76745ec072dd5d9fe70c008726a80a403420518ec58120521d94c22d1bbbd3b66d273b3dd6fb8b668d2d28ff45f2709786697e0787d63f7219c3ad9db0ba9e5 SHA512 d83b2634f2eb78d0d04d50b1d8f29af8368f35a3daaf11bb8b105ce2791ae60036420269ddeae896a40a1fbaa86b80786f42d6bc40b74e8e6f4fea5f77dc5531
-EBUILD ldap3-2.4.1.ebuild 873 BLAKE2B 4ff45e7ca81de58c5063afeaee6ec585984615e5ee34de1200dec93a44792c5a45e958f37dd784a7505c96541b09badb37c4722cbea21656420948773b5fc4ac SHA512 8541c142944e1467de4faa6b8199db4b0592f8028aa20733aefeffd2a9d51248884b1aca2ab98aa9854cc69a553b68e055d3dce8737fc8c9577f4b79d9c77b6d
-EBUILD ldap3-2.5.1.ebuild 873 BLAKE2B 4ff45e7ca81de58c5063afeaee6ec585984615e5ee34de1200dec93a44792c5a45e958f37dd784a7505c96541b09badb37c4722cbea21656420948773b5fc4ac SHA512 8541c142944e1467de4faa6b8199db4b0592f8028aa20733aefeffd2a9d51248884b1aca2ab98aa9854cc69a553b68e055d3dce8737fc8c9577f4b79d9c77b6d
+EBUILD ldap3-2.2.3.ebuild 856 BLAKE2B 4eac11a30ae7215da56bc68d3c77473b4f5558331ad17939f208ff1c6568368f6b34672462dac5c5d945741e93a606a627cb1d129360c7f90d0bfbd7d5f568c5 SHA512 5d2b99e4a937314155e160f29ae818a035a4d3c408ceac0f660ccb86e6e2c034fb595e5ea26f8a5a5cec2f45d1fe8c57352dc034f0afc7446fc64d51b447c13a
+EBUILD ldap3-2.4.1.ebuild 864 BLAKE2B 480a39591eafd5e6be80a3bb6a84247603e7a7dc7b934c0e865cef1deced353e8a75ad9b0b51b4f563e54972754914e6350e671fd8c00ab7b5652d61bb77e220 SHA512 ab3f7f36de9b41fc5cc4eb453cefcdad1464978ba267403682a73165cda8f03f9c6feb1f80cb9a472dea6f915af0d18bc362f83d7f2b92694d34d2e623fbc566
+EBUILD ldap3-2.5.1.ebuild 864 BLAKE2B 480a39591eafd5e6be80a3bb6a84247603e7a7dc7b934c0e865cef1deced353e8a75ad9b0b51b4f563e54972754914e6350e671fd8c00ab7b5652d61bb77e220 SHA512 ab3f7f36de9b41fc5cc4eb453cefcdad1464978ba267403682a73165cda8f03f9c6feb1f80cb9a472dea6f915af0d18bc362f83d7f2b92694d34d2e623fbc566
 MISC metadata.xml 667 BLAKE2B 3dd9eac5fd53006653b3e1416ea1b7b4445daee2d041dce6672043effb4a4dc919503ab06b18b6e077981749f25b787657a3f8ab7d68572eefcda78af4c15faa SHA512 f92f6b96a6d9c32f959d278edd654495b0e8350ade72dde717b285667c0a6a9f472ca164b8c5f7e96b6f4aab1f48368a4a5836f75ff5e55941f8953b6b02e747
diff --git a/dev-python/ldap3/ldap3-2.2.3.ebuild b/dev-python/ldap3/ldap3-2.2.3.ebuild
index c32a58277a10..bb9a228681c1 100644
--- a/dev-python/ldap3/ldap3-2.2.3.ebuild
+++ b/dev-python/ldap3/ldap3-2.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ldap3/ldap3-2.4.1.ebuild b/dev-python/ldap3/ldap3-2.4.1.ebuild
index ad71be6cdeb1..08e6ec09b5db 100644
--- a/dev-python/ldap3/ldap3-2.4.1.ebuild
+++ b/dev-python/ldap3/ldap3-2.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ldap3/ldap3-2.5.1.ebuild b/dev-python/ldap3/ldap3-2.5.1.ebuild
index ad71be6cdeb1..08e6ec09b5db 100644
--- a/dev-python/ldap3/ldap3-2.5.1.ebuild
+++ b/dev-python/ldap3/ldap3-2.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ldappool/Manifest b/dev-python/ldappool/Manifest
index 778ddb849f61..ea66963c9573 100644
--- a/dev-python/ldappool/Manifest
+++ b/dev-python/ldappool/Manifest
@@ -1,5 +1,5 @@
 DIST ldappool-2.3.1.tar.gz 16125 BLAKE2B 2fd2da35fa8f4b7d7f1e85107528595fe83ee771193ddb1099357607a98a90a43d8f7d64a364e323d5b127d989b6ca68d1325593806f66d50c35cdb4f85580f4 SHA512 7cf5eddc39ba5fd51151a5af6f728dd1ba15521abaeb2ddac7a19fa59e987b92eb6dd4d4ce505e715edcc650702248248bdc1a0f7ef4366220b7799e42a7dfbe
 DIST ldappool-2.4.1.tar.gz 18611 BLAKE2B 44de0b3b3c4ef94e232189216e55c0adf85b51e4d6e2e7c47a6c9dca455e9e09919bc04e264e027e4ba96af8dc7315a78e5094f5ed2ccd4c8f6c3952da38370f SHA512 ea22290d9acc7f90093cb27aacbf339e1edbad33780051db263cc5254d0b42494e6dd67da9f5e506f09c5867a69afbea89d14e0c3aac47233cba0ffe361b1a75
-EBUILD ldappool-2.3.1.ebuild 583 BLAKE2B 7faeb4b436721396328d1638d969a14504a34f9b5bcc3745d3aa590201591fd56ae06309892785821cf3501bc129beb5e8394d0ddb17620240bf696bcda8a234 SHA512 5613d5ba936f63b919d9cba0afedc1a132c2b86e215db45072ac39029542cd802b97fc31308f3189d9df55e876771890808e26627a822460a734c8aa8689668f
-EBUILD ldappool-2.4.1.ebuild 680 BLAKE2B 8a678c8c1003df78a543a96b8dcf870c1e22a7a2d141e04c65fda9060ec7183ce59d9251eaca4839866019227818117aa94ee408bd8e2982f18feda92074fa3e SHA512 4f98a5948ca1b3dc5d179655fd92fb7354c7333b58ee900171cb53692fb13c3bb46d982cfb8b382ca1b347fd54710c9ef9a0f4f2638229d2d95c44e3433821a1
+EBUILD ldappool-2.3.1.ebuild 569 BLAKE2B f5b1ba5eb2f6550e4912cba73b8e302822c7e966523b051a57ec008184bfff994680e43a93a24c3106c8a80b3ed0ea32ec7df52e58a6e98c671c11aa1996a6db SHA512 2b9d397f99420687b888c8a1612206f4eccf1fe32e15461554b621f4441e881cfdc8187056da3c86dd2165b959e493d81288ffdfc387142bfd3230ad255db65e
+EBUILD ldappool-2.4.1.ebuild 668 BLAKE2B a666a284b327dc3f709c7b212e85b8d965aa578cd47cd0c9889bd79afae53c62081a66ff5e8c5999c12cdf501e028cf75fc3248967f1d73b732348ed0dc3b04e SHA512 dfd0c6dff1363dda028e2a94c93e3744d271e8ac8f401187469f9bc93825b5c926f9514d3db8914c98e4ba500ebc4efb4b13fcc1f7d116a8baf32ff0bde3d504
 MISC metadata.xml 570 BLAKE2B 4fd4570935a9c99cb7bb552c6b02dcb2e5de5acc8f8d88b3939225839b469609f9d8b1895c738d9a131898ac620ffcda387170b6f4b4b256747ff0257ffd7227 SHA512 c8ca27a9ee07cc0af330a7c6fc0906346c8de23644a5df9b6846cd6246370c9ac05a6c49eb748cd4c4f21698a317beb19184f1753325592408c2f4b6b73d8f59
diff --git a/dev-python/ldappool/ldappool-2.3.1.ebuild b/dev-python/ldappool/ldappool-2.3.1.ebuild
index f6e2ab0e81a8..6a13c4e3aa9a 100644
--- a/dev-python/ldappool/ldappool-2.3.1.ebuild
+++ b/dev-python/ldappool/ldappool-2.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ldappool/ldappool-2.4.1.ebuild b/dev-python/ldappool/ldappool-2.4.1.ebuild
index 4eaf891a9b4b..d150e92eee95 100644
--- a/dev-python/ldappool/ldappool-2.4.1.ebuild
+++ b/dev-python/ldappool/ldappool-2.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lesscpy/Manifest b/dev-python/lesscpy/Manifest
index d3d029cccdf6..b5166bc40f88 100644
--- a/dev-python/lesscpy/Manifest
+++ b/dev-python/lesscpy/Manifest
@@ -1,7 +1,7 @@
 DIST lesscpy-0.11.1.tar.gz 159706 BLAKE2B 4f664d7e6d6edc0fea6db8d9b664703e408cbfccd666760ce1f394746696c61b28755668c7fe0d5ef374735e1ab6514532e2992d2d0c6292ef88861b25636225 SHA512 2cf4e8c3a46cf5e9a7f1dd80f613550fa0e857a8acf9d33d9da2f7a90e1b264bbc18a427668f152ff136b438b19866f016dec91794c721b98ec2f2456dc504e3
 DIST lesscpy-0.13.0.tar.gz 157854 BLAKE2B 2a06827233e5142249298c75d323ffaed2cf497f5ddf86023e65235417f3fb970e66a6b112e9eeb38f24868ab98a6d4b9bcb0cf8a53a2121fff44098fdde459a SHA512 227db8212a386b06f288140d09b7505ae43bc6221396fa2d154a6d7f0831cf1ff005d9818fd85fb3804103b725b60827cf56a29930c2de928546ab0dcf3d5877
 DIST lesscpy-0.9j.tar.gz 32061 BLAKE2B 95edffd8cfe958d966062fa58c041ebf411d5f771d48cc1da9f868c35094bb5b465449616e994690c972414cc188c9343ae29839df9fa57711e4575a42f927fc SHA512 9063b89a1ca8dc8424b3b1989bdf7c31de74e26ab8ab5ede1664f53d1ff1946308d9add65236cd5fabc58efcaf1cb5789fa73f0775a83cb70ea9a73d25207a73
-EBUILD lesscpy-0.11.1.ebuild 734 BLAKE2B 37a4e1646f17bfa9aae507b62c1653a702869cd04188db47fa76ecf7fe8ae2f3a9834f103c1a4e0b571f23d3c05f43f0c8c1282ff04d6973bf4844c68aad4f7a SHA512 3ea7898f76bd8127817170aee02fff55f64f1760345933a2d9acf221bfc1cfda7c8bb636b897ded0eaaf51f74ad7cd17a5fc005d46928ad0386d2ac6c25453f1
-EBUILD lesscpy-0.13.0.ebuild 734 BLAKE2B 551334c3b2831ec1d4236ddeda6926056b1eec0fae50eb3cf9ad6c3faa55bc23800904288871a71865d5618bf8510173066063ab5777cbe689a8f92cb750f8b2 SHA512 55a19ceef45a8ca306f48cd1901953ed6c809eae5fc27f9bb38910956cb2dca62a3e92a17697c9259651dfd33d3e28416bf25ac0c106c89a1987ec6abc10be99
+EBUILD lesscpy-0.11.1.ebuild 730 BLAKE2B 7dc44edb5fbb536ccb10113457b01e2a9cb51e708ee30d70225e75a58c7e3b83b9b0cbccd8af100e2c1349cda617e6c24051b9905e2b1bc9e862a84df4b8a5be SHA512 db49e20f0bb3ca98da4266147a2e44daad70793369cd6926d73178b11168e5ef57db961a20ee1a96a59326144d15d64d0712165305c0e987742b80758210f16b
+EBUILD lesscpy-0.13.0.ebuild 730 BLAKE2B 6a5822b37dbce720a0d3d2ebbf306918b1a3d604cdafeeafdcb658eb843df1ddaf497ae179ffe759f1d2bb6a9c64bfc8fe7ab03c62a29c0a2bf367f3f4abde5d SHA512 1ba7bf39188a9d54b72e7919cf7828257c94276e7e0ae65ef27fc6f5005a63dc5f29bb4a0ef1bf7e035ea5e33af1c5e9931410415516d14a6abe1227a07efc39
 EBUILD lesscpy-0.9j.ebuild 602 BLAKE2B 312ac7220ceaac8bce032135c7547dc433e8cd0157fba6d96c2e58ee137b19e482c41157d041e6b5b6c6131c4990cabc8576ff8696385cc6bed186bc2abfa755 SHA512 b497847362c635ab70183aecd75587b8df0bf4b11e8f2fb458253dd4c2d40ebb470387e461d14c829d217cf61f98d3d3b0a2f69a6d3b3be6a183ea0c3e7de0c0
 MISC metadata.xml 548 BLAKE2B 48939d5743ccc8041dcc22e6dd09842374253d6a34de93a7fc10119ef2abd8b860d5e9febc18e5b11c5913f52588058706048c3522c7899fd44a1db4c7612da8 SHA512 cd7c549b5130cdc08e12cccb5a0d68b5f19f2fddc97bce839c4dba5300608fe871663154ef0348623c52295e79d6efd6fd42580713a877430e82aa964b1361e7
diff --git a/dev-python/lesscpy/lesscpy-0.11.1.ebuild b/dev-python/lesscpy/lesscpy-0.11.1.ebuild
index 377c1553994e..9616d41cb732 100644
--- a/dev-python/lesscpy/lesscpy-0.11.1.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.11.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lesscpy/lesscpy-0.13.0.ebuild b/dev-python/lesscpy/lesscpy-0.13.0.ebuild
index 8238854196dc..4f4872ce6017 100644
--- a/dev-python/lesscpy/lesscpy-0.13.0.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 0adbaa53bca8..f3e7a2e52533 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,5 +1,5 @@
 DIST libarchive-c-2.7.tar.gz 42299 BLAKE2B 6e7930f4e403e23a989ad7c519143ae81cec62e40ad77f36d8491d8d36b07419d77815bf719e5782c1bb0b68692798df90c532947ddc5adec96f0077da755b25 SHA512 809319cffc250130c1414885d4e2de399a8ba92f6025848f1423bde79eadc6f686f934f4b17fc0a90ea84379b94c5c38d4849b2b28e2e03f8d16548152dbc856
 DIST libarchive-c-2.8.tar.gz 45182 BLAKE2B 8282c46f1e2bd4c9e83809743953fd8f11408e7c7b0849735cb1c4afda35387cfd6889a0443ecda26bd411a7dcab384e42c685650d62be591fc72bdb151770a8 SHA512 533b23081996f2bfbd558e379d69e0c02ecfc7e62d39f4ae2ecf5b639511ecffc073422e78d7357cc58daa260b956a6399b42db5d26d6e3933622c622fa8dc5f
-EBUILD libarchive-c-2.7.ebuild 431 BLAKE2B b157d39540d26547d4b3eea160bf8f6807a7ec51a8104b0b39036a740df3f920e0d6cab4a7f6b45c32cd2ee51d81cb637ab3dd2351ed13aabeb843644b5c2591 SHA512 2a16576876af58184660ffdcf499545adf81bc22fb435827b5cfe8acfacd5ad6d059eec34982a33f33185cbfedac3d55ec684e620ce271efc6b0963d05070fc3
-EBUILD libarchive-c-2.8.ebuild 433 BLAKE2B 95686a584a0d764b11aa713ef69c2febd887c9c45efcbbf6db921681d41c624c8a67079e3df82b947b97a6013f4329fe73cbcf6d2d1059292fdaf5b99f84f2a8 SHA512 3046e587ac1e621b3abdf596c77bf58d80b8206665b8fc3e9f1ef7d1af42bafb3cc79d94da4d93ee5e7a4f6507621b1c3ad97e3904a88574dab388fdc98a543c
+EBUILD libarchive-c-2.7.ebuild 427 BLAKE2B d4b5a74c1cfa0dc2f1faf93a830af85da5dce0b1b94d0411d1d34116f96c6a168da92dc0bec2a667f3704f74c789515d0576e309edad605edfff43f613e9d852 SHA512 50f3d6bae7894732bd041b257dd5dd32990a2c019c2187c09d3db481c5dfb3229f9b6d857fbce6b96930613962984d56babb6fe71cbb686b66483adddea77abc
+EBUILD libarchive-c-2.8.ebuild 431 BLAKE2B d6ada344e68c4ae93b7c180d225a93a4e4e1ed1d158f728c10c7e41c947d2f7c5ded30293dc169216779baf59665bcb58f901c4102ff1838cc5180c0ad10f4f5 SHA512 c9fed5853a4c53396118dc1bf59a5c2e61d4205b5adfc4174a701a228f08552d7c2981648529a1c28ccc1e00c19116f51270600e79ab747d149074b5e0851435
 MISC metadata.xml 561 BLAKE2B 4750bb7abf389d0fe90b4d42ea1d5bb6aa41e0e9a69d45bca90759eb6cecdd8a8100d87e024ea6bbab18b09a4989cd7012a6e221f3859abf997fe3b367589478 SHA512 3aa3b727b62b12512e5b342cdfbebd89aef9c605204ac1869592d48a98b4384f1772234e1a4ca8ee5bb04b254e34e2f68962cc1154e4f7e4207fa3f2a49b5551
diff --git a/dev-python/libarchive-c/libarchive-c-2.7.ebuild b/dev-python/libarchive-c/libarchive-c-2.7.ebuild
index 4b1fac73e411..ccd52d0a443e 100644
--- a/dev-python/libarchive-c/libarchive-c-2.7.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 DESCRIPTION="A Python interface to libarchive"
 HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
diff --git a/dev-python/libarchive-c/libarchive-c-2.8.ebuild b/dev-python/libarchive-c/libarchive-c-2.8.ebuild
index 8dd1de8d02e8..4e2991da0d2b 100644
--- a/dev-python/libarchive-c/libarchive-c-2.8.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 DESCRIPTION="A Python interface to libarchive"
 HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 0b56cb991068..8b7596403b9f 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,9 +1,7 @@
 DIST apache-libcloud-0.15.1.tar.bz2 570953 BLAKE2B 1baca706ac57d76baf4f83824ea0fccaccec51f38114a0103777e2965e67ad9cd96ad46459841ea702d72f8f0c3ce166037714d04f91c1f2369ddf6f455ffa63 SHA512 0cbc02c955cb91e135d73a5198ad216d0f91fa942b88dd1ffc1c46a487190f45500f003d2825cdb4f6c96c4ca7e5cf2681709769b0c2d8801b08e5a41b3d69b0
-DIST apache-libcloud-1.2.1.tar.bz2 992983 BLAKE2B e3caccd2814f3b25fa96fbc21972fb3694a6f5e55663564f712b98b64a60e577baf1da0295b914fef2440a461f6fa16f313e83bde252360ac6786995527afc04 SHA512 12e239f286d8eb523597488998582be02d6e8cd4e21a8fa7c639c829ba622833e4292ac4cd7cbc8b94670e19ec1711cb0032bc72433f421bf2ba2b8c70dcd954
 DIST apache-libcloud-1.5.0.tar.bz2 1258553 BLAKE2B 9cad0f61ab8505deea99c15022da92caf24295480d16bedf9c735c1117a055c94162cdcb331734c572f375de3ba10b499d5ed46a5a11f1e634d272e69748ef79 SHA512 91c10d164f56c9f75c6e5633802c3cf31046ab7a3ae554b73310b1da2d882ac1f8e90aaf3462db57ac0949dfd66cb840ec8fc6e6b79c46128668f13183d47b30
 DIST apache-libcloud-2.3.0.tar.bz2 1370556 BLAKE2B 14c6604d190d63f9049de2034b487cd7bb314add399339cac7a46dcbfea339497ede0d8058fd29dab43d53a45637fc5e60c71a5079fff6f45ed5023721eb68f2 SHA512 673c5b7b12f4510f2b43ea8199fab1e3f7ded62423d7d67301f5e3448c78750bc898c494a33d033844acf94bc292582371e9ac02ce1db6f4443a3966ef9fd0e8
-EBUILD libcloud-0.15.1.ebuild 1080 BLAKE2B c87b5c59425f109f412652199a464cc176658940e68cc2b38f48fb793166715c38158c4af3be8c76df153b5e7e612191b0d8d45b6170ef73aa00f1a855a95e08 SHA512 a8f1143398829e69c58d95c44fc82b251ae4254c5e9a279ad5b2a88f6b0ddf37deb12655f93b9487f96c709418885c55d9c3d707c46f4db7c03e94730ab5497e
-EBUILD libcloud-1.2.1.ebuild 1187 BLAKE2B 13ec3629d6eceb6e82ff1fac334ed053cb315e5800a96bf6a6d8d1b0cdb3a3719c271cde00f4e34bf5000fd4919536b460019ce3399ba50ffa9025ae1411fff4 SHA512 a62bde97ff32b76ba4bb906c6ff09c7c99229fbb405212cd36911606c4e52659005ce0c3857f905dc99ddbfb4d818a5e6da0682a5b1ac42fb9c4c2c14c9e327a
-EBUILD libcloud-1.5.0.ebuild 1196 BLAKE2B 30b3c2186b10677cffbf533aee0ca4302972869461f91124554543b186fec0e0a24ac8ba8bda165d48afecddbe00483c0ed8b4512cbec7443de98a667b463b6c SHA512 0a7969ece9813f7745333700d38b4b1eccaca0e1c57cb7790180083dd48b16b261a0dace517c973e791eb7a1887115181ba552be74fd5a5056f3cb21e2107ea0
-EBUILD libcloud-2.3.0.ebuild 1130 BLAKE2B 55e82d20d35ba07f89c2d2d6cc3f1cd7452cb1827ba087076c30b9f14ad07a533e80cc557322f55479036ef6d51a771f89d7d850fc12dd1350706bb1f2a6ea08 SHA512 12b4762b3c669dfdccf7822052e5dd3c67b46104e81c8804263a121f355bec0c474b6f67fa3b001bf1b999404a24ca21930b71380e1d577f977c48d13ce9f114
+EBUILD libcloud-0.15.1.ebuild 1075 BLAKE2B da3023b3fe0e174b2fc961d86a4b7d9dc870f279529535182611faf1a26fa9b1dc1186004f8f4a0877e551d7c4cb275e4684141c0d4a5e19e024e10e1c20a6ab SHA512 42a700c8d8a09bd2181b92171ee3dc2a03bd01a6d8d3d540a5f8ea2d5742db8171523f00f7d4e0fb9527cd8e37eefd00cbd52c909fbea9c101e79c6769f4b69d
+EBUILD libcloud-1.5.0.ebuild 1187 BLAKE2B 2afa7994050a018e93da85e466ea22b281892597af2ad4321b219bc2e89306661f8d81d00099e99401c0f51df6d8b9d852ded8ea728d3c62380430834c9f4b15 SHA512 ff99dd7e6bb56d3367a25053e049fc2f2ec4b20315261c0177303291f8b83618ed112ab7d7339bedf8b506856a6c25999724af1ce8f19622ab146916c0523588
+EBUILD libcloud-2.3.0.ebuild 1121 BLAKE2B 08ebcb2209e2e016ff68a4920bbf18f5fe218a06c61dfa938460e546cc831effde93f96b2d0153a7bc62606e144684c03f8c0202d522f9f44d1aef4f08724057 SHA512 245ae052132f8fa13ab57e5f2cc829b6f68ae29f258dabd06b18d4d5e50497d170120d4bf3bf0367b0fa15bf85a65a0855ac615db2fe6a068e0fe8a7258ebab3
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/libcloud/libcloud-0.15.1.ebuild b/dev-python/libcloud/libcloud-0.15.1.ebuild
index c0a45ec8a3f5..6011542de4df 100644
--- a/dev-python/libcloud/libcloud-0.15.1.ebuild
+++ b/dev-python/libcloud/libcloud-0.15.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 # py3 dropped due to failing tests once lockfile installed
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
diff --git a/dev-python/libcloud/libcloud-1.2.1.ebuild b/dev-python/libcloud/libcloud-1.2.1.ebuild
deleted file mode 100644
index a76153688bd8..000000000000
--- a/dev-python/libcloud/libcloud-1.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# py3 dropped due to failing tests once lockfile installed
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unified Interface to the Cloud - python support libs"
-HOMEPAGE="http://libcloud.apache.org/index.html"
-SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		 $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/apache-${P}"
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples
-		mv example_*.py examples || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libcloud/libcloud-1.5.0.ebuild b/dev-python/libcloud/libcloud-1.5.0.ebuild
index ab9abff3992f..f178e88a1351 100644
--- a/dev-python/libcloud/libcloud-1.5.0.ebuild
+++ b/dev-python/libcloud/libcloud-1.5.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 # py3 dropped due to failing tests once lockfile installed
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
diff --git a/dev-python/libcloud/libcloud-2.3.0.ebuild b/dev-python/libcloud/libcloud-2.3.0.ebuild
index 2f396c21fbd6..7cfaa7b14210 100644
--- a/dev-python/libcloud/libcloud-2.3.0.ebuild
+++ b/dev-python/libcloud/libcloud-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
diff --git a/dev-python/libextractor-python/Manifest b/dev-python/libextractor-python/Manifest
deleted file mode 100644
index 47deca61ff6e..000000000000
--- a/dev-python/libextractor-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libextractor-python-0.6.tar.gz 4086 BLAKE2B dd06ededc816ff94f219bf544bd47760cd401a75107a9abfe89e5334b1fea89519e64cdf365ee11c5bb9a9377b239a76f508d5a9df188d76f2f66a7ae1e71011 SHA512 38300177fc55183fb70068d9af69f0530b8729ca92056ebd77f06d11e855e983aaf9fe28c0f9a77ffe2d6375ae769dafba847d959809fd43892f518c4ecf2d18
-EBUILD libextractor-python-0.6-r1.ebuild 551 BLAKE2B fe4730e901bce32ddcc9d1c63a878c5709feb5ea1cec7a95571dae6ad99a10e9b9b3b71e591a04ebd0e36725de1249a5879f56b85aba5785c8386677fc7522e0 SHA512 92dde8c89e0e7890b02859fc05dbe28fdd0888fd15fe1c2ceb09da2ed67f9ab3fffdb1f8ade1f24eec274ca1dfbcd71364a8c1e386c553b9fcb8de577ff07c0b
-MISC metadata.xml 244 BLAKE2B c10195971bb2acd79b25417b4ffa01960e9f25af05cc78340fd245c191b36d7b8cc8aa54b440c3673423cf4c716febe0563c9e064a319b13e258f2d7b0681298 SHA512 a136c69dc1c7476ecf5837cf1556617148c5160b0f4f0f796451b8dcae337b67725c6d53ab38f1fa81d46519f30163b3899827449696df61ed1ccb3025773d72
diff --git a/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild b/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild
deleted file mode 100644
index d510df6937f5..000000000000
--- a/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A library used to extract metadata from files of arbitrary type"
-HOMEPAGE="https://www.gnu.org/software/libextractor/"
-SRC_URI="mirror://gnu/libextractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libextractor-0.6.3"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/Extractor-${PV}
diff --git a/dev-python/libextractor-python/metadata.xml b/dev-python/libextractor-python/metadata.xml
deleted file mode 100644
index de8326e467c2..000000000000
--- a/dev-python/libextractor-python/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/libiscsi-python/Manifest b/dev-python/libiscsi-python/Manifest
deleted file mode 100644
index 64cfc30fa3b1..000000000000
--- a/dev-python/libiscsi-python/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST libiscsi-python-0_pre160211.zip 110062 BLAKE2B 36e079dd49f6a1a50ff336cac17e74e29da0f86546c1e02c9e0d1ea408d5133eee1706267f0d6e5643f3d6e24e1a70e1987a515c3f8fc9fb4312a75087170ebb SHA512 c3f3742d2471f038c93ccd61e3eccf0431242988bc1237e3a0047518fb1eef71c5092735bc323452fae2219ee5a89de1fe098cd1170174934b547b44319d465c
-EBUILD libiscsi-python-0_pre160211.ebuild 604 BLAKE2B ea3467f6c5af872c3534dcfec0027e7644c68c376353402ba5c569bb938375f0367de32bb5e8494fe1abde4a80b3475eed5ab51ae889243091334f51ccdd1ca9 SHA512 bddcf23ac76f82f72892a038881faf2ae9cfc74b32e412fc6778d0de7d482ffbaa2dcdff67962f1d3ae843655db0c387e3d323277844d316a2ec30f8c7e2f6a6
-EBUILD libiscsi-python-9999.ebuild 486 BLAKE2B 79441d9dd303aa868a96559b0ca1e1a84c8e5bea0367a01851aacc707cf9e7d569b224d43b4e87f8bee624a5b7b9410bffdfdff6f22517ce9e43f0ab768575cc SHA512 5efcbd0c9968f40b0eaa584e9254f060ef2bf4207205f97e1224e830d4a56944156bffbfe21e692723ccd6754c0791f8fd2727a08ccfa4caecd252c4da2505ca
-MISC metadata.xml 339 BLAKE2B 7cbf6505ae994227ad9a4d067917d387545eecec733366cdef91d337f6941335e84e83289be953fd1dca3eda7afb28f2cef290cb3e4e1f00594a6f46e28dd929 SHA512 6773ced8ea8929c32ef44908b453b227d9abcdf3c0b051d37234885c05bec7d18a1ad68efc3f413e0678b60a819ceba10f84b0819c6a5a80716358caa5000258
diff --git a/dev-python/libiscsi-python/libiscsi-python-0_pre160211.ebuild b/dev-python/libiscsi-python/libiscsi-python-0_pre160211.ebuild
deleted file mode 100644
index 34501cb59704..000000000000
--- a/dev-python/libiscsi-python/libiscsi-python-0_pre160211.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-HASH="a8f548c2700dbe3dadfe048fa2491c7b77cf7846"
-
-DESCRIPTION="Python bindings for libiscsi"
-HOMEPAGE="https://github.com/sahlberg/libiscsi-python"
-SRC_URI="https://github.com/sahlberg/libiscsi-python/archive/${HASH}.zip -> ${P}.zip"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="net-libs/libiscsi"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${PN}-${HASH}
diff --git a/dev-python/libiscsi-python/libiscsi-python-9999.ebuild b/dev-python/libiscsi-python/libiscsi-python-9999.ebuild
deleted file mode 100644
index df01ba0b65fc..000000000000
--- a/dev-python/libiscsi-python/libiscsi-python-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Python bindings for libiscsi"
-HOMEPAGE="https://github.com/sahlberg/libiscsi-python"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/sahlberg/libiscsi-python.git"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="net-libs/libiscsi"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/libiscsi-python/metadata.xml b/dev-python/libiscsi-python/metadata.xml
deleted file mode 100644
index 910f4e214bc2..000000000000
--- a/dev-python/libiscsi-python/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="github">sahlberg/libiscsi-python</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index 36916d99f6e6..a0f080f876ea 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1,5 +1,3 @@
-DIST libnacl-1.4.4.tar.gz 30965 BLAKE2B 9f3b4f10020349bbdd038c7d07d8c6cf3ab31edd26e38344c9cefc1dd8e71f5360e07e9d2673b915733b6c4a1a9c6e307a39f86b1b74e76d5800cb35d8161a95 SHA512 dbcf16b308bad85195a96d538a116a915876a049efcd2e4a333d16a57cc59dc28fe85b2cc2c6ab036360bfd0b93ce4d1a1c0323046281dc35d290e9f12253470
 DIST libnacl-1.6.1.tar.gz 39789 BLAKE2B 7c73f67d4faec8d6e53df21eb3c394d4f36754cd9ad1dfa63ef45aab43bb1832cace7446688b2b29b9923539e00d59f3a78c719b8b8770b2c6c217db19dd2f6d SHA512 90fd9302cdfbe84acfc7dff0ac95eeb05fd1bb346cd8b220613174d5d1ae5f627be06b4d588fd4a939c49a119ca557d68a06d3cbe1c0d409a253fdca96d944ac
-EBUILD libnacl-1.4.4.ebuild 507 BLAKE2B 16bf8eda8567ef3a588bc807f4332f40dddb1785054cb93d1004f1e2a1324483bc78337cc1cd5e2798b518254f29850a86e5324462a6b9d345b1f4b7aeb03bcc SHA512 83b0711777e150d19ee0c46f9f4628451cf5621ec98a2e5565e13ee6782e4e78b26b247550d18b885a5c7a2b1b26538e531a307006c7713f079f466dd1691b16
-EBUILD libnacl-1.6.1.ebuild 543 BLAKE2B 44a6341b0f3a77924b2cd191a35547530e23adc603042eac54657ad3a361b8e76ac2f983b8e7dd0014afc7f30fda4b9be5330ad457707ffa8959755402f0556a SHA512 b99ce3493a592c1db8914a90b10ec1d8907de5cc7a6fa4e9eca510f404aca3f27ba2444a55572b0c37e41a0e98d70b887a3e80a4982b9ab8c842695b4597a8e7
+EBUILD libnacl-1.6.1.ebuild 539 BLAKE2B 5645386bcd21402b736f7892a7f8dae24d55dc06595a39cefa58094c816e2497a8bcb54a37d1ab6dd5fa72e146d026eecc6fed75198aa99ef32ac3c9dfaf8dc3 SHA512 24c0120d2bc25d6489f88429400503ae7d2c2f590a948cfb7136071f5aaf675b147b6b572cc662d261be559cb3ab8f65a87704873557eee5e537a793fe5b082f
 MISC metadata.xml 436 BLAKE2B d4777abed0c62a24f98f7053792402c4aca92cc9e352b7436061bf4669a18a731bb8edb9f79707780e3e2eb7a01daa46ab7d1222729d7708f7558b42cefcef69 SHA512 f8a241e4d71d6d6c682f019d086e4effa58608430a5df8c2f70c29cde07124fec2c37b8c63411b19e50baf2b5486a88ec696e4499e47e64936212f6dce938a2c
diff --git a/dev-python/libnacl/libnacl-1.4.4.ebuild b/dev-python/libnacl/libnacl-1.4.4.ebuild
deleted file mode 100644
index 4601f40111f9..000000000000
--- a/dev-python/libnacl/libnacl-1.4.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_5})
-inherit distutils-r1
-
-DESCRIPTION="Python ctypes wrapper for libsodium"
-HOMEPAGE="https://libnacl.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/libsodium"
-
-python_test() {
-	${EPYTHON} tests/runtests.py || die
-}
diff --git a/dev-python/libnacl/libnacl-1.6.1.ebuild b/dev-python/libnacl/libnacl-1.6.1.ebuild
index 2c92515e0687..4ce664bf5c14 100644
--- a/dev-python/libnacl/libnacl-1.6.1.ebuild
+++ b/dev-python/libnacl/libnacl-1.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 inherit distutils-r1
 
 DESCRIPTION="Python ctypes wrapper for libsodium"
diff --git a/dev-python/libnatpmp/Manifest b/dev-python/libnatpmp/Manifest
deleted file mode 100644
index 301afffef32b..000000000000
--- a/dev-python/libnatpmp/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX link-against-system-lib.patch 536 BLAKE2B 0e252420557741e8cd4ba7c753fd7213de5e6c68a6aa4a0a10f896dd807e5fc0b99ef8627aa3640573cc95a407f226d879be5df12a86c4fcb1b84259a49c3863 SHA512 587abd1777fe87f42b90d789e3546707ef45ed4e8e5f228fc103f1e91ee5fbe3b5324afd3b70074dd845f8d555bc63263956c8077c7160d15088dbca36a3aa81
-DIST libnatpmp-20130911.tar.gz 18744 BLAKE2B c24a0cb158d9d40049292bfcae8d919bbe8ec6ea63dfd59ba8a8f2c85a9eaaebb96cf4f70f2c40c456169f63a8c2aff4736d952899d15ad7e7f687e13a4e77b3 SHA512 e7dfb3955ccc2c30e7c74c1085bc71bd9318f6171b84fbad2d8ae8bd5a227f7ceed3f60ecb49bd10e6fb838d8be3325bbf467467bf0d04e46883e3a19fa14a2d
-DIST libnatpmp-20140401.tar.gz 23302 BLAKE2B 85f2b1045ad3b8b122bc9db6a12d332642e11bd62cd5fa264e141bb75d2dae2920678ce8c240009272593f81f385277d7f911298667896babbc43c8393a8963b SHA512 12616f07b0a096046a35079954b8a34d474e672d7836ddac9da993a47178902aa2d781786ac76c55c5f16cfdf6a7e7258f92fec3850714ad9cd50208d854c4c2
-DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42bcda58cada97d37a2cf74f6f6b5e27189753590552187ed7afce66d34d204b9d18ecd38ac0bcbadf8c8129a3b44ad SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09
-EBUILD libnatpmp-20130911.ebuild 678 BLAKE2B 1ad0bea6c86f4ee84bbc3f16ea6f8d3d1b9550308645dccabc455af75846ee6d73f49840801edd0cda97c012ccaa4e7667bf132bc20a02dc3d7e5e1941fa89ee SHA512 dbc6ddc32e6c347e356e9895839ce32b2c0acad9376866412936052b4c7154b593bbd288d9af82e451a2ee38815ca4f43a178d767065da0eaabd5afa55e41246
-EBUILD libnatpmp-20140401-r1.ebuild 678 BLAKE2B f96de2bf573b166e20ffbd8f5bc77de97c727d4d31ae6e56d03dc4d94f97f6485185f65e21449f7d9ef3aee228197d167b5b9ad427bb5f17bcc3a8bfd940a126 SHA512 1eed86e389eb7700365b2f8119966d53a68b01128a5b9942c3bde55df878faffa5ea8637343c431959504c39be49061b6bd99781236d2407ec533b32f975ceba
-EBUILD libnatpmp-20150609.ebuild 678 BLAKE2B f96de2bf573b166e20ffbd8f5bc77de97c727d4d31ae6e56d03dc4d94f97f6485185f65e21449f7d9ef3aee228197d167b5b9ad427bb5f17bcc3a8bfd940a126 SHA512 1eed86e389eb7700365b2f8119966d53a68b01128a5b9942c3bde55df878faffa5ea8637343c431959504c39be49061b6bd99781236d2407ec533b32f975ceba
-MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-python/libnatpmp/files/link-against-system-lib.patch b/dev-python/libnatpmp/files/link-against-system-lib.patch
deleted file mode 100644
index cdb64a9ce12b..000000000000
--- a/dev-python/libnatpmp/files/link-against-system-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libnatpmp-20110715.orig//setup.py libnatpmp-20110715/setup.py
---- libnatpmp-20110715.orig//setup.py	2009-06-04 17:37:06.000000000 -0400
-+++ libnatpmp-20110715/setup.py	2011-08-03 06:55:11.000000000 -0400
-@@ -8,7 +8,7 @@
- setup(name="libnatpmp", version="1.0",
-       ext_modules=[
-         Extension(name="libnatpmp", sources=["libnatpmpmodule.c"],
--                  extra_objects=["libnatpmp.a"],
-+                  libraries=["natpmp"],
-                   define_macros=[('ENABLE_STRNATPMPERR', None)]
-         )]
-      )
diff --git a/dev-python/libnatpmp/libnatpmp-20130911.ebuild b/dev-python/libnatpmp/libnatpmp-20130911.ebuild
deleted file mode 100644
index 53cc321d66e6..000000000000
--- a/dev-python/libnatpmp/libnatpmp-20130911.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 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for libnatpmp, an alternative protocol to UPnP IGD"
-HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
-SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="=net-libs/${P}"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	epatch "${FILESDIR}"/link-against-system-lib.patch
-
-	#These are installed by net-libs/libnatpmp
-	rm -f Changelog.txt README || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libnatpmp/libnatpmp-20140401-r1.ebuild b/dev-python/libnatpmp/libnatpmp-20140401-r1.ebuild
deleted file mode 100644
index d870176a2408..000000000000
--- a/dev-python/libnatpmp/libnatpmp-20140401-r1.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 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for libnatpmp, an alternative protocol to UPnP IGD"
-HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
-SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~net-libs/${P}"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	epatch "${FILESDIR}"/link-against-system-lib.patch
-
-	#These are installed by net-libs/libnatpmp
-	rm -f Changelog.txt README || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libnatpmp/libnatpmp-20150609.ebuild b/dev-python/libnatpmp/libnatpmp-20150609.ebuild
deleted file mode 100644
index d870176a2408..000000000000
--- a/dev-python/libnatpmp/libnatpmp-20150609.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 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for libnatpmp, an alternative protocol to UPnP IGD"
-HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
-SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~net-libs/${P}"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	epatch "${FILESDIR}"/link-against-system-lib.patch
-
-	#These are installed by net-libs/libnatpmp
-	rm -f Changelog.txt README || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libnatpmp/metadata.xml b/dev-python/libnatpmp/metadata.xml
deleted file mode 100644
index d920e3ba3e56..000000000000
--- a/dev-python/libnatpmp/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="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/libpillowfight/Manifest b/dev-python/libpillowfight/Manifest
index 44110a63b17b..9ad78422cb43 100644
--- a/dev-python/libpillowfight/Manifest
+++ b/dev-python/libpillowfight/Manifest
@@ -1,5 +1,5 @@
 DIST pypillowfight-0.2.4.tar.gz 39411 BLAKE2B a890305e3c1650274426faf92178ca0b3742c413deac236a5ac23cb5ce9be372085cebfd7189a5e16e6f2176b5850c865cbfc899a036aedfad58c5f5fe08502a SHA512 440b0faccb9f393126306afb2a060e5dab5e68a02822ad4846498a2a6b07013837642cfb818b669820b268342be3c5b0ebed81f1e3265e1f383d74c1cfb16187
 DIST pypillowfight-0.3.0.tar.gz 41065 BLAKE2B 8e945bb5a96d7ebd610435fd868d12df371c29fbc26a9c57152988a990ad83daf70382bb94e8b5591144e18d6c54702c0a578ea5f29044fcdadd169effcf933c SHA512 2782030eabb665d20cf49de584220fb65417616c3a0e2a0376c91dc2c228b571768ea3a248ebd5ec4d244a1b825e98609a35b736f7f2fdbb3f674b08e891d9a7
-EBUILD libpillowfight-0.2.4.ebuild 724 BLAKE2B 17e2b622fe8bf913c25a585151d33e3a85a28ea570847fa75072c1033d00b96f758e5e64623b6edf5b72679ce03cf0057c6be96017e2e679fe395ba6d47d17c2 SHA512 5dd56ebfb433b1e562788b32a8a27b1d06315a67676432a14137cad05ddf8bf3daa00a9efcd2734f8c2b6ea823594b81c1122aa6076c39a71641154610873921
-EBUILD libpillowfight-0.3.0.ebuild 726 BLAKE2B 80dfdb98aaee64f850fb2237d6a9c629e35f960174931c4a0817bb5fa47ed3c4697e1e89089b342b37d2d08f1f8b84f8e60fbbeabd7328f79d5e3b3c3bee26f1 SHA512 0c65fc1fba28f406d3b25e1e9e0adf037fd0c91cb27bf28463ae72f5b0a589a0090bb2328bf13a94989b7b74c795f33031c0d5a55b05c511553aac6995e43526
+EBUILD libpillowfight-0.2.4.ebuild 720 BLAKE2B c6d7766340632fdd7c459b7b5e80966a90d33a86908d923f81cb7a887d90409ec0bbe337ba5f0e095763cda6b5523a9a1ea0e3d5bab4f91f2eeceb46d0f9ff51 SHA512 0fff1d3acc2ef7e1850a40a907486903ce2ce41d61dd745720e65296b4e0ca6b97747face868650b58d82a737f3d3da5cf0840225d2c11046fe649b725a8fd30
+EBUILD libpillowfight-0.3.0.ebuild 724 BLAKE2B ddf63306dddb4f1d10721fddc9cf93d9eb8d064c0bd48654caa358a78f22477c7395e75c6c1d214e7f73668a7854a5b51b95b2deeb6abb43182edaea169420bc SHA512 228dbda2cf4e87c4d70c706dfd755946f2a326120f2d2cb0151e941387737488fd9b941069eff236cdc0b4223aa3ca5ba623157cf7d6d7fb08c3145745851d25
 MISC metadata.xml 408 BLAKE2B 6696490ab4ca4a1c5c27c4da76a781075e5bc248f6203a14d2116002e8aedf53d2ff0de76b119d822a251bd111772f2ab7c6376eb707813da079d972976689fd SHA512 a01430e7488806818e2cd64a8548fb339eef7ec6f408fe25c64a8d679a6afab988a068c4cbaab3b028fe28a2bd21265550eacf1af0b84f2c9b33c8d3e6f28b06
diff --git a/dev-python/libpillowfight/libpillowfight-0.2.4.ebuild b/dev-python/libpillowfight/libpillowfight-0.2.4.ebuild
index 7f9462f3bea3..1d041caad214 100644
--- a/dev-python/libpillowfight/libpillowfight-0.2.4.ebuild
+++ b/dev-python/libpillowfight/libpillowfight-0.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild b/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
index 8335b1a56ce8..372e56f7b49b 100644
--- a/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
+++ b/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/librharris/Manifest b/dev-python/librharris/Manifest
deleted file mode 100644
index 17f430883c12..000000000000
--- a/dev-python/librharris/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lib_rharris-0.1.14.tar.gz 12895 BLAKE2B 1b8fcb70f50241f4f42bc6bca94bfa34caa996c01d84cb3f2e693280a9f07ef16f1956728a1598688b2af1bb0b111e20247d50d2db64b6740bcdc79f483ed632 SHA512 24e8be3a0508bcac30261a0c05652ca452c09b0ce23e3a8341d702a6e3516284d65f21b5b8bca3e6bd5db39de90fc697f11943ce86cce2e849a4d9c44eb2bc85
-EBUILD librharris-0.1.14-r1.ebuild 470 BLAKE2B 3d9044331c77e8a82e1791dcedc2524211ee15c36d163ffdb24fbc7945e8ae4793d58c99b31db1b4001187ac90ecc597e95c98ab49511b5004d0cd8e58af3bde SHA512 4d7aa0d37d033d3280affbd6b20753d8ab7f017173f6ac8b1844c5bcdff5e2e50655487799533bbfd1d9c033f31d6201fc98a3bec9c632214dca3fd0bc6d909c
-MISC metadata.xml 314 BLAKE2B 903015d353ab760befd64ba4d007e274659ebcfc964c904408e91f187dfbd2999e44fbb98621959b9eb16d89d31b62ffd29264a862f69586e131e436247f189e SHA512 173c3c07b9742e039202a6a2bcaa1ca6a9f1cefac49f40a3461dfa405b874f12705d818cffec3293d22b969715575ad3167ddac7f88192722e14e12bbe78445d
diff --git a/dev-python/librharris/librharris-0.1.14-r1.ebuild b/dev-python/librharris/librharris-0.1.14-r1.ebuild
deleted file mode 100644
index eee5c5a63f30..000000000000
--- a/dev-python/librharris/librharris-0.1.14-r1.ebuild
+++ /dev/null
@@ -1,24 +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
-
-MY_PN="lib_rharris"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python Internet Programming Library"
-HOMEPAGE="https://pypi.org/project/lib_rharris/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/librharris/metadata.xml b/dev-python/librharris/metadata.xml
deleted file mode 100644
index 1e6c9b2420ab..000000000000
--- a/dev-python/librharris/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">lib_rharris</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
new file mode 100644
index 000000000000..d066d65cf587
--- /dev/null
+++ b/dev-python/libsass/Manifest
@@ -0,0 +1,4 @@
+AUX libsass-0.19.4_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d
+DIST libsass-0.19.4.tar.gz 315525 BLAKE2B b9a7fe2f42559070a30b2549f74b61fd28a18e842ba25b65c221889d18e319593bd08bfbedf2601cf5510fae33a4e24e96c52117db2290947c979bb1ecd0de53 SHA512 370ac2b4edb0dbf4e5a5b66d7795c6c189894bbe444c25465e922f8a3b435605771f8bb6fc9e25f30e6be889bcf4038d0a05ff2297777c179916de510523e489
+EBUILD libsass-0.19.4.ebuild 889 BLAKE2B 07b3076df860a216606fb41ed0ac9945ec8276d0f747b491dd9145fa2046ac91335280ac7dcb7bd654255fa9c8020062b3c0fa46c8e2b8c753e1847e8cef5425 SHA512 58aaf6275cb095a34b9fe35db415f4f8ec401d19b9e290ed4530f13e35b29b7f201b62dc24fb4a7d4b6bf1f1d1a5644c89e8155226f200866377e9280c725fdb
+MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/libsass/files/libsass-0.19.4_rename_sassc.patch b/dev-python/libsass/files/libsass-0.19.4_rename_sassc.patch
new file mode 100644
index 000000000000..46efe8700328
--- /dev/null
+++ b/dev-python/libsass/files/libsass-0.19.4_rename_sassc.patch
@@ -0,0 +1,64 @@
+diff --git a/sassc.py b/sassc.py
+deleted file mode 100644
+index 2415342..0000000
+--- a/sassc.py
++++ /dev/null
+@@ -1,15 +0,0 @@
+-import warnings
+-
+-import pysassc
+-
+-
+-def main(*args, **kwargs):
+-    warnings.warn(
+-        'The `sassc` entrypoint is deprecated, please use `pysassc`',
+-        FutureWarning,
+-    ),
+-    return pysassc.main(*args, **kwargs)
+-
+-
+-if __name__ == '__main__':
+-    exit(main())
+diff --git a/sasstests.py b/sasstests.py
+index 1f40a97..7547ab3 100644
+--- a/sasstests.py
++++ b/sasstests.py
+@@ -24,7 +24,6 @@ from werkzeug.wrappers import Response
+ 
+ import pysassc
+ import sass
+-import sassc
+ from sassutils._compat import collections_abc
+ from sassutils.builder import Manifest, build_directory
+ from sassutils.wsgi import SassMiddleware
+@@ -976,7 +975,7 @@ class SasscTestCase(BaseTestCase):
+ 
+     def test_sassc_stdout(self):
+         with pytest.warns(FutureWarning) as warninfo:
+-            exit_code = sassc.main(
++            exit_code = pysassc.main(
+                 ['sassc', 'test/a.scss'],
+                 self.out, self.err,
+             )
+diff --git a/setup.py b/setup.py
+index e2a0c85..5905162 100644
+--- a/setup.py
++++ b/setup.py
+@@ -218,7 +218,7 @@ setup(
+     version=version(),
+     ext_modules=[sass_extension],
+     packages=['sassutils'],
+-    py_modules=['pysassc', 'sass', 'sassc', 'sasstests'],
++    py_modules=['pysassc', 'sass', 'sasstests'],
+     package_data={
+         '': [
+             'README.rst',
+@@ -239,8 +239,6 @@ setup(
+         ],
+         'console_scripts': [
+             ['pysassc = pysassc:main'],
+-            # TODO: remove `sassc` entry (#134)
+-            ['sassc = sassc:main'],
+         ],
+     },
+     install_requires=['six'],
diff --git a/dev-python/libsass/libsass-0.19.4.ebuild b/dev-python/libsass/libsass-0.19.4.ebuild
new file mode 100644
index 000000000000..0c11aa2e40a6
--- /dev/null
+++ b/dev-python/libsass/libsass-0.19.4.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,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A straightforward binding of libsass for Python"
+HOMEPAGE="https://github.com/sass/libsass-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libsass
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)"
+
+# Remove sassc, in favour of pysassc, see: https://github.com/sass/libsass-python/issues/134
+# This avoids a file collision with dev-lang/sassc
+PATCHES=( "${FILESDIR}"/${P}_rename_sassc.patch )
+
+python_test() {
+	"${EPYTHON}" sasstests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/libsass/metadata.xml b/dev-python/libsass/metadata.xml
new file mode 100644
index 000000000000..dd0bd9c021f6
--- /dev/null
+++ b/dev-python/libsass/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+    <maintainer type="person">
+        <email>andrewammerlaan@riseup.net</email>
+        <name>Andrew Ammerlaan</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 9b9f2d2f35f1..b6e1cd951e12 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,6 +1,6 @@
 AUX libtmux-0.8.2-tests.patch 1677 BLAKE2B e5d3e6717809c36411ab3b5991dc1dec7a38868015529fe867743c31eacd81de13d74e96f3232106d43b68abad7e1b94afdecab44cc2954135ef34afce484a33 SHA512 b5df69fcda982fb7d8b0bc0659994959a5d4d868e46cfda43e8e9d3abb14a1a094c63da25a73250bc8329a93cf9a5747fe4cee51580b3802a4be1dfc8a68d33b
 DIST libtmux-0.8.2.tar.gz 37725 BLAKE2B 909a34b1a77bb221e6fd0ca6ef9075cc9ddd4f327cecf579d8aaff768668c9a71cff07a6567cdc0aed368482188936626dfc3f35a0b6723cd962294e2fc9d5ec SHA512 02156579c91e44e312ebf162b5314381645177cba244294b3251044be35c84b996263508cdedfd25ea2c182a87a3ff457154b9ed06e919e7149583b119a5e227
 DIST libtmux-v0.8.2.tar.gz 117077 BLAKE2B 52e9c7c47911797e9d2446e7fbc836f9482912e255c05d9b329d4a33f5f03d0bfad4df492902eff5605180f90efcd81a7e432174646cb2051b0f9dfa6615a91a SHA512 e5f3768f4ddd746c5380a92899961be05b1b6c567d9333720b0fd9ed124131671bbecf1c04a7c4e658092424b6dc89dd656ba559385b0a6f673f9895dd6c829c
-EBUILD libtmux-0.8.2-r1.ebuild 964 BLAKE2B 4818636ace0386cd172540a4e47db9da6962c43685fe7fc2b12d971bf880975da3694dc424a1862b8ad2a71c5c4bf9c9c6a417c62ae4fb00f9c3bf937f28a9f6 SHA512 a7449a61fd291b8c15eaf09cf2162e79d785d1e8f26f9efc3f273679324be35282b5c515112220081b657e04f4bf006956134bfb80648c23b747c406d6126b64
+EBUILD libtmux-0.8.2-r1.ebuild 961 BLAKE2B f8ccbbd9c26a0c7cbb25be3c55b51f69ef260236af38a45ad78df58f7bbc2a0d681d7c2a03cdeb2c350ea69268ace0c0cd383b1b508fa596fc36e4ee891e999e SHA512 186d5fb342016bb8a8e173b22ce5639973f62b867b3438817c9e75ba6db149ee10dd668c96bb52957b4001ca674e070af485a9137ef6141573b2127b5d9373d6
 EBUILD libtmux-0.8.2.ebuild 660 BLAKE2B 7d3b1f9b1f0ff61ce04880cb16bbe6b281d2e74403587bae4346a0d7219221c8168289d75cc3235adff5a807edd0273cdc954786f555690f86b029ad658c0fcb SHA512 665e56e7ab13b3817ac24da4dbe02f680f4739c16a4d58d2b06892055754dfc0866798fff3c42e76a9d861719040b451aed6e4ecf694242a6bb38e5c6d27a157
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/libtmux/libtmux-0.8.2-r1.ebuild b/dev-python/libtmux/libtmux-0.8.2-r1.ebuild
index 8498cecd8d16..cd8b5d151762 100644
--- a/dev-python/libtmux/libtmux-0.8.2-r1.ebuild
+++ b/dev-python/libtmux/libtmux-0.8.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 0a723f3b1bf5..9f5859ac5011 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,10 +1,12 @@
+DIST libvirt-python-5.10.0.tar.gz 203187 BLAKE2B 25f16381fe127579494ec54af38b6da8cf2e38cc3ccc32b8a2e17b77ed33b829fffd74d4631531f87513811abd510205b6678fd0cc50ddc4b7b51ab80bee96ac SHA512 19bf1608fa83572b9b557371efc44bffe298a654db0fca90e49fae8e69a7b2228d9e5a1ae0ab5d34fda3256498e5d53e09b5ea889d600c9d56254730d50faf79
 DIST libvirt-python-5.2.0.tar.gz 193270 BLAKE2B fecd1a07091746779a91e0cfeb9c3068048ee7e51d2f79064b4ee529a19b78d04ba53a5abab68182a1fa9c4a82f459fa9e971c33fcd10b42fe7011be17f7c6e2 SHA512 afee2dcaf08d530e6298fdf2db674af217b9e4115941258b5815aba00087d96db6eb421c9854d7dca0f9dfe24069df72aadd969c924545e72be216f01bc173cc
 DIST libvirt-python-5.5.0.tar.gz 200364 BLAKE2B 198c9858573c383ab818deae6bd42c6ad7efd58b9a661a80f06f4f0fc0d72e9da98546b07443397609d4c9454ece4e02759b53016f078bdae84580474e2bb49d SHA512 3098c5a0315488aa515a9b00e69add8de3dc372d2f82a8b1cbc6d01287a133855095f7c34510ad900adbd1c56e6a53bdfe3d251c48411acd243c2300d659332b
 DIST libvirt-python-5.6.0.tar.gz 201352 BLAKE2B 16f88b9c15214af0ec97ee39912139d6ab07473a9f65a735303f5241d10d75e46db68378b33c9c139f6a9e43f7143a4c30fdbe187e50e004cfb5205dda03d0a3 SHA512 a6bf7c661127ae0ed5962ed7bc9cefe09907e82969525ee0ea8f8f70b5fee8f200b6ba9d35aefcb7b132f59e34162ba40e75e93aff297808bc1dd23f548da428
 DIST libvirt-python-5.8.0.tar.gz 202807 BLAKE2B 82111cdaa5f22ff2a8e5aa16c789535a0e8665c5076137c24bda0698ce0dd1eca2f39db1eba0f3288b208f809d3d44b6b4f05c82b60438222ec7fa66bb2fdabe SHA512 89e02e04c26738180c244a46c1d5ff4c6e839df70ec1cc045997cba25f5182ff616f36821ae180f92901c381e6471f629b4ffd9a69e45843e9412e4e715ba91d
-EBUILD libvirt-python-5.2.0.ebuild 1006 BLAKE2B e48d8672c48cf5ec0af721af56707f2747ca6a069c8be28b4322e248d4b60128299dd3a585ffed645127cc7193c3162e642de7af8a9b6aec472ff7aef93468cd SHA512 8c6b9f610f87485532c1e7e410d8abe7fa2a92e91766b14b1b8eefafa4d294694cc15e41ae6299208e64fd57054377ae0319ffd92f8812e8e508f36577bbeb75
-EBUILD libvirt-python-5.5.0.ebuild 1006 BLAKE2B e48d8672c48cf5ec0af721af56707f2747ca6a069c8be28b4322e248d4b60128299dd3a585ffed645127cc7193c3162e642de7af8a9b6aec472ff7aef93468cd SHA512 8c6b9f610f87485532c1e7e410d8abe7fa2a92e91766b14b1b8eefafa4d294694cc15e41ae6299208e64fd57054377ae0319ffd92f8812e8e508f36577bbeb75
-EBUILD libvirt-python-5.6.0.ebuild 999 BLAKE2B afdf629f1b173367656455b06f0d9c897ee73646bee0c1ecc5bdf38f05ec87ffc8982db79d819cb0810b43f44249c43a47a109fd9bb17d9b9c594c67cf5e93fc SHA512 8923857e1f6723ed4eb777f1acc78a86ac163397173fb072932a40a926fd2045dda7b8e6a32aff35ad3cfc2d26216ada508b22536d76a1bf8b176c55659a6ec5
-EBUILD libvirt-python-5.8.0.ebuild 999 BLAKE2B afdf629f1b173367656455b06f0d9c897ee73646bee0c1ecc5bdf38f05ec87ffc8982db79d819cb0810b43f44249c43a47a109fd9bb17d9b9c594c67cf5e93fc SHA512 8923857e1f6723ed4eb777f1acc78a86ac163397173fb072932a40a926fd2045dda7b8e6a32aff35ad3cfc2d26216ada508b22536d76a1bf8b176c55659a6ec5
-EBUILD libvirt-python-9999.ebuild 999 BLAKE2B afdf629f1b173367656455b06f0d9c897ee73646bee0c1ecc5bdf38f05ec87ffc8982db79d819cb0810b43f44249c43a47a109fd9bb17d9b9c594c67cf5e93fc SHA512 8923857e1f6723ed4eb777f1acc78a86ac163397173fb072932a40a926fd2045dda7b8e6a32aff35ad3cfc2d26216ada508b22536d76a1bf8b176c55659a6ec5
+EBUILD libvirt-python-5.10.0.ebuild 1002 BLAKE2B 1e3c32e4a73cce46e778413ba605dc94c5c795da9b60e097120cdd463f3daa6809e43adab8c729c608e6d7e593a1d84b402668ae0d5b9cb33094912195be3a31 SHA512 0ed3a215477f6d3a7035e8ea5be6b0f6f5e5ef2432b2abacd9957ed18ff310ae8bbc6c6d6aeac1e8da91417d7aae13b62b8a7057c2cfcdf66b2cfc2f8ec8475e
+EBUILD libvirt-python-5.2.0.ebuild 1002 BLAKE2B 840e79ded46780f2f24957f725d46df47b0414595559a5cd6d1df0557ce2cfc35e9f4822f4f8d2aa3905031366e1b8587986fcf9341478a72e0cfa51dab75969 SHA512 6e6f6c6d91c9cf0ac3f917b652a140d1be53b5cc90482aba953541475166d0759c32d98d0f31505fca0fb4e7d30287e854bc7fbeb39960c9d01cfad77d6a442d
+EBUILD libvirt-python-5.5.0.ebuild 1002 BLAKE2B 840e79ded46780f2f24957f725d46df47b0414595559a5cd6d1df0557ce2cfc35e9f4822f4f8d2aa3905031366e1b8587986fcf9341478a72e0cfa51dab75969 SHA512 6e6f6c6d91c9cf0ac3f917b652a140d1be53b5cc90482aba953541475166d0759c32d98d0f31505fca0fb4e7d30287e854bc7fbeb39960c9d01cfad77d6a442d
+EBUILD libvirt-python-5.6.0.ebuild 995 BLAKE2B 515961245e1e73481a20d60b0a5a317a9069f9cd77c1df6044475ceb174b4011b948898f0f13292ca68a4a3190121b016f2ca7937cf490879b58f28e0924c0cb SHA512 be610188870cddc9301668f1db36da50755ab550e81eb85a73dde365d4729f7511d139245578bcc521fd6056496555e3433008ad07950100247d6f641dc0f09a
+EBUILD libvirt-python-5.8.0.ebuild 1009 BLAKE2B 352b61aae5cbb8369890af6ac0993f1b60b474a04619f9b1d62c93365f284557b01d698ffe714781d03665c6193272a404ce6d55203f4d4ccaf12ae04df3f625 SHA512 ba70faf6989e4f2810d6243024ecc5e12d07a4ca6090bd9d253f4e5c35e5a4ac1e637f61bc314ed5a8cf48caf1eb9ba93fa8ad922a0429a27ded90e10d4f9393
+EBUILD libvirt-python-9999.ebuild 998 BLAKE2B cfdedda08bb649c3f7ea1dcc9f44a7aa587bb86f1587bfd2e68c4aebd31879f2c18ab77c8daad3593f99b879a3c2055833ce6ef52719a81840c0177f1b612077 SHA512 6813619365bd317465db18a218493559e0c59778ad58666336644b38de353642761692021d21cfca1e465a4f3fb3cfbb83dad2c428eb3da5c9da09ec6eeb158d
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-5.10.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.10.0.ebuild
new file mode 100644
index 000000000000..cc56b946099c
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-5.10.0.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=( python{2_7,3_6,3_7} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+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/libvirt-python/libvirt-python-5.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
index 738b70c21d80..f86bc6c1c1e0 100644
--- a/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
diff --git a/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
index 738b70c21d80..f86bc6c1c1e0 100644
--- a/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
diff --git a/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild
index 4daec15a288c..d73b5d79b3c1 100644
--- a/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
diff --git a/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild
index 4daec15a288c..ccfb9847767c 100644
--- a/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index 4daec15a288c..607c6f77b7f4 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999* ]]; then
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libzilla/Manifest b/dev-python/libzilla/Manifest
index d0e389ffbfd2..7784bdd03b1c 100644
--- a/dev-python/libzilla/Manifest
+++ b/dev-python/libzilla/Manifest
@@ -1,3 +1,3 @@
 DIST libzilla-1.5.tar.gz 12052 BLAKE2B 48eac27be098484d2ff1407e5f6c757d81071a20c5ce00a409e4c0ad7defa6208a729e3878a0fa25726635e13c79ce406b5caeebb6c03e94dd19af6d7ad055f2 SHA512 a4916a0453a0045541ad9df80fcb06a74ccb1e090983f369f78d21887ea3330129fc53bb912961c400a85cbf0e783f1d2ac74af83cce990780539efa414d8219
-EBUILD libzilla-1.5.ebuild 565 BLAKE2B 7a18ac96e7c011ec75f8f294abe827cde26ed6f0d7a7638e0039a347407adbc48559fded3f2e0b3e6df76519dd2fc49e2f57096b925c58ae687480c35643c659 SHA512 b949bedb3e3a209060b97dacf3061fa67e0c2e61579a3e2dd88b817a4157a3c63260b0a24d82f505539e850f273de091b4ac5f25febe6a7595084b6f874eabe2
+EBUILD libzilla-1.5.ebuild 561 BLAKE2B 0067cc455bdd1dc9a00c6693e8cb2a5b8e38b34f2cc45e3990ed5575ad7971ba61488e1639484177a769bcbe3e644697a135c91b6a97478fde3d07e0dd9e6711 SHA512 7a4b6f3a11be3e052e6e1688bc5e891e0d4915c3691e6532d8c983c14cfcf1a5bc5f94830baa9d64f89c1d13f0ea2ce0c51352afc0afdcf71450668d40e9df5b
 MISC metadata.xml 418 BLAKE2B e908aeaf977f735946a52f7c9dad369a4787e19793af639e12eea821c52a27827ab48d3fb3496e304241962cc1c97829da0c9aa7359654708fc6013003c2f471 SHA512 e382a0185c2c4f2968395ef7aff65364c0523f529b6003ab135285cffd13f80c718953090d6c845b31aefcdd4c8c38ebaadbb9a4fd44cb557586185e4a7f023e
diff --git a/dev-python/libzilla/libzilla-1.5.ebuild b/dev-python/libzilla/libzilla-1.5.ebuild
index bde171b6d9ed..eb51ae00038d 100644
--- a/dev-python/libzilla/libzilla-1.5.ebuild
+++ b/dev-python/libzilla/libzilla-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 3d8d03d77041..6c0a665b43d2 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,6 +1,6 @@
 DIST line_profiler-2.0.tar.gz 68478 BLAKE2B fb814b251e8f18a51e65297e57523b85c55b4060444c42d99801aa88c8ee0279abf14def6ecd5a9b09550e46e2d27b3ec809b1333725b00de64b58f117c76ed7 SHA512 c0335fc69fb47c150fa5555af4f7fdf4b172ca12ee6512e04ba854c4a81f3e6ee5594e484d11c8ea7e9e8048e3f3b8661db52332d4ac645195a0e050acea4ecb
 DIST line_profiler-2.1.2.tar.gz 83131 BLAKE2B 0f61d7dbab24988a50c1c0a9dce528cf792ca53b5f4c60f00fd9dabfd3d3e109f2d245867bc1ebb8294fb84343907e3593c416341ea1b0d7ae626cda8a3218d3 SHA512 625a585915d338fe8ef2f37c5b5bc024f769a623380b85725bcf33686e4cc62a211c2e91552e093dee940367b0d2ad306c5cbe7f1e8f1574eb731d128b8e22bd
-EBUILD line_profiler-2.0.ebuild 683 BLAKE2B 8b5f8f454fce71b4808d5904031e97fe18b8c978cfe37b5656eebcf58c4477e8489c090fb62955e6e6730431111b7b0d818cb1e0de059f3662dacc9439b05af4 SHA512 a3f61c4023746a3ee2adfaf73e8376b3af8c4d01e7b956ef400a6d914d9bd1a73ee8427757d043b861a06f3bd5f71be4a519fe8ef508709c02ae14705fbc622f
-EBUILD line_profiler-2.1.2.ebuild 677 BLAKE2B c342dfd372a6d3a660578fa1677db627b7e5f680ac63167357e61e1027b4a2ff3883ad93cbda751957d653dde09dbe89f1a08e80c89ce4eb54065cc741a254a1 SHA512 7b34c5dce4fd85036441cc7e9ef7c6ca3b253d7b443e2e75139807431b1d3018faec9efc9c3a06d341bc9372abb473736fad1169077dadadad08d573f5a0421a
-EBUILD line_profiler-9999.ebuild 596 BLAKE2B 023c22ed3eb59879e87fced06332406a485a92bd6433335fdf00cfc57aecd0731a092f0bf0646038238a0388e363cf3aadad8081989577699df0e59c02061b6b SHA512 1c2fdc02bd48f7b9c9f9c914bfb31495ce6171218f11fcc71d6431bed25bfbc58b37bdcb416e9b0ce3b128f2a528f22cffa9550b48628a37fc7c20708223b33a
+EBUILD line_profiler-2.0.ebuild 679 BLAKE2B 9f3f89b2319ea042f72276ac23aa3ffa74aa63dff206d1f547e532f848365b13aa90ea5c74fe289b28779fb5184b88b99240536649fb981562403d90c578fa0d SHA512 6271631e46c6b7dd48a1b7e4350f99a8e811a69b7920f8ec9b103c44aeda8789124d67e6500f809999b9b394ddc733fb9d9e32b3ed826c8e5eadf048d963499c
+EBUILD line_profiler-2.1.2.ebuild 673 BLAKE2B 29d21f1a75b4bcc4280ede8bb8ea3e9de25d4469a2e094e8577022f721debf92c28c68ac3db656de2041c780c061e00e9e23e8f82ddcfce742975151e925c9ed SHA512 af85551279951c2f6ee59049e8612f617cce742b080814e6d8c550c97740086593188a81ee591b0562919ec7c84c8982a804f3d6eecfe7a0c4ff0c84256625ef
+EBUILD line_profiler-9999.ebuild 592 BLAKE2B d9decdbff91f23ae7200329f846d4569fd8093722dcdd4697c02551cd5015f71170434c99ed57f0ad1437d865fca5cf6f274dc82f90ac3a5e740e785d8d7461c SHA512 ba840fc4e42877c4467a1c0cc5623152283c27a771f1c43c08585882eba25e8a2a7dab07a8add316ab57fd94ae6315d89aad1cd0f1434d60483e884a4194c105
 MISC metadata.xml 689 BLAKE2B 115e811feb48f966543319af1851acd8f7392dc0065d3216b469abeb470b45828481e2969346fa29e5486ca86b29e7efa0fbdc173358ca59824ef787bfa1bbf4 SHA512 28daebac470f3dbcb3eaa2de42c159d001184dc87696394f7ed78b984addf886432278f78b601cc8673c6a6583bc8dd479aa696354260443a6959c3b96f72fc4
diff --git a/dev-python/line_profiler/line_profiler-2.0.ebuild b/dev-python/line_profiler/line_profiler-2.0.ebuild
index cd7a36066ffd..b3890bb3863d 100644
--- a/dev-python/line_profiler/line_profiler-2.0.ebuild
+++ b/dev-python/line_profiler/line_profiler-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/line_profiler/line_profiler-2.1.2.ebuild b/dev-python/line_profiler/line_profiler-2.1.2.ebuild
index bd4b2f215788..1111379e5195 100644
--- a/dev-python/line_profiler/line_profiler-2.1.2.ebuild
+++ b/dev-python/line_profiler/line_profiler-2.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/line_profiler/line_profiler-9999.ebuild b/dev-python/line_profiler/line_profiler-9999.ebuild
index 42b2e43e725b..d39393b59017 100644
--- a/dev-python/line_profiler/line_profiler-9999.ebuild
+++ b/dev-python/line_profiler/line_profiler-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
index 47de85332f63..3c90ab7103ad 100644
--- a/dev-python/linecache2/Manifest
+++ b/dev-python/linecache2/Manifest
@@ -1,3 +1,3 @@
 DIST linecache2-1.0.0.tar.gz 11013 BLAKE2B 5f9b125819d9c812d37f1c14ef9ab52f2d5787c83a3d0d891a4def65f17aea26d903b269a610b7247927f72c1594b434ce9274c5358b29799e4ca5b426b37836 SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e
-EBUILD linecache2-1.0.0.ebuild 779 BLAKE2B 35382d3bf828bcdba25eca9847b89e4a9209db84a66005a515986135e9af52abc977fc194f1551a379bd88d4b18e34b920d0f9079fa01ad1d509cdd4618d9578 SHA512 720148a8cc6027927652be858854c7bcdc4d01be8983bde857b90fd4e9bce4ba66563dce779de24019bcf72b58da72aaf36df427456a121e49010a10165575f6
+EBUILD linecache2-1.0.0.ebuild 774 BLAKE2B 169b397ca7e3a2b4414b7e44f2ac381a1a3ccb9c2ce5f75195d157358d8da34935bc640d694cd89927c394c877c7b075deda8192f8609851945ff9a2360bd1b1 SHA512 b40ef59a696b45295499c51e9b6407c92fd72654c16e4291abdc6f1540b6762bcec45a64d90a078eda784c5ca28fe50f2b402184dbe5fec8427cd052e7a688cc
 MISC metadata.xml 302 BLAKE2B 121d88c715f0ef01faa1e813371b3a6f021ce034816667e62e1048ba9220d8ee4871500fa8e1a54821a4af1134e46ee08e569610c937f50492b135d8b7cc3d15 SHA512 8a62ad98f7c44a165b2e9daf3eb54b37ad4bda18d2d0404a72780e4155298f98c6cfb232dcae693d76cf52f10b2fa4332bd988fb06d56d53165911f194a52400
diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild
index c7b2d659950b..99588d2b007d 100644
--- a/dev-python/linecache2/linecache2-1.0.0.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index c25b851baa04..96907b9dbc39 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,13 +1,8 @@
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
-DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
-EBUILD lit-10.0.0.9999.ebuild 855 BLAKE2B 32e8b55977e5d42881f642b7d128722d2c21a59db6e32d7354aab3f105f82a27cf8edab2fc4d8e077209e35429d3091a14aa56a5799efb7a62aaa35b9d74ab43 SHA512 94e8a5836d4cce671eaf2e134c55b45fdc2c145210a099dc414a92a576859f220a9a382e59c332450470f19f519651d55b61ef8810ad04efc09de7ea83bcd6e1
-EBUILD lit-7.1.0.ebuild 999 BLAKE2B 5d7693a688e541e9fb1a3c52e167735609d437fb2d44eb786a86cbdf9ef3af04df8c4bdbab1eab5f0249df4526a104fa51cae0b0c024662351f8d628751d8faf SHA512 7793ebc3556515dc17b565676f635d5bd779efcd0dfa990d34b3dc13b985413c8849bf52ac557c54ad636aef53d6f7b96723171c45cba1231b1174bbe15bb525
-EBUILD lit-8.0.1.ebuild 1031 BLAKE2B c5816f6a860b375e39a77d5f48bc3deb816ddbafed895e18b2bdb889fcd6a167295e3592a32645cd22527bbad6a459657f5f462ef6121bc20090698364320e35 SHA512 41482666f2a13b4b98494694b262f3c93aa5779c14d8872d9b5ff3e2d3bdfd45779caed986be5e06bf5b5baf7d8b585a46273ba290493d9cae8c7430ca6cf26d
-EBUILD lit-9.0.0.ebuild 885 BLAKE2B a8b1c3602c32f580835a435425984837adf00be61f65a6c1c60a709299aab54bd338ddbf4be3e11b3488f9425efb28139eba772da2ea5f792aa3bf1de2cd97fd SHA512 bb970e0376858268c43ffb9f4ee7acd22e90b44468390b88cd090334aacf9cce81d7456003077eae178fe5f035da28480625defff1f7c5db594cbf7406977891
-EBUILD lit-9.0.1.9999.ebuild 855 BLAKE2B 32e8b55977e5d42881f642b7d128722d2c21a59db6e32d7354aab3f105f82a27cf8edab2fc4d8e077209e35429d3091a14aa56a5799efb7a62aaa35b9d74ab43 SHA512 94e8a5836d4cce671eaf2e134c55b45fdc2c145210a099dc414a92a576859f220a9a382e59c332450470f19f519651d55b61ef8810ad04efc09de7ea83bcd6e1
-EBUILD lit-9.0.1_rc2.ebuild 885 BLAKE2B a8b1c3602c32f580835a435425984837adf00be61f65a6c1c60a709299aab54bd338ddbf4be3e11b3488f9425efb28139eba772da2ea5f792aa3bf1de2cd97fd SHA512 bb970e0376858268c43ffb9f4ee7acd22e90b44468390b88cd090334aacf9cce81d7456003077eae178fe5f035da28480625defff1f7c5db594cbf7406977891
-EBUILD lit-9.0.1_rc3.ebuild 885 BLAKE2B a8b1c3602c32f580835a435425984837adf00be61f65a6c1c60a709299aab54bd338ddbf4be3e11b3488f9425efb28139eba772da2ea5f792aa3bf1de2cd97fd SHA512 bb970e0376858268c43ffb9f4ee7acd22e90b44468390b88cd090334aacf9cce81d7456003077eae178fe5f035da28480625defff1f7c5db594cbf7406977891
+DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
+EBUILD lit-10.0.0.9999.ebuild 853 BLAKE2B 0d7ab42b23427fdc0d2fd932c0ddac35fc158c73511727095006d49be6a1387c450c9a50629064716a8c4b638ef68e6ad84de146c603bf11cca2c5441c29ad26 SHA512 1b7ce5ae74c55875ce4fcfb64953695a4fc5fe3d8dae10020421f53ecde4f5b8eec5e049e2420b13ab0c5b630faf559243eea8e47b7c0793194e3f4908c4991d
+EBUILD lit-7.1.0.ebuild 997 BLAKE2B 0ab46c9eb3f0991a34f1aa02302fd608c04a9d495b6e534c9592c86d0c418bde0196164ab80ec19000cb266416b06764ee06997eb5171d6523385fdc6fcb3414 SHA512 3ba89f927b7981e1457df180e47880f37cc410d62bb14faeca3e02080fbe20d2f31fd55f277821de5b8ac394c20d82646e5878cca56270578aacfbe8b85a209f
+EBUILD lit-8.0.1.ebuild 1029 BLAKE2B be947bf92151e27db4fa43735b2aec8f76fd4ad2c5cdd8dcc57cbf97a8f30cdca7469513af6d87346c30242787b20cf27efa9c295307b953f7b875f75def0d66 SHA512 23d0ccefc6a181f70381bacd3abc99568a49f8567639122f5e8c86c87ec0fedd49549eb11727f2f4df4b5d7ddd6e4966c9b145de4786d8d493a10fb1f7c9ca6f
+EBUILD lit-9.0.1.ebuild 883 BLAKE2B 663d13f8481ecd91e740d32bca54a61433bef7834f2790ef4e263a86b900e87a3bb70e3a54b35e0939f03546513519537f200d5254a6d9ea5c8bd2c2e7856426 SHA512 a59039e73dca85dbb52b4ca32ef3fe7a3a1b2a5e3cd2dba3f62ef8ec14f2b2d082b28e9628a4eb7a527de53b1984f6c594dfa95454a1f52a8d8f563dc09d41d7
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-10.0.0.9999.ebuild b/dev-python/lit/lit-10.0.0.9999.ebuild
index e051ca51410e..4996ccd73ba8 100644
--- a/dev-python/lit/lit-10.0.0.9999.ebuild
+++ b/dev-python/lit/lit-10.0.0.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 llvm.org multiprocessing
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
diff --git a/dev-python/lit/lit-7.1.0.ebuild b/dev-python/lit/lit-7.1.0.ebuild
index e4307ed32be4..c9d754973b91 100644
--- a/dev-python/lit/lit-7.1.0.ebuild
+++ b/dev-python/lit/lit-7.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 MY_P=llvm-${PV/_/}.src
diff --git a/dev-python/lit/lit-8.0.1.ebuild b/dev-python/lit/lit-8.0.1.ebuild
index a771d37f389d..9fb91951383f 100644
--- a/dev-python/lit/lit-8.0.1.ebuild
+++ b/dev-python/lit/lit-8.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 MY_P=llvm-${PV/_/}.src
diff --git a/dev-python/lit/lit-9.0.0.ebuild b/dev-python/lit/lit-9.0.0.ebuild
deleted file mode 100644
index cbc3d5b9e6dd..000000000000
--- a/dev-python/lit/lit-9.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1 llvm.org multiprocessing
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
-}
diff --git a/dev-python/lit/lit-9.0.1.9999.ebuild b/dev-python/lit/lit-9.0.1.9999.ebuild
deleted file mode 100644
index e051ca51410e..000000000000
--- a/dev-python/lit/lit-9.0.1.9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1 llvm.org multiprocessing
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
-}
diff --git a/dev-python/lit/lit-9.0.1.ebuild b/dev-python/lit/lit-9.0.1.ebuild
new file mode 100644
index 000000000000..bfd8b29feae7
--- /dev/null
+++ b/dev-python/lit/lit-9.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit distutils-r1 llvm.org multiprocessing
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
+}
diff --git a/dev-python/lit/lit-9.0.1_rc2.ebuild b/dev-python/lit/lit-9.0.1_rc2.ebuild
deleted file mode 100644
index cbc3d5b9e6dd..000000000000
--- a/dev-python/lit/lit-9.0.1_rc2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1 llvm.org multiprocessing
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
-}
diff --git a/dev-python/lit/lit-9.0.1_rc3.ebuild b/dev-python/lit/lit-9.0.1_rc3.ebuild
deleted file mode 100644
index cbc3d5b9e6dd..000000000000
--- a/dev-python/lit/lit-9.0.1_rc3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1 llvm.org multiprocessing
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
-}
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index 0d41373a215c..967235730dfd 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -1,5 +1,5 @@
 DIST livereload-2.4.1.tar.gz 25593 BLAKE2B 97a37349f14cb9d1841ec78cc3d1965b59f65f86b00cb972b9b726364f7f34e6409853f8af32215c6bd400698f9b3ac2b947ac7864a8df15ccec8badddaa0cfe SHA512 9106fe1894092ab336270f539be41d4db2d277560a41898e45014e34783ab0b601c993a5a5831c951d313db98ea835aecc8eb31468ba186e243a28df75bfe9bb
 DIST livereload-2.5.2.tar.gz 27070 BLAKE2B 9d2af1eb313f8fd6e7a5176565c3f7a9ab7d8a36260d568d47a427e14e8ed76c0edb0c227ba5784681c82d7c7b5994e151d14302d8c9d0e76caea7d12e130586 SHA512 bb4ba50a31a912051f6036754bfc6ce7ba33b1b8abd5a20ac151f996e347d84367d4cc26f9c798ed6aef487ea335e1591d40ebd1c12f9487f74992e53e129749
-EBUILD livereload-2.4.1.ebuild 884 BLAKE2B 3b9d77707408bae7a382049fbe53746db70c37b9eae32e89acc89acb266945c54be7916c8d8a45626fe503edfa9a95fdb4e6824c8d9b783350efefaa4cec18b7 SHA512 a2c0b837f953293a9c191bbcb9aa6dbf3656f03fb5e1674b158be5ac64347685a47efb2311bd29abfcf152ffe58339e08a73fc776a5aa56a69563a7e4c8e3aac
-EBUILD livereload-2.5.2.ebuild 885 BLAKE2B e33a7ea8b1f4432caf6293e8d5a04dcf370cfaef1b2f0178a60030e89b9dc7a16bff393038105073b86c5a6f05f0b6c8e42d90b41012120fd84c34d06371c45a SHA512 3ef15fce1861c2902059b7e2ada551631517518ad63ea8c783b27eb3f63eed2deb7bbd82fa0a2531af027fbdd7be978bc27692ec8da372658a1c448b8a3b0967
+EBUILD livereload-2.4.1.ebuild 880 BLAKE2B 77dc04af45e0446ff59ced4d24857ac72c1d9d980257832e742dad3e7805e20bae5ab5f9f7d73e8f20ef5426105597f36438cbb7503f2ddda95d237dbdf53f9f SHA512 30f027a8c1d94d920e57e85c4434fdd3ab68e7abba373098329aac155fd5c516de741d4d1f9d174d4a9a7befd3ae0b33a51ec45840a45023616f1d38baa89fcd
+EBUILD livereload-2.5.2.ebuild 881 BLAKE2B 004223f6bcc2ee2b2ac04f8e85e432eb83778e7730b4386499a388f018d598ecfe5c0ad8f0030463095a57daf056d3f65b1006a04bde2775419c81f826c84b0f SHA512 dffd38e67a16ea6196fdb703d839c593b87de0d4cc0e8834976e52a732459943cd22e679b2a96d4967f99f376dc266b0ff51296af2c466b1af2cf3530ea9fb57
 MISC metadata.xml 255 BLAKE2B e88348eaa3bdb7b0d49b6041be22aea520b3c8725f8fdf9433bf9ecff7f5835e9ca46ef054a110a94b394fed5e14c12459a1fee88449ba47cf23bfd9d44da951 SHA512 42395b9462f906c39def6b21217119364b03682e624539e1ffea1f95258d21ca9c3bc3e94f86cd4294e6e4d92ecab7e6355a5068b243aa2d11d6cca1fdd95012
diff --git a/dev-python/livereload/livereload-2.4.1.ebuild b/dev-python/livereload/livereload-2.4.1.ebuild
index 959efddbae00..f40cd94ce162 100644
--- a/dev-python/livereload/livereload-2.4.1.ebuild
+++ b/dev-python/livereload/livereload-2.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/livereload/livereload-2.5.2.ebuild b/dev-python/livereload/livereload-2.5.2.ebuild
index aecc85691101..bebe781a1863 100644
--- a/dev-python/livereload/livereload-2.5.2.ebuild
+++ b/dev-python/livereload/livereload-2.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index c754350de656..fea3f0b298e4 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -3,7 +3,7 @@ AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea7
 DIST llfuse-1.3.2.tar.bz2 348035 BLAKE2B d3a3219c8d7462f448486488971842362b6ade8fcf6804d725db30b0e91d3f240ec9443705cb67caf3e6beae8a174f323465695dddd132210e3606aef6dd861d SHA512 f065818134b12dd128574836bc7d339404d9b7d9236b535da709378e9206b17cb2accd97fc0b658f39a93efe126a7c3064f7901468231f63f8398a3e053498cf
 DIST llfuse-1.3.4.tar.bz2 364400 BLAKE2B 726a42381b84fc57e3e54d519bc1a105056cc8cf5d1c586ea12b1798db493254df7088f1060ffda0d89887c2b7db2046825e4f044953153e7978891f72032457 SHA512 6bda4534f660c42e6740093be0a2c308367f5915a0144d44c390b4f6b197efafb48bc28f7f8d1735defe470e37637bd6688690e26ec3d0c01cb7c197e443f6e6
 DIST llfuse-1.3.5.tar.bz2 362266 BLAKE2B 561439e193470c047aa32b5b4ffd189beca2496b0141d9f0b0d4b494ee135025b174744ac3c90a0e5e8a17cc98f4ab2e8b4a9069f7d73e01a369f5013d036144 SHA512 d45c5fe7e81fd561e016fe99cc7bbac0cf6243e1517e992fe5b302b641aa93c8f95779cb7a4add7a7479f1ed6ca35e0fcf1e4da0fc46ee5d819b46511927613c
-EBUILD llfuse-1.3.2.ebuild 1051 BLAKE2B b9e7e1e83a593b4cba9cbf14dde33429c14eec7c30b5b3a865bcbd3c3851100567a367e02fcbf2dbf3c2d89cf428c7999462631bdd5412d7c961b50be25d6b7f SHA512 4d9610fe9fd38cb53e29eb8a616693a6041141f469538856dd4ef3e8330b0820b5124bb54a170235971e0ea8086ddaf15bea97f035d9cf7b57ab55b05e30273f
-EBUILD llfuse-1.3.4.ebuild 1006 BLAKE2B 585fb0a309d6164fc64575c2cd88312b4f0edd1a96d40e73abf06fed5888fa622e5856db81f26b93326821f3911e87c775b61804024689d12b49af24c62a43f2 SHA512 222edadb4da064673c96f3fb139595622b033a348cf178d52ee587398c4caad4a9fbe70f6ac5a07ce24dfb20cce041ada9783e52ed34642ba1a65e2e8795ccf0
-EBUILD llfuse-1.3.5.ebuild 1007 BLAKE2B 6d2a94e3089377c04743850072fd90e0f5cc50f82acaabcf6ea7463be0eafc0a92d5935fe39883fbcb66c1ba9812d26933988d024ad10d790ae05d1a2391ab17 SHA512 bfcc551a02cbf2343e68028e1bc589918a67ea66a43be9404576a9cf861e4674e904b7a6dd1be3fbe432dd3308c372e8f81c7a9a88c600e984792756a2161eb8
+EBUILD llfuse-1.3.2.ebuild 1044 BLAKE2B 58f884c781d3baa8330cfbe64140dea5a1c3a64c8493a01b82c1c644b0a8dda79044f0a5459e0bac41e198c6b8733113df268b05df3cf8de18e7a3061bcf533e SHA512 073d4eaf5f666f6fcd6350b61acfe6c617022a1b0e1017535c292d9e0ad55b7c3cd40ddc46148ffa2c47d2e5eae40c67208ac66580f61ae8a9a69ac3b1878908
+EBUILD llfuse-1.3.4.ebuild 999 BLAKE2B 7a9f5230e277f89382f6e92fc092a23b506573c7c7efb0df714d58cbcb915abfbb465edc3f3ed0ededddb58592f7309f87d3968a4bfba081c10d16f857d9f9e9 SHA512 d2b91df9d4b8c13d2d4f9ffdb3b9ac6a7a61c0ebb7680969957048fe8e748719a6a3bc451218cdfe257b10c390b2fbe7035cb8f7a6fdb672e963c37d537ec57d
+EBUILD llfuse-1.3.5.ebuild 1000 BLAKE2B 532a6a30e88bcde95e0a92eec7436277e3e93c1f8d23242fc6a00fbf85587ab8d6dafa6d5c117235a876781955a07a16347d1a5b801829b9df33fe43805cfec4 SHA512 275f6add63ffc6efc16601fd1fd1d1843740dd6c11a3c55834ea0e258ca1b285651c585792efc8abab3e2f3cd97edbbbce5ac20193d63f4dc07165c965f943f1
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/llfuse-1.3.2.ebuild b/dev-python/llfuse/llfuse-1.3.2.ebuild
index dc91b40c6053..a2a5f2073247 100644
--- a/dev-python/llfuse/llfuse-1.3.2.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/llfuse/llfuse-1.3.4.ebuild b/dev-python/llfuse/llfuse-1.3.4.ebuild
index 2e3670d2b817..b6e057c90019 100644
--- a/dev-python/llfuse/llfuse-1.3.4.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/llfuse/llfuse-1.3.5.ebuild b/dev-python/llfuse/llfuse-1.3.5.ebuild
index da27f3614d45..c5d477418d22 100644
--- a/dev-python/llfuse/llfuse-1.3.5.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index c212d997b5a9..158d4ee93b59 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -3,7 +3,7 @@ AUX llvmlite-0.28.0-llvm710.patch 2095 BLAKE2B 78b009a935b9014da648fae3a077cba7d
 DIST llvmlite-0.28.0.gh.tar.gz 191141 BLAKE2B 23c86c28311a4e8c7f9c209a7ed7816ad5002c26f9fda7a47cf2b54c4578db28ed0781b54a716726db8a7c1abce79a79a99c3f5bf4be2a61d547eb74d06cb507 SHA512 c00c767c80a507975a055088ca4328766c992e7267219dea54376daf5eb11397532b243352976d3569185149007650d5e94839b61aa55502e1991f72b1ba492a
 DIST llvmlite-0.29.0.gh.tar.gz 196507 BLAKE2B d4870ca042d446857b7409c0c50c370458747ee744c24611e88da4bc8780c26125b2e8db3db7fe9d4f553f9aae5769b62effe1ac94cfaf234bab54d43c8086e9 SHA512 8735b46b1a3053b89306bf6e05c8c6c375d15371d33635f1d27e5533d7a78a85f773e04b7ed8d39ebab40a892c374839e1324665d81459cb797f760d6d2c81d1
 DIST llvmlite-0.30.0.gh.tar.gz 199354 BLAKE2B 71ba1b0572d115a28d838a7fa5daca136fb793d41cdebca5834d2977813b4a02837e99d8b1b48d0fa965c5d3bdfe7783314ecbd2a7e7075b82247ea5fa4f90a4 SHA512 e3a64a3170efe1bffb6eeb8d6cfdc5a9bf8cc9e123da0b317b6b8dd93dacd3a54d5117c22eca43226915e7ff2793ab66cdee00c5e6ada442d9c2f7fed6e40763
-EBUILD llvmlite-0.28.0.ebuild 1541 BLAKE2B 2d6575051c5c5fab37a40a4a9164ad2b739d1f18164836f4b68d7e4a2dc03a4fa1999b41afc1d3beb39d20e71356d76d68dee157690082cc3c74e63c6bb089cb SHA512 2337eac3c683cb2c7deba8a24556c5f5830b54e156ba589b8896aba3a2676841bc79e7c143a8e998ea53e8a0b871bfd40154a2586d1c15ccce1d6bcade47410b
-EBUILD llvmlite-0.29.0.ebuild 1500 BLAKE2B 5e724641299c1b86b764f438c40a6c98087ced767df582ceb522baa04a9d7d5c50c5dc76df3876ec9dae27a8a0035b888e11432868c618da3133351423394f75 SHA512 b24246e3cd1972a1e026a929e1b4d801e37f83626016196618a9d67c24e86115abe031f332a1c160b5846bfeb46b69cc20db7514d8764c176732c413b0182b6e
-EBUILD llvmlite-0.30.0.ebuild 1504 BLAKE2B ef859289fb6438409ef22bae53d77bb8358d78aa25f5937e0d4015a342b4e7bc380f9d163f07aa78d3c4574f288d457f91a81f318c8edae095fd3daf5a2eadb0 SHA512 4c44a4a1728da9bf7588ce85f2d12d9bb015695fd16d3f6a7775c724d8e30f825c782e47c5faa1bf3e16d68025ea7821ebc947172d1021737268a294e43eacc1
+EBUILD llvmlite-0.28.0.ebuild 1537 BLAKE2B 213aa9a2775fb005774d740025b6c0f8fa23808ce3ec689ce794f3d7b7784460d2f8986f69e7abf4a8ec3f4215af71c0bd45ac693ac8201f1f49a770e780cc8b SHA512 0c64a986bd128c0540d0e6889df8892d3d341297996e81b7da39e418912ce3523f7beaf393ecbfc7365cf2fa68bdcd3f684ac8bdf0aa72237be95ae61d9c4577
+EBUILD llvmlite-0.29.0.ebuild 1496 BLAKE2B 2c151ff7b183893b7dad48014f8327275f94cba9fa90cf7cb2718e75df6cae6a89be3fc9d10b5716f29051a939ea6a3d1a5206d9e6a8db04dc1a27301868e07d SHA512 cd78e582583a37f80cbb481638f4148fdf786f997ca78245167375727606e0b392345513924ddaa5f7635f3518b229911125f73bb10f2eab55f87952edd7f165
+EBUILD llvmlite-0.30.0.ebuild 1500 BLAKE2B 276749cba18c33471e283456d61eb6e5c8e797fc1451051e40f87739aa050d78dbdd2abcc36504c15624fa93634a28b13bab3f3017d5f869299cff85561bbbaa SHA512 0d80e97aa276e91f32c416e5940b5cf5bad28e9434fb71c85ebf27836597a2c649d180e3d609d7e0b7b91dade32b848d99851df23b7f44d88e263ff66171c6c4
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.28.0.ebuild b/dev-python/llvmlite/llvmlite-0.28.0.ebuild
index 846f75a697f4..c52d19b9934c 100644
--- a/dev-python/llvmlite/llvmlite-0.28.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.28.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 llvm
 
diff --git a/dev-python/llvmlite/llvmlite-0.29.0.ebuild b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
index d4dbce12bb71..81241167a8c7 100644
--- a/dev-python/llvmlite/llvmlite-0.29.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 llvm
 
diff --git a/dev-python/llvmlite/llvmlite-0.30.0.ebuild b/dev-python/llvmlite/llvmlite-0.30.0.ebuild
index 99c916a0fdac..6554258314b4 100644
--- a/dev-python/llvmlite/llvmlite-0.30.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.30.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 llvm
 
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index 0774744cb4d6..9f7318a04eaa 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,3 +1,3 @@
 DIST lmdb-0.92.tar.gz 155720 BLAKE2B fa991dba144e636d395e264c70de61bf6e1391bed589b8e67075eb604ad3cde7bc1593f596f884e13ef4c744efddac93467eb0e9d7e79d445a71e21e1f5541f7 SHA512 5177abe0c441fb9067ad84de0cafda960113042404507eaf36194efe614fbc9fda37668b9d8a07d4a7f674b0c1a267194ddfb241834a3b1db0d8026f53841cf2
-EBUILD lmdb-0.92.ebuild 576 BLAKE2B d4e7fbe6c97538e281da2fd1aedb00645b9400637b2abfdaa9b1f6438d6d8d505b945085015b78329d6882f851f58511f39288b1b40cf5f98d23238366261001 SHA512 450fffd40d12b8c5feca462ee881870893c828038711160ac30ca715678d43e568f852d2ff092570b8c170661b0c22b006346d24132722dd8668d69efc2a5fb4
+EBUILD lmdb-0.92.ebuild 574 BLAKE2B de845418751c517fb17c6945c0d45aca9109477e4ca0262f5de0e057be6f59d81e39c83e9cef89a6f7996b13e350867137eef933feaa29b12e16423c0abcd31c SHA512 0726699b876951f3e435606e5f55731aba5db0d1b4e7505acb500d909a3dd105711bc86d4a09f523ecf1af79968ae5ea386adbdf1ece94bd5895e8f2d528c2ee
 MISC metadata.xml 369 BLAKE2B 753c2fcd809cb0b69b60f4581421e3d2abb40158dcf3931a70c2c2adaeaf22f5558707a6dc39ec2b9d8724d9fa3bbc370cf790a8bb550d00d59e10cda643ac88 SHA512 4b2ad4e50acca757e8a1ff4e659ae99c8c42788ba6cc1e1d503cb371cb897443e6fbe3b7c2f7f8ca0b6409da9e7a7961a644aaf615d306da8172687caddff3bd
diff --git a/dev-python/lmdb/lmdb-0.92.ebuild b/dev-python/lmdb/lmdb-0.92.ebuild
index c2d5b696e55d..2c3fe85f5e1d 100644
--- a/dev-python/lmdb/lmdb-0.92.ebuild
+++ b/dev-python/lmdb/lmdb-0.92.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/locket/Manifest b/dev-python/locket/Manifest
index 70c0d02e694f..8f224ed571ba 100644
--- a/dev-python/locket/Manifest
+++ b/dev-python/locket/Manifest
@@ -1,3 +1,3 @@
 DIST locket-0.2.0.tar.gz 3506 BLAKE2B 10f5c325036b5c0880c2b0261de180ee9d046ac346a64612d680170fad8664bcbd681954384bb6b9c4f812059b4418c618ee44f638ac6fc1c35b62786afe555c SHA512 ed9bb25f3fcaa70386217716db5612bf31a923c669cbdb8e871de6df4c0c42bf3309604a1aac804c0f334aed8c88b0ba113d8d265054c0e87793c7b53f729ff9
-EBUILD locket-0.2.0.ebuild 452 BLAKE2B ac29ccf28c760f6272b1110a023e978bb1da2a4aee344e896e360d240c891a8ea3b64a13a68db73f734f9f24e17ae4c179673a384e86e858d19910bedb3d0a92 SHA512 2358017a83d7abda67ac836d6fa8448ca4d69b3c893271572286c4326e4e374c109bfdbc1d3c5c051649c0b34733ea18b7bf2599903b1574c5c9238296a7cf84
+EBUILD locket-0.2.0.ebuild 450 BLAKE2B 76c918a3e4c47b79f9489771f50c475bd530d24a0a4edbbe6cf10db3a46e1bd37183abe18d6796bf6284d7247a6dc72e6d7cfa4c7c0e56cb88864510558f9c36 SHA512 bad88ead000a63e13a2fa3d5b7aa7bdebaa5e6662e52e8a041f11dd0bc2368ab826ecfb4b76c2abee4c4d013432d54b6bcb4145ab10adcb90b15aa26e0bcd575
 MISC metadata.xml 534 BLAKE2B a6497888f2b3c5654969c9f4c83214e7703ed888873475f12aa73db09f177d114c9f7eb8e2485ef00d3611c406cf88669e1772758362c603f2aec27d355976fa SHA512 9e37c3571558f195d20d84d2785dd3866c8c035c21d6b62b5c25ea0f4f57ad8fad6e08b0071bc08c21b39d92188c31aeab930a678f0e7d014a7acba8b25d082d
diff --git a/dev-python/locket/locket-0.2.0.ebuild b/dev-python/locket/locket-0.2.0.ebuild
index d23c33b58d92..71de60e68792 100644
--- a/dev-python/locket/locket-0.2.0.ebuild
+++ b/dev-python/locket/locket-0.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index ba9cc39f0057..3d09a40cf674 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,6 +1,6 @@
 DIST lockfile-0.11.0.tar.gz 20909 BLAKE2B 8e13508312efc7eaa463e8fb80bf0a51ae3bc0adb93dee0eb52273bac40293e729de83aca98f549d12f3e46f9654c1d0f373aaba350acf7a17421c3d1fa9ea52 SHA512 6c4c69e1434194076a99f8134a2558c791675d420a17687dfd5b38c1303564392ecc388ec285d55a20027bcbcbc1b3475a489b70390796c46346b89d4b18ad89
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
-EBUILD lockfile-0.11.0-r1.ebuild 1234 BLAKE2B 36d743fa15a0f057d77d6d5237d36eb842d071cfdb51618a28dce1aebd46f8b1bed9f86e40d95b3f931acebcc0425f66fcc66d09249dd89755b5f1e7d650b041 SHA512 95c55c2434314625f388396e2f0e5e8302dac208891389eb3f3ef130b2d703c2b8f026f5d7c9a5511f6827d4ad65b02897695b2c73be18ea145bc2bca54b825a
-EBUILD lockfile-0.12.2-r1.ebuild 1105 BLAKE2B 46e29d94f68549fd6e9cb764c3412af7d463efe754041037b8564486004dcd8c5dbf109c73ff941b67ff93b8b995f9b7ce50811431f4861619e80e0508bb3d3d SHA512 a59bf11e8586c779586ad98a266aa54140f3216ccb47a5eb6d40662d296b5e31cd9d56de39f314b2684c0e610550ac5da375e441c9d1dfec000e094f83db07b4
-EBUILD lockfile-0.12.2-r2.ebuild 1105 BLAKE2B ce800a7d12f0317ed5dc2651275bf7fdf9c88b9326b2470e699e601295d60e62c969eead493078dba241dead41d677873edb2812af06d9c990a41ba362c9d064 SHA512 cd0c6495d2c103ede67ec03c9eb55640897bd663f0ca958ff8ce44a412adc25c524686223f4f36e6f14180677fd5745443824418edd8c49d93b9e67f79695c78
+EBUILD lockfile-0.11.0-r1.ebuild 1225 BLAKE2B ebac58d02165bf6f02c6cd06939dc44523dc8cae154abc95ac5e8ffce64384c481dd0d9b1f73dfd1debc48278567bb787b80c23601cc1990cbbcfdc18b8c4c7e SHA512 f5e4e78e6391eab9bce2d46b6460e2c04b81e03662c40900524cc33a218bced9366df82d604d67493665cd2701177b79cacd9fd5a3f2054c72ef449addd7d333
+EBUILD lockfile-0.12.2-r1.ebuild 1098 BLAKE2B ce4d96145d24fa870a818c1ef11a591cb0140e3fda4d43a447c77784b15c9763f30618c2778bb65572955daaedc05df5224e768efa9ecedacde6aefdd342a2df SHA512 cbb2ed5e6d0098ed36a7eb10ca3e9f1c4ded9f76e5141ff02ce4aa659b40f2986df0432bd53099f36d1433e2d1a6b4bd888cd2c927e5e11914af8a2f4f3a3443
+EBUILD lockfile-0.12.2-r2.ebuild 1098 BLAKE2B 4e921f127c6237e45555f32dacfec9efe240463b66653f8e2c4c449e81ce5870f70991bbe2e4281a753bef3b6d0dc8a3d76a55ecb6454143e4df5599128e436c SHA512 e8901e332a79d880a6ba5316a47b5aba0dec39685fe76d55a873ed8cfa45af4e420adfc92886026cb8ec0b73f3e612faa6d828636f58684204fb1d681a0b9091
 MISC metadata.xml 364 BLAKE2B 504dcb4ca67f92ab6554918b7dfa48d80f31439e35d6d1b5af441dde50455d27bea1f9e0f2284676cd9190cdacc839a322ac4ae556b45a371f98d5f032c5ae5c SHA512 b736cd5f710ac2c628d8379aa69fbf3cf5015a1edd80405ee695d56d0a0f86bc40c8ecbe70083338e6b7fdd115d11318358f5fd04b2397e0ab5ab7b315bfad5b
diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
index 917b45b73559..b333b045dca1 100644
--- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild b/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
index 5863bdef3b74..2061bcb8cf13 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
index 9cae8c68a797..b5a9be30a5b1 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/locustio/Manifest b/dev-python/locustio/Manifest
index a174aca9a1d9..03e46f707a89 100644
--- a/dev-python/locustio/Manifest
+++ b/dev-python/locustio/Manifest
@@ -1,5 +1,3 @@
-DIST locustio-0.7.3.tar.gz 89300 BLAKE2B 4fba25ff54686a35f95de15766e38ffec0de24eae7e3100275dcdd25ef7dee1bccfbd1d31458a56f35a8ee5afaeea6c91ce40be2bdeb77ab7f9d663b378782b2 SHA512 fe2434691218be0749c0bf7c2c26b6b3172b7dd69898667441aa98a67ac5e5fbb513aebd27bd54c10f423da452f734c2d6ab7a52f4641755439cd3b81a82eee4
 DIST locustio-0.9.0.tar.gz 226870 BLAKE2B 595042f110f08ddb6bfdb9642f91448a0fb7229fcffcaa1392fdb351ac5106304e2743801134f4f87fab68b8f098122c88cdedb10566ed70035480ad69755e58 SHA512 9c51fa3af784b4b653fa5f55623ef8ec5eb6a94b8f3eacab97deeb7f5805a96b5467344d653a8916975f547d5a7a7ff63c83ffb8c289e805ccd5bb577aac04d7
-EBUILD locustio-0.7.3-r1.ebuild 904 BLAKE2B da6dff8bf893cecf5ce2abb8e34ea58a6568aa380d57339d8f54d4aed867efad7651681ff218ec76f577e89124e8674de4fcbb6b2872db60f46f30a0f062804b SHA512 983cf811b33ded53e5e2adb652b622632d0095e49c00a8b65aa7215c8b18d80b3a33004bc054b6572cada44ccc4097875c788e0fa1183ab96b60187bda3b08be
-EBUILD locustio-0.9.0.ebuild 983 BLAKE2B 2beabd2ee57a7bf67071f4f6cd9e443f92dde0c667884daef1f72c05a18eb406ad5d9d8511b5a59131f5720e306d528822436f1f888d18f00e5f88d787d9feaa SHA512 ac0c12a83c26e05bf4945adbcc848f6ebd379ca68ee323ac44849369909b2c89903529e6c016d8a45aea5f22cb95160ac2f5e2a162df1a045fcd6a1309ccb649
+EBUILD locustio-0.9.0.ebuild 969 BLAKE2B 5e00df9f31cf06422ab99572e5abbc1951f25e7c5ed0bdbbb6873ed8e3372ebae421e3cd8313af35434156cf65c27062343cbafac21eb06761c4e10f6012f9e9 SHA512 f893a42cabc1942e7b0f7f36b64deaae383f60835530157c77155817cfdbab282e3ac0aee5842ba41d8296f50c91cde9707a27b9fa213ac7c4c583ba3426389a
 MISC metadata.xml 366 BLAKE2B a5b3f35409c984368b5fa0b7ce3713ead52af9bdb0dae2c18f4224e7c8b392eadf6350471ee4e928b7e39aa82ffdb8ca5b755562073430313357d1ff1e2c6573 SHA512 bfa39e9bf81a8fa9f1ac9fbd635daecbd3856a240bbeccaa8ee9afc632a21c07ccb2b5a6afd15008a828d2ca7fdacdc0825c2381636888a4f044f2ac0c5c311c
diff --git a/dev-python/locustio/locustio-0.7.3-r1.ebuild b/dev-python/locustio/locustio-0.7.3-r1.ebuild
deleted file mode 100644
index 8830bfd9b640..000000000000
--- a/dev-python/locustio/locustio-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,37 +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="A python utility for doing easy, distributed load testing of a web site"
-HOMEPAGE="https://locust.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-	)"
-RDEPEND=">=dev-python/gevent-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.2[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/locustio/locustio-0.9.0.ebuild b/dev-python/locustio/locustio-0.9.0.ebuild
index 0a39fd42fe4c..8195cc9dec4e 100644
--- a/dev-python/locustio/locustio-0.9.0.ebuild
+++ b/dev-python/locustio/locustio-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A python utility for doing easy, distributed load testing of a web site"
diff --git a/dev-python/log4py/Manifest b/dev-python/log4py/Manifest
deleted file mode 100644
index 61de79a7b6ae..000000000000
--- a/dev-python/log4py/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST log4py-1.3.tar.gz 14926 BLAKE2B 63c6fd7a1e0fcd141ba6cfab19025854a26d4e3a4db860508fa21b88ba47e61493dca53661d295cbe6c7cea6b01f8e4f891adc1265d14ea50b78a64c6288d843 SHA512 683352f00c2cbb3afdd938d7b30a524f543db6b336c69a6a10acecdab08febba384fcc7a55b0d55a56c389dfd6b74c5e6f26345680fc7b4e29adcbe66f45e9ad
-EBUILD log4py-1.3-r1.ebuild 673 BLAKE2B 23c4dc304b5c51f6dd9b2bb378fe67145d550aa2747eaaaa935760258f82820640179debce33bd4a4589c515a73a6848a528b6f403fa6832bef3ce40f209681e SHA512 6f70b4178f67c213a39333af178f45b76d43a106d4abb547161bef7ac2506d3d6286e07f158d57399aed4002a3b21a92b2a30e0b67bcc90bd715bcc447e904e0
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/log4py/log4py-1.3-r1.ebuild b/dev-python/log4py/log4py-1.3-r1.ebuild
deleted file mode 100644
index 40621831e88f..000000000000
--- a/dev-python/log4py/log4py-1.3-r1.ebuild
+++ /dev/null
@@ -1,32 +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="A python logging module similar to log4j"
-HOMEPAGE="http://www.its4you.at/english/log4py.html"
-SRC_URI="http://www.its4you.at/downloads/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="doc/AUTHORS doc/ChangeLog database/* log4py-test.py"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install
-	insinto /etc
-	doins log4py.conf
-}
diff --git a/dev-python/log4py/metadata.xml b/dev-python/log4py/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/log4py/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/logbook/Manifest b/dev-python/logbook/Manifest
index 17b84e964fe4..9176726387e4 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,8 +1,6 @@
 AUX logbook-0.4.2-objectsinv.patch 393 BLAKE2B 9575e9f92379fc772755785bd10cc465c9c85085cc9261657a61754d179f8a8f790da8045c13bdabbc0d62ca12c74286bcb35652dc13b8675ef8aa2d6677e57e SHA512 7b62f943b48f52ae46d56a8835f0942d74feb757f2a1ec5165006cfb70a6e2030b422a20f278aa746d1f3c85c9c20d87c954e8c42c31dfd18050fef9dbd3f302
-DIST logbook-0.9.1.tar.gz 106615 BLAKE2B 4100bda341a1c946bbabfb6ff423b4906f0ada754ebcbaefca93d768bd8c5135a9b1e00207fba4b13ce297cb7eca27364000e9f8b9f52935608af6c9586302aa SHA512 d136dd5a7219a23a50db857919d794e7b721cc629443ac2bf92374aef68889d8a7146886fc4484c6d0dea56ec5c1c1ccca3f0b20310c2e12dba9d40dcac9c188
 DIST logbook-1.1.0.tar.gz 367541 BLAKE2B 26e27e94f1238c9188fc66b6eb1f5622d96e1c0db97817dba30c8c70107544ea80ab1f11b71592db6a8e2a9c5d32dd659782a532cb7d263c2f042b41ef88d2ad SHA512 55ec7a026a08baed405e29d7cdcc9d3cc423c9faf13788c2447ac7ccff688de9bd9e332ad78077b1eef8bc8ad9aea572f9c124888f46ecabc2abf22d8ac9086b
 DIST logbook-1.4.0.tar.gz 369335 BLAKE2B 02398be49d2a12aadbcde90561afe6ac08060877922fa04b27f08587115aef8faf47bfc352fc005b8a986ab619289c8544fe53a84e0e863a09c992685f78739c SHA512 3ea969e9e2075e34a915566be906266b408671657e4cecbe47663c28f2212c0522b0f0eb2832fbc4fb906f70c8e53d3cdbe65923dafe53a77545b8126ab539f2
-EBUILD logbook-0.9.1.ebuild 1195 BLAKE2B e55637c53ee01987c444a98e6370647be1a5eb4b7d4068607a045f8032cca12d79f7181c8140287db39137ebdc190286ea278a8b74a1f209999a5a2d76f78c5e SHA512 61df4b2d5927872bf9c26fbd79607d5a433d59cc0fce2c1ebbecda069676f685e41243e209539afa562fc64ffd0f656903d8274992de7a023bdffdbc94842cf7
-EBUILD logbook-1.1.0.ebuild 1199 BLAKE2B 07e812b4d4c0d0802ed6d55ce35f47f2b172ce622d30a27e871239337250bed9fedfbdb4aea66f6f7ab8cabd7df247f62673b36593ae2473db36ec754c11964a SHA512 c62040e75edd78b09362dfdf7ac7ce6f1aa796561a2a6f794d56cf57fc5d5d1559f42c30aabfccb9a9fe93e9f480fab1356661c1527772497c571f6b1584b18e
-EBUILD logbook-1.4.0.ebuild 1201 BLAKE2B e27962c30ebfbf3945d851269e2ff2dc359e9017d9b7da53feb2cdc379dfa28e95bb0bba82f50ff72d71d4ff601443efc36c0c44f772aabd69a1db745cc059b4 SHA512 2d2d8b3480f2a79b81c7e25c05056dd109410c923dc1e19730983c408ac48f2d3ea5fc4817b9e01d1594c5b997bb10e62f24ff0654736c1dd9e4e301986d4293
+EBUILD logbook-1.1.0.ebuild 1190 BLAKE2B 4cadaf73f6cbb58ea2f24f45dcc7606b53e02ea9028680b54f250719d92dc15324f855d731259cc24248d75f4f0b7e9592fbfba73d23e089df8dcd131581ee79 SHA512 423db29cf813ee6c146a43412f82ca9f76c95d076dacf2580d0b02280c355489452750d6317dc944f098d8b24cf6de917c5733e172e9b3a0806d992055062dca
+EBUILD logbook-1.4.0.ebuild 1192 BLAKE2B f97fe5b5090a73f90e04a5a3e61e9f7b4da05216685e727140fc0c0328f0ba38aeb4fd2a3a8e68a1e36526fb68463da0c53f8a3b51ee13fefcc02ada2fc1dd5a SHA512 05b8efab973b0443d2613b898b3526518d2e5ea8ce420bf6ae5b96d9b820d7c175c3404e23f3b46de4c17dec24f4295c4b3ca7208b0f7a5a4ce16308c4e10947
 MISC metadata.xml 379 BLAKE2B 63416a01d45934c94f9f56e2872a35d66a625c6d529315697d4038d64fe0947f77065badeba36cd765d2a4781e04ab651b3b812c5563caf3222065210d62f3f1 SHA512 fcb989995cc9403469ef44339c37b3a849a485b9741b1910e3dbad66d6aeb5a815a25ef9c403c020d75e608f91d78d436dff8a098efe5a508ae73b3dffe01a82
diff --git a/dev-python/logbook/logbook-0.9.1.ebuild b/dev-python/logbook/logbook-0.9.1.ebuild
deleted file mode 100644
index 0322bff77b9f..000000000000
--- a/dev-python/logbook/logbook-0.9.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A logging replacement for Python"
-HOMEPAGE="https://logbook.readthedocs.io/en/stable/
-	https://github.com/getlogbook/logbook
-	https://pypi.org/project/Logbook/"
-SRC_URI="https://github.com/getlogbook/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/redis-py[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.4.2-objectsinv.patch )
-
-python_prepare_all() {
-	# Delete test file requiring local connection to redis server
-	rm tests/test_queues.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/logbook/logbook-1.1.0.ebuild b/dev-python/logbook/logbook-1.1.0.ebuild
index 5edf475bd22a..3d251417d228 100644
--- a/dev-python/logbook/logbook-1.1.0.ebuild
+++ b/dev-python/logbook/logbook-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/logbook/logbook-1.4.0.ebuild b/dev-python/logbook/logbook-1.4.0.ebuild
index 05fd3081da0b..f06bd6f03f4f 100644
--- a/dev-python/logbook/logbook-1.4.0.ebuild
+++ b/dev-python/logbook/logbook-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/logfury/Manifest b/dev-python/logfury/Manifest
index b8bbf4ba087a..91902b56d6be 100644
--- a/dev-python/logfury/Manifest
+++ b/dev-python/logfury/Manifest
@@ -1,3 +1,3 @@
 DIST logfury-0.1.2.tar.gz 17222 BLAKE2B b304ae68b345a5a262243063823354b00c72ac4301dcb34ceb56c44c0a0bc8f37ae447fb024e7d4b86469cf5412630c3b0d37370d492f7aab207f947b89d1577 SHA512 72e3e41047d3617420ece1a76a859635af42eb17d77cac0331d65144f750b5a5b8eff119a28fdda543b75cb75a2c8078492f2164dccb8c2dc9ba354e80a249ca
-EBUILD logfury-0.1.2.ebuild 567 BLAKE2B f77dd6273f1c8df3a6d7fea1ea29a5be95bb64e5ccd27d2d17be02211fb81b624405cc1bfa802012c5350aeac3c89d3f60c00d5b2a58c85a62b2d1ce1a914a0d SHA512 fce21b23e8dcb6ed7362295e5010363b4f49ba8f0b8397569d7c5917a2ca9b2d51d5bf96513cc3a8b328c22865ec363d33b70e37369ef634fd0aaad7f3cc43c0
+EBUILD logfury-0.1.2.ebuild 553 BLAKE2B 5da568536410a5b6c59280eeb15ebfe8bca15a1fcdfe64cbf2bdca16a0ac8a1c4de3ceef1155c07be61c7d5757841d2e68422f806025407b3a9f296688516134 SHA512 709496ca529ba9ac30533a873746bf69b00ae657e4b8698cf2641ce5e97f993c42a3bbe89bd48b4ffce99502a61b2fc908727db08eef9bdef52296eaa342e3f9
 MISC metadata.xml 519 BLAKE2B 4ead9ab47b13e36d475ee1ff1e5e32f3f368cdcfc563e06c6109efe300c8acaf887bb6004836dbdeb28e04aa49f9583ec0b3b6a26e91cae29745a3c9f4188713 SHA512 33badf9dca290ae2548ad447e7c1751c82e926cc00fe6fa622e4fd308922d0d208535de7a74b0b908e0211aee53afece21c2f3b399d2fb2ae1f633fe02900cc3
diff --git a/dev-python/logfury/logfury-0.1.2.ebuild b/dev-python/logfury/logfury-0.1.2.ebuild
index f21114a948a9..f77885e902e4 100644
--- a/dev-python/logfury/logfury-0.1.2.ebuild
+++ b/dev-python/logfury/logfury-0.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/loguru/Manifest b/dev-python/loguru/Manifest
index 7fc340597832..b3a4aa8cfe6a 100644
--- a/dev-python/loguru/Manifest
+++ b/dev-python/loguru/Manifest
@@ -1,3 +1,5 @@
 DIST loguru-0.3.2.tar.gz 378160 BLAKE2B 83301f5bb79d0edb20d211e8ee4d05b3b93a0a9f13f13b2ff103f1e9759f227b80e5571ccda48098a1e45658d99a54768fdf456ffef7a13d08375ce62ad876e1 SHA512 e78f5f43fbf4891ff9b9a21c1a29e4f02877f73a09b7b7df25076bffb25a094eef561c469b22cbb999979de4dbf81df2298681fa219dc684f15fe7c52ecb5359
-EBUILD loguru-0.3.2.ebuild 992 BLAKE2B 3b387ea2b110c3e3c6b8461bd69a3185c5ad8040047120fdb5e142f041f866718ddf1429dc6a0f43198b10aafe2465022ccfcab6d8837e871218e1b21ca697fd SHA512 750356f6f06edfbc42873ac1278854519a40f9382092fb706a1fcb64e662bccb915951102edb48a0d12cc3931d7005845805a207c690ca31adf8edf40b88ede6
+DIST loguru-0.4.0.tar.gz 401317 BLAKE2B 00418647a240875706059d9f677a8377c3d169b92add3519c68a89ad2609ff48a55d735793749ab92a706f33611ba6d1b88a0b2e067ec6e80eb7827245bcb116 SHA512 2829cb888585998de5d1cfca815dbca32baa2c4b6ec61d6f165750e6ffaf847c6317846d8626189162131b36a6f2510dcb66bc05e72be76fabda11002a89767f
+EBUILD loguru-0.3.2.ebuild 995 BLAKE2B e017a9a3db635092289274ab7b6fc8fece60dcbce1d6763dee5124d3ea19558dbb6fd885bb9437a9c9feed9dc53700b5af17db3711d8a082ada353966d4ab8fa SHA512 c8d2a10ff2777896faf53148ca00b06d3e7046050a42e59b68359eca6fc9d39e6f1c00e0f16fb65ce3766b39001646f95ea616313c6c39dc053851b324a8c9c8
+EBUILD loguru-0.4.0.ebuild 656 BLAKE2B c12daee7cc82dd3e3f2f2cbe97618f94baf12320ff29a1ba13a537c55a67f3d0a001217bb8c01353e15b3100347d30a5833bd08ded28362d8d052d51adc9ca98 SHA512 fd591aff2a4fd4c44abb4f0a54c4f67c41a838c89b1ff9820aed1f26096c8552bbbf41d590fd13fffdfd532f62b1cf941c9bdfb1dd1d2d5fa842847dc0384138
 MISC metadata.xml 683 BLAKE2B bd44db6c47f17a714eb8080d63d5002bbedf247787d568735f87f8aa01a13fc32d383f4eab2b92536a2f98f5b76b0ae01c407bf3c746b08c668ef562cf488ed0 SHA512 8a671ba69aa489f384c7074623f62c03905442b14b6b12bc9f306416a66390a334dcdadf84a5485936b47ff9992ac87e35ffbc8ae17d035b381f53f721b2369b
diff --git a/dev-python/loguru/loguru-0.3.2.ebuild b/dev-python/loguru/loguru-0.3.2.ebuild
index f7db000b4db4..fe109d742627 100644
--- a/dev-python/loguru/loguru-0.3.2.ebuild
+++ b/dev-python/loguru/loguru-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/loguru/loguru-0.4.0.ebuild b/dev-python/loguru/loguru-0.4.0.ebuild
new file mode 100644
index 000000000000..aed8f0048adf
--- /dev/null
+++ b/dev-python/loguru/loguru-0.4.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python logging made (stupidly) simple"
+HOMEPAGE="https://github.com/Delgan/loguru"
+SRC_URI="https://github.com/Delgan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/aiocontextvars[${PYTHON_USEDEP}]' 'python3_6')
+	>=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]
+"
+# filesystem buffering tests may fail
+# on tmpfs with 64k PAGESZ, but pass fine on ext4
+distutils_enable_tests pytest
diff --git a/dev-python/logutils/Manifest b/dev-python/logutils/Manifest
index 2320429ce640..d42fef6dc854 100644
--- a/dev-python/logutils/Manifest
+++ b/dev-python/logutils/Manifest
@@ -1,4 +1,4 @@
 DIST logutils-0.3.3.tar.gz 27106 BLAKE2B b029b1767fd385d921a254454090630b31b4a9ff7f71ca7fbf777102bcdc795bd79207f8d9098bb0538a110dfbc8ceef87ffe1443fbb42cad1e6f4879248ea0e SHA512 d341567180e96cf09155af7af96becb773b81e1c25946c5f08fce56b85018f236eb23b0d76b2b938900128b763a65327d64f0abaec0ccb0f6365d4d8fa3dc369
-EBUILD logutils-0.3.3-r1.ebuild 500 BLAKE2B 0d5b9a01dc9adf279362516767034700954da2aed51cbd45a4de181bd43a3b094d869bba4613fba88888547966a1fcd75b0c8c0674f87d0773d5d4b65aa3f2fc SHA512 c6fe3e75cdf7fb880c3918aaa4446a750be111c48b58a3a08d47f3ea140470ee4cc8b250f3af5e0d57cebba1d11bfb62e94543674e17c21551440dda92310ccb
-EBUILD logutils-0.3.3.ebuild 486 BLAKE2B c884ad38d45283f9fffb0a200f8c20e314bfe6321e3aab656bf1d500cca94c37bd6391bfcf3259799d01fd0436a4517ec876751f5a808b9e4f3d0b5980ef71ed SHA512 826e9f514e2d4fb785bb34d4f269eeef76700e5426fca3c6abf3dccf89085814a1d672b0c954ee83c6e5d1b00fbae5f17d0bd6d0f98915d94f698cc6916bf239
+EBUILD logutils-0.3.3-r1.ebuild 498 BLAKE2B 458ca68c366bee4d15ebbcfba0ff52e096437163043456238d6058c4ac31173185cde9cd812e0a33ec6975ca2640ee08127d0b3dfda1a0d888f0a655380af585 SHA512 8b9c94a3e520817485ee9af5202552cc77d796e07022738ebea6348cdde797202799974a0bf1e45afc1a1164d20c822c1ff6d9be43532022b8830dfa1d089f42
+EBUILD logutils-0.3.3.ebuild 482 BLAKE2B 32309aaa4fa0692c77c18104c6701a3a51453b4f20e527d12ff8141aa9775e7cc216ffcc33369545ee8ded270ae57e915c2a5360e53d34724f916b2f559990a9 SHA512 42f62ae7943436ba417ca05e477f13cf28dfe211d25b285ccfbcd94f7170c04f80d5ff6a581da241f8b6fac301fa476eee2d2df02487ebd32cd0ef9e64323bad
 MISC metadata.xml 388 BLAKE2B 587b9d7fcaa5cc18f3064ebfb24f18808ddbf2c05d68d6a44910babde42dd3ec003ba40b1738de445065767da564a1146e68ef14aba0309b7150137cd44b71d3 SHA512 19aab936b18ec786b830772716ee0d0c0e2d81e2cfabbccc20d0c0baa0dda993423c9de608780f2b969a2cc53f5e03a1378486246c86c656143fe6a0626a61de
diff --git a/dev-python/logutils/logutils-0.3.3-r1.ebuild b/dev-python/logutils/logutils-0.3.3-r1.ebuild
index 15e2bb9f1821..44214d61aa18 100644
--- a/dev-python/logutils/logutils-0.3.3-r1.ebuild
+++ b/dev-python/logutils/logutils-0.3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/logutils/logutils-0.3.3.ebuild b/dev-python/logutils/logutils-0.3.3.ebuild
index da99c3f44b35..7559718a6336 100644
--- a/dev-python/logutils/logutils-0.3.3.ebuild
+++ b/dev-python/logutils/logutils-0.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/louie/Manifest b/dev-python/louie/Manifest
deleted file mode 100644
index ff7f6723ceb0..000000000000
--- a/dev-python/louie/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Louie-1.1.tar.gz 22306 BLAKE2B e7cd79003113f235e4058f60ec71325dd9bad6082aa66bb115e3adde3e75528fff170df5e547355871f9aaf49393bd89e1da7abc2df598132016e8f0b324d8a6 SHA512 4f5426da4bfbf7a5928007a82e155414e7db9d466397eb9cba6a5fcfddccf4bd162071e5d551fb6ffd41f0b780097a89eea6c268e2d4fb32264683f796d85ec0
-EBUILD louie-1.1-r1.ebuild 721 BLAKE2B 3eccf1986254bbb43e72256a757692ad556faa38dabe5aac246b35d5a4e25b8b8fbf1ac978cabcf9fe43213607a73bf6779b5a87df2b77d81056c0a943cc391a SHA512 fad9ce7d9d36f69cb84eefa7d3613459598fac4280ad696db2412b345af9f9c28d6c98736675e7a74e60a60e413fd090ee2a028313877c35f94d106d91291923
-MISC metadata.xml 308 BLAKE2B f3d2320a61138ae287468fddb81dca0fd3a12500c95f0148ee2c4e67437353cba3198f1560c296a0bbcf985156b183a98e5179ca7da668444911b890903a4da8 SHA512 6559bcc872bf9bfdb5fb0bb7b3f8b61dc0bbba13fe726aa00bd316dcae42c13d2eeb887cd77168810ca6333e442a9deb82cc9de3fd7f2bd66bfea662287e63ed
diff --git a/dev-python/louie/louie-1.1-r1.ebuild b/dev-python/louie/louie-1.1-r1.ebuild
deleted file mode 100644
index 006482054fcf..000000000000
--- a/dev-python/louie/louie-1.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Signal dispatching mechanism for Python"
-HOMEPAGE="https://pypi.org/project/Louie/"
-SRC_URI="mirror://pypi/L/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S="${WORKDIR}/${P^}"
-
-python_prepare_all() {
-	sed -e "/'nose >= 0.8.3'/d" -i setup.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/louie/metadata.xml b/dev-python/louie/metadata.xml
deleted file mode 100644
index 9ca525a62916..000000000000
--- a/dev-python/louie/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">Louie</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/lp_solve/Manifest b/dev-python/lp_solve/Manifest
deleted file mode 100644
index 534d57620a44..000000000000
--- a/dev-python/lp_solve/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lp_solve-5.5.2.0-setup.patch 1637 BLAKE2B b9fb04b5383dd1c169675f41ebd072f61edfb029ebe0096982a31d41648aee2843b348abe796a62b477ef3d85c176d6808465e34b912ec75ed3b5c7477351796 SHA512 d9060808f86f67205acc3d0ce9b0aef750e9ea5d77f363c225bc11330e603646b0ef7a5b1f86f00c61324e92d8237ef99126f6b439ddb04c0c28fb6f484ef295
-DIST lp_solve_5.5.2.0_Python_source.tar.gz 58017 BLAKE2B f48f9e98103382317e0a049c83d29ade53e54583c0026b14c869be608c8e24c6625feb463ac5a1951faa037b7945d6295961ca4d600d70f65975c12bde7bc283 SHA512 eaf732a1f3497c27e40a037be21b2e1552c3aec6cc7801c47d68a439be556ac45c2f1bb90e403d1a4b8bd42b0be0b323b8c3364363e6d51ecb0ad0934902444c
-EBUILD lp_solve-5.5.2.0-r1.ebuild 1024 BLAKE2B 2d47823f152fbb522d3f7e1cdb3b4c59cb23f9cfc3114e87829e410edb8896aaa70ca092444808f50e7070db9f02d87978a0378bf19c2f116f2030878e125fe6 SHA512 c2a049f639ed3eab974a43359cab1ff77d2b56de1695161759d3ba988976247fc6328c604e534fc5fc265c6e7fd99aa87dd9feb47532c188cd67a561de309e7a
-MISC metadata.xml 464 BLAKE2B 527f6562daad377f3d9e754cd9b28f91a76db1ecb6592eea0ce86bff54426ffd5cce93cd22f26f02b2aa4bb1462b6d880aea42043811fffdba8169772e90497b SHA512 21e5fbf16ce56f8cd5c714d9a73926ea77fb8b3b1a5e9f7d90901af6a77a159545029e08db682cb151ccbf615c1d1291929acf2771138300b19498c78bcbabf0
diff --git a/dev-python/lp_solve/files/lp_solve-5.5.2.0-setup.patch b/dev-python/lp_solve/files/lp_solve-5.5.2.0-setup.patch
deleted file mode 100644
index a28b8179d261..000000000000
--- a/dev-python/lp_solve/files/lp_solve-5.5.2.0-setup.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- setup.py.orig	2012-01-07 20:27:45.072840503 +0000
-+++ setup.py	2012-01-07 20:24:22.127570128 +0000
-@@ -1,26 +1,25 @@
- from distutils.core import setup, Extension
- from os import getenv
- import sys
--import os
--p = sys.prefix
--NUMPYPATH = '.'
--if os.path.isdir(p + '/include/numpy'):
--  NUMPY = 'NUMPY'
--elif os.path.isdir(p + '/Lib/site-packages/numpy/core/include/numpy'):
--  NUMPY = 'NUMPY'
--  NUMPYPATH = p + '/Lib/site-packages/numpy/core/include'
--else:
-+import os, os.path
-+
-+try:
-+    import numpy
-+    NUMPY = 'NUMPY'
-+    NUMPYPATH = numpy.get_include()
-+except:
-   NUMPY = 'NONUMPY'
--print 'numpy: ' + NUMPY
-+  NUMPYPATH = '.'
-+
- windir = getenv('windir')
- if windir == None:
-   WIN32 = 'NOWIN32'
--  LPSOLVE55 = '../../lpsolve55/bin/ux32'
-+  LPSOLVEINC = os.path.join(sys.prefix,'include','lpsolve')
- else:
-   WIN32 = 'WIN32'
-   LPSOLVE55 = '../../lpsolve55/bin/win32'
- setup (name = "lpsolve55",
--       version = "5.5.0.9",
-+       version = "5.5.2.0",
-        description = "Linear Program Solver, Interface to lpsolve",
-        author = "Peter Notebaert",
-        author_email = "lpsolve@peno.be",
-@@ -29,8 +28,7 @@
-        ext_modules = [Extension("lpsolve55",
- 				["lpsolve.c", "hash.c", "pythonmod.c"],
-                                 define_macros=[('PYTHON', '1'), (WIN32, '1'), ('NODEBUG', '1'), ('DINLINE', 'static'), (NUMPY, '1'), ('_CRT_SECURE_NO_WARNINGS', '1')],
--                                include_dirs=['../..', NUMPYPATH],
--                                library_dirs=[LPSOLVE55],
-+                                include_dirs=[LPSOLVEINC, NUMPYPATH],
- 				libraries = ["lpsolve55"])
- 		      ]
- )
diff --git a/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild b/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild
deleted file mode 100644
index 9e8b2328c501..000000000000
--- a/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild
+++ /dev/null
@@ -1,47 +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 eutils
-
-DESCRIPTION="Python wrappers for lpsolve linear programming library"
-HOMEPAGE="http://lpsolve.sourceforge.net/5.5/Python.htm"
-SRC_URI="mirror://sourceforge/lpsolve/${PN}_${PV}_Python_source.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-mathematics/lpsolve"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN}_5.5/extra/Python/"
-
-PATCHES=( "${FILESDIR}"/${P}-setup.patch )
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples || die
-		mv ex*py examples || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" lpdemo.py || die
-}
-
-python_install_all() {
-	dodoc changes
-	use doc && dohtml Python.htm
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lp_solve/metadata.xml b/dev-python/lp_solve/metadata.xml
deleted file mode 100644
index 2486642d55bf..000000000000
--- a/dev-python/lp_solve/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-mathematics@gentoo.org</email>
-		<name>Gentoo Mathematics Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Python wrapper modules for the linear programming library lpsolve.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">lpsolve</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/lupy/Manifest b/dev-python/lupy/Manifest
deleted file mode 100644
index cf6e47b1d178..000000000000
--- a/dev-python/lupy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Lupy-0.2.1.tar.gz 52269 BLAKE2B 1b8e0410dc480a779dfcdc86f561f7d4c5322660c4e3623f2c6e702f64392b07257efbb6404af43ab627699e2d9aa61a4bc81cf279188e9f314064364ca4f343 SHA512 3ecfaced8ea8005e2fdb57f87546e9128eaf2174d27109b3e3ffbd32cf4f2dd23d2568eac7ff4b3f93a05f4efc19a6eb7f89811f1d6d1441e66f6f955184ff64
-EBUILD lupy-0.2.1-r2.ebuild 650 BLAKE2B 56e4a2118cc8566c0ea62d04fe106028e533caf26732b494f4985adf26e5bf41aa2c8cc660502970ff5b18f0f6b4cbd9e06bd208d3e8d7d979d8bd9109b21e8d SHA512 4c06c24d990f5de79fc2e1cbbcba8f1227e1092795c603087bd01c3477ad741dad9a9fb880b05cddc3439d3fb0d9332bcd810c22a23a0f7f68c584827387307c
-MISC metadata.xml 393 BLAKE2B 0dad276ad1da503c4fb0845012daa9d359dc47a4b554d1f062d7d0d02218ba90795ef82516b30b8745f4f4e0fb00d859361aa35998af640c40181c3ebf2c6a77 SHA512 23dc92c93c8270163b3bed19107e4f2fa30d96c5da86353c865dbca4fbccdf2a88969d1a498385774bd9efa96136137026da5e56931896fc10146c7bca9de751
diff --git a/dev-python/lupy/lupy-0.2.1-r2.ebuild b/dev-python/lupy/lupy-0.2.1-r2.ebuild
deleted file mode 100644
index c828e128b7ac..000000000000
--- a/dev-python/lupy/lupy-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,31 +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
-
-MY_PN="Lupy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Lupy is a is a full-text indexer and search engine written in Python"
-HOMEPAGE="https://pypi.org/project/Lupy/"
-SRC_URI="mirror://sourceforge/lupy/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ~s390 x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="changelog.txt releasenotes.txt"
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lupy/metadata.xml b/dev-python/lupy/metadata.xml
deleted file mode 100644
index d4dce3c126cb..000000000000
--- a/dev-python/lupy/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>lordvan@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lupy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 656aa9fa9767..7f44dc71fbf5 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -6,10 +6,10 @@ DIST lxml-4.3.4.tar.gz 2488557 BLAKE2B 5059ea45d3d833955636216a7c096322496882de4
 DIST lxml-4.4.0.tar.gz 939001 BLAKE2B 9fc473729286e98cd73e4b39d7acf22ccb957dd4b366924dc171a6c89c2e435a3dae771342eb3b143451b0550960cb821430de3e8f6470dc87e3a85efc389314 SHA512 23e7b5157a6520f3e1dab76b023e828a5afe9d0103e2d3ff8fd1a8791000ed8f859e26fe9809676b89d4ef9fa4b27a6f1662a2b0f54e5ae04776643f5b06c0c3
 DIST lxml-4.4.1.tar.gz 939355 BLAKE2B 0e9ebc894ebaa7994ee7ce1491683ff892ceac5dbae6bd90fd4d5ac04ec59d6c85edba37160a605c8c1b38119cdccdc8b97b62dc43f76705d7ebb595410c666c SHA512 08857f5e15d6b4badb8bea96fc7aaf3a02a504f9b87171e01c6ace25250d254691c64661dca8e723824cabac4753c59ffa667ac0b6042506b05e4357389e658c
 DIST lxml-4.4.2.tar.gz 940286 BLAKE2B 28366d1673b356f980cedc64839f070e8166906705bc948af24bba369153accc0a4cea0372e87530227be88a89a0dab4d23308b75fd695f55fdb73e6326aa03b SHA512 af6608df7e47513644b841ecb6291e655122927cb439bd2ae694fd344cf5dca621e3e1ce6b40accc6db9e0c4383b5b3e6c6f9ff19f35c4daf30f119a217113ca
-EBUILD lxml-4.2.5.ebuild 2353 BLAKE2B d55f666417be498640c5e3224fd9745bd00eb0da8fe5179ca398760d2075f6bf73052843e6e04e2afd7c2dd8aa3053c3fe3f172db6f26165a0dbec19b1006699 SHA512 072955757052fe5aa4d261c0e51563f2e4923d188f5e68e1ef216cb248597b56df90cd4a919c52b20207eb4f5aa3dd6f993c5a71319fb6ae187aea339c7052dc
-EBUILD lxml-4.3.3.ebuild 2443 BLAKE2B fa028529d2abec36bbdafe49918e4bb30aaa31f77c419cc6bb9f12713e46040d182671614bcd01c4ab60fa0c469bb823d1060734e4a3836410a421d4ef7c2c8d SHA512 ff75b9aafc904a8ec4b6306617fa32f7b928c6b6b8a170cf25ee0625b3335337fe5ff4902c8e663f6110b6def0ffa5ef30e4089c93522d9ea882ea755fba03de
-EBUILD lxml-4.3.4.ebuild 2454 BLAKE2B 3f222e378df513801962f4405d76a1ca1c9024dd2437933144f5931856636891c2044f29b15eb13da5777376905227a88566d652329e7a1c18e693b3e0d49e54 SHA512 73275c268e272719f8bcf083422c298f27c20b3516b13d066ba75023e43dfe8e3953775155be562e3627df0ff024e7d4195fcf9216fb262869ffc3c4412a1fe5
-EBUILD lxml-4.4.0.ebuild 2302 BLAKE2B c4f639087c3e3d6458c989238f11a8c163afb9aa00882c5581b68a3375c3d73f7441c3e0fdfa89f7469440316baa5a528517b9a0845e866b373134d93ed6edee SHA512 ad3955342b4b3bac0eb1bf938ee0980351a03214a1c71deff6a8830eb769d17470e4860b029f3f26c232b8bb2cb505459292b847e0e265e70544185babb6bd8d
-EBUILD lxml-4.4.1.ebuild 2304 BLAKE2B 987454bcff0b2383a915429195c64e6c1f33eefaddd19b4e5fc646991b3e5df8b9928fd5ae60eb1ecaeaf63a7aa106ce65f497cf41b5edba2b806719b6825662 SHA512 fc82baa0f984db6f43cbffbcfa09b115c91df050f3042ccb22a2bb2e52aac02bd2bddfda50ccb01375c2a0aacd0f4a8c27e8afd37eeda2d7bca4b0442d087d3e
-EBUILD lxml-4.4.2.ebuild 2352 BLAKE2B d4199978bcbe6ba823e8bfd5c8b81bff254ea62a839255cd1e5d1af366791e806822be8c38ad671be311f2b40b26ae3a85253237e5095271766ece3366cf2b4d SHA512 7ce64da44e7c6d501c2b5f0bcc5f51f6d6518a10bb264a5e951514079a1c64ec6fec541a749f45310b98c2485af81b1defa579d003b69554ea0045256175ac99
+EBUILD lxml-4.2.5.ebuild 2346 BLAKE2B 6ad6d208349c25945792d73976713927a0fd98c67cf00b449c8fd0d8cb8fdaccaa4c468c240ace642da05eb6aaccac82f91364bf0f96d7d11be6a442c1ffc5f9 SHA512 388046d56566d810a2067303aa7fd6fff906a02ee34040a80b8b78b3ec2b7e35a726320ae58ea3484e479266b4434051c4c0e5f90da4ecbe51ff5e2684d0a039
+EBUILD lxml-4.3.3.ebuild 2436 BLAKE2B 460b2b5ef5c294ed20998c3abfa888deacc8b69fe0dad701fbb5e67b454059b338bbeab8c8740c05f90b27270a4b1100c398d054131f3174d335be5d2045afed SHA512 20a9f899905c29ef32b0cede41098e8d1d6862005cd219114dbd3aecf7da1102b831a61bc4344a8c3bbb7fe2ff7c41e6455c0e0e86a0f377b5b18fa9e2bd454e
+EBUILD lxml-4.3.4.ebuild 2447 BLAKE2B b2cfc585bf18c585a7a5430e2d8cca6a4c6954333e71049190c24bd74f8cb2ace7feacddb1933846d00878f30e589c7e73ddfa6b054e828c6481e6c585b05d94 SHA512 69adfc23c9c70d2d3edc585259a5d2e85a11e5ca1f49e491ef7ab8ae85f6fbb292f56a5787839dd040e1474f7705b50a3bd166259e35d138c1d29e92fc2a56bb
+EBUILD lxml-4.4.0.ebuild 2295 BLAKE2B 79a13c6db76d78031ac8769d74ba8f835dbfeedf82ef7c2504906fde9736afecd22c48c96975cfb480b722b407810fd139f3f660fa714116acc3f17738b42c51 SHA512 e18818935cb9a3ea09dba9285decf17c27125e07d672068e74801165a4a2a0f2ab9a457dec4fe0762630791988862d935a145ee7c897c426dcb12927b1902e78
+EBUILD lxml-4.4.1.ebuild 2297 BLAKE2B d00bb97732a6c6a4831d51a142a1486948306c7ba46769b5adfa842d1a9d70fcebc65292c9351c04b0ce4a28cefdfddd18c69a6750682e15f53335ddd327d6c6 SHA512 4e649aa9ca4be5e8c998c4405862cbf685353e50c737d345ff272d835fdb62010ae7b04d7bff1d31ef8559efd1fd96ad65b2c3031d85261828ffbc76b06b69bd
+EBUILD lxml-4.4.2.ebuild 2347 BLAKE2B e8b2e916b01bfbbc99341c6ac1f2c62ca7d358d6474932da1a723228b32b948c58206e6e514c95c7f6cfc7660fe2dfb625127da6a0b5080c562cab6173e33758 SHA512 771b594ce84da482e4bb606b619828e5c74c5d8b6cc8a43a345ab9d2cdf27043c46840ecfd8648396d765af68a5b1c5fce7effc03ce6885965572b0b13e9e06f
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.2.5.ebuild b/dev-python/lxml/lxml-4.2.5.ebuild
index adc8e649fc0c..f2a02a829719 100644
--- a/dev-python/lxml/lxml-4.2.5.ebuild
+++ b/dev-python/lxml/lxml-4.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils toolchain-funcs
 
diff --git a/dev-python/lxml/lxml-4.3.3.ebuild b/dev-python/lxml/lxml-4.3.3.ebuild
index ff99e731288e..2e0cc643e642 100644
--- a/dev-python/lxml/lxml-4.3.3.ebuild
+++ b/dev-python/lxml/lxml-4.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils toolchain-funcs
 
diff --git a/dev-python/lxml/lxml-4.3.4.ebuild b/dev-python/lxml/lxml-4.3.4.ebuild
index b415e336a4f2..01eab585ebfd 100644
--- a/dev-python/lxml/lxml-4.3.4.ebuild
+++ b/dev-python/lxml/lxml-4.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils toolchain-funcs
 
diff --git a/dev-python/lxml/lxml-4.4.0.ebuild b/dev-python/lxml/lxml-4.4.0.ebuild
index 712977728290..d216231db4db 100644
--- a/dev-python/lxml/lxml-4.4.0.ebuild
+++ b/dev-python/lxml/lxml-4.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils toolchain-funcs
 
diff --git a/dev-python/lxml/lxml-4.4.1.ebuild b/dev-python/lxml/lxml-4.4.1.ebuild
index 2d1ba408e65b..73aa0d8537b8 100644
--- a/dev-python/lxml/lxml-4.4.1.ebuild
+++ b/dev-python/lxml/lxml-4.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1 eutils toolchain-funcs
 
diff --git a/dev-python/lxml/lxml-4.4.2.ebuild b/dev-python/lxml/lxml-4.4.2.ebuild
index 03335ffe1d8f..d8a372d79f7d 100644
--- a/dev-python/lxml/lxml-4.4.2.ebuild
+++ b/dev-python/lxml/lxml-4.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 eutils toolchain-funcs
 
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index 9332b5cf848d..94e2462d221a 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -2,7 +2,7 @@ AUX test.py 269 BLAKE2B d0b9ff664ca4a954cb8ebf227a1b1c80f1eff8a9bacaf1cebf2f359a
 DIST lz4-0.10.1.tar.gz 92068 BLAKE2B e581540036d1008c5efa008a1b980c1bd612bab94635b7a506e230921bd17c534fb99272e3ea09bc5be4faf09e0a8f701224c433df1615b4e708d620a23e1149 SHA512 538880742257e08b027c45c33aa29e12d7303826f63817d1f6d316ea9b69dfb20710a4f573499ce141cffd12fbac701305405521cb815e2329333934e7e1f2c9
 DIST lz4-0.8.2.tar.gz 30818 BLAKE2B ec51d733ebd33fcb00d3d3b634d11be39d92b14741a595139e23b5b067955a43ca325a0a655233a5ae3a62e18a1cf70cc21787d443703fc1a56ab7a765d5e2f4 SHA512 e516d5c3309f214fa422b040a0aacdda079395624dd4f5548ed7af637b1594012aac75b309cef260b41c10a623410f815fc089b54ca5d80955d5f2ead12841b1
 DIST lz4-2.1.6.tar.gz 129066 BLAKE2B 1a739c54946150441ddd4025b4ce8bf79a718d64a714ca5cfeaf8712c73fa88c47e1823a08ec7ad50acd31cba5bc10292f4c9e0905d8b5965b789944dd6eca9f SHA512 e37f9576f182adab263d8248e846c9f7d8a0260b2d2c5f94d74ebf3c2e51d91ba07d4bb0bf8a7560981a930fd380a2a3f5c4d21f4de5be3ae066d44a2246e9b5
-EBUILD lz4-0.10.1.ebuild 609 BLAKE2B b62ce5c9a558e340d63bb8ca290961405e08c9307a0f2c567822831829588354f2d91174e9e5cfc737e1ab3bc22b1cb41ab4886ad3fdc8cd1dfc43a65b81a7d8 SHA512 da2b8c98b64c938cd39ba67a679b227ad6947359c14a99efd528f1d082eaf52c130c73c57331a18892d2c86c17646b6d3fcc806e67fdb1f5747006b16613def7
-EBUILD lz4-0.8.2.ebuild 834 BLAKE2B 45d6c44a487db898b68b55b5b85b31472f2e6a66ba1c49f0563c19fcff6dda76dbae492f55a794fffaa08fc5631fbaeedf56902ea85db40772e6859ba0ff3757 SHA512 f45c42a3f5015ed9a8a1c40cd5e6a61455a3f34d301bfde06ae610fce410eb90efe5f1f417cd5786d9e66b7d65e20b39c23b0f4b952d8435eace5a0b7218323f
-EBUILD lz4-2.1.6.ebuild 565 BLAKE2B a6d3fce6568d91b5f71ed181554dbdc2eec90e8a160c245b83caf80bcdf9df1295417c7acd9beff3b072cd2a2a0087f808f9999d3771d8cedd1bbd21cd8219b8 SHA512 9f26c892c3cfa5bc91c3a9769ad12325772c6311cc214f22546996997daa7675d25356e7f9ea7614361ffbd10491db630e28dfb011a1539ce6f9ee80fdc3f1fc
+EBUILD lz4-0.10.1.ebuild 600 BLAKE2B befe97da696a9d0e9a636a4d6cd15b3358788f0320ec720a58e35f814b611c1349d807b8c143b74ff7965d2ceb40c3f04457afdeb6d4b2f8de934c2721bebab6 SHA512 b2dc07da46e577c86efd53066003ebf61490c5517c8db28eb0aedc25af51e43d8ab609f291b01c25de8425581a034d142663c37d2736565a0e288b9aaa61fa36
+EBUILD lz4-0.8.2.ebuild 825 BLAKE2B 72c6fca6761116d36396f3824d3a611a424d1c62275ff539f8f2ad52ba4b7d7961f176626031714723f0a6e64ac2f031f4b66270a5359dda2d6b1d1ecb8bf51a SHA512 b11c8d27a4d790e4db8aab784dcdf4479c2181a59ef46c2c9bbbfd6dc381e88705a3826df99e2efb52d38f585d3f4461b5cb701767288714e7c728132a9edd93
+EBUILD lz4-2.1.6.ebuild 556 BLAKE2B 55ad9e9f4a0341f4728e5b24c56ad95027a0aa5ce20aa6a0727ff3eae575c021b1ad47cd49ff10629aadefab520361e6a6d41fb64d7eac9feb753fe1ffd33a5c SHA512 27f6ab470f57bd18c45bd83661229a988a04bf0514e52b7be31f47987e554f1e92c11fcff995174f03f53b302ab73f784601a284c88d0fefb1a031be5d1d7603
 MISC metadata.xml 465 BLAKE2B 3eeb9b063e836d19b4ebfed81a89895f9d4e650b1788ca602f77f4cf3b5ad94cd6af93788293b9656baac1bce29a90a957c8d4afd02ee25b2aae42aefe211a37 SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91
diff --git a/dev-python/lz4/lz4-0.10.1.ebuild b/dev-python/lz4/lz4-0.10.1.ebuild
index 7692ea02b015..ab2f21869811 100644
--- a/dev-python/lz4/lz4-0.10.1.ebuild
+++ b/dev-python/lz4/lz4-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lz4/lz4-0.8.2.ebuild b/dev-python/lz4/lz4-0.8.2.ebuild
index 3c3494aa8946..340de7f78625 100644
--- a/dev-python/lz4/lz4-0.8.2.ebuild
+++ b/dev-python/lz4/lz4-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lz4/lz4-2.1.6.ebuild b/dev-python/lz4/lz4-2.1.6.ebuild
index 3e1188a0b8e8..e5a9bd7b8f30 100644
--- a/dev-python/lz4/lz4-2.1.6.ebuild
+++ b/dev-python/lz4/lz4-2.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index e1954386ccb7..52cfe856a7e6 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -2,6 +2,6 @@ AUX m2crypto-crossdev-0.31.0.patch 505 BLAKE2B 09adce189073dab0cf7e49ed2291ab2f1
 AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d
 DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989fa1554866582deb1968fd04605270e14cbfd280f64211c043c5d8cb77a09e6a8cec6824ab15416ab94366aa73d2a3 SHA512 9f3e2afda4b8ac14aa64a1534e446eb6895ec7182ce5b7ded8008178e01139d383561a87f8c9fb5fe4b9c257ba5c6b93339955eb9e2f7417cd3f4832c35c4598
 DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
-EBUILD m2crypto-0.31.0-r2.ebuild 1515 BLAKE2B 3cc2223d5714513962c326cd45bed685cac3f03e104ab47c287bcdffd726a11b528c91e7147f4d2156effdc4098e11d89464fb64aea397b452b6586b84f2abcf SHA512 8d0e4a5ec4b7f9302eae28c97622ea00f85f16290cc4b78a03682d476d13d0e73184bcdc0fa14e42249ff68f0b1decfb16454d7b2d1645792d19d84c7843dcc1
-EBUILD m2crypto-0.35.2.ebuild 1412 BLAKE2B 5c717244dc0242bfbd49297b7f82282010f469c8c37f65902a506e1edb0cf21eec9c5143278746ca7ab859f60a08c838e9aba1efbb9351d5e0bc892f8cf75525 SHA512 81fe16ace64b91bb73cbc3e1c07a3d887d69610dbfc3aaf6d2186261cdef61195334d8e8f6322bca2f1eb68c74e174f082254c608b03edb6e0a304adba5fe9f7
+EBUILD m2crypto-0.31.0-r2.ebuild 1515 BLAKE2B 03ed9034d0b22388c010360a76fc49b0965c2ef62006c21d622165dab106f92789fc0dc1bc570be35ab70e6369142d0d116b97c391cd06a097a2c8e04144929b SHA512 d079b369d5b08c56a7fca1c000b2bbae76721be470abf7cc5ec48b6b538cd54345cf52172de6fb56809031d2b266e30a4980ffb55ed9fba6a932c69e6957d4d2
+EBUILD m2crypto-0.35.2.ebuild 1412 BLAKE2B 99d5a8a7011e54d203ae8a1d71c3a909720bd69cbe68097a95e3e56c7fdb75c8780e9ad0504a07debd570e9d93b2c402550dbe6a56020365cea14e5a1a42b75b SHA512 7e09a092e644d8211474b1f42f4072dcf88fabcea6a483ccc8838a42c05819711aae5286a7ef4cdf8c0df73d6a24dec1f696638632910d33c8a5a381a1239f21
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
index c88a6032975d..65c6597d33e1 100644
--- a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5..7})
+PYTHON_COMPAT=( python2_7 python3_{6..7})
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-python/m2crypto/m2crypto-0.35.2.ebuild b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
index 86b019473876..81681dbea857 100644
--- a/dev-python/m2crypto/m2crypto-0.35.2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5..7})
+PYTHON_COMPAT=( python2_7 python3_{6..7})
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index dde23314e1eb..6fbd7e59286a 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -9,9 +9,9 @@ DIST m2r-0.1.14.tar.gz 15926 BLAKE2B 48d8961b6ebf66d494511f6bf755ae2d2de0740aa27
 DIST m2r-0.1.5.tar.gz 13202 BLAKE2B dcfc5ecdcb2c696c1eec8fe3eca4cd7e238f605c399b750286d9eb18ecbda9d80b608fb362a85959769253c5f5bca7e392ed5b61a7804b25cab5e7bfb5edf574 SHA512 78e9e8daa293b2466c95f0adad937fa0bbefaf0dd9663695bb916be13182633e0d462afa5331a595db424420485ef54bbfd4e0625962026fab4ce0c63104bc84
 DIST m2r-0.1.6.tar.gz 13615 BLAKE2B e0c98c059f5c569bf88a1f97bc1c8a912675f9c0e044175f4ecbf885b80019d62f5fe80579420af373ea3d62fffdcc62344d1035d901208719be1cfd56654a01 SHA512 3641cf4013f71fbd43d6cdad530cfd3e909c93709edfbd79d6a51e7121de68e279d3ec4eb7eed391a35902ffa467310bd6b020139b2024c3e80fa44e5f6cc4a7
 DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
-EBUILD m2r-0.1.12.ebuild 1233 BLAKE2B 1df89d1c533592882caacf2187b11cb00d813f98f5ee73be997ad9c95bf62f743224bf18732e0d24ee34320d199579904c902ff6e4a6612f21c6d4adf5507797 SHA512 b4888cdfc172824e878be384f69f100d4a910abe9c144abd44c7d823d88575ae6a41d5f7372a768ad539d4e7da4249f472dd146bd61d5a0298701ff944f0dacc
-EBUILD m2r-0.1.14.ebuild 1313 BLAKE2B 40434a2f4a0b8c14199e9330c62cd6a8ea23db778024750584254cb807ed40c7c6dda12a959c0995681cd45212964e9aac527d75186c796cc7fcebcc6ff3f904 SHA512 6021a1829e7c46b7cebd8b6f0047b6658c50fa4760fab036fd40e0565cefac9476e19fa4ecc03afd6dfa47dd29dc2272863cc86f399a8e7c0eec1d1cf294efa9
-EBUILD m2r-0.1.5.ebuild 1298 BLAKE2B 2e171f02cd62f3f5732baea4d69de49e308571eab0eb5710607fdd2f33d07a2cd4d50922d09533e1070c332acd0e3bf3584f0ce09158270c4f7db3fab545f589 SHA512 15c10db47fba3852fa6f1e85d83185d13514e44c3c0b2acc536620ef4d3f770885c84abf55bfb64b705a0fb26486d8ee5e7fa5c20101530f04fb2e58e9e144f3
-EBUILD m2r-0.1.6.ebuild 1320 BLAKE2B 23c95d08b415f8e810ca7f11134730d42b21ff8185ae84c780d93ae314bbb08c1bb189389e27553092fb3f3885a1410ff4857b3ae02ea20941586f8803ae497d SHA512 a42e411c75d356dd55c22c0437abc24d04bc3f82d721dfcc4f4886cad3eebdcd949d95bcfb8243d8950cf4c5697c46f890407ba4ef5a75d87917f6278b030fd4
-EBUILD m2r-0.2.1.ebuild 1428 BLAKE2B 25c397247fabc7da8a382b27f599ed63c08d08d7c1aece96c74e24db2a721a5da1404f851edca7826d42fdd399eac1621bf3c2162f35b5696b9d06039adcb795 SHA512 c97485536026b2c2808d46c6483c05a426344f97e8fa0856085770cb5c6c83c79bb2986bdb62f0197621374fea997c97c0c93d2f887230b7631e1ea1b0e132d4
+EBUILD m2r-0.1.12.ebuild 1224 BLAKE2B 4d86e3c367c2f504e00c3452bf0a12d804192cecc4c1ce74fb26d42855b2c4f454158da89ffabd65da761f6814984c77b66fbab8e74c3f8c4c04d270de1c68c0 SHA512 f79cb47a1eecac2e75a45f2984dabf61bf9594a25ad8f5dde5f54265a02dd813a303480596ead89f46f3a7e026d9e8d1404cc35b807ba908e1aadc975d3c3c3d
+EBUILD m2r-0.1.14.ebuild 1306 BLAKE2B 68348e610a98228a2569e38160ef7478dbb669c961cf57c81da1bade26fa17d5f8ca42844bf54df55b6651fadee82b5eb03e5a371e29d823a03e9026d2875561 SHA512 e9eef841274d2a72ba3aae3c6d11ccf8ae5c53d2af6f1b3e6e706649317f01cfcf36d28c85e8c4ebb33c36d62306e1751483771e7c8d946efa5ea7741ded70cf
+EBUILD m2r-0.1.5.ebuild 1289 BLAKE2B 2c37ab2b2c1fc58af1a839504465532e0579e098f0b8664fa732cbb71462d4c5a8b8cf7579534cffa8ba4e76b39d9dc60fcb621cb1873c4ffbfa903b391754a1 SHA512 ad1b5d8f87024725075b5e01aff044a8367c3b509dfee480cca2d3390b2c4e9158e5ff85711bcce89ab6fde606b4c742c97e4c51b2f7ae9ea7aac51d5245f0df
+EBUILD m2r-0.1.6.ebuild 1313 BLAKE2B b48013394657b4a3b84245943ec3552564213df94ba2f2e110409ba143beb7293132d0199cf865de64dc7252398c35c4f4f0b26ae689d2d54954c20e699a3ea8 SHA512 ba50196ff48945f8447cb470b2006870d4cdcfb0c7abe08561a07c79708f0216b7f643de79bd4a2b54f06e7c4c6b1df52b09f4cc0ca5408b4cd2b6cbf60f9929
+EBUILD m2r-0.2.1.ebuild 1423 BLAKE2B c1b4e056d8b8f2c837d13a7cdc7d5776ac99bfe9e17950f19ea5fe959be7b46b2cf313a04d59a0169e7683c97fd960951398da8d89da08547212b6f6d42493e2 SHA512 3e3f89382cdaf9fa71845f37ef38eac40d0dedb793559daa722709575c3d2a2e6ab15496c6ff18c28623d3a242ec51c5a6d502f2d5f9f2f811e0f0ae7d0b2142
 MISC metadata.xml 504 BLAKE2B 9e21e9256baae870dce5b60ba0f2c9feb5857c79f6ff81dbf10aafcb81d7886c18114155f2f825a6bdb7ab5b51f5e9f733ae4e8c799bbbb8c424c662cec85959 SHA512 551e5a6e90f257d5171995d6cb7ed7122e3820a787cb4acf177a9b0acc22810e71d432b8cd53667793c2e01e39edcb43540841e541737097231fe36b51eca7fd
diff --git a/dev-python/m2r/m2r-0.1.12.ebuild b/dev-python/m2r/m2r-0.1.12.ebuild
index 9b4497a9a8bf..7290a3e261a5 100644
--- a/dev-python/m2r/m2r-0.1.12.ebuild
+++ b/dev-python/m2r/m2r-0.1.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/m2r/m2r-0.1.14.ebuild b/dev-python/m2r/m2r-0.1.14.ebuild
index f991ed970198..4d5e26f0d33d 100644
--- a/dev-python/m2r/m2r-0.1.14.ebuild
+++ b/dev-python/m2r/m2r-0.1.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 
 inherit distutils-r1
 
diff --git a/dev-python/m2r/m2r-0.1.5.ebuild b/dev-python/m2r/m2r-0.1.5.ebuild
index 4d373ba9eb05..8c145d1d0fde 100644
--- a/dev-python/m2r/m2r-0.1.5.ebuild
+++ b/dev-python/m2r/m2r-0.1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/m2r/m2r-0.1.6.ebuild b/dev-python/m2r/m2r-0.1.6.ebuild
index d529b5edba46..bf9a610627ba 100644
--- a/dev-python/m2r/m2r-0.1.6.ebuild
+++ b/dev-python/m2r/m2r-0.1.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 
 inherit distutils-r1
 
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index 6abfa90133c4..e41606362361 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/m2secret/Manifest b/dev-python/m2secret/Manifest
deleted file mode 100644
index 2c60d261cfb6..000000000000
--- a/dev-python/m2secret/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST m2secret-0.1.1.tar.gz 5032 BLAKE2B 333998a24a4fde75d0ce6b58a23fa9cb4e1a08a195a46489a807700dbe7627aa426b0dfd94933d7469cb408011ec27c684d7d719935af712c00f3665c19356b5 SHA512 8fd66fdf9f255eedaeaeb514dc3af812358cdac2744cccfe65bfd0d85258c2b3ec851fd1972d1cd5604becfb8e54cd2b933bd9c0fb53e7317b03d7f09a8f16b7
-EBUILD m2secret-0.1.1-r1.ebuild 542 BLAKE2B fa372a8c812c9d70104d458e8d2a078edb2757f03299b7b5978f3a6d5e98192a2c7437e15a5ef5bc535aba614d7502edc03251acce88e37f4a46dba4a94e28ae SHA512 d49aa6343faa03fa186822a328f95b3aaecdb547b640b65fe4a548555f9855d63bff334487384dfc35f0f95dd081f0bcacc43db14dc0ab80355de059b44a491a
-MISC metadata.xml 311 BLAKE2B 4818413694f70fa0f0dbbcb35d0a2caa5006deee11383f95366929af1a834983f5253174b426fcff625f01a438a728f8794a8f6c57bb7a5c800b0b702de0682d SHA512 dc650b5a070aed296017ee094c3af8bfde5ad8c8afeb907292f12427ac3ab9229e0fe77875fc8390d89c8ab849ded17b3b8fa4e21bf1249e9af7a0a8fc9ac250
diff --git a/dev-python/m2secret/m2secret-0.1.1-r1.ebuild b/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
deleted file mode 100644
index 61a745150e74..000000000000
--- a/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,20 +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="Encryption and decryption module and CLI utility"
-HOMEPAGE="http://www.heikkitoivonen.net/m2secret https://pypi.org/project/m2secret/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=dev-python/m2crypto-0.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/m2secret/metadata.xml b/dev-python/m2secret/metadata.xml
deleted file mode 100644
index e5ab6e8d316c..000000000000
--- a/dev-python/m2secret/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">m2secret</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/mailmanclient/Manifest b/dev-python/mailmanclient/Manifest
index b7384aff7024..532abd013966 100644
--- a/dev-python/mailmanclient/Manifest
+++ b/dev-python/mailmanclient/Manifest
@@ -1,3 +1,3 @@
 DIST mailmanclient-3.1.1.tar.gz 101412 BLAKE2B fb25af8069c843c95b7afe597dbda1b26b065fb924361c7c6554d1b904d61a6b9056014a2f684148b31ad71ff5eba52694c3a1065878f9bef0f9b01ec740c848 SHA512 6f8f777796d7674348036ab96015c788ffc4740c771c993dc1d3b79871c69542a2b38792ef78092fd0adb78b9adcd51c7b90ddec25e0d4b2e4140e0389a27a97
-EBUILD mailmanclient-3.1.1.ebuild 547 BLAKE2B 4c8ce63ff7ebbbd6a9f026c2071f9637ef5474123174d63459e79c98e56ac637f8768a9829f92ab374aa82f00b56e31c6a7498afe8c74c9074f1ca6171f6d1a9 SHA512 1abbfad4d104c01a5abf49e9eb49491b9f896eddf497203adeaef760682c0e255352bd19e430f3120ee9b903b8d3eefc1bdedbf46cbfd143bf5eadfe8490e03f
+EBUILD mailmanclient-3.1.1.ebuild 528 BLAKE2B f3049031b9ef39bcbcac792a9ce8911ade915ff66d1f2366952a257cae3c67776732dcc731a4b1c2f1ca40e7e16b4657b55f4eeed2a256a94108b8befaba671d SHA512 0c3ea8c924b8d482ec6db10e6301c163b9cc6894e51482b7fd359edea66defd9b2caf91fdf7de00ae68a51b6b1e8d17adca181e14d52cd4d104953e3ded910bd
 MISC metadata.xml 437 BLAKE2B de7d92d5a777fdc7e374b124e54f90d3f33c9e85d4d47e8f9c4d00294d5af3bdb2db44d95a64beb0a8ac97016e34947f70e2d00653387828109dbe6747b5bc00 SHA512 a79a6a757bca74bf66d63ff77509ba05af0fb53b80507a81a29a1e9cef837851158674d22bbc01269adef8cdc4383977be0ab4b59bc5df8c120dd4ab3b589df8
diff --git a/dev-python/mailmanclient/mailmanclient-3.1.1.ebuild b/dev-python/mailmanclient/mailmanclient-3.1.1.ebuild
index cc0e8beb84c5..f4da7f30e60a 100644
--- a/dev-python/mailmanclient/mailmanclient-3.1.1.ebuild
+++ b/dev-python/mailmanclient/mailmanclient-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6)
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="mailmanclient -- python library for Mailman REST API"
diff --git a/dev-python/maintboot/Manifest b/dev-python/maintboot/Manifest
index be1c2aafbdba..bfcdc9eb6643 100644
--- a/dev-python/maintboot/Manifest
+++ b/dev-python/maintboot/Manifest
@@ -1,3 +1,3 @@
 DIST maintboot-0.1.0.tar.gz 2090 BLAKE2B e20c7f478b83de1eaa7c8abde5f7c308c58b41eb8b7a02b3896c7d050d3d54ec55bdc518648fb5c7187d3626bbbe0093f6a191ec7e9a29ffdf4497d0da50fe18 SHA512 dc63c59718a3c66a2128f36ad495c42d94bba08d6b16c40f470b0a0cc00388b5ec5977326ac258c858113e4d6c3f1ff246c5a1dfbd3d417aea181d381d7ae28f
-EBUILD maintboot-0.1.0.ebuild 405 BLAKE2B 9b111500cb8ca7c5786c4cf866a92411cae096bd2b99d06fa6c731ed3925ec50d04f66b4e99405e59198e1d61588ec317840d6b494fc182ec4265a034fe99bbb SHA512 9d011c77d0f08625ea0f2e4a4991c37fc7e86c62dcae4ab5fb823ee6a7dbc7f9232749acf461083ffe143d6131771989fa4400b9b7b1e100a75a90873d09ea61
+EBUILD maintboot-0.1.0.ebuild 401 BLAKE2B fdaf2fa356365912e2408309d70075c5410f7c57d13dcaaae4aae67ae6acdd2eb122bfd62f4dfacf2b0bd9b3ec03d36b3688e9abad33753903817c84468475d1 SHA512 80f6aea906f9940175dc8f02539bc1baca4d4e650cc7e068b1e82542584f9e9fc70ecc9be936a7158ef6a7b8d59061d5ee5fdef4f9ae1657ebd512fe4ecb9038
 MISC metadata.xml 244 BLAKE2B f5f1c229ff20b4c9f49e44fc9a759e8f94a79d5605031089006e5c196e877cdb074c10b5374d4087e72e86602a007388e2865ae7323bfb38b122a5fc6cc16caa SHA512 b0e08647af630e02531f47cabd502af365aa5f33e4152ca0944b73e8f627d2d473fd3ee8b0670d792854f4ee9feccb884d7dd9d33b921f881d5754f4e606d14a
diff --git a/dev-python/maintboot/maintboot-0.1.0.ebuild b/dev-python/maintboot/maintboot-0.1.0.ebuild
index 82f4edfdae4b..28f8e01bee89 100644
--- a/dev-python/maintboot/maintboot-0.1.0.ebuild
+++ b/dev-python/maintboot/maintboot-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 78f70e51885b..86c0f1f3be73 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -2,7 +2,9 @@ AUX pygments-exception.patch 1456 BLAKE2B a5cea58cab2dfbff872db7eda2a7753d69fcd0
 DIST Mako-1.0.3.tar.gz 565224 BLAKE2B 8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab64e3b3b9066ba7010db94d98c7e8e422e1f89a3ff326501eff8dd6129a1af97d131babcd00047b0db19c29 SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d
 DIST Mako-1.0.6.tar.gz 575112 BLAKE2B c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5 SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
 DIST Mako-1.0.7.tar.gz 564418 BLAKE2B c7ecad786213a8d3b77241955d5a825513f81bf66b705b6f54d6ff74a6513f7c8bacdc55fa8f21acb03e691900f45605da834a2b941bc65bddb177ce86dbe961 SHA512 d67af6788bf8603010361ce8b6d0355b0191657c07f3b5845f9d5e91653c3e349a7b35d5b36aa9c7f291973c83911ce94075e1cad78e6935d0ed4ee9c6e2a571
-EBUILD mako-1.0.3.ebuild 1430 BLAKE2B df896eecbc8fb947ec125970f956f76f79edc2e6dc5c0ed0648f87f0c578d1dedeb406b0972ad4f97299c725ff80d328d73c3a5e189db1b0f8d5a931cfb1878c SHA512 9c008dd1db194230734f5637e004133f673caa81682061396243c07189749a59566f56780e5dbe272b66fb7fdb14d84a12c7dc4565d81435bd1f5b496c6a0a30
-EBUILD mako-1.0.6.ebuild 1486 BLAKE2B cd0033a577553a01de9b38f555d0bbaba44bb289e4a4211fc8c70a1755dd29c1855f8da5de83ba7b003b96742a61b40b8097d4a069290969b5c33ca24f179ac9 SHA512 08c387c48dfc3cf0df79db16619d337599a279d30a1a7252e59953c1aae7a58c3ecdf54222c126acb2a8e86ec180af906c42855d75604edb8f2fd59b320ee8ec
-EBUILD mako-1.0.7.ebuild 1171 BLAKE2B 5abc74f77cafc583d5a43a8ee0addf0213e222fb5f09b55ee5d8235a59daa9e605a05688b9dd79638c66e0f19716f1d8f1b24306c2d7ad594f520476d4e1fc2a SHA512 c1131304e8ad11ad7c778d5401c5a760d3c4519ce6a3553a6aaf995d15c2bae8b790ed0e0d688acf9df5a0f8a921441601bc778946efc745386143727f9fb711
+DIST Mako-1.1.0.tar.gz 463945 BLAKE2B 31e5c3455f19756dfad6b61c71923c43ccb734aabffebaf3bbe853ab8a549ec11e6ee0b93f09b5dc30069f8969c8ec996143c0888b675bf1a72079fb2e478549 SHA512 acb0f53a22ae152c359c38391f508eca706efcc52916a6e87f2702517dd48b5ffd26eef0f2f9172046f1abd0aea1f47328354ff622938886aa00f950a261e8d4
+EBUILD mako-1.0.3.ebuild 1421 BLAKE2B 95d75e0d84b3e93fa95ae5116959c12a93f3c359891d4ed5af9ab93a093bf0954ee454522e35e8a622915ef0d52c9b96e13f2201bde4a3395d5160f896903ea2 SHA512 4a4da490d7ccf4458ac51a5027f3c451e815f27cdd83bed664f9210d297c51ba8acba45f23325a0c3eac5eb767ac7950c0c284add00185eb89d213f6724c2e6c
+EBUILD mako-1.0.6.ebuild 1477 BLAKE2B e153eb99dce290859c1be13ca54222cccf5d1a0db7d6b39abce2dfd95426179f5d0baf5a0a0ff239d5a064dc20453fa49f5e1f3b95ea2733d70a04153a025c21 SHA512 67f87c4fc1b87046905e1fc8a07e5f8745673ea3670c755fdf5bdc2ed9ee85acddc086a421d91fe91a8c9552048b14230079b6bf493198a436aec4e55c18cab7
+EBUILD mako-1.0.7.ebuild 1169 BLAKE2B 91e96e598344f4df7f8ba0656ea533250774a9f07b343813a4c780d66cc724ee72c077ab79706bb1a19afd8f359713b78244d2986fe83236d5060f2e99e80906 SHA512 a9b47ca8f19fc33e01e1009aa3afd4281ffb49d8e2a57aa8e48d67523408263ad82d3d0ae148ad7ce159e379b73e08f32707a7947646a8646fd78117a88c89fa
+EBUILD mako-1.1.0.ebuild 1170 BLAKE2B ec353a7ba7008ae87427f3cc290d549dcc3c2afcc124bfa776619fcdb604741b609d5bfa89d37c635dff9412fe265777bf86aca1f53e06ac2fb049bdb4f21f88 SHA512 f9048e1365ef4205a896b128c4afd621e362b37e8f9bd07b1c71bb04eb387d39a61d80971eb106987ebd710060fc1b6e8eb7cfce7b467f5ed365a498d3061680
 MISC metadata.xml 437 BLAKE2B 4dc2a160a2054ffe0bd59638a0170845b22d7eafeb77e94999ff239dac231e9b1a0c06b688da2c4699f73b99ae2c1306332cb0b5e91779da757bc048452c7c22 SHA512 ac01b2c4843ec9ab15f5b20677a003aa34fceeb2f1ad39a76e3782e077824f1d1103c831dd2f911ae5e64bb7530db2e87c2b1e5fde2fb77acf6d1df65f0e0b69
diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild
index b05167b27f9e..ae35fc28324e 100644
--- a/dev-python/mako/mako-1.0.3.ebuild
+++ b/dev-python/mako/mako-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 eutils versionator
 
diff --git a/dev-python/mako/mako-1.0.6.ebuild b/dev-python/mako/mako-1.0.6.ebuild
index d2734ef22bad..628b082b9e1c 100644
--- a/dev-python/mako/mako-1.0.6.ebuild
+++ b/dev-python/mako/mako-1.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 eutils versionator
 
diff --git a/dev-python/mako/mako-1.0.7.ebuild b/dev-python/mako/mako-1.0.7.ebuild
index 6b3548360afb..692dc1007f31 100644
--- a/dev-python/mako/mako-1.0.7.ebuild
+++ b/dev-python/mako/mako-1.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1 eutils
 
@@ -27,7 +27,7 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' pypy python2_7)
-		dev-python/pytest[${PYTHON_USEDEP}]
+		<dev-python/pytest-4[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/mako/mako-1.1.0.ebuild b/dev-python/mako/mako-1.1.0.ebuild
new file mode 100644
index 000000000000..c993bccace2a
--- /dev/null
+++ b/dev-python/mako/mako-1.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1 eutils
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' pypy python2_7)
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	rm -r doc/build || die
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "caching support" dev-python/beaker
+}
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index 3ad0e15b28e1..3f78531fd03c 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,3 +1,3 @@
 DIST mamba-0.8.6.tar.gz 10430 BLAKE2B f3629525cfe882adb040674852ed9e725332ab19525305efd42a0fa0a0a3ab20df7a257299df525149609858792c267219eb3caf761a6f15b7d3b2557d4e98a2 SHA512 f35396bcb607c2eb10caa99f4c82924b0c75c2eeddb3d18ed5db3d5e38dca41917c23f1fcd7003b596576436cea6a02f40c352e6a11f63e472144e0ae0575198
-EBUILD mamba-0.8.6.ebuild 927 BLAKE2B 4b733030988cf9f683a75cbf923caa4fc7577180f79ade859c0a1fd7b6f9689d1923f34c7b13338369b3693e1fc3e6e9ac229bfd7e9957f4a48783ec38cfefd8 SHA512 cc1a9bdf92531eb8e9e25d578e5f07a8ff4b223f54a1e2052148d1d08dda1409a342c1e8b04801c241b9400c9bbc24f9ee48a59d84a98ab879af09812d2f219e
+EBUILD mamba-0.8.6.ebuild 923 BLAKE2B 1992356862ad7f2946897e18cf0a1138b69db157339861e27b9ecc86ff3884abf6f940d55d871dbdc860fc584611dc8786f0ccdc1fa5a339f48ff5e7d9cb7b9a SHA512 d6cfc35bed1547ff9b3b78fb1b21d221a3066f61d2e000ee67e8717b39ec49f542a83f969e6290cddc18779f0f081db03a1f4bfd8238da059a589b5aee5a7f12
 MISC metadata.xml 299 BLAKE2B 921f7b7d5add4e7decb67da81d15bc1382bb3c51125d99342a9d8229fbf4cb0336ac13623290d0977ee9db821565bde14a1a5d9769dd5e2b89e333efc2a44d54 SHA512 ea6d9b306c3a8691697cea16a1582c8b5a36b54977534e4937feedc34bb62f4006d57227df48e878174aaaee03229d272bd940f23cc5e831cfbe79b05d827f93
diff --git a/dev-python/mamba/mamba-0.8.6.ebuild b/dev-python/mamba/mamba-0.8.6.ebuild
index e43ab93a9bd2..e12a951613b2 100644
--- a/dev-python/mamba/mamba-0.8.6.ebuild
+++ b/dev-python/mamba/mamba-0.8.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mando/Manifest b/dev-python/mando/Manifest
index 62c54277408a..b614cb3e2ea4 100644
--- a/dev-python/mando/Manifest
+++ b/dev-python/mando/Manifest
@@ -1,3 +1,3 @@
 DIST mando-0.3.2.tar.gz 22393 BLAKE2B bf6a7df4a6e2e8270d0b8fa278cde7d520bf5c9d490dec748927d8f7c024381094f946e5feb4b5334b0d7255df002aeb1b42b8545b7514194425e37f739d2da9 SHA512 57f5041ad175c4eca4c158d9d917dcb1f9c25978c60aa0e76322d0395b0edbc3fb7b062da7b9af871a97bbd46cfe7f81e634287f813baf15ef134be53150bd11
-EBUILD mando-0.3.2.ebuild 948 BLAKE2B 75bb9f9781fcce85c51515ba04a3a74ae26e6457deedfb6bbab6085296718dead7ed648996caf60ef6695823608f4f6a2f91bf3d3a4be4d2380bccf947cb96cb SHA512 17303a8342b0ced9934100e36f60d5ed364cce65e3e87a99350c2270780f0655a09d3291f0e7e48984501e71fdb98986a0b392ed501c651ed9ee12a4eef84b28
+EBUILD mando-0.3.2.ebuild 944 BLAKE2B 7c32dc0ede0643be1667ae3872d208868dea65eaa9821112f804fdc7a13494cbc23def84f2427348eed67933238755656d0881af051fa3655fe21e0cd4df225d SHA512 c5d8d95ef395ecbcf90c2cfcdfd18892372ff5e44dc4dc79daa7458053e09b25fb90cd448fbd4142c5efcf836b0c278c70ad7955030a6545af44978d7e7e50f3
 MISC metadata.xml 241 BLAKE2B cbc5b40c8cc94046b0c3f22ff09d1d4808cbb26026213495d792da8c605df005a5670fd55586aee9ec26e66862695768683dce22127e5af344ea529302b4cd31 SHA512 3ac90d64a94a1c32453b3fe9e3fbde47602aa1257f1a15bb08e8d5c1abf779eef08378376ab4910904a672fc66b1b36f781f1ab144eea0be3c1d36f35ea6337c
diff --git a/dev-python/mando/mando-0.3.2.ebuild b/dev-python/mando/mando-0.3.2.ebuild
index 3878fbeedf7c..9e7b1e439a9d 100644
--- a/dev-python/mando/mando-0.3.2.ebuild
+++ b/dev-python/mando/mando-0.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index da854aa19b5c..3cbac41a785c 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,6 +1,6 @@
 AUX manuel-1.8.0-rm_zope_test.patch 3693 BLAKE2B 444261de258ddc0a24aa2eaf517385712da421c6a8dc322c45e6bc980a87e10c22b6f10285d1d4352ae3542999d53f2bffc71b833d7bd9181b8708b2fde957cd SHA512 47dbc28c5d66895c764997de7a5c04aefd92de6aac6094f8184de849f906e5a1650e2c483868bf5ce77e7d81893f51410a19d7d38f732b4e0a1e54bb728836e9
 DIST manuel-1.8.0.tar.gz 207600 BLAKE2B f7bad36491d49254c7aea17550cbd4fa00b6c3c122061586785da4bddc514f51a2d5a8df3b048fe78c7b01036ca903330ea614c998fdd04d1e8cca002930c962 SHA512 8099df44cfd28c8ac6256f346bf8cd36091893a38d3c297099866b1a5db97286b9c9e69f3f12054d7eee9ae3985ca0a003d7b2cc082d28d59850bbcad6b57c57
 DIST manuel-1.9.0.tar.gz 39640 BLAKE2B 1b699b92816297fee13a65ed2c4fc9ee3683f8e47e7fbf06178c97167ae29cabcedc48edec48b053f725889b39111b3634f0305ac651b5674292d046434fd134 SHA512 519b0fd1bd7ef3414dec69f721a6f1265603d28e3b61681acf46e9fba6fdc66efb6c0a82d814af8348bb7c07c3c4c299ae94ea7d6415436592ac37fccaacf18a
-EBUILD manuel-1.8.0.ebuild 725 BLAKE2B 384219e9ac038cf2af9206c7e09da1a2c354ae8319b1b660da0879302651e3a15251aa11e28d494067f4e6cf63064171b70194a88e6c5a6cc758a2ac5b3c5cf0 SHA512 1b8ab4392d9f1b1f3ea34e80af393a8854b441c5f35adb5fcecb6cdb88c60cacd903d58e86db0d26426671d0ae2c3f2fa9dd2ad0ffd655d1656ab8ec2e3cb69f
-EBUILD manuel-1.9.0.ebuild 730 BLAKE2B e0487c4ab749cfcce0bc78ac590e71d657c2b24ff111da99796c128532fcec0680765a10f0cc64b918b7e79df3c745bdd9752340594c47f016d34ea330a14695 SHA512 324a3d4ac36a48de8bbf3f494ada21062e7e77597bbc8559405ae695841b607af8b5a81d4612fbbdbda3000a8297d267deb758e0f41c039c5291b7544457fb23
+EBUILD manuel-1.8.0.ebuild 716 BLAKE2B be6d90e327787adc1a3e29b39154cafbf8af4ac703bc09c14175afdcc6847c614281854f7e0084b8cfb4cfd8ab75f1559f4091912432913b313c5507c8d1b6f8 SHA512 648c70b7f4a11ec8c1f4e03f9c6b53fd58c33dd51be1f39e8c0c74c95fabf93d555dd3b078f3cb0e09a528a0d088cb3bceb66a62af8a155090aaf20204726fff
+EBUILD manuel-1.9.0.ebuild 725 BLAKE2B fa6f9958260ec0301224533f562d3f46348d5f71072ccd0d09516c1fe7a63946255358a78a60fa832f80bbed1cd950abad9978ec6bf0aba1f199bedc66307d62 SHA512 0bae71ca9a4b33106560003cc93766881ef7a3ce78c43109a27d29f89a81abd4b6c7ebc76d97bbad79b75a9f5007fdefc39e652aa55943b4b041ae1946078900
 MISC metadata.xml 378 BLAKE2B a015eb99ca98c46e7636f0203ad982b5e60687e7a753548f05dba16c968d42ce355e786be237a66180e7d6834cbd1a2c273113604274e4e0c1befd92c35e2668 SHA512 a90d635b0d109936cb39e2b016464e6c6220ff02b6d6f640d30045782ffb85bccc9e408119897947b11d8fa234451820bef9bd1f49264dc72c7b0ebe36f1edac
diff --git a/dev-python/manuel/manuel-1.8.0.ebuild b/dev-python/manuel/manuel-1.8.0.ebuild
index 11c471888edc..e4ca4e9630a4 100644
--- a/dev-python/manuel/manuel-1.8.0.ebuild
+++ b/dev-python/manuel/manuel-1.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/manuel/manuel-1.9.0.ebuild b/dev-python/manuel/manuel-1.9.0.ebuild
index 7883f8135473..888269e9711e 100644
--- a/dev-python/manuel/manuel-1.9.0.ebuild
+++ b/dev-python/manuel/manuel-1.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 60b3ba68fe29..c9b42f9b8488 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,14 +1,8 @@
 AUX markdown-2.6.8-dont-build-docs-default.patch 387 BLAKE2B d3ecf07d57d8aae13ecb686ac289d4938ec8e50d643020ccac13b147a5b018a75b32f10ead2dc2bedba309ab6ae3107346ff43155959fdf3e1053e0a9fa13cb8 SHA512 71f7534ce557e061c4f09b9a78aa05fd1e3f16f44c55d5597fa4901c0349f7ec7d0093eab655950812e2cab6d607377d2a15a6583009cb90ae32659c6949cfff
-DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
-DIST Markdown-2.6.5.tar.gz 301781 BLAKE2B 527a84bc8c4a891e64749bce273bf10c439376386c27355f386de8a0dd89e2bf0c1d6cadb0ff937fa3825655ab6220901f7b17ea2d184f3b3d178cbb54af58b8 SHA512 d966136a7184ada4eec70af661aba441694a8c4f59e57d59a28dfbc1649ca1e90cc1e4a29b354b3caf35362e1e0c96eeb3f46c68f82d7a898b76c08866d459d3
 DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23
-DIST Markdown-2.6.9.tar.gz 271564 BLAKE2B 792e438955a55de9f473107618516d17129caa4d02097d510992d25715a4f28aae005781b3a2e4fe53692bc12e96ab49008b66ff49247bf1685bac4c7607e0b6 SHA512 d00c800dc7c1ae0753cbcddd755ade7d593a8d9c9d4ffc6eb8765233a44027a75b68948c14b4469d7aa0e7f74029e9f60159d81ed40b3d2e770c68a81533ccfa
 DIST Markdown-3.0.1.tar.gz 284084 BLAKE2B 6a9250295057ed32b389e1aeecf9aa3acac37ef48e6ca93a4821eb56a2323d65c1aed99799bf05811f27f45ba61f7bb704f69c6d2be706d8d2764c026e937905 SHA512 c648c1b8ecb3c907ff2bd636ec6c08b4b629967fb916913f77db641f6d61b83d16929af2f15f5695c8cdb9614031606110e02a7e0bbb3aab0be38a8e285f12f1
 DIST Markdown-3.1.1.tar.gz 294136 BLAKE2B 9fd024f64f7aaa774a49f60e312e47bbc2ff0f368f083e4dfd0c38d1f12839dfcf3455f1d0c8cb0b9c851fe0d3a779c70784859f1682703bd6022d57b6548235 SHA512 78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090
-EBUILD markdown-2.6.11.ebuild 1250 BLAKE2B f67f1cc8f0b5f1ab3b4723bc0c3edffe0a0fdaee841246fa3e9a3f13e01a7b648e8f93156cc46669ba34967538a6c58add01c4d394f64180843362bd325651db SHA512 7ab62fde080f4dfc755e1e8b47260e37b8356b77938d28975cbd26af6d15c9f5aded823fd158ac5d2423d5d40c64dfc77bc8f23e96e6b1a6c66d043479499a8d
-EBUILD markdown-2.6.5.ebuild 1380 BLAKE2B 237b1c6f28be273255fdea13f8f3fc09e6bd5700fcd5e3743cf483e3f1a73d040eb586d0b9c6471c573b2d9d06c646d36f1069a98b4a94a094af0e9a77861079 SHA512 6977bd5dc03a29f748e423608ae724374a34087ad8aa421b6b9d19490364ba0640133e7f8a03d60032fe2b258d1b020db9eff17ac3878c91482bc9e28726be79
-EBUILD markdown-2.6.8.ebuild 1428 BLAKE2B fb55ed094b3fc22146c791273435115a43bf6b0a78437d0c4e8e3ccdfacee5ba7b624af883dc8bcf0086dd2be2f59d45d46aa61cfddb5f027b67993811893237 SHA512 1dbf6688efc17fc815666cbb011682cc54d5e96710d2129adf3177e584e9fcabd16000644187931bff16003e4696e3a3c1354e87a0f189dee012cf469f2d616e
-EBUILD markdown-2.6.9.ebuild 1439 BLAKE2B ec47f70c832d30749a2ea03d591af416b6aebc7326e8ef682081ca01025500b7af45a9044082faeb7be699ba2e5e0061db8b8701ef2b91d701d050fd70eee509 SHA512 3c7c87f20e42ba11ff4440fbb83451cfcd662840c2c41dc017b227bebf780779e6af5e382ea8377536ba63e3e7617d0574fc65e692335a66162af071a05928f2
-EBUILD markdown-3.0.1.ebuild 1262 BLAKE2B 033be5d2c3b603bc81a8fa633108533dfb3c1cf2b1389a28a52644e58c09fba2d7b8564629b4608e86d346136a33b19bdbd892d2bf679378d0afd9e74a9e360f SHA512 51e8ce7102b1b118c6fb7897f46ff5baf405b6baea069432f2eaaf67fc6e9ef65ff9355aa6ff00541078962bd3335e09b4d9aae362e6e8a7a805cf8251f3cc34
-EBUILD markdown-3.1.1.ebuild 1124 BLAKE2B b3a5c71c9511af8b1e79f11136f769f5ffb515b0d5bcaeaee0fd2907111e05847a409ca497b06f3bdd0f8f2f3a5e9f1a9c4f3c3392fc5c9bbe4f4c150d708620 SHA512 392d4997104816dd1449f0b8215f904467f84106ea821d62f840ad637fba4999a5b1946182ffb750fbd235d7abf148228a473087a992d3f137f94909dc22c471
+EBUILD markdown-2.6.8.ebuild 1419 BLAKE2B 02d27ff9042b56e48c3976d107ecf17b1aa95e0bf89bea5be51ff84bcc2e657f13d95d10fe16c9f3b10d2d59e259dc6eea8550e05fc50971df893e525a233dd7 SHA512 03f0120e59c1b85d1ce5b6c7aace325db1eebdfb4db7ea0074e831272541c55a266aa1bb776da059b3d2d0c3777011bbc515e8b85b2b628f3f8499dfc7da0c01
+EBUILD markdown-3.0.1.ebuild 1255 BLAKE2B eed1c97845e9f0e7ec2cbac1b3f4fae6a9bf6b251b89d8a3719f1f21e6d8b95111e0f794be9b3a6e4281c96717777e5c3da5017aacbf9afd0100ea444ef5dc12 SHA512 b3f214ed031041f107501568559f9f7346699d84ec19333aae5414c3da22d8cd344b880c60aa5c0004558ce69cde2865229eb5d3fb1e5708c81d5c09a4e4d640
+EBUILD markdown-3.1.1.ebuild 1117 BLAKE2B cef94d8dab72d492639db8188bb162aa056f13361e613a76858d5eef0f61a87d469f402954748563183c0c9f3590ae1ef5d95af71658f92ec505012ec7730579 SHA512 ff0ffe3ec30b4aef45bd3a39b360b46dda2e41bee859ce4c89ca1155c0686205bb6bf773a64c666554c06e6a40bd796ce4728eee5404ad08bd24a117e6652a44
 MISC metadata.xml 465 BLAKE2B 8eadaf9d2733b1b3d93a389b0009652eecc3a0c3b6347ada4f27d99bd69b0de1be199eb1da7854655b8814a946f40a711e8fc092b22b214c18dc696dd3c0222a SHA512 4c9a52b62e49040fde94cc2d3d9edf88c42d085639d893fb81d119b8c216100f912e2725a1bbb31b1136b505ef8102f560989289da5aadc6c8f433f0186da44c
diff --git a/dev-python/markdown/markdown-2.6.11.ebuild b/dev-python/markdown/markdown-2.6.11.ebuild
deleted file mode 100644
index 9f7bc8d4e6e7..000000000000
--- a/dev-python/markdown/markdown-2.6.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test pygments"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-	)"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P^}"
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_docs
-		HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-		# remove .txt files
-		find "${BUILD_DIR}"/docs -name '*.txt' -delete || die
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/markdown/markdown-2.6.5.ebuild b/dev-python/markdown/markdown-2.6.5.ebuild
deleted file mode 100644
index bebdd22bef89..000000000000
--- a/dev-python/markdown/markdown-2.6.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Markdown"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test pygments"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-	)"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_docs
-}
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}" || die
-	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	# make use doc do a doc build
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
index 6ba2f125fa43..e2dda6be9feb 100644
--- a/dev-python/markdown/markdown-2.6.8.ebuild
+++ b/dev-python/markdown/markdown-2.6.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markdown/markdown-2.6.9.ebuild b/dev-python/markdown/markdown-2.6.9.ebuild
deleted file mode 100644
index 581f8a969817..000000000000
--- a/dev-python/markdown/markdown-2.6.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test pygments"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-	)"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	# build system always builds docs
-	"${FILESDIR}"/${PN}-2.6.8-dont-build-docs-default.patch
-)
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_docs
-		HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-		# remove .txt files
-		find "${BUILD_DIR}"/docs -name '*.txt' -delete || die
-	fi
-}
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}" || die
-	"${EPYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown/markdown-3.0.1.ebuild b/dev-python/markdown/markdown-3.0.1.ebuild
index 3ed7c9e474a8..745535a5cb0f 100644
--- a/dev-python/markdown/markdown-3.0.1.ebuild
+++ b/dev-python/markdown/markdown-3.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markdown/markdown-3.1.1.ebuild b/dev-python/markdown/markdown-3.1.1.ebuild
index 5a6a5103b140..cdd938ab4244 100644
--- a/dev-python/markdown/markdown-3.1.1.ebuild
+++ b/dev-python/markdown/markdown-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index e4530625641f..50933df9ba92 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,3 +1,3 @@
 DIST markdown2-2.3.0.zip 145194 BLAKE2B ef6e5744b6d9c9c8de20ac2d17ea0fc13453dd6401ab0c8d6d258f6a19aec4e94cfdfef28cbef7ef4b4bf6133a0acb55a1d8a76a41ac621498117c39b1fc1a6e SHA512 48bf8e26b34c48c0c12fc0f110b09d3232ea3394db3325d50639adf5cefb603344ee97b116e09b574f7c7414ab4a8293ddc37ca6706e41baaa14e399fa467d5f
-EBUILD markdown2-2.3.0.ebuild 695 BLAKE2B c2920f4b8e27f3d838ac4e300415c9a0af2c2aa958675d45831cf8c0c10d63346bb5151b52e3dea0d9799f9654299ec6973e1a368f600d7bb06460dd48b3bb6b SHA512 f1dc301117a7af52cfd93f580b626c2f1890283bd30c2b84f8210f01821183971cf85fbf549bcff2ec1fd52fa304619f4b2c7827a9b6e400df03c613b69c5ad5
+EBUILD markdown2-2.3.0.ebuild 686 BLAKE2B f1cfa82acac2035411be3f7aef72affb367a9c8793afadf332f2b77c24fca2459e0a1d4214f8bdd40c26fcac536e9daa579161d1fb7acc8ecdca83958a64db8b SHA512 4e1a6b79bc08637ba3602eb09cd8d812671b36910c5264a1ccef7366f6e35880078c9603688cdad5d3828deffe1976a2c4ee17b54e57914336ef16df3a295277
 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
index 9eee6fb6b43c..96a0f7370cf9 100644
--- a/dev-python/markdown2/markdown2-2.3.0.ebuild
+++ b/dev-python/markdown2/markdown2-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index 5cca4ae246e7..62165c1b9722 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,3 +1,3 @@
 DIST Markups-3.0.0.tar.gz 16966 BLAKE2B 9245b1b0056bda9538fabf8540ddc41f2861a41c2ea42f29da195393bb85a63af1273109cb8f3d15ee4b257774512e3002d95948bab4a4493d89e18d687f19ce SHA512 3dfb97f29e801fa296e7ea22f2693d05fe9a9bfdf6c9b560cf6a44d04abfb6c2ac0717093732b6fbd9ea052ab9f8d054b3aae10a0c16516af3815ca1d720aef5
-EBUILD markups-3.0.0.ebuild 798 BLAKE2B 89235cae6a1b11e2ed8378e77ed306d08257969b560ffe15d81912ee5d72fd45916c70756839e9fec5623fc824eb752e64aba130fba8df4446fdf249fd624755 SHA512 f1ee2a6b558d78d3767548a91631fc668eaedd113b7c42dd8210a6408b242fed35c7282dc68bbad8f30dfd7525c6c20991277b84fcc95b3657d1455f7b07043d
+EBUILD markups-3.0.0.ebuild 796 BLAKE2B 3319db8fdba0f385bc3522fe3059e6e33e50525bccd6589b904057c8c5754a4d202666a4317e6f498df2c566a055996f36f11738fd2d5c0e69dc62747747ac4a SHA512 f0a29debc1bd4ce4f076d77f97f39254b5c5aa734db45c8fd078bccd19ddbc52a9a375ed4beed4aaae8e27ce77736623e2110814c404dadbcdd4cf0907b01322
 MISC metadata.xml 625 BLAKE2B e700717385a02ed240f11bbbebfabf215d6bbff574ea2876035e300111490f0f477be1cab1224157413eba57f6ed4f84a166c2c241110b35db284c07818d64f7 SHA512 acf3002c22de1375c1a03e0a84765e52cca93b4ad1c6a57ee7f73e7e1616551dc3d6f61dcd1a8d9f31671d6779e19ec19041691bbb7eec6eecc0b66a280de9c5
diff --git a/dev-python/markups/markups-3.0.0.ebuild b/dev-python/markups/markups-3.0.0.ebuild
index 9795d43f9fd8..d827187546c2 100644
--- a/dev-python/markups/markups-3.0.0.ebuild
+++ b/dev-python/markups/markups-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 8ca7bdd7595b..3de6cf69675f 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,7 +1,7 @@
 DIST MarkupSafe-0.23.tar.gz 13416 BLAKE2B f8ce67bab421447b201592bafce6a7ce58a827199ae45c585489165641c82dd3684810381654d3ac1325adaef3499665461d814cabf795eed9ed1dbb04632a52 SHA512 4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28
 DIST MarkupSafe-1.0.tar.gz 14356 BLAKE2B d1ceeef939f4d4c31b871d8d1bbd78c72d72ff2e8c7109c9ab2b202e4b8272db25bc13210cfe2f442dbe2073963ec41f5924e4df9dc93a45ebe85fe9f0d9f12b SHA512 7437a02cb1b9c1d6d6c20b13d394f24a1cd1cb8c743f832d8b1cbb6ab8846f70f54d924dd693423b33c4d592e772983ae38fd4a35961e233457c48bd3584ecb8
 DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
-EBUILD markupsafe-0.23.ebuild 901 BLAKE2B dd936d1e006f04bcab3810ff6520e65a167e86cffa0ed4ce2f2699a4c111bc2412cb0b05fdce8963928fa4afe44466f6b67301641aed54f3953d0cf2b007e6d8 SHA512 1f3c3c51c12c63ac13250c90c0fa1dff36c234277af143427d6ddd98b381be3a4c07330d5fd54bccd19127e51eb94515e375eebac7bf74edcabd7bc1cc131eb6
-EBUILD markupsafe-1.0.ebuild 765 BLAKE2B 034eae4deb0fc69a88772c8425ed444b2b0684e6955daf547f659aff4d703b4f44d5a3d2c3555a47bcac99615f22824bd9793f919bcde6f1c408888d25cb1083 SHA512 451a9fc1551da4867d1f32b2099db24f55a5773e70a54fb68fd8bbfbfdfbc177cacb290bf9c691b0ac0fa6bb92c871581a20c45c084954d19b1c38ceb877e42d
-EBUILD markupsafe-1.1.1.ebuild 715 BLAKE2B a9d86a2f390e118c9fd9e9bc247dfb89b4bcb7b564be6119bd9ef237f72422af9c606614a25d99dc0ee5d30fa44ff2bd57a3a1df8b1be0954d31d0deab80b323 SHA512 8ee08c2a7d434e2104bc573b75cacb0fb986b046afc0b12eba1387060b0b486e03790f14062e4c29fc7a9679346fdd1b0288ac01d7350bb71632ca829b2f230d
+EBUILD markupsafe-0.23.ebuild 892 BLAKE2B 904534d5bbc956c16e52500891ccc4feaa3c04211f7e711e326ef97add62d9f91537f430232907e097abd5567da6b8110340a0c1c11e6d95085bf3b741ff7877 SHA512 3c4c0492b86a02b689c0206ad5697dc7f87335ecbc92964c586350a5b4e39e0de8bd899eff69972d6212bbf4622a66611a58f3e405e2446b815dad6c262cc47e
+EBUILD markupsafe-1.0.ebuild 760 BLAKE2B e809a2a2f01b9f4f146bfb0db84a496137cdd72a34e82697e410d28c9325d740b2cae6cb45b30fa0fcde73c1b600c2715943ae6934b06c6ad5ce0c2c6527437f SHA512 6849ae7565b3d4df42953b519ee71bb87bf72ec3dc58753e9734154980686a441ac2be498a3a779777b921b03f7f81e739616fab842808f725d973066e600e7f
+EBUILD markupsafe-1.1.1.ebuild 710 BLAKE2B f1c4bcf55d56f4605d9b10695d14d017df8161947029b17bdafbb488a2cab23d20bd73e869538571f6332696f31d1af6457ffd52c0d9f4fe8fec32bccec9c3d2 SHA512 371b3ede55b9a2d55c7589ac10ab1cc3a15f43895362dbc757b3b3ceba5527add0d5a5398ec77d64671a9f8b267358e7bed1de5ee87570f098b24f3bb3694a97
 MISC metadata.xml 313 BLAKE2B d83629ec355bdf3a33ec1987d8826509f6485ef34a873a6db1122c72beff76de648c5f80da70f2102e60532d852462e13826f714b6ae263d65d5c81bb9aa63e9 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d
diff --git a/dev-python/markupsafe/markupsafe-0.23.ebuild b/dev-python/markupsafe/markupsafe-0.23.ebuild
index 292cbac28c02..733c989eff2b 100644
--- a/dev-python/markupsafe/markupsafe-0.23.ebuild
+++ b/dev-python/markupsafe/markupsafe-0.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markupsafe/markupsafe-1.0.ebuild b/dev-python/markupsafe/markupsafe-1.0.ebuild
index dd1c62d7e9da..eee52348d0b0 100644
--- a/dev-python/markupsafe/markupsafe-1.0.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markupsafe/markupsafe-1.1.1.ebuild b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
index 91c12bdd8194..a11fce70cb5c 100644
--- a/dev-python/markupsafe/markupsafe-1.1.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index c61c7dc03d0b..63d0c2816cfe 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,7 +1,7 @@
 DIST marshmallow-2.20.2.tar.gz 152437 BLAKE2B 0d31537051c45bad52d922439d1cb9d69fc4a4bc2767d6a13bfe32a9edc978cadf9b1c508ae51532f5661291f32ed4b7c5e54f5fcd092eb4ebd7d3045521e9b8 SHA512 05511aafa978377152ea8ea1b70dd5558782bf634df5ae52453bfa65c7ec9270a12cd7a32e11872808a3289cfab2ef0380e129e84878511872e7cc95b0792453
 DIST marshmallow-2.20.5.tar.gz 152733 BLAKE2B ba509624e3715ace53eeb1a835f533172d676b3645ae3226c6da3727dafef7084bde896f3a66459112d599e3e422d600d150934313b813fea9d819658ce3b4bf SHA512 a02b6a3341d2cd08174937112eba2f69a07de59054a088eef64ac12703699e2b6f561ce76ebc0cb43334056f02f3898098bb0d3501ae8a1b6350f9a168eb3355
 DIST marshmallow-3.0.1.tar.gz 168186 BLAKE2B 6c89fed45c144a855c692bee39390e1c80b2977274acb704095e76567e6ed00643704473f95abac7fabb4c1d1d96b90cb9a6fe3a127a09a0d2a4c72c02358baf SHA512 085a7e9b265bb86232222e4decb32fa172d62bca3ba3c5303f12715be1b0ab6553b1978e28db520a6a7a25778915c770ac83c607bdebf5e4d26746cd69f2d555
-EBUILD marshmallow-2.20.2.ebuild 897 BLAKE2B 2d03ffc90f25b536777c5b4e38d2aadf1b8971b0eaeba06c3f2ed42add8b47c0c6e1ec8071e678cfda1ee73674dc860419890d2522a7cd8be6d6e0b7570f61c0 SHA512 f5ea20eb80e69fe8429971d319849e6f079db53d2b51f569189531ffc8a064bed95d3c5b5f916f142d01f1af2fe9c5cafdbf8df251508e5cbb9f94552d5365b1
-EBUILD marshmallow-2.20.5.ebuild 897 BLAKE2B 2d03ffc90f25b536777c5b4e38d2aadf1b8971b0eaeba06c3f2ed42add8b47c0c6e1ec8071e678cfda1ee73674dc860419890d2522a7cd8be6d6e0b7570f61c0 SHA512 f5ea20eb80e69fe8429971d319849e6f079db53d2b51f569189531ffc8a064bed95d3c5b5f916f142d01f1af2fe9c5cafdbf8df251508e5cbb9f94552d5365b1
-EBUILD marshmallow-3.0.1.ebuild 813 BLAKE2B 588504a5d93e0147d36d23a2316c2f03c7ea0bba93996f3b87d9544491972aa05fe65d547f1bd8f54b350b98909b599e6cecca4415fa2ee30942002d461fc1c2 SHA512 60a97f7e5db00eddb532494f7eb9174b4c64e293cd108be1d9af8c52edef31c514427086e8d6d87775584647ab722810267cf2391f44357898e565ffe4069a1e
+EBUILD marshmallow-2.20.2.ebuild 895 BLAKE2B eb1c2758a0615bd52a3c50b13b7a48852082b383d74bbb2040f284ea7d6410bbc213078a1755c02feb8dfe122f8ec3fe5e5090f74e20b0cb76e7f14d0ad0a961 SHA512 48237020c44d787e53cd21ae19bd30642b2e7e7220b2e0b0f32f96c08c6c91eadc7db685cdd2a2ebeb093cbe5243c20d1f26a96eb410e060c5e9b2b3f3da65af
+EBUILD marshmallow-2.20.5.ebuild 895 BLAKE2B eb1c2758a0615bd52a3c50b13b7a48852082b383d74bbb2040f284ea7d6410bbc213078a1755c02feb8dfe122f8ec3fe5e5090f74e20b0cb76e7f14d0ad0a961 SHA512 48237020c44d787e53cd21ae19bd30642b2e7e7220b2e0b0f32f96c08c6c91eadc7db685cdd2a2ebeb093cbe5243c20d1f26a96eb410e060c5e9b2b3f3da65af
+EBUILD marshmallow-3.0.1.ebuild 811 BLAKE2B ce18096d54522a444509ee6c3297545abad50c1267b84b7edc4588029edbc491d2b42185c8bf73c3daa019679ea4e14b81ffd4547a704361ee11b2553e02a1fd SHA512 22be298964d6bf17f48ac236676418db97c40d6a1725089c155857dbaa6b55e413167ddfb80d06c852d5f10f14fbaa374d166b3aa8e60d43eb131c8c3dd9f044
 MISC metadata.xml 360 BLAKE2B ed1f62630b417aaefbfc1ce52c275f16187a1fac9ee46e7172c4b703452329b64de253eed111bde2e7bcb4b85e7806d8423fd5d80899f93b23e7c3da61030a2d SHA512 51665fe5adb03e70bb1582f393b95783c9e4956c24f664c09d08017663bc8373b07080c142f714fd4c93381cbd5c55bec2b58ca412df6aa55980f9a61abebc54
diff --git a/dev-python/marshmallow/marshmallow-2.20.2.ebuild b/dev-python/marshmallow/marshmallow-2.20.2.ebuild
index a9acebf6251e..d1a97915e2c2 100644
--- a/dev-python/marshmallow/marshmallow-2.20.2.ebuild
+++ b/dev-python/marshmallow/marshmallow-2.20.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/marshmallow/marshmallow-2.20.5.ebuild b/dev-python/marshmallow/marshmallow-2.20.5.ebuild
index a9acebf6251e..d1a97915e2c2 100644
--- a/dev-python/marshmallow/marshmallow-2.20.5.ebuild
+++ b/dev-python/marshmallow/marshmallow-2.20.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/marshmallow/marshmallow-3.0.1.ebuild b/dev-python/marshmallow/marshmallow-3.0.1.ebuild
index 7421ff3b53a4..0310d0cfc11e 100644
--- a/dev-python/marshmallow/marshmallow-3.0.1.ebuild
+++ b/dev-python/marshmallow/marshmallow-3.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(  python3_{5,6,7} )
+PYTHON_COMPAT=(  python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index cedce2fdce20..7ec8aa84ad45 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -3,6 +3,6 @@ AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe
 AUX matplotlib-2.2.4-no-jqueryui-download.patch 708 BLAKE2B 8ad1b3cef23a5bf1dbaaff22367ecc09608945244852552bc22f86ae6350d4683821f4b2d7d9fd76c0e701724e17508c99fda0205d420ed21c35164533bd3dd6 SHA512 8d783f6978403737ea65741a71e0c4ca7e428297504c11351f38616d01ebf60428eb993585f27c5d39dc607bb76e146b4e642bc295fc18ce3008e868a9cc6b5a
 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
 DIST matplotlib-2.2.4.tar.gz 36974286 BLAKE2B 9c4c69163a23ff02107ee155f72e142dcf31ba965f6a20f468b96f3f4b70b95ff6caade6b14bcbacd5b231848d2000ce6af9f113feefb41d6e186725349490d3 SHA512 968f5731b8a9a2c5575403c60d5b0a98a452b33094e520be44f4d901f892d082babc8fc1d73c519e1ff2baf756f3cb7652f4b796e166d66dfda31f7e50c58139
-EBUILD matplotlib-2.2.2-r1.ebuild 6372 BLAKE2B 3bbe545c33f7c3d3178391b279f9839ba2eb1ab6d95c5cb23a7e3e064ce9f9eb5f77a262fbf37b16fb7ab2d2c73cfdd4d6f5c06338ac88f9f9213b79a0d94062 SHA512 b568a6f1e78e8aef3905f284d10e86ce2b0addb1b6bd6fd5c382ec0cdd52b065664122f8d96f24609ef89a5abb040ee03758b0f04fda02ecc9f59c6f5613b0e8
-EBUILD matplotlib-2.2.4.ebuild 6424 BLAKE2B 01e66b48f3d7544483ab259d361bffe6013a81742b628abe625bb46dd1ded264ceb62600027afa35f6ed5ddc8a582b52e78c790b778bf520490ef784c67fd3ff SHA512 65207d1c820102cde14a83f70f6fbf616ca1a8c9407c9aa4d2c24a542ec27b4787cd2d583cde29715da3bbefb96b8a083f88af7daff9a5d31997af888c1d9a83
+EBUILD matplotlib-2.2.2-r1.ebuild 6370 BLAKE2B fab5c042e14172c077f62ed4ae9a44800e2d779fd8119a4bc16d343b6702976b8e3e94f9f5b2884e11cd0cf7cafe37cb11418c5c97e5c9be4b1c4e581b5b7972 SHA512 3a618bb2718901cdd4be90679fa248d20e595b32d631f414e3c63c35ff98c58897d0167a0fb11c150808fe44f6cd5641c7bfceb933ad4c09c2d92984fb7e8d28
+EBUILD matplotlib-2.2.4.ebuild 6444 BLAKE2B 5cd558b7df2f7972c37129967a0ed65a084b950be6b4859167c9bf2e23ea28963d441ec6144540c2635782282bd8036d3605a15134894b06b5b7e3424052834e SHA512 f9edb7250a6fb868a24609f107a07ecd8f2f27a8cb5637229dc5fe9e716b5fa6d9b33ae01e01877f31cd8d58251f7af893119fd2ab02be8aec5930d272309d20
 MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
index f80b95e2cc53..a4c0390e0f30 100644
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
diff --git a/dev-python/matplotlib/matplotlib-2.2.4.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
index 97f38a4d86b3..738f51416fb1 100644
--- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
@@ -210,7 +210,8 @@ python_configure() {
 }
 
 wrap_setup() {
-	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
 	unset DISPLAY
 	"$@"
 }
diff --git a/dev-python/matplotlib2tikz/Manifest b/dev-python/matplotlib2tikz/Manifest
index 8a69de7ca236..a485916a23f8 100644
--- a/dev-python/matplotlib2tikz/Manifest
+++ b/dev-python/matplotlib2tikz/Manifest
@@ -1,3 +1,3 @@
 DIST matplotlib2tikz-0.6.18.tar.gz 527262 BLAKE2B 370a1e088a17a98afd29e1e465c93b98b10100c85a277be3130f5c39bc236a9efab9241f9edffdbd430f9645cba4ff00ebda73dddeda024e3f545b21e548e786 SHA512 e12db2dd54a2145e1d66e19158c8a9305243beea60add0559959d801d319c43a28aa779048764d2adf29f878f7ccca9b2363bbc5034135a9d9002a8815fe37ab
-EBUILD matplotlib2tikz-0.6.18.ebuild 912 BLAKE2B d38e4a04bd078353ea6dbf4f395bbe4a181249921b185297a164acf4e7afe3155a27fabfca6d580364589be1d13cd8d611045d5084d8933e5db5cdfbf1d2585b SHA512 b54c7eb2314807f6d805088329b9c83c59a2b79d1f3c1591c87a033436e5a02ce7161580ecb3efe91986dc0cfc94bbf87329a217704458430d808e3c840b0036
+EBUILD matplotlib2tikz-0.6.18.ebuild 898 BLAKE2B 39413afd4bf2a926cf71437672d214affdc06364da34a81521fca78b76fac508ea3d6a2da460eddae468c6cdcf0beada46f07331f59218510808fca7cbfa6f12 SHA512 bea4ba378f9ba09827b6f3b396464a90c84a7ad9e386694d59ec3d466a70bb0c9b2b2addccdcb5c2ff53ae47533737b65a86ce4800229e58168c10bbbd7d9f39
 MISC metadata.xml 861 BLAKE2B 3a77e5f5055cca84ac21709c19a530ad3e6cd33b4b76b55516c8df06236fe6e5d3eca2847aeeaef836ccfad3c2e90a4e391670215957a03b73cc943dd324dc47 SHA512 7d654d1c7d3370364278b9c4722f4c1233203dd0196f6ca7a4fabf4ea0f7708dac8b105ef26ab6b3574cfa5c019f2f6574a10afe0cf42702a4b1d26c931b7c2c
diff --git a/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.18.ebuild b/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.18.ebuild
index f6d69ccc4c0c..f0038878e87f 100644
--- a/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.18.ebuild
+++ b/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/matterhook/Manifest b/dev-python/matterhook/Manifest
index 1cc4e9b4e9b6..3da820ede68a 100644
--- a/dev-python/matterhook/Manifest
+++ b/dev-python/matterhook/Manifest
@@ -1,3 +1,3 @@
 DIST matterhook-0.1.tar.gz 3150 BLAKE2B 841b64875d3ecc55c5056a15e07e8c46ac13ec48f1fd2752ec0c3934608172c8970cc4ad6ce984e227bef811aaee9ca2fc352afbf4e4925a6930adf798edbdd3 SHA512 1c9d264fb80b7d6d746f8379c869903e80f0b4a134efb3ca571630fdbe53eb7b1ac244470f7c2f8229cfe54e7597594427e253f35f0b103fc4c4123a935c5193
-EBUILD matterhook-0.1.ebuild 502 BLAKE2B e3906bdfbcd5e82bddfc928dc5853ffe03a5510d7d50fa31d66355ad6bf95b011ed1e375b0ec4a7da82a27cc2fce2a5dd91c56bbbbf139a6aad81880ff8df74e SHA512 5f5d664a4fb1ffbc3a8e6dbeb6d82ae960e8d8aa2e8bf33736bfd2e4060e2c0e5250f13f5cbbfddd2fae0296b19fcb647716530b76674eb4380bc1fa80b32af8
+EBUILD matterhook-0.1.ebuild 488 BLAKE2B 6a1b674be15e7e5f3f9af63d754230d144cf7101d845f15ae7d188eb8333b41848a49d7fc4d3d7ec95e579dd8e2fee835f2c4f6793392686b464720e877a1c3e SHA512 21c65b7dee596d26e2e6fa85352348757a391c96ebd6228c1ed74551cc1192ed0ef4febea9d54dad93dcc3df4935f10b76ff63a555cc8dc1c3c3a8d95f363cee
 MISC metadata.xml 396 BLAKE2B a84608bf32f99fd1c3faef21d8a51036c90305a163f853d10f184f2026bf1a4c4ab89f101c7fd2b2092d9dbd95d5e29679b35728d324d2599b12d13dc2c29b2e SHA512 48e423bbe4c3e3f6fbd8d77ea5024c6a0e56e62b00c49551c05bd6312b59dbccaa3517729707909e8e2f0ebde5c46517dad7a48e8144e2eb0710b95ad136b663
diff --git a/dev-python/matterhook/matterhook-0.1.ebuild b/dev-python/matterhook/matterhook-0.1.ebuild
index 995009a04ffe..94091ef9c7c2 100644
--- a/dev-python/matterhook/matterhook-0.1.ebuild
+++ b/dev-python/matterhook/matterhook-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index b882b6fcae80..097231c32d31 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,6 +1,6 @@
 DIST mccabe-0.2.1.tar.gz 5031 BLAKE2B 6f52106337ed534933de0c98fc103cfe209bddb30623a3b710681f4f0615a964c4d0472d4dc56f1ea4e60dda695eee540f9f9b441111808684f09fc8207b69d0 SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
-EBUILD mccabe-0.2.1.ebuild 555 BLAKE2B b5a4d9cba729e2e709bb9209bece5819d8bfe06b9598e595bedfdc87689b5ee6c44d6ea63f79354feceb63516c73ada16380a319458e656d6f4559e8ded784a5 SHA512 81ff3036e4cb3a68c680a6e8e7354f7de10557e1cdc8940b0bb7ea8511a2a5fe66b0ed330a1134257ee328799d81d73a028e9b5528a5d69b4ddf553808d4f089
-EBUILD mccabe-0.6.1-r1.ebuild 785 BLAKE2B 928bb30568bb5eee7e1c87dae0bc8c5fd07b386037c0f012eb808b099bcf7be0674096f49ad402aad17467e07ffe7b594242d50b2e1ebda3ce35b793b3787dcc SHA512 f204c15365a5960629d9abec28efd2e7d96a4520a84def4addf3e5836bbd89448e4049672378c9b2be67f43b4881354a876f301dedb27464e1bbbcf4f648ccb6
-EBUILD mccabe-0.6.1.ebuild 900 BLAKE2B 12be9967d4867f9ff2a857070b87d476f1bd428efc820741b85d2ccce34595760035a4b1d973c29a726850587d47a67a71d8660cc6237e73837075915c5e27d7 SHA512 89e8831e0112327964e6f130c871705a86f4cc38b74edecfdeacd4017445430b831ffc70d828c9e262f6a0916082c2d65fcd5b2ec73433d7cd6fbfdb499c53b9
+EBUILD mccabe-0.2.1.ebuild 553 BLAKE2B f8aacf5e1a03296460969fc561e53a0c9bf9c9eb19a82bda3896ba2caa732b1591db065fe4c4f44f6c5ec53337366eb7c1dc95a6e5f79f334d994aa55ead64a4 SHA512 98efe4f155722c8b42de40d0716c6409708f7678c65d056cf0f7a06c0eeb03e9bf2b047aba3886ed14b7ed292e66581d52d6624fdc034e0d863c147f2d590267
+EBUILD mccabe-0.6.1-r1.ebuild 780 BLAKE2B d3d569131b8328d66978b051c7ca693c175e4346a7ba38fe0f3d7fc6f51ee0900c29a77a8e5e4aa2f2907fbcb2028a17777b18c7279b639ae91f08835746e8ac SHA512 c52c1ef1411d61727d2912edbd4dbc4475bdd58744afe95f0d4f31381ac1fc0b4451204356e95386f86fbf6da5e0e13a42e8f682bfbd87b4dc5be3bf1aaa6aa7
+EBUILD mccabe-0.6.1.ebuild 895 BLAKE2B 1be1bef24dc9c1a95cc75a6cd6c58f7c59538cd2bddb082784e73ee87086d62b4b14343cded8650efef4c10756ce0c60b0ecec8a1e9d2245b24a568a9083c140 SHA512 92e89b96575daa51b872cbbbb8b208ebeae88eb36a1fc3c2b21d9a5ef5a6f80f4390e4efad4d8013287b7a807a7660e7b7677f5e29dc4c4f21285db0fcc34b6c
 MISC metadata.xml 373 BLAKE2B 0a0d03ce9752401f11326bd24a760ee9f18b792e6d6cb6f229513eff68f35acc943dde6b9b842a508e7bd7344c13e1b8d74b38ef1ef1401823ee106573502412 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1
diff --git a/dev-python/mccabe/mccabe-0.2.1.ebuild b/dev-python/mccabe/mccabe-0.2.1.ebuild
index cd8230f90c78..31b75349c164 100644
--- a/dev-python/mccabe/mccabe-0.2.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
index 64afb0078e4e..f43eb98d69ce 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mccabe/mccabe-0.6.1.ebuild b/dev-python/mccabe/mccabe-0.6.1.ebuild
index eb1adbc06a18..baa33a53602e 100644
--- a/dev-python/mccabe/mccabe-0.6.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mecab-python/Manifest b/dev-python/mecab-python/Manifest
index 8a5526bb0319..4d07df743d71 100644
--- a/dev-python/mecab-python/Manifest
+++ b/dev-python/mecab-python/Manifest
@@ -1,4 +1,4 @@
 AUX mecab-python-python3.patch 253 BLAKE2B 979ef7ea020bfb405faa366a2b87a42d5c5e03e6b49b04ffc4ac0586e4e09912e6afe333072a47d676c4c3e7829ae336e61c402da280b6fffca80fc89323c00f SHA512 7937766e44c014149c64a3ad4226110f83868df330e5c0b22b65ce4624d3e6b710db972e18d446e535a76e0b0c763b2245d50280567e1ceebed15bd20c351695
 DIST mecab-python-0.996.tar.gz 62338 BLAKE2B d2f8749bf4ea0b30b9f7ee68a4210a3af600803296197f48091d1c9fe90f5baaff3eb94ecb3aa04d994771512c1ef5b68a62e0a045da95992bffd1710725e832 SHA512 08954ed801419fd7f65d055244227364bc37b063f8d21babb6ceeb02ca40e0146fa4401d1426255f3656ac1a5e51439bde981414613153dca5972f624289447e
-EBUILD mecab-python-0.996.ebuild 614 BLAKE2B 0fafc1ba1b5a582b04be058f79ba9410847dfefc19fc7889319af0a89fc894925c9097482928a0fb49518c37e4309df7d1c9c6c6f5509c8d7772ed843efd34d9 SHA512 f5bc2ee2764a92b24afc33d322e0348bacea2caa74a7f3976bdfd363cbf957e760a4a6f948c3affb51b364d47b505820e8ae2cdb2630c59c46ecf528176d56e9
+EBUILD mecab-python-0.996.ebuild 604 BLAKE2B 1630d779c0aef86a070c69346b01a2d7362784c615a67dc60b410c6566c4c59d381b1592c4eeff7d5cf683eacce14b6cac876b7dba572ba74a371fb99ca9663b SHA512 0a07dffb0ff471f2cd56804fd094c2eaf7b68b9971aae854cf2fb9626638832894de8a8503ce61a2fbd7e8b6fa76989784cbdf1c1fec3e19980e716dc4ccc319
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/dev-python/mecab-python/mecab-python-0.996.ebuild b/dev-python/mecab-python/mecab-python-0.996.ebuild
index 16801ddb4c55..55d37f73ff77 100644
--- a/dev-python/mecab-python/mecab-python-0.996.ebuild
+++ b/dev-python/mecab-python/mecab-python-0.996.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index 4bfa813e5cac..6c1ae31818a2 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -1,5 +1,7 @@
 DIST mechanize-0.2.5.tar.gz 383918 BLAKE2B c9951f47067798861de0f153e02985c8d00fb4070960993f2ea1c32ee52d6c937af51cd6e3d291273877da0bb9bee2106b92d3518b180ebfd74eafc764136a10 SHA512 23de1d9a5fba63d76fd577889594dacf5412fb2fccb58908a10ab350a81dd16a7a31019d0b4a59a5ed4115320c7e3585c77eef88dcd80a88a9c3c2da3c28fa68
 DIST mechanize-0.3.6.tar.gz 201845 BLAKE2B be2abf0e573ca41c0b9a8f0632be4d630a4c122cdd6402209619367a01629768fb2b4eb55164f1f511f1549444c015942bcfde2a075514748fbfd56149240dcd SHA512 bc838d826dd8b08f699d4788fae8962746dbc266d892b34eff2f11b16a28ff22357d011fa1b177e813e4d879b36cd83f464173297ba58208a6ba37f9f2f130be
-EBUILD mechanize-0.2.5-r1.ebuild 971 BLAKE2B 302ed76423b10f92a54d567b6a74a58007e4733488bdad23f55db57fa016747b1893b148c0ab06de8dc4cdd00ab4007c571e0611c36bce7df83fc73c49c7cfae SHA512 0c4fb7e5169996ce133d9ceaec506553799b69137f358376d8ac9e059ffd61b52e5aae6cc7fd671eb0ff4b8ae9d4928f47c3e407e03ae2eb35e895d56820fa5b
-EBUILD mechanize-0.3.6.ebuild 609 BLAKE2B 420433466d7a125387409663f6a1c853c427af6bca39228d690818af5100dffdb416f7b110facb2b8257480354b4f7d10cfb91bbd0259012f244931220ab6e07 SHA512 b889f86f12d9e61cd290322d29019cccfedf4b76508c3a39ea131255aa298009a46b921826c1d010be86c03fcc6463f0cf5a7f9381111aae9c0a1c521b9185d9
+DIST mechanize-0.4.5.tar.gz 216908 BLAKE2B 67951ad8295a32799768b3719525d45d502bc773c6f2a5e762e3dae97f309c8c265a2cb3efde95c9e8cb65e89dee6ad6ad8585685baa4e9ff1acfd146f115f6f SHA512 51706d5c073501d02fb7395eda30625ed9191324f948073c7d1589df0e507d8b7641ca514ceff55e7d82e899ba6e10c55507c79668976c7654ff0004671d09d2
+EBUILD mechanize-0.2.5-r1.ebuild 963 BLAKE2B 4ad873d77808f0232ed9022b392ccfed72db011cee01d83cebc8dc333dbeb99f91ddad318beffbd09d36126cce101125433c7efb787a5790bbfa45cf09825cb8 SHA512 ef12df29934d67ba964b0aca913ba60e2daed4330d7c9c012cd0e98eda025c56fd74859b260587c2d488f5c533a87b7ec9180931bad5c3849e08c6cfa817dad1
+EBUILD mechanize-0.3.6.ebuild 604 BLAKE2B 6444a86331b410eff5e8dd4c0b9d6b3068820bd9fd1f8fa103ff0195fa9654f5ad6860042d893b632998776093394b68693df241b7137bcbcc50dc5623637b90 SHA512 0a6c1de6830e9bf3c58948b5437af6f3152cb0a056814f323b81eb8c1076642c9814a508d5168655b54dc139afe7e6a5f43076b9d5b5683a87e255c1be5103cb
+EBUILD mechanize-0.4.5.ebuild 630 BLAKE2B 76432d9931b460ea26b5d18545eb605f640d09ee1f31c43ac2ba5c36f5d6662b8f5a31ceabecda09f6a00d9fe54f0da5b662180b3a7aa1665cf82e714b8d9e5d SHA512 b7c48eba852b214af43bafefc5cec4609ca193db0a26b4bb4411bf741fd64efaa8b60c1d5b2e6f472850e34543b19743517a0075ab5af5b8fa666bb892301152
 MISC metadata.xml 959 BLAKE2B 7e3bc231d201f4b49561f1594301f1d2663744d4a5da0e9f277f2434f80eef016e98e5317016f3e330b1f8daa6a4559db6207720888b99dbb9634c605bcc0472 SHA512 37015b73d1166a75a206306eea97957f23cee6f558bafe54b18c99b7b70b966569a87e9d70466ed50393c1968aa1f7dd884cdf98bd401f274d1e6510d927afa8
diff --git a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
index 34eb574b0ce5..283c628975a9 100644
--- a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
+++ b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mechanize/mechanize-0.3.6.ebuild b/dev-python/mechanize/mechanize-0.3.6.ebuild
index b3264b93851b..93d90fa6bf68 100644
--- a/dev-python/mechanize/mechanize-0.3.6.ebuild
+++ b/dev-python/mechanize/mechanize-0.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mechanize/mechanize-0.4.5.ebuild b/dev-python/mechanize/mechanize-0.4.5.ebuild
new file mode 100644
index 000000000000..f3b42df6b85d
--- /dev/null
+++ b/dev-python/mechanize/mechanize-0.4.5.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=( python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Stateful programmatic web browsing in Python"
+HOMEPAGE="https://github.com/python-mechanize/mechanize"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( BSD ZPL )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+DEPEND=">=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${PYTHON}" run_tests.py || die
+}
diff --git a/dev-python/mediafile/Manifest b/dev-python/mediafile/Manifest
index b913791baade..5834413a17ff 100644
--- a/dev-python/mediafile/Manifest
+++ b/dev-python/mediafile/Manifest
@@ -1,3 +1,3 @@
 DIST mediafile-0.2.0.tar.gz 509689 BLAKE2B f79da210a74d55c4709b6fbf08a0675f445001ec49d042fc4a1101def07068bebccb155e770c5cbe8d051d7f101a213e9fcefbcb9590a650de99cfde837a965c SHA512 0fa79f77e0ac9a021b569e78f0edbe8cc63308ad8c89526d8e15dee455a284cb90d29b51aa476287e306717315c3cff290634fc6e4ac0b1726163dd922ee3b0d
-EBUILD mediafile-0.2.0.ebuild 983 BLAKE2B b5ce325c08dc481be49c2c6be29dcdccaa45c0f76d4451b54dbe0ab947e8610795160054e6ff01a14ade89335076e338fffcfa7a7ddc035a8a247cfa63bb7328 SHA512 80b8568065a40236b155346c9e53a9eb574cc9fbdb8a3e984a146e03afef1ee794929ef76f2ad729fd0409926615e013949f7611f37b8260ce3c2c00bf5ee137
+EBUILD mediafile-0.2.0.ebuild 981 BLAKE2B 8ff43c3b8a6ca86eb34b567f8fd06760c5c10ee6189c7f35b7625569ee25e30f41cc5d80bb399e1275172762b579869ff59af6676189cce04256fd09b478ddc7 SHA512 ed45b8af622a2744e3baa9f048eae6c3cf8de732097ca133cef00dd8bf40a4a93f4ee1d1a1bcc6cbe27235009b95ef493616ef6b07709cd82e8548b72a25c2cb
 MISC metadata.xml 751 BLAKE2B bea4069bfed083e2dcb984ec3feae35e0f0acf8402f51dd794a53b677e62ed258dea3f299fa508ebdc2b8fd9890b1c95ad6388f52b884ca5c207874f911ee311 SHA512 aa1afae32b7aa50149aa1f11f5a753f8881ad4f083589908f3f48566c1fa1c3de7cde9e90cf385d27c06a41792c2751c3a0dcec5cb13a839b8cab1c748fb9143
diff --git a/dev-python/mediafile/mediafile-0.2.0.ebuild b/dev-python/mediafile/mediafile-0.2.0.ebuild
index 3d5e8e1fd598..d7bb592f915a 100644
--- a/dev-python/mediafile/mediafile-0.2.0.ebuild
+++ b/dev-python/mediafile/mediafile-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Read and write audio files' tags in Python"
diff --git a/dev-python/medusa/Manifest b/dev-python/medusa/Manifest
index 3dac1613096f..ea05b648b6f7 100644
--- a/dev-python/medusa/Manifest
+++ b/dev-python/medusa/Manifest
@@ -1,3 +1,3 @@
 DIST medusa-0.5.4.tar.gz 107744 BLAKE2B 13050a97887d6dac4ddf561b109880fae9eb4f2e1462ed92a4963724580821190d94c3d9086dcf2b4656551d9f6e1f9d6d3dd6d501923cb25ff1f68257f6a985 SHA512 9b28c13f633c87586b88388719afdc6c8f32cb0e25583e8c03f5bb0a0ef7c75a4fbad23f5b296bf84c8fa50d7d811fa62305f3fbe64d3764aa5d28228a31a43f
-EBUILD medusa-0.5.4-r1.ebuild 739 BLAKE2B f1592db2e0c2ed5c26b6b324895a92167a348349efb224c7db05b1828540cc06b295c9e801041854a991468fd7216930612517c8e574a969abf2ba6d0976c420 SHA512 50d6d114c581ccf0dd1fabe785657b986148eedf7ff61315145a977d9379d6459341fd9246afc46c9cd7d03c15165e958faa95f806ecde505ed3228cb0124865
+EBUILD medusa-0.5.4-r1.ebuild 731 BLAKE2B 2a128aea8fbe255ff5e5d7a968ecb96dd7cce57fe713dc9adcf6b8c339a485398ee48d7539849e0c8fefa0f677caa372702a6af86d49d823647b85c4b4e90250 SHA512 6eb3b552b8f659812e7812f69da0faf4817ffdd7daa57595007f8af31897eafc68e7c834917b0c86e1704ebd62d379d72d9db629ced41664a37707ceacaa9696
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/medusa/medusa-0.5.4-r1.ebuild b/dev-python/medusa/medusa-0.5.4-r1.ebuild
index 5e8520f3dc4b..bbc62829e662 100644
--- a/dev-python/medusa/medusa-0.5.4-r1.ebuild
+++ b/dev-python/medusa/medusa-0.5.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/meld3/Manifest b/dev-python/meld3/Manifest
index 01f13e89eeca..341ec310d9dd 100644
--- a/dev-python/meld3/Manifest
+++ b/dev-python/meld3/Manifest
@@ -1,4 +1,3 @@
 DIST meld3-1.0.2.tar.gz 36478 BLAKE2B 2a11e4a8f3cde98246301438e52061899cdb7471abac0237f5228acee9d6f90bb322178241f6f649d26711265b0a26488fd4387f618f211bd1e896228ae88f62 SHA512 54fe6def7169fb4e3469cad8be58e56984026f27b3b8b2bfd6d53e2296e0c2a5bfb3e67d032ef75edd93306f4115a091930a7aae3573acecd3fed4acd6eeb544
-EBUILD meld3-1.0.2-r1.ebuild 491 BLAKE2B a8b97b1350aa6f1a8a3ec6222c36621c551f9e2803e6d1b072d4badf9830168e37689e26f0ede61662db733b1e6f25e0e516a28d071e86c64d0011e461091106 SHA512 42c6dbc31025cb8d0070674fcc7b984bb7b8f9f746a7fbc8182841d5ca720d411e374b241bf7a553d17fcc394da214b04857781e86b67c24dda40abf05dd8bf9
-EBUILD meld3-1.0.2-r2.ebuild 525 BLAKE2B 336270d009b4fa847722d1be3d9005d77d314acd563f269e61822929b46dd94e4c0a16818339ed41c577d4cd7922ab1356bdf8b2d1c4722c85301207c26607d8 SHA512 df8c5b0918782ae3921319502f7f04dd00ff3bed565c91c1828bf628622f351d7388e249b0ea86dadcc602bc07d711bc47b0e418e0bd9ed1e0845ce5ce648b5d
+EBUILD meld3-1.0.2-r2.ebuild 520 BLAKE2B 57ed5ff0fe041fa9e245693de29672f155dcf3fbc3953f60c72231caa4a6d0b97220c51587482ae5c0a03215f7fdf06b95859fd8067aae4e07fa9428b46ecabd SHA512 244348e2b48f6f6010c4045ab61adb2d572461d75dfa293e8a6e2e34305f59c9414d6e35fe015e62a9ea427b5fba42d72bf72dea0a7831d2d6916b17c1964f8f
 MISC metadata.xml 442 BLAKE2B 159523838dd86efbd84294c713d07959bfb2c8a40c7cce15948f1ffbe574497631e101e7100dab89597d518e99712636cd85da94b8ea24ab04c5834c050e4846 SHA512 9bef65de31cec735e1bb463f4ed8de286563cb428cbfb277fb34d99241558892d91b719d7719117b1bf882cd83044bf5a6ed234dda10bca43e0549fc14841dba
diff --git a/dev-python/meld3/meld3-1.0.2-r1.ebuild b/dev-python/meld3/meld3-1.0.2-r1.ebuild
deleted file mode 100644
index 58a458b73343..000000000000
--- a/dev-python/meld3/meld3-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.org/project/meld3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/meld3/meld3-1.0.2-r2.ebuild b/dev-python/meld3/meld3-1.0.2-r2.ebuild
index 378993be14e0..0d78453b3971 100644
--- a/dev-python/meld3/meld3-1.0.2-r2.ebuild
+++ b/dev-python/meld3/meld3-1.0.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/mem_top/Manifest b/dev-python/mem_top/Manifest
index 18d01df162af..02e9b04d70cd 100644
--- a/dev-python/mem_top/Manifest
+++ b/dev-python/mem_top/Manifest
@@ -1,3 +1,3 @@
 DIST mem_top-0.1.6.tar.gz 2520 BLAKE2B 427ce48da7b16e08bc6fd0943beafe9ebb42cea65ac550f5cbda1f4a1dfa9dfe10c0700a3e9f155d158dd9049944f23e24f01d4888843acef16215c6fce34799 SHA512 0feb736c154fbe5e1b81bf12ca183b1dedf4ad5037388bfde5b32d2c077724af98b81e6c069075c606eda7121ed20e8b71c4c6039e0c558698db58e2d0a7a1c6
-EBUILD mem_top-0.1.6.ebuild 434 BLAKE2B 6d42266abb7806d0ef4207a910a4fecb67a7a12dce66d284560baef91241a87f967f05598ef617f7b403909b36bdaa26043b6de96caf34447b6e0968a980d1d5 SHA512 7b04494e35517f98b1d53197d71aeb4ede7f7b95253715977aa6cd76ff19ae8aa0cc8676baad8fae429a0000a626796794d280bcf90477a278009851465dc5b3
+EBUILD mem_top-0.1.6.ebuild 421 BLAKE2B ee4fc089392f82f5b06c5156fa8a6ec9a5feb785836b8fc77ec912d0a57809e80a86a7a17bf504883c57debeaf167296cb5ad953c0767f824fb5090046afeef3 SHA512 2525355a5d4138ceac02b66e5d78beccf23d9f16696dea32a0ff9ed19bed97ed2447eb8206fe9a6c143ed5dbdf4f84096422d7e71f6f22498ebc8ef1983747d0
 MISC metadata.xml 349 BLAKE2B 064288e73757f45cc157a4c80e3a79a47ca0e9abbe5d8b1242b84490d03a2e7b70aa6c506f113786a49f9f2c6b5dc44bba1545b2362c891621ceef62d4bb3ffc SHA512 7695d89a8e220255089ca202257775d148d2293cf29d37045c0647536e38bd427253852c62ce8c6f5eedc9a007b0e60e78e7c309f0851593490dfbf825f0c0ef
diff --git a/dev-python/mem_top/mem_top-0.1.6.ebuild b/dev-python/mem_top/mem_top-0.1.6.ebuild
index f8006c6c7d20..fbf802d5f297 100644
--- a/dev-python/mem_top/mem_top-0.1.6.ebuild
+++ b/dev-python/mem_top/mem_top-0.1.6.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
 DESCRIPTION="Shows top suspects for memory leaks in your Python program"
 HOMEPAGE="https://github.com/denis-ryzhkov/mem_top https://pypi.org/project/mem_top/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index f7db50ed3e08..99247e9e82cd 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,7 +1,7 @@
 DIST memory_profiler-0.47.tar.gz 33725 BLAKE2B 66fc0e5c579febeea9dcd5132caa6fdbccdb5cb0a2c9083f5abf8aa03baaaafe1f77f72cdbe4d5384c6ce27fd4760511f9a947fda46eee1d81e7125c1dcd2970 SHA512 110e16ecad33068d31cf53b2f0b775d65230d51345f24a4d7d3cafafb706b10a0c7e2d98a799256b0366f1bafa9b69c060222595bb4eb9e1689301428a36fc3d
 DIST memory_profiler-0.54.0.tar.gz 31376 BLAKE2B 4c89a046bdce36a139448dde45c8cf952aaa8fe8e2089bf9574a8fb2ed1abb89991e54f59742b0ea1ae5315378c0799ef140752549f9a8d13a91bf0ceb021984 SHA512 ec5735b7e41e706ea35ce9fe0dd3963c51e50e5bdf7f1871c51bbbb2a0ae75abcdba23abd3a14979c26ce19e7ce7d2cf6782aefc77e0c17cfe4da573a6e249ae
 DIST memory_profiler-0.55.0.tar.gz 40951 BLAKE2B ed6eefa0a522eaddfd0ebf3b118a57b7bcf6c7455057d1a9e891e826ba2b32a671fd86357d073f45c36ae5db418987a55e90a908cbb4aba3b3f972ba4580f9f6 SHA512 9f280af163b124809d0276b2a473f66d9f11071f38afbabf7247d4e49f120c137f69dde2cc3fb27fcc88cfc6dc71355ba01efeb102098c401c7e953462ed4a1b
-EBUILD memory_profiler-0.47.ebuild 1257 BLAKE2B e31f5ab2c0c9253beb50379b586ed2b321233219ac950caa53567915f0cf65dd04abd40203522e8c24dbc042db6bb4456f15a0bd4c2aa3c877c28616898de583 SHA512 65f31ee181958b61b98925cb9430889ca0abcb7fe9184da9b5f0b6deb2c0026940be237a40a9178ca14e54594ad6f9ad108f3cf360c81cee2795784f836f60cd
-EBUILD memory_profiler-0.54.0.ebuild 1314 BLAKE2B d10229c5025b392afb90f76ca9eef54a35fa314d6bb629693ccbc45cb3c25586e489451252d159fcbd593aebb8889add9d0b4e582c41ad6ddd5a6faf6ca6de4a SHA512 fc3e45b012ee1006bfa0f8abaa460c83ea0f427b96d38300e05c8b169857093f51786c8d266fb4259a0f6ffb0273e4cd99d99eac2a5cbc53cb5ca0bacfaeca28
-EBUILD memory_profiler-0.55.0.ebuild 1314 BLAKE2B 774cfd866f4c38fe8c9f0405c4061ec3042e3988410d90c24a2d20aa3c446f71f1673cfb57169b8a4adce280aae965ad67c71d8170372058efe3eb6388eb90b3 SHA512 28660c6fa3363a643afdb3b4a12f42c5b7cc8d72e79c3776c8828d4c27cf3db7bff344a420f9a7afc61a27ea41ef3a06caf0b7669032bcd90f584184b2ae0981
+EBUILD memory_profiler-0.47.ebuild 1253 BLAKE2B f1f97af5b6476958f856130e1457c2973daea99497e9b95b7b52711bedf13132bd0eca2079ac1ec457f900abe946dbebcaa4335006c8ff548519626a9b1f5b96 SHA512 0f3306cf52c3f2a5f1dc7e895592449c4da58cf45680baf2b1375f14b29501b5a6bde3916b51c5ab18a1f146e94d0c679105953af7541369ecb748ec6c22174a
+EBUILD memory_profiler-0.54.0.ebuild 1312 BLAKE2B cef98532fcb0606acd9d9fcbf8e54c86d443849f225f44534f8f5b7d81e2da318448a54f4b6b932b59e0daa25961912bb4dddb65ccc8f193a084725fec75074e SHA512 fccba94402f3ab93bddd46c3e71822f69cd6f41c17a241189d565979a0f12994bec6527d27c51296c308547e0e9a5719e6cbd1a03ba1cac316046fc3db0a2845
+EBUILD memory_profiler-0.55.0.ebuild 1312 BLAKE2B 291fb9408811fab3194de4dfc34059819a12b71d80bb83848f4be85acb762351936983e518ce7ccfab3a2c69460f651d73c05c1bcc82094d704ba7f4013d5210 SHA512 42912da95211b7124aa0aad687b8109f96c718714977f0b12e1763df2ce77e3c35e6a5c5fa97fffb3dfe539abb6fa1605f0993ee9bf1048a76136c909e624e67
 MISC metadata.xml 514 BLAKE2B 9721c8c8ab0f05e50b0d3d9fe16e0392aaa513177abdd4318aa2b10c70a656627e054b0a162eb7324e9b20e8f74dd1c3f3fbf4aa456fe98a34899525e3d9ad5a SHA512 cedc4d8914ad8cf10c8981935089220967957ff50eecfd867376974055d4922df91357a2f2135ce3cf5f56a27c5111005ae53429e685f0ee080e031bb2a3e943
diff --git a/dev-python/memory_profiler/memory_profiler-0.47.ebuild b/dev-python/memory_profiler/memory_profiler-0.47.ebuild
index b1a9477e9910..72ac15e0bbed 100644
--- a/dev-python/memory_profiler/memory_profiler-0.47.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.47.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild b/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
index 95893d4e6732..71614a755324 100644
--- a/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/memory_profiler/memory_profiler-0.55.0.ebuild b/dev-python/memory_profiler/memory_profiler-0.55.0.ebuild
index 8bcd7608b1fb..e946d9d3fa03 100644
--- a/dev-python/memory_profiler/memory_profiler-0.55.0.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.55.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mergedict/Manifest b/dev-python/mergedict/Manifest
index fcd70f0e4d75..c6b8b795792f 100644
--- a/dev-python/mergedict/Manifest
+++ b/dev-python/mergedict/Manifest
@@ -1,3 +1,3 @@
 DIST mergedict-0.2.0.tar.gz 3554 BLAKE2B 3dab9dbbae8cd592b9eeae2e7383bdf2b536139027cc791a48e47a9a2894c3a385b9a993ab34563d4f75ebedef57eb39c1ebbed60a5eada20f5e3c14ade44ecc SHA512 5d867944865881731a854526ad17c178be44854e040ba47ccf493ba1e8bd627346da07fd55c066a5497d806c5537c8627c8e903883e35ac86a05661fd3248f3a
-EBUILD mergedict-0.2.0.ebuild 498 BLAKE2B bc26fe7478fc2c502b8ba1675d037ad35ce73b586eacfd2995a0eb52272558bd36ea5c1916ebae5dbb267b2bb5d4ca7ea473ad43e0f8487f47dd9ce0afcd0786 SHA512 7cca9ab5cbf4e88d89ebd6504978e534c9f26c6f43c17524d47981f961fcd7067144598db2f9969fb1a3ee4c2a6b5095d162cabfc1b3c00f53702d6723455597
+EBUILD mergedict-0.2.0.ebuild 489 BLAKE2B af6e57b7ef0647a4e81472e9c61de030c3c793721f376bc402a99c57a9be1724a6e5060d634007b1a5c9bd05ec05abbb1a3721ab72ed792bf30cadf9c0d4a50c SHA512 663a7e6e2d015278bb0b6bdbe23d5c3008ce390d91e62fe80d5913b16cc0ae33d9398b92f4695ec13c7f563cb67898eb9a3b7c6f525ced64c4a514f18464d1ff
 MISC metadata.xml 375 BLAKE2B 4a8004375ba9a901afcdd9573fe5e76b481f1831c9556f888792d1e993b2450e4ac6353d2dbd03dc129f46ca55bbaa1563ac3c7de033d23ad7dfc833bee26de7 SHA512 544ef98dfb5099a4cb1eb42b0be0692a02d7e965b4f1ded19fb87acd1b9f1dcbfe605c1a73710dd3daa2a53949d58a7e3b5dd45e7e5a6eace0349446220a8b9e
diff --git a/dev-python/mergedict/mergedict-0.2.0.ebuild b/dev-python/mergedict/mergedict-0.2.0.ebuild
index d47a05d05261..61195fac063e 100644
--- a/dev-python/mergedict/mergedict-0.2.0.ebuild
+++ b/dev-python/mergedict/mergedict-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
index 89681a463f1b..63bc364afe77 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1,3 +1,3 @@
 DIST metakernel-0.20.4.tar.gz 67895 BLAKE2B 17cbb8238eb092a9f31616e83ce638a921f84dced9ee7ed896d2470b6c1d1424e2b165da386cc997647f83bf0da02ddfabc3b74bf2fade1d312124906a2dda2d SHA512 8ab2943a93e61bfca276607adac5e619c407a2356656424d261eb520002bf582469f71329a3b2b2fcc290b21a4dffd724f5b73697c6853b5cb74eec07e26ede3
-EBUILD metakernel-0.20.4.ebuild 655 BLAKE2B 27a0b286f5282e8b6f1f5c1cf225e0cfc87e5c39abfd1733d88099b39d12760f79f6580237e60fc3f472a69638684d274c8458b7343b2d28a8fdc7de37609d25 SHA512 c5d62dc3f7cf195171e854fedad9b62fef95953193b609f53a0e1a28ed6ab0edf483e4a78a62d6e9589c6af0c2b4925161137e40a37fa774f5befb21d0f06cd1
+EBUILD metakernel-0.20.4.ebuild 651 BLAKE2B 05b328be8b3d8d48dc69a65097e1bb326980a01d61532cf313880f7dba4813f9ead883f4c34d84926deb245ddfdac228d3e18668027673499c2a4a4a2b504d1c SHA512 e85869047ec51cb749962a5a911f9f416142dee37c4351308b2411001a004b11f0f99f75d80ee90f4acab01ce42989aef55594adb82655b74fe9052fe2a769ff
 MISC metadata.xml 634 BLAKE2B 18f77a465ef02244b5ded5cea7751fabeb5d1fbad17c2e47239228e7512512eabaa79fab71f480fd11d33af8b43ca6859f4749b81c14c2e93384b051f1ea3590 SHA512 b4a566da04b0f87e979b4556d3fbe76d3716ef96b6b9e5222fb942b0d622d9acb98274b935cb2fdbbf01baa111df351e2dc3988ce494c1bb4b17a18f2115c7ad
diff --git a/dev-python/metakernel/metakernel-0.20.4.ebuild b/dev-python/metakernel/metakernel-0.20.4.ebuild
index e5844b4f671c..0e01f81bd81b 100644
--- a/dev-python/metakernel/metakernel-0.20.4.ebuild
+++ b/dev-python/metakernel/metakernel-0.20.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/meteor-ejson/Manifest b/dev-python/meteor-ejson/Manifest
index 97b97d841e6c..e19dafa729c2 100644
--- a/dev-python/meteor-ejson/Manifest
+++ b/dev-python/meteor-ejson/Manifest
@@ -1,3 +1,3 @@
 DIST meteor-ejson-1.1.0.tar.gz 2292 BLAKE2B af832f42d53c27e3b9168c1f97bf807d6ba9967acdf41ec3ec32a77dae948c4befdcfac3a85f18a38b2c9efab6ff3a4b346931d48b30bec84b935be740764f1d SHA512 eb211d262f0006f3229296b71320f68b59d8a7e618e65baa8e613f874a0e6ac9cfe45e30fc73ba57c42129204c5f27a32c4b8b579527fcefd601fa1dc2844da3
-EBUILD meteor-ejson-1.1.0.ebuild 639 BLAKE2B 3ee1dadec43f05badd4b3e08e167e304a7dc63e424512197711c38a0eb7a0de2f50e1512a69f31b02c70f4a73a695a4be7a9ebeddae28a8447c90cd0488ef222 SHA512 f1f7b27a02574eba34fef64832a4cea79a973819c27c3c71ea7783ab981aab893cfc5f5279cef5a1dedc66210deee0c109459a80736fa06cacf09db91c6826ee
+EBUILD meteor-ejson-1.1.0.ebuild 635 BLAKE2B 18159234f77e6525e678243c0497f114694c0313968457f70f54c630378ed391bef89a9003f67f2ff2240116cfb848a299822ee7cd0aaf0c38345a2ab04002fc SHA512 43db559f7777e146b73e56748e77841f9a3cbedb07338072bd04c4f2f5838c6d8853b841e319fe927842341baaa7890ff7e1d12185ebfb1f8c17f5a4b013a96e
 MISC metadata.xml 592 BLAKE2B 21de6f8fed82161290a6541ede36e22155d0b12df84c8d9cee1018a2477fe86bc2335dfe5694ccbdc2cfdd7f2b3f6ae37b4f5ff53f624184ec5493a07d3585ad SHA512 9244b588bb294281d3542c6b868359369ee2ea1aabaa1765c2b768b8add49213bd705075082168ebec080619ca481650f7546fe6e1c9ffa68f08e2aef66cc936
diff --git a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
index 3836f7464a93..42105f374937 100644
--- a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
+++ b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index 9f1712fd1197..dabbd49a43eb 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,4 +1,4 @@
 AUX micawber-0.3.2-remove-examples-from-setup.py.patch 652 BLAKE2B b7551df8c1bdc16cbb10b54e071b965a273d4b51192cdf17f50d516580a6b52065d10b46274c1e3a90a063d87fe204111ab65eac2c4a937a9e59728ae9381d9c SHA512 225bfd7c7306170c7c6d0b564c84092b015ac078ac597764c0029613209851e157ae5bfa2e910a5368f540e68c5a01aa44df78511dba753c6d875b8eb144cda5
 DIST micawber-0.3.3.tar.gz 32200 BLAKE2B 570c6e59cc73a7ddd878c6c03cba1600159a44cf1b1ce6a2e8d2311e5747352143cc7831a868cd27f68b36d67923860ec3a8c7f36a7a63aeb2c51d08f1fb2c02 SHA512 15f5e3f85e6d3bf44e6a4a3ae975872acb2e9093e15b56a5a3b24573332c811955c84f0ee69d327334b22fa61b29a51ce14657fc7bf2f486268145965c159bc0
-EBUILD micawber-0.3.3.ebuild 656 BLAKE2B 8ce8c4886a05f64338c14e85fcdd339d8722459fdb04e75706c3701aee059524baf7e189fb03b5b065717539ae0f2f74cc080d848a65366c5becb9d699ab1961 SHA512 08c15877717ec13803494e20c0a97ce8b47430c7ed323f0e45c7dd5e8cd38bb024d27d8ee35639d58c1bdc80b5347e1dee876378da9e680518c1c8cbad360723
+EBUILD micawber-0.3.3.ebuild 652 BLAKE2B 6895afefe7d878ef6707d00b928d5a4796682a78c2da3b6be175435ace37aed9a1bf8bdf940f313d03515004d2bcabd0e295d6386113e81f23874d490edb630b SHA512 9fb2a1f7ec65364ae52bef1ca94c72209dd0f1a0567a6879ac911b1f8e6317b3a58cc5cd65dec2260344ce3e543dcf509718237ec79a2a66405ca6b95ebfadfd
 MISC metadata.xml 332 BLAKE2B 1d2fa19b717b98bac1f2ad6fd261ce54360b6185671a3d1a51bc72080a6708196c0abcb5d5226dc0e4c693258caf85476a53d4b19d452b847e67a88adfed275c SHA512 9815d1b8eec3bf22a430737bc5a7dfc9e576f0f5ca79ca318a419dd911af378f94b63a6d457cba32bbf4e4939cea3690bad4e6be918ed79324f06f7eef42aaa0
diff --git a/dev-python/micawber/micawber-0.3.3.ebuild b/dev-python/micawber/micawber-0.3.3.ebuild
index 526aa1f7fed1..c4c6f95a0112 100644
--- a/dev-python/micawber/micawber-0.3.3.ebuild
+++ b/dev-python/micawber/micawber-0.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A small library for extracting rich content from urls"
diff --git a/dev-python/microversion-parse/Manifest b/dev-python/microversion-parse/Manifest
index 5ec737ef6a35..97c30db249a2 100644
--- a/dev-python/microversion-parse/Manifest
+++ b/dev-python/microversion-parse/Manifest
@@ -1,5 +1,5 @@
 DIST microversion_parse-0.1.4.tar.gz 12795 BLAKE2B 30a3839fd13567bbaf998f1c6f33f6ed1e50d768ac1e92690a575d76379ef0787e1595f03740454d8b43397755f43c7f3a69ef68bac2bc5636e6fb8cd6c0e241 SHA512 06d7063370cc55b6c41f2d9cae33caf5cce501694d4271d0ae586cb5a468cc2e6361f93906f18405a0f99a59f442cda1b56bd565069d6dbf2bbc409942ea189f
 DIST microversion_parse-0.2.1.tar.gz 20327 BLAKE2B 085ee5025329fcb0fe438d5dc35746d583a754addbf20f3d85b4ed216c52647582992217671bafbb07e921194c3f50a9a8f14cf14caba3d2285fc8c36a409150 SHA512 f9990363ba49d5840ca63b4633e16fbb2b538e151ceeed632afd70462cfb4e67f2dd3196e2d15ddf1d0b7c887a5c4b3208f2b018f441fd03f8d70fd722cced53
-EBUILD microversion-parse-0.1.4.ebuild 654 BLAKE2B a04820c42c33ec4880c146ec9666c6c1cf2abc449efb852f349f1cfe0d5a16cb54b651ab64eb3feb2fdc9b929596396dfb464358d4a724f70001ae695fee07f8 SHA512 318d45bad518a9284913e43dc08392f98c55d3e1ade841ef33f9f2e408511e5cce183d46b09e91eb92ae969f33594fccd8a543b21cd81e5d14ab77d6efbebeb4
-EBUILD microversion-parse-0.2.1.ebuild 700 BLAKE2B 38f44dc78501761128c15cbf8c928e84219519e5aa27df4f357442e1f56cd23cfce8d2f9e3cf709da7cffd5950fe927a3df2c9ecc127ecff4a0a0141198ede35 SHA512 4bb79b2b61661e9775f2a4cd09463852c82fef0f82f443c8a59f75ba7c132f3690afc443a20b927f7ce3d5f34ab81b6fe5d1bd02a0511c75f2216703a8dfdcba
+EBUILD microversion-parse-0.1.4.ebuild 640 BLAKE2B d69a1a1a68fb6f74522d122bfde88b562a9f3806d955bfa8b7e5d2a04350ea00e0e7b485fde63d16c5c132e6fb2c53762c0f5f1da35c8d5800253d34ec7f618f SHA512 c7752d5517013d84ddc0f04cf7c1e555a5387d1ebe157715609a2d31c730e0ee7be530c8b509cff55d6d371f26435279d1c7c730b68fb8792a3ce2b408bf9fba
+EBUILD microversion-parse-0.2.1.ebuild 688 BLAKE2B 8d7ee80afee9d6c6604a4f31bc9c2b445cc4c66c30be4c1e8805966b26acdb1c21bd09c7292987ff4075e1c99152fce845e61161b1c0545d1a35332db9b27374 SHA512 020d3322bb7cb2b488bb353199b640a17e342ec6259292502f593a01241285c9f2c098cf4aeee8dd1e67430fc5b989ca0ee6ab4c82db6fa9461abfef94690f2a
 MISC metadata.xml 613 BLAKE2B b826cb1a570746151f59e8b2ddebece1d393441b165ae4043f294f4d825aa37746a58fbe1a6fb87dd10475904906fdc685358127ede4b2a9b6e37521dbdd74ec SHA512 7f429d142e0ebd4d458170cd25988df17b5685c35697fe2227dbd5b0e688ec5c6648f8569f5dfd37f69c9e812c968ac9478eaf8b8147de76bcd60bcac9a73449
diff --git a/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild b/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild
index 221e61030cc8..b7fd8348a1e4 100644
--- a/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild
+++ b/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/microversion-parse/microversion-parse-0.2.1.ebuild b/dev-python/microversion-parse/microversion-parse-0.2.1.ebuild
index 09ba21e3e20e..d2f480338407 100644
--- a/dev-python/microversion-parse/microversion-parse-0.2.1.ebuild
+++ b/dev-python/microversion-parse/microversion-parse-0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/milk/Manifest b/dev-python/milk/Manifest
index 41cd9b89f759..d0545ff73863 100644
--- a/dev-python/milk/Manifest
+++ b/dev-python/milk/Manifest
@@ -1,7 +1,3 @@
-DIST milk-0.5.1.tar.gz 623685 BLAKE2B f772abb75449e4fcac6fc2437d360a5fa8db4ac3007d5e7eadae1b92b78b639f0b2fd8b26469aa112dca35efd52ba9bab1220c7e3f41dad059624cb15afdce04 SHA512 3ac6811f4c15b65de87cae0089ce3fd8372d4b349ea9b7e49db581dcd29e27baf6e33ddca9c6d96e832ebe499e9032de253da532d3241fbbaa4ac124d97a8386
-DIST milk-0.5.3.tar.gz 620091 BLAKE2B f88c1f6a89ec126dea34cf48d4c8a1eabea3e762ac0650b0ac5f1098c487ce7cd9c0269d61ae8d6862dbb779eacf38dfd862302d877e8f086e0f58770a4c623f SHA512 4b685f682229194d03fc9e6031d5e40890aac793ae87bf7c010f866c032ec53205c281ead7db654f1e4bef30a4e68ef325b560b78fe1b0db00344392d60ef4e4
 DIST milk-0.6.1.tar.gz 628357 BLAKE2B ea781b87aed1ed2b20d8eea16efe3cfc1e9777144e8847ea8617f2de3ee523cc3a9dbb54879206e146924487a10d41302e01d6fa78c812c8c5523b360cdd1e5c SHA512 54a94bc1bf760320b53b2f65396e117bdccd0d4d5e6bdb4684b68d96f3cb3beaf3cc9b285d3ba91b1f97ba335750591c1fb2d2115468ec617dbd1cc65fed9f8f
-EBUILD milk-0.5.1.ebuild 561 BLAKE2B bd25f5aa62b93a62ba3a22d46d3eb39290d54cfbc173e9ce42f01598b3f8c38856d08225e6e86a643d9d619888e9b623f9fd3f76b615adad3bc8c8843841a80b SHA512 54ff4116bc4861ab48afd7c89173fc6e5f59f3fba747ba781790c87d56d9baffbddfea145b566e41b2f38594d3f54f478be898c7f0917db69ac4b762de009200
-EBUILD milk-0.5.3.ebuild 597 BLAKE2B 00afd678a0c17e25eaed5349bc3392d4924ae01cf1c6c215c664923cfb066867770a035217b284e527ccb7b2670b658566d5a25e93ac7f5874ed0273ed983a14 SHA512 f9d2f0f081ce6c1d7df3b9b029736bcd63e48d0ba2135c9a74f3ac84e4c6cae06a44b37e66708b12b072a797dfb40d206c43bd6bfcf0ad8fa5c5160fdec4b10e
 EBUILD milk-0.6.1.ebuild 597 BLAKE2B 00afd678a0c17e25eaed5349bc3392d4924ae01cf1c6c215c664923cfb066867770a035217b284e527ccb7b2670b658566d5a25e93ac7f5874ed0273ed983a14 SHA512 f9d2f0f081ce6c1d7df3b9b029736bcd63e48d0ba2135c9a74f3ac84e4c6cae06a44b37e66708b12b072a797dfb40d206c43bd6bfcf0ad8fa5c5160fdec4b10e
 MISC metadata.xml 1152 BLAKE2B b772ced54839c36c070780303aee01a876af081e17883e97176e422c447e5da8878fe0a19fbce00267bfbdbc01ccdfd91472763a6a6c87e492bd41b094c62b49 SHA512 c4d9d5d7774abd15d165107798995a5fe4de13ba96342fbc1c8987876df7133846ca94383942812945e6bea62c9bf8f34073bf264842e58a3e70d181273c640f
diff --git a/dev-python/milk/milk-0.5.1.ebuild b/dev-python/milk/milk-0.5.1.ebuild
deleted file mode 100644
index 972120092a37..000000000000
--- a/dev-python/milk/milk-0.5.1.ebuild
+++ /dev/null
@@ -1,23 +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="Machine learning toolkit in Python"
-HOMEPAGE="http://luispedro.org/software/milk"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/numpy"
-DEPEND="dev-python/setuptools
-	dev-cpp/eigen:3
-	test? ( dev-python/milksets sci-libs/scipy[${PYTHON_USEDEP}] )"
diff --git a/dev-python/milk/milk-0.5.3.ebuild b/dev-python/milk/milk-0.5.3.ebuild
deleted file mode 100644
index 2ce95e5089c1..000000000000
--- a/dev-python/milk/milk-0.5.3.ebuild
+++ /dev/null
@@ -1,23 +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="Machine learning toolkit in Python"
-HOMEPAGE="http://luispedro.org/software/milk"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-python/milksets sci-libs/scipy[${PYTHON_USEDEP}] )"
diff --git a/dev-python/milksets/Manifest b/dev-python/milksets/Manifest
index 5351c2d4bb23..1b3f3a40e4c4 100644
--- a/dev-python/milksets/Manifest
+++ b/dev-python/milksets/Manifest
@@ -1,3 +1,3 @@
 DIST milksets-0.1.3.tar.gz 10438190 BLAKE2B e056b51924fcfdb0f510c4a1088a15364ed55aafd7e4e087c2c633505a237058f3e49968acadf8441b086566fd0f645de417fa01f46cc4c0957b8e6272fc5e9b SHA512 45ea6b14dc5e15c8797a42483fdbf3f5b8794f68a378b070f39e3117ff98fad810bb9b200f569061f8e65337380d908e32284c8563e74939b5b2cc202f2103d8
-EBUILD milksets-0.1.3-r1.ebuild 474 BLAKE2B 470a4a1113256bb01f4922e970bd52bd509822547bdb1271ba9e3da346cecec9ce11e235e9be713eb93536f1acb3e04227e0534aefa979afc6e55284073d6863 SHA512 8aa952c9a777dabec056b4a94a7e24aca51be0b175f79eb18f07dc9e98dfc2d2933af93550200c9cc8979ad0430c30dcfae0d3b804ac4487aa184929332981bc
+EBUILD milksets-0.1.3-r1.ebuild 466 BLAKE2B ce3681c1759595c03212dfe2f5f5b69b83a641f5380c07196bffddceaec82c58f35cec007931932a4925819332b1b3d22f53e85aac872319cbd57b13d08706c6 SHA512 31979a47057c3cb8572f67f24464e7f95fa7b2b1303a0f9259d3c25a1a277e41817d4fdfda180e745ec283a23c15d3e571421d45f5cb1ef612466aff5a3efbfd
 MISC metadata.xml 503 BLAKE2B 2ae3ef5c25bada8ee877b87a804c72cd9145ac98c662060aa31486d1d2f8293c2fa82571569b1d848bb72799d15b4d245de0c6dcd4a65d45a95556be96808cba SHA512 6140c969d0db68c2d14eb8a351c5b8668ccbbe1a2d5ad6f54d102e5025c24644589ef599fa5800eeb23f52c39447fe451f5b195d43da1618c9e94ba8655f94b6
diff --git a/dev-python/milksets/milksets-0.1.3-r1.ebuild b/dev-python/milksets/milksets-0.1.3-r1.ebuild
index b6344d68e3a9..86f3aff73ab2 100644
--- a/dev-python/milksets/milksets-0.1.3-r1.ebuild
+++ b/dev-python/milksets/milksets-0.1.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest
index 173969b7980d..d4deb649184f 100644
--- a/dev-python/mimeparse/Manifest
+++ b/dev-python/mimeparse/Manifest
@@ -1,5 +1,5 @@
 DIST python-mimeparse-0.1.4.tar.gz 5228 BLAKE2B f98cdea21ad015e65f638cf5828dffb006ab2f142c266b54f851faa3b38885fcd29ef8717d62235e675a8ca3fcc91fdc8d8e594be2c6404a45c3dc09b5401f1c SHA512 c8eeb298773a0eb36512b1d9a46dfc85423c0dab10b85ed94284bf1bf8dba8c34aeccefd8b6a187434789d5a160ab5d4af81659dd1808ea02078cc2b168e10b3
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD mimeparse-0.1.4-r1.ebuild 1092 BLAKE2B 532434844379e8aaccadf082b37bb03b8a1d6cc2665e0fc70f98f6cbd0d952891994c8841c2beb9ee31b82f8f33e38a76f23d1925462ffd8a298824fde5ed8c1 SHA512 8979e866b2138e345324ed9740d13d2fb425de8a4b3480274de2dee4951c170e0a4da59ca95138593baeb5906bf5b244e2eeb12ad7483c0f10800595b4ee835a
-EBUILD mimeparse-1.6.0.ebuild 1129 BLAKE2B adb1155fda8c1d16c266166aae5ec45670d2d037b8eda2c08db0a6da79c996a3cf478d0bd85f89868f232b9953598408839e07ef10aecb8970fc44496fad0617 SHA512 a568747f91265c4fe31588c6b9454bbeab0aaba3bd7b3c17914bc97719115e6ced52df0cdeb8e45c30fa91e75888717a20b5672408472e0ca2fe4875771cdb25
+EBUILD mimeparse-0.1.4-r1.ebuild 1083 BLAKE2B 61fa9c78236cfb99fcfb2dd71ae1e120dbd25688af02feec6f97b05ce172c2c69a16ff8d8e2e94f9a553c4ac8885b8307cfe9e2ef982f66c8b60eb656a9c235a SHA512 fde56a32cc4b2f614670220fe4f885814d139cbd7b85a6bee231a7946454a300fa4c955fedcb3e6125d1317d9ca7b257a8107df502a5c79bb62208929ef17cd1
+EBUILD mimeparse-1.6.0.ebuild 1122 BLAKE2B 2caa9956bca727a3cab87fe8fb4cb98acaa68cf7e1daffb87411da0c05ea846927a3675c8db51d1f86b77ac0f8ecbff82c841d9f584ed9eda76f467bb40a62a1 SHA512 dae44ea58e5b08e1a00e5934d75f247c5333431c116d445a25fc13b3c161bed4c2616f3d4922a41b0d7813c95d552382f3599c13386099f57b0008a927ed9f1a
 MISC metadata.xml 394 BLAKE2B 076eba4e701e0c6274b4e3e3510faadb92c02d2ef35ccdee6626a3e4e5b46c91c912feb325e4b3abf33a19d5e6937ff4d6b2aa4c1209c682ca4badd59f35b478 SHA512 900355ef3cc835ae4e0766614eaabcbe701570fc54e1b00cfb55eeeafb0b65df35e24ab272eef54bbaa7aa0540cf89931a9bf58f5b515fdd6c88d303fec4518f
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
index c42c80b36340..118687fa316b 100644
--- a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
+++ b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mimeparse/mimeparse-1.6.0.ebuild b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
index ef4d89d85346..8b4e0d73c62f 100644
--- a/dev-python/mimeparse/mimeparse-1.6.0.ebuild
+++ b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mimerender/Manifest b/dev-python/mimerender/Manifest
index 903490b47334..0ec5ad9a51b0 100644
--- a/dev-python/mimerender/Manifest
+++ b/dev-python/mimerender/Manifest
@@ -1,3 +1,3 @@
 DIST mimerender-0.6.0.tar.gz 5310 BLAKE2B 92ff2e9dd8544ce64eb00fea230eb5d827cdd76856eb4ec7962ab706081e4e96b97e4bbb1a9131a37d643205e92ec9afb6b2b6b462fddc025a07d201b946eef9 SHA512 0b0f452404d09860cf42b8afef96ac87d4e5b222834b2309a9aa8d4855822b988cc8daaa2a0553332786755a26ff8e65c8cd6fbd4ff390f8534f925524b4222f
-EBUILD mimerender-0.6.0.ebuild 544 BLAKE2B affb1429b29a2458a334042dfd16ea0c3b31b354175ae104dc5a9b3cffe4275d60711317ccd7a1bee03e91f99240927e28463c1f4449bd4fcfeda5d67ec0e276 SHA512 9d753d70c35ebcdc19a12426c6b298fdf9ab24356802e5b9de8474de5ee9916b0e7047998291815659830226c91de612da07baea86ffd463241286fca74e6b3a
+EBUILD mimerender-0.6.0.ebuild 529 BLAKE2B 5c4977307613aa7249572420bfa6e97a18b598f3dce79082ad59960b07a8bf16a052b8ac39dc7a20fdda50c855823ce395a18334cc332e552b774777b66e9afb SHA512 32d5b6014a85b13f24a9bb33eb9727beb7e22d8bcad6efccf6a7ade8bc359c32df3e2a83bca286503e5a4c1e2d6af55da0cb82923f32429ef4fb22498675b4b4
 MISC metadata.xml 313 BLAKE2B 0af0e6a1a8f423a445bf88ca13d771c3dc7a8e7db97d21446a5c5b7967dc232a18c1062ef01e11dfabea9fe47c36825bb2cf44bac98ef651cbfb5d941cf281ae SHA512 69420483f170abf2482ef947c26bbe7dacda158cc222464d35d18b702694b73b6205fc4d66150265962e28ba1965f7c555ea033778fb04eff73a58ef804e157d
diff --git a/dev-python/mimerender/mimerender-0.6.0.ebuild b/dev-python/mimerender/mimerender-0.6.0.ebuild
index 80bed14aa1fc..05935778d43a 100644
--- a/dev-python/mimerender/mimerender-0.6.0.ebuild
+++ b/dev-python/mimerender/mimerender-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mini-amf/Manifest b/dev-python/mini-amf/Manifest
index 13b1e8a6894a..828709f8ece3 100644
--- a/dev-python/mini-amf/Manifest
+++ b/dev-python/mini-amf/Manifest
@@ -1,3 +1,3 @@
 DIST mini-amf-0.9.1.tar.gz 117016 BLAKE2B 22133a2a6f44ea8d485874924e6175383dfc9301d9bba193e4d9d2fd901671c64be3665617c02223dbd2075141071deed142e804a77816ae11ac4d00e72a870c SHA512 8487baa551a68f7882aedaa8b809089bf2e767b0055f292dab4074d48ed442cabc250297ded91daa2f2a1dcb950ddab5ddff60466ec84ab739a240b8e2665be0
-EBUILD mini-amf-0.9.1.ebuild 1088 BLAKE2B bd53e2c2af76ebded71c7c174c5938b150074e6958a65287d132a3cae62d341180b0baa4a8032615fab246465e2249be32baafda3b3801cb83137073860ed6b6 SHA512 a801b454e42ddaeeedb30432f4ea59f251c3264f2f3826925cdece08df9ed71856666d280de5ef497d1508af2e532ec80b9eb0181fceec563f038e76173ed9b7
+EBUILD mini-amf-0.9.1.ebuild 780 BLAKE2B 71f161d78e03ba49a455f3baf8bce10ad8b694472672badb01192a1080381b666668dff195dc23fdcd9b22fbd87cbe530e870a816f8458fa60d91ab86ae21053 SHA512 70604f36b5ff0e64347ffb44011c3467721c0dde9b3aa4262e9d9988b664ddda157b349d1e854547448f4e5b9a42050e4f6bcf95168e29bf4589079fe545e379
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-python/mini-amf/mini-amf-0.9.1.ebuild b/dev-python/mini-amf/mini-amf-0.9.1.ebuild
index 823becae7b36..8822219afbf9 100644
--- a/dev-python/mini-amf/mini-amf-0.9.1.ebuild
+++ b/dev-python/mini-amf/mini-amf-0.9.1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5..7} )
+PYTHON_COMPAT=( python2_7 python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
 inherit distutils-r1
 
 DESCRIPTION="Minimal AMF encoder and decoder for Python"
@@ -17,33 +19,16 @@ IUSE="doc test"
 
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]
+RDEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/flake8[${PYTHON_USEDEP}]
 	)"
-BDEPEND="doc? ( dev-python/sphinx )"
+
+distutils_enable_sphinx doc
 
 python_test() {
 	coverage run --source=miniamf setup.py test || die
 }
-
-python_compile_all() {
-	distutils-r1_python_compile
-
-	if use doc ; then
-		cd doc/ || die
-		sphinx-build -b html . _build || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	einstalldocs
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index 00526bf5a4c6..16e845728678 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1,4 +1,4 @@
 DIST minidb-2.0.2.tar.gz 13928 BLAKE2B 7b6997bd0ed852561c1a45e1d8f63030798c59ebbe67ba3e9f38c08eddcf22028756b17c5ce8aa460e5d3113ef54cdafe782cb471aabfe208b093af702694cb7 SHA512 92879d6df61b0f9f72f9fe8f1cf38d559477983c6bba8c88ed02289570daff02f6f8d7010c0a95ffce049ab67be69323c47caefdfe3a8b008038377235ed9a5f
-EBUILD minidb-2.0.2-r1.ebuild 595 BLAKE2B 0655fd15b19e8e75db3e06a0286a383f5e1715d7e69b00bd6fabbf0ef07b9c2923810faed3478cd5a127875a8a23b5c19baee5f4402127855ca8028b5174c6d7 SHA512 5bdabf0d99eca717a2c7258ef31b155ea8011d88fd671a9749dc5c9f03708d7dcddf259a4280db57648e0e2a85cb01c3d7e313d584cfae79df4f04c429d32d9d
-EBUILD minidb-2.0.2.ebuild 585 BLAKE2B c8120de3bf3f533e2665c0ae3304b526e5f9737e585269ca1b73eee6e655e695a5a86a7d006bbe3c9c73fac870680079004db5a018eef4c38adf9600381285b1 SHA512 bc87ad607fe407205772e045beddf7fb5f880d309a91ed6bdae6239ec263445c15131f0a8c49e737731c363f2469e7d23d2412c887a2729ab77f3a544224b3ab
+EBUILD minidb-2.0.2-r1.ebuild 593 BLAKE2B 54db1df3e22f34f2e8dcac30c3a332a1fa9b18f2c920218a40cb54ab042c2ad49a6e156d7419e3a1a689ad8b9b0250d9c374d38a5ebbd62c006a268bad074421 SHA512 4b13bf2045111ef5eb5c93a275fe97fb811c1f11f1b4e011a14c5847eb8b9bf8a3507abb31dfd1b05686e113c7403795723260811536d6069ab64846f52bbfb6
+EBUILD minidb-2.0.2.ebuild 581 BLAKE2B fd2420796c00506dac05c33103253ddd8b72401953092a72e8d029f5cf07a588cc0f28817e0eec5b66696dae2e152a17f02d6807c05a696e7e801b9195dc8a7b SHA512 bd01fb30ea49d8ce1188588845c381cda05bb80d3074561959230aa8df01cbde3db6cdd4b81f7794ce55bde5c178b452445132b927f91e9037a636a089bd127a
 MISC metadata.xml 422 BLAKE2B b5d93a5b4470c716205ec803434d612c404f45c9b6ee708a56d57ea120c423cfa86f008bc47ef0690836b3cc92c6eae56c3b97959671d6ea72ad751868d3d94c SHA512 c2b0dbbbabedccc7036eecfd09f403f9a5848c6f71d09a12e5be773506c6ec5a5290f459e8cea9505abcd438e47ff84f8c32ffacf6a62be365bbf8c92f6c64d0
diff --git a/dev-python/minidb/minidb-2.0.2-r1.ebuild b/dev-python/minidb/minidb-2.0.2-r1.ebuild
index c108bec9b1ff..b65d38614eb7 100644
--- a/dev-python/minidb/minidb-2.0.2-r1.ebuild
+++ b/dev-python/minidb/minidb-2.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/minidb/minidb-2.0.2.ebuild b/dev-python/minidb/minidb-2.0.2.ebuild
index dca5f2e67539..8dcd822edcaa 100644
--- a/dev-python/minidb/minidb-2.0.2.ebuild
+++ b/dev-python/minidb/minidb-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/minimock/Manifest b/dev-python/minimock/Manifest
index e056796eee6a..98b22fba34ab 100644
--- a/dev-python/minimock/Manifest
+++ b/dev-python/minimock/Manifest
@@ -1,3 +1,3 @@
 DIST MiniMock-1.2.8.tar.gz 13217 BLAKE2B 333957307ed6c596bfc20ed18d4e40039208d589c1a9190e388c7dc3be53489994b2f45e8140f54850e4129a5a69c0fc361e3c4cb1d63a3bac579a7b86004856 SHA512 91133251a6e6b1acc11e6ac4f24404807134f8a7fca49d5f7365d7fdfc6bdd1527e7382da8d866669408b1ad30331a176026dd31bcb0c3b7367b7f778fc61ca7
-EBUILD minimock-1.2.8-r1.ebuild 828 BLAKE2B b74c31163501ced862dae89657a169fc2dc46bc392b44f800dd30efcb636633b973d471caf7676dd5a8808c894c5f536baf5759b46386bb51fe3c8f0207084ea SHA512 8efc4a9565d492bdc3f942c6f3a1d47b91e1126544314b4ef33add1d9c4c880a90ddb29718471e0b1667e30acebcea38bd6f2f5efae7494abc4c17f047233f04
+EBUILD minimock-1.2.8-r1.ebuild 824 BLAKE2B 1c788d8ff2fe33613417be5ea8334a4dace6408e256f76b94d9f2e59457e0b368773eaadd40096d4fda30e8d2b44049929ce38366da19f451ea858519232d01a SHA512 1e5c5aadef1a78db46be2ddd62f3c61834026edadff36accd9503f81631a8aba6cf6224141af3a771d6c8827eef452d63f56be4b3d03684032e87ad8055ee74d
 MISC metadata.xml 311 BLAKE2B adc96d0ea729a224f769fc01eb21da4df1e7ba91e03a33554ed6b5452ca95a0408cd367058b026f745a2adbfc74f3e3aaa2553dc5c033041bcdd72688cddd679 SHA512 9df2bf6b3486803c9754bcb3b9142844ca050718f10c00bfcaf4538262cb95c3d7a5e3102ca2005ce407205f6beca7722aca82407e85cc289b35e33139ba6236
diff --git a/dev-python/minimock/minimock-1.2.8-r1.ebuild b/dev-python/minimock/minimock-1.2.8-r1.ebuild
index 73bb646213fa..662be37ce071 100644
--- a/dev-python/minimock/minimock-1.2.8-r1.ebuild
+++ b/dev-python/minimock/minimock-1.2.8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 602d2955417c..0db358dfe327 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,6 +1,6 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
 DIST miniupnpc-2.1.20190824.tar.gz 94564 BLAKE2B 1569e15bc9a886bdee5192526b83e0a628f0d6c9b4449c547c0c22c2ab1f912b1671d84ead6aa6961161bd99e5f62f8428f3867b8f9ca14e04d5f953e6553d4a SHA512 9ed5fc6fbe6f64fbfa23938043732db1999f3c8585422a660fde04fd9e203d7acf8a5c3f1f1433468ea179f090261702194cf5714601c5c0ed9094250352f175
-EBUILD miniupnpc-2.1.20190625.ebuild 752 BLAKE2B 6cfc3ea9ac5a47a1623131fc4f01e24c838072a78f5b563499e527a8234486a46e3327e3cf2a987226ec0d8ef2f41a5b3534c327eaaa4b04ee8a45d8891c81a4 SHA512 8027e251c442459f9458296d3d0339f23c90b4c8fe83af614c9f93e83fcb783e98d98bdfd0b8aead5bca8d44da0ec25be6486e4ac25d2dd82fd0765184c85f1d
-EBUILD miniupnpc-2.1.20190824.ebuild 752 BLAKE2B 6cfc3ea9ac5a47a1623131fc4f01e24c838072a78f5b563499e527a8234486a46e3327e3cf2a987226ec0d8ef2f41a5b3534c327eaaa4b04ee8a45d8891c81a4 SHA512 8027e251c442459f9458296d3d0339f23c90b4c8fe83af614c9f93e83fcb783e98d98bdfd0b8aead5bca8d44da0ec25be6486e4ac25d2dd82fd0765184c85f1d
+DIST miniupnpc-2.1.20191224.tar.gz 94740 BLAKE2B 85c0b3eb678685bc7192dbee9440ec5f5be80cbac4d6a4e0a6473662c66f05ef512322cd535a142ffe16d3099a86f78ea70645a7eb2979c373e7a486aeab0cd5 SHA512 d362f914ce9177c1bc46f1f3ae59069c61c0c9c1b6ea7e78003d6b46445d3550835ffc541c2649b5fbc997d035357b461148edb3648135f33d0ce98b54961917
+EBUILD miniupnpc-2.1.20190824.ebuild 739 BLAKE2B 73bad0a0fdc74606e0783569bc152e113fa3b1424c5eb05dcc6f94d5a64b7c2ff996651c1714aaeda494780af3bd8a6d74a9874780cb5613eb4228d6e7e8cde0 SHA512 a073fdf2b62eef20783fd866fcbc785f90e0b9e60669fc727584884eee03a8e48e101bd9c1a9a7482c1039f63aa1b7e8e9f8069d9fcc47553b507ee9c3d0e708
+EBUILD miniupnpc-2.1.20191224.ebuild 745 BLAKE2B 8ae3f7b8f67acf1223017798aaf71de5146741436873d532256d5e24c158f899e31a02174d481e1e2a2f3550823b9dd90c5fb2252d5871bf6b5566628dc832f7 SHA512 722fbddffc96f82563d51f7d13eeb7950ddcf61cedc44616646bf5f597f405ab0808ed8576af82339a8937f0def52fa068a26a51a5c8e61fd594312484fa3274
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190625.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190625.ebuild
deleted file mode 100644
index 04591900a408..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190625.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
index 04591900a408..21a3f14354c2 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild
new file mode 100644
index 000000000000..8c1fc893ace0
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20191224.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
+
+# Example test command:
+# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 416339e50b2f..be3ccb727dda 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,5 +1,5 @@
 DIST mistune-0.8.3.tar.gz 58506 BLAKE2B a4b96162514ba1b82710c9264d9005f151943d525ff7e28a2fd4a92b16d4c90818715bf851573e25be203537a3059dbec1e86c75ec0ebd0a4b164303c06d7029 SHA512 fc0b6d53e7a62712b752bff77c2529750628e9e1eeec02603bd2c793f9b0a46efe31fe7a749c5d6aae3c591d74e43c45e450179650bfb57128fb0ec366de6aa3
 DIST mistune-0.8.4.tar.gz 58322 BLAKE2B e65d45c5c95706a49a7fd407afe5f10e82a475766ca272ec3bebba8c89e670fe6efced7b09537efb69d3fd36e75091e370170a15ad7488b5cbe9186e2ccaf4db SHA512 36c3ef5d5537f5cceaa43e4da20a84b27c378cb744a93f0380024faefde490bcb42c453f79002ca049083fc437278f4afb3e10de5462f9eeb9077ca2a2fcaea7
-EBUILD mistune-0.8.3.ebuild 751 BLAKE2B 6125794ca4c07095e0adc4d16dddbd5dca99a109ebbf2f51453a9a9427850f1c1faa98d0d099ac58ad05b0cebcf09b6fdb3a546f0416549bf9bf935009bb647c SHA512 b9987db429f31e64da5b8c363f21af9c04025b2916cd9036a807f9ac7ea06bd1ecd4e21f490b8ad14bf98170a0ab14881775184ff1c2db06213aaf381408349d
-EBUILD mistune-0.8.4.ebuild 645 BLAKE2B 44b90cc3bf07480992042c175e9c8aec6311cb440fd03f001b95b45607ef2ee5c92c2d7ce17dc2846f69852acba0c7434d2b287dc97b4fca1a05510c3d6d68dc SHA512 d4dc9ebd50ad07a438845773e79511e4bccb9c55c0239116a12a7a02281b463ba73750614b387e1abcf5e838442f7321400d60dac4b41cb450c20a72d1d7ebae
+EBUILD mistune-0.8.3.ebuild 744 BLAKE2B 06c27d31d2df93373ddde1aac9d8ae5a0c0fa678815965c63a3a0c7f85e17c262fe7c935e45efa041cd62ffd75f566dcd703ca3ccc18355bd59ba84c81dc287c SHA512 fa16e34d129e753f90d6df135e236955c5745b28402b8608088949c16f415c3ef3882787a228a0dbb7aecc0b8e8fee2770f4b218319494302f1daafd3bc28c72
+EBUILD mistune-0.8.4.ebuild 626 BLAKE2B fd0df68b0ba99ce4c32c559e297e01442160e12e96a0b7d3c8d32079dc43e6c2bd20f635bcff906fa09e8f07e97b921e32188127f8bc3a0566b93fb3b5e21d0c SHA512 aae3f3dd05a7d41bfb72e175603416f7c3d8495bd339c5692f6622a148efeb5e84e23b42e6c918e9f824aa100d229bc273b5611f91ac8e1a9329c5bae4a30abe
 MISC metadata.xml 377 BLAKE2B 6c495d3d88811994e4baf0aabb5267343c09162239cc655b5fe4f9b8b63df4cb08dff0186cbe6b63018eac2cc2489a3f612f72d49885df3055591da74f5fa5a5 SHA512 3630e9ba514f3f3b1ecf532ca928c3bc89c05ab50a9113ab4b1d609edf07a6421796774ee4a71cf17ea3c2939acea24e22a74f33b66fe630706dcd6482cf817e
diff --git a/dev-python/mistune/mistune-0.8.3.ebuild b/dev-python/mistune/mistune-0.8.3.ebuild
index 18a913ffab45..6140ca91fbcc 100644
--- a/dev-python/mistune/mistune-0.8.3.ebuild
+++ b/dev-python/mistune/mistune-0.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mistune/mistune-0.8.4.ebuild b/dev-python/mistune/mistune-0.8.4.ebuild
index 666b5c9c2310..f618deea3cd6 100644
--- a/dev-python/mistune/mistune-0.8.4.ebuild
+++ b/dev-python/mistune/mistune-0.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ LICENSE="BSD"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
-	dev-python/cython[$(python_gen_usedep 'python*')]
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index a97f79f9a895..53abd689ad25 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,4 +1,4 @@
 DIST mkdocs-bootstrap-0.1.1.tar.gz 363121 BLAKE2B aecbbab8a0ede98d52cca778d6d8430945f3b1e962f3bd4b3a5c0d544c51d0a06a21e4d0b15390640097d57b8f30ea5f271d201ef9ed0a15ff034e08e1529e33 SHA512 edaf4178f2a5914bf6fb7daaf4dfeabe42eff6872e60ca78bf748b55bb2e487742ada279696ee6f8aad87106d38e7bcf0e24460b85d441b5f77e4f64a99a4b66
-EBUILD mkdocs-bootstrap-0.1.1-r1.ebuild 396 BLAKE2B bec1f3ddbc78669f78c70ceaa58c751b5efa9ee8d1f3d9ebca5d16ca1bc648c1081b3df3d2468be46ebf7500c88cf45e597c210e45365c322189b7988e651a6b SHA512 d9d7110aa538bcbf00b69a18a0f458643467ef9db7a02d042689fb2b148dfeafff2f7e9fd555bc4ebc47093b68a6d1362977d9691090f1b018c8dad704f8336d
-EBUILD mkdocs-bootstrap-0.1.1.ebuild 414 BLAKE2B b207532740c8fae6f1c2e337b7e28ca1c94e11938dfb4b7a746889774d5f7f42a65275c04441ebfe767aa5f3e38eb7be93576ea041ba802ad0d9cf139a1bf5cd SHA512 b8a5cfe702bd593e17e999c6b12037333af40d2f731adcf461b745627d473a0e7e7aad9e23662260df94cf4555068be260d7ff842f07905e1dff28e8161ec23e
+EBUILD mkdocs-bootstrap-0.1.1-r1.ebuild 392 BLAKE2B 80b780a82bbcee765ffb1a0bd108a22b7b43221734a920e0f8f2023901180823411871edfc05f2587dbcfea7fd30576638bf216d04daed8ead7d556e8c46b843 SHA512 e0a0e17c6c3391ccd59f86f580bed1a9affb4972080d2dc0e9656789ad615eb490bdab923a2eef344e43482ecc3a13987280bc9a4a09da3e238fc0dfc9844c47
+EBUILD mkdocs-bootstrap-0.1.1.ebuild 410 BLAKE2B 62aeb1f0be7f045578540a2e69d41a9b3342d03e1e444d8f80829e647c4d82e4b047b3bec7e1584f53c091a3187143eccde9da383c888f04c6970b0b8c31a867 SHA512 7c3ce4252f8f7059ca641726ff234d132ddee491665e70670fe8ef3a9628ed71c6a3f37f19ce11e502e072b408cb5bef7cd134f81b467936e104517178e35eb9
 MISC metadata.xml 244 BLAKE2B 984a07400477f088442a2ed1491b8f96a78d1895f5186dacf5ff5c9105199d82a7df31deacd1d5986338db1fe2e2de130bf8615965fe2466492b308fa9ee8a0f SHA512 c767d00b3250438eee0e53e0cfb185601b33c09743d3d4ad7131254ba752a065465b316a279956587a70715920bf7563f420ee1fcda261eed4510528fb78e1b4
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild
index 25f8b7e1debc..070124cc0f37 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild
index 47ed42cd22ca..628907c1f976 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index cf3eb2f30731..9ce4aca72f13 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,4 +1,4 @@
 DIST mkdocs-bootswatch-0.4.0.tar.gz 4409488 BLAKE2B 219d341a995f39e58ed5aaceaf0b94f468b21a9959220f598cb7d6370c550f67591fb8a480583a0969d6b6bad94af84d4b874ee80b63b430c6f7177a0e2ce46a SHA512 46ab2f40fc5167dd96e7dd6d80b99696f371c46a1f0dca029dc444d352da71c0f05f765acd67a7a79a9e3f15140c0b0cec4e395fa247b4bc09f3b77d69b905ec
-EBUILD mkdocs-bootswatch-0.4.0-r1.ebuild 398 BLAKE2B 7dcbffce62c5cb4fb1f5a3a6506783eab2e8da050fa0123dd3ecb1fadac6a5ad3ce5ae0c7ba53424276006ce40a51ed77128fbe0aaaab777b3c6045897b06759 SHA512 d88fecccdfd83ad8db2575ad49961a712cd0d13a09137181069f0f9bd57a0f18fcf4f4528323907ff1c7dac0396fb57e2ec28a0b1c58c9b0f5779d2f7686a3f5
-EBUILD mkdocs-bootswatch-0.4.0.ebuild 416 BLAKE2B 393e16e84165427c04dd767364fb743809cb6266f8a4c1ad219814470c46eeb279ab90cff9b0cde52878409ffa3a7b4d8602edb4b5abce5d36bee113fdc4ed21 SHA512 69b2d4d32535fdc6df88b9919451868959ecbf6770e7996f0aa38e5693229db0198dc3bb1c57b6f19e363cc42058bc4e58c0cdc1a2114bef743e605a7b71931f
+EBUILD mkdocs-bootswatch-0.4.0-r1.ebuild 394 BLAKE2B 446d4c6eef09ff038323d23bae0c9e1e6bd83951f4fda49c7fbd759b4ad4d72aff82fcdb0c8d40abd4bab5a2475fafc24b2b2ce1e10ad398a91db1c580956521 SHA512 706fd00d7cce525a2e0247211addb71f530badcaa73e7c36cf4c758ed4dc0a1bbc43c221177f54cf1cfe56c39f79065c84b1cfdfea7226088df1d78e5a5bbd9f
+EBUILD mkdocs-bootswatch-0.4.0.ebuild 412 BLAKE2B 7e551cedb8ec0b611f7d8fb8e42f6e4c9a57fb624ef39227d473268a57ebcb4b589af6a3ea1eb5964c125c6eedb4655d75dd704991fb38fd97418a1ff615bc36 SHA512 0439a70daddaef6e17e3e078f48a9a1a58c379a07ada5afb0d75789bbd2f7f74aa6d894e8f67f8bd6b76aa4d3463aea2b9a118056a3fc8d9bcc334eff8579095
 MISC metadata.xml 245 BLAKE2B 95cae7ad600443b5a08b11a0193a4a30ffa6b084ae5d92b416adfd5d2324224f9f0a2df337d8636b031f3d48e9e615c44f3d30e91021aa39fce748a8a5debf57 SHA512 683cc090312ac3e11fda27d1b788d7a5c1686600d727f09b441de333753d9737dd0228a974801e8bb18ed6470f61264cb8af45ab90faf077a8e431f328fa63b0
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild
index b395fdcb4e7d..03c8ba148de6 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild
index d7bc8f2623a6..9a7d1ee9b0cc 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index f49edfe77244..a60dd20d9059 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,5 +1,5 @@
 DIST mkdocs-0.15.3.tar.gz 1805972 BLAKE2B e6619fa0bd14fefe96de5abeb9243369b1419e7018705ac6a6d58fcb40c01aff380c3b4ca514af0a25da90092f39776abe42d19a67f7e86780c5c4111884b230 SHA512 e5b72eb56dcc2fe2be154155af15845a7d0fc06d6176f1c6b2bb54e8673d207146bdd92b37a709d72c1d59fcc76a793e6fed5d7fb6d9008f28d43baa17e446f8
 DIST mkdocs-1.0.1.tar.gz 1589767 BLAKE2B 54f7a33c166fa44b9471069db45436e1381d451470fea4ed11de1cabc0cead3508bffbaf2303d33904ef0bee8f81cfbdacb0fd095ee53d6fa7c09f33274c03af SHA512 9f6b1ff5922fb58783d70f3912bb0170f927ba0160f5e48f71db2d267030208bd50997f14f4626fbfce891ddce7f97747ba05100ea96cdc24609341d382f039a
-EBUILD mkdocs-0.15.3.ebuild 1084 BLAKE2B 11a788e2555a426978fabdd6875fb4a73d46707293e94d6df07f8c479948eef712d3a0739ee56288b1161527878ba713fecdb2a9ac2390c733cabfee8bb133d4 SHA512 4ffd9499aa7a66f6eedd7fc7aefd7409231f1b9e9d3b00de99d21fe6bc3664dd59707842305054707db763071ec9c0eeec3ca36a123cbe30dc82d72174bc7dff
-EBUILD mkdocs-1.0.1.ebuild 1344 BLAKE2B d803eeff9e6ff8a77cec634d44fd223c0eadbdb93238bf0ee710e3b0ac772449c9796baf5e67b5a8939e5c2c026dedfb5a3658a11694e8767afd1dd048784715 SHA512 e64f04168d57fc6e58f6c01b8d92b94d1c446820fe6892f2dcc303d56d861c529adfbd3afdf87465282669b219712036f3119eab5494daafe365b6ad1ea1d0be
+EBUILD mkdocs-0.15.3.ebuild 1080 BLAKE2B a185448eee60477aa43f335ca78a63cb5695b0295e09a99b76848dc08871d27dbed4d92741d6e452d43c7dc4166fc818ad3c9cf13610291abece201f7256943d SHA512 c7897ace97331df8640dd0d53f544757c98ad5d912a6ea63da4ee37027fab0c9abb3d9b6ba2e39fd4543b732c5d15b73e50799d4eea743e70e998137e5ec89ce
+EBUILD mkdocs-1.0.1.ebuild 1340 BLAKE2B 00acb8ae05e6737b4ca10372ca2b42168c4eb4fb9931d166a757f78c9bc4d8269c75f460090bd1f7b03827abf38cd863d4af35919de3b3a905b700580e2429ba SHA512 63588f217bb4f0931eab31d6c5583184b03036a8188b101aca6ef3eef7932e8472f51365d18c34b52d4886c7ae9779a59eec3251af7c345896e2fee94348722b
 MISC metadata.xml 248 BLAKE2B ca12914d7dc6c1711fe96cccf5fe6a62c7854264634cd4bf62450125107655cbd64ab6e214fbef1065948a6adec5e83b3c0ba272f307a3c5b393dbb671f2d8cf SHA512 4b39eb7ca7e3e9fb49cdcefb0f721af61ec5e2e701becda0e3746b964be7105117fbde1601415985a7bcf23b3f42a0a44a55556a48c80c4c8d09ab1c7d848b9d
diff --git a/dev-python/mkdocs/mkdocs-0.15.3.ebuild b/dev-python/mkdocs/mkdocs-0.15.3.ebuild
index 1f523fea8432..32e21af0b96c 100644
--- a/dev-python/mkdocs/mkdocs-0.15.3.ebuild
+++ b/dev-python/mkdocs/mkdocs-0.15.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/mkdocs/mkdocs-1.0.1.ebuild b/dev-python/mkdocs/mkdocs-1.0.1.ebuild
index caf287784474..411cce64172d 100644
--- a/dev-python/mkdocs/mkdocs-1.0.1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/mkpythonproj/Manifest b/dev-python/mkpythonproj/Manifest
index 39f900726682..09c3e47d2a72 100644
--- a/dev-python/mkpythonproj/Manifest
+++ b/dev-python/mkpythonproj/Manifest
@@ -1,3 +1,3 @@
 DIST mkpythonproj-1.9.tar.gz 34828 BLAKE2B bd8302e81285ee8922f6eb04de94820cd978a3e236504e1072eab3b48df4e39c44545d69043b011dbf102397528f00ddd95dcd6830d6ac5f4a93485d58850ed1 SHA512 6ace3a00657ca1e853b882e897ae727eede5f1f5d72f016b439be2d747ea7cf4954aed85032a50549c1a44f88fd98afd727476bef77797fa53c2234e1d22673b
-EBUILD mkpythonproj-1.9.ebuild 602 BLAKE2B 5aac727ed3d5e51aaf9dd1aa232d15b5df5330a8ae9b4506d1f736172381784567ed740e0caa21f95b6a8a749c608e81d90d271eb8f97b42c77d6302dd08bdf8 SHA512 3e7df54cb78128b2b8e41c3798e0eacac143a0f328b6131af240ac22243ea3b96dc90ba14266b7966c16b7001744966a56115bca8e259f0f1305c7db0932703c
+EBUILD mkpythonproj-1.9.ebuild 594 BLAKE2B e61d55c07aa8adab702415a37e491b58c4dd6047beb4f1e11635a5803fbc494267f41bb2589bb500791cb91ae963c23dc4492fe26579615cc2e8786f0f3d3796 SHA512 46c4c2c091ccdd1cdfbb26bf389b11a96ecf536f9cb256a449ff46eeec079731effdb2d27b123ea4de4221b7e1274e927e066ca31e526bbe8125c4070eb882f7
 MISC metadata.xml 239 BLAKE2B f298704840f96f80c1e9ceadb8449d5486b5f79ec5e8c862ec28f7f1c274c79b6c1ebf72239ed5a6e5f79f5e5f947a7b0bdbecaea0a4dbbde88a23f63aa25eb8 SHA512 aaa56fc28c4600c5b0de6d837feece75d69a7ede375e5758766f46dc4fb44060f35e6d6eb343bba9e1698400139059e2118fa401969cdb66b80f422c95b59ca2
diff --git a/dev-python/mkpythonproj/mkpythonproj-1.9.ebuild b/dev-python/mkpythonproj/mkpythonproj-1.9.ebuild
index 03b4b1424f99..d8d6df081f54 100644
--- a/dev-python/mkpythonproj/mkpythonproj-1.9.ebuild
+++ b/dev-python/mkpythonproj/mkpythonproj-1.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mmh3/Manifest b/dev-python/mmh3/Manifest
index 953d973cdc9e..8e0146270402 100644
--- a/dev-python/mmh3/Manifest
+++ b/dev-python/mmh3/Manifest
@@ -1,5 +1,3 @@
-DIST mmh3-2.3.1.tar.gz 6122 BLAKE2B 5dbc5d0cc2185d587bab061bc66edab65e92b71aefe589545439785dd1fc74cb5f4c0330fbaef2094ef3c4581e93672387e36e2f0207a261f7b06964d005992a SHA512 9ffdf23f7fe33583713daf299fad64d4e3bc3ba433eec4e1d24a47daeffa39b13aedcedd3005f2d873a01dbc2d1b1ed931eed30d09e1887eaa0980586af37cc5
 DIST mmh3-2.5.1.tar.gz 9797 BLAKE2B af83f2e93bad0160a73d93eb41528b5ad6e5e022bf82a356df95ada3e3b73e7c0ad5ce95cd62ae956e42d7b650e53794abda6cc749d7e441ec044c14b4d5de9c SHA512 1cc2bdaceda00e90355fcca990517aec77e60c2117e716cf7311a5b4aa1a78635cee16ad4d551d73ea72a18fe9c40fb24b7ff042171eae252cc4fb5660592d37
-EBUILD mmh3-2.3.1.ebuild 436 BLAKE2B 4b53c5f015f0156461377330b0c0bb62933ff341cfe0d16bd274c2c825e4b73b0b3db4f1d3337e547c36fa6893f46b6c516f8194f42f5badf7cdf1eb50eab4ef SHA512 b762ad86016cd1069cadbf82f58bce44577e4a59abe337f86e388de5d813e42e05aac3b03c4babcb97f2e6716261900e8a6a4c81034ce3058d6661ff5d6e5757
-EBUILD mmh3-2.5.1.ebuild 467 BLAKE2B e9c6b1bad39d83d5ef84ee377774d0bebce6b5899a33313a7f3c51ea99baaa99ad1d89a62cdbc1df1edee438bb87991d6582fadd5c0dd106a3b6f77277516786 SHA512 8af69aae3b887b2fdc5e83859206fbd60f4985b62219c84f01f0951532dcfd6045f6f9a65a350a6464dded9a97962cb7793f80c9919a65b1b4c09973e0681cce
+EBUILD mmh3-2.5.1.ebuild 453 BLAKE2B 9883fddac10a175d9b04f53387a70b1d43c48632166227f614f05dd360f31b92f5d9cd6cc6e279aa7cda021d9db2491f4c433973652e89e0d1ffcd83a19c07af SHA512 a9c9cac3a930d8b4e1a317fa3abb5b057e02c297a9b63e8bed18d10f13c82f4c1ce14c6f5e57786ed7480ebe85249ce32f587705decf1b74b6a032f58b3b9fd7
 MISC metadata.xml 533 BLAKE2B 3c3c9600b5202d7fe85c89f3795f7758d05386a4eb7b2d4fb985c8157385ed2e9375aa4c3b48b4a76cf976a920af61934e9a70dd46609ff59338d400cd847718 SHA512 0ce139f6e24d78adcb11d7c1bb888daa94d382093a285ade74825abea3321a06dec759a9f8477f588c70e91e5276856a7ddebad3b8377fdd35ae7cc311e30292
diff --git a/dev-python/mmh3/mmh3-2.3.1.ebuild b/dev-python/mmh3/mmh3-2.3.1.ebuild
deleted file mode 100644
index 692019f03ae0..000000000000
--- a/dev-python/mmh3/mmh3-2.3.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit distutils-r1
-
-DESCRIPTION="Python library for MurmurHash3, fast and robust hash functions."
-HOMEPAGE="https://pypi.org/project/mmh3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/mmh3/mmh3-2.5.1.ebuild b/dev-python/mmh3/mmh3-2.5.1.ebuild
index 45f7f983ab3e..d797afa81be3 100644
--- a/dev-python/mmh3/mmh3-2.5.1.ebuild
+++ b/dev-python/mmh3/mmh3-2.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python library for MurmurHash3, fast and robust hash functions."
diff --git a/dev-python/mmtf-python/Manifest b/dev-python/mmtf-python/Manifest
index c3bceb88ed13..eba8582cd562 100644
--- a/dev-python/mmtf-python/Manifest
+++ b/dev-python/mmtf-python/Manifest
@@ -1,3 +1,3 @@
 DIST mmtf-python-1.1.2.tar.gz 46309 BLAKE2B b21d53f7cfbdf6f6bd4f0f3ac31a846e83ce0ee98faf77fa8d06de7520c4aa64a259e8b43a744a440a6cf1a10ad461697334683364698a68222b690301bc5554 SHA512 92afcce48c2de186cbf9c2cb39c94c5df14ae0eb613862d41b674b7d2f338855ed81be23fb14d16d2dfc8d33415d3904537ef4a422e3a52b78d461b609e968ca
-EBUILD mmtf-python-1.1.2-r1.ebuild 476 BLAKE2B 546f0bc1a60433852d63ff045fcebc7bd8cd93149070ad61acb9ad3b75d9fd0b566657d69a2c6bea9a93ee8cb1f6769ff205b7d3de7b3f088885d917d4a0eee1 SHA512 16a15b2adc7f52ddb0231d3d2999f3c5fdd4af8d78ad7e023036042affef222a330f257e4282a93ededaa68471e619a3d4a903b23bf4dd7566a568ce314e4da1
+EBUILD mmtf-python-1.1.2-r1.ebuild 474 BLAKE2B f2df91a32ae23e295b74f53a680304b4971dd27d4000234b37dc2acddb2749c36e38762612ccee9c5832d0bbf20d47249615ab68e676977f2814efef79211d4e SHA512 7740ef9d08e2bc7d5e526777bc3905c73105706ed930ca12117ff1297f69fd5914ccac2dc23f5012de6d456a05aada1038fb9349e2e10b3823dfd4bab859ea4b
 MISC metadata.xml 430 BLAKE2B a69050101da1e1dccf6b335506250cfaac02f1b87c87946d72aa1c3649c2f5ca107c4772b9dc410088397be824c59b2c9e6e611ba548b7b007aa22e7d9a12a46 SHA512 1245d1c1479afc4dde1a787d65342997754715a530a81d73fac1512a5d20e54fb36c80c1be1fe017b1ff9c14ee786f3b0da6b1a7bf689619285c7a86d5d376b5
diff --git a/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild b/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
index 189d6e2c00d9..ae52b3eeb899 100644
--- a/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
+++ b/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="The python implementation of the MMTF API, decoder and encoder"
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index fcf161e3425e..56730851cc9e 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -3,8 +3,8 @@ DIST mock-1.0.1.tar.gz 818644 BLAKE2B 7bfe02c413c2f98a2d98ca9cc40ca8831d65b3a509
 DIST mock-1.3.0.tar.gz 70908 BLAKE2B 4df669c5d54fc835c70d6190362d4dea9cc0d2e7ca47f6ef5a394bc80cac10898b611146f28da93e84c4b26c23f25708be3c8fc6b61062dae099396e351861d8 SHA512 10cbb78b89f2e82abfcadc035a526182f83b59df4775cd85acfdbeb4505791c63b7a3761e6126a08d9aedbd07ead8632ac2a728dc07a362f4aaeea694bdecaf9
 DIST mock-2.0.0.tar.gz 73684 BLAKE2B 970bebe72b6969b58acdc2856b53054f992d01f9f3ca5f91b73073d0a1c9ec89a5c94fd66eab85b258f23f33326825ff6598bb2ba8e07eded1e6540a26ac5fa3 SHA512 a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238
 DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
-EBUILD mock-1.0.1-r2.ebuild 1122 BLAKE2B 4d00d5a77738a33e64cd7298efad068206f44141e7818f1197023da2a08a5549be2fc20c378aff5f3defea1ecd3f48e0e246bde71ddd5271b77a5f4a099b6a27 SHA512 9a849307f5990b5bb85fc7231cce8622bb17fa7a2de24b6f7e0a082c3a415891ffd3c80f034d795d3d346e6ced972e7ba230d61662b1697e32f1562441a8962a
-EBUILD mock-1.3.0-r2.ebuild 1073 BLAKE2B 1e0c6261ebc7b0bc7bc7392c68fbea6b1fdf10d4e58f591e3d35c3f2523ad6bdd0aefb98680bb1da8c70a318808eb557fc86f770218b7d622b493565d73496a0 SHA512 ddaf8c0b2fe99ed6fb2874a2fa212e1fe7df1bc92739aa7b8f134551ea9707e674afc8de16030c03d1c2e35e2f1fcf38c76187d66590ec1ee30baa5e845f0866
-EBUILD mock-2.0.0.ebuild 1081 BLAKE2B 0c43038172d0b22af9759a1abe473d94808ed47c2678304d93c02394cea4fb5992fab6e58a8cca4809277469d71596203d8dd77737056b2c821cfe455e4be5c1 SHA512 d270885452492921423d0f330cfa1a23bc3ba03e3639b29a438cda1f2b224a65dcf6bb1f9c5e2ab7b384d7d4f0452f78c0bef9dfe272ba0038de5a3fffa979d2
-EBUILD mock-3.0.5-r1.ebuild 1476 BLAKE2B 06d3c10e3a6b02675ae5c89e22c69d9f9edb4ebc0477f72dc1e4fc61e980340cc751ae97858a472f8a7982f88fe93a644dea2665b537828121c51cd76e05052e SHA512 55ffd98626870a2ad08b2b191f74a8cd2469fe8574936187073f03f108511ffd6ea316af5936860f7cf117600ea2fcf0fcb2a1c535cb05556cd11aedf865d575
+EBUILD mock-1.0.1-r2.ebuild 1113 BLAKE2B c84a813e9bf501d2c65d5a47bf4dab44ca9aaedbfcbe3577de19328f1915ce45e4fd1dbbc98eec54807f9ae1f2477b4367aa97ac6127189d6c09b6ee038a1615 SHA512 4887ed0715c0a0a98bf2ad01b7d913edc32b8d166a87bd158424ef839f95804b999681cd2b3ff729aefbc55ad65ff8c3988fba6d99fc022b0aa09d32dad02fbd
+EBUILD mock-1.3.0-r2.ebuild 1064 BLAKE2B 0870756a130f56a03066197c233da04cdfdd77646502538049d36d817b9d5d41eba4dd12e47630325e8dad3a1c1db414b1ac8c6c6f0377cf3a974684fa67623a SHA512 4481c46edd1ff20648ca2a335ac8927c0eec77348546d6e291e51f0489596f74c059c983f7fa92f80a197ed2a70a3079f8707a8dabfee80cf506007b023d79a0
+EBUILD mock-2.0.0.ebuild 1074 BLAKE2B ab8ba91ba11ba2998a37536ea7e9f22ba2db0bd6f9dab46e3a8004723a419833547101f65c4ef3af08ba9b71e78f2d4157f4f128192afb05e354b64bb97d6e39 SHA512 68cb05eab7e1fad09e14261df2f3898b67b2c61caef5ba46b7f68b08b66b8f3606c38cf064e781bbcef0061854fb7e3295bb14d137297deaa02c4818e12e6d43
+EBUILD mock-3.0.5-r1.ebuild 1469 BLAKE2B 3075913cdf16e2e2265a7e4493d0e51786764ea4574ce0fdc8f09843b97e4141cb1c21bcf2fa563da568a5489d038ebe44dea9b0a6457803e5e3f3a77a7c968e SHA512 430c90e5c0884423e0d85722e6d1b0449689e28718e63fe462a548f8eef1064c55b04f19dd36723ed90a584a27eef59d1bd2b7a5adac4e75488eb5d572715758
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
index bb4bab3138bd..9a140d32f3ca 100644
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ b/dev-python/mock/mock-1.0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild b/dev-python/mock/mock-1.3.0-r2.ebuild
index ba7cdb49f668..7ffd78eca39c 100644
--- a/dev-python/mock/mock-1.3.0-r2.ebuild
+++ b/dev-python/mock/mock-1.3.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
index 5981e50dd65d..e3909a4144f8 100644
--- a/dev-python/mock/mock-2.0.0.ebuild
+++ b/dev-python/mock/mock-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mock/mock-3.0.5-r1.ebuild b/dev-python/mock/mock-3.0.5-r1.ebuild
index 3482aae0719a..40faa14a5262 100644
--- a/dev-python/mock/mock-3.0.5-r1.ebuild
+++ b/dev-python/mock/mock-3.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mocker/Manifest b/dev-python/mocker/Manifest
deleted file mode 100644
index af995ee308a4..000000000000
--- a/dev-python/mocker/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mocker-1.1.1-pypy_test.patch 1380 BLAKE2B 69033e748aad85160008c4d0b55017771dcba69f711f6027532a342b5fdca68d28dd27ce0c52a4a33e6818d4c278c303ebe3aca58f60f58247910fbfe70e8008 SHA512 cbbda1c8903658332f7a391c7be547d62d64c5b149c2d92434558415dafc0c68686d5210ba814ba5edb42987f04e51cb8e5ee10e3a31684560a0856f9aba81c0
-DIST mocker-1.1.1.tar.bz2 36357 BLAKE2B b64243d7846cf9cf14e1737b148786ad13d2406f69222a33fa6f9e9031b0a42e94a76303c9751389c103c7350362adf6510b2b718fbedff9d879c7cf78c9dd72 SHA512 79fc08220b932f5e8ec4999a872fd522a71e2d193fb7842a60b164793863d97aefbd5b16469243c323b8ee151a33e1ea18703b7ceaa239c816bc09a3fb7f6825
-EBUILD mocker-1.1.1-r1.ebuild 666 BLAKE2B b59cf8080a3f5a68f2cc9e5d173a651d465ce5092cefad4d9fa205ce24253787b2373575833d40799093ae6e67cd138be402d2c043428e0dfe32762c57257ef6 SHA512 0cad92316631a6aa2a6c1a0d6400ab83e4f57b007951ac15acb3263c3bf741df18a098c77b5850f30d81889b3531eabe504b3b122f510d70f9959d154391e93d
-MISC metadata.xml 319 BLAKE2B a16e091a540578adaf5c1d7b17ada9b872ab67abf646dfb602bd3f53b70129525d8d7404120b7991183c3bab98049deb12e398365a89a807ba7d40f46248c579 SHA512 e5b4c5a742d74593e9bb504b3ec84dec33f96dfd414eecacfeb1b28542018b54979ec971259e8aeb193fb2a11acaac25d461684f75eb6832f4aba26739f1a8e9
diff --git a/dev-python/mocker/files/mocker-1.1.1-pypy_test.patch b/dev-python/mocker/files/mocker-1.1.1-pypy_test.patch
deleted file mode 100644
index b0036ad6dd11..000000000000
--- a/dev-python/mocker/files/mocker-1.1.1-pypy_test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream maintainer assures us "The "assertRaises" line should be skipped IMO. The next call actually succeeds,
-but of course there is no point to test for unsupported functions."
-Re the 2nd patch;
-PyPy actually behaves as if __slots__ was added to the class
-see http://morepypy.blogspot.ch/2010/11/efficiently-implementing-python-objects.html
-diff -ur mocker-1.1.1.orig/test.py mocker-1.1.1/test.py
---- test.py	2012-05-19 19:27:02.000000000 +0800
-+++ test.py	2012-07-11 14:43:57.848953730 +0800
-@@ -3880,7 +3881,7 @@
-         from zlib import adler32
-         # If that fails, this test has to change because either adler32 has
-         # changed, or the implementation of getargspec has changed.
--        self.assertRaises(TypeError, inspect.getargspec, adler32)
-+       # self.assertRaises(TypeError, inspect.getargspec, adler32)
-         try:
-             task = SpecChecker(adler32)
-             task.run(self.path("asd"))
-@@ -4060,7 +4060,8 @@
-                 self.calendar = calendar
-         obj = C()
-         self.task.replay()
--        self.assertEquals(type(obj.calendar), Mock)
--        self.assertTrue(obj.calendar is self.mock)
-+        if not hasattr(sys, 'pypy_version_info'):
-+            self.assertEquals(type(obj.calendar), Mock)
-+            self.assertTrue(obj.calendar is self.mock)
- 
-     def test_install_on_submodule(self):
-        from os import path
diff --git a/dev-python/mocker/metadata.xml b/dev-python/mocker/metadata.xml
deleted file mode 100644
index b523b23fd348..000000000000
--- a/dev-python/mocker/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">mocker</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/mocker/mocker-1.1.1-r1.ebuild b/dev-python/mocker/mocker-1.1.1-r1.ebuild
deleted file mode 100644
index 8ffc410daae4..000000000000
--- a/dev-python/mocker/mocker-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Platform for Python test doubles: mocks, stubs, fakes, and dummies"
-HOMEPAGE="http://labix.org/mocker https://pypi.org/project/mocker/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-pypy_test.patch )
-
-python_test() {
-	"${PYTHON}" test.py || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/mockldap/Manifest b/dev-python/mockldap/Manifest
index 24b20777b93a..cf589d961bb0 100644
--- a/dev-python/mockldap/Manifest
+++ b/dev-python/mockldap/Manifest
@@ -2,6 +2,6 @@ AUX mapping.patch 444 BLAKE2B 5d7da6146cb68d71d367900da68e7b1d18cf789c5df7ba4c61
 AUX python-ldap-3.patch 1541 BLAKE2B 28a7ee4636c00a78ebcbbeaa86a33fe3e962d0fe8457a2e48817da48fcc2f6d3b1fc7dbdab785795f2a42e735f969fc63b3858634ee8e6ea63bfe754c44ce973 SHA512 ff112f3f0b5646d745c88319ed66bedf97b8c3b8b80ac84ea836f2fc6cc9427fcc600980bc3fc5c31f0ec8de73e23ca60bb9ff4b9ba6a11b2dae8382867fc2d7
 DIST mockldap-0.2.3.tar.gz 22369 BLAKE2B 0021951556c0b8ea1f043b702f4d8f8719d272559db3ad8ee4e49955bb17a3caab4083a37486366145d8a7aea927fdc0528c1194f849917471ba6174b52bb46a SHA512 3e17d9f3d6ae5a33014e2ccfe521170af1b136f38b68b216df721059941d958b87f03fb4ed5772282d319cfae9974cf1ae9e4e3bec629d161761e2018ed26788
 DIST mockldap-0.3.0.tar.gz 18973 BLAKE2B d13665afb0fbbb8095036ab7576ff5a8c77f5711a0c6ec96032924191ff8b86f16031895ec7c1d8a0c67993121a70b2d62d645e5a2a4df713e48d82e2fe0e1e7 SHA512 0af4cf1762e280024525e8fbf897493925b91393311b36beec83dfb152c1dda5b8c7e45ddd10c02ea329a62b25133a4113a0a12292dcc669416ed4cebcabbaa8
-EBUILD mockldap-0.2.3.ebuild 1044 BLAKE2B fbbf56b1cf41eeeca71eebf637711643f7c254441d7d4f605c5b5e00970c4ca71c55c5c88609c666c10816c9c7f9d04c0f2426b5ba4b14899f284e2e229c42d2 SHA512 83fa5a12c8e030b1a4e181f3312f88ebcb6a3c8fd119da6f26884ba72b97fb5755021cf7be1da0a0b41ff4898218e100134b0db299e761e5e1b83c165cc8da36
-EBUILD mockldap-0.3.0.ebuild 1253 BLAKE2B 1dbf551edab7b69c4928eac9a777399ecdbe8ad0fd44b9a670a6cc31a92e5bb4cd8b97c4094dec08e6a4ea156f57e5d369748c63fbc6b6b4fb79fc46605cff68 SHA512 c9a093b385ad6e9f67c7ea51b0ecb7db3df48f106c8285df370dd12fc107592461ccf0900c2397907da381a540400e4ae7d6f983f5b237a54b08abd2353d5f75
+EBUILD mockldap-0.2.3.ebuild 1036 BLAKE2B 8eb536df1c5e420b1ea5ab11b1a12471f2cb3a3015fbbabb7bfd1c39611e738f8a7a9695e4a01c6dc0e6911275a1dc22b265e3fb3cb2cc0760d6884d86ab5f8f SHA512 cceb24ba4286a7c89efa4c37c03607a80219e6d0ff919f24358f40d9153fb9795c8f03f1e57f41eed58d1e9e35f1597b9ea248888d9c1f0d75bbf84902758326
+EBUILD mockldap-0.3.0.ebuild 1244 BLAKE2B 9a6fdfe0ace53a61f454c098c29fbfb0cb4e0047786028e4c0e1b7eb3009c7ca1c0fccb065acfb7f06b4e551eea266cbe77bee47847675686f6836fb106784b3 SHA512 61326491c4d3896d6d2acb64e2423d962929564ab13d01cc4bc18fa2ddb05be4cbadf9d4054d71aef3adda667d0aa2948e2baf645c5bfc607565b3ead77cabd0
 MISC metadata.xml 382 BLAKE2B ad5c85cdb04b4f63756abdfbeda8c5f7b5a03a763c0249119a8d8bd2cc72d4283217731b4abe0dd8b90d607ec9309c42d82b8292f75b1884c41a439331df263c SHA512 2b137abc6da4c0782249954a50bdf8d6ba9dd0254e04afdc5e0d7f5406a0451c78c2ed8b8fbc0c2214eb04a3ad842b250dc1910327cdab58fa5aa43f0de296da
diff --git a/dev-python/mockldap/mockldap-0.2.3.ebuild b/dev-python/mockldap/mockldap-0.2.3.ebuild
index 5dc47bdac1a8..657816c34298 100644
--- a/dev-python/mockldap/mockldap-0.2.3.ebuild
+++ b/dev-python/mockldap/mockldap-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/mockldap/mockldap-0.3.0.ebuild b/dev-python/mockldap/mockldap-0.3.0.ebuild
index c2831fad5015..2897568f71cf 100644
--- a/dev-python/mockldap/mockldap-0.3.0.ebuild
+++ b/dev-python/mockldap/mockldap-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index f923ac20bb98..af6e3b27fe5b 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,3 +1,3 @@
 DIST mongoengine-0.10.6.tar.gz 469469 BLAKE2B 3930126d64e1b43d579412069da33a96e6c525d459905d05f677a406a262a15e16d8f6460637c253ace4addbe07655d194fede19fe050f4628aa17dbb6115038 SHA512 a8d16739892c64ed408afab49c6d33a4b438af83e003844caa101cd51366038ba75121d12b4385a546cf4d946a506bc11f173355f6855e740cef9fddfd6437e7
-EBUILD mongoengine-0.10.6.ebuild 814 BLAKE2B 2ed50f94c140fe43c3ca89bffeb2270dfd5e40a56c89e347073653d42ee4eaf8578c4a08e2322ddf8e1be0e5c30912127c54cc2ab75eba6358249435e87c9657 SHA512 9cbd29b2819ef8f37ae8a9e8f4c879a15b9c5a4882a1120ebc477655372ae1eaa87504430297fb642feffd8e9397d4aee833686d67cbef14427cbd5558bc4702
+EBUILD mongoengine-0.10.6.ebuild 810 BLAKE2B 24017afb6cd21e334d917242b453f7698c1395b62a53e9774bdde4fccdfb1523d57acb33493d0acb4750faa082a1d6a9c55a7eb46f2f4c839fe5236eae3a0565 SHA512 205fd957291f16505fc6e1234807c065e938a07061b8287896e85147115110dce3c795316b056754d0b28925796fc9b49c15de2bb613fe00f034d3e24480ecbe
 MISC metadata.xml 338 BLAKE2B 5ecb99b784399bb9e25c094b38e6585d5dd6dad6bade4eebd9b986e5022ef89417e11151de2528439754717c76c9601aedf24dd3295eca09bf0c59f9bc1130cf SHA512 b25628f5af0a4c32d9ec8d7bc4e39ccf6bf2c9d9bdaa60bec2a3da846a9a290944822a1d8233cda735a4cf3a801acbfa47826f6bb537ce5c7efedc669282e523
diff --git a/dev-python/mongoengine/mongoengine-0.10.6.ebuild b/dev-python/mongoengine/mongoengine-0.10.6.ebuild
index 69693289e21a..3f9c15e2115c 100644
--- a/dev-python/mongoengine/mongoengine-0.10.6.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.10.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index caaa610ba7c0..0362e3b90c8a 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,6 +1,6 @@
 DIST monotonic-1.4.tar.gz 7463 BLAKE2B c9123bb5ed5ece16014c9467c7e25dfaee8d0f30096a73f5d001b0bfc965c0c1f2b501ae39f5b490edd61f179c4e688ce4b794bdb6a842ba350d499eccd8335f SHA512 f9fa079cc325592b0bff799fabe7f9e87922cfe351776ed08be7a0060d27f81ae2c23aa7a1fac2ac2203ec26547e05fe3a918e68e6a474768b431ce860522eca
 DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970
-EBUILD monotonic-1.4.ebuild 485 BLAKE2B 8aa2c97ac58e7484215e33dbc38b9b3a8b65ca3843f9247416406ed8fa93f48319551be417c2ad395dbbbdf759d80b9080216c49af5d574e6f120225a53ae5d3 SHA512 e91f6bccfe1e044b077830daeec55df1389827a0ab32c387bd0b85a3811a725d33cb2814f08be055ed4aebfb77d9a7b4d0d2dac8df4375397502a36145d887d7
-EBUILD monotonic-1.5-r1.ebuild 495 BLAKE2B 5f0788f10329c966d76f406680c05f7ea839012c801a5a1f766a10d4d50035fa4f85535c8ec4855bc100c9c810db96e3867db8e26c6105bbea0a7d3adff5e960 SHA512 c2a6fbb75bea7ce8a7eb6e1281ea87a66d879923e2b43a54e3e68eeed6329de37e89610791a855d40dc6f19db8e30afad5ea2ab16c920f39004133daa9fcd953
-EBUILD monotonic-1.5.ebuild 489 BLAKE2B fd2db7e3196fc79790bccdd3f701bd9ca6636eacbc2286dbde4736064935a3121f5310d343930f56bcd78d00836f0925c3f3fced41ab045d5098d881c66f4157 SHA512 4b5a8ccbf48afdb8ca5c821ec278984d82599caaaf3ad1baeaea99c90beb2fc350d375602d09d63a49e3a7d1790f63f848884aaac22e240ce75735489769a21b
+EBUILD monotonic-1.4.ebuild 476 BLAKE2B 18c6af7a8e42937f973be9a7eb7655b9612a402c66c10286f869707517d3170e139085164bef5c5cdb1627c1425567c41eae4a4859ac7af6943741601d7d2752 SHA512 de3473eab92881bdf16591fc19bdfaa1d1ec8c975f181e8d3092cef59b7eb10bc3d7653a0c3cb5afa389660f5de3a274f1fd4f955573b6b64a8d0c063958ec1b
+EBUILD monotonic-1.5-r1.ebuild 490 BLAKE2B c4caa44a067e6166f3351ff2f89fb797e8ff7c0054efecda862fbe45f90e66d9713c44d7cff073609f798fb2b1329d1499a7a75dd4c1e3dbdb76a11901b0d802 SHA512 9693a2cfa9ac35ec7c180ee74f7a14bbf01403b8de0d53fdc3231d151e191acd2b1b047e8a0c29ae2c0c810c3f20c929d1ddc4f7b3530fe5196abb404abab0e7
+EBUILD monotonic-1.5.ebuild 482 BLAKE2B a0b8d7967672f8b3f6cc2d0855dda1db0948149215b24fbd6759d6c3fedfeb66102d80dbc6acf3a6914330dba551fccbc86ba84ddd9a0cf20dedc2c5b6effac3 SHA512 56c55a31d69f1602faa6ced05fe414011d5fb4df3a59969d2e3437cd0dc50ba895e8e48ce3a454292c8d430cdfdc579af6fed03cadf821da42f816a53026a7e0
 MISC metadata.xml 291 BLAKE2B dca62d0d7e7adf50cf0060332562bc3a6fc361a7f3b3b8ae25c142d93992a26c2b9ccfb0be5fffcd18e359989d4d6f603f46c93b23c2dbfe6283198fbaa7676a SHA512 f67a64d81a33f4356c9011fa9ef6ebe195ca28c6c8b9567f07e0756c7a2f9009e5cbbf5b68e495f9f840e5d75f34fc82e440626c80b024df0797e15d610dc9d8
diff --git a/dev-python/monotonic/monotonic-1.4.ebuild b/dev-python/monotonic/monotonic-1.4.ebuild
index ff6cdbfcb49d..ca9c44a0e1cf 100644
--- a/dev-python/monotonic/monotonic-1.4.ebuild
+++ b/dev-python/monotonic/monotonic-1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/monotonic/monotonic-1.5-r1.ebuild b/dev-python/monotonic/monotonic-1.5-r1.ebuild
index 518008f7641f..7eafa2c8c7fb 100644
--- a/dev-python/monotonic/monotonic-1.5-r1.ebuild
+++ b/dev-python/monotonic/monotonic-1.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/monotonic/monotonic-1.5.ebuild b/dev-python/monotonic/monotonic-1.5.ebuild
index d55b8eb0a231..08e4b3f6bcbc 100644
--- a/dev-python/monotonic/monotonic-1.5.ebuild
+++ b/dev-python/monotonic/monotonic-1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/montage-wrapper/Manifest b/dev-python/montage-wrapper/Manifest
deleted file mode 100644
index cd773b1f9271..000000000000
--- a/dev-python/montage-wrapper/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX montage-wrapper-0.9.8-fix_tests.patch 2291 BLAKE2B 0b5f121acda42c76341b52c52e88fd551021730b89af2239e03a06aaa4c7756624068a5dd71e8e87a921c9661454f1cfc36f839a1ca49b6e1e85614aa4406cb5 SHA512 1466905009a5dadd1f6cf95ab4b97384d2332cac850f61f8766dc7a9b07454fa1c3840e9b5720325db515e36ee8c321610a7ae1c5c24c0272f2f5fe25eafe226
-AUX montage-wrapper-0.9.8-increase_rtol.patch 872 BLAKE2B 7ec522c84cfc987ffe1dba6d893849ab2ccc109e2d8f800c47361108b10ef5dd8b725aaa08522975ef5cea6e82fc6b7f2822dbb5d776ea0f582bd9eecc8ff3a9 SHA512 221f0549abef1a1a7a5d2a6edc47da96c54fecd0fe3d4a762153309523731194bb9254fa352ca88eaa13e0cabeae2913ca5313b2dc4feaba705a9af6df92ff12
-AUX montage-wrapper-0.9.8-use_configparser.patch 533 BLAKE2B c39cd970eae5063c60727d0f35661f5b877ae72ed527d6c28c657f886248c6d4c3e1af4ef87eb73f6a4915746d8a69eedf249e7aec2216235a33af40a173c9b3 SHA512 ed81511da9665429ffbcf2424db7aefa63f0f0a93932380c3685d90918b30a45970f658a8ef69d860c23f216da473884c816b56ffa49d763a620fabf2997c042
-DIST montage-wrapper-0.9.8.tar.gz 208240 BLAKE2B 697eb310207cdf760f1d2ae23a840717817e85ff118886d475c73787aed4a4b644f5ab70d551686a4a746af001321846af76b9c7911ddd24943d30bd5afa128e SHA512 a9aeb48f86d055448fdfed3a5c3762b554627db10f1374cbd3f7af6002721ae04e9f47828c2084147be40f79c1c4ce6e56568bf61a6cdd78a31ce91de6365ec1
-DIST montage-wrapper-0.9.9.tar.gz 187490 BLAKE2B 1c7f06e1c168a96b574ce7a65c99aad9482a523b0c6288e8686410fdd4c9102a27cf098ab5e56895888e17147f20d8c5eb0c8785527543757b6a4166a409e4e0 SHA512 a113a9f1ca03ca158ed6d8a4520c6710804a5ac10bae3dd0c0231390f771479c43f0cdd08e302c59ac1d608c4865d4b0d7a3a233ad068d40d3f1c0efbc343533
-EBUILD montage-wrapper-0.9.8.ebuild 1166 BLAKE2B 76d4a78451f9135c51ee8e85dc617ece3e11391fe740b16d971f0987d744fd922b1d323a63ca6bd9dd5bc2439adfc3bb3503197e1166b4177846a5fce0f87077 SHA512 b9db89fbf4cea6fddedea009c54dafb2ca4a82164a3bbbd41030548967ee868d3c10cd3f68b859d0989bbec7e060a1a967e9493cb9db2a30013d2e2d9c32a386
-EBUILD montage-wrapper-0.9.9.ebuild 1009 BLAKE2B d7c0b5686d2b3b9c7d2589783c60b81da0daa824149c774dbe613b11975427921f22cb9feedd1b64f6165e13fb7cced912d4b02d758f1c4113f29435f23a747f SHA512 660529cbbab37f6350676c48e48e4d3ac3bee14cdea41fc349e837571a1d5530e38ed237ad1fadc284ec10d79cfdfd09706dd7bb6be6c51dc9453204a790fae8
-MISC metadata.xml 640 BLAKE2B 45c551a8657052c12d943a5a6ba3a14755574f7e7b1157f5a237a67e5575f07eb4354d3b310b949d7851a4da43d2fd76d724c14bb5d7a7b2a924e84a1234541c SHA512 ebc6b77919fd327e395610b3479a1bb84b2457cdd08ba850a0e9098b95284705fea84092eeb2322e51686dd8214cd281b681cbc8d28bc0d99068f73ca685cb83
diff --git a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-fix_tests.patch b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-fix_tests.patch
deleted file mode 100644
index 8d611b72f81a..000000000000
--- a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-fix_tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Make sure that opened FITS files are closed after the test
---- a/montage_wrapper/tests/test_wrappers.py
-+++ b/montage_wrapper/tests/test_wrappers.py
-@@ -46,21 +46,21 @@
- 
-     def test_mosaic(self):
-         mosaic(os.path.join(self.tmpdir, 'raw'),os.path.join(self.tmpdir, 'mosaic'), hdu=0)
--        hdu = fits.open(os.path.join(self.tmpdir, 'mosaic', 'mosaic.fits'))[0]
--        assert hdu.data.shape == (288, 282)
--        valid = hdu.data[~np.isnan(hdu.data)]
--        assert len(valid) == 65029
--        assert_allclose(np.std(valid), 0.12658458001333581, 1e-5)
--        assert_allclose(np.mean(valid), 0.4995945318627074, 1e-5)
--        assert_allclose(np.median(valid), 0.5003376603126526, 1e-5)
-+        with fits.open(os.path.join(self.tmpdir, 'mosaic', 'mosaic.fits')) as hdu:
-+            assert hdu[0].data.shape == (288, 282)
-+            valid = hdu[0].data[~np.isnan(hdu[0].data)]
-+            assert len(valid) == 65029
-+            assert_allclose(np.std(valid), 0.12658458001333581, 1e-5)
-+            assert_allclose(np.mean(valid), 0.4995945318627074, 1e-5)
-+            assert_allclose(np.median(valid), 0.5003376603126526, 1e-5)
- 
-     @pytest.mark.xfail()  # results are not consistent on different machines
-     def test_mosaic_background_match(self):
-         mosaic(os.path.join(self.tmpdir, 'raw'),os.path.join(self.tmpdir, 'mosaic_bkgmatch'), background_match=True)
--        hdu = fits.open(os.path.join(self.tmpdir, 'mosaic_bkgmatch', 'mosaic.fits'))[0]
--        assert hdu.data.shape == (288, 282)
--        valid = hdu.data[~np.isnan(hdu.data)]
--        assert len(valid) == 65029
--        assert_allclose(np.std(valid), 0.12661606622654725)
--        assert_allclose(np.mean(valid), 0.4994805202294361)
--        assert_allclose(np.median(valid), 0.5002447366714478)
-+        with fits.open(os.path.join(self.tmpdir, 'mosaic_bkgmatch', 'mosaic.fits')) as hdu:
-+            assert hdu[0].data.shape == (288, 282)
-+            valid = hdu[0].data[~np.isnan(hdu[0].data)]
-+            assert len(valid) == 65029
-+            assert_allclose(np.std(valid), 0.12661606622654725)
-+            assert_allclose(np.mean(valid), 0.4994805202294361)
-+            assert_allclose(np.median(valid), 0.5002447366714478)
diff --git a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-increase_rtol.patch b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-increase_rtol.patch
deleted file mode 100644
index 285b525a4df5..000000000000
--- a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-increase_rtol.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Increase rtol of asserts to let the tests succeed with montage-4.0
---- a/montage_wrapper/tests/test_wrappers.py
-+++ b/montage_wrapper/tests/test_wrappers.py
-@@ -50,9 +50,9 @@
-         assert hdu.data.shape == (288, 282)
-         valid = hdu.data[~np.isnan(hdu.data)]
-         assert len(valid) == 65029
--        assert_allclose(np.std(valid), 0.12658458001333581)
--        assert_allclose(np.mean(valid), 0.4995945318627074)
--        assert_allclose(np.median(valid), 0.5003376603126526)
-+        assert_allclose(np.std(valid), 0.12658458001333581, 1e-5)
-+        assert_allclose(np.mean(valid), 0.4995945318627074, 1e-5)
-+        assert_allclose(np.median(valid), 0.5003376603126526, 1e-5)
- 
-     @pytest.mark.xfail()  # results are not consistent on different machines
-     def test_mosaic_background_match(self):
diff --git a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-use_configparser.patch b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-use_configparser.patch
deleted file mode 100644
index 082c3678e125..000000000000
--- a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-use_configparser.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Vincent Prat <vinceprat@free.fr>
-Description: Use ConfigParser module instead of the one embedded in distutils.config
---- a/setup.py
-+++ b/setup.py
-@@ -21,8 +21,11 @@
- from astropy_helpers.version_helpers import generate_version_py
- 
- # Get some values from the setup.cfg
--from distutils import config
--conf = config.ConfigParser()
-+try:
-+    from configparser import ConfigParser
-+except:
-+    from ConfigParser import ConfigParser
-+conf = ConfigParser()
- conf.read(['setup.cfg'])
- metadata = dict(conf.items('metadata'))
- 
diff --git a/dev-python/montage-wrapper/metadata.xml b/dev-python/montage-wrapper/metadata.xml
deleted file mode 100644
index aa3e481c13e8..000000000000
--- a/dev-python/montage-wrapper/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 type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription>
-  This Astropy-affiliated package provides a python wrapper to the
-  Montage Astronomical Image Mosaic Engine, including both functions to
-  access individual Montage commands, and high-level functions to
-  facilitate mosaicking and re-projecting.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">montage-wrapper</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/montage-wrapper/montage-wrapper-0.9.8.ebuild b/dev-python/montage-wrapper/montage-wrapper-0.9.8.ebuild
deleted file mode 100644
index 15ec5160c747..000000000000
--- a/dev-python/montage-wrapper/montage-wrapper-0.9.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for the Montage mosaicking toolkit"
-HOMEPAGE="http://www.astropy.org/montage-wrapper/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	sci-astronomy/montage"
-DEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( sci-astronomy/montage )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-increase_rtol.patch"
-	"${FILESDIR}/${P}-fix_tests.patch"
-	"${FILESDIR}/${P}-use_configparser.patch"
-)
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && PYTHONPATH=".." emake -C docs html
-}
-
-python_test() {
-	${EPYTHON} setup.py test
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/montage-wrapper/montage-wrapper-0.9.9.ebuild b/dev-python/montage-wrapper/montage-wrapper-0.9.9.ebuild
deleted file mode 100644
index cd6d6d1e3979..000000000000
--- a/dev-python/montage-wrapper/montage-wrapper-0.9.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for the Montage mosaicking toolkit"
-HOMEPAGE="http://www.astropy.org/montage-wrapper/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	sci-astronomy/montage"
-DEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( sci-astronomy/montage )"
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		PYTHONPATH=".." emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 97690ad8bf47..a868c044c025 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,7 @@
 DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
 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
-EBUILD more-itertools-4.2.0-r1.ebuild 1072 BLAKE2B a5218e0093e93931a31b21416ebff2d10ddb6498cb39d7d041e72ebeeff446b70e584fd562b97678884c8735b0dea70e3f093e1f1b40931b070c74bad0abe22b SHA512 86996a57bc65c9c8c938530bbe9ccd926093ac5988b9331bf08732e06c30e9194196a456f91feca343ea2f4a33abfb76599473f66818c26db739d09b7da13114
-EBUILD more-itertools-5.0.0.ebuild 725 BLAKE2B 274c53c7d994726e18f48743a2d6ceac093bbb39efef416befc0b2e6a53ad9e12ff01555477c06f187d3a5f2b53a96bae0f2bdcf86d7be5d198015f4dcc63190 SHA512 8e2a0af739d6511b1d3e53b2227bc141d74e5aaee773399ea4109721e94cab6dcdd940789d9b323b0a621ad3f767eb6e946c2d35a2b93f48343aed6596b198d9
-EBUILD more-itertools-7.0.0.ebuild 672 BLAKE2B a090457622983c0ea21b37ce9a654e1c50aae0ab6347e944a4fd3b1b6f17511cea19900b44cdb33dc775bc6d5a7e265a589701d7624bd7b41271c2209a9dbb46 SHA512 c9480d12aba4a47e499cc6ab429db3db3283690fb001df4bdf352f8442b0e2a7afd4e32181a5aa70143ff508621a4514f14b91f7cac053c3fe30991fcf483e0a
+EBUILD more-itertools-4.2.0-r1.ebuild 1067 BLAKE2B da5e9e9887771ddd660135341b18d81227a69aba53dfd42b346e1d82d666d57ac3e7251bacdf90c62a8a1df2122bb10d288ce8df2ba671b53c3a7f16e09dabcf SHA512 63f2913134bfbccba4f8db1ac386f04bab73e96fc1b920030346acaa973a0f73e1b614f38b29d0e3a50b43454463e00846b73df7ca45fb5538eb310373bf9b5f
+EBUILD more-itertools-5.0.0.ebuild 720 BLAKE2B d38695e00a0d31f0e6db08ab441d91baccbbf54057a9dcd483f99e71ebcd5967464ae5bfd772cd0155f8e0fd8c2024c6eab60d74a79ef97c60a377577e145e7f SHA512 5da4eefd8c2a282f60c1b9e156d0dcaea6af83811fb186c2b6396e2adfbb606182892e3d0483b5e10a7c31896b36364b2c17461d266fb1a322cb1cd5fd9b7f68
+EBUILD more-itertools-7.0.0.ebuild 667 BLAKE2B b92631361dae585dc017fd9af152c508f910a0477f1f0f9db781e7c856a6746a3d0e3e4b7fa6bb565b60a1fcb83093712ba09120c48801324684f4243c0ccfe4 SHA512 6f45f5f954c3e3830b8f9b0fb72cf715cf88ab08f44b70d5f2a5143d35940c82aab0c7ac898f9f6bb0b13f94f706394449a917719b9b07d6daf709f8557af12a
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
index 646a8e254bba..1a03a8da5a29 100644
--- a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/more-itertools/more-itertools-5.0.0.ebuild b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
index 6ce8521b0fef..e2afa9d80093 100644
--- a/dev-python/more-itertools/more-itertools-5.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/more-itertools/more-itertools-7.0.0.ebuild b/dev-python/more-itertools/more-itertools-7.0.0.ebuild
index c0fc2414cc48..3299bd222c16 100644
--- a/dev-python/more-itertools/more-itertools-7.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-7.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 2eabc5ada2e7..f8335ce52296 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,7 +1,5 @@
-DIST moto-0.4.30.tar.gz 614008 BLAKE2B 2868ab25414e488299cb521ce814239698466d69e806245fd86ceb9d5835d08fa530f2da0a5a16f595a88b3c0e421cc264f361bc68d31841726896826240fbab SHA512 ece27979911f46adbb0aec9aa3755b13c09ced00b24ea136ab9c8a8a992550e9c38dac15d8b0c71822953f070761083253ee5fb5cbe44a4b108d140ab4407699
 DIST moto-1.0.1.tar.gz 731617 BLAKE2B 6f20c07c0635a8c10f8f70530aeaac5ed7c2136d4fc87ff57774a95f4d2e1ea8cf1100b9f0871b29138cec9059de5746a9c01104d856f8248edbb648cc4a78e0 SHA512 3171ea3e8f9d267960a7b82caf7e42b86fceba5a80e96d35b849e4e72b7fc6aed94090161219a520f9c1b4050f7de12e0f6c0d560ab1f90ca43fc0387b62d377
 DIST moto-1.3.8.tar.gz 1571716 BLAKE2B 8e79808d8488bcf8c15e8b5a55e93392ceb5f642f1f52c0af441cecb7adfe23a718f6d283e473e5dab82ddd21bcbed36ecb52b444cbd933405d13c8818e4f74d SHA512 901556249a2a28885b7f77e9f2c209b06391efcea66b78ce3c16edec14bcd03b251c37ef5d800d8f7a35180d59ce7568a68bcebf18e25b092eb5de801db6c587
-EBUILD moto-0.4.30.ebuild 857 BLAKE2B 444ceb952a989c9464811cfb42f042ec7782fb5492410c5653a9b3772da113f4025f3e983e0565badc061cadfe97f56c11b5b7f224e8aa550eaefa329cc82f20 SHA512 179362a90cc09caea49019df697039b009ee86ea03079f8c148ed226c83397614c6fd5ba1362be252374fa0cc2e028238f0d23a5e96cb37993e638f70a679b41
-EBUILD moto-1.0.1-r1.ebuild 1313 BLAKE2B 4284202c3d4b1280050fcf9cc36b65503267145f5c5261b14028035339c8c09aba04c77d476cc63004c1fa3b8e03dfe08bfd43a61c3b9385c2c0ba3173ebeea9 SHA512 646c9781cf299870de10b1b906eed87ae98a98e0a128931a4a282d06dc757c68f16b44a5ce5f328e7b3c9b3bd4ecce092d4f7be7fc792e7230c2171d2fed3c20
-EBUILD moto-1.3.8-r1.ebuild 2442 BLAKE2B 3b4215dff97712e2850f1fc1663fe8d01e97a834348e130c58b8fa394d18952494d2f32cc40619ded1d5107281b1a696207b1d403848afb8f9b0ead7c816bbb2 SHA512 bd3ceb59958484697fed08d1134a68ccdbaa19a2dbd96ef496c01b8719f3f66a6f41ca61f865744e5fe5fccecb170d021c6758e9687883ef5182ac8c14e28210
+EBUILD moto-1.0.1-r1.ebuild 1311 BLAKE2B f3522cb86375c4449245bf9e86608c7cb056d2c67de63cd731686ee5cb2d13830330af1536d2941ff84045e38cfedec343b3bb27030512253081cedfb805f712 SHA512 9a57095399ac8b233052af9e7bd4b32cfa337888341d9fea3a9cb0b713dfbb68f4da61db7ba6d26562a9af6829a0a61f18b1af5e0a75055cb039fbbd9dbefb85
+EBUILD moto-1.3.8-r1.ebuild 2440 BLAKE2B 0ca64c0325360f5a96c28626127fe0e72a41ec7d70dc36546dff944de420537c9543a501f997d5125f334b62c47bc69fbb579e24fd29c6011b89e2cbda0ac45a SHA512 a2346e4caa543c2ccaaa6041f7ff50e9580224aee641200a32a8aada67307ff14fdaab827d7fe36d27e474ff63737141a87a1079196174ee245bb5c3a283180f
 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f
diff --git a/dev-python/moto/moto-0.4.30.ebuild b/dev-python/moto/moto-0.4.30.ebuild
deleted file mode 100644
index 606524a2511c..000000000000
--- a/dev-python/moto/moto-0.4.30.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.36.0[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/httpretty-0.8.10[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e "s/httpretty==0.8.10/httpretty>=0.8.10/" -i setup.py
-
-}
diff --git a/dev-python/moto/moto-1.0.1-r1.ebuild b/dev-python/moto/moto-1.0.1-r1.ebuild
index 3da3b9a59ce9..f0f54f5060c8 100644
--- a/dev-python/moto/moto-1.0.1-r1.ebuild
+++ b/dev-python/moto/moto-1.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/moto/moto-1.3.8-r1.ebuild b/dev-python/moto/moto-1.3.8-r1.ebuild
index 85dc90877561..e574b40c5605 100644
--- a/dev-python/moto/moto-1.3.8-r1.ebuild
+++ b/dev-python/moto/moto-1.3.8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/moviepy/Manifest b/dev-python/moviepy/Manifest
index c6d7c7d079e5..dcfb6c5b5203 100644
--- a/dev-python/moviepy/Manifest
+++ b/dev-python/moviepy/Manifest
@@ -1,3 +1,5 @@
 DIST moviepy-0.2.2.tar.gz 400489 BLAKE2B 46cbf9fa6b2800dfa7c315c572448c7ba12ab4629dc5d57590ed70d40d83acabe1b140c193f04c990bbe79aa6ac5e7a6ec662e5862e01ccf41c80ce7f159bdc0 SHA512 a4300b31552e8b4120448b8973ce812579b4f38be48fb46546f4a33e9c10903fb73a89c8075d161d441ecf084b3936ef7d6f0d1b637ad347d00db2c643f1cc43
-EBUILD moviepy-0.2.2.ebuild 925 BLAKE2B e717022ca5228689de220f2ab24edd5cfae0deb3ed0d9fddf85b4f71442da3959b7e1ae782ec9ecc3fe1e7dc552e2acda637a67d3bd63cf333c2c5f9e6b6f8df SHA512 4e2056f01c1399860b7b718e40d508e73d500a0825a7a8b5251ba0829011312bf7b38217856daad495d1fd90db14141c1cccda9dec6c6468f732f186a8ca2018
+DIST moviepy-1.0.1.tar.gz 25746520 BLAKE2B 5e18841596e967a1531eef5d7cef8f96a636486923a874606c453bfda92d8ca8657afef9eb46c2b4b3bf7ae58d138866d7497cd088509d403dd6722fca8e8ec5 SHA512 3cdccaa13dd31529a17d480fcd01b5f89b421eeb618425e9fa9a114159d65aac979022507c3f9c64921af60e4c9d7970e6a3223d7942c08e67d7e696618e9abb
+EBUILD moviepy-0.2.2.ebuild 915 BLAKE2B 37c909997d14c545d27743972cd9d4ba47e9d1ae8f579a290495dd57e67c6906055d205390f1230041ed6992316dd555442a8ac59cdd3d93c4c208796827b8c2 SHA512 7991657c741b3f60f287f25dabde0bdeeec09b12c6d490fe3914f0896dd8dc947185e782e761452bf7417326c1374ed30120856d46bb771cec0915acaa90e18a
+EBUILD moviepy-1.0.1.ebuild 874 BLAKE2B a9da61121d29d29bdcd676a25f4792d145cf32b3d1b4c3b0d326a313242866daf5ae9b05bd90936774b26e2966fb12791e0382d3b5c4a2b3794fe648ce4d1626 SHA512 504934a5b91ea0d760e3720a1e286d79ee2bb2dcb36e7d49e7c3148963508287552484c33de6b3f34dbbfeba6b5acc54291957e19c53680b671e29d1d58d0b3f
 MISC metadata.xml 732 BLAKE2B 7366dd5078337dd825a1612310d068dc3be9ab38c6a9741038fe4af3ba60a19420d67e6bb5a24c0548a6e9bf8cdf257147735d16a5fb1d2195099e079f1d1d3d SHA512 46bce08e60a3a53dcdd6a6fad0ba31c3d11b5c7a4995ac830a31a1e7f0d2ccf458d1c9d1e45ebf80365675cec5d313a6cc58c9b6ce7083daa14483f2832fa630
diff --git a/dev-python/moviepy/moviepy-0.2.2.ebuild b/dev-python/moviepy/moviepy-0.2.2.ebuild
index 946fe30ab119..068a65775a44 100644
--- a/dev-python/moviepy/moviepy-0.2.2.ebuild
+++ b/dev-python/moviepy/moviepy-0.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/moviepy/moviepy-1.0.1.ebuild b/dev-python/moviepy/moviepy-1.0.1.ebuild
new file mode 100644
index 000000000000..41b2da26b5c7
--- /dev/null
+++ b/dev-python/moviepy/moviepy-1.0.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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Video editing with Python"
+HOMEPAGE="http://zulko.github.io/moviepy/"
+SRC_URI="https://github.com/Zulko/moviepy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/imageio[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/ffmpeg
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mox3/Manifest b/dev-python/mox3/Manifest
index cc3a83d4fc5a..be97fc0644d0 100644
--- a/dev-python/mox3/Manifest
+++ b/dev-python/mox3/Manifest
@@ -1,4 +1,4 @@
 AUX mox3-0.12.0-RegexTest-python3.6.patch 652 BLAKE2B c7a53ec43accd137c100c6cab6e208a5e88ff784a59b01b2c71316654f9fe7f39273eae7be8a8810548b25636864b32176997a19020c878ba7861b3e86d74c77 SHA512 bdb5b27c151a2b2fc0351575fb7f8413a7667b738624991255882c1908df3677f2d8bbc984f8c4179325450f0a5837a750adeef3afc1738090879b70a2b135b6
 DIST mox3-0.24.0.tar.gz 44846 BLAKE2B dd1a27b20fc821de79f1e1f209872c3fb66f39b2330d1dda04c5b17045e337c84920e4538d7971f025d1377f9e91abd2fca8167508c5614fee06d9fca92aaa75 SHA512 6c081cf2b1e529f3213f7f48d22ed5d2980420b2de8f49607b624d5861f8b784f2f36d8a32fae3e81fe8186c1a9c36e6c4ec7d9de172c41c0530523590ef97b6
-EBUILD mox3-0.24.0.ebuild 1465 BLAKE2B 29f88aa93099b2c6fbdc8cd97f08f29ad065eed14a98b4723a74b2f67bed3774f03942149878ff79bbfdd7e65ad1613827d66b479cc08547f5ad0947e8561b3b SHA512 e2df2a06990550fdeceef7445c388ce98ecd59b3bfa6d2230e8992ad5701509bfad5c56538e165c3a5534220f639fc6c52efaaba6149920ca165641bf473abd3
+EBUILD mox3-0.24.0.ebuild 1453 BLAKE2B b8efa423b4a623de16b6cf31ca8c5195976c8eeeb879e4354836947c371178511070927b081d9c045b7cadefc1e28dc3ccaf412becd5cbdb00f8bed246eebf69 SHA512 578c6c760663cda930386ffbfb0e5bfb52b1e0cb7cc0e5d0b0b75b49aeffa34bb272c0e78375de71197ed7dabc214a2d0357fefccf0de5b57850fcbe929b2cdf
 MISC metadata.xml 323 BLAKE2B 880203c04d889c65278f42730f465e61463109e5e8e71ffacf21d3ad98eb804d36ff66886349eec536aef71a7741a1df9496f1c8073ce1421aed9863593a9ebd SHA512 cb4be23a6eabcd2f0c9761234006bdba088200a94c23087fd3e09ac054c785bfcbe2c35ac060843cc0de2d4774298ac4c94ba8bd3e16eac9a8a4d08fa342e4f3
diff --git a/dev-python/mox3/mox3-0.24.0.ebuild b/dev-python/mox3/mox3-0.24.0.ebuild
index 78822559044a..73cae79f74f1 100644
--- a/dev-python/mox3/mox3-0.24.0.ebuild
+++ b/dev-python/mox3/mox3-0.24.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index d9a98224b6f0..c88a61f08e9e 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -1,3 +1,3 @@
 DIST mpi4py-3.0.2.tar.gz 1429331 BLAKE2B 9e35749a82698ec656553583f01ebd8edbfb3b649c7693a9ff63f9f6abfa3fd41a54cbe4e3a1de55cbaf4dc626602706c776c505d0f5c0d82ebe88f2b4ceeddb SHA512 0a18332fd45e8e80b8dab0761fbaa30444a0d55776af7a2333be17ade827e92d04ac5bb8619ce26937142f344f75de0e5ef6dcb7502f33389716aa9482ddf5ab
-EBUILD mpi4py-3.0.2.ebuild 1149 BLAKE2B 1ff8e28cb4b96cababca0bf31574b12e7c4ba2e60f57890517a71219c9fb36eb2c541002a3ae5bd0d9cc24de6313fd5b3fb8698c3b1911408f2f228e816bb002 SHA512 4b86fda234bb102b755537b7ecbd103a5168dc77f24a10aa276254798ef8fcef7e33a323b74fe21932e09cd7518801e2c79a527c3f1f1a78e0e6b51f9f1ec0fe
+EBUILD mpi4py-3.0.2.ebuild 1147 BLAKE2B c8c83e1d6017a27c0513534a16265a09e8357ba91595fe23904e15314b081c1f0772a3a856b33e1d9a5ee6569e9479be9c0512272afe46ce1cd0a647e33963e9 SHA512 bff68769e7a11b9a20bb8a215931d2bb8d0b2200543e15e88014234da8440a50ae258e1840f573c14ae5299a4af33e11cbc0cc72bda931adb08d340c24e60ba5
 MISC metadata.xml 1118 BLAKE2B 0bc626a2106e628d7eb639e6ce90c4badb63ec2ea66b0322e7b83418791b7edc4bd443294fba3d31133812416eb4428b5dc47d074da3aeebf6867e8a0998d046 SHA512 7afb6d05007036bf5562d6d262165d8c2576bb49a86f9230f939d6a2ef929affa8461fa6421ffd8d97203a4425b397a8dd8556190364f29622e53a67674978c7
diff --git a/dev-python/mpi4py/mpi4py-3.0.2.ebuild b/dev-python/mpi4py/mpi4py-3.0.2.ebuild
index 5e7b1f21c7b6..e4467754f599 100644
--- a/dev-python/mpi4py/mpi4py-3.0.2.ebuild
+++ b/dev-python/mpi4py/mpi4py-3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index f8e32ec53666..fa4ce7028a05 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -2,6 +2,6 @@ AUX mpmath-1.0.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314f
 AUX mpmath-1.1.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
 DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7
 DIST mpmath-1.1.0.tar.gz 2136921 BLAKE2B 8c3a5f39b48015aab1147aaf77ee7523dbffd7f34911ff2158d7b8bf1612e64f91d157494c5199b22090e986aba02044d610171bb92a2b230cdfbe025652e340 SHA512 628b6c61015825516d983bfcc54fc3a2793f3d9d2b93ba9c5a487a340ddf13eb4e83f17fa35692b22dd8a200a8da3a65ed88091d75abb4c48c9c4e4f2c686bcc
-EBUILD mpmath-1.0.0.ebuild 973 BLAKE2B 923cf1f2a78ef3913248adf1e889a49ebc6075e13b5b3401160ec48ddccb8bf2658e66641440e2856941c03dee1d265f899a8a3718c28d63887691144b39dd43 SHA512 c38b712d1f150302071d0497d8520e362a569365338590bf18acd1768437662f4cf61162a185a9bd046386fd029a3b98244006369f8d8ef082b6b23716eb3b72
-EBUILD mpmath-1.1.0.ebuild 991 BLAKE2B 54b65f6ce9fb3faf04b986d4e541554d82d46e8ac90cbab75e804004a66c1be394a3a2dd0996e0945a877b939966ad8f0e22a6ba9c00232f6784188b388ad953 SHA512 e766d54d96452532b9d4d6cfc5373d52d3c69aabc87124b2dcbf0bd2936fdd5fde93f017284c7b82d54260c15774cccb1c5640be09dc36a042c4fdf7c5fc7277
+EBUILD mpmath-1.0.0.ebuild 969 BLAKE2B dc8b27a3342f16d9a16fbcd5cab408f7fcf7ec8609f97fabd647f12610ab863913f5dfd1cd244cbe511d327bdb6c399bd3d9a0430b0cb88bfdd6239163222b4f SHA512 e04fa0f91dfa5a791489c4a50a8dca75cee7bb39ee16bfe541c08aeeaa662a167052d12a04ed523f148569a32f7ab527e64c4b21ed0f49dce6994babb2b111e8
+EBUILD mpmath-1.1.0.ebuild 987 BLAKE2B 5e50a86a464c15f23d673f5068758b7f9c2b7dd1c9edb75c5f581ff0ff02e3f538c857edb7796ecd23010a27241031d05572b6e7c151b9eebe8addb3d77cf43a SHA512 65d10db310bd4839cf09fed38a48e9f9d6fb04186b886141f559cf4f1e3a68be342dbc2391a74b94c2de2b0d757f4f0e62c57388ce7467b7f8b78f46a6fde3ff
 MISC metadata.xml 650 BLAKE2B 520b0399fbbae4307a4b3979202b4d5c8d1b06f739e0c0460a9a0be63b78152b50ab3f7fdc9b46623cf7afaeabbc57cd35f3865462f3b16ce2beeb0b8f8659a5 SHA512 0f999aeb354c73658f916cb8d3a80dcd216f50f77839c0c854e9235566cb197a7d047ad51045996fc0b9e1c47f55e934be9dd52597fee16fcce6360bfcbe8f08
diff --git a/dev-python/mpmath/mpmath-1.0.0.ebuild b/dev-python/mpmath/mpmath-1.0.0.ebuild
index 2c635b989f61..22b145822bb6 100644
--- a/dev-python/mpmath/mpmath-1.0.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/mpmath/mpmath-1.1.0.ebuild b/dev-python/mpmath/mpmath-1.1.0.ebuild
index 467c4a424f18..9dd5e4c9ae4c 100644
--- a/dev-python/mpmath/mpmath-1.1.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 848c9c5db695..8d2f34afc32f 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -3,9 +3,9 @@ DIST msgpack-0.6.1.tar.gz 118812 BLAKE2B 9f5522ae7dc89e286a338bfdd91bd4cacefdf7d
 DIST msgpack-0.6.2.tar.gz 119062 BLAKE2B 6b20a0d31b811ae66e66dbfaacec6f0cf2152b2937423b78f3e6244bfa49c87767788c5ee1db41b9020801b8777a4c15b1fe1853182718adf622bc7e1bff858e SHA512 95b92e3d35e0500dd4256d18bf76e586e57cc66319b4459ac5daef599277a5049177a89ad86e291dbdc4c7a918901a89d9218353ddc4a7d0b399e8a98afef363
 DIST msgpack-python-0.4.8.tar.gz 113641 BLAKE2B d22efe13302e28d0701b95b2dc4cf4792f9e045efdf77b31ac5c6170b503c885c265ff63387fe76a1aa67b1624963aa26d76dffb15fc2cb10cfe672b59e71b99 SHA512 59e9c43be6b92e6d10f40999e0902c350137e67a83c43bb15b273eca856a6eb39f24b625b02b40188a9365ce3101f03bfa9aa3dfff56c5c3b551533942183481
 DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc13f034e60ce0ef2f72161bd4ccd0cd1ede27382bc1f365f268557c8ffe503fd12de66eb5840e79760d818e7e2f67fdcd SHA512 e5172e20bb25d2e12ba34ad2805ba4ea0776397986e8bf8e26d21353f57a2dba59a9c6669c817e4e91d5801558a50f95d81e02343f8f0292a01ec5d822fba61c
-EBUILD msgpack-0.4.8.ebuild 791 BLAKE2B d6f52b915b5838b791684502c9d025593bffd73deb5c744aa7f092c80eff2b4b65dd506c2a4d0b170bb13f0ee34f0b1f7bc2e60cfefdde0e09a7e9b86a1f4f00 SHA512 72a4e9b9b8bcb19353e61ee917f818ca3b82fe57d9c24a32148dff95c4731f11868ecf5e1866542cc58db90ebdad05e1eb8b29622b3d59d43696b5a40cb39566
-EBUILD msgpack-0.5.1.ebuild 790 BLAKE2B bfef5a136198ae0caef265cd81aae9416331d192ccf5b0bc790c70fe0525d5cf091b992dc1c03963d8f8140737a72ca45c944acd2197a8e6855b886478deda25 SHA512 d9ecc81e74ac9a26194d1340c956b4b0b35ee8af87c897f3b0cb73a657c0ed14116b11e8805c6b0db01eeb65ffd6c7a376950c8129eba005dfe69ae71d59397c
-EBUILD msgpack-0.5.6.ebuild 1076 BLAKE2B 074b751e8ad9e85223afa59ed37c40d54c693868d258771d155979dab690d8582e83a4565d78bfd6fedf305de3f428a13a9cf4e0dae5286526992564d1dfcf73 SHA512 b4e7da583aef5c4b9d92796eab1bd249da36f695b2561e48d9803c5a3b30069becd82e5b37438075a8bf387b9601d7a42855a266e6f8acb40c0335f84fe668cb
-EBUILD msgpack-0.6.1.ebuild 1086 BLAKE2B 6f1c40fdb198f0ba37044df7e297bdd6328ca5ef152472dc6e1b5e5dc7212ae865ecbce528934f64127ed08160944354194ad276b265d42d91a5bd519240b08f SHA512 e1db69cd272be9d25d4cd73efbc0a0dda608a183f37af32cd77ebf5ec2c8e986ac900ff578c743196815dfe8279d9fd5788b1397779f2f59340fdace206c4070
-EBUILD msgpack-0.6.2.ebuild 985 BLAKE2B 5332efba89c3a2eeda18c6d679d6cc895e603fb00c1a41eb0239d08430e056fe830b0fd032e26df77145567f1e3447a708971c2b75de88b36b38ddde89ec2dc4 SHA512 50100fde3979addba504d6bb0c25a62dc20b3da2d63888db062cf426b10f0402ae70806ac0c1f226269840933fd50a593afc47aa661fb8d903a5fa686cdc682e
+EBUILD msgpack-0.4.8.ebuild 782 BLAKE2B d7c2125fcff9a34ab74bd381a4ea3bd1535f792b54fd8dabfb079d2507b5ec79370b41a0ce9a55c15017f3b2113b6e2bbe3f0caef984ef773bf7981a15a43166 SHA512 ba7caf2a0b307f97bc5461b5aae16fceb5d6e426a7fa82644ed081811fb01127a6999ed26e680b63a04aa2e8ad3ddbf312ba5dad156f992fa6243a7103a660e0
+EBUILD msgpack-0.5.1.ebuild 788 BLAKE2B 0adf7dc0ca8bd846cfd975295639989433196d8cc03062cff9957ce9c2abcd4d2004d883cbb9315cc26bf5403da1304c0dfa3d90fc8aeb994fadfd7eb3fa09b4 SHA512 10634b46fd4d44927a267a792499b210fd9684a41dafef5d323271a5a0fa5a80583759b10b2b1200158cc740b75d43ea45915c8241f4240a3de636ed94ece874
+EBUILD msgpack-0.5.6.ebuild 1069 BLAKE2B 59e7a9ea8eb04313f2a03bf8a1d8b1ccd8ba4f7148829f416d29b9fc197caca5cb1cc1726e8dd00fffa583d2ff831252177e56072da470c8c1406093d2a91d42 SHA512 9813bd96af1e525251c2901ba122eb35c62519901eb3f7050bdb548fcc415beba17586b069b873f1222748f93bcaeed4142c4341f84875606aba9714e9a5672c
+EBUILD msgpack-0.6.1.ebuild 1079 BLAKE2B 3591a831addb3c34cb12d4bf921dd9a6662a0c0e7a8715d399018914ccef9c452c4ed40432792cb9b9e94449a72b3d75660931cb2606433298c59c4934b291e0 SHA512 2d1c42cef34f62345417fcce80849221feb151b717decf3a21a56fc001e2e19be89b39f512e0f1731d172c80dc8ef6cf94098fd68e40aecdac670bdcf1a32b33
+EBUILD msgpack-0.6.2.ebuild 980 BLAKE2B 0acb049eafebcd4a700a99ecc02248f13df8655deeed17d02f320bc4b0d574e7c7252868aa7f90727cf7494053468882c21d988697c5b55f89ca18d40c2918d4 SHA512 c6e46f1b85649224e1d011fb44304a56811ba5112bc7299c54fb80f32d993c434d867906974a8fd9ab721110ac86aa8b308fb4737eebb91de001169f57153d1b
 MISC metadata.xml 550 BLAKE2B 6627bc6b0f417157d1728bac9f8bbf3cbd69eaa4f2b5ba25ada62f01295342ddf5231563e1ab7210acaca476cb807572208a26a20674aaff79bd8c4a47755d92 SHA512 519d1c9d2ce1825bc350fe4b1338246c37d38cfead466989976da6dceca8d033ac33b135b94d9feea79fc555017d681031f414aeb6a09de302ed9f11b6e35416
diff --git a/dev-python/msgpack/msgpack-0.4.8.ebuild b/dev-python/msgpack/msgpack-0.4.8.ebuild
index 4c2499efae99..8196ea8f9bf4 100644
--- a/dev-python/msgpack/msgpack-0.4.8.ebuild
+++ b/dev-python/msgpack/msgpack-0.4.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/msgpack/msgpack-0.5.1.ebuild b/dev-python/msgpack/msgpack-0.5.1.ebuild
index 39134e50be87..c0ab4e451857 100644
--- a/dev-python/msgpack/msgpack-0.5.1.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/msgpack/msgpack-0.5.6.ebuild b/dev-python/msgpack/msgpack-0.5.6.ebuild
index 99778feefbbf..7ed163fcb2ae 100644
--- a/dev-python/msgpack/msgpack-0.5.6.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/msgpack/msgpack-0.6.1.ebuild b/dev-python/msgpack/msgpack-0.6.1.ebuild
index 0a9a063f3e6e..c09696d86a8e 100644
--- a/dev-python/msgpack/msgpack-0.6.1.ebuild
+++ b/dev-python/msgpack/msgpack-0.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/msgpack/msgpack-0.6.2.ebuild b/dev-python/msgpack/msgpack-0.6.2.ebuild
index f200f36c9166..b441a3f24b1f 100644
--- a/dev-python/msgpack/msgpack-0.6.2.ebuild
+++ b/dev-python/msgpack/msgpack-0.6.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 234a6277057b..a78e7372e2ee 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,7 +1,7 @@
 DIST multidict-4.1.0.tar.gz 43492 BLAKE2B 4d53a12896f070fd029816742ccff11a12636164e51215bb22b368da10d555d52a9ab7d5dc4632baec9ebc628ca4f846ad7fb2ad0bb044f033fd7e567cda0da8 SHA512 8972ca48146b40fd88f5b0675ed6d45e6887c31fc1d5962203f0fa77a369ef11b0d7739593f5691ae1fd2bbef989940983ddcf0c09acfc5a65b39b6b336571f9
 DIST multidict-4.3.1.tar.gz 45342 BLAKE2B 12a0a8f0785c30e393d996c506a69d6ba03227e47040d46859e1289b47ce23b49a9bed48c3cb0b26f3bf4051cce3963d020a92ed28373038fb79b2204c13d380 SHA512 1b475836c776ddddfdc4f14882df41f9956ab06afac7b640e3f5ae3c50717f2b07267acbae2fa3e94cf8c5650273d4d7ce44329c0febea95046ee27d98db9288
 DIST multidict-4.5.2.tar.gz 56753 BLAKE2B 01db2ea847e5ef2fbd4eab89c8a6070f3febcb0046be7344469a7e8e6de6a3c2b2af49069e64953dfcac0044d581c6af09eee70eba78dda8cfa9e0d11d3f1947 SHA512 ec66cf3c57e3386e07e45641536a6eeb94e9707d8a0d3b485d22b8687f20282c9115d533c7b0e9fb6dba28b923cf68dd8cdda08c75e78ca4eca2f0c3ec23c58f
-EBUILD multidict-4.1.0.ebuild 1082 BLAKE2B 8ca92a682ab444b9afbe2558f756a4631471055a7bb21a30e2278d900a386ecef302e4ecab5448c37d7aebc9371df7b201786c6391f15c5837540f9213c30fe4 SHA512 c8737e306613e7800935e0db85a47d230239103643ba3f6fd6128b03276a5dd9aa7a85d729107a28938437ead0357acfcd7c3619bbce9d97341c202cb9b5eaab
-EBUILD multidict-4.3.1.ebuild 1084 BLAKE2B 80067e720806ba56bd39ba9deb0334a1855e1365e112248ea2713ca21686108da67a9e3280d834aa4a50f41e4f39a3dbc02c35af968306433fa73932e90de880 SHA512 04f28705fb8d56b6f597ac8944912b431a4732203ba3a64bf3373f8920906926a016bcacb97954e7cfefd558115bb8b26e6c20f752db8666c1e5013c86ed6d90
-EBUILD multidict-4.5.2.ebuild 1105 BLAKE2B 54ebaf3d672b985bb96c8d8f5edc91d571a5b1be8cb6da9432e143587dc75344444bc854381c02f9898f2e35cf9c564f1322f1baf930044f568d6b031d5c244b SHA512 846965f02ac42353ad894c306dab7c35555cf726407b79d3576af5009ba80221937ae0b83f244ea6fbdbcfb35c03e8be4f52248a04c5adb6f99d2a6d84804d8f
+EBUILD multidict-4.1.0.ebuild 1078 BLAKE2B 586c7b78da7ce5e8e702cf10cf0e0e9715898cf77a62bc29c508ba2fdcb84e9e2f1ca710b455b5ff6ce3a861aa9b46fa32035eaf508691ff500df0b7aeb3dbf5 SHA512 a268b5290e79a0b3b20825eb5f70e1d9e79f758647a38f59ae89821f26eafe5b1f415c84ae54ed99aca55edf972ed9ce071be41c9a4e29f3676c384a127c4a3f
+EBUILD multidict-4.3.1.ebuild 1080 BLAKE2B 48128dcfebeed48634a62bbd22f639256af3b33fd0389ed320d416517d11b2e395a3cf624030e252afcf96805d71120ca390c73138aad314a3f0384afb70e38e SHA512 1c4ee7936b6950a4ba2c78e6665bd96431ac54d2f7fe99fd45ee854ddcbe5f7e7ab9c6e4a92447419884fdab76413c1ffb7200819ee65ab50b4fd422f74aeac8
+EBUILD multidict-4.5.2.ebuild 1105 BLAKE2B 8fdd7a6801cccb7f0517edf054c8de92be318f56a729be5f3af3867f396ad8b44bb429f666a4d9a28719f3f80aa9cc7ac52956a02666a1e976062c0739e159da SHA512 011a2892af14972e3d1552c395a702d97298dc2a0eaf1fa0077f868595276db2cae76e10e2bd1da015e93d23b530593a3931caf83a30ace059fc5042a2711c48
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.1.0.ebuild b/dev-python/multidict/multidict-4.1.0.ebuild
index f219d50b5ec4..0b07aade6c50 100644
--- a/dev-python/multidict/multidict-4.1.0.ebuild
+++ b/dev-python/multidict/multidict-4.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/multidict/multidict-4.3.1.ebuild b/dev-python/multidict/multidict-4.3.1.ebuild
index f1bd4abdf19d..168b0b651735 100644
--- a/dev-python/multidict/multidict-4.3.1.ebuild
+++ b/dev-python/multidict/multidict-4.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/multidict/multidict-4.5.2.ebuild b/dev-python/multidict/multidict-4.5.2.ebuild
index b6be8d2cd42d..2362249952c9 100644
--- a/dev-python/multidict/multidict-4.5.2.ebuild
+++ b/dev-python/multidict/multidict-4.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/multipledispatch/Manifest b/dev-python/multipledispatch/Manifest
index 918fe8146db3..8fdb149104f1 100644
--- a/dev-python/multipledispatch/Manifest
+++ b/dev-python/multipledispatch/Manifest
@@ -1,3 +1,3 @@
 DIST multipledispatch-0.4.9.tar.gz 7541 BLAKE2B 01a2f27a694c08b2bc32864e91219685402ecab63d94ef7c2f0c889772a773c64309c259d3b35ceb7e24567efceb8ab350134011df7a1172eca3a77b8b96d6c0 SHA512 b59f73f6d500c5cbb5e45eab9f6ecea45a211764cd8e7adbbf85c29510862bc5427f13dd652a18feaa9f930dfed51fee76411ee659ed8f961c0e5ba664878c1e
-EBUILD multipledispatch-0.4.9.ebuild 516 BLAKE2B d4d9e03a04c5b1c2f9151e9cf1c610d2de7a24def27e3f57ab28b760b85e54c1d48ae8a59ed54cace6586a3212a9ced7b71bd219f8bfe4ba0e20094620a1b2b2 SHA512 6df5a0f6d272036d0dd8793e40b0bb82bb998b48388a75905375c66e484646a04794608befcaf3a029a0f822a2289f8fc546599cdc5c4be428022192686647b3
+EBUILD multipledispatch-0.4.9.ebuild 507 BLAKE2B e31f1fb555102731b8d35b8e95c700c3fb8e7cf014f4d907f3eb5dfd745930f182695c02df1cded0f255c0f9bc429ea2ca2bd394b235db87ae82e56037d673c2 SHA512 2bf335a28002eaa9b341ba960a6647f80faf52d1bbaa6243fb673830d152ead5eb3d54bc98b6381616ae2fbf4256f7a3c1a349b100cee568c6c5f4656c8855e9
 MISC metadata.xml 674 BLAKE2B d3ead3001d5d1c37cb8b69abb3e07dced3530dee4073e2119d6febd9a0b98bb19bb324218b685ae6072ef7fd5cbe6b7bf4ed6d42377f0bf011e75c2badb7cb78 SHA512 e67081034601d04f6218239e40ea4f7c9822496b3d2cfb581ae49d513445e5aca281293aacc79bacef49adb02235bc00c8598db88e7550e3f509a1f304976a39
diff --git a/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild b/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
index da56d8b9f499..df34b4fdfa19 100644
--- a/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
+++ b/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index bdbf2cae0b04..05debe896901 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,11 +1,10 @@
-AUX munch-2.5.0-pbrectomy.patch 470 BLAKE2B 1f90760c1dfae6e67f6c5c98bca7efa335dc1f1af8568cc596ae36fc61bcbe494aef82627ede7ad4406b990cf24fd26921c3b3189481982ffb634bca2ec43c0b SHA512 243cb4818a65252e70097936b18fbb9497d332c31afecf56ad9f0b69f202567f6ca230e8cc0f5f811c802dc5023b7b9cb81466b0d280178fda55215f929335d8
 AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
 DIST munch-2.1.1.tar.gz 6565 BLAKE2B 81d0ea79df9934ec4fcd4d650dde6822258b3dbaaee8b114cb445219c89b76e40c7aaddd06306f9ba585081b556d7fa32d2e002de8bf5c071b0fe361092cd18b SHA512 5ffd78b1e062f71c73047a03949e6cddcd0eeae3a0ccccf36687140d12de9eb29161d2891a0fa2f1e70dfbc2b33c4ddab5d8a3611990718330c280ea769e85c0
 DIST munch-2.2.0.tar.gz 7108 BLAKE2B c01635adbcc1083dd539317f6619ad15bb654d1f5114d3b5f5253bbd1bf92a860d3b030233f85878780d33ca171bd08c44b37c9bdb538e4be868704861c4372f SHA512 420b9fe4486aac00b3a0d747995df46bb3fc72a5bcfa4fadbad3e3a50431493f69ca76294ae541042aaabec6e01794f8f3c9c03a5c0d6058e730dccb62e42e45
 DIST munch-2.3.2.tar.gz 7598 BLAKE2B 0ff607c4821b675bb0710e185c82135ba031e2ad0e18aae07f8736e102ee73c53a6977155f250ff20e26e87671f8a20ed7bac625bb96625017be047704f63bc6 SHA512 7cbcd79b9506940f88a2090649e5ab6678164b468ed04feebeab8f85c9af861a1a8012aaafc869755c3c7957feefb231bc15426c382c014e82e9b806a879b8e7
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
-EBUILD munch-2.1.1.ebuild 473 BLAKE2B 55af2c595124d3a792be541e87a028b31e08605f82b7291e778105ac6acdff7d7f96a8fd123e8d791c3e8c4cc84c2d2388b6f3ebffd81b7e0e0789c299062ec5 SHA512 3868b705e6cbf7d4522225f11176275bd19be5a0d803f909a88ae0a3886dc7e47986ab8a718dfe263a8838355d01b70befeccacd0579ebbc06a8fe70f6b882e9
-EBUILD munch-2.2.0.ebuild 478 BLAKE2B 0ca8fdc985de70b87df668065bbdaa512c6a7759039020ff4e192bbd7e8a77f5585edbe9a93690b660c60aed69a9db1406408b32e03ad24a8920fea1c727fd65 SHA512 8ae5404498fd465fff1bfdef711668cf3412502f0360bc5053c0fc682039e638d34737113d86b772b0f70c690b89ef2ba1a87eaedc47d8b18f4b1c6a33225c68
-EBUILD munch-2.3.2.ebuild 511 BLAKE2B 2dd6b884510184b469b2c3f261861c668b3d2abed653cd90964bce741c41073c87820a5dd29136453c611af3e489fe01fda820ade4c1066a80030d224b96d874 SHA512 e27213d809610f235faa95d51d87be90108bfeda55fd442622dc3e3db25a4ef500b0430641590bd4aa4a8f241f8a10af9784da6bf88acf8b9ca78d2599bb101d
-EBUILD munch-2.5.0.ebuild 691 BLAKE2B 167b3618d1229b4c68dba15a5286ae51f0540abefb92fe3d01c10ea52373196fee60273525c34b3765c144e49905de743e7bdc5debc846c51f2b79645e248381 SHA512 89f145e87a9b5b4f3b30b438b6f79e716d8858f5baf42bf568a70d81526aebda3acf4a82687e25beb62dcb1dca7dc57cda66552c71dfdf1e8af9939215429ce2
-MISC metadata.xml 348 BLAKE2B b02f6b0b5a5acc47ab4d719f9b70dd7e6a8c5d1694d374fe5eeedbede01105160c91226db47d08cbb5e290b9d57e1741b954f8c36a52d69016b8013eedd470ef SHA512 1787b144611cf1dd895b7a822ec2c5ef81e523f277c3394c4e23de466d11f1a4e22bbff019f92383de6b116ca911eff0293b4945c18d0287de07bf020303bf08
+EBUILD munch-2.1.1.ebuild 469 BLAKE2B 4afdfa204748b6a6df5b1bbbf50cc05a8ed10c184492928c2c3bad5463f686f4461ec5f274c8eb676b53aa17df273d4139f2974c59bc48d5c5d92ccadf766f19 SHA512 5079e3e46e93235eee8e51093208a28f21736d3ab8a315c906232afac31c4af1f060d916e54713cda948d6468703de010020bc24147cb353cbb90650b1c9a928
+EBUILD munch-2.2.0.ebuild 474 BLAKE2B 57203a5fc0138be2ac56b75f29708e526f687917f21a209d54a85f1ee0a80f4f7fbd741a288d3bdbe9fa9c3f0ad6b23ea32efa5e855146bf16236378aef00ad5 SHA512 335a3e7058b9af2cfcca2cdff05fe9afadd88e9c4b36c45ea69aac9e68a48c04ccc9d3e035e306ca118a12f95d11c2e7f0be5713d7b39226167186ae8596d2b6
+EBUILD munch-2.3.2.ebuild 509 BLAKE2B 0175e524e839580194e2527681a8f76e6dce7bb14949bbac414cd752b82d12006b8a5e6ad5ee5ec49a9427e963a46f76ec6fd7ccc2774a6fea84771fbfb7c75b SHA512 cf70dae16687ffc1523787a5f3c510b414e688e4a9aa364032cbb53c56529631d814b38ad6f506162c99558c925090adbb0dd8e702dd2aa33aa72e2be1c94705
+EBUILD munch-2.5.0.ebuild 686 BLAKE2B f7f6c467c4c922f4140af766a922fae5739b34cb6a70c3a6ffb4f3f150c1f3d7163e37e77263968292863b548966c3e9d17bdbf95cf1092841da0f4eefebb50b SHA512 ed052b02e30b0f4ed284289f63043025ca9460d6866f38ce6ab5789b958a2d9d3eed311288a46190b75fbb0b12401d8084bc2dcf033c080077169cf22fa28a2e
+MISC metadata.xml 297 BLAKE2B f25a8e5e6202cf3368d7d979e07e1c0dab3dbdb9fbf6341b51d28910a246d217ac4da6c217550e0618b5df92ca309b68f23844834e9a03082ca841d2d58f428a SHA512 4cb74cf412c11219c7d9cdaa3b7ecac661c890dd225de89640893bca6a77615735138ef8fed3887ac85e6bb06acb8f4aebf344060427b0839aa708da7820938e
diff --git a/dev-python/munch/files/munch-2.5.0-pbrectomy.patch b/dev-python/munch/files/munch-2.5.0-pbrectomy.patch
deleted file mode 100644
index 13121c345b80..000000000000
--- a/dev-python/munch/files/munch-2.5.0-pbrectomy.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 31f229c..62e1ad6 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,9 +1,7 @@
--from setuptools import setup
-+from setuptools import setup, find_packages
- 
- 
- setup(
--    setup_requires=['pbr>=3.0', 'setuptools>=17.1'],
--    pbr=True,
--    long_description_content_type='text/markdown; charset=UTF-8',
--    keywords=['munch', 'dict', 'mapping', 'container', 'collection'],
-+    find_packages(exclude=['tests']),
-+    version="%VERSION%"
- )
diff --git a/dev-python/munch/metadata.xml b/dev-python/munch/metadata.xml
index 91b51b7d902b..259ce1e47786 100644
--- a/dev-python/munch/metadata.xml
+++ b/dev-python/munch/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">munch</remote-id>
     <remote-id type="github">Infinidat/munch</remote-id>
diff --git a/dev-python/munch/munch-2.1.1.ebuild b/dev-python/munch/munch-2.1.1.ebuild
index 8e728e31a0c4..18dd1e8c2731 100644
--- a/dev-python/munch/munch-2.1.1.ebuild
+++ b/dev-python/munch/munch-2.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/munch/munch-2.2.0.ebuild b/dev-python/munch/munch-2.2.0.ebuild
index 6b5baedbb333..66d6986c4551 100644
--- a/dev-python/munch/munch-2.2.0.ebuild
+++ b/dev-python/munch/munch-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/munch/munch-2.3.2.ebuild b/dev-python/munch/munch-2.3.2.ebuild
index a55f4795317a..dd72180cda06 100644
--- a/dev-python/munch/munch-2.3.2.ebuild
+++ b/dev-python/munch/munch-2.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/munch/munch-2.5.0.ebuild b/dev-python/munch/munch-2.5.0.ebuild
index 073384c94fef..76667adf2c56 100644
--- a/dev-python/munch/munch-2.5.0.ebuild
+++ b/dev-python/munch/munch-2.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
index cf93049a6ff4..fac4404e6966 100644
--- a/dev-python/munkres/Manifest
+++ b/dev-python/munkres/Manifest
@@ -1,7 +1,7 @@
 DIST munkres-1.0.12.tar.gz 12126 BLAKE2B 23fbfa95f36ecb386cd04a375b046c3749e5cbee727d72c4d25e250fc86de80720bda897400f03d8e079ff7bd6589845836f7656eaa4f18192eb64a7258946d3 SHA512 9049fd350b739c9095b6e1da8fe0041210d4723ab8c0c6a7fc9943392bebf9eb224c6f420c8158a47607277e13fba2f3c7803ee222d58e8e3720d5647f44e596
 DIST munkres-1.0.8.tar.gz 9277 BLAKE2B 9680a5b8bd20a4207ac295ce535899c4ab123d9e26ae44d652c55601ac62f345a683cb133cc50b276dc1330a11a918bdd26c0f7832d908e05d47dc795592b38a SHA512 e0afda8b91e51d177b9e2dc66ccacce849649d1a7d0e756884ac030acf4080076aa428182c5e9366613ee16db338ba7dcd3c38977de0888781b1885f08cb8236
 DIST munkres-1.1.2.tar.gz 11186 BLAKE2B 2ba5ab7ce85fdc06598829123ed334209f37c0fa4f82e863c78220db82e9b8b4c51c7369042bdac6e9b33b4d580145bdd37b5743f0b3f511141782588803cb0e SHA512 4a8b698f53812303f5020b4fc357f859a63d97370fe311d16ae959addd9cacee65667e430cd0d00496e423c1f0c7a3c8d4219ba49600a982de323fadd2c03bec
-EBUILD munkres-1.0.12.ebuild 514 BLAKE2B 3afaafe6a376ade2494b9a22af7204e398a9d593b7619eb9858fdd1d0cf317c94c3642c1254c1057ebf8edc243751c8fbbb0674612d1c62fa54ce35cfb1eb8b5 SHA512 8f5b144b1276c2448fd3315dd807a21e6aac8f6b1d2869be26f6a76914df98620e2b81e9d8e8beb6ae6fb4b3305b21444d0b1b2fc41815837db9ef183b87e522
-EBUILD munkres-1.0.8.ebuild 453 BLAKE2B f3f417d2a6799d887f9b0475b434c42bdc2bae2ffb932f0424c827cf26f27f788f8d4cda2caa7a839cc8cdba42a77282b04cb8b0ff7203dbca925c0d7579f5df SHA512 9b84fb0fca427f61735c7771347706e3fd99a9660570d9cc258c2c2cb7fb640ea6961df1ca87a77b3dfd8f3f8501beebe6a8cc7f8b821940c9e04b289d8e4f3a
-EBUILD munkres-1.1.2.ebuild 520 BLAKE2B 92dea5952ef9746ca29f9cd1524aaacdd6c8e4cb56ebc35ee5bf662bbd572f753de9064702c83d80007953bedc3dc417d63deb7c1f64a0ce002ec23858c22fdf SHA512 4d2bb46272976deceb4bb5060253bcad615d3419656874b06ae544302b6a8ece01730ce07511010524022aeaa3d5a93b740e606f9bc8d299a582e12822cf8fa7
+EBUILD munkres-1.0.12.ebuild 510 BLAKE2B 543885353e3286e6a1c017215e734e0eb29f0175790785f3d8d703b3d34ef0568a6d43414b42f013daf21fc309ace98e0d6dc57778ce414b61ff3bb8a40783c8 SHA512 17a79c37d80a016317daa21a840e4f47b708e70ca06e7694521b2b4a4a5cc1882d38cc068938a94ecad9be7be495c28154b9a7b1350a953fab33beb319a5f8c3
+EBUILD munkres-1.0.8.ebuild 449 BLAKE2B 4ae30972befbc948b213845543d828118ed784de4a87539cd5fd3095f3ccf3754dae203dcd0cd8bb8cc07eef50b47d9263638fdc90ad35782be04a0472c3961e SHA512 0bfae34c6ae6d09c3b227a85b2ef28a140ef638536f99cb81393be7abffee536a782bf3218bb7168f79e0f0672b734c0de865ca0e315d5e5bf690ea05cd2949e
+EBUILD munkres-1.1.2.ebuild 518 BLAKE2B 574005dd5e45197a7459083b0eb7476fa61e60e1d0c3d77dc707d56c6c6348a235bee1c8581215dfdb30fabbc5982be5fce9665a328795b40105c28af8bf2c7f SHA512 512dcea976343d60d2276be53dc6d92e5972d8f302df9289221e4cfde8d883f5ca80d4ee1e10182866fb49064b5a580f42c4b9da17bc9ecf2965c65585cb5395
 MISC metadata.xml 688 BLAKE2B 65040255d996c7256eada45681cd0580caf8922cc53e33d5816c73c73ac5686d6d4c6240e7b5904c22a0944c73f944bec9e565bea5ea53ae51deaebf777a0c56 SHA512 471f6eb808f978275dee54f9404c36a5a39d47c72caa9aaa5f2ad3bb455983f9c46a3196d1246d6830a50624d203b8dd2b68391b09b9b2e933c74bfeb877baf1
diff --git a/dev-python/munkres/munkres-1.0.12.ebuild b/dev-python/munkres/munkres-1.0.12.ebuild
index 34703fa0f6cd..f4fb12912d8c 100644
--- a/dev-python/munkres/munkres-1.0.12.ebuild
+++ b/dev-python/munkres/munkres-1.0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/munkres/munkres-1.0.8.ebuild b/dev-python/munkres/munkres-1.0.8.ebuild
index 3874f94a3ecb..b45efa74ca8d 100644
--- a/dev-python/munkres/munkres-1.0.8.ebuild
+++ b/dev-python/munkres/munkres-1.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/munkres/munkres-1.1.2.ebuild b/dev-python/munkres/munkres-1.1.2.ebuild
index d0dbb6b1d4aa..d9d4b94a0898 100644
--- a/dev-python/munkres/munkres-1.1.2.ebuild
+++ b/dev-python/munkres/munkres-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mwlib-ext/Manifest b/dev-python/mwlib-ext/Manifest
deleted file mode 100644
index 2a8da9acc81d..000000000000
--- a/dev-python/mwlib-ext/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.13.2-unbundle-reportlab.patch 1211 BLAKE2B a1237cf320e5a37aadb1f9a49c85a9bc9c2b080134fc066612f1b7eb5d01b77a233b5fb98ef2c3e17106e1787cb778901a3c0953bd093be2ba950926f5b0826e SHA512 9b722a08157d7e3545ce40c061ed84f1bda323bd65b2938062dc816d41b1005de851602249f787a5e6868674bf94ec37246572a7fe7476339fa5eae43e11dd72
-DIST mwlib.ext-0.13.2.zip 2111364 BLAKE2B b1b5ddf4cdc54fb2e72f809e86dfabd2b81498432161128e7fc99e811ed3736889b59242e935dddae090deb6489bcc043e699e6b4db0f360732ed983765f27f0 SHA512 a7c6a53d92335d59f952c9fc549ef079afa92dbf8b3c97930463c817c867c27d6ea97b3a52aeadc12c6d107f149630799007409f1c1ca23186ba64a2e71ca6d8
-EBUILD mwlib-ext-0.13.2.ebuild 663 BLAKE2B a0c37c1912757f723544f4c365680387fe72e1c2574075f5162f0811f4a637745cbc9f91c040ea5a501eea0776eaf54a839ed4017e6fa1e52562ca1d5f98ee0d SHA512 8b786610239a9d19729e5e1b2bef48dabad70e8ee41b110e3cad7d0998ad26b856981be10c4430ff29095587d4e46e2dd421f3a341a2fa1ee980b3160778a904
-MISC metadata.xml 312 BLAKE2B 3b9e1681fadec769e08d8f84b79152ad1bf713e81b401393fbfda73dc4acb2350d91d20b81c8556f9948990b82d2c0afc530ad22bc34e0d99abcd9ae80e809ff SHA512 35e6f66eb933bb01e8475c55ff097ec406a08fd0358da5912fe702bebbbc46b04de23e7da88144ab699f91cb7796d7eb3fdb5e620dfb7f85b38caaf3c1c88a52
diff --git a/dev-python/mwlib-ext/files/0.13.2-unbundle-reportlab.patch b/dev-python/mwlib-ext/files/0.13.2-unbundle-reportlab.patch
deleted file mode 100644
index 12156a796a5a..000000000000
--- a/dev-python/mwlib-ext/files/0.13.2-unbundle-reportlab.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur mwlib.ext-0.13.2.orig/setup.py mwlib.ext-0.13.2/setup.py
---- setup.py	2013-07-02 09:53:32.000000000 +0800
-+++ setup.py	2013-07-27 13:24:48.169128958 +0800
-@@ -1,30 +1,16 @@
- #! /usr/bin/env python
- 
- from setuptools import setup, Extension, find_packages
--from distutils import sysconfig
--if sysconfig.get_config_var("LIBM") == "-lm":
--    libraries = ["m"]
--else:
--    libraries = []
--
- install_requires = []
- execfile('mwlib/_extversion.py')  # adds 'version' to local namespace
- 
--ext_modules = []
--ext_modules.append(Extension("mwlib.ext._rl_accel",
--                             ['upstream-src/src/rl_addons/rl_accel/_rl_accel.c'],
--                             libraries=libraries))
--
--packages = ["mwlib.ext." + x for x in find_packages("upstream-src/src")] + find_packages(".")
-+packages = find_packages(".")
- 
- setup(
-     name="mwlib.ext",
-     version=str(version),
-     install_requires=install_requires,
-     packages=packages,
--    package_dir={"mwlib.ext.reportlab": "upstream-src/src/reportlab",
--                 "mwlib.ext.rl_addons": "upstream-src/src/rl_addons"},
--    ext_modules=ext_modules,
-     namespace_packages=['mwlib'],
-     include_package_data=True,
-     zip_safe=False,
diff --git a/dev-python/mwlib-ext/metadata.xml b/dev-python/mwlib-ext/metadata.xml
deleted file mode 100644
index f5604784d292..000000000000
--- a/dev-python/mwlib-ext/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">mwlib.ext</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild b/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild
deleted file mode 100644
index fe4411d9904e..000000000000
--- a/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Extension module to mwlib to pull in reportlab"
-HOMEPAGE="https://pediapress.com/code/ https://pypi.org/project/mwlib.ext/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/reportlab-2.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PV}-unbundle-reportlab.patch" )
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index d152a33ce832..eb3e3b71bb60 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,4 +1,4 @@
 AUX mygpoclient-1.8-tests.patch 1635 BLAKE2B fb92cd995755013dbb2b35424de88d5c949485e818be45e00c89192bb60b9506690b971fd586c08d7be31e7680c54586a015cd8dee299320fbbccf87c9ea70ab SHA512 9036f3328ed4980858db07f57661300e429c15ca8159118067d1385f8cf0ed5fcbcb7ef498dd12336c9fe2b8e5d22c944b8cd1f4043d418c5ce2b706a47aa239
 DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f
-EBUILD mygpoclient-1.8.ebuild 1173 BLAKE2B ec8bbc8d77d357f698fa8f329b950c689f88317ce3867cadc3ccc1c958f46022ff5f5279735cb856201d469aadd656882be398f7089d016536cd2b0b8f26b736 SHA512 e20a6052001ed867ea722c650aedbbbe0b52100b36f0566b068104fc3e6963b6d8b2f0c94c418b3ac4fcd430a1d94c62407bc9212c89d6fc4386d76cf4be5920
+EBUILD mygpoclient-1.8.ebuild 1168 BLAKE2B 51532a7b9ed5c6999454c0af075bc5c85430b2bf1f26524090c991fd8e8758bad7b017bd8fb63f0fbd8387fce76c50483bfdce385a74bd54b48b48e80699b6a1 SHA512 cc3e91991e43cd63489877da29c1d5844762dc6422361f888fe43403449c108cccf70f5e60b1ae91620d1a71df9d0ed3eb3166afd96e94c0ad68a6aea9a42c47
 MISC metadata.xml 346 BLAKE2B f7a2d7e94b509007e77797724c67413616c4833eab04227f65088bc01cee098da763738c810adcfd0be1b13de261240b24d80ca2940925a847df4638709cfa1e SHA512 83fb6ffd70d907e1fd4be3ba91e781cf9131a980338b2fe66874fecde7673bd40df0005b34f5f52c2a7ec88e4b3e92ef2417d293474c1b51ecd06ff4ee6edf2f
diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
index 7e20875c51cf..01df10cbcd92 100644
--- a/dev-python/mygpoclient/mygpoclient-1.8.ebuild
+++ b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 162702260b3d..d026c651d029 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -2,12 +2,15 @@ DIST mypy-0.700.tar.gz 1413962 BLAKE2B 6739960bdb5984115b4bd84ec3ca63e6b7a4c4494
 DIST mypy-0.701.tar.gz 1413988 BLAKE2B e705a1da6af8c68b9226d67acaf7976951ff5ddfe926f52cf51f70be59e75cd12cf303aad98e136ee342487c07e1273d0ca8ea582621552924c40ee725e6c01d SHA512 6dde048c211d1dd8f3c02af9500d5151588810d9989528ec4bee0ccbb5a8636fc4e03a373b80d177ca0937c0c92e0ffad1faf82b23db22248b782ec6812e3c1a
 DIST mypy-0.740.tar.gz 1916030 BLAKE2B ef2259fbfa24baa7dc28ed4818c988f5708d1f0be8665e97c5be231fe43f6edfeaf7f8cb4a6f05a8051b95b9457752238f044890686fdad9dce2e3fcf7f1a67f SHA512 f583be8bcb05d8f2c772f7d416bb425590263d759a719de67dc1186d0a1a8178a0c5461f90811c7799b06a49df820c98a3e369b3fcc4b045703d38084eafd0fe
 DIST mypy-0.750.tar.gz 1976988 BLAKE2B 46c008debb2d0f1757d4cc300adba53460c7e888650e9798c526bc55f16cdd79d0b9e5a52f1c5a45b4114446d3724211a513f3e4c98bd85c9e8e3f94587b6ba0 SHA512 6fbfb45296abd3d390d6fe97a39a63129cc1555645da9b4d81f08c6da5c4f45640690fbb7957a6c52144c06106e4148d3cfc244e5648b006c58445a3c49d0c63
+DIST mypy-0.760.tar.gz 1986638 BLAKE2B a52be64ae23d6a0d5c29301599a10114f6260f665d658b93b387a2f9c120fe186940591dfc7479fea4160d2bebd8950dcf67a1c21bd7ed4c6d08093235f2107a SHA512 e4dc38741a8f446095e63ba734cf26440b1ebb0761f35553d0eb79bb58bedb00c0b04b8d2a2b845c39ab8fc418868dab89a5a19668c6862bf763609d37946eba
 DIST mypy-typeshed-0.700-f7c00b8.tar.gz 467098 BLAKE2B f10c9c6b3cfe9bc8518950839c2bb00d22521b6696a155cf721d34aac46205a8415f569d566f20ce865a44c23e5935748e5e488aff22950fbdd12bad4e679a42 SHA512 88e1ca3bc88f349a26cbd97303398de270eaf9332432b0402d7b44794cadbca86612df98ff1abed2a146450df760278946cb8eecc660f3dd5e00439c60807362
 DIST mypy-typeshed-0.701-36b28e5.tar.gz 466822 BLAKE2B 6a1e2ae84250d6e51649aab9b1c65f4258533bc54ba470162ad4c4e894d6c73f32a9087fea3501f5b833069c717e6037dd848a514c5ea2880eca081337962806 SHA512 27fe5dda347903ac8fc925c7bc7d91ff0bac6421315a49fc8227f5ef8f476e6bcacafd07b87f80ee8dddc73009dc2f52fe6a57fd542283fcf2c52440ca09256e
 DIST mypy-typeshed-0.740-eca9375.tar.gz 480468 BLAKE2B 7c31e59e93303feced9730e505101641874c61cba1c68a5083c412b1e5ae50d704d69b77b23b0a54b33c8788b7a0c1cc519fbf8eb923e9124b3facfdee1f782f SHA512 53abd0aa58f58c6d3a4b4260d21053b5ab528dc1c736072942967bf21903cfea0105d92662693ca69bd7e795db481454705b57d8daf26a37728633a3c7173a3f
 DIST mypy-typeshed-0.750-8df632b.tar.gz 494170 BLAKE2B cea871eee0e7f8e3bb0ea5bddf9936ac30dbc57b483a2b9927bd4e824d797ecb96c1dd9e9a9cbe59f76c3d5616ebeb28f8b60a2a8a2f3f048cd710612eb0b2e7 SHA512 409ec4de49322ab87cb3e146e654132bc8f217559b48b662e3ab4335a171d744f29d5dacd375bd0ead17c59fa07a398be61c8ab2f3d4fe2649a46348df371968
-EBUILD mypy-0.700.ebuild 1851 BLAKE2B 50eeb23460d2b99629b430ba77a21e80838b9d28313bccbf5a97eb06d34f5fedf65fbd32d4e3c06afc73c15988c6058d9e9b4767136ac55ebb65e28330c63c35 SHA512 77ea15c21bc27579297707d1439f1844dcc51a90d19bbc528e139718731888427f30a7baa9a8dbd55c785b15b6f57e76cf07f87302aa523e5a8579b6eaa7e017
-EBUILD mypy-0.701.ebuild 1723 BLAKE2B 0c69abf69b342eb08ffff874213ec8d2ba9d07d6774a94a536b60f6ce80c0bd39ae818249cd87f9d2d1ebd7cff01b47f6e84a3e423461e5ef11af4597e879ae7 SHA512 7a959df1970f8b22d03990fe8d14858ec4e7a2de504c5a5c913e3a0a1b33581830bcc86e5402a631c4ab8a36ea7649cfc97b6464d6764c08a9a8ca4e42bf654f
-EBUILD mypy-0.740.ebuild 1731 BLAKE2B b1ec87f155cce5691d246e2161b3e8e2b6631b7e4ee9f93becb7671b3b9c134db434cafd5b600a1ae207706cd26bf33a3f2dbdd35b0666a537ca75694d14f430 SHA512 db827fe1ed3ce73efb1fdb6c5ca4d90ac8c394d2224caea874ca6a8d123a9a15c0aff50e505a74aeec34b01a66225bedbbafe5170cdf7a47d7deab8d390f3ac9
-EBUILD mypy-0.750.ebuild 1731 BLAKE2B ac587fdc193da8e6df49ef5b5130a12a48aa1ac123b7ef6a929d7ea2f4928b6de5b62e874e278581a99bd2aa746b40b8f9fc86e594aa148322dcf3da6f339e20 SHA512 8ff2ab46be54b9de7256c4b02b78de613737a0ffe5e9cf136d6f282fd63a2c09fd9bd7275356a45f6861f358df251ba7e8469cc87e359d3dc4b9a3bfc47c976e
+DIST mypy-typeshed-0.760-a06abc5.tar.gz 498726 BLAKE2B 9a2b3621806101cab009ac38e73c8683fba2789cad55da0a6739afd37bfb3ac4d8ea4e6b9cb9ba154a6fd45790f8dfda9e921d98485305c244573adf745d2adf SHA512 82559a91cc482f0cbd0cf5042d5975de21abc143708605a08c54088ee9ce3c9f52607ed3c00950442f4f526fd57f9ad4ada12a4f2acfb383759ac05f2be1a0a4
+EBUILD mypy-0.700.ebuild 1849 BLAKE2B a3133fc49865d45587764dab24e1b53c1a8d35f0067a2effdbb7aa0342f9c21da0f33d5cb6b9f15ddcf4d62587d35199e59907e2997036fd22bc4c5a90db8d12 SHA512 82208c6eab45ac01f638177068cb008d72fe3a7183363e9a9f1e27105b2ae0aba24c11f19280700b7e269cdd86e619c5a948eef8de0f5a7ba4574e5bd114c39d
+EBUILD mypy-0.701.ebuild 1721 BLAKE2B f1d188c4ac3e81afb48303a7409cb9278bc2e35c3b09987d69d596022d51ebd530eaecd60c60639a8bd11d858fb234c3719aff6aaef7d55d8aeb65e0bf29b00c SHA512 9dc0221dacf37f3fef700796afe61a77cdfc9df1988a10c990c3b6f5d2369a153d7e855b853c55a6b15d267badca2cc3bbf5398fdd033076707d4518587c7c33
+EBUILD mypy-0.740.ebuild 1729 BLAKE2B a1cefa65268a94b0b89571be9b6590f052212673372ab02a18993c39559e7dd21ca9a87c8f708b844cc10cecdd81bc9e2709848491de14a65f01af027fb9dc1c SHA512 1a0160f1a6144595619d65b519cb540151e4e264ba73c541a0aad1c7f00b04a2ec4357bc1fca9e9a321a3d92ef6b8ae0ab0b7c20518d26a3fc45334360d573b6
+EBUILD mypy-0.750.ebuild 1729 BLAKE2B 8acd886b3274fc24c6eae8ef4e385c5911fdcc8d6134fecbb886905a68af62a07821c163d5567cf39a24d8f7690c0c435834ca570bb1e940d8c79c4c18f0a0b0 SHA512 b9a3c315fd27328dece09a61406626ff021ce1c1c1d35e6f494a92b84ac3a59124690ea6bb1e7f62985f9050a6db5e7779c7d5447098a9086eb1d7b23aa799c1
+EBUILD mypy-0.760.ebuild 1718 BLAKE2B 0355c2827cc5cc6c3d2277dd41d997e86d5612c059252a518f59d51aebad9a649b405908372d860aa3d7ded21fd77f80066c8a36b2199cffda106fac2fe4edd0 SHA512 dc0e940d95a17f5cd4da0c57eb8956a4d76c4c0c91c57717a4b0ada1833559f398c25e68b0ec2bc31516cd0f9bbab704068475b7c43e042de06f586af8abb3e8
 MISC metadata.xml 318 BLAKE2B 26aeab57c568a3ebc431f846d61405428034bf9cf8333e5f52f43ec68d51fbbc2cb71deef622c07291312f63f46f29007ba4b02c21e90b4af3db039a43fda4ed SHA512 9e3c8432730d94d7ad9c65ccd1a48d7afc1b43662097f0844048ad107e81ba30e03bea99f64ee8a4171ff0504f1ff04d8d9a84407f414ff228cecadcb80c7c43
diff --git a/dev-python/mypy/mypy-0.700.ebuild b/dev-python/mypy/mypy-0.700.ebuild
index 05da31d847a9..5a3823cfae3d 100644
--- a/dev-python/mypy/mypy-0.700.ebuild
+++ b/dev-python/mypy/mypy-0.700.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [ "${PV}" == "9999" ]; then
 	inherit distutils-r1 git-r3
diff --git a/dev-python/mypy/mypy-0.701.ebuild b/dev-python/mypy/mypy-0.701.ebuild
index 8930f1f8dee8..b79da77926da 100644
--- a/dev-python/mypy/mypy-0.701.ebuild
+++ b/dev-python/mypy/mypy-0.701.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [ "${PV}" == "9999" ]; then
 	inherit distutils-r1 git-r3
diff --git a/dev-python/mypy/mypy-0.740.ebuild b/dev-python/mypy/mypy-0.740.ebuild
index 59d0673680bb..f6c5002eac3a 100644
--- a/dev-python/mypy/mypy-0.740.ebuild
+++ b/dev-python/mypy/mypy-0.740.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [ "${PV}" == "9999" ]; then
 	inherit distutils-r1 git-r3
diff --git a/dev-python/mypy/mypy-0.750.ebuild b/dev-python/mypy/mypy-0.750.ebuild
index 05d2fa5711c7..50f7863fb76a 100644
--- a/dev-python/mypy/mypy-0.750.ebuild
+++ b/dev-python/mypy/mypy-0.750.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [ "${PV}" == "9999" ]; then
 	inherit distutils-r1 git-r3
diff --git a/dev-python/mypy/mypy-0.760.ebuild b/dev-python/mypy/mypy-0.760.ebuild
new file mode 100644
index 000000000000..e4d8e799828d
--- /dev/null
+++ b/dev-python/mypy/mypy-0.760.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/python/${PN}"
+	SRC_URI=""
+else
+	TYPESHED_COMMIT="a06abc5"
+	SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			https://api.github.com/repos/python/typeshed/tarball/${TYPESHED_COMMIT} -> mypy-typeshed-${PV}-${TYPESHED_COMMIT}.tar.gz"
+fi
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+CDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	"
+
+RDEPEND="${CDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+src_unpack() {
+	if [ "${PV}" == "9999" ]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		rmdir "${S}/mypy/typeshed"
+		mv "${WORKDIR}/python-typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed"
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index 8d7fb55e0451..d32e02e4cad4 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,3 +1,5 @@
 DIST mypy_extensions-0.4.1.tar.gz 3548 BLAKE2B 48ded2fefa384242f7feaabe8be840afa623ec89b53c91c51d403684fdae8c6a25e4f88cc9f30c31537958df551a5da42fdb13b49881266da62006843824cc84 SHA512 e862a17b07d2c922b460012798d27d925cdeed4b8dbe9a1e38cb125df5546ca87039ebf32ad4151820d3444ba729fb0eb01c59576084724eb4ca19c5c2a52ac9
-EBUILD mypy_extensions-0.4.1.ebuild 1040 BLAKE2B 477bd358ba2778a0da888a5cb4e9e8fd9affbf11244c8e27db20e5d7f0a3a4a613343d316f0c1bf682af530d07eb9df96951bc40529dd06ce70248c839e60143 SHA512 a7e4ae81f6522383cec89a3f2aa35338c2fc59ee308be882fdcf9e496f2f91a4d9860d5a0c205904481ebf729cf8e7532a699507bd39a1110618a8164613278a
+DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
+EBUILD mypy_extensions-0.4.1.ebuild 1030 BLAKE2B a39d1bc195dbde421382fe34d27d5985359c03e31323b5df51622ac97fbb89096d78e351744b2aded138d90ec2a05ef5e729143e86232edf7a68f9ebc1560828 SHA512 fa403ab867dbaa172cb247c8c2f180fb5def2f63b486fee2b38ce2665caf400d4503ec17fa7e29a93c54fa3d7f6a4d8cd7cb960ceb7cc82f667ed2422ceef66c
+EBUILD mypy_extensions-0.4.3.ebuild 1040 BLAKE2B aabc6d0e793c6847aed2b1aa04095ba1505c58a7478908df93d1b1f5f6d89ef6ed22dce0dae0029e5542f419985a53a936eefd5edd5961bdf58f623f03d9b46b SHA512 e207e0c4deaee2d1bf605a07bf4b11e8aaadf923325e3db5656d967cf6cddc1b98812ec5cc02196f42274159930d59406e5f4d7de946e68ae02cb5c6b804268c
 MISC metadata.xml 418 BLAKE2B a413884e5865ee7a5ef3fc286911cb613b197aff249a7779d9bcf5c38499faa4b27590534639c4bf57a11c80748d33bf12348e020b1090a3b7c07e773f11c6fc SHA512 dd73868a30b6a1de998c0636037a431ecd9fae5b767be78e4103e2aa8fd2a5dc6c6679a8e082a20508537060f56751616fd53842974b0935817b2b9126ddaf0b
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.1.ebuild
index ec18f4e1cfad..7e051b17bf00 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild
new file mode 100644
index 000000000000..fb718cfe9e37
--- /dev/null
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/python/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [ "${PV}" == "9999" ]; then
+inherit git-r3
+EGIT_REPO_URI="https://github.com/python/${PN}"
+EGIT_COMMIT="master"
+else
+EGIT_REPO_URI="${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	${RDEPEND}
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 86abd7f2c980..f2f5b37a5ab2 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,6 +1,5 @@
 DIST mysql-connector-python-2.1.7.tar.gz 11781659 BLAKE2B 332092059a32249e449f99540beb9eebf80e9381cef4560208412a19385894eb2193f02d5a20aceafe9644b8a225926a02d57c3acc89ba7d321b6d0f9c7c4d76 SHA512 f88c3a6dd3c3c1cd5c16165daef801dbcc7ea9163406273dd751e25687a57dcdf4ffbcdb65bb107e8cd9d7c91029823f625dc19ab34116398263fa074598880a
 DIST mysql-connector-python-8.0.18.tar.gz 12037201 BLAKE2B 54dc45c9ecc09bad755bafec2b3b73e35368f742f30c8644764c8c892c6f79c3b6b438cf38dd9ebc878cd76d5d74d71be6668a903b57b3d0feaba9ff6f5b58cc SHA512 cb441a6388de8609b56e4d9885ae2491d207c7b1e3bb387341d55853d383eff6e268e34feb32b42797c7b210d35f9d6dbc302ea4c9ed2441a76b91ea66d504b2
-EBUILD mysql-connector-python-2.1.7-r1.ebuild 998 BLAKE2B 1d20c7310fafac0ed7afa9ae13509da7bcdda58fe1a435d22de4c86a797ff9d0bcdae5874167622263078199b63169c92034ad9b0a056c0dfc7b875ff5e57cff SHA512 d29a7dac07978fff4439a479dc382da3e6631d20bc0d4cc6a8cd36ff4eb89a20758797ac1528a013cea96c52bde4b03ee38684fcb8f608f69d58adff142a5191
-EBUILD mysql-connector-python-2.1.7.ebuild 969 BLAKE2B f81f9239c2540ef7920e7fd8f32871eb986bb516694493591ff22bd67b2fee4ed632a62848a545611b5fbf8b7787dd9373352aad5832f19dc3953bf3f61f395a SHA512 8c452683dcd41732868ed212776d50fc050f6cceac4e3ec0490eeb8bea3f0b60514b11a45843f4074cb585b6ee5bfd28e455e773dc28b75655d9314b8cf3fe6c
-EBUILD mysql-connector-python-8.0.18.ebuild 1493 BLAKE2B 6dc643fe409a1c6e3af0253688d460695bb77bbef73fd2d5bc3bb853beb99172167404b973e67ebd5282380762521b44aa1739fefc9da60d500d4b8e54288d74 SHA512 aef5caf50d743f498f1396aee590e4607046fa20a6a1cde7b4cff2fb80f006abf92ac00f245e5303374824909c878155e3cb5aa4a93418db6682be8aca3d31d3
+EBUILD mysql-connector-python-2.1.7-r1.ebuild 985 BLAKE2B d7ffce473579417dc81a10044dd768399ec11aaa1095e975eec2440a270475e073e483099784a1fd1af9b615310743eeafe1711e34e4c044bb3c2a3e5873ebe9 SHA512 f026c4d6243b125226ad2cdfd01172c39aab6dd0e8c93654532452a310c1394551033799ce685e2c5e1ead8012108259e1c97445278fa40d87e47f6633bb80e7
+EBUILD mysql-connector-python-8.0.18.ebuild 1483 BLAKE2B edc92a5a406b6b71abaa1ca4cde3c7f79901054cf2c413c06b44aa39f737fd10f56fe6ed32d45f2fe44ceb7ecdd4c116729630f08cec2a3404e66b03e8d997d4 SHA512 955a5d5bca969940acc080188ad58a7e0675d72e3465685ea66926a2587cccf2fd0cd317798fe9db06a8349adcdd3b0747521be19ff6ec4cd64d5eb2c408dbf3
 MISC metadata.xml 336 BLAKE2B 280111bac38fbd60e25601789026033a61dab0c2706af1874a765aa3a697cdba5d5b051a0dc28490782cf135104f92e793c68d02b74bdcffdd113252b9a3ac7d SHA512 27da38ceaf7dc44250dcb4651e2d171f1ccf0d5a3a2c04845dc6369e1a264b71ea909f7d799d3eabbd989f4c9c37c201f511887956613bf7176697da63378838
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
index 00b4a6a06cac..d3b0348b4c0b 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python client library for MariaDB/MySQL"
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7.ebuild
deleted file mode 100644
index 0c7f5c8eefd0..000000000000
--- a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-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"
-
-# tests/mysqld.py does not like MariaDB version strings.
-# See the regex MySQLServerBase._get_version.
-DEPEND="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 docs/README_DOCS.txt )
-
-python_test() {
-	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX%/}/usr" --unix-socket="${T}"
-}
-
-python_install_all(){
-	distutils-r1_python_install_all
-	if use examples ; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild
index af4e24caa31b..5a3e307aa1d3 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python client library for MariaDB/MySQL"
diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest
index 4328b0f9a8c9..86d28a64f38e 100644
--- a/dev-python/mysql-python/Manifest
+++ b/dev-python/mysql-python/Manifest
@@ -1,6 +1,6 @@
 DIST MySQL-python-1.2.3.tar.gz 70305 BLAKE2B 8a365732556646c535bd9cfac69c759e561f1e15f4b25ef863ed60b64f8953af0e3633dfe00085d9a69025cdbc755afab62fc3af5d785d1dc0f67795d5748f75 SHA512 8c1c88ccf833744ac1f78673cb306cafe7f9bfc85ab2ce6dee1024b86571c17f006e3ab8452dba3527976f39aca64757b2d961c30ef4ac61c9a27e60a5f1abf5
 DIST MySQL-python-1.2.5.zip 108935 BLAKE2B c4d5d4bc814c05604c4acf673ba4f4040dac2653e65173f672a42de4f2877583c79553533040c5502f99b57b71868031daeea7b637a4bea189fb20eea6a6ecc2 SHA512 37521c6fd855c4cde495cc8ec085aca79c2d441a6e3710759385bf2e2c17f43d3311cf1166663892829d2e3999c419443c358c7031cdda225ac44611ced188d0
 EBUILD mysql-python-1.2.3-r1.ebuild 837 BLAKE2B 715389a9e0b1f7c60cf4fc05301a73a2a77ae6907a1b9c9aa84dcb319920879a3ff03b5b568622e89a465a112eb248b0974e8e9df637afc31f089fa6bf21881c SHA512 e7e5b671e49b919c91c7f68d129af76d311ec5de9cea59912c14394d145b6e075da0a114d06f9deaf8fb380eff0e124381f15196029cd05e24ade2a6de9ec646
-EBUILD mysql-python-1.2.5-r1.ebuild 1109 BLAKE2B 5ccd076b44ef74db2b122b85681e99309929413e741e23e5604e08d7f431e96575edf652f61e37493e89a4e14b7f2f8b2c8cfdffcb137d5ea35a98f1bf81640d SHA512 7cb3eee31f89820503143998665e6bbb65dc64274ea1d73586060bc2192c05acc2f067a3d2914b6a169e0581122d9efee71c3178223c3796b876d3783b46cf7a
-EBUILD mysql-python-1.2.5-r2.ebuild 1155 BLAKE2B 5caf215f684504b53fddddf6416293d423d725f5816a8ba74605ef900e7ad8b395ee82af0662f5696d632c3a7ac584524b0a363a87f074c2a363225c795a6ead SHA512 ab537295508768624b247b54c421c0f1f5510d27a2dd6f037b9695bc7185c155b797368ad6e08d9ac982b1977698c769a9338e954d9633bb0eb4100b48deb333
+EBUILD mysql-python-1.2.5-r1.ebuild 1104 BLAKE2B 18a2cefc075bbb03fa64167277dee72e9ee31df7680b6991a4e720f1d60d9bc90e3ad5037237f61c3c3a17090cbdc8e9df530c4dcb29934073bbbe887220d872 SHA512 0998f6c8193910ba4a43335a113704a2ab3f565752ad90eed65dddfd663fcb038e34714db1d3076b151b358ca38dc045e6b172f32dd3305a96e7a02639aa066a
+EBUILD mysql-python-1.2.5-r2.ebuild 1147 BLAKE2B 9bdbfa08bbefa0c30130e98974b38825e448ec091feaf014bc64fc686119bc971ceb9d13980b786a38f5e417e502d072c2ba9783428838fca4fc9c138f40b7f8 SHA512 bedd508e9a74418b195d15655d8dc713bcfccaaf10157c80ba3d52e54128360c6382c3c3b53a213726e72dcbe42899c393c56865e202de97962cf2026c9aeefc
 MISC metadata.xml 384 BLAKE2B 3cfa19a657e3c9f4ffe875d44e01b6ddb72913d6d189a40cb9b3fb7ae6e076deb7f667ba24911ff4627125059dbec21b4fdc6deac20b71dd72de0b500689804a SHA512 df7d59db502cd6ed66cd936708f82efc5e22633508ee367c331d1f66298f806eb3d9a17dc8919c450afe3bebe30fa38e356d3feea2e87c82eea03db54c6e7ee9
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
index 9704c758e0bf..8b56cb87b2d2 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild
index c458d0189c6f..7ff354aa59ed 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 42eb6eb366d8..5237e0c24240 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,10 +1,5 @@
 DIST mysqlclient-1.3.14.tar.gz 91391 BLAKE2B 06a781f21f608246ec2da8a591d7bf5e430d96bc4069e589d6466a2deb4e53ab8a51db0015e4db73a748d6cbdba9c8c550e888e415cf9390afe5f0d7f0620156 SHA512 2623130f67b989f981bec37d19fffd400ba1b144657ff25575d055d19297d0f94c0a70eac980d90a76ef2b0455a56ca033ad92bc54c9456b2c57d5a84475ae50
-DIST mysqlclient-1.4.2-r2.tar.gz 85662 BLAKE2B 5e375c142d392d79ca3b119d52625c3c65a074fb90e71eabd2791823738995d390de90c50c20dced9df91e071d74d7a318cf09779c44387eb4103845486b48ad SHA512 d42969bc37b5148fed14b815280890f07058f75ef99390674f6ba3921f5dbaddc3ab2344f41e3b6d36f35229feffbc419a2ad31e2268e70165b1973356ec9c32
-DIST mysqlclient-1.4.5.tar.gz 86278 BLAKE2B 5ad1c6662c699dfa35e47734e211aa67bca2cb5c74194363b30a1d34a67bb5cd9d549448068aa9f912863e1457e13b42f765b7eaa95a9be0e8596dc550dcd977 SHA512 d6ea6c04618fd274544dccdefc8a7d8f94989a368404d0db1514710d03de5df5c8b864509d8a28feb1cd1d68d9b23967ae9a34f31dd5221b569e64d28a6be022
 DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
-EBUILD mysqlclient-1.3.14-r1.ebuild 846 BLAKE2B 3f8d0d6144cc07229f5f958ee4d0202dc2a94854c8dac3b4aac87c7827ab971c953692b12150299a5bdab63f147b7ff2a1b96b8e9430ffbdde5111c521d31e69 SHA512 fea2c38e6a0de96b7d155c857172990412ebaae131315e5d4bf1b08df80f640d427f1c5cf68f57963c4b2455357be4e55a312a2d7a2099623a604060724d4c39
-EBUILD mysqlclient-1.3.14.ebuild 830 BLAKE2B 4709fe700a0acc12b2766d173d8b18250bb1df1f6a4a9d23ad3fdddb85f9de4cd8f220b31f5b97a12a94d0124f792cc4cbf62033b738ae6b08883ece0ae7c8a5 SHA512 67b9953057b054cadf0e9085e60714a732e1ba7a2397be684a6ec7c29f704bfdaac8d5c2bdd0a1728dd04e3e990ab2af3a63ffc517a96c120272fb6f38c65064
-EBUILD mysqlclient-1.4.2-r2.ebuild 892 BLAKE2B 0e2e8eff2cefe75275d16d2931417bc57e5b3f75c72122a2c37237f11d2de418abeb301114eb035db5f4bd7719bbc6eaeb15417dc9f71c56926211261043e558 SHA512 3a67aef4af0646787caf5c1133aab4e06453c47b581f3eb8b74bf49f3c9ce15150fa2e4122a248ca4e34f5bb865a266a034a90820d00c6bed93bd5c4947c7486
-EBUILD mysqlclient-1.4.5.ebuild 866 BLAKE2B bd11be31e35d45e8eff8e40fdcfa03a77700b35a953132ee9ae186a7fe6298621a2bc787300070d4dcc2d85a7237d55bca28c21625ffb73bc983281f4416d8dd SHA512 2b8d62c036109f525a0c1fc61ee08a0af46e0e03e720ad4087482c408c6f36891e19ebfe37a82f0381a16d60cd2972c97ff1d083b5fdee7235d803087125a264
-EBUILD mysqlclient-1.4.6.ebuild 868 BLAKE2B c50f8b8af4af8ecbf5f71f5412d87cc6f1b4ede2f12c7eb7f27f71e1f224ea473b4b3be83050adbf7ed27203ff430979dbe0bdaaa408de94a013afc5b3f39929 SHA512 7db32c1da5801dbf2165bfd0ae893dc7c9d0713db93ce75376112ddd3cbde91ae1c31d22acf118af2bcf6375d9a2f5b6520a0665d96f57ef1449b71fdd6482a9
+EBUILD mysqlclient-1.3.14-r1.ebuild 839 BLAKE2B f628c783e3bc16735a09e78806d6ff7a46de29c2255044e6885a46c4e6584229719e3f3308f4686c14952303fedbee9fe28b641c0e609061c11cd18aacf94360 SHA512 1bf63736dfcd25b3216c97051cf122fdfb568d9b2134fca270d14fecec5320fc5f671577a07594b1d06d886fff2d13ab3d535addb7be5b7ba6e5eee3a4cbf971
+EBUILD mysqlclient-1.4.6.ebuild 859 BLAKE2B a3f2fdf7399198152c6f984cb6556cdf488470384e01167cad805c841c27e9eff7aab47f363613775474000f4f805cbe2fd756b04d3b82cea3a080ddf7a076b5 SHA512 47e45288411335982f3f91f995bf2268b9b3d176b5ea2ef0e6be306e87c0a82b8d5184a6730489765beaa6816f1df2c5de04db781bdc8bbd6d790bd6e90f3a92
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.14-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.14-r1.ebuild
index 16475d218548..8da1a79f943e 100644
--- a/dev-python/mysqlclient/mysqlclient-1.3.14-r1.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.3.14-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild
deleted file mode 100644
index 0f3dc38003de..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!dev-python/mysql-python
-	virtual/mysql"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
deleted file mode 100644
index 2fff14463c38..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.post1.tar.gz -> ${PF}.tar.gz"
-S="${WORKDIR}/${P}.post1"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!dev-python/mysql-python
-	dev-db/mysql-connector-c:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild
deleted file mode 100644
index 11c48995f38d..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${PF}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!dev-python/mysql-python
-	dev-db/mysql-connector-c:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
index 9e86450ea650..ebe9b6240458 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${PF}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/nagiosplugin/Manifest b/dev-python/nagiosplugin/Manifest
index cc577599d492..94ecab98a504 100644
--- a/dev-python/nagiosplugin/Manifest
+++ b/dev-python/nagiosplugin/Manifest
@@ -1,5 +1,5 @@
 DIST nagiosplugin-1.2.4.tar.gz 38290 BLAKE2B 4ebf230122a68919f82da7519e920b485075530cbde235d9f0d7a0f22e65a37c85f3ffe84af100f94ba8cee0a8e350b848d2e35606616808baada75c5abfddd2 SHA512 42c7823445c0dc1f5fedc6b8bed6c5be4e2b5e4c14cfa2cfbd158ae43485baa0fc74b80f9dcbb89bfdb27b984d72201c8a7c330c71d837c0f822603a5f8f7ae3
 DIST nagiosplugin-1.3.2.tar.gz 54262 BLAKE2B af2a8a876105a1ea26671b39d611beaa46303998544adadee3370c6d1b5096fa93160121f89412f3778a2bbc1c3e95606a49413b8f3f0880c9c9ca4e946fb1b8 SHA512 899650852397bffb66ad53843233adec2c91e96656674a9b21c5a02ed97ce4db69c1440d1b88c5799a54745e69b8c05f52188403b5a2fe9050acbd0067806d50
-EBUILD nagiosplugin-1.2.4.ebuild 527 BLAKE2B b0473f162c266619691935f8d7c92ad543203c2bcac1c68e38a1c8dd86fc11bac610e973fbff539aad41ab676e90646e73868730e63b54ad11e2ef879be70075 SHA512 a83503b8c92f7efcca305be3f5f8cd576759b896a9b30196b1dad232ec105b18f4866d67fa3fa1b2a58c6b1eb99245e073aa59a11d760cbe8f11069865186972
-EBUILD nagiosplugin-1.3.2.ebuild 881 BLAKE2B ea962b3530b161c5d8bb8bcf7a9ad13410ccdb0ac101b337252fff9b73f9997f6ba197ebf238455e523495f789ac2308c0c5a7df412dcb1c02538d9763f0444c SHA512 2b8b43a6049dfd14dc8bcd59aaf2617194fc17969f6e8c5f6dafa85187ecaffea0dc5740f11a66e0f141bae321be89c57b3c36cc2730a30e7d67214505f0b918
+EBUILD nagiosplugin-1.2.4.ebuild 516 BLAKE2B b581e4ebf9dc49e1b9603eb6bd361272a3d655c5edd460647793086f3c769abe4f44bcff3a0cace6c89e78d93f497e06767b3b158f4099befc0f0bdaf3c69ff9 SHA512 2508cb68bcaeda11a26558b14dd422721d6ed1acb948c81d34867b4b766a328cebdd6d002c2c24791929241dc20b58a76b0ca2a7764730995d5a89520a32cd26
+EBUILD nagiosplugin-1.3.2.ebuild 870 BLAKE2B 733e2746c42aa9f91041b3e6bdaf5a72b96bd8c3da9da3b46eb3a96300ad5055eff3533739e5ef191e188145828e67094748a7ca64526ffcf0c2596603e543d0 SHA512 f6ec1e49b24dba7bd73890a14ae0acedc81009e972f2ce8c1156a0777efd3ded0a98f5651bc64d6dc53a33e6ac23b66b828da1314c14971acba72d6f177deaf6
 MISC metadata.xml 452 BLAKE2B 39030b9d85edf373418952f1986d9a1b4c5a73ca191112d9e979b754eb12891f16a522d19a4d4278853ec4b07aaaf14537ed64eed658886c02859d8a451eb81f SHA512 2eec420a3b59460798f9d8504d86a8d01afd309867f0bdb0f46f5a87484c06f8398221946bff4d06c150cf8085a6cbc15a9e61ba815519e696a26376cc018fe0
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
index 3d5a2c4be07d..0455f63e3668 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.3.2.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.3.2.ebuild
index cd0ca3c9a35e..f342d816d30d 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.3.2.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/naima/Manifest b/dev-python/naima/Manifest
deleted file mode 100644
index 27b856d0fecd..000000000000
--- a/dev-python/naima/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST naima-0.8.tar.gz 5485631 BLAKE2B b51139b1fcb31c23edbe28f2760b5d270c0989ac70d096e0f42e90a422d8e297dac06f0fae341be1e7950ae9b25ea6eae19e297eb9c17b70235107bd8dddfa3d SHA512 38ac487ffaf3169f6e351ac1abb22244a90a872661627bd784ff0b37068e6155cc504756440db55b481e249fa8df97530e6074ff382d98e8d142aa5fa607f99d
-EBUILD naima-0.8-r1.ebuild 1520 BLAKE2B d9fac53d17983569dbf49466291e0821421cdcb66038c6f67b5d00e780f1a399d5f451599cceeca81084a9013b7ca2c5145e829a97ce8c84d4914c694e842337 SHA512 edfb29e1ba95eda044becf4f239ef31d6a5353d3c6925ef4eeead26fd62b697f79923b62c1bfb1594dd52d183528494313a9b309a9b59467314d768dea54bf2d
-MISC metadata.xml 746 BLAKE2B 72136b2f16d073f86982021ebd46fb5e3c9200b8bef539202c90eac29f8be6f01d745e7b3a9c5199828cae7ff2ebb0503a27882e2cbf672475fa14052f3dd2f6 SHA512 c3ff9eef465f6bd6be732e9b7e6e154798a485395106b54daf8680d8b9368181d98ebaab6c7cc702e171f461e99d8c2b67e6271fe733f81509ff77f77bc5b39b
diff --git a/dev-python/naima/metadata.xml b/dev-python/naima/metadata.xml
deleted file mode 100644
index a8f7917f0e16..000000000000
--- a/dev-python/naima/metadata.xml
+++ /dev/null
@@ -1,19 +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-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    naima is a Python package for computation of non-thermal radiation
-    from relativistic particle populations. It includes tools to
-    perform MCMC fitting of radiative models to X-ray, GeV, and TeV
-    spectra using emcee, an affine-invariant ensemble sampler for
-    Markov Chain Monte Carlo.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">zblz/naima</remote-id>
-    <remote-id type="pypi">naima</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/naima/naima-0.8-r1.ebuild b/dev-python/naima/naima-0.8-r1.ebuild
deleted file mode 100644
index abb6ce180f73..000000000000
--- a/dev-python/naima/naima-0.8-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 eutils xdg-utils
-
-DESCRIPTION="Python package for gamma-ray astronomy"
-HOMEPAGE="http://naima.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DOCS=( README.rst )
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/corner[${PYTHON_USEDEP}]
-	dev-python/emcee[${PYTHON_USEDEP}]
-	dev-python/h5py[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( README.rst CHANGES.rst )
-
-python_prepare_all() {
-	sed -e '/auto_use/s/True/False/' -i setup.cfg || die
-	xdg_environment_reset
-	# issues during install time (bug #604012)
-	addpredict /proc/mtrr
-	addpredict /sys/devices/system/cpu/
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index 0977a1b48bd9..475af07dee5a 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1.ebuild 846 BLAKE2B 83e8ffdf7001b3ae51fa7662ebd05955e7c255b1ad063a4d861edc11fda7f3c115dff63ef6241810d29484ffbb98cdc92196c7abab12eeec04816a50ec45617f SHA512 1f1519b142e2e1db97baa0cdd01df924ac05a148ba7238cac1a22c1820b6f3728578487f8384e23cf1b465888c27220171a21fcad4e60e4c1ad46599bb79648e
+EBUILD namespace-google-1.ebuild 839 BLAKE2B 940e4053da975201775c0612406ce7ba167eb4a2f4a0985b463cec782e4537dc665f49ea9521a92451518e0c17cc57338dbdb908cf581abe97ac2500ffa47a6e SHA512 d4426d757c8988f6651cd578c31b3b225b770c6355f11f1b77f45f5c86caba08d6cbb86d8f11aace4813cab1a8340a6afb16db7b0a9ab77615d4dae3e8693e32
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-google/namespace-google-1.ebuild b/dev-python/namespace-google/namespace-google-1.ebuild
index 5c13eb305803..c4343407b2a4 100644
--- a/dev-python/namespace-google/namespace-google-1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for google"
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
index 8c21a7e320ac..d1f292b485b6 100644
--- a/dev-python/namespace-jaraco/Manifest
+++ b/dev-python/namespace-jaraco/Manifest
@@ -1,3 +1,3 @@
-EBUILD namespace-jaraco-1.ebuild 881 BLAKE2B 4c982ff70f93135afccb4612ade4c1b98be9be25ecbe2366848e306640cc243814cf389650333ae5c14723a874757c3ee8cab08bed7e4d49e10fa87040df2406 SHA512 827f8ba5dd2ea195b290e50d0fecc2f34f60a24ef703990d3028f9d9364fb2dab1bf91c2d7a2e7532d312a8d40e485fa2d50716e156fabb640f3c2b07c8f915a
-EBUILD namespace-jaraco-2.ebuild 816 BLAKE2B f3e01bba9cc98564a38edb8d045b1d8a92fcf17917ce0c2cf6e6093679e55901a31720f871fdb4b31b320abe171cf1b4d90e2235cc0cbd5959bd4265f68f7167 SHA512 d0acbbff610f4a066b237eb663dc10752825ed945f109639098c9cf6b3edbd92462843afb226b3fbe5dee4597f3fe7198ae5591953274fcef5dee2a907d00713
+EBUILD namespace-jaraco-1.ebuild 876 BLAKE2B 2e058c8f2c9b376fbd1d1fd031f37095026b7d434f974ce18f7b6d39a29bf78eff454f0880234775b55dc9a61b63a3e53eb68fc7224c96a2d0600259ec55bca3 SHA512 348d28862ea015db5ea73d602151533ceeeae53d0cf5d7ed4824e010d0257f94c91b6c2958da984a698a2df7b8731b39a0d94b9ea505c3dda162a86686b0ece2
+EBUILD namespace-jaraco-2.ebuild 810 BLAKE2B e37e2b8777368b4a7b35881e92e1dce11445d2600ca252e514f00f0048be2c93ad7d62a77ea7001fcb680675dc8f408a724bd4b62337680dfaea39c09ec56da2 SHA512 8c8c627765efa1551ebd8f26605849679d79427e5e1f11a114b98c9c087a072e41438db61df929dc123384b2b95ca8a89770814e5c3e80be6f9624cc88004a79
 MISC metadata.xml 346 BLAKE2B bf549c97be0470c6694566c73fb27eda911bd1c7e38641ccfc90e0cbf33717499177dcd4d6b6ce475d430a04ba395500d41aa5cf7d7938ae8bdd1c0840e0a6e0 SHA512 747d2fe0daa0213a7f9d737cc8c5037438ef9262ba049a7a687e944cb1251b9b3dc39ea03a810b5ca61c7b95c7f1360bc397c4d75fc26746cab5029f7736efdf
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
index a55a29048515..7d967696b4de 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for jaraco"
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
index cc6c6bd370b8..abe50025fec8 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for jaraco"
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index 6cb860ac720a..f8d790e19285 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,3 +1,3 @@
-EBUILD namespace-paste-1-r1.ebuild 831 BLAKE2B 6ef90a6feeb4fc64ae400716a34a1c7731297b5252f42e848494a13dd8e9a82d839d09841a97e7d202b0a94efc3a2d120296a31e03fc9f60f8317c5e0644fb32 SHA512 e32d26beaab1c221a4957bc84f5144cab5225bcde294d084bdfaf8b4bb698563adfb1f09952507b32d7fc829eac93bb564cb9228edb714081e567bddc55498a0
-EBUILD namespace-paste-1.ebuild 806 BLAKE2B eab3ccc709fe545af7666023377a92cbf7f3b5b678f47d6470e7d50a389e8db88c49239d07ff5edac6b22ca32f594a37f02b8615ea3389c8d765ec54a169ea12 SHA512 34dd1aa04838c5e376ea1a51391ea031dedc15eabc951aaad72e7170ef7d827ee1b8039137ecba61e55e5bbe9da1df50a1ea813ee70705175eb2923000d041cc
+EBUILD namespace-paste-1-r1.ebuild 826 BLAKE2B 4670459053d09c248f9419f2017b76701e8c305d49bbcf4bf1a6b140ce91743a499405ea50c0411206a346c72df89d9fb2c7cf28319319d59e785e4acefad08b SHA512 7b14c1ecfd3df24a9c9dc824939097b8af64379c100705917236b8de51040aae81ba5b49941f255e6b019cedbd2f3ca1ddb193f6ecac09c456e25b2ff58fb70c
+EBUILD namespace-paste-1.ebuild 802 BLAKE2B c1ada77bead56bc606bcb25b6bfe1163f05327346c21b30e228e72376ce722ab97bce96eaae9f701ef3e125f5d7ff9dc5a78774aeea432f9f7ba3edb5629bbd8 SHA512 49b165354356570a790366e2102958d3be0c28ed0cb628235ca4c2a1bd30cb1182deb9d278fc61f8428073bfca314aae29babaee62a40498ed0c30dd2a07f992
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
index 8a23c03c7ecb..50aedb9554b2 100644
--- a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for paste"
diff --git a/dev-python/namespace-paste/namespace-paste-1.ebuild b/dev-python/namespace-paste/namespace-paste-1.ebuild
index 5f060a6c4acc..6dc41eeca30d 100644
--- a/dev-python/namespace-paste/namespace-paste-1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for paste"
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
index a83c1917e6bd..33afd6dbf9b5 100644
--- a/dev-python/namespace-repoze/Manifest
+++ b/dev-python/namespace-repoze/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-repoze-1.ebuild 739 BLAKE2B 642fac4453c5be55c9444137f60cdacec7349064b68a98c7e9037bcd7973e4cf38be40cea461d3da802dc59d867a29153924779f4affe01441d330d5983a4185 SHA512 a9f06f586a4868bc0eb31caa9a637ffb967d7d96f599be8e19266736124b930bb6023a8ab3d699bb325f9be6d5af91c1e319de8a3bc4902700826de9a4f380a6
+EBUILD namespace-repoze-1.ebuild 732 BLAKE2B 858ac9ced014355131e5a412390a38ef850dc44a5d6b38ee80aab195e1c66b04c2610ea7ee3c454954e72784b26725d9381bd0f916026782cac91aa18a9fa3b9 SHA512 5e6f73932c0fa5fcdfe1daff8d2b2841aa634b7ab57782af7c24fbc1bdd1db4e6c3a0a9a178da69f9f128dac7efa37855eb44adfc7d7848a9e8ecf1fc0975037
 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 36aade0a1de5..daf3f038a283 100644
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for repoze"
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
index af9414a06e31..48eb841bed33 100644
--- a/dev-python/namespace-sphinxcontrib/Manifest
+++ b/dev-python/namespace-sphinxcontrib/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-sphinxcontrib-1.0.ebuild 959 BLAKE2B 282219fb8a51d041bf8269d48c2a66e18597aa03b994e36f137382899862712425409c64a3bfc79c95595803c966a4895ed9998850d147fd32639a671c408f98 SHA512 2b3be26ca7954a36d264f73aeefa863af8380af16826e20b4719c377aa4553e16e7b02c4526dea934a799db178178eda51449418e71f0094bb3f4fe8ace315f7
+EBUILD namespace-sphinxcontrib-1.0.ebuild 956 BLAKE2B 311c26f5de8f12db5cf44a51071b1884c7f36686e7c8992146235113625b23282915b514dfe56d787dfee71c484a013e9711496ed32213a7c6658c57d80c5ebf SHA512 2e44d097bdb52780b14408c58cc0c844c4427f971e4e0cf04480316a402c9cdc411ab7213558d7118249833c352970851605619d2a97820d6db30b897abd741c
 MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index 1567307b166f..604aa5a559f9 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for sphinxcontrib"
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
index 8d21b7aa9748..f04593be3a96 100644
--- a/dev-python/namespace-zope/Manifest
+++ b/dev-python/namespace-zope/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-zope-1.ebuild 908 BLAKE2B ae42255580faf2531137f0b1fc571b4d416f978cb7b8377d330dc73e9e83d29ebeeac808b690476d1b66c905fc5e0bc301baffb43f1c4a10400d7bdc8a99cfff SHA512 5a4bf2e0cb3f92076350ac788cc279bfbffd5963df75849031229c75f741411e7d224bc44c10a1c480153d435a334a80088440d5146fe41328e89beace262590
+EBUILD namespace-zope-1.ebuild 903 BLAKE2B a0758d623f03282c76e7e56da8db7efa9a3cdf0d736a42f5e5baa6168400bf7fa6e9975cdf8bc10416e8ff4116d744deb7172f1c933accd56f52161d0bb10aab SHA512 f52d8432403ef6c98626cf4eda0d9d3db30ba97e7746071e93392670d20f52dd04747f3761fad24d48e97d97ccd666f5bfbf9df9b26a05239dd1eeee5a6f4f2f
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild
index f4e609ebbe4a..49c0fde0dafd 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for zope"
diff --git a/dev-python/natgrid/Manifest b/dev-python/natgrid/Manifest
index 3213ff0f2e3c..c2a632111368 100644
--- a/dev-python/natgrid/Manifest
+++ b/dev-python/natgrid/Manifest
@@ -1,3 +1,3 @@
 DIST natgrid-0.2.1.tar.gz 35205 BLAKE2B 6ca1108ffc1b30dc8e4c570405817a73dc7b2c0e0b865978d2918bf8d1e9d503904c3eea704f7c5310ae947c558e284d7ce8bd70ff2add6d876c4894bdccedb4 SHA512 489e8454f05ff994bad23d88bb423fd0bc17e838193865d3dbb6be0d01221203dcd1644c133827421ba4acf354295f07533ff838b138056064e1bee73d43c922
-EBUILD natgrid-0.2.1-r3.ebuild 793 BLAKE2B f0a34bdb9283c62d0d0ea174cc46379b4f65e323a3bae24a2e031671ba98816838d54e20ca400eef8158a8808be1e700db8ca4e321bdd1918cd6eb9b8cfcec94 SHA512 350f29311f7b0be75b3956737618ebb2141e0b28f030ccaaea182dfdfd4d1417a3a67f4aeeff4cfa94844c42fabc0b8ba685482caac96d8195b287698a739551
+EBUILD natgrid-0.2.1-r3.ebuild 779 BLAKE2B a5091a15fecef30266f6159e42d5a1522fef50f1c5a17b412cc9a2d6e188a256b37f00df950e012cf320f49eba6983fe009b4d2f6e9c842fe4ededa7233efec5 SHA512 35a01fbfb41f4da21a2365aa57d3a0b08a3867922b8909c4689cd1a3167e363f4437e9089941f3b9295641e964b823f3bd5d02d727110d6a44a3aa783f904886
 MISC metadata.xml 615 BLAKE2B 09a4d0ef38af543f9ac7d34760ce60ef9b493523d70261c1c62c1d3fb531378438f66ac8c948501b889a8c6ef762fc36cf07aed98369ec4be5a7da1dbdbc6b61 SHA512 2ec5784f8f6a083852e1c19b41cc0209bd4799820a91002aa4e024a269fcff4c7cf503decec42d634ff8355aeb5b70e85f85d174cd0fea419098c7b1d1d08dec
diff --git a/dev-python/natgrid/natgrid-0.2.1-r3.ebuild b/dev-python/natgrid/natgrid-0.2.1-r3.ebuild
index 8da62ea3e277..6aaf7a59c2db 100644
--- a/dev-python/natgrid/natgrid-0.2.1-r3.ebuild
+++ b/dev-python/natgrid/natgrid-0.2.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index a92980e46b65..399630473234 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,3 @@
 DIST natsort-4.0.4.tar.gz 63116 BLAKE2B f4b15cd105ff79c17eec2b94371596c9a75f7389304f2808449da2e68eca6d9754871e4ef983a9bdaef43049ae64dad5f7c5ac46e55c5c379a79f6f5fae579fe SHA512 e1c00de6fec56aeda6dedb547edfb2f819d8c129feb938be9cee64cd106485d75b2af12316d73b6e79c90694b0d489ddbdc29635e3df9569466d062cabbed461
-EBUILD natsort-4.0.4.ebuild 764 BLAKE2B ed4f2e721f8012e7882928c8b73fdc3e86b15e305f225704d90621df280a2b4c19a0c389eb6e2cc6534f7f3dd577722ac25e2b5b5c1149ff43733eb6b1cb16f9 SHA512 92467d2dc787133d791c6d28722599ed3803dec14fa711e6401a1cf0985d0360eded95b3173eec7074771c212bd28df82fbe72f961856bdbbaa1069627dfe023
+EBUILD natsort-4.0.4.ebuild 755 BLAKE2B 5ecc4ada606f6d4d9e8ad7cb06fe281c03aa52168363b07a81182ad2d67434fd5008a755f30ef54af8bae7ccce053c87d804110cbce6741bdc2dde413c6ee837 SHA512 079c315b65ee9126b6f4835c4b35eebeda9e8b09783a143e96ad4fedd22e53576a883cd3accfa6dab8d26a4334b94a6f589c227b0adc4da6210bcb6ef9b970b3
 MISC metadata.xml 320 BLAKE2B 96cd91c11b726c96e73c34ec02c004d240cc88e5e3991ad5bbbe5db1052a21faae41718d467e0e26f9a0813d55c7309d23320f55fcaea41be57a4f8af4ab9520 SHA512 6ddb8e2538028ac71b41a224ca0c2f8a322aa12cf1eb779c422bdcb7796aa342394dc4f6ed46695deb46b5172cf156f81244935db0c4a5eb340537d7caab8916
diff --git a/dev-python/natsort/natsort-4.0.4.ebuild b/dev-python/natsort/natsort-4.0.4.ebuild
index f25f2bff404b..c1b1def091fd 100644
--- a/dev-python/natsort/natsort-4.0.4.ebuild
+++ b/dev-python/natsort/natsort-4.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 RESTRICT="test"
 
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 3e7f7bb09550..96c99eca9994 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,5 +1,5 @@
 DIST nbconvert-5.2.1.tar.gz 510937 BLAKE2B aade38372775b032287f420ea4d335ad949a80afc0df63859db5a4f520bbaa22fcd17bf4318b05fa042fe94c2f65890aa2ed2365206abe8cdfb357817b056ac7 SHA512 c71c95d6c7bda4b55afad792d108d48c27857e060531dc8ec262673971c258ff9480821bd78ee5cbdbb19f107d5f8d19a49eac88819f20a09b450c26681335fa
 DIST nbconvert-5.5.0.tar.gz 583216 BLAKE2B fce42d68fcfb5439607fcb0fa8475462e929a5ddb9d160985956a85e09c7561e1a966be633b4d59e6afe873fb7f1300997c97bdbf4690290401d14bbe351c47a SHA512 4d10cbd6d6854d7672537cfb2e0a79854be1ed4adf96f805b1a0ec0dde0e149ed465a26ceec8d7c325f7011c30ff646054585b65d1e83540622e25a96cc207bf
-EBUILD nbconvert-5.2.1.ebuild 2121 BLAKE2B e2ad5b72d55e6de080ef479a45b986ecfd230400f998b992ec49603ea8e9dd41ee326beaad357fee792418a5f8baa66ba6d28d5680369a94861e334a7f4c48ac SHA512 862ea91c7cfb3de1e2d3910df9e277fdf47c8bce94dcb583281a4e285f10bb5e5cae6f4f2bff6afe0ecf5a417dcbf0808df552a2314bebd44fc2930b1f775b59
-EBUILD nbconvert-5.5.0.ebuild 2105 BLAKE2B 5c9fc42b42010fa1136729997065ab686ffa3a17c1fb3ec3c609a43f020d9cc1b29d2851d15faf8ee798178d89757f1bc665d9e9e76fc7790549668cc9dd5b6e SHA512 c49a69d7e72c52876469939b373517293a66c28185eb7301c7b2459ee3afb04e779ba77c18418f1f6eb837238c061c7a66b58940e2d25a4d52bb2da84b5150af
+EBUILD nbconvert-5.2.1.ebuild 2119 BLAKE2B a08f56ff246159f89f487e7d4f671d55d64c1e5f0e1fb1ade29d211c84774731f166f0005f25958c560a49f95ff3fe6ea836c556455669e77c4b7c8aee623b8c SHA512 320938050a6f3a3bf7ec2430e04c76443e2410981ce7622d7dca8deaacd2e4e33a8c1b081d3a354e3deb64df333b16fc3e81177a53bc9a343601e09fb35b876e
+EBUILD nbconvert-5.5.0.ebuild 2103 BLAKE2B 45671ea644d557087eae45329e1dc1c869ff2f9ba347de47c5cb1d50497d3af39a6d4f927d75447e3f86988137a25e24edff1bc845b5a97957d5cdf245cf638e SHA512 4ced8cead706d1341d4edacf163f78223855096a48245d619792d80c80ea67bdb43b1fa8f2073d2a124ff4cc5cb72aab7a7df5bf8eb4c34eed0a398197d2f8f1
 MISC metadata.xml 534 BLAKE2B 011d472737f4929968f44c9ab3beaaff8938a4550096b8abc2bc7dc72acfbde4eb745527a6f9ce3d1188bdc09f11607db2d9515a89b53793a88259513cf0056c SHA512 8a00c8bf80e0e9477a531b70d9f2fbba1fc8c8bc09246a6a2263d94170d294e65e6a20f8ab84974e97b346c96b22e2ca648ef5021fc9316a023532ca34bd07d8
diff --git a/dev-python/nbconvert/nbconvert-5.2.1.ebuild b/dev-python/nbconvert/nbconvert-5.2.1.ebuild
index a869bf2bc5d6..c1571315de51 100644
--- a/dev-python/nbconvert/nbconvert-5.2.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-5.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbconvert/nbconvert-5.5.0.ebuild b/dev-python/nbconvert/nbconvert-5.5.0.ebuild
index 913466aa9ad4..2f180f651028 100644
--- a/dev-python/nbconvert/nbconvert-5.5.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-5.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index eafeceda4b57..4a1f7a70cdd1 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,3 +1,3 @@
 DIST nbdime-0.2.0.tar.gz 4139079 BLAKE2B 1e6994009c8ac291272a297fe583f79123906c9e05ca2afd345c6e230e3c476259c4919e2161a049e46fa28f4490122c53d0a2bc94661683652d226a78fb39be SHA512 c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
-EBUILD nbdime-0.2.0.ebuild 1631 BLAKE2B 4af4e35ba869c5c4542803b01781d801b1df729bfe3c9a8241512e2db971e3e91ea51192eb087cb0070fd484a4032d345368f66a4d51bfc0d28bd7c1096c9822 SHA512 8d43799c79a4e7b22854f4f24b399820057517b6b48a542a6342e91c04de49b438df2d8fd934bb8b884153ec52bdb2524c03c5d44394def95a2c1778fc1ba7c7
+EBUILD nbdime-0.2.0.ebuild 1627 BLAKE2B 516e39cb3daf12267d12115dc79c64bf8c95f707eeb508f72a7c862609336d677c7a2b76041867775b3cce8a8f9f7078c71d3e39d02dafde064894c254c385f5 SHA512 f44408101877b5b097cc93637e64ec81fe2a1e550ed09c76e62c557d58f892d9a03d1df68ca3f7ff0f381b249c288ce3c41845575a400dcf3bdf8e48af924d83
 MISC metadata.xml 601 BLAKE2B eeec61d75fb90ef3e0f0dd13264d7864a204f560c047dedf6a3ddb5a2df0faffcd344127d8a7bafe8a1f2d0b6382081d56901c6f8c5e0b9e94c8d52088f29442 SHA512 27deefa922e39c76bf3b3ea96aa1f1b5ef478a0b5cf6bbc9832977cf35bce6f9c0f38bb69fd54b0a27877087aab719c34b5811a6063890fdfebab28c57d6ff94
diff --git a/dev-python/nbdime/nbdime-0.2.0.ebuild b/dev-python/nbdime/nbdime-0.2.0.ebuild
index 2059ce503092..63b92348ff58 100644
--- a/dev-python/nbdime/nbdime-0.2.0.ebuild
+++ b/dev-python/nbdime/nbdime-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index d2b23321aa45..6ba2b5d1b008 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,4 +1,4 @@
 DIST nbformat-4.4.0.tar.gz 113683 BLAKE2B f86d85d4f8bd7b2253a958b7489f8a21efa439cd75373740b4aba215aaf2b63c32ebbc88541c9a7c57bb80ef00a996ba55313c3b830063305b9a9b41b713aef4 SHA512 46cb78bca374ef49c4461f230cbb8eb4af611d7be395a448680964c759d47fa8558dd07de96c43921ca171c486707dc823e278b724d9dab51bd30c3dab47ff6e
-EBUILD nbformat-4.4.0-r1.ebuild 1248 BLAKE2B 59245a1ac9efd294a963f488cb98b3ca0925a60081842b3946ed6e3ad6d12313f7cabaa7d6b17efed4d8fd1fa9239261dba302639b5e6c2298b5ec85eb63ddfd SHA512 2393f0bddb38b05292535d426e95e69e1b9757f4e2c689fb5fdebca4f59934e9ba0a6bc2aeeab2701388d964c71a1d6de39f7aa8d73546f068afc497d22ab736
-EBUILD nbformat-4.4.0.ebuild 1303 BLAKE2B bd0af84827815137b62fa49045e8a19bbfa9053782f826e1037c51a290dd940cffdbe04cef43ae3080919e6925110270fa23a63f5873006eb4128e81b996ce04 SHA512 6369c5a3abcc05970bbb77ec69de862bb775613a958a0a1229cf6e8c0e3b1e64173e88baae1e38ec8ffec4b5871761d0a8a5cab37dc0ee61f4b7213d2a78f9b6
+EBUILD nbformat-4.4.0-r1.ebuild 1246 BLAKE2B a7dc7c8583de21427e6c5eb04fdb5d419b77f208d4451039b35bdf5b3781e49d3c3228873ea5d185bae32fef37c92480e9bbbea905ee76980033b5be5e1f4fa6 SHA512 4c14c5068ce30873817c97b0f0f2bdb850496b991032f7989684a6a0460fcf15c80183121df0be8f2e24fb0e88c30f64363f673bc0ff258453ba63f8ee116b97
+EBUILD nbformat-4.4.0.ebuild 1301 BLAKE2B aa5a3b9f8b0e72835ea15a5977f2fd77ca6784fb2c2d87c887bb532ace8f03abc6ed00cf04068bac14a98f3f50ef8319ba83b50bdf949ad2112fccaf6dd80092 SHA512 96b04949dc388fc21642229979d69d6ee799b868ff701af61eec8c6f9aaf5e0ebb0a87bd919b60fe896ba9baa100f9119aea8a32648d642d938b216eaea6221e
 MISC metadata.xml 647 BLAKE2B 0d115b188530f78f963105d8e9e4246328526a00146c79590a288f822a3326521950b0be1fdb348cacea47729c6600a99a82e57b02e191147cf0a05821187d26 SHA512 74b3a7a494e4ae1cd6407c031978a96d18de1e142570f5a42071df743bc55a8756271a3903f2bf22fe5997440339571c41a1210e7982bb1ad46468f84690a05f
diff --git a/dev-python/nbformat/nbformat-4.4.0-r1.ebuild b/dev-python/nbformat/nbformat-4.4.0-r1.ebuild
index d3b105d1d529..3f52ecf3bf66 100644
--- a/dev-python/nbformat/nbformat-4.4.0-r1.ebuild
+++ b/dev-python/nbformat/nbformat-4.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1
diff --git a/dev-python/nbformat/nbformat-4.4.0.ebuild b/dev-python/nbformat/nbformat-4.4.0.ebuild
index 09d0975255ca..dbf061276d5d 100644
--- a/dev-python/nbformat/nbformat-4.4.0.ebuild
+++ b/dev-python/nbformat/nbformat-4.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 2e0b702a15fa..a69fbca5ec68 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,5 +1,5 @@
 DIST nbsphinx-0.2.14.tar.gz 98368 BLAKE2B 2ce32043fd3371d54b1922f973b9f8b4fc1bd1ace05fb2ee4136ed759454ebc5b3ac34030156d15a72d8e58bd739e7a4bc458e2cb26b8f80e9498df47c857a7a SHA512 263aaf8b466d83215251f6115fa6210bca69537d041336ec23d9caaad06653fe848914c2e01981461fbabb8f5e4881ca11a4a01aaccb07909de6b79e695602d6
 DIST nbsphinx-0.4.1.tar.gz 108928 BLAKE2B 449ba009003c1de52057d558039255f80efc2d6979926bbe8757faf21139bdf6f0e7e96280f63ffcc0436f45d83efeb525bca0139018f345025b8dd25202bc12 SHA512 5c37d8cb48c82aa9ae865a27650aaa037cde2c06140672ae1245fd3ceafa3d40b0ccbc37ac67bd1688b228107b97d84fb8eced783d71f79f8da7505883cf2617
-EBUILD nbsphinx-0.2.14.ebuild 656 BLAKE2B 18721804f1f8cbbf5e3ff6425b2d29517c77efc4b5674b5737c2857e43edda66fc2d91e114ebff3e3c7340bd2e800eb1e3b7c3a6588307ac92a20457f6e430d7 SHA512 3135ab8eed17e62b9ceef784b527b8443e6694db00473c07c8b7a3b87fe11dc8a62a2db7c69ed2cbd4dd9d605f03c0ccd75522b21957dad5669f4a34335f78ff
-EBUILD nbsphinx-0.4.1.ebuild 658 BLAKE2B 01dee99ccbda436cfea95b70b4db7920da382698b5c9d62123610191c27fce5407d4262f454103081223931d55c9faba84385e5d3ae1cd7770c82d3af53060cb SHA512 298da791e6bca9a2d3800d2602fee89c28a970ad8a64344a6143caea37b2360661a69cb9abf41e342fe028e1306a882b5388e72b632f5517fa8b14e550c83a00
+EBUILD nbsphinx-0.2.14.ebuild 654 BLAKE2B 98f4dd4715a5a776cbe8a0b1067a8571e0ab3c2e5e4cfd000eeda249e28d5a0e0b129a2f3dc40ae4eaff4d7096f7d64cacbdaaf921403b718d354e7a3b91e6f0 SHA512 9e7a26f5c5c6e5f069507b1c6ef5c1eed9f395fd8f2a56271bc6a2e00d450400939ae89d7fed3cf2379c41e999b0c8148dfc45496e8568fe599c618f5fae9a61
+EBUILD nbsphinx-0.4.1.ebuild 656 BLAKE2B b8a9396284ecb1c9582d5098a3888f03c05cea445dbff6f7975e44e8afc44812d1af9276976f33511e00503850b746f9fe8528a66ea1b0507be46c878fbab494 SHA512 dcc6024e0a741dbbefb648c13796f03d1ed05cbb396c40f53f8e27d4c7bde38633d148bc6876f00263a010c94c50824848b3ad94e64acbae7df77dc4770f8be3
 MISC metadata.xml 809 BLAKE2B 2724ffcef846efed97ee16e7395b3362596c46347fda07bb418469f3e39f06e0523177e7a8bee35cab7113de6380a1b7ca34a6b8bd108e765796fe12d4fcc478 SHA512 03c63397c153886e8ab60767ae510a4d17350a5a2b18c05ddbcc453ef81581a029c3c63fd7c82b109dcbe9a142ec32af1650b240c72d8f95097be326c39a7080
diff --git a/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild b/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild
index 8c59a076fcf4..f469dc231b4a 100644
--- a/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild b/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild
index 601fddd7ba67..4af0f99f1107 100644
--- a/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index 0d74eeb1291a..d5c6538bf9ef 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,5 +1,5 @@
 DIST nbval-0.7.tar.gz 51805 BLAKE2B 3d1089cd480832847ca8ab5c64b69781216d4fbf2b33f7cb6a26e321062c3def85ab9620d3190451369f70b0051ed371e2df01bd0140859c98db3600cee3e543 SHA512 f146910d7fbd6a1f18b3d9ae006a1b252cc2e038f8a316463530b564e007b4b4e0b2daefbed7ae9ec7e14280f6f004b437c9570fd4d1e959c53165dcdf3cac5e
 DIST nbval-0.9.1.tar.gz 64476 BLAKE2B 299f6cb9a1e28b80b2e27a74f2b6614e83e5b571b1dc27d0f6829693dd0f6c2b59845543c91487615a8621e21ac2cbc2d34e60e62b7a646914283e23649d8bd9 SHA512 8ab0cb4e09907d99f898b148b635f0818660d04417c1c809beb93680862a5ecab14b606ecc3f90eff85e5f01de7dbf10954f1edf3629a1cf8ddac00556d4d6e7
-EBUILD nbval-0.7.ebuild 829 BLAKE2B 8769dc3eda6bffc39186de2ee4ddce92bb5c670563a3aca29eb17d509d0b82bcf438223db1bff458eb75caf57c98f654f44ef817873749d02c5ad158c8f872cd SHA512 728d9f1c1ead8e88695827f7141afba1a14ebdfe498c994e250ab8d2c804c41daa1b2b62653c6a75e04ee7901a7aef92e2ccf3ea4eae18800b07288173037088
-EBUILD nbval-0.9.1.ebuild 747 BLAKE2B 514fc6b23553a504000fc093dde85a65bb1a355fdd1a2dd3bb1633b7230b9f1ee56ed6b79d33804c9e2d8eca67054728fe783a644eb4368d7abc995f9c97cdb8 SHA512 a6608ca9cbce0a96a7b84ea0b45c79a168a37e0c47ae1c93d6e5d2629580c866aebadf7816ff72e8efeebade0c08ac19198565625d188ccd4ec516b73149d87f
+EBUILD nbval-0.7.ebuild 827 BLAKE2B b41a9aa76c765fba48de202f5b7f1786bb25917e74ff50771defe0957a9561ffc99b32ee6ee57d3e43525e329a2cb999fee0a5a03b0757a7380df71faedc7a14 SHA512 b01ed172350019ded210335061cfdcebbebb87353c28ea2d84e1a268543d88f889e252d6f5d0758141d4c6eec51d6bc9fb83c682a26b3c390042a7971a6025a4
+EBUILD nbval-0.9.1.ebuild 745 BLAKE2B fe9bab2d1fd1248317d982d7cefdb99e0b5d64969240f3aebc428a020c006ae2a28a231d7c3fa9637fd8e715639f54012c775a0a0c95b8406d378ce5065107ec SHA512 1b7549d856352f0b437f5ef2f7f95e9aec25d58c4e947cbb171dc977021b06aa8f52d6eeb0ba8f0c10a73867ebc67adcf381fc398909f1d076a0f989d3ccf559
 MISC metadata.xml 959 BLAKE2B a6a44c85198fd92b1b26ae2b110ee4f1803d8e6e7dd55860f9aef67f57b29369c31d26d85f27de5a028551d8ce7c502a82189cd0ee2ff127491a05f0d965609e SHA512 63debd61c5149c3d9dc97a10fb4e40aaf2debc480608319158fcad3a8aa39a7f0623470fe906a78ed66ce844894780aab65d4b7a3a4afb5fbfad8dd06acd7af2
diff --git a/dev-python/nbval/nbval-0.7.ebuild b/dev-python/nbval/nbval-0.7.ebuild
index 4045210aa09a..42d0e549ae9b 100644
--- a/dev-python/nbval/nbval-0.7.ebuild
+++ b/dev-python/nbval/nbval-0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbval/nbval-0.9.1.ebuild b/dev-python/nbval/nbval-0.9.1.ebuild
index d14a6d2e5ca1..eaae713d874e 100644
--- a/dev-python/nbval/nbval-0.9.1.ebuild
+++ b/dev-python/nbval/nbval-0.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index f20709889141..cbfe981d3b38 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,5 +1,5 @@
 DIST ndg_httpsclient-0.4.0.tar.gz 24038 BLAKE2B 147ba36c966b2220c068ce3376bd84259807f66c57141fee4ed95457333cd9d568d19fd4d3348e7ef25d456e3f7d794f83f8302a15beb16f451aa02ef6181848 SHA512 3c0225a20c25cf0f12f03005bb79e738527c0488bb660c1eb3b55c505a0ef503002d37fcffb3d013e5f91101bdd03080a68d5805d6d29b682cc01bdc9f0e4a19
 DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e5430e7fbb5c2bfd444e4051c60a9ac14ecacd3048f87f546516bddc4c0403738aa3ef227b3fd763a48bca28da09a47f707 SHA512 c7d6f442242ce01f69d2386b8ed41e4e5f72a2523ecbe38785c4333405f1b000e298133ccc4169d9685a3dcdcf0b20567c8e4b2dfd36f42721d36c73ee27d90a
-EBUILD ndg-httpsclient-0.4.0.ebuild 805 BLAKE2B 83bc394eaab40c24dd9bdc770375566725a1b34490c945e204c1d9c0c5bdb6f21ff9bf17a84964b4bf8d9e4253d637374a747d9e9c402cc1d9b8b2fe9f25973f SHA512 30a9336445e88b76a1a4ca59ebd8e0c5517ca45d027c2017355ca5378040bf17ebd98f5ad71c0c3af2ca68898c9dbf1603bef19fc2ac8a1c25033c5f344df910
-EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1663 BLAKE2B ca793132c40f6971c7b83ccc86c39698def9da79e1e2a6f92b4fb0ae380d9d6d791f1bcb37ddc9685f5e7bdc6e01412f69741acc28e44dccfdd1f349d104eb2e SHA512 4b2fb2f0aba5ff528cc909b5b8be0a014e86b4986db0ed3d7315f335e9958aec1d9b58169bb592ed14790e9dddde9090feeb25a43818cad780a81a49a75b4b5e
+EBUILD ndg-httpsclient-0.4.0.ebuild 796 BLAKE2B 3c63c149f5032f3d0a8cde9d39210c2d6ab0d40dc1b0f56e7f5d2a6eebf283fbb2718f3b327f6a24869705524611b11ebe702a79be95b4c45bd5fad8b3cdc700 SHA512 9136eb413d88f83d3e8321db4bcd57c2ac7792c3591437996c77075bcd521b0844981191c936efac2c03359a731c185a4a100560d436f5fa072145ed790ba3e9
+EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1656 BLAKE2B 3625e426f0d4490b8f0b7a513879bbb65562dc9adb2d6d179921c17f619be446713829478f12aaf747a6e96cc273f634f502833df4cda2365e0dc5b15eedbd8f SHA512 21a5883444f24f8ba8d71f22f9489e5b77e763b631211cc3599698d94c7f865a3ce782f399718cea07022bdcd6824c777338f83f108f5ca6af15576a2462c52e
 MISC metadata.xml 393 BLAKE2B bfb003be060fefbbdd7e46aafa06dba5c0207726a303b4d0794a115b2995bb65505ceda29ad37f0cf6d86a8f1c0521f14a004869ec8d8051e374bd11255e7266 SHA512 1092b2a6c3d9ed56cc6429ce9b1ffeb14f18934f2dc8dc9e34b28eb9a048304f31634fe2d7265a599afd338033605c831290b903e933e1a1634ed8fdbb1719ae
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
index 410516d82333..646ddf8ddf43 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
index c0cb7eab06f1..f63a67698c44 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
index 399d1ec61cd9..909677044094 100644
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@@ -1,7 +1,7 @@
 DIST neovim-python-client-0.3.1.tar.gz 51626 BLAKE2B 80e68d02d41c7891fb88e9386866f87a1c78acc9e279de4ce4c7022333f8da3b68ffe7c598c84ff9c6386458639b6ffb4aecbfe72288866dc147ffc6197e94e2 SHA512 9c1599aabce9f0e1133364f8e91dd1b57cee107a11d400f530218ec7ad157c2f58134c1e7e8fc27649b4d8953e27c51bf6e4f0e7565d8c3dab94788759eea229
 DIST neovim-python-client-0.3.2.tar.gz 51954 BLAKE2B 8e0a5eb510797db260ab501b751921f5c98551a06cf874eecff270f5f92da5d24539b857b4cc08494be9dfed139fd3bcab1cdea75ee87d99cece8e1f48f7a1c5 SHA512 c6d7c1a2955c63ac2f59bc57e190886fe0ee0238951ac26205b537d394b2ce2fee3611e8651ae1da5e6e7b3a1bd3bea36912b918b26e01bbb3354ddc2fbd77fc
 DIST neovim-python-client-0.4.0.tar.gz 53443 BLAKE2B de37fde43e90e8277f3c69cedde9226e929f122cc2ff3030766fa716069114bffb27ea9489f2de87c69d3e7a8e0ecc22397a94168cee542d37dc827dc3ed3d13 SHA512 4b3b0e295181cf8886850477d01daba1cba8ac456aedadc5b3881b0b4910724450c4e7774282f6edf3e322792b697ae8e925f40b2a0b181a95eee48aef42a97a
-EBUILD neovim-python-client-0.3.1-r1.ebuild 767 BLAKE2B feb97ea376aaee037c2babbdec0439d9d9c5e4479e182176bcc1249a0fd08689dcbad43f79804001ace9652396cfc469d299383486c7b7aa7328e1fbb567049a SHA512 1c4c98acb0e4c816383999151426a955e03e6781c8169262456c356349febe0a0ebaf932a91dc22610aa8110b0d7467543177e643b078cf66d5ea9530ec27013
-EBUILD neovim-python-client-0.3.2-r1.ebuild 766 BLAKE2B f5d94e1552c50b3d663c90ddb95c26f675532ca56cdd4e352a5165e3069f4b70a7e197437198fdd15236820b864cdfca3c23cf128d65391a86ef70a33b2f1f5e SHA512 fddbf8a18e862cc202cc57bd00a1a63fdde2335eb708d94ecec1222a75acf6166e19df3b63a25b9bcb64f328f24c7839a5f488c71cb5267a229e676eb9911419
-EBUILD neovim-python-client-0.4.0.ebuild 844 BLAKE2B 08e317908fff3608fa153aea3fbde018a955e0ad4b1e4c62820171318d27a032c36cdc2ca3d9b37fd97cf52d13c3076da208364e8793b8f1b371f5193b150203 SHA512 368c219a6ed97623699733d18ee50038b766bcbb3b6ea2e7f18bd3c030a58b9588165125e3e0398b9369bb92eab8f610db5d27a7728b26f6c6b1c07f6d5e1a6a
+EBUILD neovim-python-client-0.3.1-r1.ebuild 763 BLAKE2B 29fe7b29cb88950bf6db283846b67b89932925bec4ed4a2e18d5d64f3eebdf72eaf27fa5d4d1c3a12ab2d2460cecc3486e708a2b83473bd69cf7c1ae91a0afbd SHA512 862df85af117b9c3f64e89915330e760eca9df6a839de3c6d9f79d39312837f385fc248c1cf6c18a529caeaa6fd14bed1e29fe6b63d0ca5430c9177a0d53693d
+EBUILD neovim-python-client-0.3.2-r1.ebuild 764 BLAKE2B 5238e8a9d7b3f27cc50f59bb8b85e94d7cb7229ab7248ac9b64723334e13acd2312db016a1a23ed4514bff2e934edc40a25991d799d9309a6ecd8bb993d15a4f SHA512 89c85f9176e994bcec372d68dbe7cf712336acc75ef8763ed5f7123a5d355d8846f6fd5128c18d81ee025446896eb5a3d1894a860c33081a60e69803b23ace47
+EBUILD neovim-python-client-0.4.0.ebuild 839 BLAKE2B b8338370b7311ae99382dbb3b53f32f0d9c11ea0d97bb273f2c88f3c95c60fe408d6723a08f15b274d6e14db7d9cde30fce01e7cba593c001538e84fea5a2ffa SHA512 d8b3e6e240cea0dbbe04f04b4092ebe5d6a8e70a40680b6342542b1b32d6d7ff78e7b9a0737367621c132b5c1597c8698e691ce2045ae04654363542411300da
 MISC metadata.xml 344 BLAKE2B 0d15c0c8d8736a7622e98357e02c92eabecb22c853cba110c893b8cb681f0d7a16534329ffba68639e0a2455cd1321601dd56dabfd17b10ade3e23545aab6579 SHA512 32963ee9f09db1c9edef5a1179cdf0974b62c05d714636faf8f677db5f3205333d64eaa228ec2d35475a7efcb744759a857c6888dd055766118a19a288415e52
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.3.1-r1.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.3.1-r1.ebuild
index e398f549249e..22c82feb3766 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.3.1-r1.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.3.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.3.2-r1.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.3.2-r1.ebuild
index 638c7cb25320..f424f4b103ec 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.3.2-r1.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.4.0.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.4.0.ebuild
index 422ae8b2c754..b226b59a0c4c 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.4.0.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
index fbbec806806a..94e6374ade64 100644
--- a/dev-python/neovim-remote/Manifest
+++ b/dev-python/neovim-remote/Manifest
@@ -2,9 +2,9 @@ DIST neovim-remote-1.8.6.tar.gz 434012 BLAKE2B 1fddb5e4376d3d17c2ff0c00e5f98700a
 DIST neovim-remote-2.1.0.tar.gz 437657 BLAKE2B 056bcc1edff5225b478e72f0b0ce3b8f296ed49d9d8a035bce88b6d26daeda884640f9f6a50b68d91a8ad38a4980f554385e799302a541ce2d6985110357188d SHA512 23f6e98d57d856477b51c77aaa417af8a7a9aa02821f4dbd4870af7b3f9de07c4ba46ceae036ddb17382de4829238114dafa4b2b6d1e6dc71f1d9b4ba935b562
 DIST neovim-remote-2.1.7.tar.gz 438133 BLAKE2B 37bcbabbc4336f31ddb20aae27c748fef80924d095ef285a27105b8276a89dd681a9ea210a4b1286cf7ae5461364044fa97889b803c0de15d18df09e0ad78e2f SHA512 544c2b60b751cd72da793f1ea69fb0fed8990f009320ce6972cdb17af5ae2cc526af85bdc57f03a85cee1b8e3fdcd357a99a91252e44ae0761d3772f1714c240
 DIST neovim-remote-2.2.1.tar.gz 438078 BLAKE2B abbb056a10acb1c4e21c0c418ee2d6003869340eb34df0c0374b947fbbfa2d2e0f64f61ad571a6cad7ffad7374f1df17a519795e61b37b8d6741d566760759e9 SHA512 04a16a1ed5f4947b4fd763432a14fc565300abe9b480037a462f0c4700535d4854012ff08ac64234dbb1fccc1d3f5ba2174f94effc5564879fbcd1c83fee26ae
-EBUILD neovim-remote-1.8.6.ebuild 662 BLAKE2B b5075d6b7c54859770903e685ee66c7b076290b8b716aa1159d81c0d3937997ecde2d046e6081032bd34123f856da1213ef6944e5dc9cc46659decc8ac789ac5 SHA512 3df9d28fd51bfdcb20d45b28cafa8e52e5a75bf067669b87ae134d037da3e079f4346a942eee79cad0e34b2f5495645fd4fd13b6189977449f434a8e55bababf
-EBUILD neovim-remote-2.1.0.ebuild 794 BLAKE2B 51fbd9042eaf10661bd356c26487633e439c5c84ee1e825435f5a4150bcd39fafc46c1591429361f00318b741e4a21667cb6edb0c54fb2b6aa425f5c91f2665c SHA512 ca0a83cd8da15b3d8461cca09db0a899bf4f58c25984324f528ab2688aa9eaa26f6729a15324480748aaa3ee7539cac8b241d1820927e0d69ce8ad082754d909
-EBUILD neovim-remote-2.1.7.ebuild 796 BLAKE2B e36a5f0eb62cbc5ef879e9301ae295dea3a6b929ac0570697dfd4ef99332fa2b8868d8a6457d70744c6061032c50709f2ce1fa342db9b3991ad5f79f99536c8f SHA512 73c327c0e166e7639819cde094ce7302ba8c491215320a3cc614fdb5f88284e2c93435353bf99c59069f8d1f3aed5e8c3bb40911dc25c59eaacd712bdf2e59c6
-EBUILD neovim-remote-2.2.1.ebuild 796 BLAKE2B e36a5f0eb62cbc5ef879e9301ae295dea3a6b929ac0570697dfd4ef99332fa2b8868d8a6457d70744c6061032c50709f2ce1fa342db9b3991ad5f79f99536c8f SHA512 73c327c0e166e7639819cde094ce7302ba8c491215320a3cc614fdb5f88284e2c93435353bf99c59069f8d1f3aed5e8c3bb40911dc25c59eaacd712bdf2e59c6
-EBUILD neovim-remote-9999.ebuild 662 BLAKE2B b5075d6b7c54859770903e685ee66c7b076290b8b716aa1159d81c0d3937997ecde2d046e6081032bd34123f856da1213ef6944e5dc9cc46659decc8ac789ac5 SHA512 3df9d28fd51bfdcb20d45b28cafa8e52e5a75bf067669b87ae134d037da3e079f4346a942eee79cad0e34b2f5495645fd4fd13b6189977449f434a8e55bababf
+EBUILD neovim-remote-1.8.6.ebuild 658 BLAKE2B 9a2b73778662e287b607ebb8bc63a67796f8b2c66dd606672cbb01fcb6af09e2d93f51167b9487795f0c9fca5bf6fc59b6294120bbb2a7cb42408b1d3feb8966 SHA512 de1e544b27e02ad6a4df3c571397714bfe7a4f0d3ad1609f307fcc04a990f0c4eb20cd68c8569ce69975815b7be9d08071767ad14c08cb2369f1d6941cae617e
+EBUILD neovim-remote-2.1.0.ebuild 790 BLAKE2B 6cf59275886ba16caace980eeb9844bac7f47ebb6ba53383116c226ca9b53b8ce08d21ad8406b47c3039ecee43fb852cb2b8ea11985bbfed21fd48e7ae6ae4db SHA512 42f1eecdaae54b3b074f9bd03a3f94c62baddafb4163d2a6868e227cdd096f5f6fee66a2b9d6a9e0e1b11d84999f536bfddc83cd8ac5045812fcfbccb2a30bf3
+EBUILD neovim-remote-2.1.7.ebuild 794 BLAKE2B 25df6b13501ee721659d4dc576a19df7c36b8fa6c9036674faa615185d59881acbe9c4b81d0dcc55fe7e218a0e013dc8ab7491583221c0af50694b56c8a845c3 SHA512 e9cdd1d654e97774cf44655d16023d93c00dc7c443cedb88bedf171b72e93e23c1956fbee8470606d8f6657b20a0037870b1d720b5c888ce41441430ab17fc8d
+EBUILD neovim-remote-2.2.1.ebuild 794 BLAKE2B 25df6b13501ee721659d4dc576a19df7c36b8fa6c9036674faa615185d59881acbe9c4b81d0dcc55fe7e218a0e013dc8ab7491583221c0af50694b56c8a845c3 SHA512 e9cdd1d654e97774cf44655d16023d93c00dc7c443cedb88bedf171b72e93e23c1956fbee8470606d8f6657b20a0037870b1d720b5c888ce41441430ab17fc8d
+EBUILD neovim-remote-9999.ebuild 658 BLAKE2B 9a2b73778662e287b607ebb8bc63a67796f8b2c66dd606672cbb01fcb6af09e2d93f51167b9487795f0c9fca5bf6fc59b6294120bbb2a7cb42408b1d3feb8966 SHA512 de1e544b27e02ad6a4df3c571397714bfe7a4f0d3ad1609f307fcc04a990f0c4eb20cd68c8569ce69975815b7be9d08071767ad14c08cb2369f1d6941cae617e
 MISC metadata.xml 361 BLAKE2B 8cbaa82fad1a726eb2e09bc74bf9f6b18579fa767d56ee20d14c39d8bd7726d8ac044e5072e4cc00686f9acc41e0c9a2d4578705c79a3e84af5318c136c910e0 SHA512 b7a6d140b5642f8326e0d69752c0479319ef0746eaa440fce0a4bb2d36d4428f5bbe42364430906a1baf2dc953283130c5fb3eb7b9f9d45add2a398a1e9f5b64
diff --git a/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild b/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild
index 257f23e24437..58a2f8750763 100644
--- a/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/neovim-remote/neovim-remote-2.1.0.ebuild b/dev-python/neovim-remote/neovim-remote-2.1.0.ebuild
index ec3bfc23c6b7..b77a7afbcb56 100644
--- a/dev-python/neovim-remote/neovim-remote-2.1.0.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-2.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/neovim-remote/neovim-remote-2.1.7.ebuild b/dev-python/neovim-remote/neovim-remote-2.1.7.ebuild
index c07980e22fc2..432971bdad31 100644
--- a/dev-python/neovim-remote/neovim-remote-2.1.7.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-2.1.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/neovim-remote/neovim-remote-2.2.1.ebuild b/dev-python/neovim-remote/neovim-remote-2.2.1.ebuild
index c07980e22fc2..432971bdad31 100644
--- a/dev-python/neovim-remote/neovim-remote-2.2.1.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/neovim-remote/neovim-remote-9999.ebuild b/dev-python/neovim-remote/neovim-remote-9999.ebuild
index 257f23e24437..58a2f8750763 100644
--- a/dev-python/neovim-remote/neovim-remote-9999.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/netaddr/Manifest b/dev-python/netaddr/Manifest
index a4498a486b21..17cef62da570 100644
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@@ -1,3 +1,3 @@
 DIST netaddr-0.7.19.tar.gz 1622835 BLAKE2B 31e2c2a0f6f0b0e03494718364f93dddedc13714ff9fe12823fccb34c0693987c01e50e37d10497613cfc226a47b8d55593ed48bf25a7f7e64b7035b83511d12 SHA512 8440dee19d51828cd0dee403ec8c2fbc70e42d8c7c922d1a6a2a752100f9a313c521fa5e0789e024af0998f713599d50cf986e96867d3cc62a4143875e52d6bf
-EBUILD netaddr-0.7.19.ebuild 850 BLAKE2B 4df2d496022cff565a736427867e3322c80dc70b9c0fd0bbda08ab3ceea4bd9a37c79c7890933115cea1f2cb0dcccd8191b6d77ea03a913e576421372281678c SHA512 372482eabd6d12f9a0b158497625f4913805a2ffaafa0e38b496527a7837db89a2b48b81fc691c13597c26b704a0ee489fd62d37c7388634c360b3341416e82f
+EBUILD netaddr-0.7.19.ebuild 848 BLAKE2B b7c75b8445763a79078ced22c57a8f5bf61546c26fa0a987a016a3ad474d3f09a84bffb5c38a6d98faf2a3949572d657cf8fc36aaeedf4aa3da520d45f2b9e96 SHA512 cfe5476747281756570ee5b0322c0c75906a1831e4edeead627c0c5e24e32ee8162cc9104862ede0d5b8a7cfc47a1587697cce348a9c2c52c7e1403a5057bf60
 MISC metadata.xml 486 BLAKE2B a7a912615f72839971663e2dbbf5e4bb7fbd87a22cc9bf1080edb6756553f34eea3dfedb7487df85f6d94b0d9d835f5d3b5cecedf7f03e54af2026fac5e09be4 SHA512 91e00ad588636fbfc6edc9212349e9c04227cd388cbffff622baf699741e5875019eb80a811f91c14a76f9c9106bd35a9a45ba9caedc4c145c04b9913afd1a99
diff --git a/dev-python/netaddr/netaddr-0.7.19.ebuild b/dev-python/netaddr/netaddr-0.7.19.ebuild
index 0be7bb1eaecc..aa1cc9fc8ea8 100644
--- a/dev-python/netaddr/netaddr-0.7.19.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index b09ab18addb9..cf244883c634 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,3 +1,3 @@
 DIST netCDF4-1.2.2.tar.gz 679107 BLAKE2B c15ed9332bd8e4bb18c312cd4418add169716ef29b6f5c4b935c880259a6a16c8388ed7c790919bfbbee631e9e96ce4b9a9afaeabb305e4dd32028353e62207d SHA512 e09465d125077e71b8aad4332be844099c7fa29d0ea8f1dd0887f7a5e849ab778361026323466b1d4897bc3d8f8be1818cfa5f426773c765ee9c5f3728ff3da3
-EBUILD netcdf4-python-1.2.2-r1.ebuild 688 BLAKE2B defdc124152c143b79bd431d1d6a5beff5b6ff57c549e638d4d0d541cf8b31c46094fab3cc82f428c6e099fc63869bc56d379bd2162e3448b50d60ae4c2984b6 SHA512 35dfec10a118cec5957d3fef5564fe15c723128b815d4c5b3e89cbee3a8245159c545535e90c4b32f888e4d0b12463b75c2d1e1d0af0749712d6f3631400543a
+EBUILD netcdf4-python-1.2.2-r1.ebuild 686 BLAKE2B 8ef633a2120518abc492686cba1899d9746a8a74c3535f7c2999b57ed26980d7dafb9b19877e7666e98f90cd25ca2037b1b95816fcbe02f75f0841bb539c07fc SHA512 c66b97ef77d1da10888a03dc875f26c9ed8697f7ef6eb3aaf77c04f34885e43b36ef27687bc4b7219a2875fb85fb5aca4de4eb0bc57e2d81b7e3c9a7311238c1
 MISC metadata.xml 702 BLAKE2B a7c9b2dd81a36206430022513af169fc3819eab8923bb9fe50d94fa165ad6605bd4bbabe700e1c11612d522ad39d02bee56db03b31888969e4f871606ecb5018 SHA512 ecb1a82976d540d6a8472901456bcc634077214703ca30e52cd9cf6fe47d7ac69abbf754dcaef977ece693e5c7d8f97dd250bbe1e1dccc4c03964eba576e29d5
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
index 4494e2f43bc5..6496b8352697 100644
--- a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
+++ b/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 03578497ecfb..9d010d911ea3 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -2,7 +2,7 @@ AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28
 DIST netifaces-0.10.6.tar.gz 25166 BLAKE2B ada66ee2c0a20570d97a9375ce6212c9e7a8765d338b70aceb768912a340dadbf93311aa5cc5a23dd3953f98787be41457c60ffd0f8726cfd4955545709019e1 SHA512 2c892062286007a8330c2cddc148ea21d1fd24aec32b5f25b8fe905933c651f8c532596f523f0bb7edb3a143e9a491ec49d60f75efad4407273ac2647b579b1e
 DIST netifaces-0.10.7.tar.gz 29330 BLAKE2B b93b48242781e6fc0006dc653c180daabda46036149ed5f023481ccc85d65be03f1a1862ebde2e0285573bf347302e50958c35ce54b633d427a49fe95b151d53 SHA512 d97433345a29ae540e40d5fe9e50c10e8b30197bb0b798f55c82236f20dc6f463604ed202b361cdfcb5e0c95998c87acc781a808c0198ec0479089e13a7fdbed
 DIST netifaces-0.10.9.tar.gz 28844 BLAKE2B abbe36ef82c5fa70bac60abe4c7bda671f8bc009567dfd38fcf2084bac5b09cbd42cc16c5c8023f3219129892f8def296e3cad8f9241d8c904a9c362c8077aa6 SHA512 8fc593de4d2cbda46a3e2430ede031360f1abfc64d47d00fbec09f3395fd83479bf29d97cb6834b1df06850c9ac2745c9344b6814f34be5975d4d5df98e05e87
-EBUILD netifaces-0.10.6.ebuild 640 BLAKE2B 6f911c18818a5bc920d7eaf0f6232d38a344630418b50de8793a92334edbeef21d4401ce7b44fed2e241a61df11faec24f0d4d75ced63f87bbdc1ba6b442541c SHA512 98dc16546efdaf0199aa8e2bef8aac7548630ecc7e02ae32b73708e07ef54876d774df724ece5ae34e5fb03e61e0e6e3874c3c87c199cc8decb73fdd0d54144b
-EBUILD netifaces-0.10.7.ebuild 622 BLAKE2B 8233519f496ab810fa34e38e72b451ea7303f83af0ac5959e41cafeb7512a85be07f0f748dafea056d809a57582d55fa74691328d9879df3c6c01517a29ef470 SHA512 ae7c942ceacc55d03d0ee67e4df431528b88835003d6bb28c11b41f9f3704fd9ca9b68d1e791f12a1903897c580ba3ca489fd93f2eea9c347505261bacb11a21
-EBUILD netifaces-0.10.9.ebuild 618 BLAKE2B 12292d202045b0ab98c47847c894cb746ec673df98546b0b9d937846621ab8e6c07cf01ec4d15d6da3afb01256e23a473500ce706a30684109b7c989aa8677d8 SHA512 e97059b1b63f6dd928b686dc0d385289022d8f46cc16f25aa26d23007e85dc7ffaf804965d2369dcec5a7ed806da201f85e326458de09cc571f257a65b11a51c
+EBUILD netifaces-0.10.6.ebuild 633 BLAKE2B f03ff7f29035d23c120735a2d3958cad7758bfcd97abc8e6758df59a87d3f10265a3fa2a2673c041bd709be65b729610feaf7a9051c95ae8900dc322d027665b SHA512 0aafb7c6d7d08c1c11efa6c42ef60da73aee87260151213ef53d0ecb2c7b140209a54f0016f909f8f805ba030be4f86462c3246cdc6e59cdd3d0e75f0b3ca890
+EBUILD netifaces-0.10.7.ebuild 617 BLAKE2B f5e8fefbaa550e19fb8da0aa7a705bb250e15cd192a92e3616b8c452b4c00271193ac3d6f30d68875039d94b1ef168826b7178760f4c65c47942ff54ae6aea15 SHA512 7c70e7ca0dc3175c21d4692e7045bed5119488c2b68dfd4d74b19b2acfd7666793db8b48d94bb7f3b60b1af7fc29e33e8573638b9d3119a64a4feb90a2bb6608
+EBUILD netifaces-0.10.9.ebuild 613 BLAKE2B cea32b1f8b47c6e9804aa7109ec578803cfed57fa856947e2afa48fb3586d01790cf4d37db8b1bdca0b6d15ea995989e4643721fb3a33190943a3905c684ade7 SHA512 506902ab9461004c9516e373177394590321bacda025ccb0c3d13191604b3a2be58e4e7512a9305bbe0dc43efd1ea710aa811156abeb2aaba05ec39c17ff83e4
 MISC metadata.xml 513 BLAKE2B 2668fe590efd338d410c10a71076e5de04297b18f998b07dbb88a3df99e1c4e66ed92f97fcf6d06b2496bfec3ec308d3812f08b1640b73f1d2221beb669ad3d6 SHA512 88793ae0c8b539b78d70e1af3a18e65b7702e3663d950a9ea1ce7528ed3300ea0b4c69c5a48a652fac4c2a32ede679062dc929c165035a3cd4dec13513669691
diff --git a/dev-python/netifaces/netifaces-0.10.6.ebuild b/dev-python/netifaces/netifaces-0.10.6.ebuild
index 281c227923ba..4da2a26d121d 100644
--- a/dev-python/netifaces/netifaces-0.10.6.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/netifaces/netifaces-0.10.7.ebuild b/dev-python/netifaces/netifaces-0.10.7.ebuild
index 274f09902128..e7231ad2fbbb 100644
--- a/dev-python/netifaces/netifaces-0.10.7.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/netifaces/netifaces-0.10.9.ebuild b/dev-python/netifaces/netifaces-0.10.9.ebuild
index 9c716b123694..b54bd672b5dd 100644
--- a/dev-python/netifaces/netifaces-0.10.9.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/netmiko/Manifest b/dev-python/netmiko/Manifest
index 3669c9841465..c4eec1cdef57 100644
--- a/dev-python/netmiko/Manifest
+++ b/dev-python/netmiko/Manifest
@@ -1,5 +1,5 @@
 DIST netmiko-1.4.2.tar.gz 45217 BLAKE2B bfd8a9b6499f05bb5fb82a284d4d16b8864dafcc82033282f6648cfe82db5920c8ca87026ad8d89555edb6149876b9252e97c290473af9f80cb09db9bec14b84 SHA512 57531f3004191aba0639394149ce60fa9ed1ce9c5ba401a0e901d5a28b404506bd08f2c30ea915c379cac75186ec4076dfca3940a1abe19d89aba58268de736a
 DIST netmiko-2.1.1.tar.gz 71410 BLAKE2B adb17165b780f83a8e9b9e75aa41564783ebe0c09e4855bf7eacfa440c8f3dd04785a1ba66bdd8eeaeeb0290ad045920633ec1dc5eb0b8d64602999a272594ca SHA512 72c5e1084cad3116eda5c89a9bae6623d8f062a9901e81f91f1b355a73d33e68474627894ea6f9d1edbd494aa3aa0ed1ca5440b7c9a4a6c003875fe547dfd3e3
-EBUILD netmiko-1.4.2.ebuild 596 BLAKE2B b244bdeaf7a5b3af49a0b391b8699925567991c5bd4e35338b1af439a7a53928bafe8a506458a5c30c1ee0f66890cb3f0dbf14951de10be4470c9fc81836bc8a SHA512 cb0612d48043d5d1ac5d2d3d62ccd3b897f5098eb115d5dee4c770eb1ff85eae02fb916c044517574936de6af3493e49b519566e97d503927d3f34152eca808c
-EBUILD netmiko-2.1.1.ebuild 546 BLAKE2B 05c7b1ebd995d5a3aed9f08278fe93e1f294c9f4bc43c4284cd246d6a3d8f238de8b06e6542ce98c2a6303d7f45779cabb1dd392b04ec489afe6e7f567777833 SHA512 ac695d81c6b7402c8a4ea0d9f6e6a1707fd946cd5b73fcb6877f385a943eb42b4765a523e48d1c108f1a3a68da0843a6b3cfb522ad9adb6103832e8f1746ffac
+EBUILD netmiko-1.4.2.ebuild 586 BLAKE2B 83265c73e631e3ac05e817ce4bcd5af906a9a717694663e72b99351ba9d4f6056eb435353d97c003f18fd1d08103ebcc1216fc3b78b1543e67c701e7910e87dc SHA512 a75ecc0ea420d6a0ea0872035630ed97fd080bd73d6ed7e806a6b965fa6369890524d0e6f4437d65df2edb850be900c0b97515829d98a33f37595a41c5a094d6
+EBUILD netmiko-2.1.1.ebuild 536 BLAKE2B edd9a00119b6c21468234744a1b78ad7a617dcda86c9e5e3ebb72b8834b6df1a6553505e480b17e45b3a2a0297547ceefb360d6ec219c9ea1ed0b580c3fdfe37 SHA512 68a5ae4b584bc480e469c7019a1a4a941410a074322e1ed809bf1eb7889bf05491bf9c186f9702ff46e087b0d53cdd97bc45761d09b8de6bf36c701714680946
 MISC metadata.xml 489 BLAKE2B 3c32bc7382cff20df3738f1c9070724b7594c650276311f143e089f476cbb8d80222c71a576fc079ee244f091534adb48cbe7ac9bcd47e28a91a347cb44e1f12 SHA512 f70e8c0dbd8a02116817fd74436c434b102a89b174865ec4a2bdeec240e428bc79526679c0205b01a165f5e63c4197e3c8875f1c1928292b16018b8e065e66cb
diff --git a/dev-python/netmiko/netmiko-1.4.2.ebuild b/dev-python/netmiko/netmiko-1.4.2.ebuild
index 8adf64eed321..11f97afbef0a 100644
--- a/dev-python/netmiko/netmiko-1.4.2.ebuild
+++ b/dev-python/netmiko/netmiko-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Multi-vendor library to simplify Paramiko SSH connections to network devices"
diff --git a/dev-python/netmiko/netmiko-2.1.1.ebuild b/dev-python/netmiko/netmiko-2.1.1.ebuild
index e2b86a567942..788a9f5a8eab 100644
--- a/dev-python/netmiko/netmiko-2.1.1.ebuild
+++ b/dev-python/netmiko/netmiko-2.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Multi-vendor library to simplify Paramiko SSH connections to network devices"
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 0c3025163c97..65cb8eb02b12 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,11 +1,5 @@
-AUX 1.11-sphinx-pngmath.patch 361 BLAKE2B 1cc9c5d7ac8cf426656565df9afba6e4c75459550daafbaf98f4dbaa0814deb711963a3c7fee33537143e3f45bf7367b6a7c5213f72873f9ec5a47e7ebfa2807 SHA512 2db58b8f6067ccbe66bcdb3f39a80d126bd549c6838a34907b01360b5441f8b122632f1863b51142cba8688f4705697b9cd15d8fb6534ded8a9613e374edea4e
-DIST networkx-1.11.tar.gz 1315737 BLAKE2B 9f6556af1a4e23bf7fcf51fcbc753a08f2616dfe63c7b05fbe20ad7532580bf566c44ddc5db0c0d89626a17fd2029485583b513f44688e8033ca83cb36f28315 SHA512 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253
-DIST networkx-2.1.zip 1612593 BLAKE2B 0a603617105bb1efa3711f81a468520eef5f56438bf6e730091a43b628d04fdd22e8b62de671dbe98be180bff68b3ea4af61e475fcc1f274537ccd1e74fcdff5 SHA512 61b819ccfdd38e009e5b363f4bf551f2924bbf751b078aab1b41da9faf4c6b0841f38750b96bd359d3aebefef01e65e88b4c43a378ec25bbd45283d92bdae678
 DIST networkx-2.2.zip 1700336 BLAKE2B 8cd4bda4100d5da10864f3b08d5a7faa11399176cfe39691aef46234a3de71bb175a3ac0b179cce9971c1954d0fc13469e41d610191c7827f1212d0e9ef1e3aa SHA512 098e58c5f93c72c789e736102815e2f6388eb34147a674941519ef6f6d6452cc09b76d8523893418cb69df133e7623ea2c62fa51144f598f592ebce0e3e3ccbb
 DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
-EBUILD networkx-1.11-r1.ebuild 1926 BLAKE2B 2fb06a45d31f8460dcc8af6993a4f6d8e4037db5a5f79a1252c81887a3ed982cc571a147e20493aed0e58df1df188e2c3d3e115f1ab0efa0e4f5ec25fbaeba2a SHA512 14fe408f3b704ae0a647c45a4de4c24db28e779807a618bb4e5ff5f361ddb40d29c0d7170cc58037ad57f8bc69eeb8a11603107d2c9b5eba50d2f2edd6a4bc39
-EBUILD networkx-1.11.ebuild 1902 BLAKE2B 659c5a345e0a4258c8934988c28d55b4d1e756b1626f83f86e45d41325946349d61d24d9127efc51ddd28272829c508ea40be31212c371570265e8b48a44fbb7 SHA512 fa3a76b477d93ab37c6940a89368e634d5e49335b53d81c0bb82bf1154dadbd316538dead0daa7b303b600ee4598c5580d799fc717af53ff7b62abb046074b78
-EBUILD networkx-2.1.ebuild 1510 BLAKE2B f48013dac574a11d2c7b4998bedb810009cbfa59c5df6be8a53b2566368ecc0d26c4fa363bbe1cacb6d5ae3b96e3d69da3795954fb560fc83e2765773f15bf72 SHA512 9add51c008c127bf5473e0ebd765ec50f77f03e7957e7f41eae6daf2285f49c4388d6a001791781b1a4a56424ef3e495def8843d33117141de2efeb0eb53ae32
-EBUILD networkx-2.2.ebuild 1510 BLAKE2B 354d3a1ab17328df561ab64c9e543b41a2f3d233925c4c5c4b8bcf00af865163a25e2463806fe09b0ec0aea34d785a62f45705af1e9bfbc39a376688f729c5fa SHA512 126b41e825c509e73724078aeb5fa22c6af17632a3b1144a57b903411bd41903a2bae43a66ea0a31f5c8ad950b1b3413d8848630dc64be6f710ef654b6eee98a
-EBUILD networkx-2.4.ebuild 1551 BLAKE2B d80e91a23202abaeac80fa65caa06fdcc092475b38bec3ff7f965ddf913981801444823cec2146920609bf6c31b174f9562bfb1f08d6a46ffb7cb3dc7905834a SHA512 f595e1e45d05aeae91d90eb8e79fa9a9ae76dd898a43ab1411fa2168c1f1f5332e80422dd70a13a9827adfad035fb827ff4a6ff5e7351b49cf4a002d75f39229
+EBUILD networkx-2.2.ebuild 1500 BLAKE2B dba698161fdaa6e7495c5f52cf2a7920ba79e7a77b57f46a08703b0b799dadf04b939155b8073f2b1ce2f21ef5a257119a8fc653d8aaf2fabb23bf8be610cd71 SHA512 bb700279e5c8d8d355a815b0fcd5d515e2a43e7858e4fbed0c36a28ad579434ff2d84b3d7e4a320bf5ea89e1fbaa94a93d00a481dd77a143754ea0a5fa29f167
+EBUILD networkx-2.4.ebuild 1545 BLAKE2B 86725d70dab8b567f571e7f33f826d3cf5d2c5c9d1bb5e7d7ee3cbca257947c8d0f4c480e521a4d8cc1f86124156cc9ddc5b2c0a0efbeebd3de3271574761cad SHA512 d8d07ef16ac00d6aeb473c3d3b1b1fbafd942e5b1842031f8d77e5926289a41250a36cc14eb38bc3d6c98cd9f1811d624486ce89748f1180b54f48b39308d2df
 MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/files/1.11-sphinx-pngmath.patch b/dev-python/networkx/files/1.11-sphinx-pngmath.patch
deleted file mode 100644
index d43e4275a40b..000000000000
--- a/dev-python/networkx/files/1.11-sphinx-pngmath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Drop pngmath extenstion from sphinx config
-
-Bug: https://bugs.gentoo.org/594626
-
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -74,7 +74,6 @@ def cd(newpath):
-     'sphinx.ext.intersphinx',
-     'sphinx.ext.mathjax',
-     'sphinx.ext.napoleon',
--    'sphinx.ext.pngmath',
-     'sphinx.ext.todo',
-     'sphinx.ext.viewcode',
-     #'sphinxcontrib.bibtex',
diff --git a/dev-python/networkx/networkx-1.11-r1.ebuild b/dev-python/networkx/networkx-1.11-r1.ebuild
deleted file mode 100644
index 1280450d7c0b..000000000000
--- a/dev-python/networkx/networkx-1.11-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples scipy test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
-
-COMMON_DEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	scipy? ( sci-libs/scipy[${PYTHON_USEDEP}] )"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7)
-	)
-	test? (
-		${COMMON_DEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' -2)
-	)"
-RDEPEND="
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	examples? (
-		${COMMON_DEPEND}
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/1.11-sphinx-pngmath.patch
-)
-
-python_prepare_all() {
-	# Avoid d'loading of file objects.inv from 2 sites of python docs
-	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup -2
-		emake -C doc html
-	fi
-}
-
-python_test() {
-	virtx nosetests -vv
-}
-
-python_install_all() {
-	# Oh my.
-	rm -r "${ED}"usr/share/doc/${P} || die
-
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
deleted file mode 100644
index 8300110fa20e..000000000000
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
-
-COMMON_DEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7)
-	)
-	test? (
-		${COMMON_DEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' -2)
-	)"
-RDEPEND="
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	examples? (
-		${COMMON_DEPEND}
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/1.11-sphinx-pngmath.patch
-)
-
-python_prepare_all() {
-	# Avoid d'loading of file objects.inv from 2 sites of python docs
-	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup -2
-		emake -C doc html
-	fi
-}
-
-python_test() {
-	virtx nosetests -vv
-}
-
-python_install_all() {
-	# Oh my.
-	rm -r "${ED}"usr/share/doc/${P} || die
-
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-2.1.ebuild b/dev-python/networkx/networkx-2.1.ebuild
deleted file mode 100644
index 551f5a8714c3..000000000000
--- a/dev-python/networkx/networkx-2.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples extras pandas scipy test xml yaml"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	test? ( extras pandas scipy xml yaml )"
-
-COMMON_DEPEND="
-	>=dev-python/matplotlib-2.0.2[${PYTHON_USEDEP}]
-	extras? (
-		>=dev-python/pydot-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
-	)
-	pandas? ( >=dev-python/pandas-0.20.1[${PYTHON_USEDEP}] )
-	scipy? ( >=sci-libs/scipy-0.19[${PYTHON_USEDEP}] )
-	xml? ( >=dev-python/lxml-3.7.3[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] )"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	examples? (
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-)
-
-python_test() {
-	virtx nosetests -vv
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-2.2.ebuild b/dev-python/networkx/networkx-2.2.ebuild
index 3c300b4318c1..34015c56a179 100644
--- a/dev-python/networkx/networkx-2.2.ebuild
+++ b/dev-python/networkx/networkx-2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Python tools to manipulate graphs and complex networks"
diff --git a/dev-python/networkx/networkx-2.4.ebuild b/dev-python/networkx/networkx-2.4.ebuild
index 76776271aebd..352b12090902 100644
--- a/dev-python/networkx/networkx-2.4.ebuild
+++ b/dev-python/networkx/networkx-2.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-# networkx-2.4 supports up to python3_8
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
+# networkx-2.4 supports up to python3_8
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Python tools to manipulate graphs and complex networks"
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index 470935e64515..788858c86f54 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1,7 +1,7 @@
 DIST neutron-lib-1.18.0.tar.gz 395616 BLAKE2B 4970a7254eb3d94e06f332a9ac75d371db370fe1348497d86a535e3a12fb9f56652b319d23e9d6e5b83aa0fef30ff9c903704e00747e1176097572a7a0ec2a19 SHA512 8b20fab0f2b0a7c4ffedc0012fe80a0b1a972233fd4a4f1b5c68c77f4dcafb67df3074573453961a087481a821c2df4696a1e186adbffc09f55172cecdc1c132
 DIST neutron-lib-1.25.0.tar.gz 434978 BLAKE2B 5e7687862a8e02b1b7cb1e10135f7940c5e42c96f652ed3e694d8ffd12a55528637928ce31c6511367b80251feb609fcc6b1c92ea73c3ecc27902798d68f63bd SHA512 79614d391e6b812875312970b1cd020bcd3fb6c9135935b8f3e7a2c611d1948a9ddfa33a5f625cd6badc80c1a2fc37549add85a09dfeaad0422353b7e641e9e9
 DIST neutron-lib-1.29.1.tar.gz 454760 BLAKE2B 21dc2059d7e34e8fb155620d176da999e839019915d6d37bfc0caced305964402a38ecc8f4cac59c1e9c89db9a57a6116082253d8359835ad0460e828c447a6f SHA512 b6f646806a137cd0114663c5f192b9b20ee72af30d453a19218a00f25cd48389f0888ddec13082838cf1c88cb6c9204a08f73b0605f82801b9f4abd610ab6798
-EBUILD neutron-lib-1.18.0.ebuild 2069 BLAKE2B 7f4a3e4ca80d7e6137cf1fa2643c868d51753abfbeb795c2c2f718ddc0b4d561b06f324172a1e456958372d3a3e8ebb19863ecc9d4a6d32c10c95e448d72baa8 SHA512 640f01ac20fc5be52fd846660868db2c82be065383bf5247096cbee1677262b6ddcb2a7e8808a87b7f98f05ce747990080d9a469c66ea68a3d8524ff0063e3d5
-EBUILD neutron-lib-1.25.0.ebuild 1973 BLAKE2B 77a522b5a6a28cf5929b9234a927f9bb83c6b788e1cf54f259505863c8869568f74c019306b2258d86f05aac7f07460d4e755be79a3ba3c8ac0a6c6da8fbddc1 SHA512 acb2ac65355cb7351f7e4b37c5ea345f5216c0e42c8a49d5c5359999c9ac1347ecd601a098d785526533c5f241e45991667a8d55289068ecc5efd8b5104e66cc
-EBUILD neutron-lib-1.29.1.ebuild 2086 BLAKE2B 8eb9a5ca5fcaa5200f7552ca05afbe48ed98515c3480025dde6acdb438e6eaf15f1b344ccd69bab20ecca26439b4d778332fce4fb1ec0398cad80513ace48e35 SHA512 3002eedadf8f441ecefbea6216e7aea4c10d163b2828b89398b68ea3a2f3f1fcc837e05b39397eeef7e1db262180577311750e1265d50954ae2f45f2e72f1d25
+EBUILD neutron-lib-1.18.0.ebuild 1987 BLAKE2B d18b6516ed675fc6d3909058706a5478802deae4928bf23917298d4556f63cc266e01d11b4ee232f0fd1a6c1642378079e9f7686ff76d72b7b01b3a2747c9514 SHA512 da271ece2d464f9a887940d9afadf9f6fea00212f27b5a80b1cfd1b840da6ad2dfc2c691f0b53dcf37fd2d6ab2d7cc64c5cf9ad206e1eb8e32c91af24ea6360d
+EBUILD neutron-lib-1.25.0.ebuild 1893 BLAKE2B ee5295e0b69a16dd06e00b2edfc5f8e8b9d04795e639e3c65007a11e6f1aa67a463ee6798164983e7c02b33e76ff9b2c458e9f121687c22f69ce7a7786a7b4ae SHA512 3095536d04cde366777e0eca13af4bc3ca5faa1244b4cb52be008279f2559c278ffc9b881b35dc0402c41eb1a7e8a5cbe1d7a28ec833c7cd55aa6354caee0ca1
+EBUILD neutron-lib-1.29.1.ebuild 1985 BLAKE2B 14e1044528257d70746e1f4c2d7890ded39c4e342979d59b5f3568da4eff211eee5e8aaa5fe99d0fece1228b957d9937e5c234aa64bb90b3b8da44bc2a46c26a SHA512 8fc3ef8b0a245e5b777d68e98396a6283090e307c223cedecf948d6d1ff64831219fa2ce39baf7987515731ffb113848ad4063750a28ce95ac8f1455c3254890
 MISC metadata.xml 478 BLAKE2B 479b1ffc2e6b3de332fbdd2612c50a3471bd26615beed90810463b56122faf219cb602818de421a16c1e3227d13f5553d9db330dbbcfd6e67a725a3479566f3c SHA512 c642bad9f710c347629fca6952be3efe57e247dee81fac187d4a6458b4cb8280dc0d3d4a66e4d329bfd293b9e27edbb7a38247311fbb817088eeb70c441737bc
diff --git a/dev-python/neutron-lib/neutron-lib-1.18.0.ebuild b/dev-python/neutron-lib/neutron-lib-1.18.0.ebuild
index 768730084cf2..0c00989638cc 100644
--- a/dev-python/neutron-lib/neutron-lib-1.18.0.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-1.18.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -48,5 +48,4 @@ RDEPEND="${CDEPEND}
 	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
 	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/neutron-lib/neutron-lib-1.25.0.ebuild b/dev-python/neutron-lib/neutron-lib-1.25.0.ebuild
index b3ca2a893a40..f6fac8a2e762 100644
--- a/dev-python/neutron-lib/neutron-lib-1.25.0.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-1.25.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -45,6 +45,5 @@ RDEPEND="${CDEPEND}
 	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
 	>=dev-python/os-traits-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild b/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild
index 99f64811e74c..ca6dda873e75 100644
--- a/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -47,6 +47,5 @@ RDEPEND="${CDEPEND}
 	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/weakrefmethod-1.0.2[${PYTHON_USEDEP}]' 'python2_7')
 	>=dev-python/os-traits-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/newt_syrup/Manifest b/dev-python/newt_syrup/Manifest
deleted file mode 100644
index b0597b2073ff..000000000000
--- a/dev-python/newt_syrup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST newt_syrup-0.1.2.tar.gz 14283 BLAKE2B 3169f4caa309f5fcf5eceb288555800835a946cbe7bcbacd772c641c484ed0af1c237f01ec921a7ac440c16a88da516347aa9c9e0a3e9e2949c64f5589cf8765 SHA512 8e9db226f2f31eea5656d5bea0acd287fefb4699816e8328471685952d6f323037665bf3908cabaff4e2d0359996989ce8e03ce8c8933c995f13c1a5f035ef0c
-EBUILD newt_syrup-0.1.2-r2.ebuild 500 BLAKE2B e333d3eafdfbf3e3ed99a47fa7d979c1edf60f83fc74674e156c549756c0e17ba149185bae12889a3f4eae021d1053a1a4d7a6d1371575c409af23498c6cad0e SHA512 1b09ee0aee2090f0f1f3e111cf91576d0670864f5f2594d95abb4a178c6d449a728957234f380a7cc76bf561ae868c656b83ca4b66625a5e4f1c09b0b9b921d2
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/newt_syrup/metadata.xml b/dev-python/newt_syrup/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/newt_syrup/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/newt_syrup/newt_syrup-0.1.2-r2.ebuild b/dev-python/newt_syrup/newt_syrup-0.1.2-r2.ebuild
deleted file mode 100644
index 5ae9d1ba46bf..000000000000
--- a/dev-python/newt_syrup/newt_syrup-0.1.2-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python framework for creating text-based applications"
-HOMEPAGE="https://pagure.io/newt"
-SRC_URI="https://mcpierce.fedorapeople.org/sources/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-libs/newt-0.52.11"
-
-DOCS=( AUTHORS ChangeLog COLORS )
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 9812fab35db1..409ef7df2490 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,5 +1,5 @@
 DIST nltk-3.2.3.tar.gz 1166282 BLAKE2B 803dc1a8ec80a17538c2164d5ee0eca201be2307bbf3e08093a55cee93e9a539d8b48ea42c8ad84b540922355bf0b151ae04338d8505378a89173159d7464b76 SHA512 2e5c0899c29f61166b2e161e62e81fd35e045bda979fbfa662bf9ad1349be4aae6aabe4b9de34905e2abbc05b06a096480829fd66638efa35cd5c866f76c62e8
 DIST nltk-3.2.5.tar.gz 1188856 BLAKE2B 316e5955d2f90c351673ee9d3f0cc159babbcae08104518db62e796b422dcbf51668001b06b5d5dc399613d4db0ed39ff7dd15ad15d6f6c64e10c73a4d53bc06 SHA512 967b209ce3dde5296dafac16b91bff3894ff1a3f073c76974fd9193912597c82d2d1c50d4419052da77ab66f798f230f725b83f31368a95cacf94d46e45055de
-EBUILD nltk-3.2.3.ebuild 826 BLAKE2B b127226c418c6650771f876f30bfdde09c68db7978c615ceda6e5a95b0e6da7cd153562e8895f55ea9a557c2af1e774f5f5a54a3463a2894351cbf2a829e04ba SHA512 eb8e4e61e9dc642db117e10b4321e3e48ca875f4be333e391ddcb80931773976c00d4c83c690629195c14ead49656d2b434a428f634e2886d07a3c31bcab26ed
-EBUILD nltk-3.2.5.ebuild 828 BLAKE2B 0cada42c83ef638235238ee11b0b4f28029d70740ff1e37af9ede95c09351797c66b59de3759c04fb391e28ff9ba43ee59c1eb6cc484f295f2da24f4c3be28b2 SHA512 eec0d43ad419b67c6e7a4b24b9136acefa5c42e33e6edd3c7c4a8b79f22933fa08d178854a25be5f6bf0d3c106b4932d2f5cc03e8eca98eec31e05eb442035b2
+EBUILD nltk-3.2.3.ebuild 816 BLAKE2B a52f29769758d3c96bd8a5c00b0264d945c18f7332c056efe8c0fcef2c6abdeea5f10b6502f5e47516b712f95f51d6f51a3395b3d2863479bc509b27cb26930b SHA512 7b7028ca38290e275a6436c3d1b69f884df1252f55c5d5af0b6f1c241371d2c214c46d08d0680b10fd57b63840dbd683bf32c1c6417b3ab569362b0d0b65d140
+EBUILD nltk-3.2.5.ebuild 818 BLAKE2B 747a9cd7006e4c68c20a85653dcc3a122f57abaa7032c544a6995cb859a94b6948c5759cd28f47453df3d60e692ac2515fec46b66326047212944e41daefd603 SHA512 2dec92ee147901346b874a8191905f3e20a9451cc11c42003add86c61f41986e2a29f8f84c05b5d743e4c42dc29f78fe8c2113ecd4238508808f331066da525b
 MISC metadata.xml 455 BLAKE2B f7f64dd6f4755438db233c712dbde5cc3aae6f2cd154c207bbef0196569b458a8d26c35b92601e8e79af4cfee7f4f57029d9a892677c477a86bbd8c78fa1da16 SHA512 315f7c1822be51c6fc541323f0b977dc0bb60e129a6bd907cd47ac1247c88e906b3452f2ded4d2071c142fd1d710c674039c95036124177744ad68ecc5ca4bd8
diff --git a/dev-python/nltk/nltk-3.2.3.ebuild b/dev-python/nltk/nltk-3.2.3.ebuild
index 0f43571d84cf..d683c2517e5d 100644
--- a/dev-python/nltk/nltk-3.2.3.ebuild
+++ b/dev-python/nltk/nltk-3.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite,tk?,xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/nltk/nltk-3.2.5.ebuild b/dev-python/nltk/nltk-3.2.5.ebuild
index 748ae3d79184..8c916caec98b 100644
--- a/dev-python/nltk/nltk-3.2.5.ebuild
+++ b/dev-python/nltk/nltk-3.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite,tk?,xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/nnpy/Manifest b/dev-python/nnpy/Manifest
index c0d9d6f2d0db..e1d5bb9e7764 100644
--- a/dev-python/nnpy/Manifest
+++ b/dev-python/nnpy/Manifest
@@ -1,6 +1,6 @@
 AUX py3.patch 699 BLAKE2B f445fb6ee3756f29aed8591583938fdd64eb192c0942e5d5373fd40e725c0316406bcf9187ca128057e11dda1da2594e7b252afd1cfabf6fc8d3429576269da3 SHA512 45072f0fdb3e95b4e7301ccaa9168dbfd11dd0dda651eb6f9dff0352010ec6619e9af3de38d03fe89c93c5794883c4f9d6dcf6bda3a21db64449f0d15b65c336
 DIST nnpy-1.4.1.tar.gz 4826 BLAKE2B 28e976fdde6580e5f0e828f4e68858ca74459899092b448f0f54f89d88cb1dc7e9df9583de76d2e9ee824909c834404cfca92d0a477bfa58573c57e9ddac0cda SHA512 26e1393fdca77cc9385eff0622f9a5b4987eeca533c57478ba873a1ea96f312a2d535fd3eaa883c47746157a9d692b4b0f6c52d51ea5b4fea5fb885cfdadc2a2
 DIST nnpy-1.4.2.tar.gz 4830 BLAKE2B 7e1e3d3ade400e96e43504e490f22e5595850d54e80d4591fa0a519a47a492aaf569d9937c4ee05fc9504c4beb5cb2ef8496a65874e64b6162087eade6762906 SHA512 b0908e3b53ac62d8a41ecadd412b2c4bff69773d5eeecc2eb72cad2667c3a14405dc1dfa6f2cdf4f81cf76b9eadbcdca5bdfa1499a2f0c3beddbacbd3e21b7d7
-EBUILD nnpy-1.4.1.ebuild 621 BLAKE2B 5c0c59dc8ad8b3a9acc681039d8a23823b875d16330c4b4557e16c67f87bc1ae71a79aec04e3ceea06964ec68f42b7248cfe1b09f0b72763f3c93934a7a256d0 SHA512 07c8164a51efcd816504a4ee5eba0bea6c75340c0d3e8283040b364bdd4a29f891a074003dadbc6d394fa97767448ce69e73b5049ed9e4f2f41ab66d5cf0d80f
-EBUILD nnpy-1.4.2.ebuild 584 BLAKE2B 31d83c1c4e769eeee749b1f7f64710877223db813eef652bebad71d2516f0752c1d8cd031925ca002fc488d0fce6cbb089fc7f79d02aa26fe6e48db1ff95eb1c SHA512 426c9b8245e4a47195ee17eda6f8fc65f14d11a1338961d4e33563e527cc9699f39b78b3864f4708c518f3bfe2cb84b9af5059a1ed9c08126dbadea15ea8e76f
+EBUILD nnpy-1.4.1.ebuild 611 BLAKE2B 62c0213fce3c3b89633af00ae3e9b22c90e67b33dcf024faed63e6aeb455d34834d0ea43e76cc6e5c7611fb9a2d5856d76314dbc1ad7ab163b2234badd15c63d SHA512 50a89a4fbe2b057dcb268a9e79b69c410763f24aad98a89ce22f920d14e050eaae196d8edaad127b44eb87a66601d851188c4de46de4e2043e920ff27ea809d0
+EBUILD nnpy-1.4.2.ebuild 574 BLAKE2B cbdfa20a0150931fa2a0fdf9cc39a1b0e258fb2d6351329207186fb896d568d2231044df49c0dc5fd2a581b0a353f0c493e5d36775a0eb2356cfe7060ee714f0 SHA512 ee7dcdb91b22ae6fc9a4f6a0ae55673e9ab5da8a238e1cd21a89384c768d0ca4e4d9e4c793f1d507bb489d7de18be60d1f2f836b9b9f96ec6afcf0effec4204a
 MISC metadata.xml 432 BLAKE2B 3fa5f82774cdc03df8a39db591bc688e25401a58c302aad0230074916a7e0c97e838552f50569f0f5278d570bf8ae810d242893bf704bb10273890d1def55e5d SHA512 4831a2c1564e14be4136a2e6431a0bc5d8964fd644f13e63633090b8d962fca501bde23407cfb69672db93fcc27c14c19fbfb19fb9e2a5de8e460f014551070b
diff --git a/dev-python/nnpy/nnpy-1.4.1.ebuild b/dev-python/nnpy/nnpy-1.4.1.ebuild
index 97a372d17e32..b359e5c9c2f6 100644
--- a/dev-python/nnpy/nnpy-1.4.1.ebuild
+++ b/dev-python/nnpy/nnpy-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nnpy/nnpy-1.4.2.ebuild b/dev-python/nnpy/nnpy-1.4.2.ebuild
index ce39af56b9fb..5f229a8e0b40 100644
--- a/dev-python/nnpy/nnpy-1.4.2.ebuild
+++ b/dev-python/nnpy/nnpy-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/node-semver/Manifest b/dev-python/node-semver/Manifest
index 669be27b198c..7cac1177b305 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1,7 +1,7 @@
 DIST node-semver-0.2.0.tar.gz 10236 BLAKE2B f4f48761a0086b8a2e79307427b4dc93954362452f653042582024cee593b4b7fefb1a14d3d4ea6832255209b054c9bdb05b02cb101af1e359a1266c472c5149 SHA512 7c636d94a262723c5e50123433c9c7af38424c46711c1b8e001931b242fc9703a084a0426b75e6884104a4adc6104a298355bf3c1604b9cae0ddab7d5f11b430
 DIST node-semver-0.6.1.tar.gz 17952 BLAKE2B f7d48f7d0373acdad56ef6745f09653163f3bcfbed26820ff77205d7bb479b0c9debfd79f719d3eb973d3cec06b0bac3773f06351712c274f90a2dcf5c658694 SHA512 d1f406d6e82f02c3e0eb0f4e1506279b00e7f31875f45bfbd7f87e6777b46676003bb7b39241bdeae616c6506dd85c60e61217460c55dd5079ea87cd818cd6bc
 DIST node-semver-0.7.0.tar.gz 18090 BLAKE2B 669da955b62c35be1a0fccbdce8c66c9de915c5498052858f9f0ebe6a07109947314c904b2077b4306b8fea9f1d0747ab7dcb63a803b00555320e44ea0a59081 SHA512 9e11af16ce7a9a7f2aacd77ff14c8aa574e62bc27f902860b97fda5cc8ee19f54118e90ca39241741da657b87ec2653239b0c4255570ffe4d1ad49e2c9484e74
-EBUILD node-semver-0.2.0.ebuild 777 BLAKE2B 626375fb5750b86cfe36bc30cb3ce5cc8725ff71d16611b0c49a2347e3d2501fe47a50369c18bb8b265137101d29de41a6dd272c01ca9d9c7f9c023ddbe3c778 SHA512 cf129f4a35bd2d51740ac478ee1c50021d7605b3f64342228041621f6b2c2b3e2dda156fe68aa5f327c7ff689b091ead255646b23928b4bce3639399a5df9065
-EBUILD node-semver-0.6.1.ebuild 1106 BLAKE2B 87b23afe59f9511dc763e26e30f4f31a6ae6c276a8aeca3696fdbf7f45f8ca626e68044387b22e1f976c7f317a741f42907652e89add898fbb8a2e92d64daa91 SHA512 ace36956c9d19f262b0861fb5fda495de0dcd7129f58158d1777ad19e883e802674a325b1964cd0c3ceb85f9edc9893666d09cf0f2644da9b03aab4c15496235
-EBUILD node-semver-0.7.0.ebuild 1106 BLAKE2B 87b23afe59f9511dc763e26e30f4f31a6ae6c276a8aeca3696fdbf7f45f8ca626e68044387b22e1f976c7f317a741f42907652e89add898fbb8a2e92d64daa91 SHA512 ace36956c9d19f262b0861fb5fda495de0dcd7129f58158d1777ad19e883e802674a325b1964cd0c3ceb85f9edc9893666d09cf0f2644da9b03aab4c15496235
+EBUILD node-semver-0.2.0.ebuild 768 BLAKE2B 648ae6393a622ac00c2adee49ab067687421793a55d239909487f886a53bbb713cd5c85394842b402a324654f52f0b6c181af4134d40dcf53bac829a92a8e059 SHA512 74813bc1eb489c3ddc256e9d747dc97888af565188720612f94ef600df0dde535feaf9e9e0f621c05e20294350e1cfc6ac326bf0989ba7414af5a07761c57c97
+EBUILD node-semver-0.6.1.ebuild 1101 BLAKE2B a405a2ef3db9b02d8eb9a088a3a76a7ed8495408ba33e9f9c41b95e2bcb1899d0b5b42437b9cc2c917b012bc14025cc3424f2af5a3a535949793ce660a970fb4 SHA512 237042b16c15f43cd71d069e647ec041d11aedf6735b5d7d8c977b02a41a7c1a326fa1c69b72367bab41e4669d81d1ced0a97a7121bd9ceed0172cac32f5e0e8
+EBUILD node-semver-0.7.0.ebuild 1101 BLAKE2B a405a2ef3db9b02d8eb9a088a3a76a7ed8495408ba33e9f9c41b95e2bcb1899d0b5b42437b9cc2c917b012bc14025cc3424f2af5a3a535949793ce660a970fb4 SHA512 237042b16c15f43cd71d069e647ec041d11aedf6735b5d7d8c977b02a41a7c1a326fa1c69b72367bab41e4669d81d1ced0a97a7121bd9ceed0172cac32f5e0e8
 MISC metadata.xml 786 BLAKE2B f7fc468fd3228c485674f4816c1cab1f5220024f39108ca033e4581233d0534376dcc907629774716b5cdc16e7d243e884fe6d17a57d362342e5edd32a4a8f81 SHA512 51b36d6a15b21c6490ba5f19494b23b94bcbe4a5aaf28e6bb6034596b850872bece0a066f3ea6f11f610759492e1060b3d932736254ff0af7a895a9261d74799
diff --git a/dev-python/node-semver/node-semver-0.2.0.ebuild b/dev-python/node-semver/node-semver-0.2.0.ebuild
index 54ca2c768444..9e3e5f76a05e 100644
--- a/dev-python/node-semver/node-semver-0.2.0.ebuild
+++ b/dev-python/node-semver/node-semver-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/node-semver/node-semver-0.6.1.ebuild b/dev-python/node-semver/node-semver-0.6.1.ebuild
index 6acefd6d4563..50008cf7e635 100644
--- a/dev-python/node-semver/node-semver-0.6.1.ebuild
+++ b/dev-python/node-semver/node-semver-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/node-semver/node-semver-0.7.0.ebuild b/dev-python/node-semver/node-semver-0.7.0.ebuild
index 6acefd6d4563..50008cf7e635 100644
--- a/dev-python/node-semver/node-semver-0.7.0.ebuild
+++ b/dev-python/node-semver/node-semver-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index edc1e5453625..ab6cf1e2225c 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,3 +1,3 @@
 DIST nodeenv-1.1.3.tar.gz 32368 BLAKE2B 4b3b9213c115a55c0b084505b05f1d646e7519175ba42845af6b2a0933cb75574b54257a524c561e1b90614848bd6d68e0dbaf382692529476a69d1bf7cc7aa5 SHA512 54829345bda2130c3728f33e04ee68c36cab281c9f6f68ae257bfd5019c51fe5b80bb95e931ebdd7403aad4db4a41062bc59251786811a1563c18b2745f4e7db
-EBUILD nodeenv-1.1.3-r1.ebuild 446 BLAKE2B c10abbbd94c2ee417e1a6a5e9b49ece07f546e937bdc6f2d21b16e4560e13a28665598a8141c3f9a8ce782e61f7fa86a4969f155d02d06e2012b56f01142a39b SHA512 2341381f0d991c17ee1ef00d24d5855697aa786f1da172cb42a2383ea502c6f462c07faf421e4cefff3a95e24bdccbce232a098e686776cf4f81b27200af8663
+EBUILD nodeenv-1.1.3-r1.ebuild 431 BLAKE2B 30e4a4fcec2a17fbc9a806b1be67bb3e83e0a7747060d949de994c01414061fb8192a78080cdebf164ba4bfedfa089064af806252e0823e2442eac2490e732be SHA512 1bbfcc236a76a07c9f9efa32b738ca0554194b436d0472d3aae30604b4bfc96b2d6f5cbb3f6c31da76defc377b6edbe3681d9e9fa32552d7579cd2bdf5b7fd2c
 MISC metadata.xml 362 BLAKE2B 5e3b70f0d8049ba6ece30933fcb91db7f533fa647091c6f8cc240b4f074043a0da1b3d1078d10ef41c05311c6ea991ca52b978dafbb8f3591348871f168ddc33 SHA512 16874c2d41c9d85485115c5128ebf55439ed1b163f1e919d847177971718e7a113afa36216c35a8d19f6d92f474001084013bf75797fe82f6d25a369d42e8fd5
diff --git a/dev-python/nodeenv/nodeenv-1.1.3-r1.ebuild b/dev-python/nodeenv/nodeenv-1.1.3-r1.ebuild
index c60f938d8ed4..906d095b2737 100644
--- a/dev-python/nodeenv/nodeenv-1.1.3-r1.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-cover3/Manifest b/dev-python/nose-cover3/Manifest
index edb27e7a8a7a..7283908eae58 100644
--- a/dev-python/nose-cover3/Manifest
+++ b/dev-python/nose-cover3/Manifest
@@ -1,3 +1,3 @@
 DIST nose-cover3-0.1.0.tar.gz 14494 BLAKE2B f122523a7864d440e096f295281a0a3d6c8d979a338240751e309c83d67508c7199f2ce377704e864a01c3128b0999bd1e40080bf9b77858216e1f4512c09b67 SHA512 208dbef5bb46a403cb51a9490e68e2f06c6fb08c016a9e866959f5fef1d091ed5c3e502b4a579566f37016a0b665ff969a14b160c78e0c392452198134c20ef5
-EBUILD nose-cover3-0.1.0-r1.ebuild 539 BLAKE2B 6902acf9a2f4cba878737993a3760d56dfe78f5c41f7954864a6d8d3078a6f4876009b14c8934a010b555fbcf5677be3b61a2c448005df9fbde25999abafbb54 SHA512 1a5bb9360ed3366a44a7de784b691bfd957b65e42b27aea3bbc039f03c4158ffa4f7eae0663e24ce61465a176048fc8d36508e1a34773f347c6a7f0cba540869
+EBUILD nose-cover3-0.1.0-r1.ebuild 532 BLAKE2B d7550c5c0193744ca8ada07f3691fdd607080fa5645199bcf0478d65f211328627a82fbe58d97bde0c4c7d6bea3f47317da1a9c2ca4e2a120bea9a51feaff72a SHA512 32950335992150da30256eba3084225721d74a1d868e9049c21955b3473b18bc84f0ab3e218f04dd2692ac1473b610ec82f1f036d1831f8a5b89a96fdebf148f
 MISC metadata.xml 380 BLAKE2B 1632b64e711e43097c787f4815a210312bcb4c8442c66c85bbe20d4c96ee5b9544ab02022651edbcccd0c7fdad48086dfec3b59b116c5ed4b3f3e349d146215b SHA512 ab22ce51cf402314719b4d03710dcdebaba1cdcdc2eca7922937595728d1c003def562285840e7579385e4b35e9ef44b55fc76a0628959d225e91938888cd464
diff --git a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
index b2f1d4d29685..212da362037b 100644
--- a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
+++ b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-descriptionfixer/Manifest b/dev-python/nose-descriptionfixer/Manifest
index 9a7a3af22598..4c2e3212e00f 100644
--- a/dev-python/nose-descriptionfixer/Manifest
+++ b/dev-python/nose-descriptionfixer/Manifest
@@ -1,3 +1,3 @@
 DIST nose-descriptionfixer-0.0.4.tar.gz 2889 BLAKE2B 36ac9c0b3c5d12a713c609177dcdc8a46878ef367140417189a4cd1c88d58bb535838bbf181d469bdfc07a51cec9144cdcfdb9c1df749148228ad58ae688202f SHA512 c52e463282c1574ee35e96f680aeaebb6ec1b8ba1bfe58e387cf41d8708c60a7cb7501717de03a90f47db9c4b3aa3e5a4a57e4769d053fd4883e565369d8fce7
-EBUILD nose-descriptionfixer-0.0.4.ebuild 511 BLAKE2B 466c43065f2473c54bcf568f1725cca0028e1b72ff241f433e972d8c0a692af63e2c6e9d290d3f230b7442a1c029416996e2717c9d972b92fdcf4f51975f43df SHA512 29580345ba76c93560b2b7f3dac4f3719c9a71cf0e05f5d480dcb28c1eeb9f7322243326c00b1a8f4dc09de1498040740e1eca9469ff40f803508ac5ee893956
+EBUILD nose-descriptionfixer-0.0.4.ebuild 493 BLAKE2B 012b484091441353bdddb4aa763f9431d3faacc743a74716da5a70a61a75bc421d5c02a74ba6ebb9ab8dca48eb7f823537b43c5dbd1dfe66f5d2a9b38afc03c1 SHA512 cd117081ac41561ffeaf16db021e2733ba4610ce32751ea013aa3f6f2a465845b9075c407e1ae159c174b0917b6c235479ae94a82a4f7552da87b7464c8bb0c1
 MISC metadata.xml 345 BLAKE2B 29b06d919f4b25ba5f3a582d991a4c33baafbb1cbe9668b9ac2bb0933e1a1467e879b4e71ee080b955465a1bf0095f238f70c6b68b04ff9a5545f6547434f665 SHA512 9df2f1d74b7674acca3e4cbe6b48cb5b00c5a8405f81d3299e5f204fa00f03960fb1ebcf089792c619802c14ea3b9aea1fe33de817e4f791d8a035739309ee07
diff --git a/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild b/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
index adca258bd0a5..6c586375e63a 100644
--- a/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
+++ b/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3)
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-exclude/Manifest b/dev-python/nose-exclude/Manifest
index 12fca1e449e1..2c5c9b0cb4e4 100644
--- a/dev-python/nose-exclude/Manifest
+++ b/dev-python/nose-exclude/Manifest
@@ -1,5 +1,5 @@
 DIST nose-exclude-0.4.1.tar.gz 5930 BLAKE2B f0aec0bd0a31f1b778b0dd22efd12706cbcf609e6236418f10b863809f32886743020d7d9a5f26c890f575adf117f5af19fe2fa49eed12c9295f401be0c02f30 SHA512 07dd869f948fb6e6f23dbecc316d08f23701f30ace3755e560f94deeb62cb2b5e1f5690477260d8d3a7f634e3e9959142a340f4fe0886e2ad12852444244ca3f
 DIST nose-exclude-0.5.0.tar.gz 7359 BLAKE2B b47087f0af6a41f8a432c2e46b4a8ab3229dc682e11625d99b7d1aaa05d2cb0283acc95d9ce5eef3a071190c47dbcbd3e9d5e3ac7785e48d809a7962c27e4866 SHA512 2795f2f42430f8622fdeb46accf4a75853f8202ce1849852ec4b1a6e26aeb20accb8c2ec4faf3dad0ea174570fccd67d51140587ee9f47c905eed5d8a2963356
-EBUILD nose-exclude-0.4.1.ebuild 580 BLAKE2B 5b04177439f31d0c03ff5e52f557e72978b2a7a4b7a7bdc93bff9b579484b8b76495740a9674963c4eb32b2f6d74b428e8650ff13ff0039e68837aaee7235537 SHA512 590995e277a1b7d259fe3afe7aa715162bae41ec9c380b6972bb94b820933d2ea9275fd207491f52fb271855a654dbd0b8a5b8b6859d5d0d1c174b5e813044ec
-EBUILD nose-exclude-0.5.0.ebuild 593 BLAKE2B afed3e0b0ef625cb6a3b5f69f36aca8fe1fbe82d251c6a9729bf423b0a1a9a3be12ab1830fd31bf4723c52814a502c99f9e73aa6e3d590db82e416578b0034df SHA512 c99f2907d1668eb9058574a2026ced6c843f03bde4fb58760c36dab42645ef606706229bdb22cf7a6aa5be1354ae0e831723af0d2b5121032cac428879823277
+EBUILD nose-exclude-0.4.1.ebuild 573 BLAKE2B 4ecb6ddb14da08ce9ecaaf6036507fe28118a54cc56b03d9a2e17be31975fced41b8eb877997c9976ea636b76a2187729f85b413f090f5586e2a9ca9b0f05996 SHA512 06c9fc9ddbc39a18998bb505b3267bbeadd5a1138ce21b4b04bfbbf18546e2dc968555113d34fd1896f186cf043e4fcea281c0de427aee4aed85b3a793aeabf3
+EBUILD nose-exclude-0.5.0.ebuild 588 BLAKE2B e4aec82af2f4e4772a07be7c07da2701ecc95c8ef488b9e3b2d268a2f80a439e27103419c57fd70e3dc8649876ca72b7fcde01fea803bd632befc00cb7a400e6 SHA512 7cea1112f51421edcf67daae9743c374043eb6b742a8f81de9b6a8bae6d27652e4d8766248a2a9a1988b6b1868332b06bb82cca1a15aabcadd92b6c209b646e1
 MISC metadata.xml 680 BLAKE2B ca3883ad1541d7820da0f260ad4b42fde6af5f17c5b2e830eefe40ff16e03db89a63bb3d450acb51fff3ab5d59cf06eb125cfba96317163c5723c760bbca61df SHA512 77c4bd6bf1d654c9b7a5f22235a56a4861b5cd784dba4459916580e623ef5017c52a79af949bc9fcdcf9ac66f8f84d8646a61393f5c45c5d732693486fac5ca7
diff --git a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
index 265894a9e035..8d66bc233e26 100644
--- a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild b/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild
index 45a8c09a118f..c4906b4adbda 100644
--- a/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-parameterized/Manifest b/dev-python/nose-parameterized/Manifest
index e60eceb9fce7..280b4d7bd114 100644
--- a/dev-python/nose-parameterized/Manifest
+++ b/dev-python/nose-parameterized/Manifest
@@ -1,3 +1,3 @@
 DIST nose-parameterized-0.5.0.tar.gz 10363 BLAKE2B c149af7a4c909ab34ef6da01355b6fe69e5d965aa5b03d323f3207974c888ed5adb8379b3ce043e31baa5bf269e682b966b3a6d46e39a39be777e7bb1ead20dc SHA512 812e3e0a44f1db323f9c134b7438ea5e2c63232b04dc4d8aa59d153253183471784fd4960ffb18f23e14c398e4633515ff933bdfbfdb6954c44af97235d3cf91
-EBUILD nose-parameterized-0.5.0.ebuild 556 BLAKE2B e8dcff7771b21eb5780a1f14adf4d3ffb4f11683d5999583ab1814749eb6b7a3177d42a9450c2b904250bfa6aedd1d2f05719377f9516225d4c73c04c4a2431c SHA512 1478ee7fa9ecb733d3979be8986eb4cda0f845ecf28697de1dd498432e48a1b74c049684120654cbc336891339cee9289340dbab4ba8016a6b503c0ae4891cb5
+EBUILD nose-parameterized-0.5.0.ebuild 554 BLAKE2B 775214af45cfe6b814a4fec9bcc1ec20e3de9f2580d3aac4d0b8441e93311736b6bc9e0cc3a6c6f18b6167993b367a124400cb851d1323337b4c8f8537e1081b SHA512 b308f6608ff43a116abbc3701ff4f71728992f24fc88220f283d5d8fe2adddb6ccba5d661eba42cc43088a47b13c5f54ce7f764af2da3db4a0f81ae53da4379b
 MISC metadata.xml 557 BLAKE2B 4d3521c481995f51817adc64c6ec24360ca387dad6ae23b068ce5bf5b9d23ffaa3ffe86ae41a48d551e2fb99a31b4f94131c7505e45f3b9d9d75c4d694db8a3f SHA512 8b5b5040fc5c105f62c02616b5493f3ca7a1fccfb769f1a94dbf24fcbaac62b908005d119b49d115400c9d4b6a0c5e6a5cca2cd368281d8e1678d26750fe2f86
diff --git a/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild b/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
index b65f1a79c2f7..8c94bd96c1d4 100644
--- a/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
+++ b/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-show-skipped/Manifest b/dev-python/nose-show-skipped/Manifest
index c77673a5be59..618a3ca4343b 100644
--- a/dev-python/nose-show-skipped/Manifest
+++ b/dev-python/nose-show-skipped/Manifest
@@ -1,3 +1,3 @@
 DIST nose-show-skipped-0.1.tar.gz 1768 BLAKE2B d79272ac7fd065fe28b589b3234abf527911326d1fea1c23ba0840650d2741846b188788fa9cbeec4a56a78737ccaf8c781ff1f9ac97a5b1d1d79161ba3ab0dc SHA512 b6f3cbc8fdc6af7f6298ad54a5b06bd053d27197368eef1e006aff438d517dba549154eb3be35996b0bd1c291537729438f52709b76c507e20c496b6e504f5df
-EBUILD nose-show-skipped-0.1.ebuild 627 BLAKE2B aa83d1a45289ce0cc5ffecfee42e9e135c57cac37ea268a77e526b60189ae4932a22d724e8f77d1325ceb177053fbad9023331d644c1aeaef900353d343fa206 SHA512 674f83d6364b902de967b74ef8072cb20183f1c5eef5d371f0b7c164f160ea92a588bdb753a0228b98519aea63b862fef628aa38bac07d7d67d1a587ef4fa5bf
+EBUILD nose-show-skipped-0.1.ebuild 620 BLAKE2B 4fb5a8d3d9a0d16664e11f7522655c84b4f951e9a7d4bde2f9e3ec018cc9022efc8d4e61994f90b1b93a74c7aa2760c47d2f862782e3caff09c1ac4b833f44c1 SHA512 db7b2dc4398417ae69972c4c0226d134abeabf247c2f2b04361e76e5745e97a3bac461c79115a7148fda61b392f1d4ac160bb818b15c80abfc14d6200a085baa
 MISC metadata.xml 521 BLAKE2B fe86fa52febb5f3de9c44e66437ce7c0f05d88dceb9708cf7f316d6e4002dbdc53496d2bf0f568fbc67a92f01a0f439b4e9f0b561cd49cf16e0591034b3bdecd SHA512 de78277716b856994885a2eb0d7906f3643e1b76ad263385063770581c8c11cdea081cdcd1724182ddef0c799438f5bf94b7de885b4a3f314df6efc935aae2a4
diff --git a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
index 6fd97ca16250..443fa1ba47d9 100644
--- a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
+++ b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-testconfig/Manifest b/dev-python/nose-testconfig/Manifest
index fec61b0ce6dd..a57899fb3c41 100644
--- a/dev-python/nose-testconfig/Manifest
+++ b/dev-python/nose-testconfig/Manifest
@@ -1,5 +1,3 @@
 DIST nose-testconfig-0.10.tar.gz 9390 BLAKE2B adcf160592fc27625580f11f68be999476664cbd371197d60d8e19bd1ade755f0c7cc9ecad17d6ae3e58891b999a4f488bef33f896892f9bb6b2a1ce5bda17b7 SHA512 6bf05e0b82e0b47919da6e7f421c0c06737f9cc6d78eda49ca3d8b206d47313525a57af6c04760cdefc4e7d3288a2c10eaba9666d30a4f8135ed9856d219d7ca
-DIST nose-testconfig-0.9.tar.gz 7614 BLAKE2B 445bc4022d3d346303bb1fa94fc3fe6daa527638c4ea4465ba696f87242264a5008c2e51c813a4a07610017c48759140f0e74666b4b1037ffde5b31dad7e4f80 SHA512 411630f9af56955e5bd87efaf2db0817442f78dc61ea64a29ac186f0a71d23d81220f68bab18ceb7d3bf201bc441b522bf9acff21b541905a5a4397280444a07
-EBUILD nose-testconfig-0.10.ebuild 618 BLAKE2B 27dc7a62ba25fe59ff84252b16317162a24925ad7210d065f7757a87957a556cfbfa1f143a1134897299a15f255cce563969f364f8ce82ca178ce351dbb8b163 SHA512 e74525d95031e10ec433f170dd7ae368e947754f5a6f87690e9f37b31eb58bea41c3a8c31184707430cdc5dec3490081a0e7a5351f6cbf6eb7d2417b41a5761d
-EBUILD nose-testconfig-0.9.ebuild 608 BLAKE2B 1f2539f4fc5f51a4a311e98c90add0ef91dbead52bed17583d21f1431a92b61cdb6eaa6a21b60e84c3e5a4113ec6dfa1d4d757a9b1e6f106f8954755de5eb75b SHA512 9ff50f2c8aed2ec4e9a923ca6d8e00985d7ff05e8de571cf510fa4b99388e7a00154607d5b1d3a0ef298b28b6abc9c9583658cda55bf8828a6072e1c6e17ef62
+EBUILD nose-testconfig-0.10.ebuild 603 BLAKE2B 2f693e441ad495e1e7424ec1ee008ed31317191d31bc918f618e764024766453020bf6e3c2ec1620afe1da4da0c341e7f55fdeaa7bf4a34ffa8b1a13ca7af87c SHA512 e5c86eab490261c41bd4bc40a9df0a8c0c31bcd31688d439163d1b41118101aa3fbedd7d7ce838263b2ef4e45f7f2ab0356c4a3b9a6141ff0a73910f208308a8
 MISC metadata.xml 402 BLAKE2B d3dc3d3a81c76830a354209be031c9571b30c64e364858f65d253dfab8dafbef90c726307b5b0f8c959417d870439bb267df2962f91941e06e8d6a26a9d02c98 SHA512 dcfbf6218188c35480b7424f5e661f54b28bead28a220402702890e4890063b1510c622a7d73a241b289c27bc75563bd25685affeb618b95f538623fc6559624
diff --git a/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild b/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild
index ae6d6a1a9785..e407d8216df4 100644
--- a/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild
+++ b/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy  )
+PYTHON_COMPAT=( python3_6  )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-testconfig/nose-testconfig-0.9.ebuild b/dev-python/nose-testconfig/nose-testconfig-0.9.ebuild
deleted file mode 100644
index e518773ccbc9..000000000000
--- a/dev-python/nose-testconfig/nose-testconfig-0.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy  )
-
-inherit distutils-r1
-
-DESCRIPTION="Test Configuration plugin for nosetests"
-HOMEPAGE="https://bitbucket.org/jnoller/nose-testconfig"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="dev-python/nose"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DOCS=( docs/index.txt )
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 6d16ea59c6a1..c6d91412d2fb 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,7 +2,7 @@ AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb2530
 AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd619b1bc01da05a1a81e95d3d9dfa097b131727229a05228315252a67c57ab15aaf2dc90df59c7ff3c726ae62f4a5ef86776bb87 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
-EBUILD nose-1.3.7-r1.ebuild 2467 BLAKE2B 307d6f07969c4c8cca3801fbfe41e951d21bb4ab116a61f5a827268926d3e71937c8c91984bd31d3c1c33e185c9ed11b311e6fa90c75905fd0192df79ade6aee SHA512 d5856fc5e678e1bfbb5d1c7ccc1e60ce6be8956399264679fa39494215479e5d5498641746d1b8c171a5d1ad3d7b785695bcc20b25c25a3b90d36627f991e9d7
-EBUILD nose-1.3.7-r3.ebuild 2770 BLAKE2B d4815e041836a554970c90d31e4780649c32c369fad7d1e2ab0ed4eb3e275ca19e2b278e1074300dbba99cdb23b28bec2378e6630e383651528bde2dd087c44a SHA512 a3e7199ec2ea81f4d00bc336d0ad7e7890da3128d2200d7590651555f1a555b20362ed0b7dcd43497f23190a34354d0e50f329703bec48c640f4376ebcf6e191
-EBUILD nose-1.3.7-r4.ebuild 2996 BLAKE2B 551a6253133fa2c08ffea29b73287462fd6a8d58eda516fcaa3c192b5423034ff791528b821c26eb7687e9599df131fc1501d827a8be95457beb8013796846f1 SHA512 965cd7b81597c987dd676ca92ee9504a16c52d0a3892c447fd188dd853d6351054bc10866cc518bd3dbbde7c31e62c063f3dfa4ef12edc63a1a9f6990bc0a4e4
+EBUILD nose-1.3.7-r1.ebuild 2458 BLAKE2B 38342b0b09f560ea1bacde303515c545b98ecc0bf825d9d1b038267ea3f7e53869add6380a4260eb1ddb19cc0e3ba336a6622620d52d49df81922186b735f7e4 SHA512 06848700629f37ec30b7b5013d074cd12073930011de2edbbd7c89a701765a3df4b1212af2ffda334cd30c9dc94636f153d6cffffbe77390880fb930ceb5649a
+EBUILD nose-1.3.7-r3.ebuild 2763 BLAKE2B 281ce6e5aeb2d27a91c65d36df890aac70892a247829c094e52b7037b4e3eb06cb51215a25b7f3d776229a090cfe396971ae2d435e00875cc37eabee69822259 SHA512 182c287271f30d4803255e09ce126962d52994eb3aeaec42cba73d3920461a70b6ee61a11d9e049caa6c10f9e5aea18b7373580526dd3729e63d9c2ec9269ec0
+EBUILD nose-1.3.7-r4.ebuild 2981 BLAKE2B 389e3dda09e4f3bbf0e74750ba90f255355a4ef04abff50d893b678450534b69a2ae1e0c776338b63201c37514f221f987947c464a23739f8163339c4643abb0 SHA512 aab57e3eec5b480b49880811cde228b109ec665f0f137b193187d1214c4a2a205e92f2ab6a3c748844ea1a3567bf89cce8460997b383b77c50c57912ff33c05c
 MISC metadata.xml 499 BLAKE2B 9d6ffb5484f11c5f4c46e0013d4e93d01afef48339e83f4e4fb7d86776267256b30da1aba61c2609e5163abd012a57bc820ab77ad79577e748b56f7e8c327cee SHA512 c037d0a22b7bc9f61c10d8223932f2ebdaab4d9ac538dff56ab7e6fa263734992e8834cf739b7d787cd1243af5a9ccfccb81c2c0e4d2e8889498a707c96bd44e
diff --git a/dev-python/nose/nose-1.3.7-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
index d58786445780..ff808e17ad4a 100644
--- a/dev-python/nose/nose-1.3.7-r1.ebuild
+++ b/dev-python/nose/nose-1.3.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index 69746257a397..2d073ba12305 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/nose/nose-1.3.7-r4.ebuild b/dev-python/nose/nose-1.3.7-r4.ebuild
index 333bd6d07d11..8ed147691b2a 100644
--- a/dev-python/nose/nose-1.3.7-r4.ebuild
+++ b/dev-python/nose/nose-1.3.7-r4.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -27,7 +28,6 @@ REQUIRED_USE="
 	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	coverage? (
 		$(python_gen_cond_dep 'dev-python/coverage[${PYTHON_USEDEP}]' \
 			"${COVERAGE_IMPLS[@]}")
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index 4a8fde67fc21..185d483aac7f 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,3 +1,3 @@
 DIST nose2-0.9.1.tar.gz 152411 BLAKE2B 39f2d992e5cab4b9e5cd4401ea9285884eeeac7d2e126b5aad5582186efa0f325139480a446950019e91a376b5992fea106064e5170c9ea7961f128b895a335c SHA512 48cfe3956a3cb696e344ea03e5e0ac8d52831b8272b7cad2bdee34681d1e4e7968fe9da9b71cc9db40b6edf289509c2af766e73611f3a6f23ebd5062f4d52c9e
-EBUILD nose2-0.9.1-r1.ebuild 871 BLAKE2B db66e36b866f96b2f0e76333f2b729f4ab4acd029b7c3162a9ddbc47474c2df5cfef78bd4fc1cfe529841fdc025544d5fe3baefe6ce56e5523f3d5d77e13459f SHA512 049545838bfc3372dce9cc0d494bbaa6fcc70d583d386c58726d2aee81ef7cda70ad09a404085d9cbc032c689f3d84a14071b7695f5a363f468116990746b345
+EBUILD nose2-0.9.1-r1.ebuild 869 BLAKE2B 5f63c8827e7e60adff75f12143284fe71f8a7377f5be24fcb6726630396f2a234a4fe848aa8d79edce794c03448600efd950cba54e982991de350f487b87fb54 SHA512 8fc0a02c36123e9b0df6d88334148fb5d22a866d69967ea11b7d8c037481c03df89bd00a70f6c052784dc4e82233d9c5500c24ad2b321f1e90aa6566fca1d7ff
 MISC metadata.xml 245 BLAKE2B 3add0b4d7a53d7fe522e4b78a567cf1a8b1fe89d9abfd8fd5ccbc70104ccf52b15c4081cea951454752df03f43de328c975f280a42f8b248e83fc37a89716fdb SHA512 1ecded9f7a627a77dd609108d3bb95d70fea72e3fcc70436a6f0e54abe609bf9553644a8aaf2333e1aa0b14095768dc8f5d35b510173ccb194f4f8ac4243e33e
diff --git a/dev-python/nose2/nose2-0.9.1-r1.ebuild b/dev-python/nose2/nose2-0.9.1-r1.ebuild
index 2c81a2d5f80f..b5cf18f51b75 100644
--- a/dev-python/nose2/nose2-0.9.1-r1.ebuild
+++ b/dev-python/nose2/nose2-0.9.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Next generation unittest with plugins"
diff --git a/dev-python/nose_fixes/Manifest b/dev-python/nose_fixes/Manifest
index 9f61db40f9f8..d637a35670aa 100644
--- a/dev-python/nose_fixes/Manifest
+++ b/dev-python/nose_fixes/Manifest
@@ -1,3 +1,3 @@
 DIST nose_fixes-1.3.tar.gz 10033 BLAKE2B d6b7f9bdfb803e59be6eb400004f595ad717da7f8967c38006206f51dd599bd42984dab6a9f5ccaf30a74d119da55ff0282b3bb5c9bed9c2c37360865903f12b SHA512 2e054c04493cf11f06ee8977d4922290dbdd7928a4fe4947a76b6cf300c2d16796b578e48c0ea514f3c5a38e011fa9779e7d308eafa0ec12cc0622e124494d93
-EBUILD nose_fixes-1.3.ebuild 968 BLAKE2B f1148b315346fae54a66a7bc772ae68611174690404da6852efe15f3b80db3b4e525dcb0d775ea25782921ae9a69954511750a4f2ecb23888268a80550ecf157 SHA512 62ce9ea777abee23ba922554d8ef361252d176557bdf42dc3ce4db6631ca41281a16888829a5bc72468aa201456afffb05266fbde8d7bc23cf6baa9c1cf57c89
+EBUILD nose_fixes-1.3.ebuild 959 BLAKE2B 184cc9e294583fd421b18efc74857e73f9ddc07cb5f29728b2a4d89f3cf51d8be44418e890dc45cff0d9c9cf8699333ef718f3429f04b2d7ae83629b98df31de SHA512 23e097eabc1425f4186ba9d65bcf2a8cb64a8b7faa5768eecb6722b2b73bf817c30a598d304500bc80f22d34d1b4cad1e0a4fbc08f1dcd2b4f39a60149e4e0a8
 MISC metadata.xml 323 BLAKE2B 940bad81d1f68d7efc154f3f4798633c74ecdad7b897f08da784fd7b79857d7ce690592e2370cf3a62cb213a696d21805a03d65eef15eb634c000543aac47219 SHA512 2795d2ebddc46db61f304647a32627fb1be7370348d66962cd9901dd59e688ab7a230d4903b784eddac317bc9c2a28634fd9c7a90524be580f6979577fbfa95e
diff --git a/dev-python/nose_fixes/nose_fixes-1.3.ebuild b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
index 631754ee6a4b..5747c3ccb346 100644
--- a/dev-python/nose_fixes/nose_fixes-1.3.ebuild
+++ b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose_warnings_filters/Manifest b/dev-python/nose_warnings_filters/Manifest
index 6fef836a7859..74232dd7f7c6 100644
--- a/dev-python/nose_warnings_filters/Manifest
+++ b/dev-python/nose_warnings_filters/Manifest
@@ -1,3 +1,3 @@
 DIST nose_warnings_filters-0.1.5.tar.gz 3895 BLAKE2B 90fe9d0255227159cb4465648f45aa33623bf31b2182a7579d2f7f17687a832b2c96e9c2b3f0b5c477d808907d92bc8567d2aeed6bd13dcd28878394e9726fb6 SHA512 7ada463840bb2e3a1c7e357c231f9c7d4c7ce9f24fe7fe1e33404df41711663c8232001f9a258898f49ce89bb542a942240cf7312ee41bc75f86ca2015378405
-EBUILD nose_warnings_filters-0.1.5-r2.ebuild 858 BLAKE2B 98e0a4627273f35414338c27188ed3980cd21b34db6ba6328cc65fd3c2dffac00f20bfed897febf6d014e80b36134791c47e89e24fe7db357d7699233f33df0e SHA512 efba5cd164ef5b42878dad006218a1a3e4b05c5ac34cc27c24c2a1cb1cc9b76242c2f114bae18262b685a4bdfac00531c28dd50d2bff9f7e03828e22111dc8c5
+EBUILD nose_warnings_filters-0.1.5-r2.ebuild 856 BLAKE2B e82bf338e84a6300906975eac89bf35d192c011bb828c9baaebe42eeb274deb922bbeb0dfc67fa95bf6c02c5b2867d45ebe4176360cca31a394175a060ab55dc SHA512 2e2ec0477b2bf2026702d8c3e0dabf636497cf38f06a35f71c4aa1666063b00bda18faed24267ad0b2c55988bb321851e9b3060fc7c4d1d4c0149520aee5cca5
 MISC metadata.xml 393 BLAKE2B 077fd1e2172a4fbf35315d6597ead3dcf760145272ed4855df1b8cfd484addeffbba47bb7334c9fef8b404b70f3a136d8687d270dc22607306b68a79fbeb764e SHA512 5a579ee892244135abe424c05a9ed28ccc0d04e2e0dc87cc14187de9b5f86e00f8c51a762c0a55333f92370df2e982cf82babee6dec27205f15ede1aa87bde11
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
index 9d0cc4733ee1..62c712d5d4f5 100644
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nosehtmloutput/Manifest b/dev-python/nosehtmloutput/Manifest
index 30518def175b..edccacc450be 100644
--- a/dev-python/nosehtmloutput/Manifest
+++ b/dev-python/nosehtmloutput/Manifest
@@ -1,3 +1,3 @@
 DIST nosehtmloutput-0.0.5.tar.gz 7525 BLAKE2B 3beb983be772d51a13be64879970b2457387002a641b440ac7287aad2343134eb94254855f240f4937be4f9bb59156c14ef7c872b55896f35191a8114cb5c025 SHA512 85bf7d2ab9db9e054772a1af85c17b6213edb2c5bcf30e78392470ad79fad51f15a67f5923282b867248828beab4ca5ea57fe18a071c21995cf56cb56c6bec84
-EBUILD nosehtmloutput-0.0.5.ebuild 533 BLAKE2B fdb394564277b59a981bd02d89ac6386afcbffe3c8263edb014e7a73e04a2ef942155e2983220c6b02af2986b3575cd715f17b0bbcedbd3c4206fbffc395e1d0 SHA512 52cec44ebb691c7496e9cbde6cac924878867cd425087d5199907aac6c16b0c5a70990c3a96d47780630ef7012dbdf35ee2358195fd4abeb36225e5923d5fbc6
+EBUILD nosehtmloutput-0.0.5.ebuild 518 BLAKE2B 4f7b1f45d01a51a5b74a509c0f17dc7be1956b1ba7311d4c900eab44e21553ec1f4ca40ea2131fc299fd08ed2d1a9a090e3156352021a44770e53d684b3913c6 SHA512 cfa29f1d7f76bf338c899312a73ace1912a5b77215c6f1dc860aa997580371d1302874aafd355610e1d98c40a874e0417ef286a2148b560cd08db6605411b938
 MISC metadata.xml 614 BLAKE2B 1aeacecf30cd90b8c0146f30cf09c1958c84852ef8d3a3fe67b30e5cd9e25dcfd6b877563ef6e1cfad92b43f2224155c1b74c8da5fa7717be63a21990d4e5499 SHA512 5b48dfcbfb6dee148d81cb829ff30f90f7717d509e94e346668fabaf61bcef52dddd831ebb4adb29d8ea4593dc8364ec8d623742e14a7702fe4024f9bd92a601
diff --git a/dev-python/nosehtmloutput/nosehtmloutput-0.0.5.ebuild b/dev-python/nosehtmloutput/nosehtmloutput-0.0.5.ebuild
index 01cadbf8ba9d..2cf4d66eb603 100644
--- a/dev-python/nosehtmloutput/nosehtmloutput-0.0.5.ebuild
+++ b/dev-python/nosehtmloutput/nosehtmloutput-0.0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nosexcover/Manifest b/dev-python/nosexcover/Manifest
index d0d92e488c68..71534a9889c8 100644
--- a/dev-python/nosexcover/Manifest
+++ b/dev-python/nosexcover/Manifest
@@ -1,6 +1,6 @@
 DIST nosexcover-1.0.10.tar.gz 2744 BLAKE2B 21be6cef21fac2e230d87df6e49ebf5263c5de35f68d4576932b0990f61207c17e8d38a533f57ad59cee811ef94e3e3fce4b436a7a17396952196c8613ab90a7 SHA512 dbc3bc3379676d56711c96a4cf2d6b46ee77b5b04ac6a5fb2d58fee780ee547664738b9c6b248e3af64b3d0b7e6c9b44310c8e7025551df543c547da4239f52a
 DIST nosexcover-1.0.11.tar.gz 2903 BLAKE2B 297dc37504e2db992600ee4ec7c6c2cabdb36d8e137298755bdc6fe4af8dba666e99975a894ee534de62b4576514a3d912e6b98bcb43f228db9b58849788c092 SHA512 a4c75aac5095aa8323094b2a4eceb3af26243e6c87dd8720df8cf43ae0f76c28c638fe2c3cbcad621b7c2779115dccbb32e6a2f33a8bc5efb22a0fb0901d64fa
-EBUILD nosexcover-1.0.10.ebuild 633 BLAKE2B f5c42fc28b9a22b5b080fb6a3cdc86b1c76e8c98051f2e51b9c086a8658bcdbdb49ccf1e3c810c8150b6e14d417d34a4e4c7431ad6101e81500bad529328a582 SHA512 f6f4a969753cf244055d3e858f1a72c47f9d518fa2dfbe61f7717bece93a28cd277816eed337abdef3a0ba0fdbf348dac9f42bcd7daf3df16e2b254d29c59650
-EBUILD nosexcover-1.0.11-r1.ebuild 644 BLAKE2B dbc59e3aa62373f32720dcb43eaf08ef0d76da8eb97e2be5a54e3f8391f357490bdb35fd19b5d68e67102f863019c40708a4291c199487ab2d5569395b88d923 SHA512 fa050126ba6920f75775c47187c83611e92bedabcaf73fb4b8fb39db06b9e9f57b75e2980beb174c28d3722fc05bc700118ff5d92f3c8857646cc189fff7a644
-EBUILD nosexcover-1.0.11.ebuild 644 BLAKE2B 25718b6af9aacb7b99aa5980b67982600e03131d003e1df81e11cf10fc43138e8d089f75857fdfcfc3e431433cadabf522cadc9804f8d79e4c912ffb1e9e8b0a SHA512 ac4051fa37ead40cdff6f9987ad0daec796f29d50d4e70459b29f60e82b04e11031f3280464e62f8ee5c240570aaaf25598f5ba48084634035922d2890616c48
+EBUILD nosexcover-1.0.10.ebuild 624 BLAKE2B d514b5e651339fabb380687f86a7eb6dba977ff777c7fad1be03e0213cde8e70f55da38e6964cc0e7be8d36b53d82dc63469e9e20064e0261221d456d3b6c13f SHA512 25ac218d7a0a9e077e17e5a8fcdd10e79077ec16a9a1668884f2f2a9c15c46deb61ef13931503791a918de9ddf727b5a91080f543355ae5f8bf0013cdf8f4822
+EBUILD nosexcover-1.0.11-r1.ebuild 637 BLAKE2B b2c0ca4905de6c0142d9f7bacd636f17689ac27e7d8af763c3ef25ae4e0af857eb6efc49936f74f98bd3518bb9b4bacf269061541506ada296db14c32e835190 SHA512 63f50155acbdb37ed3cebbe6a08a3c47cf1f148da793f50584e4d037fcf8b70f97cc1e6a8554f81473887c3376835e01795278c7d9c58b0070ffc085c74948b9
+EBUILD nosexcover-1.0.11.ebuild 637 BLAKE2B da63584167c8bbb28130fe215a78e055c40c5affa478c88893d9bb05fae308d9422593f3f01b73c079e210fc284310e468893cb376d56766b5b3bd97e7797ab4 SHA512 b430e5c5ba81e95bd22d1ca994e799fd3858562497e464e8b84763d8b1f7cd875e65212268d37dfad604eaad735a1678287ad4dad1115313439dc8f512f9804b
 MISC metadata.xml 498 BLAKE2B b05a2fb406d49aa821b926dfdee1f45f12dfdb8bbd40fbbc064e9b3823a9dd6ca85609f860cac25bcf7dea29aa4f6050324fa36c6950a9f2c7240e4ddfe94790 SHA512 04961083f04775b64d14ef2be39d6a8a2379f6c82234316d29dfaca2941a24dbefff0abca2c5e8efed29a4894885c65ad49bba5acd0a30a8e71ebb2d0fe98e59
diff --git a/dev-python/nosexcover/nosexcover-1.0.10.ebuild b/dev-python/nosexcover/nosexcover-1.0.10.ebuild
index d914bbeb6ba9..2e2d2dbac0cf 100644
--- a/dev-python/nosexcover/nosexcover-1.0.10.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild b/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
index 361675192710..9c6f9f53676d 100644
--- a/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nosexcover/nosexcover-1.0.11.ebuild b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
index 5138cc036a3b..028f5240d670 100644
--- a/dev-python/nosexcover/nosexcover-1.0.11.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index f53c5b1ebe0e..1b154859c529 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -6,8 +6,8 @@ DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f9
 DIST notebook-5.2.1.tar.gz 12458130 BLAKE2B f10a91fd79064fb09889c4ee30a84a0b34321d3a89f950609df9a90106ed4af75268cc1b087d0229882575d548b7b2b78632aa97452f89fc67910586911fc467 SHA512 defdb08e37dcec9fe799d0b03dc8dc2339f37c9417e4b138ba83b98433dd77f0dea3d83e07368e67f18155af1a67bbabea21ccd061d8a926b6b084fd25960576
 DIST notebook-5.7.0.tar.gz 13394162 BLAKE2B b74be075ec97896d8ace2ce9f45d4759aee3dba1a7515a412daa8fda4606198d1487e6760ed01d8a2726ac3bf334f2335f40bf8938e8ae1ca23c9cbb5a52eded SHA512 bc5ff0316b0f89ae2c8b8bc271a8824848e2a3d93420e895557229663c889916aa98e4d1503957abbd38ca61a1b3f9d421946d6c98e36f1153b1833f473330b1
 DIST notebook-5.7.8.tar.gz 13371684 BLAKE2B 077a94ec7085ae7325a972efb58f8d7eee5a541186522402084dfa55e335163fee30e68476265e9825c3623408989b1a0782ff6a5af71af4d8ea5e6e308c3a45 SHA512 1cccb23ce6810df85b3b600c0e2e5d6599be5551ea5243c7b1a9c73ed45c34dea8b16b0fbb3624aefb9eda848bce2fdcea1f3add8df3f00a90c13a9b01ea3f07
-EBUILD notebook-5.0.0.ebuild 2285 BLAKE2B d74e1b35ce2351edeb23db9d799dec67a015b4d9d106ff522efc974ccd5ec2bf2ae0a607e280a558a388e4d963dad21c087aecbefe4eafcd7203a0d442f4d631 SHA512 3527218af587c8565777d4afd2729d083b433bcaee1ae3b6725ab471b978522a153fcca810ab7d1660d4362245e1632ce0def49ff3c0631937fd1452a8f9ed32
-EBUILD notebook-5.2.1.ebuild 2664 BLAKE2B b84f3722a847f15d360afdc0914de618706e2136d357aa139341af3f41c9ceb9d0267338328369a02396b3120ea152598f10b6d175fe2fd36e430bf5c726b614 SHA512 496176e87f4819ee1185685d98f0bc86154269b2e95f76a5a753d5513bee56201cae5e2cf66e4f0d88d3245ae390d4f4f808408ed43a2a012625b1b27f26422a
-EBUILD notebook-5.7.0.ebuild 2774 BLAKE2B 4e4f6b452cb1329132641b25f7659c1b75d76f1603f55f1c05d4f6a5346c16d00cd662561bb3af78e70eae4af2a4ef7baa0114f210d52baea4711ed4bb700c41 SHA512 a6b37462cae890de61b962b5aa702c77d172cb2cbc3724783cda6a10318ff832996b96598a36a3501fd35c2e78f9b48f7dde56e6ec3c6bdf5e48c59abbf7959e
-EBUILD notebook-5.7.8.ebuild 3004 BLAKE2B 2646c301d7673aa6f0ec13a5e330fa58bf17f42d898904acd0550bee11e0151d7db2dab03df4731e9b3bf6e43e1a06a2477b6229b9bb85aef0fa6862115cf3c7 SHA512 e229e364f2e211d9aed17e50532ed9c6b19ce2274d5c514dbc87f2f0aca21024446847b96a44cfbc9542dc66b14a2c0daf3fd37d1c2ccc27c2e149c01090177f
+EBUILD notebook-5.0.0.ebuild 2283 BLAKE2B ffaba584d2b2254335021557e8e96bc73729166436119838844b40e8554fd912b6c0dd49a89bc2d5554f682456deaa3cd7af81aa8a519bb9940e0a608416bf99 SHA512 923de51823b58be1a7243007a222e0015db68f60076eb6166bd85787c634d8229406bda88f469a8d705664b62e8d4d04d37612c83827763863a73a3c878aa0f8
+EBUILD notebook-5.2.1.ebuild 2660 BLAKE2B 32473274c98cf271610c56850404495d5f54e60a2d7697178e9b649e0fbca8f2612a108fcb21004c0b38b6dff7be5c210519ad5f9f85bb5d1a552097fb115ed8 SHA512 f3367605591943f5870cd3b68db1493961def5c0be30fc9b4cb2c95c5d4a43d73435815082425f9c3d86395aa66e9c17c169349a506369d6308f0575c5e85b84
+EBUILD notebook-5.7.0.ebuild 2772 BLAKE2B bf8616f01dfa3942ac5b1986fd8c7988e6b3a810c2756fd7524376ab7bdeaae9176fd4a975a0337cf365eb6ebc352c2217d8654eb91b47830b43226de0e7c8bb SHA512 e8a61b3f0644113ffd4b30f61a29a4f7d95064350d717ce1ec96f01d2a9e4d715c8d21afe808c94285a106cba283d9c53fa93bbe4afcd38fa43755948a038faf
+EBUILD notebook-5.7.8.ebuild 3002 BLAKE2B 017355f088b7894772366e2b79b528dcca6b26a5e257ab567af97562d74728fa690fc068603ef2bbd1148f8648b7325181c88ba15fd1e8dfdc82d4525bd35bee SHA512 af6077e66808cb85b21b556b74a7c7f5d0765a571642782ab700c589ee744bcbb10f7e010abe02968e8b8b05ed2c93297aab5179f80a9196f683e6927ff6eadb
 MISC metadata.xml 472 BLAKE2B c68faaf3f609c2fc884c61f1fd1e0296460316ddd6da67aae1492a850a9128654d6f903f9337d92f9f0bfb78b00b94191c99a26dffec92279e79ddfc9ab39fd1 SHA512 23588835d3a40661f3a59b92a9ccfb9e40777f14ff03b6f9c403eb9eee5560e0a805c6a76cd8ae2fb11eeba39b264fa0fedf44cc4fd2231318fe1cefe2c27846
diff --git a/dev-python/notebook/notebook-5.0.0.ebuild b/dev-python/notebook/notebook-5.0.0.ebuild
index 82871cfc8b3c..3309df6a5862 100644
--- a/dev-python/notebook/notebook-5.0.0.ebuild
+++ b/dev-python/notebook/notebook-5.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/notebook/notebook-5.2.1.ebuild b/dev-python/notebook/notebook-5.2.1.ebuild
index fcdb01cae5dd..027e68a44ae8 100644
--- a/dev-python/notebook/notebook-5.2.1.ebuild
+++ b/dev-python/notebook/notebook-5.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/notebook/notebook-5.7.0.ebuild b/dev-python/notebook/notebook-5.7.0.ebuild
index 59dcf29a5c1e..3add2447db86 100644
--- a/dev-python/notebook/notebook-5.7.0.ebuild
+++ b/dev-python/notebook/notebook-5.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/notebook/notebook-5.7.8.ebuild b/dev-python/notebook/notebook-5.7.8.ebuild
index e5db986f8da8..ce1b0e299a3b 100644
--- a/dev-python/notebook/notebook-5.7.8.ebuild
+++ b/dev-python/notebook/notebook-5.7.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index 3fc11314f8af..7a5d6d686811 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,6 +1,6 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
 DIST notify2-0.3.tar.gz 8798 BLAKE2B 57e1eeaa96b9e5354991db36440abfbf80471887c094e41dd6ccff72f1b1b35524bebf83b44afa455c64cdc3fb7b0ef66d2517ca499340a3d001e796828ff9b6 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f
-EBUILD notify2-0.3.1-r1.ebuild 675 BLAKE2B 8ee326d0324ad9918cacbe145b6cafaf395aa205e8771bc7e44e6041156d916ab066fb70ad4a30d8f0e3f2d6102a3b3247e7fbd78e07f7bf2a3a3916cc66370b SHA512 3990c87e305a556d602810035542db2ab51cb2e8fe1327922758d578dab814f2a4da966e7103c4ebb9821a1bd3f28b58a89a912a912a3e0e71d4ddc85164177e
-EBUILD notify2-0.3.1.ebuild 671 BLAKE2B 8eeba7082ee690a5b31269fe6f27a4dc2d935341ade026fb5267ff017d2f5ddb40d171ee210c933fc6e59fe3ed57239c7474c70830eb9e5f196793c9743acbbf SHA512 10864ac151e1ada4d4851fa243fe41758d0e7ed8ef5597226543e42c9d60672ae3122bd9b429dd9e0874765c1ef4fc4e8d2ed1445397077de6d498232066c26c
-EBUILD notify2-0.3.ebuild 666 BLAKE2B e37e4c05b6054c3619bed469a8c429c53c15673d19405a7c57b6c2d60ee30d8ff573f748f6988329f138e4fb6c3117a442699d750de4bb3b2c67a819f6ce5462 SHA512 66c34aeb75fd3f0dc37ba1d969bb1add8da41faae88a09d3b289f3057c2a60d9270eec844e3f7ad919819690a779bef85ff3fdc5edd15484b14a181bf1594d43
+EBUILD notify2-0.3.1-r1.ebuild 671 BLAKE2B 7d602cb1b6fad935ea4bc814ced510909335c4d4bd448b16386381d0947bbe26616368209f9fc3f8e934cd6e2d5b94eabee75e8383cf5cbc7251aa2a0dd8468f SHA512 35df20cb15936fbc89c96a6d43477cb3769326d310f12cd9a902c6e0172547ddae4347ce8264ae5b223b60a91df390c91ac3edc00e9c2edef63b77760a8ce87f
+EBUILD notify2-0.3.1.ebuild 667 BLAKE2B 9cff613acf78a5471cfe73e5210e040fd980dad46ee8f04027b28647924246110373bbd6e343ffa1f6e6941ecb0dec122823ad515d24a65f9b6d1c957c7e096f SHA512 2ba67f532c2df4586b9c157cfa5b830b954bca22d64640bbb1f97839fb699352137f3ac302ba257a881dabf3843a563597c492520aa684193a032839311bd5b0
+EBUILD notify2-0.3.ebuild 662 BLAKE2B 454554f3f692ca9fc5a0cea4c2c231f5a0281ec76bb0b266a1bea9cc257f760ac4cbe70705dbd25bd13d05a038edfc9ece9f26a9dc518057a0aa6486a0b34c9d SHA512 04a55e99124cdd89031ae282dd9d73e4cb9fa13a306c50ea575a0101d1a9877255a648aa1931ca775cf8d3f921ae81ae922856d4989428216391d040fc25abcb
 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 b2c1f08b566c..bce48f799b80 100644
--- a/dev-python/notify2/notify2-0.3.1-r1.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/notify2/notify2-0.3.1.ebuild b/dev-python/notify2/notify2-0.3.1.ebuild
index d81857e5beec..5441744a028f 100644
--- a/dev-python/notify2/notify2-0.3.1.ebuild
+++ b/dev-python/notify2/notify2-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/notify2/notify2-0.3.ebuild b/dev-python/notify2/notify2-0.3.ebuild
index a8212dd40006..745ef3a38a03 100644
--- a/dev-python/notify2/notify2-0.3.ebuild
+++ b/dev-python/notify2/notify2-0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index 593c506059e5..09096719e96b 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,3 +1,3 @@
 DIST nototools-9c4375f07c9adc00c700c5d252df6a25d7425870.tar.gz 9693250 BLAKE2B 636832b538714d48aa78946b9af9985c55a5543828c3033b849fe3ad75c15472ea7515ca2a4a30c990457acdce2fcbad27d8e61fcd42a4bd7f009638f1bb4381 SHA512 dd2ffe072716c61c9eab9307308f6f72ca3a6631ec2402d03adc4e4483030d770035bf9b9ae66b5b580f1dd7e1cb546f03eff61c00c73069c804953587199e9e
-EBUILD nototools-20190320.ebuild 1006 BLAKE2B 5ae83669ad857ebac8a0651747f754f632967848b9787932d89365567435653eca84f0e426b4cc462ccc42d3907f68c8778bee09e4560ad13683c3ba3b7327ed SHA512 8f2610ac2abd6b5720618a4a43aff73413eb01768eee766b2c708e6a4087cec965390e0b3259845d57e3bbfddb7ca4ab5566ab1785229f6396ffbbf50e3267d7
+EBUILD nototools-0_pre20200113.ebuild 1006 BLAKE2B acbc72533e1e1bd56c60616462944fae91e4e578a8ed0dbb927237d0910736b36ffb85e636a3b0d817129c421f85916dc16547238763720c91aabb8968ebaee3 SHA512 e1033f170424e91ff54571f4511eb3e2d1b421ea1552770a314c812db4b8cc8442a2e250c8978b1ace68c9a81cb819cacafe7cfcd5e3ea55b9d8d48932a2d269
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/nototools/nototools-0_pre20200113.ebuild b/dev-python/nototools/nototools-0_pre20200113.ebuild
new file mode 100644
index 000000000000..425374cffc01
--- /dev/null
+++ b/dev-python/nototools/nototools-0_pre20200113.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Doesn't work with python3 yet:
+# https://github.com/googlei18n/nototools/issues/472
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Noto fonts support tools and scripts plus web site generation"
+HOMEPAGE="https://github.com/googlei18n/nototools"
+
+COMMIT="9c4375f07c9adc00c700c5d252df6a25d7425870"
+SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/nototools-${COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND=""
+BDEPEND=""
+RDEPEND="${DEPEND}
+	media-gfx/scour
+	>=dev-python/booleanOperations-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/defcon-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyclipper-1.0.6[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/nototools/nototools-20190320.ebuild b/dev-python/nototools/nototools-20190320.ebuild
deleted file mode 100644
index 0b8413603b0a..000000000000
--- a/dev-python/nototools/nototools-20190320.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Doesn't work with python3 yet:
-# https://github.com/googlei18n/nototools/issues/472
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Noto fonts support tools and scripts plus web site generation"
-HOMEPAGE="https://github.com/googlei18n/nototools"
-
-COMMIT="9c4375f07c9adc00c700c5d252df6a25d7425870"
-SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/nototools-${COMMIT}.tar.gz"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-BDEPEND=""
-RDEPEND="${DEPEND}
-	media-gfx/scour
-	>=dev-python/booleanOperations-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/defcon-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyclipper-1.0.6[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index b01b1aaf4369..a0e9e82bc7d1 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -2,8 +2,8 @@ DIST ntlm-auth-1.1.0.tar.gz 38624 BLAKE2B 22c6fbe7ef95b7ee88b803b7ccc5f63f1a27ec
 DIST ntlm-auth-1.2.0.tar.gz 40006 BLAKE2B 2fbe7533411dde27938412b3e5e1292ce0fa197abb048c0e52f521ff351bd7e51bdb83b5fd8c1f05e0bb3ce206a4442b8b7059c859eea7333ee2d20ed2e7f7dd SHA512 4fa537c5a6a7f3493df2fdf49261f9588b7aac876f72b7a7ef5b8a7a1dd971d9426dacdc8bbf520cecdbe5b7adb916ddcad9e9cf4df725b69793299304601912
 DIST ntlm-auth-1.3.0.tar.gz 40684 BLAKE2B 74c2b914f508b5291cc2a23ae99417db5e5ad9fe107c03f63c795bd4da202db2f1a4f6f289645d2164e708a5a5a2e3bf626aa749dff3367420d669965c462b71 SHA512 e2d5401161ba6f9fed377a7bfed501d49ad64d5104accd7df298747abade34a3ddac9e68332416a3ab68156e9bbf7a8de6a8a271542d080cafaa84ee19f01986
 DIST ntlm-auth-1.4.0.tar.gz 40745 BLAKE2B bf2c0dab7303cb0f87d83ed11d79bc12b8f74095f2f251c190eb43879bc0e9419dedf706fcb4929c51138658910bdfa836778084b34c974ca120aeb848e2da0e SHA512 abe0260c66e2b5f57c1fd672ea121129926f1c32020166dd61973cf51f6bd320f6057f3a148d602b96d8417c2ad57c335048da185100417401e049ff14b46004
-EBUILD ntlm-auth-1.1.0.ebuild 557 BLAKE2B c9b3a25a14d39832453351cb3383e258a6ab913b1966412c17d2985a884a399d70f8efeedf61e0471d23d5e4425f6be4cad63cf2f63f784eac962d40803566aa SHA512 88c9ec8e06ef96aa6fc2ab6f1fc74650339d7c09fb58ee80e86a2738b7b68c51e52bbcaf35a9e25e46e1b6f9f69fa1f02e18f87802b630ff57181a77116b4238
-EBUILD ntlm-auth-1.2.0.ebuild 557 BLAKE2B c9b3a25a14d39832453351cb3383e258a6ab913b1966412c17d2985a884a399d70f8efeedf61e0471d23d5e4425f6be4cad63cf2f63f784eac962d40803566aa SHA512 88c9ec8e06ef96aa6fc2ab6f1fc74650339d7c09fb58ee80e86a2738b7b68c51e52bbcaf35a9e25e46e1b6f9f69fa1f02e18f87802b630ff57181a77116b4238
-EBUILD ntlm-auth-1.3.0.ebuild 602 BLAKE2B 0bf33e4a7dfd47bd8e2069748047b2c25dc38f30103118748b46d16c1232352f66d4ffb95e7c1ea9fe17482891733398eb636fd2fe4de4e40602c860c024c86c SHA512 e071bd2d00dbe8efb332bf535a555182dfc2f94e14aa40a5e3ded396965130d993e47e6b044b20e455ac09d2fd430eaf5f596cb08e89ac5f44dea57bcfdc9091
-EBUILD ntlm-auth-1.4.0.ebuild 602 BLAKE2B 0bf33e4a7dfd47bd8e2069748047b2c25dc38f30103118748b46d16c1232352f66d4ffb95e7c1ea9fe17482891733398eb636fd2fe4de4e40602c860c024c86c SHA512 e071bd2d00dbe8efb332bf535a555182dfc2f94e14aa40a5e3ded396965130d993e47e6b044b20e455ac09d2fd430eaf5f596cb08e89ac5f44dea57bcfdc9091
+EBUILD ntlm-auth-1.1.0.ebuild 476 BLAKE2B 65d84ece4a44b487584516b0f53fff76266cc301adce2501909a0d8862363c481f1c00a3090052446eb6fafc27fcefa8d395a3bfe78123e403310c9f1e8b8dfd SHA512 15ceafabc3312a9037ef6006e9bd5c53d02b27e56f5c24e76d602324cf984c15ce7d95c1a7f4068e27a47323d492051a57c661751d2960e5b4cda63b41e44fb5
+EBUILD ntlm-auth-1.2.0.ebuild 476 BLAKE2B 65d84ece4a44b487584516b0f53fff76266cc301adce2501909a0d8862363c481f1c00a3090052446eb6fafc27fcefa8d395a3bfe78123e403310c9f1e8b8dfd SHA512 15ceafabc3312a9037ef6006e9bd5c53d02b27e56f5c24e76d602324cf984c15ce7d95c1a7f4068e27a47323d492051a57c661751d2960e5b4cda63b41e44fb5
+EBUILD ntlm-auth-1.3.0.ebuild 523 BLAKE2B 89925d7c9dbbe26b0d7335d8d4814f860b2035394b08193d49e92ce34032fa9d8e21677b011c9db84ac1fb74dae50666ea00f40e834c9effeb4fa8221c83db43 SHA512 adf740f026802b87a64b2997c66d0a3ea4bf86631e79dcc442066e29c6f70980e36a8e467f9379ab99945fd81909c919a96d7bd70a1373fc68c7c7275f72fa6d
+EBUILD ntlm-auth-1.4.0-r1.ebuild 523 BLAKE2B 89925d7c9dbbe26b0d7335d8d4814f860b2035394b08193d49e92ce34032fa9d8e21677b011c9db84ac1fb74dae50666ea00f40e834c9effeb4fa8221c83db43 SHA512 adf740f026802b87a64b2997c66d0a3ea4bf86631e79dcc442066e29c6f70980e36a8e467f9379ab99945fd81909c919a96d7bd70a1373fc68c7c7275f72fa6d
 MISC metadata.xml 425 BLAKE2B 791b65f110ff47908b2ada3e140cbd1fb262f0cce02e5ac083cb4fecbfba686a44aece6a3d44a69b6876c4603dd74d343fd9a61638f908836250bf3badeb9524 SHA512 a38de76267e3e44d11a8e3571809031b94697d270e3c752629764300893e95ccb1e8daf8a9bf897a442fb3b097fd6da4f3d4d34fbaead847474335a53ab91768
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
index ba5cabbac4c7..4b2433e20090 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
@@ -16,6 +16,5 @@ LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
index ba5cabbac4c7..4b2433e20090 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
@@ -16,6 +16,5 @@ LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild
index 2f680d17f344..f34de2bf8fea 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -17,6 +17,5 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)"
+	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..f34de2bf8fea
--- /dev/null
+++ b/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+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/ntlm-auth/ntlm-auth-1.4.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild
deleted file mode 100644
index 2f680d17f344..000000000000
--- a/dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-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}]
-	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/ntplib/Manifest b/dev-python/ntplib/Manifest
index 7906c84d868e..5f7671e24016 100644
--- a/dev-python/ntplib/Manifest
+++ b/dev-python/ntplib/Manifest
@@ -1,3 +1,3 @@
 DIST ntplib-0.3.3.tar.gz 6808 BLAKE2B 192640fd46a12e6f6829b2e252bc3d8126104a15f6186d2f5164b74d6fd8aaa715c6df7c9d2d896512d82f729f85335d81e44eb86b6a7240595c40c8927c0b7b SHA512 4175ebb78228475b32744a59ad4c404f7b88344859c19874606967c7d83a4680bbc78ff42d13b866b8e6ef939d2f1948b0a0b42819c78a8520856bae48ec907f
-EBUILD ntplib-0.3.3.ebuild 464 BLAKE2B 10e160b848fd7f36547d5c2401f6bef2e6229073ce9eb7d55715908ea8265e6610a0cd3d0e77e0c3a61d99cf1280dc3fd0461d962f2e9a043969f64a113bcc58 SHA512 4417b3fc5a2e1c6df6fd650cacd0f17d95492f00c8e0a2cf0dbd0d34b1e71b36b4eee478a390df04f0597771c6362f66464192d52dd9aa2ff5a52722dd68d2cd
+EBUILD ntplib-0.3.3.ebuild 454 BLAKE2B 38504260a6cbb6ce0e08e19d275b299ddd972d2c3cce5555c1c9b098cf7666c3b1d33ac79dca068a5a4944da78871bbda2216fcc12dde1670be6a271c496928a SHA512 3d8935d0591dd1190380df0bc7ee9a3fb3422e7e765e732c49d384df173c49ae596ae3b9ee02b3c6550c2145430f84ca080c2399d035a66384bc79f6310d03e7
 MISC metadata.xml 287 BLAKE2B d9c88c99c78fd24d440b330228a1274e027828e515dafcd5002f0a5ead33993a311b69981cea6d45e43f5f3cbdb659732b611590fca0731a4fb686b9be68ef63 SHA512 d256e098bdba17370fff6e829dc5eb5b416fce97370aab0b5c96eb2be30376d1295d502731266a975e81001f098f8f030d7b1fb57b3942ef6f20dc99cfd0efe6
diff --git a/dev-python/ntplib/ntplib-0.3.3.ebuild b/dev-python/ntplib/ntplib-0.3.3.ebuild
index 7894200d03cb..37e5fcbc114c 100644
--- a/dev-python/ntplib/ntplib-0.3.3.ebuild
+++ b/dev-python/ntplib/ntplib-0.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index d335c942fd9f..82e04833598b 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -2,8 +2,8 @@ DIST Nuitka-0.6.0.6.tar.gz 2011509 BLAKE2B 1a5d37acd50bbb7d1a380306aa18d68ab6559
 DIST Nuitka-0.6.2.tar.gz 2064701 BLAKE2B 9144bbae98584c64a642ede1155f26f88afa1ffe6d1e75f88039fe99f191e0939efc5ce7e71b2b9c661004213990e4896a392e2fce995a0649d45ed5b3a18168 SHA512 94547cdabaf6c591ff5d49179dc4538fa624b40a6d63e318aeabe371b7cfdbd9b1c9c41918a4ea1dfa816a7222c5587ed17c1980d89be6d9151ecc8cdaa8c5a5
 DIST Nuitka-0.6.4.tar.gz 2211662 BLAKE2B 4831782516503f128911321bb9755db9ea7d48fe0438dbff1fbc9ded3c690dc0d2f4dd14f0f5a5b8c66cb2b8e8d380e9658b590a48316497b42f78e68a8ae5ea SHA512 89e882b5fa37fd5a1357f69e13db7c340bc6d5471e18b7796cc1b7bd9970c480f8fecb9a7b11e19e41e936c5f90ef204b7409146a362beb6946f3d8f88cdf93e
 DIST Nuitka-0.6.5.tar.gz 2239333 BLAKE2B 687b82863ad5cb78d1c1b3b353ecee8a44eccbcd73eee70181bfe274d7e9d6011323bde9e320cd13c8c67deeef86de5e93c61592b56ca9fa9412fcfa3d152a06 SHA512 785dc60b4a42061401066ed510a3bc82988a0f8947372dcbd381c7b9cf6c2907c9cc0510c8188b0526c7fa3d9f3ec43207b46190a8485cf1e546b5316fa6dbdb
-EBUILD nuitka-0.6.0.6.ebuild 630 BLAKE2B d3bb6daa3a87b32053a2d1714e987444eb9affaf3aabaecd04ec86252917442c7fe0030c410d1aa382ed1ddf62fb1845c078dcf300b7cdf481e9c8b06a84ae1b SHA512 93869f9df917064bf0fc50cab19fbb092bb7cc5b8eb163b321ae9733a534a08375871c4a0b664a59042302c8a869ca2fbb036d8b3e64f898ad1029ad4ca7b909
-EBUILD nuitka-0.6.2.ebuild 624 BLAKE2B 6f48d803688d8cd8f218de5745cffa2eab45f87b2d37a2c692eff4d40423792400c358afa1c9d290320138f4251ac661f07421a562164d95b5c37a0f5de61bf1 SHA512 5876f5dd0989ce5a33111ffa6ddeb3276c1f86e84f1f4618571dd39fd7be47e19eb5cb45fb1c03069e5899190e2499861ea4828a5d3b58988e2cd43cefbc044f
-EBUILD nuitka-0.6.4.ebuild 633 BLAKE2B 00a59a13fb3fcc70b125cd2e2accd66bfdbcbdf32f6b0b514776e82f3b8a0b0a897675bc661cd4a0b6ad1fbb4e55bfec1de99d4db085a6e10b449f83dbf4400c SHA512 38adeab05597ce90376e886d6de6a2da9167b3362684e16bd81da6d1c258841c74aa0725e180dab7f7f4f70ac5ac03326d5ea8370eb3119181e2d02cc23eb545
-EBUILD nuitka-0.6.5.ebuild 604 BLAKE2B 2d82b54251cee6a597ccc056729844960fa2bb5b8f18663cd48037961dab9ef59974f07ab40361a288f6741d1ecdc1ba2003bc79772b24d31187e10518520e78 SHA512 64dfdee81e18e6e0632784e8c86442c0e88607ecad92b9be667792041984bd04adcbaefdbedffc6e570b37cf36336d7727fc26e7138ee1fdcae34f272e2adfbf
+EBUILD nuitka-0.6.0.6.ebuild 611 BLAKE2B 0cbb2f8b442e92e0d9b86d97433252377dade212cc7a20c21eb855c07ed301da43fae6631986eb11feaf7ef3851c678da99eecbec07f3ac35037c97971e9b2ab SHA512 69858efc5cf84fe7365abcf6dbf77a99584055771a5960a9dae10a858c78f352e1e7b07bf2377ecb7fbb98e5ae05b6239bc96f4f3be0a8ebe484ed18863f67b9
+EBUILD nuitka-0.6.2.ebuild 604 BLAKE2B 3704b5e9b536cbe7470b623cccbe4c0452560238f9b209c563e91e58e74985857f6081110a060ec43387e221fed6b2a74ce465b2f61d1cdad12d4606c36f330d SHA512 810966bc5bba9019145a085f4506b5b1e6981711bf77ee6649957e5bba002a75d93c6eb5f91fc017447d709a18f16ba17682738c76b18ce1f143666e5c57a1bd
+EBUILD nuitka-0.6.4.ebuild 608 BLAKE2B 570f7b1d6f1d083697fb43ccfbffacc3e3453feedce38d96d01ad3cc0830b1a0795bdb544a244aad9d50955eaa996f8ae4c5eac1907ada04ac048244b65d0027 SHA512 abd45235a5a25cb265c0040654caedb1a8cbf78e8cc9fe4f1a7e175c1a512db37c8d7a34ddf254a9b2bff68e68afc0bc341cf7902f6248a9b418a2fa6b0160f3
+EBUILD nuitka-0.6.5.ebuild 593 BLAKE2B 8325c93f8dc27e306eadb25769cd9dd5a0ade20f44c39a133caac09c509482a17540c8b27df9b47f79737d800c48a373d4e7123fa401cd0f3b05e5ee5876046e SHA512 b10ffafcccfa17fb29d9c741355a3e97c7c3310e0d4eecb0d3509be81864fa96fdabffee1c8c10d63d37b6d6b8d9270fa0454c7ba059964e3d59845023b038ac
 MISC metadata.xml 750 BLAKE2B 56bff65b936301e2d0347e553a1ea85b89c4c991697f665b47b01dfd7e40b94726fca15c67e4387fb79ec19f77851e275bb80c48ded3f76e6cf4cb81d10ba90f SHA512 01ed4ef871d9d43ccb30b60e5051f513b56d7ab3eb46ad64b76e6ee8f53f0088c4a3d75227a0870e82664476954d6603f70614232735f107bb24a06702c014ab
diff --git a/dev-python/nuitka/nuitka-0.6.0.6.ebuild b/dev-python/nuitka/nuitka-0.6.0.6.ebuild
index 0d55ac76041d..a90782ff64ae 100644
--- a/dev-python/nuitka/nuitka-0.6.0.6.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6)
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python to native compiler"
diff --git a/dev-python/nuitka/nuitka-0.6.2.ebuild b/dev-python/nuitka/nuitka-0.6.2.ebuild
index 306034cd1e10..aafc213fc093 100644
--- a/dev-python/nuitka/nuitka-0.6.2.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Python to native compiler"
diff --git a/dev-python/nuitka/nuitka-0.6.4.ebuild b/dev-python/nuitka/nuitka-0.6.4.ebuild
index b7b8079ee4b1..fa269b1647e1 100644
--- a/dev-python/nuitka/nuitka-0.6.4.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7)
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Python to native compiler"
diff --git a/dev-python/nuitka/nuitka-0.6.5.ebuild b/dev-python/nuitka/nuitka-0.6.5.ebuild
index ed2ba72a1c00..5fae159c09ac 100644
--- a/dev-python/nuitka/nuitka-0.6.5.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7})
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Python to native compiler"
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index 77151ff43401..a77f548d4700 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -1,11 +1,6 @@
-AUX numba-0.19.2-docbuild.patch 601 BLAKE2B 9fa515f92346f732501dd3c01eeda331a456e06fe0a2803ea1de892c0438d898b9ede8eec9a0edc6673d5a6ab9170d54baa0be1785c1b91d87b2974f54ef9b85 SHA512 86c0ea1f45436c4ff89bed5c00da5ff9be92aa7bf445e37165d174f7e36a0809c48d0f7db665e3c171748822e7f70cdb8dd6cd0396b5f98587fc426de455f033
 AUX numba-skip-tests.patch 494 BLAKE2B e871220602a0e27045d2223cddb74372f9712600336d1193d79db878cf63c87b96c832e5e2ba734d07679feb0b43cbbb38c1310431035ac59a3a15969e353dac SHA512 d4f4eecd0daf793cb7b6dd8cb2c1a462e8dc726c5f8212aea5b22ae837200c70c7eb331e6018f83bc895096e0c8e93751f32fea624de157ab154122a59304069
-DIST numba-0.27.0.tar.gz 1247144 BLAKE2B 42de6e0f7865efb597ed1dd3680eafc66906d5d9cc7a8b583847cdd12a936174af976933de5aa02859c2025b86f51da3d0148f89ecd35287caadd8da8fa8bb53 SHA512 3c84fa58bc5e84683b5e593b99f8c48cfc6e9fd0f41a2a18d8a4d9deba618cec1e764a0202bb71166cbeebf27b908044be29e3b183b01f31edc8e85c962df876
-DIST numba-0.35.0.tar.gz 1647189 BLAKE2B f0dfd6fe03e1a60b4d19f0f4d1b158d418686376f4317b7f4b5fa0734b35b6ce670661705f92994910a8b47bbd0689dca652f36cea1a2f9d5afa419ae1c8b5fd SHA512 48ee1e33e7ec1327a78c3485602e911f045df8b8dbb69da3004133e6da8cbb52388712b4aeffa1e41b83d20aaa88cc8c1202ef35aabbf3e0e04ad2875df789f0
 DIST numba-0.37.0.tar.gz 1734667 BLAKE2B 20fd765d226e6e71a0e94bbf8c6a605ef7b4cf8ba6e39667001051c642fb9b872540482e710e020c0fca6653d9ca4518ce82e48681613f28ac5b9e2346bece4f SHA512 83a4e5a28a43ed1cd6584ccd63aac38a928af48c424ed119bc86487f0a2bfb9875c34f6fe0a03446d8c8e9179be81f831200c12ff31edc22bc4741789095f861
 DIST numba-0.39.0.tar.gz 1782489 BLAKE2B 77a6afe587ce3ae0ccd782e329e626d63ab58b84a2aeb836710fc0c13dcc88e16ab36e7426c6d9ff88c6d5be854915128dc2868d7fa71511ec9c8eea9debffe7 SHA512 f9cabf39fea543495425ba326aad34a52d317ebef61e5b298588764214bb396ea43871d32875f0882a36909bb12fc2e3807c38b5fc60ff5d9e6dc9ccdd36bf6e
-EBUILD numba-0.27.0.ebuild 1779 BLAKE2B 9f0824d54ee8029282d3b2eafd0787720604c698a3c32ea21dc687df737610022da0726a070b14aec57be0b2faec4c618a94bae4a175376f832423de3f3be666 SHA512 b5fe469e25e1710465b5f36dec51b23b54a51108c943f323d14f3d91f9f11c0c3e4eb1e910f4ea5ca0d53bdcf6f0488a21be8a16a09e8361dfd8c05160102676
-EBUILD numba-0.35.0.ebuild 1088 BLAKE2B 3f287d67a32213330864e5319a62f72606056db62b80c848cc4ed80ebe304cc843119f91ac30b0cefb593627af58b732c1457cf8cdad9a80283a75089472f08e SHA512 9941e5cec6971662ca98cf07340eb564345b30a59d3973d6e3d2671daf205ae7281096b0a461612c87e88720683358ef1752ae8d41e6dd6e0105cd4754dc15ca
-EBUILD numba-0.37.0.ebuild 1127 BLAKE2B f99e24bfeba9a5833426f7de7e226f03794b0d34c9ed1d5f07be10ad0d65c8f8168b81996a6fec15f0a46ea2a96c9a9799b7b31d89bd18e5f6f64b919a94ef6d SHA512 7bc960dad5f967f1fc79aa3b5a31e0e5b3829c3e566f2eee65bc09d73869ac0d983a978019aa29450087d1cccbd7651149f73e9ee5b33e0e43fcde23cd431c0e
-EBUILD numba-0.39.0.ebuild 1129 BLAKE2B ab87128ba8d886d95ab9ce11f23cf5b5aa81e17391e66bba714c77539680b6a29c058bccbbc00d50e6ca06e2662666996b917995a3c7929fe61373123cce3876 SHA512 0df480331fbd4fbbc6f18343f78901ce93ffa3e3a42d9d87eabb8df2c36b3983b1daa2b3eb2b32eb83e8d1f421a14b06e7df24e7c499a230f6a50e264e0904b7
+EBUILD numba-0.37.0.ebuild 1123 BLAKE2B 67eef98205c03b5eed92dfb12a0b624f32107d20e3f4d1e624bfb4ab54b05b454b529fc0380fd23c3d52feee5f4c5d2ca1f8b695c45cce4db9d455a5e26baaf3 SHA512 eff449200d782b616e0077051a82bacf41503c4ca30dcd80f3d7b0a7ffad10f402c8b1d589e10bb3424a30db058b53687eef0656baef8a97f6c549ce13a52254
+EBUILD numba-0.39.0.ebuild 1125 BLAKE2B d9711384e82b8c38f013013e31ab23595c7989adb6d37435466c73ff65a22086118c1218be848315d1ec2757a4522c8cea822023f3906a9ecb2b5266e0add668 SHA512 c00efe2af53f18fd8b490a770c5f6b10544e2a39dcfc38fd0a26ac4e726faf28911de14b53ac4f38e75f578bc8b1ae3757e71c69f8fdd824db43d3fba43ecabb
 MISC metadata.xml 817 BLAKE2B 38ad9b5ea5c0882357115f2e0e10747e482de1f49deb0185a258172d520b4304334834ca3a78a3b2360aff8336a29cc248e7478a0bfc6e0833e3f9ea8d2865e8 SHA512 16271bf2dba4edb77e4cf05f95e9bea6c5534890c1303f6d10b9b7449a26b05ab43acc28fd5691d1433ce15ee87214c5a414dc652eb019bb1fb87acfa37150e6
diff --git a/dev-python/numba/files/numba-0.19.2-docbuild.patch b/dev-python/numba/files/numba-0.19.2-docbuild.patch
deleted file mode 100644
index 1c8853c1b11c..000000000000
--- a/dev-python/numba/files/numba-0.19.2-docbuild.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Delete intersphinx, delete entry to set sphinxjp.themecore which is absent from portage
-diff -ur numba-0.19.2.orig/docs/source/conf.py numba-0.19.2/docs/source/conf.py
---- docs/source/conf.py	2015-06-28 15:19:14.573386743 +0800
-+++ docs/source/conf.py	2015-06-28 15:20:16.808191183 +0800
-@@ -36,12 +36,9 @@
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
- # ones.
- extensions = [
--    'sphinx.ext.intersphinx',
-     'sphinx.ext.todo',
-     #'sphinx.ext.mathjax',
-     'sphinx.ext.autodoc',
--    #'sphinx.ext.graphviz',
--    'sphinxjp.themecore',
- ]
- 
- todo_include_todos = True
diff --git a/dev-python/numba/numba-0.27.0.ebuild b/dev-python/numba/numba-0.27.0.ebuild
deleted file mode 100644
index d17a5b2a37eb..000000000000
--- a/dev-python/numba/numba-0.27.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
-HOMEPAGE="http://numba.pydata.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/llvmlite-0.10[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( virtual/python-singledispatch[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Delete intersphinx & entry to set sphinxjp.themecore, which is absent from portage, from conf.py
-PATCHES=( "${FILESDIR}"/${PN}-0.19.2-docbuild.patch )
-
-python_prepare_all() {
-	# Re-set them of doc build to one provided by sphinx
-	if has_version ">=dev-python/sphinx-1.3.1"; then
-		sed -e 's:basicstrap:classic:' -i docs/source/conf.py || die
-	else
-		sed -e 's:basicstrap:default:' -i docs/source/conf.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs/ html
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	${EPYTHON} -c "import numba; numba.test()" || die
-}
-
-python_install_all() {
-	# doc needs obsolete sphinxjp package
-#	use doc && dodoc docs/Numba.pdf
-	use examples && local EXAMPLES=( examples/. )
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numba/numba-0.35.0.ebuild b/dev-python/numba/numba-0.35.0.ebuild
deleted file mode 100644
index 9f39737ab0be..000000000000
--- a/dev-python/numba/numba-0.35.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
-HOMEPAGE="http://numba.pydata.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/llvmlite-0.19[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	${EPYTHON} -c "import numba; numba.test()" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/numba/numba-0.37.0.ebuild b/dev-python/numba/numba-0.37.0.ebuild
index d2e5e28265ed..f9db222ec831 100644
--- a/dev-python/numba/numba-0.37.0.ebuild
+++ b/dev-python/numba/numba-0.37.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/numba/numba-0.39.0.ebuild b/dev-python/numba/numba-0.39.0.ebuild
index 5e43e6e0d04f..b7559a744e07 100644
--- a/dev-python/numba/numba-0.39.0.ebuild
+++ b/dev-python/numba/numba-0.39.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/numdisplay/Manifest b/dev-python/numdisplay/Manifest
deleted file mode 100644
index fb5ba64a3a01..000000000000
--- a/dev-python/numdisplay/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST numdisplay-1.6.0.tar.gz 27397 BLAKE2B e4cc4b2c2c2b6c489829be0e91256f2a8dd15855ad9f24411f604c9c73d9cfd0b1bd598cb12d8c6a4803ff6b9dd3a6697db2d9d19ff12d2478ec1d80c9e110d5 SHA512 345aaf360ff8768bd3ddd0b176c4369e38b43f6883a841a7d1cd3d8a15f0f95309c1949126afa0e37bd569371b483b5885923e7048f09a46086d192a3894bfec
-EBUILD numdisplay-1.6.0-r1.ebuild 607 BLAKE2B 3608ee6ac8ac7b1a3a388f2a39724d4c63bef0af95b065a05a5e04808f559c4e60184210c1b516dc09b8bc3b0b37d293f1b6f7a6410fd783eeed81b8ee1774b8 SHA512 7d674e5857a17f2073d5a334430576fc40ce39bf5131211bfd72980f38253b7e818b7ca6d8fde8a3aa2d4ba0d75bf69b57aa08b43c9c03769769aca8d900d158
-MISC metadata.xml 480 BLAKE2B f97443f2843fd68bbde0d769880b4901c02b179c6f8044b361988833838bb235138d2551ea072dc64b59ffea7dca6760d0b4ffcd8aa843efc7feb8841bbfdc1a SHA512 69d6a96c88974791242487c7823afe3beb006cbd947a447368b1e4239114676b1b18dd3b8bd154cebc0fcc9f5d1dd55fb59c50044b3a85b5aadcc194038e8c20
diff --git a/dev-python/numdisplay/metadata.xml b/dev-python/numdisplay/metadata.xml
deleted file mode 100644
index 82f838a7205a..000000000000
--- a/dev-python/numdisplay/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>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Numdisplay provides the capability to visualize numarray array objects
-		using astronomical image display tools such as DS9 or XIMTOOL
-		directly from the Python command line.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild b/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild
deleted file mode 100644
index 3be5e0fdc6b5..000000000000
--- a/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,26 +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="Python package for interactively displaying FITS arrays"
-HOMEPAGE="http://stsdas.stsci.edu/numdisplay/"
-SRC_URI="http://stsdas.stsci.edu/download/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-python_install() {
-	distutils-r1_python_install
-	find "${D}" -name LICENSE.txt -delete || die
-}
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 70adf49fe4d8..0ec218f01ca2 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,5 +1,5 @@
 DIST numexpr-2.6.8.tar.gz 94517 BLAKE2B b41593183d69cd98f81107da5abc3eb59b35c6e61c0dde213c9a201c2776e4684d8af4b1a88c59ca464a7755941de9baf2157af64e8662c4219ae8ece635aefb SHA512 e610a2e3891f12b3a9fd7acb14a0362e0f03084035aa274827ec5e7d2584f2c599493afaf406d8720d915c7ed834dca11b1fbf28c0645077eb63223a2bf52cf9
 DIST numexpr-2.6.9.tar.gz 94419 BLAKE2B 22492c1c59306fbd93174b5bab2ffaa32628c52cc570871bd6192a4589b65b6f679a77c8ec6f37b0a2ac09f004364a2ba87ecc26f459cb2d4b3b2705196b9fdc SHA512 d43845fb63c1e7b645b282d251f7f112784dbc04b61af1ffcbb9646cbe2e3a9f5d38aaa000f7d49880abe44c25205a6ef1e284577d36868220a197cdc0e55166
-EBUILD numexpr-2.6.8.ebuild 1387 BLAKE2B c3f984cb662b970de36be7e1c83ff2973e2f470d829aacc5165d95cc125de9e98cd0446303ef909b5dc0387124cbbcddae0bd5013d0edec242d42ea37ea9cbc7 SHA512 ef95b842fac172c0288dd763bc9fcd3af175e005090cfb2ac92a5f06ae6b6950df41a6f75b37bb5d17b11dc98fd9e45e0230ff8cd1352cf85845e02344f5c1ca
-EBUILD numexpr-2.6.9.ebuild 1398 BLAKE2B 446678ec64a673d6069f635d81c9ebd91cbef14316a4832e0ed3d1d6f7c8fb1cdf890b4999fac65739439c114a207b560235d11e8d40d8e2e7e7f4a693f0c172 SHA512 b730b5c2fb9ec182b7aefd4395c96d4f378dc9d680ea859580ad8eb81d27d77607a2e7307603f70f5c415186df455f88704341bda6a15ec4a88b09160e35236a
+EBUILD numexpr-2.6.8.ebuild 1385 BLAKE2B a53da3819f962e909c12628592b3069b8c85e306e1dd7f8e225f491340abc657af249a1c362fbd8e6e9754138cdf3554ccda4e9c391ca7b119702de60287b5eb SHA512 1d842aa3325a928e799ccc048d5cdd3741c74c003a9bb8584385f6eb4b8509f56a9585c14db249b8bb885b6dd193f1255cec7cad4ea06fcd84f6226da6ddc484
+EBUILD numexpr-2.6.9.ebuild 1395 BLAKE2B 14075fbc6dca9f960502383df450a46819cccc21bb8ea0f7c04c7c3bf85013f2df2cd2ad21bc0de3e896276290f8e432c79b4fc649854cf2ad2ffb542e24781e SHA512 2de765cee05461b6bd2af8f38dec068438ee9f742ea652c9ee4418a7386b3f6efe8be0955ff2ec4e690236bd04fe0f5951cdba59d5c58f3d461cd9b6f2eadbcf
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.6.8.ebuild b/dev-python/numexpr/numexpr-2.6.8.ebuild
index efa9cba12779..960a34ddb3fd 100644
--- a/dev-python/numexpr/numexpr-2.6.8.ebuild
+++ b/dev-python/numexpr/numexpr-2.6.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/numexpr/numexpr-2.6.9.ebuild b/dev-python/numexpr/numexpr-2.6.9.ebuild
index 4d492d8928f1..08933804d0ae 100644
--- a/dev-python/numexpr/numexpr-2.6.9.ebuild
+++ b/dev-python/numexpr/numexpr-2.6.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/numpy-python2/Manifest b/dev-python/numpy-python2/Manifest
new file mode 100644
index 000000000000..2f0cd3101b82
--- /dev/null
+++ b/dev-python/numpy-python2/Manifest
@@ -0,0 +1,7 @@
+AUX numpy-1.15.4-no-hardcode-blas.patch 3841 BLAKE2B 19ddde096b5b0b1d3c0a98e16c14b96cf9c16ec5d96736ec561f14535fe240eaa8fbe71f396d432ce557b78b18a98ad8684724614f201b1d6151c8edfd07f483 SHA512 8f870f8a52c096f6f0f614dc64ff6d5ed8d8805e14723c60c6e85b69cf915fc698e808f3fcafce75a6ea9e7eb728949dc56ef823d70963d25658e50aa8becaae
+DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437 SHA512 6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
+DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
+DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
+DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
+EBUILD numpy-python2-1.16.5.ebuild 4400 BLAKE2B 72633645c512ec0a25e573112b17f3c0c7155bf2dd75c501fb0e5639d4ba34e541c3048abd3c218908ec2dfaf65503721a97919c97e544f9fc4f29d2492f0b5b SHA512 2e9250eb0829e298fed57153e13706169d07aa49650251d9dc9602fe7d55f6e094b462c02f2931a2ff8f06bd932fd75279d884314090f8eb201c021afd58f2a4
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch b/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch
new file mode 100644
index 000000000000..979b56bd6dc5
--- /dev/null
+++ b/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch
@@ -0,0 +1,76 @@
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index 65d7de316..a85640d30 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -364,29 +364,7 @@ def get_info(name, notfound_action=0):
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads': atlas_threads_info,                # ditto
+-          'atlas_blas': atlas_blas_info,
+-          'atlas_blas_threads': atlas_blas_threads_info,
+-          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
+-          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
+-          'atlas_3_10_blas': atlas_3_10_blas_info,
+-          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+-          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
+-          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
+-          'mkl': mkl_info,
+-          # openblas which may or may not have embedded lapack
+-          'openblas': openblas_info,          # use blas_opt instead
+-          # openblas with embedded lapack
+-          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+-          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
+-          'blis': blis_info,                  # use blas_opt instead
+-          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+-          'blas_mkl': blas_mkl_info,          # use blas_opt instead
+-          'accelerate': accelerate_info,      # use blas_opt instead
+-          'x11': x11_info,
++    cl = {'x11': x11_info,
+           'fft_opt': fft_opt_info,
+           'fftw': fftw_info,
+           'fftw2': fftw2_info,
+@@ -731,10 +709,7 @@ class system_info(object):
+         return [b for b in [a.strip() for a in libs.split(',')] if b]
+ 
+     def get_libraries(self, key='libraries'):
+-        if hasattr(self, '_lib_names'):
+-            return self.get_libs(key, default=self._lib_names)
+-        else:
+-            return self.get_libs(key, '')
++        return self.get_libs(key, '')
+ 
+     def library_extensions(self):
+         c = customized_ccompiler()
+@@ -1685,7 +1660,7 @@ class blas_info(system_info):
+             lib = self.has_cblas(info)
+             if lib is not None:
+                 info['language'] = 'c'
+-                info['libraries'] = [lib]
++                info['libraries'] = lib
+                 info['define_macros'] = [('HAVE_CBLAS', None)]
+         self.set_info(**info)
+ 
+@@ -1717,16 +1692,16 @@ class blas_info(system_info):
+                 # check for cblas lib, and if not present check for blas lib.
+                 try:
+                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+-                                      libraries=["cblas"],
++                                      libraries=info["libraries"],
+                                       library_dirs=info['library_dirs'],
+                                       extra_postargs=info.get('extra_link_args', []))
+-                    res = "cblas"
++                    res = info["libraries"]
+                 except distutils.ccompiler.LinkError:
+                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+                                       libraries=["blas"],
+                                       library_dirs=info['library_dirs'],
+                                       extra_postargs=info.get('extra_link_args', []))
+-                    res = "blas"
++                    res = ["blas"]
+             except distutils.ccompiler.CompileError:
+                 res = None
+         finally:
diff --git a/dev-python/numpy-python2/metadata.xml b/dev-python/numpy-python2/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/dev-python/numpy-python2/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild b/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild
new file mode 100644
index 000000000000..caad08decf1d
--- /dev/null
+++ b/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+MY_PN="numpy"
+DOC_PV="1.16.4"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://www.numpy.org"
+SRC_URI="
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!<dev-python/numpy-1.17
+	lapack? (
+		virtual/cblas
+		virtual/lapack
+	)
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${MY_PN}-1.15.4-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = $(pc_incdir cblas):${incdir}
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_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
+
+	local python_makeopts_jobs=""
+	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
+	distutils-r1_python_compile \
+		${python_makeopts_jobs} \
+		${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() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${MY_PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+
+	# Let latest version to provide f2py link
+	rm "${ED}"/usr/bin/f2py || die
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 888578ee8d95..5809afb3890a 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,7 +2,7 @@ AUX numpy-1.14.5-no-hardcode-blas.patch 3767 BLAKE2B f580a067b9c91a53f99daffd33f
 AUX numpy-1.14.5-py37.patch 5417 BLAKE2B a6660b06a6f5ebc436b8bef4f53934892384889304f3b48ed1e9e84298deb78528e431e2102856fe1bc44b5e9a472b3a0b51401ad824b7072465d8c54f6aa939 SHA512 78b6a1640cf51e9b58478fd9ad5044bec2efc1319cc050f0a1345fc367b57b9170954ce25b88b2851007b438a00ac380eab48f6b699fed1115d109972ec553ad
 AUX numpy-1.15.4-no-hardcode-blas.patch 3841 BLAKE2B 19ddde096b5b0b1d3c0a98e16c14b96cf9c16ec5d96736ec561f14535fe240eaa8fbe71f396d432ce557b78b18a98ad8684724614f201b1d6151c8edfd07f483 SHA512 8f870f8a52c096f6f0f614dc64ff6d5ed8d8805e14723c60c6e85b69cf915fc698e808f3fcafce75a6ea9e7eb728949dc56ef823d70963d25658e50aa8becaae
 AUX numpy-1.17.4-no-hardcode-blas.patch 2769 BLAKE2B 800bd23df8f23f335a8298041403f7caca92128e759db85c354c0328447c2b0cada571694bb96d4e9231b12ab91c7f9533526a06427723a3db4a75f502aec443 SHA512 8f31fdcb5acec9f5a346b35625e526d120577fba95d9039d53c3ad2441a5fc6950251d6ef58ecc53110873d76ec9f9a12c65f60f909413f26f3734f8e0bcfb09
-AUX numpy-1.8.0-no-hardcode-blas.patch 1153 BLAKE2B d812ddc3069d23f211026c14ca36aa907c254b5e5305e720bc87bb5fbd51dd032f93eecd245c222ae8fa81dbe1541a2ffb1524e685a05f238758b4487e3532b9 SHA512 baa29a0c981ede608d890e776026961fb71156eb7804f702623bce775e3b6ce3bb28ced252d9c6fe991429b690b3eef8468d703f79247820527648d6484d23f3
+AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67b2843021c6f42773781668a556eb48d7038acd0b1c7cbf30a432fdc3f4d2abf8eef28df7102be1bc9669a4ddc4ee4fc5e239d68 SHA512 9c6dc7e4f5b28b24ac5e1c686066c973b218b0e4e07b500a52c8b3e247acb150714072d17dd1a8579f47c48e9776bddebf9f049616aca52e0325c8f09ef09dad
 DIST numpy-1.14.5.zip 4904624 BLAKE2B 14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0 SHA512 e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
 DIST numpy-1.15.4.zip 4473522 BLAKE2B c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090 SHA512 9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676
 DIST numpy-1.16.1.zip 5070040 BLAKE2B 0429d27d88ec97e207822c9c7fa759453bbef97d1d5fdf3e68dab21ca098a6321e2e57d85561dd99084d190b8ed6fce20f00b421c8d14a249fc45dc1ea09569e SHA512 e4adce4f40a3cb6ac482f82db9fcd079179b03b0e878920cfc7d98b9f622adab997c68af892b209f417d5f31b4123a1c5ff5c07cf5b0aaa496d8be6c8354bde8
@@ -20,9 +20,10 @@ DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e
 DIST numpy-user-1.15.4.pdf 596191 BLAKE2B 1387b7aac9cccba4b7ce259391f56372959db35c4ddce111afb9949347ebcf3290e7d3fb5b1b2d2e7850911259cddb07edfe104c1396ae8e31a58a81e9293f16 SHA512 2089753b48412f094b279c378be1d221ec9b171957171a4e26b4589d594e00b4f66b6f8a88a7eb665e8c3fa3e6ed505d63da80d4d01ced041544b97ea56fe212
 DIST numpy-user-1.16.1.pdf 592508 BLAKE2B 88ef7aac2998fd8eeebc3ab92df9ad9ba139b67ab0442cd4ed91cdc7b1cd72acf7905468118df25634640b709106758455c7d316539b941d7760010b8135fafa SHA512 d089b4c663f92c38aa075c37974df757bdc457f75980737477a4477f67311d28149bc4c20f5d1cd0877221a78e5a9ff10702b1ebcc8ab062d328cdda4087d0f7
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
-EBUILD numpy-1.14.5.ebuild 4105 BLAKE2B efeb5636a8b6c86e4cfad8c681e83face73864836af07558e5538f0eeef134331889d464150f4978018c721da48d49e79a104fced2da935bb8d3e9e0930f6e92 SHA512 3b89faf902d55d333bc9d4487fa5e753fb837a10dbc414bbe3157a007936fc0dc9f70843ef4c169845aef00cb48f7c8cd9fa7a5f5155c3e36b45c771247e5db1
-EBUILD numpy-1.15.4.ebuild 3916 BLAKE2B 659ccf8a6bc7acd4899aad0303abaf3e42db17a28e36636e4eb0da9dda607f4574c576fc622655d3afa83fed641e6c331deaf3e12c1a60bababaacc2873ec22c SHA512 5874312dffe34ad0c77f0c808fb90e50a85880046ab4e866f31d26cb3f369c10324af2e8124e8a49d6c047cce1e460d6ea55a446ff9bd226f8f17b0192663c72
-EBUILD numpy-1.16.1.ebuild 3936 BLAKE2B 0d3dc2c4895e2c28ff7174e6152332c6db1eef1b51e77072e319f74fc6a16b340d8555894672350a1de71e34d55143dc05b32ae1aa44898d84f1da1814d78a5d SHA512 90d4594f0a1cfe312e78302fa27c17bc057ed3bd718de9f43053a6b5419fb5212d93ed96600ebabe37a20dbc9c4901457dd42b52b6583f5e453d076191bc5ad4
-EBUILD numpy-1.16.5.ebuild 4225 BLAKE2B 4f08f746030c6c21b6f53253b4eca417e7e6e827d6179c219f1c40a20883be428da70d8c827246d2cef195ddb4144ea7b3a74f0031e0b3caed78284b570ef8ff SHA512 5a1ecdb57965b09910551ff03c56c07b784d7705c67361a1d52155f59f7567d699c35ea987826c34256322900d95f61cb1dfeb5e248b647fbee3afed1574af61
-EBUILD numpy-1.17.4.ebuild 4232 BLAKE2B f26e8430e5fc08584a67066024516bd59debaf4e58fb758edfb9f57d4738836e251c7d57cc8fadd67f40015e17c30102f7de874b91376a805e07bbc9894b2874 SHA512 aa9c2122a075faa4f4cbc905331f1d9ffda0843e17a762aab754e16857a94e280612053d295a51f67daa1f49076cedb3e45a9833a0fc13759402d39386a8f6f8
+EBUILD numpy-1.14.5.ebuild 4103 BLAKE2B eeaf60f0d6dcf9adb805ebbd4185061dc21c81d2c5064d1f0c3ee838d68d0bed5f52adeeb138f8ac84fc9ad0e8cddd926142c9d2ca1867b05f1342993db54403 SHA512 c3f585498951aa39e160cc65391fa2d91a08e41981f82daf11562a80e1c1beb4100d06ee619034f0b5dbc211cf06e86e5e26518538d1bebdb18e6c267a8a46ce
+EBUILD numpy-1.15.4.ebuild 3914 BLAKE2B b1e4541facef34dc973bd1de3d7c9fc556116fa936c7c4ea6f4aa4cac2d727f56743743f5e04f7f0355d8c085457d44c2f2f478bf5bf52310be23d2ec1451b80 SHA512 23ecdb6df8cd632f661aa8518f90e90d1d0fd5fb566e4d97149f92cf19995f067ce5e405b3b0035e740de53383d358eca00f503b63a4227b4d7592909d26b90b
+EBUILD numpy-1.16.1.ebuild 3934 BLAKE2B 35063ed7529f4cb757b7dc3aaf8c0009bc4e72aafb6723267ac582ccccffa2e2f079d3cd067a88c32f935de3622abb1875d7bdcf8417d125ad1750f2568b5b2a SHA512 db1c4337360dddbcba2a34eb1f282dabeb652f36a3f216332b2e6d6ea8058e16dea642ea5e6f583871436e7ffa75eae59cb1daec797a41a3097678b8554ca5be
+EBUILD numpy-1.16.5.ebuild 4223 BLAKE2B e8de035eab95a811936542fc223d71fce1c3a98c01b6c4f6f064d0fecf231acf4e3d28dfe368c09a06a84f6e95eafc7bd30eedd4fab5d58afc1f97bc792996da SHA512 2d47d1a95f0e2a7677a4ac29ce44ba519fd620c732bce8a2df15cbbfc6d198a56187e837e19ee27bdd8ed6bf7bd4d04d3c67a78e09ec0b2d4da8e0d74df04d41
+EBUILD numpy-1.17.4-r1.ebuild 4085 BLAKE2B 97f33b37330e8ef2672d1967f9b5ad33f6647dde276dc464ccf1d774d3865af02d2d4b571f286b595e03905bcf8707500ce10edadead113cadb467c683ea00d9 SHA512 61c18fa1c261f62b9a964a80edc416f2b1ebb6e7579b054b05e343f0208e8f8a452f07651fc653575014beefb3f86e790bd4f65f69b0e48679f5724b5c186250
+EBUILD numpy-1.17.4.ebuild 4230 BLAKE2B 8ef305e01f0217df28459560322e08c13fb14f9447b094f65627f129f40cde81dd4ab9932226f2d9f1f1b610d0baa785028ed36487dc7e3e500eb8e666a00ffa SHA512 95dc8135ec99d8427e71f4722d7afdcbff4a6dd85f06b038ba1e6da488121d0c1d738a13b20dee3a0815ba9c749c4f90d641aca83d1f9bbe54190931837ce244
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch
new file mode 100644
index 000000000000..850f70f4551a
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch
@@ -0,0 +1,47 @@
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index ba2b1f46c..09db18e69 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -374,28 +374,7 @@ def get_info(name, notfound_action=0):
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads': atlas_threads_info,                # ditto
+-          'atlas_blas': atlas_blas_info,
+-          'atlas_blas_threads': atlas_blas_threads_info,
+-          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
+-          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
+-          'atlas_3_10_blas': atlas_3_10_blas_info,
+-          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+-          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
+-          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
+-          'flame': flame_info,          # use lapack_opt instead
+-          'mkl': mkl_info,
+-          # openblas which may or may not have embedded lapack
+-          'openblas': openblas_info,          # use blas_opt instead
+-          # openblas with embedded lapack
+-          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+-          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
+-          'blis': blis_info,                  # use blas_opt instead
+-          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+-          'blas_mkl': blas_mkl_info,          # use blas_opt instead
++    cl = {'flame': flame_info,          # use lapack_opt instead
+           'accelerate': accelerate_info,      # use blas_opt instead
+           'x11': x11_info,
+           'fft_opt': fft_opt_info,
+@@ -796,10 +775,7 @@ class system_info(object):
+         return [b for b in [a.strip() for a in libs.split(',')] if b]
+ 
+     def get_libraries(self, key='libraries'):
+-        if hasattr(self, '_lib_names'):
+-            return self.get_libs(key, default=self._lib_names)
+-        else:
+-            return self.get_libs(key, '')
++        return self.get_libs(key, '')
+ 
+     def library_extensions(self):
+         c = customized_ccompiler()
+ 
diff --git a/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch
deleted file mode 100644
index eaf30dd8e130..000000000000
--- a/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-patch to allow any blas (c or f77) to simulate the
-special treatment atlas libs have in numpy.
-2013: numpy.distutils still horrendous code
-
---- numpy/distutils/system_info.py.orig	2013-11-25 19:54:45.760217851 -0800
-+++ numpy/distutils/system_info.py	2013-11-25 20:00:26.575310888 -0800
-@@ -293,17 +293,7 @@
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'mkl': mkl_info,
--          'openblas': openblas_info,          # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'x11': x11_info,
-+    cl = {'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-           'fftw2': fftw2_info,
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
index 55a472e0bc84..facc76fe7b19 100644
--- a/dev-python/numpy/numpy-1.14.5.ebuild
+++ b/dev-python/numpy/numpy-1.14.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/numpy/numpy-1.15.4.ebuild b/dev-python/numpy/numpy-1.15.4.ebuild
index 8a97cad7ac9c..7c4e514f4986 100644
--- a/dev-python/numpy/numpy-1.15.4.ebuild
+++ b/dev-python/numpy/numpy-1.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/numpy/numpy-1.16.1.ebuild b/dev-python/numpy/numpy-1.16.1.ebuild
index b923d3d6d813..3cbc081a140a 100644
--- a/dev-python/numpy/numpy-1.16.1.ebuild
+++ b/dev-python/numpy/numpy-1.16.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/numpy/numpy-1.16.5.ebuild b/dev-python/numpy/numpy-1.16.5.ebuild
index 68c575ddf570..8f51b01deeff 100644
--- a/dev-python/numpy/numpy-1.16.5.ebuild
+++ b/dev-python/numpy/numpy-1.16.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/numpy/numpy-1.17.4-r1.ebuild b/dev-python/numpy/numpy-1.17.4-r1.ebuild
new file mode 100644
index 000000000000..c7836c89affb
--- /dev/null
+++ b/dev-python/numpy/numpy-1.17.4-r1.ebuild
@@ -0,0 +1,154 @@
+# 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(+)"
+
+FORTRAN_NEEDED=lapack
+
+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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	lapack? (
+		virtual/cblas
+		virtual/lapack
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			lapack_libs = $(pc_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
+
+	local python_makeopts_jobs=""
+	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
+	distutils-r1_python_compile \
+		${python_makeopts_jobs} \
+		${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() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/numpy-1.17.4.ebuild b/dev-python/numpy/numpy-1.17.4.ebuild
index 607f5f55d31f..3db67281f36f 100644
--- a/dev-python/numpy/numpy-1.17.4.ebuild
+++ b/dev-python/numpy/numpy-1.17.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index cc6614065167..1007a006f6b0 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,7 +1,7 @@
 DIST numpydoc-0.6.0.tar.gz 32464 BLAKE2B 3296da3630c20eb2b1e0aeac4c5c4c912f9011cdcec0f54145532759d0b3ea7bb68529e5b3f5a1d640f3bf2e574fc03c3e7bc29f6fe1afacdcc92aadc3766fb5 SHA512 aa86854cfba93f27540eee8a7937c81fe006e1d96b556b66ac643d9673b413fac357762068ca5675f265c7d2a80b0ba000416f5ddf3fbac2bfe4315fe0f48aa7
 DIST numpydoc-0.8.0.tar.gz 20488 BLAKE2B 8af3bd363e288a66dfe84c412ba3d2a1e4afb7021f665491496374b47e0bab4756fcb5d4196abfde0e64f0acec91c18a7eb6e5314767f88e4932bfd3086e18b6 SHA512 8302c7eb6518b46823655ff26776beae35011c9842b6ed61d1db3f7ffd1f34ec695ffde0f0be91152ad59510a5904445ed6dcd877f9b1fb520adc8d9f895635d
 DIST numpydoc-0.9.1.tar.gz 27583 BLAKE2B 91764f74b35a740790efa9faade69622d48777fe97a62824b91d78ebf62f806f8c5ec34b1e6c4a4afee6e87358edfa40ca0d316ea41f7ed8501733a51797611b SHA512 85a47ed86823baa3125dde4bb2760ce56f6fed9bb29dc64187dee4101f6344b5065146209f603d50a84a5d9cf0b7f4e5134fc0b495219e68100e05e028b61f2a
-EBUILD numpydoc-0.6.0.ebuild 750 BLAKE2B c262ad433e08936b3ed4dc442f3de764bf9a5f8951a13e3fbc38ac777e0456f5575c28559941c3351121a8b5f48c297e83f087a34e6d1b9af3065c6c927518b7 SHA512 1b2fd8fe415f57fe64b3b17664f85cf9def4f0e8a4511e62e898b4466e85672b5075686583cd900594193757963a2468dcccb22b95495629c58e911933e57de9
-EBUILD numpydoc-0.8.0.ebuild 799 BLAKE2B 1b4ad1cb1e0aaa420e8e6c3d4de86423e45338a233af0f2914f77647158d56bc231fac2644aa08f7fad5b8b22a0ea853f75ed55ee6df4efeba6d0f8a5b685d66 SHA512 4fa4f45d98da173328df64f681e91ac14597074f27343b6bc289ee4fffcf71de364aed2c66f42bc900be5d2f1530b15d1e19707daaf8d450c5d5769d5f39782d
-EBUILD numpydoc-0.9.1.ebuild 797 BLAKE2B a89aceb09ebe1a85a9f17dd2d467a77e709a48f2c31732560ec4a6362c35595bd8e594dd0158703a52cede647355d329d483fe862ab545d1e28932be82d6e8c6 SHA512 384974a08addebeb3f094398ee39f1552c094efc75038285f297f19aff8927bc8318517fafbcdb9050c5aab8d72c20895ed13172754efdea5ff14d4ad24c04f3
+EBUILD numpydoc-0.6.0.ebuild 746 BLAKE2B 00c2c15675cbd1ea11252fba6cf486507ecf477c7ec7674317d07b7d48cfdc011cad5d8eb68cb4ac7fb05fcbf217758ad9fb971021047d935f0b03582d5d0857 SHA512 783e25ad16c880d3b2872366af650d6274f8c89703fae2e74da1f538b1fa9d5a28424ea3ac2a1d7fd7a69b9f3eb151b65211d3a133f288d86060e227f413bc5c
+EBUILD numpydoc-0.8.0.ebuild 797 BLAKE2B 395ffc5333dd87defd8c346b6d6925065dba7afbfbe3a4ce571163ccd6f42d3bff07e5dd24d45662259d3ad2995a546ec5f5bb65bcb56ab25644a23bd730c126 SHA512 1c38cd6dc1351924901ecdad7a4f9dd5bf073f415ccf764ccd238971f789ffff70d476d2f2055e991bfb18a5564416fc015ad13b6d16e37cef734d8a286b53cf
+EBUILD numpydoc-0.9.1.ebuild 795 BLAKE2B f0ff2fe014d6d1650b95107a78288678aae825faf9611396b351f273974952cbe392b5a7a56f689fd51f632ebabbe2d78d246d7c53101e9b82737b29ac88e59e SHA512 d9562ff14205b382d3e23ec80306f74cf96004572a8f2185bcacaf7b799268801278ac9fe83ac1023f435ae51de449d86e309471e14e229a7ce20549c7183ae1
 MISC metadata.xml 321 BLAKE2B bbd5917a97e564f5abc495cb2632e42ab36ac1e2441be7c0a375224af7be481b00e5b8e60b6762653401021104b0094903a62eabe9a221020390a74753fcc258 SHA512 51803da4bebb8d1ac7fcc0e33ec99234b4f497a2817361032712c35ea57e9e58591fd675c9273d7627f94c60e010878b9dd6a6e8708704f36c945344159880a2
diff --git a/dev-python/numpydoc/numpydoc-0.6.0.ebuild b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
index e4a6e786743e..f361a74250f6 100644
--- a/dev-python/numpydoc/numpydoc-0.6.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/numpydoc/numpydoc-0.8.0.ebuild b/dev-python/numpydoc/numpydoc-0.8.0.ebuild
index 7bcbac1ead17..bbdbcdc8785c 100644
--- a/dev-python/numpydoc/numpydoc-0.8.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/numpydoc/numpydoc-0.9.1.ebuild b/dev-python/numpydoc/numpydoc-0.9.1.ebuild
index 75bd98b4d478..14c536f66acc 100644
--- a/dev-python/numpydoc/numpydoc-0.9.1.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth/Manifest b/dev-python/oauth/Manifest
index 9c04a5333f71..bc8eafbd1630 100644
--- a/dev-python/oauth/Manifest
+++ b/dev-python/oauth/Manifest
@@ -1,3 +1,3 @@
 DIST oauth-1.0.1.tar.gz 9533 BLAKE2B 621926e0ec839ffe4aa3eb22eee1d3cbdf1e5fbfc152d4ef127ef271c69f7d036a2b4dec634a78a2dcdef1d3f4a6f5cc27900324787c23f0e4b7ebe59a64beea SHA512 a503b1bfff18c97a0e666cc376bfcb11e3cc0f3340dd16e0254fcd4340ed28ab0fc52d1de81b573309351a5edaf83d0b437c155580c00e32a81a7c219ee7eca9
-EBUILD oauth-1.0.1-r1.ebuild 420 BLAKE2B 3988d6873b431f6d9758e551125e4e005d7d534dffa78283c1313bad2c9a3cfdbc747ce833bfc2b23d4e748baaca755f4916e69e514303350bdd24785f2723fd SHA512 45aed0603281e46cdb1926be2278bed13eb2358d91a6f84874e4e1cff9880c0a9cb31a237d97a5619cb9a792c2609e79a8a2b1b09970538228ea84e53e19b431
+EBUILD oauth-1.0.1-r1.ebuild 412 BLAKE2B 36b761b85d8b88db244b2dca3910fb665abd8e97228f0b6d4ae2e6259a5ace283821e49b64c6da0d4149d4246a89461c8883ba839195ff5b17b9c8981d898102 SHA512 68eee6ef547eefd70e2fee437523b9a5e0ca0d6ce1d90308e8c5554170750333e09b56f9ca64c79825261cbc2232ec244292edf145d47bab36e2659a50399012
 MISC metadata.xml 308 BLAKE2B bc43d346ef9f7e197058b62366bd2c572f6367a154102bd22a7343ea4fd31704f0150e0b7e0e860be58c030bf3c2ac1c803dd000d4468405610bbfcf7280d912 SHA512 0f14e64b2b19c1895773d57a4814878d825986856cd5b8f383101e8f17e11c762123b57b19e9c9bd74bcb533c084a9cc33e46e990fc6291d623e83603e61882e
diff --git a/dev-python/oauth/oauth-1.0.1-r1.ebuild b/dev-python/oauth/oauth-1.0.1-r1.ebuild
index 32feaddc9414..b7d1b47d95f8 100644
--- a/dev-python/oauth/oauth-1.0.1-r1.ebuild
+++ b/dev-python/oauth/oauth-1.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth2/Manifest b/dev-python/oauth2/Manifest
index 4347c7b37927..1740db33f3c4 100644
--- a/dev-python/oauth2/Manifest
+++ b/dev-python/oauth2/Manifest
@@ -1,4 +1,4 @@
 AUX 1.9.0_p1-exclude-tests.patch 332 BLAKE2B 82d468bd3f94baf4e99ddcc17252bad0b71ff2331aaeda3ec3d7b4117017b5a9ac2ab57f4fcdaeeaae9afec4c39e1ca5481e2463e197eba7bae40c6d27e0af05 SHA512 9b4b45d22076517ac6e79ecd74430ee7e53501aea07f0e2c43bae3c119e572d9357dfc32adb036920f4ff15c1344ea3cde20e79ee4c609508feeb9fac3293c57
 DIST oauth2-1.9.0.post1.tar.gz 21306 BLAKE2B 3e61ba6d46b98c594fa31e828885930490f99390f14e0173bdf719cfc1d5e8ad385e56c9654e139279cd95611a7e35b1fe0276679a2a4849b67125f5e6919788 SHA512 a3b64eef331d4c4f59c275f14efb2dfb48ad60de47a59a88106f60d64428a09b76d8bedf08c98c113493968d83708b1478b4b61b2b5528b5b01fa22777daff4c
-EBUILD oauth2-1.9.0_p1-r1.ebuild 1033 BLAKE2B b97d12b2b42767100286dfbfd76910e7cf989b98390ee73a8ff49ef6af1f0e801449b70f9687ea422730e4f7f84e325eb80544b9191a25d0474d5d6c3b305668 SHA512 c2d3e16257347cc886fdd1505911b43943ee06445d76119363b030465c4471a43be58db89bc0825ccf44b818ef0f63fdfe294c4e295e24e69c07f244f073919e
+EBUILD oauth2-1.9.0_p1-r1.ebuild 1024 BLAKE2B 1bf8d1a84a90c805ae8029fa3d25c3edab2e738b04e6c5d4d6fb71bef06672e311756dd29cb6464389b34abf130490101717009a2c0b2a75667b607001e703e7 SHA512 3532f143242d744386180e21cd490002d2fcd274b06d0aabef1a444caedd008eb70c2c7315582ac34a5acfb5cd68555cbd6ab8d282c10f45ec37f60844e1b9a1
 MISC metadata.xml 371 BLAKE2B 6c43294e3af678e152bc35ab923bca43990db39552673b6dde5206eb5d82199ca46d4162d53fe1f62b09ec15ae9b54b27c5c5c59ca3957ccdb532feaab63147c SHA512 292d51b2e24153b3351aa1a78e5246ecc0d36f21697f0637390ee5869b770bc24a9dcf01fa26e8ab6feeb61902bbc34659f34969537eac0c647445c03cb086da
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
index f9addfc1eb35..b2f0f827eb1c 100644
--- a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
+++ b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 9b23c83c9c69..a35966882377 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -2,8 +2,8 @@ DIST oauth2client-2.0.1.tar.gz 153127 BLAKE2B f7e7ccbe42effedfb94abe4f78e2ea0286
 DIST oauth2client-2.2.0.tar.gz 167484 BLAKE2B 60c7fc941548874f436df094a94e97312983f88af8ca472c998cb7121662363793423d420fa3e7e83032b82a3fd22a76f9331a60e3099785ef82d3fb5a781356 SHA512 1e23c3f655e955dbf0cdb2b78613768ca4c6eb4336b555e3553da212fd762ba12329584f108d8145810228cf44da018675b38dd152b06e58be4eb18d4f8127c6
 DIST oauth2client-4.1.2.tar.gz 184731 BLAKE2B 09ae16a94b1f6b3eedb02ac10d660d8fda78faa82da5fed75b2a40308049c7d78951d593352f2e02c7bd9255e75b50c20996d12f451c20e1dcf2c32f54008b07 SHA512 908f0e32f0ef76c3eb86ee34118d4100bc08fa34aa89c561793bf8c55078f07611935ee6aecb6d2ae2f7e96a18ac3bc25af0321fe564f26042ff2bb5eab30b18
 DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
-EBUILD oauth2client-2.0.1.ebuild 1116 BLAKE2B 6f44662774bbcc87956a139350f7f80e603f786a78ef752104bd4a636a2f1ed0569e0f930ecb9b887ad48caf6b98d96d9fbe5fd35fa180fd5090d3b36643d9e7 SHA512 8fe080acfdbc270f5c367982c1686531591d0bbeb4d150ce8726931f5c502f7e46feb9b8fbfc9bb1dd80acb0adb8ce89fd6cd3078b2f00d80290c66c9b256975
-EBUILD oauth2client-2.2.0.ebuild 1119 BLAKE2B e35cf70076bd57d2dc5c32b1cded13a6a72dcf223cd4823b60f78fa54cb8a1a0313cf9960c41468c9abe3509a0dc4cd62ea12852fd1cbabda38454c0956e04c1 SHA512 e560828a0ce512a6de838d61a945053f8a5b5f0c54ed82edfa1ae00bdbd20d3d49e7be3d2fb4838f7fae9341025f8512bee6e20330260edf93931cf40000b610
-EBUILD oauth2client-4.1.2.ebuild 1725 BLAKE2B b77b37dd6f0950aad62af16d88d8a44a79784dfa8c15ea9a55046989ae36ee882ad1d383ff934f0259c8c9ef5c9202f4b1215e36304bc1c61a2ebbbadedf5103 SHA512 8dbb6c503fa55795cfd018fe2b25e79ccd877144615f8885cba9f1b09b8fcd594dac8bf8e71ce62974687ff0ea1492a6a06b803b9e9ea3656df6f882a6a107ce
-EBUILD oauth2client-4.1.3.ebuild 1727 BLAKE2B 113266928bd82ff55364ef1857a0d979cf92e6cc650b94afd805bd5a7e6c28c478fd9d9541277c4057e70201ffc8b63ca10a85f79fac521a1c8bba20c4608535 SHA512 633b3c75f9df11c4c297a70f1c1e4127c9e1055b3aaccdca2261883716b5a39b913985bab7a5cd8eb99475c034d5f3f70bf9343240f4dd43f841984778772884
+EBUILD oauth2client-2.0.1.ebuild 1107 BLAKE2B b97fcde5f3c8aa7da8b29c04002605d1fbc441c2b0265ea07262c3ddd7770b98db9582f86e38ab15554c603b6468de88979cd50c8c1c2662927227129f85d586 SHA512 1c7215364cc18328e4d9bf44b8279344e39d09e8ebf109636d05e5dec6c33bad0dc3c8232bb7de9fd3e6212becc60ee9f2370c791081ea9cf38a56ea40168eda
+EBUILD oauth2client-2.2.0.ebuild 1110 BLAKE2B 84e9ef9785d6846e37e76ffe68ee188aea1be5a4e5947e8a143e30b3516154f67a103e5d905ea412f96fdcefa68b749e0bb89359fb6a493bf8bb22d35e860774 SHA512 2a807f26b11fdc5bbb9f6605bef327d6ebdd629c9804b65ae2e89012989aef81643642b7475cfe52c1b2d56d8923c1b3aa0e8eb66eca329e1d303ade4d645c17
+EBUILD oauth2client-4.1.2.ebuild 1716 BLAKE2B 624d8491de253283dce3b11bd8bc97a35ad0b282ed168632f844825a010f4275507b730f9dbe84f2c850670e11241ff933d093882b38b9dc311e4e66764cd938 SHA512 52a6fcf09a7294dd507ea678dbcc5d5f8feeccdb47ab2c63b4c0bf93c63b8435f2794d0ec942c5cebe28f635b412c1c0922ab6b7b0c4260ddef26ad7864bc72d
+EBUILD oauth2client-4.1.3.ebuild 1720 BLAKE2B cccb8e56be25babc71a62fc85295b6fc61ed4ab767f3064194b10b156cc804e79df9438a1006bb4180a9d7aa979319e7c2deed22bf3825b1febb9f0533587c1b SHA512 0b0f9d22a2fe97b2bc99883947b872e20053eb8f0631f221114dabee747d98a8756fbae10e6a71369a4ba2fab0f4e1a040b40a6f780777faf3779d81ded202bb
 MISC metadata.xml 334 BLAKE2B 474087a66809e8ad113f10c3f674b5684858d0eb67d58f54d19557f9a32295f96c587aa945eb6b4fbe338690a096fb59109f907902cd4e08f40c4d62f5dc7e54 SHA512 585f6ddeaa1a11022fcb9bab897e02392157abca2e638cfef57d76a97be2d85071405bbd70a256172d6202e4a4deca47ddb2374b98cd810e60541c2d4d3d373c
diff --git a/dev-python/oauth2client/oauth2client-2.0.1.ebuild b/dev-python/oauth2client/oauth2client-2.0.1.ebuild
index c35d90750f91..9e4fe5bf637b 100644
--- a/dev-python/oauth2client/oauth2client-2.0.1.ebuild
+++ b/dev-python/oauth2client/oauth2client-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth2client/oauth2client-2.2.0.ebuild b/dev-python/oauth2client/oauth2client-2.2.0.ebuild
index d145f97414fd..750cc3869f83 100644
--- a/dev-python/oauth2client/oauth2client-2.2.0.ebuild
+++ b/dev-python/oauth2client/oauth2client-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth2client/oauth2client-4.1.2.ebuild b/dev-python/oauth2client/oauth2client-4.1.2.ebuild
index 46415d90c2eb..5a6e3debe7d4 100644
--- a/dev-python/oauth2client/oauth2client-4.1.2.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth2client/oauth2client-4.1.3.ebuild b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
index 27f0762d6d95..22cdb28cf896 100644
--- a/dev-python/oauth2client/oauth2client-4.1.3.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 0244a7640fed..e95c7095d3c5 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -3,9 +3,9 @@ DIST oauthlib-2.0.2.tar.gz 125631 BLAKE2B d9d6efd396dd320573a4c95ce94f5465ca67e7
 DIST oauthlib-2.0.3.tar.gz 127155 BLAKE2B c3c69fe8e1f2a1672ad78755b35ef285be9e6d61ff5ba1792493d475eea1d47d38acfbc29ab150eddee83b3d41f60b14ba91074c213e5e92186842c25bdbc7ce SHA512 40eed9aacd6c239745523bf056afce8d76615ef9dcda8ee8a46e2900f940674f4178daf70c18c2bdef9f607db3fba84cc10b2306c608116ef2eb08414268125d
 DIST oauthlib-2.0.6.tar.gz 127675 BLAKE2B fb9db14e06007d575fc099381b9aea8f337666716ff8a6f7331febe9f41f38e5c5abceccbbac41da993a389ce2f171dcfb6fa7d75b09eb70d08e09d56b5e8a80 SHA512 3d966a540e3aeb2c4e72ecf60c28a596de1e11b986b68f2a2aa8b56efef12fd1a0181d64e083850843f38e329d9a6a401c244c02ae61f06af428d8188ea0864c
 DIST oauthlib-3.0.1.tar.gz 149303 BLAKE2B daf826a3959f56f70b7f52ac1fc98d8ec73161316235cf7f0dce17469999383faa1b11c50c9645748b39938ae1d24dc3dea3908b68daf8c838f99df763bc361d SHA512 88ee266f764488090b849c036d2475c31dab0d8b18bd6afd0450da6aa0982ba17cdada7d0c25791d5efcf89601f69ae40cd21c584540448c209f90d36e0e98f8
-EBUILD oauthlib-1.0.3.ebuild 1057 BLAKE2B af3883fe575c2228c1f8a96789ad03853d0dbccb8fcb0153d805db954a0c1ed960d253e7b32984834fa8769c463619f356ec39bdc7de9688658c16c04427f5f3 SHA512 8fdc9de4cbd943978bc9bfeafbfad87c014aca60c044c98a326e5755119a8011034b4d29e003cb0d1e34e7a34dc07010da111b2bed374dd3207247b4997d6765
-EBUILD oauthlib-2.0.2.ebuild 1016 BLAKE2B 30877db67d77f28f4b73afe788a9c6d76c11c290d4adf8656e1ded159e81de0ea76e42b818ff3ec9645e6affe795d38d99d29a3e8de341fcdd01a16c0f676b36 SHA512 ccf03044451cbbf8b6a557cf41fbdfc945bc9bb47a6c1997b072605059da23a9d361b9c6945d3a0c5a089e953f5af349f49016ef86a67a5babbf5c876fd5374e
-EBUILD oauthlib-2.0.3.ebuild 1021 BLAKE2B b7876fe82df7759b13de6c7f137fc4e2b426e9a18e9354e8e6a406bc4e0f8b9780667ea399ed29f1fc23695ceb05bc9ffaea2030000973969f4dccf314afb020 SHA512 8c7e543dcc4559ce997d66e9f7d2b9ec672a1d1ce2e3f77219b1732ca020ed9042b315e430ecb1fe89f515e64e27c47c54bfbbbeb7a8a12cf573afe071d8430f
-EBUILD oauthlib-2.0.6.ebuild 1019 BLAKE2B 73bf132de32a6908d488bea5a1d9b30558848ad88496f814f4312fb26fd6ca73b0042cf531654b2061394d469d9fa5b241bb8cfb7ee1d1650e9e79f836eb1816 SHA512 366373d5c077580b89901a84b65167b5b1e3dbdbbf7b08a7f2112bfa117f432d09f4ef261af1bb89c6e6015b697d208ea749693d8151115ccc5509fcdf75800d
-EBUILD oauthlib-3.0.1.ebuild 1021 BLAKE2B 050344f2e691aaff7003063428cdf69db802816cecb4d2606661d216f82bdb5279093f3aa3bd86dea44853efe8a6d296cffc6010931315271bca56fc5ba52765 SHA512 c7af8524bbc9e0c08ebd99a3e99fec6afb44e0b217b570339b9ab51d753016847c0a69c68530263ba1466d29de4bfd13f81849d7fe16d5627ccc5ba7ba6714c2
+EBUILD oauthlib-1.0.3.ebuild 1053 BLAKE2B d8fbce07ce733eadab005bbe8eb3a4ad6099bf3bd50f1670c6008be960511e54396f2c63e154eea404d618b5062f1c575bcdc3875299f6a14e743e48829707f9 SHA512 9e274295be29b7c70519ffb76126fd2940121fc3e33f9a703085d4a1950f5a46a8b358362fc3ef0f1849cb22b6ec4817a8a93e838315062b8385e59f8dbaa743
+EBUILD oauthlib-2.0.2.ebuild 1012 BLAKE2B 5f8af6bc172798764c9d6ff7581046ab9f9e5953d5b8fa317fe42a51f60199d289c9b3b39ebe183ea7db031f6f24a05d41ac1a16a16c5e5309ac6a2068f515b2 SHA512 b17a6919986ac4f784984ef2fb619735ce3c3f9599efee44743f9c44803f753b758159ec490d5a4ea93796d0587e99f19b03bc39a9485cc591590dd2278adf63
+EBUILD oauthlib-2.0.3.ebuild 1017 BLAKE2B faa8d08f51ae940c3e9b99cfe9698d1692079469c1c4653dd5ae22a8b166da2e9f292cc0175d33b7681c37d44e3657ac55acfa2b843730a7e194a94f26b2015d SHA512 edf7377464103c2366fb2955b0e237738c2f2903cc98f3f1634e9984ce77e3d88dd8490367218c06e21976562a8c899d1f35637533133d96b162e5e8d578d94f
+EBUILD oauthlib-2.0.6.ebuild 1015 BLAKE2B 65b5b70c0c6aef08ddf1e85c13c9ed2bfe9807cf2452e0f205d63dd4ebb8499ca5c1ec9d6fbc7e8de01e8a136af9c6ee0b4efac760788ab2cc2361bb74377220 SHA512 a3f8cc088943f60f1d8a0aff88caf71da246114fe4ba6350d3b6bc8f4626a9f538a60329bd0e52211192943c4938f71ff43d754c9c1b5f2f4625321cfcca4a58
+EBUILD oauthlib-3.0.1.ebuild 1019 BLAKE2B 3286460e880bee9f0197760fd234f5b93b680d58aa710cb9eb6d65994731f05d41d22d2b11553ec613c3c91026fd3ca67391fb406a32655804eeacdd1b530a73 SHA512 02d52b9cf81aa5a67f9965330f821bfeff65db9e077837ce61a526ebcaa341168cc42d5262ae3ccf1390ec72a0aad5f1656ae24b95a320b05adb182cd376cfb0
 MISC metadata.xml 376 BLAKE2B cc62cffdc76d014f0c43c3cd9495942d08f592f6a3d241d8147dc907e233d7b3ed394c52e8b7767570768a50bc4b76fcfd64fb90f2860b4f7ed65f016eb69a68 SHA512 ec1f35a21ea68091f6fe901d7c05c711f891f7edcf48496dbf57312cf331e7df9465309ca90789b795efa024e3ba3ede3d0416c7d9362823cffab8fbb23fd3fe
diff --git a/dev-python/oauthlib/oauthlib-1.0.3.ebuild b/dev-python/oauthlib/oauthlib-1.0.3.ebuild
index 0acdb63954bb..c35a25ca5860 100644
--- a/dev-python/oauthlib/oauthlib-1.0.3.ebuild
+++ b/dev-python/oauthlib/oauthlib-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-2.0.2.ebuild b/dev-python/oauthlib/oauthlib-2.0.2.ebuild
index 919b14561e47..dff3a303aae0 100644
--- a/dev-python/oauthlib/oauthlib-2.0.2.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-2.0.3.ebuild b/dev-python/oauthlib/oauthlib-2.0.3.ebuild
index 32f70904eb54..6ef2ab25deb8 100644
--- a/dev-python/oauthlib/oauthlib-2.0.3.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-2.0.6.ebuild b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
index 0af9e26f7932..ca6606d22ae0 100644
--- a/dev-python/oauthlib/oauthlib-2.0.6.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-3.0.1.ebuild b/dev-python/oauthlib/oauthlib-3.0.1.ebuild
index ea5f90da996b..91d9d1fc10cc 100644
--- a/dev-python/oauthlib/oauthlib-3.0.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 436da73bf838..22768af2f6e6 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -4,6 +4,6 @@ DIST objgraph-3.1.0.tar.gz 629772 BLAKE2B afa34613d8b05399dec1429465d81b026000ac
 DIST objgraph-3.4.0.tar.gz 634554 BLAKE2B d1e58370a50a9c9d8647c7633a780069581eec61cccef56e83b015f26a7ffbba6b872673d72dc138339b3c97a3f08c02067e203ddb1d1048ae6f3611e0837fca SHA512 f1e2b9f22dfdce56988bd40aaa865572c42688e73800bb7c188b903c67ef3726c03ba058ed30d40792133a2e2fe74d5ecda91be3de8cf7b80188ac0b9f6ac393
 EBUILD objgraph-1.7.2.ebuild 508 BLAKE2B 1c2845c5e133b1d133cbc3600bfdfe3aa3c677ba5389ade4d42040ee2cf0d512da18ef481e8f52e6fddcf10a94859868663193717c3df485af9a8ba940c613de SHA512 360edf2e238396fcc41df3aa253bf4c5d7d3ecd87d2f4630c8be7a7bfce6fcc96afa34b1d86fc019d7da640d9a85c6d2f8c7f6b3ade3025f078b177df7f77d83
 EBUILD objgraph-1.8.1.ebuild 508 BLAKE2B 1c2845c5e133b1d133cbc3600bfdfe3aa3c677ba5389ade4d42040ee2cf0d512da18ef481e8f52e6fddcf10a94859868663193717c3df485af9a8ba940c613de SHA512 360edf2e238396fcc41df3aa253bf4c5d7d3ecd87d2f4630c8be7a7bfce6fcc96afa34b1d86fc019d7da640d9a85c6d2f8c7f6b3ade3025f078b177df7f77d83
-EBUILD objgraph-3.1.0.ebuild 603 BLAKE2B 81dca87c62064732f186704ff301c30b0dda39fcaf7157efd143e4f01d079a5ec61a25a7ee5c3f3246ea3f862fd47bae28024d0afc1cb024380f6ef269ad3df8 SHA512 08ef3785f39076f407b432c7150c3bffe725e4a0c53e122c913b652d00133ebec7f832c03238dd272c75f14c8ed08ca7ec9455bcb443cfb14639f2e9739887ef
-EBUILD objgraph-3.4.0.ebuild 670 BLAKE2B 0b881f7cb8c7166b64f96388aabf7b818ebdff06920460fc996a498e0f9c1f29e4d46b2fe0a3f9dbbc364dde4fc21b23bf0336f17d689d0966304edde8147909 SHA512 c0481d0a8006ff1ea60c9445bd89bb65011fbaa987b730b1daab10f1342bd50314dfdb5640383f8abe776cfd0e6ea3e2f09bc952d0f1b12444e85212eaef4b68
+EBUILD objgraph-3.1.0.ebuild 599 BLAKE2B ec1ef0653bcdee6b9be61085dfc971838dab1e8fbbe8de3d8523543d145171a5cf1707a39d2f758741467d1ffca4b35b78d198eb98b28cc39cf7caa38ae4007a SHA512 ac9cae63232d812b58423894bfd2389ee9c1aa10a6e4304fb1b031c4d9f8d1cd217b860823b0f900c810e1e50e546904b993816d4f7e7a8801bd24bea84b99e7
+EBUILD objgraph-3.4.0.ebuild 668 BLAKE2B c1cbf95a769a39106eb89fccd82825694387e7763f033b6a0b43bb0746745f767267486a764af972436448bd44a58b6dfc7996ccbf0e9aaa9be8b8706d0cab16 SHA512 87b2417287afcb44c68282ecd3aa1eeb93eb183a969a1d268f8d7b41ea4e258f0d82a25f08204e3a8427852d71c52392b9804de049fc65fe6e8bc4eb3c2ab7a5
 MISC metadata.xml 422 BLAKE2B 079428e0094ac67f67e608a3f99dc09a92b6db7de99db8603357a134476f73d135a8605c6c86c5acb8c1d796168badf635ddd526b7710d40cda49451457fba48 SHA512 efdbee08e75b435bc2c976b80ff251eeeaea1e806f8cbcfbc288711f31831b4aca279b303d3e261447c3a8eecd5997c8db848812951c86c02f01b74a9c1de146
diff --git a/dev-python/objgraph/objgraph-3.1.0.ebuild b/dev-python/objgraph/objgraph-3.1.0.ebuild
index a4e71768efa7..a931e9f2ac4f 100644
--- a/dev-python/objgraph/objgraph-3.1.0.ebuild
+++ b/dev-python/objgraph/objgraph-3.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/objgraph/objgraph-3.4.0.ebuild b/dev-python/objgraph/objgraph-3.4.0.ebuild
index 7f7a9c4d3553..d8a26511b0ff 100644
--- a/dev-python/objgraph/objgraph-3.4.0.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oct2py/Manifest b/dev-python/oct2py/Manifest
index 0f43493d82c4..b5894f81f1b9 100644
--- a/dev-python/oct2py/Manifest
+++ b/dev-python/oct2py/Manifest
@@ -1,5 +1,5 @@
 DIST oct2py-3.6.0.tar.gz 668836 BLAKE2B 2edafd7c054a70a604273a7f3f5846926cb54dd05e7f2625aad57034d7760c099e9ad01120b719d3d047e6e6aa11f16e5fe8ca58e51079f038cea6d7aa3efe13 SHA512 f414a0231665bc3bedb7dcdaab8c86f32c140e5107ef80b70e2f99467e737d033de6ff492f2af7233671bff9b148475e0af4881c073ac727d0fd1228b7cf59b6
 DIST oct2py-4.0.6.tar.gz 431738 BLAKE2B d76fd323fa2405cd70dd1d4cbbdf64bbd346d45dc8065de0913d44d833f6d609d20ec8887cefeafdc4e59c382f862a8954b395557ff5ec127a67b1df2d560083 SHA512 997ca843571d2d68c4c57c0213a525c1be5f8b3e3dbffffb6cd41e423d68c8836dd12a03d5210d7f0cbf8ff19be7bb9d25b48c62a236cae68a0762547e574caa
-EBUILD oct2py-3.6.0.ebuild 1433 BLAKE2B 511622dd9889fab9792198b43b86e31138cae42f10967326887015ac642ca232c1ee5041da8009e26b33624b99b4cc95d881529d34d896fc453a804438e97e71 SHA512 037a5cc0ef0e8f61b027469c2824318470ca9528fb9ede0aba569fe9840645d98f718fa2e5f76da24dc1d534a474b99e72626d7b5d12ef44a2f6259134b3fe5a
-EBUILD oct2py-4.0.6.ebuild 1210 BLAKE2B 9d83337c6e9d058e1e3c232157cb2044598ac8ce44f01cb8bf2a53b297b6fa4a774a183fb3cf22884c6ad2071716ef3605f2e5d9ee5d87d3d383c39ce2f12d3d SHA512 dd4457f54076052f502deeb3c54b2fed5fb3b45f58d93529535f5b4fc54f8c3950c5a39660a6eaf15b16af7010402f1ada99641f0066389844069fa783ab71b3
+EBUILD oct2py-3.6.0.ebuild 1429 BLAKE2B 667980c3367e76fa7e3bf0e9cf3daa0885da9f25ba86bf1c35db162ccd9baa5cef41aecc84d2a4a9154023dfe1ac3f708790516dcca88ebbe6458bdb9e519d1b SHA512 e3aa34fe02c58ba077a4d675b9eb8e4170dcaf4a09bd506b40235e81bd2c5226d03562a2e44275a18ffd57103bf966e7f9d05a56c45620b1ae3ef9e164220d2d
+EBUILD oct2py-4.0.6.ebuild 1206 BLAKE2B fdb7df28d2b19e57178d5cdd3b7336deba02aba41627bab703293bdd7c34da4d9b617baf9956a8b38a64debaa80cdd0e592d4acbc7bf3e7d8725ddee04970726 SHA512 56851dff88a8762fcaa263058421abefbf83676f1fe920d3080af1a10bd30d5f129f2b65813e0a036404faca7c6e32bfec91ad8c90fc7401bc254eb80694d592
 MISC metadata.xml 615 BLAKE2B 32a95461360131faf43212d3e419ba75a12f853749baf7f862499155d6f445492c311860ea5ee7c7e22c5e9586c722df8382cfe2eb6f67ac7bc1596f6cb9602a SHA512 e476f193cbbdefdf56caeb8a8a501f57daf1b74a12a32c426b6e9150ea0d5b2538b7bd9bbeb3b7f45ba01aa741be2fd0b4dbf8e8302e867230fc1b2512c10ca2
diff --git a/dev-python/oct2py/oct2py-3.6.0.ebuild b/dev-python/oct2py/oct2py-3.6.0.ebuild
index 12ef576217a4..7439762cf917 100644
--- a/dev-python/oct2py/oct2py-3.6.0.ebuild
+++ b/dev-python/oct2py/oct2py-3.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oct2py/oct2py-4.0.6.ebuild b/dev-python/oct2py/oct2py-4.0.6.ebuild
index 8c10e6de4276..95327776d8b7 100644
--- a/dev-python/oct2py/oct2py-4.0.6.ebuild
+++ b/dev-python/oct2py/oct2py-4.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/octave_kernel/Manifest b/dev-python/octave_kernel/Manifest
index 0cce4c91124a..8fac1ed302cf 100644
--- a/dev-python/octave_kernel/Manifest
+++ b/dev-python/octave_kernel/Manifest
@@ -1,3 +1,3 @@
 DIST octave_kernel-0.26.2.tar.gz 11152 BLAKE2B 8331bb595a2e95c8bd1ba2975d45cb65a3cf417bf56c21ee7dc0c0d1e25bd45c51ea6c317f72bd868fe8b401ecb20b862037bbe8ef7cadd44569c17089504415 SHA512 95072ea3e0f74c57e71ef51c3c2050be9c739693bbee22fc5fa63e24fd639daf1bcf4f3a8b5be499de2e4e723bedc8d1f59237ffc1a17ad634a519c96cdde34f
-EBUILD octave_kernel-0.26.2.ebuild 574 BLAKE2B 6bb0f5bec03f3e0dbdab5449fdd2db731d8e18c0e62dc7aa8cfa32e1994edfae6d8a16a1eab68bca9ce990ccbd52d346fef5c7fe9ccef3b0b0d9d490c10c235f SHA512 2fca4a1dfd43ae8700b4709eb65125adfeae7dd3af7da753db4ca68d4429c32739ba1ec30bb635c5c4ba9c6704db2e5e13592e2762eb4f5460a63129ceda9f4a
+EBUILD octave_kernel-0.26.2.ebuild 570 BLAKE2B 7cf28e84634170e12846c29a243d64f90a00ce494f7004f0b44d4c923612c844e814dc438fed3fba02f640f78805f614b6f9ca83d2d1da5ec94d72e49ff8ad65 SHA512 685c35a3c6ac9470017f5051b14b52b14510f9730747b6ef96d398a65914afa67d1d6160b23b02062af396747a8c04d24b4a030cf0d4f8c9deaee07aa9f9dc31
 MISC metadata.xml 506 BLAKE2B 1c7c71e71c9a75c082a771cfc01c2ac9d1fb1cf4d80ac7694a993380952db728387365b44939b398b22a3be589caf0c696cc010ae68562fce8b62ca0463c8077 SHA512 c53f4011a2474c2295d9e3a3f216aba6711b08304c6b59da8b81bc40aa2d3bdf7911e69b23abcec4a0e5e9a3c75663f0c7e693cb2bca6c59a108393185f445fb
diff --git a/dev-python/octave_kernel/octave_kernel-0.26.2.ebuild b/dev-python/octave_kernel/octave_kernel-0.26.2.ebuild
index d393bf75a370..4cec3862631b 100644
--- a/dev-python/octave_kernel/octave_kernel-0.26.2.ebuild
+++ b/dev-python/octave_kernel/octave_kernel-0.26.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/odfpy/Manifest b/dev-python/odfpy/Manifest
index f80bb23dceb4..f5fe6c5d7278 100644
--- a/dev-python/odfpy/Manifest
+++ b/dev-python/odfpy/Manifest
@@ -1,3 +1,3 @@
 DIST odfpy-1.3.6.tar.gz 691122 BLAKE2B aaaf2c1613beb6775d22e4d1739b7c144d8046e687f0dc8f7b7b1ea7400cc32dd572ed5a1cd12cb01c5fec27b5c37950b710b279a46d60da8735154d2b2d7030 SHA512 09f3fbce633949035842cff16d2e016271b7f6abf04d74fcaa712c9b3afa18943dd566a2d88a7256a0a52d88ea689d6ef8262f6d8d67d6ea1025aa56e10300f8
-EBUILD odfpy-1.3.6.ebuild 931 BLAKE2B 16af0b004d5d60b5dae601c0ee7a67a9cbdd82c7a058940ef16bd5ac90796e1b5521d199bfe678c056a7e93ae1aa3279e1955c783557757deb7238fc7556f0cd SHA512 0649580fd062fe74026c40c6ceb33137185204e88a175178e766c3ba2e12f3edf758ec8c117a787611853df5bd077175dbae04f751728f734fc4a103faf0f388
+EBUILD odfpy-1.3.6.ebuild 927 BLAKE2B 849a9d9103b39795f7695619a6d5e614b795b29e5bf7feffba8ae694c8ac39a9cd03f9d54dca788dcb61da4d948bd47ca999faf8e3441dd1d4a77b5ee597f0c3 SHA512 973299152963dc76eb6ff4604d73e99f49e9f706d0265977f14009eead7c7a86818cd982773b7ce287a457150792cfabb1c81448a78742d43cbcd2c46ec5a380
 MISC metadata.xml 308 BLAKE2B 4d370440c480d97acc4b9b2e51aeb78f27227e8dd2c5acfdb99747b6b2eabdd624f8a8f90af28287849216d874bbcc81bb9ca8cbf78c1221e947fd479476b1db SHA512 919a3c6c182828bf99396da71e83f0b982aadcdf0e0c5e6e7f29e15cab19e2d3c6d5afc26864a324055e97be9563cc30ef10b701716678c7cd44e8403adaccde
diff --git a/dev-python/odfpy/odfpy-1.3.6.ebuild b/dev-python/odfpy/odfpy-1.3.6.ebuild
index 6b98207030d2..cad4cc3cff88 100644
--- a/dev-python/odfpy/odfpy-1.3.6.ebuild
+++ b/dev-python/odfpy/odfpy-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 # Classifier: Programming Language :: Python :: 2 :: Only
 # py3 fails one test, pypy anpother.
 # Notes on page of home repo reports support of python3.
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/odo/Manifest b/dev-python/odo/Manifest
index ff1f27aba0b0..38e0e233f819 100644
--- a/dev-python/odo/Manifest
+++ b/dev-python/odo/Manifest
@@ -1,4 +1,3 @@
 DIST odo-0.5.0.tar.gz 129977 BLAKE2B 48a9306e959329d31a9ecec9d46323563336b1523f0e4c9e4c99395f6310f957f8af0965fe41102b5e73963a2cece0545c39bf5d9ff3b20f061153207cdf7e2a SHA512 699ec7a3640f319d428854c784bac7747b5c50a8d3f1cad9caa02048a012b51e0da655989b749d84b52b9cb23ad26e6c218aac1d36a0966087238f60874f41f3
-EBUILD odo-0.5.0-r1.ebuild 1263 BLAKE2B 814264c057684a282110e8c141d1ad5a3737e7abe15dcb36fe0a4cfca733cc2db4699b947e0d093ff748c99b5f862c7a5fca7510f8c9f081888f458a178c5f64 SHA512 4b4e006b054fc9bff1a86dd9937c71c8a82bd782064473fb9aafb8d89663f6c4b2eafe4692736562274a6195edd515debf8caddfb49295a0e177d481abfc2ab8
-EBUILD odo-0.5.0.ebuild 1132 BLAKE2B 6205c026defa649ea40b61df29c5db2873a4e241404a7c6fa3acd857d3ca20370a91ab3d67250821568da9d6cff4d6f81fb190149e2b0410496c85839ca7eb3a SHA512 a18004c59fa1afb52b56e6ed3348a832a9b089f711db6826e97f2261e05de1122c86e93c5a7b7f931f262f17b23db59e2e24f6c93e88d6eca57bbeebedefcc2e
+EBUILD odo-0.5.0-r1.ebuild 1253 BLAKE2B 6befc32ee5217f2327a7d9815cf261320f494c6a557ab8f2b94516c93a03add7a3e65eee7be622a312afc13148f88ab637011207942fac5de4b13d5797fcd65c SHA512 6c264b1f28ad74eddf39794f76300d82288389562b94e3a6309a2dca4a9a6ee34cc04748cc5c718996108bcb8f09834f7130df49f2de784f300f24adf14ec404
 MISC metadata.xml 373 BLAKE2B e75a0397cb96adb5db1a0ca803d712c459493a9566d0d95cf2088b8b2c1aea074341591afc343022fb68e80e909370b58864becc09c07d9f8dd365e36c7a5cde SHA512 1b6f87d7aafc773ab3004adc75b4449a3b90386470ec6f47e1e7c3fde5d54cde883f4e6728b083c2706e4ecc0a76845d28d4f721d653cb8d16dce9687b0d478f
diff --git a/dev-python/odo/odo-0.5.0-r1.ebuild b/dev-python/odo/odo-0.5.0-r1.ebuild
index f8fe88e3a7b0..28c7ad5d02ad 100644
--- a/dev-python/odo/odo-0.5.0-r1.ebuild
+++ b/dev-python/odo/odo-0.5.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Data migration in python"
diff --git a/dev-python/odo/odo-0.5.0.ebuild b/dev-python/odo/odo-0.5.0.ebuild
deleted file mode 100644
index 1ee3129a83e8..000000000000
--- a/dev-python/odo/odo-0.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Data migration in python"
-HOMEPAGE="https://github.com/ContinuumIO/odo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="app-arch/unzip
-	doc? ( dev-python/docutils )"
-RDEPEND=">=dev-python/datashape-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.15.0[${PYTHON_USEDEP}]
-	dev-python/toolz[${PYTHON_USEDEP}]
-	>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all() {
-	sed -e '/.. toctree::/d' -i docs/source/index.rst|| die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		pushd docs/source > /dev/null
-		mkdir ../build || die
-		local i;
-		for i in ./*
-		do
-	        	rst2html.py $i > ../build/${i/rst/html} || die
-		done
-		popd > /dev/null
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index e26ce67e39cc..5755fad9de69 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.44.ebuild 671 BLAKE2B 77909af03a2ba6ef299fad02513404657ab95dbf2befeeacef276cd68d350977da3ffaeb1573a62690be5ff6a944d3fc19e8a544e73dbaaff6ec9f261c9525e4 SHA512 5ae0bc6bb1689eac5efd4484d91aea838ee40bcc7d29bbc49271f776e669ffd301aa3cdf82edf064fe40d9387d69f3d37543c7f6b3e841623788d45869b6e17b
-EBUILD olefile-0.46.ebuild 560 BLAKE2B 73bd46a74946aa886e0ab67e150af4dd8549994faf0594c262c3acb8ca1d1a3e963bc024ca7fbcc96af5ff6321dac8ba4e8babd562eee27377f70d82ed2bb085 SHA512 617b2603fb5a14fa200edaff614f9dde4ed903f28eb3a442294055acd47a91eb8343dc06165930b0d016b56a36ea7776aff4237223edba9534d73823ff09d554
+EBUILD olefile-0.44.ebuild 667 BLAKE2B b3f1d9af0a02cbcf9d7e0768f6488ab687d866e0f2696a9e176286a2b1d14cc8ab53c1d307f184546f30f56a69063a56c8b5338c3c3dba48803b59c38ffb9307 SHA512 8626cd165fc43b0192ec5ee9f113f56c35040e0e6c0f10d3cf02a448c43ef8ffb9a23e20148612a6d09ca69943b837e7c2ac523d52bd93216ea6fa893af70f9a
+EBUILD olefile-0.46.ebuild 553 BLAKE2B f5d9fc5005f49b12d0f8c7790e2f8c17874288e57ca76733bf49f6779815e56283f93e4bb75e61c027828f18635ca902aa6d7315ebcb68d99cab0df9625afc8c SHA512 195e75edd3b8e94aa8e0f21ed78c9a7e2c438f64682d1733479e2f7561a6e0f495195beca7cf31daece3546349f4897f58a5389974f61b3b8b5fb6fb1a9eedf1
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.44.ebuild b/dev-python/olefile/olefile-0.44.ebuild
index b071a5ad492b..741f906a006a 100644
--- a/dev-python/olefile/olefile-0.44.ebuild
+++ b/dev-python/olefile/olefile-0.44.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/olefile/olefile-0.46.ebuild b/dev-python/olefile/olefile-0.46.ebuild
index bd4044fe5ca6..a6cd8aecbec8 100644
--- a/dev-python/olefile/olefile-0.46.ebuild
+++ b/dev-python/olefile/olefile-0.46.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx doc
 distutils_enable_tests unittest
diff --git a/dev-python/onkyo-eiscp/Manifest b/dev-python/onkyo-eiscp/Manifest
index 2571dc37f2ed..4dafb82c83ac 100644
--- a/dev-python/onkyo-eiscp/Manifest
+++ b/dev-python/onkyo-eiscp/Manifest
@@ -1,4 +1,4 @@
 AUX onkyo-eiscp-1.2.4-exclude-tests.patch 453 BLAKE2B 966418a94703f5af908a19d7ad7aeca907f5d4aa91eb5955e632b8abd23f16b58e57a7a223545ff418c58e3a2a3c71ac0db579da4cb8321f0623586767deac28 SHA512 ee529c6d8a096014a4b2acb2a5fe9f3f7b9086f11dd3f43f280b0f95a2b56edd2fdade60118f6d043303cba76ddd62f775f8969854b02eb9fd3a0a7f4f4f4877
 DIST onkyo-eiscp-1.2.7.tar.gz 48290 BLAKE2B c583b2af2619b6dc070c431a91d77ce507d3bf91f87a5ee181b82333ef597fd45d122c85f3fa4dfe5454b5059c89888744beb0a44a916f8e8cba64fd94b6cda1 SHA512 0fe8f23762d49b3b2c45ef24b94345d9a342cf04b2fa55538abf4ea21a6039011c0ade945f7432555ec948811ab521bb6a611909e19163e0e0c806bf87604635
-EBUILD onkyo-eiscp-1.2.7.ebuild 648 BLAKE2B e37f367f6a169a3ac297fe4572ebafd0f432beb1f0d70df4a37b37134e112c9aa31aec6b894e0cd549108ef58c2a14f8a3e0db907d363c3d95422ce743ce4cee SHA512 97105b2992bd2cc9da7713473b2bafd5ec74ead95f9d00135ae9bda8e9936bcdbd5e86fbf18b3eccf41f890d24363602850d9d50b543ca3902f18c07da391fee
+EBUILD onkyo-eiscp-1.2.7.ebuild 638 BLAKE2B 6e6ae1f183e2f6294b6f3af4edd8eef5cfdb8fe5d3eff2482f367553dc5f515fea511a4352629f7f78bbea1ea0c4df3aebae5d02f431141affda1d5fc13b8883 SHA512 3f1e8ba32857f454bc19e35c7014a232b1f2485ff4a47f729c173f1882de12b76e4e17aab2ad2d9966663e40437ee751a41219c1d88daf515e2719509110467b
 MISC metadata.xml 381 BLAKE2B 66cc4f148b9ded0452971c614536bdd681d8e0279ad9b7dab1795eeaf503ee383056ff3bd574fd53291f7a6ced9d95aa9636381a4211a3f478e42aa9b21873a8 SHA512 974fd1d80260721251f781d060526f7b545ab67cf93d1ac3fbac176c48d496c72be817b053278f7e8ba6e28ea4ff7519fb23c181cf51def1980b028080d576b1
diff --git a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild
index e04f8d02c963..de7dad5a9036 100644
--- a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild
+++ b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 7daf09cdf222..09e99c4f9671 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -2,9 +2,9 @@ DIST openpyxl-2.6.1.tar.bz2 2403827 BLAKE2B 26abdea047b4d283f3d0e3ed499c1d7247d0
 DIST openpyxl-2.6.2.tar.bz2 2404387 BLAKE2B ce63ed51bc2f475fc12f510307e3cd417321588aa1a9adb5f8b780249898747babf211137d21442eceaff01bcfb4f7b8f3092b3dc64f751aa2b26d404d11fb74 SHA512 e037abd13e050e25146b016c578bb50c008b7c74a19702d9bae14b594ad5f30d352f8443fd5021a169991a96f5d19b84a3acceb9b05a713e8526ad478fffd31f
 DIST openpyxl-2.6.4.tar.bz2 2406293 BLAKE2B 5395820c2b7a1c6f754f80d33f629b438cbf6421b91d8f3c0a3cd4b4105b84f1b4b90ec1a5557193924718e462af1720c166fc37295ebd0c3b0c270f4cd7af7a SHA512 0880c61b2f2fe6162a1aaa6815607ca20cadac3e58a92f737bc4c7a5a867a0d731ea3ad144d552fb2854b703b7426f1c8c3b3d8ea6c64ab2485f9733f0fabc61
 DIST openpyxl-3.0.0.tar.bz2 2405154 BLAKE2B d14e529c73cebd3eab6a4d93dc38c1807d38a5396032b4df77bc7af5d98b5b68369f1b44cce83d77592e7aca673ca497d49a1fafc1f0bcca3c0aff19486ea8db SHA512 fc0c31b1ae486f6fc8802dbd6ea2efee65e788b452240985202617109113dfccb5b26bfa94c2ac42a0ac218ff75bc310773f96122da1522537c063e8d55309f4
-EBUILD openpyxl-2.6.1.ebuild 866 BLAKE2B 375866ad3bf1672880dd2e1b1b5505fdc905e315c5bc8fdf537d959625ab967817a337ab5dcfc8a0cab72dfbed783bd10f49821ac0d8e57534af31f9d4f03b79 SHA512 314b97663e050e314360d7bdf8d01361c0a3b39b66d472278bee12620e6755d5bdb2eb7be117c8698ea209b6d379654e7106b7abc31841466936e3cf5462f614
-EBUILD openpyxl-2.6.2.ebuild 1018 BLAKE2B 270ecd698b2a66ed7b1504066ac274f5fa18d812db1a9d188368cfaa94570aa34c26de6a14a1ce43e93fab6dae93103a6c42599cb3a9ef02c1189407c311ba04 SHA512 5b3c675b9b02a6d23ef7160bb81cb1329324173ec491805269bd64a3c63505ff847f5fd3fdd90a15b0a7ebf300df558d15fe058b735c7e327d782445d14276e0
-EBUILD openpyxl-2.6.4.ebuild 992 BLAKE2B fcf750bd9a65e4d546ad7090d01b2f981249b5418ee687256c9b22ddd59d10e2e5162920cabccf8527eb120f4295545a04e41f14e7b9c70783f4d46f7ed8a3f5 SHA512 016e500b13ff883dac166c5db000f51fee27883fbc4f2701edb265cf7f766f8c2ffa55db8abebf437b53a3409c24a66101c556faa8e09448a78a64da7c35092d
-EBUILD openpyxl-3.0.0.ebuild 982 BLAKE2B af468d3d84e99869922dfd9ea33bc531d836190f384b0c4b9e8b98c88ed67edf1761c07d6384a954a5c05b9a9d5998450cfdb262ed89a05aef22e3979d28eb50 SHA512 e314ba84ed750868298ecd35e684bc9c12656dd42fc122581a1e4506e92fd137302081f915a48e0047f8744494b77704043283df139c6a54596d26bb2358a274
-EBUILD openpyxl-9999.ebuild 756 BLAKE2B 8387d571e2a2d03bbdd228c211d75e8fc6f5a4f0f63fdd79fc381cb42e40df2d90ed9568b05bdd85540e2de68b1db7b22c374c00d0f54cbeec80c1c2432b1d88 SHA512 ffb3237c48ae30083bcb97547605216c77d785ee3be35677ed8facd48224626836f38f289458a9f5549b3a24099d9dd231d80729e778a0083fffa7136997ef7e
+EBUILD openpyxl-2.6.1.ebuild 864 BLAKE2B 0a86a50ccc789f265341cff9a30fc9364a754ee7c6d28ecbbce90d7e21a3c0cba4110afb9022af4f894bcf3ebaa9693454f684bcd9f9edaf75a508a538342541 SHA512 10d48b449a9148ddc974dfe80b3cdde877176c1d40b6fb827a7d67dffdb541cffec2e03c8fcda075752956233e4ad481b6bbd455a1b845d134cb591dce51e1c6
+EBUILD openpyxl-2.6.2.ebuild 1016 BLAKE2B 8f3bd6b196a8643d6f8ba3c10f93207512a01aee94b89447a1face0330794f5984896bc9b2b304a26fcddbc9ed07428338effdacd19d132a1fc9f4322afd1606 SHA512 a3f0660428395f98df010ae15219659a76c4ac0a02357abf060516cc38997a52e568ab93ae54ee46c55dd2ddfaf34529e52b734d716d99b8ed281a729ccb78bf
+EBUILD openpyxl-2.6.4.ebuild 990 BLAKE2B df99a3ce30c7a8f140a0614a9bf2207ab23fc93b7ed6ebd73c313f9634f7b210a98bd0170de958154a1a7dd40bd7bcaceb639ad4513357ec5399f7f71784ecd5 SHA512 ebd8fd5fd5aa8f671bdc55549ee501cd4cb11627f7ddc91a17c81f42318221f8840fb0475a6440621ca347fc3c4a912d4fd2f8bccd393574e51a7a2b94a663a6
+EBUILD openpyxl-3.0.0.ebuild 980 BLAKE2B fa7daeaf8a65bce12b3c09927e06007cd0ac54dfe6e8d93590e6f73a176bd73d5d4330c0d3eaf42fb60da9e2c59fd1905a8643fc33669a234ecbde0f9a239615 SHA512 de96ccce27cc480a482c5f330786ca0943359c21937f39c0f7b30e572fd8dfcfa31c29a74118786bc89576ebeb0c54bf3f379dfa94797cbea24739afba6aaf64
+EBUILD openpyxl-9999.ebuild 754 BLAKE2B 91193b5e0c419fd547f5ed78d6d4915573ac8d1ee439b325560e6c213da3d1501a1123a77db9d58ad88a349c4e8ba5552c7557071390e098d776bbc94b5bcf42 SHA512 20154f1fe897bad84d14cce2b4eb266b027a409d376bcb3f1f2f87463d54a97ac5d564139fa1d6689acfb06c13156c33340b66ca1b12dcc45537c004ae08a296
 MISC metadata.xml 653 BLAKE2B 7ea56953654fbad2982d2fb0569396bca3d32e2068bf6bceaadbcabd4b02520aea7f0ca04e810bfa5f8c3756658fe1915e53bb824eefca3c420506ddda048656 SHA512 4f8eba0d2bdb3a5b621abf9f2eee89d576d86f5a3e694b9755b0cf55e178e584afa599dad260ff5854cf6a00e0609d740727a62d1addeccc59b05f9e31e60fca
diff --git a/dev-python/openpyxl/openpyxl-2.6.1.ebuild b/dev-python/openpyxl/openpyxl-2.6.1.ebuild
index 8255efe44d8c..1c60e0ce0a68 100644
--- a/dev-python/openpyxl/openpyxl-2.6.1.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/openpyxl/openpyxl-2.6.2.ebuild b/dev-python/openpyxl/openpyxl-2.6.2.ebuild
index 23c5dc191c02..bfac1ddd1532 100644
--- a/dev-python/openpyxl/openpyxl-2.6.2.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/openpyxl/openpyxl-2.6.4.ebuild b/dev-python/openpyxl/openpyxl-2.6.4.ebuild
index be327107096c..433dd9136f9b 100644
--- a/dev-python/openpyxl/openpyxl-2.6.4.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/openpyxl/openpyxl-3.0.0.ebuild b/dev-python/openpyxl/openpyxl-3.0.0.ebuild
index 737e3b936e62..284935b4f7ee 100644
--- a/dev-python/openpyxl/openpyxl-3.0.0.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/openpyxl/openpyxl-9999.ebuild b/dev-python/openpyxl/openpyxl-9999.ebuild
index 7c1e47d57b1b..35313a2cb368 100644
--- a/dev-python/openpyxl/openpyxl-9999.ebuild
+++ b/dev-python/openpyxl/openpyxl-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 mercurial
 
diff --git a/dev-python/openstack-nose-plugin/Manifest b/dev-python/openstack-nose-plugin/Manifest
index d2cf8ee495d9..edb5377469c5 100644
--- a/dev-python/openstack-nose-plugin/Manifest
+++ b/dev-python/openstack-nose-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST openstack.nose_plugin-0.11.tar.gz 4120 BLAKE2B 5335b920cba985639d0ca36f475d0d020bdf15eab5a32fc481f0d7200de867c437dc0fa6766aecd93e41a564c584201ebec92c10030c577768f3b2e798661258 SHA512 25139ebd3229cb5e07e296848d5a0bff090bec9b3ba618fe3a4278bdc9b2f7f0eced887285e9e3836b555afcbd74f061ec90a8a63d5c1fdfc53b7aea48a102a2
-EBUILD openstack-nose-plugin-0.11-r2.ebuild 654 BLAKE2B b0ac4bdb2127c9ef6b5b7a6a800a75f66381db454b32998f2a6123e1d92dd5df494cf1bae20a6dd4b6703943c8c37ed656f91a258035861171c0afb67025e71c SHA512 3c8a17f73ccfdddec6cef30afa692e1fb703ede473e2af2eb5adb20c1ee99df9f416ffbe7279bc178d67155c21dde89dece9d4f26ee41da92eee41c94430a8d1
+EBUILD openstack-nose-plugin-0.11-r2.ebuild 646 BLAKE2B 62947daeceda964398fbdbab95a50ecf47989a3c9027c0a6a99fa5917aa71da2f87d5413413499fafb6d1e03969e073a370d8a011a8f7d17bdd1c0eb4086bca8 SHA512 34da4e2069aecdffdb179974523a3806d1b1e4c06ec4057fb6d2db329249035dfd84fc9c12eab1bb4dbb36249313654cb21db0f55e15150eff173cb002f040b5
 MISC metadata.xml 684 BLAKE2B 47a57afa49f7edb3df474f5859e3b735c69e4dd916de9228b0272590838edb8e0140b9be6b1ca9321d38e34470f79899ca24b15640d0ebe3f1da572538fac0fd SHA512 a1e6ea9f0bdd146e9b61d2679c425cc0946e0fc835edb39feda2b103355d7a3cde81366b417297eebc9ee7a0e8044fa02b99cc596e834dc63910f6f80f9a9a73
diff --git a/dev-python/openstack-nose-plugin/openstack-nose-plugin-0.11-r2.ebuild b/dev-python/openstack-nose-plugin/openstack-nose-plugin-0.11-r2.ebuild
index 0dfb9f91f7b5..56df4bfe15ed 100644
--- a/dev-python/openstack-nose-plugin/openstack-nose-plugin-0.11-r2.ebuild
+++ b/dev-python/openstack-nose-plugin/openstack-nose-plugin-0.11-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 2516d2bd5be2..0660d6686dde 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,5 +1,5 @@
 DIST openstackdocstheme-1.16.1.tar.gz 1179830 BLAKE2B 9f30e0206e0f7cf0e74bed486b6c4c0ee5fd8aaaf8118a4cac2da99f0cf8ffad2c1d14440177d4db232e29abfa38116a8a395b28b3efc883a22803757c0875bd SHA512 fb5c6e8d9945603dd2f09799520eaac8586784cbb1a9fa5f5c5f53e04905150646159f1d0fe4ff0e9da0e04a4df348a931272a59dd3893b5ee2cb10b4a271dd7
 DIST openstackdocstheme-1.18.1.tar.gz 1185809 BLAKE2B 253b2140109b90c63fb782f9f1e9994a2b5d422525cfca60e2d54379fca9d9ae936822b04acb29807254fbfb20ccd2c460621cede03f15d4807bdf067a565a97 SHA512 7361cc972ad036528b9b3bc58a7adb92a96142493a1ed4ccb1dab135cd33cd911d5b3fe3ed9e17a58763abf4c9abc68167d31a96b3364f3f4c139c332e7a36ec
-EBUILD openstackdocstheme-1.16.1.ebuild 589 BLAKE2B 774144e8fbcb643266db8483ab2ab9ae58ad90e5ac752ebae329e16b1570da3e1bfcc70296019cc524ce8f268dd6c62354a78bb7168447b80844fc73a78c28dc SHA512 47f5ec3bdf399266a958247db1be819246a6474974fe71dda3bad9ada52d45d9df5ce43de3560dc5b97751c72017d4f5fcbc0ad3014a67d95eb7f30b06a8cec0
-EBUILD openstackdocstheme-1.18.1.ebuild 597 BLAKE2B b445061718d06e78c39eeb1044d93ead25790e6502ce0b3989d90a6756ecb08056893f88967e7261f8252a60c64d5289bfcc20f3030917111ffaec21ec692907 SHA512 3645e7385d3612dc0ee47e8b1bf7ae18bf525d93c83010fa94a175c64b96601d051a656bfa88391b711f28b0643041791d88056459f7916e65fa5ef3195e8f15
+EBUILD openstackdocstheme-1.16.1.ebuild 585 BLAKE2B 64a791dc522b58ca4f2a6aa6804c62410689fd478e75e3b709c66cd5c42b7618cb114b4e44efa7a502cb08511eb314c0d44f9a765cccb627b911c1b1d95c9801 SHA512 c685975dd0e1911aa854175bab08003becc49c5b4210a0458762f31fb926321011d26fd6cf2508439a0ab46f295225991975371ef79c0b64759af3f30fe2a6df
+EBUILD openstackdocstheme-1.18.1.ebuild 595 BLAKE2B 264d98cfe533a02c181cf4b8eaa937179a8ed712879d14de6b7cf5392985bda4b883e466c9f0213940ea533fdcd1ccb916ccfdb36bf0537c918d4975abea1bae SHA512 de9c1282fdb4469f6b64b59f4b69cd92cfcd653c576a0c80f3348a101f2343e6ee50a6c296a99d1db9eaba024bdfd3f51b59a53743a0e0305a2270a06c84c817
 MISC metadata.xml 506 BLAKE2B 71e15d9fcae38b184e8ce3a4bc3eccb1369dcee434e6d257930f955a18a7068a92a7b3e7a2d875651e36a74063350e75bf6ddbf3ce4fb00d5966c7e4113ccb4d SHA512 6111af92dd3436c323603a2351083701e9ad9108fe94dd4a5ceb29fc5e4408d2732481604f3f57936c243fc0f88f4ef6c1c351915ec65d3e3384e34c5e683ac0
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-1.16.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-1.16.1.ebuild
index 91d06df43a63..9d38e22c1027 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-1.16.1.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-1.16.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
index 0f02124249a5..0c5b0c3de111 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index b3a16c49c487..42b91a075138 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,5 +1,5 @@
 DIST openstacksdk-0.27.0.tar.gz 818981 BLAKE2B 6ad4bdd75e9b6af8da256afaff4003b233164336edef1edcc13fef66bfc25eaa17f02cd2fc1cd57cc27076cc05d63dd646200fbbc809ccff48c5477bcf8178e1 SHA512 3eb2b26dfa37713967d533b66abb27ac107524bc48c5fa7d475fbcc58291e7531518226acdb1e0c20537a24fc6008e287545d61b40e3f1104c80a04df014d566
 DIST openstacksdk-0.36.0.tar.gz 887545 BLAKE2B 8a207e5d3a2c6989a1e7c881beaa35dca4617569eeb2efec5f917f4310a6e49549b3ddc9f8106566b7b1e620b2aab38507f92063f68e326f234166a5ea7b267b SHA512 e95cb7c626f8bdd0064ed69d767dc1d53742d9d7a0d6196058453113ddcab3bdd903a1ef7455a2f9fe4335733793c927a00fe333099ba142ef69945a287d3983
-EBUILD openstacksdk-0.27.0.ebuild 1422 BLAKE2B 7360a31da811667945a8bdacdb4ddf97e05d0b4c6486c8af93e2878480745080868b9b261a2b9ea5a26578b0ce88f37becfbf151464f071c4b04b7443642da94 SHA512 627ea6ec00cc817817feacab1fe1f0248ba26ef250cb960f7a69bef0894c01322a82c51026e43584eeb250c2475c80e6956ed7cf5dc6f942b6fa4bc222c83692
-EBUILD openstacksdk-0.36.0.ebuild 1422 BLAKE2B 2a5b3a68c4c5c1d811df79c74fb842f86309407d75d14bde29b5ee8838ad8661defa4b0c0c35808de01ed551ff005c08a20d0689d63cdc69f407261d1e05ec11 SHA512 e3e06af01e00e51e4b305d3fe768bdd63098a8123e59aa46b9ee571e55d9291cde4aed25da069c75f6b58fb41054b51e8481b6b2f3518f835781b044b67824e7
+EBUILD openstacksdk-0.27.0.ebuild 1410 BLAKE2B 6233f76cd677a76d34aa28b20ecbed72daf41e0dfafe0872ed039c3a306a60fca9b38473134531d417e763e6aa3bc10d100571957f0efecfd0509cfa699520cb SHA512 3880e02dc77dc6ae9f77eac1a3d824719456b794c8d89d806df3aec44b4e903c840495c8c47851711aaac998d541a13361248433bc1d37b55ba18bf87655a82b
+EBUILD openstacksdk-0.36.0.ebuild 1410 BLAKE2B e767cb89b06ff24679e1312aa576091a58a90cf4aa5260869e2a74fdd0cf36d827dbb484c33d1d725aabac3edc95720ecf5b47b0c2a64546d00cd3e44b4fa31a SHA512 2548edb660022605b0901e9f0684eed8301af2b3bae2efa8f3c69c2d562ec366c2aad6a0e73aa2ade16b0bdb73ee83d4ff14a7047add6afe385e41dcc782431e
 MISC metadata.xml 532 BLAKE2B 6432003077d4f17d035396d83fdd85037468296b4e58c7e93a773bfd99e1d65144d88ef93709e41fa5618a300fc1c9f2e85bdb3f8520d5ca2bdbb4a9520003a9 SHA512 1dd04969556dfc8648aefe2358c81dcbb2e6c36fe487d153f0b488d3a066130f99d31edabafd15933892a0b6b1979f0edba37ca88e1d62be9898380890d0977c
diff --git a/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild
index dad854f5652a..de5398553836 100644
--- a/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild
index 1dc1d27ba824..329fcdea89ac 100644
--- a/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index e20f1cf94998..a53b117a7409 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,3 +1,3 @@
 DIST opt_einsum-3.0.1.tar.gz 66204 BLAKE2B a8d2d1246e890d24ea73d129ed1ee99e8fbbca30771c96a48858acb5af5eac93bc73b9e8f1c5f1ece6e0872277de1f01fd1d0f7d27e044fa5f9de09060792565 SHA512 d6c2b95d17f523680e3f849ad2b0a4c36e7102e0540fddee365446bfddad4a26be2aed19060570ac0d1db42ccde8e15f0e7e4c066b9117024a58f8cc8978508a
-EBUILD opt-einsum-3.0.1.ebuild 481 BLAKE2B f3b8fc74dbf5bde0a3e71f4f35d606c3afde0f72ab9f3dbcef67ebac5fa201e45eedd2f7e2982202607cd99c44fb98178595b337ed1673c4cc04b702ff2b86e8 SHA512 583061c7cebc03afeadf02afc6743edb1df97d688bb01b2d2e9eb6d84fa0bf110d8d8e74b8ebb0c47ac207cb1f184e6815dad154d2269c682f803580b54643be
+EBUILD opt-einsum-3.0.1.ebuild 477 BLAKE2B b0e2817bc7b21bed51bd5818461146cc35801c5594456284da2796804e73acaf30805a36258f66b5a08f867e107073080aa2e1f4282a5b6cf87d629e0203bb40 SHA512 9db7dfe0d8d1786315f37171b47fc8895fe5a51cac9b2f66a6565b8303794995e64bb142a58cec4e0270652cbb54c69d21ea83af6e4893a6fa7620271c841718
 MISC metadata.xml 373 BLAKE2B e60b5def188efafe8cbea965732384164a8dd735c37d065cfb9b8c3edc652dcd5b23641e11655fe535206823317e8aa9c0c2f2a624e654d511595e36ef8fc5af SHA512 5471c7592bfb2e9ab1f3c47fdb1ab2211debda6e928f2491f17a171d14c95d5faacf03eb105c94d35ab6f5e889f24cc327f5111e8ac8c11527dcca1e04d61290
diff --git a/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild b/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
index ac865d7fc8cd..777132fc4015 100644
--- a/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
diff --git a/dev-python/optcomplete/Manifest b/dev-python/optcomplete/Manifest
deleted file mode 100644
index 57ad5ed64534..000000000000
--- a/dev-python/optcomplete/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST optcomplete-1.2.tar.bz2 15358 BLAKE2B 57f6f22dff4523619bfd61edd2cced917f17713c23123a5ecb8aa338c053540aa445d70de8095eb63571e69aebf367fdc8082046336d87d97dee2648b94c0d59 SHA512 2b2a902755eae0da0d362e6c504bd007fd13309ac515e6b68d6b2d177648645b7bd9c73d172c5eb2d0473caf261d8d60583a8f83779c901d50c304c03811e7ea
-EBUILD optcomplete-1.2-r1.ebuild 613 BLAKE2B bcf645f6e322a7d0d8d4bacdf935ba247269140b015544212fd54c68b7348544fd9f0b228991e86b5e1146cf9e1c5c421ef6d37d7f2236c2dd7bbabb3302410c SHA512 bf82c34c50ea430fe0e108c9517192bdaee53b5a30d48bb454502ef3efddb056ede63d84aeb38c9e59597b758c534c4b94aa1b384f39f972a429ac6336fd7694
-MISC metadata.xml 892 BLAKE2B 93a970370e8ec0d6f67a5fde2d72e1bd8dfaf33bdb6c4c1646dbd9ff4aa49509f900b28e51574de62f06ef28acc061139ec15502243f7411f010734542876c54 SHA512 5ccd2ef13a6d0a76497e3e1cdf15f819ea456271a269dfed87681111c5fb590e48669291054978aefc83eaa2332d8eb08532278d990a483b61883abb1a4ca4e4
diff --git a/dev-python/optcomplete/metadata.xml b/dev-python/optcomplete/metadata.xml
deleted file mode 100644
index 3620338c02cf..000000000000
--- a/dev-python/optcomplete/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="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    This Python module aims at providing almost automatically shell completion
-    for any Python program that already uses the optparse module.
-
-    This module aims at placing the shell completion routine and the option
-    parsing code in a single location: in the program itself.
-
-    The logic is that since a program already knows about its options, and in
-    Python we have a standard module to specify them programmatically since
-    Python-2.3 (optparse), the program itself is in the best position to suggest
-    completions for an incomplete command-line to a shell that invokes it.
-  </longdescription>
-</pkgmetadata>
diff --git a/dev-python/optcomplete/optcomplete-1.2-r1.ebuild b/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
deleted file mode 100644
index 4c8787527dee..000000000000
--- a/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Shell completion self-generator for Python"
-HOMEPAGE="http://furius.ca/optcomplete/ https://pypi.org/project/optcomplete/"
-SRC_URI="http://furius.ca/downloads/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-python_install_all() {
-	use examples && local EXAMPLES=( bin/. )
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index f40f7b61afd1..addbcf3bad0b 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,5 +1,5 @@
 DIST os-brick-2.5.5.tar.gz 174931 BLAKE2B 0efa117c756728062ef0ae3bdff4ce8127bd0d800cac906960c9f2d5fcd79820e2b72753744f8acfbc52a8dce8a357583283e2adacb692cbb391c5b198b4a919 SHA512 a343cb9194ca1b497bdec55853258b8d51b109abbb3ea406aab672e87c5c68d00511928d8690bca88c37e65bb4d8bfb4cab2cd3ba6fbff2794edbdcb681e0cc0
 DIST os-brick-2.8.2.tar.gz 179510 BLAKE2B c72c1f0260fc541a9f6ca9f984b934f718dadd7ec0909a4b2483bb190e1ad587084174a33e1a7c81a52728817286bc3887474ea2c39d7f43e8e71a4a9a4baaef SHA512 0e9237f9baf5338d123bec1b22285ff8c4c31a89d60cf8480985a144c45c2766322cb359f3d548676b2631883664c5797e687bbe4d2d9ec5cd38e10e53d394ff
-EBUILD os-brick-2.5.5.ebuild 1468 BLAKE2B 46eb46eaf474b181407156a5843c7e75dc03df3ad166e14fd7e6b25de6752cea46dc007f91bdd342fb0414517e1f410a75bcce15817aa1ed91f3297adcf13325 SHA512 ee1e0803cf8e705f9a721706d358165e3aa6027a0acaecd8f85da64374ed6aa1e129c75fa3ae9243efb1c0a22858f1a1de896cc8af9e0af58dbad44beb0b6ac7
-EBUILD os-brick-2.8.2.ebuild 1470 BLAKE2B 2edce4ad636d375d50ebb740fa37fa461b637b4887ab7f3e546c61bd83cdbd75dca6918c8fb922b3efab4bd232ca2459b60719cfea80a93b5be118d30885eff3 SHA512 d81fcd8c8c7a5ae52a2626f1edbea67a2f75dad8fed04082d86136bdd7cc12cd3aaa21a3bc4ad026f125a099739cec57d3983c3af9993441901b373872e547e6
+EBUILD os-brick-2.5.5.ebuild 1454 BLAKE2B 0482d36fdaa10bc911de364897ab9aca7351087b37e8167dff254a197cb295987a9d16e93d80bc612b249157370b79350b8d63b400ce2b942d0991bd081a5a49 SHA512 285fa4ffacc8cfe7606957b518648c314802281a7aa1e82a1f26956ae1b77b0564eb4a3a8a677b0a4339985ec72b8a1b2904d2cb33a5ff132ee91204b7864e7c
+EBUILD os-brick-2.8.2.ebuild 1458 BLAKE2B aadfe1bb39d49f87e8da9f8bd14291eb8d414a1b38acca29fd12022fec5c0d58a944a46bb2eb29796ff65fb9a417fc2cb2e6493ca59fac90557891367e88c55c SHA512 46ff984e089bd29223627f368b31ec34e60ffa42fb22fe64525b4404de638dd8d9c6cbf1a6906d4a9bd68520bb7f31f7f5d19e6354f03fa342bbc89ba54eb73b
 MISC metadata.xml 381 BLAKE2B 6d5a168e81b27c1e9a5ada920a182616c150d5f5ca204e334067f4bcce2878b19152810391d0506b9e4bf1dd287bc56fda035d576c5fee64a9ff2fecfb7b39c3 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9
diff --git a/dev-python/os-brick/os-brick-2.5.5.ebuild b/dev-python/os-brick/os-brick-2.5.5.ebuild
index 14aafb7caa3f..a684a0844715 100644
--- a/dev-python/os-brick/os-brick-2.5.5.ebuild
+++ b/dev-python/os-brick/os-brick-2.5.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-brick/os-brick-2.8.2.ebuild b/dev-python/os-brick/os-brick-2.8.2.ebuild
index 1c44322da69a..a1766af0adcb 100644
--- a/dev-python/os-brick/os-brick-2.8.2.ebuild
+++ b/dev-python/os-brick/os-brick-2.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 4aa21650d4c3..f7da1b6237b9 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,6 +1,6 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-1.29.0.tar.gz 65974 BLAKE2B f8632f4f4ae95941e81b039ea928bb1013d4208b93a3cf67abcb689aeb8f2f128ad309b4c86ead98ede98c2a9c44a5e0db49a32bd6e73490ce50a357f1f37bba SHA512 1b50777fb1476a58ff0b6ca9fe3015d4002eee312bc970d23284f2a05c5b27a96204c3e892b8262c8d830b1681fb7376387cc4a032736e31a3c353a0a348e752
 DIST os-client-config-1.32.0.tar.gz 48162 BLAKE2B 95f70717da5ad85b4a691bd89ca38989713f2d3654eac18c7b0001ccda8eccb266bd7ac3a25591d649af0814f8c97b718c88d856498e5042a07ca9920b6fe52d SHA512 2cca903347df75e18a0aab4244dc325f79fa7cb5a25a382ec7081a30d7e2c6ecbd5025d58c20873ea851396169e2b2c8253b0b77f6189a311016e57f8e065329
-EBUILD os-client-config-1.29.0.ebuild 892 BLAKE2B cdaa51fcc30282c73586faa34402696dd43a9548ce1a71a7fd6ea51b94057528c82de30743dcaf7ec36f59b37d0dabccdce6f5811c1ab0e103b2a3f70f11226a SHA512 da9f6c8d19e04d563f685926ec27bd88b0e2410e8f6067f2006189cc0b35d5dbede1b2cf83d261184c01aad8a017dd2cdf0eec24e7bfa62b50fa2cf4befcfafc
-EBUILD os-client-config-1.32.0.ebuild 744 BLAKE2B 205b8849fc8a9ae18a68239ba288cb71ebbaf4fb04e0614fc2d4c3403aac46293a92b2505d954477ee1e605a890787ef2e34939c49c5eda723c0f66c1fe4ae27 SHA512 555f33648f426b5d5523d4edd15b7c13e80db817ef3c93f95ae5a0005b6905c183d549488f782dfe7869e8e7d075591368406b3c8f81e86d0b5884b23bd732aa
+EBUILD os-client-config-1.29.0.ebuild 880 BLAKE2B cf450a255b2e352cc36df641b882e0ac2b47f3de95d59334b0ceb8b76d608f08029dc629ce1f58c7fe16a28ffb9886b481b9db8217a843acb8d7f4b62356591b SHA512 1d8d199d66d4e3a43d2c378b2f358534e51e9dc64a00d511a6bbb8a0e21754a403dff23855597ea4866fb5c4a974871c62cf544b3a03ffd52fafd25f85774b89
+EBUILD os-client-config-1.32.0.ebuild 732 BLAKE2B 35be51b95abe9aee7d1350a14dd35b2710b0e0359f0001dacc466b76c02c47d24df73f1ee347e44ecd9bc5e8770a583cbca330ec13df10e2c9a6b08b1cdb4f0b SHA512 88b6817f2c8bb6b618541e8d7ce44297cde3640f2bac5a26bfbfdef77dc8de442965f56e06addecdf177c812597ce6cff696440445d03203b1241f4b09f83258
 MISC metadata.xml 450 BLAKE2B 107120c3a7de0bdacbcc1d06d9daa9dd5379da49a46cdd8d7578809654eeece85ffd309e12b5044553ebfb8b46176f614aca67d141db99e4a615f98eb140f8b5 SHA512 776aca3159f9e170b02e6d6ef52fd088fc77315fef951f24d6a4477b7a95f109dc790daf814a373df04e263c68ff4f9acf0b50c221e1ea4b932804c4355ec4ef
diff --git a/dev-python/os-client-config/os-client-config-1.29.0.ebuild b/dev-python/os-client-config/os-client-config-1.29.0.ebuild
index bd6169ea8f10..ca0391ec0126 100644
--- a/dev-python/os-client-config/os-client-config-1.29.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-1.29.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-client-config/os-client-config-1.32.0.ebuild b/dev-python/os-client-config/os-client-config-1.32.0.ebuild
index a0bd9eb91b33..1389f4c7fdf7 100644
--- a/dev-python/os-client-config/os-client-config-1.32.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-1.32.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/Manifest b/dev-python/os-diskconfig-python-novaclient-ext/Manifest
index 8627a08d6fab..82f2252c130f 100644
--- a/dev-python/os-diskconfig-python-novaclient-ext/Manifest
+++ b/dev-python/os-diskconfig-python-novaclient-ext/Manifest
@@ -1,4 +1,4 @@
 DIST os_diskconfig_python_novaclient_ext-0.1.3.tar.gz 2543 BLAKE2B 07fb502eaa1fa4340c2adff63e5ecbea17292bf7a7c69171507be83b51e9fe65870b0716cdc857d49fe31d01a6522cd265950a7ccf9487599cc19dd0c808ca55 SHA512 4733c4ef720d0fdfabaa26c4288b933ac7d9e4433b20257cfe206399b71154dc6ee98ab621e67aa4c3446df2ec1929edfb9341538d7d4ab69d71576652a9d591
-EBUILD os-diskconfig-python-novaclient-ext-0.1.3.ebuild 637 BLAKE2B 973f73ad117b7073ea23505e0f21dcc0995c37686b3f02b0f31ebe59b02481796b076119b48985dae7527d98d61250c5be610b01c423f8b21592fe53dc02afea SHA512 dbde43365af1c3476193f83c456a10f698029903f2f910fcd3fd6b7f5fde9a6204faa087acb47b1d099a304d773a01910835ec0a3aa77f379790a3af3dd71a61
-EBUILD os-diskconfig-python-novaclient-ext-9999.ebuild 556 BLAKE2B 46a08f78bc19ca353fbfc63f3db2d78d1d9dd03075798c2a7bca6ec0816983a46b3e0a8d92d821f9bdbb566d2b221292f61af3f2cdb9b586c932a270b835937f SHA512 f5a2122a3704079d641a3593f508051de79efe02c95cbbab85dcf18c217faacd83855966aa82abebf173faaec2b91cf4630e9eab8c515a106a0b46e6875fbf3d
+EBUILD os-diskconfig-python-novaclient-ext-0.1.3.ebuild 625 BLAKE2B 7b465440c09dd957f5e1c65576b37963af23f8f6a55add7ecee5629442a84403f1ce0e3e05b4015ffdc8b442a1e75f8482354e9a6a3353d74236a5dc80ca2e37 SHA512 077eb1265014835165c0afd158b8e9e57a72469546f95cb5de6a68333e3cf51f4ea9755654e81df69ff01f8cab2012a55a06c4b95f52a8c401521c1490155397
+EBUILD os-diskconfig-python-novaclient-ext-9999.ebuild 544 BLAKE2B cd8be386da925fd094d7284ec44d361feca2a6ddc11a9a8c3b30f196e0085f761e2e8030b7c91b9e030c29ed0f10019184940750a26a2cf471a63cf8d09340ea SHA512 448ec68e242ae0defb319eb29639543597c46555cab0be0b7524194766defdbe7f08058d60a7753662292deac8ed1e1216bda0d653884ab66f49652b4dade5d1
 MISC metadata.xml 548 BLAKE2B cb64b77ba8095d687feac35c3b45a15df13ee6c6a5ddc389dc9ddad79d40087f3efa2cf6ece1a75480b2ad55176ee70106fc4548270ae504b9f613bc8501dae3 SHA512 04af40651fbcf6ef3c98b5dfa65a51d05f384ea3c6a51ff20f1c0355f0bc8376f74e17659a98280e2e45650d6c79b2b9f169e8035bb2fa96c4c806c783988616
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild
index a7fc14c14038..d6f008cadb2f 100644
--- a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild
+++ b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
index 6bab3bf13d9e..1a38af2a0a97 100644
--- a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
+++ b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/os-ken/Manifest b/dev-python/os-ken/Manifest
index 237d3440f286..be38abfce5be 100644
--- a/dev-python/os-ken/Manifest
+++ b/dev-python/os-ken/Manifest
@@ -1,3 +1,3 @@
 DIST os-ken-0.3.1.tar.gz 1440173 BLAKE2B 1b861e79e3aa324ac24b0a120b1edc06ce3b9916f2863538a95ecd96d618cbf416c2633af6a89e923d346d6092dcf72f25bf486b5e46d2d7a18774c58f839efc SHA512 ddf3309165614a9d25046623cefbb0e961452eefd43a9260ad3e1bdeb9999200624848d14bf5ef318b53dee786374131bcaf14d9798d7b7a8cd581bc47aaf9ed
-EBUILD os-ken-0.3.1.ebuild 1385 BLAKE2B 8ef21a692393974a484d693584b939e86befcbf9a6398122e0854038839c8d9287f48e387eaf8ff76f4c848de86d294f000f95d12431b07d8a46121ea3951b7d SHA512 387a03fe136b57ce1bfb78a2f244a13e93879b5520fff5794c2c1dae70bf677bdaeed668e3df81978c98cf00f4180018742906d7d4914dda4e8ccae0c452f4ec
+EBUILD os-ken-0.3.1.ebuild 1373 BLAKE2B 2a0f737a6938fd943d0b37d3d46e27986a5f795429f85a56546f6f252e4a3b250354201b1aee923ce5ecaba60bbecd623840f9e9135b6d6811b554e422d4e685 SHA512 d824fd46e93ac739b69fbe47edd438240cc7f655b47ee317488e3d1885b2de0cd97c07191b3d72dcc067539b92fd7cc3a4ec9d5c6268ea75cd4b3d0392c6f00c
 MISC metadata.xml 379 BLAKE2B 32a2ec39c671d7239814a17aece1b1c676bb60efc379ec5b27aa534eb9436f327e801b1d54167144c27654e9161b3edb147c2fa7593ecc57b156b7462b73d806 SHA512 d93efff2f59945fad29d284866339ed2d8d0a6e53eb96a728909635d268c47798bf4f50c1dc3a62e9ac2861230b178af85798ce68a223ed8bc3d318f64ce78ec
diff --git a/dev-python/os-ken/os-ken-0.3.1.ebuild b/dev-python/os-ken/os-ken-0.3.1.ebuild
index 689c3bc54bc9..2239b731e389 100644
--- a/dev-python/os-ken/os-ken-0.3.1.ebuild
+++ b/dev-python/os-ken/os-ken-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-networksv2-python-novaclient-ext/Manifest b/dev-python/os-networksv2-python-novaclient-ext/Manifest
index 26916aaf924f..3ec1c84bb0d6 100644
--- a/dev-python/os-networksv2-python-novaclient-ext/Manifest
+++ b/dev-python/os-networksv2-python-novaclient-ext/Manifest
@@ -1,3 +1,3 @@
 DIST os_networksv2_python_novaclient_ext-0.26.tar.gz 2258 BLAKE2B c30b844e79da5b5ae9f4e9e38a9bd68a64a3fd16a0782840be3513bce7f0fe2820d5bc378eb3c17173a1dde4a042ea6c20b654308193404cb6a21d5c40454c1b SHA512 e262e42204a2c30f059b93ff1e5543b30901e9b005c27a0065ea0b4eeb42b403cfd3587b52b4c1652cf04379fd137373277e4784e7410b395997ac6dc51dd92c
-EBUILD os-networksv2-python-novaclient-ext-0.26.ebuild 665 BLAKE2B 32f9e6e3e410299226960587e91d802d053101c9567b050bccc9132f7a680f7fc6d2415a9718ee237c3707a6a568ffd309c7321f5fc1104d48b9fbc95d5f407a SHA512 90daa44f5b4715e9a27012dcc119b81e7641974d4f00d9ca99d62eda41113f94c9c1340413ea47899408fdf0601bafc94a40e6d0b6c391f874d233c0ce25f03b
+EBUILD os-networksv2-python-novaclient-ext-0.26.ebuild 651 BLAKE2B 87d99601f47ebdc99f06bf40375bba9383013bbd5b063f20dba9e8251b04d9b4db4c9d21118d3a7c5906631cc2756d7a7d0aef572487d94577d0ac90162e0a37 SHA512 b48890e1c71d6acd4107a82683b5b29b85087a297f313340c97eb147d79d566d092019a197a346d1a8853bf695ce69ebe85d1799ec2ef1f1e080473ffefee590
 MISC metadata.xml 556 BLAKE2B aa3cd7d186fcb1ab9b4061cd66b84325f138faea92ebaa99d89e7ba2bcb536de068c448ea0c36570cfedd11754be892ba40160f3c12a9bd9cd7b427af640f65c SHA512 0394d2b4cfab2f91c86e147fd50ea7a622ff6aabdb6442ef6f47bc6de93e4d9e6977d473a1c9052ff6716164d6a48e919f9bd274d68e87c5af384088175f3e22
diff --git a/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.26.ebuild b/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.26.ebuild
index cc217f35c043..e00c9151dde0 100644
--- a/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.26.ebuild
+++ b/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.26.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-resource-classes/Manifest b/dev-python/os-resource-classes/Manifest
index 0470819696a0..b9e2b4720ab6 100644
--- a/dev-python/os-resource-classes/Manifest
+++ b/dev-python/os-resource-classes/Manifest
@@ -1,5 +1,5 @@
 DIST os-resource-classes-0.3.0.tar.gz 15371 BLAKE2B 93d9f97cc3ea546e56384684da086e284c6d4c575e8232ddb2655a98fc1cc37e6cf454f50890bffccc625342cb7bbc020df8f2a2a262a2888b854425ae2ac6f3 SHA512 6b347fde11dd0d11784a6e80ff148385b33e3f31545d6379693af611cd1d65d5cb54721c7fa599fc49b1f8e6a07ecf85ee33c30d09dc647da07fd4f67f6c5813
 DIST os-resource-classes-0.5.0.tar.gz 15949 BLAKE2B 7cef19c63a27723fdf0037224205c9df545f24c2ada020d196928707945a7acbca7619a98ca6e9585edb92b1ebb7259ea5c9811ae6d1daf18a90a92ce60661ce SHA512 112548db1daf0c31fe4304cac3834d588e531102620f0e55f648cca81724eddddc05acce4cdf3fd468b38a44dbbecea43152903c1df3a809103a7f1b947b9cd7
-EBUILD os-resource-classes-0.3.0.ebuild 740 BLAKE2B fc0b32f0db11f4127e0166e26b0d0c6162c81bb8d8388aa1055fbd71b5c91d9c627cdf54ddfdd29f6c3882a6e518bf547ecfdac9b89cb50f0329f1dfafa17761 SHA512 a1d7922b81185bcdf63a2f6b199ec324c78c563c868475bf7c5c5acf0b44d6efbdd990ae6a1e879441ca23e7cebfa0004c028a2f26620bffef77744e22d8ade4
-EBUILD os-resource-classes-0.5.0.ebuild 740 BLAKE2B fc0b32f0db11f4127e0166e26b0d0c6162c81bb8d8388aa1055fbd71b5c91d9c627cdf54ddfdd29f6c3882a6e518bf547ecfdac9b89cb50f0329f1dfafa17761 SHA512 a1d7922b81185bcdf63a2f6b199ec324c78c563c868475bf7c5c5acf0b44d6efbdd990ae6a1e879441ca23e7cebfa0004c028a2f26620bffef77744e22d8ade4
+EBUILD os-resource-classes-0.3.0.ebuild 728 BLAKE2B e36ddefd10ea0d339adbf2bc6c278e6959dbb18ffa7e60b0714b44c4eab8924bd0ca66ce799b5b330801dd625b3a4f113fcb31934d1b428131de79c3b1590f35 SHA512 8ac7f5cb4794942c9d109f0b5acf3bc0770aa50888ab0f35736c89f8996d13e75f83c84465f4507c5c4630ce60927a0cc6586b2422a6f920b5b8d2986d9128dc
+EBUILD os-resource-classes-0.5.0.ebuild 728 BLAKE2B e36ddefd10ea0d339adbf2bc6c278e6959dbb18ffa7e60b0714b44c4eab8924bd0ca66ce799b5b330801dd625b3a4f113fcb31934d1b428131de79c3b1590f35 SHA512 8ac7f5cb4794942c9d109f0b5acf3bc0770aa50888ab0f35736c89f8996d13e75f83c84465f4507c5c4630ce60927a0cc6586b2422a6f920b5b8d2986d9128dc
 MISC metadata.xml 405 BLAKE2B 63a7bd1834b0367846138475cdc9024abafca54967b74f09d2bc248663c3e0481417d735298f6076af2db4b7dd8c111b59f8f0fe615f8d09edc18b07fc484626 SHA512 256a3131b22660dadbb0522ae467e715b0a7e326f68308bfa76f8e3aabfcc25c44b64b483a4af6e0b6772c89425e9798dee0dcf3b5b1b775efcb2d836b63061b
diff --git a/dev-python/os-resource-classes/os-resource-classes-0.3.0.ebuild b/dev-python/os-resource-classes/os-resource-classes-0.3.0.ebuild
index ca97d93b46cb..3a7777ee9849 100644
--- a/dev-python/os-resource-classes/os-resource-classes-0.3.0.ebuild
+++ b/dev-python/os-resource-classes/os-resource-classes-0.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-resource-classes/os-resource-classes-0.5.0.ebuild b/dev-python/os-resource-classes/os-resource-classes-0.5.0.ebuild
index ca97d93b46cb..3a7777ee9849 100644
--- a/dev-python/os-resource-classes/os-resource-classes-0.5.0.ebuild
+++ b/dev-python/os-resource-classes/os-resource-classes-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 79be3d2d8b46..685dcdd1d66c 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,7 +1,7 @@
 DIST os-service-types-1.3.0.tar.gz 22961 BLAKE2B 6ad32594c7fd86f61b0e9018901da740c6ce7d30ba10610cb3fac1900cb8188084ed754a36b608dc076582f438a8cdff0f655cef2ee406de4186c12b5b454f1c SHA512 6a90cd4744902dc314ae2af09411947270a06db548016a0d8e424e6dd44520b20a24e061425e7dcebe4c62fad4c0bab4636e9537644d87f66e652ae02025afe1
 DIST os-service-types-1.6.0.tar.gz 23412 BLAKE2B 9e475b3905c81b2c480c98b17fb804766312d32573c8d84d27aec66cca60b0b4b6065a12b73c6546f60a266e1cdd3f9499c409c031580a323ee7bd87472cbcd1 SHA512 5269f54568304e038510542c5c29aefedb00449807a424426a03d450db6822b3c7d850da50b6804a9ee435298c0e56da31a031cdd09fc758780655f92de28662
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
-EBUILD os-service-types-1.3.0.ebuild 561 BLAKE2B bc2d466af236e659f8a81f398d626d99bc098adb188479906a694746ac7e8c1fe1aa6c9b0f17659291074703db1e6086faf3853477d92c6a0960320e01f9c359 SHA512 b97f7b8aeedc55cbab26d85a56ac99607a3f4620ae4bf02f5552ebf7869f3e94e641a08a0980680953c91d7825b5af5995549726ee76e28aaf3caa6215b687ab
-EBUILD os-service-types-1.6.0.ebuild 561 BLAKE2B 9fd2bcdba7308674a8716ee4b13ca31811a5f6461b34cd7d52a6be9b1b25f57a325836812449abf1ff93b31595503cbf92af3951577a7efde3b0a318308ead50 SHA512 76f48af17fee8a5dc8e60f35cc79d4a60f90dc87961f0f5a6d97912c40866f344f2f24eac55463e672ddee9aad25bbc3b8ef20f5a7ace9bbe23025ee911c98dc
-EBUILD os-service-types-1.7.0.ebuild 561 BLAKE2B 9fd2bcdba7308674a8716ee4b13ca31811a5f6461b34cd7d52a6be9b1b25f57a325836812449abf1ff93b31595503cbf92af3951577a7efde3b0a318308ead50 SHA512 76f48af17fee8a5dc8e60f35cc79d4a60f90dc87961f0f5a6d97912c40866f344f2f24eac55463e672ddee9aad25bbc3b8ef20f5a7ace9bbe23025ee911c98dc
+EBUILD os-service-types-1.3.0.ebuild 549 BLAKE2B 2d3457960e5b61578f8e01f473c78f5b6fafbc97dc813da2253eae861b26c3724ae5a4f73eb1064107186286f74b6af2eb0e6076a4f7962f44b2dfcaa7c3a731 SHA512 835024d39eff2949897a4bd67a1e05474d56d21a59e6fb37e95d0433a8c02d4a880801a736917230929f2897397c04b58738009488cabed1bb59047b8133f67c
+EBUILD os-service-types-1.6.0.ebuild 549 BLAKE2B 8509a015b1c790c2fe7bea08f423c009831f8aee715351ed2fc6fea7953b245b376af1a1d0319fba9449cd6d72c31489870051dc6180276426d1e5d2e86e50df SHA512 7324866c58376831c61d29549f46fb964e7dd7601091b06a9a0080f82ed0728f57129fe986a274b9618ed0b2281eed85370e40349a782d1c649a9ade9cecfe93
+EBUILD os-service-types-1.7.0.ebuild 549 BLAKE2B 8509a015b1c790c2fe7bea08f423c009831f8aee715351ed2fc6fea7953b245b376af1a1d0319fba9449cd6d72c31489870051dc6180276426d1e5d2e86e50df SHA512 7324866c58376831c61d29549f46fb964e7dd7601091b06a9a0080f82ed0728f57129fe986a274b9618ed0b2281eed85370e40349a782d1c649a9ade9cecfe93
 MISC metadata.xml 596 BLAKE2B cd24306b859d804610fccde33b67ec4e0e9ac1724449f67af93df2e98e840781d7a077daac575dd9401c03d53148192d3f520b488426d428f803ffe812fd631a SHA512 063efcfb4484e91c21d5b2d0ea66acb2362a791c402bc2f2fe5a7f8bd2401a732dc0859e9be2a87f5eed72454fc87e05eaaa7666a9f99f73b68c35baa1f734ba
diff --git a/dev-python/os-service-types/os-service-types-1.3.0.ebuild b/dev-python/os-service-types/os-service-types-1.3.0.ebuild
index eda62bb88f6b..4f5517811696 100644
--- a/dev-python/os-service-types/os-service-types-1.3.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A library to handle official service types for OpenStack and it's aliases."
diff --git a/dev-python/os-service-types/os-service-types-1.6.0.ebuild b/dev-python/os-service-types/os-service-types-1.6.0.ebuild
index f7ff9202a49f..d82a40b4fefc 100644
--- a/dev-python/os-service-types/os-service-types-1.6.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-service-types/os-service-types-1.7.0.ebuild b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
index f7ff9202a49f..d82a40b4fefc 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
index 54b23e2aa422..ab20efb61a7b 100644
--- a/dev-python/os-testr/Manifest
+++ b/dev-python/os-testr/Manifest
@@ -1,3 +1,3 @@
 DIST os-testr-1.0.0.tar.gz 43382 BLAKE2B c5a9b22700ce40acff8ceeb796d9fa0b840038cd285d80630b16c3399e8c188d87dc54de653d06a2c0918185e9ffd4695747f59d4d42eb158f9ea18bc361963d SHA512 2189abc76840d935d63635874ebdae7c325b392bc24a52e07e1046b47a17be6fd97ba17dc5593ae7a1e2bff9c5b0dbbfd8ade8a2382dce2223ee4047b3483cec
-EBUILD os-testr-1.0.0.ebuild 1249 BLAKE2B 61318c7662e9e2153e9e503f9d267d31aea7845e83827844d156c0bb5eb2cd3c0cca1c679554a9f538e29db170c87894caf69feeea62e0c134da1be52e2a27da SHA512 658a007d12d99e229fcbe4cf645798bd21c7be602edd46ccd19fb45034e5b4e836dec6e23d47f8f845e4dd83821cca685721f01904e3a5bd271e7bddde652c22
+EBUILD os-testr-1.0.0.ebuild 1241 BLAKE2B 6fb052efd1d2fbae5e2b40d81eec56aa9ca2db1a8e972b1f97e2bc9ef312535dac5640bd626d448419f2f314e6b3c74b7c199e360dd986f85b27834688a6bcad SHA512 7d82cdbe53503c010f85e464fa4673eef0f8a891a7ec36b7c0ff6e56cbce94a5fd4b42235ddf0c43d9e0eab2aa23754e960740c82fac5c2efa62e6c2620de932
 MISC metadata.xml 383 BLAKE2B 1d861bbcd12c0cd7c1d3798cf03163ae3a114349b3efc600179c47d71a275c211d65e8e542dc9b5c22b3b4690af4048ba85a573c7a40b8373f2783d154c050b9 SHA512 6e205857c3d2b3d94baceef580f343bee82210bf3003106ac58ad48d0403aa32c38332aee7b030eacd7d0bd272d7bcb34054e5852bd8b4870cebd0af74eb2577
diff --git a/dev-python/os-testr/os-testr-1.0.0.ebuild b/dev-python/os-testr/os-testr-1.0.0.ebuild
index 0ef1c1a7f967..67cb7710dfa8 100644
--- a/dev-python/os-testr/os-testr-1.0.0.ebuild
+++ b/dev-python/os-testr/os-testr-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-traits/Manifest b/dev-python/os-traits/Manifest
index 4a10d973d91d..8c3fee2eb586 100644
--- a/dev-python/os-traits/Manifest
+++ b/dev-python/os-traits/Manifest
@@ -1,7 +1,7 @@
 DIST os-traits-0.11.0.tar.gz 20362 BLAKE2B 843c1a874dc5e7ee5066263a7dfd9491157c692a5489e53f9467d85589ce25570995cb25715409a49d81400a39bbf4c5ba0e616706e7462c4497f3613dd95599 SHA512 570fdc23ab3ae1920cbe0520bf2c007bd10c8372d83bb129993324a9a6de4462a9b5a86b816295dde9039f55cb8f125cb38653b4bfdb29630577327ec47c7d0c
 DIST os-traits-0.16.0.tar.gz 24583 BLAKE2B 8f81c4ae3cd88f74b7b44033800af4475c2e76cf4ca402504bb54444c3952fa97a2871336bcdd4a5ed870e423c1201fe0ca658d663d19286098641efd88bc060 SHA512 93ff4c066e0819cacf3a8cc8b80b05960e7a4b7c31af1d249f61f95eac1f37ea21f0f1ddb6e6dbc5b9c023394e10db88a105bbfbbfaf10afc57078040838a8f7
 DIST os-traits-0.5.0.tar.gz 15775 BLAKE2B 288db72d500a3187a8520b9674982f3233f8644a537ec04971453ece394344b7310cbf133785dfee7122e1aeadebee7fd91d18f57a6ccecf0f176fd569b2bfae SHA512 2dd9019b13fc3394bf97fa9ff6c82d02d26dc6ca8ba8b32e619e9f88a9fdee0d3082e3818ca6a51eea9eb45997dfb48eee6976190b27dff6ab5b892747ce2a54
-EBUILD os-traits-0.11.0.ebuild 737 BLAKE2B 9f3387917df2c1a26d2f9f40432b6605f791066821aadcac56f7d0c48dbcd2bd1d095fd027b1e1fa628d31bb3e9f50043154a7b77ddae4d9e24ee361be662910 SHA512 832a25bea6a8dc888da6b0280169aaf7eaa76db026a31e244cffe0937da18c22ae8327f1e62cc7d28892008b2ae61416d8831e77672676ea96f8d90a65b8a13e
-EBUILD os-traits-0.16.0.ebuild 737 BLAKE2B 9f3387917df2c1a26d2f9f40432b6605f791066821aadcac56f7d0c48dbcd2bd1d095fd027b1e1fa628d31bb3e9f50043154a7b77ddae4d9e24ee361be662910 SHA512 832a25bea6a8dc888da6b0280169aaf7eaa76db026a31e244cffe0937da18c22ae8327f1e62cc7d28892008b2ae61416d8831e77672676ea96f8d90a65b8a13e
-EBUILD os-traits-0.5.0.ebuild 735 BLAKE2B b808414f5f8a7a92060aa785d347d5180e0b0c52dcb0bd01c85dabf15eeaaf64b78233420608233cd434f9c3299b52a95e121228c822abcadd0ede4cf7ee378f SHA512 f6bda726549e1a5fd4fa344c09c21612f0aefb920c5786018eddf78473c51fbbcdb6855f90417abc651c12c91bd71d559c9f0d81452d56ad41731cbc05c6e00e
+EBUILD os-traits-0.11.0.ebuild 725 BLAKE2B d12117c2f4317fc72b1c2c7a85d803b51fae25f9e11faac73bd120dad8fdb2de01cdc8d66c2126e88f8b0b18ae21a20ba50a81d90e138e74353e8cf058a3ad2a SHA512 c42f01be3ea291fc5a5876075e189f55ed88490f019e9555bce3ff7e49bdb1a291da5f6fd61555c0b10d6c3b34cc6dc859ad43643b10ef7ba0c00084c3dbe553
+EBUILD os-traits-0.16.0.ebuild 725 BLAKE2B d12117c2f4317fc72b1c2c7a85d803b51fae25f9e11faac73bd120dad8fdb2de01cdc8d66c2126e88f8b0b18ae21a20ba50a81d90e138e74353e8cf058a3ad2a SHA512 c42f01be3ea291fc5a5876075e189f55ed88490f019e9555bce3ff7e49bdb1a291da5f6fd61555c0b10d6c3b34cc6dc859ad43643b10ef7ba0c00084c3dbe553
+EBUILD os-traits-0.5.0.ebuild 721 BLAKE2B 722ff58fa6d9afdb3843efa58553ae2057ba232c2831abd645189c9465d249d73ee15bf40e5efc078e58b8cc48d3a070fd00cc4ec940f89aa2673c39ec6ddedc SHA512 e52ba20e01d8fb231613a0b8c0417d6aea951d5a822b37f19e5a3050b0ac83b5d481fb7c8a83e09801b8a70db9fc46a3845e70fd82e1d041309f0676330d507b
 MISC metadata.xml 385 BLAKE2B 2ba965a78d301c8f0b65378ff482552eba70236b457b96461367e0ffa5cbab79ddac2296cab4184803f7970e4162faa0ace82762ff356eef2e739625bfc99878 SHA512 9dc66a1191f15d9a8569e229a59164a7527c2ad27c06f67d89a9a25910bdaafe70f6c9269a2482d5770105ce58a64705dde15db56b34f2568add1800df0cc42d
diff --git a/dev-python/os-traits/os-traits-0.11.0.ebuild b/dev-python/os-traits/os-traits-0.11.0.ebuild
index 0ab91e9fe7ef..92ca6d87d411 100644
--- a/dev-python/os-traits/os-traits-0.11.0.ebuild
+++ b/dev-python/os-traits/os-traits-0.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-traits/os-traits-0.16.0.ebuild b/dev-python/os-traits/os-traits-0.16.0.ebuild
index 0ab91e9fe7ef..92ca6d87d411 100644
--- a/dev-python/os-traits/os-traits-0.16.0.ebuild
+++ b/dev-python/os-traits/os-traits-0.16.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-traits/os-traits-0.5.0.ebuild b/dev-python/os-traits/os-traits-0.5.0.ebuild
index d24dc67f1665..f36ab09fb6b5 100644
--- a/dev-python/os-traits/os-traits-0.5.0.ebuild
+++ b/dev-python/os-traits/os-traits-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-vif/Manifest b/dev-python/os-vif/Manifest
index 85fcdc16a497..1e5b5af8dc69 100644
--- a/dev-python/os-vif/Manifest
+++ b/dev-python/os-vif/Manifest
@@ -1,5 +1,5 @@
 DIST os_vif-1.15.2.tar.gz 88591 BLAKE2B 0a272332b238590f9a0cb5a457babe8a26b97196370c0e0f4c1e4d89e814e424dcc5f0e2786cfed3729bb5608434507966ab22d9c68b90e7deef0767381a8cb0 SHA512 36d7ff16fa5b7cecf738d9e867657ce7ff416a514cde2796306d2e21a1ae1985528dfcecc95498a24fcfc16687cfdbc898550520ac6e17d202ea554e8d8c7b1c
 DIST os_vif-1.9.1.tar.gz 63535 BLAKE2B b4c017b129c2540794f85292341a165761d00439d24727fe2f421c96a7e5d6e79e8572a217064e01e62bb137f136fcfd1d51ff089c48026de82d91a8b9a22386 SHA512 d7aeec1bd277a91a1f4fbda69e5408f5648ad49ffac17d1ca54148ec30c31bd64639151988355395166747df91cd89cbed1863a2668a5bce89a10d2aea55c288
-EBUILD os-vif-1.15.2.ebuild 1418 BLAKE2B 575f1b3fe4398f8d15819439ba8dacd256211378d12428d05dcafedc6887da47e1d5e2c60aa7e80c5dc6ee1d2887866b689d621bce7ef42c9cff245d0410cb22 SHA512 9b53d5b13bdbee6bd2015c828c747dba4f2ec47c7c9355017085505e1db3bb6fafd183e063d54e16711fd941319816ca6ec5f29b0af1a26b7ec293bc491c66c4
-EBUILD os-vif-1.9.1.ebuild 1316 BLAKE2B fed08c77cb8740ab83da994b04d7f218cb8848c0e8e7d5635826b7cf56adf540823f96364685cd396649ca57b3ca9086fe1ee5bab466b448cd6617787415fb9f SHA512 50ebdb3012fb584797346da906f212011dc09a9d9cb11ea91df25daa60a446af246a9e5a6c7c4d3c4cc7b59cbe7c980a072c0e111f2c5ebf6fa9fcbe46bc7140
+EBUILD os-vif-1.15.2.ebuild 1406 BLAKE2B 4953125fa71b7fe0a5f2237dc384aa0b60f44ca1ef8df572c0cb83341c221f7b6c07d4fee858e06d704c121731eced3f0413321e4cfd2ef3afaa2b7415c314d2 SHA512 13481f3bb47f1b454f71b27e92e43203e291ae42d467924f394555bdd060a0c2e878e7d554f36686aa697620d23ba7527e6c14cb4b08fc57ee38e08ee7de4e19
+EBUILD os-vif-1.9.1.ebuild 1302 BLAKE2B 27a0036b4ddfe1962d976c192a78de3645a9be0d4719bb30a5d8ac4476facdb2d9c57102af18ec3c628ddb5827dd0c3d09244a176fb16585d9dc5ce505bba715 SHA512 d66716c118824549e9cdff3ee0e92caedfc17da53ebcead4b60b85fa7dd1456095cb5ca79da611faef8eda973306908745d87027a3077aeae754dd608ac30149
 MISC metadata.xml 379 BLAKE2B 9c4bc302bcb12ea964647546867a2f00cc84eda6f1193a700cd248248c6c992f6183c735ac55f021a8b89974ca336d4d840578444f02d1ac85cfdfcb8d48bc0c SHA512 3667aff7bf331a2383c2e4a854ceb0b1fa214bc605e98bcc9829dae0eb5e870ad123e9a2989a345134db916541005f54dce777c680e32ec6196785727a89831f
diff --git a/dev-python/os-vif/os-vif-1.15.2.ebuild b/dev-python/os-vif/os-vif-1.15.2.ebuild
index f40aad0c51cd..c39f1e165e71 100644
--- a/dev-python/os-vif/os-vif-1.15.2.ebuild
+++ b/dev-python/os-vif/os-vif-1.15.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-vif/os-vif-1.9.1.ebuild b/dev-python/os-vif/os-vif-1.9.1.ebuild
index 4f46a154d415..f7b24d313f67 100644
--- a/dev-python/os-vif/os-vif-1.9.1.ebuild
+++ b/dev-python/os-vif/os-vif-1.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-virtual-interfacesv2-python-novaclient-ext/Manifest b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/Manifest
index 74c2f748b65d..9bedb845a596 100644
--- a/dev-python/os-virtual-interfacesv2-python-novaclient-ext/Manifest
+++ b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/Manifest
@@ -1,3 +1,3 @@
 DIST os_virtual_interfacesv2_python_novaclient_ext-0.20.tar.gz 2581 BLAKE2B 3522366bdf65c96b771b0503ed30970e1aa8cafefea1752ee43f9363c14e282633e1ace9a86534f4f5ba60061d77f8aa59f9ca321d93d204a0f52e5a84d25e32 SHA512 7faa2d25c1a9de5907dc0ca23757b8500e0a05d5c0ab56c1d064e6b8d445f91a6c26c2208f69c2ac35f894536a0f2663d7d3caa8f8b96dcf9dd8b7b5e803d1d1
-EBUILD os-virtual-interfacesv2-python-novaclient-ext-0.20.ebuild 689 BLAKE2B 1e39256ae91b752617beca77c5afdece78ea54f3c7eec6cbee911b63cbc1bfe579ae49238a2743a275ffdff4c6db3ecc6f2f8c3377a82e5421f0d1bb3301fa2b SHA512 8178c564950f63c07655a80cfe815f6912f2f21768d446a39539cec6cf2c51929994caf561ca039a6dd0a3a4d6c800a737e52f74c785ad089c5337d019060987
+EBUILD os-virtual-interfacesv2-python-novaclient-ext-0.20.ebuild 675 BLAKE2B d918986975088981ab958d95d77b18a5bbdd7082f2fcd2473aebf8d6aca69ed16f35c3539fa8953002a9ac5c7813f2f153c27041767494e452f230cb6e28dfcc SHA512 524d6221cfe5047b6755078576e8dedbbebf4bc38d9f0a72c75aab900115aab1466984a307213263db183c51fe3898cb259db2f787682d694e16ceb379947e58
 MISC metadata.xml 560 BLAKE2B 07b6994eca2891d6c8a0b4046be8e7f97aa53bd1a7aa66f09165b59575336f918676465a25436cd20f08699f1935469bd4b0697c271fa54c2b552687cfe1d721 SHA512 cdd8f0d42937d49905650307eacafa171e7bb22fe09f7613f5addec328be7d6810bfeafc457d8ba8eb34fa17464392279d72fba3138c59932fda73018f2db688
diff --git a/dev-python/os-virtual-interfacesv2-python-novaclient-ext/os-virtual-interfacesv2-python-novaclient-ext-0.20.ebuild b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/os-virtual-interfacesv2-python-novaclient-ext-0.20.ebuild
index d0b5883475dd..7d7bcd7c2270 100644
--- a/dev-python/os-virtual-interfacesv2-python-novaclient-ext/os-virtual-interfacesv2-python-novaclient-ext-0.20.ebuild
+++ b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/os-virtual-interfacesv2-python-novaclient-ext-0.20.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-win/Manifest b/dev-python/os-win/Manifest
index 430131ecb746..61bfceb94df5 100644
--- a/dev-python/os-win/Manifest
+++ b/dev-python/os-win/Manifest
@@ -1,5 +1,5 @@
 DIST os-win-3.0.1.tar.gz 202691 BLAKE2B 934f90970ccdb7890379ca6f3545936db65f104414c4de51dd8956345b4e5330a3d6db286b6fc2cbc9f218528751fea56b7836d81cb9da1f271737817b220101 SHA512 619b893f4595fda57c2d339b10bf4a7de48c711829f1e2407f981c943b76999d1ee84c15a5b91b03fcd946f16754501cede2081c5ce0ae3ffea0e6f4faaaf23e
 DIST os-win-4.2.0.tar.gz 214676 BLAKE2B 689417494acd7ddf219b7b29d670ed888dc0649fddb5e0a94b5160b2bec66167c14a315e0daa2f0fa794de96cecb15a054cbc6f4df0c4c8d26abb2367eb06862 SHA512 5f828e5b0b0a178a65959bb69f88c7bf30282b71f458ac36c11ef197dac3e821a2cbfb8be43acbc90d845e247be990ce6618b6dbe60205af8e890c2f7b7d245e
-EBUILD os-win-3.0.1.ebuild 1204 BLAKE2B d62380f5245b0b4cc508f455199200ebb6b44f55469f23e7ba11f2311081d3e54a3e1333bc1149dc33f70eae923a0e186bf7eb4cd0cd55278ff004525b6474ee SHA512 c11ce871a108be63fc6da28777c6e6a64ba023b7ac059385f43dc3b8a42087bada470c85b8337ae7b8c149d95d15f478caf21608262b7a98e7bab983099edc9b
-EBUILD os-win-4.2.0.ebuild 1159 BLAKE2B b0d310385f3fc2948f7da3f6828273b6005db1bacea2f04cb5c75da15cd1defaca2b0064e5984453047376ce092cdd5a035af79b479830eaa39814a51b9aadb6 SHA512 e2ec9e65a2bb28198a361d3bf1d8bcb8c30e1c82f7888b122fbe023f27b31c62d16fdab5f410a9dca7c041b4699ccacf11323e9d1437615b9e5645db0f7d1943
+EBUILD os-win-3.0.1.ebuild 1190 BLAKE2B 8470f305a5966798acba766b9c1535f0c6fcdea6ee4a70ff54889b378be2220dc85848ce0e8412027ae726071e07a6460a8194cb31f792bf1855645c242514dd SHA512 82f6a7aa5d90e4bdd7e2b1bd5284ada337e4ab7d7aced11e31c4a31bdda0ea70de4e6dafa9ff2296d93fcbf0e61d0a467016dae184443f51d7aae723a53cbd48
+EBUILD os-win-4.2.0.ebuild 1147 BLAKE2B 4d3adc4ba3384bf76908f3aee30215edeae575dd67da0e34d3d2da2ee9304e77ba048c2e3b36e45fcfa8c38150a181107079998ba46c0816e05a3859f5c4cafb SHA512 069e3aee3752de235b9033c7ede59bed73dbbb5f45b0e67f44bff5787bbea5ee1f82ed7c62dc203df288306959fc07c80fec2a3645a036f3fc0ccbdae1ac5e24
 MISC metadata.xml 480 BLAKE2B b17e3983e5660147a3a55a76948e00dd9e0fc800e442cdf92e4e17a70737740b749a86063f3f644b092df6e0d00d4e9c36d11f6a8ba697f214c08fd79c560008 SHA512 6454d56af0f829cf94cd211f78651a6d611eabebd8a3aaf5cf2cb92aef29107ed6efa5e974b5f9e5f6f53ed29565c1c6ac0448de72a3f21efbf73ecbcad2dd3e
diff --git a/dev-python/os-win/os-win-3.0.1.ebuild b/dev-python/os-win/os-win-3.0.1.ebuild
index 31a919aa00e4..395a5842473c 100644
--- a/dev-python/os-win/os-win-3.0.1.ebuild
+++ b/dev-python/os-win/os-win-3.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-win/os-win-4.2.0.ebuild b/dev-python/os-win/os-win-4.2.0.ebuild
index da1e21ac8924..696a351814d9 100644
--- a/dev-python/os-win/os-win-4.2.0.ebuild
+++ b/dev-python/os-win/os-win-4.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-xenapi/Manifest b/dev-python/os-xenapi/Manifest
index bb6e481a6014..2df230637c4f 100644
--- a/dev-python/os-xenapi/Manifest
+++ b/dev-python/os-xenapi/Manifest
@@ -1,5 +1,5 @@
 DIST os-xenapi-0.3.3.tar.gz 135902 BLAKE2B 7ba2a7a386d3bbc0a0e20aeeae7b34c22540ed66a97ab48819eeb5995b6a5c8de09f59f0ab31ecee543147c75b33a5b590e6cb228f2f2f7aed861e3fe03654b4 SHA512 ec7b89299cfb4a76d0184bbac933e30857e45082cadf43c6b3f74d0c241cbb1013959e6338f85cb2af71c815a6ec6166d8e173898539c9f68eca128e2e908ad1
 DIST os-xenapi-0.3.4.tar.gz 139843 BLAKE2B 333b7af4bc5475584922264ea47a61e6c7a0fd813cd5ed99db1338c74fc86474d190df84ab8732d090668cfa5dc7ec43cfc75283f42a7298aad7d470deec5eb5 SHA512 4e5afbce07d38f93e93ac839eb26927a2436b33a39e14a57ed1e99cbd3501c7d2dec8db7f65617c8d6308e8227e60f5653102ac3a04d9322c0791040fa3f22a9
-EBUILD os-xenapi-0.3.3.ebuild 1078 BLAKE2B 7941d0c863157f35f00e72a978bf99426154541547e7772b0c9d97ff7e9428d0dfbd4d1f4bf76c3612c136b3d320c7d8505afe9b8c9352c608e7c0ba3b31c299 SHA512 f960228d7006714568381337401ecb5a53fc8b0ef06621434c16b84362fa4032325c5f3a0390817e5b1253ed805daef7f1e3cbbcfa646c26d9065c8982a6c9b2
-EBUILD os-xenapi-0.3.4.ebuild 1033 BLAKE2B fa055491759dc1bd23778eb81efccbe07777d7dd314f3956d46cc90d6b0d9c918f7b8f6d3ba69c4a77e1146757f515357ca3c2eb95e5d637144c5dd9790312e0 SHA512 b332bda0f2aa4526cb925fa0101e8da582c70060a69bb29bdf34c101aa8acc47882f21ce8cd95383715d431778c047d5106b129954565fde6d6131f38515550b
+EBUILD os-xenapi-0.3.3.ebuild 1064 BLAKE2B 031b64202e5a5e15d75c4d4cf878abf928411965cfeae24c5e2736576c7ae7521fa271d3315c95f786de29508a0e084057bdd571503d0a5677cc4b9cef4b79c5 SHA512 e87f42b5aca24f851d7a10575a7ee95af913349f0a8c9f1cbeee0cacdadb3101bccee36543479f71a10182a44ca147b8d19bf26ad2e7b0fa7ee6d6e3bd4130ae
+EBUILD os-xenapi-0.3.4.ebuild 1021 BLAKE2B 2687dbbb1198a5f3313d7b5113850f42cdd9bbaf34a34c601be8d1e35bcb7ab3fd7c0e0dd7d280736ce56153dd9d598239de5f07bc5617e5abe4b4efc018f030 SHA512 e9cc19a3506ede57b023afe054fbce9f586a1fe923494d6cef8ea39226447e94762c46bf59927c7e9ee285a57c53db5646844d3d4a548b09de8daf7244fafc01
 MISC metadata.xml 385 BLAKE2B f9d38f905be85b349d2afbc8c957f4da69f640e1156cf17ea94d64df946e836e7f1d5629f03eff601e625330320e99a1df11dea785bd142e82492beeedbe7a13 SHA512 b8a779ae9c1158dc5d435fdea67f528af82d880b858cacd091d6d9b0e1812cc0c909b46d76396785aeee8f26cb00d5ca53ce38b063c42ae05deb90efd01b586c
diff --git a/dev-python/os-xenapi/os-xenapi-0.3.3.ebuild b/dev-python/os-xenapi/os-xenapi-0.3.3.ebuild
index 3fe0c854aaae..3f8ecbbff18c 100644
--- a/dev-python/os-xenapi/os-xenapi-0.3.3.ebuild
+++ b/dev-python/os-xenapi/os-xenapi-0.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-xenapi/os-xenapi-0.3.4.ebuild b/dev-python/os-xenapi/os-xenapi-0.3.4.ebuild
index d10ef612b4fb..c98114f7dade 100644
--- a/dev-python/os-xenapi/os-xenapi-0.3.4.ebuild
+++ b/dev-python/os-xenapi/os-xenapi-0.3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index 9277b899d9a4..148c959dbdfc 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,9 +1,3 @@
-DIST osc-lib-1.11.1.tar.gz 89065 BLAKE2B 4410cd9033984a671cd36b1788f7dfc57321aa1303bd5dcdfd58aa394184cb936cf8af88fbd5c0966f89f671138d91d47b0e0cf42f2930d88e2ba15d744410f4 SHA512 703475a0ecf5c9c8b1b9fda1f2eec6ce544cc0862afdb3fc3db34ff00e9b09dff6b43907cc376d9c6ca5b8e56ea0e22b1a36b4783588ffe9ae8c43fddcec9c10
 DIST osc-lib-1.12.1.tar.gz 89641 BLAKE2B 06069dc38e72c2c008c730cb7a30279762c213b2715e70786e6d293a3087d9fe7d0b3b3a04fa343337bff6721d32bf25a35920e12dfeb03368d1308fc0331f12 SHA512 0b5c2e1376ea078f0641d3e2b69508539531b2d369f2171773ad5d44ded6f25112c3b0843dec11c481afd51b2b804d4e56736ae65a24ad4c59ab142b86da678f
-DIST osc-lib-1.7.0.tar.gz 81917 BLAKE2B 3a87d42fb8baed7096e01e591d863097d5efab63fc36f0245b5311fa52a0f952a3a8a52cfc964e14630009aed7922752e7a0c5d9aeb1da0d31d7caf40c3a9a44 SHA512 a3dd3ceeaf674692fa318809b190df30d1d6be5b59355b8f0b5862f5b220452e3df0185415b35ef596158ce010b47bdfea24e5fcc3d957d38a2a89b8a5905bcf
-DIST osc-lib-1.9.0.tar.gz 86263 BLAKE2B 23105d3e0a327e0c7a9d08be59ff70b510528bbc26bf8b5fad0dbd6bb53e96773427ea4a0a6fe069ffb8270ea001e767d2e58863132938398a0d9c99a427f13d SHA512 26ade2147f5e0f7c02a2ff0ca1e0b2c369f6cbcb7d7843c4df09e5c5ae9e5e6eb7001cc9232723b2941b956fec1c7ae34457fd8ba7c45056a185576cd8abe2a4
-EBUILD osc-lib-1.11.1.ebuild 1180 BLAKE2B 3ec8f05914a1ececcda60be9702df9a814dafa6a83b3f9138120fe10a0ee6896c4eb44ed3c906fe9bbb081dccab33185311574b1e9ce7fc003adb54b20407e8d SHA512 d9a28ee4d91634f73d20c1ff38e4284889ee368877201f2758c1172383c47ba41cf9bce645b7c4e75776e961e58aafa7d9aecc3fc4368658f615f72b838155a9
-EBUILD osc-lib-1.12.1.ebuild 1182 BLAKE2B d01c9ee2d54b3b77c72a18566ef1f7e62fcc2da585fe4586aebf71a5c5af42f98d2d67fe68ecb15d5941ddae5cc6aa47421d92f3667800be9d35487107044979 SHA512 30cddac2f4a0b0cac837509f706eeeac69c33ade3abb96f12517fb8a8ff9dcc7cb47f10e338f37723f902a26106404abe5a556851d2adf6c415dc7537261444e
-EBUILD osc-lib-1.7.0.ebuild 1128 BLAKE2B 0b014f75b02dcd920bfd013e55ef6943120c31f408aa18e995a18357dbdb9d8efe8561af9f01a2e41e4545d8a6fb0cdc773b517cea8816bad43d935a93ac35c9 SHA512 256a09c40698de237b0b29d5f9b946a65c15a57dbda0e436bad8b5c040c4046ee7ddc2a3bcff373bb16b1de5bbaf24aebb047e4303691df04dda2343ee634871
-EBUILD osc-lib-1.9.0.ebuild 1180 BLAKE2B 61a9e28ffe3ec422e898d48b0ed0ec3e16877cd9d9c617082e6c391ab04a328f8d8d18fa68713b5b58be9b78d97afde9ced4b19d33752e6f884fbd061f1ee1dd SHA512 524e3fde81644222bfe802c9110e4c736488cc02e6d99db51510ad4d6c754f840c68090497e68a345de8af1ca85a5180a818dc23ec7009bb6c0c1fc23c43c260
+EBUILD osc-lib-1.12.1.ebuild 1170 BLAKE2B 9a947fcf245efeb4d51494df3fa4b74073eab452e77f14b23e4a04e9e54ca89476d900de65a4c6d8dcb746ea3772df5e30071b93a689e08d358603c9455cf4e6 SHA512 4ea1fc91b6267385bf6aa2ada31cc9cc767a338c0350f1e75310ed024dcc89269c89836c9ec76840ee655470f7427050f24db9715ed393f0ec88e726a01287d6
 MISC metadata.xml 703 BLAKE2B c8c0ecef0cabde0df016a0a65b6f29079fc44b98f23bfa74abd7e9c9305b3469fe103998262027d7f16d4132d0520c530d41cf28d869cf50bdec307dac6ae475 SHA512 78f928551abdf1d6c53aa4f7ab7dc4b3f6a5212157b7c31adb5019a3b88064d06c66c693493ac2bcc6cf62e0f4b3fa2c6b4e329a25ab530df72220f430bd8df4
diff --git a/dev-python/osc-lib/osc-lib-1.11.1.ebuild b/dev-python/osc-lib/osc-lib-1.11.1.ebuild
deleted file mode 100644
index 94b207f04260..000000000000
--- a/dev-python/osc-lib/osc-lib-1.11.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-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/osc-lib/osc-lib-1.12.1.ebuild b/dev-python/osc-lib/osc-lib-1.12.1.ebuild
index 4adabaab7c7d..3aa2ab043ade 100644
--- a/dev-python/osc-lib/osc-lib-1.12.1.ebuild
+++ b/dev-python/osc-lib/osc-lib-1.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/osc-lib/osc-lib-1.7.0.ebuild b/dev-python/osc-lib/osc-lib-1.7.0.ebuild
deleted file mode 100644
index 93139dc9db92..000000000000
--- a/dev-python/osc-lib/osc-lib-1.7.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-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.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.21.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/osc-lib/osc-lib-1.9.0.ebuild b/dev-python/osc-lib/osc-lib-1.9.0.ebuild
deleted file mode 100644
index 33e8a61f7125..000000000000
--- a/dev-python/osc-lib/osc-lib-1.9.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-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.3.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.9.19[${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/osc-placement/Manifest b/dev-python/osc-placement/Manifest
index e1f388cab982..7f4edc546b52 100644
--- a/dev-python/osc-placement/Manifest
+++ b/dev-python/osc-placement/Manifest
@@ -1,3 +1,3 @@
 DIST osc-placement-1.3.0.tar.gz 41728 BLAKE2B 1950d3180903b42d8833c1fce1d5cf28310429e18c28b828cbbc84191bae0ff77d182e4c8c4515bff6697f0b3064a687a066e4ba84300ffdcacafeec7ba8e52d SHA512 ad7e783bb32bd3519462906f50d7e9d2d537872aaf11f4b4cf30bd60233004cd01b1561aaf24b99c30aa368879cf537196955482e706d544e525c03cdb27bb1c
-EBUILD osc-placement-1.3.0.ebuild 739 BLAKE2B ba4d698cf428eea00ae6b17197a340067ba54f7f761e54dcacc4a9bd44f7cda47413368c6d77b76e238d3d715d6ae7e086b23b317a27ff0eefc4606834e09d7d SHA512 91189d2f54c99e0406b25366702b9d0dd1bb4c7ee02ceb834d99b5899e4b93fdd7fb4db61eba1bbb043e636488531ef2ac9245c7599fe51937917c19305adb3c
+EBUILD osc-placement-1.3.0.ebuild 725 BLAKE2B 74680ddbda60c5794d0e3b5608b5ae3c242d8738e809477c3ff09b1354e26854aeda1fab8786e165bba1ee2ea6d3082342dcd8d25c0c20aec0cc4eaa6bb81b44 SHA512 47d903527e24b4238d7c8be8f33b5788ec3b10a45204f583709c80285de4f90b504f6508c9a0b739dbe2e2b08933810bcea02290f1c8837497a1b55f9a271521
 MISC metadata.xml 809 BLAKE2B 1acfba49a99723326ffc06a4920623b85b8339ef809b2bc975ae4c6c46baec684d1d672de5171a87f2375a9deb5dc1459eb7d35ede9c4b1e48d8a17461138913 SHA512 ca8bba39b6d74baec13374a0e19f6f6e023107c2c37d1745d2a44e8c13bdf35932a3c62bfcf4fc7013ddc0a981aa7a1ca686b0c13d41752243811058ea0b3538
diff --git a/dev-python/osc-placement/osc-placement-1.3.0.ebuild b/dev-python/osc-placement/osc-placement-1.3.0.ebuild
index aedb83b6704c..ddef162955ef 100644
--- a/dev-python/osc-placement/osc-placement-1.3.0.ebuild
+++ b/dev-python/osc-placement/osc-placement-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 211d50002ba4..960f1c21d5ee 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,6 +1,6 @@
 DIST bug-681012.patch 4751 BLAKE2B 50c95275ec06522292bcbc7833af63bff98dcc112b2c2f742c0807d02bf090cfdd70fdeed433149ca3f27b7b5d356d7bd321c145aa8fb212ffa6e77b42da976f SHA512 f7ebbe5fbdbb570fbadc7d840c11fba49a9bc13e04626df053aae3da5668641f095a48d89229a7fd2b894d86c58f14699822e16923f183c099792dcde0777051
 DIST oslo-cache-1.33.2.tar.gz 55778 BLAKE2B e75fea8b669d30efdf72bd565deb560dfe2c1627e4bca74ffbce923341e5663d641ae44b144e070e4af7587c08e911a4b025ffd0ca1bbc39dfc4ed3266cde1c8 SHA512 8111ba9f62724ff6ee64750a88807e40a38252273669c96b86dedd0e36f2d1661f54fd55bc462ffa577e95771d08965ad6be208224d442306d869db2d155da91
 DIST oslo-cache-1.33.3.tar.gz 56098 BLAKE2B b3d2ab549a2b2066ffdfc5d9b680da35501818719a8c6f460be1520c2d6342f1c41f0f1aa20ffdcc45958e83e242515a3ec8bf69ce1273ab47a8a26e648069c8 SHA512 7edc1d8ceb00f2989093ec1809120f2aa552de2d5ce6176c9af56278040d652fc0d627e0f7f427b9bacaaa24cec7b0fe24568316d90a4e52054357bc9b9e30e2
-EBUILD oslo-cache-1.33.2-r1.ebuild 1192 BLAKE2B edea95d24eb2756e656cb37790c2693dfa3b25fc3f004cf75fd0da136275c727a75600b1520720921f8a2990c8fb2dea786726801ad8b147b19077930f7cf9d4 SHA512 96bb301424cb4530e75e9f096552d323eb99532d483afa26089cbb17dd092760e8ba76f35c4b7c5c8730e34777eb667e0f3375db6ec78721f751133e7e910ec4
-EBUILD oslo-cache-1.33.3.ebuild 1072 BLAKE2B 58f04bebc6eb68e244e03d8dab1d1c259afde97ff6b1f492c5df5bd5d73872dc4e46412a790a45075b64cd3265a0d61581549538ac4a65dcbfdf4cd6333f51ca SHA512 4f0cd1b96d53eb27fc30df3c016c532fdeba82de21bf99aa58a1ed7f526daf5dfae919c7daf9bba7b49abcc90db2315aae1e54a96759d9dd7af925418212b151
+EBUILD oslo-cache-1.33.2-r1.ebuild 1184 BLAKE2B ae4c021f985270bfeda34584a6a953762f8a274f15c979e67dad6cd60d2a5e523f34a1af659832899bbfee4bed402c828f7c4d626c7e5490525cf7c7504b794a SHA512 ebec977f3cdc77b5cf7d1443b1b70fde4f17ab5648dc6c81988d1ab1c8daa9b95a453672f9109ba05c81ba207bd0366011883784728b280df53aa168d7764309
+EBUILD oslo-cache-1.33.3.ebuild 1064 BLAKE2B 753592d05bf39a8ac6ec16c056bddedb5e99b007d57679d277dd74e598531c8388fa19f421e8c5a537cd4269e5e448f2162e6f15ea02abb01135524580e66c80 SHA512 90195588142d161bfa928a5690ac37d0fd0b125c0f44448289251e12116357e9f1bb3fa232228022a8b348d297e338aff14abc3a736f450c137a073acb9b3d90
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.33.2-r1.ebuild b/dev-python/oslo-cache/oslo-cache-1.33.2-r1.ebuild
index 663262ea3fa6..dd18f35cf901 100644
--- a/dev-python/oslo-cache/oslo-cache-1.33.2-r1.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.33.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild b/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
index 0958aba71861..e0d9e2955bfe 100644
--- a/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 45f919dc24b8..880fecb05e3c 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.concurrency-3.27.0.tar.gz 49604 BLAKE2B 04a7ed66c6d7cf37014080113bd3782cf186f57f486d6834fd28f3d518141f8dcac6f5e67ffb5ef894bc6f5085a90aa41a041e35b72325c645f7567dd743a912 SHA512 fb2e1377a8bbad451ef0a2713dfbcd58ec06d455e97fc4d8acf8bfde8eb27d59826d68dd3411bd60b6d6b5e68ff629f0e6e4781b17dd4349bc5b87f17c8b9d52
 DIST oslo.concurrency-3.29.1.tar.gz 51785 BLAKE2B 4035981fcff3cb4384209f3b640b928dfacd13e324c9df1dfebb0c5230727736ff803b478e506b08ac4bd7bd405763b93bdb951b01751a5e293daa33df860c8e SHA512 f820b07dbb26be9170c7ded08ce96bebc8c8cbfa72a3be56e0cb0fd7a025160fe630ad256c8c5b1adc9059cd1608c3625513b3da311e5a611866280d2b65424e
-EBUILD oslo-concurrency-3.27.0.ebuild 1863 BLAKE2B 8dc39f4e89bf3af1f8d3dd03b6a5b408eef97edf8262823b70a97bfda0336bcbe5330e1d04315b11a705811e1639d5eaa9a45e790faa1c95f056210300b3200e SHA512 dc25919368e9d4aa1af6a3f2a10d401290889da4bc07508844377ef34402d8cdf7f229e79b3e7599d8dc5eaf939b726680e208e82fa4cfcf2fa71254e2b35f45
-EBUILD oslo-concurrency-3.29.1.ebuild 1919 BLAKE2B f07962d61ec5875c0adeed83639940152b7f92e8d0d6c5ee6c99ee95eccc9a2fc519d542933ee3c76f2e7506e137af078d78efcdf39660365cbbce019156ef09 SHA512 47eec23f6be086484c512339cb81ad8637174efd3cd6a7b7e0fcf5726501d405e36c7575ee3fc1c3fd23f20f67c04a8da38c08a82957cc6496e49dca6f0fab05
+EBUILD oslo-concurrency-3.27.0.ebuild 1843 BLAKE2B 1d107c059753f43ad773440aebc289b5db20a584e9bb2b6e91958043cae91564daaf1531f79f09fdef75193da2d74006b426bccd5abdb6cb10dbc8ead72a98a2 SHA512 d20ed16ae6a3e390c23973637e22a231414fd6809d6833fa78a6519892afbaba5a13c54b91671d13c44c55eb625d7207ae69e163613e6bef04c571098695355e
+EBUILD oslo-concurrency-3.29.1.ebuild 1899 BLAKE2B fd552407955e8121fdc855a16c1532b59ad4ed175a717a0aa0e56f8803baf9fc4111ad61675327ac1323c8cac580fb051e09dff88a5d9cbafa34bc6f7334c50c SHA512 b97ed02a6a9771f7e7e0950e402888b707193d118bede3ef58d316e13c4d3f480525ebf5515b89615593958e9a0657e6437c234e3d8ec1df1ddd07ae1764509d
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.27.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.27.0.ebuild
index 65c8e194a44b..77d41a1f4fd2 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.27.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.27.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
index 285554352ed7..3785252b3b57 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index eafb59b31700..2620c4cb866b 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,7 @@
+DIST oslo-config-6.11.2.tar.gz 152842 BLAKE2B 9217232e11252cd59bed9ae35ebad28fe8013f5608fe45544f7fb1d35cfb0a27c1172fd2f565f812ca3d9672d30df2962ac51de551cc50c8fefaae2266943959 SHA512 47e92c14d873a127e12fa734d975032bfa560a624111625b622d1b1896ce6e786ca661312afa894176941d4e8b13a2f6f5b44a05092e23f5fe1f8f78596498ae
 DIST oslo-config-6.4.1.tar.gz 144762 BLAKE2B 467e139767b6afd82e1c0d39841765c93e4c23b208e676bfd4c64512a71f6c432a1431d5bf902d268152fa3011e864173f6a766bca560efaadce7a713fa919b7 SHA512 97a47931fe98c6a19ecfe38fa8aae50e91e955db879b96988560db16c0ec775ce294cf0c9b45e62aa7dea67ec43cbfebf4a77e168f0c348bb03066c832dc40a3
 DIST oslo-config-6.8.1.tar.gz 149525 BLAKE2B 0676ac364410c5d2eb6c4d75b85c18d0cbb50cff33954a2afc96f4f779606912d46c0627b0d77fd63795f43e26baab113cfba409eb86e5a8c8353253542bdecb SHA512 d861120e35332411e7caba1ce1b37a2ad16d986ff2063d731edfa0cd6603000fd7f1abf6ebb611c7efbb6d3c4296c0ffb9ccea2c2cd6ba6bf7b18c53daa09f15
-EBUILD oslo-config-6.4.1.ebuild 2306 BLAKE2B c5dc946689e424d3852a4218a2620d2e2a9d042c9b0d755ba16a397f010707466cb845c547e89e0b013a7e6350db18f9aa00e29da39c1b295359ad63bd309769 SHA512 76159cf31cafb3cfcec1d6da4b2c70578380debe857ce572c3d4360ec7b79ce2cebd99054a7623c542be032b188d555c405264c52916cf9e4032ddf476a1c91a
-EBUILD oslo-config-6.8.1.ebuild 1972 BLAKE2B 89e4681ef784ec92b9eff18147f9792e7b3e05ef89d9165a4a4ba8f690a05e41dd3343389584dfc1cff3b4e546c21fcbae9d65f4c9f1746290bce480326d6ca9 SHA512 ffd2adbc814b308a3450899e20b6f82bedb6f71e250e5de1a19f124dcb9a25f88f70fed762aed94400f4b3000c4453a9b48d7525695953a391f5095c532c6a66
+EBUILD oslo-config-6.11.2.ebuild 1349 BLAKE2B 1e06ad8d84daad7c5e59ed4eae61a228a5b93eae4908fa70c67c0a62734704a97ce23d53e6a08ca4cd2b545588203287e7ac5c81b82b120397e0f03b8d12c149 SHA512 9f5faef79acb8eee7e8f5d84171ae083a46114650bd5bdf0984917ec695f792c1e642cce8d98c913bcf440a1d425199db72cb5aa94cd765e5edba5558caff1d5
+EBUILD oslo-config-6.4.1.ebuild 2294 BLAKE2B 1d066f6755a5ab2611032f6839b0c98919f0338cafbcfb0012a220a9ea7ebb26fa699810f719eda46f781e64658cdbca0d764819f44d245f4568a950be01c688 SHA512 b6dec6488c397a7fc92de597f21e88e5542e1208e4a43f2d8af1a9928e1b72eae5d115eebec438fdbfd6dde82bd3f580edf8a76092aaf204011b4fc3783edfd4
+EBUILD oslo-config-6.8.1.ebuild 1960 BLAKE2B a8c3ef2ab3572d964ec7b6fb258d3029968e7e1ff8d9dd5661c4ed0e95a0aafb835758e63fdbe790045e121bdac9804fa68f74d6297cbc849747b20e82ed26f0 SHA512 589c48a02bc603eaa583965c475500e90b8cbce018e80c4ba521dbf70bcf4d995a605d2f9d4c059745b8c787a119d144bdca5eef4783aedfb86256c6815bca15
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-6.11.2.ebuild b/dev-python/oslo-config/oslo-config-6.11.2.ebuild
new file mode 100644
index 000000000000..fa19ee9fc042
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-6.11.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-config/oslo-config-6.4.1.ebuild b/dev-python/oslo-config/oslo-config-6.4.1.ebuild
index e8a77ba7d689..24a4aa5b23fb 100644
--- a/dev-python/oslo-config/oslo-config-6.4.1.ebuild
+++ b/dev-python/oslo-config/oslo-config-6.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/oslo-config/oslo-config-6.8.1.ebuild b/dev-python/oslo-config/oslo-config-6.8.1.ebuild
index e742c003248a..d4c9654fc283 100644
--- a/dev-python/oslo-config/oslo-config-6.8.1.ebuild
+++ b/dev-python/oslo-config/oslo-config-6.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index cd9fe0bce726..23ade155b5eb 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.context-2.21.0.tar.gz 27605 BLAKE2B fa2be8819c3b5c46e12eacae12c665e8168c4d8ac88fe7e8b8c3454093ea14d1a5980d1ecc377eb7294d913e117cf5188571be3bf678f270712e09c5230f2f7e SHA512 af25aebd306d0a3d60032778e6e3ca10b976e758c10e5d02302ebfef6a6183c8f9a102e9b4c2c8400914d71976dff284654bbcec63c15192dcfd2605928596eb
 DIST oslo.context-2.22.1.tar.gz 29315 BLAKE2B 89c7dacfe42a9c3cd8d7fde8a77e3654f48788909cea725151e833a305c6916534919496393e603084311625cc9242661e72cbf1a2bdb72bedca3127e77ca9d9 SHA512 d0a3b9e41d23e8f642f8aacd998f6d6f4ad1fbf103947fc7403a57c4e3d9ae51b3cf73dfb79139d541875a0e412ed8600c4ce6b19cc207697429f48a7fb72887
-EBUILD oslo-context-2.21.0.ebuild 1234 BLAKE2B f88b8a677cd62a2665c06df61d4353b49083cb884841ada25fbf22daea57c05b751dbe8579a2968d4d42df50922d94967a35bdcf9f7f8091d0c9095be0a54eac SHA512 09620700eeaaeade35b40946f11494bf7bb49fce7d3cc3688a90633d46199e476547a174f85afabc031d64b62535b7dcf4fe94cea894dc3fa347ac9af87e2db7
-EBUILD oslo-context-2.22.1.ebuild 1279 BLAKE2B 8b9356f45a786f397d6971ee8dce211945a0bbf35ccc793f3a3c2d5e75e269dfa0bb02f11be81b970f30daa6f0f1d0ec1f885c0dda8f81822a0c9f5b1e654a11 SHA512 f5508ea537f4a462db5dc1be9990ecc50281a3a9920712cae590af4438238d677be3da8d3738836276790e22c503d6cb78d257b17563f44e042be993b1c9d533
+EBUILD oslo-context-2.21.0.ebuild 1226 BLAKE2B ed5f75c84530158def462dd90755f6001a212bd1e6b56af6c1267bac1eb70eedf94768ffca260fe048f00a19c6a860d45e55ee112063fbff899637005c443679 SHA512 99d4d67f55d129b59bd437a6d073d835686b0f6ba05db8e63cd494230ef607148722028cb22bd2cc7607f7740d0c9d5ce05d5da6ac4299919820758563477713
+EBUILD oslo-context-2.22.1.ebuild 1271 BLAKE2B 7c90620d1478dff470d3331f442488edcb5ee9224c9e2a84421759731b884b9444b37e70760aa60a0a735039465540541bcfe0b5cd60ef848f6e57ba25167fc0 SHA512 4008caea05cf43592beed2a1aea0b88e9da14bcdbadb51da0ce4993d5feb7fff51ff87a0943f1aff3757670e33b597c9d997148b66d248cf024ab8dcc594c039
 MISC metadata.xml 700 BLAKE2B d0e048afd7e2d85b6cbadc1927d2cf83469e0c8bf31d6aa6516e8d9f6af5d07e387c975c54c2bd877a22f2a964ab6b99d7f2c70130efcb80af68368d2f4c769c SHA512 2ff5f7f1e4a65feee089f19c189a30668f09000ffe03e852d084d65f4db245e94086dea053620cfbde5a793f3c1014f84e3e3e192deb5e16e94bd46017e88bcb
diff --git a/dev-python/oslo-context/oslo-context-2.21.0.ebuild b/dev-python/oslo-context/oslo-context-2.21.0.ebuild
index fabd74f090bd..19dcc5f416c1 100644
--- a/dev-python/oslo-context/oslo-context-2.21.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-2.21.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-context/oslo-context-2.22.1.ebuild b/dev-python/oslo-context/oslo-context-2.22.1.ebuild
index f9a31fa8b5ad..945f4d2d90c1 100644
--- a/dev-python/oslo-context/oslo-context-2.22.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-2.22.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 1f68b89d24a7..5a1cc5f4591c 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.db-4.40.0.tar.gz 171545 BLAKE2B 34172325f99938595b36cbbabea421f8e51f8c5916a908ade56a2cd072ea532ec08b884c2ee74481f3651855f9c1432be145df3689569b06a6597e9eb9bdd6d2 SHA512 b1a0db1d3624ffc86eb41b49f76a4afe3737d943b6465a1b66a2aed18524c463e52130f1d6fe27cd382f04633df327bba07254b6d4bfb300cdaeb51b608745f0
 DIST oslo.db-4.45.0.tar.gz 172505 BLAKE2B b280daf94dcdcaa21051bb1c8d611199725b7ad9017225f16ef2ae7342941a6b2bd474b1598cdb54e301f5143c985f250ec1b1f64cddf2ac3cb71a03d9acf589 SHA512 f976ff2aab1e39ce253618ed5669ee0b824ada03073028a990899784d96378eb7c5a2476e1a60ab9afa5a30fd8e34c84b0545d63a7f3c522cad9c7423208b1ba
-EBUILD oslo-db-4.40.0.ebuild 2205 BLAKE2B 2ca6c5f9c1e772415ff43834eae834b845ca1b3bfd1b5c21c5a091273eaabbd8359b6c5a8e10df99a6ed67e05a6c476431efc6207f103c5313721decf8795781 SHA512 5c626911b5b32aa5b893d67d2b5260d322ec143cfcc69884dd1599ace84c9382d7983279377417b5c2fcbdedf210a85e6d55542aff1deb59f746805159064b94
-EBUILD oslo-db-4.45.0.ebuild 2211 BLAKE2B 241199749d24abbbc13a70eaf013dfe3953602157e8fcdc153c52285b53c5729a81fa7a39352ceeefc938490e5a3db9f5c8806c573bee6962f2982c571b5bb39 SHA512 01e523b3af6ee597a5da40a3ae6e86e87a6fff6eef896079936483f091bfae5edd150e8de516da369da12c18ee790ca962e5ea28dece88ced36c9e6a35d5cd11
+EBUILD oslo-db-4.40.0.ebuild 2118 BLAKE2B 29b36b55159ee3672db78114eba306bc6a78340cb0ebb52c2fd19618d853d4e70fa1beb7df321647799e1b6712ca0c699dd3622e5c0b5e759b35ad14bb90edef SHA512 48abde72e1b30b0f5d53ac58584cbd223abb867dd22d911a63f9f6910f94494ec268e59a2ecc71ccc96b553afad1eae222bdfa44075c2c7d08ca4de84b345013
+EBUILD oslo-db-4.45.0.ebuild 2126 BLAKE2B c304a08e657950229de40bba7eb90153b62003060b96c2c98149696e9712651eefa636a8ab936008d399be25006cf1189eacf7409db0b5a19d7488800c070c84 SHA512 a3a59c744bceeac135d28f46f2edbf50a6abd68d2ef95cd644df0cb1b26585992981270ac701a23df02d173010e7855f4c606af27c6a84b05c031534cadcd93f
 MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-4.40.0.ebuild b/dev-python/oslo-db/oslo-db-4.40.0.ebuild
index ab6ed2e16432..624724caa6c1 100644
--- a/dev-python/oslo-db/oslo-db-4.40.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-4.40.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -38,10 +38,7 @@ RDEPEND="
 		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
 	)
 	mysql? (
-		|| (
-			dev-python/pymysql[${PYTHON_USEDEP}]
-			dev-python/mysql-python[$(python_gen_usedep 'python2_7')]
-		)
+		dev-python/pymysql[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
 		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
 		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-db/oslo-db-4.45.0.ebuild b/dev-python/oslo-db/oslo-db-4.45.0.ebuild
index e748cb2e91f7..d4bf92584022 100644
--- a/dev-python/oslo-db/oslo-db-4.45.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-4.45.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -38,10 +38,7 @@ RDEPEND="
 		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
 	)
 	mysql? (
-		|| (
-			dev-python/pymysql[${PYTHON_USEDEP}]
-			dev-python/mysql-python[$(python_gen_usedep 'python2_7')]
-		)
+		dev-python/pymysql[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
 		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
 		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 37d55af295c9..8a2cc371a316 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-i18n-3.19.0.tar.gz 41888 BLAKE2B 651b6e1ee2d2d6c11bd1b86b78eadf70b33338f5495fb93d58747635961df20fbf74fb2a949ef81b82efce582410f05c88806e678f688bb686b500378c77ff6e SHA512 2c12fc5ec24fbebd2624b3bf9d3043a62da84304e73a995c49b395e792bd9bd7d38a13f5e3086abe59bbb9ef43729a47eaee78ea0701ed05c15f5070af232a69
 DIST oslo-i18n-3.23.1.tar.gz 44731 BLAKE2B 2205d5f27640fe15c7143df2e18d27b01a3f90c30b04b838643d33cc490cc4257cde77925d76fefd0add0d3159ee4976281608b6e43288f0c0cd4fc4c7959b47 SHA512 82ebcf54d7edbd7c3e7c1d7e13b223ca9cf88aae717ee6fa0c2fb9b423ef88403b42b3360cfd7b8dd3b6d973a077a1458fc9c879efbb6006a1cedc6ade35397b
-EBUILD oslo-i18n-3.19.0.ebuild 1779 BLAKE2B 80fa9889828e2b3570db2663c93bc71e77464991000cda6ef54f83aa86aee9ed3bdd7555c59fdbadb7df00fe231c0e4104229722ddd5dd5bdbb34a4f95d550e9 SHA512 d98d870e55051e04fdf004f59165432fb332f2cc19c820f8a29aa0c7a8193e037a3cc923251ba90f0c63cca197d3413185f116cad6dfe8ee6cf32fd34e6db114
-EBUILD oslo-i18n-3.23.1.ebuild 1915 BLAKE2B 49091c234233b6bda77ba368ed99ddc964841eade981aa5846fd7822aa81878949c7282039ffc88877b4466b7b94b8b6bd65b81c379b210f029147f0beb52b8c SHA512 76c9c2d2d926e0d9bb3d0bc918c7354598a1a620e0cc79e7b90c02549e962d0648fc88c98bea995df327c0d1648f62c05d8ab3d826a0bbb94526d83b3d690cfe
+EBUILD oslo-i18n-3.19.0.ebuild 1767 BLAKE2B 06abfead2c986f2e30ab30592eba205c43f97b5056f6588ed016c441e331dcc343fde82e1891fe9a696e2abea8c59122d065c17ecc8ec5a5a6e897b282fbbaa0 SHA512 135875816eb42ca442de07303d047cc47997eef8902c36c9036668b8492ea6e43426ce86389700e327e8ec5ef0659377eadf7e085d12fdeef7c060ab1e1ad66c
+EBUILD oslo-i18n-3.23.1.ebuild 1903 BLAKE2B 03d5e8cf04b50f7ba7d5715891d8a3768d215e6aebe2201a702a26cfcfbc503506ce75870dadf579079ddb97b1d28b748d3d401c589ef0f9fc5f20a505cbbd01 SHA512 f0a84f87624fcbd38585746c4d1978222b6dde513ead08e385a487acc22e92efe78e668d3e84a78fe148383b418d9dd2601491a04e13fc4b3ad87fa941a57f86
 MISC metadata.xml 365 BLAKE2B de17547743fb15cc3453fbff770a48a4f7d7222e6a5f437064eef2269ecbc0a8ba3723893d653074364afd320894fda16f4e2f70da3dc6f60bf5e2ac763d61d5 SHA512 c3f2d54fd641ba2c5f423e2d358ccd8001354a7a3dc405af89b781ed167340b8a1dc23b3c15e70d60b72ed2d35ced17f9d4e6c1442ba8b3f919ab1788b33db37
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild
index bffaccbb2689..1bd39e3d2bdc 100644
--- a/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild
index 2ef2f3d79cd2..aaa558a19924 100644
--- a/dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 87934b464357..9befc3cd257f 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,7 +1,7 @@
 DIST oslo.log-3.39.2.tar.gz 85121 BLAKE2B 782323490b619d28b1ff5df0d72e752431b01156e4c6fc8c1ff6191e22960398560dfc3c871edf65d33b92a75a3af61c85a5b1b66bf56ed8237a638355ccae35 SHA512 6b5fad426387d65559be2cd014054c123b9db57158969229ce184919f36ea355b181e3c0c06c78d8e1567108bd05af38ec2695354070826933888332699261ed
 DIST oslo.log-3.42.3.tar.gz 87865 BLAKE2B cd4bd304a122093ec99eace122dac4cc6b859afa7b2c8a2257b34f6af0c3eae7aae8603e48ece8cfd37b561f4d2387ad6f4eb58210b6a477b0f3c86d2f938687 SHA512 ac9425725c86b73cd87c2e61d2254a7c4267bafdff1fd27ad88a177d5fc4f6c8a9a10d6fb38425a0b40d9095e5139de028a4c775f02de226a85a91d46dc195f4
 DIST oslo.log-3.44.1.tar.gz 87427 BLAKE2B 225f855c2539557d4d673c23fd58618c669864ea3d5c13f6ffdfc64b4926fd33ec45b6730671b4fe70a105aee39adea63af88a735dabbd5fe9588afb1fd9e2dc SHA512 b8c655bbe2e49b1d69ba7a68c9f115f012d75f0bc0fa1d5583d692b01e65dc17c956fc738cf8092ebb90ac9605c644989526fab4132f23ddef92835ff433e1ca
-EBUILD oslo-log-3.39.2.ebuild 1987 BLAKE2B 32fbc97db90c91c7064c2d7c43950449111d23365980188595090a91093f88166d67085e7a84166892b406c53f0360804ee70a488b998e2c93c3a2e5a6b6aa77 SHA512 1e8812f775a90165705faeadce691fa41022f01ff40944704722283db9f2e79fa7ca4f5041bf6e35e7f01d3ecdf6c9a2d514292840265fb614b4c29361a8154c
-EBUILD oslo-log-3.42.3.ebuild 1874 BLAKE2B 0ebd44eb690df3159860132c70a2fd82c9f3277590673503475a50200bf42a0deed7a3a61a86088e03982869c2c8c3597ce9944e3bfb17ca35490a195ec1a07a SHA512 f9f711e00537393c3f07d1b1cb3ac6e3c773d00b6b321aaf6bfe0a05342924ae373bae6c9d40e7bf98f8e75c82dd6351575121498e4a48667cd1bc7c37e47b3f
-EBUILD oslo-log-3.44.1.ebuild 1326 BLAKE2B c6cbb5d6ab14823954ecc50b0eee1e7f35d26fbf8527c25ace5d242216e4e761841603c063d913e78d6bc65759f31e5af9d31a1b7e25bdda133ff31763ce2590 SHA512 e1a8f41f3aec6f463f09b9326007f81e8282ede80226e037c7b5dffed5962b7290d204d57f644fec98a00d354ef8658929657a42345814dbb28b9adf01538b6f
+EBUILD oslo-log-3.39.2.ebuild 1975 BLAKE2B 351138c41577cec23df6b2d17ff5918c0f96a494a5e39fa09683dcb7a93711ff9f10c51ad17b5bfe2eba7f052b74378aa1986567b91de0114234ac5b2ecd5a1a SHA512 b5936f63ea85f8ce55303535bec0dddb9f0cc92884b533e49ac9faa981e32af70e1ad9a84286c1bc81f733e799bc7783dce13c9f2941b33e3ea3f71c252f24f6
+EBUILD oslo-log-3.42.3.ebuild 1862 BLAKE2B 50d635518936012124837864d82aba9f10d8cd37a152623a9ba35ba9b42e681ad6dfa900897dc473a310ee8fb04c5dade9c6eebab6a17fe0226efc5cc4b39000 SHA512 962d3ede1072358f018e25e8fd330c9abfe4ffdafca489a29f8c66b7ad125789e10531b9cf515ca28fcba57bff884ff5b0f397874124ac29ea16bdb65bc4764f
+EBUILD oslo-log-3.44.1.ebuild 1314 BLAKE2B 3210cc03011bb3a427d514033f0a65a537a5b5b672a222c38b9515b77fd4e00b86ee9fd6e7a5450722931a65030a3563207bf00d47f72ec71e605def7f14160c SHA512 e67dfb0104f968ac1859e564823d5a7b2be6633822b06599dc78648b27db1734945c520f3d86da6ae47f84ce68cd9b27ae5445d5f25fe251adb95a811340fb99
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-3.39.2.ebuild b/dev-python/oslo-log/oslo-log-3.39.2.ebuild
index ae4e71ff6c49..cd4257453ff1 100644
--- a/dev-python/oslo-log/oslo-log-3.39.2.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.39.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-log/oslo-log-3.42.3.ebuild b/dev-python/oslo-log/oslo-log-3.42.3.ebuild
index fd672284809c..0c7f4abec334 100644
--- a/dev-python/oslo-log/oslo-log-3.42.3.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.42.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-log/oslo-log-3.44.1.ebuild b/dev-python/oslo-log/oslo-log-3.44.1.ebuild
index a827dbd18423..9071f914d928 100644
--- a/dev-python/oslo-log/oslo-log-3.44.1.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.44.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 18c7da6c1ec2..48b0cac90329 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,7 +1,9 @@
 DIST oslo.messaging-10.2.0.tar.gz 255431 BLAKE2B 971f24845b4d0440fb600b459b4a41c94220e387cbe2ef16a5c93d72e0582116702254c4d8106f5f3f3a3435b1c5bfaceffbb1c6ed3e671f7c269fb6d5ca3cb3 SHA512 404aed31f2808de744d7fd141257aca3d2db2b65645eebfffa7edb364e50803621af98886dc60b46042e525a7a98a12f3208ba472dcf805524cd0defdd441060
 DIST oslo.messaging-8.1.2.tar.gz 296052 BLAKE2B c24d8bc22f1e7bb8fd4f58bf15c349a5fa5e41b98031611a0820b66ab7cabb2742d49995e5c730d1bba2c04a36ef4a055de0aced5f1100a7930052a4f4efd5fb SHA512 f7bebc525019f19f6d25178f4b2ef811c3073dc2b10600a9a01aa23dfadad4b428baeb929963df31ee7c775bb94c47493699e8031d5dd9cea5d865c28432d3ba
 DIST oslo.messaging-9.5.0.tar.gz 251799 BLAKE2B 72edeea222af199ace54ef6ea672177713c15c8556b7b1d1691c5d217bd57e377f871879c3429d46ef1339f4a4b5c610bae82c2aa6ddc74dc069d08b86c15537 SHA512 2479a51c2be7be5752d11fa2d09eb6ffd6cd82ce3531f0a9275eb5bf5fa4451ac16240873a41e2550db5fd7b51003bc9af293704e50d2f3033bd51b502728380
-EBUILD oslo-messaging-10.2.0.ebuild 1671 BLAKE2B 90c2a284ad4ab67f6484204649627daa772c73235dcacebcf077c81c0527a92ff473564e755204b76ce3e6a62854f24025ab601de5d661d65844f8c94290ff46 SHA512 fa05e854957da430eed1d5a6a8ab45e2d1f8aa4c9198d64fe16495550e7bcb9157f9d96c2afcf6f0f6a119612243a5085798481f22371c5559a0ac7ada19e8ad
-EBUILD oslo-messaging-8.1.2.ebuild 1943 BLAKE2B 68098cb7a6988819d0a42d38a7e24288c964b3339451ce1919e7acfc683148fac7d1658deecca5f50461fa3c2eb98b5bbc2866750ccbe52bac50fb92fb8b7b08 SHA512 0e940f38b388211d6ca008782787d13e07f78ddd411ed145b6ac04f287a01f5c60e6ea62cf89daef9bac7b00e43619aa8dae66bfac0aac880848b4ac4e39273a
-EBUILD oslo-messaging-9.5.0.ebuild 1764 BLAKE2B 2e8a90aeba377eced243f1bb36e25baa7bf134ea5c0352208f9cc47e7cae17e722cfab9871fb29da356a88bf10561c3212b5ad68fc74bb3675418dada8079b13 SHA512 922f1b37c550db3fae096336e683a05ac2b5f7600ff33de5f4efefbdcd611627cf2d943a6d62e8bb2a4336c0190725eb05bda29e837f7cc472b5e5e6f1b80b0d
+DIST oslo.messaging-9.5.1.tar.gz 251389 BLAKE2B 2f6ceddcb476e4a65ad1c5359f0e771010d8a8683b8e2d4961c4aeef5c78e4b9fa5c440fa4716d0e0adce4acb4a79437e44968983715f72f0b8d983ac624ac80 SHA512 4b6c90a391597d96d887a54eed4ea29f8b803f3e48609644d865a5708eb6202c07c1bc7fecd1327bd0f55611224ede63166fd10452a97edc203cef2256f49f35
+EBUILD oslo-messaging-10.2.0.ebuild 1659 BLAKE2B 2c7381dfc84b54ae7260f68699baba2f017233738829259c3623fd57b87ff988fa299be89f4c37bfeb10419f8876fe2e323a3ad94fcaabeb955354107042f60a SHA512 b08d716fc977fd966c27d0fe873f229fc6a8bdda96895e975436785c9e9d6f435e31176a914f0be6ffcd4f122a354d57b0452dbbf4e6c20a89dc8065f9ac039a
+EBUILD oslo-messaging-8.1.2.ebuild 1929 BLAKE2B cd00f4da9362b89bb76b0f8cde68a88bf315fbdc759c0f1db871ab92854d2e6970f8c7cd717221e8031742baf0eb8a83a49842abdf840df0f8eb36b4125da3ce SHA512 015981d3919fd44ed212ea81e7d5c8afd7c2a72ccddbaf44bc4cf59cfa1f28792ca6bdfeb94595a90e3a3053e894676f8d089b37e7c1df92430e1b3c7d2fb110
+EBUILD oslo-messaging-9.5.0.ebuild 1752 BLAKE2B c04a7a77209b0aac82de5293b360570c6ec410d98e18ac6ad08d56c12bf7e7df94fea08f184ccda1306ca2aef6c0828310735ba8c92d530d7461efcc1118af28 SHA512 c21864a77b12a2d7b19cca4ec7fa17b8a5284db3f2f803c1065c5cf2447313642455ef3014ada2ee9fdfb530296432964644acea879c030174f1bcb20c7f2d44
+EBUILD oslo-messaging-9.5.1.ebuild 1754 BLAKE2B 5844b2ff45edc935e73729048a2c12572282f6541ae68bc604a2007fea9a191fa9b6a0a0824cf2b2092b357b897ac5cb0e72bfda8a81c25244c1a5cd02cd3a42 SHA512 2488d5251ec93069621b14dda4cf14695c47467e75c2ccf27d076817b76955cbce96b9e666087d9926c37c4742eade614995eb3ce62b7df78514a25cfd3a2790
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-10.2.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-10.2.0.ebuild
index f6bfe150314a..cef773967641 100644
--- a/dev-python/oslo-messaging/oslo-messaging-10.2.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-10.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-messaging/oslo-messaging-8.1.2.ebuild b/dev-python/oslo-messaging/oslo-messaging-8.1.2.ebuild
index c5baf280caf3..ec30a5571710 100644
--- a/dev-python/oslo-messaging/oslo-messaging-8.1.2.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-8.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild
index a245277a2029..91134cc529af 100644
--- a/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-messaging/oslo-messaging-9.5.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-9.5.1.ebuild
new file mode 100644
index 000000000000..c71f43ca6ca8
--- /dev/null
+++ b/dev-python/oslo-messaging/oslo-messaging-9.5.1.ebuild
@@ -0,0 +1,49 @@
+# 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="Messaging API for RPC and notifications over different messaging transports"
+HOMEPAGE="https://pypi.org/project/oslo.messaging/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
+S="${WORKDIR}/oslo.messaging-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-2.4.1[${PYTHON_USEDEP}]
+	>=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index aa794cfa4569..b217846b9c9a 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.middleware-3.34.0.tar.gz 55582 BLAKE2B 0e1af09d016cd5b81c5e0e719d40665ce24e0caaf28a4aae0043f99eee4e74a36669fdaa39330d0ffa13b588892480ee5081e1ffa41b431687c85964c7f30460 SHA512 ba8b418eb11f25ca929db32eb0451fdba757197e1bdba90dd56665e08daaa6f0a4dc6cc07788db4f14ebf2625312d3db69b73acc5cb425fa9e35299f22b6d451
 DIST oslo.middleware-3.37.1.tar.gz 56354 BLAKE2B e9b119d2163c3949eb98b7580b4d5aa4a4427b9a8b3a841549f282358d8daefe62cc3f0588535c744aab7b77b44d38691316f50b9d60e5c974e3a0714a367699 SHA512 1864b2c25602ac7e27e2b080617f7af5f38083705735893dde744e7535d127d62ab0f29a0ef2575ec53af22969544d83e454bc5913b5719c4eb7d312764fa5c0
-EBUILD oslo-middleware-3.34.0.ebuild 2202 BLAKE2B d189d929afe580d3fcc0bfb8b27fc90a7a44b4619afb25858903498c205727da9726345a4cd2dd87e286e643ffcadde3f539bff599ba8db3dfb867ba2156f2b7 SHA512 2f27e6668a882a9594336c620bf8b4cccfa4eeda136a22e0888b3458a44ba3892c7737dd0793448faf06846960049e82cc10bcba558f6eb7a0e80cd12b43d773
-EBUILD oslo-middleware-3.37.1.ebuild 2030 BLAKE2B fe5d9bb2e3167d41f8fe5d81798f0f91e67df7e798b08236a87a62039c071e93dfb1b3db8168ab53a23a2b110d87bc8f80649b7b2953ef06a5704113bbfafbb3 SHA512 f1e24933e0c44111f0bd8e4f45bcb60a549a59f31678d17924bbb670275943b86b2f3c8d6c97f193357bdb1301835e632df4aa633530e39c379fe89a6f9616c7
+EBUILD oslo-middleware-3.34.0.ebuild 2188 BLAKE2B b96efc4da622e7cf1b85330be3d082f66838ef813977ee3daadb9b6f237e4d395d7c245b382352bfe91ef500b4494c09fd7f307cd52b5f4e71728d693d8f3577 SHA512 3dd41d11442ef590355101dfeb52ad3d5be551e345b02a29f128b7328cdb450a928b250ff85baa2172ce1ac55698f4698616f8d67757c4be3ecac4237cc2aec3
+EBUILD oslo-middleware-3.37.1.ebuild 2018 BLAKE2B 0bb6bf29c5d9fc8580a3df64abd2a559cf0d9e2fd1df686b3fafcd3fc6dbc38322d720dbf08c65644e5dad7ad11dd5b1e469aa3e42ccb3c8cfad66a44e74d9a6 SHA512 b16ec22d46819772c88369c01941d3dbcf3a56245c64f08a714b14d5487c14cd34e1175179d9d1b1135f40b0af3390d3ace3066c01d3f776b3995350830e0fe8
 MISC metadata.xml 766 BLAKE2B 09e791c996ee3e46083287243f3180ad073f53611981ef527b166c7c251401b2a3c34b8c0db8142ad77b4d4a82b92e43696b36f5fe80f7077e92928d5a825930 SHA512 38381c4dd993470e01cb5d469f345880a730b9afb3536b467a6e86243174192db346dfad58282e17d1bc0bcfb33e08b0f1797577e938c982e633cec8719d468e
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
index 1914411171db..d4dc18808969 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild
index 07420221a3d6..529e6b770e81 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index b798a830ca9d..b11a9d6af52d 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,7 +1,9 @@
 DIST oslo.policy-1.38.1.tar.gz 82871 BLAKE2B e47e96230874d1c287a1d4e930c9a5dd4ab35ccfee62b1c93c9d046adaf877c7e0cb65f9c34ef378c2a212d6986b0c1abf86af0ca6671c17f7dc8e85e1f1e706 SHA512 6b80a45ef550f5562d0c5cd3a0a466163d741bba7f9fb430c4e9d5273e0811d468d9c0c19c1e6168b38b4436279b81a1aec379d6513cf12d59f1a50fd7a4eb91
 DIST oslo.policy-2.1.1.tar.gz 90438 BLAKE2B fa99f36c688705fbaacefbb01bbc74bb5efd6f6c6ab0e1c0a8e21a299f9a45e162988e26a8da98d0edc2318b8f0b16d2e3c75962043da8aeb365b1a35307dcb4 SHA512 e5925156a42978eada310ef1fd695ff7759e22a4124aaf0bbf5803071484ea83dfbce335c45bdfa73564050b853661d848a1b92e457de8fa3f4c1f27abcbc089
 DIST oslo.policy-2.3.2.tar.gz 90884 BLAKE2B 6eb100e5baf56083bb846adbcfcd0ed1636da3e21fc1cd7b164c89f774b34fd10604776c3751eb48233a8d0822b6a2aca5f57fc2c03babd543cb49d8b6d1a151 SHA512 44300e8aaf894f99fdf6bf4c7b3890013b7f9e9974667a423605f106baff2ca05fa0b8ebc82081511ac211b9c7bc57356a9aea8dbe78ee1ac01d364e337936fe
-EBUILD oslo-policy-1.38.1.ebuild 1219 BLAKE2B 3e5e5eeebf9acbeb29ba131e0322825261322cd212c5b95c06e95938b80787931f261a9b30d5a538b8dc44ed1fda844f82854faebbe92dc152c5f57e2ef971a5 SHA512 2d1572122c3efc725ede91766b48ef3ab2192d7d728f6b129a2b2aa51168eb049190fc6561e1c317ab77ba89c58314447dce65f60c8dced32b15f3ff1181dfb1
-EBUILD oslo-policy-2.1.1.ebuild 1220 BLAKE2B 345909d3df0d89e87beab94df7c0c2cde1874bcaea117a0a4708463ce4c8c7da25202ae82000a43d0a7cb213451e94441dee56fa5ef66aec92f93ecc3b01cb2a SHA512 7dfc88ce801b95a3175f57579d239df6d6b20f8723fb8b85bfe55e9b07206f5ac96cfaf3d468c8e5d02d7a5a727cd7e91f707289de76fa6462dfa9f2a202cf8f
-EBUILD oslo-policy-2.3.2.ebuild 1220 BLAKE2B 345909d3df0d89e87beab94df7c0c2cde1874bcaea117a0a4708463ce4c8c7da25202ae82000a43d0a7cb213451e94441dee56fa5ef66aec92f93ecc3b01cb2a SHA512 7dfc88ce801b95a3175f57579d239df6d6b20f8723fb8b85bfe55e9b07206f5ac96cfaf3d468c8e5d02d7a5a727cd7e91f707289de76fa6462dfa9f2a202cf8f
+DIST oslo.policy-2.3.3.tar.gz 93581 BLAKE2B 50d1b45b596242b901a5b583b412c90d55b2ea9501dab29fa24be7b1c64eacf89f0f7df742f897503ab3c09399bfca25b93ed9cc3aa2377a72986f73bb96f1e4 SHA512 b4a2febe240582dbad8306e2208bfb7bd83c2783002544428b5888a8930d959919f10044eb2c30579e2fe61a6958ebefce4300f1778798b201714232a2edb88f
+EBUILD oslo-policy-1.38.1.ebuild 1209 BLAKE2B 1cdb54ddc6f303c0417fd410489eae887e09ef26eebcf0a8229011a5265dad691a0bfec036b9400ff40f7cf744f6e8c5a04747d36f7e736d93debb2ed5654c5d SHA512 3799b3f1894a0f9924f7bc596334c25b49d42577ab14642c5b58ed6b444908d812412e0f2914d839daba378819e90f675c6902688bace1183ccdb609213fb03d
+EBUILD oslo-policy-2.1.1.ebuild 1212 BLAKE2B 1a0922f292a6dffc518b431f24e662edf6c006f95709c1e5a4d44b6134d97b4d897183400728d923c0b412a90fe69b8de58c47cd9e696dd00901d4dfc18ffdfd SHA512 69a0934bf19dfc1af089b18f19ea326a47326a88441e210205685bbacf2b353f1a8c79a9a543b01d785591f06de9ce22fa3e9c005e516ca06babef00d1bfaef6
+EBUILD oslo-policy-2.3.2.ebuild 1212 BLAKE2B 1a0922f292a6dffc518b431f24e662edf6c006f95709c1e5a4d44b6134d97b4d897183400728d923c0b412a90fe69b8de58c47cd9e696dd00901d4dfc18ffdfd SHA512 69a0934bf19dfc1af089b18f19ea326a47326a88441e210205685bbacf2b353f1a8c79a9a543b01d785591f06de9ce22fa3e9c005e516ca06babef00d1bfaef6
+EBUILD oslo-policy-2.3.3.ebuild 1214 BLAKE2B 39cc784835e3b166f77fe1a26912c470cfa45c0f8b0ca480b2dc947818adb15c9b024bbad066efa1078604e8802bea28afd52995ffa6dc0a04b5d397446fb695 SHA512 967fcfa49fbd3f1e2b49fa18af0c736404d488b2188a9d6f327426d787e0237ddc8a7be2ee3f0654dbdeac2846dee3a3146b1724cde964c6ffbc673e5c3c9ce4
 MISC metadata.xml 600 BLAKE2B 5c911411e88182db677743ddc559bdbd0695f12648a00fc6b0474535ba52493eb2dc291f51a2fd37701a17f951627fabd83c1ae3c616331c200fa231eb3c4dce SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe
diff --git a/dev-python/oslo-policy/oslo-policy-1.38.1.ebuild b/dev-python/oslo-policy/oslo-policy-1.38.1.ebuild
index 5f24fb50bd31..85007c3f1dfa 100644
--- a/dev-python/oslo-policy/oslo-policy-1.38.1.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-1.38.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild b/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild
index a6c6091fa12e..c3144b2fa23a 100644
--- a/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild b/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild
index a6c6091fa12e..c3144b2fa23a 100644
--- a/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild b/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild
new file mode 100644
index 000000000000..099d09f598fe
--- /dev/null
+++ b/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
+HOMEPAGE="https://pypi.org/project/oslo.policy/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.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[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.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-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/oslo.policy-${PV}"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
index 3cda32424ad3..80fe97685b64 100644
--- a/dev-python/oslo-privsep/Manifest
+++ b/dev-python/oslo-privsep/Manifest
@@ -1,7 +1,7 @@
 DIST oslo.privsep-1.29.2.tar.gz 34376 BLAKE2B aab2807ec44cb984f7b304f46ffae39d2965dbfb876f08e3a6fbf24e9e70d5f0ae7a2aed9d47b126c48641c56004195bcc4ff015865e97b966e7f6b172f9f5a3 SHA512 8130700578cc1b54530011da259c795b6eb24ceba959f927934cf21e439d1412d393dee9f7bcb804ac52a4ae716284df8950677d5386905ac68bd6c37adfabbc
 DIST oslo.privsep-1.32.1.tar.gz 35671 BLAKE2B 06a793386b39a1899daf87ec7a9668821baf66d04cd785298d15b3ab1a1ed5fce2366b529e6d0eef0eaa64f35a4f41000a3b779648909737d6fe5a651aada631 SHA512 250c80a9654fb3ed503742cf867b36b09721c97b428684ba42542bcc8cccdf5c821156177360973594697135a7181c37ccb05f873746c241e0d78a14a15f7b05
 DIST oslo.privsep-1.33.3.tar.gz 38774 BLAKE2B f2d2db494e7af1ace672734dad89fcccb9d78d446d646fb25446db2f788bf2b762e85a14e7da6bb0be382289cc1f43b448bf506f8932ede53f87cd4f5e6ade58 SHA512 5a4ef7cc8b04689f544eababb76b4c5070ce9105eaa3f04d80c5976ec1358ce8b6f13fef7f968b4dd2131aff666264be00749f630651b7e39c93aad96a772bbd
-EBUILD oslo-privsep-1.29.2.ebuild 1797 BLAKE2B d537739502b014e24855e96ac85748da712743b0671f9714cb383532236dff7b72c16576eeb778ee4506ee5c67f5f859a537d54844bdd1b6512046a93511b049 SHA512 f29deba52fdc1b769d7e2aec12d9b0f9619238a8bbda80a3889746b97310d820b3065cc3d190f8d2f3c95477ab606501edbb7464eeed44fed7a5b267a13be9fc
-EBUILD oslo-privsep-1.32.1.ebuild 1887 BLAKE2B ea04e967f6e050de27502a9c9b23390f66845ef7e6f17b221576585841e0fa43af13446af10dbf2dd8950a1e1ac1e1642bf68eada1a46c1ceeb00b3b903dc4bf SHA512 d0c6df6d822d570fd416e545e887cf5d0ae69b8fa593d0289e9f41b53b80b9cb263a2be0c4603eb2903d2b82616fa7f2d2b449ce28872420a6b06155d4c249ef
-EBUILD oslo-privsep-1.33.3.ebuild 1313 BLAKE2B 09281719d99ceae0b0eeae38b62ff9d36267103b1ed89e35793a638413eb24d8f06eee43f64dd187b85313cf707a412f88926b326872aaf1bd5e53c4c7bdaa34 SHA512 71096215286e492cefb2f71f91fdc0024aa6dbc28e653ab161c68fcf3ed6d9e6af1b574a07620619ca8d526c2d1c3e8b90298944717eb3423f20e4c723c932fb
+EBUILD oslo-privsep-1.29.2.ebuild 1783 BLAKE2B 4f98b87838b492e9be400f8c15b68ecd4d423bb3d6af4c9b5b162d38b6a874c29d7397e4ed0997b4ca9d8f2fa41cc958eaf9331379ae7043bc990f597544562f SHA512 ff6147833401d28fc59d7d88e5ddf224190c3c6daa7e80813feae3a43eb8a6ea39698f177535ea42eec82158acae1ed077148773ccc85850ef10dfe99a11550c
+EBUILD oslo-privsep-1.32.1.ebuild 1875 BLAKE2B 77d4a77b4359c35e5cf3c7c29c9ab4bb8499ff3e21b5d0dc0b43b27d40a6294bda387efda6ed20a5e1769aadfd6cb315e28ff3340f994f9c44f11a4b62f56d2e SHA512 2da98f566e4e8c33311ed262274f72cf003db78ef5a7e365738ad5294ac134f4afc87346610ac6e80bba12d0d02ba4827241054150a933d109f9242ae4f5d2a7
+EBUILD oslo-privsep-1.33.3.ebuild 1301 BLAKE2B 852a4dac9a1e6d082a65ef0663ecd7430e97f6c151593bb965f10301a8ff7acaea2bc0f37078390890d9d6ac469b95a5d82819bb148c54e5a3bad1be4fbad199 SHA512 80f5e1a2577afb4595a232000a20b11720d69c5defb982e27252978cef0cd8f41291831aef4abeceac3ce7fbe9abd13f4174b8cd8f157f620b6f1d5e3d1f9343
 MISC metadata.xml 544 BLAKE2B a76322f18a6f2b32d17934a5d8c747963f5bf647cae027babcc4508c4b15ad6c958baa30399247302aa696dcde2ade3a9ae4552de7c1538d4b0af79b3da2ce69 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.29.2.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.29.2.ebuild
index 48e481a14015..c88710fe0eea 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.29.2.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.29.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.32.1.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.32.1.ebuild
index 7ee91aff26b6..3a3b7bad087a 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.32.1.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.32.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.33.3.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.33.3.ebuild
index e038698a0f7a..af60fbecb5c2 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.33.3.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.33.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index 398daa2f9bf2..4ac6d044fc89 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.reports-1.26.0.tar.gz 48691 BLAKE2B 670c3c7205dd2ceba1559d296cbb697045aa088f7343614e82c9c5983166f34e90af33de43c55b1d865715c840ea3a12fcff697a798a5eb0b2a120a39c4895c8 SHA512 e4a8bb5cdfaf1cb82f53fc56060f2e6bfde85ad6933326faab2ce8f8181231510700712d191c1429cb264f70a79695a069fe9dae93aa4a70aafa3efe37898603
 DIST oslo.reports-1.29.2.tar.gz 49597 BLAKE2B 4c5f76fce7075fa1b9dece5a617d2a198d04386ba03513070b700a5794baeab18e9266012b8f10d232d5063eadf8467f0169e670fbd6dbe7e2838e34cbed4bb0 SHA512 92ba14a445ae0a12454c8861f43bcb2aed9f07373008b0246dd10a6a650ac22be8e239365441e6b192d11d09506dd51a4c2e4a6fb54560fa46175b0f085c4fb3
-EBUILD oslo-reports-1.26.0.ebuild 1293 BLAKE2B edef108a7240b7e9f370c710580d1a934793133b4a1ab9eb35992677e5d7b085e67f44461d8d2fb83917eeda834fed5638efbdb95e8effcac3e2b3bc3be8c046 SHA512 50e7b1f4a8652935eed67a6d2acd26b405a44f65b5b704d960d7f89ca5a3f268ce45ff597eb80da470fe770847d56ad0e5f471f90be4c2ad0b22642b6056bd35
-EBUILD oslo-reports-1.29.2.ebuild 1076 BLAKE2B 1937d3cd8356baf743792c4f5558502abda57540912f4c51b70c143a1b504340b832e7f813963d292ede2c13d7baf1a1ac55ed0ada0c7e1bb7b601a3aa54240e SHA512 7e1d53a0e166fae6e4f9af44e57c8af7ed6ca886c9a50f2e3cf4bc9ace972cde267c14c9508c869d1f12acb01fd986f483dec3059583a04d11ec042618c91cfe
+EBUILD oslo-reports-1.26.0.ebuild 1279 BLAKE2B cdd3786c035de49df8d4a95e4cd09fb4804be211fd8868c7f99e06eeef4ba0e958c8930c50a3cf46e19ef7b8b968131c8a189a24a8aba29736fc0186871e0e79 SHA512 1ef3015475628f2f0c01419185e8d1a1f37a9dbd4a1b6a58bc961e22ec6881261b21549137b7ea24fdff29b1a1f3d1832751b849f8bd1c832361324f0c150cd1
+EBUILD oslo-reports-1.29.2.ebuild 1064 BLAKE2B fdd549a2cb6dcd640fc025683f5cbf274101dc6b645dcddb1c839d4103da94e814d20100a4e1987a94fd2ea77a4bd940ebc1d1a85e97d8a8272e3ea93883432b SHA512 c4661a61f829b4682ec4c919341ccf41e2176db273f7cd5a2b456ed38942c180d75ef7bfc88c661d20763d6daa10a4264e39e7a89a78a892bafec846e685206d
 MISC metadata.xml 329 BLAKE2B 431c4b925c3e743ab9f24b399affb6c0debc3c81f2dff9fc3e30c04af99b1984b8b8ee56d143c5f130a2c77f3bcecc0ff905d07fad2e3301ce5ca1b7920715d9 SHA512 61b44fd1704b8cee9c664efea764a36fc32e5019e5b9c7fca107b8a3a3272a7f97c525827b6ea918d0f91e9098f19fa164df62c83cf617b8125886aee633c1ec
diff --git a/dev-python/oslo-reports/oslo-reports-1.26.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.26.0.ebuild
index f0c2ec4b0fe4..50d4589ff148 100644
--- a/dev-python/oslo-reports/oslo-reports-1.26.0.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-1.26.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild b/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
index 9c1b91075216..c5a0877b6783 100644
--- a/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest
index 2b85b9f9e27f..ee5b290ea171 100644
--- a/dev-python/oslo-rootwrap/Manifest
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.rootwrap-5.13.0.tar.gz 43433 BLAKE2B 8d53587f63022255683d18b8ce22dca07a160d7692e9d2fcd5e6c466bb6969da11a9a1af4646809921724b9f1b63b2532728bd3ade82312354793b6b4d15f0d4 SHA512 ff716e1e5900f754617578eb8bf60c1d2794474706f22a0c619c94177602ed3c3acde42ad499a7a613f310d6dffe526339b5cd1c96ecc727dcc43e1a9afd606c
 DIST oslo.rootwrap-5.15.2.tar.gz 45566 BLAKE2B 1755a52d1e380a512c50f5314f7a4f249da9e62030abfef531bf973277a98f1f42f1c27a69a4e6e5cf64441e6a7263a3780355da4860461cfafed172ea087946 SHA512 9fc4c4678a25ebecb08026e71ef8da44bf1214f177d5330de8d68cfce8c3d85f4085a9e19f282bc8b498a36d8a7e384cde354a95619a800e3a68aba088df5aad
-EBUILD oslo-rootwrap-5.13.0.ebuild 1638 BLAKE2B 16ddf2a6ea3d75bc9e37deb14301d2a75db182fce4ce776ddb86609ad493c937abfaa0994286caaf11412b1062c2d3f864ef19ef993af0ea659458f21f9b410d SHA512 02771a941cb44e2e2c1a3f19080c68288e79c6e9a2c2424f668877a12647187ba167cb48ffa7df7dc6284a3e6e113454daf02e163cad501524a6bf9154811528
-EBUILD oslo-rootwrap-5.15.2.ebuild 1674 BLAKE2B 5d8712ce9c59b69d2798ad6cd2475ebf9749dddf39221494b85f76ee17c1fa5e2471e4c0a4eadb287eb910a4657b5ce1993dad17c7c7216b6d951b44a8259dad SHA512 eac98f1ba5e5be5c7c4af72dea693f03e2d27f7b84d2cd2b71a05869c2f19ace65bfe0031deb1707be20e381860038ff8232b8ab27bf9a16a323d9cd3c3a89c9
+EBUILD oslo-rootwrap-5.13.0.ebuild 1624 BLAKE2B 9bd60f83509ad456c47264f04b3b8ec1a05545e1a09e388bb6609fe003cd9c271413d8ed2aba094aa9f9c23b6b3759100cf7a177ab39e6c5406918c74312df1b SHA512 1dbd61a274361976ce4b2a90af13d6805e41789c90f1d14be045ef56f48c2230a92e146c864a2c6ad6d3df9cf55cd07236ce9a7bd74eeeb7abb887717cfc76a8
+EBUILD oslo-rootwrap-5.15.2.ebuild 1662 BLAKE2B 29c4e8045b94a195c475c519abd71fd0c7e228759eaa3851398670d193bfe240fed41b96c54c96b4a4b4bd9bf8d8ca62c284ee84fd54a6d5a5cacc443b411de0 SHA512 29439dd9e4955a7ed36c39f4703df4ba1c6b14fd88c1460909d6c1ca2c3452e4f511e85bae5e5972c92568d245710aa6096c2b044381643f8d61d26f0779798b
 MISC metadata.xml 600 BLAKE2B 93dce16794b8495f34be98af703ca0ba06ff4a2e378805f7f3b08d4805f01ad015a1144124e1ad32eb63e6b5c9a9378aea30a4b82eeab54b1cb9dc95280fc6fd SHA512 ad1012d9f43875065679837f787f6a8087876d4ef1e56d24fcd2aa379c85e628848dcf5fa03e84e5929cdfabc4c1b6e2f7167ac0a508f7f26b6b533405932e10
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild
index d2fd96f950b3..92c9f199bcfc 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.15.2.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.15.2.ebuild
index d3dbfdd91640..80a72028afb2 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.15.2.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.15.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 17e1651e4a2b..78982339c42a 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-serialization-2.24.0.tar.gz 28948 BLAKE2B 8e57d14b21deefd8058f4dd677493072b0bfdc08bfb18faae2f6a09c4ab4e29ce544e479427a6c6557e0ca78fd7b525aa6a8ab3443a01c3d856ee3556f5f3f5e SHA512 8c2103409d9ec2ebfd45eefb56ed42b1ca52c0f8eaf5deff1020a67f813c8524d1bffd81d97a1ad28c80b4a5afeaebca829c4580e635f514900fd0835782990c
 DIST oslo-serialization-2.28.2.tar.gz 30807 BLAKE2B ff0ee4d4215943d0fa419d0d0989c093812d354da6727f5e87a27ff0562baf5e3a22c781c686ce5156fcff065e03c7481bcf3e16041a2296366a1f297060eff5 SHA512 78305f20392348b73eca244464cd4167177cd82ea74597641ee9de60b51182e5e3d75e5d748fe2c39ddb322a08f2ee5044c846bc969022b738a0b89874451337
-EBUILD oslo-serialization-2.24.0-r1.ebuild 2024 BLAKE2B 747fff9ee91e652cbfe1dbdafac61cd7834faeecb7270499e9578fffb217441a6d80733a2352476d4c1f70c0f6560148ea095970a33ccbb64618d8d048400811 SHA512 0b62f26a70b885ca31c1e781dcccf530887451787de10757f788cf98935c92ce7fc5ee50e202c2bf455e005d2350703942a0439d57ba9640b8b87f31f38be139
-EBUILD oslo-serialization-2.28.2.ebuild 2133 BLAKE2B 0f141f77840cc18f206f05dd5303c7d89bbf6d5a6adb3ee53a69be5d070dfc5a8bc1c69f13f3976fbc89bc635bf3e1057a31fca42db326d0719db4a0d472b278 SHA512 37bff5318b724bac3fe0518d9255a3b55ddb3ebc68869a366ff597532b01bdbb3c670d8b2fcb56d09b5269e7555aab89e0d2ec190609d86fccc2acfd0383644a
+EBUILD oslo-serialization-2.24.0-r1.ebuild 2012 BLAKE2B 3a335323e566c975d5f29ca59be841fe920ee11ea4f58a250497f8abd7a4c0312fd3b70a714065abcab69fa6a5d9282a16c1b1ec3ef6daeadbae709de62a61ac SHA512 2478abe334db6d65a4238ed8367de979c808b5dcbf39a70aaff564c484ecaab44c8306fc86f7248665d8ff0131edb9ff36d635484057eac5a38e6d39936b5286
+EBUILD oslo-serialization-2.28.2.ebuild 2121 BLAKE2B 268cfdbe64de452286157bd2d9dfe4de07cf750b6efe005c7b6cad22b7da9f1ddbf309442e8edb2a98a157c399001afc7a835491f07f526023ac1de4115de003 SHA512 fb44f726715b29d3860f0329bc576facbd3290453b34c76671e60d4a8c621624b4284d1fb8f33201333ee90d9ecbcd537bea0f74bf4f03d7e50d78917a76c0c4
 MISC metadata.xml 374 BLAKE2B dc4d16d6259d728baf0c2e3427ce5788baba2b57442d67d02dc487dce353dd993b4f306d7dcb2c1a426f88db55e2be58dfe69731819082458e6305242d07bcd6 SHA512 97704036d1f08927b8c0f96604506f2a0ca3665a939f49f0f6c3e9274afb470121f93e6281a88769bd43651b61a43ff8919291244959dc1b73956c71da3fcde9
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.ebuild
index 8304ddd6d785..601783fd8724 100644
--- a/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
index 80c2a180dbb3..ca16f7635813 100644
--- a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index 80ae92dcb42e..84f19ba12076 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,7 +1,7 @@
 DIST oslo.service-1.31.8.tar.gz 72731 BLAKE2B d0460fa76df75b691dd85bed07b2bff5f8574feb84f324736769156fb1d9c74f181d8267ed69b6f8a371bd9eae3db17d5fc8588bd706da30f3cd065e8d35f80b SHA512 af4f1fc011dce56935d8ce09902172fe3c93f4907023d04c3aacb3e06631b5d5fc891ec55ee3c42acb8e29754a7519d12a38d1264935636284aee9134ce6f84f
 DIST oslo.service-1.38.0.tar.gz 78671 BLAKE2B 3291b20a60d57a251045701f890a1dc4077bec070330c4fc86e2bfaa82612e4795d0bc8b1cd8c5d8b70c7be0f45fe6db25c98b263e0a5a7bc4335bd4ae0995d9 SHA512 c2bce20abe535b12f98eea808cc95a687b226c16507ed2a4cc5f7143439f7f1a9137489ae82dc09e175165784046f6103bede3350bd6419ba5d4c134cf6aa361
 DIST oslo.service-1.40.2.tar.gz 80334 BLAKE2B 6000ba70c414ae6396f8be3911511b073f0f6a73a3a98e92e0c662b42a637b4cccbe684ceb1df2613aedad3fbd430ff588dca001997293563f39525efba05d99 SHA512 e412ae3d96e7e7f5f40238b3b9d9623a36347c3d8c6e06baa11133da71d4f5e55bd1ac2f43b45a2f84f725f84c59ec6870bc557fb623ab681bbeec27bffd086d
-EBUILD oslo-service-1.31.8.ebuild 2142 BLAKE2B e0b383c8c416fbbfff4506d7b2138014ad5de4470835653652df8399cec43ab6d156451c88b842b54af9f27dfdc2af1df7dec0d01c1402a36273383b26d5f0cb SHA512 5ac778c70f4c8222cef7251a243ffcb87bc9ecbba1c2f09d2adafdbb9554aac813acefb220050dd06c872185f27e66b3f6818a3dc1acbd69a475b33f30676ba6
-EBUILD oslo-service-1.38.0.ebuild 2285 BLAKE2B 19cb1f3fb989138bc993b2739e7cfc3f7ae51527c1169d6d204fd60f3d562bc8ca9941895469b4cc2714fe4e2a204b6dfcfd3adc272b577ea9d83e477d1ef586 SHA512 e3331248764a5bdb542158014e7a0cbcf13894dbf0ba9b3e32f94911f766757c37ce89438c05c0b1ccbe77dfbb0a7cd0502da2cb009cab4514ee28ce845f36da
-EBUILD oslo-service-1.40.2.ebuild 1555 BLAKE2B e8cfe80fea2ad304ce1a8ec09248834dc110fa974d6be56ec1b9cbd12c0a6dc7e642140c317da0d9ad1bd5096b4887505a90bdc968190af4e5930f039068f358 SHA512 bbf6bf314bc08f40f83fd3193164e5407cf992fe0e92780b2444af6b3c17270ca88e3ac817cb93155addcac37ccbc3a700e9538a9a6e9c9481be5ef21df60c24
+EBUILD oslo-service-1.31.8.ebuild 2128 BLAKE2B 7052c43d0847079f3c7afc783d6a3701b048411648782aa82994c98863dd6112b5874e611925f7bc4e37e97427f339552ea19f5f3e061ba79ead4c07aae5ea5e SHA512 d09ae50e1411461270419684c1a3954ed16681e70e77eb6e68f12d547959b6ed4dd853764f9383f0109a318f60e1cbf9b5bdf602041b1fbb191da7c6bfcff734
+EBUILD oslo-service-1.38.0.ebuild 2273 BLAKE2B a185757f16cf13281502e3123076ccbb95a14ce5a54f376211f0dcc76be739d0d29dcb7694925e341a1d61739f60aa1f80a48cbaad78031070925f2627221c44 SHA512 25daed1366922d013f79b43000c22afbba6055dd863ff461f70e23efa6ccbd42f9dd314364443f9130a4892c4aa66f9d21574b9389fdf85ad769d6f85510fa4a
+EBUILD oslo-service-1.40.2.ebuild 1543 BLAKE2B c4a8cd555c697c7acf2c8d9443b3b4ed6147e2d564aebf1c7ce51ee51e2750a5540a72f7d3ee3058f6ceaf224c49c9c4c99af511804c4c944c1fa8650ac405e2 SHA512 03bf0a1d45ff7a26b3d6812eeaa5a72e89cc33f93dbb127899ab05cfca9b0f4c9da16c41d28b201a35f8f5ff958f20ae099ed2aa9657da913fb98c481df72ea6
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.31.8.ebuild b/dev-python/oslo-service/oslo-service-1.31.8.ebuild
index a5637845324c..34c9fad4f8d9 100644
--- a/dev-python/oslo-service/oslo-service-1.31.8.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.31.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-service/oslo-service-1.38.0.ebuild b/dev-python/oslo-service/oslo-service-1.38.0.ebuild
index b7865ab889f6..2f24b14d064a 100644
--- a/dev-python/oslo-service/oslo-service-1.38.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.38.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-service/oslo-service-1.40.2.ebuild b/dev-python/oslo-service/oslo-service-1.40.2.ebuild
index 49db052ad2e9..cca69a142a6c 100644
--- a/dev-python/oslo-service/oslo-service-1.40.2.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.40.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
index a777523858f8..e0482398e195 100644
--- a/dev-python/oslo-sphinx/Manifest
+++ b/dev-python/oslo-sphinx/Manifest
@@ -1,3 +1,3 @@
 DIST oslosphinx-4.18.0.tar.gz 32046 BLAKE2B b10b13f819cc2f4c3e769c195bc340a74545a4cab2a2e9894e56e4352f5f35c1cdd7f1d40d47c2b7449d30bc77dbadb1feae129f6ff31d54e6227349a0c31e57 SHA512 b736dbf68a3ad8c32ca6d8de72cb79e49ab4b84593c70d0165615de66a8c343ce7094656d3b0be3383453143308a4862f27529b1c9d72920c5418a3f62dbcc46
-EBUILD oslo-sphinx-4.18.0.ebuild 813 BLAKE2B 6343861cfe54f9df353bc33062ff3c1af86e4f2e71b80b5a124f32c33f9175b3b6f5fbee5537b532cec13c745cdf7ca0e6c78fd4649e2f93a30a3af3760aabb3 SHA512 60a6e109c9eeae3c8e932ab98a234b9168e616b2caba554753d0618e537a3e1616012471f92d00bbd26d93e171b1fba854f06fe872d92ac7ff1945f00b5c0dc3
+EBUILD oslo-sphinx-4.18.0.ebuild 805 BLAKE2B 164bed67e1c272f976862d6a84a75d484da745c8f174b6bf44878050239ea75c2c6cffe44f9225ca4460f157c3bb22cb3c5b768fe4c3f35937f2852894a65708 SHA512 18cc8050fcacbf820e78a0d013248e0c4a16f9c775b496373842687aa4ba4ad164d325595a36a0bc5be1cd926fda5d41509b8a4bdb0ad5e928bb6dd474cc295f
 MISC metadata.xml 586 BLAKE2B b78b49fc66eaa7ca4a79da676895e28b397359cc8579a3e9b91dca1d933779d3ec7f9153d0789b7f44dd75c8fa8f9d866cd916911a4dfe3bd6d89435a0330960 SHA512 ebd5d188edde4955081fa7cb073daeace8c9580dab828d4fd12f10f27bb562ca7736ec77f816e243a02e808b83dc712ab53f40f70e1865cec014413514ffa000
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
index b7e68dce3a06..2fa552f47457 100644
--- a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-upgradecheck/Manifest b/dev-python/oslo-upgradecheck/Manifest
index e3fa66260eb3..0b35bb89764b 100644
--- a/dev-python/oslo-upgradecheck/Manifest
+++ b/dev-python/oslo-upgradecheck/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-upgradecheck-0.2.1.tar.gz 14624 BLAKE2B 0b6e397c67df12f3162f4f05334b775e05ec253f642d707a262901b90120eedeef7aaaa3764c04620426e62031f953096cba975dc3e8dc7da3e091c7ac8f2d57 SHA512 26c771b3bc07b9d13fea6638330c785ef82781e794084088bbf46ec811a615e58123d5a42d17a9e31685308a4c1d2ccb7b839c32d9f454e3934d5fb625b73816
-EBUILD oslo-upgradecheck-0.2.1.ebuild 1002 BLAKE2B d8fcb2dcd64c01534ff04e43ba001c913c575c988a744312306e670b2f8e132765e5816a15af54657006e82142f0b2accbe0281bbfe5563f160198275572823f SHA512 bfc2a2ca1fd5472af27bb7e2e00a435e5f10b646c98433c16e98dec3f33d00af8259dfac57df2257b885a27c16b39b2529903a863968a65435aab8886a5a0053
+EBUILD oslo-upgradecheck-0.2.1.ebuild 990 BLAKE2B 41dc0fe8332ab14535e6c38171c4e70a1817dc117a93a0f7970f51eb46dc4d7166340aa44d14e513b45f82473623f9a7bd28853f5214208c359f4847dcbc8dfd SHA512 60e5873f7584599853b1ab9c5a2e3129822082b61677d62eda31538ff2997f5bc943379596ed26027ed264ea8d12c3d2cba0290e5c34be8a8daf7fc012150420
 MISC metadata.xml 373 BLAKE2B faf870e41a823c9dc8e6829fffc6cdc1852889bf17de0ef5b93f12321d86d7cc538368cb93edc56807aca7f25e0d75255045acbc6cfa60329aaea35e78721346 SHA512 c82e432bee2d34b39fca929ba2b602d65d13167c555eb0a3b07d39c5ae864bb4d6ac459449200bd767f040307ebf854e0a99d72d5ba1f965053190eed68c401c
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
index aa83219a0356..7b1036e50994 100644
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
+++ b/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index a84f8e937813..e2a40a0297df 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,5 @@
-DIST oslo-utils-3.40.4.tar.gz 90174 BLAKE2B 63c419c7925d58bdf73e3a1aaa683141f5e91d2b70a7e27db44a49ef5c662e7e1ff45016edc51eb73892ddebb45f6bcf4d8c1066d2eb6c6ebafa7f6a1be662b0 SHA512 d5df70052f0c4931fb5e9e89b6edf98ec2435a319157e04f53bf486f54e855ab178825772d405c2121cd2a2cfb894abfa35afe11edbe6b5b8030cbb915f841ab
 DIST oslo-utils-3.41.3.tar.gz 91174 BLAKE2B 9783360e5328083b5cfb2813f388ea29ca8876ce01cbcba5a25e0706766aab87d28f7683c4a9ef43ad9a0a4756403d2f35dc61ad170ada33e0dab67e5d5a6af4 SHA512 b8efc1ee5e22a0f224a48406208424d75ae1b9eb2b740bd2ac57e172f23f2d7e3f2ae712a006f89b4a64e0b6a619858908540b729705285d0aa99a8d5081495f
-EBUILD oslo-utils-3.40.4.ebuild 3017 BLAKE2B cb2d7b8fcac3f53295a2252c458d247f56d1d6a17f98e96ae6d877c6f7a21bbdcbb6cf19f6776c79f585c32ba3b953aa3d40356c009c3e4233fc6fe4510c6b13 SHA512 38125e1978e9151a1d61eaab5ffff2385f3a221289499a62f32e25732408221d9b25a4690bb3fd01c92b335771710b23eecbd392511f4af24abe849a9707e355
-EBUILD oslo-utils-3.41.3.ebuild 3144 BLAKE2B 7c13e371828c4bc8a7ce5ffdef292461ac33a4213ededfb7d273a12543fe53cf88737da03051ee7e62b2bfa96ba3e1bdecae191a735e750b83f087b0f3f4008c SHA512 734c2a72918b11a5ce9498d0b8fa3427375291ff333036f43cbed245c5fb4fb87ae534fe7dffc19503172faaab027f7d598d10677e4e92b849e2d062b001c7fa
+DIST oslo-utils-3.41.4.tar.gz 91178 BLAKE2B fe3292b2f60021f6c7cff0a2f6444a8d906586278b4560422e7296e996ac2322973f98902b11b72e6d543a18693c5f10a02629c2fa741e36a8338ff3f53de8f5 SHA512 ea12199b583a83b408fdbe4874162689038936a08d2a362e4adc9074da623c38a1642861ad83833c63988298e2efd11c2242bf69090da03d6358856e6e287acd
+EBUILD oslo-utils-3.41.3.ebuild 3130 BLAKE2B a612f10cca203ab9da819cda28a80f3140bc44d422893dfa9b34547d50e4222f117e41fe1bebc04ac65b25945777357a1e4ba7c5e6e15a15a62271bc7eb1cf4a SHA512 97edf9bcb1baba5dfe63f3d6318fced2aba3c8b242e93fbf195e440e5547f7f69430bae71a47ce70305faa843525cb770dad7e82703afbf9771c2f46481e2770
+EBUILD oslo-utils-3.41.4.ebuild 3132 BLAKE2B 6cc5585a5ae665ca105156ce5cc04873ab21691528663ca3431b51e214062ee0798c0e97a65e14df3cf1d16616e7aa089c03b2aa1a4ccdeed75f9ae7a1b65f25 SHA512 0eee022263230c646f37c6448f4139ffd0fc8b915d5d5a083bc2c22161021d7167a584b0f880f42b9ab06699263a4e6295d03e77e4e76608a348922dec2de554
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-3.40.4.ebuild b/dev-python/oslo-utils/oslo-utils-3.40.4.ebuild
deleted file mode 100644
index f51d62068460..000000000000
--- a/dev-python/oslo-utils/oslo-utils-3.40.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	cd "${TEST_DIR}"/lib || die
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
index 8d52d7df921e..b3a3b972d712 100644
--- a/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild
new file mode 100644
index 000000000000..8fb0bddeb33c
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
+		<dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+# Note: Tests fail due to requiring installation
+#
+# Installation appears to fail due to the use of namespace packages but root
+# cause was never truly established.
+#
+# Tests fail with:
+# ImportError: No module named 'oslo.utils
+
+#RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	cd "${TEST_DIR}"/lib || die
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index eeb6fd39b808..3caf74fba8a5 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.versionedobjects-1.33.3.tar.gz 150086 BLAKE2B 7248c5cc114962ed33c70a3c6e9698ed784a2a995d949830f5e8f3f97953caf793a37c60074e848e8c4518aed2de29ed54ae637166f247bb7e6f95af0d9c6e87 SHA512 0d1d8654b1f971bc922d57771c159608d30fd7474448d425beb7c5a98b9810c6796c7e0b21436f75a266f54913fb01ce6b8e8ad4402e09453b797854f9fc4575
 DIST oslo.versionedobjects-1.35.1.tar.gz 150347 BLAKE2B 2b19ff4056eaa4106adb255b4ca0c3c2c4e07ee6a3839a079f6ac9891383c02b1a913833853e4c8e8c6d67f2880b9f2966b1e5d9d20e9093a8f37a1063cdccdf SHA512 f115ef300d4274cca00fac938a5f62c920a8a44901fe40d7c016498718c1e0357cf8eb745213986a89455b33e9dfbfe10b0fcb76551ad815859e7204e5532307
-EBUILD oslo-versionedobjects-1.33.3.ebuild 1355 BLAKE2B 26aedceb505595664bd7a0e0711f5436c43274dec175b0846c7f0d5687de1072e879cd34a2dec969a07ddc4803906ae4a8d3dc75c8fe61cd9e05fa95034b9860 SHA512 0fb308a7d9c509b923fdd3dc5f5c655ae0f1994b1296290b940877577f85694823a577069e7e7df63421e036000d097a07dc450ca4f543876426b86b44f87a03
-EBUILD oslo-versionedobjects-1.35.1.ebuild 1357 BLAKE2B e8aafa8f156c6f17a9219d37452bdbf8c388887643122860baf689d69f5035e6e891f8a57311d5f744342394b02261967c683cb01ef15a2a1f25b4910e17c6fe SHA512 139cb1792fc4ed14fa5bcf64292280c9d04f284df83d913c5432d1b1ae4bf71103b26f5797b2614ba06d2d789b24f6bc2c8522dd504a2d0c08dad199c72138bc
+EBUILD oslo-versionedobjects-1.33.3.ebuild 1341 BLAKE2B cb71d2e08a5ca57b8cb22cada2f0e5391744d079665ef6608999b1750fc3715674980cf9cde882262e157fce3fd107c3d69cdeb3f750c929f8c5c436b2f13f50 SHA512 654f85d680fc37e29c01f35a2105ecf8cf316c29b7a5854b9d4d5386dcb33a15b45323b21cd8127125f4080dbd123161cca29f700974cb05dd53890470d6e92b
+EBUILD oslo-versionedobjects-1.35.1.ebuild 1345 BLAKE2B 3a6f24e9c06a0aa63ccc2738c8ca008d4096c0434753fe6ac94f12e5ac25490868bb091dd8c3a2525c6d4f200b2983cba4db0c7b05869de4f2f7761153d9d801 SHA512 0402a890433ff23f6f790d733f5756ef07c4a7cbf2835cbf33a43f66db773a984a98b1a827a60f106f120de12cd8ec36ebc5196c0789848d87747e1232a3a1d3
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.33.3.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.33.3.ebuild
index e97713c82536..89495a0cc9fa 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.33.3.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.33.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild
index f6b21fdba583..15911f24f26f 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index 87fdae05b0b0..9f9d4a3b27e3 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.vmware-2.26.0.tar.gz 208576 BLAKE2B 2e9df2002565d286631dd846c31551735f204771156b2c5cddc7ace1170381d10eaf647e13f1634f84fb21be674b65c29ab51076b49fdfd6787072b78c06171d SHA512 7ddb675ec252e91984cdc23b6adee7e1b13a0dddd1967f9a882935da0bc12d3c0b271f0cfa42b569802e0521d65285d80c7a3e1ef280cf405827a4e2fa2f6437
 DIST oslo.vmware-2.32.2.tar.gz 334130 BLAKE2B ba1fcec92812613fc202afd8d5eab3c4de65f2451bf17dbae383dd6176a0fda73d1661c1d066e3c9fa24686562c46b0b8927f359632d8f2f94c9d3d185ef802d SHA512 2f18f38590221a14e876607ccb9b8d1b5f25cca1e714c3256980b1f818ac1a1d2f9d3f1418bee7289b1efe01bfff1ae17f76663eb4a96a90e4d17a05dc39e91f
-EBUILD oslo-vmware-2.26.0.ebuild 2172 BLAKE2B 9a2b3a585dd771f7ecca2d0e5b629afdd94a287f5817fb05d5a7145365ba36c65193da3937336cdab0eda0fc550c59070672ea79502c96865162216d9c56e781 SHA512 8e48b19e546c11d9b3ec402afb9e345dede93b5480336f65b29212d11f220e5234b1c2694ecc49a7f2035388c219bdb5cdb813ae3ffe1206751eff5dc831255d
-EBUILD oslo-vmware-2.32.2.ebuild 2315 BLAKE2B 8c5a72252192f2bb98829b45e10b0ebafecd7d84e4c566b62c8255904b2238a43b62f380873f21b01962e61e55881591519c26908650520ba476294c8cd89a33 SHA512 0f3167536e65fc0085bda4adfc4ff73a8f52ece9dd2a530447765c4a0b2f6404da8e39034bf7ee8f4dbfd9fc3c85cfc3109d7c1d667f4687af473bbb2a802c4e
+EBUILD oslo-vmware-2.26.0.ebuild 2158 BLAKE2B d143e4aed6cce5568c23232a9a907a82f81d902b844f31d7fddd2988ec2fc3a4dad98aba1d39d948f22227815eb25f8625b519551b81eedd706da09388197bfa SHA512 0a7861fc42410249c867f1138196e606aa0d681a05ec8e65ce844c274235a84cc5632f3fd987a6b8e2f0edc989f85d182ab840f9b1ccdfada7caf2c5f7109b11
+EBUILD oslo-vmware-2.32.2.ebuild 2303 BLAKE2B d8fce2f54cdca73a9df23990888f3daab9c11a6ae08caf9bd22e2abd36d1996cbfe657e6624d821bfaa5415c356cac906b2a4d093b54cab995d1d29f064d7a1d SHA512 2a54eda44ed89ef024ac776356a4881db247fefefe289ba9833bb0813f5121d8d91f88de700d376a8d2952f677953aa2447786365428f4aeaccb07e80da82f87
 MISC metadata.xml 568 BLAKE2B e5ba6d5e5d14ace6be413a2bc6d97d8dd5f6befd0cfe683fdb6bb870cef7b673cc779ab143362b48181f62fa4f15eb827174f17da64c4d7ed539eef74e050136 SHA512 879bcc0237b70f9ab61a3d659e948e5d1289128b3b4f11f6797b0f20809c3cc90efa104a582dd6cb407fd9a7dd4f0e2330d68227dda145c9456875d44db913dc
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild
index 8f474db297c2..d67f2aadde66 100644
--- a/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.32.2.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.32.2.ebuild
index 33e5218f7878..14c12303077c 100644
--- a/dev-python/oslo-vmware/oslo-vmware-2.32.2.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-2.32.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index 048e3424e78a..52c7b739acd7 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,5 +1,5 @@
 DIST oslotest-3.2.0.tar.gz 35445 BLAKE2B d33c70e760fc595586c2d7b0ce6ed1f63b73c89ba078f85b70d3b6b1af1c4d115e6eb7b431f9ef52abf50290eb47a1d3adb2d014c2ba5cf7b93ecf0e46401a26 SHA512 4513291e2bec939f9734255cb0fe3f85b9eb8a8cadce58873ad4e85365a0ec27bc2084085f5b95b681b5e811b62458e18fe63aff1e022b2d8ace0ca48bd6a527
 DIST oslotest-3.7.1.tar.gz 38176 BLAKE2B 94924dca8384dcc8ba9e4f62220eb6d29b27b38966ffce7dddbd23d5c5e66493141ce4170565325a0516648db186a0171cd33de6d536bb8ed5cdef76161d4f94 SHA512 dfc55bc91ebd8ef448d4c69b2af51b8f2a9f2068b2ef2ec1cfbcfffc27eff7ccafb00dc2a3059730427aecbcd815f9dee2f00b8c74df154c8dbb95793aff7e78
-EBUILD oslotest-3.2.0.ebuild 1569 BLAKE2B c34bc419261f4b17e0a70854f3855dcc86c7f775551a7383c5dafeb36cb6c6c7a928f8ae15d46d3b443dbbaad8e95f449e6c17839b4359c20f0815c6bacdbacb SHA512 64d95b2d69d19fd936cb587f13f0a1d092566a45791f0dd1e0c8243e9e4d386849ee3ffb0dc15ee3fd8e74a6a45c36dc84e091ba75de3b99eb5d3d547ef6de4a
-EBUILD oslotest-3.7.1.ebuild 1749 BLAKE2B a6f77bfff2f94270e9752a168d3d6f4fe6dd3f2e0132366d478b93652223ece73b6ed09d775ef06a979591d7a327eacc92517179f2855be62a3bff6798820abf SHA512 688e9af25f7fb3c1d7da3b4c1586ed5e357ebb2a06525e52b3c114260e4d2bbb45b64dfbfb02e17c309daab6bcb76a8e1ed6364724763d47b468f7148bcff95c
+EBUILD oslotest-3.2.0.ebuild 1557 BLAKE2B 04097639e1a10e26ff219b8d215f825dd974452d19e20198108849795a0e571b3bcfa71139234c2dc5c7337b670f980db9b949ba655f561f99cba86a198593a2 SHA512 57acb55787a17d73f45ef4185b5b039c988d38b15c655c8bd7a770b6494ad5c595a1bb3346245314e5705197d3020bc5679da0aa4df6cea32ef8985fffa9eb41
+EBUILD oslotest-3.7.1.ebuild 1737 BLAKE2B 28f41d7ac2557fc053ce587273cd1a4f2ce3dae3a41ee869b095c8d4ab5807efc0c60cba34801bdd3a9077595867e60e85dd8d9f1e81662118573e82359e49c7 SHA512 706cd329486692462ac57b7a80fb551549863018f0203e957ebff9d46de623f61b842f4af9f987dded423e160f5bb0791eafae0a7c18ef03b5a6af2429035cdf
 MISC metadata.xml 828 BLAKE2B a328982018731cc93cda675447ce2ba308e9164e8762df10a267c6b82389a717f16b5ba6d9843503e12a458f3ad5a726ce648f80e9ff781aeb429bd9034632f6 SHA512 48a68782c8ef2a15db7c73f03dbd4670b8ca25a6cfcf0c15d4585a93a75cc4591fb6edb70f7176cd72c97d1205ef8e5e898eafa9fca41ed0b00023bff93f966d
diff --git a/dev-python/oslotest/oslotest-3.2.0.ebuild b/dev-python/oslotest/oslotest-3.2.0.ebuild
index 9210a595b442..9132d32067cd 100644
--- a/dev-python/oslotest/oslotest-3.2.0.ebuild
+++ b/dev-python/oslotest/oslotest-3.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslotest/oslotest-3.7.1.ebuild b/dev-python/oslotest/oslotest-3.7.1.ebuild
index d4ec756d5146..27baf64502ea 100644
--- a/dev-python/oslotest/oslotest-3.7.1.ebuild
+++ b/dev-python/oslotest/oslotest-3.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/osprofiler/Manifest b/dev-python/osprofiler/Manifest
index af2eb5207296..076113678d28 100644
--- a/dev-python/osprofiler/Manifest
+++ b/dev-python/osprofiler/Manifest
@@ -1,7 +1,3 @@
-DIST osprofiler-1.11.0.tar.gz 75301 BLAKE2B abad6752d9779c9f0244ef4ef279ac4236ea765ec3903bdeade771c2c41d31eb78cd4596c57120b8558200fb0fdff1b6aa0e00a76eb6d634ccd9552e755e03cd SHA512 41697a9d3bfb81f0c193bd1bd82cb470f1e7e410192e982c076877026457c9b7eb3d17b72c3d02ba4e1bda6ff4a7006798210f37c67d75ff600e41fa047ca59e
-DIST osprofiler-1.15.2.tar.gz 80503 BLAKE2B 280f96ece13ba0973692c6ab29b0ee783465b05721eaf2914eb9bd58615c0c7ece91aa3118d03a5fd57296318626d34e9c8b88f80ac6d8b1914b3a9c5d24ad49 SHA512 16deacf3163eb2bbb616ce2e7381feb0174812fff526eb18fd5a9436912b70ff331587bfd4dda1aefdcf75ed7ec21a88e04d8ec9e65771b466fa083a7a33b782
 DIST osprofiler-2.6.0.tar.gz 80518 BLAKE2B bc45f9bf3378b75a8c702ab1bf9ba40e9f6d77bba808882c7c504adb4f1c295449ab2cc19d128cdec7ebb3120a3d0c49eb77e1769625bafa216e32b3304c6f1e SHA512 3c911961b3107f28bc7b625738d6afb0098d87b891603d1a41be5cfea2b21eb0a3358f3f2fc5cfa0f9b32287f59d732c4ade8ae3436fe46095fa220b5bfb7a15
-EBUILD osprofiler-1.11.0.ebuild 912 BLAKE2B caa728180601770d8c38c068d5a949790928d9d89385738cba6a33abd08d5365d4fe31362c1a0a2d97877f6212aac60a9c7f0dae40fccb4c6efa4797064ad354 SHA512 815a5394a118e2fc56f4d40d8f581428db91d8961b9bdacae4ca1103608d738517c61c1ee38dd4d691f6c2104d443c06cf49e30625614ebc7f382c4a93cecf4d
-EBUILD osprofiler-1.15.2.ebuild 821 BLAKE2B b6da8ee99fc3b335edc7ba9716c1df48bbadc1544586cd6585db7b6634340bc7249f253497cd4509de671ccef052047d0ffbba9c27297f928d2504a8ab37a032 SHA512 9893e3e6a82463dcf400260b1aa460963ea7d0e79d7f417e90bce789a7958589204d8e7e675be28d243d1a0cb862f91dfbdec2c2579c0f69b7e12f4070375dda
-EBUILD osprofiler-2.6.0.ebuild 933 BLAKE2B 5161308676067b499e759a6270e0b1f2108e350729373c7962d8a95e07b8198d44ef0d0e8b7e214631cd52eccdd2c1c0dbb143d749575a81a90884b7e48b837e SHA512 5f69f41312d834247804bc58b4a422e8cfa221dfcece6c6975923717ccdac13adc2e5e938d1bd85d00ab3bd0efe476953fe54d31c84f0f6f07b98daefaf88937
+EBUILD osprofiler-2.6.0.ebuild 921 BLAKE2B 2cb4fce4efb47ac2b3e4286bed75282328c915f49781811d23f2300024f37dc24302053f46c3df2c9ee071ff272931b8b34ccbdafdecab5e455e9006c8170d03 SHA512 e6f770eb6053b5e84cf4fde7a4a807caa32d8057506be9989481096b64957dfa588bb3da82e0c1b99727d56624dc2a792c0747275be4f34ae5ee25bf0d55badf
 MISC metadata.xml 564 BLAKE2B 7af0039638bc73eb560dfaee133f1990851111a2f3ab51e270cc5418bce6c044fa0b15355823fd37b54f73b84d2187096a1e29918b1e0fa073138d901654232c SHA512 2a8070a290ebecb271dec1bb576fd361c937191f69390e1477bac368eb6c9b91ddb3c9eb78af9aa4e4f6e3982a8a83f3ad2c8d5675b1278d6e7191aa3bd36589
diff --git a/dev-python/osprofiler/osprofiler-1.11.0.ebuild b/dev-python/osprofiler/osprofiler-1.11.0.ebuild
deleted file mode 100644
index f0bd00ddc653..000000000000
--- a/dev-python/osprofiler/osprofiler-1.11.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Profiler Library"
-HOMEPAGE="https://launchpad.net/osprofiler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/osprofiler/osprofiler-1.15.2.ebuild b/dev-python/osprofiler/osprofiler-1.15.2.ebuild
deleted file mode 100644
index a62139043bbb..000000000000
--- a/dev-python/osprofiler/osprofiler-1.15.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Profiler Library"
-HOMEPAGE="https://launchpad.net/osprofiler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/osprofiler/osprofiler-2.6.0.ebuild b/dev-python/osprofiler/osprofiler-2.6.0.ebuild
index 4c103c01991d..bd5a2632fec9 100644
--- a/dev-python/osprofiler/osprofiler-2.6.0.ebuild
+++ b/dev-python/osprofiler/osprofiler-2.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index a5fccc11ab8a..616a06bc45da 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,13 +1,5 @@
 DIST ovs-2.10.0.tar.gz 98548 BLAKE2B 9ab3ea02dbfab1622106ead1e19a96b279d73ee758fbdcfadcb50526b8652a80443c817513b0df92b78a6e788d7215386f18c5e9e59d71536cf481eac8b3a264 SHA512 9b7de41aceb2f3c08df765b97c5149cd66579f361b427b3bb6c24ab20cf922de688a82a99b1d98778311f15b37c73be2769a95b01c96db4fed122e272aab2adf
 DIST ovs-2.11.0.tar.gz 98933 BLAKE2B 8735cd4db64291790327fc1e8b144b76e4804472a99990488d57686c9eaf51ec1ee4cc0d4e1b0c3aaf979b547936c77cdb6f7656b0b16e16df45fe0d9b8c5f8d SHA512 104d9f783a1ff0bfe93fc17235c7a9d595fab5007ee3bb490ef064f7893756fdc4c7306c0b03f4c2fb5179efbb038ed163ca4de8c9c417426c6e157c0f17c39b
-DIST ovs-2.7.0.tar.gz 73714 BLAKE2B 3edb76be6ddb20243b6d85c7bc67024c274f625c2f18cd4dd2fdbfa94b01d241edc4d83ce380aaa4374a75f4b392d36b79bd5fb81c8522be88dad4c277858be4 SHA512 6732721f494b0de24dd6b79ca12d45d7e2da8598906384c6fcc4cc0de4dadb87a822c5e0aa4c07065138a0837a850e7d07ae50e6dea9e0752beba667bf154e22
-DIST ovs-2.7.2.tar.gz 74222 BLAKE2B ecf1cfa9cde4824ba927f4fed610ca11129d221f4ecb2c0f0fc701f0fe2a9b86fdc67332b0e0270b0eb1047aeb49fd41d153a212416754180a35dd916cef59e4 SHA512 568f256a2ad204d5b4a237f1f52c903a1041bb03e30b56e390ea4995c646b49225f69eb5804faf996a9db56916398597100a16ff86bd6798d01ee427073c89ac
-DIST ovs-2.8.1.tar.gz 74483 BLAKE2B a90904e645316b625c7fddcc323270bbb6246d59432392bfbcb05ed0ae258f1fcc0afe7a3716dad519d47725a3f765c99c59dcffc30bc5343de59ccf523cfa76 SHA512 b7133f5c2ae00d508d77122952584cba840d4a22231d1a42105ba2918cf598b12b58c47408c17405bb3c9aa90d24a3d0a9257299626704e367badc982aba62ee
-DIST ovs-2.9.2.tar.gz 77160 BLAKE2B 09304ebb6bdf22a2f62d7e89b159a99d861d4121fa52972ca6bd9d9667564e485a454d99aabb243556f2ba1db7fca8c635c9a4f237aee9ac8830c9b19a51039a SHA512 aa5e5ebf633b36074278dc7fd67da05be71b5fcb139955a8398e40bd3dfe51654b016ef144477b818e5682c5612a16550487a89aa76cb41ee75509d62319a66b
-EBUILD ovs-2.10.0-r1.ebuild 494 BLAKE2B 8b928ab15e48826ba8ba27964cf19760f9672f47be1d48a32da06dd3e833644bc280638359a8e4675a2694dbe3400f742f7effeba28b4df4ac1f33d79a526577 SHA512 578128668432bcb6943b4f3020e9c280bec7ad581a1429ec04c4cea7b0523e6f127b03f0238a90fb85edf667cedbed165c6f37785dab0e45c23752dba502376f
-EBUILD ovs-2.11.0.ebuild 494 BLAKE2B 8b928ab15e48826ba8ba27964cf19760f9672f47be1d48a32da06dd3e833644bc280638359a8e4675a2694dbe3400f742f7effeba28b4df4ac1f33d79a526577 SHA512 578128668432bcb6943b4f3020e9c280bec7ad581a1429ec04c4cea7b0523e6f127b03f0238a90fb85edf667cedbed165c6f37785dab0e45c23752dba502376f
-EBUILD ovs-2.7.0.ebuild 476 BLAKE2B 1ccef3f920918c6df8f603d6319e4a059a81adce4a94d6b41119dae0cf43c08a4d4707a8d5cc15a5392729debf14e7603c36e06577c89cd7a9186e16ca3c2c30 SHA512 cdb623a67c2f09d60fe9aff8dbb55baa7d9747bfe03b1bd0f7fbc0ad17cbf0a4c3483da909f02b1b25982c0f3103ff241a8209a3e478f157043d641f52956ef9
-EBUILD ovs-2.7.2.ebuild 448 BLAKE2B 68b809ba263d8e37b3c1f1805e1bb4dde25489d4fa053d2f3456c483ada0bdb2563722eea0930c28f1f3671e77a2ea7614e183968250c10c24cd8e4e4b6fb1ff SHA512 3d4a85dfe147d849be000e4233b408dbde3589c95779fc3b49eb88520f701d7ae8725c4bc2879ebd77e4b5edca084c6f1014b995b0acc8e44e849d58d94f97c2
-EBUILD ovs-2.8.1.ebuild 447 BLAKE2B 8f96b7ce08452416475b8611abb560e7fc69e35128f81bff0d45c4d72d38703ab6b38707119636f23107cb3c6819b9aeb2516683d3db52c8393d9c90cb4968ec SHA512 4858f63af77ba5d69659d93633e143888565cd6faced0e37269fc1d9adaa7a859e5e1c6028432b44c5a84470bb8bf45490282648f87b02513dee4a297fc6b9d2
-EBUILD ovs-2.9.2.ebuild 447 BLAKE2B 8f96b7ce08452416475b8611abb560e7fc69e35128f81bff0d45c4d72d38703ab6b38707119636f23107cb3c6819b9aeb2516683d3db52c8393d9c90cb4968ec SHA512 4858f63af77ba5d69659d93633e143888565cd6faced0e37269fc1d9adaa7a859e5e1c6028432b44c5a84470bb8bf45490282648f87b02513dee4a297fc6b9d2
+EBUILD ovs-2.10.0-r1.ebuild 492 BLAKE2B 8a3bc5777fd6e497e40173e5dcbe3096173b73b72345f3c9dd015b09406cfef04671ed8d96c062421ba85f1e285311bd36f327bf5bad5ce3e9554ccdc8d24d5d SHA512 6c14ff87f230b43cd45390550a2dfe13857eddde1a49860a53db8ebd7f35c2e03b9fef53391ac9bbd0db86fb55feaabe5530b3105b784d6effa3ed8e7bcc6c55
+EBUILD ovs-2.11.0.ebuild 492 BLAKE2B 8a3bc5777fd6e497e40173e5dcbe3096173b73b72345f3c9dd015b09406cfef04671ed8d96c062421ba85f1e285311bd36f327bf5bad5ce3e9554ccdc8d24d5d SHA512 6c14ff87f230b43cd45390550a2dfe13857eddde1a49860a53db8ebd7f35c2e03b9fef53391ac9bbd0db86fb55feaabe5530b3105b784d6effa3ed8e7bcc6c55
 MISC metadata.xml 455 BLAKE2B 4b3662feee3f99c83ee91117f441d7bae841764b4f6a153dfe96574e7f8181e0db9e6f94c93f59b009e419a3879f8825e2cd76699a7ca82b5c88fb9df449f87a SHA512 53fad2964967c6b5d0a17cea549a01a23b0365a22ea53aa8a82d5bc26a2491651cd0ee276566493bc497a2c033b1a2139a516865ef99ba639365d1709410be5b
diff --git a/dev-python/ovs/ovs-2.10.0-r1.ebuild b/dev-python/ovs/ovs-2.10.0-r1.ebuild
index 2006c9e99595..03925b669f32 100644
--- a/dev-python/ovs/ovs-2.10.0-r1.ebuild
+++ b/dev-python/ovs/ovs-2.10.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ovs/ovs-2.11.0.ebuild b/dev-python/ovs/ovs-2.11.0.ebuild
index 2006c9e99595..03925b669f32 100644
--- a/dev-python/ovs/ovs-2.11.0.ebuild
+++ b/dev-python/ovs/ovs-2.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ovs/ovs-2.7.0.ebuild b/dev-python/ovs/ovs-2.7.0.ebuild
deleted file mode 100644
index 5d1bc442a331..000000000000
--- a/dev-python/ovs/ovs-2.7.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="OVS bindings for python."
-HOMEPAGE="https://github.com/openvswitch/ovs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="!<net-misc/openvswitch-2.6.0-r2"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/ovs/ovs-2.7.2.ebuild b/dev-python/ovs/ovs-2.7.2.ebuild
deleted file mode 100644
index bbd82351ef5d..000000000000
--- a/dev-python/ovs/ovs-2.7.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="OVS bindings for python."
-HOMEPAGE="https://github.com/openvswitch/ovs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ovs/ovs-2.8.1.ebuild b/dev-python/ovs/ovs-2.8.1.ebuild
deleted file mode 100644
index 0540f2ddb10e..000000000000
--- a/dev-python/ovs/ovs-2.8.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="OVS bindings for python."
-HOMEPAGE="https://github.com/openvswitch/ovs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ovs/ovs-2.9.2.ebuild b/dev-python/ovs/ovs-2.9.2.ebuild
deleted file mode 100644
index 0540f2ddb10e..000000000000
--- a/dev-python/ovs/ovs-2.9.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="OVS bindings for python."
-HOMEPAGE="https://github.com/openvswitch/ovs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index facf55617da2..9fefffe232e1 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1,5 +1,5 @@
 DIST ovsdbapp-0.12.2.tar.gz 78135 BLAKE2B bd0e0b209352af0bc2939a98d2ef52aa4d610471669d9eb3e9050dccdaa093ea9c922a588e6709defc0182cc991cd38883a9a9780f03cf7350a08eee5b99d424 SHA512 ef2b4080e600c585e23e5e9fa80fd684b42a1f2209db7ff00ec59a751e47c887d296339958d2805be0d359bb30dfab35271cea1b750039170c7bbf719ccc9d6e
 DIST ovsdbapp-0.15.0.tar.gz 79493 BLAKE2B a035a8571033e210db253dc4a301c602f9b213bbeb6fc73e9317d2a29f3b3520f43c0f6c8fa7f3d549f3fd76484993f5b905d3916c93c1daef228e9c15fa4a0f SHA512 db8179c32bb58b04019b215083bbf7490418305631a826a44965d52ebbfa9d75e08bff840659982a93c3941cecc0ef1e81299e83408731582907e24d2e2764f0
-EBUILD ovsdbapp-0.12.2.ebuild 736 BLAKE2B 42c711075ff666a36c7936e7f70bcd4ecc644e5fd5eb6ed5298b41da2c37a176c24c9aedd2e5f794d545d0f575d9fb6a1d5fc413aa3a21df8bd5c1210ea3222b SHA512 d493b6636241673760512edb8443e65f9795b417afb46cfd5cc49c84f1668497941d7ee5a6291435b53dd2ef636870abfce4d3577a8f476b0819c8e919a4dd1d
-EBUILD ovsdbapp-0.15.0.ebuild 738 BLAKE2B 765a048db2b20cc423410d8d6149364b2c5f3da35a395dbde8e71d3cc9d4448b4183798cb2effb5a0275c4b3aaa06e698bb521e7990f876424f3318df41e7825 SHA512 00f42900b3dcb49f26d9acfac37d40c5fd62651ebf33865a79be1cddd6ee0264b881d1b6581aa2c2c06e57f0f42a006533ce844c009ede6cd2932d38b3d66691
+EBUILD ovsdbapp-0.12.2.ebuild 732 BLAKE2B 88671a2eb77026cd7e1f223ede76c85fda6b5b40d1917f8cae9651d12184e5dba281ec5a95d54d91df09d2985e8b4fc8efa307e98228850147e7b3a11cde73d8 SHA512 b27482ba732a077135c29faae24f0cfcc3e07f92b5a70f68eed9db8123dac4f7613eac0b8686ee7244f9aa7ffd423b8f42186c1cc0a152480e5d257a12d8ce64
+EBUILD ovsdbapp-0.15.0.ebuild 736 BLAKE2B b93177f402d5334ab9c80a06e353f9c4aa8842590bce7a62248842daa9ecf858a6e6aa3abd3a968ddc6b257b674731024c7258acc238ef472e24f83da6a34afc SHA512 30d78515f90d0369e5dbca1afa00aaa689119459ba44138ac4479b02a77c2297dc8969a6eba5db468cf05550153885edfc4439008d061c35c81c747c0227a690
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
index db8a31c6183a..37077f33c01f 100644
--- a/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A library for creating OVSDB applications"
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild
index cfd92151e1a1..edf181fc4b57 100644
--- a/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 90801282a25a..867dc19d2ace 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,6 +1,6 @@
 DIST owslib-0.16.0.tar.gz 658145 BLAKE2B 8e32de48192579f10515771c1682b1d1319deb8195ff9c0f9168ea82bb30bbc8bcf7c457c794a79b1121d40f3f544624f0a9789b0f6f36632c6457f396fa78c9 SHA512 a468352dfdb62bea1e6189efcc198237cb909051e51782abb15093e328ca7d3d379e88d0466e42c39ce9bc201a3be828a779193666bf9befe8d501355aaddbf4
 DIST owslib-0.17.1.tar.gz 898961 BLAKE2B e48b10a0bd9dc1e85588b8007261c47f9f754af9eeb7292d4a3fd9ce017309efbe0fc9951a42470a6938194e5903b12ffe286b140d906e1d281f5a2f739540ce SHA512 0772f7698d1d5c6989419a455e8b6d97b0fc9f04a48275b1179f5bcc0fe782620721e840969281941b0f0a3616d8220916090256bb177eff1b2a4df0e02e2caa
-EBUILD owslib-0.16.0-r1.ebuild 982 BLAKE2B adf494c1fd7c61a8f524647466874942f0675bbe8d5fe2841bf771d8e731d363e7f05bb022a129d105970f144edbf97924b57d3e5445cce3d6c2d84fc3687c58 SHA512 559e8ee627cc9baf02c25bb46fad1247c75d041833de2e219c031cbc0b1073f141898edce419c3564fe827664f3d601aab1c3d8e60e8036ca0c86cfd6d8e7584
+EBUILD owslib-0.16.0-r1.ebuild 978 BLAKE2B 6188d6b9d0ed618c682e5805de2d34edc7e4af033759bc6e68e988b8624a07d0a2485b5dda72b3887264132787f16c8fcc08ec1b78324f4322eadb225edc644e SHA512 ca6773e37d77ca2caba1815c2c6ecda251279590b73a7d565b0a3be2f352d7bb026184e8d811c49e10967f2a768934cbf788351aa47eaa5f1f9b5db01925bbc1
 EBUILD owslib-0.17.1-r1.ebuild 976 BLAKE2B 36e2e2c4cc50165b212fd688ff615750856488ecd7e68598d413964f94839591f8b3ba32847b73f413979b7135560dbdca1712b7fd9be2781c44406352804759 SHA512 256cbce8ae7b43b97d18feb7e8603d9cf782a0c40435a47c968aac28a32b5f376756c84f603f98a5d052a2f643c4b52b8c2efcde3254b39df1489807b2c6820c
-EBUILD owslib-0.17.1.ebuild 984 BLAKE2B 327e0538d1b9b47d2b7d10c2bcb845d2b5747de463efe2dc8fc826659e2f7588c112a503fe31f3e7e742f1889923db0c0b883a4c23df9e8eb2a5e3147309d9c5 SHA512 eae71f875c65e515edf28857796b45174ad8e695a8f2e276c9d9d185fdef3bfab8ab310b1db07dd89c4481cc9e7ec61d904ce2f785250f2d2bd3f0cca21d80e0
+EBUILD owslib-0.17.1.ebuild 980 BLAKE2B 96aabf7c03c839990a3f35adfd1a215e493e0035813a238a566e07b315b82b21e2f80e094b6133817b85a1e8db8bbc323a38aeaef8d253c88f6c83b7ecb50514 SHA512 0f7e71d6aab34bdb90e659d0fa58249031d9b5cd74e537698533bec71a397cd688d1d9a69b4a38fabea3df413ee567cc51bb25215dafc33dfa83c9ecc668d636
 MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
diff --git a/dev-python/owslib/owslib-0.16.0-r1.ebuild b/dev-python/owslib/owslib-0.16.0-r1.ebuild
index 1c79db9c3740..c409c4e6bb32 100644
--- a/dev-python/owslib/owslib-0.16.0-r1.ebuild
+++ b/dev-python/owslib/owslib-0.16.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
diff --git a/dev-python/owslib/owslib-0.17.1.ebuild b/dev-python/owslib/owslib-0.17.1.ebuild
index 8fa38d39c553..118c22f7c3ec 100644
--- a/dev-python/owslib/owslib-0.17.1.ebuild
+++ b/dev-python/owslib/owslib-0.17.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 34cf70a4dc15..51215c69ba84 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,8 +1,8 @@
 AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
 DIST packaging-16.8.tar.gz 44706 BLAKE2B 6443f05d3745eb6c4cc3d51fccfb1afcfa207ac12498be4d15cd0f5c52c80435f8ea513589e8aec671cf88b10cc8c98555e7cac7fe9a1e0c67f4625fce83f80f SHA512 d1a7b65472c7c02dd758f0c469d6c6aeea34de7b798613f7fcdf45fcccbeba1e9085cab113fa89b392a60f758f8747d13b1c265c809566990c22e61ca8db49bb
-DIST packaging-18.0.tar.gz 48018 BLAKE2B 3c7082a6cd6ba697f8b2c036062c7020b3b6417ba5492abee3b57b6a14bd8895168f6d6ab385458d08561fdf37230eb9d79ce82a8eae7dd16dc4951d679f917f SHA512 9f7cab9bdd756cc49192379b8381f81d218d3201e071498f2f6fd0307b1c46ad1a8c8b9d4f27e62d5f469eb05603a57be54deb8a5e0dbc2cf542e436a7127b34
 DIST packaging-19.2.tar.gz 59110 BLAKE2B 8098538b8f48f4ff478eb13f3f4384d08c246b8a99711a48b2f412deaecd85faf13e24fd910a7a262c3407c5eb54939cd926e31e6f802deed0e28e0a92dfdb86 SHA512 af7312a85292f577d3e6e57154f10fb380bbdee749344ba4b226a09f22bf5ca664ed63c62cd5b4dea0be5eb5cff5c17ad04415aab8c925fa90dcae2e1c6dee5a
-EBUILD packaging-16.8.ebuild 1435 BLAKE2B 61f84076339e88b08b95241d9e6eacce5565640cb97f125b96ec08341aca855c180e795f42fe9c4711503e7f71b05ea2ccdcd5ffbc6334299ca72836a87cb3c5 SHA512 c42fae42b7d8710702b81c51621ca9eca811bb886396be93a65bc4f4c6f24a99a105946cae1d49e3b5adfc4f2e0e19b496959e0635a54f218da9d448173e6417
-EBUILD packaging-18.0.ebuild 1448 BLAKE2B 3a91497a8f4410accaa5d97c344bec224ba4a2ce1ad97f68300aa58e34e141b9d9039957b7c495f46a7ad50ef823439e0adc0044d40aa901ec0f05d5a47630e9 SHA512 b4fbeca1287b2167040e16f6c3816442ac661ac4d1fc1afe877889c04442b15be1244970fa3c3b0bd9f4b39bc4994d15a8ddbe51b684d4bb305b8ab3781aa735
-EBUILD packaging-19.2.ebuild 1422 BLAKE2B e90518be8ff2b9fe4e8ff924407b574b5aae1a920b738aacdc5273051e81ea96115772131ea390e0d6b006020d427076d174636bbd8f5f9769378169af327509 SHA512 8ecb4a1585660d663883e2bf54a053b7d884249ca35606214382da0ac535d4021b1afa2a43bc14fffeb8aaa42aa9ff4ed7cd480f48ea44c1c2d92032fae7af3a
+DIST packaging-20.0.tar.gz 72663 BLAKE2B 39fe2c52389978d1c6d7a0a0044b549a96fd386f83ece2dac65090b8ea55193fb2334102523c5119ef29050655d81bc015e3b02c6589088ef6f5bc8e97f3aa04 SHA512 f7d99700d27d5aebbb3343f1de6ee9ce1372750b805c55a40d1a1fbeb6cfcfe2184875db56de175c6cd46e17f1567c30a39d5527870902c3c69168d025447587
+EBUILD packaging-16.8.ebuild 1426 BLAKE2B 09f077436c392bdc57cb524e06927b1a1c5c1cff91a6be03422becef6f47a49a0a6b2830e929ef76e819ecac08042c2858d2aacd03dcd3094ca0b9218e6f5f0c SHA512 8a7004680a62d2fbb728527842f6aeaab2b2f576fc4471add0da08d62018ed66f3277e54ac5d6c6e4ef1ffe839bc4cac09c5debd377bc86b0779849751ad553b
+EBUILD packaging-19.2.ebuild 1415 BLAKE2B 712b60364c9dd21cc284ad9235e51d6066eeb8a2a93d4dbf191df826580b536186da67da20001b70fb0f68db1d2acfbe836ef6703f3504653bb4486cd397c662 SHA512 c44d324b43b3b9f3d0c4cfd75054c579371864dd40f5f038e419c39a7651a5b476499bec2121c3cfdce90a6fd7a5b47e71b6f2e19f7594b620d31b1ff9371a13
+EBUILD packaging-20.0.ebuild 1417 BLAKE2B 7eb668b201610d64b01a91d7eec7c8cd37b4fcefd0436efbff41092eac037c42fd49ec422903ee08729331f727d315cb4e35d3b5bcb4c493db3c46e3928a8e7a SHA512 a09d271d703344f9f655b4fed8827c48d2d1f026758aabf4a47440a1f83029b132c5e286c4f5c3f71cf7fb45f06865a1d9beb084015608318fd90521824a1ba5
 MISC metadata.xml 366 BLAKE2B 62088f9e06b99999bcb0082f1ff6d6e243c8502a7e3f399699cded85fa65395f558e019b08342c73e4f078183cd0732d88058fab8fba984ba0b531c19ff6560c SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index 49fbf109beab..e5bbf4a21873 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3  )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3  )
 
 inherit distutils-r1
 
diff --git a/dev-python/packaging/packaging-18.0.ebuild b/dev-python/packaging/packaging-18.0.ebuild
deleted file mode 100644
index af75bdacd0d7..000000000000
--- a/dev-python/packaging/packaging-18.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3  )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.org/project/packaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.8-distutils.patch"
-)
-
-python_test() {
-	py.test --capture=no --strict -v || die
-}
-
-pkg_preinst() {
-	# https://bugs.gentoo.org/585146
-	cd "${HOME}" || die
-
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			echo rm -r "${egginfo}"
-			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/packaging/packaging-19.2.ebuild b/dev-python/packaging/packaging-19.2.ebuild
index 46e822b150f8..2675f40b46c8 100644
--- a/dev-python/packaging/packaging-19.2.ebuild
+++ b/dev-python/packaging/packaging-19.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3  )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3  )
 
 inherit distutils-r1
 
diff --git a/dev-python/packaging/packaging-20.0.ebuild b/dev-python/packaging/packaging-20.0.ebuild
new file mode 100644
index 000000000000..cbdf1bd94389
--- /dev/null
+++ b/dev-python/packaging/packaging-20.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=( python2_7 python3_{6,7,8} pypy3  )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="https://github.com/pypa/packaging https://pypi.org/project/packaging/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.8-distutils.patch"
+)
+
+python_test() {
+	pytest --capture=no --strict -vv || die
+}
+
+pkg_preinst() {
+	# https://bugs.gentoo.org/585146
+	cd "${HOME}" || die
+
+	_cleanup() {
+		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
+		local egginfo="${ROOT}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		if [[ -d ${egginfo} ]]; then
+			rm -rv "${egginfo}" || die "Failed to remove egg-info directory"
+		fi
+	}
+	python_foreach_impl _cleanup
+}
diff --git a/dev-python/pafy/Manifest b/dev-python/pafy/Manifest
index 03552e118c21..939b304b3265 100644
--- a/dev-python/pafy/Manifest
+++ b/dev-python/pafy/Manifest
@@ -1,6 +1,6 @@
 DIST pafy-0.5.3.1.tar.gz 25636 BLAKE2B b5281e135ba86d5bb4f259fe1bc5e2fb6f5a51519e0c2b3f7c929858ef0a54c77382fd2e6f399dfc3323db21c17b26991cc05502bcd1161f4d4118d45cd6b4cc SHA512 2d8fa30e15b9d500fac9726d9119da9f1ad24021a804b7e75d6251347f8b47f4517425834ba243a749e22517507fc27b67c7258f81bdebaa7d3b0b7f9b18e5ed
 DIST pafy-0.5.4.tar.gz 27393 BLAKE2B 9bf0601f3deaef091c1ad65a3d45a4d98747311e64244e9fa109519ab4980e9a8c822c5bba8ade73794d320300fa9693d2a9fb377a5547c6a7079fbbe9ae81f5 SHA512 91283ae831ecf50a861e9e6565d34652138b84bbf012f8b77b9fca9fe4eee2dfe358199ba77fd705792ce16173eccbf6f1bc31b88768edef02ba57fbde118011
-EBUILD pafy-0.5.3.1.ebuild 515 BLAKE2B b6e28f0058b93011e0fda50dc13cc242ddfd1279cc1b3f1387311a0cd149b3b4a1c894f9ce177c41f82fc0672ca453cca88d50d03e30ceca95d1c491fd09a04a SHA512 204e031dab857efedd4c420bb9524cb664ad2d76d6f1867f20a065b61492e76b6d346da146518ba4dad5ce18b56ad5d49034b111accb3d77ffcc0ee8473544c8
-EBUILD pafy-0.5.4.ebuild 631 BLAKE2B 8660d9d32e9dd448c1a1f27378419aa47ddf9b422bc19c6dbbb7538baeb16c33ac223428f5a9c87c3928bc772c2df3e1ff87332dc12272c198a12aeb07dacb2e SHA512 200863097afe42a1cabaa51d8d79dccf01cb87482c76e450e3264c54f837f2a7710bcac19101ff41e628fca0d23430f74cc9ac6f5e5929b0d854bf8d186cb213
-EBUILD pafy-9999.ebuild 631 BLAKE2B 8660d9d32e9dd448c1a1f27378419aa47ddf9b422bc19c6dbbb7538baeb16c33ac223428f5a9c87c3928bc772c2df3e1ff87332dc12272c198a12aeb07dacb2e SHA512 200863097afe42a1cabaa51d8d79dccf01cb87482c76e450e3264c54f837f2a7710bcac19101ff41e628fca0d23430f74cc9ac6f5e5929b0d854bf8d186cb213
+EBUILD pafy-0.5.3.1.ebuild 511 BLAKE2B 8bb2b9f9ed96474f6ee8611dc3cecd6f5d33dfd472790bb90f6222995a28bf231867e2f2dac939dc908eb580043b357cd3eb39e78261f92924be912a54ed7f25 SHA512 a9a575ff7544e5430fece06817de0eb8e5e3891a3908d6af6a8bc44ea23e94943d4107582c961c43c47407714ecfb7da36005c9110ec21a4c1194fa2e698c733
+EBUILD pafy-0.5.4.ebuild 627 BLAKE2B ab15b23b9c33a68184239b0b20e592c6a96293b5843bf1b948a25314cd41c6b783de656ad3b44c6755eb4a3c50c6bbd5041264159f16aad98de3ba26d0b5ea9e SHA512 9f2fc03066a87c17492fe0d2d02a7a459f1200e34b6b9d07c0a3f852ff12133b4a85b97076b46d2eea26b42f0945926cac00ff36df9f91b0b2ff8df8611ed0aa
+EBUILD pafy-9999.ebuild 627 BLAKE2B ab15b23b9c33a68184239b0b20e592c6a96293b5843bf1b948a25314cd41c6b783de656ad3b44c6755eb4a3c50c6bbd5041264159f16aad98de3ba26d0b5ea9e SHA512 9f2fc03066a87c17492fe0d2d02a7a459f1200e34b6b9d07c0a3f852ff12133b4a85b97076b46d2eea26b42f0945926cac00ff36df9f91b0b2ff8df8611ed0aa
 MISC metadata.xml 363 BLAKE2B 5159e9e65f41774553a894b2f11e9ca2f32b96ffb3b17cd3f0d7bbb0a56152a7a96e83c5f949bc4055c002dba93244ebe535c151d147c2c8d90e038050953f47 SHA512 7385160f1c9fb564b0b1b136409f853a28c0c4b1e87350f0c2097ea0cd4726bf1f8047e6a33c4f1e2751cfdf1349d80494d3c0149964969d25a8a999fe3dc2ae
diff --git a/dev-python/pafy/pafy-0.5.3.1.ebuild b/dev-python/pafy/pafy-0.5.3.1.ebuild
index bcba84a03df6..4bf1ef7fd986 100644
--- a/dev-python/pafy/pafy-0.5.3.1.ebuild
+++ b/dev-python/pafy/pafy-0.5.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to retrieve YouTube content and metadata"
diff --git a/dev-python/pafy/pafy-0.5.4.ebuild b/dev-python/pafy/pafy-0.5.4.ebuild
index 2ad86bf08f70..9b18f78eea05 100644
--- a/dev-python/pafy/pafy-0.5.4.ebuild
+++ b/dev-python/pafy/pafy-0.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-python/pafy/pafy-9999.ebuild b/dev-python/pafy/pafy-9999.ebuild
index 2ad86bf08f70..9b18f78eea05 100644
--- a/dev-python/pafy/pafy-9999.ebuild
+++ b/dev-python/pafy/pafy-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 560e0a138456..6bc75b0ccfda 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,4 +1,4 @@
 AUX paho-mqtt-1.3.1-strip-test-dependency.patch 681 BLAKE2B 0ed9a448e5e72813aa05ad1d37ae957150ad09b6d48a54f668a969e5e98ad25f8d55b223064e01f6773d0e42da3ba26f2e0a7f43a628ff68fee4b619b8de96c9 SHA512 dbadb8c1bd7691a973d8c1cd146ac9bd72407625ddfc5042b25bc81ff74af6d554c06fa3b2972637acc4a466e75a65c9371990e43bbf649fe5a5a22da2bb36fb
 DIST paho-mqtt-1.4.0.tar.gz 108278 BLAKE2B 0569f3cb5d262b3b7f6ae68261fe138d839afcc6fe91f880e29de24d5cf8e2491af81a30eb82c27fe63eee90114326eb75b06a32e05ec2fffed27b92d9601902 SHA512 2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c
-EBUILD paho-mqtt-1.4.0.ebuild 842 BLAKE2B 5ace569e1cf23eb13a25dad37fa8f4ba922884f8ca71051c83fadf0ca52d5e245e787dd4335e4aaf458ed967844c0d5aa8d6866c580fa777b3f27f9d48990648 SHA512 c9dbb00022e66bd1ab3746c0a6a0b84d59f13ef56d07fa9b6107ef593dd528ca4ac7b70767c496109abaea371643455f309827835831b78b3424fc6992b038ea
+EBUILD paho-mqtt-1.4.0.ebuild 832 BLAKE2B 1ffc21c1e68794f52bc03e2b965f6423490a851e4fdedd2b9c0c394b0f1813e95c9266a538cd1b0025e436136b0617ba26d38bbbd1950f5f6d1164ac47286727 SHA512 ddf18c0813539b838426242af0f2cb93e62a70f3a2496cdbeaad6e54378271c67b883cebc6a53ad15fe1a67548289a2212d1b1801294120870f6fab1a61670ab
 MISC metadata.xml 461 BLAKE2B aafc02224eae792f2800211f291493df079437667e706879cff3d8f7e895f16b8b778fe623280434f36ee878db2da6edefb459ad7b59b3fe5ec6e4dc8e3c7b36 SHA512 a9b6ab584e14070bcc2087a7027b1e36bc91706124039938a7bc2eaef5c14247afbe3c4827a22a3899c8e3c527f0d0ca0e394f1465b42e759e2fd26cf965297c
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
index 54e2bfe1319c..d37ae460afc2 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index f5e017da2432..fec173d32c14 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
-EBUILD pallets-sphinx-themes-1.1.2.ebuild 669 BLAKE2B 8ed4a6aa1c24287e37fd23e7ddcd6445a5a789c106b4db946b5db63e86a6548fa747f18834db5391e011365c258b5dfd4c41b9691d8720549d8e7fbcd65e6d8b SHA512 d77fbec11374b2dd6bdbfd9449c02ac100d0622b4bbc3490a0d20d02f330fcfe49bc95db6b66e395edf20755839867c3468a899a571b5b3f69331bdf6aa2056d
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 662 BLAKE2B 4359c556e879a45d3a6824485aaecc2ec4a14a54943ad6fe311c5f35dcfe16823cc40fe456cc5d5486ada153935c4f553b6a5b9495eda59dd4ed53277b4f36b5 SHA512 8a5256b7153a603bf1cf003ad1759fd9f6252ef410a41a66210f0430f48daff90ccbf3d6564a0313615a425a30463ea32c92b6dbfe31c504808cdc4d752abc28
 MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index 7a4e6c5393bf..e613698edb67 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx themes for Pallets and related projects"
diff --git a/dev-python/pandas-datareader/Manifest b/dev-python/pandas-datareader/Manifest
index 6e08c87c6584..c70c8dcf3649 100644
--- a/dev-python/pandas-datareader/Manifest
+++ b/dev-python/pandas-datareader/Manifest
@@ -1,3 +1,3 @@
 DIST pandas-datareader-0.7.0.tar.gz 341577 BLAKE2B 4169fdb9eb5280be15da23224d25104aaa47f7c328adc6fae6220ac11fc76954f541b8bdb117df977c163229751885e625d3a44923a8c0c2266f0eb3ee57b8af SHA512 2a2d1411fb3724f3e1cebea8a962c1d4f12124d58ba191035583d8d621bdb0dfaf0c0cbaea765ef61f5c23cc221ae2b585b612e97e45795380b70fe672d0b7a5
-EBUILD pandas-datareader-0.7.0.ebuild 1140 BLAKE2B 8f251d4f593a2e0e997750b392604b2093bdf9ef0601e7a7e4ebceb322196b5eb43d57dcdae1c5a6cf70c9bb3fbe642dfa5b5e0e0b0ffc2078305cae9bea77c6 SHA512 aa368d8fde015ad79a0346ac6c74c5507d119ae28f95927389948b24bc13a5bba69e59ce6a07d92defd64519f001a432c12a6cae1598d854935685030df89108
+EBUILD pandas-datareader-0.7.0.ebuild 1127 BLAKE2B 209f084c0862e979fe4a249d5d15cd0f4020a82e9fbfbc115931be9e5a18850db6ff9a4eae3fae88861ad648dcf926c4d84d42f73636d8318a0329fa69445e22 SHA512 4446397502fac587ff1c1a59d1078d4689ed3d99d5d8403c5527a47d17739b9c3a1caeee94ef08ae4bb9f44fee9974b817942f48e32d74269bd6e6174f4c611c
 MISC metadata.xml 753 BLAKE2B 2ecbabdb680770a13686fccdb0c91d7aa11b72db6649dc11395085fffc6712b23ad247355ac0845eff0ff4df306b7ae12151385ffa8871e525decc0f166b825e SHA512 886f97288af0af8c5939874e8d2d24d1614d56419a32c268bee80480f6c1a6921dfc46544bef189616737397feee4cd49cfad895939568127c046c9943c58751
diff --git a/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild b/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild
index 875b3856915a..694fd072b852 100644
--- a/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild
+++ b/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 4d57e508bdaf..da5eb5761089 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -5,8 +5,8 @@ AUX pandas-0.24.2-skip-broken-test.patch 644 BLAKE2B 8a879cb0cf3f9b2e7c80a649fe3
 DIST pandas-0.19.1.tar.gz 8360233 BLAKE2B 82611ca1a3e3169ac2d084f4dcd9c4d4d74e9e9c9913a41acad48ae68a208a884dfd877445a7d658a7ff098ef383cedae7e79a4900baa8d56c032ce9aaad96eb SHA512 6451990a7fae8c6db8ab0b014a13b4f1828754d3998f13c17b111f891fb9fd23f8e09b907623096dfa55668c42298eee1373210a9fddb95f56dd7d552b964e6f
 DIST pandas-0.23.4.tar.gz 10490077 BLAKE2B 28a78860e0aa5de8def7bb529fc98b9121a516b7fd7620e31e000ae14217165e6677ce26b56da0b9c603930ab1304725c644426a135d8f9b2a84921b88f3d23d SHA512 0c89db820a49e0cfb9764e64589ff9af819f9a53c01bd0254cd1b6dbd1e9fd452b2ff7c7330ede7623c7576589113e831a19a57c735562b55f90506df15805b9
 DIST pandas-0.24.2.tar.gz 11837693 BLAKE2B 3762e94554a3ae3c803c9a412c5c551c15a9fbf15cb05633f7d1b0ccbfddc646f68f0306666e688a83a4495b0537cea2fec671157f5a63aaa5f9cad6b791261e SHA512 0795c6bb8a47a511853558ea59d371b4540ec175f213cfba4ad2361d6481fea5d3f7074bb4961c32f2f0080a72d7436a9b3706f5cc692074f98d83bfc587fd15
-EBUILD pandas-0.19.1.ebuild 5804 BLAKE2B 8f4d7566032c34f6564405c0b47a79084f3fa6aa1fd7ff016ddd51801288777167778dbb6ec6729c347ab0f60b5dbbe42cd960a5d8558a74017ac9a74ef2df05 SHA512 562c32b2941376c9c296ce1c72a2bcdd95061b0e679eb804398d013099fd057e08404f924a3974d260d16038671b8db1c31e1eb8fdf2c2c80104035f4dc81449
-EBUILD pandas-0.23.4.ebuild 5798 BLAKE2B 6e3368f9095a55bfd5daa816bf6b8fb8bbebd7c97bb3e6093e61f8044f9d0620c583e770cfb4f109cec119dfcffca12f18be0f108a6d1c9d90845c8f8f97fcb1 SHA512 a980c12916b01810d16a7cb905c45b2c963e6c683ddb9896048acabbcaa27cd807c6135c70a1e4067ca4b009eabec17f334dda21f3c017ce8ead0470db094ac4
-EBUILD pandas-0.24.2.ebuild 5439 BLAKE2B 5b6aa8874fae4f1eac86ee9df4a6d6cb0565733e8d55e72067058cb3f6f1c1a204ac23447990e4bfea6d533a46b582435cd0c44926e09e964bf6c08cce9b0980 SHA512 2834fe037b15e9b6746738dc15f7c0c3d501b385d0745db35d824dfe41c8a56a21a7eb527369bf407dfed5a54d47edd9486f62889fa98d3545f9a6905ee546d2
-EBUILD pandas-9999.ebuild 5885 BLAKE2B 6a039c0081c689246946be67d2ca18ad176eda28c07d9e47cd882bad0de54d9ed54795bb580a9efb00ba2dc5e4f92b7f9db945ece6cb579595ec9c2ef4e0cc83 SHA512 fa413ca7c0a33d97c993436ce545ca49315f756f56abb5e172426f977c835f60a0e4b602a685c120b9401aad40099d858ba804e58aff837c8b76f7f985e8bfec
+EBUILD pandas-0.19.1.ebuild 5800 BLAKE2B e694fa020cf9c2cb4a13f5f2667df1cea60e8481145de3972f4db9bb13a505405b362b9aee0ca644b9e8fb71f1575719f35ecf7c5d4f26a6c88ab87b44c473ea SHA512 47a0c2aa41ffaffe8ca4d3129281ef0949b3d17bfb937d6a5fe488d4af6a16ed5d9069b525240aa0d9ecd8adc17601e94adb5d0e785078954041744ae8799bd1
+EBUILD pandas-0.23.4.ebuild 5791 BLAKE2B f1bf1ee63da72fdc1e0a8226e92a979c753a954322c6de066a15f34fa0bcffefe1318a07864e6321aa9a11030e04d4697e0e3219cfb9842baa52f2c3b26e2d06 SHA512 a9cad7b052306c4470043c0a38f689514291805fad4204ba8d642b5c7635553f0fbe90021d161b39dac8f1f0eac505a92a6f846fffc3ba4a0a839c9e1d16eaae
+EBUILD pandas-0.24.2.ebuild 5437 BLAKE2B 8cc8e58d69edaf48a6d315dbe89847a89adf0c9bcacea42e56d7a8be922a00edc34d8e03a1d53e8ee18e5edcb0c5780412c4b71c9d450e38d9b0f35506e11852 SHA512 6e0e8cb6f27cc6bb04e328ca59aa835710c0681e601583e13a5be1f2a8cab2bd80663e0f1d58987489b53319085aea8f9ec0eb477744b23e5d2c8c16abf22993
+EBUILD pandas-9999.ebuild 5878 BLAKE2B b87567b2c98f4c4a4a76666530ceada21a89d2034ab1940741faa2dead2c5c842f64ffa8cf255c53d3bf6534529333c04909b857868f7f8fd2bacce557f6e719 SHA512 b6decec12502c566101ac66d6fe06c84e6ec31ac5c3d2ab163dc6614310c967b4047b8d187cc75bc7423d522efc52e23b5453410d865238a2395c6ed07c3c3cc
 MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
diff --git a/dev-python/pandas/pandas-0.19.1.ebuild b/dev-python/pandas/pandas-0.19.1.ebuild
index 6012836ecbd1..4992553b1a9a 100644
--- a/dev-python/pandas/pandas-0.19.1.ebuild
+++ b/dev-python/pandas/pandas-0.19.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 VIRTUALX_REQUIRED="manual"
diff --git a/dev-python/pandas/pandas-0.23.4.ebuild b/dev-python/pandas/pandas-0.23.4.ebuild
index ea03b73582a1..fe01a85bcdf6 100644
--- a/dev-python/pandas/pandas-0.23.4.ebuild
+++ b/dev-python/pandas/pandas-0.23.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 VIRTUALX_REQUIRED="manual"
diff --git a/dev-python/pandas/pandas-0.24.2.ebuild b/dev-python/pandas/pandas-0.24.2.ebuild
index 0f98d036d311..90ca74ada211 100644
--- a/dev-python/pandas/pandas-0.24.2.ebuild
+++ b/dev-python/pandas/pandas-0.24.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 VIRTUALX_REQUIRED="manual"
diff --git a/dev-python/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild
index 70eaf651e7b3..dcb1f71f9a01 100644
--- a/dev-python/pandas/pandas-9999.ebuild
+++ b/dev-python/pandas/pandas-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 VIRTUALX_REQUIRED="manual"
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index a0b1303a4d14..28b65e7ac512 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,3 +1,3 @@
 DIST pandocfilters-1.4.2.tar.gz 14229 BLAKE2B 8d061435fc4368fe34f30d7ba7aa06a2b8f3bf94a94661aa120d3b0e9a3042e64bfb8f81a8731470417e436f52342b3a63ab4bb3144349ec9aa983cea9c5d4a4 SHA512 5e5c0fb18f163430e87750b88d38a5f0fa618b90c84bf08e6f295df3ddd46c1bbf35ec51514af8d6699c7dfc9f0b3ee9edd0484deeb05e5efb3b26e650b5ee1b
-EBUILD pandocfilters-1.4.2-r1.ebuild 425 BLAKE2B d29b9dfe9560b224b46a95a089aea803baceedd8c765efa32dc6ae2d55905632386caa834796ad0cb478d23a2965a8c46d8a672c8daddac4ebcc1ca8a397ba24 SHA512 99f15eba05808f108395c24294a0a7e20a817690928a957a8fb612b9668272f8601045b381fdea4343043c123700d4fc748b2b33d0d9a5aece643f1251a57543
+EBUILD pandocfilters-1.4.2-r1.ebuild 423 BLAKE2B fcd3e52a499ec097d6c70a8eda3620298ba06c3996c37d75037c3936d182e632fdb15b6910a0a98047b6a5d610436bc85658e42ddcf76ce4fa0c32cc0123165c SHA512 3e8575f16aa4ce113bef25d3ba60361e27b683b6985e7e7c4964043b40bf13a8ac1f7ade9880d9727dabd031c2aea1875bf5d07b94d6858ce0e0724eb0c82d11
 MISC metadata.xml 398 BLAKE2B 2c08c9bb2d07f4566c9ced1a87888d4482988acb2e4579d243aa776272050a0c8a95de5efd209163dbeb95b33327de59478c978343ce69472c2812cadd6adc41 SHA512 fa20fb0f6270246612d2f7a7cbde6052d3f27c5ad4e111deaf7a80ac7438fba8c4e48150be615053063197f7902243b12ad149b1d050fc281b71196d4b70daf4
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
index c3cc24da5414..a2ff84331817 100644
--- a/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index 92e1711c3bac..46b49f5775b5 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -1,3 +1,3 @@
 DIST parameterized-0.7.0.tar.gz 20751 BLAKE2B d9ae50c8f3ad142fb18511aa151b386443d9100db69d5ac3c1256be98f6a5c669f1ae08172b13f8ab2441fcdafa548c42899178d737be1db9d65fa597322397b SHA512 b76e18a7eee62fcab4385fd5d053253c096d4c3fc3a6300e8539afc4d8decc995e533085297c52f8a26411d2591a326033a740cc30a250d510aa1c11ee904246
-EBUILD parameterized-0.7.0.ebuild 592 BLAKE2B e46df374fb23b3f699033b70ef5a1a8965a6ce54909e0aacf0f6b99268b0d4ce5c2489b94084c8397efbd5b2615c18fc419563c19216ce8e6cfaec3b9991a064 SHA512 63687b7c5e57d3ed146cebc4a93675d4f085aa5a736e99d57aa0859131192a3bf43cf32d97b0804c3a8c7ddc012d7e12ddc3aef12b41fa182bbfef973bf5ba59
+EBUILD parameterized-0.7.0.ebuild 588 BLAKE2B daadbe00dfe5134d7cc5b570e4d9cc626818f20eea1062b552870bda00bdf94d2fa34edd3c9f7dfd64027cead6f027e8b22baad6741b20ef4c091f05f06a880c SHA512 5ed88fc132537830593a18786ded0f00928f2891a4b2cc41a28fdd929731f791b8657f501b09b6b094accfe4cd65954e60372dc45084273e7e7ae1709f1bf6a9
 MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
diff --git a/dev-python/parameterized/parameterized-0.7.0.ebuild b/dev-python/parameterized/parameterized-0.7.0.ebuild
index 0ae2431defc9..279b62b3fa55 100644
--- a/dev-python/parameterized/parameterized-0.7.0.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parametrized/Manifest b/dev-python/parametrized/Manifest
index e4e4b37e988b..85afeac7ffc2 100644
--- a/dev-python/parametrized/Manifest
+++ b/dev-python/parametrized/Manifest
@@ -1,3 +1,3 @@
 DIST parametrized-0.1.tar.gz 2246 BLAKE2B 2d6296434aaed324c3b15492d212a9bae025ab0614d349cd1ddc621189a91e593ab84b7a7c4089d6245bf4b91dd48586cdb0d9eb562b99d8de697e66c19a2713 SHA512 ee9543b1c2f4e313ea3a74d91b97b6339770101b70317754006fde7568292d3f175d923896742339302d5e1e625b2c0f2beb05863c659ac3b81869a3f574f25b
-EBUILD parametrized-0.1.ebuild 492 BLAKE2B 3b4221b56a4c53ee27f3db90cbbaaa33b918fba104770a259fa473e28b7400e08f2088d5b3bfc5b18ca2ac6a44e08828aa1306b6f6c92ea7342fbe07da6d33b4 SHA512 1925c134f8de9f3afc0be74f2e12ade02cbea0f30bd9b955b3365473b1132d867e3b960076f7b12f635da508881085708e0190e70f18e1767fe8ef21b76c29b6
+EBUILD parametrized-0.1.ebuild 480 BLAKE2B 4c2b0b43a9ad1fe767792ed52c9aad50768decfd975b43ec7ba64a6f072b9272e2e61bb5a82e4623a1e310cd632c84b294f87b48d6b230cf1d7ae06d388098a1 SHA512 33ade0a3cce73b671ba8a0ec8fe3f549a924f1e3e7c6ea15e7cb7c737dd85240ee32f31007cedb8cef3f4cd8aa3ad546b5e0f4791b2a14fe1e57ec64406bb25b
 MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
diff --git a/dev-python/parametrized/parametrized-0.1.ebuild b/dev-python/parametrized/parametrized-0.1.ebuild
index f404802404b2..dd09c7ae337b 100644
--- a/dev-python/parametrized/parametrized-0.1.ebuild
+++ b/dev-python/parametrized/parametrized-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 406e4db37dde..0a68c6fb9867 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,7 +1,10 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-2.6.0-tests.patch 1193 BLAKE2B 86063ffd478f5772e2aacbbd6e6a74262ebaa1e67126af598eb589e49484efc15b581df0bbc796c0790a5ca80d6b5a72cbd07782c7790a9782e66f857e9c2336 SHA512 5b5de9c209d6aee83dc57f2f04d1d43f7106ed135fc12427d9237cf63932408c6385f878d02ef5dbb3d09476ee516148208d0390caa21f82a113bf6ed5a8176e
+AUX paramiko-2.7.1-tests.patch 2370 BLAKE2B 9d63e9e96a3bc4a1ecc7762ff0b7663c13ae82b6f4d2b46343847059b03bd91ad3b16ddb2e2204f15cf8c6eb14310857ff7c0af7ad420f27d2ef11f500057414 SHA512 4c9dbe97d9c2957f26838b46897d776c08ea20040c452b9dea8466288271811e51f491277c8c5e544c0b47e1eb50fdb5baacce1e6254c7f2cf2f45de6ab20a19
 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
 DIST paramiko-2.6.0.tar.gz 304469 BLAKE2B cde861069c8924b2f685675266fd28600ffd24a39074e9ad5db8fd1d010c6e23ca13a2c78a79b23504dfff395b773b171e7c787119d01e3b92a2eec44ca8b40a SHA512 1ac2c3486cb786a1e4640d7b7f8628087f9b78ee247b09dbd3ac2646790da4f12cf95fc4291f27f200b63ec6c11d9ebf5a1283f88cf2de7c2eb6e6f76e892ef2
-EBUILD paramiko-2.4.2.ebuild 1494 BLAKE2B fabb448af23b231105975f393b16c5e81cd39fe5e3838ad7e1298e4b06ba0567e95a4842803c39049f01d1ec7b6df570427c11f5ee9c95b028525f669e0e7870 SHA512 1c8b1663a261fa52b8f582a9f3040e451abbe45f68bbeadc723637bd59c55791c7a20a2619b1bb8f7b1024765b7e11366365b65e07d20880c88b596dd15913ef
-EBUILD paramiko-2.6.0.ebuild 1506 BLAKE2B 5c3d9487209d7bff99de46c78dd292721935a514c02bec232bbef5786f5fea5c5c184c4f6ff051766cfe038a526a4ed1aec400ec787ca813f044b14f598119f6 SHA512 c18f2d11b016b2b2c8e3658faa7b8ca859d66e1525b0b0de770d4c07a9abc5ca1075798c7fc83dd0c90e85c4071b2d87f3e5676054a2152c4d6be616ed7fd111
+DIST paramiko-2.7.1.tar.gz 330391 BLAKE2B 0f7a2f3b6c15a68002001d69f8402deea5421a8b1f6cf35061a8a36f4b81b7a291d7b0f0b457f32de4c4769659a2e067f0bdb6cc5dcdd0810ebf917e349e85af SHA512 2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2
+EBUILD paramiko-2.4.2.ebuild 1492 BLAKE2B 2c1fce2e9e0af333e86367108f24fb3198222018a0e51432492bb3eede58413bcd81c8a32badf6ca2b75455554ccc9a3726cb1ffbc6a4f73b98c2cdf964e65a5 SHA512 475752888e86d31cef669184b1cf7c018fe1c708f52be8966b6b51e1ec6b9bd7e1328255ae988d7c9bf9482f52438294b1b5ef8abb8d99de7329a90ee5b83009
+EBUILD paramiko-2.6.0.ebuild 1504 BLAKE2B cb516255c6f6ee6a91414222f470646699f40c682e552898b6a40414bee9ca23f7e8405481c43617a925cadda9a27bdc73577944bb8041dfc3c602d916898cfc SHA512 a09c8dea801857ae470d77bb923f84d8901a462a40711b1a02f06d0caa64f6b77118d1a61da2b34edda3ddceff290772328aed1ea464f4dbbcfb9f4a032580c3
+EBUILD paramiko-2.7.1.ebuild 1504 BLAKE2B cb516255c6f6ee6a91414222f470646699f40c682e552898b6a40414bee9ca23f7e8405481c43617a925cadda9a27bdc73577944bb8041dfc3c602d916898cfc SHA512 a09c8dea801857ae470d77bb923f84d8901a462a40711b1a02f06d0caa64f6b77118d1a61da2b34edda3ddceff290772328aed1ea464f4dbbcfb9f4a032580c3
 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
diff --git a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
new file mode 100644
index 000000000000..9c3570c2c58d
--- /dev/null
+++ b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
@@ -0,0 +1,62 @@
+From e3e904cc88a08e88c9051de4f5a6f1b6e78bf4a6 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 16 Dec 2019 17:39:50 +0100
+Subject: [PATCH] Strip use of pytest-relaxed
+
+.. since it was removed from the tree due to breaking pytest.
+---
+ tests/test_client.py | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/tests/test_client.py b/tests/test_client.py
+index 60ad310..22a2e40 100644
+--- a/tests/test_client.py
++++ b/tests/test_client.py
+@@ -33,7 +33,6 @@ import warnings
+ import weakref
+ from tempfile import mkstemp
+ 
+-from pytest_relaxed import raises
+ from mock import patch, Mock
+ 
+ import paramiko
+@@ -684,10 +683,10 @@ class PasswordPassphraseTests(ClientTest):
+ 
+     # TODO: more granular exception pending #387; should be signaling "no auth
+     # methods available" because no key and no password
+-    @raises(SSHException)
+     def test_passphrase_kwarg_not_used_for_password_auth(self):
+-        # Using the "right" password in the "wrong" field shouldn't work.
+-        self._test_connection(passphrase="pygmalion")
++        with self.assertRaises(SSHException):
++            # Using the "right" password in the "wrong" field shouldn't work.
++            self._test_connection(passphrase="pygmalion")
+ 
+     def test_passphrase_kwarg_used_for_key_passphrase(self):
+         # Straightforward again, with new passphrase kwarg.
+@@ -705,14 +704,14 @@ class PasswordPassphraseTests(ClientTest):
+             password="television",
+         )
+ 
+-    @raises(AuthenticationException)  # TODO: more granular
+     def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(  # noqa
+         self
+     ):
+-        # Sanity: if we're given both fields, the password field is NOT used as
+-        # a passphrase.
+-        self._test_connection(
+-            key_filename=_support("test_rsa_password.key"),
+-            password="television",
+-            passphrase="wat? lol no",
+-        )
++        with self.assertRaises(AuthenticationException):
++            # Sanity: if we're given both fields, the password field is NOT used as
++            # a passphrase.
++            self._test_connection(
++                key_filename=_support("test_rsa_password.key"),
++                password="television",
++                passphrase="wat? lol no",
++            )
+-- 
+2.23.0
+
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
index 751e6e4b1f19..167f6e088cc1 100644
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/paramiko/paramiko-2.6.0.ebuild b/dev-python/paramiko/paramiko-2.6.0.ebuild
index 5587e75a3c8f..694ab7ad7eee 100644
--- a/dev-python/paramiko/paramiko-2.6.0.ebuild
+++ b/dev-python/paramiko/paramiko-2.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/paramiko/paramiko-2.7.1.ebuild b/dev-python/paramiko/paramiko-2.7.1.ebuild
new file mode 100644
index 000000000000..694ab7ad7eee
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.7.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
+# pypi tarballs are missing test data
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="examples server test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx sites/docs
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-tests.patch
+
+	if ! use server; then
+		eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
+	fi
+
+	eapply_user
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/*
+	fi
+}
diff --git a/dev-python/paramunittest/Manifest b/dev-python/paramunittest/Manifest
index 9d3953abb9a4..f3acbd0e09e5 100644
--- a/dev-python/paramunittest/Manifest
+++ b/dev-python/paramunittest/Manifest
@@ -1,3 +1,3 @@
 DIST ParamUnittest-0.2.tar.gz 2482 BLAKE2B 13d7de57fe0f3747fa5a8bdf2654a16b18c56d74545d05cfd8288fd902f43fec3c7c73d7528c1b3ada7e280e95b72855c14ac6e6d7419280197258eed2592a52 SHA512 ad39def15e5983ebe6b018b10f966b7f83085facccc50e71010f88b8bcfdb704e889ce021535b2e4dd84bc1ae413088e7c028990d934d4fe28d3186b4b01a3b7
-EBUILD paramunittest-0.2.ebuild 526 BLAKE2B 80e5d16d0a9751fa94a082c2e994d36590a531eaa892b7b44c3d89167f30bfab0eaf263413b2deec8cc22fb43e496da156cd8acc9f5441829fca5405138c367e SHA512 5a505d1e06ae8cfc55a341f58f3f936820da899dd6ea1cd30512c9996d4925782e8fb44d19855104c04fa04aecd66babf7668f9cbd4081e31ade5f7057199f89
+EBUILD paramunittest-0.2.ebuild 522 BLAKE2B 870496e6339b2c08013ed7b5b033331d1fa7600ba7223758cf81a646a0522579e69bbdcf441f637b7dbf3c0be39646143b635c65e784e8f99dbc17acb88024d6 SHA512 4165c95ec42cada035d94afeb3de4da8cdf3fa082ab2dd68a44138aa37bb36745cc94b29bc4a899fce7fd05c81caea336159d61f3def47ad0baeb85ec6421e79
 MISC metadata.xml 299 BLAKE2B 63557ffe11e7306ee858e78150e1e9581505cbe9498b0bc4cf0e2113757c8d22518f4afdda9da0af358565c6a5aade3487bb3f443bc354906c621ecbc3327919 SHA512 b7bf38d24afab09b5d2da40d7ea77601ba094ad322f505cb5dab4991955e2799c2cdb33d0a5a387de6f2df6f0772020e1fb9cc7bbe74b3198077defbfb6f0b92
diff --git a/dev-python/paramunittest/paramunittest-0.2.ebuild b/dev-python/paramunittest/paramunittest-0.2.ebuild
index 4dd814f6e2ba..1c3b77a0be5d 100644
--- a/dev-python/paramunittest/paramunittest-0.2.ebuild
+++ b/dev-python/paramunittest/paramunittest-0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/parsedatetime/Manifest b/dev-python/parsedatetime/Manifest
index 10c6ac02816e..b641b23f7eb6 100644
--- a/dev-python/parsedatetime/Manifest
+++ b/dev-python/parsedatetime/Manifest
@@ -1,3 +1,3 @@
 DIST parsedatetime-2.4.tar.gz 63598 BLAKE2B 864e40311b56d28f5b1eed5ea069d40f7bd06b99a365530466ec0d16e99ce61d64d2c0bf78f1653aafa936a4fa91b2145e76f4da288dd3d1ff69ec8ccdc00174 SHA512 0fd8bfa3411476a20d8874b44036bc162735fb7865d39ca98b0a608daec39daac47100314279dbf66229ec333821492744f7505315d955f58216fdaa75cbf046
-EBUILD parsedatetime-2.4-r1.ebuild 684 BLAKE2B 6f974f6d9d327c77a63c37de4257752445f2206cd0be2a98e502889b0ed540d610c155aaa247e667d687a2b66b6a578ea1ad8ebed2f2919b6b1a870719a9782c SHA512 2fc644eede9054f98b12f6af03378d8c2a950379bb166ca295fd4ae5cc46787f900f02d5e9f498ab51426ca9e12b5798ab7b09cbc134125dd35a7be301d20dc3
+EBUILD parsedatetime-2.4-r1.ebuild 684 BLAKE2B f8d5a2864c7f8ac26f3b709a65b9a57822c09ce9d7cf88e7544389d36499793363c2131d423d40e6c6f752f93664d4bfcce0f612f90799c26ea0db14caea4a33 SHA512 f87f9182166c7fe86fa94777d15102e9c3e82689f3daa97bc6897f0482f7aded426c10c96386352f2a6f5c77ae11dd4f193ed993a7ac55c4fc102e84707ad0ca
 MISC metadata.xml 323 BLAKE2B 9aa027d44b3a16191a66b19dee59d74607de0260f4490af322e0f3daf7a5eaad521afa616287314f942537988e0a6e6f84b706bc8f2cbec7229c4e400624cd8e SHA512 496f1ae871e09c9a218454f32dc7fb1953c484d8b813324bf3a2a2f11226f5788d0a84f78641499b111571ee4487e1849b1401c611b1302e87d581c3e869fff6
diff --git a/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild b/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
index c8a9b8c5d2d7..5e114832a014 100644
--- a/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
+++ b/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5..7}} )
+PYTHON_COMPAT=( python{2_7,3_{6..7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/parsley/Manifest b/dev-python/parsley/Manifest
index 5a39da30c9b2..82f4383e04c8 100644
--- a/dev-python/parsley/Manifest
+++ b/dev-python/parsley/Manifest
@@ -1,3 +1,3 @@
 DIST parsley-1.3.tar.gz 108574 BLAKE2B 4fb22ee0cf5e9115820bd8da76402c4915ac936b58e590097f44d788d6df99ad15779833ff8535e9256dc04a375e818a1e97a2ebc828cb343d002c27956b57c6 SHA512 da749592a585be6c7b45e3d0637e30f0cf79caf71f88cd55a9c53466f5adf9c46a955359b3587f37b8237a5005cda94f62ab349889cb649c786f593b3707dd55
-EBUILD parsley-1.3.ebuild 434 BLAKE2B 4686893927d6f33e18cfc425eb96d4a71de8f0d8eb7e0270296fe22f8254896a3db1366db9422e27997c32b04675017d0713910eb93115fde2e7b155c1cc8a76 SHA512 b4099d74bce5118946451fef67b90a42ee206d6c395517bb1525f2d840a6dcd78fd561dd38a6601fbfce1ecf39dd46256dfee071761bbcb076df31b3555aa903
+EBUILD parsley-1.3.ebuild 424 BLAKE2B 3cc34d6b813a4a46d67246a94319ed0c2bf15bdf067e2f962a392ef1915938d69b70f8f9f2029f6f56b2e78546a63778f27c6e56e186ed7650763475448fc719 SHA512 7cb03b50aafd5f5823c71c0c8170863e3adefa265f65c2b54129e4b4454523901732c7f5397af9db980f9cfc1a38e94baabac289db1b766b1bca8dc30aca3e6f
 MISC metadata.xml 259 BLAKE2B 1c1ccfbd9597e220cf99add6d11ae208387d4dadf7e9839f5054ca2a5c1f9e352da99d46c976a51caafdad98a7b067dc4bf725543621c4de7fd07f6eddbbadd5 SHA512 f0b022a8047e4d0fcbfb12f88ac7761c403cb33e7fcb900ec929e06d00251253426815b3293d072e13ab69b643c256554c753b62be63554d408c06f6a6d63a3e
diff --git a/dev-python/parsley/parsley-1.3.ebuild b/dev-python/parsley/parsley-1.3.ebuild
index b4ad7201e55f..2fb1421ba039 100644
--- a/dev-python/parsley/parsley-1.3.ebuild
+++ b/dev-python/parsley/parsley-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 4e2aa124656c..b6e7c48195fe 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,8 +1,5 @@
-DIST parso-0.3.1.tar.gz 375226 BLAKE2B 71481f5f382f14e5f2c7826f8eb50a1c35f8c280f14c8bf52bcf44f77aa9872cddce7d7fb7b0a586ab7cda547e43bbce11812077ae84129c418a9f0bb3c5b856 SHA512 f83e316a41e21d3132d9ee8a45f9042962c01a2b906e8791046112b9ed938d378b0dc28c4ae05ce03a8c2d19563a49cba9a9a230654345ff62e87cc763536ddb
-DIST parso-0.5.0.tar.gz 386652 BLAKE2B f12e34aa9b93a1d3eedca96588148ac1e9ecb3a6af3910627d251e2281df285ce8768c11bf3cac35f8a977f0dac2f7a906fb20171db35fae2bec1c60cd0d7dc6 SHA512 cd2a38e538faf4faf3f1828f4e69dfe685ef1fd3e120326ca5260f0edbc23952e51ffd8370a2bb2de513a90ecde76e6ea2fe76d84d3ab4115c7817e3af08e701
 DIST parso-0.5.1.tar.gz 388060 BLAKE2B 429ab40501d38e982cf77e0dbbfa4d8677dd1e2400945436b8eced608a41015b7028f586cf9af6057e441765f0a1db519a642ceadaba14620a92f452ce709871 SHA512 a04ef9bbe156bc28ac9fa64d091d3f1dcc9cf4b15a3c109cd33de1c4d34d0bf741016b88b6c12d456e953253942b7d522e0b793c9a00e9fb06de27ab0667c7fc
-EBUILD parso-0.3.1.ebuild 908 BLAKE2B 4e15db9871a30630370f78d687e7f82a7b469eb1668e5bb5d982517a586919b5e087967b0fc8077b920b115ea9f844e69e2b12e139fa5fc55d57cd0dc9fd340d SHA512 04b439466e792a0b11176d7cf3207c3f4e3eba5941426b2749c5064b28a8b1df1f23910fc9dd7c4c3c6b7c14382cee83d28f269888f015a55cd641f98e02e959
-EBUILD parso-0.5.0.ebuild 910 BLAKE2B 3118a1da083c862de96c29038f98c85ba6276b32986723aecbb6859fd599a654d5b5b642e816545fff399a369a81bd9c9aa6dd81d694f9dfcc50609715a8c501 SHA512 2045df1cd5c5ff7761e3990a3680586329bfe2de9b92ba51a3163a9d56a5cb227d58ebd4a85f526f026202825b0e9276ef6c18ce773f06e727994118fe9111c1
-EBUILD parso-0.5.1-r1.ebuild 661 BLAKE2B 2c852da38ff191db1a6b78e8e0adc696593afa087598202d296e22df688b84cbf223e7d1e9bedd1faacc7eb431b4ce069a930508dd76d72411ec14c6d59047d7 SHA512 b6d84e56bc1a6223e86160acc947cfaf51a4687631e9ed8b2878290ff1ab115bd3739e91a293ff6fd93a57b40b21e5d45b0977e78b13befd0711f3345fa07986
-EBUILD parso-0.5.1.ebuild 909 BLAKE2B af8893736fe98af0a2a7e7bd2bbcafbec7405f0a5df276faae25f48025ea47c98deaf98aa38bbe74543f58b9d7bfe40226c7db0005c326fe0033675497248682 SHA512 614753154bc202497c77a5fc3ef83e33a53c654c4909e15b15867feecad4b8fd5d038cbdf964ebca06c878b551d5a135742b91b03d3e108633e222d5380196e6
+DIST parso-0.5.2.tar.gz 390495 BLAKE2B 257de5853cad74803d9b45ae4820c96933d09ebe7c09d30a98ccb1d40d1473d8ef55f9be692278012f3d6f57066600ae14817d20bbde2258f2362702f3056f93 SHA512 d8a2b8c4f30eec676f9cb36afc86b4f80d8397ce4d82a2452598116ae50cb861a1eea6543a51898f4c94acb13b8345833283a353f19ae27242b6e993c02f0ef7
+EBUILD parso-0.5.1-r1.ebuild 653 BLAKE2B 3e812b5c5882e6b482c1a3dba3df575f06ded2fa3e8b174691ef5e92074aed573d5c3dcb243d4f9b337c96861cbb8ed0be9356854aaf98afc1caccbbcbddac4e SHA512 8b23fd80b995261ad8332c74c7290ab5a6b4195e70f57a3cc0c04c9d2e3ccbb409a135b01843537c83a4b6845a9b088d8be9a2d77d60565ed75d76946d7d2c42
+EBUILD parso-0.5.2.ebuild 657 BLAKE2B 0541c81ce6454910f9df836bf78a93b14ff0da22f8e3ea25e23c7f497994882f853c0760066152347901f6ecf4de7e496bfb60b7bf08ade80c38a2eecd672c19 SHA512 c464d169614129468b21653826482648038694ddc1499e4eea3cbc99e997437aa7b213636db87c8a71a3ca3bf858d7975a3e289cba13e90af361061ef103766d
 MISC metadata.xml 377 BLAKE2B 0ac7d9c46c0b591fe46ff373bcb8942261cf0b819d9397500928546c4b07541c958edb116ecf1ff79f0a83c2f02784b019e7d64bd8a82bdfb397ef70fbbaa0c3 SHA512 7d719c633f81372caafbfb0a913fa455fd1d150210ea09713a0888b38d18ccae646b17bbe32a66b931016ee6e4bc826a1670a033466c945a2591e77f9d6d7b7c
diff --git a/dev-python/parso/parso-0.3.1.ebuild b/dev-python/parso/parso-0.3.1.ebuild
deleted file mode 100644
index e40de7cdfb6b..000000000000
--- a/dev-python/parso/parso-0.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -vv test || die "tests failed with ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/parso/parso-0.5.0.ebuild b/dev-python/parso/parso-0.5.0.ebuild
deleted file mode 100644
index 059cd991adce..000000000000
--- a/dev-python/parso/parso-0.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -vv test || die "tests failed with ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/parso/parso-0.5.1-r1.ebuild b/dev-python/parso/parso-0.5.1-r1.ebuild
index 34f4507fb045..751ea4f20069 100644
--- a/dev-python/parso/parso-0.5.1-r1.ebuild
+++ b/dev-python/parso/parso-0.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parso/parso-0.5.1.ebuild b/dev-python/parso/parso-0.5.1.ebuild
deleted file mode 100644
index fbadad5e5009..000000000000
--- a/dev-python/parso/parso-0.5.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -vv test || die "tests failed with ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/parso/parso-0.5.2.ebuild b/dev-python/parso/parso-0.5.2.ebuild
new file mode 100644
index 000000000000..177f7ce1aa8b
--- /dev/null
+++ b/dev-python/parso/parso-0.5.2.ebuild
@@ -0,0 +1,23 @@
+# 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 python parser that supports error recovery and round-trip parsing"
+HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/partd/Manifest b/dev-python/partd/Manifest
index aae0b542d078..063b5f7a0caf 100644
--- a/dev-python/partd/Manifest
+++ b/dev-python/partd/Manifest
@@ -1,5 +1,3 @@
-DIST partd-0.3.2.tar.gz 17097 BLAKE2B 7ab5175f3df7a550d107d19d07f6a0810dbac8d393e66b25ac9f7f17b4f1f0f3209140e05798369d7e3178ca4556a05b356db399f23da5591f3829d6631cadad SHA512 7d48af79d6a42d7adbca85df1199d266ae115b4160fcaa9ba6a026b92ae813d9a37594dfab06f969a38799f13f23c80bbcd89be4ec4fdd8ad9f85718598707de
 DIST partd-0.3.8.tar.gz 19171 BLAKE2B 1c96a3771ba8866ec1f8e8536909c433bc2cf914d0eee9ae01bd7d1255b44caed59b1dd71ff4f7c433c3429a86381757be1202dadd01cd65282687ddd0c1ad62 SHA512 3b7c642f7452a409eece356d2fe2e9430f6c5859b685c2ebe3d4cd8fbaa1c86e370174454f31b264ff8866ca9a9ab3bc0ca288f7ed123d8233ea3332f373d01d
-EBUILD partd-0.3.2.ebuild 823 BLAKE2B 1b2ab872dee6bf8d6aedf92ab2031002c5851524a547a9e3b12c435aa5f872c898c676ca0e32b6641136221745f93125a00c45c7880b9d1e5db1e4a0e4c8dca2 SHA512 270d1d9f31f1a8972b084506142f08e5d03835cafcf7617785149835798cae7dd7142da01885e2ee4d5d045cc9c1bad1fe3cc273007bba334600ed4199d13e0c
-EBUILD partd-0.3.8.ebuild 823 BLAKE2B 5a6e8cb0ba89910fbeb236e14bfcd307a25cfdd8e1702524c9a487984a956f4f65d0da17a1273a4891b49dd2048959fa66d3f0e7144cc002402bea9d67bb0131 SHA512 cbc5f5601bcf7b69506c1bdd74cce065657ae11055d74a7f036ab9bc88631574514c8d99e8c6566bc1315fad3bd79762af12c03edbd5d146a5924963f83ee91e
+EBUILD partd-0.3.8.ebuild 821 BLAKE2B 8b258c58b67f79d740e6b56c7fee08654b641d049bf47c024427c08797cdf019a8637488427b848a9944de87c6fb30952ce3ad8c5af149ce5e81564e3cab614b SHA512 959fa8f8a66e382ded80601fe665abe6bbe68c9c4135646af9d9a092e63e0895161c5b0cbf45b35d5ef8bbd05345e6ad04e774b62e8864b08c299078f78287ec
 MISC metadata.xml 668 BLAKE2B 5bee3dfee36d41021686daf6f8449311089503fafc31e9bc7a998bda70a5301e144fcb47925339f268f2caa27bfba06f3cea1e614d8d97b08ad611982ce712ec SHA512 30f9fb68a75ecadd72d03b01be181cc661ddc70b595fcef8cc5d9a98de089d585e2baa9615e9989af68cc4f1e520c8862b41ac769568c8a29a3c8877330fc52f
diff --git a/dev-python/partd/partd-0.3.2.ebuild b/dev-python/partd/partd-0.3.2.ebuild
deleted file mode 100644
index 916931d897a7..000000000000
--- a/dev-python/partd/partd-0.3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-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"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-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/pytest[${PYTHON_USEDEP}]
-	  dev-python/pyzmq[${PYTHON_USEDEP}]
-	  dev-python/toolz[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test partd --verbose || die
-}
diff --git a/dev-python/partd/partd-0.3.8.ebuild b/dev-python/partd/partd-0.3.8.ebuild
index fae54eecb00f..1596103bd4ce 100644
--- a/dev-python/partd/partd-0.3.8.ebuild
+++ b/dev-python/partd/partd-0.3.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index fe79bf4a0249..8bc4bb23b70d 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,3 +1,6 @@
+AUX parver-0.2.1-gentoo-versioning.patch 771 BLAKE2B edeeb76368745ce85ca812c399fe919dea9da01b1ed8f9c4b5a151809c0610d59b9213d441fbf891ba15389c9c9caaa610509a213585481a2ecbf09de85c33a9 SHA512 d4d8cea17ec8aa6bc3a2e3855f2d1e85b2954290fe41a894dfdea8617afe87f1dc79e882b14db608d5b58f1df4129509b55f8aa64862d770d81fa07e59c53b34
 DIST parver-0.1.1.tar.gz 23398 BLAKE2B 2e15ac0c5739ac4d5360cd905d87d0ba1e3831fa975b42c73503f1fdc0952d4a73f36a9eb07cf95a12969637cbfaa902ed46c9a66a85110c17b8ff36c39c87f1 SHA512 d79a4981f3ad77180c5a9c5972410714a1be075308c933bde6af499c25aaa2f82034afb27c0b4c4d7ca269d645285a953a91ea6f945fcac663250ed06ae3accb
-EBUILD parver-0.1.1.ebuild 750 BLAKE2B 6955473bda2aed1664b64749f86098260c5895a346693fab6fdf1fb8ba0f3832948254d12fb2de80006118ee29bac3200c28bc5115ef05e38acbb97c26499d75 SHA512 fc910b97301b494b6b1b3d8e554cef3f08f59dd0e43706a9653297c0ca58673551ff0c5223364237ede07df6ae6bf1acf9203ff8fb0c5d104b19313e0d8b549b
+DIST parver-0.2.1.tar.gz 25717 BLAKE2B dd55f44b8bb43ca948fa459537385066b811fca4ff68426365b840d704c30c4a258632f1d2ac2a3967acafcbde44151f1d394ffd96a18d03c6a004ce6b29f1b1 SHA512 674e97d5bef6bb02a659ecf5e1a78fa5d597436b656d0251db20fe330a151ae8de52a3f3f0d3732ccb624ad9093116c07837ba0cbe4ae7ae664b4d47ec3333c3
+EBUILD parver-0.1.1.ebuild 748 BLAKE2B a4905d32194a840bd1d541bdf53cf22f0794d38bdd520129cc8f73176cb2093db3550c3f1796f21256ed5a3c2ab215920e48b581cec6099d8d294f16b1b9f29b SHA512 1285ca2fa81db3ea1af0191e48e903341a9e6115af864f6f2d8120dec979162408da18edbf28672d616213ee2d6604dd54903e386ce48af88c607ba935ea3d71
+EBUILD parver-0.2.1.ebuild 845 BLAKE2B 0d245211f485256835d722ceaa96cfa8d2ddcdcf62c9ca820a16b049d97f69e6880d6df920bc1cbc950dd34d3925bb11bf8e2597dead2796587da0f5e69e30da SHA512 b03cf4dfd29f6f5ae9162a62f77208c6239503f0041e763172fb57e6849a51e38dcccd6897d3bc087cb53ac5f0ffc80c42e039c99299c09b8fcf806d7b46d034
 MISC metadata.xml 574 BLAKE2B 510cd38b3ed8ff1bc35c94dc05b898794d2770d0804e2dc0b86139177e98379c6bb0f8aad5a5c46f4586e24efa84c2eaee7d22a072feea99be98a5faedeeb810 SHA512 bd52224f07bee7d3655766dbaccdedb0ee53367c3b6544fc6641ad9593f005c42d79a862914bc87bd673bb4206d19698784f9bff0135c0a56e156bf2fee12cc7
diff --git a/dev-python/parver/files/parver-0.2.1-gentoo-versioning.patch b/dev-python/parver/files/parver-0.2.1-gentoo-versioning.patch
new file mode 100644
index 000000000000..a2cae61afa46
--- /dev/null
+++ b/dev-python/parver/files/parver-0.2.1-gentoo-versioning.patch
@@ -0,0 +1,29 @@
+diff --git a/setup.py b/setup.py
+index c5c2492..8f5c8c7 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,9 +18,9 @@ LONG_DESC = open('README.rst', encoding='utf-8').read()
+ 
+ extras_require = {
+     'test': [
+-        'pytest ~= 3.5',
+-        'hypothesis ~= 3.56',
+-        'pretend ~= 1.0',
++        'pytest >= 3.5',
++        'hypothesis >= 3.56',
++        'pretend >= 1.0',
+     ],
+     'docstest': [
+         'doc8',
+@@ -49,9 +49,9 @@ setup(
+     packages=find_packages('src'),
+     package_dir={'': 'src'},
+     install_requires=[
+-        'arpeggio ~= 1.7',
++        'arpeggio >= 1.7',
+         'attrs >= 17.4.0',
+-        'six ~= 1.9',
++        'six >= 1.9',
+     ],
+     extras_require=extras_require,
+     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
diff --git a/dev-python/parver/parver-0.1.1.ebuild b/dev-python/parver/parver-0.1.1.ebuild
index d2e30e447cfc..02527e47152c 100644
--- a/dev-python/parver/parver-0.1.1.ebuild
+++ b/dev-python/parver/parver-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/parver/parver-0.2.1.ebuild b/dev-python/parver/parver-0.2.1.ebuild
new file mode 100644
index 000000000000..60a12771ff94
--- /dev/null
+++ b/dev-python/parver/parver-0.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Parse and manipulate version numbers"
+HOMEPAGE="https://github.com/RazerM/parver https://pypi.org/project/parver/"
+SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.1-gentoo-versioning.patch
+)
+
+RDEPEND="
+	>=dev-python/arpeggio-1.7[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	pytest -vv || die "Testing failed"
+}
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index 707e1db5286f..86eb582c8303 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -2,7 +2,7 @@ AUX passlib-1.7.1-tests.patch 1552 BLAKE2B 86cfedd409d6aff983c31ec33362577e5e353
 AUX passlib-1.7.2-pypy3.patch 3117 BLAKE2B c68b96cddf48038198e7d5d35da33c581c2abcf1aef75e6ca556c39a87e242e9990ed17235596ffb68a4154eec9acb6fcb0d651a04856a93f79a993865d702f7 SHA512 808fc0f3067f30f23118b5222d90f86910b3e681c585d1bdb237a2b954ff99936105042f2a0fce8f4ae2b0301cd201be68905be316fed5ebfd81ccc1cf29fd1a
 DIST passlib-1.7.1.tar.gz 645724 BLAKE2B f34e3bbc5a61ff71cc989fa26edb9f992909bfdcc6ca1b094ebc02fc9942eb1db1ea18fc3dd5bb7d9fcecf6b4bd82e93aba07c7ce63ec85452b5d7117a6e1968 SHA512 3d5f069cd4e44e5e87cdabc46845acbdd6c1eeedb7ce1f611aebee87b0f7af19009b6a47a10ec555fd84260b9f5c933c6429e325d30326de3869f05031674168
 DIST passlib-1.7.2.tar.gz 649654 BLAKE2B 40279113d9ff633cea47222f2d72af0abee78dc52a9b46adf66aaae213594eaae7f245cc80004f85b5055b882741b4bedfd81ee39132db23760d37a34e87ac6a SHA512 1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53
-EBUILD passlib-1.7.1-r1.ebuild 951 BLAKE2B 360d814517701b163e92800af22089522bab1cda92798fa29a946218a8e45c20b65affdfd9ac62ee76e2611f4b703b2b9140c585e1dbd7da7bd012264b508f73 SHA512 79d89aca9012f2843f39b7193faa4f07ca10694a82621e17bc1c57aa03f66b5195bb77202cbcbb49bd756d4c538f6725d7e05f3070926ead0b22fffa6fe98238
-EBUILD passlib-1.7.1-r2.ebuild 1024 BLAKE2B 9b18e3d13e79804f38ef7976d29af99c97c0e124db4ec4e4f3e498bbdea35b82e29292a5e9f734f9a9cb4191a4c09ac701f792cf2dd3e7404d1911ade8c08536 SHA512 2ceff70b8b569a603b3e1b7420f6121e89df54d6ac5332bdd56de2f052a8873562a0f5da4a2bf051f14227273e179b4af9677738f990120110e721cf6c0b677d
-EBUILD passlib-1.7.2.ebuild 875 BLAKE2B 3e0cafea93c6c12a2415d17fe75858b1509c9f3826d0eb4f9abbf9ac9a4732e6cc524634a090fa0a619dabce8ba65d5d52201f77664f7fb0d4ffe6fb4a0dedaf SHA512 b8a7c48a9f24f9b242fb73562dc571c50dbfdbfe7f74fd4c4e402b66431fa72b99d835c44a69eaf092d52771950ef229c23ccc84ca4238fc5bce36c72ac18029
+EBUILD passlib-1.7.1-r1.ebuild 942 BLAKE2B 9ce2a5d002f6c5f6d592d618ddfaccac39b7ee7dc3ca7566fd73ded9588e55fd0f484314ce98cc7deb798f24e2357e6c166712d2f0201fc962645d12e47896fd SHA512 8e13da6ae54b8c1703bbc02f33bcb5bf59d2b2c0feb52b98024b75dd462351296d3e78cb8524b14e08dbf7018b646764e35b14553f1478c284348b2edeb3cc72
+EBUILD passlib-1.7.1-r2.ebuild 1017 BLAKE2B 3951702642b043ce19ad9b8b277484646f753e5c081d91dc38e5c4740d942ec041d9a07191d29767aae853423d06aada6713ed20fdc8513d9dbfff928371c526 SHA512 e9f5fb5eddb7b92f4184deb6c0764e5b7e5ce7aa58322b92ba4f9aa7641f2d10b1863f8bb6c3d8cbe91b18fabd9357623623e368cd5fc95064b89087cb775572
+EBUILD passlib-1.7.2.ebuild 870 BLAKE2B 96bd4ed4d51b9649456c4efcb2e867b8fd16454f58d778c725839a9ceee440e89ed6281cb5dd3dfec7c7f8df5486dc604a4e06a6005b9ff166365b09db77362e SHA512 e801dbf6ee3a06c66c8ed5863cc95ade660ac9ad54e807d5105eaad034b9ff77ba2f1af3acaa19e7dc711cf77d47987b276826ffa5fc51c4c93c8e6a86bd2a2e
 MISC metadata.xml 913 BLAKE2B e5e596a7d8039ea24c92c7cc33702c8adbfec59171a6dfb6ddf83beb213d5a29ca0c2c12b3f7d59f7dd5e5234984bdcdeae0f9dc859faa2bb23f2c3ac072b322 SHA512 942c129b6e9213511959c07967ca77c8888571b8e8ddda7e57da964f4dbb58f55ff10f90d1322d3a95752f00f1439bfb29604600e7a3b926660513d52a6c8b1c
diff --git a/dev-python/passlib/passlib-1.7.1-r1.ebuild b/dev-python/passlib/passlib-1.7.1-r1.ebuild
index 5791a80c010c..b13bb2f8e226 100644
--- a/dev-python/passlib/passlib-1.7.1-r1.ebuild
+++ b/dev-python/passlib/passlib-1.7.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/passlib/passlib-1.7.1-r2.ebuild b/dev-python/passlib/passlib-1.7.1-r2.ebuild
index f72758004e54..560714066abe 100644
--- a/dev-python/passlib/passlib-1.7.1-r2.ebuild
+++ b/dev-python/passlib/passlib-1.7.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
index 90238f185175..ce11522be05f 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/passwordmeter/Manifest b/dev-python/passwordmeter/Manifest
index c28b5dafdc63..1b2b42030436 100644
--- a/dev-python/passwordmeter/Manifest
+++ b/dev-python/passwordmeter/Manifest
@@ -1,3 +1,3 @@
 DIST passwordmeter-0.1.8.tar.gz 51904 BLAKE2B 1c5b004996b1bd10b2c16e0d9a352e135f20f45db345f9b12381ffa139923515cb71d8ee77b372377f372eaff2302e2ee1e217712cec00e5a8a2cff8c3a4085d SHA512 c7604054812576ab8144523c174f3d1543da3ccc192420a9ce8fe596887d1e53a596c255b9f1ffb9a7ab5e3952f53ff8fde11966a58a2ccb2210f891e43b4ac4
-EBUILD passwordmeter-0.1.8.ebuild 819 BLAKE2B 03fecdc5e13074bc10f8374fef50f0c4e946bcaf0e8dbb001685181ce67dc70d0bf93a11300ecb27f0f4da1086865caa48f5584009c8c1d02255c7ac4c09b3d8 SHA512 62864b2de4d16704dfd986b6adc37c293f8a0957d8664d6d3a230d652d90bf6264ed80a11678ae8cab6c77ea37fce9119455648732feffafbb9b3ec17453c1bd
+EBUILD passwordmeter-0.1.8.ebuild 805 BLAKE2B 64e42fe558137a685a6e2285de6b4c9f22194c3a87efb25e4ca37f06edbd55bad9c6ef8feba501f0176a3fdaf4b478731983f49782113c3e438ec3ebcfd25f20 SHA512 528f944247395ff79002da8650586b2f19aaabf1635f7a627c6e53c10758ebc2bc8bba0ae33c4f3a9a498f3f0dce9ab1317ba8e4ce778dd0ecc389b01d9e325e
 MISC metadata.xml 381 BLAKE2B 6d01bb4d8682e5c9319f5ee91092409686af224bbf0194c1bfa8361b6b377c85612eac6cc6e3b6a3ca4a1b25cc0d3b31ce765ea5049c85babb833a0342d0985c SHA512 193e98b082bd4db93b501b449e3f276b6b42619f50ef22624675b150c8d68656809217a1622480645767f3e4747c3e5b79b1394d9cf4ec6f7a6cad29202f6af2
diff --git a/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild b/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
index 25040d3de3f3..db627a77bc9a 100644
--- a/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
+++ b/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index b7a717e60e8a..35b37e78ae95 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -2,7 +2,7 @@ AUX paste-2.0.3-unbundle-tempita.patch 1260 BLAKE2B eee8a9ede07730cc6af7de910a02
 DIST Paste-2.0.3.tar.gz 643935 BLAKE2B 140f88cbab40728713a052e5aca0c7f14336d526a2c7bcd6a279fcdd13b14ed83938f69997182b43d2a83a76f51586c3b9132428f0f9c9e9ba08b6ff820827b9 SHA512 174b06d77bc6e1d4079e8de7df40412ffda098364efd4e3f915f858be1188c8a6fb546fe4ab981ccc067ec77b7171083b2469e7db6fc3b777d5a24151c928362
 DIST Paste-3.0.7.tar.gz 628999 BLAKE2B c91bb228fc2c36da1e7d487d521b9f57df19f4cb76731ec8ac17786aae087fe820760d19798a8da0ab6ce50f24b8a1fcb9d5189e6c48cffbda75ddfc9cf9f617 SHA512 adf823d208065b00a4bf1473e7550a1e0907d1da88000e87ea3a5dfb36f22c2bb33dda21ccf096da1512a0f2db2ad540a66efe751bbab8bfb49cd4ad456d5460
 DIST Paste-3.2.3.tar.gz 628900 BLAKE2B 3f6bc741a716f33b82fa3bf8e1ab6ba3c17a56ebf3f90ccce0c1a925f982a2a0b460f433e15045321bb4b7c22c6fe9238cf6c7c76b78dc86d414729b67f0791e SHA512 8775a4c6b1863355a2acb3b88258e342db768942ccf28edc8654d7a1a15c5a036f4f8c5c9d917d51e74c9260170234f9c499cefd709b0fbd39ffd4d1b7afcb79
-EBUILD paste-2.0.3-r1.ebuild 1842 BLAKE2B 84b7beb82b4ee1e824e3c7da99592e94130a9d4333cc09831d4e091008cedb9540738cfb870c2c852a337ba02220c088f923cef78b32009ced81d80877094510 SHA512 77dba81daafaafa73079884c82de4bb9a948c496327346a397d9ed1bb700dd1bd237191f982dbe0f43ff26e7df4fb292e6c26388ef797c822ceb65dddf697b62
-EBUILD paste-3.0.7.ebuild 1900 BLAKE2B f468b9552b35e0f652eb339ac517a930ca3253f1b91b3ffb6137336e87ba52f1f2b28941063c7e0335facb3a2a5476cf3a6f67ab7e965075b42d35a797560972 SHA512 ab43659606f1dc99339cc8d56457e8f513076e4dc73f11a9debf70ebb6ccce64416bde54389904b25284ae4fda2b25f7ffcde4580bc73c82ef5b19d843ec7493
-EBUILD paste-3.2.3.ebuild 1709 BLAKE2B a43577ce9b68d1e55cced2b8d3c3f5c8d9dd74d5e9c784793e77fa5beb9dbf210b199190e26772c33ec25e29327d137cb45daf47e5ee4564b350c28394faedc5 SHA512 fa6d077983077ae4b054da5623e6ef2debc685241d4f5df308863e422943d9f4a10424839ad8d4cd7e70132aee382f8d3b1e0a6c13e23ae6260a25d4ad90bff6
+EBUILD paste-2.0.3-r1.ebuild 1840 BLAKE2B 5a25230773e9401b7479255d4432a23ed45b995a7385f8b73a3b1c385c9efaca26790f8ab3ca7bb9adf196d9587565f292ac6bf776775b0c9c090bb88c4ea6e1 SHA512 29d9cbe8901e534ccbf34474243c19dcae8f4318c81e8dbd8da3716c740e192a93852c623c92b17e5d22ee9e372d3092cb351ec9694bd38c3b83b475bc3fc24b
+EBUILD paste-3.0.7.ebuild 1898 BLAKE2B f88fc66d546d88e0015c69ca13976a6684b2cb3b2e2172487a64516dac781999976cd5df3e5f447fb7f5615b22ca70e7c915dafb26beff69d58d42c39f2c6359 SHA512 6e52175c4ef08cf9a728715efbac37778336d347a32b4e6fa469b7bf59d1be4ed50206f2812d61711ff8dfc6013345288794e8e0d59280c09b9b1647ff6a4bc7
+EBUILD paste-3.2.3.ebuild 1704 BLAKE2B e00f57ff80e98fbcaaefc0d6f256538743c6af036db78a5f01d4c549822c75a302bee8405e300d7bec42b52f7974663376d65d0171b40e96991982f4c0762d24 SHA512 bb33de9929fc78250716d951e007a58e36b81ac92582c4d62b5bd1c6b05a4e20eaf08d1acbbd88c133a9da012b8ab6f28490bad119926a3ff817266cc87b4dde
 MISC metadata.xml 778 BLAKE2B 74d5474ab918861e65f330eff278a319f8b197c6f95e65c862e55bd19d84534c447e348df82ddc68558dd089f8ac81785c16de38e3fdc70f706d4e5b870243fc SHA512 86b244a3dd365e74dfc12dfc283809840352cbe210b34c34ffda1929db29362d1e02b246920d8461cde70b087020d15cecd3ec5cfe0f168fb69fa45cdb66015a
diff --git a/dev-python/paste/paste-2.0.3-r1.ebuild b/dev-python/paste/paste-2.0.3-r1.ebuild
index 5477ac936fdf..7565575649c4 100644
--- a/dev-python/paste/paste-2.0.3-r1.ebuild
+++ b/dev-python/paste/paste-2.0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paste/paste-3.0.7.ebuild b/dev-python/paste/paste-3.0.7.ebuild
index 7e01fcd13909..9153f2c37152 100644
--- a/dev-python/paste/paste-3.0.7.ebuild
+++ b/dev-python/paste/paste-3.0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paste/paste-3.2.3.ebuild b/dev-python/paste/paste-3.2.3.ebuild
index 35a4d120ade4..d0d437d3a61e 100644
--- a/dev-python/paste/paste-3.2.3.ebuild
+++ b/dev-python/paste/paste-3.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 4dd7d40f3928..deb8f2ae596c 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,10 +1,4 @@
-AUX pastedeploy-1.5.2-py3-tests.patch 606 BLAKE2B 8f7d5a9f8c517e14a1ecdcbfa040977ab9d3c8e7a072eef3c31d50ac74c02b377ea25fa965d36a89f3c9e0fbfed63364447cfe5525468766df976445d9cebe9c SHA512 0301653864071de976bae24a945ba6d8499aaf21d41c5117ad922254055ee8a3b975cdadc6590677cd458a233ad115647a01a05d52feb0dd40d16bcf4de8f5cc
-DIST PasteDeploy-1.5.2.tar.gz 24006 BLAKE2B 1088d5cdafc80402b44c6c0e62829d1efe666d9ef8c84409125173ce927aecb8ed3ec4283b9821a42cc614d27e74e43e79407554fabfd79f6a913f9742532c72 SHA512 03147b2e735f4504b928066d35f46e7d19a49b85afc506b793fba69c8827a4d5b8185074bdd4a963ac392cc104f5a608d1db9a3538d7d3239da5febcbff4ccab
-DIST pastedeploy-1.5.2-r1.tar.gz 29528 BLAKE2B 0c36f24e51eb66b9a2176083d42726be5be8e7eb9b7d73972bcb5a2b0094beb1c88f3eea9ce94bfccaf688b6f5fdbf18e43e38694b91107a141ac0acf0576ed6 SHA512 5d9f648d4bddb4fa0b018f5e1c100d0899ff9e6a429a0a54aede69800fa13b7bb0d606ff454c516b36c3b056320bbda4581de9d57a154e71493a8bd6208fb3ce
 DIST pastedeploy-2.0.1.tar.gz 32215 BLAKE2B a398c54813fa990e3f12ba7c66615e3e84e848ce0dc57177f7f76114a544a11f89569ac85f16afb1ee392a08ad06eb6b4f0cc5aa3f328d154643c541fcafa7bd SHA512 be50c434765d5a913f9456527a72bd88e778e947b1db99ee4ea2f3325366038d941bdab6c826bd61f0c1eb1618395e6bca2081ac99b5ca50aa7120406d5f4ce3
-EBUILD pastedeploy-1.5.2-r1.ebuild 1045 BLAKE2B 56839023733f71c3500bed7f0997a80f7693433754c5a40fb1a5192498c1c6cad124ee9c09a2f58b1b9889c93efe069e970d1ee123a8066bbfb15bac7ffa2a31 SHA512 59839b0e04ab95185e2ea3cc4a7670ab0c07128b0cb4ec4f9c8bf5d388ae5b8b9b9de228bb397b2ddefe21ea87e0b1f35f710b21f9d8179b7ed0738d5ec4a5b3
-EBUILD pastedeploy-1.5.2-r2.ebuild 1062 BLAKE2B 5076d832f7aa3c165ac10c13cec1f3b9ed346b29cf0859a81d6a2ea2088e1c7c00e48ef892456e200725882a56b610ad2146d5b9c7effdf3f40976db40b5fa97 SHA512 81f0c8eb474be03178e570521cf8de0a801d3a633953a9f289d720e4a843cc40b22dc5765cc83cc012f7356358920b5ce1962976611e6032403a418dcf41bdeb
-EBUILD pastedeploy-1.5.2.ebuild 715 BLAKE2B e909b282cebdf298b5e7392261dfaf043c100c5ed201986fd10bbeba6a016f1c99d7001a3e54198526eb15224a420dea4f172273b85ea0bb9c86beeb8e610fb2 SHA512 f794b9a53d97e5a279bb1a8c6f61d8280e89659bcb33f44e950a47df14dde715edb6478edb0f98e2924722885d5e5d70dec2affbbd0e99983de1b2c0bae879d0
-EBUILD pastedeploy-2.0.1-r1.ebuild 1009 BLAKE2B c162715410b0b32518dda64fec1ee2821d934d704e95d33a211d93e8b854c73931c983fb51c09d91f37a7659ec037212c342d9f48c7284fd786df8dc16ce7d74 SHA512 26741c8b7d0946424a62378dba477c42c321d8ef2aecbe31ec6dfbff5843a76264d66ba96c9a7c2bc35338cbc224c6db0c0471432ab68903136bccf63f251c15
-EBUILD pastedeploy-2.0.1.ebuild 1005 BLAKE2B 1d457a65d7dd8b22c06f9148e0add3e3d550fcba45d84066bf7e122e577cb0c0dbac4467d8b3774db4776e21a5462b3639f8b4be223ab54408cf65b0e850a6d7 SHA512 5f41644ec0e980271f83c9b1933c4f14f7ee928f0461b3f1980e56aa9eb94cb2f09ded9ad70f338f63daa5cc75079216248bd006f6d3f16b85fd92300e79b54e
+EBUILD pastedeploy-2.0.1-r1.ebuild 1004 BLAKE2B 4f932dbc6510af32c43dd2779f7e262fbff8af850aef6828fcc91f8f5fe169a27e00e00c5feb2faa4a2b6d9c443a3e6d9fca7dff6669751fe9d31990aeeb4a4c SHA512 23af06109ce4ebef08d00ad5fabd77af4b203296d27d34b26bef9b304211dc775f8161c926be3bd981ea25f56ebd773b4eb333138effa862d7e6418a37ed8d11
+EBUILD pastedeploy-2.0.1.ebuild 1003 BLAKE2B fe0798d2471f2415e1c85136e67aeb20335aebbe4d4dbd8137bb237a26f7a95e57600773cb6286908d113bb15e38093151c616221d697a24a10ea3b1d7cc733a SHA512 008b1b9d597442d869c99f34019f7712376618f7da47b3e04950d096c90456152aff9ff0d1c1c449df3cd4cb15d781bd570529d017058e3c3568f5b6cdbd6f3f
 MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d
diff --git a/dev-python/pastedeploy/files/pastedeploy-1.5.2-py3-tests.patch b/dev-python/pastedeploy/files/pastedeploy-1.5.2-py3-tests.patch
deleted file mode 100644
index 0839406813b6..000000000000
--- a/dev-python/pastedeploy/files/pastedeploy-1.5.2-py3-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User aodag <aodagx@gmail.com>
-# Date 1457425517 -32400
-# Node ID 6aeb907ef222ed071b149f8b07b14f0a61e45dbe
-# Parent  0c2ea2f675bc77f2ee2a889c0e83d61d026fbc7b
-use explicit bytes literal
-
-diff --git a/tests/test_config_middleware.py b/tests/test_config_middleware.py
---- a/tests/test_config_middleware.py
-+++ b/tests/test_config_middleware.py
-@@ -10,7 +10,7 @@
- 
- def app_with_exception(environ, start_response):
-     def cont():
--        yield "something"
-+        yield b"something"
-         raise Bug
-     start_response('200 OK', [('Content-type', 'text/html')])
-     return cont()
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
deleted file mode 100644
index 84034e878269..000000000000
--- a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN="PasteDeploy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy/"
-# pypi tarball does not include tests
-SRC_URI="https://bitbucket.org/ianb/pastedeploy/get/${PV}.tar.gz -> ${P}-r1.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${P}-r1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py3-tests.patch
-)
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.txt
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2-r2.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2-r2.ebuild
deleted file mode 100644
index baa0567056e1..000000000000
--- a/dev-python/pastedeploy/pastedeploy-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN="PasteDeploy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy/"
-# pypi tarball does not include tests
-SRC_URI="https://bitbucket.org/ianb/pastedeploy/get/${PV}.tar.gz -> ${P}-r1.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${P}-r1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py3-tests.patch
-)
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.txt
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
deleted file mode 100644
index 0e58ed37ac4e..000000000000
--- a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-MY_PN="PasteDeploy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.txt
-}
diff --git a/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild b/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
index 016dda41de95..d16669ada327 100644
--- a/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
index 7e8f1ac0fddc..4b495dbfbe60 100644
--- a/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pastescript/Manifest b/dev-python/pastescript/Manifest
index f2910e0f2b40..38b2e759efaf 100644
--- a/dev-python/pastescript/Manifest
+++ b/dev-python/pastescript/Manifest
@@ -1,3 +1,3 @@
 DIST PasteScript-2.0.2.tar.gz 117521 BLAKE2B 2de72050ee7f5b7037b99f9661b5445e523607afc84a8846f0e5d9e89196e302627f552825ce0e4f821b7ed9ed2713c87d7b504a4e2abf092f1e8fa014c40c4b SHA512 2f093eb982972fed354219c75c2e008931cea553960cea8aaafbe57cde8556de5626e7eb9bb3b9b7328bad3b7d9899f11fc9773a65380396dae506e7531516de
-EBUILD pastescript-2.0.2-r1.ebuild 1282 BLAKE2B 205e5664316644b9b64978c08368d4c07a433ced01b8f3c1ce1b496f6a77e276e39b7c8b2f07f7d96063f24c8358e3ce8d798c70df4fbc192b3f794fd2883052 SHA512 a489ceb8a482226dc3a2c5efe91757c1e394dbe30576fd3e268c3d91ea28de4e14f251c73f50f8241deac54643f71808707b631b2eef9d646e480a590ada3117
+EBUILD pastescript-2.0.2-r1.ebuild 1278 BLAKE2B 083d617140c882e2d87c4fab4285c2d21fe636daa827f072415ed1f0820c457fad6e2c57584b9ada70b674e44377dafb7108a80b5b08623fbc5aa11488938249 SHA512 0d90f1d3117dc262116114eec3a40cb3c28c98a0dcd04de1a9c04e0e74a00a51e6cfdee62f49a0f2445924c8cdc58561227e74489ca3821cd8706c045654faea
 MISC metadata.xml 324 BLAKE2B ef67daa0f9e2595c0b35ed1b919c98129443d224c81a7ea6bd0ef919845339dd9cd45ea96ff4a4aa0176b24c61a57bc2cf8ee2f0c2d10386dbae1c904d5426ab SHA512 48a93ec635e32513438b44cb67bd7302c6bc55c72281d253ee4cd4b0a7d4c25ec61b028d861fa1acd2b40f22479fc0a1f726d3334c8a2970ad2b45729279ec47
diff --git a/dev-python/pastescript/pastescript-2.0.2-r1.ebuild b/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
index f000e3178c5a..0984831efdba 100644
--- a/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
+++ b/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/patch/Manifest b/dev-python/patch/Manifest
index 443fee950f8c..7a08f8fc6f4d 100644
--- a/dev-python/patch/Manifest
+++ b/dev-python/patch/Manifest
@@ -1,3 +1,3 @@
 DIST patch-1.16.zip 12809 BLAKE2B 43e751edd4a51a530968b6b7accf64e35f2886c55b9f0b7206d8f568b51937fcfb266a7b41df22bb9f05b4d2549782f6f5a64037dc8b3c4a075cd521b7ac3eca SHA512 563be07f0376e6ddcf7fa500006d57def4faa2d9fdbd5232afac625d17d9621787de60dc67f0895e1f54f1d5cf0920594ade0985f1dfb7796f131acc92cd7f0b
-EBUILD patch-1.16.ebuild 489 BLAKE2B 92f6ff0839e0abab9de370ae24881e18ac0bc8582f087a620926d9012d83704d07906c3f622c4583c9e9154d8487ec07955ecd973d2c6d07e59b780fdb3f5585 SHA512 33f3b0e879834fa756dc522ecedc819085d8c25d410fa1ba203ed5288c8255a1c9754adcc550b7d0021240cd3b704b19ff4be0e1b4aa1cd856dbdc1afc32515b
+EBUILD patch-1.16.ebuild 485 BLAKE2B c51c8e8dc5a8968b9e7850ff8c5858806accb894cafe9f66f332752c3794df8731ef4f92e472fb67255eeb6214438e6143598e0b49ceb40e69f93710811e99aa SHA512 00d4194f83a06a157301d55b4f249aeecc03cc1782ce077355dc7cbe0136ab97973b3a76ca678d73fd5b2412498cbcf791eb2c2dd8baffcea59447ab8b965717
 MISC metadata.xml 382 BLAKE2B 1a7923939c7b122ec6c8ea4836c33f24cb7141e9e6d08d9ace99b917057b414e3d43e14b47a0ffee828c853a1442e498db5a81e636a979ceec3d6717c8bfc1c5 SHA512 997aea675440c86e710e01e3202e4e7d228860166ed568a5289f379461f3c4c9f088e1b31988ca052376acf3442a66908564692eb958455dd1c12ed59920acdc
diff --git a/dev-python/patch/patch-1.16.ebuild b/dev-python/patch/patch-1.16.ebuild
index 1512d6e69f2b..738cc211f027 100644
--- a/dev-python/patch/patch-1.16.ebuild
+++ b/dev-python/patch/patch-1.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/path-and-address/Manifest b/dev-python/path-and-address/Manifest
index db7f34dbd2f9..3bfdaa34cde3 100644
--- a/dev-python/path-and-address/Manifest
+++ b/dev-python/path-and-address/Manifest
@@ -1,3 +1,3 @@
 DIST path-and-address-1.1.0.zip 7652 BLAKE2B fcf80494a2969d4b59a96ca6cd6f9dbc03a56b11e4374e64ea59fba18859b50eb8621d506b28472713bce8aaec6e8d9f26ba763b82b726df439967aa3c8a75be SHA512 eb60fabce6a71401b4681bcc1db5253c2043c33bd25f9bc8bf678d45aa459e2398ed482166fa0f85a0365ba8762a46e75c6c497ea25b6c1ba5c91d6a37618062
-EBUILD path-and-address-1.1.0.ebuild 452 BLAKE2B 90ef49cf4b13adc6b36f4483bc5f09647250c39b51583f8dd41fa0552a8a28944701922cdfa7659e31a880e9f586a7778c70320313e7ed85a03ad03ad88a7577 SHA512 53e1b9e7eee980e6b9f1ecda041a2f5f3dd8b1fec24d98308c895b37cc4cd93552019a105875002b22e6831c15af3a1e47655d016b02d58f45b36ce6daa5105e
+EBUILD path-and-address-1.1.0.ebuild 445 BLAKE2B b6a40f9f05061af6a22f506d4c3fb8fc7e5fba3e0a3662a7cdcfffd1f858a43d78a0611a503193945941fa38f2abb77826312088ccc9604594e4fee6e7ccaafc SHA512 00b59180a18da708fa25c4cb0b01b677309ba3a04d91a890b818e36779574293a8c4d939a151d77dfc916425b4c5238f1d602238c9373ef6ae532b3154144462
 MISC metadata.xml 372 BLAKE2B 9f9a9049c7217b83000616bcfaea1057a2395b6599ab5c0ea6a0da8fc9eb817d16995c29c51c901bc329b5b649a091c5422b2d4ee412f314f9692e4e884aa149 SHA512 4d300dd69614b1ecb51799e501301294daae24819f7c7fbdeeae73cc9bd9fca49cf96a12441828ec67f7c80ce6f7b0bd8cbc0e32a178673b2053e93afa8cfeb4
diff --git a/dev-python/path-and-address/path-and-address-1.1.0.ebuild b/dev-python/path-and-address/path-and-address-1.1.0.ebuild
index 8ea2ba06e21c..e9ec9c8f1fbd 100644
--- a/dev-python/path-and-address/path-and-address-1.1.0.ebuild
+++ b/dev-python/path-and-address/path-and-address-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy{,3} python3_{5,6} )
+PYTHON_COMPAT=( python2_7 pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 2c33333ade27..c9867fd663b3 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -5,9 +5,9 @@ DIST path.py-11.0.1.tar.gz 38348 BLAKE2B 80bfc308c72f0e2867ce1811709e3d2ff63888b
 DIST path.py-11.5.2.tar.gz 43542 BLAKE2B 6b376eebf5b9197c4a2e23ee25c8261c7a8b9428007a626bc0f7d1be71496f4abf7fc6f11cee628432304e6a684bd690d6895f325981c4dd0092bdf3c4a4a4e3 SHA512 8a76ffd7d369adb4c5cbc25f2a52c5cabe899bf59d248d217fc5a086e45438d9dfe6b65b63aa2c89edd7662a793d213662cd6726d15f5ce49dc6bdaf22425865
 DIST path.py-12.0.2.tar.gz 44859 BLAKE2B c82bfd248e0e6eb21e3416c86f7a3a5fbfc5f5b327fe20da4084c53f22834013fc224bfbcf455690f53002c8f1c3e060aa0f04f3792e749dad62e51702cea348 SHA512 97971fa1e6bcdd4acf057ab4fe6cde2edb9d9d3d06dc049ea3779cae867221ae3e9d905daa1ec706f867473f738bb328b2795d3030244f8bd8ff7e8f0d5a6b2c
 DIST path.py-8.1.2.tar.gz 33437 BLAKE2B 0033b64e9d0f4c719414e5345989308a113c9e23f99fb46722ee7d7de85c7bb4b471f5416d646d943771cdd369ac2d8f23f925660d4212b18acf7b82daaa76c0 SHA512 639b6247d99bd7c88e7505f5f41a5896266f23c0517b470ea5c1ec90ca76e87f1971babee623bbd7bea57bbef5f7677a7163bc51bae78c3c54e978eaf7f122d1
-EBUILD path-py-10.3.1.ebuild 888 BLAKE2B 9d99bf64f47192f1e43aab0abfd5b76977889e7aee661074067d060e165d4649218bd350f48589e547167587d1697929e2765d8d13eedd1207449487b28e6ec3 SHA512 9ffcd001f6797ab99dde65c773d60dc5b5a10c19842aed98dbcde5faf8b9ec17ed94c7b0a05aa00c933aedaf37956c106262f38d60022a9f22e5c0dcae99b1fc
-EBUILD path-py-11.0.1.ebuild 1126 BLAKE2B 45d68003dc8eb460ae4de27a65878ca6aa861574fd478e984ed48f25cc4d4f676070510e9bd1627fdbeea15784c794df8c9f2328065cfadd1326a37b6c89172d SHA512 1ead72802909fdaa7f184c0dc9b53eacbeed1c1f1dcffe9ba6408ac337d3d5443867e3525d5b5896e921219b90225612f7808989c15e04b46587c47d8978f600
-EBUILD path-py-11.5.2.ebuild 1377 BLAKE2B 8b23d20acec52d8511d94ee34307a9d8a0b1676545c05c6488229a12fcddf8e3b0aaf81d13ab6c3ea5ebde06c8cc1af19e459a3b6410309d14fd0950db038e6c SHA512 1cc504ab537e0994c0b991b1eb3c2d8940688a2fab3632329edcf963d5bf78c3d9ad9bb9f4c348407fde32ae356e35013514357d456a376c783410dd76aec000
-EBUILD path-py-12.0.2.ebuild 1365 BLAKE2B d5dda755281802d39f5bb7bfde94e246b18033ca2c6de605871ac597d273c018890504bd894b453fab27768afbf6e84d0c712ddad1fd789efdbda81407039b24 SHA512 b7aef46770250853f9bd5708cceb1a4cb445f1963b04732be660171551534f2ae18c7f6fa532d6b3676b831d5ac38168d607e436e8459eaceda02e1372137a5a
-EBUILD path-py-8.1.2.ebuild 970 BLAKE2B 867a823f4517255df63bfbc739caf38eb344678ac2906bb8ecba0e2133b595442c7a3a3705c8dfda81966dcff8d4074e902fe4728dcef3ad94083bdc763d092a SHA512 b873924299b6191cebbe30c5043fa04dbe97c0d584c184f8d67a1dfefcb74d622fc9849457104422add736b45c78f27a7fa7979f4ebd0c7dfc01fbb39ecb455a
+EBUILD path-py-10.3.1.ebuild 881 BLAKE2B 7d56c4e9f4c64d5945c0091d400fbf74765e04333138c605bdf0c97bf8d41042bb3f3a9aa17678e3a0dad9c765c800cb2efd29aa35d5c4f21a9fc9b5fda7ec6c SHA512 fbeb016faa9164c2c23755b0bc5df25ca7b2fd66fd5d6f0c646ea4c8d966a32616011c8fb290899466ec4a1bbc65704a09ed0cfcfa655d1114ce2db17e5b2239
+EBUILD path-py-11.0.1.ebuild 1121 BLAKE2B 218a2b078a47e217dfff252d47566c4d4a18a0d061a70c9ba4a9791f80d45ba73f6d265045a688e3213df4f31307cb67439c280757d33278e52645977180c311 SHA512 29f66fff1b3c2d05600e5b21c1344262231268097efe78c647d840289a436ce22de651ca5dbc2d0330b0fe2467890bb50013970194684f6eeea755b3c9a05090
+EBUILD path-py-11.5.2.ebuild 1372 BLAKE2B c4438a150fbb485c0e72cd3dcd409c9ba5a8f50723cb5551cdd6bfdfed3e9178d0ef19de66697d40bf920ab5507bfdff1edd587cdd3bae9e5b65fe074a537da5 SHA512 67e72279b86bfcdc67d5559312d98a700614ce23bd75d1b67e83d46e603704529c6d591aa011ea6f2366e8375632779b3d319b8c62c383fb9451555a0d097bd4
+EBUILD path-py-12.0.2.ebuild 1355 BLAKE2B c3b0b00f41fc829dbe761b1a8afd373e8657d6b8c60d24db01ce2670a2d3a57bcca128a2fe314474b3f8cf9f22eaba83074c021d7822cbba09766b0c2b3ee083 SHA512 1ffa7a691c251510ae768aa8d95da3a4cbd4a173982427e45e37d6ca515f069546df503b594dadf4df5dff89f0aa43fae5263c84745b508d0201da16c5ed03c0
+EBUILD path-py-8.1.2.ebuild 963 BLAKE2B 396401fc090eab6489be1d58aa379a9fcebbb230a53ae252e27d9c8bf3f0513a19dfec45197493dea87709ba0ff9bb55072d4899bfcf166b4f1800200fe5cc74 SHA512 d5289abe7dc986859c5e5e1847774362d028465d376b30b86c420e33fbe7aa79cbd61584954403c75ff0e50f214455c5608e1e9597409e21e65798b0261834cc
 MISC metadata.xml 376 BLAKE2B a0c037397a1f2315bfbe646c139a2c565b028d0d440e4b830550a6a32fcd78415d4e9c3d4cbc0f80e5b3914dc85b1268cf101b55c7eb1eeecee004322d402340 SHA512 6273623109e7f816ecf729a7dd65ae21b0f69049343ad49b6d439312512324aa94f2d5764e2248690718a57a24a50babcf2f29813c4d45f58eef44c9f14cb9bd
diff --git a/dev-python/path-py/path-py-10.3.1.ebuild b/dev-python/path-py/path-py-10.3.1.ebuild
index 789bd00cc84f..865c0e1ed6f7 100644
--- a/dev-python/path-py/path-py-10.3.1.ebuild
+++ b/dev-python/path-py/path-py-10.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/path-py/path-py-11.0.1.ebuild b/dev-python/path-py/path-py-11.0.1.ebuild
index 1836476559cf..f3a336bbbaa3 100644
--- a/dev-python/path-py/path-py-11.0.1.ebuild
+++ b/dev-python/path-py/path-py-11.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/path-py/path-py-11.5.2.ebuild b/dev-python/path-py/path-py-11.5.2.ebuild
index 2f33ff1c53da..4f3427b3ce8b 100644
--- a/dev-python/path-py/path-py-11.5.2.ebuild
+++ b/dev-python/path-py/path-py-11.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/path-py/path-py-12.0.2.ebuild b/dev-python/path-py/path-py-12.0.2.ebuild
index 5a4e0998bfa0..7a5ea1d4249c 100644
--- a/dev-python/path-py/path-py-12.0.2.ebuild
+++ b/dev-python/path-py/path-py-12.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{5,6,7} pypy3)
diff --git a/dev-python/path-py/path-py-8.1.2.ebuild b/dev-python/path-py/path-py-8.1.2.ebuild
index 93895443079d..b7d70a898eb3 100644
--- a/dev-python/path-py/path-py-8.1.2.ebuild
+++ b/dev-python/path-py/path-py-8.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
index efaf0a1bb144..fbd341765a84 100644
--- a/dev-python/pathlib/Manifest
+++ b/dev-python/pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib-1.0.1.tar.gz 49298 BLAKE2B 918b363ebd4101fce50927dd83200cf94b44d820e9f422489be8b06cb5dfe732aa9373b936606a07efbfe0c624b685d1c9efe8851ba74aa60df9f45c08cd33be SHA512 d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b
-EBUILD pathlib-1.0.1-r1.ebuild 516 BLAKE2B efd6988a50b19c9e5940011100c87d06472ce7455b393e2a32e544be96e1febf6dfacd4ab98e222cd32d12744f225d96f75d4612b911e601c780b6d59b725d67 SHA512 2df5f9b5d34a34bb63c53a2ea4d6ca6606a6885240cd35f0bc7c0911b37aa3af8142fc9aa09af1a1719d744eb4c2b4c668227b3a0f8bcec84a09237554bd1877
+EBUILD pathlib-1.0.1-r1.ebuild 517 BLAKE2B 723a2988008de98f2c0fdb0df92396fba2197b8da4ba59eaee849fadac930c99df0f0fa88d1bbc969c54b88c9060f59c298ca2078bec38e9fa9ed06adc72025a SHA512 b1b0959fd0fd214b97e3072e2d54b0e4f6a7c959f68fce8d50c4ff31eaca0fba1adb24bf5c151ebb722536dcc2f8fd150bb71ca377c740b7bc96d4363e195a92
 MISC metadata.xml 310 BLAKE2B dfac529133f0a3fe4c0fc865d7f7cc9d70a7b37dd2d8fcd4f1c87a44ec6f9ade254454e01cfd4dbd57a04f9643f079bdbc358d84cfcb0c09cb416d3ecad2db99 SHA512 462b029410c6c013f274599ee749a79541f9a40a1819b168963421d0b8bfbeedae5590a460c7295f0e9a249fa9298e7526b0cace165a29f82383d8943bd9842f
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
index 0bc487a94f03..25b111e7ae80 100644
--- a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 # In Python 3.4, pathlib is now part of the standard library.
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ia64 ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 197ed75533f8..2c3e14e50691 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,7 +1,7 @@
 DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c1ffb6718e2b13eb007ea3e0ab0eebe946a1bcc2683fed7db46867f415ad2b52abedcdc87fb67bd45d5998aea5 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124
 DIST pathlib2-2.3.2.tar.gz 33764 BLAKE2B c652069d60f489e482c6d75c0a201c5ac67c6b18b4acd6c8b00f7f12832f7165a45293d93ca7f6c45f1451c842e59931b6b8c45608de1bac91ad822cc3536105 SHA512 46ba0cc8b26006bc4cb914118b7c453dc49cc8a80147ea7a4b3d5a17e97d5538c5d73a3029bd7e5b59f42f256baba30ea273382e57468df1a459ac6f7c237ddc
 DIST pathlib2-2.3.5.tar.gz 34393 BLAKE2B 7e03214a53f1ebf7718d04f653e24ffa4b06070b0ae21583d98ea0ce956c5aced5ea63bf6062d8e8d979bef4c82137cd2d2d5d6121dc3dda0ae1f713c1868d36 SHA512 3f0f212bf5208d0965ac02a590bef6ac0ec5e3b702828c06c3c9d37119b3db422cc7873de614fdc37ebfb3f52239a6517008d9672a176ca15d03fe13baeeddc8
-EBUILD pathlib2-2.3.0.ebuild 1043 BLAKE2B 859fe1c299d00855a6dfd277bcafd40bfd5ba7bb25b643c6c9dfaff7a6d23157cd49f5a2b68c5f2eb42f234b2849da8e1945f9bd6b75e0efffb2a6b024e08f9d SHA512 258a9cf95c8ab7cb9a295fd1ed1e8d0c167057e20f5b577d7476c17c39014190a57410c50e37475c6e71a60be8b900ed69ef3c03ca6c3eee4089994c928f18f0
-EBUILD pathlib2-2.3.2.ebuild 915 BLAKE2B 277b60b8dc776500310eea5a4f9d7ec754758ff2919d25660183f02bfd5a02ec6737401ce37f9cff8b52735405167f6524adc7d590abd69a4f97e867e1cdaea8 SHA512 db9d44515cc54dde9cfbcfd2d9d3764e97b13d612b50b69de5a085ec637292a143bf0ffc631c568b818ae4bb1010e9d315cf6eff0665e4eb9ac5994cd222f831
-EBUILD pathlib2-2.3.5.ebuild 928 BLAKE2B 373db9d63ae4f099378bb3c9f76dd09394bf7f1d9fea1fd9debcecb87f238f8c8c19cfed1a672552fbb2c1bc2348458b9acf2a2a9e95e7bf8638df4504d47b30 SHA512 ccffc7822467d6af16a0c0b5e63109252f234e563d34bdb6bcaefa9e1ec75390947f58430bbd57036e28c1c07e08a5a1a55fd5464a956a6ff022408582ddd980
+EBUILD pathlib2-2.3.0.ebuild 1034 BLAKE2B 6cd6123c2fc02c9229c86c112782c5bf8bf98de2614b6fe5be1f66281df6c2124ffb15847cd64c913d22f6737f552507fe7b38597c89df6cc205e2d1ac66a680 SHA512 e596ee68ac9f65800f80aeab2d85fb76b15753c3c62957fbc9f3eb9399f80d22bc0c1939fb7003683e178407caa37ade7a9ca4e11838cda3acfb49f16c93daf9
+EBUILD pathlib2-2.3.2.ebuild 910 BLAKE2B 14b0f82f1eb219144f9643986e5d8a5d4975b484c04393cfaf38e3dd74f45fde3248e39687d2785a5d91b20d39a84341c8c111900aa7780addb414d0d8e107fa SHA512 d6838c2d32e6021b9c2f61bf7c871c9cf599281cdc47b402d6343a6d2179dceb5aecdd9847ae8fcb858f1fb1b8140bbc5e09527314d97f5b2564489cb056f656
+EBUILD pathlib2-2.3.5.ebuild 923 BLAKE2B c2853f84616ee6060ef2c13e40df5aaaead95c49eb5631b469768b3bf43fde551f16155f53b36bfbbfbd9e15f353956067a4f176c3f86ebc3ff83fa5b9bc0a2c SHA512 903f48ac36984b05c94365bc1d82236abcab3c962100f8f6fa99d80f4235884056697470baac827f6ab8bf9336ad0171da968bbf4abdd277c4f1b0d7ef5a485a
 MISC metadata.xml 439 BLAKE2B a6ff80028323e5e3a48832388ab9d88a6633815784b079543d2fae49a43a5c6aa25ac15453f4d564e570558fb62ce387cd5b3450d552c009e153002e5b43398b SHA512 e1912b7e9c099ac259aed03a38b7bdf27bc817e188901d79b89500bf1d2ddca1881ff55f06310758f6cf6d0fe581cf5ac28f14f64972060fa1d620699cfcbaca
diff --git a/dev-python/pathlib2/pathlib2-2.3.0.ebuild b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
index ef3be1691a51..d1a68f31c41d 100644
--- a/dev-python/pathlib2/pathlib2-2.3.0.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pathlib2/pathlib2-2.3.2.ebuild b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
index f34d217e4ec2..a2a19b6c6537 100644
--- a/dev-python/pathlib2/pathlib2-2.3.2.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pathlib2/pathlib2-2.3.5.ebuild b/dev-python/pathlib2/pathlib2-2.3.5.ebuild
index f91dd378eabd..848e46f033d4 100644
--- a/dev-python/pathlib2/pathlib2-2.3.5.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 24bb9073bab6..5b9bd27796a6 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,3 +1,3 @@
 DIST pathspec-0.6.0.tar.gz 24159 BLAKE2B ac3f75d7f4b3f6d092d216176823f061fe91f3bead10947b01315267655133a0f99a29288283cbeeff7c2c9305c499b4ade1efcdccc554d756ecaaae2f84896c SHA512 e08baa05a3fe58ec6ecd651577834115cdeef26b75eef274d843c3c6444cf771e86f99a2a2b2980a6d1ece946997f1ebe714f79ddd5c296071c2e18b73955a84
-EBUILD pathspec-0.6.0.ebuild 597 BLAKE2B db2501b28b4e01a7905ca57f39c3f0c47f1f678d7fa11c02ecfa9f589bea02bcfec68937fe2a4aa4666574a76168f18bd27966db2f582c7253e9737f6cc8ad16 SHA512 e4825c66121994347fa18380c394b3999af2b7909bc82aff752ba369adcf4c3fa827cce53e22e64a3003887a3353bac6a5424085a32eb8f50b683c7376d85362
+EBUILD pathspec-0.6.0.ebuild 592 BLAKE2B cc4885d49570cd86bbe17990bb259789c6a92c82e23749a2e1727b9142424fa8e894acafc5bfe62894cb383cecf5ecaa2fbd698b4db0df9f3fadb7b974baa679 SHA512 ba397d75c69c47c117960ad32b404fca6a61213ffed0f97efa2c9db1b3a66280fc9b054e0d9023b6140446f0e81b8496e71fc1617512f06e410f218989b7bce2
 MISC metadata.xml 396 BLAKE2B e76022dc2c60ab84694cf449d56709db941649742c430370395c8389ab302c64eb5074db3d16c48195e9e36ff40d1f873919582cead9c39ee584667fbcff1b3f SHA512 db15dc438facff639ab3c1b32cebaced718c3a0eb7edcee5477e0688589d56f48d55347a9679b043d551acd9638b601738c947c2072043d0aaaea34a3f4d2eed
diff --git a/dev-python/pathspec/pathspec-0.6.0.ebuild b/dev-python/pathspec/pathspec-0.6.0.ebuild
index afd3a3aff8b1..fdea12e2fe41 100644
--- a/dev-python/pathspec/pathspec-0.6.0.ebuild
+++ b/dev-python/pathspec/pathspec-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
index 5f7e90c94c8d..71b7eee2d2e7 100644
--- a/dev-python/pathtools/Manifest
+++ b/dev-python/pathtools/Manifest
@@ -1,3 +1,4 @@
 DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
-EBUILD pathtools-0.1.2-r2.ebuild 468 BLAKE2B d88dc6de0870989d92ee5e206acaeadd7712be83c19395733c2709d1e1aad864477ef75ef3277c5a2f0efbae14e464d031a0beca11c42c2fa57f6dee8ab0b956 SHA512 85fd10027beab21dbfb962ec59af6616a046aa9e347a6d432767fa78c8de033404f17fa1bdf2d7a0bfb91e771ab8a3ecb25b5c6651aed7a0ac0ad281e1a1c9a4
+EBUILD pathtools-0.1.2-r2.ebuild 459 BLAKE2B f912b13bbf4ede40cdaf485fc4cdcaf7e953825fc5030a3547a83d5bbd67c87efee3552b1335b092b34769c01a8c703fa2c265dc6acbd9472f3a8a2c2ae1a84b SHA512 2b9bf2a2aa08a49c37f8edf50b09d38d43b575b6b652a966bb0c7f606e041dbacf6601cd4cf089f80d0fe4040385f519c1169f687207bb626ed257d56dec02b5
+EBUILD pathtools-0.1.2-r3.ebuild 410 BLAKE2B a164dc3b373fbe8d796b7f1564f5253f02c54e6231696789b9c8052e807262e20fdf0ce5b30759dbf2d146f10251f4b5bae3b080358afc3093a2105bb91eea96 SHA512 1ddc768766a03961b3aa324964f0235e04197beb22bafeeff1818855c5c3c0c4f9c9b0238313dbc540119ee4b0a502b83bb0a4b5136a5c481b9fe946fefccb67
 MISC metadata.xml 312 BLAKE2B 655db0f4e05f6f22057f5b40c38a0790aa4878190ba1f2eddd703c2a13a1d8010282517cc827bdf2f48597024c9069ddff7be23a4f914899d5c432115d150c57 SHA512 f1187bfa80d1a0e64b04e3d474d8d805fa73f7c23ad412fdde4a51f347268c764d1f808d9c9b1f191c661e777dcfe6aaf0966bf13ce7ea9e8c02f6a8e5249851
diff --git a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
index d7c7d2612789..898a06919cac 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy)
+PYTHON_COMPAT=( python{2_7,3_6})
 inherit distutils-r1
 
 DESCRIPTION="Pattern matching and various utilities for file systems paths"
diff --git a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
new file mode 100644
index 000000000000..33ed06945c63
--- /dev/null
+++ b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
@@ -0,0 +1,16 @@
+# 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 distutils-r1
+
+DESCRIPTION="Pattern matching and various utilities for file systems paths"
+HOMEPAGE="https://pypi.org/project/pathtools/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index 82451b0e128a..5237ed4a9a7d 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,5 +1,5 @@
 DIST patsy-0.4.1.zip 425390 BLAKE2B b8d5696abcf35fcd5e49a7d3efdfb201976efdbe7e845f136dd0cdbfb0972d8372e54b8f4141139cff9ad4df3525c67a10a3c71bc1471991a810e834e0dd0ad9 SHA512 24cf2e6f9a33e6dd795a839eb2b2ac9e0d45cd9c3d5250de17722914ac29436d0518388d0696b75d73236eda3c7819dc4fa24d6d9bc37d5ae035dde2af4510c3
 DIST patsy-0.5.1.tar.gz 397623 BLAKE2B b8861e8c8e223db5df616c378d5b1ce475a1b337d049723c1a4b01432d9e1569c4b6537dc467fbc1ba83dfc7cd999ad188008e387c446f2133f872393c9eb960 SHA512 aeb56411e68713ec75c0b5344890939f721c460d3c7643b9fd57d7c928421d21408b0f2963348edf27a025842989dbae6fd5cfccd3f9d9497d60a1dffe8d7bdc
-EBUILD patsy-0.4.1.ebuild 1130 BLAKE2B c33556d6b5024f530ac69d80197a9dd4013d7807b65d690c85d21aace644917b877ebc3ff8b94a825903772d3c3b30f8ac7ea8eb57ad34d0d90ee6e07072f586 SHA512 2d7e0ee6a784e74242cb85a6a98445819f13c4d59a553c5c9161d8e1aeae155518cd4eb8f3d4ee2b4fd59e6ceaf49ca020b034fbab981dfb69c8aa14f3c9e261
-EBUILD patsy-0.5.1.ebuild 1218 BLAKE2B 6cdea7f36a03348ba3fcad6a19d97c638d7c6b813bfd22c1377b50c17b5c86df884b5697605285185b576c2e6ec6d4b68df9ac97fdb8b68fffa662f7ff60b98b SHA512 231b912d2dda6718849fcbefda44723fb7f9990c14fa3a7d432fdacef7b0cc81fba19c541057f76e22f5490418016e9d0ecb77fd574e02695a2e61a8ddb3e9a0
+EBUILD patsy-0.4.1.ebuild 1126 BLAKE2B 91799b6b3544b8eeb4c48020668920eb5a17a6eddfbfb2f915e6680a6a87f33ffc2602dadf2e28d7b677583e2f9ffbb894854665be597c6b3858b2c88a7aa387 SHA512 13ad9f830944336a19452e3f889992e11c02c0273646c368206d0cc17b1e9a1cdc1913140ce5f1a93726c77b87b358a62030e113fdb946516c3a0bb0fa9d2087
+EBUILD patsy-0.5.1.ebuild 1216 BLAKE2B a7702c268deedba58b780fa3f17ce138ff7629b1dfe665c06aa789707252271922c376926f79aabbcb0f83ebe00311e7ec7bda70dd71eb2911a5a4225d817ca2 SHA512 e6e3a09e82938bf7a2cc9c98f333e436084b7de9152bed133cb70beb0317acba1a31d03b9fc184ebb735c23d1df1e3c9c58e4388ae8ccf97d767baaeab6aaa0f
 MISC metadata.xml 568 BLAKE2B 198b70af00599da8c516753e5ec88fb4353a966a279e4e40db5b57a7bab57f0ec360ac70ebe4dc14b194b147520b0a8d6d35d2e73003c9c70bbbcc3c830b91aa SHA512 57957dc18e93d9bc8d53d72bf8c9e601856ffb1511943034ff30aa7d93761f8b986e67daadf8dbcd57ef7714ebf3dda13ccd345df294809954c942cb9bdd1310
diff --git a/dev-python/patsy/patsy-0.4.1.ebuild b/dev-python/patsy/patsy-0.4.1.ebuild
index 9b8e2db1ca3d..ddc0a1cc41de 100644
--- a/dev-python/patsy/patsy-0.4.1.ebuild
+++ b/dev-python/patsy/patsy-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/patsy/patsy-0.5.1.ebuild b/dev-python/patsy/patsy-0.5.1.ebuild
index 48aa2c256639..7d2a0db0b346 100644
--- a/dev-python/patsy/patsy-0.5.1.ebuild
+++ b/dev-python/patsy/patsy-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paver/Manifest b/dev-python/paver/Manifest
index 17f5270d5d44..fef6c76e5199 100644
--- a/dev-python/paver/Manifest
+++ b/dev-python/paver/Manifest
@@ -1,6 +1,6 @@
 DIST Paver-1.2.4.tar.gz 328794 BLAKE2B f81db3fa8fae72b9719b51d0643ba9495734bc351a6b3d5e86ba6f4afd778cf70157c427cc8e7741828c97197d8961c10f49dcd92b6fb22c810c73a2d26a2668 SHA512 ba737f2da0582d4c3364b654a79d9868bb394fcbf1102feea3604821a65075631fbdb7b767ba8977f3231bcb6cf167abd994fb1dd9fd080046ea8bcfde8cdeb7
 DIST Paver-1.3.4.tar.gz 446425 BLAKE2B 6ed6014e45d0d54f5323fba7a2aa713f860b6d8a7e6ed2d409f17e02b245b516196cf298602dea98022efc640cb2a94fddec060a396d02807fb872240a3bff3e SHA512 f29d6a67ebae8100f3dc7f7cea06acf5606c4c3691be49a86cd85ff69aecff4441c28e41ce5e1b79050d32946f9bb55b213e68ee966ffc0ae1e0b0bea4871aa7
-EBUILD paver-1.2.4.ebuild 1006 BLAKE2B 0fcffef535718adc0d450fc2d85aa8b0ebcbace1839cc4e49bbd532cb4d009ba20a91994b7210b2d33bc85a3ec37eb5c5b25b98cae38b1ec6764ad474a50e2fc SHA512 acbd9a7b73fda793805d85a15ff87af201bd41498a3a7c9b844a6abc02e4d28d64022b980b0334fba7a1cc92a4dc6dac95316db7558e14499ca6b92dd17e6787
-EBUILD paver-1.3.4-r1.ebuild 1062 BLAKE2B f14dfb5f89451d3e69ce012c16db56020d3c59f374d8b86dae2d28b7cc9020d576f67c95f0169d31db6df6d8d1068b843119469d03640b2ef670ecb71a87fbb2 SHA512 7833dad438f8d950d1cdbdfeda8bdb328afb0d4ec7e2b469f6b132a06f74d7418afd55877e00091346623c2a7f28168d6b668b35578f89f1daa4b665b64b269f
-EBUILD paver-1.3.4.ebuild 1024 BLAKE2B c48fc6ea3c1e944502b65268e276d2db1bdf84a8457e58188714216d886b57280db8057cdbfaaf7b66b08873e04d578c791f65d9e1623587fcfe374df3711ce6 SHA512 4fe971fca31ade8d35ea9220649760637e383d6ff24047a2db053874e7d95f0af6f9249a56df984e8778925f7ff61f82d8129ca76cc761f19235e4aeadd94c8b
+EBUILD paver-1.2.4.ebuild 997 BLAKE2B 892c5308f0ec2d679980ea6f6e987c11071251fdedb678153db71b30d71e17f934fddf277021ad8edbb2f363cdc37dee77786d98b1fd72504da86bb9c9eaa4b5 SHA512 11745701d4e7979ddf1e2f0a069f607c3be7d8fce57829566c2a3a902fa63040eb7737143c051f9d0fe17bc1808078fc4f739b530c73e61b5399ac822a108942
+EBUILD paver-1.3.4-r1.ebuild 1053 BLAKE2B 29c0933739b0e4aea89e184caa0dab9408ebcb04b2c2a5a3508168ef554fdc847be2d5c6d41246c88e1f852bd8e8da29e0d59add8fb0f760cb8a25205f062318 SHA512 568503f3cd4757a4bfbe9d9c630a5611ee91b405f0de0c10386c0d38439a15c536d1083edccc0c867ab09204010f635d2797e603c2c7bcf8411f45009ba56217
+EBUILD paver-1.3.4.ebuild 1015 BLAKE2B 422dbebdbb19c5f2100b1e3fbe5f4a8d4c2e883f4b26bc0834cf42d563130e753e7bfe16f2282abc6b51b3dd1b209d85b95a7c982d1a1dbbc77d49d2dc0a99a1 SHA512 6d98bc9185aa7c90d99e4e4061aadd52a93fd31102d5bd11b70743522096b43f0bf1833db414fb76605cecc3e66ce4e8384ace162d380a79b24dc204e2946008
 MISC metadata.xml 371 BLAKE2B 9328a4c42ca5a8c8320b5b7fd4bf5050f1549d1f139bb1ecdd7e0f74964b808c0d1b6df9449af7d8f80d914bf7a211a105b886faae5d543a4e6730cdf0447f76 SHA512 94df99ebc516697a06642bd882bd306e35b4dd46b4c0031b3ddae47e44b379d77a90c0b04bf1a3aaf16e4bc35f915cad622bbf8f61f39123b68a2bd51b1b2e31
diff --git a/dev-python/paver/paver-1.2.4.ebuild b/dev-python/paver/paver-1.2.4.ebuild
index 9eb09c194ac6..4d88e447f2a5 100644
--- a/dev-python/paver/paver-1.2.4.ebuild
+++ b/dev-python/paver/paver-1.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paver/paver-1.3.4-r1.ebuild b/dev-python/paver/paver-1.3.4-r1.ebuild
index 6ac9af90abd2..78785cd845e3 100644
--- a/dev-python/paver/paver-1.3.4-r1.ebuild
+++ b/dev-python/paver/paver-1.3.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paver/paver-1.3.4.ebuild b/dev-python/paver/paver-1.3.4.ebuild
index 0ae35c29421a..fc9c4b99da24 100644
--- a/dev-python/paver/paver-1.3.4.ebuild
+++ b/dev-python/paver/paver-1.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pbkdf2/Manifest b/dev-python/pbkdf2/Manifest
index bb4ce6263b96..5e4573a77b74 100644
--- a/dev-python/pbkdf2/Manifest
+++ b/dev-python/pbkdf2/Manifest
@@ -1,4 +1,4 @@
 DIST pbkdf2-1.3.tar.gz 6360 BLAKE2B 0a449b593fb1dddd604db687dab1fcdbeae37819dc17d7a875d8f592b1a45ac16903a77de46b72d87fbc2d41217f044046c4b4cf3a10b579e4f21e151d8512d0 SHA512 1297950d045f9b56f5eb9f771fe65091802c1f12f090a8a80fb5e36bfa10f1c1ac3b9dc8088f4a640b840fb7073aadd3fdf39f3979118046ba5cde477d071244
-EBUILD pbkdf2-1.3-r1.ebuild 529 BLAKE2B 03f2d4e5c7ca4959052db57332e843810cb7268247ca9e719f7834387f7b0546ed7cf57b34f84a5c6794eddd611cab9dc259c88099da6c97ec819981f773a6b3 SHA512 3e36facc8292e3c4cf9014e1218a71d2c1046733fe280c30eaaeca78eb633a94ff0f5b832abde0e184797c4ef2622c3feb606d5606ed931cf47d491ec162c18a
-EBUILD pbkdf2-1.3.ebuild 567 BLAKE2B 995a21458cd1b4d10d795c4225b0049e05017bc725099e33f7f3af722ad5aa925c845ea17272af4f48020764c3ec005dad69c851756a1b349347bb3b915b1251 SHA512 ffbefd54d55f793396535af5ee1a2f906e8a311f2266fe2ecfc2a26d422c5b10da10378e14e0cb73fd3a7aac28dfcbcdab5a22f61ba0f688595e328f90e21e04
-MISC metadata.xml 578 BLAKE2B 2bb6c12b4c3661c35e6d109f5c44b665ff826e12aaa334707742785d3ca68aa7661e5ecc5e6dfa55cc44c088ad9de7b1f8136650a214bdc608e7fb9bbf425727 SHA512 dff57e44050eac6feeaa13be6ad1cbbdf9c0c7bb91d3ec7110b3e3861e112c4faaf2d4a279751f9b585303eaeb3d1de98b7fe2fa0a8466acf8dd89ec0e95a6a1
+EBUILD pbkdf2-1.3-r1.ebuild 520 BLAKE2B c343dcf0065cd37005ddaaee6db3d5774f3a00d722f08ed91a1f5565c6bb0db81f3c9fb71291a8400b5ebe329c3282074458ce9030e8c7560406812cea60ef91 SHA512 03cd2dba51fda1ac0fe40261500df473b8d8d8ebe49236021ccc7776dbe561c684219cb5aed87d3d539b9f8f20e55685cd0bc5f6217dc9fec2630eeeb9a5236c
+EBUILD pbkdf2-1.3.ebuild 558 BLAKE2B 347d64738c42bf6b14d0549c4d24f48662ad60fd3c31d58641c57f1a5355139f0050100942811206f8700fdc412046bbf5f61edfc2dffa8f776f796d151b4594 SHA512 ff0ac555a2293ebe7546bda38bdf89f534ad16591e5c84e1a2dd8c7781ed39841bb5cca5308705b29e248d01e67a9bc64fc6ac84cdd86d52110e3ddeb4da1729
+MISC metadata.xml 459 BLAKE2B 965991be60210f9e930734bce65864e787ce89679cd3022cc4bf8b0fae52673d38a27c6e44b4f809df88eecf7408adb248cb232399e3377974e8af91184c206f SHA512 698082fce3b94481fefb400b8328018726c7c0151f088ead749fc0e25224852cdce344947b9f084011e216918237aed988f39f6ceefe60dc86ab6e1859583136
diff --git a/dev-python/pbkdf2/metadata.xml b/dev-python/pbkdf2/metadata.xml
index ed4bb5275121..81b5d33a3e1f 100644
--- a/dev-python/pbkdf2/metadata.xml
+++ b/dev-python/pbkdf2/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="person">
     <email>luke-jr+gentoobugs@utopios.org</email>
     <name>Luke Dashjr</name>
   </maintainer>
diff --git a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
index 0a5ba8456983..52263f9a9c33 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pbkdf2/pbkdf2-1.3.ebuild b/dev-python/pbkdf2/pbkdf2-1.3.ebuild
index bc554d89dc34..64130c588c56 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 3a7ac3e3d9cf..c9f3218e94d7 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -4,11 +4,11 @@ DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
 DIST pbr-5.1.1.tar.gz 113476 BLAKE2B 9e4857f13eba2e18abffa3d7c56f05eb5a5997b855f02770a807cec110e6eb4596b333b67beba2a507bb8cb55fcd3ed87a012b4a3a245b81d0a74737c010f157 SHA512 cd6f8bdc6db80841e948dbb278423556861aa681b970050a40c920dd00e32704a29cfdd28aabd4d14e0e577fff1bc816f0646a62c9450d0d85233ab5802606f1
-EBUILD pbr-0.8.2-r1.ebuild 2128 BLAKE2B 2f79eb4c44df07d41b8465b21ebcb96bd5331b3095ee6cba6c2587f2291834b4fc1090fe74614ad09fd7d18da02368580c84160e2b69b64a8c85055d2a3f7e3f SHA512 4c6e8197c4228014dfe81b53e5da5c8128ee1d6182f0e73e5bc32f01c3e78a39cfc46c872d795b5f77455f43a138f5ac97e738277b0764c95fbc929f0da1fc6c
-EBUILD pbr-1.10.0-r1.ebuild 2624 BLAKE2B 49444efdc4e0b052aeed475f805d0e8399a963bd84d4dec6178f8f15170f55f9417dbb3c613a8aea0c2fd17d8c2859b2d45809566148d471550bdc78660ed8bb SHA512 f714b523d46d8d8d7923bcd57a139900641046a9c7e59b942cc8c8acec73b363d1fc37e73e7a675132c9201f29e9f2d3309b35a793d23c95e61aca01173e8c74
-EBUILD pbr-3.1.1.ebuild 2814 BLAKE2B 263ba0caf152cea63957971df4e2bebce0cbe22a455076a716c88b4db8eb5d8c44581be450ee0b7678523fbcaacc90a8f1c8f3472ab1deb2cd1d62920be36094 SHA512 6905dc75f32b54c7969e6ec1c307f5890caecb9cb6f4fda7f049dfeaeffd8a2606b64eb8d81beb71a7b7977b70d258e7ca377efde4ec2205c6918d3003795787
-EBUILD pbr-4.1.1.ebuild 2611 BLAKE2B d2b2fc467aec0da79a15fa41ca566c4d9d259c506411f483e70869c7d069a2f8635dd19a6bab2477714c9063d99347ab0323b9f9c6b3c57c632901479465645f SHA512 274922db5a5dda818d547c2ad1b64e65ddd806194b7a98a43ae5d3778a190b2dbea7b19a058a8d9c0fe15241e05de6732425fe39da382502d93ce8e318679075
-EBUILD pbr-4.2.0-r1.ebuild 2753 BLAKE2B ed90d38819cc7f4bc070c1561146180b97673e5cc604e44320b8a781d1d3cd70707a82cea962293bd9d4bc49546a877a9a050f8ee418bbf4b16add7ab55adc1e SHA512 592dc4927a13aeee8cb14d56c08512432f6cc4b385e4b2434ba6f99e916c91e5f922e22071210bf7c9eeb06092e9f7a5e6209e0671831f5ae3481fc0a65424eb
-EBUILD pbr-4.2.0-r2.ebuild 2796 BLAKE2B 70ea6be291328341cf58b867aac9a21900748eb44274d82547346b218eedb32f0bfaf3835abac7d6d0705890860b82c5961a98165ae8fed79c09b4afe0df27ff SHA512 da63c36c2d6a2ae75f9d1b2b7af833266d9fb8a27079f535255da4b85588d2d0d9056615c8f45c684af438e3fbe973031e0e0b11aff9ffa28f0d24e76004532a
-EBUILD pbr-5.1.1.ebuild 2946 BLAKE2B 68dac01884fa48d79c81be67d38b2bae35cd80a4e85836588e1e15112ce9294940f25f45ae4a29367fa194a8ac3539dcc7af3f84e5faefce97be87339ff10c27 SHA512 2639cb444d66b55a041058404f31d6488f21303c4da07eca6cc54e0d925965edfd8cc3d15348a1837dd4a6b165189d0d6eee67d0d0919950406b91d3340ed982
+EBUILD pbr-0.8.2-r1.ebuild 2124 BLAKE2B 0044653518d5480a17633e828270288b22d4a7481f2563c0aaa685769d62bec62f7cdc3df56ce763994e1bb4faca0b299a3d38a501c6171f2e4fc6d44a033a93 SHA512 852a06c85f5ef486cdd646ca691048fe3f64e3393fa8c8317d6626cb3073362d4f89eff4882e37eb6b178c89af6b4c0c48709cef61ef10ab52b6e481042ed406
+EBUILD pbr-1.10.0-r1.ebuild 2615 BLAKE2B e8eec60b55b4eaea498d102a15b685c2cbb6962e717e66310418e4a39e60c1d9db202c0b3ce5a06878f984d8d3d2440550895160269c50d38ad9b5a750f6c033 SHA512 61f1bdf29387e728a60e884a34f77d50fcacc1809b244a0660bd678a92ba000f9df3bb34d19cc3478c071d286dea8c651e05be48efe2ae9bb3fe8d02058798d8
+EBUILD pbr-3.1.1.ebuild 2781 BLAKE2B 52e9a9fc7f2188891bc972a9e0c2cff9b6e7fa7f3e0b66ce408be62b8adda2eef2d4e132b870632e761b25d16313b9939ffac542ee75897af8257bc8f0bdf423 SHA512 e3b1ac3e8a9388c62d9a04d4c165375f71bd3d048da0f1761dae4c154290deb14a6231427ee6c38b97749fce526643626f8ac66617ea3d2e3ba4a83ca4cbc032
+EBUILD pbr-4.1.1.ebuild 2604 BLAKE2B 18016e6be510bf45f904a8f9f063e38cc69cf654c9ffc48c4d99bffaa53724b99cd6fcb247ef34caf13f3c94d0af85733f5ff9dd6ab064c2a26e4a2fa48a4631 SHA512 a620e00173bee7069a5cf2e6a21cd34ca507a83044e1a178b13ccdbb0d78aa6ef7d9dbacd3189174ca4061308da790ceca940100a8f94bc31b33092bd329065f
+EBUILD pbr-4.2.0-r1.ebuild 2746 BLAKE2B daf15ee5f683d5631576a46d92373a744398e3faac7392da015e63b87c7c4f6a965e94d07f5efefbb19abf5d71918ef4de1c7b6b0351a10548de91a6c9113fca SHA512 33f4a96e7226c979032d46e887060e5a03a42b1d74b87af9849160020283f0bd487d938911b57908e7ee6e5ca2868c1602eca61317fa457a97e7e2ee67f74dbb
+EBUILD pbr-4.2.0-r2.ebuild 2789 BLAKE2B e47f1a64c3d138e616926204bb582d5f480517a3ee57a0784ea90ee4b573f0cb8f1a5926ce9f234fbfd2367b470a9a6c2425409ed7f07c152777c7973eeaaed0 SHA512 a7b5345c0144b1782c581253ceebc1184ad8ed88f9e357a1f81107de97d49551b6d867af4d07c32c93a94fc629f6c72c79ca7019191058feba0931b8fa5a61d7
+EBUILD pbr-5.1.1.ebuild 2969 BLAKE2B efcbf6e7a9ca71d1227ae893c546e5440dc34f149c68de1c30fc4aae1c1a99328e897f1d8814dc64eb4c203a164719305a7105ff29c700a925abcec71dab1d8f SHA512 44edb938c63b971448d066d894a8074851e466f7f4fee2a0066ecf4c17fe598e512a411f4e8d7c878a29fa86aab216b546a74b87aede9aa096fd12725581858d
 MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
diff --git a/dev-python/pbr/pbr-0.8.2-r1.ebuild b/dev-python/pbr/pbr-0.8.2-r1.ebuild
index ba6e40ff8fe2..30612108f509 100644
--- a/dev-python/pbr/pbr-0.8.2-r1.ebuild
+++ b/dev-python/pbr/pbr-0.8.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pbr/pbr-1.10.0-r1.ebuild b/dev-python/pbr/pbr-1.10.0-r1.ebuild
index 933db9386a73..623d028bf798 100644
--- a/dev-python/pbr/pbr-1.10.0-r1.ebuild
+++ b/dev-python/pbr/pbr-1.10.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pbr/pbr-3.1.1.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild
index 1214ba60668d..bb0786eb8a0f 100644
--- a/dev-python/pbr/pbr-3.1.1.ebuild
+++ b/dev-python/pbr/pbr-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -29,8 +29,8 @@ DEPEND="
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.5.1[$(python_gen_usedep 'python2_7' 'python3_5' 'python3_6')]
-		!~dev-python/sphinx-1.6.1[$(python_gen_usedep 'python2_7' 'python3_5' 'python3_6')]
+		>=dev-python/sphinx-1.5.1[$(python_gen_usedep 'python2_7' 'python3_6')]
+		!~dev-python/sphinx-1.6.1[$(python_gen_usedep 'python2_7' 'python3_6')]
 		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pbr/pbr-4.1.1.ebuild b/dev-python/pbr/pbr-4.1.1.ebuild
index 59045af8ca23..1f13d6c70ecd 100644
--- a/dev-python/pbr/pbr-4.1.1.ebuild
+++ b/dev-python/pbr/pbr-4.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pbr/pbr-4.2.0-r1.ebuild b/dev-python/pbr/pbr-4.2.0-r1.ebuild
index e589fcb27a5b..a00a288a6d97 100644
--- a/dev-python/pbr/pbr-4.2.0-r1.ebuild
+++ b/dev-python/pbr/pbr-4.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pbr/pbr-4.2.0-r2.ebuild b/dev-python/pbr/pbr-4.2.0-r2.ebuild
index b9aa32459791..8685cc63ab41 100644
--- a/dev-python/pbr/pbr-4.2.0-r2.ebuild
+++ b/dev-python/pbr/pbr-4.2.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild
index 956f9fc47cda..91144ad7969c 100644
--- a/dev-python/pbr/pbr-5.1.1.ebuild
+++ b/dev-python/pbr/pbr-5.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -37,7 +37,9 @@ DEPEND="
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_5,3_6})]
+		$(python_gen_cond_dep '
+			>=dev-python/stestr-2.1.0[${PYTHON_USEDEP}]
+		' python{2_7,3_5,3_6})
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/pcapy/Manifest b/dev-python/pcapy/Manifest
index aa4c11d9b01a..51f0cd45561c 100644
--- a/dev-python/pcapy/Manifest
+++ b/dev-python/pcapy/Manifest
@@ -1,5 +1,5 @@
 DIST pcapy-0.11.1.tar.gz 31439 BLAKE2B c41a9ead869aea65470ff5db368f9eb8a813ac5aec4cde23e2375d1d9d5f9d9885d2ae88a147eb21820e3c1875ffa490a1476b346bd0eaf5082bab9e239bfb16 SHA512 60eebbeae84da33d7bd2eb2398687007a305e8986fcc183d8061fa50bbc0cdf9a66c17461a32a652ca39952dd0935b164bd98a200f82ffef00ffaa55409522a3
 DIST pcapy-0.11.2.tar.gz 32040 BLAKE2B 467d35dff94d2f32e66f9caae88bb43218f3391745230347c39e1db241543e4e9431cfe49185151025201d0913ca102d1f9567f4cf70a83d6fbbade76ec35ecf SHA512 353a2240a9b8541f30f9df472b6977664f94966fbda327aa72f73f26257086caf1db13d55c57859abf2237f5867c11b6ab582742e04d5c16184ea42dc547301c
-EBUILD pcapy-0.11.1.ebuild 614 BLAKE2B 63a77610fe1070b5a9bb2c355de48748d7b7528477f6b34446841a908db5c50bc2744dfb940f957e29696f96816d4dded803170a4c715cb38df1dd8ae202a0b0 SHA512 f2315991450d136806627d7c6cad6a42393f5f6ea3ebeff5abdc3a9c371a41ae710abcdf85c4e5b7040ce30da91ecc2ce1c9345671be895ffb93a0b6bb82a92b
-EBUILD pcapy-0.11.2.ebuild 611 BLAKE2B cdd9fb5365d70cc5333afdb317de5ab1a672bbfea7b705169e38aad7a8d3d84ddaf53413a7d1f9d639750ef849e76e31f235ad0eee7c5713a6985fdc1c9a2e37 SHA512 ce96227f633bf4cad8f894804b1a7aa50bf8582ec7b86833c65c92f0935018701f613bb39dd5553e8459b47c03d3c46154f7b3d30d2d32cff8ef11068177c0b9
+EBUILD pcapy-0.11.1.ebuild 610 BLAKE2B 3477f44b9f1160545a2d7a761cb2858d0fc9dd016f10a4fa058fd5abb04df40962cfd5d44bfa7c3fea6a0a290bd507c45944e54c4bc39d7b7729fd25bb217268 SHA512 3a2ce81112163def2db5d50b53e9638e67bdf9cc22dc93cb1285284ae9f3f24bafbf9bb23cc2a3ffc52553b4c5eff4b79ecb1cb00a73eeab1bb76fb5531120cd
+EBUILD pcapy-0.11.2.ebuild 607 BLAKE2B 0f9fe3e31c70052d76180a4203565f8835aaa8f7855b1f78c419068e57c91803f99a92d162251b01ec5d6a7ae7803d575192d3ba60f51782a24cacbc62e1d5cf SHA512 30be370ccc4cda32841e30f89d2db1c4d756788a8e6fe7340bad40b203dd5acacd95024019e1500a49bdf841c86b5347c1c048f54a661035892bc2ae112cfa53
 MISC metadata.xml 358 BLAKE2B c89fc0ed9212d67a3ac2992ec231ee3a26c473e19e317ab3c0bb1002212838299a55ec6db99950d852c6760941e5c698f04db2213544ce9089303519a38e8c79 SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d
diff --git a/dev-python/pcapy/pcapy-0.11.1.ebuild b/dev-python/pcapy/pcapy-0.11.1.ebuild
index 64fd0003fd29..0b09a073763e 100644
--- a/dev-python/pcapy/pcapy-0.11.1.ebuild
+++ b/dev-python/pcapy/pcapy-0.11.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pcapy/pcapy-0.11.2.ebuild b/dev-python/pcapy/pcapy-0.11.2.ebuild
index 78a8a1c5989d..4380eb9cc544 100644
--- a/dev-python/pcapy/pcapy-0.11.2.ebuild
+++ b/dev-python/pcapy/pcapy-0.11.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pdb-clone/Manifest b/dev-python/pdb-clone/Manifest
index 54eca17e56de..74d7050741eb 100644
--- a/dev-python/pdb-clone/Manifest
+++ b/dev-python/pdb-clone/Manifest
@@ -1,3 +1,3 @@
 DIST pdb-clone-1.10.1.zip 110435 BLAKE2B 99ab07e09399ce236ea3cb4e0b7590182475cb982978ad986d448f7a55caff9adebac16959dbef71c5b5a2100f30a8ab0f63a8a2d4d117f17aa75287ff48664f SHA512 70470d8fb33deb46c49fd2e072c1b6aa24c0397d21417f0ab1f63c1e05d8ff9797ba10a6c4ff350c29dd3b94ff6175110cb80971b4f0d16e922f948490773070
-EBUILD pdb-clone-1.10.1.ebuild 411 BLAKE2B 3b2571708e9b9db28231bccf7f29ca78c46d1d0f653a8e0e70817765b14efa54c6780b8a853665265fa6d00ebefda59531a40b93373142124115140e526b50ab SHA512 e9e3fe1824a8379edb4a01c898ad502c9c1e558b84a956eeace9f7b53c9e880d7bbd1daa2743e73aea178781c12909f6eddc84e8dae08a3677ac77f43ed2ce61
+EBUILD pdb-clone-1.10.1.ebuild 404 BLAKE2B 7576ec19f69ab8211cfed76f9716df2941d9d0a89c92f191502cb07cbd53658a8ce1bb8646359526083cda321c038a792ddd1fadc26a0ed3e25d1652fa79c811 SHA512 67f5900c8cb53bbb3a904747ae9b9d4a2bac4a3ec54bca8d8292c396882bed43f275a5ca141118e395a799f36a0143006870b0863ae72b0f1162d82037419c4b
 MISC metadata.xml 371 BLAKE2B 4ddd36edf799f79bdbf8217a5ed630997162f6fba1ba11347ead64cb5e7fbee8b7c136359c2592bda55170818e7b9951668bc9db6baef67341ef583ff763ed71 SHA512 01042ed02fb971d8404159d92149b4e3624b716744ca8828e3d15e3bc3b268ed4ffa359a7d35a009a249b396ae4ea8c2430b3f44c3de05caa5240dd3cfc854f8
diff --git a/dev-python/pdb-clone/pdb-clone-1.10.1.ebuild b/dev-python/pdb-clone/pdb-clone-1.10.1.ebuild
index a880d6f5d7bd..e06d7d83c25e 100644
--- a/dev-python/pdb-clone/pdb-clone-1.10.1.ebuild
+++ b/dev-python/pdb-clone/pdb-clone-1.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A faster clone of pdb"
diff --git a/dev-python/pdfrw/Manifest b/dev-python/pdfrw/Manifest
index c50b3c2eb67c..1766b2f2a223 100644
--- a/dev-python/pdfrw/Manifest
+++ b/dev-python/pdfrw/Manifest
@@ -1,5 +1,5 @@
 DIST pdfrw-0.2.tar.gz 69177 BLAKE2B 2a2d679efd217a8de4faebb4b46d3682c7395cc7d7c70e55107994c7d8de5862bea63765e038f8110efec5fd984ad01de922227a8ac9afa2dacb4d7fa7d2903f SHA512 4f1ed3b7ddb42969110291b31e02e15e1f98316ede25eaa4d63cdbc443497a278267309769351e04cff52651cdbc44c93771e521cb953ba08d57152f81ee516f
 DIST pdfrw-0.4.tar.gz 95402 BLAKE2B 00f01f8d4cca9c5306d08094639d4cb10c53aca1c81b6c65f5639c8862a067e562c164523cc58abddb06b39dabcc50c2fbcdcf04a291309cac709cbfd0cf4673 SHA512 6c0b629e837f9bd479a288bcd040952b98920da345113bf90167becbdf2f90a9d6c082c5e7988c68118bd62a2a5a0d22f98523407996531bb5d3031e847e10b0
-EBUILD pdfrw-0.2.ebuild 396 BLAKE2B f34b2539f6799161ce55db0c4e0bd29796dc6b406c76027cf5cc69a9aff6f625993fb68ef59d8de0e7afcd59b563a09ca9732fec5fd9ddbebd709252cac3907c SHA512 7b9f7e3ac9a36eeacc8b86e5e7fc88c7acf0d6eaa3c19e276378c431df3e4262eaff5456e81fae5c4158e599abc23eb9432c6643f43784eadc7a0d376ab90df2
-EBUILD pdfrw-0.4.ebuild 477 BLAKE2B fa474d77dccc7fca5d732a4bd50d89490020196f4486a3c06d066c69890ff8b80ac0b9be67d9bd209555af3e380728af5f34b1b165a50f97909585e1d465da8b SHA512 74931ebff05ea31ccf8d196973bc6da204317322e80f478d53cecbbb11b5ff483dfd9a32d2ea6daf795614997f6b2b6b6cef1853499f505f23f1f38e1a1967e8
+EBUILD pdfrw-0.2.ebuild 388 BLAKE2B 4c9bdeabcd65689b9e356317dc1fd7b66e5954423eb0bcb22b6c2241f5f90e4b9f8c1f8e7322e3c80dbed4383dd5e9a43137e9e63b03ccd9e9c4b42ba3adc02e SHA512 a6df87ff9295791812bf042a34c70e17d76bdd58c28df3f7c64181ee16d139cdbfde64bda7652863659d0826fe09a32aa66d1c5340e1ac4100d39a89a225cbaa
+EBUILD pdfrw-0.4.ebuild 468 BLAKE2B fcb1924aa23564ba18ad31b76fa87193418bfbce76c45e8ebfb93d6ad1fadd35d8116d46a3d08b70502a255a7312be878f346f4f4d2c70b134f145ce0d8376ab SHA512 0db59dd56c05a47f8982cb3c51d6c162627afab6ac62667109ccbdc42bf276713791a7446e8a3ef5ddf96fcca5df051b855dc4435e77272a4d393a5c48187dec
 MISC metadata.xml 361 BLAKE2B f5d799fb9f95986aa7d1a6668bd05a4d0c0a76069258247dc537b27249cd52d374a819f646e87a6073b7aa7b739c874d0097bb4cb1df4d14381f5bd830085621 SHA512 d48a58a2fa2bf29f2739565e270bced92d417c1c9d0cba507bdd217d1ce61be0f6658e41e8100c814838bf40b79973d39ad8a0f26b04f060451929f2cb6d646e
diff --git a/dev-python/pdfrw/pdfrw-0.2.ebuild b/dev-python/pdfrw/pdfrw-0.2.ebuild
index f1f15f17450e..1e01def2d505 100644
--- a/dev-python/pdfrw/pdfrw-0.2.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pdfrw/pdfrw-0.4.ebuild b/dev-python/pdfrw/pdfrw-0.4.ebuild
index 9099897fb84a..edf78a68ac49 100644
--- a/dev-python/pdfrw/pdfrw-0.4.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pdoc/Manifest b/dev-python/pdoc/Manifest
index b84594734936..8ecc1055d38b 100644
--- a/dev-python/pdoc/Manifest
+++ b/dev-python/pdoc/Manifest
@@ -1,3 +1,3 @@
 DIST pdoc-0.3.2.tar.gz 76536 BLAKE2B 41a5a6ae19b221e19de65df2832760622103f4aada6dc8e9c6c97e1826a24fe546b3b3d7ca5a429d156a1151201241fad6018b9174cb8f2b1fbf46fc450c8522 SHA512 a28f4c20c43339ca89fe93a5e79672033336cdd73c875fa8aeb5649556e39711e0b7f7b680f3c31c242e0263549939a301545d26d5b96b7818f7903d4311a189
-EBUILD pdoc-0.3.2.ebuild 901 BLAKE2B 6f19e05d5d3b0fdb6c000134ae77eac48e35673a56df903450dbae7f4b8e2785888fada7e1230f2ee0b0d1a664fdbf7d676dba80ba98124ea57a7cc16fe4514a SHA512 209e4bb81edc3c603ae1ed68953bcb58f9f3b0bc2a9c3b1a6bbc17aabe980b766e6a71c0aa75a0850d7e1b606044e18577735b5911bdfdc8f0fafee933e5733c
+EBUILD pdoc-0.3.2.ebuild 887 BLAKE2B 7cf3e6a3c1cfd9d468e8a2fcd2fa09d487fed55eaa39913282caa9188ed0c4ded9417c0feeee6de0303331648b597c49c9a87d2c54c1d9525bf3660330aacd6e SHA512 7775228264d3c78220e2e9bd6a0d14a32b044c77fdd1add3e39979a5d66c65dedb14ddc3a43965e3a07db899344898ed948e3501b8f9deb37d594df72e547cea
 MISC metadata.xml 424 BLAKE2B 9699f4ea942fab1f467f13318ec34b3827aafd5946f863fe73ed8411c8967c3aadd75d210d59a194f44cdd40a60f7911231b9b9f1b0da91b88be636b007cd205 SHA512 d5cacf7c2874eec32bd10036f6fa03f0d357569e99b229b397df2ca1978f3961b9f3e7cd892cba677e4f6c4e39a5d69ef496166285adf089e08e7406446c9a35
diff --git a/dev-python/pdoc/pdoc-0.3.2.ebuild b/dev-python/pdoc/pdoc-0.3.2.ebuild
index 2b58238fc53c..eaaa3940e693 100644
--- a/dev-python/pdoc/pdoc-0.3.2.ebuild
+++ b/dev-python/pdoc/pdoc-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/peak-rules/Manifest b/dev-python/peak-rules/Manifest
index 94027bcd1455..99a124cbd261 100644
--- a/dev-python/peak-rules/Manifest
+++ b/dev-python/peak-rules/Manifest
@@ -1,3 +1,3 @@
 DIST peak-rules-0.5.tar.gz 113173 BLAKE2B 374e533d1e4127d721d0133a8c0e4faa02fe12d2c7e4eee8cb5e6b5ae5c30e6fd81858ef44a28df45d300f3c46efdbd660998b916a21481c8c2841e064442569 SHA512 7ab915641829f6366b681b4c576e7213097cbd2be76bd526fdbb4f128762c04c08ee20e3fe3ef36e1df0e544719f71c28079745c9c88f98911074da51ecfa169
-EBUILD peak-rules-0.5.ebuild 1333 BLAKE2B aa1fb4508dfb9b90e923239b3e329e719a72ea5e924740382934656b4773ebf9b596cd2a7e2ed82af300c5e432ba4b642a51c77ccbe9d833bb925cd93e9b829c SHA512 0a24cde459dad3fd782fd709a3a5e0455be156844b8ebdd83a67dfac7e06193f3239cc9c778deaa515c700f1b312d7528b3dbe7b29053f8cec747d9f4f6babfb
+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
index 7dc3bd63c480..2d5b38bf6e7c 100644
--- a/dev-python/peak-rules/peak-rules-0.5.ebuild
+++ b/dev-python/peak-rules/peak-rules-0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
index 664bca2bd520..703786753292 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -1,11 +1,3 @@
-DIST pecan-1.0.4.tar.gz 119575 BLAKE2B eead6234fe26f4698c03f965aba6cd1078369693827574ca3b0b39da4bf8b0b660c01a2e57b3789c092df1cf3f1529ae5d74385055def47482a7f95df5283976 SHA512 cbd5bc21658e68553baa55b74f82f7198ba261bf48d2889732ebbdbcb7f00d0a68f85dcaf946e7349000e78217c532d2017606316335211abd1fac15b947ed7f
-DIST pecan-1.1.2.tar.gz 120316 BLAKE2B aa63103552e8563d7da27d2ee06706f5dbe507557cf8d76c8f196345f453efb02a13c0e1eccfb5e2db7fab850c4fc22b934da0ddfaf92b048edc729517621197 SHA512 672771fb8645bd11f6d89e7be46b6a85ea640b1951cc286cfedc7813f4f076e8435474adcf88d5c149b4d3933fea9c458b155df8b0ce491dac54bad46e4186be
-DIST pecan-1.2.1.tar.gz 120364 BLAKE2B aa0f75249a3c91dbe45376180f1886ec6ff4169c407166dc7a6014152a4cc50bfb8085fcb53996fad75f3b142784ad0a6c2c52c7eb92ca1585dae9c771116c2d SHA512 ce7007f2ea9cf01b7375919c1624b8bf9b8a836d383b6a1906b6d33190b6586ae8700149d862a6a9f16d7eb5e29d055540a13122f67bd3074270e3791a82a233
 DIST pecan-1.3.3.tar.gz 120595 BLAKE2B d1169b6af4fe822259a6bad75068475324cd9c7811a8e62ae6f9c2b9bbfe69b7688a03de9c4a1a4b27666f22c34fdac95ebddbb50feba6ccda60fd2a7f190d38 SHA512 ffa171d4847e549f959dd5ed71f32b3d689ef7e2548302adfadd007f5217c4e1a16088612c27005ac6ae38bb5a99aa532e84be71ae4abf6b06dfdb26ff5cac89
-EBUILD pecan-1.0.4.ebuild 840 BLAKE2B e8e278e5b0505d02671cd90c92a236c027a7ca5ed370a4960e140e2c1a76439b6c0345e45673e8407f18bf7e83f972eeb06464f38e2bac0d4ff73936eefd462b SHA512 24a32a5fd479ef22b4f2df1979627787575bc10c6bc1f11ae629ad90d07c20f1334c98216b4d354c8c97bf2ab9f4de6442f4d9952e4fcd4f6ab8a3ebaab039e1
-EBUILD pecan-1.1.2.ebuild 848 BLAKE2B 2423f4fb53310f0433f196b4b426b161f4e158d40aabedb7682842fbe9d40a896edf55202402066fe3e8e7d031dc897bb78ce238f7100aff8da2d6fa220fe6c5 SHA512 9ea55af4fc69e54bf1bd916e2016d2c033af39e26e802f1dfd544f4a555dea0ec807686a870e1e9f3ea4827942d8fad2835a0c8978161b564e56d1bf07b37a9c
-EBUILD pecan-1.2.1-r1.ebuild 857 BLAKE2B 0fc4cbbd54aa9ed32ac4cf11f31a172f1e1304190a30ca86727a3dcabd8152ec7a27fc79e5220215fe8d5ac55ecb1c3a38ab785eb1873051f8e47d4a4efab485 SHA512 93de7068eed04d839d1168ae722e744b1ce1e352e127f5053a4cf0ca02cacd1a632646cdc6ffaa2bb5b70944ffdb189e1dd13ce2a20de921d8ac113b7aaca0a5
-EBUILD pecan-1.2.1.ebuild 858 BLAKE2B 386b6264b7d70dff6dc944f157e51c735e932cc9d5bf47d8f302c6065539bb8817bc4cfecce323e908c69046257738bf8be7bb40572e7b94cc070d2c23e98899 SHA512 e6165cd6a4cbb3838730bcb651b4444f31e79e8c061f7c05288b2ad9337e2427af8d0f72d2d1e08633d5607a58ebbf061781b0545280d762b542a2e772449a94
-EBUILD pecan-1.3.3-r1.ebuild 833 BLAKE2B d9cedd892cb56097da508d65c93c0e1b6c55e0598b3f58bf8d50ee18443885d334782a7e1945abe4d66fab21cae16116daa37267ce858ae652b96d79c8b8fee9 SHA512 0fa69c442634d0d34d3227e3ad170f6079c209b1250f8a9df56e68128f8328809d35bc8e664ab678b8188d3c8bb45d517f6fd5c915731cdbd38e722d1acdd5c9
-EBUILD pecan-1.3.3.ebuild 805 BLAKE2B c32b9f52a96d3f87783211976ad3f120742605d63d46e2aa4d0f29f7f3511d5f063251763997ddd0131f3ce8e46f4b27c4e5db0de25d413a02e4068296519dcc SHA512 1e45fd1cd0c196c41306d770ce3cf4c24f5f6bc04d9cb7daf83cdda9ac8786c35d75f90676d5479b816b98796da3097e1d8baed2a6c17bbb417d9c11bf5774d4
+EBUILD pecan-1.3.3-r2.ebuild 752 BLAKE2B 6f3e927b519c604aa51faacfe6b998f408f43b3185eb07303471b3fe22d0d37101217fc74781e38ce6bb808810c53f9b219e5aac976e1666684868b6d2ef3925 SHA512 65a1dfdc43870d201eddef31bcee5f3d4142007ff38d50b25b7f0ce4018e1f71568cb484dd8fdf85d529911128c62bc123805c8fef9407ce9eaef387cbb1368d
 MISC metadata.xml 322 BLAKE2B 4be3ea8f134925d142020ac8fcfb0adbba264d7576f30c012a70c5ac175ef79cf9293d6035c9c0eeb52c01ab1a6288a42c926dcd40ee48951ba10122e640017c SHA512 506ed5b74b1e2383261f2ce34595e4fce40864db017ac9a8b2497de0802949a5d2163956a860d037898cb0885a4990531f200767781615056dac07a4af3a4e7d
diff --git a/dev-python/pecan/pecan-1.0.4.ebuild b/dev-python/pecan/pecan-1.0.4.ebuild
deleted file mode 100644
index e4069d461c31..000000000000
--- a/dev-python/pecan/pecan-1.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.org/project/pecan/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
-	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pecan/pecan-1.1.2.ebuild b/dev-python/pecan/pecan-1.1.2.ebuild
deleted file mode 100644
index 95acc83f6417..000000000000
--- a/dev-python/pecan/pecan-1.1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.org/project/pecan/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/simplejson-2.1.1[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
-	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pecan/pecan-1.2.1-r1.ebuild b/dev-python/pecan/pecan-1.2.1-r1.ebuild
deleted file mode 100644
index c5bde13c10df..000000000000
--- a/dev-python/pecan/pecan-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.org/project/pecan/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/simplejson-2.1.1[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
-	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pecan/pecan-1.2.1.ebuild b/dev-python/pecan/pecan-1.2.1.ebuild
deleted file mode 100644
index 1ce8e8d7e4d9..000000000000
--- a/dev-python/pecan/pecan-1.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.org/project/pecan/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/simplejson-2.1.1[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
-	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pecan/pecan-1.3.3-r1.ebuild b/dev-python/pecan/pecan-1.3.3-r1.ebuild
deleted file mode 100644
index e034d97987db..000000000000
--- a/dev-python/pecan/pecan-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.org/project/pecan/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)
-	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pecan/pecan-1.3.3-r2.ebuild b/dev-python/pecan/pecan-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..08967a809bef
--- /dev/null
+++ b/dev-python/pecan/pecan-1.3.3-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
+HOMEPAGE="https://pypi.org/project/pecan/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
+	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pecan/pecan-1.3.3.ebuild b/dev-python/pecan/pecan-1.3.3.ebuild
deleted file mode 100644
index 27af9ad66d85..000000000000
--- a/dev-python/pecan/pecan-1.3.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.org/project/pecan/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
-	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 4adec49854f7..58b6c64b9113 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,9 +1,3 @@
-DIST peewee-2.7.4.tar.gz 608818 BLAKE2B 3749b84b903240851f4f765a1d19d9629600563991b4474027e69f134bdd176abed322b37de69ce99412ecfa19bef78d6d8a52b3629481a99a0e762841d8a1f3 SHA512 c72391316c8bd1f712bcb26d4d6e5ef386a415da536d78cade35d42bbb9c8c6d7b0494bf329bd67e3ac5b91a2d76e97365376b0e91a5c6a5b78ab1696f7576cb
-DIST peewee-2.8.3.tar.gz 639529 BLAKE2B 2d7bd7745b406e2b512a277667cf4c393cdc8ccf193af719d49e9c7e39bce1da3a634c0ef39efda8dbbdb5bdeb9ed5084abf8a304766f4f0216b1bf9abed2936 SHA512 03a2a24acc12c024d9ffc2ccdc70e763e4879f65221b44cda7ee41083e85e8fa5ffa39227a20baa32368d6bd1f104621bb431740430ef6eb0457225fc78e76e4
-DIST peewee-2.8.4.tar.gz 644430 BLAKE2B cbfc829a7abef3ccbbdc863efa9a04d2ad07f052fad11d0e26d8c4902c60c01ad532ae127166ca253f0f656fe9c69d1f1044779d3d9e612e5348c72c10582b1d SHA512 1fa421d3622c63f42901e1673ed1fb47676030861df9758bed801afbcc4ab3e793650fce30e79c7b39d7388a0a2230bfe1a378e43e9b7eafbb29d4bd354ee057
 DIST peewee-3.1.0.tar.gz 705099 BLAKE2B 1dc528082337ae509fc9f91c521d7bf036179ad6b1a5a93e113d594ce819d3a9cdbb7e687b51acacdaf242d542dad138ce2a21f9dcc19483c7361788329a53ed SHA512 628eea27d51017a6ab87aae9ae851d749b0f437fe1806957b23408ad3c97bbb93e5b84c66c5e70bfb7b55c9f29a0c517b84e65adc0f979da450987d670661e84
-EBUILD peewee-2.7.4.ebuild 1003 BLAKE2B c7b01de92110c9811e9e185a3e115e344cd1b558501124d5fc723745e82c5b3d052c0e7bf368c700e884145b43d95caf7e76b63b3073931fce938609a5b52345 SHA512 4f964331fb5ec5edb784e0bb0ceed8637484c49d909c439d065a84f2f4ca7f8e2a34fb2b684d8dd48b46ac8570f5223fdcc16015a52a6223e6c7a9983d3f468e
-EBUILD peewee-2.8.3.ebuild 1236 BLAKE2B f4ca27dc0c7b2623ccbb7012bc0f6e43da891314de9bc136a656662de1cc0a963c5cf6ebdbe21ed019e20b6a5d184091dd485b4724b85825f3ce97bbcfa9fbeb SHA512 78480f2d3efa5be566338cb1b06b4b42870857f4187b27a0599b128c88e226db422995b484fcdd52af510781eefedd3e57eabbed81868ca3d25bfb40e0374736
-EBUILD peewee-2.8.4.ebuild 1273 BLAKE2B b1dbc0fa8a7421fb6f93f7817501b6785a6f53cba7ec8077112ce79abe0ff8f7fb4072a14477ff5d405490cd2b9006ba699594e81a48fb485700cd8e0826824d SHA512 bd4d9d125adec7037dad71a00038b2687e7f8f3258de33c15bb8048a1c126a237b567c03bd762d653980f6e0fb5263e6b9463fd5aa3dd3c720c906579d9c80fc
-EBUILD peewee-3.1.0.ebuild 1271 BLAKE2B 1d867810966b007edd7b65eeeccdaee35661e4ec0c0eecbd1e780107204d5051b36513790871c4b75fa85a0857715c314e2c178329c41205cbcc5c1ba1d7320a SHA512 9e2d0ae004ec22c6cf39d2e49ba9239f2e13f7508c066382edd83fc3d5055f572440c1f8bd4f6c6354b237a82fc856e2be16b435a4266c90958e7b339294730f
+EBUILD peewee-3.1.0.ebuild 1267 BLAKE2B 76a05179c1e6a643ce481d55f42eed67eede342a713e1f17aaf73651e432920691ef4c7585a1bdd53df6b0bdda0476b8d0e087f3b2f8d19f85d90035d8f389fc SHA512 00b639532ccff586496e8273bae51007ccf3ac9150366e56fbe559cba54247e543b59148246e7e847036409959fdef4a7aba2f52f879c0700a5ee34a038517f6
 MISC metadata.xml 330 BLAKE2B 744abc7ba6933e67a2e85359c870e51ed2e5b39cde3adf64a4e92860805eefc37e8035000b1728a921816e0713c8757f0fbcb40206b72505117b2bead9ed2642 SHA512 a75ad6963c2dd0a763e7f11b42a5f92d536a7b4daf59acea56a91b49c11996d316d3fc27b04fcba9c4e7556305543eb44d87ac909a65f937faaf8fd8c57110b2
diff --git a/dev-python/peewee/peewee-2.7.4.ebuild b/dev-python/peewee/peewee-2.7.4.ebuild
deleted file mode 100644
index 13106b511c40..000000000000
--- a/dev-python/peewee/peewee-2.7.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Testsuite run using runtests.py does not require deps listed in previous ebuild
-	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-2.8.3.ebuild b/dev-python/peewee/peewee-2.8.3.ebuild
deleted file mode 100644
index c4ac7df32f44..000000000000
--- a/dev-python/peewee/peewee-2.8.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -i -e "s#test_suite='tests',##g;" ./setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Testsuite run using runtests.py does not require deps listed in previous ebuild
-	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-2.8.4.ebuild b/dev-python/peewee/peewee-2.8.4.ebuild
deleted file mode 100644
index 4968ccbead2e..000000000000
--- a/dev-python/peewee/peewee-2.8.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -i -e "s#test_suite='tests',##g;" ./setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Testsuite run using runtests.py does not require deps listed in previous ebuild
-	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.1.0.ebuild b/dev-python/peewee/peewee-3.1.0.ebuild
index bffc061efd70..78dda8ee3b05 100644
--- a/dev-python/peewee/peewee-3.1.0.ebuild
+++ b/dev-python/peewee/peewee-3.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pelican-minify/Manifest b/dev-python/pelican-minify/Manifest
index 6d95fdc72cc2..806c1c92cf00 100644
--- a/dev-python/pelican-minify/Manifest
+++ b/dev-python/pelican-minify/Manifest
@@ -1,3 +1,3 @@
 DIST pelican-minify-0.9.tar.gz 223517 BLAKE2B 808601e027af7b3970e3fcac08e9f0f656e48fe016a470b4a5b3892a108264e2fff52a9b036861fb9007da263e59c7fcf68867e789f65e20b29278fb8de445a0 SHA512 de28727ed6b39e89461b2d725139b88010def892f3fd23f822a6e84a585b3f93771fdc9ca8f402adc9bb196a0dde03b9d6417317c7e8141d83f0e6460860cd33
-EBUILD pelican-minify-0.9.ebuild 625 BLAKE2B d88cb1da3b625075a7c5650ce125206266236cb81205dcfdc60f5dc5f0f7ca2658e1b8f77bead4a948156bdf364cc576f79edb7ac065f364efa03ba99084fb06 SHA512 2dbe910e13594983ec5830673ed1e79261b92ea3dc169c392803c341e61cc939e510fddb8a46aaa9e9c0ad7d7cdf769118699a7b854d9d30eca8e51bcfaac4d4
+EBUILD pelican-minify-0.9.ebuild 611 BLAKE2B ca21e6ffacd56c6bd33ee91b8e90ea246c5b30c230ff6c1c7ac1508a006c159448c2607dabe4e148453e6e249715851ee4e231ead18aab072f5d306212442b99 SHA512 58d561d01ceb0e4640017d7956681e51efd94f35e5d1771e57ff6d4e4e08b71212a15c02e766d35f37ab37647cd656e8e83df24cdedfc7fd4b2beb7d2bbbf562
 MISC metadata.xml 452 BLAKE2B bbe68af4fc0f50adc241fcd2a7c39fd15a2092ce59d1ce84a72e70d3174d44c95fd00342ca6e85b2d7c014a7543dff3bdbc56e11fa70d3f091a60b3e26f797d8 SHA512 838e7d6032dde459c275fc2d6cce3a3c4a86f4766573d2950031f7cacd52d66550961bb834010a56ed9b3a45d0182da3b35e06e71c2e55cdb66fef361035e242
diff --git a/dev-python/pelican-minify/pelican-minify-0.9.ebuild b/dev-python/pelican-minify/pelican-minify-0.9.ebuild
index 543485962d36..31a17191bf53 100644
--- a/dev-python/pelican-minify/pelican-minify-0.9.ebuild
+++ b/dev-python/pelican-minify/pelican-minify-0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="An HTML minification plugin for Pelican, the static site generator."
diff --git a/dev-python/pep257/Manifest b/dev-python/pep257/Manifest
index c9f333b7a208..2a26a09eb972 100644
--- a/dev-python/pep257/Manifest
+++ b/dev-python/pep257/Manifest
@@ -1,3 +1,3 @@
 DIST pep257-2.1.1.tar.gz 55760 BLAKE2B e470b006b5db04c4bed5c3145b14b949980c71d1dd91dbe34d49599063aaf1cb1d0842dfb992e5d471436446455bde2d309ee573826c039540fa99adba3f828b SHA512 f23939e0350094c67565613bab4ddf285dda5a7379e6ac2493953d6e60ab75588143fd374715765d2aa0728e7117d02e91312dbbe5a9cad28aa8e8e7f68e3bc4
-EBUILD pep257-2.1.1.ebuild 743 BLAKE2B 9502234439edf2f13201affc35f525680bedff242583334e75540e6ef0b3a5e9f91d0dad0c49120110c251db784051214baf9ac7bdd8b740a022b6ddf1867f0e SHA512 5100dba896c1de83220b2b964e6a00dccddbe50989db83c5c108361e9298c86077d8ef8b8f26decad8675973c149ba77200ebcde5f2b5b6ace95ef284bfade41
+EBUILD pep257-2.1.1.ebuild 739 BLAKE2B 0306c0d40d52da704d85511f03fe288578b5b23f0f1d523cd77192b83ccfd1f12cfc93cd492e55e0c3c64eba5eb9deb385538db216e0f63fa4447b1463105b17 SHA512 a7c7e1a27de677a7b39db661142fb2ae8c6749ed0cf10c457e4edd2f2be9eb0d24dedf47ddd9a079bf961b99be8f6d68014850cb4a2380dc4aa024f187665d9c
 MISC metadata.xml 464 BLAKE2B b427cfba180d91335b6cb1b632d0f5cf2f2d468ffc31917cd1cf03248ccb8baf4359357b2a8f6018a663ee973e8c4c125a5cc19a973b5f017420c1a929a980c3 SHA512 07dfa48f689377623d1a3f0fc969b7b6377d6623937449ad4bd67003583a218a309b229a5815d93adb57bb97edb8a02a90321e29520ae291663e7fb75b9bc2fa
diff --git a/dev-python/pep257/pep257-2.1.1.ebuild b/dev-python/pep257/pep257-2.1.1.ebuild
index 1275afe560d0..81273ae6b6e3 100644
--- a/dev-python/pep257/pep257-2.1.1.ebuild
+++ b/dev-python/pep257/pep257-2.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index cb6fe8c6c040..a8d9301b85fa 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -2,8 +2,8 @@ DIST pep8-1.5.6.tar.gz 66944 BLAKE2B 5875895eb21c771d21cb1c415dc9f85737ae18ab10c
 DIST pep8-1.5.7.tar.gz 67302 BLAKE2B 714ecb7f21c457aca1a2465319c3f202d13b5cfe067418eb2e3e6f21b25dffbab891a05f5b145264e484c180b67e1fc8c4ad1cf47f1413ebeaff2bb858f9858e SHA512 ae5cc6cc47d71e90059fec0c89f5e8e7b71b08d185c95b0c8cf0aa9acaee4841d0cfc617fb1ca6d7af7f4721480a1992b6178dc845d80dfe87fe3792d515a3eb
 DIST pep8-1.7.0.tar.gz 79704 BLAKE2B f2e3585bdb3732f9be7f77b1cbf065c0938c1847a5caeb493e3cd62e6a5e19713779a087ffdc9c627481fb10e13d3ed53b3bc368182c2442f24ad57d1d2e96d3 SHA512 0077dac97846fe3a5fc654cd3ce8578845cf3b93ee097a3ae6ff2db4ae0797ad5766c69f036d6a5add786eb929a9beb6d657ab693227b8df2ba46ec0f9284b0a
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
-EBUILD pep8-1.5.6.ebuild 908 BLAKE2B 47e40c0f716160bf5bd0c7a6b84c31c2a1d2a988c0062773ee4e55c629193a73e6ea94230658c1c5931049c1f6659519089315e513a0d0a8941bf77711291ce0 SHA512 c61076a12ca6bcbee8b168ff3d084fc5f91e54c06d177e18e40a284cefed6014e7cff6740cf621aded9ea8f67254aabd613f9e269dde4e80111b8d59f968676d
-EBUILD pep8-1.5.7.ebuild 918 BLAKE2B 06a97fc6bcb9c53c09cf23743540805efb8b1fb7fa8b9b57dfa4083af6c965322c2101c07e149acb92fb7ed4ad37c2088dcf898c28fb82b480894f3d9c6fe85a SHA512 d9491819f005802240fbf1dcc1b6a35b00a84f02fc3808803b52a1ba888a207f11b8dedebe547ee76a9ef4dc3ecfccec06fe3968ad59410f639a8ae6bf65c6f2
-EBUILD pep8-1.7.0.ebuild 1093 BLAKE2B 7b1bb5122fc3391d0f3ccc67fb506c1ab71f410af1e7d8c2a352bb5de938e563b4ec5a6147123deb42bf41386618ffcfdcf486ef4457610711ec3da689237084 SHA512 5a474b25c2c4cefa3306082fc4801fb24fc13e30374679c7e4c1454a9c282de9b10ed4e91ca49f22ea84eefead681a13eb5c140b546bd374bb398e86c5ffb9d9
-EBUILD pep8-1.7.1.ebuild 1097 BLAKE2B bd59fd4efb6a55eb5a441eb8faf32716c7afda0fa0b3febd2a8c0323ca9228f9fb368ea86c24583d26cc96afc7cc080935a5fd90bf545261a6e4f306f75b0b6e SHA512 7a297b4a08b379886a8d23bb88af18d91404553f0402b6cf97626ff16d1635d472d95ea19d767e3c0191e16b19386b7d0d61b44473f8ed48fe7c5738860f4a43
+EBUILD pep8-1.5.6.ebuild 899 BLAKE2B cb438527e11aff46c659d8eb1e3454a7671e9c1c732326380b0202eff0aa1f157723bb03af4822ed7376b677c9691f06d1f67ffdc3faef56713c1f032488b6af SHA512 afa6d450590c6f4e509b117efb10e3b0a935b5d384bf6797fd91b66ad5b1d1b126034495ada49da950d76522f1ebc5d3869c9280dd49794bd6742dc577753e70
+EBUILD pep8-1.5.7.ebuild 909 BLAKE2B 4b9a077f9a36b8801f711ec38a27510aa2ef9808e508e188b9b729ed12fe176d2091314b5ca9d882638d31b55928ee422ca59a70691379899d12a6b532d8a160 SHA512 da171c2bb14afb7b42f889a5ebcc4211af958f3d7ac7044619d4f17280f3c0b447ca4a653510f9f1e685a64b7daf36c812c98398c46ed17f0663e37bacedb302
+EBUILD pep8-1.7.0.ebuild 1086 BLAKE2B 7fe87108412495ab24ea699f4014727b96fd673fb54f129885f1ad5020c285aa581a67841c2c1732e6973dcd93ccc51afdeae1335685bf334986a201d1e0e73c SHA512 5e79ffc839a4f0a091d76e00dc01d7c9248a3b1d9a31558d2a4806c5f8b837d6d04c7052dff0ca36c6c3306c5a16b52a1d159d074ab70c71576d5decc112d996
+EBUILD pep8-1.7.1.ebuild 1090 BLAKE2B a037ab9cc4391c98c901bf7fdc03deb756a780f37d5cc2f7c3e1009400861e5ab80f0e87c32f8dc85f2751ccf11c3a3f1e9de8d8aa4f58a71235cb999a96cd25 SHA512 70420ba74f77dba3b740a62de4a23ba687a1e7b49cd999585f6c38692df6d96ea9a50179e08b78a67f3f38a10b52f1c59a4674057692175c5ac6d13c31f843d5
 MISC metadata.xml 373 BLAKE2B c13332bbd6ab86ea6a6c9d6cd0dadde195528493cc7984e31416b833906e692cbadd18f4185b6cdfce0e2847750ce05a12f70d29d4fa98d3932654b73aeaa9ca SHA512 0c3ea303192c4b56bd910168dbac81284231291053b5fbca4a5a0700cb40ae8646f1b201fddc76dfeab52979c4c5944a67a2b0c62cfdf5c020c23e09e034056c
diff --git a/dev-python/pep8/pep8-1.5.6.ebuild b/dev-python/pep8/pep8-1.5.6.ebuild
index 66b9e73cca9d..a0d85be25a07 100644
--- a/dev-python/pep8/pep8-1.5.6.ebuild
+++ b/dev-python/pep8/pep8-1.5.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pep8/pep8-1.5.7.ebuild b/dev-python/pep8/pep8-1.5.7.ebuild
index 5d4ea7330988..3e28f5a824f3 100644
--- a/dev-python/pep8/pep8-1.5.7.ebuild
+++ b/dev-python/pep8/pep8-1.5.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pep8/pep8-1.7.0.ebuild b/dev-python/pep8/pep8-1.7.0.ebuild
index b15b8f236c50..b777f1e6605a 100644
--- a/dev-python/pep8/pep8-1.7.0.ebuild
+++ b/dev-python/pep8/pep8-1.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index eb5200ebd655..01d5eb575aa7 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/peppercorn/Manifest b/dev-python/peppercorn/Manifest
index b8c1e8648b5d..3a03903e7e8e 100644
--- a/dev-python/peppercorn/Manifest
+++ b/dev-python/peppercorn/Manifest
@@ -1,5 +1,5 @@
 DIST peppercorn-0.5.tar.gz 19637 BLAKE2B 13a94c3bc09b5cdf75cf44b40111b1d5cfbc79b8cfe97bceb9f1cbcbac2983a912dd25676d1e68366e471cc86ec8832cb55c105d3fd3332cafb80e5f086a8e9c SHA512 37f9df282872b0c664780f5e27caf81cc379b05009756cf6c79290b09893d88427f3619916688412dabf20e99f264da8832d959563943e2910b1fcac696edc31
 DIST peppercorn-0.6.tar.gz 16386 BLAKE2B fe72e6585f8fc6e0dc23d9bae321482ec1b2c50e7d13faff11c8a3beedb645a99b1e90852896ac6807938d7e23e1cbb5bc80cb10fd11d657d6574172e61a71d4 SHA512 6363c22cec2c6bdca7a4520d8bd81aae02a74ca473733b22d2557ee7299dbc1bafc77c04808c6e9520f23ac6e1c6bd8acbb8e8dba0deebdac55a170ed0396a60
-EBUILD peppercorn-0.5.ebuild 1080 BLAKE2B 976dc03c848160d5d7223bda6cb524473dce1ca8f996dc763e473ff0b3f5a3ebbc99b09d516002bf4c5484d221ac9687d78943ac42184bf543c572eea82d3b57 SHA512 1fac35a2e718d7639471345e2c008602d8b84d0d3a374216522ebfc2320d54c4c85cc667eb35b3f37dc48cfb1ca116468dcf7b1bf2d58f44555d17458afc658a
-EBUILD peppercorn-0.6.ebuild 1052 BLAKE2B f966ea2082294177ff714967b015065a4a8b7b56eb2f147c30a65c99bd4f4f82959e7c237ad51031621f7584e87b668cd3c699af5268334ffb97cfcfc68f929b SHA512 e11ae0ef7d2365e6b3ed6d3a265507798d84a016968bc9557f35950003ce7cc63a198e58da67c5f3f1bc9b79049b361e38f5f0fa36eacc9aa5e595e7d3d588f8
+EBUILD peppercorn-0.5.ebuild 1071 BLAKE2B 5afac813365ea5a99d3a7aab0bd6668835b65e1437afe35fdbc749a7ed4e607d01cf81d2c404519b48789cda04e03cfeb4539d080043517a0049acf9e6d9cbb5 SHA512 79082c4a42d0d1e2bebf24a9d132d69164b98a14b83ba02f5f54ad9ad55c9ac38c103fe5d29734ee2cef7b347efa5e75e1860794a33aebc09a53aaa5d5013cb5
+EBUILD peppercorn-0.6.ebuild 1043 BLAKE2B f23f946b6c93dc140ee319dab88403a60b3a96a194e6d2ffd64e2e69fd75f8323bbf611ab0c33e80f82b5559514f22e4336ca5f6f6bb7f9137334598b6823472 SHA512 8261edf9a9ac2388909a6684406ae3214589a70176f55741f3d354f7ba777b1cce19aef35d47af232f3571dab21293edb98709cbecb78363ef992f22497829d3
 MISC metadata.xml 382 BLAKE2B 78a004976812587b5ea7062e0beb40fca449529ffa21182f24c8f7a93eb332fe65e14b9c8248bc9e1525303476513051ea45b32e02f9c0abd17ad54cfcd4b0bf SHA512 87d4af71c685754259be695e02aa5a99e49f9f6c72a57c15ed7e5e6777255cc49f8400d349fd0e1308e25ce36b0a880696c9f8cbc2e6ea991d34901cf38c8235
diff --git a/dev-python/peppercorn/peppercorn-0.5.ebuild b/dev-python/peppercorn/peppercorn-0.5.ebuild
index a77222720a08..916c3cf03623 100644
--- a/dev-python/peppercorn/peppercorn-0.5.ebuild
+++ b/dev-python/peppercorn/peppercorn-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/peppercorn/peppercorn-0.6.ebuild b/dev-python/peppercorn/peppercorn-0.6.ebuild
index 5b8c2275b8b9..c67990245fd5 100644
--- a/dev-python/peppercorn/peppercorn-0.6.ebuild
+++ b/dev-python/peppercorn/peppercorn-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pew/Manifest b/dev-python/pew/Manifest
index 43b5cbe6fcd4..9bf944b642fe 100644
--- a/dev-python/pew/Manifest
+++ b/dev-python/pew/Manifest
@@ -1,3 +1,3 @@
 DIST pew-1.1.1.tar.gz 19629 BLAKE2B 9db83eeee873c1a9a542372562cbadda37d6d5d52ed220c7018390291a96ae1adf7e168c4213cbcadad04a6cadb7115aed53eb7a8561a0ee0e58dc9137ac5257 SHA512 9b59ab51d4685b6203a944338d8fc5ab0ac65b442adb7861fb3f2ed7437ef8a02f1f87e234fc70124245625ac7992500c11e51902a98511015e90f1ac5e56b46
-EBUILD pew-1.1.1.ebuild 740 BLAKE2B 623870ed11c79b1d3a42f5e712ab46fadce466fb2f60debbed9f292cfef214a6155ab6b65c66c712ea28ba1ff24fac69b3fd980f24663e1be399577ac68a9d7a SHA512 6c8c52a838867fc9e44b46cc41d98580babc42e9f1155d0be1803624a837dee50fe81d1d98799c91a0bc4dd84f2c6c17a9c0fec3d41591f5d37ed61574efe4cd
+EBUILD pew-1.1.1.ebuild 738 BLAKE2B fa0b7cca85c2ba4d4600084e21bdf0ede28864552d53804979510a9275903dfca0aaee697be84478d1f07ca788d4d97613cf57214ff05908d75ba4bb26974e52 SHA512 5880e9a85cfefa5613d9d36245313a6c13f801279410336cde98eeca1e07b68a03757571aca0d84f2ce0339a04b7fed57c0f64cfb20ef469e9ec5e36883dbc73
 MISC metadata.xml 446 BLAKE2B d4be59a9c95d607bc67b12d4fe5a5310dfcfa5a251e022fb9fb0ffb0a57aaf51c47331d735b76eb651718adfd627d72ae9afa315c9703fe639dbf67ddfe411b7 SHA512 81ea90c5b887670e5a5d1f6933c503fdbcbfe1b59034bc8656a5ecdd5aa954a35edf3aa46b3c5d591194d2f964d4fdf30ede9270d9dc06ca7676b0f864bae20b
diff --git a/dev-python/pew/pew-1.1.1.ebuild b/dev-python/pew/pew-1.1.1.ebuild
index 729742e78a15..9425c31e4b42 100644
--- a/dev-python/pew/pew-1.1.1.ebuild
+++ b/dev-python/pew/pew-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 25e43c0dafab..fcf7fa960f49 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,5 +1,5 @@
 DIST pexpect-4.2.1.tar.gz 143980 BLAKE2B b5cb9c7847eabdf8778bddc6b208520edb9b3611d7a981fae6e371fa6deafebe142ba8361e3a1d21187cd692576c91d732f3def75e19989296f50b2a9fb4d4c6 SHA512 796474c87559cb9f4e2dfe72564d70c75e1aac4f57c4f3e4033a56c8842a48380ae0d5fafdad7f1ea6718b25c272fe4a611a59db44e69afb1f2bbf7e00256261
 DIST pexpect-4.6.0.tar.gz 148966 BLAKE2B 0ed1a3c31133bf618e4c75ea099efaa9bda9e2b7f92f46c54ad553ecc56487e5415b750334376a95599ada53e17e91efe7d4b65ad80bb4f6a1cf9d655a3c9685 SHA512 9a2b1ef19d885e69cfd17ba0519581f782574019010043e66d8b68f98ac86b359f4a1ca42f8bb0059a5dfdd43275ad93531c076cc0ac2049e109408961b46bbd
-EBUILD pexpect-4.2.1.ebuild 1176 BLAKE2B a83d75d8734c9c67f7fee30a6f64ddcd484718eb690ce9e3b3ff46f4d12a28bfc4af05f33ac989ddb2030460c56b663260524af03f878793c34ccb8e42a147b2 SHA512 a720b69fd35b5eea7aa9355f66a44c93137ca7b9897f2ee4c0f41608493b0632207fce6e37fe93a489ac6a4400d8c5dba2ef032bf187aaafc60764f39a878026
-EBUILD pexpect-4.6.0.ebuild 1052 BLAKE2B ccef50f5b946e8cb14dda6ce48306945abe68ed4a8db40a6425d1da6a33750be17615d5870f7c3ef3566f2fe06ae397b83cb35b919596ffa9f916954067327a7 SHA512 b1a61a76c5d9b2af6de37afe7532ca05fc658b848260e3042e8eeca3d347d9575822f0c37ed931de36c4ace3b17f87550ce156d8f77153032cdb1a5e8e40daff
+EBUILD pexpect-4.2.1.ebuild 1167 BLAKE2B 019443fe1699a063f62607b982518b4c89e92eafbcc9b68e221c76580143e5ec336255d4f2f49074a34d552d1d980bef16aad725d0d1f4301cea1a016ea824d5 SHA512 4ce7be1f1ea47c291a20989d58938f03dd6bd37681d17b09e47049ab07a121f1fe5678663ecc5719c648cc96a5806808b0b2a97921a9cb8873d473609664d2d3
+EBUILD pexpect-4.6.0.ebuild 1045 BLAKE2B f56ef2209e5a7bc5e03315aafc8fa061156eaae1124d558aa3b5b530cdb474fafe68f76d38bb87e6c97e564b771657dfbd525a4f733c420a4cf475141fe483c6 SHA512 08572970caa6e4b3e9777a1eaab78ea5d7cafe22ef85c8645784337bd71082a381fde19286e96e8f156eefae2226220d2c807d4c968e02f8d798302e4256dfad
 MISC metadata.xml 377 BLAKE2B 72c4b35c12a770df9344987af8c7a392c3aed05296a4876902987ef946239f8318ee833cc81a7f004719e954670a83e84a3813bcdaac48912efad885515de1ea SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464
diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild
index 8be1a9dfe689..f0f81fa7e562 100644
--- a/dev-python/pexpect/pexpect-4.2.1.ebuild
+++ b/dev-python/pexpect/pexpect-4.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pexpect/pexpect-4.6.0.ebuild b/dev-python/pexpect/pexpect-4.6.0.ebuild
index a24c7cde74e3..5e6f7e028143 100644
--- a/dev-python/pexpect/pexpect-4.6.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pgpdump/Manifest b/dev-python/pgpdump/Manifest
index afaa0cc24f09..30efa1f9ed90 100644
--- a/dev-python/pgpdump/Manifest
+++ b/dev-python/pgpdump/Manifest
@@ -1,3 +1,3 @@
 DIST pgpdump-1.5.tar.gz 69446 BLAKE2B cdca875f3d827d8c1a35164465c158fb211677457c29924a6bf1cc7d901c1e732ebbe57edc819ddac0ded186495d307010d0180b4d115977dd0c68f254fc9e45 SHA512 b9fc7f78b920296301acaad2dbbafefff7b5f1658cbb65f5892a28d0b4d5110581bba984ad5cdabde3330025e3828387d7127c689cb86a7163c0b5ac0d0d2de0
-EBUILD pgpdump-1.5.ebuild 434 BLAKE2B c3d8d31e3fe4a8907ba4acc3614df9ed2063b34d939827f5f6a131befa337d2a1ed66256fd84cabdde7fccedb646aad32a1dbd8d85c593590e8a5ffd5daaeca2 SHA512 74200dfd77a7dee5e0a8108bb31d25e4324f494d464b053fa37c15cbdd475dcfb989a3bf1850914fa871a8a437cdcd7ff3160555540be441d0563936516e276c
+EBUILD pgpdump-1.5.ebuild 424 BLAKE2B 05cc128eecf346b3b386a32425fa40685ffe61dba2b32fb7c99d6e7c48991563c9604e593ff8ba6dafbe82fdfa67fae088c131a31c63dec570cc369f909e181a SHA512 96c0452f364614d94d384a4e86f602279b28faa0e3f1f93e1affc914faba9703d9f77adebc154ceed1eb516a208b96acd4db55e4bc9b17c0215c477ad6d5422e
 MISC metadata.xml 386 BLAKE2B d999fd34acffdce83998229fd30d7bb5cf8848601c43341ae1a5c2b7028991bb8af59f69ccd04f4c6284be6e97ff99cbc4841f333b0dab75e7fbb5fea844e541 SHA512 e7d8886a19a4cae8c44a9546ca41c486965a304da55d623892746d1dd0706348dbd431080ff145bd47d7a629b1e7c464e36f18699172689907c15fd31f79fe27
diff --git a/dev-python/pgpdump/pgpdump-1.5.ebuild b/dev-python/pgpdump/pgpdump-1.5.ebuild
index bc805eb033d9..208dd93f7567 100644
--- a/dev-python/pgpdump/pgpdump-1.5.ebuild
+++ b/dev-python/pgpdump/pgpdump-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 162bf2c8265f..1df9a923d8a9 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,7 +1,7 @@
 DIST pgspecial-1.11.5.tar.gz 43649 BLAKE2B f9b8956cfcd81bba946e0323d584668c82e6fc18a0aa08012c3236636d0ad801f10f786b71707daadafc1274d5733adecf9233871b13bded8fe8e8f41fad0fc9 SHA512 984a09a10a705d91d9b97142eb2502b44b2a79d95cc1ed8596dd2f7f31515028f4c34cc54383d762a73fdefd6e59418f677b020181740b82cebb5d8e77bbc234
 DIST pgspecial-1.11.7.tar.gz 44874 BLAKE2B 2d3afd7983a31347a4b0f59fd095684c2fb83e85def027f633734a672c3df1ed21584e2620932efacbdc27a579ea35e810e727456191e02811c81e906373ac5b SHA512 dbcfe996cb67af292c90bec431d918c3e78aa4fb90fcbfc9d5ef36ed0c5c7de58505704df277b586990efcc7110e1395af1476003aafaf359257f0665e4d9a19
 DIST pgspecial-1.11.9.tar.gz 45009 BLAKE2B 3ae53d4225d448c3291d6701caf7388023d140678461a5811673c7cc7ed242fb0c18ea38427210366f58f1886894def348051469c23aff20be7abc5e5c96622f SHA512 b07083ed715a6ac3d1b32ac954b83852fcb154f4b2757fae91ce7c35524576fa8caef5cb7201d313eac783bc956ea89c9d68f099a11c332486d677dfb185caca
-EBUILD pgspecial-1.11.5.ebuild 841 BLAKE2B 6e307bf10368f73fccb8581b4f71187a729d982c5823204eb49588f5694f237b2761e68242db1c815b43a4c72e42bab01f730b7716362f127a30fe65a1ce326b SHA512 5158f7d875fe0bcc768ed053b9a2ae9f8f01159442e2163b4546e23c9d7bb7b63e97adaf124d346c87020c8e43a405ea811862063368c5546565a3a8cd502be4
-EBUILD pgspecial-1.11.7.ebuild 800 BLAKE2B 6a6072a773f8fc3f9aad875681d08f251e81d308366f3798566b38eea2856ae60e67b841107f075007657bfb6086aa2095db34a1eeac1f9bfae3c27c3a769cdd SHA512 a2221dede6eb1923e2b946b0b2c6da3ef1f8763c34d3d71d048cc7a39d5c51c7cc991661c00754995bec814fa2ef22fd5c940147f471142b3695a0576de326f7
-EBUILD pgspecial-1.11.9.ebuild 601 BLAKE2B 65d2831a6d4c57e00c51ce35ba3eb879596096483acd539434b74cba6d13d8c21d6820122534c86158163c08617f7bd30aace1dbc6ba48eb037ebe6e41c0c6f5 SHA512 73db6706697bc5977d45f3c7b00e8049c8c7e1819241af554d326a314e28b47f696d8998fe358b5acd3a7fd712dfa17b5e21950dfcb71c307eb39d6cb9429c43
+EBUILD pgspecial-1.11.5.ebuild 837 BLAKE2B be57f72edcc4861acaa643541e4c8cfa80b10fd2b0e40d2a8470af0301bbf6d687bc7697727f57f540adf9fb15e5bb608ab7174ee98732d2c72ae98e161491cc SHA512 f46f004a2448ced67d7e6edf76d14f731f0168a0570292560e6bf8a1ec45bed5f7b284a9b9a771ef84c211c0beef36a95f7d1e0084719760a00248cb37a7b036
+EBUILD pgspecial-1.11.7.ebuild 796 BLAKE2B 3d4be6e838d425112f64148e94969a8494ecc49ea38b75dde550193962049ea67ab148d685ae3feff7bd5efaaebd4d9c6e30173fd0547d933b63593a45e2740c SHA512 0c6339a14f9c6f292f43e4493a3ed6026c235671e1187ec56fc05a25a1bb3952306e83edc548d456e2ab38228a9533535d1a290a4bf7af19c3ba7f51e2f0dca8
+EBUILD pgspecial-1.11.9.ebuild 599 BLAKE2B 75166395caba6bdb3899bbf9efa43001c9535a88a0120a9a740789d396b303ff7dbfc88cdd8d3749b6c86cce1f68fc941dc587648afbe4d223c1f268fb933529 SHA512 df32f02875911348e4141e4f82275236100130e3dc8282c757ebb28061747b4fefa03483d17ed669eaf67ab2418faa3708e8df622a8253987893029ca4af8e14
 MISC metadata.xml 467 BLAKE2B 4a1fe580d03eee97746d0b3f25ae0f33a693c5095fffbc30e41edb78b5cf48d4e8d39e1bdd6764956ba675c282548993878455177bb766d9f5bb333630925c25 SHA512 fa46dbfa82bd12f191d99d189a2286da31cbc42346df1072b3f445bcc1a79575a8adf17ad79cafd0a5a4a17fc7094a7f3d2e5fac642b2ad61ce84a2299a13f60
diff --git a/dev-python/pgspecial/pgspecial-1.11.5.ebuild b/dev-python/pgspecial/pgspecial-1.11.5.ebuild
index 6318ec7b5292..932fc9faffd2 100644
--- a/dev-python/pgspecial/pgspecial-1.11.5.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.11.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of postgres meta commands"
diff --git a/dev-python/pgspecial/pgspecial-1.11.7.ebuild b/dev-python/pgspecial/pgspecial-1.11.7.ebuild
index 06f5ead2917f..323ce5614df5 100644
--- a/dev-python/pgspecial/pgspecial-1.11.7.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.11.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of postgres meta commands"
diff --git a/dev-python/pgspecial/pgspecial-1.11.9.ebuild b/dev-python/pgspecial/pgspecial-1.11.9.ebuild
index 274f62b7a91d..8bc7a1cf5c49 100644
--- a/dev-python/pgspecial/pgspecial-1.11.9.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.11.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of postgres meta commands"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index eae6649f15f8..4a85768da0b7 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,5 @@
 DIST phonenumbers-8.10.22.tar.gz 2307815 BLAKE2B 397711a4cca97be68986cbb21ab971710c213a74fbb0e2c79de67b98ab44c3e25e95f6bfc2c469c1abfaf0d1c3848114a0be47d08650c7ac57a01240b7a79270 SHA512 f7c540276324a373bc0caa9aa3b87da31b98bfd24fbffab2f9137f0c6f72bba88022d9820193dfe482ee621fc3c90126bd93cb51bb4715dcbd1c3fa689e055b5
-EBUILD phonenumbers-8.10.22.ebuild 537 BLAKE2B d6869aae81a5b58c959cccff9317da77db0227abf34fc10de8c008ea543cc1dbba60f513da3e8b32d332323c1edb33990543569c47a2d7354f69277df28ed460 SHA512 b3491ad4d8209a1caa7f22d412863f14fe083a6f83947271ead7cf9af06a062972d61663ab092dd20bcfa39509cc26db228cf8973bb346257fc6fb75f646e298
+DIST phonenumbers-8.11.1.tar.gz 2365325 BLAKE2B 2863f44ef09abd94d0d647121742a8da915ee67ee639a2f8b9cc7755efc7bab93d8eddc47ef22d28e56f05471c889050750ce116a91dff5e7d523c50ecd58399 SHA512 24e32176f45871c80f4c74ccf248742441422a61935f1ac3fe21acbece4a85d8a2f264f24e7f77d5ac31eae52ff0d598c50c882aec50f22733da3b4e70a5ee02
+EBUILD phonenumbers-8.10.22.ebuild 523 BLAKE2B 24eeb05726d2f9d849644b6af229762cf037129e27132d4dc364e47e6651ffb4520a41ff4b488ed2611a989fdf8dbdf3ad1261ea9e4d83f400edeea563b672fa SHA512 0411af8491522b28a005405181c384b8133bbe2c944600faa6c0d41f4652abda346635f30f3dbbe6b39f94eabb33abc686eaa3b2fb59c7b6c5e99e3bab8f865f
+EBUILD phonenumbers-8.11.1.ebuild 525 BLAKE2B 75a57a3a7b7314df171e245b6a39108a862c1412b52394be4267f002c94cb3be63779468e814d6b533633f0a18220b6765287cdec1663c142185393b22d12eab SHA512 2b2d9db25c7f0df94e639b82f6766d46c374ce7ba382785b45c6b7ffcb1c7a930cb72deb061ee47c947d1babcab8234810d9531909bf5cdb6bab9a096fdf1916
 MISC metadata.xml 392 BLAKE2B 132a6d6143f7bdcca65dc93f90077577d9ea472aa6f2b107224f60a07c047e7e93a6fc9e9686e61d78299a0776487171e177c5fc3f6c85be74e29e1cd1132b22 SHA512 a610d3e2399621a5d222ae3de92108698785b077edc4bc969930fb60f6ba2364f6795538c6647fe46cf21c599ef00ecbab3458d45fb1d5f849e127c06f0b5634
diff --git a/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild b/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild
index dd568b8273a1..a220686c780e 100644
--- a/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/phonenumbers/phonenumbers-8.11.1.ebuild b/dev-python/phonenumbers/phonenumbers-8.11.1.ebuild
new file mode 100644
index 000000000000..1677ba0426a4
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.11.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS="README.md"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/photutils/Manifest b/dev-python/photutils/Manifest
deleted file mode 100644
index 9a5149401f37..000000000000
--- a/dev-python/photutils/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST photutils-0.3.1.tar.gz 633814 BLAKE2B 362fda6922f0fa192f383e52dc30b7e02e63d215486d895c3d8ed88784709c1f7758c4206ba7d4116d8b64586fb2804a1495964dc4ad67fd6eff74cfcc0e51b0 SHA512 62f7b838e09cb76d0c3b400524340861d882455d305fc31bb062c5853018f0133a4364a5b5e5166101328ad931d474823dd59ab7e58fdcb68bd824dd2ed34959
-DIST photutils-0.3.2.tar.gz 634159 BLAKE2B 8297ed77059b6bbe3cbd92b7aefb79886b88741fafea43f44cac9eff86a02c24e7e7c1428ae70259e3d2d2590eb61f8b864d9edf3dcecd340aa82b095644b32a SHA512 69c845cee9e16ab9daa26e87bbd209f9159fbba4cbcbae1eea9e84bf4ab75b7723964bde30ecec4004d00a80370ed599d867d8314675700485eb6190c7aa0300
-EBUILD photutils-0.3.1.ebuild 1403 BLAKE2B 0e99b92db928ba980c363f004fdd4eba60437338c41232d5821af0b70eadd5b649b17fb6740f2a9be62f551310fd276129a4843e7dc91bb967ddec8e203b3b5d SHA512 c482d40728b4883614269e2e311d4d04d322627779fc670bdcd1367c7773d87420308cdd51cba4ead0c4e0345bdc7823ef954e4367978f3320e5e88e8943e795
-EBUILD photutils-0.3.2.ebuild 1407 BLAKE2B 442c1541fb869cb8c32edc28063d2b9693224e64014290c0d1a14cef2462e074acaf1303525cffc42b324237b937d766dd3d245abe33f08cb14149cfdb42317e SHA512 196ffbeb2eb15f52356d43860a99e98fa7154f0fe9943600153e2694af79a08e4d5514145f8d7d338532a500c0e782e0b21e7ef902dde9451ccf45c4d1ad5eca
-MISC metadata.xml 663 BLAKE2B cd56e713bdfdc927fb4058bb5ec1225b8e34ffc34985444e11fa99ba709e8029b1d75453cbeae63d4879bd56b568e99ee21ceaffc31fcff3d0547fe71edbbe0c SHA512 5347e693578e31b753d8283362241c1bf5932c6dc36e148e858036d9746214af3cd3584ab3108ee1059483d5bcb301bcf78e0469c51c3844b8135299ae4bb4c5
diff --git a/dev-python/photutils/metadata.xml b/dev-python/photutils/metadata.xml
deleted file mode 100644
index b72b596902ef..000000000000
--- a/dev-python/photutils/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 type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    photutils is a python package for determining photometric properties
-    of sources in astronomical images. This includes source detection,
-    centroid and shape parameters, and performing photometry.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">photutils</remote-id>
-    <remote-id type="github">astropy/photutils</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/photutils/photutils-0.3.1.ebuild b/dev-python/photutils/photutils-0.3.1.ebuild
deleted file mode 100644
index 36b6cbf2baad..000000000000
--- a/dev-python/photutils/photutils-0.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python package for image astronomical photometry"
-HOMEPAGE="https://photutils.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DOCS=( README.rst )
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scikits_image[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	export MPLCONFIGDIR="${T}"
-	echo "backend: Agg" > "${MPLCONFIGDIR}"/matplotlibrc
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-				   PYTHONPATH="${BUILD_DIR}"/lib \
-				   esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/photutils/photutils-0.3.2.ebuild b/dev-python/photutils/photutils-0.3.2.ebuild
deleted file mode 100644
index d29b2d6948ad..000000000000
--- a/dev-python/photutils/photutils-0.3.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python package for image astronomical photometry"
-HOMEPAGE="https://photutils.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DOCS=( README.rst )
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scikits_image[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	export MPLCONFIGDIR="${T}"
-	echo "backend: Agg" > "${MPLCONFIGDIR}"/matplotlibrc
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-				   PYTHONPATH="${BUILD_DIR}"/lib \
-				   esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index 9d24c20de153..5ac098f5d4c4 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,5 +1,5 @@
 DIST pickleshare-0.7.3.tar.gz 5930 BLAKE2B 7cc8ea436af6c7be2ec891882fb42ff67aa71f82ec7beae48a9e37cd1bfeee24742d1a83dfcecf8f27bdf6c4d86653f9374b869960699565789ac4f435f62255 SHA512 c49f41b2778783c0de69838db0c916bbfe88eb651134959bf43a18233a4f1747599e51bdbe4b0cc7f7b13c92fc202c2159a0cdd2331b099034afbfe0df61c19d
 DIST pickleshare-0.7.4.tar.gz 5981 BLAKE2B 12679a29db75c772ba78d9c83061176bdab4ac93fb7b122ee803650e0b0d0fb951ad43f75b73ba303b6c637184ef7cc304935abbb2aebdf6928b5d47d83ee1ab SHA512 6cd4b70f63378c4f668f3428262aeca66a38ec86ef9069e3fbc5e7b0b8d7a06341e99b387f9cf29502decbb47c188b7b2183fe7d249e68914fead7e6628d7154
-EBUILD pickleshare-0.7.3.ebuild 668 BLAKE2B c49a09dc6d82d17d0a6cc174735b68882c12bb0029f4de5f1450cb4dcee74600dd00567c2bb383cab8654c5247790fd74348574bb3ac319c13c2a89b11c9c5d9 SHA512 448657fe027889f06640f6cfd2fcf9c7d4166b1e8d6e9dae7e191e34a95891e2dbe714448e19ca4179f5731316454f0427277c14ea97b8daf9083d64ba6fba8e
-EBUILD pickleshare-0.7.4-r1.ebuild 687 BLAKE2B c0b6da43bb983bfd58efefa08d67d50c3971f8f0203dcccb1db4965c21b3958f5d6e01a71245a244d41515a106b7a9289c488189a6984e9677ef3b7dafa458d5 SHA512 144d05e3e98f75b51a6f9542fd47b17df1389f7d9a481e046faab6c60bab3bc3829d3920455a62718f363ba316cf06b5b168f67e368bad6d89078cd98a66ee48
+EBUILD pickleshare-0.7.3.ebuild 664 BLAKE2B 7a3a4979799d83a8ef177217d0fe359fe41c7a0da30b6ba8f46d75181ef8307d3a5cf676a78d93d5ed5d79e53f1cccd9db903a495b07519208a11b54e7e46f41 SHA512 cc4fb64b6207a52a83e014ae40bba4739cf6f64e50006845af014344236d72fea463f51e0dbea030ea1cc0f09dcce47de11880493e865552c63b78f1c62329c1
+EBUILD pickleshare-0.7.4-r1.ebuild 685 BLAKE2B ae3734da0d0e47da1fb595e9df1c85d2fb8b8435a0ae72cd0c56d3f0bb255ca4a69311575219d7336be42d837258222601bf2b6bdc687b74e281e8dd45380d7d SHA512 40fefd6637f28499ffdf4e546f751576f453f97e24f6fc1abd8eb83d26e4e4073e8bb5cecf8aa23576205d1c2d9c915f1aeb9bb22c747dc26150fa46bd805592
 MISC metadata.xml 862 BLAKE2B a7c04e6cdf8a9c5a074a790da324591984286ebf33fd13950d8dc7b070f750069f88d5f0d9235b5ec824c1dbac834a2e09e29b74bbb8eb23ad4c1d99c9d8986f SHA512 0f9d4a8f540699c18af10123696a2ff91002a9af8ad675769fbbe12fb3fdf160077a1932dcc5ddee5427051a6467054220cab958fc32d4c352a46bf9f4d8aa5a
diff --git a/dev-python/pickleshare/pickleshare-0.7.3.ebuild b/dev-python/pickleshare/pickleshare-0.7.3.ebuild
index 44109f9ad635..19081c353265 100644
--- a/dev-python/pickleshare/pickleshare-0.7.3.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
index 497827800cc2..66d57491af6c 100644
--- a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pid/Manifest b/dev-python/pid/Manifest
index 2a6ac6a9630e..d84e5ab0c214 100644
--- a/dev-python/pid/Manifest
+++ b/dev-python/pid/Manifest
@@ -1,8 +1,6 @@
 AUX pid-2.2.5-fix_tests.patch 1186 BLAKE2B 6cf21aa8569696ae53d78bd3939fcd49b8426484a24aa35d1f0a943cd87c7a160a1b30d8481ff9fe5796e4bd0e02cc618c691fbd3273cbc88a9bfc974b6ed2fb SHA512 397b1af456b079b7db1448ef3a1d16097747e4581365a51f1c34d22ea6826abf458f6637b239b52751893364b3c1a51bd56d97eb673725e469a11561a6167ee3
-DIST pid-2.1.1.tar.gz 9591 BLAKE2B 90bebcd225d96283c771b29d864ab35311e748978040e3667a13fa14d84e9f9f1bfe86a25c93bd4781c80938dc20cf14894f32de87a3c1cbef5797e168e71f0d SHA512 5f20338ca902d68a0c4a614b0b8229cd498712bf1750b68fa49037e9e6915c66ad562564d70d7c9308538f4302e90473a5d253dd6366bfa561f6a2248b21a45e
 DIST pid-2.2.0.tar.gz 10752 BLAKE2B 943626f9eccecb16f3da03d222cf44aae93179d4f97f922dca431960dbd744fb996239332b7e8557464aaf0797505645634ee3a23b88f0e98fb0a9d60f20e7c3 SHA512 bd35110fe67d916265985eeceed08d70a2e2e04507eaadf62bf6c67927fc6b36ca6eaf2a225947f5b0ad049e54eb2371c8576672c0ec3f819208cf6e11543fcc
 DIST pid-2.2.5.tar.gz 12151 BLAKE2B e681ad7e1d92ca1468f02dc258f12f6ae4899c775108e39c85488d8427132050d34ee79cad979a65d1bbee4cdb3d12b1a851d313547caf28c1f06dec4d0a81b6 SHA512 01cb6af9a81b216af3b2e02c336589f4f1fb29b12dbdbefb817b78255157e175b16862c2bc01412460f9f754f2c7a073c9ec2a907e3290569af8bd9a2ee7081f
-EBUILD pid-2.1.1.ebuild 486 BLAKE2B 453978f7d01a1afe244ebd31c121331093c45d517801309fc31c7c7e7c5dd7c16d6909b348e5841bdb8ecdb02a34044ab9b8408b332d069b66270a0232565e89 SHA512 e1c50988a0e9e255e6e5f41521c0b807ea42a396c1bd315c451f8a2b5b357c77007ebff014a1c7ee1723e86d2757fd0fe1a198615745b11e74b547e81b85ca47
-EBUILD pid-2.2.0.ebuild 742 BLAKE2B a5e53b32290e679b26cc68fba85bd668120db98a83a84653a2512b6fe58bf2440651a2ba39ef28430e3840bcf980e1ac019dd2a0d70671991cd0b092216afa6d SHA512 9f8822e32d4fecb45ab449b3356c4f1dfd744c931fa9260b9d51cb55cf1eb7c7ef9a74516538857099735ac0877e74ed928cb169f810d9c4de364a0ad2c1b085
-EBUILD pid-2.2.5.ebuild 607 BLAKE2B 72cbe72a8cb3fc76c6ca844fc492bda9cbbf4c671dfe439817d84cbd34ae5ad524678adf6a0f342808995c556b9da3afdf5dfefa1d555c93c3b3c66624ca465d SHA512 d0225b176a7de169c76327cca2c8b6fce7e5f1a51882ac4d3bb0fbe39d5e5dce6bd585a1e8069b3eaf9a2c0891ecd02cb05ad16da4423a0bf219a02c834b989d
+EBUILD pid-2.2.0.ebuild 729 BLAKE2B 23706c7234fa1b348948839bd580d82af91698a14d8dd61943ce8a20ee9c434199ee009bfa9c63dd33fbec52dd157a834cb6a4762c3d571abd4ee649f05f06ca SHA512 db273d949b4e41f45543baa4e9f08d75d6c48e6b211f2a78e91926a0debe6875e0b4fc8abf2a855e53e05412a03f9f842b79723a31753f12c7dfd8a0ef219c2a
+EBUILD pid-2.2.5.ebuild 592 BLAKE2B 0763bae1e42fe5925e8b14480f7f4b462de17cb991e4748410763c01d01c8a572842c37f21f88d88c8729bc0aac17fba301e6c21d53b9d3f44f76868517d094d SHA512 e118a411fd81b79157c9a02477401ccf12338b6f851ad31a5c35641da6381a40ca93bef84c1ca0db36976ed260ce535a47757056cc0b2f1e01f404cc45cac7a6
 MISC metadata.xml 560 BLAKE2B 5af715f7414da897d42890da7399e0eb94a6a9e565168490a30fe6869ea5377cd7c58dfbc1b130f2998752ba0fd2ff0dae9f98479ab22909dcc2b61f9c1abeb3 SHA512 3ca1077fa0948e659fe7673dd885ba306512f75b3706314919de74910482b99c112f4e1cdf2ada3ceff9ebf18bc72dfb46c263ce4da396e1400a6402757c2dcd
diff --git a/dev-python/pid/pid-2.1.1.ebuild b/dev-python/pid/pid-2.1.1.ebuild
deleted file mode 100644
index b89daceff188..000000000000
--- a/dev-python/pid/pid-2.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pidfile featuring stale detection and file-locking"
-HOMEPAGE="https://pypi.org/project/pid/ https://github.com/trbs/pid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64"
-
-DEPEND="dev-python/nose[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/pid/pid-2.2.0.ebuild b/dev-python/pid/pid-2.2.0.ebuild
index 3bfa2333161a..63ef9bc8daa1 100644
--- a/dev-python/pid/pid-2.2.0.ebuild
+++ b/dev-python/pid/pid-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pid/pid-2.2.5.ebuild b/dev-python/pid/pid-2.2.5.ebuild
index ccc10b9d4456..14d86fbe5e32 100644
--- a/dev-python/pid/pid-2.2.5.ebuild
+++ b/dev-python/pid/pid-2.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/piddle/Manifest b/dev-python/piddle/Manifest
deleted file mode 100644
index 5e53e0852375..000000000000
--- a/dev-python/piddle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST piddle-1.0.15.tar.gz 454044 BLAKE2B 7b878c3d178d24deba0b84ab99b073f771256a67972269ad915e5858d07a903de1dcc23b05ce14baf6f8d59c9be797f12a91d6619776fe16ba6b09bed277a6cb SHA512 5ab216f67721b47360a6e757bddb268173b7fbe3d1a54dfc6dda0a7c050064f833e24911f16882e98af1d56a6ee840a205aa4d0d2e394a375c7abc98d0074a07
-EBUILD piddle-1.0.15-r1.ebuild 484 BLAKE2B 9771d25108cbd85f6db5764aa312ec27f745aff7ed3e73243afae2deb77b3d1c57e2f2e8d316bbb351462b050cfbd89d9a2ca4e380e1bd89c3748c07c2fd3a1d SHA512 996e9b36ab8002501291d01e2d128cd8ff5b5c891f8b3b37ba0055f60bed72474d553b8330890387ce3d1d720abee13296ca8f0614a4b225be5745238b8cb16e
-MISC metadata.xml 1880 BLAKE2B a3f46df16473797d594b6a2a25b3f4013204cbbac630f242bfa51eb148cd24aa2b7d2c920640912fec383104372bd321a6996a778d40229d4a793c6a22772bd2 SHA512 cbe13d492470bb2934620f274aac66ad8a6b3aa8d68acf3d929013ca9801427809d57b4cc1a1f09429621ed67fa1a5717d2630f169cc46e2c3224c3e0aa325f9
diff --git a/dev-python/piddle/metadata.xml b/dev-python/piddle/metadata.xml
deleted file mode 100644
index dce2e6da3832..000000000000
--- a/dev-python/piddle/metadata.xml
+++ /dev/null
@@ -1,29 +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>
-PIDDLE is a Python module for creating two-dimensional graphics in a
-manner that is both cross-platform and cross-media; that is, it can
-support screen graphics (e.g. QuickDraw, Windows, Tk) as well as file
-output (PostScript, PDF, GIF, etc.). It makes use of the native 2D
-drawing calls of each backend, for maximum efficiency and quality. It
-works by defining a base class (piddle.Canvas) with methods for all
-supported drawing primitives. A particular drawing context is provided
-in the form of a derived class. PIDDLE applications will be able to
-automatically select an appropriate backend for the user's environment. 
-</longdescription>
-	<longdescription lang="ja">
-PIDDLE�クロスプラットフォーム�クロスメディア�両方�マナー�沿��二次元画�を
-作��る���Python言語モジュール��。��り��れ�ファイル出力(Postscript, PDF, GIF��)���様�スクリーン・グラフィック(例��QuickDraw, TK)をサ�ート���。最大��効果��質�����イティブ2D�画を��ックエンド�呼出��よ��
-���。�れ�原始的�サ�ート�れ��画方法を指�メソッドを���ベース・クラス
-(Paddle.Canvas)を明確��る事�����。特別�ドロー・コンテキスト�派生元クラス�フォーム��供�れ��。PIDDLEアプリケーション�ユーザー環境��切��ックエ
-ンドを自動的��択�る��ょ�。
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">piddle</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/piddle/piddle-1.0.15-r1.ebuild b/dev-python/piddle/piddle-1.0.15-r1.ebuild
deleted file mode 100644
index 33db772726d2..000000000000
--- a/dev-python/piddle/piddle-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,21 +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="Cross-media, cross-platform 2D graphics package"
-HOMEPAGE="http://piddle.sourceforge.net/"
-SRC_URI="mirror://sourceforge/piddle/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/piexif/Manifest b/dev-python/piexif/Manifest
index b7df80bf6bf5..7aee710a76f4 100644
--- a/dev-python/piexif/Manifest
+++ b/dev-python/piexif/Manifest
@@ -2,8 +2,8 @@ DIST piexif-1.0.12.zip 1005725 BLAKE2B ff370dfea7b2e3b0013c484c586a294ed3b1590f9
 DIST piexif-1.0.13.zip 1008345 BLAKE2B f2f1ba520d661bf3f50de41b81ceebdaff8db2d83f76d4202771438d78c30beabf118f5732a5e76a6484fbf2bd850b461a9d1a0b675f12995dd7f3c8bb32e6cf SHA512 4234783a639e777b58eb0b4591a272d7d5e8c116a7a242cf36287e64d15089478c88327a16b4fa75786fc3621a6bf647f6a075fab0708e2d0aed6395f95b92cb
 DIST piexif-1.1.0b0.zip 1010925 BLAKE2B dd0eb4cd98cd77b639d88181f7f50201928d683285c661d6fce98c2cef92adfa0a809f45c3dbd38d25745fb1c88f21d31d45871b328052043abe4a247940db62 SHA512 6549f2b1f4a36b3455d561109fc9bdfc130f668ffa78af45ddd1c9ab9264af26617f8d9c7072b2e097d3951a931fae3d8b495589d665d972097411299e24d6e4
 DIST piexif-1.1.3.zip 1011134 BLAKE2B b27d4419cf545f6205b13c5646dff9fc7b1ce6e5de538f6a7189e6cadb54d301e11cbf0feaed8b073cbf16de95d67c621b68657b35fc0ba2025281ee64be4e51 SHA512 df5f7793c39911af58bbae76cf998e2a7bc820b84dcf9808ee8f6a38f766f824fef28392ef88387e18b10c270c4b27881be310f0368076b6fb65379a11a93270
-EBUILD piexif-1.0.12.ebuild 586 BLAKE2B 225b9fa4771dc83fd1852b5258394b03194663eb981d6874bee0d5a810cd44fd8112211931d2d054828f1977b07a1b961b23cee688a8f3110b0f6e23f4ba50a0 SHA512 91b8a00ebb7d0422d88ea74e230796b0510b93a6bbe6eb2b4a9e10b58e927f35b55b40601245ee98e0bca989ed6c3e1511d16a640938559255fc889027605099
-EBUILD piexif-1.0.13.ebuild 587 BLAKE2B 430c636e7df374e281fd3b0b861a5b6c8f2ff1810c8ab4499f6c4cce6aab853c45ff3e632e18625939f46460856a2787bfa65e94224c41ed9f1df8c7182d2c97 SHA512 1d91c58aa4deeffb2f524ad4fa2baf440f91816baf1049fdb3bea92c48be2b0a596a39db78da51f69bcff6d657291604cfdb9e6d29941c0692232f5fc18ff59a
-EBUILD piexif-1.1.0_beta0.ebuild 639 BLAKE2B 6fe27609bb73e56782e47faeb607264ddc59bfe606c3d707e6926d9bdf66247f67d28125e3e2f77ab3519295edd25215914d3b008afc0d4468fef9ad476c04a8 SHA512 47b3eb8348ee88b1a4e3cbf40220f2ed7fd92214e3b32d9675cd79d203314b0b723183bc9e1a9d1a51183e5722e353cd3ce5638abc54462302eb206252e0cd4b
-EBUILD piexif-1.1.3.ebuild 600 BLAKE2B 5d275499e92b285f34f1021f83f025680f51221f4ad273404252a709549bd9d57c383372b62bfda63f156d8bc678cd9078bee11ef4265976cd05cb679dded569 SHA512 5518cf94218d9d43733e659578ff39323258edd87f743314332c619b54b7e0b669bbacb55c6d2cca22849336510777bae66b097a568514a185d239de392495fc
+EBUILD piexif-1.0.12.ebuild 579 BLAKE2B 25863bcd655eeb41bf805f013b8384d6bb3d6fd0b80ffec9b779cbb16e156773b1c84f88d3845d0d93c28dde692b246aac28d8b76259692afee9c686ee515c3c SHA512 539079671d7df8dd76cc0eedc67c2de894a3b6c58b18a58eba472d61b958f6115ab6c857b4ac0b530eff1ca9865c7f2fc4487b25dfb10fd7718f116a4eb23ed5
+EBUILD piexif-1.0.13.ebuild 580 BLAKE2B d8c4a1235e0e17668dacc4a95f3d0c7a1d23ce01a03569be6c597b5c50728ee727f3a336b6c27d0e8357d8133ff5068bf160a1893e7d4e5bfc2b7f820e0eae4c SHA512 d578232d95044fb0fb9f4cb72d341f61e29dfaa9a895fac9451198e67627abf47d607198fcbc9ad1e77bcb1f550a46c042c1170b5d3c5b162fca1036a8d6bfdc
+EBUILD piexif-1.1.0_beta0.ebuild 632 BLAKE2B 0405c7cfc598e0b896ed5e9d641bd1ae1c3071f7608b292722d39d83ae7de7b04772b71bd60d6c55c1c4326d2d8e28b4873f2a9d0761fd35ed7346eecee6ccc3 SHA512 67c6e502b14c36a77291eea58aef98570d75bf022900afbd444e55825c5eb8f163e3cad0f531ff0ea2367b3b703a5f9e5df42f5cdb1835a83994397294943b80
+EBUILD piexif-1.1.3.ebuild 595 BLAKE2B e77a949679ddb5e81177b45a645a41c818bbff445e1513ba86018c8281c0b13044018dea5c3c06c58c019c2a6ee067c3112f8fe8e51bcbd3d3f16c9f67baa259 SHA512 7777ddb341968e13f1cdf5ee0f9cb23466c8ff856c74f805f01601c9b46413a101ed2af54d57b06cde452c0f9200be038e4ad2a448b26da26d1629ffd47c3097
 MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/dev-python/piexif/piexif-1.0.12.ebuild b/dev-python/piexif/piexif-1.0.12.ebuild
index d831b6e88fa8..f144607fd470 100644
--- a/dev-python/piexif/piexif-1.0.12.ebuild
+++ b/dev-python/piexif/piexif-1.0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/piexif/piexif-1.0.13.ebuild b/dev-python/piexif/piexif-1.0.13.ebuild
index e6fd91be4b35..b9cc417d5f3f 100644
--- a/dev-python/piexif/piexif-1.0.13.ebuild
+++ b/dev-python/piexif/piexif-1.0.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/piexif/piexif-1.1.0_beta0.ebuild b/dev-python/piexif/piexif-1.1.0_beta0.ebuild
index 7cead2ae93b5..12cbfe6f6227 100644
--- a/dev-python/piexif/piexif-1.1.0_beta0.ebuild
+++ b/dev-python/piexif/piexif-1.1.0_beta0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/piexif/piexif-1.1.3.ebuild b/dev-python/piexif/piexif-1.1.3.ebuild
index 156df0a63aa1..e7d890c4780d 100644
--- a/dev-python/piexif/piexif-1.1.3.ebuild
+++ b/dev-python/piexif/piexif-1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pika-pool/Manifest b/dev-python/pika-pool/Manifest
index 583632e6e269..c17d01ea5491 100644
--- a/dev-python/pika-pool/Manifest
+++ b/dev-python/pika-pool/Manifest
@@ -1,3 +1,3 @@
 DIST pika-pool-0.1.3.tar.gz 4722 BLAKE2B e34dcb022cd915e00054860b04fa84e29fc0595bb31387da3d3270e520dfc7b1f5db7ea99e0a7808b093bb1eca1881199575b89c5b1846509072886cd3968071 SHA512 2065e4068310cbf0ac27e3fd242a025a1a174d7faa940cc1eb07b5eb7b7313da2b11456b056fe90520c7a39cec679ee06e38fa3327a6a50548200254d376a62e
-EBUILD pika-pool-0.1.3.ebuild 519 BLAKE2B 61ac2fd0a46acc17e3bf0d4f9d61919441f64eb813ceab01f959c7a254b9fa5fc41bfd9e545c2f32c452ec323272ef4038dfb044927b0bf27208162e5eb083af SHA512 7258ff5c0f4e5eb27cbb2f1a015043f960a320cfbe12d6824675021ac172052dc767044ea373997ca0b6c45b6cedf37e19d867f2db4e90a272823e41ffea29cc
+EBUILD pika-pool-0.1.3.ebuild 515 BLAKE2B 2ba8fee5dfebf4e4ae4aee9f8f7606e6c1b8e3e07e7527292055e62b688c128ca084991638b1cd63a19d553ea4589a584b42649f3f191e4fc3204b988f218cc6 SHA512 633344d2e6ac3e5544f43096ec43301d42d0fcfa1ae7f0c23f9dbf67c63a29f6b9c60c591a6458baf1c3f12f6f2e9699e80514002039f9bc4adde2123abb135f
 MISC metadata.xml 461 BLAKE2B 35b685abb5c06fc53639d95158c0722f76ac41d1cfd35a10284d303a4e79a7a343d3811304f4f5a7509681376ce9e13377fc2558da352a0afbf6a41ff706b385 SHA512 6b55d28c9a908dd3fdfb61145086ea970ac733b97472faed403f3118c7586437c2635095b53378f30b5e3739ac1c317f891dc716cf336be70bc221971e180b8d
diff --git a/dev-python/pika-pool/pika-pool-0.1.3.ebuild b/dev-python/pika-pool/pika-pool-0.1.3.ebuild
index ebd636fe4848..f00bda7df835 100644
--- a/dev-python/pika-pool/pika-pool-0.1.3.ebuild
+++ b/dev-python/pika-pool/pika-pool-0.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pika/Manifest b/dev-python/pika/Manifest
index 2e98b1f205a3..fbf409206a89 100644
--- a/dev-python/pika/Manifest
+++ b/dev-python/pika/Manifest
@@ -1,5 +1,5 @@
 DIST pika-0.10.0.tar.gz 82642 BLAKE2B cc0cafd6d58c1b6511bb244731f4c18698370e77baaa0b876061d80c9748fb81b92dfdac0250c4db7a6ca816791ab8eb8f4f785d9223b45082918a304545a4bd SHA512 8a6e8b870aa36f141a24d4886cd8e4d4fb5cb735d87857a16ad963d7a14e0c40e81a3c7e193d879046a7e76fa87ab0b16bfd4a000e169e2452815fcd04db93eb
 DIST pika-0.13.0.tar.gz 103730 BLAKE2B c78139ac7a60bd324619792b177c96793c8c645d58bd6962f7061d5dfca2f621b6199ebb4b2d3fbc7367324f18d3e766266b43db9afafdd8e64c2eec6069f175 SHA512 f555142c8f466ebdbc46a24278794754186176832841723cb0d5d6ff69ee9a946dca8a7ae3280a96b5da8cb2d3066e11a58771583edecf7990749c8857a7ed42
-EBUILD pika-0.10.0.ebuild 482 BLAKE2B 32894aaf55332fa734d1175074a05eb28ce2c740a1464627b55e308248fd654055b79fcf1f6d50a6d45ca566c1dc8d67c3ad36ffc1e6c8c7990a892a7654d0a7 SHA512 b86f8c40b1cea790caad0482938f9acf0e6ab380168507e58b12d4a5c2bbf2e5a3e1b21cbb5e91468a84380213efeb511b25dfc8231cb50fcbc2d40983cefa92
-EBUILD pika-0.13.0.ebuild 484 BLAKE2B 4c0e426eadd598fffdeddbc7515dce366bc5c180ad152932285b2e47adcd85a9a6e4ce719f31e93de9f7f35fed12846bd1a074dd8b4e85152a9392a20bfb981b SHA512 34ab28a59802664188144b0f41dd26d575ae378fc745cec716b426fa58988a2a0857c580be25a9e6f59d3dce13edd6536daffd4c49ea607ae0ef9267d81d91ef
+EBUILD pika-0.10.0.ebuild 473 BLAKE2B e2ddf2ebaea1d93fe2e278fe571805970b527384d7044785b96fec4e2a0d100b9bc4aaf70c1f47579bc3f5f06a1d329872295905bbc76f6473622cbf720ea268 SHA512 1d6f416cc232550c34e240a2fb123046c7f3cd75ffeebde0bc1ca42beef7e03b99a200b4a69b848ad30019ff4b6ec30620579b858db3ac1e598de9ffbe18fa0d
+EBUILD pika-0.13.0.ebuild 477 BLAKE2B 695709e90ecad72e700379bc8a759c4133c29f85831e4d1901f90e07908fc316f77037b66bc79497064aa1a5c6181b20351b8fe7bef6df8bfafbb08dfdfc15db SHA512 1d089072a6d79cd9aad1bedc62d34b3ccff54e0238fe42bcfc218dc9177e8862ddfe1b9cca8723ac4a9c22c1b1f8e1f339da336da1d1a32c6b3c05171b006b7e
 MISC metadata.xml 654 BLAKE2B d2ca07b7ddae1316c11f0fc7efe6a075f3b6118ddf6063e72de5cfaf90eb46cbb6f1c94292e82df12b2c7282f7518f79ed7fb5bac446841d388d797242bfac98 SHA512 dfaf85260ba3acb2c471870c6674d5ac647111168a77f09bde9419831f2a18acb297ef1590b7c944a242bce3deb29aa5dc149e691424d85eafd6f4b678aa2289
diff --git a/dev-python/pika/pika-0.10.0.ebuild b/dev-python/pika/pika-0.10.0.ebuild
index 5e6880484f75..0ff76879c705 100644
--- a/dev-python/pika/pika-0.10.0.ebuild
+++ b/dev-python/pika/pika-0.10.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pika/pika-0.13.0.ebuild b/dev-python/pika/pika-0.13.0.ebuild
index 318ade7ac886..cc7b2c08c825 100644
--- a/dev-python/pika/pika-0.13.0.ebuild
+++ b/dev-python/pika/pika-0.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
new file mode 100644
index 000000000000..05d053a115f1
--- /dev/null
+++ b/dev-python/pikepdf/Manifest
@@ -0,0 +1,4 @@
+AUX pikepdf-1.8.3-test.patch 1383 BLAKE2B 18ac2e4ad4fd2c1e6db158ecd87505ef3099a5053d3d4b5b96a2b1179eeeb77218ba0582e1f25975f5f94867220fd382c82ca960da404154ea67008cd389ff82 SHA512 6db05c94c09f5474f53bd2dd77b0ebdf6cecb4cf00ae5c344b1795bd81379f072856c7d06c05630d40c878ba2fd9b09c918d0f6fe364b54fea720638135caf0c
+DIST pikepdf-1.8.3.tar.gz 1649370 BLAKE2B c655eb2a9304eb624b5f3dd3ea68ff3194f5a508b4249ef0643689945c28bbe9eaad015df481516d6cfce6768a70a34377725a7995b448f22a2eb025b4967e71 SHA512 5cb674042dca6850df7cf9476743956967d0ad168ac6bdadda03895a604f6c3670849e33ab863e7686eaa46922489d6dd1da9883d19a721c8021323d768086a9
+EBUILD pikepdf-1.8.3.ebuild 1448 BLAKE2B bcc45f6908fb64a2d74fed49277f000e3655c8f0c7f564333d094203f5875a2ef33e2b88f28164916da130ed812ec0cf943746652d346c05eb1b82b2ddf2df4b SHA512 a56a545f64ba95ec6e51c5eb6eb49f361c39d1d636aae7c5014c11f1f3bba35179b3084cb645f7654f04f1609d47dc852dce547e0a49c667c8e85d4b2d5abc5f
+MISC metadata.xml 579 BLAKE2B 010d66d2d00284f744a85bebf5b916e77efc7f46f880886815bc677007ae0f71b5f19b6caf6cc49c05e1e9ce13c954876e8d13b988a533af2fb68de147e6911a SHA512 3f41579208b5354e6361d6cd1f035bf0e5819fd90575e15c684cf501ca33bc14b6c4a7b70040cd5f44796a8ca58810535734787ce84ce8183d0cadc14d6c1f01
diff --git a/dev-python/pikepdf/files/pikepdf-1.8.3-test.patch b/dev-python/pikepdf/files/pikepdf-1.8.3-test.patch
new file mode 100644
index 000000000000..b142980caa77
--- /dev/null
+++ b/dev-python/pikepdf/files/pikepdf-1.8.3-test.patch
@@ -0,0 +1,40 @@
+diff -r -U3 pikepdf-1.8.3.orig/tests/test_object.py pikepdf-1.8.3/tests/test_object.py
+--- pikepdf-1.8.3.orig/tests/test_object.py	2020-01-06 18:30:03.000000000 +0700
++++ pikepdf-1.8.3/tests/test_object.py	2020-01-13 22:43:54.844142512 +0700
+@@ -146,21 +146,21 @@
+         a[-5555] = Name.Foo
+ 
+ 
+-def test_stack_depth():
+-    a = [42]
+-    for _ in range(100):
+-        a = [a]
+-    rlimit = sys.getrecursionlimit()
+-    try:
+-        sys.setrecursionlimit(100)
+-        with pytest.raises(RecursionError):
+-            assert encode(a) == a
+-        with pytest.raises(RecursionError):
+-            encode(a) == encode(a)  # pylint: disable=expression-not-assigned
+-        with pytest.raises(RecursionError):
+-            repr(a)
+-    finally:
+-        sys.setrecursionlimit(rlimit)  # So other tests are not affected
++#def test_stack_depth():
++#    a = [42]
++#    for _ in range(100):
++#        a = [a]
++#    rlimit = sys.getrecursionlimit()
++#    try:
++#        sys.setrecursionlimit(100)
++#        with pytest.raises(RecursionError):
++#            assert encode(a) == a
++#        with pytest.raises(RecursionError):
++#            encode(a) == encode(a)  # pylint: disable=expression-not-assigned
++#        with pytest.raises(RecursionError):
++#            repr(a)
++#    finally:
++#        sys.setrecursionlimit(rlimit)  # So other tests are not affected
+ 
+ 
+ def test_bytes():
diff --git a/dev-python/pikepdf/metadata.xml b/dev-python/pikepdf/metadata.xml
new file mode 100644
index 000000000000..bb5d42c73a8c
--- /dev/null
+++ b/dev-python/pikepdf/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
+    pikepdf is a Python library for reading and writing PDF files.
+    pikepdf is based on QPDF, a powerful PDF manipulation and repair library.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pikepdf</remote-id>
+    <remote-id type="github">pikepdf/pikepdf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pikepdf/pikepdf-1.8.3.ebuild b/dev-python/pikepdf/pikepdf-1.8.3.ebuild
new file mode 100644
index 000000000000..03166127d0d0
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-1.8.3.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,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"
+RDEPEND="app-text/qpdf
+	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-5.0
+		>=dev-python/pillow-5.0.0
+		>=dev-python/pytest-4.4.0
+		<dev-python/pytest-5.0.0
+		>=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}"/${P}-test.patch )
+
+python_test() {
+	pytest
+}
+
+# When ipythom 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/pilkit/Manifest b/dev-python/pilkit/Manifest
index d980dc152add..001355143970 100644
--- a/dev-python/pilkit/Manifest
+++ b/dev-python/pilkit/Manifest
@@ -1,3 +1,3 @@
 DIST pilkit-2.0.tar.gz 160077 BLAKE2B def84c3444c5ffe7e1b9c016c2fe15de222d6765e7ce4652ef2f6864af59fdc89b9bde5c7a63097838ab3fc054c81529dcb4a13cd3fb3ee8a0f141f6b0030c10 SHA512 7732c67bc00db53c6849c907233381cca7f9055d55d479958a7b97db277524ac280753fd40c0023fe2b34f98b7261134f993585e658275ccd4c67f357c13de51
-EBUILD pilkit-2.0.ebuild 701 BLAKE2B a5be2ee1f213f00ceea9182bdd9f0fdb726f897bdeeb0a85e8c8058d38145db52ece84c8f0cdb7d623ad6ffb000046f3aefb61b346e7adefa456c3abc27f94c7 SHA512 740da0784ef726d76554888d6a785072798df60357d285e5a7718881b0ccccb61f27da40faf2686c3c17de56246364365f694da7bc653133751a0203465b741f
+EBUILD pilkit-2.0.ebuild 697 BLAKE2B a928ca8fad79a26ab1af5a640b7889590ef8f61b1f62d981b6581208182136395b7bd4d351ccd0bc650d951c79988ed2194a3644e3b156e77ad17be07bd89731 SHA512 4200798ad1e9a6f9489b965454509b69e8eb22bc779e908e51e6366e96fbe12ff6dc7ffd4f05c99e2d20ba625fc443cb3ff67528b19261ed0bb4ced88ef98630
 MISC metadata.xml 707 BLAKE2B 4499ba1535c6f7572d0e336ccb8b69eebc7d52c0a26fe3a113d79f22bdf93b33062cab1d8f5735d795d6c11c0164bf7304b8327c1e4724e2f9d8c572079ff508 SHA512 32ae881094153b9179401cc55abc4a03469d9004b121afad62bdcbe80725c687f5779fcb3e2286c051f6038e98f7838d89308f12fba4c0fb15e5abe6e27df556
diff --git a/dev-python/pilkit/pilkit-2.0.ebuild b/dev-python/pilkit/pilkit-2.0.ebuild
index b62b8c290d54..8c12db1a8bbc 100644
--- a/dev-python/pilkit/pilkit-2.0.ebuild
+++ b/dev-python/pilkit/pilkit-2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 49e5ff161c49..74789e532d5b 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -3,14 +3,12 @@ AUX pillow-5.4.1-pkg-config.patch 790 BLAKE2B 702af0f1901834f13f4731fbc78989ee56
 AUX pillow-5.4.1-toolchain-paths.patch 516 BLAKE2B e794866ebfb5db41cba72def4690721f2f1254d16932a89f8ef5f28095a07df3a928aa7fc90c96e5a57983e8421369fd7495fa30a677831761801a639f22a91b SHA512 48bc736101fae55bf7da666e7b82c05c9a0a549f6892f8dbedb64d6db8a9bcfae34950847189209ab3acbbc5c357633a0102fd298f12590e678c7ad1b2dbffde
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
 DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62
-DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69649e02a954c0b3810fc5d77288c361fb40747171176d29843848d802b783a2b0c0de15476462f17f15552298fa SHA512 c5fbe1432d576fe4a70a15fa7a70a446ccbcb247fbd4c3605917fa26a6345eb9319c0153dba7637d521c358963f2f06f525219aa1af1502da2565d54dceef4c5
-DIST pillow-6.1.0.tar.gz 33523149 BLAKE2B 305613aa1f444327c0a70a9e88b51035dc87c17af9d0dd4be47192eeef1b496ba0da3675d9fed5dbaed1bd9a5f2c739370bfd7d1292d7db27230c7ad60b4db14 SHA512 b531644d7214f624369ada12a953c773a0009eaa50217e91aeae30b1ea065c685c7ad331bd9d5e952cb25edfaaf4e8255025004b4c83624ecd2dc06f3501d60a
-DIST pillow-6.2.0.tar.gz 37404132 BLAKE2B 3f86f7fcf4695f152f021fda629df182846e33e7031e1b6bb8f71b0cc1bd7e8039bb94ea8e480afa29324c3015902839cdcaaa359fe58f2bcd8c287a3eb13417 SHA512 9de48d9acdb4367325fb16f970bb533dc369b895615169e0ec77155b400d878e3ebb67f706243ff3e81cc957f9b5360ca8206d4f7fb2d00e9474abb9925bf9d5
 DIST pillow-6.2.1.tar.gz 37405020 BLAKE2B bf3592bcc159902acc35899463c8949daf7cc31f03283684dc55d5f1517fdfbc07e1feb73b65b0b9cb4052ee1d5281558b38f9bd08240d0fc5727909b98da158 SHA512 ee757ec2b8382d6d56fd0f0cdd4cd36440cc37f05741e27fc661449a16dc7c868966772060adb283de1b1b5ebc49b8eec46e0bdcdad9f5f4d5ebd77feab7ad31
-EBUILD pillow-3.4.2-r1.ebuild 2510 BLAKE2B 46fea0d8573139395d0d3a1a3e4457c63900c8422a111d9975b7d6a16666961a1a269ddc143927f04455628adf83f6e886c13af489917f98de5e6e7446d13553 SHA512 6a9de5aa86cba1ebb93ad4269d1077bde0a47f8928194dbff2bb463a2cd78bcca7e7d6f288b4280e14dc5026fc1895ea98c4d3b33f5b25cb4fae20cc04c6e346
-EBUILD pillow-5.4.1.ebuild 2797 BLAKE2B 6d2196bbc49b0b160a27811837bac3ac636ca60c953451adc060f9c1c699f9c9fa369dac18286622232eb4668d01af29ebc68af98d6929f67cc6289eeca7913d SHA512 aa12b638c49a224aba341c2bbef40c25be6761706391b91f19dc7a58969e4b3358d1f323973cad0ef622c4d2b6ca37f585ca6c90d4cb6878c5003e2cf4ec3a0e
-EBUILD pillow-6.0.0.ebuild 2800 BLAKE2B ee3282b7f19849e8921180b871a9acd56e166f7371f5c3c237367daf78f91073cb8634b395ec2b4471418f5e6d96b2b0a086a020b7132eb33ce34555195d02ed SHA512 8f0897b09bb3999db596127d92336a6b6bdd181f3a5e863e60597a60e83ac0990b8907504faa22ac7415fa74d6c2876eddd856f9fe613c6d686e3bfff038f054
-EBUILD pillow-6.1.0.ebuild 2810 BLAKE2B 5ad74bc69f30510864919cd957522ebf11b7acbf4f3fdb3023b2a720a023243a1040d3b269abc1958baaaee86f1643a54d9a32750f244d4691bcfe919de12af9 SHA512 3d0f3dfbb2d581e85417079575ba5164988507b009234b2ab2ffe22de52c5ce8b3740eee1170700f8f2ad699dfaf251971e3861073a3e55a8543782946fab9a0
-EBUILD pillow-6.2.0.ebuild 2809 BLAKE2B a1815519b845c7991d927275b429cbec0150fecbd58d65c0419e0c95e62a409e051e497e727ac3c331e4ee529086d176718db7c19688e37d5449090ea932c68f SHA512 7d226398eafa43935a293474a15ab2eddc972cd6844e3fe0b701c0ca49ca44a1e2f8ae72d3bb3d006f09710fe66ab54f67a54efc179f5dae03a6f108b7b231ca
-EBUILD pillow-6.2.1.ebuild 2658 BLAKE2B 4d9550bc49fbc1caaffa7ea4fac533020201e64debbcb38db97b1cc96c6b5cf679ebb0dff740100fb18864ed8884717fe3692d6766569ceb91277a280d596505 SHA512 e7de1fa305ea822fa00cf098782054aa5acb35a745f5db2c77166eff2c98d4ecedb5e34ba352a5522bee773e9a61c99590927b50cbb1c97bf3d6c09e48574702
+DIST pillow-6.2.2.tar.gz 37538464 BLAKE2B dfd9b81490a8adb4e12ecbf6764e4e27573c9a087877ac37275a9fb42b89f0cd8cab8d7ca0b45c9a00bf38ca5b1d83de68f5fc35ff19031bfcc1495ee3a5f5b7 SHA512 0f2c3bfd921247fa11645eadc42e184182a401ccbdb8f10215312e96c8c28f2382f5413b56acd78fab1dffc6fa53cc8588ce960543af65c4769451874c2c918e
+DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B be940cbdced884c33f2b3979be113b1bc8974814c9532fe80203395184f90eccba1cd9a5017fec1f0c30a21ff06abc46560d5c6d67938dbf640f2e8e08b7e554 SHA512 187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73
+EBUILD pillow-3.4.2-r1.ebuild 2501 BLAKE2B da1dce4b7de4981de61256b05f713733c7d8ab1ab15b70f532f0d51c12e355689f2a2aec7bc794a1b31e5ffa7639559b7216649207f0d86ac54bde9e3ab4356e SHA512 c45d1e96b4b2fedca0bc207688884a1d8ae302feb8429c4498025181f514c2d67539450859f96e744788e4ce426e95fa20126ecfcd83825aae24c03bdc3e19b7
+EBUILD pillow-5.4.1.ebuild 2790 BLAKE2B 1a563797081fbc9fd5dcefc7698716638e9d9fba9931bbed0b21fb2498612c6e16954ec6eb13a5927fdd02c5a9a404d521680af2538fd80845a79cfe5472db59 SHA512 1d6bb22a67c297f8d9826a77bbeafe1fbe112228591639526d0035e2bf85d9e2efda69f9a28ed707f43ff71738f1e945a5c9ceccabd4719580bde92e502dff98
+EBUILD pillow-6.2.1.ebuild 2648 BLAKE2B 3a93f8baae33245b32c5d90800a699f6f725d797d1134642517c0ca137aa90834dc19724c5dd187e51d309add143b73e4044c974de351a858dc929e785da510e SHA512 776123e3352e5023e7adb9008c229e625330c772a62ad3f9ffacc6300d88f58b97b963b9c5af40ff62c4a179b985409d42f182a9df4c6e29a4f731b737ddb7c0
+EBUILD pillow-6.2.2.ebuild 2656 BLAKE2B 1a57b5e31cd1c73e201e4b09a24286c00be3196c448e13a7c1a560e7087e077057606b5938c5bb5139a4cc5d3ef4b620ae86561b606f7d8bf951ee3ed786beb7 SHA512 89871307447ac46b0c1a92aae11eb4a3a0e16d498429183a1431d7b15f15b2b369faec94644306f37d0d378df9e0aeee4556c145c3d3ad401b4d689fe28bdc23
+EBUILD pillow-7.0.0.ebuild 2646 BLAKE2B e1b5a4fd0c980780bd16212bb19965c67a3a4d024003d93ccd0385340d13fd46f7ccdeb89ed77770ce9103dd0cba2a2eb82fbfc2b0573450faeba3b58eb02a12 SHA512 22592c3483bab0ddd13546c47f085f0ab5007a8cf7de7754663be31454049dfc949d32d14dde7380e96ed0fa062a9ddb614f494243c7808a597cddfa717d7547
 MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
diff --git a/dev-python/pillow/pillow-3.4.2-r1.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild
index b5c3c3a06952..78939fb69482 100644
--- a/dev-python/pillow/pillow-3.4.2-r1.ebuild
+++ b/dev-python/pillow/pillow-3.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 eutils virtualx
diff --git a/dev-python/pillow/pillow-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild
index b9f8496d9ad4..6d18e5a0d47e 100644
--- a/dev-python/pillow/pillow-5.4.1.ebuild
+++ b/dev-python/pillow/pillow-5.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 toolchain-funcs virtualx
diff --git a/dev-python/pillow/pillow-6.0.0.ebuild b/dev-python/pillow/pillow-6.0.0.ebuild
deleted file mode 100644
index fd37a520efdd..000000000000
--- a/dev-python/pillow/pillow-6.0.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.1-{pkg-config,toolchain-paths}.patch
-)
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable zlib)
-	)
-
-	# setup.py sucks at adding the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but this setup.py does stupid things.
-	export \
-		INCLUDE=${ESYSROOT}/usr/include \
-		LIB=${ESYSROOT}/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	virtx pytest -vv -p no:relaxed
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-6.1.0.ebuild b/dev-python/pillow/pillow-6.1.0.ebuild
deleted file mode 100644
index 64b1c01eb7e1..000000000000
--- a/dev-python/pillow/pillow-6.1.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable zlib)
-	)
-
-	# setup.py sucks at adding the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but this setup.py does stupid things.
-	export \
-		INCLUDE=${ESYSROOT}/usr/include \
-		LIB=${ESYSROOT}/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-6.2.0.ebuild b/dev-python/pillow/pillow-6.2.0.ebuild
deleted file mode 100644
index dbe4d52efc2f..000000000000
--- a/dev-python/pillow/pillow-6.2.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-REQUIRED_USE="test? ( jpeg tiff )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable zlib)
-	)
-
-	# setup.py sucks at adding the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but this setup.py does stupid things.
-	export \
-		INCLUDE=${ESYSROOT}/usr/include \
-		LIB=${ESYSROOT}/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-6.2.1.ebuild b/dev-python/pillow/pillow-6.2.1.ebuild
index d274e9829a3d..8c3b3fd995ee 100644
--- a/dev-python/pillow/pillow-6.2.1.ebuild
+++ b/dev-python/pillow/pillow-6.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 toolchain-funcs virtualx
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-6.2.2.ebuild b/dev-python/pillow/pillow-6.2.2.ebuild
new file mode 100644
index 000000000000..1e93fc0e069c
--- /dev/null
+++ b/dev-python/pillow/pillow-6.2.2.ebuild
@@ -0,0 +1,98 @@
+# 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} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+REQUIRED_USE="test? ( jpeg tiff )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/olefile[${PYTHON_USEDEP}]
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable zlib)
+	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/pillow-7.0.0.ebuild b/dev-python/pillow/pillow-7.0.0.ebuild
new file mode 100644
index 000000000000..04853bc300ad
--- /dev/null
+++ b/dev-python/pillow/pillow-7.0.0.ebuild
@@ -0,0 +1,98 @@
+# 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='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+REQUIRED_USE="test? ( jpeg tiff )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/olefile[${PYTHON_USEDEP}]
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable zlib)
+	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pillowfight/Manifest b/dev-python/pillowfight/Manifest
index f8f39e2a4cb4..981da6307b51 100644
--- a/dev-python/pillowfight/Manifest
+++ b/dev-python/pillowfight/Manifest
@@ -1,3 +1,3 @@
 DIST pillowfight-0.2.tar.gz 2628 BLAKE2B c0bc947b679a5372e3af722a3d2cab97b0fb97a245f6319c7ff10cbfa5409fc7c2f325b7f65fdedbbdcc2ad2bfff8d426c3f8691a24be77760eb427cabcb0c40 SHA512 2eff2fd0bdf5c02513ddb4838675e7b9f392135ff08a784ca2fedf06c5b96a56af75460559066cc6cded65f3d4da087ac679492b7b1dba23fb557e6ac3565e6e
-EBUILD pillowfight-0.2.ebuild 539 BLAKE2B e175aa1ce3552eb98ef2b0e7ab67dd771b649ac0309612fc758729821fc75836eb97d616bf00b832b75dcc699095343b20c1b7a74a520bf49b30d72d41abb581 SHA512 d3f3d618b3deea724bdd0245059e66890749a369f962156ea69f98e46904519250a1ec50f56fabe8e66d89468e444bbf70e9f58833a830d299b29e54d661fd79
+EBUILD pillowfight-0.2.ebuild 520 BLAKE2B 0b118800e052f582099f3a68f896030040313d572c200b21ceddaacc819a8cac96f3e6b18a139baa36619cf83efe1b5b73523348e8dd45ca332641a6611c72dc SHA512 ea7e81cad14cb5680f2c9cf206a1c3cd2491475fa03d85a29d9ca2dad65fbc5072ef111b77c5413614f984a87aeb8781956ea229f0546ac92ac314df3ba1773d
 MISC metadata.xml 388 BLAKE2B 2679d6d0ca4a4c6f78a35498cd13379bc0b065643ce29205f35b66a31bea52fd5986c58225acce1bb1f27e132fcc6897058f0d0dfef1b5a123bfa3c398dbc710 SHA512 63a6f23df5433c9c251cb2ef9d4a2f88a1eeaf390b88b74ed8e80468b81de9537fdcbfa9d8a62109167900ed72cd503de495283d84e1b5fd22892538e2723950
diff --git a/dev-python/pillowfight/pillowfight-0.2.ebuild b/dev-python/pillowfight/pillowfight-0.2.ebuild
index 909dcf5742a2..40b647ae018d 100644
--- a/dev-python/pillowfight/pillowfight-0.2.ebuild
+++ b/dev-python/pillowfight/pillowfight-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 04d00b271a7a..3c2788b1cee4 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -13,10 +13,10 @@ DIST setuptools-41.0.1-py2.py3-none-any.whl 575966 BLAKE2B 332986453a35e4ec36ab2
 DIST setuptools-41.4.0-py2.py3-none-any.whl 580302 BLAKE2B 58dc2d48445406f7467bfb0934dc507e8a569e4759bfcc95287cfb21b5b1a7bcab061656a29a8b4976ee3ae12a3adca570035ae4a6d9df09ae7a799857775d36 SHA512 a27b38d596931dfef81d705d05689b7748ce0e02d21af4a37204fc74b0913fa7241b8135535eb7749f09af361cad90c475af98493fef11c4ad974780ee01243d
 DIST wheel-0.33.1-py2.py3-none-any.whl 21496 BLAKE2B 41bb9ed91d43f94209a010c286d541da9d68b9e727ec8a339fe3c24fb806746b1de5b62c6cd26d2c2841be17406e1f99353b6d172f5258540faeba014945e9e8 SHA512 761ad8cb96557b146642871e1f8ce75849a9828193d992a19d072236b9f8452ab54907a3b82bc7441f75f036155ae21b7450120e0c4c19aa5100b58337945ac0
 DIST wheel-0.33.6-py2.py3-none-any.whl 21556 BLAKE2B 6b6124c1e8e70592399a90c88b2a70efc5885bad81d2ff07a2e243eee008ba5cb0c927454036915a61e97489e29fe1abc4ba2e63d7eadf1a8985c8a8b7cdf4c4 SHA512 4663cd55ee9d3de138216bb06870606b546b19cb6a733f1beab211c0ba72e63d849c422d320ddc8aa8275ad04a30119a84c1351e589150cd18c2a34f9fdb224a
-EBUILD pip-19.1.ebuild 3481 BLAKE2B 760de9a795075cdc4a2c14a570d821f653e471864da78fe87705802aca9f053168ce0a64b86155c71812359f33e2d1bc5be38b08eb0032fb71332e08ec57e324 SHA512 2fc882c9d65b9cd8b1d60fb5e89d2c9e23849f15fd33cf4ae8f4aee2398e71789e2221c040be80afd2bdb53b1f7a62d0a8f630d15e6843030fbf71d5a18d35fd
-EBUILD pip-19.3.1-r1.ebuild 3850 BLAKE2B 95e9b44d0b2cf318212f269c4733d93412e22c2b68485a599a9482233530e1362013653aa71afe2b495b0e277698eb909887858c27c875278c536119d71eb51b SHA512 0bbe5cf7c753a0c63b25f93849509fa04028f05384d6ecb836659f719767d7e5246b578e4dfe9d0c54a942aa7c5c297a63a25ca4dcb1067d785c5f9eadd8ef7d
-EBUILD pip-19.3.1-r2.ebuild 3815 BLAKE2B 0164eb3c3245c29ee00200bdaae841745ff09f1a6e5cfb7688b2b517f01a2c6be509b24a5e3658a738094e244ef8f6fd9d8f55880bedfb03532e3d033c2bd952 SHA512 5f9e32098270620af2fe91c71e1dc251102f3f825e0dcc98fd166702b614b37c62d63eaee0dded745af9ac938fcb8e40b71700e1c804f618d9bb6976b1f357d6
-EBUILD pip-19.3.1.ebuild 4029 BLAKE2B 2a10677d9a0f72a4d883284d635d0b83892e07149125d007e5610905a1df443b940df8f942574882510221b57b952c7dd0fcd706edf136701c01a7dbf6dac3bd SHA512 3a35237038bfbc220fcc7961349533aa179e9a094d6c9d7a49dfe42d5f22bde247adad7032192712518827ed0f45a92e85a0132359664eacdabffa49c5507175
-EBUILD pip-9.0.1-r1.ebuild 2331 BLAKE2B edca4ecfeac1bc3bffbb066b83fa87669304ccd59dcfe165fd4cb207f8155ba2836df80a2e15c954ae5513b060fc9bab1df1d5a15870815f199bf51e19781b50 SHA512 711042823b41c10c1db502afc046424c71f081c38dc173e5bc06d58de5ca57f2e3106d4ef24134f8e79e557228f63f49c91eee1e037a2416cdfdbb592fabe221
-EBUILD pip-9.0.1-r2.ebuild 2474 BLAKE2B f9f8713be38bd3316e6fb37605b2efe913b759c1c8530ebdef06c3172ef3d13d09e3d4e251f082c167a0c56773195da830ad6f7148e69c0cf64affb748964b43 SHA512 69f38fdabaee85bf23a8f4302d77a7e6cc65ffa2bc1ffcbc7f598144002c5f59072ea24b21fbef891f7145d6a129fea3b45abbef0b90caf004c5264f01f5a4c4
+EBUILD pip-19.1.ebuild 3476 BLAKE2B 72694b9acd70570e68490dccbd0b263768336257df6d1cf9783a76d66bf303630c9e49cbedece735dbd8f04e214c7dae1ac9678dfb9d3d12900e97a7cc682ab7 SHA512 8fb072517f1f740714e0b08355a2639fa0507b83cd9f6effd031d4dbfdd784bc8c682be184719319f6c72b609fc39e6206f03274863ae2fd7028653d4e83ff36
+EBUILD pip-19.3.1-r1.ebuild 3845 BLAKE2B cdc6ebc48b4106d79788eb8ffafcf63fcd55744159e6480116710c4b7c29240fdd3e49ecb93ce7f5f197dbb16bb022a4e5878be320257fe2d7c4976283d5daad SHA512 f0accd6e361db491523f5d4def86dfbb45929b927e740272fed3920788569a8076daebc95b3e6df0078eff543f948eb42ee0267750545d1bca41b90d319303a1
+EBUILD pip-19.3.1-r2.ebuild 3810 BLAKE2B 22f2de682ef2963b1329f91648714f702884a33cd907a6f257ca7f10edae001db98039834dfcf4a45890b53f1802809f43b8a50df9e9f00b3dfbf0a48c83169c SHA512 f86b1d627584a4bacb00ec3e58265a982598846b53efcef939935dc6e2d44c2a65b25862dd8f4e12677ec588b4a00e73f2120a2d846c193a835499e4098c8293
+EBUILD pip-19.3.1.ebuild 4024 BLAKE2B 6baac0f72d610819501694414ac31a166f9b0c08afd88a6f3e01361ee3e31db5470cb26e5cc7a1abdd435aca186c9267b6f9795dc15597b20252c54785faf39f SHA512 7cbf94c38e543b78da5e704f349ff8157c2bedb24023670ec7176ee385f73396a6923900fb1048ea604a18148fe47d8ec3115ce553a93fd783206fee12f42d88
+EBUILD pip-9.0.1-r1.ebuild 2322 BLAKE2B db1fe94c11315f7e4ce7bdc557c7584b58ca268d3c8fb27b9eccfb31449e42784ffdb8b302c6a83e07f6e7c990218e3c577d63aad448cc8e7df9c9361acd3678 SHA512 ba006fb6aecaf343d4f95e79890ffd5696228175a4f95f10dd5391664af4b61025a1a02ff6fe1dfd8f1771a53790288660a5bba891e479c18256593cf3a56054
+EBUILD pip-9.0.1-r2.ebuild 2467 BLAKE2B fd324e0b25678bf54e0fa1b7501ee3d3965e43b281dac481a66e8c1f666fc5f22a9fce0e6e2a6267e3e728905c540640cadc1c29372c238738c9deb46399419a SHA512 629fb863ac7fe86f14a3a47a7410ad43fe2517e0c7b5fd838f714d50d99e6c9b56b39fb3e5040d4fb6d1d734851e0ee1458ebf39f5b53d763080e3d7027f83a9
 MISC metadata.xml 366 BLAKE2B 6cfb3fe9bd6fa72a5bc5aafb74d7f79eaa1fdf273cf45be4fb7989fd917ea8b1ad60a855770cc51944611e7590abeec450ed02c7c9ae8d850084c2b4f7c0d009 SHA512 43ccb12f2797cb70b59ff495d149c32c813e5145c65521eda9a86f675eac7756eefadeb9f4ca977e8e8c7019bae144b445240e6d7128da771eaf6d19559336f6
diff --git a/dev-python/pip/pip-19.1.ebuild b/dev-python/pip/pip-19.1.ebuild
index 4ead19048113..f0c3d00ba9d7 100644
--- a/dev-python/pip/pip-19.1.ebuild
+++ b/dev-python/pip/pip-19.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit bash-completion-r1 distutils-r1 multiprocessing
diff --git a/dev-python/pip/pip-19.3.1-r1.ebuild b/dev-python/pip/pip-19.3.1-r1.ebuild
index af825b576635..10543a992052 100644
--- a/dev-python/pip/pip-19.3.1-r1.ebuild
+++ b/dev-python/pip/pip-19.3.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit bash-completion-r1 distutils-r1 multiprocessing
diff --git a/dev-python/pip/pip-19.3.1-r2.ebuild b/dev-python/pip/pip-19.3.1-r2.ebuild
index 6e7219b27dfe..507b3e88684b 100644
--- a/dev-python/pip/pip-19.3.1-r2.ebuild
+++ b/dev-python/pip/pip-19.3.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit bash-completion-r1 distutils-r1 multiprocessing
diff --git a/dev-python/pip/pip-19.3.1.ebuild b/dev-python/pip/pip-19.3.1.ebuild
index 8a91d32fe62f..f060898b7fcf 100644
--- a/dev-python/pip/pip-19.3.1.ebuild
+++ b/dev-python/pip/pip-19.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit bash-completion-r1 distutils-r1 multiprocessing
diff --git a/dev-python/pip/pip-9.0.1-r1.ebuild b/dev-python/pip/pip-9.0.1-r1.ebuild
index a97ca8facdc7..a5b251787952 100644
--- a/dev-python/pip/pip-9.0.1-r1.ebuild
+++ b/dev-python/pip/pip-9.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit eutils bash-completion-r1 distutils-r1
diff --git a/dev-python/pip/pip-9.0.1-r2.ebuild b/dev-python/pip/pip-9.0.1-r2.ebuild
index e6e368808f76..c11f49132097 100644
--- a/dev-python/pip/pip-9.0.1-r2.ebuild
+++ b/dev-python/pip/pip-9.0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit eutils bash-completion-r1 distutils-r1
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 95df26c341be..76d11419f2ae 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,5 +1,7 @@
+DIST pipenv-2018.11.26.tar.gz 6560580 BLAKE2B a3846de696733b5f3f393163999d7f333b52accdcebadfd800507defd1108ac4ccb288b39fb805ecf03e417cfe0d1a8b2fc714a95e8ee4485f8622ff8fe4a1ca SHA512 59582ad4a0730083ea58867f7a5d9714290d62947f56bec80e154d4359fe1dff16e44974a7fba3841e5f2516f2ce9709baf9954c9fc40fd66ebc46c3060d4dea
 DIST pipenv-9.0.0.tar.gz 3859618 BLAKE2B 138e53b1ef08d036f4ded6b4ca9da1a88084ad3d987aea1c6783181de414f7b24a54d46b26c2171f0918a1b1c22e2dac983fafad8a80f4aa95f93979bebfe2df SHA512 ea2d5ada73288a5d20473d769e20d6d195f65c3d3aebe2e52a43e1641af916295a18810bdb74a611751e773bfdfbc0ea7190d61358dce66d4aa33fa4a6f6131f
-EBUILD pipenv-9.0.0-r1.ebuild 887 BLAKE2B 4275ab6a9ed9982ec15c85f106486be4d4481c09d7a587d1cd489e241a532ab61d42be8828c71b8c742e4063ddfe34bbb5078997a73cc65714c61913923afbba SHA512 4399e2faf7e3a7ac93583ae49bbfe1ae4ad6cc182e5c0e63e70af06fd910a99ce7af09d3988d6c186cf85682560b961d7a0244ea71b973d0e684a95c7b8b1197
-EBUILD pipenv-9.0.0-r2.ebuild 1068 BLAKE2B dd260ff5b284db965a04281855473ecf398a8a78b2cf2949559a2d4e81d633e67397f580c1f0484eb700ad625fd4bf236af9280cb6c7e15ab3ddec30d8fb7f58 SHA512 4d83406c913a453e787ff09afe2f4c37c46d5b8ba96d6efb5f329b478b48db8dca9f1fb54f3a26f55825ef2161139e057bdf1302f25a642dcb37a81272d49bf8
-EBUILD pipenv-9.0.0.ebuild 899 BLAKE2B 5ec0d45e704e90cf8ca90a8d94e8ca8714a34128772c0295297b2709a27af44d45dd62f17c620830439d969501f9274e46a3964c33b5456b0cc41ba673ee8fcd SHA512 29a45a0a6e6c1c201d5f7769a4821ca56ff6dcd504f143dcf1ffe32cbc981fb3c76896f5904030be3560fe496971cc4c576295d300bf44102c8ca3706210c7cc
+EBUILD pipenv-2018.11.26.ebuild 1337 BLAKE2B 9416b0846e233457d3a22acd363fe2ebd951cd783d4a4c8d6cfee4260f4abc814368b6837c42c736c6305be95501e8b1292d8fcce04facb00647760649c4753e SHA512 03fd951a8ef9624299c0cd51ddb5acd844295a5e96f4330047ab7333605f1a36b0c790f84cd5a86da8b4491f11713d888e41c8b15300e2a2a6b6722ab8b754b2
+EBUILD pipenv-9.0.0-r1.ebuild 877 BLAKE2B e877b35dc2ec6b9c500763c243ff9b8a10a8f3c455ad13cf4fa147effba0be8a05cf30d5eb5d196bfb7e15a94f7afd99675b6e96c1a4cebea03b29429ede5116 SHA512 c0a0f17a4f15d4e158e846dc4d842364cbdb8736ca0430151250e7e053cb4b75d55c1ac16640b67b1577fdeead27a8c43e2f4cff26a7cf1ce3c8b20831069ea4
+EBUILD pipenv-9.0.0-r2.ebuild 1060 BLAKE2B f98565caf2bd8a2d6bc123eb31c6be17aa2815f9473423edaed50ad5b25f41f9f8b94a53e087c484c3cbd4b3d3874a354fd5581b01342ef5dec6c983cf1004b5 SHA512 d361efd68335e9b54ce7883db7ffdff470478644dd13e0990bae57ec7ec4a38000fb3aff224e4f5de2e826d37cc3fcba6be28bd32bc3b28ed6e96d00b9fa1c92
+EBUILD pipenv-9.0.0.ebuild 889 BLAKE2B ab602b85c1cf96dab20720c3d4c82ffeb051c9a710f77a8077f9380f1ad4af2db2621309255e0658c414172cc5ecf6aa4898531841bd129d3d058caa0c50be71 SHA512 9f8924aad736c665a37001962c53a8c600f584995d8481149ae23b08e7c95c996a958fde8aa906f03ed18b2f67a0e71b5166fe09e58e8a3dcf1039f1d8e2aeb4
 MISC metadata.xml 445 BLAKE2B 71ce759695adf862ea00805dc1865487ae2b4bccd94af567240463b8935463010c4c8945fe3ba58a216afae1066de9b8659ea0ec216128c9017ec42e52bed3c9 SHA512 15d259d0f38fbee2fb0d9765934eddc46c8bb1a6da7fc656f3b2b006c74aa1b0ffd8211e9d9c23f241113a8ae3a333708acbf351fa1a150084b127b4eab88795
diff --git a/dev-python/pipenv/pipenv-2018.11.26.ebuild b/dev-python/pipenv/pipenv-2018.11.26.ebuild
new file mode 100644
index 000000000000..c247869dfbe4
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2018.11.26.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
+	>dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep 'dev-python/pathlib[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2_7')
+	"
+DEPEND="
+	>=dev-python/parver-0.2[${PYTHON_USEDEP}]
+	dev-python/invoke[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# not completely packed
+# requires networking
+RESTRICT="test"
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/pipenv/pipenv-9.0.0-r1.ebuild b/dev-python/pipenv/pipenv-9.0.0-r1.ebuild
index 11ced7d2d917..29826767a98c 100644
--- a/dev-python/pipenv/pipenv-9.0.0-r1.ebuild
+++ b/dev-python/pipenv/pipenv-9.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pipenv/pipenv-9.0.0-r2.ebuild b/dev-python/pipenv/pipenv-9.0.0-r2.ebuild
index 30234d8c8e80..141a489a64c7 100644
--- a/dev-python/pipenv/pipenv-9.0.0-r2.ebuild
+++ b/dev-python/pipenv/pipenv-9.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pipenv/pipenv-9.0.0.ebuild b/dev-python/pipenv/pipenv-9.0.0.ebuild
index 9a19b2e5813a..32a7a8be7471 100644
--- a/dev-python/pipenv/pipenv-9.0.0.ebuild
+++ b/dev-python/pipenv/pipenv-9.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pipfile/Manifest b/dev-python/pipfile/Manifest
index c42adecec232..9923b8b80fff 100644
--- a/dev-python/pipfile/Manifest
+++ b/dev-python/pipfile/Manifest
@@ -1,3 +1,3 @@
 DIST pipfile-0.0.2.tar.gz 17395 BLAKE2B ac86dc6a725cfec0e3d23cd24ab9cdbaa5c803b15916e03e6d2a1e371eb137e25836e78b3393bf6ac42c6d98ebf85fd4ccf29f63b8ab9b87cdd4828b3499278e SHA512 070986a213d0d42c3f5391b303ee0c4a588269ad1889c79b6622c1a9817cfcec4365b8764dcd208aafd78394890d3367c7c9782e65dd3f04ea1bcce001f164f1
-EBUILD pipfile-0.0.2.ebuild 668 BLAKE2B 3b603a39a14e883b67506a441f73955690f25b4a6b3903b10a2186b880f5e5c9b8890754a29853986b1c0ad848c78db1cbfde988d8e13f977b01486cd762b84d SHA512 4e7d94684d8ae0ed66e7a538d8b8ef5af41efdfb2c2c7775248da8669e797000fcf16da6f83e60c52962d698508824ec18f5701a83c8c4b1d35dc668b66deb1d
+EBUILD pipfile-0.0.2.ebuild 682 BLAKE2B 41d201afa31a66e1d1c6053a38abdf80e80d302b199c384013950caff5e3f49eede9335749e8ac3f13f3b0a74392107dc57e7d2ce0d655cbf678ff55b2a1ae5f SHA512 c44250fd0048d4ed52b6a58460ce484be4d882d4bf741db27a60cde74212d4e2012237484a74d06cce933422221827a3f6414ba658a1c236a005bc699ce7eb06
 MISC metadata.xml 374 BLAKE2B 33a0b13410d7700b88daa529d089d32088b734da535af09b4b721017fad386338323207c58d94d517762f617d1d73a8e4bec44a5fcfb503ec8af83a65427e047 SHA512 7469685c63c03c2dd25a114bec9c2c3c8531858e45bc880f5cdc6066a9c22a7ca73d1be0d8ffbc5eabf3ca28ed80f17d18f4eaf86bb54ddd888a1fbcde53a49f
diff --git a/dev-python/pipfile/pipfile-0.0.2.ebuild b/dev-python/pipfile/pipfile-0.0.2.ebuild
index ec951ea5c9f7..f77832ab30f0 100644
--- a/dev-python/pipfile/pipfile-0.0.2.ebuild
+++ b/dev-python/pipfile/pipfile-0.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pypa/pipfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86"
 
 RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 2529f52904cb..fad03d8653b8 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,5 +1,5 @@
 DIST pkgconfig-1.2.2.tar.gz 5305 BLAKE2B 39fe5e05489e4eb8fefce66f23820d96039f5dfb82148e8ac2d691644aa2d4f1205bfa483f9fdc69837b7956834d1525d85281ba6aa0a0c079748336d47708c7 SHA512 88cfb27755297871c500f37c422da5d4ae30a14e0b9974afbe63f22c59746be0d175b65d9e3d2ed315b4d942046e7c18be062aef914199c99070a2767699848b
 DIST pkgconfig-1.4.0.tar.gz 5915 BLAKE2B 17ae11783b6642f6c8e726b42b725b7904ea282829b4527f92daa1e6ea43c3c126e6ef7e29fe5eefc89b40f3b69799087a46df6ac5695a593903dab9dc247c04 SHA512 8a270449b7b8b850aab9cc5774d1d6c6b68254f00157b66530c15697eda214948d3a71a75725067d63b906a9c3b1d789a775ac15a1094ff5ba3f227bcd666528
-EBUILD pkgconfig-1.2.2.ebuild 724 BLAKE2B 72f24dc2b555f0e72a9845c13efafb0476cbe9d2b7c7f45618912e846d678a156c3f09d16f70466d0a323a6105e1b647ad5716b6db6125bfeaa058b5e0e2600d SHA512 dfa3eb4c48c40f6d1b72c8493254aab840389dadcbbde74c0f7481cb232abf052066867e2b3415a8fb95004892836acc355157b37127fb8b16784fec10169e84
-EBUILD pkgconfig-1.4.0.ebuild 761 BLAKE2B 6c1435ae04059e9eb9d968a361ab6cf8e4bf88ee3e255331b59ca5b9816622b3afb1290f959181eee30b562cfbd9c4d87d37736c92ab2bf2bd190ab76fcce659 SHA512 ab39f94fc6d1c6b7e8ae480d2ea112a648c54985a4d4f5b7f69c5ab0fe5b32ecb8dd010ad6404288af8dc7ee5a5cb2b74597e95078f30c9b05f906679e49e6cb
+EBUILD pkgconfig-1.2.2.ebuild 715 BLAKE2B 133f73d4e7494cff98cf95065090fd4b18b8c0d5e6a8ea0f402e42443a3e1e9cf991a63773c49cdea6f1b55ca0d2236f3b4636730a86e53c6c96621ee68f118e SHA512 e682337f8ececc22e261283a72dcd306c0ac8ed52ba5ca77a6ae5f4531ffe29d582b60a00dee473c987d8ce794ffa42aaec7e1ff10f5cbfbd2b8a836387d20d1
+EBUILD pkgconfig-1.4.0.ebuild 756 BLAKE2B b094210b669e4c94bd96fec52f229b6c291bb58e31ed9ede4c12277d42e122ec4c57b02f46df63deb31775595874b77a36d0fd1190ff5c6bc0947f70e6f27efd SHA512 ea95483100e4f64d0ccfaec5020ca5e4fe7ccca1ad94b7d4781cde9a8dd71c0a5cb7687c2bb63df8c5b6a5793e3c2066f562e87839a7ae38e47f957998f9d31b
 MISC metadata.xml 379 BLAKE2B 6d974351e99e999b08f6c18b48ecd4dcafb45452f724d6d038a2307a205ca00f300bf1c60761bc9e63726426f499c2622673dd677afb263c957fb398f264504f SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4
diff --git a/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild b/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
index 85eb9dcd7059..5799dae24cb8 100644
--- a/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
index f41c378e86f0..ce3dcb6f80c0 100644
--- a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 4e2823c55b86..18c7f226da3f 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,7 +1,7 @@
 DIST pkginfo-1.2.1.tar.gz 31072 BLAKE2B 57ce5f6147b97af513dfdc6137180e5561822096cdbd21b673c49522384622c58f9eba8c65f24b54bc1e76dc0c6feede5d43e8aac945d94ffe79ea220e830470 SHA512 8a530a164befdcbc6f1f550e106880e14e9d2c762a5e1055f926ccf0228d9e2312f11598454ef015e97dccb78ac7aeb7309f34279590cd318c19c2bd9a29ed2a
 DIST pkginfo-1.4.2.tar.gz 33539 BLAKE2B d3cfc6bf7a9e748902b1f63434c745d8abf4e144c0a2b5d7a90236bfc2ce7f94922b0e08e5a08b13ba2025159bd90fecee25d9abdb283e7d52de0d34386aba59 SHA512 536628a2a2472e999695a115449a76f971453aea7ac3a08f10d9b08dfdf4a7b8e67c6010c6f18d300472a6afc8dff33331c955cc2f7bdb357504cd6a36390da3
 DIST pkginfo-1.5.0.1.tar.gz 34496 BLAKE2B b5a60e3fe2408283afbdebf8efa709b7b1c96b82ddc76b3fbc4d58d544c2170de1434525fe2e324af9864332c6570885b05a3d8ec2c248fbff20984d2ee80a94 SHA512 319bb403970affd5a4222dfdb3d17738630d1350ea84e51ad1bebc6c8c72e0dcfd69a4eaf5e7bd156b8e605d806357922c05cc994dcafb01b7a33c617b2df447
-EBUILD pkginfo-1.2.1.ebuild 1397 BLAKE2B bc97ce7a875fb1ef331a66d0ab313f2d0ee6e0fb0a9d37eb0b4894ffd625255b015a7b19ad0468b46be94b7dfe8d9503ad65d7749c58df58afc681a94c45b874 SHA512 089a8496ef1f1b639e3f0bab012545a6017b19fc19219571e1ae4808c96fa76665f39e4f8d7232e7404220d7ca533721d9f220b52d2151c85c225070407fe5b8
-EBUILD pkginfo-1.4.2.ebuild 1350 BLAKE2B 5c6e48ad19eacf833c739943baf8e5c3f22da248fabc17227156eec5f3a8fce317e19f58c1d60cfa5442d4dc5c86760b50b4f293412f677643449cbc7a941ec1 SHA512 d0c0dec02840e620165dc4b5e09119b3e306ab2f4af1663de2f137f2a080e791eb40443deccf5cc8255b3e784c5401abf1175c12ae3f94c0eb7ed5b704e13f6e
-EBUILD pkginfo-1.5.0.1.ebuild 761 BLAKE2B da6299d79781eb1227d2b6b8e318f5b6aa6e47ba27d1e970738b6a2b1e7997f51356cf810b7e3889b1653bbcf3d64c21b518ddd3ffcce0267d010053f816191c SHA512 3fa81470d060fc95a6913c04b6a0fd9bc6d739dfae94004ce8b211f3b952423af28ac78b9a2d5fb550879729072e89a8f69446b93a35cf3a5a258083e0bf8a03
+EBUILD pkginfo-1.2.1.ebuild 1390 BLAKE2B 51c58d39105d699358a23b48a0d6f7cd54b5ef8ad04a8e4c3997ed29aa95849fde781e271ca27dbf48d0fcfd342af5a6e80fd2c9759d504b68b8353a451856af SHA512 add429cbfc58fa8c76e240aba93b75216e922542d5def681afe09eaf71e308a8cebd58be4d84eac0d625c2186db2b1ae8ab4a1033a52c67d1e32f211b3056c12
+EBUILD pkginfo-1.4.2.ebuild 1343 BLAKE2B e3cd6deed1c90e0f958bb80f2a3c7f92b6c8fae552bd69cd6d8d9e874f9f3c0890f68a889c81a0fd558a2327135fc1ddfccc031e948554a121c639435ddf5a65 SHA512 493cea3662910927f3d24b33e3214d9a46ba99986a34ad5c656cc3b708c6ab8a2a08021f4cd3d3af70c41d4e71df15f1ac2d3aefeb7264d59424eac1736bdfde
+EBUILD pkginfo-1.5.0.1.ebuild 756 BLAKE2B 735c523b52991ce8e848460c92e1acdb271c59449be1d750d1235c5dc54fed56adafc0d57972045241a4b2d573734b89ceac0abfca82f842bc15d4a48ce2cc30 SHA512 fbf6407e470c60e8b8e509c6d329251414231c580ef7142dabed130efe822541f793c6f6b141b1b0697420db8d381523d220072588f424f82e69f69d80c214d6
 MISC metadata.xml 320 BLAKE2B 70ca2a2666e83f11a892b1c3e155512ebb6992f2b02911aa86609ba66ac72ce4c5af72acf513c92b6a9d542d510379ed6963a94a4a1e16d0909c2461e8b6d5ee SHA512 8f2cf51568e86fb0ebbaf5eb2476f6c7f7121abecec606626aafe5395b2e9530009e77be890d389daa563b6ee47af311cbdeb121518351b0e99da0c591c0502c
diff --git a/dev-python/pkginfo/pkginfo-1.2.1.ebuild b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
index f27bb0b7f9b7..3ca490f830dc 100644
--- a/dev-python/pkginfo/pkginfo-1.2.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pkginfo/pkginfo-1.4.2.ebuild b/dev-python/pkginfo/pkginfo-1.4.2.ebuild
index 8825c2f51116..b2f0a7150e32 100644
--- a/dev-python/pkginfo/pkginfo-1.4.2.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
index 6716367c8a99..7865c0c3efeb 100644
--- a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/placefinder/Manifest b/dev-python/placefinder/Manifest
index a2741ee85d30..44f5c0f4be94 100644
--- a/dev-python/placefinder/Manifest
+++ b/dev-python/placefinder/Manifest
@@ -1,3 +1,3 @@
 DIST placefinder-0.3.tar.gz 2632 BLAKE2B 26aaa5ad6ae0090d909841be4793df2cb632c83531873f3e98ee30d62543c27bb8bc61abc86077146c904cac4782bd05c715ee8f191c8d307a70e38fccf68f3d SHA512 dcff0ec0e6a1ca361a726bd5996095855d289f0780238aa0371835821294799f13c49919e0966495a9f77b5ea18b3be9deb5d2b5efd6ce0cf8803f13e22f6249
-EBUILD placefinder-0.3.ebuild 470 BLAKE2B bb8557f7ca92dfa16d9f3b6d7fa23c06bf18455a0d052a5c771234ad09c972d73fb4316e2d9d469909abb480c2f624877e6e851ffbb6ef823443f4ba87b12989 SHA512 f584defb7fd18ba326e3c85108566bf75d0dcb53c712b52315769db64abbdec60bc808441e3a96178b2c9fb2c0d982c937b8bf727d6bcd319ce8def040ae30a3
+EBUILD placefinder-0.3.ebuild 461 BLAKE2B 58dab5d064fb3962acda6d3988eec580b2f5643c929381315ed667dbf32637d336cf1953302547a7a99c5ad33d64e9bc73be10d997dd5360f361cd07421cadb0 SHA512 96305ce0c2093ddd76944542e63458551b16abe16f4f7cd61217eb057dbc8319d6ea44ade216b4dd0d7a5b32b1b38fc3ca76f028f7eb2626fc67d6c2df44dd0a
 MISC metadata.xml 395 BLAKE2B 7b747923612d66d63dcc424fb5797e14e54cc098e0a032353aca6fc6357b14a849a53feb57b8df8fd8a49778ec5452114810b0a01b960ad36c5b6bc045c97deb SHA512 90d623c763dd2b3948ee444bb88221ca64b38b5af8379dafcaa0f267c4a89cc6620f8efebadbd414be8258a5d21cf437b3b4aef263d9e059b155b7001b7878cf
diff --git a/dev-python/placefinder/placefinder-0.3.ebuild b/dev-python/placefinder/placefinder-0.3.ebuild
index e4fe775df53f..c90637b8c12f 100644
--- a/dev-python/placefinder/placefinder-0.3.ebuild
+++ b/dev-python/placefinder/placefinder-0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index 0f8e20c561bc..cc9f1d10bb86 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,3 +1,3 @@
 DIST plotly-1.9.6.tar.gz 546722 BLAKE2B 5905af517ef40bc077492f01b49c367c0aa03a96accb86ec072e188a43e463c187a0b9dee3d0df33669aa6d600ed9127b067c7099947e5235331d14ce10bf33c SHA512 7564036ed3745fc06ee7428942e45ca6bfaefa1e47b08a5868a918924268ee632515f1de4bf3e90911234f18a4d85b092ecb6ef9f213b939093dcb433a12dec4
-EBUILD plotly-1.9.6.ebuild 591 BLAKE2B 09447fab728063e493c6892767073307a8649bf3e33e00154a63a5a38dc759709e23af089c8f19bc3723c9e482f08ec132864ca1afe8aa7f613b8d365851dd2e SHA512 7e41191aa1449f3888e6ca360ca38376bde8583f6779ba527dacc47a0e2c2272c9641a9f8e507784d0d82d8936429bce50dc7b3dda47adfb6697cf2f15b05bb9
+EBUILD plotly-1.9.6.ebuild 581 BLAKE2B 417af31851a15f9daaacab05b8f2ece2d43e014c61591df78cef90d9c64402461ad81fb3fe35dc9bd21bdb13dc825f3307c62e3615a66695e0c3c47d4974aac6 SHA512 36b10804505a919ff4c796d3089573e1c194df7a116a4f139f8344f60e28fe1c909e9b8aff7990280d51f1ab0a22460c618078527fe96b94cc057f688dc2f8da
 MISC metadata.xml 601 BLAKE2B eb47eb35e1a4e00d798a5483413476bd98e4071845e7271e7a1982e8d0474c9f77d55105952b47d8676230ef1f2c89296172b26729b91b9403d73498be080645 SHA512 6a9af070fbe6fd992fa2131491b742c7d92c8fdc30993d1c92185c5bb4dbd42c9a9f84bbf6a9b710d5c731d820e3610d00258fcc284ea7388e1acf56fd3840b9
diff --git a/dev-python/plotly/plotly-1.9.6.ebuild b/dev-python/plotly/plotly-1.9.6.ebuild
index 38633daae73f..a92ff18c06ce 100644
--- a/dev-python/plotly/plotly-1.9.6.ebuild
+++ b/dev-python/plotly/plotly-1.9.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index f915e25c7cf5..109c4e0b7601 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -6,10 +6,10 @@ DIST pluggy-0.13.0.tar.gz 57726 BLAKE2B bbf473271c1ea6520d71a6dbbf145a2c3b1a2f2a
 DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
 DIST pluggy-0.5.2.tar.gz 18935 BLAKE2B 8e5bbab9ed0c78a0c6da076ad03618e66780f9ff209f4d08223e7a381eb4d7573727793f4543799e0e557991d4edcdbfd22c0565b69814379806912a4631abf3 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb
 DIST pluggy-0.7.1.tar.gz 47784 BLAKE2B 49eb28779717ead8963e14101cdfb830feeecff756a59f080e79e70465d48dbbc6e6100305e8b32031cefb0ba06bb10494f29bc8ddd38d4296016ecebaafccc1 SHA512 e19f6c1b3f2e711df1c8b075a2b802751afd218f1b692f08b2434c01d71c402331ff8c937550fbdfece2098f6d6856422d485f193e188916b365ded2e4087697
-EBUILD pluggy-0.11.0.ebuild 863 BLAKE2B c1b01140b02aa4e50e12e1c13eff24fec9fae2f58f614156b27229ff4b6132002dea67be9cdd22f8abc82cbe3293caef992e49cd872b4aafcb5cdff16d89ed92 SHA512 736333b421c536dd13bccaa8faee2152dc4c5964722671e7198b29780023c628d0cb5ed2627e428a2e03bec9c097103878f76993a5f4682dabbbeafba28194e3
-EBUILD pluggy-0.12.0.ebuild 790 BLAKE2B fa8b4f5139df04a88e9cd623a99743308a6dd7624f1ab4cd05f50f9e5c0b822830b0a2e808469e7b6b38ad47ae09635ee0548a9bc6df737033a6410a6fcbf2fb SHA512 2abf0f8501ad802fe15e0c56e0b01e44b3bb6b3503f3526e4da207895d618dc6d77e1b8e8a9720c3f979b7c1ab732c235d604235803bf8e4c28775956a356dbc
-EBUILD pluggy-0.13.0.ebuild 689 BLAKE2B a5379c80edfde04a228a56865f816703627293d5bc71fd4f1dc0b1835a12cd4871a03d20e18497e8c7f9699b094690180a1277d7aee4bf05f1d3bf07d6242708 SHA512 9d5ca7c794bc98b709c891ebb22ab669816879ad117bebfc99a2085e120f1465dbbc707b999052b9d246ee6f0503c44f272147c1bc472f29f0ba786e79196e69
-EBUILD pluggy-0.13.1.ebuild 689 BLAKE2B a5379c80edfde04a228a56865f816703627293d5bc71fd4f1dc0b1835a12cd4871a03d20e18497e8c7f9699b094690180a1277d7aee4bf05f1d3bf07d6242708 SHA512 9d5ca7c794bc98b709c891ebb22ab669816879ad117bebfc99a2085e120f1465dbbc707b999052b9d246ee6f0503c44f272147c1bc472f29f0ba786e79196e69
-EBUILD pluggy-0.5.2.ebuild 755 BLAKE2B 157077803394e3f1d4d2b050c75a5220ea7a3ec8a1fc48fc60c338a20cd5495c917e87d62c496cb29f2884b7bfab06e380ed8755f5503ef920942dcdd2b922f4 SHA512 26b629a0f49e26ff802e9b7ec1dfaf9e7401a75e37bd277a111d7d83bbc01254dcc59cd3508e008bffa30b3ab40ce4e0a5fe370c90410614342e09c8151ddf63
-EBUILD pluggy-0.7.1.ebuild 921 BLAKE2B 2008e1c6be1628a52af26b05d446bb289d3d932983ba04602170ba5ab2565feb9666362518c8f728bf01d9645fae82b8fe11ac7799f245b738e0b5379b201fe1 SHA512 59f82bb2baed2c244afdd2188764c71112522db91a4782c75f6e534f984d709941c00de1416bc0b385bb9b797b98827e75879ee3826184b7fda85da9ab84b0b9
+EBUILD pluggy-0.11.0.ebuild 848 BLAKE2B 80958b043b2d88b8809316134b1f36cc3f7398127e835c74dc35e7663f9b6321aa32aa9229afe7e6ae94f1b58d8c3cea23d3b3b611542e325f5ccbfdfa5a722e SHA512 37da9447f756ad570f6d564aa4ffef38836e0cf350ce5559eb809a137129c5fa95b774b98618b5e7520f9cfda027f2455a5cf71af57592ca32cb837d430833f8
+EBUILD pluggy-0.12.0.ebuild 783 BLAKE2B 301fb765ffb292678892339680740150f60e7f91f94513be75c230065f7ae315dadbfb87db89356979e53c9099e951cfda2508ecb6877495d23d4ac5a67f93dd SHA512 958411a70cd0f5f7a0d0832fa5cf03e6615d0446f34727f757af4934cac58a7e1e46322988467712738044cb9ddb56683c86c4a43f14f1c09e646325148750e8
+EBUILD pluggy-0.13.0.ebuild 682 BLAKE2B 9bea1507d74098933cc7b5c965d6dbb288f6f469ec63a5016c327588c2cd954bfb43fb5424c9ed69b9cd2faba27d8383cfd8298d1d9173272fba9824c9af9ce6 SHA512 57390c7578d981a2c51a0d34734b82154c0f521d0ebdc8408688b0e112fd09430f4bdaa021664acbe352f844abbaac4b05762e0165ebc665246011eb6e3316ba
+EBUILD pluggy-0.13.1.ebuild 682 BLAKE2B 9bea1507d74098933cc7b5c965d6dbb288f6f469ec63a5016c327588c2cd954bfb43fb5424c9ed69b9cd2faba27d8383cfd8298d1d9173272fba9824c9af9ce6 SHA512 57390c7578d981a2c51a0d34734b82154c0f521d0ebdc8408688b0e112fd09430f4bdaa021664acbe352f844abbaac4b05762e0165ebc665246011eb6e3316ba
+EBUILD pluggy-0.5.2.ebuild 746 BLAKE2B 535ac3c99af0f05174ee709e42e7b9d7cc11b40b0ef42dd0b38f9157b25523d2c7783b372547bc5b8fef3aa2eccc78f26f1a791798b0235f251786a6c560fb71 SHA512 9c35e48e1dc27314417177a7bfa428d3c4b35fd4cefac533c8f197d3979c253280eb7f698f26f65203f788becfbd62b12473e09669c4f5fb98c4b10a87c08924
+EBUILD pluggy-0.7.1.ebuild 914 BLAKE2B ac2cbbd21e5b2aad5f9345327188d2e1fb23800847b65936572c631f83e1ceb590008af6f7b46f52a774b88f88da10589ed935a7317616f232e021d21e5325d7 SHA512 f603affbb5ab5176222ab1c7daf243430191358654c58ddd7080a29da8e8296d263d7ac94a33d8a80bbadeb8c62439eb037c86687093162b759bcbfdf2f05660
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.11.0.ebuild b/dev-python/pluggy/pluggy-0.11.0.ebuild
index 46d0f008902b..e1a6ba536906 100644
--- a/dev-python/pluggy/pluggy-0.11.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pluggy/pluggy-0.12.0.ebuild b/dev-python/pluggy/pluggy-0.12.0.ebuild
index d8ce296fc171..5b1c8ed5e833 100644
--- a/dev-python/pluggy/pluggy-0.12.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pluggy/pluggy-0.13.0.ebuild b/dev-python/pluggy/pluggy-0.13.0.ebuild
index d2d28b6fca6d..a34865771512 100644
--- a/dev-python/pluggy/pluggy-0.13.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pluggy/pluggy-0.13.1.ebuild b/dev-python/pluggy/pluggy-0.13.1.ebuild
index d2d28b6fca6d..a34865771512 100644
--- a/dev-python/pluggy/pluggy-0.13.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pluggy/pluggy-0.5.2.ebuild b/dev-python/pluggy/pluggy-0.5.2.ebuild
index 9c077692884c..d8e9e94b6d58 100644
--- a/dev-python/pluggy/pluggy-0.5.2.ebuild
+++ b/dev-python/pluggy/pluggy-0.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pluggy/pluggy-0.7.1.ebuild b/dev-python/pluggy/pluggy-0.7.1.ebuild
index f2d0a1584808..7e9901100220 100644
--- a/dev-python/pluggy/pluggy-0.7.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pluginbase/Manifest b/dev-python/pluginbase/Manifest
index 2b3a6d8df00b..b28a05fce72c 100644
--- a/dev-python/pluginbase/Manifest
+++ b/dev-python/pluginbase/Manifest
@@ -1,3 +1,3 @@
 DIST pluginbase-0.5.tar.gz 41964 BLAKE2B 84fc187b60182f100a9016ac663856b29587e60b5ef5ac9c51fb4ed99666908a77c9817c2dc5fb64e82b807e635bd10beb5ce7644e31e63262736cc667a7b8c2 SHA512 921ddc7dacb6ad63abc90beb1d1d993e7b15c9cfe21e850a5852eb40735436e08b39fd2a6d83e23f641014ee81e718aca147ef1e21b55f94ce04a64ba7780455
-EBUILD pluginbase-0.5.ebuild 939 BLAKE2B 848b6c07f229e0233212c0059f1e3267d5fb94f6ae45e49d82aa93e4e3a6889a1179907ba084a29c0dd72d442188beafc829582e54fcfc170baf0f0545b602ef SHA512 7c06875096b7fad210ee338e36c5f10e233a62d91c7576a7627b3fad721d2b4ef1dcc897ef3830f18a36646dea90275b9daba3a9cb52f0988200104c9482d26b
+EBUILD pluginbase-0.5.ebuild 945 BLAKE2B d67d8a3db8f98f087b173dd1d969d1a8829643016211038a62161d216b2f435c848f1d4cf204ab0470c91144203de117e6b4731ccfa81ab3ca510c09b1648c9f SHA512 4f99ed51d75fcd3cef15e0da3f64316c02d88fa98a16188c45e6226e2dcc0786595b02def9e5f59b5eb8581bc447b9f5a7550048984f8fef0478c6c5523a9bf9
 MISC metadata.xml 385 BLAKE2B 0b58f71f7f6e816ba3b2c41212f371d37b0b09b38fc69a1adcdbab7a4537f9e9e7c5c0d9505e5dc72d219f30aeb5a3739c7f58bf4927f75323bd2b34e25733dd SHA512 166cec1bf4ad16e00b937dca860dedef5f8f766c1e3edae03dd29753ad9590843601723243e702344d1d4853b4d1a87c9c0960f9b70ac3dd4ad40995333516b2
diff --git a/dev-python/pluginbase/pluginbase-0.5.ebuild b/dev-python/pluginbase/pluginbase-0.5.ebuild
index aa79a5454b2c..d01c4571f584 100644
--- a/dev-python/pluginbase/pluginbase-0.5.ebuild
+++ b/dev-python/pluginbase/pluginbase-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 1558914362e9..d4d8ac06d3a6 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,6 +1,6 @@
 AUX plumbum-1.6.4.patch 1521 BLAKE2B f65f963fbba8f8e585b8bcaa99f3cc377f485867994294d0116380d61d05fa0ff509f2df07e869fc12fb817d8c0ae3c97c9c71cc65b3e028eff708ac82565b09 SHA512 cd054cd97f055c571b627bdb54b4644dca4653f06efd9022a74cbd632486f1fe3cec65969168895aba85bed4bb0e060bbaf11009d31d21d9537dca5b4f29a539
 DIST plumbum-1.6.4.tar.gz 88041 BLAKE2B aadd929fc6878bd49ac3169b1b4235140d08ff452eb5eb61e43f9ad869ea867916d76ee7f2befb68e67cdd9d9b19c364d6e02810866f6ba5022cf7064d240786 SHA512 26110741251d75ae9b47f522aba38e8af7a658d22900b1487b3f6e4e6971e4682283003e674f40345e14dd4103f6d485fc569348cc1245ac0440cd04688abe99
 DIST plumbum-1.6.7.tar.gz 90911 BLAKE2B fbd7399962288826c9b1aa9eda60e93d2257b02c8d14adda02cd1c6a895941b0adda8cb844b2137e3235dbf5ca7ebfe7e272d3cfafe7e3df8ab3668be75a4fc3 SHA512 70a80a77eb64e483cf0444745a4c05c8599711ea578a61fe3969edceba4a9f68ca226c6d8cb65995ad36f3d6423326af887816c5ffd337f20279dfff47cb59b4
-EBUILD plumbum-1.6.4.ebuild 498 BLAKE2B fc648f18bdd2919185b6cd3f4e7f91f5f43bf9e36fcfff07b7fb8ee9e65b50bd64ea21715896f1f454d680949abda63a2dc06d984b438efb1485f132ae51f573 SHA512 60c8398f8171411cfb4a583c0724d12184c140069a357eb58faf4d97ad024476cc2546efa753aefff1ead95dfee750f99b0c5ca92d4bf34a2192256600922b5f
-EBUILD plumbum-1.6.7.ebuild 465 BLAKE2B 500a257a6e817f897270db29032afe940ebdda9fe14fd05d891ae3943dada3071c8fc44cbb6ca1e1666f656011c08971d103deeb8bd2770181c82fcb164e2d40 SHA512 d17923cf45f1442faa93edb11901022c11a3af3689c92d9b5c1fd9e4e8c640645873c68774a2a90c69c4d95dd23f21fb49ddb84da681fa1bd4463b89acbb991d
+EBUILD plumbum-1.6.4.ebuild 491 BLAKE2B adad559078aceb34d72a23426fce44fb93126c211abbdff3d6016a5cf7210b8820290d100309ab74718d63fc59ba71570f847edc851160fcfa4d86e8ed4e73a3 SHA512 63d8eb1a3803e78bb9289fc617a9b9a3cc5bee8d599227404261e6849816b32a6bdfef3a6a0bed1fddc4de3e93b5ef43ba2574b01405554fb666cba96429c276
+EBUILD plumbum-1.6.7.ebuild 460 BLAKE2B 73ea42329dd29b727a8029df84f06f7c62283f267bb9b79065c7cf049c7756a4dfdf71255bc5d3fe69c677c3540bcd75f531dab9af14bc3bcdc7c94a332a213c SHA512 be94a1adde03124dc575fcbbc2ac2468d58a8ba05c05c7e7f858db7995fb20fc9e197b24c37d61b5b42fc7155cbd781576c9a25dd619b09eb67e6337d81353f9
 MISC metadata.xml 667 BLAKE2B 831314c0a117c620e7d17f7023d0bed99deba80cf0d84852bd972ca788aa8e4ed6d959938fe5c7592db95b13d600a86b7928aa46a58d65cf1b9e48a2209b5c61 SHA512 c44ac643857f1e096d33e7ac3ae9a5a7e135861b7f6e26a3b889d9cc4fd5d302ac9657520c73cdc618b95ee31f168cb2e5704c1bf1b7710b859e57a2abafa812
diff --git a/dev-python/plumbum/plumbum-1.6.4.ebuild b/dev-python/plumbum/plumbum-1.6.4.ebuild
index 5db056d4549d..cb4315b1ba22 100644
--- a/dev-python/plumbum/plumbum-1.6.4.ebuild
+++ b/dev-python/plumbum/plumbum-1.6.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A library for shell script-like programs in python"
diff --git a/dev-python/plumbum/plumbum-1.6.7.ebuild b/dev-python/plumbum/plumbum-1.6.7.ebuild
index 66450ca0aee8..8315e0d456a8 100644
--- a/dev-python/plumbum/plumbum-1.6.7.ebuild
+++ b/dev-python/plumbum/plumbum-1.6.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A library for shell script-like programs in python"
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index ef25c974461f..e562ca46ad81 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -4,8 +4,8 @@ DIST ply-3.10.tar.gz 150926 BLAKE2B b7373bfb83f66c35b77f244e67443f5c4805cb5e586e
 DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33a7d62590a92388c4a21c9800599c1d4e4db6f02630e8dee4c8482611e26498e4aa8ccdb2cf3453ae1db4 SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008
 DIST ply-3.6.tar.gz 281690 BLAKE2B 1a8e9e925c1a70832e3312208470a3bc4831b7ba18a0c2eb3a8b31fc9a850ae192809b9dec098f8479f2060e63ae781063b362227db2c6080aad85a2fb8648a2 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55
 DIST ply-3.9.tar.gz 150750 BLAKE2B cb32c3837f2b4bd33ef2074dcb3f1421a54e820faf0e65def16f4c354643dc3e467f7c482dfc5b7f62cfb367945632e346b6e02e16cc79a91bb6f9241e315eb1 SHA512 c3beca6f70e9fdfd11f9fc7beb18efb03f0b32be3cdc949e96c4df3d060e7e9da3ee42d1f58f7a9225d333cb7864a4253fd3a9b75c496364276fe9969ebd7641
-EBUILD ply-3.10.ebuild 1116 BLAKE2B f20d17bb8bb4ffd3c07572367e054223a4ab03415881bbf170f843b7fbb3a05a59134827409571c1c4fa468be353c3ff845148ff77d354041515809296f0d840 SHA512 575a45df119c1023ea953d06ee61de05814f55f2bb8b6c2234f8ab3b44a3daec3b04ca56b819b3474920bb89f6178009aee63a8d46bb6adefdef5806f8ebea2d
-EBUILD ply-3.11.ebuild 1152 BLAKE2B b06af9ad4bb1bd40f5183f202819c65fd543778f6a7b08068a6689347d02d909cd3aae85219201014e9c35871d069a6aa511f9a6d30c7f256fb91833980a2fcf SHA512 45d3459e7105a99c9340ad456c1c0aa4a0247ab52378fcef31680ca696792e1241ed76e80cf3250d6a5c647b0a9ca4a193e4060d1123a253fc36d96795737fda
-EBUILD ply-3.6-r1.ebuild 1129 BLAKE2B 47c949ab2df77f63e8ac5ff0bcfb7f6324883b61b35909068fd5cacc89ed357088173e73956c50df8c7c14630b7812bdb2e2f2044514acfa4dfa2e7d2e6c6507 SHA512 1dafb0cd20f665f9e9f37b9bfabb81da74fa715f6a13e39909dc28f3bdf1dfc26b9203dfcf8cf8e58fc34961aa8b0450e42099b26804e09212ee4813909db007
-EBUILD ply-3.9.ebuild 1094 BLAKE2B 40eb336ab3c6741985ece8e45b5783290930e8a9d87f43816aa9d3c23cb8e86d4b70ec3c45a07811570b1061bd1937abfb3b183e8a8345260de4fa5530ac28bd SHA512 a255e357121208bca3d9205a9f9a3a229a9da3f4fbb3967bc3000ae3e67e8e1b1f9219b7e4c47feaa897a60a981d3a3e5d3753f9e1954a708f2eee23ad505919
+EBUILD ply-3.10.ebuild 1107 BLAKE2B d3e29643cdd3cd9586cc7597976db6edca6144020784787ce6be850c41ecc5e48e6d647cc2e0532cfaa09cc933992a29735ac693e8bbf94d8492509addd3ce82 SHA512 f87cd7c711b598f1582207ea437ec211fe8f416cbef0fae86a9f4e59151231af352cbc7191af54337fe216f4f63f3b846f558fd8b1c881898f140bdaf847a706
+EBUILD ply-3.11.ebuild 1145 BLAKE2B f5bcceb5f39ef5e4ce002b65cd25a466512636f363f5d5d652b741e411ac9fbed6d548cf08623899bd25672ecc6d91da651787f194715ea136631f2f2146fe6b SHA512 bde2259628c85d5c36fd30a9548e3e0b1152b58439a1a7fc68d104ae4a74892f4fbac772bdc2d9b4452ee5117f3a04f923d8d5e445a66220a866c2fece5c512d
+EBUILD ply-3.6-r1.ebuild 1120 BLAKE2B f2d713488d8ef56bdf14f9b9024e915f548165ded2a85166fb827169701fb9adafb3551165f56016088dfae58a8188be7d1d1ca307e978d6e950f677ec93351b SHA512 388120427188978d09f176250fdbf8e3268ea56b22c197d3d439f97a197fb8456a72b97112792f4527784242c70d140624b393551e23f5ff0002aacc3c3aa918
+EBUILD ply-3.9.ebuild 1085 BLAKE2B 631fe4ba3b208114a2ffc5f1b76bb95f77d3abbb867ca9fb96e13ffd10388a9920cc551750f92d1b8ff6c41d6e0e15910f96ad3840072a90d88438827317cc33 SHA512 8514e1fcb0b8eef9f1ea22c646a6bebc4856f08b7a1c691bb2da7a2ef569775c13b4c81ef945e89017850a1e7b00e12fc86ddf1a5e3f9af5055f707ddbb1dcc6
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/ply-3.10.ebuild b/dev-python/ply/ply-3.10.ebuild
index 1a0409e8a666..3ad00e452918 100644
--- a/dev-python/ply/ply-3.10.ebuild
+++ b/dev-python/ply/ply-3.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index 034a90f6860e..774b1bdaad00 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ply/ply-3.6-r1.ebuild b/dev-python/ply/ply-3.6-r1.ebuild
index 68075a030672..b83b2b6dac71 100644
--- a/dev-python/ply/ply-3.6-r1.ebuild
+++ b/dev-python/ply/ply-3.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ply/ply-3.9.ebuild b/dev-python/ply/ply-3.9.ebuild
index 56f275ed779d..f5cd4d1b7bf7 100644
--- a/dev-python/ply/ply-3.9.ebuild
+++ b/dev-python/ply/ply-3.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/plyr/Manifest b/dev-python/plyr/Manifest
index f4ec80e09d6f..4fcdc1b1207d 100644
--- a/dev-python/plyr/Manifest
+++ b/dev-python/plyr/Manifest
@@ -1,3 +1,3 @@
 DIST python-glyr-1.0.6.tar.gz 42952 BLAKE2B fd95ef9fd01788c6f6526eabb77cc2c93bd28324066cfb1a4be70a5990bb1599e57e40d607f926a7216c582389e9763bdc92fbd411cdeef52aa86e1ba6138c83 SHA512 c4b04b1379116048f78c3ce5f9d30c92fd0d7198bfda456891d3012d115b86a5970595d9b4bc1d43028e87c9d467c35a7d02c7f3a9f4670dae8a17c22d1ab58a
-EBUILD plyr-1.0.6.ebuild 1288 BLAKE2B b9203c6707065824b990cc86da435812e1f9029c108c7005eac73afcb88b5181186c0e241202e81a94762d98e595f12612839378962cc95c389fad48493613e2 SHA512 444ce64deb43ef61856cb5d8bdfbe3ccd7827f850a85a1f5b1309321fb3f91adffc3c2672c5a758f1c0e24e37f29f038e9eeed2a0d299428dfe66b2d6c4554e7
+EBUILD plyr-1.0.6.ebuild 1284 BLAKE2B 53ce277b9b995748764f321acdbd095922bc72c09a79a98c02ffbfae96c6c9583b4edc7ffc04884778972bfc8ce29323f379b4929a21f6cdba767b09b910f033 SHA512 45040b941d24848562161f9c84870302cdac2d32775ee3d808833ea5e42f9af148adcff1843649ca36a4abe91626c5562c308a9ce17f1d00d0820e50223bb19f
 MISC metadata.xml 323 BLAKE2B 6697ca93abe56cb6d2a14920f307f123527cbf570ccae070632877253ffb1dc5dfbfa013f4618b8cc5f22a3c76f5e70654808825ec31d991e704303fa5014f6b SHA512 11f94ab00c03b6a45166db720c0fa897e03fa0f5ecc85a3b824ce51309b672212053b9d7ea703e7f3400501289324b9c4ff6680668c1b6dafe0d009d6265d451
diff --git a/dev-python/plyr/plyr-1.0.6.ebuild b/dev-python/plyr/plyr-1.0.6.ebuild
index b4ad8f55d1d4..cb7d843384f7 100644
--- a/dev-python/plyr/plyr-1.0.6.ebuild
+++ b/dev-python/plyr/plyr-1.0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest
index c9546f3e1e37..304ec1afef1e 100644
--- a/dev-python/plyvel/Manifest
+++ b/dev-python/plyvel/Manifest
@@ -1,5 +1,5 @@
 DIST plyvel-1.0.5.tar.gz 143728 BLAKE2B 2eac687e6901381b62df5278abe00684c8e5a9ac162596a1a1a0e620536155b5e5c0ba0ab9bb32c1d3a6467d997cfdf530e9275024f8caba3323728f3f3aba67 SHA512 d2a7fe9d49b377135ece03292f366423e9550d3440689a99246d8c5ddc38e474c2b05c709655c6bf74a1d04f742a23dfb8841b51698c2adb062418577b28c4b4
 DIST plyvel-1.1.0.tar.gz 143970 BLAKE2B 980c8117f39c704abaf1733bfabb6816aa84e5e449ed37368038a7d6cd4cbbbf832319bf149ec6ae7cca5074984427df08afc50e033451d3d97ddafd210d91e0 SHA512 4d9b20f7e047d75af14d530519b4360194a18aa423a57ac4596441e47528bbc9f8e3ff763dd91da4c115cb1e4a6f34f01bbd47f4be49be110b2f6e3c7b8bdb3a
-EBUILD plyvel-1.0.5.ebuild 1250 BLAKE2B 2f231e794eb55080b1de3a3b9cefd855cf3e146cf27d0e96e8818c9a3cac5d2fded95202b0b74b3e6cc2daac61f7ed144d99da3e3f3ed25b04e5ab0af27f1d2d SHA512 a5fa5e18380359f13d9f2a71e7f4f3002246d9bf26bbc24a6fd2ad7bfac8ad58dcf9465d0e46b8c630d8d084b304331de1516fec648270aa9eb03639af54b8ff
-EBUILD plyvel-1.1.0.ebuild 1253 BLAKE2B 4051f1cd5af9b5ee3a15e6797682feae95e75232db1d5569f919d42da9bb09863290ed43682ec8e623e10f3fe9f927b3d431bb3adb0e4a4dd40802f07e9e4b69 SHA512 51b105873ba7260857d8d407119911e0be62f44ca9b1d8c8748292cb7985a0b6c6db56ada7459d33e78719c1b9c3e9cc012fbbe932868d38d29222e6338ecde9
+EBUILD plyvel-1.0.5.ebuild 1053 BLAKE2B 502e224111d99a312232cfbbc3ca755dc6383b99b9f2e954292ab7b571190e3f717a9ad2034b422aa912a0e41998453eca7e91a9765e62df2b1a1a63e879d140 SHA512 fef6e7ba1143c6598c603f1a780be7cd5a05d2a2b920c0a68f9cfac51dc8c86d446237c1765fb38c08a10021f336a74e6b570b2492b55707ed8e727ae7928a07
+EBUILD plyvel-1.1.0.ebuild 1056 BLAKE2B 0a5ede3289410bfc2f18c1e92eb5056c3a732ab22074e5f9c2c7edae820c32c3de219e3aec43629eb9bd09e6e9a74db9f15b1476cdedd32397cfc390cf47fce0 SHA512 f16d964c8b4d889d5d7000ab16f605202e194a3481135698b1de32ca32aa95c2a905daaee6327005864a95fad3ff440b15f6db9ca092c91a62b0f13965281051
 MISC metadata.xml 432 BLAKE2B 5ff794b8cd6bb312ed6fc0a3ef74ab6a89be65b45d90fee726ec4350f702b45e46da69c35ac2fea606bdd2b7cc87a9d360ce03d101b4243950cbd54567a772d7 SHA512 fbd7143b819341c3d6686e6861b5c8642b6e18f3e0c73b0ab0221dae9f074fba26d7792f41a23a67074679594ed2739a9a6926124365c1fab88765e51915f288
diff --git a/dev-python/plyvel/plyvel-1.0.5.ebuild b/dev-python/plyvel/plyvel-1.0.5.ebuild
index 953e10d1c72d..8006345f9308 100644
--- a/dev-python/plyvel/plyvel-1.0.5.ebuild
+++ b/dev-python/plyvel/plyvel-1.0.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Tests fail with PyPy: https://github.com/wbolster/plyvel/issues/38
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -28,12 +28,6 @@ DEPEND="
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
 
-python_compile() {
-	# https://wiki.gentoo.org/wiki/Project:Python/Strict_aliasing
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
 python_compile_all() {
 	if use doc; then
 		sphinx-build doc doc/_build/html || die
diff --git a/dev-python/plyvel/plyvel-1.1.0.ebuild b/dev-python/plyvel/plyvel-1.1.0.ebuild
index e03758e6af93..7b5f43428317 100644
--- a/dev-python/plyvel/plyvel-1.1.0.ebuild
+++ b/dev-python/plyvel/plyvel-1.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Tests fail with PyPy: https://github.com/wbolster/plyvel/issues/38
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -28,12 +28,6 @@ DEPEND="
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
 
-python_compile() {
-	# https://wiki.gentoo.org/wiki/Project:Python/Strict_aliasing
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
 python_compile_all() {
 	if use doc; then
 		sphinx-build doc doc/_build/html || die
diff --git a/dev-python/pmw/Manifest b/dev-python/pmw/Manifest
index 39f885b0f036..eedeb4ef76d1 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -3,6 +3,6 @@ DIST Pmw-2.0.1.tar.gz 830448 BLAKE2B c78fef1570a34b9784f936f16856c4450164d8a2327
 DIST Pmw.1.3.3.tar.gz 451232 BLAKE2B 2ea74cf010b094539b1e052850b358e05a561aee1990de7184244b77a4133c1259ff54fa6e47c5368dac4bf81bf23e9217742ef1327ab7e20b8dca27ebf5f333 SHA512 d63fad8f8c5bb9b8cb940b10bdf9e3bc1dabe714e10f32c587d5e1097ef0767492602984089172d85cf57c8ebf34acf555b8fe73a2157c6f734ee36042803668
 EBUILD pmw-1.3.3-r2.ebuild 1227 BLAKE2B b95220e48ef2ad28960a750d36f7429a0cd02d67345262c9a95d68b629167f57e0db542e0701868770ca817a7b8c27c76e6e74ba4dfed17d2ccde84b1079ce43 SHA512 1c5fa6dcecf737a07309652a046cafbfcdf9333a8dea32626fe8a08fcb1867bdc0746a1bdb79814418203ddd0ab8c38a57fbda0e2c9c83429dd1d571953927ba
 EBUILD pmw-1.3.3-r3.ebuild 1214 BLAKE2B 58373ef472193728b01d035d76b4a319b712ef169d683cf27bf873a345853fc22031166e264b469cf3293afa81e6a77a4ec55f639b09f02bc8c3a169ec8090b7 SHA512 502b61d69b1a228e25128881505d052fbae4a959dbcbd324cdca3bbf1b094afbced946927ce0c5ed005c8d413c0f26d8d2e32bb5213db71c61e977aea7a459fe
-EBUILD pmw-2.0.1-r1.ebuild 1211 BLAKE2B e1c94009cb50eca463b9269d51aa651f38ad950b7706b00fbd6fc7219aa344e68d767ca6575194e14d6ece7df9453775378eb9a1c1195a9d489590386acc489c SHA512 b332cc7ede4bfdd7ad17154251acb4d59f12f599bf40cfaf8c62b3ba5311eb2705af4134fe0e8314324e71961b91bf2f7e5864d6fd0d83c7b7b7d872b7188199
-EBUILD pmw-2.0.1.ebuild 1202 BLAKE2B 7a120d5cd8844e563293c1f6aca1cf5109cbded43b11881c4b3cce69a3035219dbae8a515a838450ff5fc94066ff10b686c537f4f3d851165d35c94729a6a4ba SHA512 b9d367e773baae18b3d05e8e71008c6d19d4493a677af4ff3b5b615b0f592503b80c8fde635a8226339bfb6a4b9bedcea269943f06575d564468e22e4ace1cde
+EBUILD pmw-2.0.1-r1.ebuild 1209 BLAKE2B ea77ededa8fd3e3258fd68f2b08dd48ae9faa643ca4838d7391faefc603fd0fcd48169785ab75fdf5732d59143c8b8898712d2f37dd85cada866e138d12458df SHA512 976368d75e89f86224ce419669ef4a10a9632ca8f7bd8023359f97bbfcd0cb0c43f3b4f98aa088f1725efe3b97f51fa40909207a35c1f2be82500466908904c3
+EBUILD pmw-2.0.1.ebuild 1198 BLAKE2B 58fcd866218095fdf63b0240bcdccbe6bda5914f4fd16bee5f64216a04eb1bcc7153a01f8a8c7f181afac9730bd01ae1dd37e65fc6f94c8d837538b932a9b3d4 SHA512 03276c7f5361633dd2623bf823a855743a324de42e2ed286ad141638c9148a6426e0280b9af32d8bfc11d7091af580f1be45828aa1b25673efab01829f881e95
 MISC metadata.xml 366 BLAKE2B c2d56d3c744468056b41ca45aaff5263692a9055807ae406644d9c482489f004271d932d56e078a2d66bdca3f17332e0ac03c7f93d7d41890db0eaa90c004002 SHA512 f0bac4e4faad03c83434cc214c0a0befebcbd1cd7eb89663d6058dcb36ee791102b081595e604409d278f01d7c2062f1d1ca1e01e1194e44826f66e6121697f7
diff --git a/dev-python/pmw/pmw-2.0.1-r1.ebuild b/dev-python/pmw/pmw-2.0.1-r1.ebuild
index 9795b10364b7..553235b26f5c 100644
--- a/dev-python/pmw/pmw-2.0.1-r1.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="tk"
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/pmw/pmw-2.0.1.ebuild b/dev-python/pmw/pmw-2.0.1.ebuild
index d7b87df2a1b2..43b30cc9de4b 100644
--- a/dev-python/pmw/pmw-2.0.1.ebuild
+++ b/dev-python/pmw/pmw-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="tk"
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 4856603a9abf..6af36ed0267b 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,7 +1,7 @@
 DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
 DIST pocketlint-0.19.tar.gz 23118 BLAKE2B 2e622ba1de20d2043d55261b79b8f78b2c5bbebb2d739da2766b56fc379a6433c56f7184d832356fefbb231fb271782d4a884739b55ab52ffd64ef3efc5c2ea4 SHA512 409ebe916b1c83e128ebb1cd12b7f1d695a999d8ada1555cf6710acbfbde241535f2a929d06ebddfffed66ea7db9f20ca6606e9dd9f1505914ae3c6480cdfb52
 DIST pocketlint-0.20.tar.gz 23443 BLAKE2B f3f50c8f54b35e6d1bcf544ed6f55f2e3e461289929a6da5cf3028283fd97781d7b41d6ea458146ae7b563441aa52b757b4a59a0ab44b9016652503b344f1e48 SHA512 02b05f4831b00ece03856938306f0410f2849212d9aa1b686fdf58e6a8e415ce689cdc990125b7baa3e16eeb0e166b49afe6ba574d553f56c7f9981ed01a15dd
-EBUILD pocketlint-0.17.ebuild 478 BLAKE2B 0e62254afe12db459a60567527acaf4b84545fd8945645a326f71cc20539d406db7c467ad3721a82ea000f6b4e91000474e20baaa682a50a096bee6e880a73b3 SHA512 6e695b91eb875f227d60baee88b4806bedc37b1745bc061931e97d5eab010d5328d9434c9ea3d61979e5ebb0f4c96d085b514387b0d4a5fb49d16f777299f6f9
-EBUILD pocketlint-0.19.ebuild 487 BLAKE2B 09bf182155b09e18579a20765d0d77ad0512fe61ac1f5c499c65f697da3f5e2bb158cd8ad512874e35f995d6462b3b5acff24f133be9b21250d5c035f1eb989a SHA512 cba74d08634f335e1e49c54708a3a7c1d7b9618ee77671e7d22214fc0353763e7a1a9f6ac3103797ec84b6ca76ed5149d0eeaa372b3edfe6428ecc8a6d72440f
-EBUILD pocketlint-0.20.ebuild 489 BLAKE2B 05e4e714dd1e2fc199bb95b1d543399584d7fd79caab85ae5e41d41225154e594e258e204978805caece7975def5d67942ff9784090c61c97495fbd4531bef03 SHA512 15cbf2bad4f0081f4dcbf009d4aa9039e4f935743bb1c77c24ade5f8fc05d6f1f483c7e30fed25ac4e6894c0b75242e6336beb25ae162cc5ebda398732758627
+EBUILD pocketlint-0.17.ebuild 476 BLAKE2B 65feee0f4ffc26179b58cb1c91b7e86998fff3b8c9a0d76d30bee98d2a5c61406ff4ca6183429e4414134197a4ac7ac07c1cfc7a1f86a8b5b1671418f5ca3fb0 SHA512 d0f391085c8df3f2247baaead86ca335b572bf9c850716acc02a9e6936087506dc22d1f2e9b4ec0d5a421b079e7f6ec3743213297e0cc60c4d51f1729eabe0f5
+EBUILD pocketlint-0.19.ebuild 485 BLAKE2B 74a789f3909fc1ee35b05296545d4b12ff5b1801ca2346906815f1dde41ca7e385f433754b25affbb1bca5e853bea675cb95dbf69b3b1e5cbff2ed0904c109e0 SHA512 326d61fa24fc73f7b2841d0bbbed1c4e7b2b0b00a119d573f6aad9d0de3ca3b98b7f71e75b8c9eafb361813d8f884279f47ba252b18289303eab3b06d9be00e3
+EBUILD pocketlint-0.20.ebuild 487 BLAKE2B 2a3c26ec0035f8f77f7d57d6e0fcbcd685a5bb89049eff03cf083ff8fb8d6ddb35d85c559c8ef221a64147b3b028f4d703c04cdaf56264706034c097b7761774 SHA512 9369f0fd7da203f60f58c08f558f9a0c6d03c5ef3aaa22fc980e79d54c2f89b7717ab69293d4b1160295487a2c671e4476f3288c81d4a9909148c0ac50369b49
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.17.ebuild b/dev-python/pocketlint/pocketlint-0.17.ebuild
index b9f0c2b7b947..45cb7f1c7835 100644
--- a/dev-python/pocketlint/pocketlint-0.17.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pocketlint/pocketlint-0.19.ebuild b/dev-python/pocketlint/pocketlint-0.19.ebuild
index c5d0b13365c2..07c7f2cb8c1a 100644
--- a/dev-python/pocketlint/pocketlint-0.19.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pocketlint/pocketlint-0.20.ebuild b/dev-python/pocketlint/pocketlint-0.20.ebuild
index 63839de3b18a..d3095c6f4606 100644
--- a/dev-python/pocketlint/pocketlint-0.20.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
index 903ef71e1f4d..745ad69cc7fc 100644
--- a/dev-python/pockets/Manifest
+++ b/dev-python/pockets/Manifest
@@ -1,6 +1,3 @@
-AUX no_installed_tests.patch 300 BLAKE2B 0514a72a8150d6f287c64eea748fd89cc454936d425b2bdcdb12ce1b10a715e51f7fe82ae1a9c516cbc4f16c7a3f4f6e1c966a78d40a097faeed95e1df58111f SHA512 9775565373d46c2fbb8d3b3002e9205f1c71a68f0e02c95f177f25451a50579b13efcb3328a0f90d0ba133a0997651ec9697957a6fd76db990e5e83c0e6a10e2
-DIST pockets-0.3.tar.gz 20441 BLAKE2B 2880ad8cb004aef7c108c4a227b37b641dcc44456a8438982c3e213ff30101f236f8be4521a4fe03ea30d514a6ae3809cf52c072226e87ea103b840110d32e2e SHA512 da208b541aa4e0884e37a7d128d11d1d99fac22f10e5dbc88065487265aca8ca348286c0d0214dae657af824cca08f0585c70abc27be25f4c54040cd44a3e44c
 DIST pockets-0.5.1.tar.gz 18437 BLAKE2B eb2414b05f7843f8ce253cd137aac087daa4839ca4b16ce9d6f1745535d3687a5bc832abfd6597a6761c12f7251b32a1007e5d34434e0f54ef2c7a5873756f99 SHA512 f0ae52e2260d83ea76acf8996e901a8f1868b578788b9e98233d92850703ef98e3ba18beb4e7adc5883c8d339ea63a8c4b95203ff40c2521b2179fd87cab1391
-EBUILD pockets-0.3.ebuild 879 BLAKE2B b4fdf946078b1af789f535a4e268d0ab9131e3329088fab8d9eefeadaa5ea40cb12a3a0fd8dbde1ac78e150f87f9070ede673589a87215dccbba2c04eeba9684 SHA512 161fccf62905c0383b8b4abf31ab5950f84bb01525651f8ac35bbee49a4e05c2b44cab6432d53cfa959af751fe6d5e73bdb90c263a0a5b7a75c35b18fcb14590
-EBUILD pockets-0.5.1.ebuild 600 BLAKE2B a6bf5d997b9d4c7787824438d8b9fe5a1646998e6490adb9431ad078461774a623ee655e74f05208b09c403ce6828c8de7e6629c2c31db691dd34c088b1614f6 SHA512 bd4689cff31ede44ae36c636fb68dc3eb74694d8bb537c7a31cde8823e84cde7e2efd3ff23f5142e29a211cdea52fb413319792ced21be65576023cd403fbfd4
+EBUILD pockets-0.5.1.ebuild 596 BLAKE2B 0c3a99b058d1312d716f07cbd5ea852c1af22403737820491e58b9926cdfafdb0caae189b90201898cc4558d08180bab823c3b314ff8ca110ee86294ab66720d SHA512 067982c3bc34df162706c46e7012347296ae7fc7e9a1efee31e3e02ec82d74d56d8e4fc3e09ab3d1fb9ed624dae2ed4f8d78dc3a4900ca2a761f10f3190019d1
 MISC metadata.xml 331 BLAKE2B cb17ecc8fb5618d45d09af9211028e4876b6523792f70d20df4104b9dc72f132a592ba961d2571632e34a72f213eff0c06e02d1700c82d4f46ca48ea9d9fc844 SHA512 70933bb4063959e5fa091a416ba3aeb6e8540e03263fd8cfb5680165200e2716a90a19e03afbd9f746cd7ca7673bf309d47307c7e2f49b7f2609d77de65ed4fb
diff --git a/dev-python/pockets/files/no_installed_tests.patch b/dev-python/pockets/files/no_installed_tests.patch
deleted file mode 100644
index 05c23aaae901..000000000000
--- a/dev-python/pockets/files/no_installed_tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2016-08-03 16:30:08.093499589 +0200
-+++ setup.py	2016-08-03 16:30:40.861165597 +0200
-@@ -39,7 +39,7 @@
-         'Topic :: Utilities',
-     ],
-     platforms='any',
--    packages=find_packages(),
-+    packages=["pockets"],
-     install_requires=reqs,
-     tests_require=test_reqs
- )
diff --git a/dev-python/pockets/pockets-0.3.ebuild b/dev-python/pockets/pockets-0.3.ebuild
deleted file mode 100644
index b7a782e7636a..000000000000
--- a/dev-python/pockets/pockets-0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DESCRIPTION="A collection of helpful Python tools"
-HOMEPAGE="https://pypi.org/project/pockets/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-	>=dev-python/flake8-2.3.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-	        dev-python/nose[${PYTHON_USEDEP}]
-	      )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-
-"
-src_prepare() {
-	epatch "${FILESDIR}/no_installed_tests.patch" || die
-}
-python_test() {
-	nosetests tests || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pockets/pockets-0.5.1.ebuild b/dev-python/pockets/pockets-0.5.1.ebuild
index 7cabb673a120..e55b2b784964 100644
--- a/dev-python/pockets/pockets-0.5.1.ebuild
+++ b/dev-python/pockets/pockets-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/podcastparser/Manifest b/dev-python/podcastparser/Manifest
index 86fe4b0c940d..8fffd57d0efc 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1,3 +1,3 @@
 DIST podcastparser-0.6.4.tar.gz 22446 BLAKE2B b6111251c6ce325a91e763402d7f0a6cfd137491939dd581e1e4f1bb2458b741fee0a61eed009b61876224722fb4e43d289b2a294e02bccb724e2f0337786884 SHA512 c63065aa822b0210891c3316fc592591bcc962e16c52a86815637634ad5f02d3f559596e3727d56d191c454f28320e21ddb469ff8473fc99f57ea830fb046b2a
-EBUILD podcastparser-0.6.4.ebuild 380 BLAKE2B 7e311eb86631a706883134a308f0905fe3cf776855154127d32389d8bc8404d8c7f2040a34ee34df0da82cc91bd225c5306c2fbf87ffd4c40c03efb1b554715a SHA512 a3507ff8da4969edb9a643f37b96818170bf7021ef3a5bdc245ab3dab81db49e9bc625d9d2182c8ab403126eda5520649e00818d377721752e584ba8123da466
+EBUILD podcastparser-0.6.4.ebuild 378 BLAKE2B bddda81fea7c45709c509ffa0555de1a970afc80961b1bdab7362284f0bf52a31ea04a87db34916212af85a81aa23ac1bf1206df5e70884240bd528872217b23 SHA512 2143cb054fb4e644ab849e7fab84ea68acbd97196b50c0806204fbf5ca3c1e8942f43f73b9305acad3db7fb960c08e148c282c3674c6a07d40d654f78522d741
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/dev-python/podcastparser/podcastparser-0.6.4.ebuild b/dev-python/podcastparser/podcastparser-0.6.4.ebuild
index 6ff89afc2b05..7a426e3289a1 100644
--- a/dev-python/podcastparser/podcastparser-0.6.4.ebuild
+++ b/dev-python/podcastparser/podcastparser-0.6.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index 8505ce89d301..cb7f92871d09 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,4 +1,4 @@
 AUX polib-1.0.7-BE-test.patch 545 BLAKE2B 800372796d19d98f47dff73ed593dcbe8a60d55b654258ea5063b702fc3761906754096bc2f4703621378a56ef9589ff5a4c1d7aa6bcef368e293bad9e8b869f SHA512 0b62dadaa7983657901463770a5e7abc41361094c7dba41618881d7328378b989c10b3458c667f15134ad92d0bfebd785f475e1ba040ea11da70352bd8a2cc2c
 DIST polib-1.1.0.tar.gz 158484 BLAKE2B 41766f00e3928eacf3c98406b6acce224f0d0cb44d79326c834db900ed8b91181911ab7e26845a737057dd07c067a784d0b06278952708c17888db42d8c1e303 SHA512 74681585b4d7252e107acd7d73f49f7e91c90adcd180722d39d35c40ec158434798af0124a16788cf564c73b84f52a040aefeb58355a1a3cd85848c3f6a5e67f
-EBUILD polib-1.1.0-r1.ebuild 835 BLAKE2B 479c0041757f0a7bb93185939ec007a2d886f5dea75ab8c8d2d79a6cb34aedddda1ce44ea56376187a94d0969b50fa36a398031c3274d08cc860edbfecfb9f93 SHA512 0b43367ea0994a83b71b0fc96e2ecba2bcd0af421734c0f9fee640b3a998753179acb468c04ca14caac6cbb108cd195fb23733d45552d6b8a3c30da01457efe7
+EBUILD polib-1.1.0-r1.ebuild 833 BLAKE2B e7f63e3ac180fe53a28ebefa5d5b7d019fab8bacce85c2a687f4f712dc0b79505afd6947b8250f07ffb4571f63623b9d680e2d1f3c861617c419ec76bd8f01ff SHA512 0e43a3f92bc957f3357ea032d0ca1717ceee749c458ac0f5cff54de8301a1667b5915e27fcb756cff72e2dad7b58b8022ea57c53367ec8600f202f9aca0cdd3e
 MISC metadata.xml 294 BLAKE2B 096af7abe45b2be00baf31d9a8eb7f9606c817c48e08fb457961b48c533b6c35c5acdba95420d7a193c5a216f3d46aa512ea54e0a2ff45f9173e76720689b99f SHA512 f5fe76b50e225e8e3f3e4d745c7e49b0056eac52b46c0a51cd552ffffbf915b5035d5edc2428c15e6497a054bd475eff39ea19a5c3e79eb2f087ee8ee0565099
diff --git a/dev-python/polib/polib-1.1.0-r1.ebuild b/dev-python/polib/polib-1.1.0-r1.ebuild
index d5f735e244ec..1ea0502c5226 100644
--- a/dev-python/polib/polib-1.1.0-r1.ebuild
+++ b/dev-python/polib/polib-1.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/polygon/Manifest b/dev-python/polygon/Manifest
index c98b5c5ce1f1..faa1ec90aa20 100644
--- a/dev-python/polygon/Manifest
+++ b/dev-python/polygon/Manifest
@@ -1,5 +1,3 @@
-DIST Polygon2-2.0.6.zip 73551 BLAKE2B 0ce0359945f87f0efcd9fd61a2538dec96a76265d3b4d13a53288609e6bfde45c946f9184ee6268a24f987c5081ca10d8261d7febcbaee218f10f9fa8b2a3875 SHA512 d0827fe3299449842e201598b59e423bf3029302037ffb9329dae0045b2be1727eb33951dfd22f560476360836305526be58e55d9d4cff36f3d9a4b0262b7aed
 DIST Polygon3-3.0.7.zip 76193 BLAKE2B 57ef62b6652400be057e8596f705e2112caef09208aafa7e46686f86367181dc078cbfc6ade99af22cce7fc0a76ec1de2995885ba4c11263444ca315029c38d7 SHA512 e30cd8e51ad69a2d76b61a7d92ead4ac352e729093546b965f649866fd9c6a860e3cdcd9fcd7f8cc9f8d7735ccd1128fb5af00b3de89e4efd7128e446a70b33b
-EBUILD polygon-2.0.6.ebuild 568 BLAKE2B 98141dc77592acb522fb80f74ab96317bb84e3daade4372f46e1a60ad65064dd49125e3a17ab028ad163bac324c680e30c5bee61db71672864aa04d0d1170235 SHA512 52130f04ac0e59b14469643f104d732ac4b4e8060aba7079666d0f760e2ebb59fba00e092c18b612bb0e1f2b352b6f507aa88067d30447483da08e8d13db984d
-EBUILD polygon-3.0.7.ebuild 876 BLAKE2B 15c1bbfdc2e5edf342c3081c2e13094cb654731d3e2da43b44d7114bafaea9b4973edff9cfc5bd2047a2393661b302dcb0c0004bda43aa9cda9e1f8221b71b12 SHA512 0ee6ecfd8eb457a5e27b2bb3f9f953734f9e41d3db245d91ec190a0b4140eed61e01bb8b3f93c26e1fe0b5e4786e5d3fd20006e691c11a4059d383a85a0dbf64
+EBUILD polygon-3.0.7.ebuild 872 BLAKE2B a3ca02116114808e190032d68e94230d38e54efb025416a91905f206d0d6e9632afc39a43071b41cb6e6902ec561eaa4c24f08bba04dab658505daddd3f0b150 SHA512 6499740bb05438af4a0983b8686d1eb53bab2d12c5f9afff1487d3dbf922dafc716f05a2cc94b0e195455a4c288132f7815a8d73c1c6cc9adcd808d2a3965ab6
 MISC metadata.xml 498 BLAKE2B 37a852bfcd8d3b2cb147e45532ff82192c14c415a4cc86671e1ce1b26dd1154778e907421ab7bcd61d602cfd8864dad6bed1ade6e07f4f9257bea072f7623d1c SHA512 f720cc8215dab75ac6246e86d3ee3fe6a07676078a25848924fc0ced02826bb8b2122417d5b27549f9557b486a4e71baff27bc7d54d7f8d15d7a21b4caa0de52
diff --git a/dev-python/polygon/polygon-2.0.6.ebuild b/dev-python/polygon/polygon-2.0.6.ebuild
deleted file mode 100644
index c411417e96cf..000000000000
--- a/dev-python/polygon/polygon-2.0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package to handle polygonal shapes in 2D"
-HOMEPAGE="https://www.j-raedler.de/projects/polygon/"
-SRC_URI="https://www.bitbucket.org/jraedler/${PN}2/downloads/Polygon2-${PV}.zip"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/Polygon2-${PV}
-
-DOCS=( HISTORY doc/Polygon.txt )
-
-python_test() {
-	${PYTHON} test/Test.py || die "Tests failed"
-}
diff --git a/dev-python/polygon/polygon-3.0.7.ebuild b/dev-python/polygon/polygon-3.0.7.ebuild
index 2538d60392cd..b62923113930 100644
--- a/dev-python/polygon/polygon-3.0.7.ebuild
+++ b/dev-python/polygon/polygon-3.0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index b30d25ac2a5b..1c39fc999b89 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,6 +1,6 @@
 DIST portend-2.2.tar.gz 7974 BLAKE2B 77ffcf02b65f276a5ca1f1bdd76afd54e8f6afcb1c55b6948862017f973772dfe65c9b934ffbc98d2f36f799131d23d4a7128f46e46183010def8936f2dd0bad SHA512 1782132b0dec5b678892190b70ab795b1748dfa17e257b6655fc803f0cf19652725778cd329c3609353f969959501dd11fd2b9726cfcdf2c58689e2ce280c146
 DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
-EBUILD portend-2.2-r1.ebuild 748 BLAKE2B 75b915d42195297b7a8730700847fdefc084331e871b5061aa4a7bb8afb9e770b121411f32731d0ce447f503b28a3424c8c4d1d704cb9c6671a72609c2277bd8 SHA512 52c09486808b7acfb53112468c674e96b8317da4b1fb18631c97e22771c68be7c5087107aa08ebf3d29cec0321fd695dc5b78aacb9cc90ce22eb2e009da480a2
-EBUILD portend-2.2.ebuild 743 BLAKE2B 9d8a7a2e4dc83e98b3b35add157b18f367a56b05a3117a94296e56178f23649058835edd1a5a67098355b20a7c75d32ab0a594c6c26b49f6cc38bb7f5e19f63d SHA512 b4584bdbc7dbe807c103f82297c5a66def56b4d76cb7158ac59275615d71723d02fa527a01d3232d4d667b4de9f02f213deaf2026189f6685e49bf0d28c8ebad
-EBUILD portend-2.6.ebuild 982 BLAKE2B 300aefc5395a2fb778ef52f010e980e1038ccb255e4d138930da6f83852db66a5f5f22017c1def9cefa0911afdee5e9e29f9582f4a24d62a82499f15e2335c4a SHA512 aec0e3b60556e19a03d19ece52e26976314c54f5e04ed9be459c663e5f9c168081a501b84117959c3708e5581826bf2533e4058fb644aa32dc943ecbee521bc0
+EBUILD portend-2.2-r1.ebuild 746 BLAKE2B d5fea8d4aa7c17b6d8a0ce182481d53d439a77b037b4f1fee29bcba0d3b9929b942ec3a63e2939d40475cb056ffb49c8390b76e1f9b49e1fe679bcf778c2c25f SHA512 038b9c2712a7c09b491a88ccf37357583ad56941a883278477218294e88b2303b3b295c78a8f7f17ede15adbcac7a958c32b140c19307f156117c01b4515bba1
+EBUILD portend-2.2.ebuild 734 BLAKE2B 05b051d555a641392812f387afdb28a37a1a319360cad1b7ae5035a04734f4ecafcf6c672a9b8c8f025307694464677373867914996d45f1f26003888f575470 SHA512 4660eb9aa963c51bc24139058b016f6fb66faa27f4bbe54f54ef4c2024fc348da0e0f51b11d26d028f365ff8d944e6f2bd4c6a061ff0cfe4dd56be9eaed953f2
+EBUILD portend-2.6.ebuild 980 BLAKE2B 9175026b8e611741ef219791f9f32b17e23f7e0968435411c3c7bd734d0df5b05d3c39ce27ceafd7492a2486bfcb0f6e4d19b2c9677eb6c6710e45e8b65692a9 SHA512 593f310f6e45e8be0944af11268ee28e9d416ef7661025222f7b19ea477120be3f372c42141c686ad5ca9c984aeb9c4028c7f897cbaff3995b43a085614807bc
 MISC metadata.xml 368 BLAKE2B 3f51a162e0c69485b7fb54960635b24ccb4741cf053ad4ac314f7f45798cc56056a7416e2207b6eb1084dffeb9bed043053eaa2ae5ac3b8d0dec142a47d1fe36 SHA512 269ed8048e3bcf73a693874ab0a6a269fa24169a1a95d9cb5bebad5e87193c443be8883682df973b4a461447ebd6042cdc7a932f81019b0ea53b3da7c566bf82
diff --git a/dev-python/portend/portend-2.2-r1.ebuild b/dev-python/portend/portend-2.2-r1.ebuild
index a54e188f38b2..3ebf5796b8cf 100644
--- a/dev-python/portend/portend-2.2-r1.ebuild
+++ b/dev-python/portend/portend-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/portend/portend-2.2.ebuild b/dev-python/portend/portend-2.2.ebuild
index 497ec4b43b99..c789204db463 100644
--- a/dev-python/portend/portend-2.2.ebuild
+++ b/dev-python/portend/portend-2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/portend/portend-2.6.ebuild b/dev-python/portend/portend-2.6.ebuild
index 62fb040f65a3..aa8f2d39e0f4 100644
--- a/dev-python/portend/portend-2.6.ebuild
+++ b/dev-python/portend/portend-2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/positional/Manifest b/dev-python/positional/Manifest
index cbc82c12a362..1a15e816ee48 100644
--- a/dev-python/positional/Manifest
+++ b/dev-python/positional/Manifest
@@ -1,7 +1,3 @@
-DIST positional-1.0.1.tar.gz 16398 BLAKE2B 83797cbae3ae19dc953da46cb539b3eeaed533cbc9a13f46594afff0f869c35f40eca093160381cd23c28f0004dcb3b39e07ad94851925f1c7adc4c8b42e9daa SHA512 1071100fdc3d05520d452ef74a3294c7b16f84f41aac04ebd85fddcbbac58564e7ee836ac2a73af732b137bdf857efbfd15351e913afcdc88885d1b820183699
-DIST positional-1.1.1.tar.gz 15987 BLAKE2B ecc96b1df800a4a5a18e5baa048c1323e66cad0176bda70eee36f47173b8b711416af925e59c839288bbc3c9f2a32a5569978450506b29990b886a44ca5aa889 SHA512 6bb8984c5a31081a97be3be1eff2d62747e829f7f4d1e6e973ab00e8baae3552ff996500a343b58986bb70399c99026284fd59185b3452dc2b9165e8276eefba
 DIST positional-1.1.2.tar.gz 16434 BLAKE2B e54e7e7ae0543780578272705ac6cc27d6df0bd29220f3ad2cf6f850972b6d5ccf7c29e81f889e06d3f718664557ce06a0fdab1300f4d423bd8c9289f4dbf374 SHA512 864f6c505edea1a0639a97aeae554cbb9cf0141c3c175b836489b6f258d53f6d306e915bd75d6cb7c61f6eda9d36afaef1fdf0cd2f8afa61a6e797b1c81c8cb5
-EBUILD positional-1.0.1.ebuild 576 BLAKE2B c6065c40c5419b44c19064fa97684ef262a6833b312c4c3b449ce01cfb7d1ea4e913e64944a3849707e2569dcf5bf7d469bf263793cbcec067583f50d4da884b SHA512 a05afa31572d25e2e50bae65ffe8717200ff1cfed7dfcd1009624b834ca4adf6e12a1cdc02ee3c8c4ed90185309d221410fe3a446d63003dd4e3d47c49d207a5
-EBUILD positional-1.1.1.ebuild 616 BLAKE2B aa99832656afcaec648e188b8091776006f817b079346dd44ddad8bd62afbb2f86e6bf128c527bcf65366c4009aaf7975f25af384147791ecfdf45addd8907fe SHA512 e55d0af0bd7746beb51ea7f1f305ad3a7e6a2f5cf09589743acdfa31955740176537ae9251d64360dd2efa4c93022d0dd473badcfc05f4f97751d475b92c3590
-EBUILD positional-1.1.2.ebuild 616 BLAKE2B aa99832656afcaec648e188b8091776006f817b079346dd44ddad8bd62afbb2f86e6bf128c527bcf65366c4009aaf7975f25af384147791ecfdf45addd8907fe SHA512 e55d0af0bd7746beb51ea7f1f305ad3a7e6a2f5cf09589743acdfa31955740176537ae9251d64360dd2efa4c93022d0dd473badcfc05f4f97751d475b92c3590
+EBUILD positional-1.1.2.ebuild 607 BLAKE2B 8472422488e707d2feeebab6c06e3dddb16f8663543fcebcf8f0a59eade244537f44e7233a48dd9f4840b00b781a94fab751fdfc6984abf6793fb8451c8bff74 SHA512 f8757b6aecef9776868edf0773435622a7bb3cbfa629c84b63e58bb75050f5631f125eb76f4de27b5c54939d15920496f05898e509ffee43c1fecb617eabec17
 MISC metadata.xml 513 BLAKE2B 938c5bd1c134e441a40adf90891709ff5b33172d402e221a70855635d6759c5b9f31d92266e5898d1f30736d8b6b1ea3f0d435f1a745412f51da4e754c826d08 SHA512 3279a282ce690d0025b82a1ba42298304fd375388afea2b7cfc0981da82a78002077df6c8b3cdf8d6b857872b97e25a1f37312cae5a473fe12f1cd6a50ccdeb9
diff --git a/dev-python/positional/positional-1.0.1.ebuild b/dev-python/positional/positional-1.0.1.ebuild
deleted file mode 100644
index 6cab73bf6569..000000000000
--- a/dev-python/positional/positional-1.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A decorator which enforces only some args may be passed positionally."
-HOMEPAGE="https://github.com/morganfainberg/positional"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/positional/positional-1.1.1.ebuild b/dev-python/positional/positional-1.1.1.ebuild
deleted file mode 100644
index a6a70cb65d72..000000000000
--- a/dev-python/positional/positional-1.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A decorator which enforces only some args may be passed positionally."
-HOMEPAGE="https://github.com/morganfainberg/positional"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]"
diff --git a/dev-python/positional/positional-1.1.2.ebuild b/dev-python/positional/positional-1.1.2.ebuild
index a6a70cb65d72..4a97388ea26f 100644
--- a/dev-python/positional/positional-1.1.2.ebuild
+++ b/dev-python/positional/positional-1.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/posix_ipc/Manifest b/dev-python/posix_ipc/Manifest
index 1de77c0121fb..f778daa372d9 100644
--- a/dev-python/posix_ipc/Manifest
+++ b/dev-python/posix_ipc/Manifest
@@ -1,3 +1,3 @@
 DIST posix_ipc-0.9.8.tar.gz 66589 BLAKE2B 3a88a9f6c1e545cff3dab07d516be052128966d7f9b5e9d2282817e4fe34cf0b5d0fc3ea4a9f7f8987ce8a6ac108df8b86094ba50609c54e0ead833ec9d8293b SHA512 d0618c302e6d0f9113b9515627095d6baf383dcf4ac603b3a4596ee814873a0baa473e8505918859bda37cb539f98e76fd601e29f6772dbc14f74d6059fd4200
-EBUILD posix_ipc-0.9.8.ebuild 524 BLAKE2B f22db775df48a064b525ca80666aaeb5417ad31ba8ac6e92c1a4289aa6b0089331495a124404adca0c295841375126d1dc1d3c84f789af48d19c1b29666634df SHA512 e3d8b1453799c8b268b32cdd0da23b679eb17db8685ec14d1be4f44e89b1d5ae12866b6db6d2330bd32fa45978e34ef3cda82f9087ccb3a46423b1e8c5850b66
+EBUILD posix_ipc-0.9.8.ebuild 510 BLAKE2B e44b11bdc8cdf429b20a1b427fe947c5a5d580a28a9dc595cf4c0c32926865536562bdc8730dacc03c97c9e89b8d5bfd3983d9c41a18bf1948106f79bea36475 SHA512 b85ec0e372309b12425db4343ab92a61def0326841448559e63f9e6798c1a67e214db63830fa2efad90f5c770cf58aad3fa56a279b5c91584f194c767f6552b5
 MISC metadata.xml 563 BLAKE2B 972d775004d13b76a8f7da5efcca6fd74bf4c89643797fdc553fe96bf53d8612fd536738b245985776e89e179e39e88f0f7532405d22da0bb3bb076c13a44782 SHA512 53e0a911f621bdd0c409aef92100284da83ec41bb0c8834e73263254076bc53da8a2c3f0a8aeb43a9f78003e654381a135818e4b75d3c1d60eaad5c63f6c8ff6
diff --git a/dev-python/posix_ipc/posix_ipc-0.9.8.ebuild b/dev-python/posix_ipc/posix_ipc-0.9.8.ebuild
index 71d70243f530..b0a808e852cc 100644
--- a/dev-python/posix_ipc/posix_ipc-0.9.8.ebuild
+++ b/dev-python/posix_ipc/posix_ipc-0.9.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-python/potr/Manifest b/dev-python/potr/Manifest
index 08047ad96a5f..d7c7f300bf0a 100644
--- a/dev-python/potr/Manifest
+++ b/dev-python/potr/Manifest
@@ -1,3 +1,3 @@
 DIST python-potr-1.0.1.zip 30200 BLAKE2B 9dddad5cc902bcbdc5c674487e9f75d50dc711d9e2dcb24bc96abf6638628f22cd50ea2674efc2079e904668eef5cc92accce707811f922beb1453c1aa636a0c SHA512 d38f2fc68ce9f72ccee18923183f8640ee51f079da1e79e1f2f22e37383c99da7a6336a8538e28bd90b483fe8e227956ebc052e9c03aa6d7b49e9fc4e8df5281
-EBUILD potr-1.0.1.ebuild 595 BLAKE2B 93343c679dbb73c526a256f87a6d14136e5d524b7e16b122d1d1b38b18cf110cfafa9857f437d2bd93332574c04d2d63c835ee4bc80bbd74b0d3b613ff4cb3a8 SHA512 a56b160a43a6b72b93431acb9e80b642eaa88eaea1218da7d65e238e58df1f7b7abffe71ccf2ef013638ebb8f5a0533737501e721f22a08f9eb77fc53401122e
+EBUILD potr-1.0.1.ebuild 591 BLAKE2B 278181ba7bcd2b7d8156a471dff2feb11499ced4c125e71591d616555fe471bb73e878c225a9d1679ae80df2ceaaa5714abfc8cdac2117a0d383cbb66b02ef13 SHA512 32a44d0966a355334ad8fde07642a251f93cb3bdfd6ab62c510339aa0d5810f10841eaf4a3a8814cf9f428ff34bdf71cc6b634c61b38a80e7a27f564a8cab336
 MISC metadata.xml 515 BLAKE2B 4d576b7dca605ae1433a370cc03c569ebc3d27991e59ed75395100f75f787c3d5a69bb6d47f4b4fef68aa4f4b1a5a8b3fda4cbde678c1de5b5504df2f51c620a SHA512 3cbc182032fa1e1d868fc1348271840feab79629611316eb3433f11500552c57e1a04cee0b333f9cb6edfb93f9091c3aba25750b64a18ec62f59c5d4fc07da38
diff --git a/dev-python/potr/potr-1.0.1.ebuild b/dev-python/potr/potr-1.0.1.ebuild
index 476ade70fed2..119fea031ee7 100644
--- a/dev-python/potr/potr-1.0.1.ebuild
+++ b/dev-python/potr/potr-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 MY_PN="python-${PN}"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/poyo/Manifest b/dev-python/poyo/Manifest
index 9fd0887d7493..291e2892d355 100644
--- a/dev-python/poyo/Manifest
+++ b/dev-python/poyo/Manifest
@@ -1,3 +1,3 @@
 DIST poyo-0.4.1.tar.gz 10960 BLAKE2B 0020e10e3d29978398930a861352138bc11c491f70cae864618734a1382470a7df6d865de89bac144535db391022748559db874f6325e64430abbc3ff52420f7 SHA512 e2dfc504ec9cea8e43363556b875f9b01fbda506ee8e70916d4a018941e4e347a4e8a78a245f980b9c41b20731948fc9e5e131b415856b31593e44b805acc768
-EBUILD poyo-0.4.1.ebuild 538 BLAKE2B ee289a9645c79ce6fe72736a9f0de2c5a8d625a58a2b54cc0dbdf52cee155e1d238345170fffb3417e2fc5f22fc8cd2faecfa8c33f677f2e9f521af4367fe906 SHA512 b7c5b1fc48ccff2b819ca8382eb4bc76b3cb262532bedc31f20af4d0e5cbd2dfdc51b0ca7b8cb9c7ab2315d13ac67ef63eed37b700fa39f425df91accea27b2f
+EBUILD poyo-0.4.1.ebuild 534 BLAKE2B 165ab04920da4bd4472aedf04fe14dc17c7b7e93b10f2731be464edc4f6641fabd28dac0cc6a591e9677fb2e2821ec37aa91549a22ba2b67293f29ed7c710ed4 SHA512 2f8015128feb33c67fc48ef69b557d71210cfcbb54e8c414a97a16809b006b13df49e449d52e4383c3be9270500ccc1d41cffdc76efcf5234aeeb4362a7e5d47
 MISC metadata.xml 361 BLAKE2B e2dcab94df2b6bc836d19fa5a7789279ef28dfa42ba1ca36f7c88fcfa461cefb2de49245fd9d94789b06f5560ec8d6b0b0d6a737cacdc4e1034cc211a468c3e5 SHA512 b40df5a8d22697185ef353c30f046ebab34896e43ec3e6aac1eb3c31396b051c026a6e76b00799855953a0f4393103bc2ab95e24fb358b0eff8897293d6762d4
diff --git a/dev-python/poyo/poyo-0.4.1.ebuild b/dev-python/poyo/poyo-0.4.1.ebuild
index 3b22a0b883a5..eb0dd7710e92 100644
--- a/dev-python/poyo/poyo-0.4.1.ebuild
+++ b/dev-python/poyo/poyo-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A lightweight YAML Parser for Python"
diff --git a/dev-python/pp/Manifest b/dev-python/pp/Manifest
deleted file mode 100644
index 98d3ae72eff5..000000000000
--- a/dev-python/pp/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pp-1.6.5.tar.bz2 27185 BLAKE2B 3148b9d9c251a8f75348f4a5b4905d658054b44ef959b4e9617532f69d6d0c12379c68c86cb91a8151de50b9434844ee6746cc266e253a4417228895178c3aec SHA512 b72c3e12b770f386b213a0325748a7e99d225a608a5453929004b06aaaa8fb69b40054a3bcb1d8b30a640f7db7a945b0ae8c1b1a1d753855668553d18a18bbfe
-DIST pp-1.6.6.tar.bz2 27261 BLAKE2B 967fa8a1a65c098eb61c0f78ba3527b7d6c6aaec60adc6bec04019e3f10379ef4d5b50a6cd251fa5f9c658bdbc7fc54639afb12cd6708ffbb3519eab56ef1548 SHA512 5014a57a9c58b3032973e6511a00c710d2f781441735cdc2760d1073a4d78a0f86f02e2f6f21d2a55dac272e6ea0c0cbcaa6282efbc0c5175fcb0b6ccec1ac97
-EBUILD pp-1.6.5.ebuild 617 BLAKE2B c9cda62671a799b6db808ec5abe2fedce19e7a180365eff6193a508fd2ee94245370a1087c6fd9dfbacdca9ec72141960df51c7ea07e1bc2b7888a8caee2a1cf SHA512 c0b9e70c30df277550db1db85b53a5d02f4412f42f15c43471aa351ee4130ea6f2b26931b965b41e3af5fdcc9936103b35166522251728488e977ae71393a63a
-EBUILD pp-1.6.6.ebuild 617 BLAKE2B c9cda62671a799b6db808ec5abe2fedce19e7a180365eff6193a508fd2ee94245370a1087c6fd9dfbacdca9ec72141960df51c7ea07e1bc2b7888a8caee2a1cf SHA512 c0b9e70c30df277550db1db85b53a5d02f4412f42f15c43471aa351ee4130ea6f2b26931b965b41e3af5fdcc9936103b35166522251728488e977ae71393a63a
-MISC metadata.xml 485 BLAKE2B b45925828641bb14a94fc2aef987654643219b4a58d57a1551b675bb10700d077a69d8cb8783a92aa8273971476ed22eb9b9216ea4e29d28a8fcddcffa9aa1ae SHA512 68f07655eb89478f3fd4bd5f2312706ae48ffb23ae5da7c120dbcfed34fb3476bd9aa8b82de033db604bf04a8056b7765d46b83b72c5df4187dbd1d37a907a51
diff --git a/dev-python/pp/metadata.xml b/dev-python/pp/metadata.xml
deleted file mode 100644
index 3569a6dd52bf..000000000000
--- a/dev-python/pp/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 lang="en">
-  PP is a python module which provides mechanism for parallel
-  execution of python code on SMP (systems with multiple processors or
-  cores) and clusters (computers connected via network).
-</longdescription>
-</pkgmetadata>
diff --git a/dev-python/pp/pp-1.6.5.ebuild b/dev-python/pp/pp-1.6.5.ebuild
deleted file mode 100644
index 467a8f15bfab..000000000000
--- a/dev-python/pp/pp-1.6.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Parallel and distributed programming for Python"
-HOMEPAGE="https://www.parallelpython.com/"
-SRC_URI="https://www.parallelpython.com/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-python_install_all() {
-	doman doc/ppserver.1
-	use doc && HTML_DOCS=( doc/ppdoc.html )
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/examples"
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pp/pp-1.6.6.ebuild b/dev-python/pp/pp-1.6.6.ebuild
deleted file mode 100644
index 467a8f15bfab..000000000000
--- a/dev-python/pp/pp-1.6.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Parallel and distributed programming for Python"
-HOMEPAGE="https://www.parallelpython.com/"
-SRC_URI="https://www.parallelpython.com/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-python_install_all() {
-	doman doc/ppserver.1
-	use doc && HTML_DOCS=( doc/ppdoc.html )
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/examples"
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/precis-i18n/Manifest b/dev-python/precis-i18n/Manifest
index 50b573f18275..236a5c9ae17d 100644
--- a/dev-python/precis-i18n/Manifest
+++ b/dev-python/precis-i18n/Manifest
@@ -1,3 +1,5 @@
 DIST precis_i18n-1.0.0.tar.gz 61251 BLAKE2B 3f49f77ae4e6eea6ac1429a8de9b4ebe217d4d901edc223ee487d8a11bb45dc9e21a1e9fef9bd4478273ae721b5c02e4e2a7d2a3f28da281fcbdc17a12a1094e SHA512 9017852fdd2a066b8e31521bd39843f3b1f87259ce87e1567cfaa2b932b52b745ad84eb89b77a4c3ea0a04e513573655266b2cc73997e951268646da7a000e5d
-EBUILD precis-i18n-1.0.0.ebuild 539 BLAKE2B e7d0334726f7bc192c69e1367481461994564ddea5e3e9383bef74d58ee6ed217f55c2c58f19ad8c5287664b37a8376b2218db3e7e905db329880542c9f6ebd3 SHA512 7e18ca22f87e476b9d4428077a12d1f75b3746d52d8713570e343e6ae0916ef3932598ed4ab6ca4e4504e8634141baed3d1e57352fbb3e6dda94620ac2cc4474
+DIST precis_i18n-1.0.1.tar.gz 63941 BLAKE2B ee429304f41fd225b306d6df342e1ab62a9dcc3daa40ae08c88a02809230d7e356090c3414136799b176b74debfd901863cb673b577b336784411ca5baf3e92c SHA512 d8aaf99bbf3bde148f173ac8ffa5cab5051ec873d53e19336171dcd29f995e706746e5969d37aef05b6c9db064ca5e7b3944ae049b0a41e605e71a854248251b
+EBUILD precis-i18n-1.0.0.ebuild 535 BLAKE2B 720f1d32f9560fa3c1de767e13c028441b065430ae060c102f83ecdc2966a89c71439fc662e6a53c7393b25551b1710da5f2ba88aa772d394b944f9941a09f5f SHA512 c89ef7f6c7d37b738ef08af33e316dab4bd94e4cb74c4ff6d7ee1bda2f1ba8681db4d2111f2cee45e228da93aeef1d2e4e437501d5b23177058d6f2752cad617
+EBUILD precis-i18n-1.0.1.ebuild 543 BLAKE2B 5e69a64f6814bfc91d257f4176b27d48a05855c5b813a7350e2b21a42a1fa687fef0947d0f40282de6dde53104bdd5f96c57a9bb19baa2e8a8be54a5399231ce SHA512 cad8cd688c9540fff0486d01f8b39bbf21f362f14ea8c9bf98ffcd6914e2118e12d25be966110cb6e0e5d5a8154f93e6a790e3ce36bd779f87d563381f25452b
 MISC metadata.xml 945 BLAKE2B e05fc6a6170827749badef2aa323c05a7c57ceaf89c21d11d64d9b7e43623a1486c5a90ae4fa6a6d40557a19fc4a3b06eb1575a7981bfb98c46826de8297dd1c SHA512 d45d169badda2117215c9145a80e95bb03f13018631e813b61c09b84e6e860e56e48054aa874639d3111aa79383a690179d415cdba015452b21546f0970756c4
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.0.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.0.ebuild
index d79b5f9f77aa..28cd9ad42489 100644
--- a/dev-python/precis-i18n/precis-i18n-1.0.0.ebuild
+++ b/dev-python/precis-i18n/precis-i18n-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.1.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.1.ebuild
new file mode 100644
index 000000000000..bf0af6cb4e90
--- /dev/null
+++ b/dev-python/precis-i18n/precis-i18n-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# 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
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Internationalized Usernames and Passwords"
+HOMEPAGE="https://pypi.python.org/pypi/precis-i18n"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pretend/Manifest b/dev-python/pretend/Manifest
index 5617ff7d56fb..257a0dde5acd 100644
--- a/dev-python/pretend/Manifest
+++ b/dev-python/pretend/Manifest
@@ -1,7 +1,7 @@
 DIST pretend-1.0.8.gh.tar.gz 5509 BLAKE2B 574c83f05c9b45876891df97a23a25cefb0f27f9ba76aa6d01fe8d2246f7b4457fb99522540d85108056dd83e79ed7179c4661d30fbc786ce2adf0c477a23560 SHA512 f0a3263f55afc43bfd63a6ba0ae876f2607ed9cc26352a3ec69933ebb79418a128c5c29c3e77a924b158da658d8ff2043a7f8e6d4ee3e499df22e4083329cf62
 DIST pretend-1.0.8.tar.gz 4848 BLAKE2B 396fae55208e39eadceaff92890b48d63b79a24e0d313a3b87d69b8a61655cb8a1a2f8823f06779e0730fb3505cb269ca907dd28a79fdd283ebd6913bd9c0ab3 SHA512 25011216947289d340fb979ebc9e2c7f000571f006cf5ce15f10ff0e013164e4329a3a66933d202acf8ced498929cf9e5a2a3666aafa00f78348400615c5cec8
 DIST pretend-1.0.9.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0
-EBUILD pretend-1.0.8-r1.ebuild 773 BLAKE2B 910416abaeeb9ee07bd17811ff807e3ac46c69e4a06ce2e75e502414383d3e6fbfba9c3b303bb2eec2471797a4edf71848b7cfdfffdd5e9263e1f515a3e2535b SHA512 313e538e6367749042be248542c06514d3dfdfde775fd728ae991e43edca32c4b82da3dd951eb99498010f02ff9ad0526ccc8f2a4a0c0f9441585c7b44c207dd
-EBUILD pretend-1.0.8.ebuild 615 BLAKE2B a9a9a467db013205946ee55a66e57d7b6bec4b1bafa32472ab3e986884771d99273c4d24420dae92f52ff9594a7063e45d6b62e2cdea830ecfbc8aa75148835d SHA512 b0f6e848c13473d3f708da5a4afcfc7c4cb836c97f101a55538ca72cb692de5e2bf357499f25688c127d6f2a34d15f205c77cf55af09a899c87a80b25754c8c2
-EBUILD pretend-1.0.9.ebuild 707 BLAKE2B 0b42de0acea526fd34b066a9749ec8b4b5581fe3f148addf5695865ab1ead42f79e4c23d291953390976cbbd54c26f5c70e76b15b513eb29a146331abafa5d29 SHA512 1aa133075bd79dbd5cf0c97cbb925db40a691e972c1b2109647c895a035e348343e1fd7f19b4014183aa459316efb7ddc208160089058ed41c9ae2f1c2157a86
+EBUILD pretend-1.0.8-r1.ebuild 764 BLAKE2B ce3f3acaf2894a96d65919ff63f70c13b543200cc5ecfb78c828285a8e0aaa3ea783565dc6167cbfee71ccbdb682c64c49803ce44ee0aff4c6ccc48028a629ab SHA512 50fead85493b708c0baa933fef081e9a05757e08601e0ec38402a18a1722f28485e28b467d797e184fcca2423f05d0a6dfe4b4ae0d9da6c1ad7b82dcfcdc8f2e
+EBUILD pretend-1.0.8.ebuild 606 BLAKE2B 4fb20035f7048fd26de94527d3cf9171c71355b6380c5d2d1bc184fdd3510c95a918e12c1f8aaab961aedf728f4421be11780ef4f80fb2072d9ca8d6e8d6275b SHA512 bc9ec87fee6aa8a9a244268053ad02808c7bc4702caa40998d6a083a718db830fc280c23a1a58ffae863188f64b7318f4f06ae5d44978c732bfc202e66b78478
+EBUILD pretend-1.0.9.ebuild 698 BLAKE2B 6c638b412eae08e3747e859e21feaa23654d1439061221ca55ae1acec6c671f59769c98e6d3f2c40685ed45cc08f7e2a208403e368ec45574f83fb187b2953cc SHA512 5035e04c8fd862d787156fb0bb1ef4e3bf0125ac1d4dddf38428199e00b951aff36d8adadf75ff943a5eb5c9b315a8efcf50aec25750720974aeb08f220c7812
 MISC metadata.xml 374 BLAKE2B 4f62dba0b0933a47aec8c86fffefdb9a50d31fd76424e268adbb0f7f6902556366e9b71fbf2ec2b652e8114f310f15060de015f753aedea9ac727ce9a884e1ab SHA512 8241b20ba14badb91e36edb5070339dfcea6902e0f192dd1bc066698cc9c87370fbe0f16f61173e207766b84a65193f12ca3d9e1a16f467411762fbe52cc906d
diff --git a/dev-python/pretend/pretend-1.0.8-r1.ebuild b/dev-python/pretend/pretend-1.0.8-r1.ebuild
index f7800f84636b..b122b6bccd68 100644
--- a/dev-python/pretend/pretend-1.0.8-r1.ebuild
+++ b/dev-python/pretend/pretend-1.0.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pretend/pretend-1.0.8.ebuild b/dev-python/pretend/pretend-1.0.8.ebuild
index 23b7d4d8474f..6b08ba6e1624 100644
--- a/dev-python/pretend/pretend-1.0.8.ebuild
+++ b/dev-python/pretend/pretend-1.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pretend/pretend-1.0.9.ebuild b/dev-python/pretend/pretend-1.0.9.ebuild
index 7591bced794c..3ea4647b3405 100644
--- a/dev-python/pretend/pretend-1.0.9.ebuild
+++ b/dev-python/pretend/pretend-1.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pretty-yaml/Manifest b/dev-python/pretty-yaml/Manifest
index d3d965770c82..b726988c8820 100644
--- a/dev-python/pretty-yaml/Manifest
+++ b/dev-python/pretty-yaml/Manifest
@@ -1,5 +1,3 @@
-DIST pyaml-15.6.3.tar.gz 14459 BLAKE2B 3329d47f5cfc3de1a2916ac2f7cbe6bb0ac0739fe7704a4a3c684d9a050f9272c16140cf3fe040fe74b86f71e46ac626fe179bec04fbeccf6962ae959b846953 SHA512 9d0789342f59adfc415bef54cdc52b75cbcf1fa71940e1b9534ea0c141c5737449104e45fb0feea968e58d0886a74d9a5bbec0ba05b7d72cf5d93d3a674b5868
 DIST pyaml-15.8.2.tar.gz 16544 BLAKE2B 1e9820c172bb0c2e05c78f5dee3299c6bb0d83e2c658f3cd45322abac3404af1c9dd1f3b00e2c7b285cbd00c17d382c82cbb16b96bbac10021a0ca1a008d0287 SHA512 74f1fdacdd601f0b6f710457627e4dcbc42e7301fe5faa061d3e8d593842d6e5dd85041625aba576bba9cda2a713ee07ca3067221a720cbddc6dcd417fccee64
-EBUILD pretty-yaml-15.6.3.ebuild 762 BLAKE2B 18d22b43bdf4e23a0a6e0451fe92c74677aef730cfdfab4f9f94eceadd1d3d582d15b70435d83226edeae29f2748f864151f394c8efe80241315bd3c15ad9b74 SHA512 17380cac91235d86cf9e5039bae6f5fc6b0ebaa142028830d1cf9545e204487eea6331ea9479a6c115122fd745c4484611b1d3414001c68282519de3c1d64cdd
-EBUILD pretty-yaml-15.8.2.ebuild 783 BLAKE2B 04e1dc34e3898b4f014a6f52ef2c85c2fb84cb0c1f416117e46a90eaa2e2b75c4a8ed0804ac11e58a595e619a2174f839f8f2ceccf9e8f9fc4e68ee024e5c95d SHA512 f3cf9587de33729581729c31d44d5e2eec0effba0429ed27703f2ebd52d0ccd58fdccfd5149d4e00133a72f30a65265ca35f709ff78056ad5a0e9da0ea5efb1b
+EBUILD pretty-yaml-15.8.2.ebuild 776 BLAKE2B 1f8c20a0bfb9defed9f5a7b19ea52baff22fed87ec262d2fbed7cdc377e262b8a8ff2cb826189ed75718768715e35193b878f46bbb213e11ac34941987b3e565 SHA512 c204290537c5cc99334f7cd61ffa21581e8e864647cc6a0fb585a119a87f728758fa3db225b1717c703b1a9b2e9b44c8b142d47b4d1ee064a4231343441dc891
 MISC metadata.xml 444 BLAKE2B 522c0c3698f3c35b698b255504afbcda02c321e542ba7013fb0e3de4f57334b31ee014dbfdc8914dd2760a621ab1724a9142029d506d8fa44831726ae7c2b6a9 SHA512 70aee75c33eaa54fc003d6879ada0d4fc772d00619273c7b0e7c5829dcffb8ba23171c563e6e922504d9256f53ee207b36b98240bec3d084a8e6de15e0013732
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
deleted file mode 100644
index d66683e52bf4..000000000000
--- a/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-MY_PN="${PN//retty-}"
-DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
-HOMEPAGE="https://github.com/mk-fg/pretty-yaml"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/unidecode[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	"${PYTHON}" pyaml/tests/dump.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
index 960913e8c75f..cc507c308569 100644
--- a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/prettyprinter/Manifest b/dev-python/prettyprinter/Manifest
index dd3daf43c761..e0275364ed51 100644
--- a/dev-python/prettyprinter/Manifest
+++ b/dev-python/prettyprinter/Manifest
@@ -1,3 +1,3 @@
 DIST prettyprinter-0.13.2.tar.gz 644753 BLAKE2B cdefadd64b3de6a65135fd474c2f19567d26985acdf8c520f6334980bbf85b393fd6450d1abfed9d005adabae2b6a2adbe08d6448e43caf4c66bb3cc126dd0f4 SHA512 07c4d1d7abc56cc6677aa71ef2a156499ee3618693414d0ada4e451325d633835b11561e50ad6824341cff85a95f6703a663856bd3e3b20f2716f835bfc65041
-EBUILD prettyprinter-0.13.2.ebuild 612 BLAKE2B 88a2e0df0ff80ed7a9ba6bee3c9309611193d5a86f6bf0abc9317a2c2c2019c2e7cf8b3feda51daf9b5c99044b3ff25f311f5309bf7eb3f695d49f824c9e2a8c SHA512 06527599814ae8af255dab91f966ff5821594dc1779d647b01fdc0952bd45bae004309902f2f26d541537510bfae9db550f004b0b8ba5ab0a7cca2cbdbb34f9f
+EBUILD prettyprinter-0.13.2.ebuild 605 BLAKE2B 2cba60847e4a547696faba71cdce533d877e3bff4eb2b39265aa3e6739e1fa277fe99cdbeeaf411579f0432b114263cc7fcb9e8389d974d7ea61619892743d0d SHA512 65ff3e276ec6d28440ad5e800c9203f2ad1e57159c993f73cc83cbc5fcae9374850f5442635cabb57234ddb9dbf8f149cd1d6eca83c9d3e5b3bd28c071815657
 MISC metadata.xml 404 BLAKE2B bce6eafd9badbae17b71c24ee28d268e1026b1c5c92ae044352860896dcd1c9de2d7d1e0ecb86e7cdb249f43c13cb8c40c48a63df308707d8917beab653a286b SHA512 7424b276b1f962faa10048e93eccd40ef6b3295653c392afc30cdf0bc7e9629b41786ae18200cd150431535c7f7206e62fe02776708463cb65e34a50582af45a
diff --git a/dev-python/prettyprinter/prettyprinter-0.13.2.ebuild b/dev-python/prettyprinter/prettyprinter-0.13.2.ebuild
index 764017b849b3..c3ce1b88c99a 100644
--- a/dev-python/prettyprinter/prettyprinter-0.13.2.ebuild
+++ b/dev-python/prettyprinter/prettyprinter-0.13.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 01da20c53851..a8e50ab414bb 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,6 +1,6 @@
 DIST prettytable-0.7.1.tar.bz2 21499 BLAKE2B 6f8e3306fd26e134dbcfed18cbb641f6b167cc9b91846fd14ee9402c5f7384d71b00d120dfe32cc6948ff6cf78c613c8f4317cae0ae5b3eb028e16f1054cac12 SHA512 1a7aa604f608483b107401ddca9721ddea673ea1415d2a514948f7399835784e0a9025f0e5236f4109890e5924da345bd111893200730501b496c136465c204f
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
 EBUILD prettytable-0.7.1-r1.ebuild 613 BLAKE2B 50952c33aa0692b22aa9557676188190165c8efd965664dd579a537254cf8661d07d2bc401577c99edd3cd6055282fe69c5606ccee0dc4deb495d8b39b001508 SHA512 4104a0a385082b7c7144cd653535187bf862c79e81f91b00af80a04f88479203f95317d9206cc1652daa6822a6f50b7f7d5a7e5660f19792733cdea47a217d59
-EBUILD prettytable-0.7.2-r1.ebuild 644 BLAKE2B 99759f3242a8177fe7bb1c1a64671b868eb20b115611c359ac63763bd880239eae8da8002f73f64128e624708e055dbebf2c39dfe2701e4a653808f15c00cfa8 SHA512 081c6926f7b20863a8029bb97f626726222ae2b95cd4170a6c597263ff8913bbd07ac541e2c9df93f26619dd51d5b303d32bd6452ea8ae33cd9793863f955144
-EBUILD prettytable-0.7.2.ebuild 639 BLAKE2B 810e112275805011f3cd7501703ff0d505c325ba3e1be4ce3098b27dc305c793f24752c9531d11966cfd4aebf49bcd05b521504fe7131999f2775752958929a8 SHA512 03976e907073eb62455b5199a5e8795b77300a06755faa93ced74936eb17e8af63f6be6bce7e6b708bf790636bd1b4206975fcb000b2b78ca2a50a3cc708c1bc
+EBUILD prettytable-0.7.2-r1.ebuild 641 BLAKE2B ed6c5104f0d4c38d176ee9ef1d76d545cc204bf9c079bc9c8550725e7d026f03a13708d34f53dcd45f1e446d20f07aab34513698a980a6e4bff9251cca97ef01 SHA512 4bceb86a2943496bd3f363a48247f24de8ed17e808acdc39658d6509983dbf47b3636c52e07236397a95958fe3e7c8615f7eb6abf59808d40689f394618e74a9
+EBUILD prettytable-0.7.2.ebuild 635 BLAKE2B 8e1498de088ade323ef168e93abdc848711e771968921038d19f3834fce0d6a95e513719569add64da680ccc290aadd0f02add29d9d8b6b2224179f14078f425 SHA512 5b75c572b5e56c833859f51e2e89bf5d75ea9824c06f106e6d3ff0531bc94e0897e5c95dfd9c08491fd2f3ec18ae7f4bde2218de7133bfe3fa81da51253f31dc
 MISC metadata.xml 388 BLAKE2B c19229c631dbaafafe2f8b2bcb0650052b4827bd6d0901d51d7c16fcf2456fca33efbcd21ee3ea1012a1b28c7cfc67042661b02bcc23af6d5768bf180304efd5 SHA512 7ac1cfd03216f171bf432f35b21bd6b43d297e77f41dffe5c5c5c4d85614c799252182a06bd5a116b5b831c06df115dcb933f1b2fd051eca8676f0aca7997d58
diff --git a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
index 9690506178b9..908cb7400486 100644
--- a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/prettytable/prettytable-0.7.2.ebuild b/dev-python/prettytable/prettytable-0.7.2.ebuild
index de41ec354f3f..e7f7440c1c53 100644
--- a/dev-python/prettytable/prettytable-0.7.2.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index 6a41ef7877e0..66783b99eb91 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,4 +1,4 @@
 AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a31871e5c8a66c45d6724506590c95e09eac027969def8198c5bdaa14e50cd77ea105881b7ddb7f36c95665502799f5ea751b6d SHA512 9e809600bc972baf4e1f5366c65db5e5d050bcfd0df23da3d1f75f653a0fdc27f7e4a59e96e13bd42636360653dfdc1de1991e6684e95bfffbf0c4384d7dc550
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
-EBUILD priority-1.3.0.ebuild 748 BLAKE2B 1cc7d67a4878ffd8f3f3458d6a15aadd6656a9c2285978bf2e19e40d3b32069d1c5821daf94421e97bf267fa774394ed89dc9712209b31147f48a82594397dde SHA512 aa1eab5adff64094c5fa86ab0c7d8c748be02c7e26e72f45c39bd1d67c1bc9ccc6a5c4ae3e37e6e56496157ae602c1bc85244c661b979a030d35c5a27108a7d8
+EBUILD priority-1.3.0.ebuild 741 BLAKE2B 7667872608a5c0f71570a5c520fe4a18c197ef4dbed4a886518a8ae3c592c122543859bda1c64b637463135b0a9a1c3896d848459c46f8063b5479334909fecb SHA512 c363fec93ef365bbf7399ad899aec26d2e5c20adedbf131192c496b76121e3d46055d038c2a23b2121b6d9577f0a6084c0f59d495c2b966c6e7f7f76705a23ac
 MISC metadata.xml 839 BLAKE2B 2a922ade07ccabbde2eaaeaac310e1c89206f7a6194ea14cd83f53182270edfd2cca4b1d13072d8a4c81c96563ba3b81251626eb777ced188bc9a22a37dcbffb SHA512 fbd62fe6b97e29566a18a29d155b8b08124d5c1561a21ad7aef7daac1a68b75b48b82d3edc612a27888da0d24ecde73b808cb90dfb7fe78ee97adc5fb507b003
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index fc22a3fbb745..ff29f8aad5e7 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7,8})
 
 inherit distutils-r1
 
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 4d5579ca929d..25421e0c4018 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,5 +1,5 @@
 DIST process-tests-1.2.0.tar.gz 5478 BLAKE2B e210945253e0a5437b68b47f3621b82642379f8ead297cb63b76fb010f8276a5e3d007435c4f837c7ff0ce83ba38cf57dd8963eaa480219e34fcbce9f8cc22b6 SHA512 b5cbe96dbeb6421b26f5a50cfe91bcac2f5d527830dad678df5e0ed1b2019483eab6102ba548483dd6695c881f29380ead2a8b6851c40119815363549ecf5bb6
 DIST process-tests-2.0.2.tar.gz 4815 BLAKE2B 14f2b2e266fd7365c4c1382a608ce641734c34c5215131b45b895a6d1d72591c2396332d1483f006ea7333a30993fae98d25e1a95cd58b38995d949c395da035 SHA512 6cf64d14587ab577a0680760ab6be146a60590091a0bbd6fb35d5c06ddf5289fa4d873c5658f882313837291b70adb37a3e41c13f1fe541777e05f5e9dac1750
-EBUILD process-tests-1.2.0.ebuild 630 BLAKE2B e710cba6d1555c35467d3e4ccbb67059b7002b4b94edb465ada011bac9d7d37a4ecfeb5db44274adf1114c0c6a2ec483cff9445bb3ca508242912670f7cd1f2d SHA512 5f0b8e6f4f39123d19d84af371aa28526ba73baafe253f37048f62c83a38f6b7c9822529c82aa17277323a89e72695c33d2891c0c62486632bbdf61f6f4fad1f
-EBUILD process-tests-2.0.2.ebuild 706 BLAKE2B 288f0b28ec0825eb7b85f725d1e522ab6d0de8737c65e1f2706863e715bf5981f7597f71272d0d882875523bbc3caeb023dd8f15059d3dd792008eded61642dd SHA512 b97f36ec3bd6a9c80e98e100cc685689ee2ea85c2b189574a284a6fc9260b9068b6f84949ed0823d66d42947d67640bcace988d86345b1bce83bef3748a269df
+EBUILD process-tests-1.2.0.ebuild 623 BLAKE2B 773602c917c43620f5c0d2a3339491db3cc127413affbdcfef5b5bd264dde9cc1bae48998fa42f49e2a478453280eda6199b5ddd7078b5ef5f7869757f844d07 SHA512 c5277edc8feaf07d23bf25c20160d72676bca00e2a3baf8d630756568750f2a112ac0823bb75f3eacc71526b0c9bd09ca3bd7feb195279307c61f7c652e63aea
+EBUILD process-tests-2.0.2.ebuild 701 BLAKE2B 5b42a1c7c103c704b68642dbb86051786101e70f6d832e9f39e8cd6f8c47f679ccd6bfa3e9f57cf9010a7eb4c480af7b3abb26e10b102fa9fac51943d8e175e2 SHA512 b8397b5053f91e4abdec2606e8fa915a2db34d7097f87261e9a39303c18f27b703de6ba8d32c6b52685aaf0c9423bfdb0bd052fea30bb1d4014bd7e138862614
 MISC metadata.xml 363 BLAKE2B a98b0d8b713b641ed26c4dd10207b0b9c76c6068e30d3e212cd76eb6d51e74edc032803f937f63fe10e676b61028fb95600fe322addffb7d9fe7936c988ad929 SHA512 f36107242f9361d2ea84f045ad22595c39bb94ba6641a2ffe4348bb7574a3656a57760f75211e9ee3e76b56fe0e3e9c44e941a8192a00476c7bfcfba150fe5e6
diff --git a/dev-python/process-tests/process-tests-1.2.0.ebuild b/dev-python/process-tests/process-tests-1.2.0.ebuild
index cc6ab95f84db..111c8f18e4e1 100644
--- a/dev-python/process-tests/process-tests-1.2.0.ebuild
+++ b/dev-python/process-tests/process-tests-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
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 ce1d7c09190c..69f276696c84 100644
--- a/dev-python/process-tests/process-tests-2.0.2.ebuild
+++ b/dev-python/process-tests/process-tests-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/progress/Manifest b/dev-python/progress/Manifest
index 1296797c2b96..dceb158ce6e5 100644
--- a/dev-python/progress/Manifest
+++ b/dev-python/progress/Manifest
@@ -1,5 +1,5 @@
 DIST progress-1.2.tar.gz 4951 BLAKE2B dcbb6df423949292c865142b40a654f5ac78472a1d5abfca4716d7449a3140cf8c71cadc6691609bfb81a941c5db27719dcf2eba9f743507c7023f710782eb1c SHA512 bd09e63a1cc1b24260b66e6f963deaeb6da87b08c376a4e2da179badc23eeb3e9ca213872d1da8caa5e2475cc1b7bb2022389bb8d7f1c9e1ca8f755406648116
 DIST progress-1.3.tar.gz 5300 BLAKE2B db7683550ac19e2e11832c8be19971fe07fd58d6077e5fbf585178e1353aca1bf873affdcb528182e7856cdb2f9c342c7caed74e7914fbebde2d803479258ac8 SHA512 e94ac3b86ab5391a348130fe97a1bed9c42ed3625b4436b84080f677351a2d64b56e9ebafc65ac6c598ffed825413d30bb0d57210a7835c5e5fec82278b37076
-EBUILD progress-1.2.ebuild 685 BLAKE2B 38332008f8584e286007f372ae98ad2a96014d5354e11a37b0175dba9cbea46060c930da6cc50a25dc9ca9ef15c43bd6117d3355b0914fcfb1aad06b0cb7b7de SHA512 0fafb9f08450fb24af1c971a345d71300a2be554babf0d84780515b16286c53b339fe796f44c8f21d2b9c80efef0bf34fe22e256d63b252ddb1283bc43ea9dbe
-EBUILD progress-1.3.ebuild 667 BLAKE2B ea4185a3f2394ad3872764d9bc76f0ad15416db44c3f55cd831dbb21ff13f733105f095d1d4bd1d56016497ac3b7bb9d8a809d035c96262ee97e0bb67815c954 SHA512 5e2cc8180035725126fcea15eed95c5993d56b96835c641346a5435790074f24c028439471117f13c6c925ff8e238596ae06da5475ba7898c05dbbb30ada84ea
+EBUILD progress-1.2.ebuild 676 BLAKE2B 19b099a1af5758b1c7554f9499c3b6b1cada6b8504701f8b8a7d9197a579291fc48079b7b89cb0414024fca9e4c03d274ce7247f07418808a08674bcc9cd05c7 SHA512 dd3ab75a6ea023aed86ae97d9bbcd126149148e464b6d0bed5d2c5c2ca87f0da56c1b74002c49e922ed7589c9d8adcf3a0df56f3900fc8d563afacd3bd1b3834
+EBUILD progress-1.3.ebuild 660 BLAKE2B f9002c627ccd7a23ed72b22cb0e41f424f5a5f6bd2335356f842ac90a0241d23177a4fef62698b8c9573141422be7d44e6bd97d59539ce24c0975a1cef588b11 SHA512 433e2750ae9ad774e9684d1a6b413c56d10326faa94a5506a3d1b80682f8ed157811644b1b4ab4585c0adca32beed7e4acc3d9504c689de1c01c1204aea32b7f
 MISC metadata.xml 367 BLAKE2B 211ac3b5e167e316dfc7b36076e1dcaa32eefb4933f1cd4690119fe0de679a9fed0660e55d31ba12f7ec174b80d2b41513c9d604e2bfc832402794a74907ee96 SHA512 cb620893fc0f46e9de21d8adebe9cd8b4946152d770fc88a1417204dfbc2bf9ec24bcd43d0132977e1ffe47da72297d04d0bda8ceafefabf36021a7f796c65ae
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
index 3ca7372b46b8..b4c1caa174db 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/progress/progress-1.3.ebuild b/dev-python/progress/progress-1.3.ebuild
index ce2a1bda2eda..54d02e314e0b 100644
--- a/dev-python/progress/progress-1.3.ebuild
+++ b/dev-python/progress/progress-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/progressbar/Manifest b/dev-python/progressbar/Manifest
index 523d1609c8e0..a0e05d8abd9a 100644
--- a/dev-python/progressbar/Manifest
+++ b/dev-python/progressbar/Manifest
@@ -1,6 +1,6 @@
 AUX progressbar-2.3-python3.3.patch 2646 BLAKE2B f381950997463c466fd65b9bf9b3155e67172488cbc436c13e6a64744e92aa41d5c7b592ce9a3028ef066c9cdce886f1736a573ca4f4d8bb5176f6327d79eae2 SHA512 8f6816119c01809f3116ade0d52188cffa86e59fec516343937e6a624fc077dd75906325a88f514568b0e61d262435bf9c743807df2a4099991e8e3bec804b50
 DIST progressbar-2.3.tar.gz 9420 BLAKE2B 025f2d42fb0ef11a2e4b974ba6a8cd44c48a7f828ec40a08347492d393acac46fa9c29962d39fe296af655e94ab2075885c73ed6953e2d739aeb6f5f0c0aa13f SHA512 06fdc8b6664642bd864be8023355316fba23bcc4deb0c5877c5dfa91da5d233301a8f39342f133cbb63f37a20de7b8b24910ac8073127fcbdf43b5200d60ed5f
 DIST progressbar-2.5.tar.gz 10046 BLAKE2B fdbef570f48a0c61659bf02b3cc4e0f64d9e4e2edda970edb79fd4aac5fe2cc1bd0a7421458100cab7cbfd3d9d8cf905774113e336ff2d687d5e06b04a4e113a SHA512 86a56a573b903b947baac98b26f88e40072603007fdf5cda3e4a7e797fe4c4c42fd1a4b1ddb1c9ca9a062659d3647c428e33949e2df9e20b0f56a9a4099de51b
-EBUILD progressbar-2.3-r3.ebuild 560 BLAKE2B 918a634d4bd12a573725d3f7248690462957024822c50d801448dda65d9cbacaa77ef78db5bf5b9d2b890ac5dfdbca156b056c475f78c120fef4c9210b6a9db2 SHA512 ab797b3fa9b12ed0e37b667a60d10b520f564b1b98ef4c1cfdcab301ab6bd6f7dc21e1951aca1d24aa986adbc48f570c5e497ace18a50384de0e7f7786b3ab14
-EBUILD progressbar-2.5.ebuild 516 BLAKE2B 7d070850bb68d6e93930ed2abf885ed7899637a507a14e4ee0ad776fd2e52bada8464581ca6186646d479a1f0123ac1dd65b82357831ac394e73269e3389cab8 SHA512 62d2473b9c22087d22aaf55b66a4f55247471918f0716c1edcd9e0398a09e00bedcbad30beb1c35171b77af21a5da3a6214a8333362faa485c6aa9594a089b24
+EBUILD progressbar-2.3-r3.ebuild 551 BLAKE2B 5a5c8d5e33d737a1391295c332f95b720a2d764aeb1cfdec34da3d0c9129f536b757861a03483c5ff72570734dee1129fa866ee648a6c0cf773997614af40572 SHA512 54d4afc4ec878c6f4e25d174b9e88c583774f81a51b7a7c719deedf0af10e7ae5339843a6e346ce556d796ac3b894c96c4ee3f7d45989382180ea4f79945880b
+EBUILD progressbar-2.5.ebuild 511 BLAKE2B 91ae4e0ed0cb6a422eeb46fd1731a29d320dfee15149f45a473c176297b44c94d2145b66a0bd7e977838befba04283c63fc0daa44e4299fed1b0ef84ef65f3ba SHA512 c1cbad2de119d243eafe9d276675673859a332cabffa82580e14bc5c29c8ce0c882551108119a07a0298812002415bf5d67cb7da6351f111084ddb033adf9612
 MISC metadata.xml 324 BLAKE2B 28c39259d7567dc383b5f8e80cb81deb5c235fe9431a0a8dc90c7e35a80ff058c541c5f27236db96d5ecbd905071d8ad60a4a6232e31ef99786a0d847f674a39 SHA512 96cd08f27e9f075bacf7c3aa012b69642d245dbf7b99ced6a6cab24c2183c6304cef7bc25a44392319638d20233f9bb6256990f08c6eff60846815de35ed100b
diff --git a/dev-python/progressbar/progressbar-2.3-r3.ebuild b/dev-python/progressbar/progressbar-2.3-r3.ebuild
index 89bae9cfb0c4..47f3f0e8e573 100644
--- a/dev-python/progressbar/progressbar-2.3-r3.ebuild
+++ b/dev-python/progressbar/progressbar-2.3-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_6 pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/progressbar/progressbar-2.5.ebuild b/dev-python/progressbar/progressbar-2.5.ebuild
index 1aa5f92eea07..b1d6c2d4302d 100644
--- a/dev-python/progressbar/progressbar-2.5.ebuild
+++ b/dev-python/progressbar/progressbar-2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 5c4075ef1ed8..716d4b4f0ae2 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,5 +1,3 @@
-DIST progressbar2-3.39.2.tar.gz 131723 BLAKE2B d8ff04986e125d17b67d86399308c4f7ca55c1dc744e2cd42042fb61ec0b93e61f6af1308e884e24e1b423a5ff66e3074b30ce75c0fb7af85acb700288a7bcc0 SHA512 efbf08a09665542fc361757c2a649ecc3bff0077e68b2669f4dfe1635e7730cf3cd0c6a3ae13e059adada31dc77b291098c21746ed9b5e0929260d2788345d6b
 DIST progressbar2-3.39.3.tar.gz 131839 BLAKE2B 2cbf1ecf04947b3a393b5cc473a696528cdaf38f132a1b0faab5e45dff76aecdee497ca1b2810b9ec5e3b180acfa8e2af1d195e5804c058a7d8880fc3b0a330f SHA512 b8944b319f1133fe7abdd256bed8803e9f426208af5ddc58935121845e81b9f65878e536bd5a1e4810eaa6906b24d114e8681dddf1f77c1bf96cb231f6473a5e
-EBUILD progressbar2-3.39.2.ebuild 556 BLAKE2B 073e66325c9d00700696df54aee11abaf845724e78a37cf39f9b374072daad0e7ac4cd511521acfa91417e451d5ae5582210b84116073a9652888fb020078dfc SHA512 b98e73280be33ce98731a66ef34fba91ee75ab80658b3bf0c04640cebb127c46233906c30bc0a20dc1d6014b805415a479cf0cb7941f919654495c802668e928
-EBUILD progressbar2-3.39.3.ebuild 562 BLAKE2B 9255c16381c00dd7d2ed22dfa9e14c477b9e8bffc850f4c98f1ab9f799f50b6e52154961e5fcad2dd27ad445b0035173c7dfc440c23214f4b0743b9ab5d3780e SHA512 1b686452f4ed1ac2cf969276bcbaa6a78bf754c2a2f1cbc5b335b39566b080773d6d86b2f583cb6ef3fd7b9954ef6368c05873d41d4f46441143edf88f995fe9
+EBUILD progressbar2-3.39.3.ebuild 555 BLAKE2B e314f07d104537e4a3b17dd25316b36678ecd55544978b99938056db304e77702c69bd857241357f7e6b022b19902822f146e17d0416fa630118b958b68fad16 SHA512 d4e282d0c4a54c3f889483fe31ce95dd1bbbfcba5d4dcc852b6b3d6a94d753f6e1bdfa597a26a019a905cef755ccbedbcb73503c9a8a456b9fced4946106d8a7
 MISC metadata.xml 321 BLAKE2B 91ed0719ef7b045724e73976e54e9e99d289ff410fb04207bd51ab9e570b5a03f799487183eb8180813e370d7dd34e779db641e7d228674e32fa14f89046b744 SHA512 51998db2ca2a1835c61326b8f7cd3c491238ccf8853b636d6fb768243785f74f74496092f3e076c485293363da6cc317110d754dec17dd8973dd89a4f57e556b
diff --git a/dev-python/progressbar2/progressbar2-3.39.2.ebuild b/dev-python/progressbar2/progressbar2-3.39.2.ebuild
deleted file mode 100644
index 6fee4894854f..000000000000
--- a/dev-python/progressbar2/progressbar2-3.39.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 pypy pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Text progressbar library for python"
-HOMEPAGE="https://pypi.org/project/progressbar2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="!dev-python/progressbar[${PYTHON_USEDEP}]
-	dev-python/python-utils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}"
diff --git a/dev-python/progressbar2/progressbar2-3.39.3.ebuild b/dev-python/progressbar2/progressbar2-3.39.3.ebuild
index 5e98c5dd5bf5..14a98b27f135 100644
--- a/dev-python/progressbar2/progressbar2-3.39.3.ebuild
+++ b/dev-python/progressbar2/progressbar2-3.39.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 37ef98051fea..61282704090a 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,5 +1,5 @@
 DIST prometheus_client-0.6.0.tar.gz 60790 BLAKE2B fa8eaddfedb9598394fec0c6464499ed5bcace9969e843126422414e397d31985a44a626be0257a235f6d5f685fd8d6bb55fc0d92928f0b9729ab9f097f1958b SHA512 a2b92683f939961c567c266a54699de6f37088cd4e61c9d9a5f4451228b4c3bfa4c517e4a5187867f5463d726a8dc6e7fdae30973c1e9aa9aa1a03247b2e99cd
 DIST prometheus_client-0.7.1.tar.gz 62880 BLAKE2B 8878a6e6a20f96443f1f14ffbb74eda7dc6f1f48151901da047ade6342ddd7858b4dcd808d80af64a3eff449c1c7425f9eb9f3d1283b65e8e6067c6b5fe2f9c4 SHA512 84b145ed191c9903d390b152c72de4f2afcb4c500b8debba59ded081f00cc76109b336ed2d7783d59e9922ea2927632f7ef730f336974294b20048c51e9d58a4
-EBUILD prometheus_client-0.6.0.ebuild 751 BLAKE2B 00537006f674b4ddfeafbf258674a822f5483ca21576b90cd11cdac204679ef47aa5a8e27ca9fec0176b740424882bf17f56ee04c5b979d405a9b2e86056bca4 SHA512 52ef191118760d22d2edfefe6db7a88382e7d7ab7a830a66c27d7cafa7c0f8a0ba8975d3107cfcb1875844393bc30de56a3019e9fc335184ec461129a45ed14b
-EBUILD prometheus_client-0.7.1.ebuild 752 BLAKE2B 4bf4c1d28d0010b49ec7f9adfabf281947b9a1b8ca0251a07d28a27a5dd00b11fdb7f2104c70390f95f07745b747fe7563e2752ee2e74ca166b49afcfc574a2a SHA512 6a6bf215bcea8eb3d275a305f7df7259f7e9fc9a57120b70b9c0d753fad815ffc3dab18873c8e1585fc3433d4517cecaebaeebcf20fcf1881d46a45bdbcb3cf6
+EBUILD prometheus_client-0.6.0.ebuild 747 BLAKE2B 15962b4ffcb24207ff0090f0a59537ee6ded0d23867d56e720a5648b11402545e3ed9a589c70a4598f6ebbc668392afb3eb7133386681c8cc1fc4b57aa84a271 SHA512 ce43e56a4dd40d582f32c0bfbace4a060d0e1b3e24fd33e3040ffc0e26044d1777430322cfeb2473cf8b505aa50ed17442ae45aaec90600b9f2e62859089e418
+EBUILD prometheus_client-0.7.1.ebuild 748 BLAKE2B 8762e5190e0987e2088545da00c30a8ec43269ebf4fff512235a0c2c8f47649771ce60ccf2a9ff4c939178e2483183c5939175157de1e1b47cf179d41cd14b36 SHA512 326fb660f5bca371faa2a43c3b17d64ee1374a21331b35acb8444083f984b5493904c3cffdba319a1465b054d37138a63248b703c2c61e9685fa2042715b7294
 MISC metadata.xml 339 BLAKE2B 19175465b43ef0c7b56a6241f5e857392bbffcdd12de70833ca0c7c0fb2815dfdf529553721cab2afda053a63caad1621c06508dd1f776511adf5be84cfd010a SHA512 887ce6ef1c7181d5c87e69085c6d58c324260aa7dede8259115131b367b2d60219537fe8b3366ce10ec8904c15fb36626e34e28e6dde2db120c8e20f80fc9d74
diff --git a/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
index 5f11077944f6..dc6591f642fe 100644
--- a/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
diff --git a/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild b/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild
index 9dd8eb6a2bad..6e9469df6023 100644
--- a/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
diff --git a/dev-python/prometheus_flask_exporter/Manifest b/dev-python/prometheus_flask_exporter/Manifest
index a032873d15c5..d5749e7e0b16 100644
--- a/dev-python/prometheus_flask_exporter/Manifest
+++ b/dev-python/prometheus_flask_exporter/Manifest
@@ -1,7 +1,7 @@
 DIST prometheus_flask_exporter-0.4.1.tar.gz 169196 BLAKE2B f88212acf6a1e64207001a620bf562e121f681fec972d1d97ddffa2b8cd2f9c9af4b4da377234f6b98731702d964dd14835377e805e9d72855f463907aaaed9c SHA512 98819d09f66a7fb272ce298fadb77848de2591a42dccc29cbf1cf69b423093789ef5708f7082d54d11ce2bf2e092d84a52c22b916af0081c64fc4838e7f5e374
 DIST prometheus_flask_exporter-0.5.1.tar.gz 171616 BLAKE2B 49c95ec09f72c2c6dd61b01e55ebb70c19aee6cb782bb1a3b7a7dc28bc5a1d119af15e4740051627a06dfbead578acb1743adf7b40278faed21ff7b5717ca190 SHA512 444ccff5e7430a673c662c60c4588a949e12929ca49065d076ad28fca14f4fe945e8ad68aef5bf297f69892463c92a41fb3309e487a1c856897fa0132c69298d
 DIST prometheus_flask_exporter-0.7.2.tar.gz 172123 BLAKE2B 9c2a30924414547f34e84152d3c7d6d95785e868fbdeab1a3c157804bba17d90b39404e285ca0349ce30ca19e2e8d1c62c35f4881847844636d262a6bc835f58 SHA512 42c425861504a21c14a67b3ee7571510e586ba6166e3ecd66ed0263f527a563561eea7034e050ad7b03154090918aa88e0a07e13808acb9f4605c021d19bf3c1
-EBUILD prometheus_flask_exporter-0.4.1.ebuild 803 BLAKE2B 3094c7c78b98ee34f3d822799489351a0a85d84d6f9b2bfd9c5a646d8755bdd0bb0073a2955833ba93d064a0be042c235a69c26aa285bd3c72eecc4534218441 SHA512 999df1e4af6ca7cf7d8abf5eff0f803afe60bc538ddbc1b91f8dd1db9254efb33f40b02bc791970cdde8f2ed1544bd7d2983aff389fb4c604337b705035eae93
-EBUILD prometheus_flask_exporter-0.5.1.ebuild 803 BLAKE2B 3094c7c78b98ee34f3d822799489351a0a85d84d6f9b2bfd9c5a646d8755bdd0bb0073a2955833ba93d064a0be042c235a69c26aa285bd3c72eecc4534218441 SHA512 999df1e4af6ca7cf7d8abf5eff0f803afe60bc538ddbc1b91f8dd1db9254efb33f40b02bc791970cdde8f2ed1544bd7d2983aff389fb4c604337b705035eae93
-EBUILD prometheus_flask_exporter-0.7.2.ebuild 803 BLAKE2B 3094c7c78b98ee34f3d822799489351a0a85d84d6f9b2bfd9c5a646d8755bdd0bb0073a2955833ba93d064a0be042c235a69c26aa285bd3c72eecc4534218441 SHA512 999df1e4af6ca7cf7d8abf5eff0f803afe60bc538ddbc1b91f8dd1db9254efb33f40b02bc791970cdde8f2ed1544bd7d2983aff389fb4c604337b705035eae93
+EBUILD prometheus_flask_exporter-0.4.1.ebuild 793 BLAKE2B 9e2b4d7e9b8c673525be341bad2a9d1761faae6028494c2f5379d2d2676f7f8a9e8ee306b167ba166ed6edec32a8a52e11a4d7d4cb99e1fa714f5c5b989cf195 SHA512 33805734bd477fcad8d342c398ab7184677dbf43ad5c60047d3a291958aa033ba11a65a2680b965d4b01b37ebac873b5cc57c38374c0a5a105222a14ad1597ec
+EBUILD prometheus_flask_exporter-0.5.1.ebuild 793 BLAKE2B 9e2b4d7e9b8c673525be341bad2a9d1761faae6028494c2f5379d2d2676f7f8a9e8ee306b167ba166ed6edec32a8a52e11a4d7d4cb99e1fa714f5c5b989cf195 SHA512 33805734bd477fcad8d342c398ab7184677dbf43ad5c60047d3a291958aa033ba11a65a2680b965d4b01b37ebac873b5cc57c38374c0a5a105222a14ad1597ec
+EBUILD prometheus_flask_exporter-0.7.2.ebuild 793 BLAKE2B 9e2b4d7e9b8c673525be341bad2a9d1761faae6028494c2f5379d2d2676f7f8a9e8ee306b167ba166ed6edec32a8a52e11a4d7d4cb99e1fa714f5c5b989cf195 SHA512 33805734bd477fcad8d342c398ab7184677dbf43ad5c60047d3a291958aa033ba11a65a2680b965d4b01b37ebac873b5cc57c38374c0a5a105222a14ad1597ec
 MISC metadata.xml 379 BLAKE2B fa5becfbac6899fcca5123454185c7449de058974619b27d388d40a2954d1000b35474637751b379131b0564f444443647eebd24b8f2328c8689690b5f806e7c SHA512 75692a0ca25d143cd7c969ef35444c62c8694c52a4ab615ee0473d385a51817f152212a29a2e802beadf4d1ad66f699223f50ba50e58d40159f1e2f51af15bfb
diff --git a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.4.1.ebuild b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.4.1.ebuild
index 604944022cef..dd118210ffc4 100644
--- a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.4.1.ebuild
+++ b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.5.1.ebuild b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.5.1.ebuild
index 604944022cef..dd118210ffc4 100644
--- a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.5.1.ebuild
+++ b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.7.2.ebuild b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.7.2.ebuild
index 604944022cef..dd118210ffc4 100644
--- a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.7.2.ebuild
+++ b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/promises/Manifest b/dev-python/promises/Manifest
index f716fb377e71..53e3847ffabe 100644
--- a/dev-python/promises/Manifest
+++ b/dev-python/promises/Manifest
@@ -1,5 +1,5 @@
 DIST promise-2.0.1.tar.gz 26274 BLAKE2B 528d938ab93790dc57545eb0064a014ea293d782ff6a7e6eeb2287f23c79c9cf9b2427ad57df524a888193c5aa9d62b21bd1e533d49ca4c8f2615d5719be58f9 SHA512 2bd9ad83a3b21dd4e3ae3052dfe6705790fb6ec925e9607960d43d9329fea606c82f6806599f09e6255ff5639c936369f88601668cf4ec8944747b1b6676693c
 DIST promise-2.1.tar.gz 17974 BLAKE2B 5e1fc9bbed3af51812c43b1c13006037ada44404564a3064cb2e39657f6bb5dc0fec6d052ae9038439c60339fd4f4b5fa97330571398bf84243805b25ead94e8 SHA512 d4d5628c9b75f81fdb5d654a76e788df5296472cd73bcb8fd9a27979b8aadeb1d40a4d52cfed173341a5a97920132b00cee44d915ef640167127a249b5c0cac0
-EBUILD promises-2.0.1-r1.ebuild 960 BLAKE2B aedb83aef235d782ebfd748fd37bdca19a66d3038f5a9a86cad564eb8a98e59e84f90414c67f55a6662d82b42ea190e82af448f309eeb57abcf23cf5be9bb75f SHA512 f7c39b44a94988bc0b84971a447d8c11d1c776c173aed5ebb77f8818be56cb58ccf46034089f129bc436e6eb3b4a9e4f28b81beba67dd8e00bf0bbf29fc80e4c
-EBUILD promises-2.1-r1.ebuild 947 BLAKE2B 71245a7774c1cb8d99a065b5d829d92f1178023e5b80e301338bd7761eaefc69c8ed8d476efae6696ad60edb7acaecc00a7e3be908454d27ed5000b8d798599b SHA512 2d1428109a4d492253ca51a00a4a91deb84ffc8d96156994285011906174d8367b4b67de448a6da1357095c9859794f1b23593768e9e591b3096a36434dbc756
+EBUILD promises-2.0.1-r1.ebuild 953 BLAKE2B 85002ecc040fb6eb51d7bdb8c32004f72ae604f122dde5b14e3ee3ff0b18235d5f9d11fcac506836aab1961edff74a2a321380cc6a6c5cf7b53fccc560b42f42 SHA512 536c7c90806c04cb380958d2af99bf8e9e79c1e5d329ca912320df17c17120fadb71c5839cf04e63203ace47d448cc51b68eaeebe05216153078ff17d083dfb8
+EBUILD promises-2.1-r1.ebuild 940 BLAKE2B 8b6d3d9a53ace1b64269b459871908add48cc1358631ecdeadd0a26c7a299822edde2d8b535c22557d4b0d22c0fb33f7e97684e5ee1a13a35708eae81a077881 SHA512 31a7365f21fea5f27d75824eaef34e5109d211469c82d4b8e04711aaae77f6111a381805ae859936336c3bcee63999c49b02d1a70ee8c7dbb65bb996cfd84809
 MISC metadata.xml 393 BLAKE2B 68978c2f902a87b58c0a51587bf1ef734d6133e17ee3ce0b4239bb0ff26a1ee4a04ea18259ed2cf4efed561acbb8ce5a57ca4b35e60d85e93a5e4a5928a1c3e8 SHA512 e080ac2038f5e274a4cb2e395d1811755f1441091859a7c9c231f126ade1daea3725ced4253a32164ef5483e92756f9b1ddef05f2b866e9ccc6298ca27b2c019
diff --git a/dev-python/promises/promises-2.0.1-r1.ebuild b/dev-python/promises/promises-2.0.1-r1.ebuild
index ab5cb29c06fe..751d1b976e4e 100644
--- a/dev-python/promises/promises-2.0.1-r1.ebuild
+++ b/dev-python/promises/promises-2.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/promises/promises-2.1-r1.ebuild b/dev-python/promises/promises-2.1-r1.ebuild
index d383755c08b5..a34cf6968700 100644
--- a/dev-python/promises/promises-2.1-r1.ebuild
+++ b/dev-python/promises/promises-2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 770365e34ea1..d4cbbf2b9593 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -2,8 +2,8 @@ DIST prompt_toolkit-1.0.15.tar.gz 243734 BLAKE2B b27e61bb444360abe95714e2014fcac
 DIST prompt_toolkit-2.0.10.tar.gz 347981 BLAKE2B b95cf000d5249da3710f9b51f72d41c3d552f1d3a35dea5493f565f0f62998d890bf2b81b3376140a4d16a19f2c5fd60eb0cb5f2f58180c176ef1543c6fc4ec2 SHA512 b91292cf43607b3a7018ca29827f0aa9bc90efc064c68faffe02ad28e4bb60f45fc2d25bbfd9a40a383a815cb08596975f08237a498f94a5c088d56d3a0a9803
 DIST prompt_toolkit-2.0.6.tar.gz 339714 BLAKE2B f969edef98d25930e4d61c1500bb9c8d731dea29e8d154e6baa2ab4045ceaf9d577d46024734a255cc15a4c13685582309e9d2fe7ae3320257f6fd1f9981ada6 SHA512 37082011ee5b8d6fd9febef95c92494ed6108b9ad8c64ac580b69c3464781a2f0dcef5b1c4d06fe309a3036932f7c622042e6b2293acf2ab6f9f2aa3c48d9322
 DIST prompt_toolkit-2.0.7.tar.gz 343267 BLAKE2B eed36fb951bcf8b0663a87eb4e77267246bbc7a6b773ed76d730c04b4dd012434fd0e71e5f558c231fd5ba1e8b3403878106bf3c60f44b7aa3e492a99a622b65 SHA512 4ea8102a50290878248ccc2119eb2b5ae50ad58f466510f8328bc172942f5417abde24393958c910ae0ab2ea4a8caff049b6e7acd8d94e9dbeb97b36c6e2191e
-EBUILD prompt_toolkit-1.0.15.ebuild 777 BLAKE2B 2934ed09e3fc7f45a3ad8f3915949a8da1d3d0bcbf462d56423266a8b7b7ac5932a5771dbe702ab2115e1bf2509a89409138cb6376fb7d72bd36c73f656070e9 SHA512 6637b821969a61c7794d6ab3f655b0f7859875d62ad949b4c1d35c15cabc9539b87deffbf5be6d30770096710dd980fcfbeffcd5c68f7f23e12428e61a1bd918
-EBUILD prompt_toolkit-2.0.10.ebuild 600 BLAKE2B 3977ff4515adc780a3e118883936c80b65f76ef1b12e8f0178bac2a39b4d3690e79e84102509b4d0c931f6c4023f34887607604bc2add51d2863dc6f1fc0a3f7 SHA512 a6ad8fedfd70bf793c892151e6c5897e897cfcde4c655ffbfeea831e202baa573f62a70cd5754e96c4974e3ae2049d32d9fa4c7eae2beddc6d7f4e8be464a104
-EBUILD prompt_toolkit-2.0.6.ebuild 780 BLAKE2B 1153ecdbeb655261c3a2b0b7527f7e3ce0ff8f84a09bb7dd37607362d5968f07cf3bffaeb0ef9a90e9ffccacd6ff03b2b04c7670e0d3a7a01c1007632f982748 SHA512 0bf4b937cb6042eaddaf6a7e3bab1d73272b865e5557c87bbd3edee6be18cd9d5bb538cafb19492f5a4c071a3b7ed2ab5094294f055e33f27112dd4707e3ea5c
-EBUILD prompt_toolkit-2.0.7.ebuild 782 BLAKE2B e5c619ed6ce84c94dac8d7bef2c44aba630e7055d82ef2d778a1fb5daeed7785b816fb5493c394d834f54da5e176511784adbb3f0d83a12c53445acccc8a82f5 SHA512 65ae1b5fc2d3c40a75783dc7bdb2bb9488625dca4234fb6ab98405941de43e555e9c5ca703bfdbe7f08f8f9a3424754e0a9f37ed724744ae3f3a44f98e2773f2
+EBUILD prompt_toolkit-1.0.15.ebuild 775 BLAKE2B 8e37f60d2d3b17d71a06f2869cf81732f8b968335b0cece0e38ca32a06101047ca1af2824f53897765e2c3422d2e193733b8dc4f1c018e36527a055a88320676 SHA512 d3505fd91d8b3afaaced68b48b6dcb65e7898c9a1a5d0481bf33955f9f241c511ee4df51154ca2331567cffa44293d266679112ba57f155716bb9fda3c4bdc40
+EBUILD prompt_toolkit-2.0.10.ebuild 598 BLAKE2B 504ec8c4ce0b262c2cfa95059f36ea93d11528d284e420ec55471805ece4277c153e2bf17937f8fdc213ee42e641e7cf1fdf4faeeb500a83bca0f4679dada994 SHA512 825d38fdfa1f41d5362a55a7924199292d4c328ae9b98c1c9ac01f4ee204037526c286a9029cfa66e7d67ecb480858868e31fb57a0cb5457e48ebb397cbbdab2
+EBUILD prompt_toolkit-2.0.6.ebuild 776 BLAKE2B 1a15e07c84393bbde4c36f7fdb4786d6365db11b89372f830ab0088fdc7d153ec849519f571b82e051df0c3c606b85dfda375d33892b40af65da25941baae98d SHA512 d440f93c2be5a449e559e178e5ab3b9e252eae756d2efea47434e9735bc764cd51d33d2f5a953c532d0eb55cad2f24c908fb568a9071634b6ec97a434bed503c
+EBUILD prompt_toolkit-2.0.7.ebuild 780 BLAKE2B 88da542d6f18c25dc67b44d253ff3c136b2ef044127e6271dc034ba3980b7f08676caa6c487d35092eb96271a8d3270543f68ac9f332b972d564f7017cfcf846 SHA512 cb834abc68f0e518e8ab1ae7b9e223dcc8dec36c3f25ac68188baadf7580a853394a6e645310aa296ec3327c3448a7fd29ec1fcc6443c9a5cfbedb5da4dc905f
 MISC metadata.xml 405 BLAKE2B df7ed8f078fe07004e09438bdc172fe1b24c4d8c06a82828a59aefc1466675de75bf7e96aa9a2012e912d3568ac87ccd4f7580cb4e56b6652d1228eccb6bec47 SHA512 31fd338e542e320ea3e089f13ce179af94777688d86f49ae68be12b6cb2463e6a5b5ff5270c5bd81d2b6fb76e834f0213a06e5daa3327d0b032a68de5f9da4d1
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
index d28ff26cf2dc..2e6b179b1832 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-2.0.10.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-2.0.10.ebuild
index d119b248c58a..50201d6c5ebd 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-2.0.10.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-2.0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Building powerful interactive command lines in Python"
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-2.0.6.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-2.0.6.ebuild
index efb5b1d31d64..a8972906a464 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-2.0.6.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-2.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild
index c32a12c11994..d9bd30bd76a2 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index e47749a51bd1..be0d617fca16 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,12 +1,12 @@
 DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
-DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
+DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B 275ea52a072b4e0226e4b6dc476d4bc28e8f4f05bca0709eab51da91c02869e96c3b0ac9ab4cc46290f875d4eac6ac72374c5b45e27fa89ad3d58fd56a2c8b7e SHA512 8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f
 DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
 DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
 DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
-EBUILD protobuf-python-3.10.1.ebuild 1536 BLAKE2B af636a141c5a60deb002c8ec784a9195ca8c524d0035aee87900fb51559da2230a5869d91d1ff666b005aa841727d85aa38e30f113f9fb1a0e379974d5242322 SHA512 05ac228c4eb805a199ee729bde86c96ecf692da550c55b0fa2642c57c018051fe2d36f1bfd5dc690f28ae2c2b1780f354bb1206a8e3c65ae1074062adb6b49a3
-EBUILD protobuf-python-3.7.1.ebuild 1581 BLAKE2B 0a1956a1e5168382d5db661b7ccce17f164ac5f34d5746b54f17c94b935d7f6566731440e5d7a560ff4f03314b55f85f65dd9b8b9adb5965cb8799879ccec151 SHA512 6724d4732e02042369ccf2e662964be6493caf34dd166ae58d9afb9dcf5117e425c8f22134357d0b3b72b8e9dfac65837db31f6c317e92eae3517622e3ffb520
-EBUILD protobuf-python-3.8.0.ebuild 1525 BLAKE2B 5cf0572a7cd975ef21ff50b0f126a5467d9245301f3d47151c36069062b4f15f4fc74f8a7305798d72eba317804d14926b43d85921fd608e41806afc3260df40 SHA512 0183cf00fbfb384a16b956a709c9b432e2dec7097c8c4ab1e3ddeb0dcdff0a1d8a2ee6c50a0b2d662267f7c8bfdaab22da6ad7dc5c115dcb60e5072de8211d02
-EBUILD protobuf-python-3.9.1.ebuild 1532 BLAKE2B 1731a0fb3647828d002a6dece70dec5eb0d92e6e467457e7872740bc5a504998358ec9f55e7c31f6d8f805345d5e13db9619894b7d393b7b15cbc0013b5e813e SHA512 f703f0e64b604adaab42298543878ab13b9fdebe64832a17483c6da38c000a696fd1a4e16e464a459d18f82b09f5daf0e6eb5e5b4d89328c396aeb8f35eb2ff4
-EBUILD protobuf-python-3.9.2.ebuild 1532 BLAKE2B 1731a0fb3647828d002a6dece70dec5eb0d92e6e467457e7872740bc5a504998358ec9f55e7c31f6d8f805345d5e13db9619894b7d393b7b15cbc0013b5e813e SHA512 f703f0e64b604adaab42298543878ab13b9fdebe64832a17483c6da38c000a696fd1a4e16e464a459d18f82b09f5daf0e6eb5e5b4d89328c396aeb8f35eb2ff4
-EBUILD protobuf-python-9999.ebuild 1419 BLAKE2B 681f5aaa9fc78f2079d01f2a9671eff8d8f5ffa2682c632445af69a4ea16a17103e0fb1e33c80e94cf7ae6b36d2c3a30b4003d4209ac0a82a5e1b7f185b3907c SHA512 119b49010f3957f048da167d7825892d2b334519608ed325d7c68d2dc76fcb955c6247d1e43a6ce85e63f8c104b8452fbbf79198c37972ae158e301707bd58c2
+EBUILD protobuf-python-3.10.1.ebuild 1560 BLAKE2B fbc81c5c6bd23a65996b45aa8161a2de0ae52f5f64654659785cd14c0fb6fabbd233a2c05f6e20a0be5a20cb993b9aa20c168c2867d845c8c68fc2530b5f8f3b SHA512 a83f54043dc51d1595ab8418c99eb2f0d348f06c8315067a4eae7933313e30188efdbbb9dc7e90574899599d0274a2ff443833343b49c4515e8d7b53fdfd05a2
+EBUILD protobuf-python-3.11.2.ebuild 1566 BLAKE2B b9ba89d3d9444ec65e908664151dc6552d007805c3c37b7a93e885dfe5daacc9cf4da6545b1f1dc120583301d93fb00031070d7b97a4621bec298d93b772112b SHA512 5d5ea41a5750d90da5689b1114165891e674b42a443716889ef63ece61630cf04d80aa34ac52683df6129eb1a1792387fe6fa6360232e20e9a73d18a855fa270
+EBUILD protobuf-python-3.8.0.ebuild 1555 BLAKE2B 22582f4e2dcb1c0e5c1ca137ed63afdbd7729d57c2bd697be5f22a7dde643de5b89e780c54ee5be528e8199d5761afdcd60596e106c7aea06dbea7f9ab1208b1 SHA512 352cbb84283758d33ac202e667b786bdb16b2ed819479c5bb907a3a9eef5dfc659cae8e79fcbbb54ec723a7127b675958021f299010a13d7e04736c0d0c1f42c
+EBUILD protobuf-python-3.9.1.ebuild 1562 BLAKE2B 7fe2712055449c2f858fafdbd6722e6cdd1e0334611eb5753d7de64f0b2f1b56d2823c6f05a559950aa7cf45bae3fd04adaa5c5f9c3973922f7e2b21330e65ac SHA512 5a571762ea8314efeacfed1b240be45982d813613220e879b7e5d48f69ae850c94706a4210d736821fd0550fbc4f29f37d63cce0ed16669f9772079328d9ef8e
+EBUILD protobuf-python-3.9.2.ebuild 1562 BLAKE2B 7fe2712055449c2f858fafdbd6722e6cdd1e0334611eb5753d7de64f0b2f1b56d2823c6f05a559950aa7cf45bae3fd04adaa5c5f9c3973922f7e2b21330e65ac SHA512 5a571762ea8314efeacfed1b240be45982d813613220e879b7e5d48f69ae850c94706a4210d736821fd0550fbc4f29f37d63cce0ed16669f9772079328d9ef8e
+EBUILD protobuf-python-9999.ebuild 1449 BLAKE2B c8b0e26305ad406209daa373b09cdefa9755ce3f72e2fba51d24114566519fa7ecad38f1d321b542fef6541e4ebaa74b4eaace6376f72be963b183e4cc28be58 SHA512 080b3321bd3ecbdc7a468d33f04bf24e556cc712e6d7dd2faf1912b1366c2d8fd62f2014dd394706f8c7b7eba654ae1e7baca111b3cd74b1412363d64ad2296b
 MISC metadata.xml 539 BLAKE2B 32831dd18b1c8c19a3e5339788b48bcbc6719654148fab93412bb91aa53ccad7b39529bbc2ea78b33b157eeb024e77cfa981088375466273e58b9d043ebdd70b SHA512 c6f28c8549dc8d3552836e81322db479ed4ac7ab5a12232f64d55cd909d8e4face39eed67b3f2c79f01023cfe3d00cf0540493acdb0aac419e6b58abcd430890
diff --git a/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild
index a6af9c20ffce..23befa242450 100644
--- a/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7,3_8})
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS="manual"
 
 inherit distutils-r1
 
@@ -23,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/21"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/protobuf-python/protobuf-python-3.11.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.11.2.ebuild
new file mode 100644
index 000000000000..28ac6f319989
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.11.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS="manual"
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+python_configure_all() {
+	mydistutilsargs=(--cpp_implementation)
+}
+
+python_compile() {
+	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild
deleted file mode 100644
index 806af14728ad..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2008-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# True Authors: Arfrever Frehtes Taifersar Arahesis and others
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/18"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
index e95319dbff3d..83dcab48f6cf 100644
--- a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
+DISTUTILS_USE_SETUPTOOLS="manual"
 
 inherit distutils-r1
 
diff --git a/dev-python/protobuf-python/protobuf-python-3.9.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.9.1.ebuild
index 634283beb42e..2ac416dab44d 100644
--- a/dev-python/protobuf-python/protobuf-python-3.9.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.9.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
+DISTUTILS_USE_SETUPTOOLS="manual"
 
 inherit distutils-r1
 
diff --git a/dev-python/protobuf-python/protobuf-python-3.9.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.9.2.ebuild
index 634283beb42e..2ac416dab44d 100644
--- a/dev-python/protobuf-python/protobuf-python-3.9.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.9.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
+DISTUTILS_USE_SETUPTOOLS="manual"
 
 inherit distutils-r1
 
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index 9e9d34cbcc8a..5fddaadfdf53 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7,3_8})
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS="manual"
 
 inherit distutils-r1
 
diff --git a/dev-python/prov/Manifest b/dev-python/prov/Manifest
index a322bc1f867e..ad9bffb4c318 100644
--- a/dev-python/prov/Manifest
+++ b/dev-python/prov/Manifest
@@ -1,7 +1,7 @@
 DIST prov-1.5.0.tar.gz 125045 BLAKE2B c378c665b78f4b91b612e954e51b517a6c2e293297afea7482fd4fc7362e7f1255e3b4b6ebc18232bf2014f86f2f491c12e781d7b7553d18b724f72e077d95c5 SHA512 d08b924385f587814f6094679649e746bc687e136ddebe1194c5d97921a081b960a5531f13cb8f83d167dbd1cf7114d2e55478431feaf52e547db24a181a2ad2
 DIST prov-1.5.1.tar.gz 123725 BLAKE2B 80816d7a78c881e48b89adf0fe2b9579fb3bb5ebca55220ae449dca422c069cd6c469a547d025600944fedccb82c20e4a7571f336592c3f5ff5b5a0bd0835c1c SHA512 71ff149f7a015a36299413b7fc98e0965684aaa0ece86ff865be1c1ef404a3b24489144d9f8299dd48c2f13b377d16679b26fe93e3463455192a054897af52f7
 DIST prov-1.5.3.tar.gz 121405 BLAKE2B d3c854b9631e68ff8d71e90992c6238ff3a5a0053efe2970a95e3f4584e12637774ef23f3d00c2c3594ff250175cc706f1d5f4d04abd6b24cbb920f588fd6716 SHA512 b205b978320c032c07e96f75a6c6edd4f046e4e219a41234c3fa12dbfa5514d16d56bba602617b95417918ee457c6a7f82dc228066f8a21edd28730fd20494ba
-EBUILD prov-1.5.0.ebuild 938 BLAKE2B 1e93b5cc02cd1e3282deb265b2dde063588be211a93cf91a4aa454cc1a2fa9ca5192a398d92b7cd9e59697fb1bab37d3218970a836f605a0511d3f190466f3d1 SHA512 132c33ecfaabffe514ff35b4a479611d7d8f3a956bb40af002ebfc5d3337eeefe0c59bdf12bc1f60b90a6f148254351cae2d7a071db8500c434cbe2a71603bdb
-EBUILD prov-1.5.1.ebuild 781 BLAKE2B d47fc01c3550591cbd308494424cf4b0a62bba3f98e8282b7f2d93200208b25355ee6299ee9a7a7ab5202af3ee099612e6c102f0128fc52561ed43fbb67b2169 SHA512 cace649926e7b2d702b529a6c665b7317a2ebc1ceb02b8bed2036da95b466a186eeb4133d3d327a7536057f29b9337c17385e6ce162c7cb235bf74d429964821
-EBUILD prov-1.5.3.ebuild 781 BLAKE2B d47fc01c3550591cbd308494424cf4b0a62bba3f98e8282b7f2d93200208b25355ee6299ee9a7a7ab5202af3ee099612e6c102f0128fc52561ed43fbb67b2169 SHA512 cace649926e7b2d702b529a6c665b7317a2ebc1ceb02b8bed2036da95b466a186eeb4133d3d327a7536057f29b9337c17385e6ce162c7cb235bf74d429964821
+EBUILD prov-1.5.0.ebuild 928 BLAKE2B 3bf44b0facc4084f364fb9ef6ccf85d9a728301d65f4e0ab1309d233b940be1b331bb398830deef4f6cf454aeaf982cd10637ce17d84dfc5eab51af087d30f13 SHA512 9e4e940c07b1604d0db7a25736f227f064ad18267f3702fff81b9ef2f75e9495848a9f47f7cc9d9463c11381c1bb8eb1d2bf7b9dd8d5f57e1cf7396e484bb985
+EBUILD prov-1.5.1.ebuild 771 BLAKE2B e2e0fc1bd220347ca0af330b6d9d1267f00e6cf5518da5163a6fac469d62852f91953ec871a9711e49b964d6cfba765c11267aec1ca45db8ea43b27175dcdad4 SHA512 8c0eaaeb7e9172701a59eda62ffd6a2bbbd5512287cb25fc4c1db831c851e0e22cbb8b8ccebf3e47417d3816f72b0c2c93d4f65c781a1aa15797dd2c8b69d18d
+EBUILD prov-1.5.3.ebuild 771 BLAKE2B e2e0fc1bd220347ca0af330b6d9d1267f00e6cf5518da5163a6fac469d62852f91953ec871a9711e49b964d6cfba765c11267aec1ca45db8ea43b27175dcdad4 SHA512 8c0eaaeb7e9172701a59eda62ffd6a2bbbd5512287cb25fc4c1db831c851e0e22cbb8b8ccebf3e47417d3816f72b0c2c93d4f65c781a1aa15797dd2c8b69d18d
 MISC metadata.xml 632 BLAKE2B a13213d0c3f132bada05993e9e392a744c33a178f576d712d8d2ec081283543519871182ca53b7c43d7dc10d95f22b76e56946afb73ff77c84ae96be75692c03 SHA512 ecc45c96e15df53bf48de473c0553b3fad1ca42b89b3f1f9059f49f5877e7f3dfdcb725c25b54fb64db910acb657c88cbead3a36ed60be4e4f8068ecafbd52a7
diff --git a/dev-python/prov/prov-1.5.0.ebuild b/dev-python/prov/prov-1.5.0.ebuild
index efecb0487e81..b17ff3ecb56d 100644
--- a/dev-python/prov/prov-1.5.0.ebuild
+++ b/dev-python/prov/prov-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/prov/prov-1.5.1.ebuild b/dev-python/prov/prov-1.5.1.ebuild
index a792a51cfa75..a85f51451d3f 100644
--- a/dev-python/prov/prov-1.5.1.ebuild
+++ b/dev-python/prov/prov-1.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/prov/prov-1.5.3.ebuild b/dev-python/prov/prov-1.5.3.ebuild
index a792a51cfa75..a85f51451d3f 100644
--- a/dev-python/prov/prov-1.5.3.ebuild
+++ b/dev-python/prov/prov-1.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pslab-python/Manifest b/dev-python/pslab-python/Manifest
index a76688e1bb37..b99b86737a21 100644
--- a/dev-python/pslab-python/Manifest
+++ b/dev-python/pslab-python/Manifest
@@ -1,5 +1,5 @@
 AUX pslab-python-1.0.1-no_install_udev_rules.patch 313 BLAKE2B ec6b728082006c23c500959e639cd2c80c432922e4a6277826ffc3ac6236fde35983b00391475b2d3f0563f2143360e6e83eb3d587cbffb7d4a6e0a8a227255d SHA512 7af64c38503a9857e724a0d5744b82f569d39effdf2218628ba72ea29008b666384c0666c6b26ed8a84bcaa9caecf45885c5ec965757791c77047256d7764051
 AUX pslab-python-1.0.1-sys_version.patch 296 BLAKE2B 317af730f51ec96b73e31f5d1da981b71ed39bc48fda426aec177998971ae69db457a4eda6193cdc1a85f0215196c6da17437c5de5f70d50bb97effb3d5ca1fd SHA512 36b6f18af550a8bf72e79fcc99e53e356b359e5de62043829c7e52d51753e17078a170b6bfee68ab5225cf4282c5ebc50a8913bf050b7a9258d9be52382f324f
 DIST pslab-python-1.0.1.tar.gz 15460183 BLAKE2B 6837c40352eecdf563fa700617ee1712997fc0532483357d889d0fb03645732e0febf5ac83cdc8c766b7ec6d9ac9a436a313d0f44221c2ea69044be6f4c11fa6 SHA512 939f3649a0060a59a39ee97b57134075f8602b966fb3d14250c8ae96c340a4ab33e9fa8d7c5d8cf09ae9297b762c203e4a256bc29b9ff6006ce6ff254c468ad2
-EBUILD pslab-python-1.0.1.ebuild 875 BLAKE2B 4cdf1f82db20b8bf1c01e607366032a743e34f0548599b31072518b102c187f688e32388fd23630a2194567f1cc4cec3ff410e5b9c91c36100fb099adb51628d SHA512 2d3bbc5586b2aee1e5413b4a716f07607601c03aec4f79995e0b0bbed5dde70383dad50658753691ebd212e64b1746c327045cda2ea04704ed0d267abca79bfe
+EBUILD pslab-python-1.0.1.ebuild 871 BLAKE2B 7ce5e74a32abeb5eee6c43e6ef5def6bde7191b7b89051ee8fb5dbd410b44bff6bbb9cc210e1406e009b8286af0ed6d476ecbf9e95c38ced4e62bc6110216ec3 SHA512 374e2b92161b51b937f0fb033141b745517e826c56846a418aa8163080a952b5861d97238917b205762179c0d08919aaa43b82cd0312b566ae946fe2fa142fb1
 MISC metadata.xml 331 BLAKE2B ec438234de81318bd3e0d6e070fffa79cfa7ce6bbf7ce2ae8ac3c02d3cb797048d0606d403f9c7f439d5b8772248ea72bd2d034364678ce5208dab8df37e9884 SHA512 811ed0f495c2ffaed32234a72c022e1b4c23f5b33d991b943c33790176f7cb5eb2365c8801997a1a1d50a80133c0b40d1a94167b4c3aa47572461dd4ffa16422
diff --git a/dev-python/pslab-python/pslab-python-1.0.1.ebuild b/dev-python/pslab-python/pslab-python-1.0.1.ebuild
index b3feed3e6281..22befe0156f1 100644
--- a/dev-python/pslab-python/pslab-python-1.0.1.ebuild
+++ b/dev-python/pslab-python/pslab-python-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 32b2c8c09867..4d48ab799f64 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -5,9 +5,9 @@ DIST psutil-5.5.0.tar.gz 425058 BLAKE2B 0a13149b060d1a99faa600470fdbd592ee520b24
 DIST psutil-5.6.0.tar.gz 426596 BLAKE2B 803cb09262575a7193ecc9cf9bfbbf721e10ef4adc25672f6747111306d1803c1422c9894636421653eaae11c241100f58837c80173ab473bb9dc39da2580aed SHA512 01daf80698954a53a9e987afad6c7aefad502c76b5f34601728c3864c924ca52099f139242e508fd4c72378cbe436c9870eca7a33c112fb8dead0be501aaf2aa
 DIST psutil-5.6.5.tar.gz 447489 BLAKE2B 9301d1580bded927b4b117facf82a3c6be9b43cb648f0f52b841dc2c59cbcc58b5a5c3e0ea7cee30a546e1ea1c00fc0e03b3b49fa69209bbfd3c873e18510859 SHA512 037b1501b686b7101be4180c8698b09d20d4260962a88f0c437ff558d91c405f56eae186c9d55c1893c612c4534093ab26e6943f0ed56db69e343c5c0317be1b
 DIST psutil-5.6.7.tar.gz 448321 BLAKE2B 4e47fb7def5a0eed162686d4e90dd122bd380eca50c3294cd89ed154e27f71972dbc2b3b481456d5022107a1adad2a637e8f233002d429463232c38a04a957c7 SHA512 74eb488b91764941e38214f07bca00e3c837167ad543bfd9ae3b83d665e2be1bb5341eca4aff9282ad50d321568a679e1ffa2ee72ad7b4965cda92b7c80b2503
-EBUILD psutil-5.4.8.ebuild 918 BLAKE2B 8d446590ccc43fa7caf518e1835c6e0e5fb09df405b269432877bf92f602d8fd27422b68fdbb40496fc8909b057239f2fdc4b10d056d55d0d936846598a63e4c SHA512 0d8e56472d194c2190a6b9c9c19ab18fff25b64c2fa681fc95b012eff980870c5d360704961278d89d70348d6663005dc9474c95f7f3f753bbac5f8de50f0a6f
-EBUILD psutil-5.5.0.ebuild 908 BLAKE2B f245c2adf6cfc321a1ee956674f4c2b83b5d90a0f6fcf4ed7dd1145cbed858a4e0de13e9f5bebd63fb0814ed630b6e66ed8c56252d7d58eceac25b980c5e8c95 SHA512 a75f1af6f3bb1566e81f855e8d92cee5854c1d9ba267988c2cd863f0734f3cd912743406e6ecee3558784d357e194c9f20cf68f04980f90ca1e529abf9037b54
-EBUILD psutil-5.6.0.ebuild 911 BLAKE2B d5dbc0e162f4822086cdf32c136b59e500f7756e2d5dc37da61e443c23daacd1afa161f212323d95e0e553844b196e334487cb2bb0bc6966f8b557cb7b348bd0 SHA512 620cf271b7ff28dfc284f84051573ff26d034798a6d968dacc5c12a449456c132fba5b2a8860fd4330c4263f959875ff98e265979f32a90b4a5483a45e3d4792
-EBUILD psutil-5.6.5.ebuild 1224 BLAKE2B d0a5fb02c26e1638dbc42a0f513ec8de4b52ee8a74f31ddac7b8d309b14321dd99cb8d1f9f70881d98397d128e1bb59ae6e0740aa159f6fe31e6e8c1f833b3e8 SHA512 5260f37197c0a834befe293424df82f2d1c4211ab24403fc9d21b2ae28fd7ebadb72fd4cb97b68c110a3af70f2e54f0ff47aedb1397d68d733ce6a03dd573e9c
-EBUILD psutil-5.6.7.ebuild 1186 BLAKE2B 4806a32f55a0ca13b1a0fedd6f147767aa7da2fc321ca371bbb7016d8729de5df3d8ad1f9a62d15d5c8b63373909991019de27f9784a2ebb6bfec5b42451392d SHA512 69436669d08dee4e8944679120366fd7c96519ad38a1def7965ec7dd4b767ce72277c8b559b0cb2ca4cd425bb0db82fd29625eddbf8274ad6d6abfa60a9eae42
+EBUILD psutil-5.4.8.ebuild 911 BLAKE2B 552531d6c0b70dcb013cb8a4f089fa788cc90c0ba62a82f11b48dbb7e9f7f6d9ede63c8f51c8e89be55c1242569fa60c2e8b6246914d996fd3d9d96d412949c4 SHA512 54a6fde56fd09337094025e5272615e03c521d66c041a9cf0d11850c0b7c36734e02cf5082f0e6567955593badccd73dc87bc655df98376dff8d0f3a39640bad
+EBUILD psutil-5.5.0.ebuild 901 BLAKE2B 1ec48e6ebc4b74c7ac9e092ea52661b9b58296c84034e3bc89a078173d9c2417be33525bd63a44779bfa6c8ee73dcfe36d541c6c26dc4fcba2316e008aa96800 SHA512 de38ddb4e806df057feefef7d022547de41db4f4963252cf581cd6c38c5d374b450f0e5d1378d1d9d4c541942c0f44246aaa1a1dbb89141f226d4d1d15f3701d
+EBUILD psutil-5.6.0.ebuild 904 BLAKE2B 5d85f27ecb4d758cf8ea4de82d0605ec1f8cf047835259c6069230f936b9a212b082be539cce6f8c5ae70c83a391ffb42f11ea8e7b4d6e7ce9f1f34fc38f327d SHA512 27991183c768aaacc25993d727b3905a74df0638b69c1d0f5a23e38c7008fab9bfc8e67e49067bd4775773ae79587824c4ba38505cbd13d984e08d3e185c72ec
+EBUILD psutil-5.6.5.ebuild 1219 BLAKE2B b9a1cf7ddcf48299f0b9a97754b29d3b6ca3ca32b34f15c2bec7da5c189cb744d11cc7b06d7a6e7f89500627a40b754eccf68016d383d9d4e36cb64507cc6b39 SHA512 95145244df8b0a050ac9e74068c5a82dce594169a7a8157a973faf7b99cb17711c7d4ddad70525c756c72e35fd7c675f68156e7b8de9569f3a4e27fc67f2f652
+EBUILD psutil-5.6.7.ebuild 1300 BLAKE2B 4840866eea59dbbad5fb5a395e93de1f5463ad339e89d2119928b6b890121a291a7b7d64a22f60c9ee3b66fe180c938de1c7c21115375a0ee29336d4f3546508 SHA512 307518cc34244bcd2caf3bb74b4179cdaef1e388feafc1ad581f858a53c93c586215ee79bae4e4d12c88af4a515882ab0f6cca85c92651a1cb931a472b05750c
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.4.8.ebuild b/dev-python/psutil/psutil-5.4.8.ebuild
index 51e66216adbe..02ce4a8970ab 100644
--- a/dev-python/psutil/psutil-5.4.8.ebuild
+++ b/dev-python/psutil/psutil-5.4.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/psutil/psutil-5.5.0.ebuild b/dev-python/psutil/psutil-5.5.0.ebuild
index daef5c1d2e45..fcde94b5ccfa 100644
--- a/dev-python/psutil/psutil-5.5.0.ebuild
+++ b/dev-python/psutil/psutil-5.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/psutil/psutil-5.6.0.ebuild b/dev-python/psutil/psutil-5.6.0.ebuild
index bf6f4c30295a..205a8af99750 100644
--- a/dev-python/psutil/psutil-5.6.0.ebuild
+++ b/dev-python/psutil/psutil-5.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/psutil/psutil-5.6.5.ebuild b/dev-python/psutil/psutil-5.6.5.ebuild
index ef2b398012ec..c33d3e6eddaf 100644
--- a/dev-python/psutil/psutil-5.6.5.ebuild
+++ b/dev-python/psutil/psutil-5.6.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/psutil/psutil-5.6.7.ebuild b/dev-python/psutil/psutil-5.6.7.ebuild
index 4d56ce828c32..ca07e5b732d8 100644
--- a/dev-python/psutil/psutil-5.6.7.ebuild
+++ b/dev-python/psutil/psutil-5.6.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -39,3 +39,9 @@ python_test() {
 	TRAVIS=1 APPVEYOR=1 "${EPYTHON}" psutil/tests/__main__.py ||
 		die "tests failed with ${EPYTHON}"
 }
+
+python_compile() {
+	# force -j1 to avoid .o linking race conditions
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 71a96ad712e7..dc0b297d9c5d 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -4,8 +4,8 @@ DIST psycopg2-2.7.4.tar.gz 425331 BLAKE2B 9d256ea340e4bace53981596d9d42863ddc9c8
 DIST psycopg2-2.7.5.tar.gz 426358 BLAKE2B 301bd4c6ecbc29b1b02e477ffd3576c4bbb00142998a85f5a79678a96b521098a8d0bf75779ab7ecb082c6d374cbf41cc845dcba0e1413b98621f67f9b139135 SHA512 5bf85b6760871f904b6b570ea454f99b72cf97acf9cce10b63dc7b6b0b18913b50ad4f24c469d101c54de6ad6100f1cac3c58225076b5e584a677f5ab4170a93
 DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
 DIST psycopg2-2.8.3.tar.gz 377333 BLAKE2B a4f22fb4dfc5492147bee198c587c5c5e43e197e5abb60cc7d5d7a006d91ffd22e35fbfeba35b8d36322f3802073fc105cb8270d436a3ad4d52b1c3c41ba39b1 SHA512 74268f6d05922c968d46ad62a49b4af54dc30463daa67cc0f32d5930c366596f9a1b2f368f2b38c8a9d45bfdcffb13be469a5cbf3911c62d163bea5c7a3ad928
-EBUILD psycopg-2.7.4.ebuild 1545 BLAKE2B 461a37074a888e4364091281ed7db0011c557b5f284ac0966751e24ebbaa8f6c3d0607fc779f1724435f8e0ba7793b7b61f60175fd8b3f0d00b0ea4d05135dad SHA512 a00dc8997321bfda597c46cc2e5374dbd17ccaecb6723ea1104b7295d0b8c5f7e2f59fd946b0cefe3c01ac9ee7bde6ce59657cf206fba446a58291680ded0389
-EBUILD psycopg-2.7.5.ebuild 1556 BLAKE2B 9a2702a647bddc9d957eda0b37c36c3409fbc427bf1599c39a7fdaceaae384e7602167c34184bdc57ade567f074189f687c0c8236f8d4fe0ebd81f1d67005157 SHA512 b669d9e3588773c2073d7a1f43316743a79ed7d63442fd44cd2c8c5689e4884d378b759d5db2f13db17fcd2e505b9b0b00818f8d8082afc8d7c74916c6a18ef9
-EBUILD psycopg-2.7.7.ebuild 1547 BLAKE2B ec86f180fd5f4e5603fa4e021f9a8bc9c85c11c59e95cae2ea47bc573266f51a3cadaefb141b2face451cfbd3d00c1ac65f37627e8d6c533dddd0aa3cc6d902d SHA512 62c8c136fd0d2f44b0b3dbefa038f3f30f0456fce6c1dbf4a3407a83a8ea2fad2a33ac8cdaa5a939bbfa4c128dac7149f6aedbb7d2c578f93fa744a05bdfede2
-EBUILD psycopg-2.8.3.ebuild 1430 BLAKE2B 352107b0f5a12906947fb54b1521085130c28179ca2a680ef8ebc5d3d8d81079045039a7d00909d34b17441c5daca3c7f8bc7629c7306b2b719c95bc514f4d46 SHA512 faa467b819750904d932290d173f35ba2b06e36741e1c2112b8f6f56af7fdae81648a797cd7d507735b4f1623666ad50632b2e615cf67f46283454c323442dc0
+EBUILD psycopg-2.7.4.ebuild 1541 BLAKE2B e14373df863af19681a2e657b38d3a797175d7b2dabf4ed15d3c7c67f100991e39f9826f2eaedef06bbe13bb6e4e697c45bc3ad6ff34c3f43bcaee54778d377e SHA512 72fd880c7900b6ea5dc86528302c5247ed70b748277ab2c1011e29bf242b8bd45f79ac759145fc7ef8c09b8c46ff83db1f419ae8bfbf5d9e2b54c228e762c5f2
+EBUILD psycopg-2.7.5.ebuild 1554 BLAKE2B b482fc43480ba87569d1b28d0db4ca47be79466de3f0156eb35fac78bb4807c9316e62389d1f7a744faf01e23368d3e55ea7cc8f20d1bf78832b89903354ab8c SHA512 bf10ede2d5004715f3a028ef7f6fc108f4c3b9368ed1690e60bcddf00627014f3483d7d241b01a10ea3a6317748bef8ec40e7909ed584fa730713f1aa6699faf
+EBUILD psycopg-2.7.7.ebuild 1545 BLAKE2B 0bb3f08adee8735ad27c2fb02f7e4f67ebdb562371b756820acd0d1f0eb1fe1f27b1a2658122d99355d4eaf51bbc0e3278f519a7d5893988e2f900b54c4add4b SHA512 41bd841de48561b5f4bead978a5bbf06f61c26cf65acbef4d3616b3cf45a362d4c201f7669f2cc232bad57f41826a450cf2c41b00e9f6007cc7792327367905c
+EBUILD psycopg-2.8.3.ebuild 1428 BLAKE2B ea3a99eddb5622d11279617be9bf1a9963779bbea7a3bcc24eaa7c1b9dfc018bf2a8ed730ed0dfad10b3c33eba3d54f13f74ac98103015415405a5f120700091 SHA512 51d62aeacf11d5e84c8cc0b5e3169f24a614942213bac17953eeba5315fdbfa9355fb1c0dc7a4c5073fa78c1ee6c858e7d3c476563a097e635ca1b515b7ccf07
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.7.4.ebuild b/dev-python/psycopg/psycopg-2.7.4.ebuild
index b163fc72919c..0e1353104865 100644
--- a/dev-python/psycopg/psycopg-2.7.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/psycopg/psycopg-2.7.5.ebuild b/dev-python/psycopg/psycopg-2.7.5.ebuild
index 7b5d75a9a0c8..7f0174747019 100644
--- a/dev-python/psycopg/psycopg-2.7.5.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/psycopg/psycopg-2.7.7.ebuild b/dev-python/psycopg/psycopg-2.7.7.ebuild
index 4c1e5981bffa..f7ed9d0b3a9d 100644
--- a/dev-python/psycopg/psycopg-2.7.7.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/psycopg/psycopg-2.8.3.ebuild b/dev-python/psycopg/psycopg-2.8.3.ebuild
index d863f7add36f..4f7153baf26c 100644
--- a/dev-python/psycopg/psycopg-2.8.3.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/ptpython/Manifest b/dev-python/ptpython/Manifest
index 7e7e8d55eb53..14d7e6f1dc21 100644
--- a/dev-python/ptpython/Manifest
+++ b/dev-python/ptpython/Manifest
@@ -1,6 +1,5 @@
 DIST ptpython-0.33.tar.gz 43295 BLAKE2B 96df547c3a231124e2e34e5dd6d6a2fe661883d8c8f88a25d955c46b250b86319e343adc0a2265841ca69f115e9b0787a431c49db9de2de362cd5d0c4334ae1f SHA512 fce9379e4522b2b644e6159c73e3eff2d0ced8de65462d4ad622f91feb46fa80a9e01a2c7aef1832b4fcf69de5c0c7d229c731149af7029eec46f88a0506ad71
 DIST ptpython-2.0.6.tar.gz 46980 BLAKE2B b78013d898bb01106315a7aea88f40c0a8ba70571ae8fb5376dcf7d67636f4e3d4d329c5c58dc4c2cdca80ec92313938250224c2560f91eda40bff6c5f59736c SHA512 2d0a84e6515ad2e6523774b1136fdc822aed95e27e6a2d857952b703ea5def86de44166c2cffd8d2151cdf246088959d0a41279cb66b1249a865bff3ad02f4cc
-EBUILD ptpython-0.33-r1.ebuild 796 BLAKE2B 750128b2d001b57c3255b5a190ee799f9549590278aa288984eed2ffc2b245acde5ab4a6a28a7245f020b102f3569add5616ec87ee0407d8ab9c6612e1c53247 SHA512 6102e476171cfd078a26ba3c8afa9108f24a4727ae4657573cac51cb3b16c0f6d50b3638e23a17c2841daf0c3274a28832e216addfd203c555d03fefad8ef081
-EBUILD ptpython-0.33.ebuild 792 BLAKE2B 8b48528de34769cfd8bf0422e6c369ac67a4331801414f9b46909ddfc09aaf298f1f0e45aacfe832cccbde3a413b3d8a6c5d289478a9b76068d83feb98d2dd29 SHA512 35792f0209a5380cf21bb547ade078c92ad45b35fb558691854100d87a798662c710d5489be3cb82abcfecac67726f59ce8c2f46b9c059c7f3244abb159d7d68
-EBUILD ptpython-2.0.6.ebuild 659 BLAKE2B c766793941d3a454d3a08b220b4890fa4b79f56c4b60fbc007c0918e5d72bd734fbd77832e2e408c6335063fb12a2e4ba486b280e5cfa2769dcbda677f653d8b SHA512 edff3759e2a6fe8681de906e22174eda7ca9af5d04961afd8997313aba4fefec34f82c33360e87695a433902b476732a4786ee7e1e3fdd9bdc8ccac05a1c7627
+EBUILD ptpython-0.33-r1.ebuild 782 BLAKE2B 8f26df19ffce17842c3c19c85f4652f3c184fa9e82553967ad69b0012dbe031125cdb2b633cd365ccbe7ff11073c2e68b515d3aa6dec263f2f58dbc1e75b8b54 SHA512 c3a1d92dd80fecd33fef2280a1e486d2b00ebc5d56f0fe3b20bce1c36d60781b7e89aa8514d820df55648596ee0b1d99f57728eb7e3e408bca5d8fbaefdf1a17
+EBUILD ptpython-2.0.6.ebuild 657 BLAKE2B 69fbd09a41e8c54be6d8724afaaa92f7ba20025e93aad0b2a7d6a7b8370b35a64cf03d4d56685e49725e1f183686fb821a7cb5e271c56dc08d1714b0b70d1ceb SHA512 687db15631d88b339b6b5146089a8c7c797d4c54c7ea0da483995ee6053ff21a87cc1efc7b9ba51b33de7aea3a4d28fb207d8c21b153e9d7c0313a6a6153d601
 MISC metadata.xml 386 BLAKE2B 3c952950b95b3f4b38f23f0ac0c25242cb6b0ce9f115a475a956098c246a59858ade285cb2e4df63019e3e0a9f730ad7911e183d5a9b35697006b18607e62b64 SHA512 99b03e22dd04923f3d25f8e50230bf93055f51096ca5c2c6a2613ea3ce219e0192720e29b9fe43de79768b9ec4e2818a730790f4f62cf468e272b3604ea21a26
diff --git a/dev-python/ptpython/ptpython-0.33-r1.ebuild b/dev-python/ptpython/ptpython-0.33-r1.ebuild
index d571527d33ac..e7c152fd13a9 100644
--- a/dev-python/ptpython/ptpython-0.33-r1.ebuild
+++ b/dev-python/ptpython/ptpython-0.33-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/ptpython/ptpython-0.33.ebuild b/dev-python/ptpython/ptpython-0.33.ebuild
deleted file mode 100644
index 197e47a31fc2..000000000000
--- a/dev-python/ptpython/ptpython-0.33.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python REPL build on top of prompt_toolkit"
-HOMEPAGE="https://pypi.org/project/ptpython/ https://github.com/jonathanslenders/ptpython"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/docopt[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-0.58[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# Not included
-RESTRICT=test
-
-python_test() {
-	"${PYTHON}" tests/run_tests.py || die
-}
diff --git a/dev-python/ptpython/ptpython-2.0.6.ebuild b/dev-python/ptpython/ptpython-2.0.6.ebuild
index 0b3ce70fa4b5..804f70e86817 100644
--- a/dev-python/ptpython/ptpython-2.0.6.ebuild
+++ b/dev-python/ptpython/ptpython-2.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python REPL build on top of prompt_toolkit"
diff --git a/dev-python/ptvsd/Manifest b/dev-python/ptvsd/Manifest
index 210dd2b1342a..c71fb4b9bfa6 100644
--- a/dev-python/ptvsd/Manifest
+++ b/dev-python/ptvsd/Manifest
@@ -1,3 +1,3 @@
 DIST ptvsd-3.2.1.tar.gz 51934 BLAKE2B f94b57430bbc39bec90867f3d3b0e98fe88e3a6a8df26ef62f9e5aa4b966358c960881acca4df5a5f8d4538fad0a1c095488b11602673c092236f3110f4e9f8d SHA512 00524c80323ace2753a3ad07b441357f1d4a5c8a6a64eaa0d42c09fac9f6db2c291a1e55dd12ddfd46c257490979359088498fdfdf9fe7afe04bb6ceace33654
-EBUILD ptvsd-3.2.1.ebuild 547 BLAKE2B b389f95ecd8078e242c4466b56e2367ae7af2143271022cebfa8cee527118178d068c508d2ff0915f926bdaf88063f12fdf0e0474f7f2963f80465169403c05e SHA512 d866e89036e01a99a4aff6a89a9a4bfe1e966957b19c4d8f39fe4392153099f585a0c280da13254a632086f3c43e72839cdfd0e1d0997ba524c18478c4c5f03e
+EBUILD ptvsd-3.2.1.ebuild 533 BLAKE2B f7f0c6ace08f44a83d224e2d74bc4694fafadc9b6e8e011df9a91e4465123f1196479630546b406972308eb74421450c397bbd6e175567d72393ea0dc0eb3bc0 SHA512 bfe51765d39784ff771c8409ce7ff14d189483e897da4d0f43148162f99f39d55f3e3bc63e29a0ef60bd6fa72818150110ee3ebb01b982e6c2d44782e3a768f5
 MISC metadata.xml 341 BLAKE2B 1a9fb681f0a7e155da2d3584ef81421b359cb9c935590780b9773140cbeccb81e4d97811a4bac800096096a06f24a10c51cf5fd9d04fd7f34b7efb897967caee SHA512 1a0bfdbe1365247c7f1ad322c1a6216c0d90edb549b7d8f83ecab81f0b72385d2f43b684ecd01d8bdafa7c4e3b0cefe2edddcbfd910a126a2488d0ba3e46030f
diff --git a/dev-python/ptvsd/ptvsd-3.2.1.ebuild b/dev-python/ptvsd/ptvsd-3.2.1.ebuild
index 9831dd6f07ed..6d4a03c50953 100644
--- a/dev-python/ptvsd/ptvsd-3.2.1.ebuild
+++ b/dev-python/ptvsd/ptvsd-3.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index 2be5c5fb5ea0..1d8b312d767b 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,5 +1,5 @@
 DIST ptyprocess-0.5.1.tar.gz 68474 BLAKE2B 70dc7b33fecbbce753dad3363b99b0f6e3433a8e0c9c6bd97c6c9537b071266e5a24fd80e64b5dff804706449a40b810fa5e058e159862b112b89755a3577c1d SHA512 9e7481e8e3facde73086ef0728a57516a15b6bc2a5fb6bf6d6f892c396c9376d9d6334ee37737f3469929c4086d5678a2c5deaf44d70589d41644a98f2239dad
 DIST ptyprocess-0.5.2.tar.gz 69297 BLAKE2B 5b473d0549d18d17f27ba6ff89543b66b2a6781a73c849ab1e2225b73bc3485ae36ecbf50a660bfc0abcad472062502a484de55a9ea206dcf63724c2dd765ce9 SHA512 cb4e70855d388a6ff691e2a244c072a5a50cf39cdf727e3a4218817bf5ac722c4b49f0dbfd80204259998eba137492690759b8908bfea925842b9f7fc83ee553
-EBUILD ptyprocess-0.5.1.ebuild 625 BLAKE2B 78e12ef37595a03f3b4625a9b3d284a6b632e0137701f2c53cbd3343ad84b1b0103a60f12b6b07ee61235e2aa16250f66991529d38d2d427e31c431d8a722770 SHA512 1d5073717a5084ba50d21275cc50a5780c92db0fb5fda6cc20dcf85b26dc6673c48fd43d77864b4838c28aa497ef9fa5aeffc5b2ce2feccca2822d2b186b7cf0
-EBUILD ptyprocess-0.5.2.ebuild 518 BLAKE2B c418f144b04620879e008c594ef8b2aeb1da9968590831cdd82d5ee5df69e3aed3217985a1190f7680cb871e17c2d2341960e702a3bf8073319008673e90417a SHA512 9b2e595001bd55d8f26c8543154136382a1110c75d9bb76aeb300410781b957f37d4dcf4bb97ec9fdbdd5aa7681bce8b2001b930e318a8dc0cc3edd477707f1b
+EBUILD ptyprocess-0.5.1.ebuild 616 BLAKE2B b1fdb7fc7301951961ebb08d036950b37f4b564c3cbd9aa3104931745cc9795bc06861b6677c22dfba2b315005eb6f31f64a87c856cd11c0f2e24961e182ede1 SHA512 8947217c65b269e71959c44bcc9a99fcb2463d0b65ccf3fb98c57660a0a15f51ae09143ddf0160a27b7bdaece5ca0e579f0f71d022757d54306c46b2a79c9fd6
+EBUILD ptyprocess-0.5.2.ebuild 539 BLAKE2B 59248b2f51e086b52309f33c28f90918f0f22dd1a9db98aba1a295318a0353c845463b206d62a3e814aa0127a65a113f37a1f54dd2ca87b64cd80448ce4aaff4 SHA512 104c607e566d4b8e030b3621349d380559a3a6018996ce4345bf9db079a031fdf4358a866b5c70d9d7d661afe6e8535386226d99cf03248a3c56725cd4b0f994
 MISC metadata.xml 383 BLAKE2B 03c99bb4daff695f738e75605fe765379ada90b822ded3015bd82e3e34fff7ff61699978e00dd615d2ca6684567b3d072316debbf66abb0c6f9413ff2e3ad724 SHA512 4355f5b56f756ee65c09bcc3647050e727abdd9abbee62a3f2fedf18fb97bbd523182c55ac8eb8456b0d8b7c0904372ee92cbfeed50765d6f2d608280655b05a
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
index 388cb5121346..1e51d8165496 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
index be8d2e2c6014..e27d100ea235 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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_{5,6,7,8} pypy pypy3 )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index 1da083be98e8..6350959d69ac 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,5 +1,5 @@
 DIST pudb-2017.1.4.tar.gz 55322 BLAKE2B 9cbcf856e364938b93e882d97556512817eaf9fda81a6b5dcb62f626696ed50ad5434cd238a2a73d90484b8e10a2d25b41d4d151fa066b410ba88b85372559d9 SHA512 7abc4f09eaf0df52f66cfc477e02285c32b1650f92db1e1bbc95cba534acb4bda1b5f853f7a1dd1af61ca7ac0296a10b9082e6c9059af176300b93153d472bc6
 DIST pudb-2018.1.tar.gz 56771 BLAKE2B 1c57392a2dcf1a178035fd5824b253a0b5ad19990d32360956b55696f76f40c69b3baaaff14bd4bbc4556bb7c7e12bbcf4f00aea057555480771bd27c1ec4ced SHA512 4f0311d5a8642ff7097c2bceecde9a45999ad4567e008507cc8f977cc1e452cbbb80be525d08703c3e22038831b6b94e9b5b46ea1f1a1dc2d4292c8df9ef7ca7
-EBUILD pudb-2017.1.4.ebuild 545 BLAKE2B 3919d7d7e2c3dab9ea72ab2dbe26f05d1135b5ca0ca924e5aa4d507c6c3dd61bb25e4371882b7fa4365c0923b155774376af35419351621090715c71ba3ba760 SHA512 2177a63d99db70480dc7f134b23be2c6e912c3f6f7ade77fe450574b00ce2378f66e2b0aa63c52c7f3a79148f312a84076792191825b70287bf26e07c4f98382
-EBUILD pudb-2018.1.ebuild 547 BLAKE2B d33a5b2fc9f0baf0b34a003d00070b8b9043936e40c913c6140e3b50d877fc4bb04eb5670d4a0b25ad42951682581638504cda53793377ef528cf1dbbad8009d SHA512 e0b3a934fda7bfbc8a5cbb9decd5ce4617454a4c514b9a9fa6be537be4ec50e6fa3d50d14d3829b0091b04f498fbaeb4e5b7b60318405b52eaab213ec73f67cc
+EBUILD pudb-2017.1.4.ebuild 535 BLAKE2B 0a5978726b3cf4bb29dd3da301c6cccfca0b74c54ef9e8678beb78021ca0da21fc37278105dbdbf81d9c0e8a8ba50dbb97e219df5147daac9e9861860f0fd4c6 SHA512 cdea794034087e56942b141aead59fad42081f9959419c4ec36673ee1e211a4114d93c9be15abbf3a025da0979c079441a18dbe091736c06916f263be4f42e3e
+EBUILD pudb-2018.1.ebuild 539 BLAKE2B ec979d5c3967cba0e7cf8a24e2dd611e0251c0729b168ee80737c0c813165e072a029942b86cb3f222f760aaaf4fb323255eaa5b719fa01c7d69e3117cc218d9 SHA512 27eddcff1341b0c5e3a3558bcf2c0a08805cbbab7e4545e5da51a4b40453a2815a51fd0257b9e134c897a30838e98c08a007908393477bbd31ec8f4496f8c55b
 MISC metadata.xml 495 BLAKE2B 7cc2da3650908671807f02695e8fd3f1f674a7a591313072bb6b61ec1a7a597f8b6fff2473cc385a9cfe8792be4248cf5e48330f6716dd362f3ab3671f179150 SHA512 21a4c18638b19cef9f1d01f7641be082c20053a0dbd455d2c8a6f5cd41a058224362187c299b96e0735cff6dccb942c060776f17c94d74a47b290ac7f5916b80
diff --git a/dev-python/pudb/pudb-2017.1.4.ebuild b/dev-python/pudb/pudb-2017.1.4.ebuild
index a8099641554b..d2e254250094 100644
--- a/dev-python/pudb/pudb-2017.1.4.ebuild
+++ b/dev-python/pudb/pudb-2017.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pudb/pudb-2018.1.ebuild b/dev-python/pudb/pudb-2018.1.ebuild
index e61e96c17885..3218f0008438 100644
--- a/dev-python/pudb/pudb-2018.1.ebuild
+++ b/dev-python/pudb/pudb-2018.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pure-sasl/Manifest b/dev-python/pure-sasl/Manifest
index e94df6100f73..f2f7a097854a 100644
--- a/dev-python/pure-sasl/Manifest
+++ b/dev-python/pure-sasl/Manifest
@@ -1,3 +1,3 @@
 DIST pure-sasl-0.6.1.tar.gz 11553 BLAKE2B 17a3728e23b04cfcebd967ec4e40ab40ae72ebd18325579dfac52dbeac58ebee6e467f32a8030214cd976b2ae96e446afbc853c3e4233a61fa149d2910b1ecfc SHA512 f0e34fba460b03fb2348871859f79a21ac27df4be8b125a1652891efacd428a560673f42dff0993e87a3d80439f182e3a6e07b7c968cbfa3c86311c1592822a2
-EBUILD pure-sasl-0.6.1.ebuild 726 BLAKE2B 816ec871c73a63b2304553d939e42c00c27f8cd28bc989453935d6b75f7f1c5ff1aa10f3a777fc09dd65bf3df2cce9c466203adbb2e6208baceccc94f4207b7c SHA512 304ca58b2510606e26ffa814e8ac7cb233e5acd8f9605fbc87ea6e2f474526cf9e284363e46d3176ebee957187620d2d0a84cb0d74af581445de59dfff6ac1bc
+EBUILD pure-sasl-0.6.1.ebuild 716 BLAKE2B 0c00d255342de8dc4832083c7f064e0d7580a0326e72bc3e7bb320eb2acb001c30f798ca277e52931a7694e782333b30047a445f774cc52a2e4580d8d114170a SHA512 cac9460fbc50cca5fac2747807bc3085490c720f21a5438b5b7abcba8fcee7c8bca02397ab82f6ad6c03d2ef2afa0b4d26e9eeea0df2d0702470f6eb1931cfb3
 MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
diff --git a/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild b/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
index ce2889a576cc..c74a9f98c68e 100644
--- a/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
+++ b/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_7 )
+PYTHON_COMPAT=( python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="High-level SASL client written in pure Python"
diff --git a/dev-python/pushbullet-py/Manifest b/dev-python/pushbullet-py/Manifest
index a0dd1a8c3148..56962889ad13 100644
--- a/dev-python/pushbullet-py/Manifest
+++ b/dev-python/pushbullet-py/Manifest
@@ -1,6 +1,3 @@
-AUX pushbullet-py-0.10.0-fix-filetypes-python3.patch 705 BLAKE2B d70f4746288bc3a54d4f5a780722ef04d85ae5018cb2b62d714856ce11a9596a5767218735def55a31ef9cb0c3628e3ab1422ed4e40001fc7754d2409f190058 SHA512 b349e98877eaa540c688f7e1d1c3dbfe708e2bda253f8cd177f26510716db58f8c3ac10531722a16706f7e53951cfa99268b9afa0597558630c344f7bea6bf1e
-DIST pushbullet-py-0.10.0.tar.gz 18929 BLAKE2B 900e42ce407a0baff0b24cbe6e04a3c10e1aeb9f7dbfc917cd58b2c35a2f42f81c0aa935fecdbd50d087a45d309b9baad1e3e5235568461b3e54c12874a2ac93 SHA512 2e259b76413c5e644350a891678eb98f761e56b18f5a06a9d7cc34353c7c7ee67fa875aed575b1b005782b21f4440d682db5c09be7033d52b7b9cf41e9120123
 DIST pushbullet.py-0.11.0.tar.gz 21653 BLAKE2B a6c9b6f4958ce35b63ea4043d1d4f8691885bd0aa2927af541f2080a0b0b65a7df979a497967f3adceab8ad2382448a4c6a02d1184c9d72a18d91844eb970722 SHA512 b236f30b99e5bb79eff183529716c1c8f83cfd2526fdf50d86041eb6d3fcd6670d0c4dce407ae6e50aea0fa96d6a5527af980148f0c71ef758c480f972ad9659
-EBUILD pushbullet-py-0.10.0.ebuild 1334 BLAKE2B 8817b0e6f5b9eab9171a677866df91d82e9b32c17fe71eb80abc89f8c9953fe26a8771030a9e7569c43dae81a1f998a290bd04c2509ee4324f5a8155db192630 SHA512 df6238faa5dbe262d60128372eb7d7cb7968fca45fef03f747dcbd768e3469b3b5519f1eb317ceb1dabe85a23d2307061bb955cd115705ee4075a54a674b50d3
-EBUILD pushbullet-py-0.11.0.ebuild 1140 BLAKE2B c4b318922c254373cef3abfdbde6a13e92e73cd6f269729c87eb9e237a3e58a88ee2293bbc543f313582f674fa892a9d3ae1b2c46c19fa79f231258086e2c566 SHA512 f1719d2952e2698610afa05f603182a52be3dd481e5114b9d6a6dc06f51552741874a3cc9d54ec5432989b8f5b827c45cbb79adb899459a34fe7420524c75a3d
+EBUILD pushbullet-py-0.11.0.ebuild 1130 BLAKE2B 614cf6a5ea5661cfb8748fc1376775c27e8d4d776229e38f2c0f26379fa33e2c5d937d7e31a18b9018ab6a65c4745a6b4e09a60cec7a8f37685a47c981be24b3 SHA512 a017d3919983d68b71b092dbb88311f27cd12fdd590afd36ec17dc45a0af7ebbcaf6ae0d1509a53df42b62f744d71569db99bc94c44a9894e3a81a5f435380a4
 MISC metadata.xml 459 BLAKE2B 86e83479fde9503defd709e67ea6ba81e5dd9430e1e1b4ea6545f332979173fab9a2392528007638531c58ec205f2d45ca9817f21981b4ebd94f0f81596bde71 SHA512 cda083520abafb4b81b0691234a2bc2bbdf75f4bef69943e5243492a8d8916f9924eae5f06288a6f636ef7bf36477e198dc6a33a04e55a9fd2376a03999f91a2
diff --git a/dev-python/pushbullet-py/files/pushbullet-py-0.10.0-fix-filetypes-python3.patch b/dev-python/pushbullet-py/files/pushbullet-py-0.10.0-fix-filetypes-python3.patch
deleted file mode 100644
index 09ded3540487..000000000000
--- a/dev-python/pushbullet-py/files/pushbullet-py-0.10.0-fix-filetypes-python3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/pushbullet/filetype.py b/pushbullet/filetype.py
-index a2f2be0..22ffedf 100644
---- a/pushbullet/filetype.py
-+++ b/pushbullet/filetype.py
-@@ -1,13 +1,22 @@
- def _magic_get_file_type(f, _):
-     file_type = magic.from_buffer(f.read(1024), mime=True)
-     f.seek(0)
--    return file_type.decode('utf-8')
-+    return maybe_decode(file_type)
- 
- 
- def _guess_file_type(_, filename):
-     return mimetypes.guess_type(filename)[0]
- 
- 
-+# return str on python3.  Don't want to unconditionally
-+# decode because that results in unicode on python2
-+def maybe_decode(s):
-+    if str == bytes:
-+        return s.decode('utf-8')
-+    else:
-+        return s
-+
-+
- try:
-     import magic
- except ImportError:
diff --git a/dev-python/pushbullet-py/pushbullet-py-0.10.0.ebuild b/dev-python/pushbullet-py/pushbullet-py-0.10.0.ebuild
deleted file mode 100644
index 4d369b1e74a1..000000000000
--- a/dev-python/pushbullet-py/pushbullet-py-0.10.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-DESCRIPTION="A simple python client for pushbullet.com"
-HOMEPAGE="https://github.com/randomchars/pushbullet.py"
-# tests and examples are missing from PyPI tarballs
-# https://github.com/randomchars/pushbullet.py/pull/104
-SRC_URI="https://github.com/randomchars/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Backport from upstream git
-PATCHES=( "${FILESDIR}/${P}-fix-filetypes-python3.patch" )
-
-python_test() {
-	# skip tests which require network access
-	PUSHBULLET_API_KEY= py.test \
-		-k "not test_auth" || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r example/.
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild b/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild
index 6b2549833e3b..267422432286 100644
--- a/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild
+++ b/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pxml/Manifest b/dev-python/pxml/Manifest
index eea0192e2f74..9cd9cf79e4d7 100644
--- a/dev-python/pxml/Manifest
+++ b/dev-python/pxml/Manifest
@@ -1,3 +1,3 @@
 DIST pxml-0.2.12.tar.gz 21194 BLAKE2B 1fe5e1ee2a038396efc7e4d2933fc0d1fb261c5a1f3528584f4d609869c1b5d88f3b5236f162bec72ce3fa034630395669813e5021f74c3fd36c16807c6d5dcc SHA512 95c66036d161c1245edfc7924abde9f63e764bfc39037ff2b5d281840e7b306c08091c9845ad4d5738ebe2769f27d90e1b6b226379ee6fd263db323ff629d42b
-EBUILD pxml-0.2.12.ebuild 766 BLAKE2B c665ad3e038d419bee09630436fc00379084bd7bc332a728e84e24da7ac57126d1d9d37fbc0ef53955490f8c5dcb6477606dcc223d8b19ada3fe8909a685d3cc SHA512 bf74ce9e088d4ad7354a156ea720ca1df81764f15704f282cfbd5ea6ba4f11475e8dcaaaa331a37d5df4a9d379965367da2fddf536d684e3d833a451ec43ec9a
+EBUILD pxml-0.2.12.ebuild 762 BLAKE2B 551019c8f0013ac4615e90f56a3114ca68f8787d65000f96f5eabb3ea0df2ae12483ac44dd11c0a3bff6298293480e9712a269b18a919d917b23ecd1cb77797e SHA512 5a5cbc7ddb0496ae467827be5e5d848d5d9ed9c4c608e695992bf026793e4909ef470f59dc16b8408efca846f260f7351c584414607cd6222a82079c98c0bc01
 MISC metadata.xml 363 BLAKE2B a98b0d8b713b641ed26c4dd10207b0b9c76c6068e30d3e212cd76eb6d51e74edc032803f937f63fe10e676b61028fb95600fe322addffb7d9fe7936c988ad929 SHA512 f36107242f9361d2ea84f045ad22595c39bb94ba6641a2ffe4348bb7574a3656a57760f75211e9ee3e76b56fe0e3e9c44e941a8192a00476c7bfcfba150fe5e6
diff --git a/dev-python/pxml/pxml-0.2.12.ebuild b/dev-python/pxml/pxml-0.2.12.ebuild
index 0af9dab08744..fa7bba27d4ca 100644
--- a/dev-python/pxml/pxml-0.2.12.ebuild
+++ b/dev-python/pxml/pxml-0.2.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 178cc6a4d5ee..08808f2c6eab 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,7 +1,7 @@
 DIST amqp-2.3.2.tar.gz 105854 BLAKE2B 8bacae52f03118e2d0fb93a6494628f18f7139d655f1c4b3e7cda9fd81eba5d92f56038bc01dd4a28a89168be0fd51013db0060e945e7f7c63e1423892feaee6 SHA512 c9c99a238cf64ab5590eaea5756e9f68d58769b4d74af3405321d5c129171f34e6a5d20f2125ef2828e843b637fbd115d1ee9391726fe6ff09d233f0e6bdd511
 DIST amqp-2.4.2.tar.gz 116265 BLAKE2B 1615563ad4ea86ebd970641ed409d3f90aba86c4f4eb4af3fbd528cdbe68642a83e05bbed8b8bcc5f503c227003f078c2cbd444f56218af5d02961f1008319ec SHA512 dba880c07ee8b503e02f11ea5804f559ac2eb85717118d796558b1890032482babd15930af78f9d11b77530d496fce3ba8c8579eec71ce5a3f76b8d8a181af34
 DIST amqp-2.5.0.tar.gz 117022 BLAKE2B d05df3699a73ee3cc9540599b7947b4ad9fc1d74194cfbea81787d85c0f83262d109c153669d746ccfb67a1ecb21755da4615043ebfa67c84c8f108ef61ecd3c SHA512 c0675b85bb4d8bdc7c303bb694153c86eb503fa3c4fe6b6c4dac6b1f3aac2fbfa75a4ec39ea8bbdedc297a6a3407a0a5b560885df761e667e3c0770f5979156b
-EBUILD py-amqp-2.3.2.ebuild 1206 BLAKE2B 3c3237d76f8d61bf4fd62a5357381451804fe315b4b69d8f961e20ca054f8d20871a8f04adff65337a34cb4b717ecaffb4133c9663b7dd9e63b849880e3eb00b SHA512 13a8f830b69d09731a84f977a2052fc4ca7ee1fec7dde9ed7e9b000c2a07c3a94ab2738bc2fb79c71d8a84c71a58a78f4501dd458982507d0b7f9913663dc6de
-EBUILD py-amqp-2.4.2.ebuild 1207 BLAKE2B 2967fa8ae3d4365a5e1b97d8b0790a8862ca1de2c8ccc0dc8f5df6378539088b0e32bebe644a04881bcdd77c136113aeaf7d2dbf47b71ab7d45e9e82a37d5f6a SHA512 fca6bc855a07bed296d694919aa437e6507f26ba7d5e4eb5b24d72547d2a01d31338a9ab13b994415b7547aa78ad4048aeb6ca46bed3f06803acd11c11f87c60
-EBUILD py-amqp-2.5.0.ebuild 1485 BLAKE2B e8ff62fe86494c180bbec1e3329b50c5590ce4103f5d4831c5258f43898d6d52ed77662fcb71fb23275300f417cf93083ef409c35a183613fd98d61fce76fbf0 SHA512 a0aee715be946e1281c50c01af20c6857be16b9afb444874c99839343bddb5118b87fe2fc38d2c73cb05ffdd2d24c3bc3fb98bb2e2d3afae2c07165f2a9d392b
+EBUILD py-amqp-2.3.2.ebuild 1202 BLAKE2B aa2c0dd3e47d7b1b5e28b4318ec13e6224877bf20a8881e1582219c5f1bcae073701fbd0c4cba39cf2c726d100aaf7b18db27c3b03de37cb64fe95d523dc4fed SHA512 5ac6b7959a803a673933f7c7ef264d7876fd1df07d5ba1bc47cd3bd38d450917a12c5390fc994db9d60e513529ddcf910c42baa244302cb92da13382e4e7dc18
+EBUILD py-amqp-2.4.2.ebuild 1205 BLAKE2B 869da83b1f354478db2f6c3cb5d66d7c3210ee0a86072b7ed02f48bded269d996cc1f338f48bfb5eca42554215ba6415fcab81be40e7c802d5e2c9006bfab2de SHA512 255384379b9392c434f2f4e7d38b33aaec51a93c804ac5ba1780f4b16488ad29a464b1e0db97d97eaae8e7c673755dca96da9a5a9c96d731840d691d4d05422d
+EBUILD py-amqp-2.5.0.ebuild 1483 BLAKE2B b11c95da90d4bb495cc722e4a4cc6f8a9808b0de045b9acdeef0d5719079446f998a33cdeb30e24a03c6a6827d1309e5f4f33952eda04418c056d073b00fdbfe SHA512 9bd5439edffa29ee3ca6eede18fb6c158b86feffe211c1acf5151c99801f55901fcfb83bfe2e6dc03ce9593df16701fe603c176e840c22ad1fd73ca8b003daf2
 MISC metadata.xml 480 BLAKE2B 43fb5084b74b3c2162cfe63a41aa8e115ca9da87aa9cd32ba135371ed1236a443b96804d5593c69b8e8189affeddafb8bebe7733369548150ce525f4d0f71d84 SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd
diff --git a/dev-python/py-amqp/py-amqp-2.3.2.ebuild b/dev-python/py-amqp/py-amqp-2.3.2.ebuild
index fa7165d1d9d8..5510755d23b4 100644
--- a/dev-python/py-amqp/py-amqp-2.3.2.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-amqp/py-amqp-2.4.2.ebuild b/dev-python/py-amqp/py-amqp-2.4.2.ebuild
index 3934387e12a6..262ae2aabddd 100644
--- a/dev-python/py-amqp/py-amqp-2.4.2.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-amqp/py-amqp-2.5.0.ebuild b/dev-python/py-amqp/py-amqp-2.5.0.ebuild
index e8389ea178dd..d2527024cddd 100644
--- a/dev-python/py-amqp/py-amqp-2.5.0.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index faafe8c071a5..15cbbd1c537c 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1,7 +1,7 @@
 DIST py-cpuinfo-3.2.0.tar.gz 76019 BLAKE2B 2a0969911b385e51ead94a92b89a21bf6ebd6a49ce5229329265ec0611fabe1180cf4ac617c1786ab25605fbf11463e85d74a02195cf01ebc40a5f8d1350f83a SHA512 737d5a73d6991ce5cb99125951a75492f48177030986270bbe7dcc0efb4e3200c9957bfbe51bd5a7555bfa8e62db68c3a5227e47e5e6bb2115ff2c10c0bfb688
 DIST py-cpuinfo-3.3.0.tar.gz 76052 BLAKE2B ffa9d53ccca034b8b4707cc60c8c38b66bd76101e4c6c8d8bf5de743904270a4b9236c0f03192336c2fb32fefb665c5a6d5587639a408ff0bb9183b33f9c3ce7 SHA512 b31ebfb0f066303813d699a7aa5bd5b8d4e0b3b6e8422dfb4aa53c5b64d2234c5275fc293b3eb3ee72752691e023dc94fc013ccf6a0251d307c4b10619135524
 DIST py-cpuinfo-5.0.0.tar.gz 82118 BLAKE2B 94df998e053de04cf7b470799eb7595b5a398bf7d2da6417e3f5f6313a3e1152adfa5ef6a67461cd10d521be88d0a9ccf9495715a23cefb557f673f10dec7468 SHA512 d3a22ffdc4d1668a58330016e3297e57c07f6380e544497b1ad9dfcf0410b000f69418bf1cb9a434a2ffdbc8f17be89a25d33c65817913a823c6e181df6b760e
-EBUILD py-cpuinfo-3.2.0.ebuild 602 BLAKE2B dd1ba74bf0f689cf122d8a12867bbfba4be903e39e848a9792f4f8eeef5c9495ef7586d2e02d6d524f1cdebf39f048b2c521daafcfd8f7862b769721ac1e2730 SHA512 2b2acf4fec7185161cba7219cad55099fb8e169b309b7a5ef2fa1a5f64a3f149b872f8bef8857e6a418bc91de650cf206a5ca8cae10cfd573a701256a8f54c3a
-EBUILD py-cpuinfo-3.3.0.ebuild 602 BLAKE2B dd1ba74bf0f689cf122d8a12867bbfba4be903e39e848a9792f4f8eeef5c9495ef7586d2e02d6d524f1cdebf39f048b2c521daafcfd8f7862b769721ac1e2730 SHA512 2b2acf4fec7185161cba7219cad55099fb8e169b309b7a5ef2fa1a5f64a3f149b872f8bef8857e6a418bc91de650cf206a5ca8cae10cfd573a701256a8f54c3a
-EBUILD py-cpuinfo-5.0.0.ebuild 604 BLAKE2B 17b40a01066412547b4eb4638e5712ee14fafae722df5ce3203add2c6f3233d81f3416ffd0cf5ebb42e27eb31cf18355d274e6f9d6417f2d3647f4ce1ca8b75e SHA512 5534fb37118a7abba64cec02cf58b3274128e28c21304c3297cdf46fab3eb5fbe0341c6f62abf06183985bb0bfe56f061da91f7026c0db56057110c0d38f0e07
+EBUILD py-cpuinfo-3.2.0.ebuild 587 BLAKE2B 4cd1d8e23e66d3d0eb4befb20db051493d8df98bee74fad5a0f96fb3e7edd033f73aed6754c08c03bba3719372ffae163bc839a43f3b8e1e78da78e8a60abed1 SHA512 8d75c87ebe0947aa7dc3cff27f0a2b2f9fbd6ed219c86620074db31a0867174ce8f06a23eb9d952b1cdd232d4505c88c4c5df6fc66d36f9e7caa71768e7f0332
+EBUILD py-cpuinfo-3.3.0.ebuild 587 BLAKE2B 4cd1d8e23e66d3d0eb4befb20db051493d8df98bee74fad5a0f96fb3e7edd033f73aed6754c08c03bba3719372ffae163bc839a43f3b8e1e78da78e8a60abed1 SHA512 8d75c87ebe0947aa7dc3cff27f0a2b2f9fbd6ed219c86620074db31a0867174ce8f06a23eb9d952b1cdd232d4505c88c4c5df6fc66d36f9e7caa71768e7f0332
+EBUILD py-cpuinfo-5.0.0.ebuild 591 BLAKE2B ef4fbf93fdd7d737b45da6a91d1da066c6195ccbd08bdd79b364198e6a51990c911904c96b2312750bc7c1241b8565b006bf605c5e8bb8ba9007cb210b43aa08 SHA512 0d9ad91a5ea624c65e9babfcbe0e1518eb3af00a9c58507b26340e6b0f4fb12c29fb5950ee679dbb052d5bf047988648938f49f2d8134ce34468f70eac579ee9
 MISC metadata.xml 531 BLAKE2B ae246808bbc91d82d4d635474be548d3a3e5d48cf45dadfe17e13c6b3e766871106c329a1e478ce7f65478cba17bc28673b459c83b6bbe779891a7f86d605ce0 SHA512 388ada1a9c39b57369dfc9f164530a871801149d44a1439679509fc733b90f33256e8f9a5b5ef22af854e5aaa7c9e1857e87943f25f0c4e06eff2c6b64d440d4
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
index fa7e20decef9..0ba28f62f731 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild
index fa7e20decef9..0ba28f62f731 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-5.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-5.0.0.ebuild
index 88a18ba0cac9..2d19c682a38f 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-5.0.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-5.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-gfm/Manifest b/dev-python/py-gfm/Manifest
index 34ca52acb66a..31f28808fdeb 100644
--- a/dev-python/py-gfm/Manifest
+++ b/dev-python/py-gfm/Manifest
@@ -1,5 +1,5 @@
 DIST py-gfm-0.1.1.tar.gz 7326 BLAKE2B 9439a3bbfea66c43e9d4a8a1bbf51aec1029009510a39ad187d98555ae3b7ea9a9ebdb467d7ba220ff189350bb72fa91bc72b5baf19da5aaba64131d74ef744a SHA512 af10b15bb2b565904a8383f8e87d9f83cfbf55a5d20ac258759e74d1fa227a2224381ea9bf3f49c4ecb8718d195fabdae372fe572611428ae82b925a92bba7b5
 DIST py-gfm-0.1.4.tar.gz 21015 BLAKE2B a3060453ce9b2c0a4c3112f003439527c03b7b0be439b63620575e95265d8a65c1053546f9cacf19b6006ef2cbcfe5d8dae762740ce6e6aa035706a94bc611d1 SHA512 4730035b8a6168b6d2987a4a5f9a0ca70564e6797b7c88ec43f04152fa77c5a396f204b6143fc0bb3a53ab364b6d11b2274663b8b64d4640afba2a21cd1e3c6a
-EBUILD py-gfm-0.1.1.ebuild 528 BLAKE2B 7f8b916363815742fead9c00b4a7ff030f2e7462a442061238265942b6f7397f9ce7d45d769c21e0177a0b536de44b76bdc11b86a1ef96bfac303edb6cbe2bca SHA512 deed847376b8452cf9665c003020f4f2fd53aeebf886be26f3bab923781ea704b6577b82869476b9f2a08b0d552a959faf3b5548ef6cfb8f56b3c085135e66c9
-EBUILD py-gfm-0.1.4.ebuild 532 BLAKE2B 0a5984bc9f6d09139fb7b2ad4baf620c79c2869e120fdff7a2bcf56bf8451605119ffaa1d532df9ee8ea8574feaf0534054b75617fb2ff7026b7a8908e7c8923 SHA512 b9fc0ea538afaf8be84616a81d3ebe42bc8f2f36b9d9e6cac0620251c3cc830bafe4bcd1523e7da8010f0926002750e5820fbac9ee1f8ad944c876f465192cb3
+EBUILD py-gfm-0.1.1.ebuild 524 BLAKE2B 8838c756128dc5fd9fa6cbcfd459fe1ad7a5928f9502aea7170cda0ec332b71ee728836908f9690a05ff123c9d34d8b07dc8c17d7ceb3d042df973384b574881 SHA512 15482ed0184861fbddb7a875c6b47bf32ba64798a1895dd275945301e6507b429d410922eccf7adb6ccd49ba942d303fba877548971ffb534dfe92b6aac9c7f6
+EBUILD py-gfm-0.1.4.ebuild 528 BLAKE2B c6ab6a99a688b50deee6394a55bfe0d2fe1f4ea5e677bc3ff7cba4b659b672c67fbb0918cff3a095982b2eaf61be25fbaf2402154edeb22e3f1fdf65ffd71d87 SHA512 548f1b3ecef4c48dad8347bc283aca635f20aaf41087066f438967f555597fc86b2bf6e62d926ab7f209d88f2c9b4d0f38b18b3840d75e8afe25960c8fc299c2
 MISC metadata.xml 311 BLAKE2B 97f71814ab60ebe250eb61ee7697be94ba6effd3dec0328481aa5d5487b805e6945515bc605cbabed215f982d618f991ee07355c0b6d05e57276a1f949e178f3 SHA512 e8b4170b6b16a408b606625e6ab7dd17d0090310e84d1909c0b81d70c9c073cf40d61d56e434a370489cabec0803a22cb70e830ef7649f031fdf0214312627cc
diff --git a/dev-python/py-gfm/py-gfm-0.1.1.ebuild b/dev-python/py-gfm/py-gfm-0.1.1.ebuild
index 1c9d74b4d95d..968047be4d14 100644
--- a/dev-python/py-gfm/py-gfm-0.1.1.ebuild
+++ b/dev-python/py-gfm/py-gfm-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-gfm/py-gfm-0.1.4.ebuild b/dev-python/py-gfm/py-gfm-0.1.4.ebuild
index a699d1c6bc02..3a051b33bebe 100644
--- a/dev-python/py-gfm/py-gfm-0.1.4.ebuild
+++ b/dev-python/py-gfm/py-gfm-0.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-lz4framed/Manifest b/dev-python/py-lz4framed/Manifest
index 6b1a516cdb21..ac3cb831ef00 100644
--- a/dev-python/py-lz4framed/Manifest
+++ b/dev-python/py-lz4framed/Manifest
@@ -1,3 +1,3 @@
 DIST py-lz4framed-0.9.6.tar.gz 82402 BLAKE2B 7c7eaa919a0210dc904bf1ba0c334c48c9328171ccd2b8935b71974fc9eb6a0c3494490747af72961118197baf382182cdcdf140931cd9d46a2952f5cd8b8839 SHA512 46613146a538189c8035d0e2257bb37bce73e23fb7d4dde5a6c99948a8b7f27fa4fb19c3f6d654ac3d230551b7dce7e46d7beda05a419f39911fa816b44c9a1d
-EBUILD py-lz4framed-0.9.6.ebuild 548 BLAKE2B 4a90bb329b3faaadb909e3aeda55d3ae6321f2a4c00651c371b6940c37ef70cc32db14c6881d50fcd751b782a89bae08cbe2bbba295036404f4935f83eee8ee4 SHA512 768ca844c5215b42b7cd8b5ce81a70b314f4f0b85bb8befbf53af70fc1ae063a9f05ad3ef1e7dcf5c441737b7274591bee6eb7547545ab15ac2142b9211c1412
+EBUILD py-lz4framed-0.9.6.ebuild 538 BLAKE2B 87b1ee79f6302de655f08697822ce17f4a2a7a7166fc1fba7e6bd1c1add0b9dae3afa99d8b313716d3ba3333bbeacc29c0f167ffa25e29f82dda078281bdec74 SHA512 b74557484f0b5566ba0e59542ac90577ea48a3d0d3f9af789543a33386009f2781fec57f7c419d7f34e8cb7990de8cbcbad475bc714439e91c89f0647c0f36d7
 MISC metadata.xml 390 BLAKE2B e793f58e8ad12da3e2bd47e1e7f14651cd7b01779872d40eb191c5563bda3aa8e3fc3e5e148618ecc57bd182495d77c96065fe8fdc8204d208136a4b18b41144 SHA512 b449fee19c464b2ceff5a95d95bf455a828c436af7a15d6c717b459c095b7bbf58cc4616caf6448a4303380d58f65fb573d6e9379deb002854741910e56b5ae5
diff --git a/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild b/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild
index 8a40b04595da..2e8da740da98 100644
--- a/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild
+++ b/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="LZ4Frame library for Python (via C bindings)"
diff --git a/dev-python/py-notify/Manifest b/dev-python/py-notify/Manifest
deleted file mode 100644
index 3792d3dea3b9..000000000000
--- a/dev-python/py-notify/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST py-notify-0.3.1.tar.gz 144954 BLAKE2B 85032cdf1db90b1cea713b4f5ee9bac1fac20a55ae549a3c908c5ecb358c66494db92c48df99662ce1e8c3b8c01743219d88fea9466300d0165448541a99be69 SHA512 16d874e6e265edabffe2200484566823251a0a395e979657829a7facc419ec6e21589f97f1675556b48c67ab6b93ded7325d57c8de29a4216211a8c37a3d9075
-EBUILD py-notify-0.3.1-r1.ebuild 608 BLAKE2B bdce55f455d7c30503f592329252bfb4cbe96a19e37b3531848dad5a7c31730ccd14aaaaa42aed9b3593c2c0557b505f5da7553e5eabddad3577bdeb821e8cdd SHA512 150743e57a78b55a07adf9f221bc6538e5f632033e26fafb9934671e30d90b4aaa012883df8db859578f2da1a77df3ce0e8b95f87bb416185b3291c2f2ca7909
-MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/py-notify/metadata.xml b/dev-python/py-notify/metadata.xml
deleted file mode 100644
index e24dd86faa2a..000000000000
--- a/dev-python/py-notify/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/py-notify/py-notify-0.3.1-r1.ebuild b/dev-python/py-notify/py-notify-0.3.1-r1.ebuild
deleted file mode 100644
index 083fa3224273..000000000000
--- a/dev-python/py-notify/py-notify-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,27 +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="Tools for implementing the Observer programming pattern in Python"
-HOMEPAGE="http://home.gna.org/py-notify"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${PYTHON}" run-tests.py || die "Tests failed"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-smbpasswd/Manifest b/dev-python/py-smbpasswd/Manifest
deleted file mode 100644
index 01e87a0ced9c..000000000000
--- a/dev-python/py-smbpasswd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST smbpasswd-1.0.2.tgz 13503 BLAKE2B b7c1409c7e28a70f43608d54b527096c990e02786eb30b1a99ff5a869acbf160c241ebdf8e725d32cf37210c8e7e3166f9cb7582336851c6f31257717de9b9b5 SHA512 2136e14343037bdd014765c28b9e152c8edc774ce7cf531b0784148db42e88e3abc402389e9b58b2ed938681f42715783504f4854ffe269b02419f13979a7d6c
-EBUILD py-smbpasswd-1.0.2.ebuild 538 BLAKE2B bf8dc4400bacbb6b3c2dfdad75106ae5d38515891059f5a0c108b5adc053a5d26f5d723a7439597648ffe498d83433a38fd5b9eb07942a712c5e5b487b6a39c7 SHA512 9d7d1455d9b7ae51b385d6b34187be302a796bc0b791d038b048ccb6734bcc9f0736f704b283a64916e427531aa8800fd22f063b634c2914793ebda8de815ade
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/py-smbpasswd/metadata.xml b/dev-python/py-smbpasswd/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/py-smbpasswd/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/py-smbpasswd/py-smbpasswd-1.0.2.ebuild b/dev-python/py-smbpasswd/py-smbpasswd-1.0.2.ebuild
deleted file mode 100644
index 6d805a8b5aae..000000000000
--- a/dev-python/py-smbpasswd/py-smbpasswd-1.0.2.ebuild
+++ /dev/null
@@ -1,24 +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
-
-MY_P="${PN#py-}-${PV}"
-
-DESCRIPTION="Module capable of generating both LANMAN and NT password hashes, for e.g. Samba"
-HOMEPAGE="https://barryp.org/software/py-smbpasswd/"
-SRC_URI="https://barryp.org/static/media/software/download/${PN}/${PV}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index 82c9b0d75af5..bd2f5eeffd74 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -1,7 +1,7 @@
 DIST py-ubjson-0.10.0.tar.gz 44653 BLAKE2B 91c40aab4cc66200d863fb13e4f0b64f4b1903422732f83af1f32d05a7e002723bb101b085c3d34bd33c0f2c161e24877b8fe8e8d7c09a54bac043104a58ceb1 SHA512 f4fd5dedf0212d91d8fc65b4379ccdd2576d6a3e4f5200f0f6caebd4671d582516916fc89af5d942c35624a98ac76db8fe0825a269206de4ab1ca63b54608cc2
 DIST py-ubjson-0.11.0.tar.gz 45473 BLAKE2B b74bfc20b30a2a45fb4511aa730d51245e6810fb8b00980dd61ae5bfa7cda1f60397de8c9d914195dffc48e4ec9582f839b9e133b98dd897b0a47a03abfbb67d SHA512 2c5dd111ea91fff1cebd722c62b312422e198bb8cc614e1254a3913067f72124efd1cd9879bd83ff88c2fc12ff2ef17fcf350ef7a3d6587c96a58c8b9e8ca547
 DIST py-ubjson-0.9.0.tar.gz 43338 BLAKE2B 8bcf61d1329931a2bfb7399cc27e72b14f9641fe902f0275ae190b1b256c67d78fe9b436aacf6b33912ef0e29a008e4e7b05a12b10488714ecb5b31451c1e69e SHA512 d9f061e548405d16a22d235f487740b3d4abeab8b555f9684b632cdb5e2f655ba8413a207230f90e7f3f352fa3289b16bb9a56b623c0cc5fe02f61778a8f78a2
-EBUILD py-ubjson-0.10.0.ebuild 433 BLAKE2B 8400c323d203cc5a59cdd7b2de731ae2619cf75087b1d1cd1795f76a2d8095ee88d2f0534265b47d7213c01d133c5e5da82198d16f0a2b4dd6dcc4261d55311d SHA512 fcde8d7440caadd017485c7528b16d9ff5f32b221b2b378553e86494c193a034f0fda54a477f462526b110cdef1f101fffc5f9e79942d0c44dd930a2faa148b8
-EBUILD py-ubjson-0.11.0.ebuild 534 BLAKE2B d8596f01ee83423118c8a05fc2006f0f77d801dec5de9734f640af4f3dc5a3ce1d5c2d1ca5c31da36086f9ca5b39742d4145f6959a9c0e22b3100f46a367e471 SHA512 c24fb2489235e4691bc8080bf0696a94e54320a5e3b63c01f6ccdd878c9954314f48bb5e99d3e7eeffdcee40eddf67dd71645c26cf2fe9a2e802af442072cd17
-EBUILD py-ubjson-0.9.0.ebuild 461 BLAKE2B 207179e60d31b7c6801bc379a85d017ec20c526163086241bcd8ea4bbbb71b423db2bc675bfb8801333db7bc0e38c28befd3861a7c202e618167e5cf7b9fa653 SHA512 e584775f50d56fcf17fa7a9535e74ddede873fa8594085c5a6a7a5d6c81413b3681fb6a5c8b5868fb161484356bd16ffb79ac6206fe57b2c06f6b1b0bd099e94
+EBUILD py-ubjson-0.10.0.ebuild 429 BLAKE2B 231ee1423911752cbf93bf04e1c05a2eb560eb6f4d667a32f29c7dcde63a2c31275e49fadf2dd2a5d0a7386e47499cc1e851c2d52f7e1609d857798d5e4fff90 SHA512 4ee20cdb90f8fa362a12f5a695c78664e014f9b52605b5e2040f2af2da3b4d982b3f78c0d1998a3efa03adad92821fd322b199a7551457a08840a80e75e34297
+EBUILD py-ubjson-0.11.0.ebuild 530 BLAKE2B 2caa48892143704eba7bb03f3ccc61ebdb5cee6eaa2157a5a81679f35b63a5cf051306b6b8a3964b3f40ddb8e4a75f116f7ee39ffdd1485c7101565d1e928c07 SHA512 0c670c08885f33e67121fed072f966faea9dbecdc5341a6875691509e6483379b25a6ad96177005f43baf7534876fdfe5a451414178f1e4bba0b669bb23b7b91
+EBUILD py-ubjson-0.9.0.ebuild 457 BLAKE2B cdc6159578b7075d4b6461f80c9632a8e2571895e7b58c1820641324b3a5aa30fd5c21843a1ee59e668d57e05d1573244953dd557e7dc4988cadcc0d3665e26c SHA512 0bba258b25dc898aa915e913c9c62f4dc47beadaec2782efc4c3c448d6fc2949ff5741fbacd93783ae51fd318590a3b84dcb9f261ede540fc8eccc17fe10f5a1
 MISC metadata.xml 634 BLAKE2B f799cc627077029b5b5b1009539b5d55a15e581348a3f8a6a93f2661c2e40b15772920d0937d56e620625bfe61902135c228efd18ea93d4538d8cc2f0ee73375 SHA512 900769da6ff1965cd50824ca97dd27baaa5d816f0fdd99851b4063c8dfdf3d469b6a17d4372bc6d16d34245609e76a5e2223b5bf61cb467f8cfabdf775b6da7f
diff --git a/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild
index 809f890b9eb2..09e03c9e87a7 100644
--- a/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
index d7e4b709f1bc..4d3aa9e4e279 100644
--- a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild
index 94be41ad9fb0..87df06633dd5 100644
--- a/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/py-xmlrpc/Manifest b/dev-python/py-xmlrpc/Manifest
deleted file mode 100644
index e90fb8026c7e..000000000000
--- a/dev-python/py-xmlrpc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST py-xmlrpc-0.9.tar.gz 51200 BLAKE2B 4e5ef1ae56815e22610cc7584e8279ff9a153b410f7425476c4cd798afc4f144d62774ba65618e7bffe9ab62ef33704e3ec957c2b45eff25c6e41908d7eae64c SHA512 5a5c0382975ef25183c9b40cf9795e9c87369efc3b11e31845c2a818e3ff88ea753fa923af7d6c493c02008dce4f3bf92c2f719871b4c7d5a24a20a5f2de32c9
-EBUILD py-xmlrpc-0.9.ebuild 571 BLAKE2B c019473e100b1ac247e1c4e827b4b3a01d07f13b81e564e5d903066b1ad0ef178fbe02ea0a25d30a14026c3945a63928fe17f718608a6591c73f5d93edd32ac6 SHA512 66cc354573b78116b863de96787a7d40384de62a8a01e08d44c184e19f479134f404a27f2da39cc2bd7dc637ff46d9da35841aa80b0c2cf7b54d630f724c5c6f
-MISC metadata.xml 319 BLAKE2B ed1e8c7cc7b12e46810f19abf8974c93a545fea0a2d1ae0e712b84e26a3deca50c3ca081da59ae2c0ae132206e6230fe47e277b393d9df78d2936d3d45bed341 SHA512 f1e62bf5fb88853fcd863f8ab103aa0d26e63574ccd71f30ef57159cc0e9b9e98a65385a09b9c2ccf5a22ec775f3ecf467f18400c8be99026fd0d418a811ff10
diff --git a/dev-python/py-xmlrpc/metadata.xml b/dev-python/py-xmlrpc/metadata.xml
deleted file mode 100644
index 27bd92ef205a..000000000000
--- a/dev-python/py-xmlrpc/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="sourceforge">py-xmlrpc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/py-xmlrpc/py-xmlrpc-0.9.ebuild b/dev-python/py-xmlrpc/py-xmlrpc-0.9.ebuild
deleted file mode 100644
index 525070740b45..000000000000
--- a/dev-python/py-xmlrpc/py-xmlrpc-0.9.ebuild
+++ /dev/null
@@ -1,27 +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="Fast XML-RPC implementation for Python"
-HOMEPAGE="https://sourceforge.net/projects/py-xmlrpc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${PN/py-/}
-
-python_install_all() {
-	use examples && local EXAMPLES=( doc/examples.py )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index ef8ecfbcb037..908e75905a06 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -7,10 +7,10 @@ DIST py-1.5.2.tar.gz 189542 BLAKE2B f0c5995121492ebca7bab9e73b7db61edf014be8e7d7
 DIST py-1.5.3.tar.gz 202335 BLAKE2B 6a7ef206bddd641cb5e2fe04966ae93db96a7ff757fcde604f8fd2d36c4a03ce5955c2f445a866dd5cd83026ab2a9fa17feeb0da0df3d40d9746c19d865f6325 SHA512 243c0da94c439163257c525ef00b30fd6d8add5897121ee0b1f19476b50f18823ce2b99a5ab27a9cf47598b538758d0534060123dce0820d2a65d98046548c96
 DIST py-1.5.4.tar.gz 201448 BLAKE2B 3d9f71ba53c8004d4745be984e0a3b81c98f38fdcd7703c39286c53bb167a803aa92b3b0897e407f6ee98d2b870838a27b507ad8e6cceab7b22c8e7229bb6581 SHA512 45424b133be3e78ccab48e74daa6ca6a76fca283bd3a51d50c91e911c509a2c45de4fcc7c8c15f33620d61ee16dfc3969fdd78d8839e96f52897e97b1ad624c4
 DIST py-1.8.0.tar.gz 205096 BLAKE2B e08554fc3e0bae2e2d4515f075991707af29aa5c39e1387e8f8a7dab25e78c7340d389c79936ddea27b1fb0438ebdee8b5e218bbb48c62089d7fb656b1b6dbe8 SHA512 37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b
-EBUILD py-1.4.30.ebuild 1274 BLAKE2B c7341c3f4d7cfded91f44af7d0fd3fc500b57f80b030e68d3babec8fdcb2d53f9ba79937dd4ea65b63efa0786cbaf15911819a4927e31ce1959ea04c38e5c986 SHA512 71f53b56b4774a70c41ee64f60082db143163ee345a4e44384da085baa411e23a242342ba88bfd23938b61fc1d7ca784bace2420da43134449869bda1d853caf
-EBUILD py-1.4.34.ebuild 1342 BLAKE2B 19982fe33c68c6045c70453f63e38364ba705bcd9137aa4fc5633dde43ddd97ecbc859d1957b466e499f656c8f35e5cea1a7c62d4ccb39865ead7c49c53f5832 SHA512 9adb3eaf529960d588de30b30f6cbf3b2512ababba3f4824169465c9ea7ec6a49841b9892a4252355f9693f1ac4864aa9e23226a3c8642bd8fe535f77bf6548a
-EBUILD py-1.5.2.ebuild 1347 BLAKE2B c928c85c5a4d959faf05dd48eff670d464794582fd463ab8eeefa5b2fe854e71f50729822711e8163891c7b167ff775aab5076b500ce516c5c5bb4cfdfc2689c SHA512 cf264f905453cc1e06dda9203d2b233a386cdd1909aa665a0ec1948d4111badc29f5f835a755f0dd38c2b3f984764abe79d421d29556a9aafb80cd9c97bc28f1
-EBUILD py-1.5.3.ebuild 1356 BLAKE2B d74458f2c0d1723566b536c41c47bacaed293b2089a1f738e6dcb022f0aa96518f62e2ba1aeb00b6d38b8ef337b0fb06ed04998b3518953f2f0fa7068772ae93 SHA512 7d6b28bb3b9ff871e18b9e1dd230077309479daddd79602dc63a442ef61caaad0701c34681a8cb36b0ac92eaf31ca5954f758d16e29db291843f53efb0b00286
-EBUILD py-1.5.4.ebuild 1446 BLAKE2B 17ef105867edca750d188a3e6c61ee2c00bf3212702abce41ffde6c3375b0fd1fc813a445555529eda4388b87aff5ebf469f395bea598e5ef9376e0f180b3fcd SHA512 5c5ed11dfcdf9ab023253975b8f622f4123fffbad9d54566bf2d8062d14ad8879eebf1080009f93dc1cd71fed8fc687ba6dbe82d80c258c4a3fdda3a934582f6
-EBUILD py-1.8.0.ebuild 1450 BLAKE2B ca2956a47c4b9e125e9d6f844085ca48a2ea179e6b29a2b70be56ff519e439a9ca6d0bd8c593f5be87ed61e998b211ef73ec15fed66036894670451ac4cde95c SHA512 e117a4c6e36b6cc8baea7fb06685069495b35c7cab341eab1fefd22ecbf61d0c059bd3b1fff815d6564bcaacab45266c61a855355c98aab33c94c10931d050ac
+EBUILD py-1.4.30.ebuild 1265 BLAKE2B 42ed558f682dd2ab342bae0c7ff9f82766171f7933a99c448bf443a58adee09302ee6ad98f6f4f16f2b27bee7180503f675b902c5dad1bda26905950cbc55fbd SHA512 12065a83ac36d9b53796820471eec86b96fa5f56003d22c8bdb52a96e6458d11cf676ee90576257e3d505c21d16722c89d75079f28c910f7058d0962830e9551
+EBUILD py-1.4.34.ebuild 1333 BLAKE2B 832c5021ec114a700df5b4489318c0846efe18b1d5f1e30233583a06446380d372b4d657fc696323f93c8e5ae7f763c1d59f2d18acc72af83525fc8d0f22e3d7 SHA512 1a1304657bc7ba461cdfdd4af6710e281539ba0723ce0a4a239797c651d93671267548f3cd1cb0e14491396daac1fb1168a173614b1bf54ef677b571c781300a
+EBUILD py-1.5.2.ebuild 1338 BLAKE2B d18bcf1b1d13e6f33a1b163ed24a4425602fb7526e5beef9cb7902f859c03762ede3e513d772919352c1c73643820b0cf95e73383b5f995349824d2cca999425 SHA512 ea1d714f6314cc85a11006b4b7ddba839a8e864e73675a3db563ef10b19a889b4c16da4bc4e2af59769b38cff59fcd51a4e6773b9f1a79aecb8e7c8b30c51f82
+EBUILD py-1.5.3.ebuild 1349 BLAKE2B cba0ee130aaad63bb423afaba55ef16d0779af37c5598e535e4af0f8b34a62161aff3dec5e002c5a56161d8301349e5cdaba369bfa23a10361d516cdf9468b91 SHA512 c4d07ae4750af7b90a298b1ee6f73e6be998137734443e40eb3bd24373b704803eda2c5c226a3db53cf7ac76c1b8f50e9345b48e45395cd41cc9b3130d623a0e
+EBUILD py-1.5.4.ebuild 1439 BLAKE2B e2fc602247e121bc37b48216c82b6a33c8881c5b3e234302b9f3f39ef15de6f53b98ec9ee5787c84594eeea37e3f0298d240f3592121ef4762dfab5acdb5ec11 SHA512 91bfcf403b69d81335ad692d83d9170cb6dd3175b31f50012c7a44d2a77f5548e59d76506cb1a4f1d16f72fbfa09c78580d18546e60dd3291584b87d173bc819
+EBUILD py-1.8.0.ebuild 1445 BLAKE2B 2abee08a91d79611c7710f5e98931a53e5ebcf7756f923e97c9fea1dc02ee899211c4e94188013221c29ff8b943c9396e5b48f3b69e4475088de5e0b6fe29c79 SHA512 13b385ee5c4e991bb93d0f6ccb14a43a63f9a2b577e914b590269a5b60b943526dfece65bbe2fb4a474ec034fe483aec618361748ac250707b956aeeb7acbd77
 MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
index fdd19dd3a783..a61aeb055026 100644
--- a/dev-python/py/py-1.4.30.ebuild
+++ b/dev-python/py/py-1.4.30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
index 38d4468a7379..9bc69c32d493 100644
--- a/dev-python/py/py-1.4.34.ebuild
+++ b/dev-python/py/py-1.4.34.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py/py-1.5.2.ebuild b/dev-python/py/py-1.5.2.ebuild
index fd462b5070b3..ed9ba3e15e17 100644
--- a/dev-python/py/py-1.5.2.ebuild
+++ b/dev-python/py/py-1.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py/py-1.5.3.ebuild b/dev-python/py/py-1.5.3.ebuild
index ed2578eea296..7966b74a2e41 100644
--- a/dev-python/py/py-1.5.3.ebuild
+++ b/dev-python/py/py-1.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
index 3348c423dac4..d9062ca7ec76 100644
--- a/dev-python/py/py-1.5.4.ebuild
+++ b/dev-python/py/py-1.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py/py-1.8.0.ebuild b/dev-python/py/py-1.8.0.ebuild
index 4e22b868c12a..5ecc54325825 100644
--- a/dev-python/py/py-1.8.0.ebuild
+++ b/dev-python/py/py-1.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py2neo/Manifest b/dev-python/py2neo/Manifest
index 529c053a1f1c..1c698074d6a5 100644
--- a/dev-python/py2neo/Manifest
+++ b/dev-python/py2neo/Manifest
@@ -1,3 +1,3 @@
 DIST py2neo-3.1.2.tar.gz 100101 BLAKE2B e3339049ce112ce2d952af130aa612ea8c810dafd77f58178bc5bacc743dd384113a56a34f99c1c6ca6f6af07311a608104bb2ce787285ce4d97ca57834ad7e1 SHA512 1f61e1129effe5e77b72955b34726cde668eeb3f3627a1164b40593ad863ae4f19d534f7174742eccae58d770f5e54d907346bef698d98c33e3f3837e70659d4
-EBUILD py2neo-3.1.2.ebuild 631 BLAKE2B f3f7ac2ac239e777cb245a14af46e3027c42a3332c9be22afa934225b110baead7ab2a367e9f74981eefc35061f6cf9dfc749b53f01be8350640cbc27fd7b133 SHA512 d69f4e8d21616e542007795bd7dec7bde8b5bb3bd79934a8cfc81621e687dbd1d582652b65389fb32b5cedc238c2775202b80a7130566bd629bdc3ef6bf2e975
+EBUILD py2neo-3.1.2.ebuild 445 BLAKE2B 54d975cc75914c25ebfde8fe926b5d4170a6eada01063f23234db9d9f9f8a40fb25a5f7558357d4ac9e90b9041939e14019575fe329b4e08e97e1bfc8d368df7 SHA512 732f57f4e4850f3f2cf0943814aa88070af79ce49063ded942a068f983f60a6185d87c91e9320a18e813396dcf82ddab9cb042834854381dfbb99126b1927e26
 MISC metadata.xml 366 BLAKE2B 31803fbd38d7d95cf2d4b34ffd2531748b20e18e0c3137835a7b93b3461717d905bb3b6fe4254370a4495e825470995ad66e458f9764d6ab47a4bc8c0d2600e5 SHA512 90e6f3f7417e4315f6682e22790c807a226fb244e5e42965443b907fa188eeb602f37c7ef57ba451e3e9dc53da95aaf4ebc911a4446a5269307f343593d52159
diff --git a/dev-python/py2neo/py2neo-3.1.2.ebuild b/dev-python/py2neo/py2neo-3.1.2.ebuild
index 6d1fc20736fe..fa0b17ead676 100644
--- a/dev-python/py2neo/py2neo-3.1.2.ebuild
+++ b/dev-python/py2neo/py2neo-3.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
@@ -17,9 +17,3 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_compile() {
-	# https://github.com/nigelsmall/py2neo/issues/380
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
diff --git a/dev-python/pyClamd/Manifest b/dev-python/pyClamd/Manifest
index a65e3e44141f..1d1d2380ca0f 100644
--- a/dev-python/pyClamd/Manifest
+++ b/dev-python/pyClamd/Manifest
@@ -1,4 +1,4 @@
 DIST pyClamd-0.4.0.tar.gz 11177 BLAKE2B cb69c9e1fec936d416a18658a2c3e9df4dc4684cf56c19e8a02ad9929b4c86d9985395c38a8f88f7053f81fe08fa3574c6a206bcc519a9494c2a61caf6b995b1 SHA512 b96e26729e0fe2600572534c0fa22a01238761589f1771e72a054dde9c1b8f122493c83ca04cffda167f7a0e44fbf309bdf76b8fe1de499ec50d56c677923bd4
-EBUILD pyClamd-0.4.0-r1.ebuild 564 BLAKE2B 8eee2817ef1fe29228011225e54617fc59d7a708321f2c9f88a6d5177b8580ce21a46bd25e28baf06b6c94799ed33913a8f130fb0eec85942872d7bed618203f SHA512 478043b276b81481b2138384cf5d596a8fe2ac5e39d1e10c5077765b334a229e094bb5accaa6c4231fffa80642ef81b307f69a8e1c2f14ae18c4142800f2c4bb
-EBUILD pyClamd-0.4.0.ebuild 560 BLAKE2B bb91ea97f5b1b26c22d84ceebf819c161fbd8979a796542283845c31db43836ee74ba937cae0b469a3b8f181f9bf5fb2eb06ff3784e819796b97569271225c90 SHA512 23df1da8b7010e5d73ab73708f8745bd3ba696c3e12ad9c2702efe1de0d26b185bcbf0a86aaa95b7c00fb4e8c38348d792e1b705c9e3338f2cfa541504e4ad6d
+EBUILD pyClamd-0.4.0-r1.ebuild 554 BLAKE2B 4dfb141be54f4fe27f32b943538e8ef3287b6eec53b5a249039c163b7126afb456120ede3ae3cf47692bddca9cbd2ad2f37398d36ed4722aa6728d33ec83c155 SHA512 6ad49cfce596a64d128e0d8f6ef226ecb033ec3eef772f57fab2bb0c6265fbf80d3fa16d4046ee89efabc051d96899ec5b3242bd4113a7c5a01ab5ef1bdaa5e0
+EBUILD pyClamd-0.4.0.ebuild 550 BLAKE2B 7618deced8444f709270e1a713eb375acf3b807370151687a0bbc22a8a369ff81271340f8f6d7f3d035438c84b98e5e234cc77b66a229964b2c454c40e0a1f4b SHA512 1f8352e976eeb233190deadf00f74fbd9f6dff49e4e938c8370cf9bb6e9b7239296290cc5d772d03c3fe3b9519ba5bdcfa7dca2b94e82344340f90d263909eec
 MISC metadata.xml 294 BLAKE2B 5afec3e518db21e9f221a65a2229a99361b4aeab9c53ca3e7b8676f5b3b18b36f0e327b9a1d806c43c1470105da4200e7c46e6a03364c05e5c6970fea9ce6a2e SHA512 7a1d0eeba424c98b65554c534cdadb43674818c8f7d2ec4b366ce35d7cdac32474cc761915285b12ba798cb1c703a74d54dec9779a142c199e9e76c05a370043
diff --git a/dev-python/pyClamd/pyClamd-0.4.0-r1.ebuild b/dev-python/pyClamd/pyClamd-0.4.0-r1.ebuild
index dfcc0c76b5e6..25a3cf8671a3 100644
--- a/dev-python/pyClamd/pyClamd-0.4.0-r1.ebuild
+++ b/dev-python/pyClamd/pyClamd-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyClamd/pyClamd-0.4.0.ebuild b/dev-python/pyClamd/pyClamd-0.4.0.ebuild
index bfe1abf058cf..56bab6b3c117 100644
--- a/dev-python/pyClamd/pyClamd-0.4.0.ebuild
+++ b/dev-python/pyClamd/pyClamd-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyFFTW/Manifest b/dev-python/pyFFTW/Manifest
index 03f87678059f..dde32fead627 100644
--- a/dev-python/pyFFTW/Manifest
+++ b/dev-python/pyFFTW/Manifest
@@ -1,4 +1,4 @@
-DIST pyFFTW-0.10.4.tar.gz 97736 BLAKE2B 4d9b7f301e3455af2bc19daf5eb6dc6549df7d50e614d924310f6b20838ad308342ae02b73eff4c9317faba5ff0c0f6dbb7f1ff2ccf1636c6d963a7222d57298 SHA512 d3743e3834ae753898c1abd49762ce5ec6bf808ececb2db93337698ee6b6f4f92969d6a9e61a88230709095ed1b276e722a92330855f349c60b8a9936ab53680
-EBUILD pyFFTW-0.10.4.ebuild 658 BLAKE2B b7890a7f9d9e9cc33d381570bdd9547014c0aba02311d044736c43f3d9e971da85537e460d69455c00bebcd5f921bf70c9571f789ccdbb56784150a44a1b5c5d SHA512 31e80e3f13da93fbc2bfb56ab62904167372cd7a679505f39352e729b9762bba631b402376cda445729b1753ac11d653c537b3eefee38211ead36ab8a6cabdf2
-EBUILD pyFFTW-9999.ebuild 658 BLAKE2B b7890a7f9d9e9cc33d381570bdd9547014c0aba02311d044736c43f3d9e971da85537e460d69455c00bebcd5f921bf70c9571f789ccdbb56784150a44a1b5c5d SHA512 31e80e3f13da93fbc2bfb56ab62904167372cd7a679505f39352e729b9762bba631b402376cda445729b1753ac11d653c537b3eefee38211ead36ab8a6cabdf2
+DIST pyFFTW-0.11.1.tar.gz 144045 BLAKE2B dcf37653e8d5259d8d74282699eb8d9820694f21e092528105e07a8c7e05fe213d908590560e83a5a4ad993716fcf343ef0780126bbd689ee4ff584a01ee6453 SHA512 88769fd65b1a9ba3228a920226ac82f9b4e0a9023b6b73fffc0dc52a8983197e4406c376e89d00888526cfe3a9abb3e15a576daa51ba5bea8e8302514176763a
+EBUILD pyFFTW-0.11.1.ebuild 658 BLAKE2B 8ff50d03d15fe4090799294933a18dc16356640124be2d509f927aa3b0dbc2607f1ca616afccfbbc5bcc5a07425e82679d3e40ba2d4cc209d54f5ac66b20c58e SHA512 700ee51acfe92983b6fe978dd066a0d457024a5079ec0bbac8aba47080300d6904642c36495ad19f2eebb5adc8cd1212a0e4d123d603fb16c669bbb53796df8a
+EBUILD pyFFTW-9999.ebuild 658 BLAKE2B 8ff50d03d15fe4090799294933a18dc16356640124be2d509f927aa3b0dbc2607f1ca616afccfbbc5bcc5a07425e82679d3e40ba2d4cc209d54f5ac66b20c58e SHA512 700ee51acfe92983b6fe978dd066a0d457024a5079ec0bbac8aba47080300d6904642c36495ad19f2eebb5adc8cd1212a0e4d123d603fb16c669bbb53796df8a
 MISC metadata.xml 424 BLAKE2B 5d75e20623d795582045a8571aa6c9269619d975bc35598fdac89ff2aad062287f2f44d16ea4fee68923d9dabbdb17a58ee0407fda13af733f0085ea81e219a0 SHA512 1a05bf34de75ceabd0207520d44bfe450958e05bcea410ca7a7cc8b7f43170c2842595b800a178c798bf517a2d060b631633e941da382fb39279fc6c81b044e3
diff --git a/dev-python/pyFFTW/pyFFTW-0.10.4.ebuild b/dev-python/pyFFTW/pyFFTW-0.10.4.ebuild
deleted file mode 100644
index a230885802b6..000000000000
--- a/dev-python/pyFFTW/pyFFTW-0.10.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="A pythonic python wrapper around FFTW"
-HOMEPAGE="https://github.com/pyFFTW/pyFFTW"
-
-LICENSE="BSD"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	KEYWORDS=""
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE=""
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-		>=sci-libs/fftw-3.3:3.0="
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild b/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild
new file mode 100644
index 000000000000..c0a80dd82e78
--- /dev/null
+++ b/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="A pythonic python wrapper around FFTW"
+HOMEPAGE="https://github.com/pyFFTW/pyFFTW"
+
+LICENSE="BSD"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	KEYWORDS=""
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+IUSE=""
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
+		>=sci-libs/fftw-3.3:3.0="
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pyFFTW/pyFFTW-9999.ebuild b/dev-python/pyFFTW/pyFFTW-9999.ebuild
index a230885802b6..c0a80dd82e78 100644
--- a/dev-python/pyFFTW/pyFFTW-9999.ebuild
+++ b/dev-python/pyFFTW/pyFFTW-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="A pythonic python wrapper around FFTW"
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index 366a07eae22b..04913639ecd9 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1,4 +1,4 @@
 DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
-EBUILD pyGPG-0.2.ebuild 1127 BLAKE2B 1080ebfd37d6e65e9af7295ac52da9c960d32b761212ca4a005f6222f6b7a30a3b58d78006c72079e0c30df0c4ae24974eaf91cf545f75960725bbbfda6c5d1b SHA512 358a7f8141d1994796229c73aca965d6f98b9509a5b42b0b2330cc258dbafcc8e525a107d77e24afa8d9e9befbdfffcb788cdba41bce0d7d63a3e8240ade9009
-EBUILD pyGPG-9999.ebuild 1137 BLAKE2B 413a02bd7ab8aa9eea83c6b8ae075f7e148d33f95e58485d71fa7db3151bae5f53f842aa2ea60a03ffbce1ed58bf4adeba7317f2220f28533364a14e98c4aa77 SHA512 228b7e18adf0e7d3f10b5432713cd1ee4d329046b141baaa7831fd58ecce010021d71a2d386a265ca5d151bdddf3c451f3678ea8684735b089252fd9d2efe916
+EBUILD pyGPG-0.2.ebuild 1125 BLAKE2B 2f121afe29e3c96caae5b3fedbc6b35002421c1a56660d5ccb4f8645deaabbff16a642396fb7b5960e70c3dd3049e93ed9aebd75ffa5d5ddaecb69e303eb3eba SHA512 9c9cef36a1f7cb8f25500fb735c9d1743f8098f943f14a35444666443ef01b97605f30329f5a6ad17c0d9e17227b592b5b2a64ccf960b83eaeb13ee9919e26c9
+EBUILD pyGPG-9999.ebuild 1135 BLAKE2B 72ee90f9757fe60e75b382b31427f942ffd2a09ec3cadb90d8f9426ebccc73f9460d4d2dc7a7ba67e99e8795669f7bce90d2c6f3b14103e9c30b6b2e8ee03b5a SHA512 725451e20609d475587561f29e882c68f511ad871e22deec4ba6ae7a8adc048af50b88a26080619b29f4023d4e649a8fb351c7cadabec991d7366c33f0764b36
 MISC metadata.xml 566 BLAKE2B 85f26a61bb3bbdc790bbd1f67133d51d522f492f16ee59dca909eb1c33668cd330faa69cd75603e65b41fc3a0ceb760e0a9aace292de9c7fad248273d0c407ee SHA512 03125338286f45302cc2b60257f4650a8bbcb43e8b7d433b6f012e646a2a2ef7f84b994057a93c3fbdeddd94b838a428d1409d965e0d190c937e4e2463ad34fb
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index f447e9fb6117..c39c92e87d4a 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyGPG/pyGPG-9999.ebuild b/dev-python/pyGPG/pyGPG-9999.ebuild
index a5839bdc60dd..c62035eebd34 100644
--- a/dev-python/pyGPG/pyGPG-9999.ebuild
+++ b/dev-python/pyGPG/pyGPG-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyPdf/Manifest b/dev-python/pyPdf/Manifest
deleted file mode 100644
index 06114d99a43a..000000000000
--- a/dev-python/pyPdf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyPdf-1.13.tar.gz 35699 BLAKE2B f9d271861aac69b129c09b5751ecc60ad2aaee6a44366ab553324cd87c1c6ed66e5410be901ab30cae20a544673b3212b7ce41b692e093bacebc11d5f5f55fc6 SHA512 1c00a5a6658054671a396e7b334cbeb9e26dc1e3ad9668e212d05a9483f164931d8bd14fb9ab4d083d7ca3999fee7a2e9eea55b604a06c7d5d0632f0791b7598
-EBUILD pyPdf-1.13-r1.ebuild 383 BLAKE2B 78ed93720e520b74d348a1f152d0bc01fa594b58ccce710fc07677b9785743bca1db02fa36bd2521361d1b47eec637291a560c335603ee69a8c59033a67421bf SHA512 1f6b79b1db17707a93a47617624fc496c85ac4036e73fdbf9a1956e68f0cf0232cb6853e535aca874b156315dbb125e3a2b1c4e904be61ec54dad0d656d50765
-MISC metadata.xml 730 BLAKE2B 0867ece0ce25bd8d6b96ff11befd4f1a1aacdc7c8b3e444d9bd956d507872cd2d0f4b3032768e1a13fbe5e1e5e5cea339d622ae227381ce2b76db820e83baa59 SHA512 0cdece8ac0eca75cc821714ba1ea696cf295609ce991ffd6d1fcc2b1beeaa2b107dedc57eefafda105daf11e3c20469eb3e74e02d8de81e9d2b0ba7f2097ac3f
diff --git a/dev-python/pyPdf/metadata.xml b/dev-python/pyPdf/metadata.xml
deleted file mode 100644
index e7eb74fec115..000000000000
--- a/dev-python/pyPdf/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>grozin@gentoo.org</email>
-    <name>Andrey Grozin</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    A Pure-Python library built as a PDF toolkit. It is capable of:
-    * extracting document information (title, author, ...),
-    * splitting documents page by page,
-    * merging documents page by page,
-    * cropping pages,
-    * merging multiple pages into a single page,
-    * encrypting and decrypting PDF files.
-  </longdescription>
-</pkgmetadata>
diff --git a/dev-python/pyPdf/pyPdf-1.13-r1.ebuild b/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
deleted file mode 100644
index a072b8a05c0e..000000000000
--- a/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
+++ /dev/null
@@ -1,15 +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="Python library to work with pdf files"
-HOMEPAGE="http://pybrary.net/pyPdf/ https://pypi.org/project/pyPdf/"
-SRC_URI="http://pybrary.net/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
index 673a7c2c84e1..8adb4c94512c 100644
--- a/dev-python/pyTenable/Manifest
+++ b/dev-python/pyTenable/Manifest
@@ -2,8 +2,8 @@ DIST pyTenable-0.3.18.tar.gz 115304 BLAKE2B 5f25afc4de6a7ee59c0049b7f91a88b9bc6b
 DIST pyTenable-0.3.19.tar.gz 117429 BLAKE2B 08d6c1e4a718425221013fbfd981f5893cbc7f6c3f09fa22bec1b7aa39019ac6167a06ba35e0bc449803d0f513b44cb1a7731abc87f9c70ac7082837130d3eac SHA512 d79e37be7b28c4cf8b987c77cc527a0697f0045fb3d07b497ed3a2fd926b7dcfda9f94cf891cdd61c84175757dbfad0f62b179e11cf72935845ea2537687af53
 DIST pyTenable-0.3.20.tar.gz 117381 BLAKE2B 7d2259ffdd16a2eb5a536e13a09920f67316f336712f07ea2b797016caaa14ab05686b75349aa99e0b794e922b87cfbb58806511c05a65a43d6e5adb27133ad4 SHA512 5e610fe3c450de6614d3e3483bf1c8e866f497b1d4bdeefed2854f23ded4707981750a0a3f3571f8bda6cf93b129e62f0bad6d55cd0dc58339dfa2429f57d9ea
 DIST pyTenable-0.3.7.tar.gz 76638 BLAKE2B 8ff586e4a77bc4005769e6565622756b798398aac9e8e2335653c1ccc5f9c0525ab9e1261b939c848126b1fa71dcca8ea7887d82972f1d881c7b21e5f61de0b5 SHA512 c1f5d7a916cc79a754160fd056b661bad15ec60d64ab08b91345c2646f0e8047ba629d73b39a4d70d87ad7b1c624d55744cbbe0eb78f6e9df32e50a5c85c38b4
-EBUILD pyTenable-0.3.18.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
-EBUILD pyTenable-0.3.19.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
-EBUILD pyTenable-0.3.20.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
-EBUILD pyTenable-0.3.7.ebuild 678 BLAKE2B 63274d27fa3aad1e82c8aca7fea64ae65acfe670c7546965717fbdec694511e96b789d4a5cd4aa06b23b09c960bb8ed87d859916e13e6378cdbfc294c2d448de SHA512 05c6d303474a25f30dd974616fc0e8977977a1ad498a1b6a9b010717864ef6c2def5c5ffeea05df41acaa5e75d476acbed3f1241913b3b63958dff49a3d9ec6a
+EBUILD pyTenable-0.3.18.ebuild 753 BLAKE2B 19b5ac2d1047efeb57929d3cfcdd6964d77aa2830bb2063a68821d8c7dbe24a6dcfe6db81c94f8fcd9f67ae5b19085c475d69139b2637489e3cbadc8fc0156bd SHA512 8e282adec68df92890c4ffc5a2071cdf2a3afc1748a1c0e6b61cafaa9f925cd4db01f72176cabfee354392d4f4f471eb07d19ddc9f596f24cf3f2f57d0ef96b9
+EBUILD pyTenable-0.3.19.ebuild 753 BLAKE2B 19b5ac2d1047efeb57929d3cfcdd6964d77aa2830bb2063a68821d8c7dbe24a6dcfe6db81c94f8fcd9f67ae5b19085c475d69139b2637489e3cbadc8fc0156bd SHA512 8e282adec68df92890c4ffc5a2071cdf2a3afc1748a1c0e6b61cafaa9f925cd4db01f72176cabfee354392d4f4f471eb07d19ddc9f596f24cf3f2f57d0ef96b9
+EBUILD pyTenable-0.3.20.ebuild 753 BLAKE2B 19b5ac2d1047efeb57929d3cfcdd6964d77aa2830bb2063a68821d8c7dbe24a6dcfe6db81c94f8fcd9f67ae5b19085c475d69139b2637489e3cbadc8fc0156bd SHA512 8e282adec68df92890c4ffc5a2071cdf2a3afc1748a1c0e6b61cafaa9f925cd4db01f72176cabfee354392d4f4f471eb07d19ddc9f596f24cf3f2f57d0ef96b9
+EBUILD pyTenable-0.3.7.ebuild 652 BLAKE2B 4cebdc4457aa5c908e55d6630f7218903ea989f756851d0ed10c6f1541edad6497bc13baf4adb8297b25275f87590b27ad5bc5ffc4c6aec950b59ad1978d813e SHA512 ec8d1abcc16951b78cb6ac95711ac64c03fcf4ec72963b67337aacf5d804672301b35ce7d56cd2f89dfc241a4d5e5f20cc1667ba7b17599ec343ff2d2a6541f5
 MISC metadata.xml 529 BLAKE2B eccd96c558e42e1d453f21c6ce85fdda19c47a9bebd5803cc1f789f311726ff02a41d6da592ad1202a6c970413745a5e272dafa7efb6c2abdbe5361c0d7544b0 SHA512 9c8094a71191ceda8919499eca6c8cebcbb3db0bc668b5d2cc414b1ed0798ad1431fa9e102358deee6eeadd5a11c610d2bd90ade8ace0d4451b4d87ac66a5ae1
diff --git a/dev-python/pyTenable/pyTenable-0.3.18.ebuild b/dev-python/pyTenable/pyTenable-0.3.18.ebuild
index 6aa15ef4bd9c..9218d826d205 100644
--- a/dev-python/pyTenable/pyTenable-0.3.18.ebuild
+++ b/dev-python/pyTenable/pyTenable-0.3.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyTenable/pyTenable-0.3.19.ebuild b/dev-python/pyTenable/pyTenable-0.3.19.ebuild
index 6aa15ef4bd9c..9218d826d205 100644
--- a/dev-python/pyTenable/pyTenable-0.3.19.ebuild
+++ b/dev-python/pyTenable/pyTenable-0.3.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyTenable/pyTenable-0.3.20.ebuild b/dev-python/pyTenable/pyTenable-0.3.20.ebuild
index 6aa15ef4bd9c..9218d826d205 100644
--- a/dev-python/pyTenable/pyTenable-0.3.20.ebuild
+++ b/dev-python/pyTenable/pyTenable-0.3.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyTenable/pyTenable-0.3.7.ebuild b/dev-python/pyTenable/pyTenable-0.3.7.ebuild
index 9adbd9bee7e9..b5dbed40d084 100644
--- a/dev-python/pyTenable/pyTenable-0.3.7.ebuild
+++ b/dev-python/pyTenable/pyTenable-0.3.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index 9b705205f500..c47c4131fac1 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,5 +1,5 @@
 DIST pyaes-1.6.0.tar.gz 28237 BLAKE2B ccce23a58d88582fde56dfe26b774effc00c999c6dd0625e17c5ee7cea7ad1c16c9ab83f452cc4eb47fe88bb7367a37425c1975005249591656bf29ea3af4064 SHA512 32f6bf998b7e200fc73b4852873f60067ac056d646ae87cd8ab55f3ec99c9e26fa2b418b67ba0264a8016311a5f0eb2d40c8e7f917c0715e19f5c3dbf6a8238e
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
-EBUILD pyaes-1.6.0.ebuild 548 BLAKE2B 647f114c7cc7f000fc69e57fd6bc46637649857ab2795e81fce2e35e159ad1b78f60b528687232abffbd814fc9435b3566f71a1693c824738c0709d185818641 SHA512 ff604b02034e403c14fb46c20c94a415b722fc1764b8d44e271637834ef41adc41133ab64648ae6958c0e71c1a0d7079ccbc337d081e04346ecab8a9f987f617
-EBUILD pyaes-1.6.1-r1.ebuild 596 BLAKE2B c1b7c18e3760b76f20a234f5d57e174755555dab1f17e71f8c80f1095b98474022bfe410ef28c7bea1ec4c477675fe290933d9b01b2c34dba238361ee70feb9c SHA512 3ef81b83f311f71ee0e664c7949895961c8f1f8908b3e609dd6893486108d1d0db628f0f1f145e87360d3d8d1831567169c2ae31bf3fd881b37da32f9ea968cb
+EBUILD pyaes-1.6.0.ebuild 544 BLAKE2B f66779e2e67f0e3c9db04c80552f56ec252b2704878291b24d0a83d7967882948351323e6de1259715bfba0fc02e8cf4381d0a73b090ba96e3673235d1959281 SHA512 1e5245c019416358e51cd0f041ce9a1ef77ecede8a1ea804b8a3c642842388b2b0acef8b847e95e33851e5e6f767ddb4dda17f52cc417624ef2d26703aadd3e8
+EBUILD pyaes-1.6.1-r1.ebuild 594 BLAKE2B 2dcfd8fb4a7781335db7fc37a46250b59dd317f78ce6b574f6aa59643426b491954b3d8f4d302251c3d481f3bb2e8fe8c742d5add9a3edc7bb25eb8c87406305 SHA512 cb80ae8d1352f07138cb72721b95a53d6dd922901d3a05c634a649d0e6f387e07f5c9afbec052c5f6f4f6754bd8f13af19e30bbbd09b92e15285df9fafe95e3c
 MISC metadata.xml 413 BLAKE2B 8f8dd44dbba6ea7f5428112866c3dcec032237c42001522d4e520d2565d378cd9e6e48dfb9eb1205f78b5e85c4f9964c44075774807d35188eeac72cd1e67fc0 SHA512 63a02ec94c96d1183a71a1a4676d54c3aa915666a0080edb472e169769669ca5268706189613a370b754c66df8879742e0705bd378c7ba9aeb9bfc0015e7a2c8
diff --git a/dev-python/pyaes/pyaes-1.6.0.ebuild b/dev-python/pyaes/pyaes-1.6.0.ebuild
index 493acab22b91..9d6d55e33405 100644
--- a/dev-python/pyaes/pyaes-1.6.0.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyaes/pyaes-1.6.1-r1.ebuild b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
index 90b8b03fdf57..11179bd2874f 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 15613fd8c608..2c21e93cef35 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -2,6 +2,6 @@ AUX pyalsa-1.0.29-no-build-symlinks.patch 775 BLAKE2B c8669e67fdb72b169db4a1445c
 AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d82384148b805544b6f05e44ec329bef2299b67e46c68401b800761e9dff2141b22bc029a55fd5cf01cd5cdb533303aef91a2bbe0f SHA512 fd3937df5a69326908da942a8926e10221bb85693c863cc06ca363ca8fb07761173d2b51113615970887442d8779b2e9ff468b927b078acf52620e944b71b779
 DIST pyalsa-1.0.29.tar.bz2 39481 BLAKE2B 12644bad27c06ce4782ef3396e883bf1aab521a39d813f11d25f910c99d899b14b618f21568bdc1422a3ed448e7421c8b8129dc19c8fcd0f9c0b595f9fbae370 SHA512 cc885094b020ea6e1735391cfc73a11e29f7d59b1e24a766908d57bec0fae4f490616c59f04eb74648f8ee610e76295a9501ab31a2513e921bcd8b4fdb104683
 DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
-EBUILD pyalsa-1.0.29.ebuild 757 BLAKE2B 0adeb9c5ec8c4f8df30ac683b60243bb5320095f24ecc8c7ca3bfa0a49dcc7d1470ed40b16884ed97d6c10317ea93cad6972774fcfe145d884766b66c6ae6c91 SHA512 338b616ae343f290a09fffdd8e57046a4bd730550ca77247726c70d618d3aa93d0c8c57dc4291192d3fd9cf4a76e581e40129fad5c2482021fdfa3de179fa67a
-EBUILD pyalsa-1.1.6.ebuild 642 BLAKE2B 39b12986575d7101fe9b7dee324635fc50ae962c4b94ba00c9d1b92c0f76dc868d2c97c582f13a050d7b866ec15a31e9e97731a9f39339f5dfac14d2586ba020 SHA512 d9a03dc39be7979a4fc6d84bfc1d262c0976b01c529cc07aa1e94b30529008b93aabedefa106aa4b9202652c97fa215d7a5dba29c4d8665d8ed429ed714c6718
+EBUILD pyalsa-1.0.29.ebuild 749 BLAKE2B ca6af7cf05b488740701967a7bc510a0a62a91d5d60f0ffcab25513d3d4f0b172158c6681799b055dc78733aece802a3cc43f94029b6e183acacb88a28a176db SHA512 ad54758a711119db741e188d7ab3dc61204e5d21b3fc63ea80c637f4594854f692aedc224f7d197c2a3b159bf4f4a7dad0f5b7ccf0ea9d1539a87aa4ad7279d9
+EBUILD pyalsa-1.1.6.ebuild 633 BLAKE2B 4ef4cdfaaa3cf97ea503cdbb78b425123011c893d68472f8b1651675e96244cc8beb952295f034de56ad33aa4ae75d8ba81e4fb368b86a279fd0dbcced7f1d46 SHA512 724f0e3f58e98bcbdad96cf3dde376032c62016d35df22652c07dc42a48823de0bc4cd03b75c950c460fb8f87e60afa9a51fa1c82899b84c7a45920f5b8a3539
 MISC metadata.xml 349 BLAKE2B 743c640ee72b49353f6b3b19b958609dc420f187753d9e63e292c9cdfcb6c183092953dd16c3cf0f91ee13df04b9f12a2a9893a56cacad2c70535730294d6af1 SHA512 ef94ac2639e61234b2140a6dae1683f99c3c8bf564a37d22e54612340a2d0147037e590ef8f6c639914df05684f3d62ebc96a9e2176cab82ba85e5d87171ec58
diff --git a/dev-python/pyalsa/pyalsa-1.0.29.ebuild b/dev-python/pyalsa/pyalsa-1.0.29.ebuild
index a83eb76ea6e9..dd4351a64795 100644
--- a/dev-python/pyalsa/pyalsa-1.0.29.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.0.29.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )	# Still py2 only it appears
+PYTHON_COMPAT=( python2_7 )	# Still py2 only it appears
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyalsa/pyalsa-1.1.6.ebuild b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
index bd3a9dad2414..3284a23d8f81 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyalsaaudio/Manifest b/dev-python/pyalsaaudio/Manifest
index 6d6bfc5392ec..67dcd605ecec 100644
--- a/dev-python/pyalsaaudio/Manifest
+++ b/dev-python/pyalsaaudio/Manifest
@@ -1,5 +1,5 @@
 DIST pyalsaaudio-0.7.tar.gz 124577 BLAKE2B d6a5d29f3d8eee7d016441ecb7dd418a8061484a72dfc8ea4cbdcc102fc70aa12f09ff7136380a50ca5149772d3c0d8d6c2d950a5d26877664371e30fbe90857 SHA512 aea46ebc4a59c791e318e58fa7c307b73ea7e1eafdd6b2055df312e26e8d4868ca582b76dd2f203cb7c632a25e1bfd066f6f9522484aa5db51f404e5f99a38cc
 DIST pyalsaaudio-0.8.2.tar.gz 212747 BLAKE2B 59eeb2fce58d035cb59e36c717cbe6ec367906728c04dc4c4a63d05aaa6eca41fc530b587ad5d3d33161b9f0794ee4e8af0b7efbc1203584564e00efc080dfc6 SHA512 cba4acaf18b74f990547a590da5bbb824398518444cd09cf80d2e4dcb1176fd5469b107c96b3696ca98ef8ef4d1026feb22b01f730b2558c9dd60ee58500d4b5
 EBUILD pyalsaaudio-0.7-r2.ebuild 857 BLAKE2B 7a72a9e04487b3d4a35548d9ec2dfe7f2bb2714769ae1f026c1e373823e6a667abca290cff65cd2ec083b78190b9656fa25799300c06cc3acaf4918ceff4600c SHA512 76a2d792cc216bf39769dde2bc432164083940d2de6ebdc5131f555fdedb474aa34050b41816a9942b71b9bd16bc21dc893115c9e8779d1ae96ef164584dc85d
-EBUILD pyalsaaudio-0.8.2.ebuild 1061 BLAKE2B 50f1994574847e23e6fc38288ddb6025f7fd260708d25e65d61f8228a25eba700139541de9c1578beef88802ea8bfe5bf9da12808efb1b68cf06505e3104aa52 SHA512 e0e9a102a662d3ff86b2958e910cf9a6f26ee3414beb9b1aa23e72ce17667762252ae447a4e3754d7e333fa2c61e5f0c57b6c4612f07fcae6ac3102f1d315404
+EBUILD pyalsaaudio-0.8.2.ebuild 1057 BLAKE2B 474a327395d3bf1e184e02d59ccb443a9c88d52b007fdabb85975cbea6e778e35379844831b128b47fbe886b3b4de96b1c84608bf5ec4195b26e3c74a2b6a54a SHA512 b647a1f4416ee8e87fe77a62d2174a4dd28147c35c5a0f9e3673fd8c751567bf2a490e916f4073463b22328172d24a46a03eaf7edd4207741eab8e20f420b47a
 MISC metadata.xml 370 BLAKE2B 40c4cbfd6dab8c228180d1c80b37ba7989ffc9ba5db1cfba21f0ffe47b013b88ab6206939340e1d0b776f6f54fcbcba410f25b41d07f8c890ffcd4c97dbdf113 SHA512 8f63acae6a202a3d23c7b7c1777db4734de9e630630d679417ff2f9ea1c3595d855c6bb3d21f5ea6e889bc005fb500cdc95c2b7247725ebb14d0dc66dc8e4ff8
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
index d1af75269fbd..86ab4f4bfb56 100644
--- a/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
+++ b/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/pyamazon/Manifest b/dev-python/pyamazon/Manifest
deleted file mode 100644
index 8e3726e4222e..000000000000
--- a/dev-python/pyamazon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyamazon-0.65.zip 4715 BLAKE2B d657fd1b077f1a4962320a3aac502c8f3a223ca426ce6dc7a7e45c6bd0927b6249f5d2bc076a51966a4c021dc76c2b97503fe3ca4b7fcb92f41e3b764298dcd5 SHA512 91da5c766f3c8b24429f92c46d27509e6e7ea4f3fe945920774aad88ab7ccfa9418067d9919f14f7800c767a2c59da52452d9949e7cda46c2626c33db7bd9997
-EBUILD pyamazon-0.65-r1.ebuild 620 BLAKE2B 35aa0827544c292247c4880f18e96dc72d78fad39861f06cae3e7d209eeee7c2fc6e7a8f1a26139872fa2b768c4b05882285208e4c2582e232a5ec733442c944 SHA512 8739ad39128edbdccd5835fb6b24ea42616040c6d762b5723a7b987f0c2b951a32ce1fa9160b21555190cde088dc902daf78aaf2072d03b888da88e9e28c7b0f
-MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/pyamazon/metadata.xml b/dev-python/pyamazon/metadata.xml
deleted file mode 100644
index d0913ee5d1cb..000000000000
--- a/dev-python/pyamazon/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>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/pyamazon/pyamazon-0.65-r1.ebuild b/dev-python/pyamazon/pyamazon-0.65-r1.ebuild
deleted file mode 100644
index ee51a16a8cd1..000000000000
--- a/dev-python/pyamazon/pyamazon-0.65-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A Python wrapper for the Amazon web API"
-HOMEPAGE="https://www.josephson.org/projects/pyamazon/"
-SRC_URI="https://www.josephson.org/projects/${PN}/files/${P}.zip"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	edos2unix amazon.py
-}
-
-src_install() {
-	python_domodule amazon.py
-}
diff --git a/dev-python/pyamf/Manifest b/dev-python/pyamf/Manifest
deleted file mode 100644
index 1e6d8ca4e78c..000000000000
--- a/dev-python/pyamf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyAMF-0.8.0.tar.gz 1651369 BLAKE2B ebe525188dba45595e14025077597bd583c7d807245f6e37908d3d03c52f48c8cd9da2bc36e9914873030fdd99b859d9d4012fbac643a0cb551b39337bcee353 SHA512 1da66afbfb6cc32886a8680b5f610d17b3ad6e5cca338deb7f8d8c5e61f0f4e165b6602936590b4053a3bc98d0e36f898e5913e7d59d8444faf385fa036fd81e
-EBUILD pyamf-0.8.0.ebuild 911 BLAKE2B 043bf35519119793486d4ca632d7550f8bf6f82e2334e3fb0e14d91b872aa218a5d05e87a9aaaf545e3a395d21e1ed8b4741c1ffea6d46c1f58848de2accc52c SHA512 e118f476e27bea531576b2e7f66fac04670cd4b21ecaa69ff01db74000696343273ef722a7558aa3a08462f870a6a3c391da176aa2a7cabbc1838724a58f15cd
-MISC metadata.xml 363 BLAKE2B b3f96a75dddf413e0b03a43dd74bb1712e1646da77e3c0c3b8f39f12120c1126c76b02e72441641910065f0ff55e2e01312bc6f12a2245e146d29ba510393a29 SHA512 0679bdd03e3e056c5687c0cd4269de8a09df3f51aae06a7a0440cb74333b9100cf97dd4070846df0ae03c8a86bff5d2b787c28ca56958efe2e6103c49b6742f3
diff --git a/dev-python/pyamf/metadata.xml b/dev-python/pyamf/metadata.xml
deleted file mode 100644
index f66c29721bba..000000000000
--- a/dev-python/pyamf/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">hydralabs/pyamf</remote-id>
-		<remote-id type="pypi">PyAMF</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyamf/pyamf-0.8.0.ebuild b/dev-python/pyamf/pyamf-0.8.0.ebuild
deleted file mode 100644
index 56c1298452e2..000000000000
--- a/dev-python/pyamf/pyamf-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +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
-
-MY_PN=PyAMF
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Action Message Format (AMF) support for Python"
-HOMEPAGE="https://github.com/hydralabs/pyamf https://pypi.org/project/PyAMF/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "PyAMF optionally integrates with several third-party libraries"
-		elog "and web frameworks. See the README or the Optional Extras section at"
-		elog "https://github.com/hydralabs/pyamf/blob/master/doc/install.rst"
-	fi
-}
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index 13968ea3be1c..37586ef62c21 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1,10 +1,3 @@
-DIST pyamg-2.1.0.tar.gz 752632 BLAKE2B 21fe8a2547d7d47c61c37d5968fd5d8a07d4e6721c2f01e063b33d760e17c37f406140e19a66b51cca6753e8114435183be6e355a97e2f6f2239b725340e085c SHA512 d2574ccb093e6c5bd214c4366ec70bfeae73449f98932a9a4435afb2d606b12a4d479411a88bcac4df500e33dbf635ae981620c584e688abc3f2cca6c6188d4d
-DIST pyamg-2.2.1.tar.gz 753299 BLAKE2B aeca4105bca1525a4c86f110c135c5505c6aa78aff04283a3b43de75c8b639ae5800b5ca9022436d40ca045700daef8a3ca6bb98edb12b223b7b10f8047cfb81 SHA512 b784626fbdfcfa338560763a38bc5ddde07ace5213225d4c876b09be93019e81e641630e88952aab20a6c4f859bf6260730459d247c35d531433df4ecd209248
-DIST pyamg-3.0.2.tar.gz 759301 BLAKE2B 35209f238540604e8a9c013df47f85a5f9dc86eb5372975e8b518352ffe0247f1ac65aaa0822ceff435d20bec87ac8b87d650c00b6b53056c6d5417fa99b0edb SHA512 3075e4e8f042e320c53fed5de7a5ccc7d9698e60cb2f830661468eabc9ba4ebbfff2b2d3254c72c5c376f0e45a59abce7b70a50f6f3a869a75096c33982d1313
 DIST pyamg-3.2.1.tar.gz 765723 BLAKE2B 72c59c0fe93363f73d8ba4c6297920dd1ca8406b048cf0357baec5f2390bdb524421a35ef65e790be45b543e9e162067ee8f8f09327b464a4bc5c9cec368b003 SHA512 6be0dd068417389934ce97813321367920abf6f9f5e94ce2df8bd796edc797cedd492c9153b62466f7d68055a05821447dcf21578ccdfe3294766a49a9ac220e
-EBUILD pyamg-2.1.0.ebuild 688 BLAKE2B f4fc07c33ad4ead47321333a6b8b1db6862b35c39d90102d28ac51d98ee36ad4bee8ba8a34aae2328284c73015847dcafccd38d8e40cf86a4f9f768b7ee5f7c3 SHA512 fa5d25e562af118578cc8ef1abe0c7fdb6c187cfbb6454e799c7159fb129d6c7435f31da1dd7570915b1b5a29c6733c48e672d901b490c81ff991568dd31c3c4
-EBUILD pyamg-2.2.1.ebuild 746 BLAKE2B ad985fc1a5069b32c6dc598380fdcff47904d11fa5dbc72a037186085d84b0d25c69a10e6738c5ac0af7672567f97d06c98c18133a13151725c9bff346b74c3d SHA512 97b0cd3cfae181a1872fc13b8eace6ff35f07497035338f312d5a03eba25180a62a7f77753c443520f2a632610d7eb3c1da413f5dd9bd157af851e11ef8019fd
-EBUILD pyamg-3.0.2.ebuild 699 BLAKE2B 1d82298d2bdde35b70e6f4f17044a6bee8766bab250a7114b64aa9a1e9e14d958026cccc6cacac4f856c3e698551402ec6b379667a718f04604a66252df9930e SHA512 03d8ad2dcc2da93934495d3fc702945cc768d72d375e16a61796bbcb67a3bf2abf6c50d7dd9e755ae6e4daed6df889d00543c3500bb1435ed9ef97d483ccfd76
-EBUILD pyamg-3.2.1-r1.ebuild 709 BLAKE2B 639cdeb774f078c216cd53966ffdb7190e6c3a26a705218f5e36e3e7f23acca11d4d9c2923221009166580e97f552b91e4478e336fb391e70afbbb5a94b9d293 SHA512 a76edf9de1851843dd97976a50720acfdd62ceb7cb61514f7837a859f4520b6dc3ed85a90318eecc29a0927cf8ca2f3a38225d237d929c498807e5602e13b5b8
-EBUILD pyamg-3.2.1.ebuild 703 BLAKE2B ddf12a1478a272ee2a6860362d8af4d212b09210e02766c6a7ba427373051a7f60ff0b6f3c2f99b8f6661922af1a0a91417e0d00243e4527779aca8988fd4ef0 SHA512 6c95f10ebbfc298d600e550e5b2ee82ec99eb294b9a6b1331e14ddf77095c7d5a7d78fa9fcb55ad7468319227f8fea8cfb2e5e89b5947fba6dcc8d247f151e82
+EBUILD pyamg-3.2.1-r1.ebuild 707 BLAKE2B bf7a6b38376db6eca08c4944da95912b39de2e2bfe056fc41aa3298ffed2fc0c3a7c39da9e7470f3962d2d6f5f6d1e9a382b319afdf8c667e88089dc4a1c6d7f SHA512 dba45b0a287780e3263814ae4b81237d09096aef63c20a69386011c3c30bbc4edafcd7e2eca23e584ebabea936209796ba3b71399d903dbe0bca08881a39526a
 MISC metadata.xml 660 BLAKE2B 09f5ba733b9e679cd6435afe0e71a2382498ed2417563031c24dbb9d8630f1ea9ece9d10c2851afb411dec9694b773e495aac10e9cfe4398980f2d0c26efa370 SHA512 9900180bd0de0c9cb26205d2de5674f02405499778124c3fc21a3d3be6e7bd6602f4f619b0b983e95e30ff3f8f37e15ebfc66535db144f92e8f0c6d579e5e6f1
diff --git a/dev-python/pyamg/pyamg-2.1.0.ebuild b/dev-python/pyamg/pyamg-2.1.0.ebuild
deleted file mode 100644
index e1b891e27372..000000000000
--- a/dev-python/pyamg/pyamg-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +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="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.github.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	distutils_install_for_testing
-	cd "${T}" || die # need to be away source directory
-	${EPYTHON} -c "
-import pyamg, sys
-r = pyamg.test(verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyamg/pyamg-2.2.1.ebuild b/dev-python/pyamg/pyamg-2.2.1.ebuild
deleted file mode 100644
index 1ee8327ff82f..000000000000
--- a/dev-python/pyamg/pyamg-2.2.1.ebuild
+++ /dev/null
@@ -1,32 +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="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.github.io/ https://github.com/pyamg/pyamg"
-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/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	distutils_install_for_testing
-	cd "${T}" || die # need to be away source directory
-	"${PYTHON}" "${S}"/test_pyamg_install.py || die
-}
diff --git a/dev-python/pyamg/pyamg-3.0.2.ebuild b/dev-python/pyamg/pyamg-3.0.2.ebuild
deleted file mode 100644
index 85a2cbc86214..000000000000
--- a/dev-python/pyamg/pyamg-3.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.org"
-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/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	distutils_install_for_testing
-	cd "${T}" || die # need to be away source directory
-	nosetests --verbose pyamg || die
-}
diff --git a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
index 0b04a1849796..349233e869fd 100644
--- a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
+++ b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyamg/pyamg-3.2.1.ebuild b/dev-python/pyamg/pyamg-3.2.1.ebuild
deleted file mode 100644
index fe0aa6117392..000000000000
--- a/dev-python/pyamg/pyamg-3.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.org"
-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/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	distutils_install_for_testing
-	cd "${T}" || die # need to be away source directory
-	nosetests --verbose pyamg || die
-}
diff --git a/dev-python/pyao/Manifest b/dev-python/pyao/Manifest
deleted file mode 100644
index 213045646bdb..000000000000
--- a/dev-python/pyao/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pyao-0.82-new_api.patch 1626 BLAKE2B c2d4718b9d39fc0710d511c730d07bb2ec7e721fc6c0e3e47105cdd6dd838818823b2e208c20a72cd119f07ed2202ea68f6182ada29a360284b4aa62767ecaa8 SHA512 f060f764208c0a7015c86eeee5010df78ac3c8eb1b925cc1c08fdedfccf94ec8ddbf635d8f9052034c1cf6ee73c816904e18c945c2e9afca7ffe78147b57d373
-DIST pyao-0.82.tar.gz 15399 BLAKE2B 40f136984831e3f081d2a2274054bf4f5a2387127709065ae4c5c6047610b13c62583851fd2e39ceb746e2d722a1b9069bea7bc6e1670a13f8731ce784f43a53 SHA512 9c2349a2cfd55f64b8edaa6aaf9cecd4589dab3c6fd8a5cc8ad8c9512bf3595c85e0efaa56d6bb2f89410fbfa82081c8c2ea5ea68071e64afdbd8809f70b36cf
-EBUILD pyao-0.82-r3.ebuild 589 BLAKE2B cbc4e4fe7bcd1a475ef1b74f40119447120ec33df18f78628bd51cf0c13e2d28c7e54a7de653111b88922b2c4ff727d483406a7db2f7e3577f982def70e40588 SHA512 329b4ab8a1b849cfbf2a54245f7e6ed5cd8e08736bfb0cb8d764872d201399a7b223f09903c73bd37148166885f55a0f88fea1182aca3fce1f5d13c0c5b565ed
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyao/files/pyao-0.82-new_api.patch b/dev-python/pyao/files/pyao-0.82-new_api.patch
deleted file mode 100644
index 7a77d0ab8a2e..000000000000
--- a/dev-python/pyao/files/pyao-0.82-new_api.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-http://bugs.gentoo.org/314627
-http://bugs.gentoo.org/257550
-
---- src/aomodule.c
-+++ src/aomodule.c
-@@ -4,7 +4,7 @@
- static ao_option *
- dict_to_options(PyObject *dict)
- {
--  int pos = 0;
-+  Py_ssize_t pos = 0;
-   PyObject *key, *val;
-   ao_option *head = NULL;
-   int ret;
-@@ -71,7 +71,7 @@
-   
-   *overwrite = 0;
- 
--  if(PyArg_ParseTupleAndKeywords(args, kwargs, "s|llllO!sl", 
-+  if(PyArg_ParseTupleAndKeywords(args, kwargs, "s|iiiiO!si", 
- 				 (char **) driver_name_kwlist,
- 				 &driver_name, 
- 				 &format->bits, 
-@@ -84,7 +84,7 @@
-     *driver_id = ao_driver_id(driver_name);
-   } else {
-     PyErr_Clear();
--    if(!(PyArg_ParseTupleAndKeywords(args, kwargs, "i|llllO!sl",
-+    if(!(PyArg_ParseTupleAndKeywords(args, kwargs, "i|iiiiO!si",
- 				     (char **) driver_id_kwlist,
- 				     driver_id, 
- 				     &format->bits, 
-@@ -141,8 +141,9 @@
-     return NULL;
-   }
- 
--  retobj = (ao_Object *) PyObject_NEW(ao_Object, &ao_Type);
-+  retobj = (ao_Object *) PyObject_New(ao_Object, &ao_Type);
-   retobj->dev = dev;
-+  retobj->driver_id = driver_id;
-   return (PyObject *) retobj;
- }
- 
-@@ -150,7 +151,7 @@
- py_ao_dealloc(ao_Object *self)
- {
-   ao_close(self->dev);
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- static PyObject *
-@@ -184,7 +185,7 @@
- 
-     /* It's a method */
-     ao_Object *ao_self = (ao_Object *) self;
--    info = ao_driver_info(ao_self->dev->driver_id);
-+    info = ao_driver_info(ao_self->driver_id);
- 
-   } else {
- 
---- src/aomodule.h
-+++ src/aomodule.h
-@@ -9,6 +9,7 @@
- typedef struct {
-   PyObject_HEAD
-   ao_device *dev;
-+  uint32_t driver_id;
- } ao_Object;
- 
- static PyObject *Py_aoError;
diff --git a/dev-python/pyao/metadata.xml b/dev-python/pyao/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/pyao/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/pyao/pyao-0.82-r3.ebuild b/dev-python/pyao/pyao-0.82-r3.ebuild
deleted file mode 100644
index 85282e85eb17..000000000000
--- a/dev-python/pyao/pyao-0.82-r3.ebuild
+++ /dev/null
@@ -1,26 +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="Python bindings for the libao library"
-HOMEPAGE="http://www.andrewchatham.com/pyogg/"
-SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc -sparc x86"
-IUSE=""
-
-DEPEND=">=media-libs/libao-1.0.0"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-new_api.patch )
-
-python_compile() {
-	"${PYTHON}" config_unix.py || die
-	distutils-r1_python_compile
-}
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 567aa7084d3c..d96361d23a8c 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -4,10 +4,10 @@ DIST pyasn1-modules-0.0.8.tar.gz 38776 BLAKE2B fafa28d577932df010f9f62d156d47d41
 DIST pyasn1-modules-0.1.4.tar.gz 65552 BLAKE2B 5eb087cc4d930f39a651e3b8765ee8c4157d8d12c07134cd1297d7b2828052f7c32a7e3bc26702bc51792c2a51f1dcb9a59f7075a7352b94eb8ad582eac7fc22 SHA512 29467aa9fff15b7a7ef999389db01fe696350e29910397f0c867685689a9fa8e5df8128a7703ae0de095804ae20c3759b24656467cec8d086d07a1014ccf5d65
 DIST pyasn1-modules-0.1.5.tar.gz 65690 BLAKE2B 74f3de59a8388527e885e04e4eee56c3d4587e697c980e1f9c23604101f367956bff12dd72a34cd4135b49c968f22b69ed70bbac9989259c1dcbc5bf711a96d1 SHA512 0d7f631fdbcb4c89ccf65b91c106483f536daadd099f5b3fb9b144bbcfcb0619bf818fa18715b8f61baf10699421a1af80f003781a5ebac28ebb4f4e7f677c1a
 DIST pyasn1-modules-0.2.1.tar.gz 65808 BLAKE2B 7c1490926078682dd4392bd6c6dd73f944f55e8b5623fde07a3bbc1f62dcfdd1ea8b5217232cd7e2709997424fd61e276cd5786ba618cebd11cbf8ddb695dc53 SHA512 2d8b6bee59434fee41747625236c1d7eb5081a1cef66aa0a0e9e75869c3641a418d21544edafe65f1808ad0dacd9cf1047dd036ff5ce668bb3bf1f6e662e4a5e
-EBUILD pyasn1-modules-0.0.10.ebuild 887 BLAKE2B 1d7edc96024f2ae83e5637b5f260226d38f2d0e657a583853bfcf621d6ddb2f70040eccdbd98c5d299874aa7b462562dc8f01527af090ddfdfede4c727a31bed SHA512 96243cf112b6752aa3eae0384b6d75ca33f90280f9aae4617d0c3bcc9a801225d87f98aa0dc6c596c9233b8a662488fc6bc84c7640bc19cc6f486f089380f5e2
-EBUILD pyasn1-modules-0.0.5-r1.ebuild 881 BLAKE2B 8f5940292f632736e70785005661546eb3a4cf773a20a9f23bbf234bd3f0aaf87466202005ec8740cb14b25aceb98c99211d0dbfdb20580d408d1db4c7b2f06e SHA512 6620639cf0d82ae29736233d60cc13922073a3c04ebe7f155a00a994221c7d406424ab6437a20e2981610bd0130d411f82b900e6001390b05f085def38158d98
-EBUILD pyasn1-modules-0.0.8.ebuild 877 BLAKE2B 25aa50598172a743b2edd804b5843ccb1e61c78099162c7deb7720af6d03d739ec27152f2eaa61d35f3dadeabe6de46324538c62eff9a101b05eb43da9064886 SHA512 3407c38060705dc9c0f6d34d7857ca9aa91203a09f43f93212dc05c1d2b81c8a9e705f948f99b9b6ec6cb9bb182a879df46a04abb94b93416375e895fcfbb074
-EBUILD pyasn1-modules-0.1.4.ebuild 887 BLAKE2B 1d7edc96024f2ae83e5637b5f260226d38f2d0e657a583853bfcf621d6ddb2f70040eccdbd98c5d299874aa7b462562dc8f01527af090ddfdfede4c727a31bed SHA512 96243cf112b6752aa3eae0384b6d75ca33f90280f9aae4617d0c3bcc9a801225d87f98aa0dc6c596c9233b8a662488fc6bc84c7640bc19cc6f486f089380f5e2
-EBUILD pyasn1-modules-0.1.5.ebuild 822 BLAKE2B b0cb474f06d9ae93fd8a5879f44d7c55154b9fff61e33b1c84ba50b9729ddbed7787c8caf7a8512f9c98a0978bb149c7482979f058f644b0832586aec07e4302 SHA512 c19487d9882235cde9b7a849d1cd8a4aa2f1bf461321136c52ed25d0c466b0490612d59c25c154a1a57e3cd28d729eeccd34f9b37057e02ee6dd45d7bb38365e
-EBUILD pyasn1-modules-0.2.1.ebuild 828 BLAKE2B 5d198b3491985a27554f876b624657df5e0bc48a339ce4dd6ad5c4583891a8d48ed21fd978e8bb3c4180667d7c1300d8ef339b5b196915431aa6acf9fe79a6f7 SHA512 4844f7703cbf059756c733eb492bc644c219ebc39f34a936ee9931fa809eebcfa40e765a302d92c7f90a9d83698e31cb51cdfdd5b792ba7ca2909cb897b19c8c
+EBUILD pyasn1-modules-0.0.10.ebuild 878 BLAKE2B 54aeeba6a9ec4a7bdc32bf0bc6d7215e6e589057eaa5af5f42ad66ca33303809de69dbfbe71dc7ea5e40259bef115b29294e0aebfacd452657bb5adac6cb16a5 SHA512 80b3e0f37a7938ff2d09212957cd633df781ca1365d253cc584e73268248b9d9a2ca2dab404a56efdd8d43cd60fda37b94c300ff541b04af49db238e7998878c
+EBUILD pyasn1-modules-0.0.5-r1.ebuild 872 BLAKE2B 444051110b95f6dc662317d287aaa2501ab495bca42e7947e849b84a23f4c6a09e96aa58251b8a631c06d67adb71ae069d07a6b7a67b29a3f19b715e8eb9598d SHA512 7cac67249d784687ba9e4ac9d7f2db3b38d07e1ee6486761880ec8906982611ea1dcd9a44db8cbe0f426eea85c8b8228065d45d22e9f0408b1e95bd1e5db3e31
+EBUILD pyasn1-modules-0.0.8.ebuild 868 BLAKE2B 481c2a6f0889ef93785ea734c105cd798b2bb392d2ab266a515e6b133e83916c2f0fa894f1d679b83cefdb894b5d5e2fe12dc637b0a7faca7f6be0394cc8e7ec SHA512 e0c706505fe3f6098755c70b7792bcfdf76db7d351469037b1ce6232e51f2836a9bf4cc24d11ff1a32226e67a281408cf673f8e832f79bdfe1144503a6a1bfa7
+EBUILD pyasn1-modules-0.1.4.ebuild 878 BLAKE2B 54aeeba6a9ec4a7bdc32bf0bc6d7215e6e589057eaa5af5f42ad66ca33303809de69dbfbe71dc7ea5e40259bef115b29294e0aebfacd452657bb5adac6cb16a5 SHA512 80b3e0f37a7938ff2d09212957cd633df781ca1365d253cc584e73268248b9d9a2ca2dab404a56efdd8d43cd60fda37b94c300ff541b04af49db238e7998878c
+EBUILD pyasn1-modules-0.1.5.ebuild 813 BLAKE2B 48374dbb5c3a80a1549f9eb748f8f657954c7b47f35370cdf0455635f17cfc58d1eea260f801f86e54e4e6168b7a8d4c9e44c53ebb9006bcd5afbc2260084e27 SHA512 d04674fa1988b49f83b9b07238dc31aaca5c298ef5101e03ab744028c753b57f61c8d77d0de4baaddea7794e93e0af059d8da044c4143c97311f26a76fbe1d56
+EBUILD pyasn1-modules-0.2.1.ebuild 821 BLAKE2B e3d1a2cfcc335b5e8e5ec30aa1b9733f5e1b267f34d3fe75a83ba384c1eba31b3ec79877da6381daa70984cca7637432c2767965a73da4e99d512cf70335ff83 SHA512 231f490caed1166eca8dbb095513d0c0d8de13a6f78e480769dac70d438ee68b8ba6ac6e432035dcaa89d90e504fd5ea9cdd42958ac6815adf7114595e937394
 MISC metadata.xml 380 BLAKE2B 0f3336d6484687fbe0a61cc0c88110e51ae40a8905bb0d5d5b166ed6f8c49964f9abedeb7539cea85118a3d2ab548444680bb89ea57d5e44ff52298e95f557e3 SHA512 0122261838e5789fc995c1e07fd2f8d59fb470d2f525126adb971d7e991e7b7cd76c3fe37ce21949d6ec3fb79af8ccc2d5ce02aab4afda842809916a5c609f15
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
index 8540214ba167..bbeaed1e2bb1 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
index 4f5d068ba0ea..5779cccd4c6f 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
index 9f25b066d122..cb0814a6f918 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
index 8540214ba167..bbeaed1e2bb1 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
index 20e392452a0d..535630bd7c1e 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
index ce76ff6cf0c6..c76154bbfc4a 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index d5f83c7e2288..a285e2518fae 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -2,8 +2,8 @@ DIST pyasn1-0.2.3.tar.gz 100099 BLAKE2B 32e6fa765fc5c217f66ca5618acc132c96fd8adc
 DIST pyasn1-0.3.7.tar.gz 117643 BLAKE2B 66e4987a63139c7af06d6bcdb125ef6f0f46ea5885bbbefae6c76252bd96296abf71a59f6ddc6f196ef78077a62649963c4d9419546f631d93e723dca30bf9b2 SHA512 85735ecb5b83979e51c9f663e2e0dcfbc317ba7e22474d78998f97c40a3487fd06ade9a259d1a4a8de5f4e70e5521a060af127799b92931ceb26abd384ec5807
 DIST pyasn1-0.4.2.tar.gz 118404 BLAKE2B b96135b10eb9b79ac02b21d35df19ee1078a51586eb37832004a1891db0cce305fe3fb65c34f4b05fd1c854f1d708aa59b3e85908df39d54ebb051a2f021ca60 SHA512 30e7cdfd2f7b182081f951bd94169a300a577f95fbfcb4ddb6dc288617b2776265018d246ae0adb649650ee94aab9122a428313d7a61559f97ed7f02b9670709
 DIST pyasn1-0.4.3.tar.gz 118494 BLAKE2B 39c223e09d3996674e7e89306fadec9e47eb39284abafb7ca2b0f988ec420a3986247f6daf69a14bde0a671726c1e615976042228de6869606a3da2c7c65d7fd SHA512 a699b1ef58129860f8448e8c08a7017adfd7ead7844a45197b1026e12760424d20f89a421b3fe8caeab3922448d00a77f717c0a03841c36c6b1d1740b0d9707b
-EBUILD pyasn1-0.2.3.ebuild 1118 BLAKE2B 55bda0571d79d63402f6944ae549b365422e2ccaa958e08482f62c3a1effeffcc91705173c19d0c5bc5ae5c1e8aeae812a5eb8337e490a7b09f0b6b71ef9ed4b SHA512 9f42658c574838cd5c8a06f66ef01c1cd566413fb71abb2259cf8be8139f2a089a1480887bc64fc4923ddd021efee25fd60a5e8e7e8e9ebf08df3420e1470372
-EBUILD pyasn1-0.3.7.ebuild 1132 BLAKE2B eaf0572407114d69ec65412283db55c73fa56d49b8d9088d734cf29a4fbb55ccd716ad38d6f03f67e69ee1273cc40454539136a538a200e6296ebd0bbe33bc2a SHA512 6edc6300e6c7d0ab79e771ce055acb216abd465fc0ce5c6fabe732a4b689e4273ddcd3bbc8c7d3fa48bc6a6eaeeb136cc959c0cd54eb3543ac30783385878a77
-EBUILD pyasn1-0.4.2.ebuild 894 BLAKE2B b081c7e46a916912f0a5a2375c95aaf8b27e5aacd39fb7601b8a0a4e4601ef218c34ebd1159b4d867aaa121fe91f2828b3210d902f4d08fd7a1e09f1e50a8e77 SHA512 8ac213603dde3f5664597fca2f83303639c7c8a02460553f0311081fd2607717bf398dbd9330e214a800a0f0b995562d9dcd759040019415f40557b794ce738d
-EBUILD pyasn1-0.4.3.ebuild 856 BLAKE2B c2cdab06dbc871d99778237b76c43f566ae5a443c31f609146828eb49e71ef865e27d81260316ecef39c124c679f75d488f51b9267ac1e69e1711ff7e75f4392 SHA512 65800513ac9963c1109d9a70775c552060b1738910fc017fb2ad719a49d4a82ff6b9b1c13e71dcea73761e0ac84c14202681514bf590c9aaf30e7b415e9c3501
+EBUILD pyasn1-0.2.3.ebuild 1109 BLAKE2B 5856a3cc7b6da2f54911136de2e626aacbbd38831da5e9cd34cae09cb1ca9279ea48a965d3aa03fa94627d2020d7b735e0a96cc479cd59d18470ebe61eed080f SHA512 0fcbe2c1a8ce171bc6dbb1130c15e5cc9fea15213cbc6f050a17378f012f5cfdcc8026c94e6e13def16fde1e809ae9161510ee73a3703f4d5a5d32a11d538774
+EBUILD pyasn1-0.3.7.ebuild 1123 BLAKE2B 2a9a328f950c46048be70ee26ef6be42791aa0bd088c69bbe65da9db30f1e0061c19bd9357f946e7c1e73de13f53b2a22bda5cd334361e08466d4304ab0648f3 SHA512 74715a44393cd13915094f15b1c63a7e192ad44462b22838dd106a44760f57acc580c1ea19b49c867f716710574a67039b5f8d634595f12fc2899929cd96c243
+EBUILD pyasn1-0.4.2.ebuild 887 BLAKE2B 23abc568a1a32dcb2855bb549bdc2ebdaf0f32adb3ae43628b316d34cafce1b56b7c13fcc533cab52d8485f416566b457dee0b360e7969f0260319b4125ca98f SHA512 fbd85fa726e004f143ef48f1508e440daf65b619ce4631a797d25ad83b7844fba8ec4e6eb7dc26bb68b380808b7ce93179f8b3574a473aea3c72488c30a9e122
+EBUILD pyasn1-0.4.3.ebuild 849 BLAKE2B 7730fa7de0971bab381356e43a87f711eec9abbe76d0a7396a8d92eaa702e9b1b48662512bc95e623d4a8a7368c9a9c6b83a91f790aec14e39637a72e6ed41ab SHA512 ee05350279d72affd819f89e18a1d8683cd059ce353add71bea376b57d57fac7f6e5a6aabf6ce0e035118a55799fbf1a87937436ac3663de2ee8c4133f456274
 MISC metadata.xml 428 BLAKE2B d98ed2c4f984efff51e45c7b57c7decacbde65d59311776fa432b1e771f1bfb97abc6b588b75fd4faca7a3a0bd93aac3504532ef0b4569f8cf9099fa1f69b548 SHA512 b2d4bf181128f2724c450387fd51d971f85fc25ca293b8ebe4029e0559f660a5f5d207db40d683b8d80a6233986a885069ae4e7d82507901151a71f19c6a75ee
diff --git a/dev-python/pyasn1/pyasn1-0.2.3.ebuild b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
index 6f141bef4bee..dd5380fe7488 100644
--- a/dev-python/pyasn1/pyasn1-0.2.3.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1/pyasn1-0.3.7.ebuild b/dev-python/pyasn1/pyasn1-0.3.7.ebuild
index 3728c2865f3d..282c8c3f3322 100644
--- a/dev-python/pyasn1/pyasn1-0.3.7.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.3.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1/pyasn1-0.4.2.ebuild b/dev-python/pyasn1/pyasn1-0.4.2.ebuild
index ab1a31dca4da..00a16beabd76 100644
--- a/dev-python/pyasn1/pyasn1-0.4.2.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1/pyasn1-0.4.3.ebuild b/dev-python/pyasn1/pyasn1-0.4.3.ebuild
index 8b9592f73995..463a2f3d14f9 100644
--- a/dev-python/pyasn1/pyasn1-0.4.3.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index b8655e2afef6..2b07e2016e9a 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,8 +1,6 @@
 AUX pyatspi-2.6.0-examples-python3.patch 791 BLAKE2B ad8130ef64605915b3124dd268bb002e8e4a32c7c3e3e7f4445a5ee7e6a899b1caae25e1ecaff417d2d121063361d3dd983df08bafa666ab03aa6746fa21151c SHA512 7171f77080fed4ef235d1d3380821939d5a41e919b8509db8dcbe211d63b7b390e66389152c7275128cc8372c2a7fd1bdfaf179fc93b8fa62ed76a6edffd11ed
-DIST pyatspi-2.30.0.tar.xz 310672 BLAKE2B 76d51e6ce2f39305bcda8f706b5207738d3a2c0fd7480efb77c4dab8baf8ed6eb71263375ff0c16be0087e47f7f6b5eab99c6fc8992b83bdea6e64c92c381043 SHA512 a7af81bb55dff45d1bceced645f6aeb1adc1fa2a2b61fc39d9e97b6659e474636e5ac1af9923588311e651fee57b5e31a62ea5b2977b341eda43a5a736bf27ed
 DIST pyatspi-2.32.1.tar.xz 310896 BLAKE2B acf4a0211015daf5a19a796de9e267637ae77b2f79f0c6af20bfa5eb5a0fa0d4a62cf23524348299daebd515cccb7a4a1c18226e8c04356ea6439840613242a7 SHA512 6cdddc4275770a4f89e66355e18518f5cbf1ceeee1f27298be1fb5bb8b67676eeeb81ce7f4fbb5ad617573f574e5fd5858d363c77a0e5727d637ae7275429b03
 DIST pyatspi-2.34.0.tar.xz 314060 BLAKE2B 1d2c390c6f110a37e9553b1f1aeba75fa0585beabddb2d6db54aa8fddc671b844e7c670c7fdf9696e3833c8f9619dc8a2ecc364019f14703647e7996033c7dd7 SHA512 61b157f067e23b7a964cf8268f556ad059982f448e436ecb25c96915ecb53918c6ab7b29bfb4e7b85e25e6038e27678fbd3d0bfb61d14a038ab5eaeee1f682b4
-EBUILD pyatspi-2.30.0.ebuild 1297 BLAKE2B 958e2b72ab234d040d3c945a5b535fb7cba118517ae6636fe10facc73d5cd0939c390dd10e6cd90ecc5b73e28489b3ac7097b68e4751cf9c6ec89e9ef7100c4f SHA512 7140f8455184dcdde5d7899fe0716ca9f444807cb74a1d359c9a39da758f3e415ba31a93560e7852b58761e4811a4787599b1832289b117aee27eba99b4331d4
-EBUILD pyatspi-2.32.1.ebuild 1295 BLAKE2B 74df8dd3eea6c1662badc84369d34a0338b02633a89fc8f7e8a0e60139cdb7dc0bedcee14a59e8613d9180320d74847eb999edf31da567c3b9acebbd68ee0c3d SHA512 688940f13912588210d4636893390945cdd3534d2ed48f58e506071e5abb3083acac8cf8bc917ab478ed41a5329e3aa6b706685bd2d4dfa489ea73aa54571975
-EBUILD pyatspi-2.34.0.ebuild 1243 BLAKE2B b557d8986823fc05d41523704231cb79022509c5ee045f8f9d378e58b6a41e75075e62b0617a9264067f10e058322c9ef8ae229485c61cba1b4552e409d57c1e SHA512 abbbad705420dd01cbb376df42eb25ac2ff871464cb6d86c1e3578019e03b49916886f937214ace7013c6409424966dd3836ef83c2a12dc206a3b47a70255df2
+EBUILD pyatspi-2.32.1.ebuild 1291 BLAKE2B 30cdd16b56d4f3509eefea3e4d64e5ba4ba5f3822187375958305dbc2793957e571bbc4b320f465f7bdc76887110e2d0899d7c65f8bc09071c3b9e528212d91f SHA512 1c030bbdeb01d4db71ca5412a04ba1b3a54379672120ac6984507606b25d3b7b4f893286987c4d7ba242df97f2022d6f0f5025562b6c30586f3bf974fed8f4f5
+EBUILD pyatspi-2.34.0.ebuild 1239 BLAKE2B df692da1cb826147401e5673fd3b1fdab3ba497ce21444871e0dee54b934bb1ecb1cc0ca3f44ea58cfa3711ff214f4f4b93c7eb434675e4497c9e537a2020b65 SHA512 0022a6e95ddd89bb28126f65d2ce7c9c799bb61ff9ada9c98f357eed7e4bca4ef21974c0a172eede13f7592c3643c7cee347aa377e8ca2d9a3a6b65db1f5b89d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.30.0.ebuild b/dev-python/pyatspi/pyatspi-2.30.0.ebuild
deleted file mode 100644
index 5a8d07f7a659..000000000000
--- a/dev-python/pyatspi/pyatspi-2.30.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Python binding to at-spi library"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-# Note: only some of the tests are GPL-licensed, everything else is LGPL
-LICENSE="LGPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-IUSE="" # test
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/atk-2.11.2
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/dbus-1
-	>=app-accessibility/at-spi2-core-2.20.2[introspection]
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
-	"${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
-)
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	docinto examples
-	dodoc examples/*.py
-}
diff --git a/dev-python/pyatspi/pyatspi-2.32.1.ebuild b/dev-python/pyatspi/pyatspi-2.32.1.ebuild
index 4ce30738e665..b50265f49f9a 100644
--- a/dev-python/pyatspi/pyatspi-2.32.1.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.32.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit gnome2 python-r1
 
diff --git a/dev-python/pyatspi/pyatspi-2.34.0.ebuild b/dev-python/pyatspi/pyatspi-2.34.0.ebuild
index 11642c0a868e..0b7083708f43 100644
--- a/dev-python/pyatspi/pyatspi-2.34.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.34.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit gnome2 python-r1
 
diff --git a/dev-python/pyaudio/Manifest b/dev-python/pyaudio/Manifest
index f7e5fba5c8ed..28eec1799d3e 100644
--- a/dev-python/pyaudio/Manifest
+++ b/dev-python/pyaudio/Manifest
@@ -1,3 +1,3 @@
 DIST PyAudio-0.2.11.tar.gz 37428 BLAKE2B 18db51a651876135a6afc6c8c60e2221017a311fe1aec10497905bc35b81a73b5e9f27201431566bac3d13bcf582ec12a3b818c51f0e5e70aeb4ad177608461a SHA512 64db5542ee60837c9b07677e146fc7b060ff47c8b1c04cbb575bce79dd3ed4776c201e169ff2860f27dbe9e00a77046ba0cb925b55f7c546f8de46c6df68954e
-EBUILD pyaudio-0.2.11.ebuild 718 BLAKE2B 8febe6e313b03901b8872c2ba027ddcf673c6b3f977f68b9768bbbcf80611c2611e554754459ddd99457ff825c2f137fe877d1f07ffc4073f9880851d3e1a48b SHA512 576075e13031081b06681e472cc39112833b1a549bb67daba63d6f28b81468dac2a7e0c677dc80c3c98a16bd2e66d27167f02fa707d735e8cb355f4466de4a28
+EBUILD pyaudio-0.2.11.ebuild 714 BLAKE2B 82d7592bd87e910748e246203ea6485d88ceab58113919d59812296c0bf2866f961aa0bdd2f7fcbe78a638cf56744f68e817130eb74ddde7a75791d773bbda14 SHA512 374e0868637580728ef7ad424d5cc33dc0c066acf9a8f2965185236b3717d41cb7e061e5f9b68b0df644de4da22c288c882dd1237c22dc2d86dc55762d77c98d
 MISC metadata.xml 472 BLAKE2B cf257d8a4fc3a96c8fb9e8a1d808fb946a04db4c6f26118ffd37550758b1d660450666edcdca81c1ed0238f0999dd3972d96c6f6e2d2a64b63d70b3205b88c83 SHA512 ac14049f5d6ef3c9607bc6457cdd5a1b469187fb01490ec6e6611f5a36d2437c44a1ee65372ab038bf5f3aa4ef572f8a4be284c8c941a89dbddc80c01e9a8c52
diff --git a/dev-python/pyaudio/pyaudio-0.2.11.ebuild b/dev-python/pyaudio/pyaudio-0.2.11.ebuild
index 318d2e7009cb..ad1db440f22a 100644
--- a/dev-python/pyaudio/pyaudio-0.2.11.ebuild
+++ b/dev-python/pyaudio/pyaudio-0.2.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyavm/Manifest b/dev-python/pyavm/Manifest
deleted file mode 100644
index 4688c70b5889..000000000000
--- a/dev-python/pyavm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyAVM-0.9.4.tar.gz 221928 BLAKE2B 4cec66dbe1a3416376fb454ded75acb43091e287c1f1d0c1a2a71eba69cc4233239205e3cb3e2eb4bf2b07880892f5512944440153217c91d8f79b9afea595ce SHA512 95b10a57206dcace2941342015155ad46c6d71fd11963e5516d766067d2074d2302b60d6455b2194034beb6668c2a989cbf88908871d2bacd28ba6433a83a89e
-EBUILD pyavm-0.9.4.ebuild 760 BLAKE2B a80f61bb2ad7bc918a0a7c76d0f7a6f40372289cd802692e7f860cddba4860478b22a24ec7d91b2070971ab37eb25e368f6ae8c941ea54b6e3e650d5e2da7ce0 SHA512 562d6164be4665a95a70c88ed394d8cb84e6392f90a416ad84b04fea455dc9426db1396468375db6f4c1ed059eb832650e8ba726605471a27b46aeb68816a64c
-MISC metadata.xml 500 BLAKE2B cf927688b4a9486a39456407af6f90253d245396e443a16e142bfa7cb88b74ca5cb1f0298abd78fff96f534ef022f06c01f5a084925bca65408f8c709ea1d164 SHA512 65a5ae16d81a63ee6823dd9683d25146c1f92d05d00848dfb097d03bca9ce9d93f4610d4b9e3d7381fca29cb1af32c11a96930b0fe38dd11b4aeaa4bc71b0bbd
diff --git a/dev-python/pyavm/metadata.xml b/dev-python/pyavm/metadata.xml
deleted file mode 100644
index 963a3cab357a..000000000000
--- a/dev-python/pyavm/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>sci-astronomy@gentoo.org</email>
-  <name>Gentoo Astronomy Project</name>
-</maintainer>
-<longdescription lang="en">
-  PyAVM is a module to represent, read, and write metadata following
-  the Astronomy Visualization Metadata (AVM) standard.
-</longdescription>
-<upstream>
-  <remote-id type="pypi">PyAVM</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyavm/pyavm-0.9.4.ebuild b/dev-python/pyavm/pyavm-0.9.4.ebuild
deleted file mode 100644
index a15732b89312..000000000000
--- a/dev-python/pyavm/pyavm-0.9.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MYPN=PyAVM
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Python module for Astronomy Visualization Metadata i/o"
-HOMEPAGE="http://astrofrog.github.io/pyavm/"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/astropy[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/astropy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MYP}"
-
-python_test() {
-	py.test || die "tests for ${EPYTHON} failed"
-}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
new file mode 100644
index 000000000000..e9a22d1ddc4d
--- /dev/null
+++ b/dev-python/pybind11/Manifest
@@ -0,0 +1,3 @@
+DIST pybind11-2.4.3.tar.gz 138789 BLAKE2B 6279ddbc4ca4c8a62eeff684cac789a315eef0ce769258c8152f7073f8bbea39e582ed1ea86fae6878f46c675ed998c314bbaa54a40457287833cc555f5d9692 SHA512 97b6ffb38dbda8021e8265c2052df65785d532dbcd94a2b711306f806eab1a9e2aaf31ea466f13eb5784856ac69e0f4c1dc6d742aa70e5a10ce9ce338e5e9d84
+EBUILD pybind11-2.4.3.ebuild 473 BLAKE2B 9f42d8574d396abc4f529921639b90e12949c5a0505f9d52e9c6e11c8b2afa39e1369251589f9800599aa3f80ba948b1a825262595721be858f15431a13c47fa SHA512 7192cd1555eb1862058f521ede5e22c82bbf0c61044c907c9dbf3c34e5b1d31bab5a7706cbf01e1f71b70de493a5aeea7ccec79b40c510469bf5b2b2e8331a71
+MISC metadata.xml 344 BLAKE2B 43767c7307da199018d865ab629b72a9df002046ae4fb011fc52610d56a0f890af4da32a56ef0ec73f9f20bb6849734cf7bf25b4f961b6e7fa6e61695ac96a58 SHA512 185ed0ca79b66e1ae69b3989366a304efd4cb71845e62bad7cb64b21d3c5761e2fb09b9eb4aa9647a975e2759de1104910ebbf48b6069bb9aee24b129ec3fb3b
diff --git a/dev-python/pybind11/metadata.xml b/dev-python/pybind11/metadata.xml
new file mode 100644
index 000000000000..cd8fa63c07d6
--- /dev/null
+++ b/dev-python/pybind11/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+	<longdescription lang="en">
+		Seamless operability between C++11 and Python
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pybind11/pybind11-2.4.3.ebuild b/dev-python/pybind11/pybind11-2.4.3.ebuild
new file mode 100644
index 000000000000..e652ef877e4c
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.4.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://github.com/pybind/pybind11"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index ccfd9c96f8a7..ce5abfd5de5e 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,3 +1,3 @@
 DIST pyblake2-1.1.2.tar.gz 126693 BLAKE2B 01690ec32a07b7ea59d7d040523ce8cb523f18927044f2d38c0a143a344fde661498e1a4b35a0f161be7b761a324677f80e88c4a0045dc324f0d588997e884f2 SHA512 26297d788208a80c8102602135332d5ee1424711d9c693828af232b5546301c5d144680367a954d8d9765998a23b82046b157b0072fdc63305ff0088feb16e55
-EBUILD pyblake2-1.1.2.ebuild 842 BLAKE2B 8a82e0611bce978f0417dca8f7b558e96c26194be39195d465f8b7fe266290e7785460e074ac35822a0a070b7e903ded5b003522f96e920225a1555e226aaef0 SHA512 ae81de31326f32ff4f8e2c8f1a9d28587b2466d13361794e06239a703b921721ee1ca276b5d1990afe18b4fc4c6687c361b0c5bb0ba8b8f0b9c3da8205f92890
+EBUILD pyblake2-1.1.2.ebuild 835 BLAKE2B c43d773d26cf2a1003f77a9e593b0e66319eb458a799271293f0e9d9a2c06802f81d75b889192259d0118ed83dff20f2927825d4b7a7877d0580dddb401b9310 SHA512 3d51d06cfc5bd0cb60f6ce39790d64f8beb309be7a71923f0a0979bbc673f41beff0fee39ced391b8b7432b1040f79600a336206a48b913088f5a26f4e9df3ed
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.1.2.ebuild b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
index c199bc299aa5..5484f325f2bb 100644
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="BLAKE2 hash function extension module"
diff --git a/dev-python/pybluez/Manifest b/dev-python/pybluez/Manifest
index 72020c182cda..d05c81ec6cb2 100644
--- a/dev-python/pybluez/Manifest
+++ b/dev-python/pybluez/Manifest
@@ -1,5 +1,5 @@
 DIST PyBluez-0.18.tar.gz 74501 BLAKE2B 59ff94cd001f98ef113b0c705c11171ce61e1cb69d2eb596161a3c52764dad64ec2e3f6c5b8c1eedf2bcc463de781e60bcea84413866d10e47e742851bb23f43 SHA512 ddd185ad90f7c6235e25182afccfb586efa0d361f38140f33718dc2d29ca62f3aa68867d075820afffd5ee2fbd306b907b565fbdfdf32f906657f6a3a8c779da
 DIST PyBluez-0.22.zip 109060 BLAKE2B 0bbe0d23b3baf0e76567f2dee8f38ca1460767179df15b52c545e84cd131d23a5ae3752dd7867aae6307fd98f0b2c5a5f55b23c550805e163675526696f559fb SHA512 c166a976d311eba73516aaf86ab42b100a39ebccd3d70f93ccb89f59c12127a857698dcfe4b25f8f689eee12187b5f35ccc8235e36cf012e73df155ba5adfae6
-EBUILD pybluez-0.18-r1.ebuild 582 BLAKE2B 7fb062aac76c37fd06584fa49ae0d2451b34ee9c8802165f056544f355c8e949c2d35a5b3d342c5940d1be0a2b5d8b95524bff72931b865a4a1b37db774aae4f SHA512 d582b4d4875a328bda3e76153fadcdb2b83aafb860d61d0504f4f7213676d8570c48675ab2e94dc803c4436eb52af265592a9ae095f7d469a679a38ef9ca050c
-EBUILD pybluez-0.22.ebuild 658 BLAKE2B f736babbc0dbe5d3ddb45dfd7f890461cbdc18e3a2c6e163c56aebcffd97b88d23866ceb67b9ef46b522667d25a87da1bf55e18ec5ae605d11b06d43ddc9e9c7 SHA512 42abfd8f08c04e4ab4376cd4b98efbd36cf6fdfb89fb3b669592faacba6b010314f291291b8f31ffd7b02df18aaf00d286aca294a1cb38ba0a93a72dc837f4e9
+EBUILD pybluez-0.18-r1.ebuild 574 BLAKE2B 69e35680ca72d37e5162e6130cfc20b94208f77727081ce193de29d6e2478587487e3cc26da3949dff7c3e3fad7b09897fcfc421d7666cc2e0062b5cced20391 SHA512 cfcc9d653c9dda462e742228625dad0526cf2691482b29d03b1b68d8e1397a4575a8840f72c6cfabd2452411d77e02dd9d53576697067e5e7ce56437cf3362fe
+EBUILD pybluez-0.22.ebuild 649 BLAKE2B 59d828aa8280f812fab6c3f448d32030cf35b687a3d36866bb96b30bf25bafbd7b91e63e2da7fbfc80e6572f81c73d1cff79199e7b47ee866e21c733b64ab87a SHA512 311bbcc07e1cf28650a1d0765fb1bef594059dfde58c65df2164d05b73b1d2d9a3c1f30a2bcf88dc8931cfd0a10bd13b7e488e90d932962dbd0d1e1765a8900f
 MISC metadata.xml 614 BLAKE2B 407faf55334b7e516c3d3a43000c2d886e6b02a23908878bf3b40b7ad62bbbfa8d9353f1751ab4b35cfdb5d1af2e695811dbaca58ba1e88722f9acce1cd57b9b SHA512 0a4c61d454bfe82c6491d87c2e807b52b0a223a695359ba6921852b43bc5afd37de44821fe6c65c06c5973d128ef158bb02ad13a1963d1909ae4bddfe64324af
diff --git a/dev-python/pybluez/pybluez-0.18-r1.ebuild b/dev-python/pybluez/pybluez-0.18-r1.ebuild
index 4067c947963b..8227841674e7 100644
--- a/dev-python/pybluez/pybluez-0.18-r1.ebuild
+++ b/dev-python/pybluez/pybluez-0.18-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pybluez/pybluez-0.22.ebuild b/dev-python/pybluez/pybluez-0.22.ebuild
index c5b8121e6702..f0f3ba767b3c 100644
--- a/dev-python/pybluez/pybluez-0.22.ebuild
+++ b/dev-python/pybluez/pybluez-0.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index 9bf5ca8f7c75..346b48887852 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -1,7 +1,3 @@
-DIST pycadf-2.6.0.tar.gz 249411 BLAKE2B 7ddbbcb9355502910ba023589181cbf2d6a104454ca408b604eee031ce79c547213961d10bec4d891e8ddfb00ccacaf1dff1f5bb2646913e9c0bb79abfd4ae72 SHA512 a581b54a8dae088e015d639f14eb46b3c41bdbfdd55b671e79f34b7392af49e3e8dbb2fd85a43e5f8e010cbcdba1d9a330972b5cb6f7f2c5179c00b6f135b4ec
-DIST pycadf-2.7.0.tar.gz 248233 BLAKE2B b2258e0f2027811c35cfcf7063821bd41cc83291d5ace7969fcd48d2e76b4f1a24e8a09b60f996f2edc7e9c37c1578cda40bd2bbd0a1ecbfc889a1d9bbab6ca4 SHA512 093c633c82345154c45c7b8b3dd38ef8101fc6a6aa980a44fc69887409a8facd987a960f403150401a64f2186113bdf5e8c05a3996f3ca4c55f9dc40ab8bfa8d
 DIST pycadf-2.9.0.tar.gz 249992 BLAKE2B d6c1fd12991e24fa747e2f0ba35719faf6b4392334957ead977901f14c8cd98b26f1f93e4b866085e73b7009f66a1ce692e58e478ec501dd4fa988ebf11c2f5b SHA512 da94d778db2fa06b129ae5e85151e301eb68b9ca551fe33f86a9e627cf2c879c71451df140dddbc6d3dfcbac4b6939fce6748711549400713e96165b6673c356
-EBUILD pycadf-2.6.0.ebuild 1751 BLAKE2B ff62fdcb7be3bc803a7d9e62dc3cf0bd7a67ab48bf1015e0201a3de0e8e5ea4383bbc656ed1b14e041bd8824f1838a408f665f0cde07ffdf8cbf6eb940375f2c SHA512 680036823b959b07196fce2549bfbc1d17d18ae034c321917a8a742dd908dd4026ae1501f1d89d3b59edc298e04ba166ff1676243f6b8dac75b233c063646a88
-EBUILD pycadf-2.7.0.ebuild 1777 BLAKE2B a126136aa866c69f105034cf2772271e8b01f1cbaf7d89b734c63782ac0067b612ecb1b000c2eaba2addefebe29a009001af867307069a5e68b79c607fbbed8d SHA512 ca752bffb9b8b51786e111ac93f60c1433b02204ae5944b4ee7a8a3108c12c61634f2bee764a3406e01d95b9a7027a1fe43e9a0105e40b1ab8049bbd88ce8c4a
-EBUILD pycadf-2.9.0-r1.ebuild 1857 BLAKE2B 5e8403c53b9a4c6adbe300ab0759c52b0b44accf8c83c33da9a0040b2bcd5cbd3a20d32104bff8822e7244a58ae27f335005276dd1efd3c530a57c4def24cbec SHA512 bc6e95f23d0c901998f4ddb37c58b893d79eadcc8a14f8a4e6352cdf5695eff4fa1530d2844c0ffbbc23e8e2e198985aa1927bbcf7dd89ccb6d87df03623db04
+EBUILD pycadf-2.9.0-r1.ebuild 1845 BLAKE2B 334d4a07eafc927e5ac3a1ce1d7d83791e55be3f123390ef76aa533feae6b2f3fc05086a8029e242aaef9ea08333758aa468465bb8837404ab58a9691913b2aa SHA512 13d5755670962d08a5391af3c915e1efe04defcfe5c24c98f6457aa92e4b4faa7ab50d0138aae538e32d1ab22f410e2dd15ff5d0920902c505be1cfb8af5297c
 MISC metadata.xml 555 BLAKE2B 87869fe50262ccda3c9f08312ba7d4017e655da6e4e18e31bf8dd99cfb552ea2a1a13cd71793bc00feb6d6d362c19bbc6fcff9779ffa7334db96833548b567dc SHA512 370b97a8a71e49aa553cd6d56b5060074fbfcf366e84672527e8ce49e086c3393198a6afc7d675ce7db71fb8c2abf7bbd4921140da3180f78eee687a2edadf0d
diff --git a/dev-python/pycadf/pycadf-2.6.0.ebuild b/dev-python/pycadf/pycadf-2.6.0.ebuild
deleted file mode 100644
index 9892dce0aad1..000000000000
--- a/dev-python/pycadf/pycadf-2.6.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.org/project/pycadf/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycadf/pycadf-2.7.0.ebuild b/dev-python/pycadf/pycadf-2.7.0.ebuild
deleted file mode 100644
index 0bba6096d5c4..000000000000
--- a/dev-python/pycadf/pycadf-2.7.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.org/project/pycadf/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycadf/pycadf-2.9.0-r1.ebuild b/dev-python/pycadf/pycadf-2.9.0-r1.ebuild
index 1427cbb70aae..50d99eeffcd9 100644
--- a/dev-python/pycadf/pycadf-2.9.0-r1.ebuild
+++ b/dev-python/pycadf/pycadf-2.9.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index d78f89f17a7d..423c523fe413 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -3,8 +3,8 @@ DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff611
 DIST pycairo-1.17.0.tar.gz 192182 BLAKE2B b7a4db8258b03b89878fca6b5e27bb9037b74b1792ded23edfe38a0aa5e9ba5003bbac2c8623a6ace8033960c3199b307dcb689650e21ba2df0d81a36a71b6cf SHA512 c073f04d92c9a577f7dcea8d46335751ebd896a65e682e99e4453877d8ba2cadad4437f4ceb1ce8c05eb87d5757a2bd78ac2549e63e38720f4c9276e6f70bdd5
 DIST pycairo-1.18.1.tar.gz 200610 BLAKE2B 47e707f3481d816e9fcd72d169d7ab9210f746396a45a6c9cdac946b4dca9529515ebe1a288d985eed659ff23488bec2cf3e0fb8d11c160349530871ed05881f SHA512 fef6b0d863d45a182a1ba671ddc4f6cb15745447cdaed3e1efeb05fad97f02aa0a56698517648a942bde263d74e06ad7781bcf487757aeb3b124ef64dc525024
 DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
-EBUILD pycairo-1.16.3-r1.ebuild 1095 BLAKE2B b4ca15b0bc6d3a3bb7abbe30018a0e21450eb53f7e15a55ac62dc8bc2bdf19d3312c4d568079982d60a20284b610224cea4bd400f7b08dba2e43472f3b59c82e SHA512 b6ff919b6c6d0e07ef15bea3047c4de7b60a5e96290033bcaab458b6feea9d12a78ecaae0f7d87ea543af19c6800a5ef1e8f658d3276bfb868ec71a758769a63
-EBUILD pycairo-1.17.0-r1.ebuild 1287 BLAKE2B a601b3cb83208ac266f74465514bf59e0d9821090b4a7ec653b87d6e0ba68cbbd52fe9ed53e58d3aff018fef2b0ab486083930c0585832bd2434c99e93d4e0bd SHA512 f60f1156bfa416cca27c9e2e4b4e347ee961f55c9d1f3f200cc0867012faa1ec9b96bec6c22a0757878c118eb50b93be2b1b1e01711084e7e5c5cae3e902399d
-EBUILD pycairo-1.18.1.ebuild 1279 BLAKE2B 770cbd60301499851cdb926ac4096789a62b5bbcae60791b4a7133da14bcb69ddec383bf6f94959b4ed08a7036d66b88417cdaee69e22106163ab63b888039db SHA512 1fccda063817d842ea2cd90c60698b6daf874fbfce0c14f732af88825e4de1f4517b95cdfe3c048a39f978d9dd1e69ce8fbc2f72dd92002e4783d218f3526ae2
-EBUILD pycairo-1.18.2.ebuild 1432 BLAKE2B e30c800d2677377667edca73310135cf5870f885f81a94032a70eeab0902ccd78b3b2147a8ee7f4e3069165a48ce70ee59f4eed81cd9a97f6d845e36b0d22663 SHA512 2a15b8885303e3c25d271715023706e9549ec23c2a31b7153fb4b878f2837949380fc76ff5c7565ecb7d5d5375dea75ac5c1ae90baa31d4ab513d1645a9a8396
+EBUILD pycairo-1.16.3-r1.ebuild 1088 BLAKE2B 5a49cd65ed9498006d35d95da1b0b11fa103ae6d6dce76b6a98432688e71c949cb716329ca0b518a39966232be62f79ae75cf5067b97ef61c4b42300071c0b85 SHA512 09a27fdb5023c0c9c22412db6f5ba4c1a67c6e283e477858e29083957b32b167970ed9273b82fa91a7d82b5a722cf316aa287dfe88f3d241fdf608fd022fb176
+EBUILD pycairo-1.17.0-r1.ebuild 1282 BLAKE2B 43bc3ce2a4a2f778de08a5402e652631646e924702f667ec934a6c1d9865b34a6ce64c3765da5fd24a5d6d80d834be9639dfbf8b846d2df1e0503368c88cff21 SHA512 9258c2f1c6230f572ca801f0231e1787a03fd3009b25ba877c19c410bf141d6a65062b707d1f11b67b11d50ae3a1914c234b68a71d80f1de8c135b311ed9c308
+EBUILD pycairo-1.18.1.ebuild 1274 BLAKE2B 242e5ab2d3d0a0fd73ccdca6555062c062af8ebde0e5595ac85a7300a78066e85035702b37cffe139ce5c93193e4b164d7c5365f9df616dc0cc9ffb0002e86f5 SHA512 5f8693df36a504cd006efd1442d3a0c8dd940f5164a52b4441f4e08ebef5e5a1de0dee604423ec62fe44ea0a1a9bf2d9de70fcd007ebb9c6494cde347ffb7c82
+EBUILD pycairo-1.18.2.ebuild 1417 BLAKE2B 3b1687a28ad16c06eea5b88f409231aca22bbf1335dc4de5b2dd382e4bd088b9cacbc3f036f310f1280ece8e0098727190d44f9bc23b47a3c0d90c0fcbd2273e SHA512 0f0f60e5797d3c61eccf86c43299f3057a929843f7ad84a565ceb350ad6a1870bc82378e70a3cb97d5abacfb3ec5e4ae13f681338715b24fb955d7b6e4ed2c5b
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.16.3-r1.ebuild b/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
index 2ea372462f00..2393563f129f 100644
--- a/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
+++ b/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycairo/pycairo-1.17.0-r1.ebuild b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
index 629c40ee9f68..de5dc8be4ae4 100644
--- a/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
+++ b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycairo/pycairo-1.18.1.ebuild b/dev-python/pycairo/pycairo-1.18.1.ebuild
index 3d5f803e074e..ea83bd345307 100644
--- a/dev-python/pycairo/pycairo-1.18.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.18.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycairo/pycairo-1.18.2.ebuild b/dev-python/pycairo/pycairo-1.18.2.ebuild
index 9f1cd5f0198d..202b459da436 100644
--- a/dev-python/pycairo/pycairo-1.18.2.ebuild
+++ b/dev-python/pycairo/pycairo-1.18.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 BDEPEND="
diff --git a/dev-python/pycanberra/Manifest b/dev-python/pycanberra/Manifest
index 993a0bc6de74..b9e340cacccc 100644
--- a/dev-python/pycanberra/Manifest
+++ b/dev-python/pycanberra/Manifest
@@ -1,3 +1,3 @@
 DIST pycanberra-0_pre20130515.zip 14945 BLAKE2B ae90cf894cec24aa4d83f69d4a4a8c72303a16171d17e1dd74ee40e2031d87ccb51780e0aa2ef2a8ca0d448f5e7b26c8ed72fdfacceb49967a05c142e8b2a92a SHA512 9836ed3d5aea9a80a3ffd64ef85b327c7dcdf24793c65010f43139c548d7c77522ab32f407930efed89493509efd117c64ec0fbf4d1d6d567d4d34d12d1936aa
-EBUILD pycanberra-0_pre20130515.ebuild 751 BLAKE2B 02cbae9056b2b2a05950cf353d65e413fb1326a73362ea395ae72c1a7a4c6577df5bf09e8d7d1060df26f345f4c0d5cac49ab61f8e2f6a31c58bf11ef0fdd5fb SHA512 0f51d5369a92de73c1f5496517ba218c7e3b19df64ab1b63ba276242d598885e66b21852b91de0b0a19f0d69d1de2172d43f40c486bbef341edb6ef7ff4a0dc3
+EBUILD pycanberra-0_pre20130515.ebuild 741 BLAKE2B bca7904af2884e327f41abce7771cdbb5f2f086953776ce36360d7b032fab82bcd5ba4bf5c167c34608f1976eb554ee4ee6b1b3ce575d155453fc20fc232f0fa SHA512 76279455e4a9bada07bb54f7471ec9216fc046f5549ec15c4c78dfb1a7e660639122434c1c4ee895d3d4459215eb7716ef4d7e06195eca2e91ec59a18d0be16e
 MISC metadata.xml 575 BLAKE2B cb6d8d2df8e9bec22a3d5e64554e27d6b4a684530c62e5736d7a858f765b3701ddc6e88214d263ce1d4d485fc210e0e9f1eeb514a77354b2a0d1eedcb0dd3017 SHA512 19bc4b110c746d4a0e946164d0d0b4f43f0bbabef179596d6a6b6981a443122ff395aa892e6130be75dd92aeccb263c5ef5f7857b91f076158da11db3d6714ca
diff --git a/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild b/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
index 23dd23e04f34..70a12316c67c 100644
--- a/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
+++ b/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-r1
 
diff --git a/dev-python/pycapnp/Manifest b/dev-python/pycapnp/Manifest
index 8432d62f4d9c..585135273659 100644
--- a/dev-python/pycapnp/Manifest
+++ b/dev-python/pycapnp/Manifest
@@ -2,7 +2,7 @@ AUX sdist.patch 437 BLAKE2B 772ad2962f35c470496d2d13ccababa442183e12df2274c207bc
 DIST pycapnp-0.6.2.tar.gz 455092 BLAKE2B 5cdffde0a88398328f6e6908caf4ea2c3626a4a4d47100973a2bb3ae0e10406734354e40afe60f7d4861c79534e05bee6aeecfee4ffeca50ef7e24101ca4a08d SHA512 6656ce4a67e38fc301fb4dd7e80daea3a7551e01589b11c8fd7aea0d4af7638387fecd712c968f549ff596bf64caca6bdf7add20fbd14396a92e49ac3ce47188
 DIST pycapnp-0.6.3.tar.gz 455075 BLAKE2B ad4ccb7e4c83ed686a419ac97652b50853e4377a4d59579fd276b89c60c7f2a0235c73da711288ca4843c5277925dedab8bd4ddaa4d84e8615d9aeed325521fe SHA512 e125af41d46ca32f94cf548b778f554587074ee59993f4a5bf243b66650976c2c219ca572094daa51f3718272dd9e3529e27bda85dc52d2a644ead8e16b6e02c
 DIST pycapnp-0.6.4.tar.gz 531404 BLAKE2B 035e0f37292275af8d5e292cb98f85f3d40ffe6284c0defecdb6d0c79afac97e4570e0042c0be6716a992ab904b844c9f046c5795b97cd8b7dd7625af1b2b219 SHA512 3f2c9d93bcf226fb39ef233b8b5fbc86af73d796986e82b897a571db5d8223fb4f65cc28a8bf4ed57b787b6e5defdca70388ac865f036daff48d6d6f93cbbfc3
-EBUILD pycapnp-0.6.2.ebuild 625 BLAKE2B 7588b80a7c9c20e1dd69219a160f0338d6abb8d6511f72147f0ac7c48e7bccb140d8b74d698d7dea7aa63f4051fa8c3ac89b39303b71d08ea1bd9cfa5d0f2e72 SHA512 6073e1c2a515ab8cc851a069cc636a83c995a51cf72a8ff56e87303c3535fa46a0d74ed4d7c7bc90a93db3eff4de5c9ba6e1a57a8e1b006b65a750408f5e18c8
-EBUILD pycapnp-0.6.3.ebuild 625 BLAKE2B 7588b80a7c9c20e1dd69219a160f0338d6abb8d6511f72147f0ac7c48e7bccb140d8b74d698d7dea7aa63f4051fa8c3ac89b39303b71d08ea1bd9cfa5d0f2e72 SHA512 6073e1c2a515ab8cc851a069cc636a83c995a51cf72a8ff56e87303c3535fa46a0d74ed4d7c7bc90a93db3eff4de5c9ba6e1a57a8e1b006b65a750408f5e18c8
-EBUILD pycapnp-0.6.4.ebuild 802 BLAKE2B a4bffe96f97a93dfa827028ef795bf055f5aab79e1e8c495bdba3c0f1224b2c632e4aa12cbc50aee6056fe7ec1561cd2d474661e69a2da203f798648ae222108 SHA512 53a721e3e3f5474307f009ebf0ae7b82f956aab93628b8776a893de3cd0a3035fe2923689f96ec7341aa8097b91b0b8a24b96c23f60dace9c1ee5c4a458ce920
+EBUILD pycapnp-0.6.2.ebuild 615 BLAKE2B caf4e43e79ad86396ad43f2848446fce9a22fd7a19aabcf653ce9d8e98b9ced6ce5adbbfa37be5e4041ac52af73179eb84d70fd88710c4668b4b2f3feab809fd SHA512 41b218484a5b25a9109b6888a957481aa01e3e008eb8aa81f5db5e21f2b08753b788b0df92ea9df3e7f9116f246da3485f04eab459c179f8d2b36cf6128ec90c
+EBUILD pycapnp-0.6.3.ebuild 615 BLAKE2B caf4e43e79ad86396ad43f2848446fce9a22fd7a19aabcf653ce9d8e98b9ced6ce5adbbfa37be5e4041ac52af73179eb84d70fd88710c4668b4b2f3feab809fd SHA512 41b218484a5b25a9109b6888a957481aa01e3e008eb8aa81f5db5e21f2b08753b788b0df92ea9df3e7f9116f246da3485f04eab459c179f8d2b36cf6128ec90c
+EBUILD pycapnp-0.6.4.ebuild 792 BLAKE2B 1b4406f7795e25eb3e72ef6ecd74b5d54ab38a9bbb9d0c493c66e44315d42b8cfeb1035ab33c42f6d31271b76dff8e97a78acf2c27cda443643baa1e670a3bad SHA512 431d5b23ae020b882ba9c0fb745137592e7b0079e95fde0317cbc74c64382ccfd9abd3e1746dd5f008c7997262cb119e1b7deedc6f4c53ccb4df0dd95bf82e99
 MISC metadata.xml 514 BLAKE2B 0294a7ef4293cdef64d7a287cc824e81b4c22b75ea1e7c2f770c756a56c5c251610e006bf63a28b549527b99b9cc958a5535d43a1c822d9ad724c45f1113e5bd SHA512 10bc088e1650bfa18b74023ba1cd5fd78618051febe89be2756ba0aa706cd695ca98548096392a60a38c94ab168660f347c6e73e2789c32acf7eb927de7d2923
diff --git a/dev-python/pycapnp/pycapnp-0.6.2.ebuild b/dev-python/pycapnp/pycapnp-0.6.2.ebuild
index 61a944bf2e56..852c846d5ab7 100644
--- a/dev-python/pycapnp/pycapnp-0.6.2.ebuild
+++ b/dev-python/pycapnp/pycapnp-0.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycapnp/pycapnp-0.6.3.ebuild b/dev-python/pycapnp/pycapnp-0.6.3.ebuild
index 61a944bf2e56..852c846d5ab7 100644
--- a/dev-python/pycapnp/pycapnp-0.6.3.ebuild
+++ b/dev-python/pycapnp/pycapnp-0.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycapnp/pycapnp-0.6.4.ebuild b/dev-python/pycapnp/pycapnp-0.6.4.ebuild
index 6b3fa80e14dd..c8e8551a477a 100644
--- a/dev-python/pycapnp/pycapnp-0.6.4.ebuild
+++ b/dev-python/pycapnp/pycapnp-0.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index aa3e4f2b57c2..e4a7c4bc6a3f 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,13 +1,5 @@
-DIST pycares-0c831407bc32c6e78a80c5b3d7865ba4c7ac26df.tar.gz 215641 BLAKE2B 36aed2a16138dae5ba05a22418509cbc8cfbf7878d0f27aa2c71110407c5aaaf48445d29ceaa4c4f041f01bb4f4b408c81b2cf5c9f7ba4470dbf4317457f93a0 SHA512 0ef0edd124eef7f897e0bf8b09ffccefaed5ea9eab149cb11c2874087acfb14f15efa6ff6b3967f285b8910adce4b8c228bc69b8ed54c8a6392d3435fc57875b
-DIST pycares-2.1.1.tar.gz 226787 BLAKE2B 26716906e78a3fa16bcbd143f63e633ffe4664706b2230f698ea933c15d057f92a0fedc45927743690e9ef8f84191e40f4215878ff2845fd1fb4bcf91f49b765 SHA512 c3524a49f5abe4222c9371ca269918eecf30a77bd52258187766833b4663be861678ebe6f1cb2f50e824d36e75938162d5528abd5445c477f23fb85c24572403
-DIST pycares-2.3.0.tar.gz 224941 BLAKE2B 9ab59f8f7294930b5ff97c7340c3f64cd039c4b291b7b33d00da85168638cdfc75552508a72afd91db28c4c1b823a018b45c346a3daf8da15d5160fd691b6c4a SHA512 dc707ab0320e03fb20e728e2e2e52e92ed3388afcf19e4553bc2a15c33a129abee39a9bc423edb7be7113d42989286ab8e8ad48699cc7433a6d8823460fd4678
-DIST pycares-2.4.0.tar.gz 214021 BLAKE2B 481d46e9a5726d953d0dcb391a549ba4177e5ac1758a0ecb25bf634b9eb6baa2fbb0544874a78ae46e30a1dd4be8a981f5ebdf1b36cb9aa2e42370074731319e SHA512 7770a2b1fd69bb800019a292e5c9fc1f737b044fb4ca5166ead197da3515f2edac55f947a68f3505c9b404745529287114667d742162c98f2ff84b2c330ef295
 DIST pycares-3.1.0-fix3.tar.gz 217616 BLAKE2B 121d09bd57f60371f9ee7d6f9fec0b0acd9413e86367c278a73dd0b47151e937358bb955f51657c117b72d83de23fc6e530f9418fd6d4c1b96ccb31045096e25 SHA512 d386d1b3434fc7a868783b96a2ef635695efdea62365134287fcaef6e44f75ba266f095c3e667ea1a57940d81d23adbf6e031b8571537a041aba15a36df7a904
-DIST pycares-pycares-3.0.0.tar.gz 215445 BLAKE2B 5543d27ee38d9360b9ee74ebf1c09da15f68873d5cc83b486e61f3d337e733353dde44d64d6a0520525f4876e67d34c91a770f1c9717b7a1036f568c227f6c87 SHA512 bf60549044686accae68ed118e6c5e0da07b1d13473b70f91db85693ebd9ac9e4afb87cba763c667f2f7f487de28759e26a1677023081e94311b547a51bf7451
-EBUILD pycares-2.1.1.ebuild 602 BLAKE2B ce0cda0f1b027951c663a279d280937ac152664938c5e5fedac4db04f660d4d2d33e72f7d51515b2fe01ac2d2ff2374446336a1d44bd12913b671ce471189e9b SHA512 a5b6ee83309f088e87daff32f42a35c7cc0f3938a8f8b46bda754601cdd1d78db20846355fdef7e72e3af576e10af536665d792f2d75f383e228ecd15eb7a7b1
-EBUILD pycares-2.3.0.ebuild 602 BLAKE2B ce0cda0f1b027951c663a279d280937ac152664938c5e5fedac4db04f660d4d2d33e72f7d51515b2fe01ac2d2ff2374446336a1d44bd12913b671ce471189e9b SHA512 a5b6ee83309f088e87daff32f42a35c7cc0f3938a8f8b46bda754601cdd1d78db20846355fdef7e72e3af576e10af536665d792f2d75f383e228ecd15eb7a7b1
-EBUILD pycares-2.4.0.ebuild 600 BLAKE2B dbb606d105ad2e232253b042ecd123ec8b302fa064ada4518e3aaf768954c8de6188341e69bd957e0a67a75e35b4b7f8d312e3f42b56cd5fd9fc345a620c8733 SHA512 ad3623df4d977822230d91d8ed2ab3ee4c5fd92834d904afa7d2599bc9271d77b255eb4112d324bb50c6efea8941766c5857f6386a9eef5ff7ea4fe39896e338
-EBUILD pycares-3.0.0.ebuild 764 BLAKE2B ecdb9ee03850e181ff66dd182c47c7a020bf6a6c6fcad1f18a614bb1c5199bdad38fae9302e83fb00fabdebcdf00dabfdf089193d1f6e737eb3be53613198f57 SHA512 9910861e2edfeb410d09e869788544bc130aed2036c14646d8b67ed48ac23b98854614c5446e46e954742886f2d20c355c20b78095cbb1416f8b6c31e87d33da
-EBUILD pycares-3.0.0_p20190709.ebuild 791 BLAKE2B 7c26bae47661bade0de214a0a309a212d50b3c9cabafc5812d4768edc2c320a116f52fbbeb1e5f5e46cdff5e597cb11456264f370394914265fa59a015986fc1 SHA512 f7a18d40beff2ce2f713f904a4ec806215dfb6e57354b7be6b3213776f412f56a60d29837c12f798af3df4dd644f37459fe655d3736bac06babb847b394aeaa2
-EBUILD pycares-3.1.0_p3.ebuild 704 BLAKE2B 4018b75f6990e73a0c221ae24fc09d284093e7ebe435795d6cc6e6f2798388eba458c0a1e4ab95b36e135aa01bd2ec9d6223f21b7d597732160ab8316db337ce SHA512 217ebf8ded8ff5e9907172c2d2850761670bc1e4e60eb374afa3c5e7bdbacf6625e1149f7377791fe6fe4eb17ab97fd9fe481aedc1397c9b7bf7f4dc48034372
+DIST pycares-3.1.1.tar.gz 216259 BLAKE2B 4481689e418695838c456f1e15b38dcdabadb106f393f52ec21a358b06621650d4e82086ca913abb341b9d8658db1c9ddd0064e68413e71a4ddded070647edfb SHA512 52c529510e3342c0b97ad0b4b9277d1f364da7719817a31a3cfac1f88613ea82f127182eab7c52c2fcd08008c689885bb4196f887a0f81b769f08f7cbf39909e
+EBUILD pycares-3.1.0_p3.ebuild 702 BLAKE2B eca0cd4a2eecc2866064e653f38d79593957a9c0dda199b167513d9994a5918841186289015c5df9e98b8ae9ce2fe8255b02b80156255e972c5a586d9c32f542 SHA512 a86101c9b0a5858669bf62f964b1707a10c99db66f28f68cc3d26111142e9d4c931d41c29d1c67ad9fb6c7eba400d370e9ed890ca601161265d203648a5c3226
+EBUILD pycares-3.1.1.ebuild 660 BLAKE2B fc409b4a538c74ef5bd40d28dd322f7731a95c716607d996ab5e611dd2482bb03531ef427e1a1aa3946417ee995a282c72254f66e9eea321b7999f8813bd7896 SHA512 df7adeb367656003a6a28792e92ea95886be4d3495c654546bdeb24db4530fa74702f15a78b39874b37e5d256f919786f8133c5234295ac9f82c154600b76de8
 MISC metadata.xml 342 BLAKE2B 673fd0795be11f8ede70971b4313e5b9cee3aec6b93ebdc38f4454f0c6bb024c8128598208a6ba9777f52b584a9faf71f386de2e33aad2b96bba1023c6599046 SHA512 fdd177da9082fc650173331be63823ef6eb8dd195c526c3f5e7a38521f3203fc12ca591ff2ac4bba5fa64aa2ac8a9b419385285991696c9f02dd29bede7784a6
diff --git a/dev-python/pycares/pycares-2.1.1.ebuild b/dev-python/pycares/pycares-2.1.1.ebuild
deleted file mode 100644
index 6827684e6fba..000000000000
--- a/dev-python/pycares/pycares-2.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-# uses bundled/patched c-ares
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON:-python}" tests/tests.py || die
-}
diff --git a/dev-python/pycares/pycares-2.3.0.ebuild b/dev-python/pycares/pycares-2.3.0.ebuild
deleted file mode 100644
index 6827684e6fba..000000000000
--- a/dev-python/pycares/pycares-2.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-# uses bundled/patched c-ares
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON:-python}" tests/tests.py || die
-}
diff --git a/dev-python/pycares/pycares-2.4.0.ebuild b/dev-python/pycares/pycares-2.4.0.ebuild
deleted file mode 100644
index 63fae6d646f7..000000000000
--- a/dev-python/pycares/pycares-2.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-# uses bundled/patched c-ares
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" tests/tests.py -v || die
-}
diff --git a/dev-python/pycares/pycares-3.0.0.ebuild b/dev-python/pycares/pycares-3.0.0.ebuild
deleted file mode 100644
index 5581faeccb30..000000000000
--- a/dev-python/pycares/pycares-3.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-EGIT_COMMIT=pycares-3.0.0
-MY_P=${PN}-${EGIT_COMMIT}
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="https://github.com/saghul/pycares/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-# uses bundled/patched c-ares
-RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" tests/tests.py -v || die
-}
diff --git a/dev-python/pycares/pycares-3.0.0_p20190709.ebuild b/dev-python/pycares/pycares-3.0.0_p20190709.ebuild
deleted file mode 100644
index 12865ccb31f9..000000000000
--- a/dev-python/pycares/pycares-3.0.0_p20190709.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-EGIT_COMMIT=0c831407bc32c6e78a80c5b3d7865ba4c7ac26df
-MY_P=${PN}-${EGIT_COMMIT}
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="https://github.com/saghul/pycares/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-# uses bundled/patched c-ares
-RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" tests/tests.py -v || die
-}
diff --git a/dev-python/pycares/pycares-3.1.0_p3.ebuild b/dev-python/pycares/pycares-3.1.0_p3.ebuild
index 40e86c064a53..fba0f774f511 100644
--- a/dev-python/pycares/pycares-3.1.0_p3.ebuild
+++ b/dev-python/pycares/pycares-3.1.0_p3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycares/pycares-3.1.1.ebuild b/dev-python/pycares/pycares-3.1.1.ebuild
new file mode 100644
index 000000000000..d813fe5ac6d7
--- /dev/null
+++ b/dev-python/pycares/pycares-3.1.1.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=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="https://github.com/saghul/pycares/"
+SRC_URI="https://github.com/saghul/pycares/archive/${P/_p/-fix}.tar.gz"
+S=${WORKDIR}/${PN}-${P/_p/-fix}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+# uses bundled/patched c-ares
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+BDEPEND=${RDEPEND}
+
+python_test() {
+	"${EPYTHON}" tests/tests.py -v || die
+}
diff --git a/dev-python/pycdf/Manifest b/dev-python/pycdf/Manifest
deleted file mode 100644
index 65612d3f2a37..000000000000
--- a/dev-python/pycdf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pycdf-0.6-3.tar.gz 167762 BLAKE2B cbdcad6d4348951dd842710f58e276e9d1a87a4f2fb9aeda1df1c5347d51197708797f16e8a71d634296cf94190aa6cb5616467db248bdc568e992c0b62ed787 SHA512 c18ecb46fa3888ab2fdd3449fcc599a22e371996faa273aa67f137a960ad74f8eb40472174a9034ccecc86ddaea14d1955b4cfdd16c8b64d2fd54cc42a75ad86
-EBUILD pycdf-0.6.3-r1.ebuild 717 BLAKE2B 6ee2ced74cfe86024279dc2fb721ccfdaea759dfb085375965406070bd642cb3fdac86b37618b2356d30d1bea53aa505476f81bd77693164c42cbf0a9381c4ce SHA512 1425b39f34da66ed576bcf45df4772c598da1629c357a23bd534c980fb58e32a682584510dee4202ec482ae512822b92ba51e2910d7d3a733242e62f60454349
-MISC metadata.xml 318 BLAKE2B e67ec40b4f522082bd43be75a6461eaf34828284036fbe99e661eabe2435a1ab3572c986d72ef13172959348e74d390087a2c391ca8d4c454b103fa92b1a9267 SHA512 7bd5695f9efa3c1b03f5dcc08e96f425255000b0638fcfaeb96e1b7096df8acda147e6f601fe99f5bb20aacd2a440eb055fc9c318aca5a5535ea9d4a42fad40f
diff --git a/dev-python/pycdf/metadata.xml b/dev-python/pycdf/metadata.xml
deleted file mode 100644
index f9bcbfa7e57f..000000000000
--- a/dev-python/pycdf/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="sourceforge">pysclint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pycdf/pycdf-0.6.3-r1.ebuild b/dev-python/pycdf/pycdf-0.6.3-r1.ebuild
deleted file mode 100644
index 74bd9b0ce220..000000000000
--- a/dev-python/pycdf/pycdf-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,31 +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
-
-MY_P="${PN}-${PV:0:3}-${PV:4:1}"
-
-DESCRIPTION="Python interface to scientific netCDF library"
-HOMEPAGE="http://pysclint.sourceforge.net/pycdf/"
-SRC_URI="mirror://sourceforge/pysclint/${MY_P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/netcdf-3.6.1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	use doc && dohtml doc/pycdf.html
-	dodoc CHANGES doc/pycdf.txt
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pychart/Manifest b/dev-python/pychart/Manifest
deleted file mode 100644
index bcf7b82ddb00..000000000000
--- a/dev-python/pychart/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST PyChart-1.39.tar.gz 115908 BLAKE2B f7c226c20716516da33f54e6b75238bebb8dc3d20ec5463ec347c170d4fe13f7ea506fe4dd2418ad4962e83d4903d7e337a1683f54f4b82672de0fcebfe1d46b SHA512 b6af817906610f3907508b72e2e95a68893f65f132c7964c803dcb88ca2e999b57f89ead1c6a66e28796f1ed2df512d16513d093fc8de1505f678edda3e41532
-DIST pychart-doc.tar.gz 302416 BLAKE2B 12297515da76cfb9a961bf501ceef4b1e0fb67824be2d81a155bf877cfa053f2f81838479cd727ed4e60d52e8f5bae777550dffd53759197a3ffe3341af02288 SHA512 9a81fea73b37fb8decc1279cc0e52abbdc9f98c7d73c98c9c7d7d2d27e0bf33fa4eb199dc4a09488d5f109a202b23fe950d58e1140f29a720cd14190dff10530
-EBUILD pychart-1.39-r1.ebuild 713 BLAKE2B 342d4008ff5765bed45f40a2d6cb6bf8953fefeea3492d491f98fbb3de29badc2a3150d1cfdb35ea68afe83a7db153a8a9563a16d2a303eadb8d1c615f9f9e1d SHA512 348f7a718127c08854f3e9915d6bd81f400292d95e23aeea24dd4cce15f292c812db985e7f9ef2e77563436e882254a5375ae0d7a6c27faeaa9122f590ff75dd
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pychart/metadata.xml b/dev-python/pychart/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/pychart/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/pychart/pychart-1.39-r1.ebuild b/dev-python/pychart/pychart-1.39-r1.ebuild
deleted file mode 100644
index 1aa68ac64277..000000000000
--- a/dev-python/pychart/pychart-1.39-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-MY_P=PyChart-${PV}
-
-DESCRIPTION="Python library for creating charts"
-HOMEPAGE="http://home.gna.org/pychart/"
-SRC_URI="http://download.gna.org/pychart/${MY_P}.tar.gz
-	doc? ( http://download.gna.org/pychart/${PN}-doc.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
-IUSE="doc examples"
-
-DEPEND="app-text/ghostscript-gpl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${WORKDIR}"/${PN}/. )
-	use examples && local EXAMPLES=( demos/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pychecker/Manifest b/dev-python/pychecker/Manifest
deleted file mode 100644
index 99256960bb1d..000000000000
--- a/dev-python/pychecker/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pychecker-0.8.19-create_script.patch 460 BLAKE2B 049cb432db4f7bd872a4161421c7129423c93e2738efe3d6efc041908e2f995f30753f4fdfdecbbb2e7c4f22abbec007441fa0403e9b91e77303dc816222299f SHA512 88bc5116b3773130af02598fcaa211678c9577eac7168819f2b41537a2579881e6145614fc222907cc432efdb99c068f13e78826377a84a2420eda1c355a611e
-AUX pychecker-0.8.19-version.patch 473 BLAKE2B 2c400973032de8fed6ee816a8bea7cba278eb15b4704d943a8a39cba5b07687666f53cac43b30d1a8d060e8dc4a785b5b172df487f75369db5be0dd92c92b121 SHA512 3cfbf2370a02c0462013d0eddc5c99246b27fc2cb95f7361e7f991ddd9052c8093816088272171ada0d3f20bc814d9d6352deec7de2013a527e3f36ca3418845
-DIST pychecker-0.8.19.tar.gz 99783 BLAKE2B 9605cab5263227794c5184de7a569f3b49d93165af6d886221e7832555cb62b3ccc28fbaca0481e9b56e37bd9d9414ea5edd18fbd3b0447fdff24f570e25f020 SHA512 50f3d87a0ea80235761eb0ff078dc7e815848c356cea2bdf12bb699edc6d3301252acebaf6ab6aa961849d740dc38bc9b6deb7cfe956e7fff83a104750adfa18
-EBUILD pychecker-0.8.19-r1.ebuild 1041 BLAKE2B 38b34b875211ebbebde2e842333432a36b7b0b82c7300e27b96b6a469e8dee4d9d202d07cd8f77afc7e0f456c344146940d2aa35ad6cd360cddc107270c7d6b3 SHA512 a0f2d6bb44dc36a44c3e87a12da473696bb9d0bb0b6a7c49f9e27488b924699427628e80dfca85dfec86eca27e927e70076c561c8fa2c793457ef67083c71eaa
-MISC metadata.xml 319 BLAKE2B b7837758e07a55453d3fd30b6e2101e513347b7742a10c362e9d64fb4055418c6db9eac0ce15d52a76f4570dc786b88bc45892db35ddd86442398582de8ad82b SHA512 46b9b45d2fc905a2b5a31741e249ead92c8b43eb312bd3d379d6946171858fc86dba75a8ffff71405f50367624ae9940fcca2ed069742e44fc2e2fa6c5c79124
diff --git a/dev-python/pychecker/files/pychecker-0.8.19-create_script.patch b/dev-python/pychecker/files/pychecker-0.8.19-create_script.patch
deleted file mode 100644
index ca4367591174..000000000000
--- a/dev-python/pychecker/files/pychecker-0.8.19-create_script.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -221,7 +221,9 @@
-          script_str = "%s %s %%*\n" % (sys.executable, checker_path)
-       else:
-          script_str = '#! /bin/sh\n\n%s %s "$@"\n' % (sys.executable, checker_path)
--      open(script_path, "w").write(script_str)
-+      script = open(script_path, "w")
-+      script.write(script_str)
-+      script.close()
-    except Exception, e:
-       print "ERROR: Unable to create %s: %s" % (script_path, e)
-       raise e
diff --git a/dev-python/pychecker/files/pychecker-0.8.19-version.patch b/dev-python/pychecker/files/pychecker-0.8.19-version.patch
deleted file mode 100644
index 9fe8490175a8..000000000000
--- a/dev-python/pychecker/files/pychecker-0.8.19-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur pychecker-0.8.19.orig/pychecker/Config.py pychecker-0.8.19/pychecker/Config.py
---- pychecker/Config.py	2013-02-01 12:06:10.669695876 +0800
-+++ pychecker/Config.py	2013-02-01 12:06:26.238695001 +0800
-@@ -33,7 +33,7 @@
- 
- _RC_FILE = ".pycheckrc"
- CHECKER_VAR = '__pychecker__'
--_VERSION = '0.8.18'
-+_VERSION = '0.8.19'
- 
- _DEFAULT_BLACK_LIST = [ "Tkinter", "wxPython", "gtk", "GTK", "GDK", ]
- _DEFAULT_VARIABLE_IGNORE_LIST = [ '__version__', '__warningregistry__', 
diff --git a/dev-python/pychecker/metadata.xml b/dev-python/pychecker/metadata.xml
deleted file mode 100644
index 9b5e980c8695..000000000000
--- a/dev-python/pychecker/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="sourceforge">pychecker</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pychecker/pychecker-0.8.19-r1.ebuild b/dev-python/pychecker/pychecker-0.8.19-r1.ebuild
deleted file mode 100644
index 9fe47ad621f2..000000000000
--- a/dev-python/pychecker/pychecker-0.8.19-r1.ebuild
+++ /dev/null
@@ -1,43 +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="Python source code checking tool"
-HOMEPAGE="http://pychecker.sourceforge.net/ https://pypi.org/project/PyChecker/"
-SRC_URI="mirror://sourceforge/pychecker/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DOCS=( pycheckrc ChangeLog KNOWN_BUGS MAINTAINERS NEWS README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-version.patch
-	"${FILESDIR}"/${P}-create_script.patch
-	)
-
-python_prepare_all() {
-	sed \
-		-e '1d' \
-		-i pychecker/checker.py \
-		|| die
-
-	# Disable installation of unneeded files.
-	sed \
-		-e "/'data_files'       :/d" \
-		-i setup.py || die "sed failed"
-
-	# Strip final "/" from root.
-	sed \
-		-e 's:root = self\.distribution\.get_command_obj("install")\.root:&\.rstrip("/"):' \
-		-i setup.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pychef/Manifest b/dev-python/pychef/Manifest
deleted file mode 100644
index 4fb03756b8a4..000000000000
--- a/dev-python/pychef/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyChef-0.2.3.tar.gz 21082 BLAKE2B fb0502b931588e02f67fd5f21e61dfe1c0171d21896ef00185196659d85134ba68f010c18d5ed698ff9a3d0d96e31fcd8f337f3b1002fb79184a20545a4775c5 SHA512 e8e0f3045f23032d8fe3169e9ff66cb3ce78ac1a9910d35c7399eeb252b474668c11dde4205689608c073b95f380738bf34b47d32ee5d24edb61fe3fd1674790
-EBUILD pychef-0.2.3.ebuild 628 BLAKE2B 685add9fbf9b4b470b1cc62fd26ff99e9cd949c52b11868a6e765da6047b47bca7117416c2c924b013d698b44cc5b544dbf24a3c12e83c296e9958ce00ecfe0b SHA512 f165e5b1cf0fb03b6492b9be8f3d7ba2c9f658c80be68235c48e3f1e51ce6a9e391027b16fadc6f4526827c32d589e8ca12b1b98b477b95478c7fbcd6c1b585d
-MISC metadata.xml 603 BLAKE2B 21998daf62d22c327f6f013c207003c738f7a9c801acdbc59fa073489c18e88561d52aa548becee09111d03c4d7c33f5cbe55b9fc037d6c18763b3a252b77822 SHA512 40d133c9789df0766a9feca76f3515b74ccb82f8e2cd63d8b1f929275985606d17d890cb2e1b1798a1953fca430114fe186ce40019a1a338d5becffd882928ee
diff --git a/dev-python/pychef/metadata.xml b/dev-python/pychef/metadata.xml
deleted file mode 100644
index 1474fde779fd..000000000000
--- a/dev-python/pychef/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    A Python API for interacting with a Chef server.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">PyChef</remote-id>
-    <remote-id type="github">coderanger/pychef</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pychef/pychef-0.2.3.ebuild b/dev-python/pychef/pychef-0.2.3.ebuild
deleted file mode 100644
index 13c1b4aa8744..000000000000
--- a/dev-python/pychef/pychef-0.2.3.ebuild
+++ /dev/null
@@ -1,27 +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="A Python API for interacting with a Chef server"
-HOMEPAGE="https://github.com/coderanger/pychef"
-SRC_URI="mirror://pypi/P/PyChef/PyChef-${PV}.tar.gz"
-S="${WORKDIR}/PyChef-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/versiontools[${PYTHON_USEDEP}]
-		test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/pychm/Manifest b/dev-python/pychm/Manifest
index c2a387ed54af..751e09cadcbe 100644
--- a/dev-python/pychm/Manifest
+++ b/dev-python/pychm/Manifest
@@ -2,6 +2,6 @@ DIST pychm-0.8.4.tar.gz 28803 BLAKE2B c6b66c83b1bd5b20280cb60636ccf2780f665fd589
 DIST pychm-0.8.5.gh.tar.gz 23539 BLAKE2B 4671ccca56153ee493f239de46a01c9e878448f46ecb7e1a39156457562d7f7ac951007e04bd534ea26455da68607eab9b2e2266eed71a7b14c90f103888887e SHA512 3f6b175710880fd4e45c4407af06bec580839517727ee0f5f706747c78be727171f7f8ad2d8fa9add0065825556c3a5d48cc1a6016705f34569350c495f5710d
 DIST pychm-0.8.6.gh.tar.gz 23803 BLAKE2B fdf3c37eead60455fd5bde1638a010f2788074752f98c32cf4b3431b4a87b8893c23a9fa29995352b35b41f628b7026fdbfa6ff20b75e8a6efdf75fc2da3f67d SHA512 cc1b254b6c58aba038171ad9db1eea3212094d7fb9386b22ada67381d702b388e6a1dde0317b5724587ee135d2695c546a7c2d65af7091dafeb394647597b0ae
 EBUILD pychm-0.8.4-r1.ebuild 428 BLAKE2B bc58690f32d7f106dfe4ec6f665fe240352ea747324c1c208b79ef6eee7f414663370621d5a4d23bda08aa80e3f99d156b74b1f3433d226a42e86f1534c7e9e9 SHA512 b854fa1ef64b8f82d589e0018014548570d89f981c9e47dccd10e3d23e891b08b4e4bc16b89ddadf6ceaaa798046024f14a58433354a7eee454c91f80ec0466e
-EBUILD pychm-0.8.5.ebuild 586 BLAKE2B 72ae6967e384a67736555278cf4e37b98431ba9a63ca85e84df0aeae9392881f73510624f68f1e38516983393d93614a5159b35ce7191e7747eac59cf68db98b SHA512 b69fe1ae321b59d27b785cd01d4e14e950fcaf67b323087e0fbb79929edc4c3bca2163237c40e527ad0a2f2898ec7da0d74e477c4ec2b51421be8cf9f2128bbc
-EBUILD pychm-0.8.6.ebuild 495 BLAKE2B a14a39e3c2a8153991a8fc13dbf09790cd5e3abc4f9a09ed4d04f3a3ab8687f0ea933221ee5e027c7165d08d921491593e4fb735d39f588936fe55166da1a225 SHA512 6f0e0cb9b5c4013d234bc8799a013942eeeefde480aa064716b899affa4868254c617c7a747b3d7a83d456892d800832721870f802c110e9bad4e960c754857b
+EBUILD pychm-0.8.5.ebuild 584 BLAKE2B 4b3b02e304d282cc9bbc4b78461cc3d04cba4c040f76a3396fe3ac05f25fd44d40bf1bc68fab39f23670cd50caa9169a1b01744676fd35f5f540c4105675d118 SHA512 81894525d73727e99d356d5c844df6b35207d9a8cd3d25f7a74443a72d52f327066ec5324f83674180800354df68110f6bd90985b2d277784f6538ac37924f67
+EBUILD pychm-0.8.6.ebuild 493 BLAKE2B e7ca24fe3404183e61b535221c76e684d9e42b111a141d5a702cee91e0896b03f26a51c41149190033d8cf9460cc9b651c7ae32f78444cdd3c0c3830e13f943d SHA512 edc6fe929622aaa8c12dac772dd2ffed5dc55fcb0d7be34977c0c8cfd00ba9742caa7875f0bebff424297e3712c01a92b57e5473465e8dd0365c009f8f5f3e30
 MISC metadata.xml 981 BLAKE2B 94814a08cf697f65b50efcb43de52d9271f75bda4b058cfc6b5010cf5a159f1d48add1c305ca4318aeb7993c9e689ebe09ad0c1fbc0eb485ad58868fe427428e SHA512 1ff1b79c5b18961a5ed7aefc06c367968d05e14c47e3b4ac898c62ef8b444c75d092b1a10213197523bb107e8d2a5e04fc19c90b1381420a8d40659c6f950ebe
diff --git a/dev-python/pychm/pychm-0.8.5.ebuild b/dev-python/pychm/pychm-0.8.5.ebuild
index 301661fc7b72..acb52459dc50 100644
--- a/dev-python/pychm/pychm-0.8.5.ebuild
+++ b/dev-python/pychm/pychm-0.8.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pychm/pychm-0.8.6.ebuild b/dev-python/pychm/pychm-0.8.6.ebuild
index 5d77dcd07ccc..bc39b09e76a5 100644
--- a/dev-python/pychm/pychm-0.8.6.ebuild
+++ b/dev-python/pychm/pychm-0.8.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pychromecast/Manifest b/dev-python/pychromecast/Manifest
new file mode 100644
index 000000000000..9f5c3d6cdf1e
--- /dev/null
+++ b/dev-python/pychromecast/Manifest
@@ -0,0 +1,3 @@
+DIST PyChromecast-4.1.0.tar.gz 44463 BLAKE2B 3ee92cfe57134665621c347dda9b21a06fa1d000f840d25b49f843edef86e35e22b82c9d4f80b8e0ae6f5fabcc4662d7c619363686a37903e27d84e0f85c8fca SHA512 688014a115f3189fed5535e70622a7323e4a29fd65678aa14a302047c5246dbc6a932a8f4eabb58f9fcecc0f4bdbe627d1496a4b6d28e680ad4fac6dd902c825
+EBUILD pychromecast-4.1.0.ebuild 706 BLAKE2B 6d6869ec8953db731ff349600fc82cf4fad509c21dedb0092436f00d7da42d8c03ef935a529f0df2216b03c58e5b77eb03deb47b507262e41bd277f3dca86f32 SHA512 89e0e175391bc8567f0802a8951700f5de70317fedaa97e823fea53aa2165839fbca875be91123960851b8957145ca20dd20efc7f06a3267a47af74f83e95c2a
+MISC metadata.xml 455 BLAKE2B 1fc5a60702092a7f317262f9410b93a330e07f99221b42e58a9f1855eaa370350cffe1e1d2535e2ec116ee0b82687e9b6fb65d9af176314df726e4a8d3d78749 SHA512 d9ca042a81b58cfeafaa5e06b8d2be4f71ddec498ee6f7e6619ad24a6223ab68e3e99a43329344738b1fd6a61a6f771ce0d58b2643e739d836565f977c9d7eb2
diff --git a/dev-python/pychromecast/metadata.xml b/dev-python/pychromecast/metadata.xml
new file mode 100644
index 000000000000..24fcd1714e2b
--- /dev/null
+++ b/dev-python/pychromecast/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+			Library for Python 2 and 3 to communicate with the Google Chromecast.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pychromecast/pychromecast-4.1.0.ebuild b/dev-python/pychromecast/pychromecast-4.1.0.ebuild
new file mode 100644
index 000000000000..382fbb243999
--- /dev/null
+++ b/dev-python/pychromecast/pychromecast-4.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="Python module to talk to Google Chromecast."
+HOMEPAGE="https://github.com/balloob/pychromecast"
+SRC_URI="mirror://pypi/P/PyChromecast/PyChromecast-${PV}.tar.gz"
+S="${WORKDIR}/PyChromecast-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.17.7[${PYTHON_USEDEP}]
+	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]"
+BDEPEND=""
diff --git a/dev-python/pycipher/Manifest b/dev-python/pycipher/Manifest
index fce775755092..58acfb6b67ea 100644
--- a/dev-python/pycipher/Manifest
+++ b/dev-python/pycipher/Manifest
@@ -1,3 +1,3 @@
 DIST pycipher-0.2.py 9174 BLAKE2B aeb994f58452bb8e8808f48a217ceace8118e9fa378d9af9eaa68fd4a28aac0b7b0a23e9e66c28b4359f0e723a062007a82d5fa949f0ccd86f2c0b2a707195ac SHA512 ce3890184affc761fcac7a19284437ca5bd7fd5be6594dc6112eccc27971ca2a62cdff106bffea29c94f3dbc8bbee5f67af3bcd3a53838a1c7bfb19dad45dcda
-EBUILD pycipher-0.2-r1.ebuild 642 BLAKE2B 0bf2d7f489d78fe8ba683f91d889c75c97c7e19752f6c4d9693f3ae1c60b910566b6b77c2ae3e2943b5f0957c27618317eee7a4521b3b86f9cb1fecafe30fb90 SHA512 70d0d1a2e129fa093b31ebb355a209deaf521a965b8507776133af368f7e3aff5bda72c75c2e8fd2446f531cc53f053dcbeaaf4f77a089fdd7482a9e598c2c64
+EBUILD pycipher-0.2-r1.ebuild 632 BLAKE2B 0c162968144c7380b778e666c1529b9deea723251666f1230ac27e52ba2416f951f4c84bba7064d0c338c328ed2c5cf97c9d8a5da0b5e657414b7cef50f082dc SHA512 4c51b5fba3121be17b1ddba36c9355e2966c05e1b71f0e5d45b8939208e0d06aa315f3265e022703801a8a6c41078c817bc12f1ce9416803d3a67e05704114c9
 MISC metadata.xml 318 BLAKE2B c4e881cdabe022937899237f2e89fd584a1f667c9b051844449cf809a35c18854e083006482defa161a929c98b94305fc3af869e2f744cadee5286ae594d2895 SHA512 5038596f685157e786f10f04e89d766479e8f29262787969d36f2aae2d5ad8031e0233b3a2d1176e4d007cd5c01534d82863ea19ad85715dfb3b0cd979f53a01
diff --git a/dev-python/pycipher/pycipher-0.2-r1.ebuild b/dev-python/pycipher/pycipher-0.2-r1.ebuild
index 47d3d3f7e748..7ffcc03a0ad8 100644
--- a/dev-python/pycipher/pycipher-0.2-r1.ebuild
+++ b/dev-python/pycipher/pycipher-0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-r1
 
diff --git a/dev-python/pyclamav/Manifest b/dev-python/pyclamav/Manifest
deleted file mode 100644
index 27512287b1d5..000000000000
--- a/dev-python/pyclamav/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pyclamav-0.4.1-clamav-0.95.patch 4111 BLAKE2B fcb09c4ce1e239bbe24da17e15ef0acb0f590c32431c9c6e26cf66043f63141d8674fb3cd9447787e9b15278a2cd9ccb3317d506cfaf6ec44ab44ede6785ea9e SHA512 4425ef9edf86c1391d41d925b381bfe068c1db9791a82b942e36f96eb1828ceb170e41877443084d17d45bb365c988f72afa9173d3c701a681ddd953d9a9f474
-DIST pyclamav-0.4.1.tar.gz 12789 BLAKE2B f0ca4d357c73fb1064425596c6f7daa7ec4075c5b53a5b279dd7aeaefeb099252d5e977b041557c39bbd517f38d9eb9643dca0a7fa46810d63f790d6311b6f68 SHA512 ea06ba4706d2a1a98f265f308a72461224d09c44498f2809d31d7576958ecb53038cc3b98ba65e7841bf5082ecf094c2eea6cf7156074461378e98260d42b54f
-EBUILD pyclamav-0.4.1-r2.ebuild 759 BLAKE2B d5bea6a85f3382d89526a5184ddc8769ac0d620f471aacecf73159a52c2f43d014b5feed68e8a0b4fcf94b0a8b10c2be6bb5a8bd2b58302ee56c3883e34be80f SHA512 073eba18daf55b8de7c4fcfa94141f8cad4147eb5321b1fb7d18af0bd163ca4c47eb5e9ee01e22c4af7fcb30a3974cd53b23f5fade34109282f3004e4b517aa7
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pyclamav/files/pyclamav-0.4.1-clamav-0.95.patch b/dev-python/pyclamav/files/pyclamav-0.4.1-clamav-0.95.patch
deleted file mode 100644
index 1cf77e1925e7..000000000000
--- a/dev-python/pyclamav/files/pyclamav-0.4.1-clamav-0.95.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-
---- python-clamav-0.4.1.orig/pyclamav.c
-+++ python-clamav-0.4.1/pyclamav.c
-@@ -33,25 +33,6 @@
- 
- /* ********************************************************* */
- 
--/* To be able to compile with 
--   releases 0.75 of libclamav 
--
--   Where cl_free was cl_freetrie
--   and cl_build was cl_buildtrie
--   CL_SCAN_STDOPT did not exist
--*/
--#ifndef CL_SCAN_STDOPT
--#define CL_SCAN_STDOPT CL_RAW | CL_ARCHIVE | CL_MAIL | CL_DISABLERAR | CL_OLE2 | CL_ENCRYPTED
--void cl_free(struct cl_node *rootnode) {
--  cl_freetrie(rootnode);  
--  return;    
--} 
--
--int cl_build(struct cl_node *rootnode) {  
--  return cl_buildtrie(rootnode);    
--} 
--#endif
--
- /* For python prior to 2.3 */
- #ifndef PyMODINIT_FUNC
- #define PyMODINIT_FUNC void
-@@ -68,11 +49,9 @@
- unsigned int signumber = 0;
-  
- /* Structures for clamav */
--struct cl_node *root = NULL;
--struct cl_limits limits;
-+struct cl_engine *engine = NULL;
- struct cl_stat dbstat;
- 
--
- /*
-  * If the virus database has been changed, then
-  * free the current tree and reload the new one
-@@ -85,22 +64,22 @@
-   /* If yes : reload DB                */
-   if (cl_statchkdir(&dbstat) == 1)
-     {
--      /* free the tree */
--      cl_free(root); 
-+      /* free the engine */
-+      cl_engine_free(engine); 
-       signumber=0;
--      root=NULL;
-+      engine=NULL;
- 
-       /* Load DB */
--      if((ret = cl_load(cl_retdbdir(), &root, &signumber, CL_DB_STDOPT))) {
-+      if((ret = cl_load(cl_retdbdir(), engine, &signumber, CL_DB_STDOPT)) != CL_SUCCESS) {
- 	/* Raise exception with error message */
- 	PyErr_SetString(PyclamavError,  cl_strerror(ret));
- 	return -2;
-       }
- 
--      /* build the final tree */
--      if((ret = cl_build(root))) {
--	/* free the partial tree */
--	cl_free(root); 
-+      /* prepare the engine */
-+      if((ret = cl_engine_compile(engine))) {
-+	/* free the engine */
-+	cl_engine_free(engine); 
- 	/* Raise exception with error message */
- 	PyErr_SetString(PyclamavError, cl_strerror(ret));
- 	return -2;
-@@ -231,7 +210,7 @@
-     return NULL;     
-   }
- 
--  ret = cl_scanfile(file_to_scan, &virname, &size, root, &limits, CL_SCAN_STDOPT);
-+  ret = cl_scanfile(file_to_scan, &virname, &size, engine, CL_SCAN_STDOPT);
- 
-   /* Test return code */
-   switch (ret) {
-@@ -278,17 +257,21 @@
-   /* Set documentation string for the module */
-   PyDict_SetItemString(dict, "__doc__", PyString_FromString("pyclamav :\n\n  This is a python binding to the C libclamav library\n  (from the Clamav project - http://www.clamav.net).\n  It can be used to easily allow a Python script to scan\n  a file or a buffer against known viruses.\n\nAuthor : Alexandre Norman [norman@xael.org]\n\nFunctions :\n  - scanfile(string filename) : Scan a file for virus.\n  - get_numsig() : Return the number of known signatures.\n  - get_version() : Return the version of Clamav.\n  - version() : Return the version of pyclamav.\n"));
- 
-+  /* initialize libclamav */
-+  cl_init(CL_INIT_DEFAULT);
-+  engine = cl_engine_new();
- 
--  if((ret = cl_load(cl_retdbdir(), &root, &signumber, CL_DB_STDOPT))) {
-+  if((ret = cl_load(cl_retdbdir(), engine, &signumber, CL_DB_STDOPT))) {
-     /* Raise exception with error message */
-     PyErr_SetString(PyclamavError,  cl_strerror(ret));
-+    cl_engine_free(engine);
-     return;
-   }
- 
--  /* build the final tree */
--  if((ret = cl_build(root))) {
--    /* free the partial tree */
--    cl_free(root); 
-+  /* prepare the engine */
-+  if((ret = cl_engine_compile(engine)) != CL_SUCCESS) {
-+    /* free up the engine resources */
-+    cl_engine_free(engine); 
-     /* Raise exception with error message */
-     PyErr_SetString(PyclamavError, cl_strerror(ret));
-     return;
-@@ -299,15 +282,6 @@
-   memset(&dbstat, 0, sizeof(struct cl_stat));
-   cl_statinidir(cl_retdbdir(), &dbstat);
- 
--
--
--  /* set up archive limits */
--  memset(&limits, 0, sizeof(struct cl_limits));
--  limits.maxfiles = 1000; /* max files */
--  limits.maxfilesize = 10 * 1048576; /* maximal archived file size == 10 Mb */
--  limits.maxreclevel = 5; /* maximal recursion level */
--  limits.archivememlim = 0; /* disable memory limit for bzip2 scanner */
--
-   return ;
- }
- 
-
diff --git a/dev-python/pyclamav/metadata.xml b/dev-python/pyclamav/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/pyclamav/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/pyclamav/pyclamav-0.4.1-r2.ebuild b/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild
deleted file mode 100644
index ffdcef0bbb10..000000000000
--- a/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding for libclamav"
-HOMEPAGE="https://xael.org/norman/python/pyclamav/
-	https://pypi.org/project/pyclamav/"
-SRC_URI="https://xael.org/norman/python/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
-IUSE=""
-
-DEPEND=">=app-antivirus/clamav-0.90"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-clamav-0.95.patch )
-DOCS=( README.txt  example.py )
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto /usr/share/doc/${PF}
-	doins example.py
-}
-
-pkg_postinst() {
-	elog "an example called example.py has been installed into /usr/share/doc/${PF}"
-}
diff --git a/dev-python/pycmd/Manifest b/dev-python/pycmd/Manifest
index cafa6d9e9c65..5b36c1c2053b 100644
--- a/dev-python/pycmd/Manifest
+++ b/dev-python/pycmd/Manifest
@@ -1,3 +1,3 @@
 DIST pycmd-1.2.tar.gz 12896 BLAKE2B e31866ff82e58b0bab7e1932dfb3ee5d2ad115ab3a99b60bebaf8541e9e6372d4b12569db9ff0695da6025fd5d86c717bcf67e9091b9408aaa771ced4b4ae4c5 SHA512 a9506e59889d112a40e1ef115a919644cce31320603904b350cc0a459775dc3d7454dc3f06953b1534cebbf429942bf1577302470bc54665c8dec5eb64b97957
-EBUILD pycmd-1.2.ebuild 772 BLAKE2B 8aa76babb4af0ef51815229b7c7605e96df125e8ab9938ad9a2de4444a36808280b67486999d5919daf5b4ee122468f02841be42798fd224aa831890f0e0c168 SHA512 8482e8c70df0c27a84f180bf790a8ef49b84dc4d7a98a9bc9204884189f5e4e3b808bd9b76b2a8dc80bd868b5a21b7e2346cd989a4460be88762432f9d6e4ed5
+EBUILD pycmd-1.2.ebuild 757 BLAKE2B b9abdda3cad7d88fed320dc2eb40b1dc6d61891a032b266fa512995a04a195c5e94b4ba4b2a1656cded978b615edb3831c39d71ce1af893d44f5a1acc30b4316 SHA512 a2875d23334e0ffe00b6183b31975e6bd306dfc4366aee652d46f714463c5c70ca3ec7d638c04be921f0eab6a32a49352c608505d6a44fcfc244d39cfdde4993
 MISC metadata.xml 308 BLAKE2B bf2ebbbcf0a862b3cbe0394d1050a8f5091c90e732481e50bf7a33dc756a1b0d83dc717adda8e457e3c56cb6f95e452b0cb5c77b700f3ff2a498703221ba92fe SHA512 fc624db4af29f488eef3386bfa2ddb2fdb57f1be25fd826e5351fcecdaa2c132ce9b25cf25cbbcb19f38b18de8e936548e5877da88058613ab702ac3073143ac
diff --git a/dev-python/pycmd/pycmd-1.2.ebuild b/dev-python/pycmd/pycmd-1.2.ebuild
index 630e61c1d17b..a4e2aaf495b9 100644
--- a/dev-python/pycmd/pycmd-1.2.ebuild
+++ b/dev-python/pycmd/pycmd-1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycobertura/Manifest b/dev-python/pycobertura/Manifest
index 7f9673e9bdac..c55bcf3622e9 100644
--- a/dev-python/pycobertura/Manifest
+++ b/dev-python/pycobertura/Manifest
@@ -1,3 +1,3 @@
 DIST pycobertura-0.10.0.tar.gz 54209 BLAKE2B 92198255aa94516b4062c47356a49e4e8424ec8a1ed1347aa9b3fc0aa8519741fe2223a923deccccd48e4bc2019a0b0e7cec940d72c065ef326d9a9cc08f3742 SHA512 47e64c462aa09c871eb6ccffcb5cff8870b332082b79d7642da540014d3b5c3c59fcdef62ee71a2405af48b1393d4f13c79fabb9d182026024cc4887b8681422
-EBUILD pycobertura-0.10.0.ebuild 888 BLAKE2B fb885bb6c040d998090d947575eee69034cf04f8d92bc7bf1bc618ab0149392dcdb06f23d217947b4106f2aa4d4636be995ccb18c556d8337dd0877bcf546975 SHA512 1fc61caa81dd7dffbdf3c412fb78f48e65bc603c4c2a4995a16ad4722d97a5cbfa797dcb0494b970a3082ba42ea995edf69a5e8182e8679f9d1f9091a0357bf0
+EBUILD pycobertura-0.10.0.ebuild 874 BLAKE2B cf682706983ea87a08fc74b56fa79e14879d1db63c43ca7317d050ea9749a2ce2b69fc610dc9fa6c20b6092764c04025308db2e58ac301596996acfa8fa90e97 SHA512 7783f8d7655dfd68457cd75e716d5688e0214133474ab11e9e361ecbb76ab3ab27ca76c3da514de5bc69d7a37aecab4c32811023b0cb75dbfc67590267a4ce8d
 MISC metadata.xml 378 BLAKE2B f17ee64b017462651d30df0f657c73fd3aef52f40f2e31ce9514859220c9154d48fb5c5ad685dc563bbc0316804aaa8421c8285ea036a2f44f37d01f0a72fda4 SHA512 c046a00110dfba45bd7f97f25f026ec982bc17dbe98c2831f73aad59f1a10631095c951c035595c1a5f04e64018c0d2381fbb70a2f93f20e7a232199d3d9daa5
diff --git a/dev-python/pycobertura/pycobertura-0.10.0.ebuild b/dev-python/pycobertura/pycobertura-0.10.0.ebuild
index cf658099ffce..4ff6d73158a8 100644
--- a/dev-python/pycobertura/pycobertura-0.10.0.ebuild
+++ b/dev-python/pycobertura/pycobertura-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Cobertura coverage parser that can diff reports and show coverage progress"
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 2f48dd40f68a..0144e8e097f0 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,7 +1,7 @@
 DIST pycodestyle-2.3.1.tar.gz 89460 BLAKE2B 0b7e23be13830954277d521262e9504ade8a4d0275a77e6365201ccffae955a8f505a1cd5e739145e1fc5551c3b956ff9a51bb57cede819f2886ee36637f7f9e SHA512 276bc21b4e6898e379be88f3582135a21314460ad20d4b6c3e12825ac1a72082b2c08bb62099e704c3222f879a1098d0b305132fac1095aaa60ca239b9763a2d
 DIST pycodestyle-2.4.0.tar.gz 96665 BLAKE2B 9c847aa9c9ffa1f401595d1c2c3f81f971f69628fb34d4e572ccb99203f8e9abe8101302d61c4ae7d330c03e7d0dd5e252d658065b7ed6660dea186880030529 SHA512 cb35238291fed30f1a4363e65b754165772d01e6006e19ce31769691aed17411cd893899fcd22dfca0455401bee899097fff6f3d63825c7656f186e37b7da3a0
 DIST pycodestyle-2.5.0.tar.gz 98802 BLAKE2B ec86642f0f37abc4da8886df6395694b54cbe4e1d0030615b2136f0bc265825df254f019483e9094feaad685e43008cefdf0e50b533df434a40de0de11aa5fa1 SHA512 84e751a7d00048393b02ca743de5d71d1641e948ee1b4daebbdf2d07e0cd8f087ca4e81f826061114b40ef41920bbcd680c9f479e7cc1a159a70188425717208
-EBUILD pycodestyle-2.3.1.ebuild 1114 BLAKE2B 84b7823ef5f606038179c26f5a1df0126054d5fbd2911ce61cec047ee4ba85a981b740ff8bd19bbd86c28ea891f69bf60c82a400dcdb3b31712aff8c4336ec3b SHA512 eb6987e581d2a4689320cce62216a3df8d21f95aaa0d84d3ebe8e52661e84a4c56ae0d549cce2f76b588ba37163f45bf5064d725726ccaec7700015f677e1f63
-EBUILD pycodestyle-2.4.0.ebuild 1120 BLAKE2B 6d98e5ba715eb279fbcb3242431d4cfe924db9b914c727b531baf1f1ab1595b47284fbf89eae3d32fb9a65c3b68acacbf4b4f289104e669909893c74cd2f140e SHA512 490127c1b7563a7bec091028dfeebd9f76852f23f41a11185d6289f4a9c6efb35018231a42fd8c0e363d225909e1b3a6dad16bb46bdca9013f331912b3a6d11f
-EBUILD pycodestyle-2.5.0.ebuild 1109 BLAKE2B fa34c43d20ab1ead3b26dc7f085aee48794e89a7428c8ea7e5bc8c2764076cafbab0f256bbdbfc1b93fb827ce500769e834293e55d57b10a771964f6cdde34df SHA512 cab325badcde62a719412e8cc257342ccfde80af4ff34b8cf05f4d7e432486c783ed595db0ff0ff346efb498c4a748aca671ce692148dfc4f81256a05706892f
+EBUILD pycodestyle-2.3.1.ebuild 1105 BLAKE2B 90c38e2808fedf9594d5b914de453fa24d9bbe7e27b6a0e0fbe4cce261f665a5ffedc36640182c4ec09b716e3c1b0c52b371a7f14bf2ee98d6ef6cd1ae828340 SHA512 4052b765a776d987763a7032a48ccff9aa26d979c5b02f22b53e626fb66893d69dc4813c8506dbe97db80ba02f2802d42a3bcb4506a460e01dfe9a26d11a8b36
+EBUILD pycodestyle-2.4.0.ebuild 1115 BLAKE2B f804ddda31c340567206d5970445048923c30abfd13009f309e9790314745e6a64c9576f1207be03d2b9f1e2fa9e2456650e1ead5b6004cc58638a50fd49d0bd SHA512 e0ea088f6844cd41b74c596f45fbad249cf8928c5af1e82d44a826c03f354c64fbce300d72769541667997745f894a34d0b15eb00af24dee1276f8d2506abfd9
+EBUILD pycodestyle-2.5.0.ebuild 1096 BLAKE2B 688870c576b27db41c90bc6c11b95ad48182350b67192c7b7e502b44bdd692e41a2f29b73096245c10b3e43abc71882c05c42a1d7a5c87c06454a27d1654a4e9 SHA512 df8fbfdf4c0291ad4672908b5abd469a940456949b2cda34e76e8c21fdcf37b1c96c061d0b4958638376e6c6e780bab4917edf64122759074b2fd39b934da061
 MISC metadata.xml 335 BLAKE2B 9ecbe193a8f7aaf12005920847cd3d8a34b868636a943ba30465a4eead591ce46d422bd0b0e777a86f0d5c4efd5ed925a1476f18f659f18e622dfab057df0d8e SHA512 92e19ab42f44fe1a1da2c8407214bb447262a818b2051e644851178cc7f2274198310a85d7c094839b1764664bd8f8463a6a7a96df83447768082c8ab44909c4
diff --git a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
index 81690c2d1460..12c2e94d60ed 100644
--- a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild
index b78992716227..34a1b6e6bf67 100644
--- a/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycodestyle/pycodestyle-2.5.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.5.0.ebuild
index 37e81701a84f..be0393733667 100644
--- a/dev-python/pycodestyle/pycodestyle-2.5.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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 ~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="doc"
 
 BDEPEND="
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index 3552d722a720..6202072a27a0 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1,3 +1,3 @@
 DIST pycollada-0.6.tar.gz 3109963 BLAKE2B 92e9b3a28c959700fad4f4af1c6375f47b1a3cabb4ff3b8eec47a5625bd680d7088b7c9677e0d395f3be296d555996e5e5819f11ab82a0fa37b0c6fbec33795f SHA512 043eaafbd97a588897870e89202e281777094e4bf63ea56a979b6f7aef7ad549fc2b71f3b575c0b9c413bc10756ba36e02cc7cbd497a6cbaa51f06e99b34f0cd
-EBUILD pycollada-0.6-r1.ebuild 1367 BLAKE2B e59f3f30f4cf54192109ad6f490753ca86ed6a14bed4754b55f85193374ecb9a586d5b11bb8b502b159cbcae9ac690b766946af71baa9625b865f89a3f5db7c0 SHA512 3e6a2d5d17a692e763d70091756c77e927b73e37fe384df441e8663ef705390760b4d8dcaf4bb95035bee97259916cbce9e9c0379062f2d48fa3b6dcd8eb2fb9
+EBUILD pycollada-0.6-r1.ebuild 1359 BLAKE2B 8c0f5b31dad2da98d37dc96f377f38ef58c2461eeb130847665c88b1938669c3a959dc89a9a7464e6515f92d00e09c0fc89b0eef2b71da888320dc40e25e009b SHA512 f4d652710bb8ea1e858a5d28da9a46771f5aa9437158eef093d193ca9efb60031176f1d4bc37f042dd67c84ce14912bb2a44b2be4587bbdb2d7ec8eff2d175a5
 MISC metadata.xml 559 BLAKE2B 4a6983c74b48af34e314f348e781cde10d22c7419f11932f40e28d47cdd0bd5b940cbff2431cba17793a813bc3d8a697a7cd3dea4e4d122834ce91fbff79fa53 SHA512 401e7df61bebe47ef2f8de32766df5013994c624285ff5f352195e0b316f2c831ecb43e513efc29b4a5710de6c810b8f80add2b57513d5cd5aa6904aebc0ec7f
diff --git a/dev-python/pycollada/pycollada-0.6-r1.ebuild b/dev-python/pycollada/pycollada-0.6-r1.ebuild
index 47a0d7434951..b1249b836a22 100644
--- a/dev-python/pycollada/pycollada-0.6-r1.ebuild
+++ b/dev-python/pycollada/pycollada-0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index bc47a6de4ace..4287d521d6ff 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,9 +1,5 @@
 DIST pycountry-16.11.8.tar.gz 9042735 BLAKE2B 66f5dcb0b9b55be692e398c998babeb49542cb5383a706bb74091088eaa3703f41da33f59e2267046c53f8f025f85945096d1e8d251ad5af57c5d39a27896cf2 SHA512 eb0a91f1efae6aeace0b49cd44b0770efa0b57add208c4247e7f58a3c46774f9f8007c51ee88a0e108c90ced3ad69204b4322c9c23f51df0b2202aa98c314a37
-DIST pycountry-17.9.23.tar.gz 9208478 BLAKE2B 381497b220991f76bdac235b71fd9c10984f5762e9cc16b813cb37cfef0444bbaada01e1ed9513848c681a06335ff58544f6f7c2217b51ef98c7415db4b3d285 SHA512 168e2d2693629a39a85a4c6aa7187323693ca73d6af0cc947d3536ae373eca602e7e3add91ba114966db4ebf52118ef3d6a3dbf8339734ec68682bab559beeb5
-DIST pycountry-18.5.26.tar.gz 9779056 BLAKE2B 11928f29cb7446db7159936619a5d0828af89ec7a2ca355d809c97887605174e41d3f93d7e459f3f37ce37b9a7650432df1e7619f9fdfa1f9ea010a39af4501a SHA512 9760175a7926347920542a2fd2420cc3d4f36ac11df5aa6f7aaabbd9b46dd9cb61801933133a589ed35fd2e279db2a70e98340d8cf8856987dc88d6fdb715437
 DIST pycountry-19.8.18.tar.gz 10003160 BLAKE2B ac7894e9fc1ed4e8f386cc6e07c1fc2abefee63c39c7c851c100519418606b52bc18be8da672930ceefdc7ca7b51571e4b3884ea0c20e547e5b596e249ebf407 SHA512 39ba06629eeea55460424d06992ca5f1e5bf6168b219dc4880ec326f6aa0c92a4fdc54d4143a8b8bb1490149af793e760e291c6d704104a57ba91e88228ab669
-EBUILD pycountry-16.11.8.ebuild 919 BLAKE2B e13795148ecfc893047c88e151d2802a7d2f048da7f81d45461f84b0885df0773274295cd38444961ad132a76299d782317f86d084ee7206ab774a4b4a4a2de7 SHA512 43feb3422ccb5995b7dfb4df3f487a9cf7ebfa16dd8d24911b0e50c45180bf21d8974dc710d87360318b948884489f5324c1cb5cc18af3b212b679fcf3c2f0a8
-EBUILD pycountry-17.9.23.ebuild 922 BLAKE2B c8b932ebc4d997ef2c6ff7ac0e3dbd70951bf944238f88a34e5413da01b9f2417fd0d0bb503b2ff7770aa5aad20799f7f4f85322b8d7d27dc06dad30db9f86ea SHA512 fd3b2f3ba597c2870f68e07f2a48fba54cc59784b03ecfd330000331bed45034c24d8da59cf0f62ca4d8440547d207d717329c8877fd8127520b9fd686fe10bd
-EBUILD pycountry-18.5.26.ebuild 919 BLAKE2B bb5212f2342b1939666f1bae12783a0414dc6f776e97dcec67f075e12df1576e2ae016d05e5f70323a23b75322768f41d48029910e693d730459eaef19541f31 SHA512 3d916ccfd4c6ecc6e540e46ee656e89561643c3d96d4b7b2f7f8ebaea1733a9487323fb28536650fccbc2207e89e5eb3c9be5db376309ee3befde7a3806896d4
-EBUILD pycountry-19.8.18.ebuild 910 BLAKE2B 244548255798b9a71d6fe78ef61dfe17fd7338d41ec4f32946f2db9ccbcaa043b636fd5974312d09ef8c056a94d812fcdf90da419503a780d652817ffd2f369a SHA512 687756de3248868739065821ad4acade36ec542315450c2c8b1c9111ba4028828806652e13c1a04c8a292e968cc211d9ca3d0dc59606d8c76e2a165b51a1a44d
+EBUILD pycountry-16.11.8.ebuild 910 BLAKE2B eb4ef7c349c45b1937d58b3de47ef0da7db3f431ee517f1b9af8c60c2c519a35af92502a5c72b1730ffdb6d9bb587cea33142f625679042b1560ff662db7782f SHA512 a67aab3de12d03c12eb255c3ff2beb14d16c114f789d91c0b380dd267abf146f3852b1424df1a52364b82ba1493c42f317968dd39f2b6a0377889779311daf7f
+EBUILD pycountry-19.8.18.ebuild 903 BLAKE2B 66186f5d369ebe4785d73c89313f17f1cb3a1748cc8e561ca16399313a90fc79a59782ff1738b09be252c5187eb80f18c6524e0fbc6a1ae499ee98b51b536650 SHA512 8059d73a4624e61fda29fbb72d12d35e5ff6d73f787be7b01fcb8d5bbb0c01470f753b7883cf5b7012f23bd147f87e23d21220ccceb4037bda86d266200cf3ee
 MISC metadata.xml 516 BLAKE2B 8e3dabec1ed6b181d44db184d87d2a7b05bef670aae39e71bc35c8d3fbd8e606c929b4b7abe5b8d6d8faa69ca373238fbb8c31d40334ef87d8ff6f07ea1c6f53 SHA512 901c2f02b6dcaacbaae30e82fe886b104051a434ed4c079443a77f5b474cef24f16f658cbe7c01a30966126af78d7950f65207bb8b16e2e1c9bfc71bc05d0c3a
diff --git a/dev-python/pycountry/pycountry-16.11.8.ebuild b/dev-python/pycountry/pycountry-16.11.8.ebuild
index 02fee902fb05..25106dc525c4 100644
--- a/dev-python/pycountry/pycountry-16.11.8.ebuild
+++ b/dev-python/pycountry/pycountry-16.11.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycountry/pycountry-17.9.23.ebuild b/dev-python/pycountry/pycountry-17.9.23.ebuild
deleted file mode 100644
index 7b3da4279cce..000000000000
--- a/dev-python/pycountry/pycountry-17.9.23.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
-HOMEPAGE="https://bitbucket.org/flyingcircus/pycountry"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
-	pushd "${BUILD_DIR}"/lib > /dev/null
-	if [[ "${EPYTHON}" == pypy || "${EPYTHON}" == pypy3 ]]; then
-		sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
-	fi
-	py.test ${PN}/tests/test_general.py || die
-	popd > /dev/null
-}
diff --git a/dev-python/pycountry/pycountry-18.5.26.ebuild b/dev-python/pycountry/pycountry-18.5.26.ebuild
deleted file mode 100644
index 7439d69b58ef..000000000000
--- a/dev-python/pycountry/pycountry-18.5.26.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
-HOMEPAGE="https://bitbucket.org/flyingcircus/pycountry"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	if [[ ${EPYTHON} == pypy* ]]; then
-		sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
-	fi
-	pytest -o cache_dir="${T}" -vv || die
-	popd > /dev/null || die
-}
diff --git a/dev-python/pycountry/pycountry-19.8.18.ebuild b/dev-python/pycountry/pycountry-19.8.18.ebuild
index 1bf3d5552cec..0ce91bc3e4d6 100644
--- a/dev-python/pycountry/pycountry-19.8.18.ebuild
+++ b/dev-python/pycountry/pycountry-19.8.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 6e4a51c61e7d..81363ba8a024 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -2,7 +2,7 @@ AUX pycparser-2.18-OO.patch 2224 BLAKE2B 38955919380a0ec7dbaacde434a327b9842be02
 DIST pycparser-2.14.tar.gz 223295 BLAKE2B 13dd4e36d7239db4fd6dfb77f08088bdbffa897ab75d748da5bd7297fe0a7dd751ba7153f8bf15f93494e347c653d1ebc7250907d2ccc555e785830e731e93dc SHA512 d5b9ab434a8944898ac23a4f51189db77b02b993bf3e3ca018852b117fc0eb43e460b156beaa5c1d631ad71c81e1649113e9fff7e33506b1e7d4de24d8b464c6
 DIST pycparser-2.18.tar.gz 245897 BLAKE2B 2f47263c73763f9d76edcb0d90aacd2e6cf0a68ed2e8c5825a0788a5ccb6574167220a5bb7605b2c11dda8956ce8fb1ad28eeb8e91fed7aa0282191b11478b63 SHA512 4754e4e7556d21da328bf7dbabf72f940c9b18f1457260d48208033b05e576919f45ab399e86ea49e82120116980d7d6f53e8b959d21b7b03a3b5bbea3672f13
 DIST pycparser-2.19.tar.gz 158295 BLAKE2B 8836914e7549517f0c23a1c75457beefd013161f19c51a9f2a236ebd69466edd11235bf0a3f59c5cbece9e9e287eeb24b707bfa5afc30fcb079d134dcd4d9a80 SHA512 7f830e1c9066ee2d297a55e2bf6db4bf6447b6d9da0145d11a88c3bb98505755fb7986eafa6e06ae0b7680838f5e5d6a6d188245ca5ad45c2a727587bac93ab5
-EBUILD pycparser-2.14.ebuild 945 BLAKE2B ef895369eff300105a13c9d08312ca1b8554513cd6b08f16b82e049ad71f5eb2b4c4fecd164aa740b44d02e391039d0f87bf545bc93545acacb29848f72c1855 SHA512 cd8aa1fcd9a2c05765792779d22b32501c0425e4d3c8c72e42368a92f61b08cff5e5c6bcf738661d7bedeaff0d90d4037ebeff4ed686042300762537cabd3066
-EBUILD pycparser-2.18-r1.ebuild 1553 BLAKE2B 464b805e100ee40ecef759dd7042e82e6bb18813205b1570bb34a589266b3176fd8a1a7bb09257b17dfa756b73729575184921db08afb8af2f2e318627187c4f SHA512 1bd76d00ffbdb933925c35b813c7c7f83d2869ada6d7d6d654040207b836002e7678b26703ebd9e44eb04c370bbce8dc354148b1d80c3db438b09989b8779979
-EBUILD pycparser-2.19-r1.ebuild 1642 BLAKE2B f834554ecc4b08e56587ecb4f4c3b1d0064eac42f96d66882ca80037e16a8d35824c4d74154fbf1d9cf3b4e218e57fdbee4b55ba72ff9cc5c7b394969076b478 SHA512 5dcba801e5a83ec7c25924a116080b79d465e3824d754ac355c3e5728de8666ea4c9335fdc18cd7b4ba398e579f8d4d0575d41a8344d097a9650d2e49f112bde
+EBUILD pycparser-2.14.ebuild 936 BLAKE2B b64eabf2c0e4b102cadd8cf15eb73b44b3fdc63edda563f6b902576601e7520ed4d2b8682f9bbfdd39545ef5223b70dfd1e21ba50042c40e621641586f73321a SHA512 49abe6a8b737877598edec7a8d778d5f4e8a7d87c19b67f53f97d21107547346f136d8eaee775e87ae8482d8061ca3c9a976e2660aea9a0d9a5b5b850ad806c7
+EBUILD pycparser-2.18-r1.ebuild 1546 BLAKE2B 7866aaa73b1338de2905b0d6cd112e5cea41ed70d28487095679f4b420920924ab290151a0e644c11742d96ac25b3d0bee3e33456ba15b58a5d90f7823cfca24 SHA512 a20aaa69e14031578116492155e3e46bf574b45f4b74ba799e4f55eaac6ac4e6e76056fa9a90d9b33947734e93ae4f3313e9fce17ee9a606b263846ac848c3f3
+EBUILD pycparser-2.19-r1.ebuild 1635 BLAKE2B f2c50c07039079b37a11b8476263211b29484316437d4cdf382d521b7aa1b74e168d1a8ae5094f49ce272f7aafb596296bdf1028cd9575d0b02773203942e2f3 SHA512 d095fd84b65fb6cae0ef1e06df8da1a23c01a43b7dac3d331a52e3302b9f8d2371c6398c9e5e88a784a5d769f102c95e499fc8f37144855d50992bd2da16542e
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/pycparser-2.14.ebuild b/dev-python/pycparser/pycparser-2.14.ebuild
index 15ff90da3761..699b5fdfc71a 100644
--- a/dev-python/pycparser/pycparser-2.14.ebuild
+++ b/dev-python/pycparser/pycparser-2.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/pycparser/pycparser-2.18-r1.ebuild b/dev-python/pycparser/pycparser-2.18-r1.ebuild
index 508a13602ef4..20f5f714a28a 100644
--- a/dev-python/pycparser/pycparser-2.18-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.18-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycparser/pycparser-2.19-r1.ebuild b/dev-python/pycparser/pycparser-2.19-r1.ebuild
index e38e5d51fcb9..f8579432a3b7 100644
--- a/dev-python/pycparser/pycparser-2.19-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.19-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index 028ed14064f8..c54c3c065a43 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -1,5 +1,5 @@
 AUX pycrypto-2.6.1-CVE-2013-7459.patch 3808 BLAKE2B a13ec783c0a99f06efba4caa2f77cc101bad577c47eeea58a53aaca343fb6caa4ba6e617c5ff07808781c2fe71a2f48fd9a3ec4aa18d504d56ab0e7a2ec9f40c SHA512 b34a28fa886ad749878aee17459307fb3006f392304a368e9c80b9beac78b1bca2f35831664e504097996ae1be4e1e81eae5e68b211e47fbf11f2b05b2379fb8
 AUX pycrypto-2.6.1-cross-compile.patch 489 BLAKE2B e4505725793379547d13a3b08b3621471ae0828915c48253aba778b576c3b379267210e5e763ce9f78f3f9ff992b2521c9a9940c744042d16ba992b9e5728b17 SHA512 fbf1f5b6d065725e84594c1493d0d795a9f8c73d9e873f28b473ebc6bf2f346330d5a92362e1dc09f465227f0bc839ccfaf8dc0011c21323ac80931f74b16fca
 DIST pycrypto-2.6.1.tar.gz 446240 BLAKE2B 89c9cc5b8cbd446364bd56c170c2733b960ec269a6691085392b3cc0ebc2eb244721f6763ed72a1254f90bfaadee2cc1a8446865a95fca19ffb36700d89711a9 SHA512 20a4aed4dac4e9e61d773ebc1d48ea577e9870c33f396be53d075a9bf8487d93e75e200179882d81e452efd0f6751789bac434f6f431b3e7c1c8ef9dba392847
-EBUILD pycrypto-2.6.1-r2.ebuild 2082 BLAKE2B 97c778b305aae3d102a3f3d8df31e98ea53da11d737a5482f40f4bbe580ddbf46b3d87ab20779f264cd5d3289066cc2677fe3661c3228e1dca82b63a7d0618c5 SHA512 6711366caf428d43051fd8961aec626120069f17241d5b1653823957a16f8f3e699bec4978586a4e55f51a770f8120d141e7cab665f61a76493e9bc0b7c03e04
+EBUILD pycrypto-2.6.1-r2.ebuild 2080 BLAKE2B 14bcf7f8413d487dcbab802901c63e089d74b66e0a7b60202839381365fe2a9c940ebd0e1e0f5d5647e27e703534646fc66a9796ecbc566e7507f7ea7b3143da SHA512 c75e03f572eef26cb2567d9a596d1576bbf4f3cc782694e6196c888ba9250530923ecf76804cfab06aa9e37ba852ec6704245a6e071f6be355c63a05f94921a8
 MISC metadata.xml 1797 BLAKE2B 0880d583a65ca52fccc51fc6451205ad5ff2bdb49e861c8abc3586e396fdff72fb1b30082b44eb6a48c4e5be32895a5e4a74642821b9025e8ec0b1d81ee7620e SHA512 63afa4bd18299965a4e5ae4690ece849a00d568cbae5bc4d7983f4299fa0755c5cced81a8d160820b3b3f1772c5b40d0e81d8ac2b4e784f4017400acb592ba65
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
index 4c76b5a66852..a8ce013b01c8 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 1ca48fda04b6..ffccf683cd2f 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -6,10 +6,10 @@ DIST pycryptodome-3.6.6.tar.gz 7137656 BLAKE2B 72a3dffa22ca4a90a6515ce0bb6939d4c
 DIST pycryptodome-3.7.3.tar.gz 9285823 BLAKE2B 6f215a3bb0337f5b7469d92bd2d5b5a19ab4e2c6a8f119411c3a5bcdcf93307752d99113866268b5066cceda6470bd0fbe81b1b2f9e30b5e5e569c77ede087f3 SHA512 b5e09c08cd252cad4d76249be84ce29e16a9bba4f2c5e81594c24d9a39df0f3fc67822698497eb9daa4cb6a43311c5d5a2543f187a5d5f801288596c2941f08f
 DIST pycryptodome-3.8.2.tar.gz 12441359 BLAKE2B 857b77ce23bafe8a296d6fc2402914491818b51142d2a08aa882a0d4e15899bc2b18a6b69ffa904cad406fb3ce8bf029404ea178532cd4580ce118ec03311cd2 SHA512 361909d479b3478b72f2723f2c94cafd4e9d50c2d4156535d217f0566c534dc27435f64e9ba0cdb8215c2c3d3800ad1e0befde95d9999eed481f33f9ed2ba318
 DIST pycryptodome-3.9.4.tar.gz 11575825 BLAKE2B c153fe71179d633a5722480c4c42cc133100f524a8ba9d3cd9380b7e172564c276b70b97ef36437fa3a149c418903802f410c9d1807d5d72345dffb0aa568223 SHA512 d99e4e431d77856ce3ae33526984cadf2fa6aa82b1f692a2ad0ae893f6a1e9538e6d71d281578e6bd733a816664d1683364c64441196cbc6ee1278f9d6eac62c
-EBUILD pycryptodome-3.4.6.ebuild 808 BLAKE2B b38ed83737b71e5a37c127ff797eb6287148c454016889e33251b1db22ed3ece1a72d37f9a4e205e0f7705505b94ad32377f2f235ba139b7432e7ba96837ec3a SHA512 82dfb29667405d80e1e4306d868eb4fbc7da0c5e4102a9f2ce5e350d7ab7fdf2c0b1b7239cb1f99e6abb81648391e81d78a9ce1335b8ef342b5edb93dfd30e07
-EBUILD pycryptodome-3.4.7.ebuild 858 BLAKE2B 90de20b7936a5d2802ffba03fc2a1ed9abb9bd5d46a12bca5fa6980e5c06a1f64217a5b493109a97710dfd64e42b9555a3bf675f18aac2e6722ecc608561aebf SHA512 f3ac56d33b51132bae232bebaf9b9c735dfcfbc1c8a3e5ec3609377dd484936d365f7d5d174038a5eb5bb8b4622fafe4062058f18fe1dd823737c68e54b4b9c0
-EBUILD pycryptodome-3.6.6.ebuild 891 BLAKE2B d48fa992eb58a2c596de398654e087497ff510b7ee0e4592724debaefa87dd5f78e508770a06432345c0242be9b5cad8ede7be8db6e26b97e64758a6f6ffa8d4 SHA512 c14d9fb1d5bf14ca5fa783db560fbb93a85697b1ff7ddb39a600d687ab0f0953355a0dde026f1523687297cf7e721a76e21f5442d52a3967a7d6cf41680e212b
-EBUILD pycryptodome-3.7.3.ebuild 901 BLAKE2B 8841b6eca574b455d87a54328645b3a165c1dc01e78599a5a74fa0e4c2306bd8344fb5d97c58fe4b8a26ede14d290e74f5a60decdda29894f0e352d0b84b3d9c SHA512 e9c7251640d19f618a465d370e028e450108bea8c2f2f58b09f529e74c0fa9b28ffca2e698bcab95755f87877b1c48f0dc08c6393bd0151060410ed96d591e1d
-EBUILD pycryptodome-3.8.2.ebuild 901 BLAKE2B 8841b6eca574b455d87a54328645b3a165c1dc01e78599a5a74fa0e4c2306bd8344fb5d97c58fe4b8a26ede14d290e74f5a60decdda29894f0e352d0b84b3d9c SHA512 e9c7251640d19f618a465d370e028e450108bea8c2f2f58b09f529e74c0fa9b28ffca2e698bcab95755f87877b1c48f0dc08c6393bd0151060410ed96d591e1d
-EBUILD pycryptodome-3.9.4.ebuild 1489 BLAKE2B b8ad92fa55e1d7155b46af1370be61c102bb61ae61522a1dfc0b7927b2b893df6136ddc54295a5500bc4f27f7069de6c9e33bd6704588a24b1e6d585f7e3f534 SHA512 80ccdd37620c8e15527344b30d054972f387e74e8575c4eef27a58a920656bf3c57467e5ee059786c641675f1806aaf6efbab5105ff382b6f563bc0f640f946a
+EBUILD pycryptodome-3.4.6.ebuild 801 BLAKE2B 18061cb2cebae82ccd6c695e424d891a46a833abd856473f63e0242531a04a11de20593c44ecd1d13e3021ab315087bb114eaf8db79bf414fdbc9a7eeae7e39e SHA512 28e15901398dcbbf61e669b22c46ef21e544fbb4f46984603d9c1a447f113de6f97440f7b2ee26bd43eabbc266ec5bbe6337793fffd42dcf77cfe01008cc82bd
+EBUILD pycryptodome-3.4.7.ebuild 851 BLAKE2B 05e1584574c422538e6c2832643c93ac8854a2267f9f317147c66dbce677d916fb04a74808136bc64ac332ed562736c6182b23e9c07eb2c663fdba468498ad98 SHA512 84276c577e41325b6ff729a48a2fc8761858c7e34e4816810751904468618aab09727d5ed347862b025739fd97557b8a35e66b111e925d7145dca33e4400595b
+EBUILD pycryptodome-3.6.6.ebuild 886 BLAKE2B 309f71f49b85bebaa2cb6f96e3e09a0e7ddf3525c5a4324692d691e24fa062f2f4a8f21c4c6878d7f7e3a2e5e238a5f2c5fb8e5e00be4d74494d157fcc38556e SHA512 0b338d83d78f5d60a8db2e0b400e103faa3742887db06f6c70b63de40e87a4514d7cdb8dddd09c54ea997671da8ddc49f8e31757bb56ccae9c1379fdd2218edd
+EBUILD pycryptodome-3.7.3.ebuild 896 BLAKE2B 006cbd8af847db6f283315b8c1a7c89837ab5db28dcbd0ee388916204d1a92ae2e32ed5c067f8b6748be98188e4c634527b4831e4d9becc82a3a3d1e9b4959d7 SHA512 57fc674100fe0c569c326125fc5cc53a3119d13d95e9cfbe110590b68a0c0c46b907745e24ae5b7d97e8d9be914c5d742262e11e1597869b543743d6584866b5
+EBUILD pycryptodome-3.8.2.ebuild 896 BLAKE2B 006cbd8af847db6f283315b8c1a7c89837ab5db28dcbd0ee388916204d1a92ae2e32ed5c067f8b6748be98188e4c634527b4831e4d9becc82a3a3d1e9b4959d7 SHA512 57fc674100fe0c569c326125fc5cc53a3119d13d95e9cfbe110590b68a0c0c46b907745e24ae5b7d97e8d9be914c5d742262e11e1597869b543743d6584866b5
+EBUILD pycryptodome-3.9.4.ebuild 1484 BLAKE2B e0923a3a310baa4b5ea404ddd9aaa62bafe5f408f5d96adf491d113ab2a4c427650d0c3cc8e7f2b13c26bd75c176752e83e25f7e0bb77b2d0e5aa2c8d1e1f17c SHA512 4e6fef644d0cba7c57998de5e3e780d460bc0f269aa726e24d3864d5f5d90961ae0267856d1d9fdc621da0529054b6bf1a7a153db1ea047f888c90d9b832c5a6
 MISC metadata.xml 335 BLAKE2B 7e5036b03371769db2f3a8d0cb5d5cd9078f16d4dccc3bd012f0d4f96ba960388c3025df93bb165f3cdbe05d73da05537a373e01b799aac2dc59dcd44e6206b5 SHA512 a94a7c0c45ae597e5c4ac672a5e9151851448371ddae0fdbd9967651476681440f2d4a6071e2cd0c4a1553038a92f4e6649f0554b636d58a025366c57c80e899
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild
index 5155484c553b..ca2e4bbe3e95 100644
--- a/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
index 2b5ba9d25e28..0f37040bf1c4 100644
--- a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
index cbeee86fe368..ddee8b4404dc 100644
--- a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild b/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild
index 9ed7187a5cb9..e07797edc91d 100644
--- a/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild b/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild
index 9ed7187a5cb9..e07797edc91d 100644
--- a/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild
index 00d860e0cd6f..e572e00ff8a9 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycryptopp/Manifest b/dev-python/pycryptopp/Manifest
deleted file mode 100644
index e6d9d75d6c79..000000000000
--- a/dev-python/pycryptopp/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pycryptopp-0.7.1-abi-change.patch 1777 BLAKE2B c37989ae1e9d2000208bf7d74a9a06953d2273db1ecd976d0726513fe0f74fa5c2fae858e56163929d15fbde7464c8320ce2a9a8d040a39050a7d72ba74efdfd SHA512 cc0730806c637d105c35beaa19c546c31a92126481eba087ae7e055ab794ab8bb3a926f862ae7fc75e9b505c8a2612db3e26dd104046c2503889e1aa9b6614e0
-DIST pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz 2009822 BLAKE2B bf25b9049d131b197352138624cc8d393e8b3b33f76e53b1087ded5cdbb365286d0db692a03eaf8c117981e95d1e2074dbbe49daeeba098c3f4a42e9625365e2 SHA512 bdd7d983bc0f8ef50c140a8da0c532883f0f1461d4a91d2761c872403133e9474d4fdbd78e275adbaacd2066cab4121034002a4730258162a618b3af913fdf7a
-DIST pycryptopp-0.7.1.869544967005693312591928092448767568728501330214.tar.gz 1992756 BLAKE2B 7b458d3143ad4b4d2a3f6dc385241f6ea224429c1b7e56d431dc11134ed12a8bf0c5420e079ab8f62db6fb405e10fb0edcd7bf3d18200445f258834970ac44dd SHA512 8b5996badedcd32345818f95e26487ac938c10e1790495515c74816075261a4fcedd2f80c55beddbdea54ed8899bc7c7b1a192468cb3cf434c50f9a68b65cc25
-EBUILD pycryptopp-0.6.0.ebuild 954 BLAKE2B 6a62771d8707a9cdbc9293cd548406a402f6dc3a462c14cb75bf74e143b20c1202f4f3ecab1f7ca3e95e5e782a5fc03f60a484450cc57976f9290414414c3f77 SHA512 05eb4ddcebc65fb36067867c0cca0c3be573acb5ca3e4829929539a704036058aac20ae94470a9dd3a256f2c64bd7e87352d80e13322b492f4c9db0ab8b32e5f
-EBUILD pycryptopp-0.7.1-r1.ebuild 1008 BLAKE2B 620941a0714191bce4d62ee91b852db53ee67ca6f49e064c6b488fc1f2fd73996c52d8a723a24672fb735e7a3a88ada4a9ac3363941521effd3d667dca6f0d31 SHA512 0413078388c6530cc506a477a8fd108ec8b477e8984dae72c3f93da8082a1e4c5a4edb58e0331f2ea9eee6fa5f572a81905d7701f0e43b52a4a35659e04d8cd6
-MISC metadata.xml 313 BLAKE2B 436153bae6b5708f1ec47d315a12328ea8ca013e983787fd41cf319ad4d92a934fef3492d13cd79caa44e6f5dc415eed4f06bcf6590e694bdb3e04eba7e41d2d SHA512 43f568076f481a7172565b251b4e5cd08567a2a0ec204713f9f1d892331d70be656694df66f47961289a99f0aac72733e75d3689054dd88dd52a6d055e19c0dc
diff --git a/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch b/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch
deleted file mode 100644
index d6edd2ecc630..000000000000
--- a/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://github.com/tahoe-lafs/pycryptopp/issues/42
-
---- old/src/pycryptopp/cipher/aesmodule.cpp
-+++ old/src/pycryptopp/cipher/aesmodule.cpp
-@@ -20,6 +20,8 @@
- #include <src-cryptopp/aes.h>
- #endif
- 
-+typedef unsigned char byte;
-+
- static const char*const aes___doc__ = "_aes counter mode cipher\n\
- You are advised to run aes.start_up_self_test() after importing this module.";
- 
---- old/src/pycryptopp/cipher/xsalsa20module.cpp
-+++ old/src/pycryptopp/cipher/xsalsa20module.cpp
-@@ -16,6 +16,8 @@
- #include <src-cryptopp/salsa.h>
- #endif
- 
-+typedef unsigned char byte;
-+
- static const char* const xsalsa20__doc__ = "_xsalsa20 cipher";
- 
- static PyObject *xsalsa20_error;
---- old/src/pycryptopp/hash/sha256module.cpp
-+++ old/src/pycryptopp/hash/sha256module.cpp
-@@ -21,6 +21,8 @@
- #include <src-cryptopp/filters.h>
- #endif
- 
-+typedef unsigned char byte;
-+
- static const char*const sha256___doc__ = "_sha256 hash function";
- 
- static PyObject *sha256_error;
---- old/src/pycryptopp/publickey/rsamodule.cpp
-+++ old/src/pycryptopp/publickey/rsamodule.cpp
-@@ -87,7 +87,7 @@
- VerifyingKey_serialize(VerifyingKey *self, PyObject *dummy) {
-     std::string outstr;
-     StringSink ss(outstr);
--    self->k->DEREncode(ss);
-+    self->k->GetMaterial().Save(ss);
-     PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
-     if (!result)
-         return NULL;
-@@ -216,7 +216,7 @@
- SigningKey_serialize(SigningKey *self, PyObject *dummy) {
-     std::string outstr;
-     StringSink ss(outstr);
--    self->k->DEREncode(ss);
-+    self->k->GetMaterial().Save(ss);
-     PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
-     if (!result)
-         return NULL;
diff --git a/dev-python/pycryptopp/metadata.xml b/dev-python/pycryptopp/metadata.xml
deleted file mode 100644
index b4a9e3bc1573..000000000000
--- a/dev-python/pycryptopp/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">pycryptopp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
deleted file mode 100644
index eb61b04973c7..000000000000
--- a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-NUM="1206569328141510525648634803928199668821045408958"
-MY_P="${P}.${NUM}"
-
-DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
-HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp
-	https://pypi.org/project/pycryptopp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/crypto++"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="NEWS.rst"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Don't install license files
-	sed -i -e "/data_files=data_files,/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	# use system crypto++ library
-	distutils-r1_python_compile --disable-embedded-cryptopp
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild b/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild
deleted file mode 100644
index 400c5ec5bc83..000000000000
--- a/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-NUM="869544967005693312591928092448767568728501330214"
-MY_P="${P}.${NUM}"
-
-DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
-HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp
-	https://pypi.org/project/pycryptopp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/crypto++"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="NEWS.rst"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.1-abi-change.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Don't install license files
-	sed -i -e "/data_files=data_files,/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	# use system crypto++ library
-	distutils-r1_python_compile --disable-embedded-cryptopp
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycson/Manifest b/dev-python/pycson/Manifest
index 96960b3914b1..75d3c1e9fe4b 100644
--- a/dev-python/pycson/Manifest
+++ b/dev-python/pycson/Manifest
@@ -1,3 +1,3 @@
 DIST pycson-0.7.tar.gz 9970 BLAKE2B 4ea59d558cd668b0ee074d22f19509056f5b39ee35289fb4de9123ff39472121a2cf57cba59888c43275c3a8ead2fdee2355b654aecad4fedbf796b478c02c06 SHA512 e8a48afbdd48d4250891d449c80f99bfc668e128a2784c1b951acd7e217cb66f6e527a7d417be3c5362930d426fc189cd3d0a7f4b2e41df351d2347f44d0e206
-EBUILD pycson-0.7.ebuild 487 BLAKE2B 575ad0051d2c184ae476685b85fb4e059ee9ef6e35e74e1bd2bf2612c07149415a83654b629f795ebc95874ffec01d92435f68a533406a73576c9d38b1c40d8e SHA512 c877c24994fa3eb2c4e2a79fe36a9651776de4e9e273d25bc18810e7272e11c0a938d6a69f7d0880ca7122c0113009a43fa27b510fcacd49682498393022b85f
+EBUILD pycson-0.7.ebuild 480 BLAKE2B a7f5155febcdc5c0593141691a2d6becace436505ee43d80fe92bdac21b6f07447b99e7e0681171a88878b96ff23aa5267f2928873e80cc0fbb4dbee315b0a41 SHA512 fbd73f3ffae4560197959b5601e4546e5e01bb9b6007cfdf5d1ba23c90e3eb0dd3c9cfc8c9a971361b7e6a41c6610d1be0739d0396b63d06ed4e162073c0fb85
 MISC metadata.xml 378 BLAKE2B 6219f2f67b53bfb416508e9d0701fdb719fa45f6748c2a31d4eb7df19cb80cb25f774c19bcdef069c65d34952839c06e3d597da3187d500eeedbaa3bd5fcb24b SHA512 7f3674a4976aa6c6591771922354183b1c448fbfd204ab9be0c160604f220fc3e6d483c155f8a06a47f7808e0ed79943843ad7ce5c03f3679808a58fa2377095
diff --git a/dev-python/pycson/pycson-0.7.ebuild b/dev-python/pycson/pycson-0.7.ebuild
index 9c5fe89fb5e7..b844e53db67f 100644
--- a/dev-python/pycson/pycson-0.7.ebuild
+++ b/dev-python/pycson/pycson-0.7.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 DESCRIPTION="A python parser for the Coffeescript Object Notation (CSON)"
 HOMEPAGE="https://github.com/avakar/pycson/"
 SRC_URI="https://github.com/avakar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/speg"
diff --git a/dev-python/pycuda/Manifest b/dev-python/pycuda/Manifest
index 76f959b19009..e1cbc068e10e 100644
--- a/dev-python/pycuda/Manifest
+++ b/dev-python/pycuda/Manifest
@@ -1,14 +1,6 @@
-DIST pycuda-2012.1.tar.gz 1473695 BLAKE2B c50dbc4b7b506f6bdee071d74b1c1617775da3a6904378ed5cdee3d56ea12803bcf5fedf4c8187520217b58e9a2ccb76fd559fa9365f3a44e6e88b6a1d6ea9b9 SHA512 bb8889fa46de3d4ae57fb47883232953eba0e12a53431fffdefb12af3134540aec2671f0f2fbbe1d836dab354d407e078e773e84f8ee9a5345400a4a59da7937
-DIST pycuda-2013.1.1.tar.gz 1586425 BLAKE2B 2d566de0bf5ee5d231f8f7089bd2921f6790653d9e0f142a951f545d84814963031506577c46fd466dc7d58bca451dc8b03134f5ab40e04d0ed5f74334d4235f SHA512 7a7e95fcd4f76d10234558021064cc299e6d93ab9a428c9560e5a8a73b13304ba9ccc3c103674a25effdc01a14aac21981a62de881a9c990ad16d7689b75e502
-DIST pycuda-2014.1.tar.gz 1588986 BLAKE2B 70baa81e8d1b77bcab73eeccf4d38dbe7cea1a8dcd73da4363eaecb87b68eb72b5c96733637eb5082ae81bff2aa264427c1415b9660df5cd95693d1eedc6250a SHA512 57e333941c472feea6974e583f9d27f7f5083011bd8a7cc0bc31d27032885a130f1f57a16b0730696c607b9dca32ad84b96c984cd82351800ec854acdfa8fe9f
-DIST pycuda-2016.1.2.tar.gz 1603373 BLAKE2B 35a5972cd4280cace9375314635131b4e8f0f397f0a3f799fd537c13fc2190ee183ab3b2248487f0c79a15a06031776b9c3bbff9ce2545090590d004ff97f0a4 SHA512 7a1a9d6723651bdc6f584de884c46bbaa17970e622b4d800c7f36ff57817807a51c7e4aa0a40872e46fc1243087af6dda07489bb60b6a33f52740a4d7a9e69a7
 DIST pycuda-2017.1.tar.gz 1608187 BLAKE2B 483bfd8e2da6d1c2dee9f1b5512e3f8120b29aa87d5fab49d7b1b738e9949aba14f87b102c5ff04cd2f2061c6c64c5036fdea71129e35505cce00ce76b6943aa SHA512 ce3de28de613352bec4efb86ffaa055f92ccd0c758b903aecc60af5b84f0f0643d04a869d6a23ce329c3d33670cfb266ad69c784ba917a190a11bdfea1fe6690
 DIST pycuda-2018.1.1.tar.gz 1612853 BLAKE2B 7afbcc33891da96d726f07f1686bfb9a28b4a5ce3dfc754707166556153f91a0fbc3454d50ca678ac56b71e8dc15e8f7b797e8ff025e42aa9eed2eaaa797d952 SHA512 cb93855cf3cee6650ba0564bccce73c2f59ecbd579235eb3623ec32dde8d9247216e756b1342a876fc7d37c0159e741f5f626a86f2e7ab11c4b03c7a4e581a28
-EBUILD pycuda-2012.1.ebuild 2381 BLAKE2B 6aa9514eee15afa8d6d33fedad130674562d9c47eb68a2fb8a3302589093f4e69fac222c23aaebba7b90b5f19491bf7415bd8aa2bbdfc7fa341b124fc877f720 SHA512 b7e97f367a10a2bc6671dda930e0d4a4e67c330d24687f7bdeb2e3da1cd315f27d9780aa2b68aaa2fa08c676765fd0822b23fdaee34dff8cb631602c136054cb
-EBUILD pycuda-2013.1.1.ebuild 2379 BLAKE2B a07bbd73f91ab4d2f0e893a144d33e7fe919459233646664d0f6c002ca8b4551f7f1ad69b6688873855ace71af1a59896b1dc76867f5bdd3247ffcd14c65698c SHA512 177737883a5e8ed9d6df5ee616eaaaebade660c1475405cb19ea092947044a507bf97a94345845b5a436f230f5a1aa66edc783f6df1831ae0476660b421698bf
-EBUILD pycuda-2014.1.ebuild 2406 BLAKE2B 731bed4eb8c2a42399e00a1d23db87998e9a3034815ced286338e2a79055cdcfd4be141eb1b792d75b485c1875ff22fe0cdaf706c45721ca5cceeaa1a0420bb2 SHA512 0024594eafb767f7817357635e41471cefcf29718e120bdbb28f827416e693bef9305ddc2c5e8bef6c5941e46c84452c6ff91901b401f6e8ab470a9ac497325d
-EBUILD pycuda-2016.1.2.ebuild 2326 BLAKE2B a66acc58f5da4f51b3ec7b9a08927c87c4417d6226eb0c7094dbe33669811bd5c24c09ea87e90ab99d2f8d54f6767ce4646e39cc21a62d89647d7f8f134907cf SHA512 07b0ba09dc92298ecb1ef0590f21e4142cea87b61727c75cbe40fbc82afdd4fe91ac360c933503332ab483e8f8722a957989abec553033df5df9a1d87436e121
-EBUILD pycuda-2017.1.ebuild 2339 BLAKE2B 9b4ae4bda3182444fdc74397a036253c511abde01fad70fde4fbde0d0e90d72cf255611e9224f44a64c7167a3013495fdc18323836ca1995a2b93c0a0d1622cf SHA512 e7b05683d480f147c1d984a58c3915e4d54924ec6873bdc499c72e995a56014b61b63ec3bf95958ebde17fc2b30d08e7e0b9c68019d198e5e340dc3a6ff067ad
-EBUILD pycuda-2018.1.1.ebuild 2355 BLAKE2B 65cbf787c59d81d4df0d0424f61b61b4616424272005bcebab1918300f8d34d69c621bf2eeb13db9acda48ca1a4b27d0ef604a52b4c03a85f3ee13c43b79347e SHA512 e2100c5542ea2e122cfcb217e95b35616516bb64a0d4f5d3c7472083651c7228a71ba3baa67288862741aa2e998c42294ebe8e7d9d11fd2c9907e1eadea84afc
-EBUILD pycuda-9999.ebuild 2403 BLAKE2B f0cc27bc203547a2c161b2965911766dd1172a13a9eb90273e83aa041d3aacd574c53e1162f782b8b4364c38333d9299970391d913229e13c9cee57c638e9bdc SHA512 200cf1db5eb845bb3025d21d3a9ae523885b1991ac92c109dcab096630d9135cf63acc0df7169b2d1b05f5069beabbffe68062622f2b97822fcdb67e13c1f11d
+EBUILD pycuda-2017.1.ebuild 2325 BLAKE2B c4dba688ff5b449d6927d77c0351fb4ad4b2bcc19333f43cb707da4bef770e7ebd159f4618b9b9bee234152822e3fbc18a11240dba1380c6859bfee34b975dc1 SHA512 d021642b6082361aeed18b880a552144d9224cc26b5cb51aaf46ea8259fc4c70d2a74acc5266677dfc826c9c4ee6b5b7d160a62397f9627a5d5a1ddf56a254d2
+EBUILD pycuda-2018.1.1.ebuild 2341 BLAKE2B 771004c137981e41e4b154b4ab085456e27e8e0b8cc91087ab88e7ef35bbdebcf8016266bbc13542a8af70855a92d2e568b3927e7e3e8b52eb18e26b41a9ab29 SHA512 27f3e4ea5ecbe0c79e2a9c3b2997f6604f09148394572e5e553450ea806d48e810a34dae6f74f7b62319b0a042dcac3c40d18b9d1e8b34e9809b94a18f79237f
+EBUILD pycuda-9999.ebuild 2389 BLAKE2B 23251e6d3c82c83551cd5544dcfe85141095ce2b873f9172dc49b0d5ae1b3e1e3919710bf92d62bcd6319ef28a0fbc85ee59d98525da29f9e1ef1f76e7f6959b SHA512 d4112f21be7938a65d8017e15f0242f491fb63460743c450b5fabc3e5e061db1700d74f3c383459032284f73a42dfc07ae0bb96d63b5f49a251c110ec47f031c
 MISC metadata.xml 332 BLAKE2B f880a8d2cdbe4271dc2f1e91c32419420b22e00c0d358832614aa970e95d979b10661953b35dda0b30a23d36b995364464ebd3bb1a862a34f33e7a84fa9b8e84 SHA512 2a2ba5f70d55593801948a9143fce5ddb2922da30fc7c1ea3ec21ccbb391a09fc34be961e9dbccb53d6575aa347878d105526d85bb7cc3f2f561f1793f0eee5c
diff --git a/dev-python/pycuda/pycuda-2012.1.ebuild b/dev-python/pycuda/pycuda-2012.1.ebuild
deleted file mode 100644
index 21e49e486065..000000000000
--- a/dev-python/pycuda/pycuda-2012.1.ebuild
+++ /dev/null
@@ -1,87 +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 cuda distutils-r1 multilib
-
-DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples opengl test"
-
-RDEPEND="
-	dev-libs/boost[python,${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2011.2[${PYTHON_USEDEP}]
-	dev-util/nvidia-cuda-toolkit
-	x11-drivers/nvidia-drivers
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv !test? ( test )"
-
-python_prepare_all() {
-	cuda_sanitize
-	sed \
-		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
-		-i pycuda/compiler.py || die
-
-	touch siteconf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local myopts=()
-	use opengl && myopts+=( --cuda-enable-gl )
-
-	mkdir "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
-	"${EPYTHON}" "${S}"/configure.py \
-		--boost-inc-dir="${EPREFIX}/usr/include" \
-		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
-		--boost-thread-libname=boost_thread-mt \
-		--cuda-root="${EPREFIX}/opt/cuda" \
-		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
-		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
-		--no-use-shipped-boost \
-		"${myopts[@]}"
-}
-
-src_test() {
-	# we need write access to this to run the tests
-	addwrite /dev/nvidia0
-	addwrite /dev/nvidiactl
-	python_test() {
-			py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
-	}
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pycuda/pycuda-2013.1.1.ebuild b/dev-python/pycuda/pycuda-2013.1.1.ebuild
deleted file mode 100644
index 46a77f6203c6..000000000000
--- a/dev-python/pycuda/pycuda-2013.1.1.ebuild
+++ /dev/null
@@ -1,87 +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 cuda distutils-r1 multilib
-
-DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples opengl test"
-
-RDEPEND="
-	dev-libs/boost[python,${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
-	dev-util/nvidia-cuda-toolkit
-	x11-drivers/nvidia-drivers
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv !test? ( test )"
-
-python_prepare_all() {
-	cuda_sanitize
-	sed \
-		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
-		-i pycuda/compiler.py || die
-
-	touch siteconf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local myopts=()
-	use opengl && myopts+=( --cuda-enable-gl )
-
-	mkdir "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
-	"${EPYTHON}" "${S}"/configure.py \
-		--boost-inc-dir="${EPREFIX}/usr/include" \
-		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
-		--boost-thread-libname=boost_thread-mt \
-		--cuda-root="${EPREFIX}/opt/cuda" \
-		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
-		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
-		--no-use-shipped-boost \
-		"${myopts[@]}"
-}
-
-src_test() {
-	# we need write access to this to run the tests
-	addwrite /dev/nvidia0
-	addwrite /dev/nvidiactl
-	python_test() {
-			py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
-	}
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pycuda/pycuda-2014.1.ebuild b/dev-python/pycuda/pycuda-2014.1.ebuild
deleted file mode 100644
index e72781d1161f..000000000000
--- a/dev-python/pycuda/pycuda-2014.1.ebuild
+++ /dev/null
@@ -1,87 +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 cuda distutils-r1 multilib
-
-DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples opengl test"
-
-RDEPEND="
-	dev-libs/boost[python,${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
-	dev-util/nvidia-cuda-toolkit
-	x11-drivers/nvidia-drivers
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv !test? ( test )"
-
-python_prepare_all() {
-	cuda_sanitize
-	sed \
-		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
-		-i pycuda/compiler.py || die
-
-	touch siteconf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local myopts=()
-	use opengl && myopts+=( --cuda-enable-gl )
-
-	[[ -d "${BUILD_DIR}" ]] || mkdir "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
-	"${EPYTHON}" "${S}"/configure.py \
-		--boost-inc-dir="${EPREFIX}/usr/include" \
-		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
-		--boost-thread-libname=boost_thread-mt \
-		--cuda-root="${EPREFIX}/opt/cuda" \
-		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
-		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
-		--no-use-shipped-boost \
-		"${myopts[@]}"
-}
-
-src_test() {
-	# we need write access to this to run the tests
-	addwrite /dev/nvidia0
-	addwrite /dev/nvidiactl
-	python_test() {
-			py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
-	}
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pycuda/pycuda-2016.1.2.ebuild b/dev-python/pycuda/pycuda-2016.1.2.ebuild
deleted file mode 100644
index 9875a9045d8e..000000000000
--- a/dev-python/pycuda/pycuda-2016.1.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit cuda distutils-r1
-
-DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples opengl test"
-
-RDEPEND="
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
-	dev-util/nvidia-cuda-toolkit
-	x11-drivers/nvidia-drivers
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv !test? ( test )"
-
-python_prepare_all() {
-	cuda_sanitize
-	sed \
-		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
-		-i pycuda/compiler.py || die
-
-	touch siteconf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	rm -f ./siteconf.py || die
-	"${EPYTHON}" "${S}"/configure.py \
-		--boost-inc-dir="${EPREFIX}/usr/include" \
-		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
-		--boost-thread-libname=boost_thread-mt \
-		--cuda-root="${EPREFIX}/opt/cuda" \
-		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
-		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
-		--no-use-shipped-boost \
-		$(usex opengl --cuda-enable-gl "") || die
-}
-
-src_test() {
-	# we need write access to this to run the tests
-	addwrite /dev/nvidia0
-	addwrite /dev/nvidiactl
-	python_test() {
-			py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
-	}
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pycuda/pycuda-2017.1.ebuild b/dev-python/pycuda/pycuda-2017.1.ebuild
index 7cffaca82606..74f9a3f6aef6 100644
--- a/dev-python/pycuda/pycuda-2017.1.ebuild
+++ b/dev-python/pycuda/pycuda-2017.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cuda distutils-r1
 
diff --git a/dev-python/pycuda/pycuda-2018.1.1.ebuild b/dev-python/pycuda/pycuda-2018.1.1.ebuild
index 23d3223f3ff7..ddf5f6037bc1 100644
--- a/dev-python/pycuda/pycuda-2018.1.1.ebuild
+++ b/dev-python/pycuda/pycuda-2018.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cuda distutils-r1
 
diff --git a/dev-python/pycuda/pycuda-9999.ebuild b/dev-python/pycuda/pycuda-9999.ebuild
index 5b3ba1b64de0..9e930995b6dd 100644
--- a/dev-python/pycuda/pycuda-9999.ebuild
+++ b/dev-python/pycuda/pycuda-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cuda distutils-r1 git-r3 multilib
 
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index 11e7cc396aa1..ced51bdf64c3 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,7 +1,4 @@
-DIST pycups-1.9.72.tar.bz2 52687 BLAKE2B 37d2bf2afc71b4feabbd5aac0c4dab49142a580b0b82d337709ef79a666ea2ad7942072f4f09923099626103a67f6b9a08a7972481ea28f7a88e13118e194d4d SHA512 db8b06378bf398073e34c89d62aa64cc8e56e93553346484c2e5dd67d046a3aa2f44020b68a7d479203fb2eeba005f8860ad4cebf72f8d7aa9aa15952a36d816
 DIST pycups-1.9.73.tar.bz2 52732 BLAKE2B a6c9750970548ba85cdef4041f716491e9b0cf4273cb5381bca8e57deab457affaa62eccf74d36eb3f8b047e5142c952e56e7e624f85ed7959a769f568824f26 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810
-EBUILD pycups-1.9.72.ebuild 1255 BLAKE2B 4568166dcf0935cc900039e6344e8df2ba984c447c75e301d535faa06bf04a2e1651bd69b75e606b3235305ac370848fa4a5631ee8548e89014af6d77f058d1c SHA512 9533c094c3cacfecd5124cdd313a7d4e5e9cd63b94f0f745873dcf2918dbc9723a5fc52c9517352eb7a30abeb3322a6cfb4616c88fd13b6535662d84b41f6560
-EBUILD pycups-1.9.73-r1.ebuild 1418 BLAKE2B 2b0df6b3662df5434fb39504a68799cb723308ee1a8d5eb7f41ebf9eb3dd901650725df96c0f29ab027fbe5698c42e05f24aef9e27c068ba9a228e6afaf09f47 SHA512 d6fd99175c6e8d03e73b70924e2a7f31daa2e77183098aeb3ff42afd3425610c1302f56d3f6249a6c5ec8475e796b7addc07e7d47868309265108967e173c7ff
-EBUILD pycups-1.9.73-r2.ebuild 1424 BLAKE2B deb2569eb5602f5348da8d72badcbea4439de4646ab8077ec11ae1910c2eda0b7e09754d49fa5d46d818a7dcbed46142e105c13f639d36ff90c8406996d762d0 SHA512 7f0d3b0dea815f6a1a28269386d6c36ddf98502e0698e4cba05f147f7fd1a808c507d62227fe94f91f3065aef397e3f8ca62f63b4baa6b14ae381fecaaba86f9
-EBUILD pycups-1.9.73.ebuild 1327 BLAKE2B 4c7faa8943c4e091cbadb1f039668b0d477570adfc70a57e8565bdfb342ccad308dbef8648abfe193513580ad66583b3bb4024b67fc96afb789aba64f296e1f7 SHA512 445e2fd1524f8cb03867f24deba97dac67156643feb7455aa699442bb100dcb7c713716a4ad8dbe901a4ddcc4341d27fdfdbc0884bc50bb094f51215f9b00b30
+EBUILD pycups-1.9.73-r1.ebuild 1409 BLAKE2B 648bb223e5d16dba790275b992bbe37d89785cf18db998f06dd3aff607ca1abb0943136df0e15502ab04105d3fdf3354f56cfa41c0707b996cb76eb1d0a01015 SHA512 17cdd261c35306de1fc93d8b62abc818b346c13c593257c7c9e85e33f7a5a71dc5b974c2c17062f4bbbac5b68c004c27e99900586cb89b650751f7673fb7e451
+EBUILD pycups-1.9.73-r2.ebuild 1414 BLAKE2B 68060b212b39f8cbec8fad18b6094f800e0464b9922c99ef1ef5dde54a26b15cf2bba513b5f5ce1241c1e0d4ed50f1beb0776be550dff96c0c7af2b858051cdc SHA512 d75f20cd92ff2df5c5d0d8472d58d6fb5512708000810757c2784ae2f390b8b8c751c155012256dcc95c6f828311c2ff7e32ffd49db148147ee6176a0f96eeab
 MISC metadata.xml 456 BLAKE2B ea7d7af9ed2baa3cb5270b3da9c5e1c6dc64d1391e0b280ddd1a6e3e8f3317808eb3906e1c9551615ac2218b89685b9ccbfb4d4656e80eeb54cf2d8dec2149c7 SHA512 c8318d150b07e8a369037201bcb9a99a7bc8c406a2a2889f4a1af62166313d4db740e8546f78f0de1e80cddf774f8818e49a4d3e99e906456ffc2f46a562e7ea
diff --git a/dev-python/pycups/pycups-1.9.72.ebuild b/dev-python/pycups/pycups-1.9.72.ebuild
deleted file mode 100644
index c7002ddb5e03..000000000000
--- a/dev-python/pycups/pycups-1.9.72.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the CUPS API"
-HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
-SLOT="0"
-IUSE="doc examples"
-
-RDEPEND="
-	net-print/cups
-"
-DEPEND="${RDEPEND}"
-
-# epydoc kinda sucks and supports python2 only (it's dead too),
-# and since we're dealing with a binary module we need exact version
-# match. therefore, docbuilding *requires* any python2 being enabled.
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )
-"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-python_compile_all() {
-	if use doc; then
-		# we can't use Makefile since it relies on hardcoded paths
-		epydoc -o html --html cups || die "doc build failed"
-	fi
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/ )
-	use examples && local EXAMPLES=( examples/ )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild
index 471e5ea80425..a4f5ad9e53f2 100644
--- a/dev-python/pycups/pycups-1.9.73-r1.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the CUPS API"
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
index a82ccbe95a4e..5cc54abd0a77 100644
--- a/dev-python/pycups/pycups-1.9.73-r2.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the CUPS API"
@@ -11,7 +11,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 SLOT="0"
 IUSE="doc examples"
 
diff --git a/dev-python/pycups/pycups-1.9.73.ebuild b/dev-python/pycups/pycups-1.9.73.ebuild
deleted file mode 100644
index 4701a3f40c30..000000000000
--- a/dev-python/pycups/pycups-1.9.73.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the CUPS API"
-HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
-SLOT="0"
-IUSE="doc examples"
-
-RDEPEND="
-	net-print/cups
-"
-DEPEND="${RDEPEND}"
-
-# epydoc kinda sucks and supports python2 only (it's dead too),
-# and since we're dealing with a binary module we need exact version
-# match. therefore, docbuilding *requires* any python2 being enabled.
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )
-"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_compile_all() {
-	if use doc; then
-		# we can't use Makefile since it relies on hardcoded paths
-		epydoc -o html --html cups || die "doc build failed"
-	fi
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/ )
-	use examples && local EXAMPLES=( examples/ )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index f45730e6dd9c..d5492c5557cd 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,7 +1,7 @@
 DIST pycurl-7.43.0.2.tar.gz 214212 BLAKE2B dae74be194334809048782de6a1adef8405e123464ffb0cad02d998d82fb59579d54bb7c5150895224d7622edfe4375f7b2336abd381270b5f64f44b09c8612f SHA512 8635fb33107c9351b7527036b8ab16d76aad72c2170643928034641770d07ab1507a8b2adc8b1a1dcfff29272f55cb00fee65abfcc0c639db14fdc20fc3a0fd0
 DIST pycurl-7.43.0.3.tar.gz 215003 BLAKE2B 2f1e61bd52873906a2d0480ab316c9026f2722cde14c059884ee552a2340fe6b646b4021326f72730aa9eed82f57b5ba923d19c2b8dfadb7a8f8819982116e7a SHA512 eec5c5f10b9a78bcf7e786368cdd5dc165faa4bb646df39ad52c1dfe8110e3e56456f5961f63ab7b460e51e56c41e66a0fc4652c8132411f1dee4074b3cffc00
 DIST pycurl-7.43.0.tar.gz 182522 BLAKE2B af6c85934565d851ea2280253ec6c61ab85f2dea047c83fc5ad65a6f05d3b8bf97932a161ae171c573a7333a99f2a25d4280c70be7ed3aef5eae19b5c392f5c7 SHA512 7442462c74c19964b9d72976e9b92bf68bb37debc1401bc399590bea42704065da13d6de710e795eeae79a4651b9a08841d50454243cb0994c7eb1c1bab233a5
-EBUILD pycurl-7.43.0.2.ebuild 2686 BLAKE2B f5be605c9ace2cce7a75b2b988ae0fae5f369e88bb784eb2453a7f38290a3dd770f485cb8d7f089df4a2160a7570ba5bf4a5918c7c7b40445b57eae238f578be SHA512 ea9f1018887539377b0f37a28eec3478d30f1f90d948bf1f78160b30d7e3f910663fe11e47081089bdb8228787e083c3bf2f9ad1df1bc7e0bd240869a0e168d6
-EBUILD pycurl-7.43.0.3.ebuild 2686 BLAKE2B f5be605c9ace2cce7a75b2b988ae0fae5f369e88bb784eb2453a7f38290a3dd770f485cb8d7f089df4a2160a7570ba5bf4a5918c7c7b40445b57eae238f578be SHA512 ea9f1018887539377b0f37a28eec3478d30f1f90d948bf1f78160b30d7e3f910663fe11e47081089bdb8228787e083c3bf2f9ad1df1bc7e0bd240869a0e168d6
-EBUILD pycurl-7.43.0.ebuild 2630 BLAKE2B 7dbb87bb4b0a2fa638f8786c17a44ea3391132f6e9264bf5be61b38878f518ef9a6bcc3177c97acee350164044daafa4e1f9592cd8df4d5c5302a724c30f253a SHA512 02fe1deb6708a5ba6bd985a9442f024ed8080727eee0e865cd4bf29dbf990fcda96f76c9082f206319a1135c7e34911cd73ccf0b5cdd5f7a55d4369104e9f19c
+EBUILD pycurl-7.43.0.2.ebuild 2684 BLAKE2B 32630309a398f22925bfe159d328d9c7f7224cc941b0e720c53e9103bdcf0138a4bbdc21c582c24782e7f13894c4a29fb90f2f2fb6122f1a7c83c600c5daf0f9 SHA512 9d80f4ce5c51267c32aca53570df9f3327c75ee157cd901e94b2091d93ea521613467f0ca9b02b9a16de72645d1cccb69c0a4c0489d84067d74121bc890b77cb
+EBUILD pycurl-7.43.0.3.ebuild 2684 BLAKE2B 32630309a398f22925bfe159d328d9c7f7224cc941b0e720c53e9103bdcf0138a4bbdc21c582c24782e7f13894c4a29fb90f2f2fb6122f1a7c83c600c5daf0f9 SHA512 9d80f4ce5c51267c32aca53570df9f3327c75ee157cd901e94b2091d93ea521613467f0ca9b02b9a16de72645d1cccb69c0a4c0489d84067d74121bc890b77cb
+EBUILD pycurl-7.43.0.ebuild 2626 BLAKE2B 25bfe246cbad2bcb9301f0e7713f644055ae6e9aa79c3473d473268cde2602d770453cb4f0f6175ce549f711692352a71c108b88ff9b0344b866f6739d5c7458 SHA512 d27e84799d20f781743f43413a398ef40df1d21ce25c512c47b0d7cf39ca39840663ecb1803060adfb1ba6c3d217dfd6a6d53e0f7e2b637294ada8cdee38f489
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.2.ebuild b/dev-python/pycurl/pycurl-7.43.0.2.ebuild
index d45df6dae399..965a025834d9 100644
--- a/dev-python/pycurl/pycurl-7.43.0.2.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycurl/pycurl-7.43.0.3.ebuild b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
index d45df6dae399..965a025834d9 100644
--- a/dev-python/pycurl/pycurl-7.43.0.3.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycurl/pycurl-7.43.0.ebuild b/dev-python/pycurl/pycurl-7.43.0.ebuild
index 2597f7462b72..66d7525dd702 100644
--- a/dev-python/pycurl/pycurl-7.43.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 # The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index 3ee90fb84d35..c49246364f92 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,4 +1,4 @@
 AUX pycxx-6.2.3-installation.patch 1248 BLAKE2B 8f91ad3bec34739bf3e23efda7b671d8be12a2fb6c9920b89f7ed582c81e9230475281efbd69361a9d1d862804144a4bc779caa01bf303c35d7d7e8b0ca60df7 SHA512 34eaf885611dddb4b7a650d9b2d162fbe559b5f0fcf19f514e1d9cf65e15944c43a9e0c988da815c00a92652495ef9a94a98634d11d9291d28b1f41289fb9d81
 DIST pycxx-6.2.6.tar.gz 141547 BLAKE2B e067d2a3f7ce58200c3b97f971692f64545f224929308c6e9a668a15eb775580060e860cf8ba1f894ae61320aa3454622f15fcc6fbdc601251c9b9ce576b611d SHA512 9a6c30acb99c112497c02fb0826dc0197bbf4b813d25eab3f7d6537dfd83db8150c94f617f79810bbcca64496b8d6e67b1a41446523d66031c54c21e0425ea0c
-EBUILD pycxx-6.2.6.ebuild 967 BLAKE2B f0d247bcf1586e903e5ccb64597eb9f999c289eb8f5787cf42d5b9a4f2d2f03b52b8125895452899f18f39407f3723adc31238e53b1f5df24a215d8ea2b7d704 SHA512 3ce2d598b8fd904d379f6bfa43d11c274481ce491c69a580a5772c0c60ccfdd05b054349054db0198dc4ff76a0d3117c3aa82d01dd9cc47e9ecdaa541c46117b
+EBUILD pycxx-6.2.6.ebuild 963 BLAKE2B bf2f0175e1d798e85090632dc2311a415acfa494a455be3c3e7e7c68fd11a99a29991fc844ca933ef17736ee2a10e6f799ccac536058ed1f24e33938e10f82c6 SHA512 4f431ca30136a8d3561c01942b652a61c07fb8e5a5e8d79d78635ff03f10883c44de57da4c03237a110840282b94eba222fc65d48bc7b1efaaf623d810600ff9
 MISC metadata.xml 623 BLAKE2B f58248b0fd25b697209c0dd07cefd240cc2bee7eb7ae8b76d3d2e7fa26ce9036e9478b8f07781821fbd2c666ebb4edc09c618d20cceb045acc5e21aac41b0658 SHA512 fbe60226b2e1a989e27652d9449105c6a188bf39ed07e0511901050752d1cd51d74a18fae9f794a341a3f6d772957757275b973a87cd49bf4745a87a509beb50
diff --git a/dev-python/pycxx/pycxx-6.2.6.ebuild b/dev-python/pycxx/pycxx-6.2.6.ebuild
index de59c9458bbe..f52cebdcd499 100644
--- a/dev-python/pycxx/pycxx-6.2.6.ebuild
+++ b/dev-python/pycxx/pycxx-6.2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index 317d1fdadec8..cc5bd3ee260e 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,6 +1,4 @@
-DIST pydecomp-0.2.tar.gz 9819 BLAKE2B fc2078b00f152e598599b1fc4b1239035d1d21789689fb49605a4c3afb6d9201a1b1635d6f1971edf98fef8de02caeb6ea5e6bae1fe2b21f546e8a712ca94949 SHA512 1cec8ba501cf6223740c50751508a83f474a9acbce811c82f6d8beb5536ea8ce9c1d04a218503acd13b6eec8d9a68ef4b712049a7e0ae94ff34ba05c6f50ebc9
 DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a
-EBUILD pydecomp-0.2.ebuild 956 BLAKE2B 5ed21c56f8a86a66c85fe9ad634292e01ecf2c27fd9f5559a5abc95f36016f581510795a4ccae11124720e3f96766d0527c22fe3d215b856e73e89ac39133d85 SHA512 69d1784d4890167f3bb369b144d5171db8fe586b2de7c981cc4276f607fee767cc48182e36403f7032c84951cebea25a0fb1dcda0071f6c74b01f4b03ca46803
-EBUILD pydecomp-0.3.ebuild 958 BLAKE2B a567136f6c8e6e838cdf9cbb95debe48b78ef259c0e65e5dc5a332783ed0ec142c1080503f6c1e047544c267c388e978639e9b45a1fc4d3e7a2a20c57f2d064a SHA512 16d1977904fd3be7286684ab7e233bee94d5d54c778d086d46cbd76fc797a8a7e3991fcb041f79d454bf328bbbd826da6311deb786ab5962c440c45acb81acc0
-EBUILD pydecomp-9999.ebuild 1228 BLAKE2B 35f189d55002df67d7a4d7f0b16bfa769bc2388fe00dd8ba2a1ebc9bb0bd58503f1d47e394f9ef9d5184698700dae86b2469f9468865ea4c60e1a6902ec02a68 SHA512 9a65faf540b70b7d1818f9b48d63adbcb7142136ecb8eae8792eecd695b3cbbf4a05a8d533fadf5ca9fdb9d47946781afe7db10c7cf7bd28e5a80751a0e7709c
+EBUILD pydecomp-0.3.ebuild 950 BLAKE2B bd4cab2ccaffab4fa752a475606d6abb3c913c0a41b58518e88cb7bb733fb056a0a537e06834ee8e77bd6634874d40eb1ba092b3f627221dd0619bdf228eaf8c SHA512 8c82f46e37623fa83b3e6b40fb8cf9cde02d30a300b9e97a494472ba89651270f90911ce4809c5bf0cc914dfbf23f312ee84e8e5d52f87ed1402ed7f19b9bb06
+EBUILD pydecomp-9999.ebuild 1224 BLAKE2B cd334838d8bec6255bd53631039aabfaac20411da3e7a41bbb3759251224bd4d76f08332ecc00084e6e7641c54e5e0096ed05b1f09d883ef31dd2c35923d2bfc SHA512 bdf973ba90d702b015447fd5d91e87a7461b17e114cd82186142ed17ca4342332f907cbf026c5b0f2053210ef5131819f9b7c7d7b123d4cb55614f6d39fcd528
 MISC metadata.xml 690 BLAKE2B 4fea9b06a19ceb9616513e452d1016972ade5c78bdfddb2b94c5d6c4b9884d8c2a379a9874ac5a4dcb7d1e9373a030fdfd1fea8c91a6e21ecd723d04e85a247d SHA512 ec9167bab90e021522941252d9f523ce6040adcaa337b4bdd31495867ac64cdb8ff919fd0928e9ad8e2c12cac45555b805cc7d9afab059e1a20b014fd8c25707
diff --git a/dev-python/pydecomp/pydecomp-0.2.ebuild b/dev-python/pydecomp/pydecomp-0.2.ebuild
deleted file mode 100644
index f75af0f4302e..000000000000
--- a/dev-python/pydecomp/pydecomp-0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 python-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	S="${WORKDIR}/pyDeComp-${PV}"
-fi
-
-DESCRIPTION="A python library of common (de)compression and contents handling"
-HOMEPAGE="https://github.com/dol-sen/pyDeComp"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please file any enhancement requests, or bugs"
-	einfo "at https://github.com/dol-sen/pyDeComp/issues"
-	einfo "I am also on IRC @ #gentoo-releng of the freenode network"
-}
diff --git a/dev-python/pydecomp/pydecomp-0.3.ebuild b/dev-python/pydecomp/pydecomp-0.3.ebuild
index 868f1e046158..dee7614b55cc 100644
--- a/dev-python/pydecomp/pydecomp-0.3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 python-r1
 
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index f9d93b445f73..a301c9b23467 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 python-r1
 
diff --git a/dev-python/pydiff/Manifest b/dev-python/pydiff/Manifest
index 55ed3a7fcb7b..5d447cbb2f1e 100644
--- a/dev-python/pydiff/Manifest
+++ b/dev-python/pydiff/Manifest
@@ -1,4 +1,4 @@
 DIST pydiff-0.2.tar.gz 4108 BLAKE2B 868b9b31f96e49a4e375d2933fc158845ced4bc561816512f41c85dbd6d5373567a51153dedc527826ef2d03306288e3255d300fc2b400e28983e6616eec6a25 SHA512 0f55edf17138c4a1894a1ca03db21e6d6d21fb3961a2738c00d59e05d32a006413aee04005962f1ba6628c012bb018d43fcbbef50665ea10d3397539e5d3def1
-EBUILD pydiff-0.2-r1.ebuild 487 BLAKE2B 20e205c796fac7d981e955d37b6f0f621bd9fff3c08ccbb169e1073008da6d189ba1e83b5e85d6b9075a4be92ef39db91b64b24b8de8b916981b7f05a55fc334 SHA512 54201825e2703035549a597d3fce76280af4a74f158ad71798cd71cd70015e1ae354fe3cc889884d5b60a159285b954e0aca5e2bc58b05e95d2728011ba46ead
-EBUILD pydiff-0.2.ebuild 483 BLAKE2B 3bfc27445e4b8452b5504e2f9026b6e188b4eb195a987bcf11330efee4ba0f3de59d34828528b1542586a7124ca80066ae42cc47f2c682dabf00fec9b42c9268 SHA512 27e9e4c3905b1854f07847b1e649be96fb97ef210fbf7afc30d927fda0517b3048a09e66e4ca54429ac4571337913c060fe37094acf105049a4bf03344cb153f
+EBUILD pydiff-0.2-r1.ebuild 509 BLAKE2B a8195c38f6beebd32c9daf2b6db23239c20ce385da9ecd90634f11a2e106e947f2b358dc88b39f2887e1310aa1597b68c6a04640833a49e0be6657a6e452a94e SHA512 16e0b41ce6749b95a302d64e57cd5b7833e1e085ba25b8f25603f47c2bcbadd77cd4cbaad564f353c04cd7c3000cd92272ad9316ba6a1f2d236006680ca66404
+EBUILD pydiff-0.2.ebuild 476 BLAKE2B 31b0d353e9d2313e28c5703e6646c1c390dd4c4565cc8d05b3a7b0e2c29e8b5f8657b37401e43742af8cc0ba37f813268a2253d92ab3d53897df3fefeaf4b457 SHA512 e7b0056db1bac48c2359827f5745a4b46495b59ed8792855666ca5ee72e8754986b8f187718877d4e31a7db640800dcdc48a218419623f6ca42fb9f3c60b4882
 MISC metadata.xml 373 BLAKE2B 8e20b47c64105d9f29c7beb15868eee311dc1f6bc49645729b780629d1e7d26ea7296f0768b29de4f4cb9df2e629d25d100409e646f30f336608a7996364ba34 SHA512 cc56455c69ef9816eecb5ca62fa6f660ca124cae7d62d58006133a9d9af79aa4bc45e572ca1d2cf5d9b64c7f7617f62b94b573b65d799327a2088e1f80902402
diff --git a/dev-python/pydiff/pydiff-0.2-r1.ebuild b/dev-python/pydiff/pydiff-0.2-r1.ebuild
index ef7201dae570..3d0c4fe0fba6 100644
--- a/dev-python/pydiff/pydiff-0.2-r1.ebuild
+++ b/dev-python/pydiff/pydiff-0.2-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -16,5 +17,5 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 python_test() {
-	"${PYTHON}" test_pydiff.py || die "Tests failed under ${EPYTHON}"
+	"${EPYTHON}" test_pydiff.py || die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/pydiff/pydiff-0.2.ebuild b/dev-python/pydiff/pydiff-0.2.ebuild
index adc543302a83..779565241015 100644
--- a/dev-python/pydiff/pydiff-0.2.ebuild
+++ b/dev-python/pydiff/pydiff-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydispatcher/Manifest b/dev-python/pydispatcher/Manifest
index 9ca0e39d7513..4a86d6e87fce 100644
--- a/dev-python/pydispatcher/Manifest
+++ b/dev-python/pydispatcher/Manifest
@@ -1,5 +1,5 @@
 DIST PyPyDispatcher-2.1.2.tar.gz 23224 BLAKE2B 881e7063e61f80ed08f2e46967c7cf7e35d9687025a55d9b446e034085a09627b75263519c16ac64e0cbd9f84e822095f89ecbc52e95ed23a65fcb50d4e90d52 SHA512 a8a94a68551e72da2703a4f7fc93296fbffe78518ff363930125874a2a65dbbe4fe9434e910e0d019fb653785e41d024fe2c9d5bab5072c3989dd2a61ffcb708
 DIST pydispatcher-2.0.5.tar.gz 34437 BLAKE2B eefc2e0f22c9d91b22acd1352d76f1bd69d7161efdf0827f1bcb42ccf0a5c98576dbc25817e0a6c4cb3327b5fad39281cd19a784f0f477ba1b20690e644e867c SHA512 b361463f006a775e1f22cfe07520951649f76c26be35a80ca016620c8ef466129c4abeafe42f0ffdc605e7523287b1e804967f19d951089d24e052fe10d88e6f
-EBUILD pydispatcher-2.0.5.ebuild 968 BLAKE2B 96a9a01469c1d471b49b0b4f649054101ebc0a9872bc8987fdae91c43e4457137c11428ef4cbff76eedff86dd6f9c577241795c9c9b17582ad439c881775146e SHA512 8613d6d4193f9018dd16093207539a0317f60391a21a503041a38e2ce4b9c0c0abb66e27a1b3cbf37b35eaef5bccc4049e06cbd539159cb1f42072962daf14a6
-EBUILD pydispatcher-2.1.2.ebuild 886 BLAKE2B 00f736d821455b4b573256bc63595f4aec70a2da40e009c9afa847ab9ed3e612bdec3761677cf6d0d9546d41769bf9787cc08d4492477857272e67d14cc3aaa9 SHA512 2577b94b73c492be4ad78b506995b45b83b8679e7f134d1339a4a84b54756d45577a21dc9ec929d07a0fc7ac05612dfc0ce7f58864f107829f12618e021e665f
+EBUILD pydispatcher-2.0.5.ebuild 954 BLAKE2B 20f0db36b6136753d23cf5987e8309c96d1dd893cdf5800e29aef7550a4eb40b488760d960621675ac7b9303ea3aa7cb8ca83d56e78983df099e1e0d0ce93c5f SHA512 2c3d57366b8d090b39aa2d7c1ea0e118df0a161b4df0248fb1f717945cbdf0706f8d4f8ce8be5c6b2f44c721cb694ce23876421d0fb80d89df30684f61c44bfe
+EBUILD pydispatcher-2.1.2.ebuild 876 BLAKE2B d66274296431e3df34c8df3bb4989a0f916e1e54f5af6adac3be33766cebc15ee5a0f2d75b3901be0167e05601f19f7a99fb54d0ea6ce23eec1c7aaa711ff266 SHA512 031c827589240b0ddbcc0c2b72e88a010c37921b2c33b185a0de360cb8c4acf692569309392af0966122afc0b46176d11ad7d57af6d1ab212497b7d0229de0d2
 MISC metadata.xml 541 BLAKE2B bc7fa8bff7f371707fde69ad7d027f569dab8f3efd8838f9cb3ec19551beaebfe6508ddb5cc7f84f66e919323d18038fb1ef98c0f92da1f090fa5a1170441801 SHA512 7ce92eaf53bd85e61e51e88727974b9c0c473cdc4fb5a427c7997576499592bef3d6a0ac97d210d1a8f99c7252fa9e1e9219291475b5fd4e6dd21d44a072d515
diff --git a/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild b/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
index bc07d51f002f..e37ed6656def 100644
--- a/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
+++ b/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild b/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
index 26c4e9f49995..e74f7a264c95 100644
--- a/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
+++ b/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydl/Manifest b/dev-python/pydl/Manifest
deleted file mode 100644
index cb19e8b66003..000000000000
--- a/dev-python/pydl/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pydl-ignore_entry_points.patch 552 BLAKE2B 755300f18bb7c18b2c0b2a92e27062775829b063da91eeab8e293308892ed8c1706bd908825443c18be331d26a9b1e59e2f9c9ccd7b83ea387771dca4c50c4fc SHA512 519d3dfef8c09f4d38cc4c4280c3a48c31201badd8c927d905f052f3245eca17e3c479d98b10d3304f93b78049d02758402252910934113d35290fda6e78790e
-DIST pydl-0.5.3.tar.gz 687705 BLAKE2B 3aa7e3c6bac5fabc0326cfdcc3cead4b12395d496a1aae95c6f60906f11635fcbdee085f3a5412b45c499c49daa88e454b78b70217a3ceab7effe64a7ec8e96b SHA512 6a18fabdbcfe84e296289c41453eaf549ab7a56f9fcc11720359cf284ba99075e5ec33539ce32118c6982ba1b3a72b54fa307f7fec21adb5b317bda0a9de84d2
-DIST pydl-0.5.4.tar.gz 697024 BLAKE2B c8a078b6dbe5ea26cca5fa26909b869730b753a7ef842a1610182296b53a6f28ac3e7b41ebda94d42217d324e88cce498928976477552a1aab070cb32a61338e SHA512 9a9d086cf42b8cc4364b0079b2af17b1b25090865cc99badef78380b99cf6e2ff0de514ff17e60536c62f85a0bf613a52530a10ab4eb45984a0c45969d332682
-EBUILD pydl-0.5.3.ebuild 1348 BLAKE2B 87d4df9e8afba34db6ae599dd472dd5eada9a969ce17d17f1c7e9cc566bcc4f681f56bc0caef3b3d7677de2831287f709809290eaf9054ce7c3b8df232230777 SHA512 e1bd375807e967b75f760e7af5c57c9b36352f7ffcd312a49fce8e6f1b646ebe6d3c806f7dbdfee247cad76fba34fdc69da207481010974790cf7e20beb003f2
-EBUILD pydl-0.5.4.ebuild 1352 BLAKE2B ec4c7b3ead44589fc550c4c0c9f25a123879a1018c3cd3ac97423a322a5e31be46cc3cf354f78f0e5c443ba7afee50aecf7cd0bd1a5960c5eadcd7e0029d45c1 SHA512 78a34084910a1b6b936747b4354658bf5ede1a2164af2f5a8a975f5b0bf2ac5967f83879c4c9f8f064098d394f7632856a38e6e95203a0b9b9bdb09145b0dffa
-MISC metadata.xml 702 BLAKE2B b209982ccd9b39018e6c4abcfcc0687d179499383f12326ee5e4d311f7bb849416f4236b30622be6dfbb3ac7f1a33b9a8d0feaa26c50ebeefff0756d07a834c3 SHA512 8cbcc10035c042dc6e50952605e1049a07a39db7ecf4ae47752b95004260ace7650d00d5727bb5a64836817af28428d7336afbcff0dfc4bb75f39b654a2cf4f9
diff --git a/dev-python/pydl/files/pydl-ignore_entry_points.patch b/dev-python/pydl/files/pydl-ignore_entry_points.patch
deleted file mode 100644
index 26b3abac6538..000000000000
--- a/dev-python/pydl/files/pydl-ignore_entry_points.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Vincent Prat <vinceprat@free.fr>
-Description: Ignore entry points to avoid creating executables
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -31,6 +31,6 @@
- github_project = weaverba137/pydl
- 
- [entry_points]
--get_juldate = pydl.goddard.astro:get_juldate_main
--hogg_iau_name = pydl.pydlutils.misc:hogg_iau_name_main
--compute_templates = pydl.pydlspec2d.spec1d:template_input_main
-+#get_juldate = pydl.goddard.astro:get_juldate_main
-+#hogg_iau_name = pydl.pydlutils.misc:hogg_iau_name_main
-+#compute_templates = pydl.pydlspec2d.spec1d:template_input_main
diff --git a/dev-python/pydl/metadata.xml b/dev-python/pydl/metadata.xml
deleted file mode 100644
index 9c578b94db55..000000000000
--- a/dev-python/pydl/metadata.xml
+++ /dev/null
@@ -1,18 +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-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-   PyDL consists of Python replacements for functions that are part of the IDL
-   built-in library or part of astronomical IDL libraries.
-   The emphasis is on reproducing results of the astronomical library
-   functions.
-   Only the bare minimum of IDL built-in functions are implemented to support this.   
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">pydl</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pydl/pydl-0.5.3.ebuild b/dev-python/pydl/pydl-0.5.3.ebuild
deleted file mode 100644
index 8d4d15bffbe5..000000000000
--- a/dev-python/pydl/pydl-0.5.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Library of IDL astronomy routines converted to Python"
-HOMEPAGE="https://pypi.org/project/pydl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( ${FILESDIR}/${PN}-ignore_entry_points.patch )
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pydl/pydl-0.5.4.ebuild b/dev-python/pydl/pydl-0.5.4.ebuild
deleted file mode 100644
index e70826192771..000000000000
--- a/dev-python/pydl/pydl-0.5.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Library of IDL astronomy routines converted to Python"
-HOMEPAGE="https://pypi.org/project/pydl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( ${FILESDIR}/${PN}-ignore_entry_points.patch )
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pydns/Manifest b/dev-python/pydns/Manifest
index 998fce02f63c..343d474f1a3f 100644
--- a/dev-python/pydns/Manifest
+++ b/dev-python/pydns/Manifest
@@ -1,5 +1,5 @@
 DIST py3dns-3.1.1.tar.gz 29981 BLAKE2B b8f1aaeb95764f4d332ec05a367557a24fdd9171e98349668995687052cbd392169a76aaf24e3d29c94ca1c232f04842b84a2320eab5e553de12c278af23975c SHA512 5f22ba12db502f997be4c2479697cc21fe15aac218da1d347bd400a3ab73d86ad32b57740292a10eacb73e07eba977f67b881e59be16f902afab47053efd6c6e
 DIST pydns-2.3.6.tar.gz 28220 BLAKE2B 81d48c57bc90641c2e1667a951e3af3dc75dc1055e6f3f7b45e57d66bb1d391fc55ef0fa9fd261821de22c9119564cfc2b5a18f7a9780fe708b676c427824261 SHA512 261598c085c7d9f7adf5ce881814e444cdcf48a946dc17db467268ab6164f6045c204507cc58eff8e6f826b9786715ad2a9e766a72193ac8666969913180954b
-EBUILD pydns-2.3.6-r1.ebuild 1145 BLAKE2B 91c22bffc1e37f981dce98784180d81869ae6006ecceed2ceae6588c252aa48e00f9151fd1632688cd6cc9719270c3479319442618fc2f142cec43b5736ec274 SHA512 4a0a0074b935f4ab2c4a7a635be6e5132c0e9b748dd7cd6c6213de760689120b6f8223c2a4c98f16aebb515c1457126ae610a0e7a5957618eca1fbca6f3162b6
-EBUILD pydns-3.1.1.ebuild 856 BLAKE2B 5e9a4ff6225776aafb8483d3b9eade560cdb2e3169cbae956992e0b85a4f7bacd2445945b801ce4f29842dfb15c8be2c596209063b571cd6c8e1671bf696bd8f SHA512 49f2f4b7df897d21e3b639490a192432beabd1b80891aa55fb4c14020b00223328dc1b4ba7cd356456a853b44c9c45ab1edfba74c02dcaf815d78dcf7261ba2a
+EBUILD pydns-2.3.6-r1.ebuild 1137 BLAKE2B b98b4d62d8d24136087858db5320e045de5f51aa3609cd8054165df06f7c1d2a4bed381ea090115fceed8784ee83d4c91122179c40e0a36c61a924baee66c824 SHA512 acf34d8d755a95097f370d0ffb10ae9af4c4ca9f6050470b9fd89ded6d89944e406feb113a69908b17b47d37ec8ac56035648cfe1af273943e5455160522e392
+EBUILD pydns-3.1.1.ebuild 852 BLAKE2B 5a451ba543f9eb08ef3e3f930f527786bb5de0f183c4f3590743ccc01c2188be828c46a2af4e73f612dba5545c0ff08b7c8ae023c81d15338fb9aa803d1411bd SHA512 b172a708106855e9ac0ba8590eedae84337614c04dfbffd8f0e524b1051dc90cb3cf9c60ae77a4290f744636bb9f77a32be1260cf7613f0c1ef9947e3cb913e4
 MISC metadata.xml 662 BLAKE2B a86ca878eddec2ae971f3fdbda533d9fff639c7619aeb25997bf335de25d0738c9370a1b68d6e6fd8fe5eca6237d124a0fa629c048ba9e1772b42e42a1b0edd8 SHA512 a87cafcd69bb347d9737d97589211360b71181b80caa73c4f117790596f5482e0b3177dc712eb89afb200c7a56669eb8a805f7c3f4974f9527dcaff8c4cbc821
diff --git a/dev-python/pydns/pydns-2.3.6-r1.ebuild b/dev-python/pydns/pydns-2.3.6-r1.ebuild
index 5299102538ad..8d5bc650d791 100644
--- a/dev-python/pydns/pydns-2.3.6-r1.ebuild
+++ b/dev-python/pydns/pydns-2.3.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydns/pydns-3.1.1.ebuild b/dev-python/pydns/pydns-3.1.1.ebuild
index 1081be8d6898..a762d33ca2de 100644
--- a/dev-python/pydns/pydns-3.1.1.ebuild
+++ b/dev-python/pydns/pydns-3.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydot-ng/Manifest b/dev-python/pydot-ng/Manifest
index bb7abc56683b..7dc7d72fafe0 100644
--- a/dev-python/pydot-ng/Manifest
+++ b/dev-python/pydot-ng/Manifest
@@ -1,3 +1,3 @@
 DIST pydot-ng-1.0.0.tar.gz 263582 BLAKE2B 1cee6c94ce831e4670e65c8031331a25ca123a7d794636a1f0229a9082ce2945368c953efa46ed29c91c7c51e3e0f28d931d7d5309d34fd74dfaea3c46281331 SHA512 b0570a63f89f8c192de93e13f39d715aee987a62476ed0b4d378db0148ba3884c6ea5de6f4035dd92fce1d140b9900630096bdf408037cb430a08b561242e724
-EBUILD pydot-ng-1.0.0.ebuild 788 BLAKE2B 06901ab42ed648e72d5ea85520af3f1656a480698288e47b629e45a6dc4d526e418377a0aaf7be7e1b97748c345b3a9a627aeaa4b2ee0815b30d2d6435345433 SHA512 5a27b9a081339b5a77c496e5740e1918a40b618c6d9e26307c78eddc092578f39f698b59aa051a9fcffcf42b3f06236f53bbcd2f78ce50d030ba3503dcf1ef5e
+EBUILD pydot-ng-1.0.0.ebuild 774 BLAKE2B 524d40c219054089d81b0403c967cfcc50ec5cff2e0f842403ff23804b5ce59ecbc1d241cfe0956db36566791b1c32712e333d518c4e0c32f4bb3f97805884ae SHA512 e1710eef18894c953d3ebbab9f4eeefc9ab9e00fac187230103358eca2fbd7b9703b9c4767808cf1cdceadd251bfe9c51337cea370d0a9e2a87cd1d0ef4065d0
 MISC metadata.xml 464 BLAKE2B 04ac34e87d03f814fc37ba246800d30e75809e99feef47528f2c774edb8a747de169f966deea451a4f10f50dbffb84d98af27069051145070d90258388ae5993 SHA512 cde32dc44b04826ae3212fe0264c42a3943f81fea26d047a02de189d2d0ea19eef21b2949438792fc3124c26d03f52f296d51c4d286b84cc70c0a22140cc1fa7
diff --git a/dev-python/pydot-ng/pydot-ng-1.0.0.ebuild b/dev-python/pydot-ng/pydot-ng-1.0.0.ebuild
index 43f686a4a12f..fe6afc08b1be 100644
--- a/dev-python/pydot-ng/pydot-ng-1.0.0.ebuild
+++ b/dev-python/pydot-ng/pydot-ng-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 741debd64f9f..6569f8c1227f 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -4,6 +4,6 @@ DIST pydot-1.0.28.tar.gz 19711 BLAKE2B 73fa2a614de998d4b53065a350768dbf1c0a4aef6
 DIST pydot-1.2.3.tar.gz 262660 BLAKE2B b5acfc365f7864c2b1fb419e5d4624ebeabef2e969dcf545668062ad46b33de5b5ee65271ac6b0fe0abb48df83f6c24bf3598798eb8879a998c06d91b6a5ac00 SHA512 0527279174bd9d5703131ab6c16365d66e392e27597b5d2d536d43f783a59139913a6dbfa1cc022993f842843f5d79e4e0b2a1435ce3427ebc534ef7b1ef2e9b
 DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac19a6c197ab1725f92c87e973c2dcd84d4c6c04cb2ca76b8f40814cfee1d5a53e4952065a538fc271e75d2a0 SHA512 b5f16b59908586df61cd415cb1a3e242fb69c39674a82b171862beff1f3727f47cba39bdd806901cb56bc8a6888783a53d112b1b70044e124ea992789d77f938
 EBUILD pydot-1.0.28-r2.ebuild 715 BLAKE2B bb5e42c14060af3919cd62963de8b1ee13581b37f2163c15b99869440a4be2af2f5e27251b0a159b064c7039a6970f470e7b926c3b6438ccd7d55f5933365823 SHA512 374267a45cc3ac12b170620ee639481f8171783b36c7cd24a470b51fbe36c82e38c6af8c2609d6779aafd0b0bfc09da25e221a43fbb5f61210f3549f22094ecf
-EBUILD pydot-1.2.3.ebuild 921 BLAKE2B 0583f728ccff24c5b9fc8894c5ef5daf6bfe308705ab244d4ffa2039372482bd0158b8c78fe6ef1419419700a11307622fe7d7d774c9eda8a0906ad444577396 SHA512 c5f108562a8d9b7971ee6a437e26c5669635c2dcff98ee523a3baff7d994522a9842c613d0c751c3d8fad0404c192bdb67a06c96f55eca6fec949fd3358d8293
-EBUILD pydot-1.4.1.ebuild 931 BLAKE2B 4ed6acb91ae8fd2c6244b4c5038f990c707f6bfe5a65a2b649f811f30ccc9c063fab38ad81bb978197390d0ee3ab73d65d0b6bcbf6073c77934b867635c2321d SHA512 f12cf01cf5ea292891cad42c12a834a60907bf70667934e5158ab2f351bba7a73c48d2a282a70319ed6d2d93b8d1dc93b5a0df0e4e8987436903a5791698c0cb
+EBUILD pydot-1.2.3.ebuild 917 BLAKE2B 946d5b0b27eecef742545a99a53f8e0405c520ff83299c3e7a350d7af559210db288e79783798c6ac3560e5d3b6428380e6b81d92a10a1bc099699a0ec0b29f3 SHA512 648a80890d1b2bc50302937ad2dae65ad56e1d3b71ce048e2d8322a389ebdd2c0750c08be0e595da8fdb88f23c1f34304445440e16d8149ffa8cdb950bdec61a
+EBUILD pydot-1.4.1.ebuild 929 BLAKE2B bbed83abd491faeee1e03360a22bfae3d5cc2afcd561949822af64b7c9a4ce5e1e075635623a6ff7f7e3e109a855bc66eb5ea4e74f58036096701a4949eea88e SHA512 07878f4de05d7e0cf7410e3f17f4842df06cab73641e8479d34847fa9094446f58c4eaf3fec11a86ed5897e7053593152bb8a272f8cffb9a2be4911ec5c140e6
 MISC metadata.xml 376 BLAKE2B 2118896ad9769d359f3d1573285cc61affc3989d2ea81d0914e01b5e8882ff94fd70a06324ce3cdc38146edc8513aa67457dc65b81af93474568e9a1b3b23c47 SHA512 0f67a0286f6ff6c6b35e67ff08abb0b86f9ac60e57d321ac7ca0508383b5ce8b0c091a3b023e87d20f3705887db40a5edde2055fa96ec7bca21a5b8aacac31ce
diff --git a/dev-python/pydot/pydot-1.2.3.ebuild b/dev-python/pydot/pydot-1.2.3.ebuild
index 7d152dced086..567b94376cf4 100644
--- a/dev-python/pydot/pydot-1.2.3.ebuild
+++ b/dev-python/pydot/pydot-1.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index a814e4075a50..30c027800711 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydotplus/Manifest b/dev-python/pydotplus/Manifest
index a6938e660a47..e56d88d8817c 100644
--- a/dev-python/pydotplus/Manifest
+++ b/dev-python/pydotplus/Manifest
@@ -1,3 +1,3 @@
 DIST pydotplus-2.0.2.tar.gz 278677 BLAKE2B 879271ba7e2104134a71caef7676082420770dcdb34aeabfe76232ad8f9774d3e90a9f7ca5fb407a7a4e8e0c4e5e01824bd0d5936fe77554cc661839fcc0dc7b SHA512 6f06a1f284401123a4514f9e9a4974dee8dc8d01e6b7c40a797fb70eed22b99fe774272f8b106b5632a33f524b356349fe1ff9633101ff61ef2fc3fe69d641ac
-EBUILD pydotplus-2.0.2.ebuild 943 BLAKE2B 8e06d1a5fffac644c08ba5b443f9817d634a4f36d201949a6d178c6787268790877de98cb7e969f7981426e560a78f6170324c2c02238a963034c2cf8efcf957 SHA512 b369f26d1c0fcf4f21b531b2b24bc2cbda118907436405d831db65be1c2b8831b5ccaf0a03e9f5f7a382c5fc49e928ecc1e784f34dd9c4cc903b567987d61d8d
+EBUILD pydotplus-2.0.2.ebuild 939 BLAKE2B 445b030e307a6db59774375cd4aefd04fff496a4221dcceca38a9762d9c6fd12e2b84a5b2fb2811a61dd2e43b23a248b1988e3bd2dab9ecdb4bb53ea3b6f7dd3 SHA512 0c555b0f441d4453dd29169291150df9d86dd714d88e27a7529aa75a7d7f8e5064d03c41bc8676b1c7e473e125ac9f50efc21b9c3d4ec67d1784365cd7681c8b
 MISC metadata.xml 616 BLAKE2B b3b59bc1482de96d68d0fa8c4d63e9683ad39f7201eca9008bebdcc703978c1313d973d8ee8839625962d2c4b8fb965df88e27ff89b57c0330990fd6ffd1de11 SHA512 684ead6a0a6f5ff7a9afa13e819e0c444e1d87b50f1cc97567de0c9d5b2e22b6b21a44e28887f430c37358eede53521377f89773687ef5d08cd9e626427fd081
diff --git a/dev-python/pydotplus/pydotplus-2.0.2.ebuild b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
index b0aa06060c8c..99ad37f7883d 100644
--- a/dev-python/pydotplus/pydotplus-2.0.2.ebuild
+++ b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyds9/Manifest b/dev-python/pyds9/Manifest
index 3611239ee4cb..df962464d04a 100644
--- a/dev-python/pyds9/Manifest
+++ b/dev-python/pyds9/Manifest
@@ -1,4 +1,4 @@
 AUX pyds9-1.8.1-use-system-xpa.patch 1089 BLAKE2B a69e6f644ea475d115297fad9a4e5731233716af11a1aa67cf873dbaaebc70abedffb4cad86e65dd3a109372336b98de7a15bf55c3884a20b695faf86eca7801 SHA512 1cb86d67479485abf95898ca88e5949a6a0e2eb96a2eb1aeda777bc3815653f6e1a8a7be9345b1a50eb4fa63c205b6a2a5ef4838a7b585d7e2d5a74e6e60e08c
 DIST pyds9-1.8.1.tar.gz 899377 BLAKE2B 06b38aa1b4c2df7ed69908d2fe3d884cdc5598846594c32f9c3f8c078f3ab4424e6906dda051a94916bb61659d3d5e6b9cf676e97494bd542df714e5756b3610 SHA512 6924ba2a1c1ccd0b3c068d4923c6a35127da744b91b97ece7d075bfde68ff49e6d24ae55869aa5e0e462f3f488db697dcdb33d217b33b6d63551286d9a95eec9
-EBUILD pyds9-1.8.1.ebuild 605 BLAKE2B ea2a11b15cb8a6a68fd50011239e8a660be96278fcf5ae4104e41c489a5e608a2ead197c7f9fd2d568e12b7c46b9c425be8e8c7c71ccb49efe9e2e2284e1d687 SHA512 1e925de4a58d98fe902ac3347f4d1e2200fb42dba0be4dc06e85dbaa5bdbf1a87b2c47d444ccfee21a0e4157521ace05c7d4a47c4daf0ce4fa90dd69f531b451
+EBUILD pyds9-1.8.1.ebuild 595 BLAKE2B a5644ae52720f51266cee0b2e78d383326bd288a1d8ea7cea11f053de77c49b9499917d5bdc7f8a042843d35454678205c6f3a539eb4981a877af4b8531463e1 SHA512 d67be658121e8af0a243b10dc24be5612476592fcbc1076163847d5887f23af8e72bb2e49b2c9035d0ed5570dc72691e9f144a47069af2779e0d88c08c9a4c59
 MISC metadata.xml 689 BLAKE2B 091eee3939c4065d1bd1b058ae992badbd4184eddd94d87bd011a89de3ec635497ac38503488d00866096b0ff0465171b2d65df85ba8ffffa5396099902c11ee SHA512 edb6305f963fff8c98d5d24f7873bdaf30a49db7defcb2c1b4e76c8bf82d9d4843f217da5a3a7c19cd6eedd41450d9d53c7638b3296b7e6a906808457458b279
diff --git a/dev-python/pyds9/pyds9-1.8.1.ebuild b/dev-python/pyds9/pyds9-1.8.1.ebuild
index 35e2d04aed1d..1124444adc6c 100644
--- a/dev-python/pyds9/pyds9-1.8.1.ebuild
+++ b/dev-python/pyds9/pyds9-1.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydvdread/Manifest b/dev-python/pydvdread/Manifest
deleted file mode 100644
index c9cbb00d335a..000000000000
--- a/dev-python/pydvdread/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pydvdread-1.0-api-update.patch 9032 BLAKE2B ac291fefbb26d550b6242005718be63b01c4c0b75e45b8cbea41c71d6352f1e2292ee0dfd6437b7c21541427d5d308e90039018cbb8741c98ffadd7908e7eabe SHA512 52456ce0a3b7503de4f70d0fd6b8f03cc1cc91db348dbeb41d62c246773e280869149bed30e763ecb0a4ac57413369a1a269669977a5e8465ba56be5b0536be2
-AUX pydvdread-1.0-py3k.patch 790 BLAKE2B 9b563ae15b22c225404af3bcb0b89c2b230a5651a44d8a47e9898e62518fad8a04a32b5980b31b6fefa181404bec5f82473c9d76e1ef433e3add33c345871864 SHA512 82f8721dc618d79a0684353011a714144143d836fe742878003cfcc122fe171f1c3e11d340bbf3e9a778160a351df50ffb68b0cc858244babcf81e8595690236
-DIST pydvdread-1.0.tar.bz2 62072 BLAKE2B 36ef9dc1accf8d346881ec4a270a43139823b6aa8691e72446433f6106b12468ce4a1c4b85664835c0b7d32c18b9a8b1bfcf1b89fd3120757b4d62a621efbb6c SHA512 1d403e1b9538113bb5ab1a808147691b806ee57db3fa30f704a0fcb1dbb8e9155e470dc2fbb895788af59c2952d637a2853d613f0619deb5daf07d2e7b675eee
-EBUILD pydvdread-1.0-r1.ebuild 810 BLAKE2B 595f776f1f366eb98d943afcd88ebeb80d8fc18b1fdefe265a76bd4b5f1e69161473d0bc45c72849e4d372dd5186cb7d932088fcce278b65cd79d141ae83ee62 SHA512 e9a51c363d603cc4e75bf8ff527e451135941dd7a3d637eef8073fbad48eb54876e20580812d5933ce48ac7dc690d6724fe723adc5b60ffb784f997dfbff1133
-MISC metadata.xml 319 BLAKE2B 34985b920907d2c96cfc44f72f5a9e533e3112afec2fe10157b427914aacfccf4548ba1ce73a3b9ea14043f6b37f4271343fcc42958b9af4d907b393f48aff6c SHA512 73a20bef88f68ec88c854ce4d4418742563267d7a8007aa5c32a421fcac1259cb22a3ede01d2f5e49265902b4957bcf8a1e81512ed4715c49d461044f886d1f8
diff --git a/dev-python/pydvdread/files/pydvdread-1.0-api-update.patch b/dev-python/pydvdread/files/pydvdread-1.0-api-update.patch
deleted file mode 100644
index 71c08158e660..000000000000
--- a/dev-python/pydvdread/files/pydvdread-1.0-api-update.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-update the module to libdvdread-4.2.0 (at least so tests pass)
-
---- a/src/dvdread/__init__.py
-+++ b/src/dvdread/__init__.py
-@@ -1,6 +1,6 @@
- """Main package of pydvdread."""
- 
--__all__ = ['cmd_print',
-+__all__ = [
-            'dvd_reader',
-            'ifo_print',
-            'ifo_read',
---- a/src/dvdread/all.i
-+++ b/src/dvdread/all.i
-@@ -403,7 +403,6 @@
- %{
- #include <stdint.h>
- %}
--%include "cmd_print.i"
- %include "dvd_reader.i"
- %include "ifo_print.i"
- %include "ifo_read.i"
---- a/src/dvdread/ifo_types.i
-+++ b/src/dvdread/ifo_types.i
-@@ -374,7 +374,7 @@ typedef struct {
-   uint16_t nr_of_pre;
-   uint16_t nr_of_post;
-   uint16_t nr_of_cell;
--  uint16_t last_byte;
-+  uint16_t zero_1;
-   vm_cmd_t *pre_cmds;
-   vm_cmd_t *post_cmds;
-   vm_cmd_t *cell_cmds;
---- a/src/dvdread/ifo_print.i
-+++ b/src/dvdread/ifo_print.i
-@@ -31,6 +31,7 @@ file to stdout."
- 
- %{
- #include <dvdread/ifo_print.h>
-+#include <dvdread/ifo_read.h>
- %}
- 
- /**
-@@ -40,21 +41,6 @@ file to stdout."
- %feature("autodoc", "0");
- 
- /* ifoPrint(dvd, title); */
--void ifoPrint(dvd_reader_t *dvd, int title);
-+void ifo_print(dvd_reader_t *dvd, int title);
- 
- %feature("autodoc", "1");
--
--void ifoPrint_VMGI_MAT(vmgi_mat_t *obj);
--void ifoPrint_VTSI_MAT(vtsi_mat_t *obj);
--
--void ifoPrint_PTL_MAIT(ptl_mait_t *obj);
--void ifoPrint_VTS_ATRT(vts_atrt_t *obj);
--void ifoPrint_TT_SRPT(tt_srpt_t *obj);
--void ifoPrint_VTS_PTT_SRPT(vts_ptt_srpt_t *obj);
--void ifoPrint_PGC(pgc_t *obj);
--void ifoPrint_PGCIT(pgcit_t *obj);
--void ifoPrint_PGCI_UT(pgci_ut_t *obj);
--void ifoPrint_VTS_TMAPT(vts_tmapt_t *obj);
--void ifoPrint_C_ADT(c_adt_t *obj);
--void ifoPrint_VOBU_ADMAP(vobu_admap_t *obj);
--
---- a/src/dvdread/ifo_print.py
-+++ b/src/dvdread/ifo_print.py
-@@ -16,11 +16,4 @@
- ## along with this program; if not, write to the Free Software
- ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
--from all import ifoPrint
--from all import ifoPrint_VMGI_MAT, ifoPrint_VTSI_MAT
--from all import ifoPrint_PTL_MAIT, ifoPrint_VTS_ATRT
--from all import ifoPrint_TT_SRPT, ifoPrint_VTS_PTT_SRPT
--from all import ifoPrint_PGC, ifoPrint_PGCIT
--from all import ifoPrint_PGCI_UT, ifoPrint_VTS_TMAPT
--from all import ifoPrint_C_ADT, ifoPrint_VOBU_ADMAP
--
-+from all import ifo_print
---- a/src/dvdread/dvd_reader.i
-+++ b/src/dvdread/dvd_reader.i
-@@ -59,14 +59,6 @@ reading files located on a DVD."
- 
- 
- /**
-- * DVDVersion
-- */
--%feature("autodoc", "DVDVersion() -> int\n\n\
--Returns the version of libdvdread.") DVDVersion;
--int DVDVersion(void);
--
--
--/**
-  * DVDOpen
-  */
- %feature("autodoc", "DVDOpen(path) -> dvd\n\n\
-@@ -106,25 +98,6 @@ void DVDClose( dvd_reader_t * );
- 
- 
- /**
-- * DVDInit
-- */
--%feature("autodoc", "DVDInit()\n\n\
--Initializes support for multiple threads.\n\n\
--NOTE: You must call DVDInit before using any of the other functions\n\
--if you are going to use them in a multithreading app.") DVDInit;
--void DVDInit(void);
--
--
--/**
-- * DVDFinish
-- */
--%feature("autodoc", "DVDFinish()\n\n\
--Frees any dlopened objects.\n\n\
--NOTE: You must DVDClose all handles opened with DVDOpen before calling this.") DVDFinish;
--void DVDFinish(void);
--
--
--/**
-  * File Domains
-  */
- typedef enum {
---- a/src/dvdread/dvd_reader.py
-+++ b/src/dvdread/dvd_reader.py
-@@ -22,9 +22,7 @@ from all import DVD_READ_MENU_VOBS, DVD_READ_TITLE_VOBS
- 
- from all import dvd_stat_t
- 
--from all import DVDVersion, DVDOpen
--from all import DVDClose, DVDInit
--from all import DVDFinish, DVDFileStat
-+from all import DVDOpen, DVDClose, DVDFileStat
- from all import DVDOpenFile, DVDCloseFile
- from all import DVDReadBlocks, DVDFileSeek
- from all import DVDReadBytes, DVDFileSize
---- a/tests/TestAll.py
-+++ b/tests/TestAll.py
-@@ -33,7 +33,6 @@ devpath()
- 
- import unittest
- 
--import Test_cmd_print
- import Test_dvd_reader
- import Test_ifo_print
- import Test_ifo_read
-@@ -49,7 +48,6 @@ import TestStruct_nav_types
- # Run all tests
- if __name__ == '__main__':
-     if len(sys.argv) > 1:
--        Test_cmd_print.DVDPATH = sys.argv[1]
-         Test_dvd_reader.DVDPATH = sys.argv[1]
-         Test_ifo_print.DVDPATH = sys.argv[1]
-         Test_ifo_read.DVDPATH = sys.argv[1]
-@@ -57,8 +55,7 @@ if __name__ == '__main__':
-         Test_nav_print.DVDPATH = sys.argv[1]
-         Test_nav_read.DVDPATH = sys.argv[1]
-         Test_nav_types.DVDPATH = sys.argv[1]
--    suite = unittest.TestLoader().loadTestsFromModule(Test_cmd_print)
--    suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_dvd_reader))
-+    suite = unittest.TestLoader().loadTestsFromModule(Test_dvd_reader)
-     suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_ifo_print))
-     suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_ifo_read))
-     suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_ifo_types))
---- a/tests/Test_dvd_reader.py
-+++ b/tests/Test_dvd_reader.py
-@@ -49,9 +49,6 @@ class Test1(unittest.TestCase):
-         self.assert_(isinstance(dvd_reader.DVD_READ_MENU_VOBS, int))
-         self.assert_(isinstance(dvd_reader.DVD_READ_TITLE_VOBS, int))
- 
--    def test_DVDVersion(self):
--        self.assert_(isinstance(dvd_reader.DVDVersion(), int))
--
- class Test2(unittest.TestCase):
-     
-     def tearDown(self):
-@@ -70,22 +67,6 @@ class Test3(unittest.TestCase):
-     def test_DVDClose(self):
-         dvd_reader.DVDClose(self.dvd)
- 
--class Test4(unittest.TestCase):
--    
--    def tearDown(self):
--        dvd_reader.DVDFinish()
--    
--    def test_DVDInit(self):
--        dvd_reader.DVDInit()
--
--class Test5(unittest.TestCase):
--    
--    def setUp(self):
--        dvd_reader.DVDInit()
--    
--    def test_DVDFinish(self):
--        dvd_reader.DVDFinish()
--
- class Test6(unittest.TestCase):
- 
-     def setUp(self):
---- a/tests/Test_ifo_print.py
-+++ b/tests/Test_ifo_print.py
-@@ -50,45 +50,8 @@ class Test1(unittest.TestCase):
-         ifo_read.ifoClose(self.ifo)
-         dvd_reader.DVDClose(self.dvd)
-     
--    def test_ifoPrint(self):
--        ifo_print.ifoPrint(self.dvd, 1)
--
--    def test_ifoPrint_VMGI_MAT(self):
--        ifo_print.ifoPrint_VMGI_MAT(self.ifo0.vmgi_mat)
--
--    def test_ifoPrint_VTSI_MAT(self):
--        ifo_print.ifoPrint_VTSI_MAT(self.ifo.vtsi_mat)
--
--    def test_ifoPrint_PTL_MAIT(self):
--        if self.ifo0.ptl_mait:
--            ifo_print.ifoPrint_PTL_MAIT(self.ifo0.ptl_mait)
--
--    def test_ifoPrint_VTS_ATRT(self):
--        ifo_print.ifoPrint_VTS_ATRT(self.ifo0.vts_atrt)
--
--    def test_ifoPrint_TT_SRPT(self):
--        ifo_print.ifoPrint_TT_SRPT(self.ifo0.tt_srpt)
--
--    def test_ifoPrint_VTS_PTT_SRPT(self):
--        ifo_print.ifoPrint_VTS_PTT_SRPT(self.ifo.vts_ptt_srpt)
--
--    def test_ifoPrint_PGC(self):
--        ifo_print.ifoPrint_PGC(self.ifo0.first_play_pgc)
--
--    def test_ifoPrint_PGCIT(self):
--        ifo_print.ifoPrint_PGCIT(self.ifo.vts_pgcit)
--
--    def test_ifoPrint_PGCI_UT(self):
--        ifo_print.ifoPrint_PGCI_UT(self.ifo.pgci_ut)
--
--    def test_ifoPrint_VTS_TMAPT(self):
--        ifo_print.ifoPrint_VTS_TMAPT(self.ifo.vts_tmapt)
--
--    def test_ifoPrint_C_ADT(self):
--        ifo_print.ifoPrint_C_ADT(self.ifo.menu_c_adt)
--
--    def test_ifoPrint_VOBU_ADMAP(self):
--        ifo_print.ifoPrint_VOBU_ADMAP(self.ifo.menu_vobu_admap)
-+    def test_ifo_print(self):
-+        ifo_print.ifo_print(self.dvd, 1)
- 
- 
- # Run the tests
---- a/tests/Test_ifo_types.py
-+++ b/tests/Test_ifo_types.py
-@@ -189,7 +189,7 @@ def pgc_command_tbl_t(obj, tester):
-     tester.assert_(isinstance(obj.nr_of_pre, int))
-     tester.assert_(isinstance(obj.nr_of_post, int))
-     tester.assert_(isinstance(obj.nr_of_cell, int))
--    tester.assert_(isinstance(obj.last_byte, int))
-+    tester.assert_(isinstance(obj.zero_1, int))
-     tester.assert_(callable(obj.pre_cmds))
-     for i in range(obj.nr_of_pre):
-         tester.assert_(isinstance(obj.pre_cmds(i), ifo_types.vm_cmd_t))
-@@ -457,18 +457,18 @@ def ptl_mait_country_t(obj, tester):
-     tester.assert_(isinstance(obj.zero_1, int))
-     tester.assert_(isinstance(obj.pf_ptl_mai_start_byte, int))
-     tester.assert_(isinstance(obj.zero_2, int))
--    tester.assert_(isinstance(obj.pf_ptl_mai, ifo_types.pf_level_t))
--    pf_level_t(obj.pf_ptl_mai, tester)
-+    # No idea what's going on here.
-+    #tester.assert_(isinstance(obj.pf_ptl_mai, ifo_types.pf_level_t))
-+    #pf_level_t(obj.pf_ptl_mai, tester)
- 
- def ptl_mait_t(obj, tester):
-     tester.assert_(isinstance(obj.nr_of_countries, int))
-     tester.assert_(isinstance(obj.nr_of_vtss, int))
-     tester.assert_(isinstance(obj.last_byte, int))
--    tester.assert_(isinstance(obj.countries, list))
--    tester.assertEqual(len(obj.countries), obj.nr_of_countries)
--    for elem in obj.countries:
--        tester.assert_(isinstance(elem, ifo_types.ptl_mait_country_t))
--        ptl_mait_country_t(elem, tester)
-+    tester.assert_(callable(obj.countries))
-+    for i in range(obj.nr_of_countries):
-+        tester.assert_(isinstance(obj.countries(i), ifo_types.ptl_mait_country_t))
-+        ptl_mait_country_t(obj.countries(i), tester)
- 
- def vts_attributes_t(obj, tester):
-     tester.assert_(isinstance(obj.last_byte, int))
diff --git a/dev-python/pydvdread/files/pydvdread-1.0-py3k.patch b/dev-python/pydvdread/files/pydvdread-1.0-py3k.patch
deleted file mode 100644
index 338ad6c0ef0c..000000000000
--- a/dev-python/pydvdread/files/pydvdread-1.0-py3k.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-get it building w/python3
-
---- a/setup.py
-+++ b/setup.py
-@@ -18,11 +18,11 @@ def fixso(filepath):
- class my_build_ext(build_ext):
-     def build_extension(self, ext):
-         sources = ext.sources
--        if sources is None or type(sources) not in (ListType, TupleType):
--            raise DistutilsSetupError, \
-+        if sources is None or not isinstance(sources, (list, tuple)):
-+            raise DistutilsSetupError(
-                   ("in 'ext_modules' option (extension '%s'), " +
-                    "'sources' must be present and must be " +
--                   "a list of source filenames") % ext.name
-+                   "a list of source filenames") % ext.name)
-         sources = list(sources)
-         fullname = self.get_ext_fullname(ext.name)
-         if self.inplace:
diff --git a/dev-python/pydvdread/metadata.xml b/dev-python/pydvdread/metadata.xml
deleted file mode 100644
index d1ae6b21ccc0..000000000000
--- a/dev-python/pydvdread/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="sourceforge">pydvdread</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pydvdread/pydvdread-1.0-r1.ebuild b/dev-python/pydvdread/pydvdread-1.0-r1.ebuild
deleted file mode 100644
index df9ec22c1527..000000000000
--- a/dev-python/pydvdread/pydvdread-1.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A set of Python bindings for the libdvdread library"
-HOMEPAGE="http://pydvdread.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-RESTRICT="test" # Requires an actual DVD to test.
-
-DEPEND="media-libs/libdvdread
-		dev-lang/swig"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-py3k.patch \
-		"${FILESDIR}"/${P}-api-update.patch )
-
-python_test() {
-	"${PYTHON}" tests/TestAll.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyee/Manifest b/dev-python/pyee/Manifest
index 79eca013c095..b07c948b5d86 100644
--- a/dev-python/pyee/Manifest
+++ b/dev-python/pyee/Manifest
@@ -1,3 +1,3 @@
 DIST pyee-1.0.2.tar.gz 4263 BLAKE2B 5e29f47987f56ddb07186ac19218c448b5052b999c3a5ae4101ab6d48a27d82f18ad67886e45df166e69af27575e8d9ed611ae2eb32875e12c3611180f21baeb SHA512 73cbb3cc7b06be9d4c92f6bc901fa55e1ca51271177672e8a1636eedc6f82fc940d7dd844d0f4a959e52185c0ef934e9fbe4760b70d62f39b94f5d1c3660ce2c
-EBUILD pyee-1.0.2.ebuild 556 BLAKE2B 6e1201efe863c1badea038eb10a65c14ff7c8a8b2c9894d2dab0f5c01d17963642cdbfb9a485292098b642dd2ad3fde9236fd7b1b1980ff338e541fea864a594 SHA512 b465a0766d5b93147796cabd661eb30de8d829ca7a8a8794f9df4ced53465308621c11139a8651a7e6313dfe7c001322b944afb16370a9bd121d7713b370cc4f
+EBUILD pyee-1.0.2.ebuild 552 BLAKE2B 41a02273a671dfd3905b41ea0b1f3f85acc9e0e65c12004571fe2202f7aa39aac66dc023087cc2fc73498f13ad3f8617399e403f5f9b7eabc44cce13e99dcec7 SHA512 73aaf338730c7c8865824bd95f2e3ed7de4cbc3913c4067dadd529c07c268da80db8019a4d747fac6e4b62581dba4db4b4ca28f2f9df0bcbef42796a53913441
 MISC metadata.xml 566 BLAKE2B 42dc964ce3f4c59572f63a26a4f726497c8a469ca3a574736fe552f47e37346f371e85b6db54dda613c4beb709500d077c3de6bf6684d28d575710f20fb54d92 SHA512 75bd4c0b9b8120f7240e06c6674976fbe4ca213c8e8652dc0a6f783c2750ea3bbf269cc079ca1ceafdb2af2760e77792c189f2d2c2753a6c2966b8d9c4c0cc47
diff --git a/dev-python/pyee/pyee-1.0.2.ebuild b/dev-python/pyee/pyee-1.0.2.ebuild
index b19f37752686..4ef8ecc59bbd 100644
--- a/dev-python/pyee/pyee-1.0.2.ebuild
+++ b/dev-python/pyee/pyee-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyelemental/Manifest b/dev-python/pyelemental/Manifest
deleted file mode 100644
index 76a585b40424..000000000000
--- a/dev-python/pyelemental/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pyelemental-1.2.0-gcc-4.7.patch 641 BLAKE2B 75cdc88875b51acc510f16989638ebfd52daa4322c6870633b08b55099337147c3b0ea565679da38058e5bd2cbc2bb188408077888d08d6cee5f880ab39d5fa2 SHA512 f48af2ab3a4ae49193d011e4c9e74a1ef6270f4ec80e5968588b8a76d2bc172128723bf4b05e7f34f0caed87577ad80c504b302a7bf8d94eb52dc382ffcdcabb
-DIST pyelemental-1.2.0.tar.bz2 34610 BLAKE2B b3de55927c889344ca05ae690e535a8a0243b5576a71691d602a51914565e0a67239c89b69795ab9e66bf58af17851fba75669a3fc00c2f97fb40daa59c14de0 SHA512 2053042ed19e73d9fefd1d86d29d6d3f9fbed1b0733273197bf62f908154d96ac4c6f3ca0c314e66fa291ab253e8afcdf514e4fbf3e4ea66741349f45a27b23e
-EBUILD pyelemental-1.2.0-r1.ebuild 734 BLAKE2B 7090b4588d473c965da8d4fd9c1530cbb8770070eafd9a80193c26af5eea9bb0cf2a8b08791431226d1234fe4e879e8ebd5849dd07f0c545f778ff0e1031f2ef SHA512 c77563bc9300870726a38c083a6f8b4e07b6743ecff5bfd8c2e1360b8c74ea7c4fef4987397c21bf8d0f902e1f31067e68d57402921b947a3ac42af9dbcde9d5
-MISC metadata.xml 443 BLAKE2B cc722345d33a98749b67095ec9fd4dd632e0b59af0be5c5a04922c348b0678e0b2b1bace759d9927b0f1210bb41c283af8f35b6603471bb2ba3ea7be577dbb33 SHA512 0b62309461f36d934829c7d4223f67001557dc77f1f3433940d9e47282e999c0466b4a54190da5df8157e29a9643212d8de85d42f247d5806e9da059edbf3440
diff --git a/dev-python/pyelemental/files/pyelemental-1.2.0-gcc-4.7.patch b/dev-python/pyelemental/files/pyelemental-1.2.0-gcc-4.7.patch
deleted file mode 100644
index a0a53a67be28..000000000000
--- a/dev-python/pyelemental/files/pyelemental-1.2.0-gcc-4.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
- value-types.tcc |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/value-types.tcc b/value-types.tcc
-index 5afc8d0..a95ccbf 100644
---- a/value-types.tcc
-+++ b/value-types.tcc
-@@ -44,7 +44,7 @@ ValueType_t (bool)::ready (PyObject* module)
- 
- ValueType_t (PyObject*)::wrap (const cxxtype& source)
- {
--	return wrap_copy (&type, source);
-+	return ValueType::wrap_copy (&type, source);
- }
- 
- 
-@@ -160,7 +160,7 @@ ValueListType_t (bool)::ready (PyObject* module)
- 
- ValueListType_t (PyObject*)::wrap (const cxxtype& source)
- {
--	return wrap_copy (&type, source);
-+	return ValueListType::wrap_copy (&type, source);
- }
- 
- 
diff --git a/dev-python/pyelemental/metadata.xml b/dev-python/pyelemental/metadata.xml
deleted file mode 100644
index 3b58d75ed9a6..000000000000
--- a/dev-python/pyelemental/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freecode">gelemental</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyelemental/pyelemental-1.2.0-r1.ebuild b/dev-python/pyelemental/pyelemental-1.2.0-r1.ebuild
deleted file mode 100644
index 39c5e4117997..000000000000
--- a/dev-python/pyelemental/pyelemental-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,33 +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 flag-o-matic
-
-DESCRIPTION="Python bindings for libelemental (sci-chemistry/gelemental)"
-HOMEPAGE="http://freecode.com/projects/gelemental/"
-SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=sci-chemistry/gelemental-1.2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-4.7.patch )
-
-python_prepare_all() {
-	append-cxxflags -std=c++11
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index a0336ca35d86..ed1655393873 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,6 +1,6 @@
 DIST pyelftools-0.24.tar.gz 411874 BLAKE2B 304721cc440599d6436366c14a17d7e3132464686cdd870257a0180dd5f292a23c50a4e654966552d643875ac2683fda8584684cfeb611a3f22f02f73852a288 SHA512 5169617f9a8446ffc21dfc44ee185a388c8945a0296bdc6752483b0756888dccb10e3ee88e529d101cf31a4595de924b5c95f5459d5ee4448f57c0c4f2c56887
 DIST pyelftools-0.25.tar.gz 499493 BLAKE2B 941b21526d1225a4effa25d8f0245b326d5ec652cea6741240613c19af61e03a537fe363dd4c10a90760a7ddc6201e20dd83b6825ad185ae21696be6f4d1e52f SHA512 06ead53ada32676161193d7e5cdb3b9e4c1910dcb34f77a544f53445651f8118b582716bf8c5cc54efb21b1ddbbcdb4b41c533350af3c41553d103c7fc74702f
-EBUILD pyelftools-0.24-r1.ebuild 889 BLAKE2B 50606dc2eb5ffc3f2c1af0173e3303c333de06879d5e1ed033cb1ed7f8274fe14240fc32aea5b49188ab13ac4cec5cc0869ca3311ab711fc101a5deab59a8d47 SHA512 96b0837b64d37e8385f14fff42ce6dc7b8a36fc4d59be92ac4f9209e289aa1544698144771631631c2cdce641c1329819280d28880472be8fbb390f24f31e293
-EBUILD pyelftools-0.24.ebuild 874 BLAKE2B f4da0a359b4e263a36c2b6e10a5e1f10d1b43d6297dda24d6b34096d268ac78e1072c5bad8c64a9cc971767068ea9431fb7a76c68e46e11349a510714c927bf9 SHA512 be0bb9cb6eafbdfa595b88bd6f08f43e48ad92599713fac5f752c15da0b9f4d9cc9cb43f0319e21ec97a1aa18885359f206aebd2275e7c1dc088330b2b846732
-EBUILD pyelftools-0.25.ebuild 891 BLAKE2B c65ef04ac7668bc38ef6c7af95732f11c8da39eaf717d07f95eaab6d0b161c8fef71e396f61ed578e5dea0007e20dd018aa0999c8e71467476da6c8f97874a12 SHA512 12edf84b4e0c1e81d2d097ac772e577a126353a1121ef0a00caa0a7c0e1506c83ee2350c6f5db5d67abf76b94bc01f679fcce61ee750c587ebcebf5ace2e12bc
+EBUILD pyelftools-0.24-r1.ebuild 887 BLAKE2B 737cf15c794e829e057f0a4a8b4761d79c4e871e5c16e7c3c90412c6880764e7af874d8085700c795c85f3ce4d03cedfdae816878bc4a4eb7466a3397bfab120 SHA512 2aa3ece5d5c454a899acf6a0bb136028d77e6ee762a0e53885bbd8e88d4c2404c74b9dcc90efccc97abc6c0ddda7228973dcb26dbc7d37f4bd7157b1b723e8f9
+EBUILD pyelftools-0.24.ebuild 870 BLAKE2B b52fa33aa53c4a9434a2b2ee31657b80b28c2179dd420033d800bcd5c37f1aa007b3ab6c116c1441cd37e4bf7e8a7c84789e5c5fa887c8a9dc1b98beb4331b88 SHA512 e605ac84aa0cace233758370632f7a6bf0ae39e6a897989e45d76400f735a9dc451efd3d9f18b0d1254265483620241f608968e7583579ae6d7ed19d97a179fa
+EBUILD pyelftools-0.25.ebuild 889 BLAKE2B e40f6d9226597cd0b9c07eedce8c0d9b94815017b3a929af87c7589cc8a3af755d6281c3898a429c43e6a8c5ac535743591889f8188ef0e950985b882804b62c SHA512 9dae901bf85378568ca6a09e432f4b6e6e6daa4652fe5be69340724c8eaf1a1d7637f25f44d3693ccd0b27066f23d22db82c3e99c2439bcb9d2d12614fb560cb
 MISC metadata.xml 370 BLAKE2B 8dcbbb8d9add514bc0daf421c6739f8ee8426af39a0cf36758c594ee859a1aead4bddcfab3466cb50761ae289f7d58426dacb5a51b745a290530abeb511204eb SHA512 0f00113fb42e48e7b232b8a500ac77958f3ead50ff51d547e015a2c1aa7b87ff7a25495094ba10480176f3653742f18473378fe336f544ec93d645db9057ec20
diff --git a/dev-python/pyelftools/pyelftools-0.24-r1.ebuild b/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
index c774ffe84331..5c6ca6ce5a21 100644
--- a/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
diff --git a/dev-python/pyelftools/pyelftools-0.24.ebuild b/dev-python/pyelftools/pyelftools-0.24.ebuild
index b9c53b9bc906..a82f2882ad5f 100644
--- a/dev-python/pyelftools/pyelftools-0.24.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.24.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
diff --git a/dev-python/pyelftools/pyelftools-0.25.ebuild b/dev-python/pyelftools/pyelftools-0.25.ebuild
index e325097e6010..076bc03a3ed0 100644
--- a/dev-python/pyelftools/pyelftools-0.25.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.25.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index dae6e0d54689..88037e3d44ab 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,7 +1,7 @@
 DIST pyenchant-1.6.6.tar.gz 64010 BLAKE2B cdd0878ca58e05d955bf7d5518de71c02f663a8b00b1437bed8171fcdd08768691a9f9bc2bea0de0e942c2197bc9cbef66a88a114c47df3265c8d8034c95225a SHA512 af6aa1ac77b5718ec4b4aad3d0b88d26e697b472ec8261b23b37fdbf6b399a120ccc3e4ee6579b884c44b0eeb3f95bcdbceea189105c05088a48400a0c8cdb90
 DIST pyenchant-1.6.8.tar.gz 63693 BLAKE2B 5a8f867f3f40e81ec7d2431b678f324619b81942c8ca05a0cddc5acd2a3c645227fe6584b2236cfd440104f552d23786fff064d39762eb62e9e6a9d62ef1c670 SHA512 1a297cd279a0fbea2657bb42f2018a693b7f1d2da420f8cba436f680fb803282432f86e244a098eb7b9ef801059a3ee3c3bbaa748d30ea6357edf9f778e2f0a0
 DIST pyenchant-2.0.0.tar.gz 64022 BLAKE2B ee1200ded8e2a8f9145fece64cee1c8ea3129d540e10708d51acf6491c200a0f39927b47fce51d2e2f932e465d7acd5bb4afd31712183530f6da5e8ea899c0c7 SHA512 c985714bc8ad69b6580fa1dd546243da5f3f92e8681d846ed265b086c486ae7ed33754fba303b450be4c0cb20e975a9a10efbeb700ea5213a11ed00612a93af0
-EBUILD pyenchant-1.6.6.ebuild 779 BLAKE2B e70553ef9c50fefed527a956d1c56ee33f3ef572fb8d0054e3ea7153c24973753d94a534cb3096f0c2e13fe5731f34d483a93e1c02f3cd7a930434cf82b8fe9c SHA512 913a63977bb157390d1a8287dc375d9ff927e0cdf18b3530f7736d97e5a0f6b840d7f8fb1d8e5fe6b5e04167d92a527f356c5249d4b8e8c66ff3b83e7f73f8db
-EBUILD pyenchant-1.6.8.ebuild 780 BLAKE2B e4eda96558c3717da543e190932837f656f0541babd65ac032280dae4f5ca0f262ec34768b39d76a648edff3079d83f10ff53ebf2d85ea0d79dea795c7a2c504 SHA512 09ccea130ef4b40d421aadb29bc94a5a2e1915aa01b2786ca40e236ac72872dbe6db05de6fdf8cff69e29c6168e42a1ec67debd8920c5e8122b231fc1f98b25f
-EBUILD pyenchant-2.0.0.ebuild 934 BLAKE2B bfd2e683cf76bf8b00f5ef08da0a238ebfc93e68f5a6a83364cef955727a5aa0f62b6e79719a35e288a28d5f1b83b7a69a3c3fbc4d3bbf2ab9dd50d1668b9c52 SHA512 aff5e2826fcc13b5911de6b769d19b8ff3afee1f60905bc9817ac7906d4b68a71cb28efca4b34220c5ab7eac525efe56ce2dfe8d78c56ed5321e0e4dbfca4cd9
+EBUILD pyenchant-1.6.6.ebuild 770 BLAKE2B 3497b828044fba68e539cbc1b5a4abfbe0ed6e2bf61337102b01bbb93771243b27de7cf4444198d4140cde91fc538c76efe89bb873421c22e80668241826d7a2 SHA512 a6de324154cef7c602e5055f73b73d3f577c0228e1d4d487814bb5ef098e17af749965e23bf88420014ed73922c8d0e38da54a76ee98898d055cb8a867a83250
+EBUILD pyenchant-1.6.8.ebuild 771 BLAKE2B 8b109760d1cc3febfda270343472656d13640ec8b5eeee7d2d7c5b06326c8064cb9e3a986ba888e772ac3ca16f0e939aab3b256d12c61d5f633d9cc609c047ef SHA512 be271c20fd38bcace1e9465e0df6d0d8b2984fb4d21f4fb570539b5af372dd6ea6f5bd41b10d35ad33c3cf00b3777dc1d86645bc8ecbe955e39b6918e18df0f0
+EBUILD pyenchant-2.0.0.ebuild 931 BLAKE2B 8ec545d98f7c1c9bc66c6bd857c6ccc861fa26f3d5f7136714447d46075511b82b38e2c8930508d4f8d60a86a5c1359b5e06cd79a1170414000213c6e66a857e SHA512 ae1cc94d011dfd87a5e0e18cfdd68486a54554adf340050041568d4a7a47f27bc477134753be21440ed89dc6356d42a68ca58da51b899b92b956665ac8902384
 MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-1.6.6.ebuild b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
index a3cd71d5e50b..f1b8c3a1c833 100644
--- a/dev-python/pyenchant/pyenchant-1.6.6.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyenchant/pyenchant-1.6.8.ebuild b/dev-python/pyenchant/pyenchant-1.6.8.ebuild
index e00cfd9c2cfd..b2fcac14d9a2 100644
--- a/dev-python/pyenchant/pyenchant-1.6.8.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyenchant/pyenchant-2.0.0.ebuild b/dev-python/pyenchant/pyenchant-2.0.0.ebuild
index c86571f441bd..aea7fc5f686c 100644
--- a/dev-python/pyenchant/pyenchant-2.0.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyev/Manifest b/dev-python/pyev/Manifest
index 70f00c1b91a4..e960dd936232 100644
--- a/dev-python/pyev/Manifest
+++ b/dev-python/pyev/Manifest
@@ -1,3 +1,3 @@
 DIST pyev-0.9.0.tar.gz 223943 BLAKE2B bb54795214f4f1f46bd33ebd3826060bb256e2df9602e4aaa30966c30dc4c6df33b0b40a6f00b5484d27670fa0b502e630ca61efce4a1e03c5269afbb99a38a8 SHA512 05eafd70b843be8ee84a9a384fea9f222445930de00c5a6ac38c6e798f22165914fab3825be8e98e84fa68fdfe9e477718190a6939737667868b4badeb1eafa8
-EBUILD pyev-0.9.0.ebuild 490 BLAKE2B ce83f62609044076fbfcebfcdbb029a7627d41ced8a40fe97f65991c43fdb5b7dd386f12ee24433bb348d16673f321f19565ec240c399314319cc6d2bc38ab0f SHA512 d7a479b0add5ea4747ae4d2d2244c51a7aed5f5c2a57afdabf1ff1180a5b2c59f63baf149abd0dc057c01751d9429131d30e0a11b1d40b0977f759346688c482
+EBUILD pyev-0.9.0.ebuild 480 BLAKE2B 26a5cce3a1bae068297376dbbeb93266cb2b1d5945692e4fbd60bbc8fb5650a0e8cb1f6082dc9047193f5ff0cba0dd704c6a7c492d58932039175ecffd8a07e7 SHA512 43a830bdc7fa15f73ea2dd4a2a1bd1ec9500e24d169710cc1becdeb7a974c09ed5de8526e5fe7e51e315e3e117d25fb61483d3d6a0985e8809ad6d5d24cb7ca1
 MISC metadata.xml 607 BLAKE2B 705a36806eb16277dc8bcf17d302948b0d39451e558e8753a4b054bffdaa31bc776b720027985776eef13d3cc4b4cb403dafcbbdec64a1c35de0f80f01b3e89f SHA512 88c2bda93a5e69a0f06f8c7188afffb2fa8fd84e930f314406366c5c64111abffb1d8a20e184545fbde8ac7b199c9f007312b662331293fb984bfdd57c4c8a03
diff --git a/dev-python/pyev/pyev-0.9.0.ebuild b/dev-python/pyev/pyev-0.9.0.ebuild
index 5a8339c1c93f..ae08bc0bd859 100644
--- a/dev-python/pyev/pyev-0.9.0.ebuild
+++ b/dev-python/pyev/pyev-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 44360c0168f2..0502e160f1e1 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -5,8 +5,8 @@ DIST pyfakefs-3.3.tar.gz 141704 BLAKE2B f805146024d9886ce6cb25b23f6f818bb37cac00
 DIST pyfakefs-3.4.1.tar.gz 151662 BLAKE2B cbfdd7ab4c2936d484b5ff1e22852438c5c653e8875b7d363324e0a1aed0bfc5c492c2cd5c64a47052fcb4d043f567819f32067527b870ab42da8cfd92d40be3 SHA512 1be0254455f6046f1d28bf4377d17e0fb943b4b0db09e933c114f587f3d917877b23ee1610cf83a6330b406bb9ae66fe79dea31a6bf75c0b9c2b79a88d07e753
 DIST pyfakefs-3.4.3.tar.gz 156896 BLAKE2B 2450cb67dbb25d2029a113dd95c3d51e60ef66c6683a5898ea73800ce1269d628af9f8daa85195d5b473f18b7c3262f2f26fc9c17caf80ce2f5159c247ebea5b SHA512 aafcad5d801f625273239221c56e46229ff8ab622cfb474d92f8555cfff90279ad9a092c20878279454c59033ad23d53cfe877023ac5d20c5a67a610b62ba7f1
 DIST pyfakefs-3.5.8.tar.gz 171519 BLAKE2B 18eb784cf62108c3363b3b5fa137ec4ce830583d263dcecc6f007e6cdeb8a8eefcc4f9eecfba4a9b5b485508749f6dc75a47ff67bc8f5e77f2c0abae2cdd1778 SHA512 e72042dc80545d4a8602bf90bc832298184040389c8fd182df1ef33712061b4937623ca98d70e59b4a388677626f861ff096de939b5caa372849ee10fc3dd8bb
-EBUILD pyfakefs-3.3.ebuild 713 BLAKE2B c99fd73a3ea526c5394dfacd6514ee55e87335b1b284f96143fbd784aca335a586bdbdb5ef66eb2ebc848a9d1ee553568c8a4745d84310fdb3b4fbbefdb546f1 SHA512 86073016b524f588a2d2f4a9563387dd29899e9de118a8beeae1528d2e18d111a36f944bfdf8341c1f56d72480bf076593a47750baff53233f3d6fc1fef83ec6
-EBUILD pyfakefs-3.4.1.ebuild 716 BLAKE2B 700608c3a0b2ff41b42d1caca4ba9d00ab78df2627ddc2e82b038f3de3d6a69dd99b23ccbbc1d967fdae1a450d8988cb5082a355cd3b8b32b2950616bbff0bfd SHA512 61d88ade44f0bcf5390ed91c64548abb5e51c31acc3bc8dfbb8a4e614bd9fa81e20984b47d0daeae851a2bdcbe540d17dc4003a3db393279531cea14417b06f8
-EBUILD pyfakefs-3.4.3.ebuild 720 BLAKE2B 85c1a1a4872d622a9cac95d418b58f491e883a630d02fd77c19c92b7024713b387ee47b9e9947a9e7945feb54cc9a5588d58729396c5e489c84766ef601dbfe2 SHA512 d176ab413688f8150681d5456d7182b1a0d35cb149042820e2c6b365d30890a3764e7d9e6b9058c0a4c6882a1cef3005eb8ce8b01b3d1ff463013a360e3ed7e4
-EBUILD pyfakefs-3.5.8.ebuild 863 BLAKE2B 1723e275f5dc01c9429c8d20a15273358ed0e4d474eb9f0ef39ba72dded028341b12453010df3c013f4a22847c91259b1cdcb11044ffbb0fd5f33eb09cb91078 SHA512 ef98a22419fda870c9a8f4f7e4cd64987c69d034b84057cd6b6eb768f3d44bb9f8143e2cc302a270cf4dccee7e23070cc03004b68c57faa8174de8268328952a
+EBUILD pyfakefs-3.3.ebuild 706 BLAKE2B 194f957a15cd50e054ae98c08d9408452cbe2ca9ec5a545f2fd4ea7cc501677e1e18ac0792befc7c84c2f82d893649bcc4fc89b84d594dcf558944aafd949d72 SHA512 8cef48aec6f558ab513aa84560e5a68f36e3787a7d0a7251da75609468e481a44677427b24400a8ff23ffc531b46b5655df25fe3a7faec13b1eba1449796f426
+EBUILD pyfakefs-3.4.1.ebuild 709 BLAKE2B 2a46a3ae89a1ba39e7e336ae049a4059d4fd79e3eea344d00fa4abe228d468c1f754e704cbe5ddfe205285370c465b561186ff3480d6ebb589b0265e2f4cb231 SHA512 de026d62f12362235f25bb88c9aba62ef3fa563d670a95ee3853ae7fa781f3c5ccf66c858bfb09ded699e34f7b68f61995a0a70bac91b7272f63797b5a1f92b4
+EBUILD pyfakefs-3.4.3.ebuild 713 BLAKE2B c1aae975305b1d3555cccea2aee091b75f158c638a50f39e84a8f0b4aebed0be4638548c70b940a8f45ff521ed9826b54488130c39762911de8f6733f5693d7c SHA512 4272510a33b3b29aba9d2882fe3938193a7c323bdb81c014b429ea10cd59bb7558b3394898a8794cad8e60c22989347872cf30dd037b799976482f0fd0677811
+EBUILD pyfakefs-3.5.8.ebuild 856 BLAKE2B 2592aa52f4db10fdad9b81beefd941cd3efa18b8234da2fafe8c28e26fef759d7158208fba8014b1d90269e14c7078066cbe4da4b7a34ac2c636728adf07e973 SHA512 cfd6413cfd3b53e4340b422b8b8fb91a31ec93717e2e226f2a2e9892550f3716f8550cf57ee0718981897604dac8aa90a91f8eb8bc87105f24f30535b73160a5
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/pyfakefs-3.3.ebuild b/dev-python/pyfakefs/pyfakefs-3.3.ebuild
index 47fc0f33221b..0305b6844914 100644
--- a/dev-python/pyfakefs/pyfakefs-3.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
index 379130c4a2bc..c4d151cc93a6 100644
--- a/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild b/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
index 6d26845b2f40..b007cb54b5c5 100644
--- a/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-python/pyfakefs/pyfakefs-3.5.8.ebuild b/dev-python/pyfakefs/pyfakefs-3.5.8.ebuild
index 1d5836b59bea..6386a5b02bc7 100644
--- a/dev-python/pyfakefs/pyfakefs-3.5.8.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.5.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
index 0a3d8b6d94e9..d14d5fa022fc 100644
--- a/dev-python/pyfeyn/Manifest
+++ b/dev-python/pyfeyn/Manifest
@@ -1,4 +1,4 @@
 AUX pyfeyn-1.0.0.patch 1012 BLAKE2B d3d8ba8f46c9fe6eac5db4183c18fbbe118ba36bbcc3b9a263a470fac702ac81c17bb77acf7b913c3a3bb51d4f12bda60b07d8152a324b8f4c927f1800b104c2 SHA512 43811f881c479062af0376c9d3dbe440383599d7e6937481ad2ca8dbca3ff404ab8d04adaa4afcdf1c4eb001340ed1870a7f50730fbc3d4c458f5d6a1936cc73
 DIST pyfeyn-1.0.0.tar.gz 27316 BLAKE2B f1ece2e64be35f6e64dbe539406462c1802bb0149577662a92658769c1b347c2d98786cd83998e8887cc609f8ffa5aac3e3c995c253f54badd5bed43050dbf0f SHA512 edecbb61cbc63adb5d218cd53e45568f42aa018875bd57485afe612080300a16dd93d1dd0a1286b040a27aaf727a9e35e210f2a2edccaf9e6e114301a91c839a
-EBUILD pyfeyn-1.0.0-r1.ebuild 555 BLAKE2B fe72aca6dc8f5810726b6ba40cc8748579e3fd2a314016896f3790b8ef1331ffce6e9f60c0063476debd5aeb21bdc058896914c862c10989f751655e1f3d5dea SHA512 8f9e3c0257f69573951dfce5c355b81fb04b0221736e64509faa283329d106894beab3d86f69042f85d338468287db41c423bb15e982314522b920c593c3665a
+EBUILD pyfeyn-1.0.0-r1.ebuild 551 BLAKE2B 61bc357187f08598a460137e73f575f1a61b20e0596d53bb0519cb5b18ebf169aeef1a89eaeb4ac9dd4f1c05db641f03da7d0ec6ee28f9411f3f27fc7f9524d1 SHA512 0bc2fa0648c201fafb3c62711ef16f2e9671d9b895111c3a062635d53d98fdbb491e9f4a04952a8e56edf27a6fe4fd1086edf0ceda82b76ffb90e3db59c89a00
 MISC metadata.xml 498 BLAKE2B 31414fd895669d8706e4025d404575d0de13b04dcd23dc175262701489fc98d8e11407e758aef681805a8275323397a6bf1b5296247f48b36ff34c9b9d410ae5 SHA512 19364d290277c99a31dc436a941d66d60a1829c2ffac855cc35c85e4923124d559c8310b0c87a8129d0115e482ba0ec13287e6f1994fb93ae43de969f9082751
diff --git a/dev-python/pyfeyn/pyfeyn-1.0.0-r1.ebuild b/dev-python/pyfeyn/pyfeyn-1.0.0-r1.ebuild
index 37168de9f5a7..bcab0f9e7d47 100644
--- a/dev-python/pyfeyn/pyfeyn-1.0.0-r1.ebuild
+++ b/dev-python/pyfeyn/pyfeyn-1.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyfiglet/Manifest b/dev-python/pyfiglet/Manifest
index 59d45e408e39..fba1c4f39c94 100644
--- a/dev-python/pyfiglet/Manifest
+++ b/dev-python/pyfiglet/Manifest
@@ -1,3 +1,3 @@
 DIST pyfiglet-0.7.5.tar.gz 767904 BLAKE2B 761b933d60d074d3966fd0c8a10a5e0da056ef351c3ab31cbb43cd545ea75baf8b4daf1c2b61f8023b88d9c485acd402b12c1ccde103e545882588d87c8302f2 SHA512 835a2710c576e3695388bcad60c93bd58394bdd263cce9b51bfd8d1d82582765924215bf1e7560b7be01d4551923b29f56c2e063e646ef5cffc970521e2cbfb2
-EBUILD pyfiglet-0.7.5.ebuild 434 BLAKE2B f90b0d9e9d21287500e192bb3bb61a6baf167f93333fd20da1c65f11480ff0e6a51190753e40faf5772a6d63c36c75b5e5340cd416c04cde5760bfeac46aa5d5 SHA512 4eab92e340a830c57f7c50c84d22ce4bf1305e8258ba038b43fa1bc5e3173a6caea53ecf3c507e5cef405f22e8fcc197649128e17fb3289c2e1a95711cd24f40
+EBUILD pyfiglet-0.7.5.ebuild 430 BLAKE2B bae7f14b5216a59937eaf4af12fa1b958bdd36ba45731002d297cfcbe90d92c8c5596089b87859c420e26d0184a1ba809f5031e1e2dda378c02f2fba9d020217 SHA512 253ecd966878723dbe5009ec35c8abf0e3155854ceffefa174566c7e32cdde33453cc837863b453d7be75dacb74f4fa171831cb93ef2c2b30d3ae2e3fdfcb777
 MISC metadata.xml 464 BLAKE2B 1b46b5afe539a60af185b8b5fe10a6e7459508749263efb0ea88adce9655f103ab4ae6bfe666362df894bde1b642a2bb041ef53cf80cc0386d369a3d91b093b4 SHA512 a82637fbb0d524910ca2456bcc19028418d815bac7f52058eac1b677fd6ebcc62f965f002ff3072ffeed78fa54c4a6c427e672a21a8f3d1bc10bd0e42c3b3d9a
diff --git a/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild b/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild
index 93d60da367c5..bed9fb7e7cb0 100644
--- a/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild
+++ b/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest
deleted file mode 100644
index ffd871effb98..000000000000
--- a/dev-python/pyfits/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 01-system-cfitsio.patch 5038 BLAKE2B d6c48057f9efc207e68103d823ca07e0fdddf699451f8389274662b67eb7ac210577c0e9b28529f819f087352e7dc5b5ae7e7aba7f50954238c62ec7581f33f3 SHA512 25369aaf360742b432cd9ad4b4d83c3875dad3eb89daf70483f4dd6a187777a0493f94f365fea171f4adf493d2d5bfcb2223bb362a3fc8aface750c3d29af5b5
-AUX 02-numpy-deprecation-warning.patch 902 BLAKE2B 6f3bcb2c9738f9a24a4d5c1c53bae7cb8b447368320e46ef1958def84de4422f2160f4124d05266ec6177d3de5fc962f0c456c281788cf0322ec359ba2cbae5c SHA512 14123cd3ac5401fe29af59b4d03bc6b8cf2c3f17695cc4d34664298f0031748bc27ff52897e57032bd887743c9acda0c22af16b0a7362898d2d48984fe9c6a2a
-AUX 03-fix-for-cfitsio-3380.patch 1496 BLAKE2B bdacc85c1dd1ee28d7c84325646499f2c510e881e3641a0583d4fa56bc02dcedad6a743ad3b6265c664fd2c79804798bf66b4b626d03cbabfef1898e96c1596f SHA512 f3a842f0c9701233e49b22ba6fa8f672fa6374e025614e9c071ea3a54d01033c0f930fc7649cfd42abe65482927b70246762b9f59992790bccf17bc0ce3e0fdc
-AUX pyfits-3.2.1-unbundle-cfitsio.patch 2676 BLAKE2B 741df2cbceae943cda462db93d8d337e799ed77a4e5c6b214033ec8829da912d098c02e53e55071b9bf1344cacd2d44244fa1b5606a871ba3a42de97c7ffb85c SHA512 bea17130b7cb3f593ba8e24a699f4a2d58990ee4aace00117beb68498a56c662f90031a8843cb9b388e3dd757bf1efaf2596ba3a69bcc958e0a344e53d3c0675
-DIST pyfits-3.3.tar.gz 1646403 BLAKE2B 6d97198353c93e8d40545bba2677a9f3be5a810c68ddb8b6243debee82fc6ba256ed1a314a42a1c18eb4a2e037f191709bdf17fc08256256d797d7524c84a7f2 SHA512 561fe61050e61745054e0e4712c4413e129293b062d2020219b61d648d7093ce6952e1f26da955a1bf570f76ba7eddeb1805c99f679300b072ef6bacc2e4c90a
-DIST pyfits-3.4.tar.gz 1692414 BLAKE2B d3bcd3ce992c63e3a9e520c1bba56bd908590fddc0bfbb35941c7cdf8ff98c384bf5631fe86f8c6c8f292df9a38f299edde431d37a85dce0db1b869b92965bd7 SHA512 b569f871f26dcd9cb2fbe9d823d55c525e8101b0fcf83fff4bc3f3ec4bc7f680953a29634518ea19383f533f5e23b3703fffdb4e0d577b1023b4323254ef3a7e
-EBUILD pyfits-3.3-r1.ebuild 1882 BLAKE2B 9982b3410cc6d22f197b7a9e6f2f6d5ca9da7a61cefea1126792199356b628d82492388f445481e294965cb5b5a90c896c9462f04503d23fbdf19696a45a4dea SHA512 c538b21c9e4af9943941c560a6fa7498ee9b37723325b5029655d8e0496a2f0f1b1dc3f8271d1e79a4172d8b5d8f252d26618d056742ada36553a6642448d915
-EBUILD pyfits-3.4-r1.ebuild 1964 BLAKE2B baad8955c0e8f9f6f10351cb0e4916df7cfdf2cebdae2daaf300ed79cf3847b9556d122026d648831f810869452b2da5dd66273cc051be70fb65cfe99810d9da SHA512 5225fb2e180f84e677073e7c56ae09e6ef398b431ea980b8c0dfa94069d153ce57072f82d4c13dc937cb7b8f1a4d33d68e15babcab82a25640d81a1a01b98464
-MISC metadata.xml 642 BLAKE2B 553c94afc0e02b2f208c2936603f49777405e08a99b45b254857a960c5d5a8ace8995941603a7069216a93ca2787f681f7a656f3028f987d576a344779eb01e3 SHA512 fd07a54d6f8273f7e16358da22be2f8484f74bacdeb78c35980046256800701b7fc53e7261074fb84651384f2e821ef3fbe62ba3674ca5fc6cd2fc176335da7c
diff --git a/dev-python/pyfits/files/01-system-cfitsio.patch b/dev-python/pyfits/files/01-system-cfitsio.patch
deleted file mode 100644
index f2ce935c7ea8..000000000000
--- a/dev-python/pyfits/files/01-system-cfitsio.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 70fe4dac3f68c3eed369d42e6a49e7865db8b250 Mon Sep 17 00:00:00 2001
-From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 10:31:01 -0700
-Subject: 01-system-cfitsio.diff
-
-Patch-Name: 01-system-cfitsio.diff
----
- setup.cfg | 145 +++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 73 insertions(+), 72 deletions(-)
-
-diff --git a/setup.cfg b/setup.cfg
-index 3a05c62..3a64f33 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -40,81 +40,81 @@ scripts =
- 
- [extension=pyfits.compression]
- sources = 
--	cextern/cfitsio/adler32.c
--	cextern/cfitsio/buffers.c
--	cextern/cfitsio/cfileio.c
--	cextern/cfitsio/checksum.c
--	cextern/cfitsio/crc32.c
--	cextern/cfitsio/deflate.c
--	cextern/cfitsio/drvrfile.c
--	cextern/cfitsio/drvrgsiftp.c
--	cextern/cfitsio/drvrmem.c
--	cextern/cfitsio/drvrnet.c
--	cextern/cfitsio/drvrsmem.c
--	cextern/cfitsio/editcol.c
--	cextern/cfitsio/edithdu.c
--	cextern/cfitsio/eval_f.c
--	cextern/cfitsio/eval_l.c
--	cextern/cfitsio/eval_y.c
--	cextern/cfitsio/fitscore.c
--	cextern/cfitsio/fits_hcompress.c
--	cextern/cfitsio/fits_hdecompress.c
--	cextern/cfitsio/getcolb.c
--	cextern/cfitsio/getcol.c
--	cextern/cfitsio/getcold.c
--	cextern/cfitsio/getcole.c
--	cextern/cfitsio/getcoli.c
--	cextern/cfitsio/getcolj.c
--	cextern/cfitsio/getcolk.c
--	cextern/cfitsio/getcoll.c
--	cextern/cfitsio/getcolsb.c
--	cextern/cfitsio/getcols.c
--	cextern/cfitsio/getcolui.c
--	cextern/cfitsio/getcoluj.c
--	cextern/cfitsio/getcoluk.c
--	cextern/cfitsio/getkey.c
--	cextern/cfitsio/group.c
--	cextern/cfitsio/grparser.c
--	cextern/cfitsio/histo.c
--	cextern/cfitsio/imcompress.c
--	cextern/cfitsio/infback.c
--	cextern/cfitsio/inffast.c
--	cextern/cfitsio/inflate.c
--	cextern/cfitsio/inftrees.c
--	cextern/cfitsio/iraffits.c
--	cextern/cfitsio/modkey.c
--	cextern/cfitsio/pliocomp.c
--	cextern/cfitsio/putcolb.c
--	cextern/cfitsio/putcol.c
--	cextern/cfitsio/putcold.c
--	cextern/cfitsio/putcole.c
--	cextern/cfitsio/putcoli.c
--	cextern/cfitsio/putcolj.c
--	cextern/cfitsio/putcolk.c
--	cextern/cfitsio/putcoll.c
--	cextern/cfitsio/putcolsb.c
--	cextern/cfitsio/putcols.c
--	cextern/cfitsio/putcolu.c
--	cextern/cfitsio/putcolui.c
--	cextern/cfitsio/putcoluj.c
--	cextern/cfitsio/putcoluk.c
--	cextern/cfitsio/putkey.c
--	cextern/cfitsio/quantize.c
--	cextern/cfitsio/region.c
--	cextern/cfitsio/ricecomp.c
--	cextern/cfitsio/scalnull.c
--	cextern/cfitsio/swapproc.c
--	cextern/cfitsio/trees.c
--	cextern/cfitsio/uncompr.c
--	cextern/cfitsio/wcssub.c
--	cextern/cfitsio/wcsutil.c
--	cextern/cfitsio/zcompress.c
--	cextern/cfitsio/zuncompress.c
--	cextern/cfitsio/zutil.c
-+#	cextern/cfitsio/adler32.c
-+#	cextern/cfitsio/buffers.c
-+#	cextern/cfitsio/cfileio.c
-+#	cextern/cfitsio/checksum.c
-+#	cextern/cfitsio/crc32.c
-+#	cextern/cfitsio/deflate.c
-+#	cextern/cfitsio/drvrfile.c
-+#	cextern/cfitsio/drvrgsiftp.c
-+#	cextern/cfitsio/drvrmem.c
-+#	cextern/cfitsio/drvrnet.c
-+#	cextern/cfitsio/drvrsmem.c
-+#	cextern/cfitsio/editcol.c
-+#	cextern/cfitsio/edithdu.c
-+#	cextern/cfitsio/eval_f.c
-+#	cextern/cfitsio/eval_l.c
-+#	cextern/cfitsio/eval_y.c
-+#	cextern/cfitsio/fitscore.c
-+#	cextern/cfitsio/fits_hcompress.c
-+#	cextern/cfitsio/fits_hdecompress.c
-+#	cextern/cfitsio/getcolb.c
-+#	cextern/cfitsio/getcol.c
-+#	cextern/cfitsio/getcold.c
-+#	cextern/cfitsio/getcole.c
-+#	cextern/cfitsio/getcoli.c
-+#	cextern/cfitsio/getcolj.c
-+#	cextern/cfitsio/getcolk.c
-+#	cextern/cfitsio/getcoll.c
-+#	cextern/cfitsio/getcolsb.c
-+#	cextern/cfitsio/getcols.c
-+#	cextern/cfitsio/getcolui.c
-+#	cextern/cfitsio/getcoluj.c
-+#	cextern/cfitsio/getcoluk.c
-+#	cextern/cfitsio/getkey.c
-+#	cextern/cfitsio/group.c
-+#	cextern/cfitsio/grparser.c
-+#	cextern/cfitsio/histo.c
-+#	cextern/cfitsio/imcompress.c
-+#	cextern/cfitsio/infback.c
-+#	cextern/cfitsio/inffast.c
-+#	cextern/cfitsio/inflate.c
-+#	cextern/cfitsio/inftrees.c
-+#	cextern/cfitsio/iraffits.c
-+#	cextern/cfitsio/modkey.c
-+#	cextern/cfitsio/pliocomp.c
-+#	cextern/cfitsio/putcolb.c
-+#	cextern/cfitsio/putcol.c
-+#	cextern/cfitsio/putcold.c
-+#	cextern/cfitsio/putcole.c
-+#	cextern/cfitsio/putcoli.c
-+#	cextern/cfitsio/putcolj.c
-+#	cextern/cfitsio/putcolk.c
-+#	cextern/cfitsio/putcoll.c
-+#	cextern/cfitsio/putcolsb.c
-+#	cextern/cfitsio/putcols.c
-+#	cextern/cfitsio/putcolu.c
-+#	cextern/cfitsio/putcolui.c
-+#	cextern/cfitsio/putcoluj.c
-+#	cextern/cfitsio/putcoluk.c
-+#	cextern/cfitsio/putkey.c
-+#	cextern/cfitsio/quantize.c
-+#	cextern/cfitsio/region.c
-+#	cextern/cfitsio/ricecomp.c
-+#	cextern/cfitsio/scalnull.c
-+#	cextern/cfitsio/swapproc.c
-+#	cextern/cfitsio/trees.c
-+#	cextern/cfitsio/uncompr.c
-+#	cextern/cfitsio/wcssub.c
-+#	cextern/cfitsio/wcsutil.c
-+#	cextern/cfitsio/zcompress.c
-+#	cextern/cfitsio/zuncompress.c
-+#	cextern/cfitsio/zutil.c
- 	src/compressionmodule.c
- include_dirs = 
- 	numpy
--	cextern/cfitsio
-+#	cextern/cfitsio
- extra_compile_args = 
- 	-Wno-declaration-after-statement
- 	-Wno-unused-variable
-@@ -125,6 +125,7 @@ extra_compile_args =
- 	-Wno-unused
- 	-Wno-comments
- 	-Wno-switch
-+libraries = cfitsio
- optional = True
- fail_message = 
- 	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/dev-python/pyfits/files/02-numpy-deprecation-warning.patch b/dev-python/pyfits/files/02-numpy-deprecation-warning.patch
deleted file mode 100644
index 026e6b829d4d..000000000000
--- a/dev-python/pyfits/files/02-numpy-deprecation-warning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 90cac05f8a5436a8dd3714ad29e2d81eb8b4d39b Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Tue, 2 Feb 2016 22:41:09 +0100
-Subject: Avoid DeprecationWarning from Numpy.
-
-Patch-Name: 02-numpy-deprecation-warning.diff
----
- pyfits/tests/test_division.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pyfits/tests/test_division.py b/pyfits/tests/test_division.py
-index da4df72..aa93264 100644
---- a/pyfits/tests/test_division.py
-+++ b/pyfits/tests/test_division.py
-@@ -18,7 +18,8 @@ class TestDivisionFunctions(PyfitsTestCase):
-         a1 = np.rec.array(
-             s,
-             dtype=np.dtype([('c1', '>i4'), ('c2', '|S3'),
--                         ('c3', '>f4'), ('c4', '|i1')]))
-+                         ('c3', '>f4'), ('c4', '|i1')]),
-+            shape=len(s) // 12)
- 
-     def test_card_with_continue(self):
-         h = fits.PrimaryHDU()
diff --git a/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch b/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch
deleted file mode 100644
index d0fac84d1e22..000000000000
--- a/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Update image tests for cfitsio 3.380
- Make TFORMx check more flexible. The maximal column length in cfitsio
- changed between version 3370 and 3380. This patch checks their syntax,
- without a specific length.
- .
- HCOMPRESSed images are allowed to deviate from the original by about
- 1/quantize_level of the RMS in each tile. This patch changes the absolute
- identity test
-Bug: https://github.com/astropy/astropy/issues/4646
-Bug: https://github.com/astropy/astropy/issues/4647
-Bug-Debian: https://bugs.debian.org/816595
---- a/pyfits/tests/test_image.py
-+++ b/pyfits/tests/test_image.py
-@@ -2,6 +2,7 @@
- 
- import math
- import os
-+import re
- import time
- import warnings
- 
-@@ -1014,7 +1015,7 @@
-         hdu.writeto(self.temp('test.fits'))
- 
-         with fits.open(self.temp('test.fits')) as hdul:
--            assert (hdul['SCI'].data == cube).all()
-+            assert np.abs(hdul['SCI'].data - cube).max() < 1./15.
- 
-     def test_subtractive_dither_seed(self):
-         """
-@@ -1269,8 +1270,8 @@
- 
-         with fits.open(self.temp('test.fits'),
-                        disable_image_compression=True) as h:
--            assert h[1].header['TFORM1'] == '1PB(30)'
--            assert h[1].header['TFORM2'] == '1PB(359)'
-+            assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM1'])
-+            assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM2'])
- 
-     def test_compression_update_header(self):
-         """Regression test for
-
diff --git a/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch b/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch
deleted file mode 100644
index a5d7e6217486..000000000000
--- a/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- setup.cfg.orig	2014-03-10 10:50:38.200531959 -0700
-+++ setup.cfg	2014-03-10 10:52:19.288232002 -0700
-@@ -36,92 +36,12 @@
- 
- [extension=pyfits.compression]
- sources = 
--	cextern/cfitsio/adler32.c
--	cextern/cfitsio/buffers.c
--	cextern/cfitsio/cfileio.c
--	cextern/cfitsio/checksum.c
--	cextern/cfitsio/crc32.c
--	cextern/cfitsio/deflate.c
--	cextern/cfitsio/drvrfile.c
--	cextern/cfitsio/drvrgsiftp.c
--	cextern/cfitsio/drvrmem.c
--	cextern/cfitsio/drvrnet.c
--	cextern/cfitsio/drvrsmem.c
--	cextern/cfitsio/editcol.c
--	cextern/cfitsio/edithdu.c
--	cextern/cfitsio/eval_f.c
--	cextern/cfitsio/eval_l.c
--	cextern/cfitsio/eval_y.c
--	cextern/cfitsio/fitscore.c
--	cextern/cfitsio/fits_hcompress.c
--	cextern/cfitsio/fits_hdecompress.c
--	cextern/cfitsio/getcolb.c
--	cextern/cfitsio/getcol.c
--	cextern/cfitsio/getcold.c
--	cextern/cfitsio/getcole.c
--	cextern/cfitsio/getcoli.c
--	cextern/cfitsio/getcolj.c
--	cextern/cfitsio/getcolk.c
--	cextern/cfitsio/getcoll.c
--	cextern/cfitsio/getcolsb.c
--	cextern/cfitsio/getcols.c
--	cextern/cfitsio/getcolui.c
--	cextern/cfitsio/getcoluj.c
--	cextern/cfitsio/getcoluk.c
--	cextern/cfitsio/getkey.c
--	cextern/cfitsio/group.c
--	cextern/cfitsio/grparser.c
--	cextern/cfitsio/histo.c
--	cextern/cfitsio/imcompress.c
--	cextern/cfitsio/infback.c
--	cextern/cfitsio/inffast.c
--	cextern/cfitsio/inflate.c
--	cextern/cfitsio/inftrees.c
--	cextern/cfitsio/iraffits.c
--	cextern/cfitsio/modkey.c
--	cextern/cfitsio/pliocomp.c
--	cextern/cfitsio/putcolb.c
--	cextern/cfitsio/putcol.c
--	cextern/cfitsio/putcold.c
--	cextern/cfitsio/putcole.c
--	cextern/cfitsio/putcoli.c
--	cextern/cfitsio/putcolj.c
--	cextern/cfitsio/putcolk.c
--	cextern/cfitsio/putcoll.c
--	cextern/cfitsio/putcolsb.c
--	cextern/cfitsio/putcols.c
--	cextern/cfitsio/putcolu.c
--	cextern/cfitsio/putcolui.c
--	cextern/cfitsio/putcoluj.c
--	cextern/cfitsio/putcoluk.c
--	cextern/cfitsio/putkey.c
--	cextern/cfitsio/quantize.c
--	cextern/cfitsio/region.c
--	cextern/cfitsio/ricecomp.c
--	cextern/cfitsio/scalnull.c
--	cextern/cfitsio/swapproc.c
--	cextern/cfitsio/trees.c
--	cextern/cfitsio/uncompr.c
--	cextern/cfitsio/wcssub.c
--	cextern/cfitsio/wcsutil.c
--	cextern/cfitsio/zcompress.c
--	cextern/cfitsio/zuncompress.c
--	cextern/cfitsio/zutil.c
- 	src/compressionmodule.c
- include_dirs = 
- 	numpy
--	cextern/cfitsio
--extra_compile_args = 
--	-Wno-declaration-after-statement
--	-Wno-unused-variable
--	-Wno-parentheses
--	-Wno-uninitialized
--	-Wno-format
--	-Wno-strict-prototypes
--	-Wno-unused
--	-Wno-comments
--	-Wno-switch
--optional = True
-+libraries =
-+	cfitsio
-+optional = False
- fail_message = 
- 	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- 	Failed to build PyFITS tile compression support.  PyFITS will still
diff --git a/dev-python/pyfits/metadata.xml b/dev-python/pyfits/metadata.xml
deleted file mode 100644
index 4e1c8e2ff441..000000000000
--- a/dev-python/pyfits/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="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-  PyFITS provides an interface to FITS formatted files under the
-  Python scripting language and PyRAF, the Python-based interface to
-  IRAF.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">pyfits</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyfits/pyfits-3.3-r1.ebuild b/dev-python/pyfits/pyfits-3.3-r1.ebuild
deleted file mode 100644
index 1c67ac765045..000000000000
--- a/dev-python/pyfits/pyfits-3.3-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/cfitsio:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/d2to1-0.2.5[${PYTHON_USEDEP}]
-	>=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' 'python*')
-		dev-python/sphinxcontrib-programoutput[${PYTHON_USEDEP}]
-		dev-python/stsci-sphinxext[${PYTHON_USEDEP}]
-		 )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.1-unbundle-cfitsio.patch )
-
-python_prepare_all() {
-	sed -i \
-		-e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
-		"${S}"/setup.cfg || die
-
-	# https://github.com/spacetelescope/PyFITS/issues/95
-	sed \
-		-e "s/except UserWarning, w/except UserWarning as w/" \
-		-i lib/pyfits/scripts/fitscheck.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	nosetests --verbose || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	local binary
-	for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
-		einfo "Renaming ${binary} to ${binary}-${PN}"
-		mv ${binary}{,-${PN}} || die "failed renaming"
-	done
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	DOCS=( FAQ.txt CHANGES.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyfits/pyfits-3.4-r1.ebuild b/dev-python/pyfits/pyfits-3.4-r1.ebuild
deleted file mode 100644
index 2bfee75e72b5..000000000000
--- a/dev-python/pyfits/pyfits-3.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/cfitsio:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/d2to1-0.2.5[${PYTHON_USEDEP}]
-	>=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' 'python*')
-		dev-python/sphinxcontrib-programoutput[${PYTHON_USEDEP}]
-		dev-python/stsci-sphinxext[${PYTHON_USEDEP}]
-		 )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/01-system-cfitsio.patch
-		  "${FILESDIR}"/02-numpy-deprecation-warning.patch
-		  "${FILESDIR}"/03-fix-for-cfitsio-3380.patch )
-
-python_prepare_all() {
-	sed -e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
-		-i "${S}"/setup.cfg || die
-
-	# https://github.com/spacetelescope/PyFITS/issues/95
-	sed -e "s/except UserWarning, w/except UserWarning as w/" \
-		-i pyfits/scripts/fitscheck.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	nosetests --verbose || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	local binary
-	for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
-		einfo "Renaming ${binary} to ${binary}-${PN}"
-		mv ${binary}{,-${PN}} || die "failed renaming"
-	done
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	DOCS=( FAQ.txt CHANGES.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 5236a559bcd3..f8b267d85e13 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -7,10 +7,10 @@ DIST pyflakes-1.2.3.tar.gz 44776 BLAKE2B 9effec80b58ebac140a6a8b2f5f31a32c4fdf9e
 DIST pyflakes-1.6.0.tar.gz 48184 BLAKE2B a5762c23521aa68ea92537fbc2903bb7af64faf8d1fafc97e48e003f529f8c16ae8dca444c9122fc5c50618fec7120b2f2b2e6682e1d86e502ab49096cb42bfc SHA512 7e9c2aad6ebed638a1354cef51c7e1f68b25e59f8caf4694997a9afecd7cd8baa629a9363297ac0d961430f007fd22dcae7dae1bcbd7838a3b5d4285063bc7c5
 DIST pyflakes-2.0.0.tar.gz 49002 BLAKE2B 146d1108b7cf9aca3316d33ad2ac3a0d1627af525b5def8c6140787fb4d1f47bb45c3c9ec9cb755e51e7ca4e947346e5e9de9b4a1b461389ff1bc4521371a684 SHA512 4961ebb8372f51783416681e79342d6be94318ecd007190e5c27f46c48f8f163c7a5f49cbe3025789ff1d9cd37c465b2f3baa219059779163545f9828a766f71
 DIST pyflakes-2.1.1.tar.gz 58072 BLAKE2B 68dccddae2a9dc77f2d1f1251c80e2552935281b6b79e55fd2a0805cb30bf5e1c227b60a7e1f55f5f92ac42dfd18a69eb0b76ce06f43ac1c48dde3921817a271 SHA512 7ebf5843b38146305c1063e070480fea8ec3b47fa1be546b1fafaeb242a688a5a001f978e7257fd71d5905b9a338b466ef17c7330725191587e9c40ba632c3f8
-EBUILD pyflakes-0.8.1.ebuild 725 BLAKE2B 66db1c79832def85898214b113fa89f4954cf453bd8de2133307768d744ce4e298310ae166aa3e9c97c750db6ed5896636bcaceeeeb522057d7df6e11e2d6735 SHA512 17161d9c4497fea7cb139a041350d41ea72df414372c0ec703baf0e2b23b2ef47a6b7938246aca8fb0e06445d12826dfd4dd5a29722a67e052787225846f3a51
-EBUILD pyflakes-1.0.0.ebuild 756 BLAKE2B b1c3e4eecb2943fc256f201b4d51341112c0f9bd37488bae76c3d6fb0db0e75c5e7ccbc18ccb8739fb3679ff1d4734f1a4b77cc6ea1c103346112b420c41fad3 SHA512 d9ae2e18cbdbfddc22ed8ba1f3404c0c6483d4ffa3b136cb04b43c2216082b6df36f3d0e1a01386ebf4bf6490368f1f5fe0db74c91f27ede8cc36fe707e961f6
-EBUILD pyflakes-1.2.3.ebuild 696 BLAKE2B d454508e43c8aedf492e047297026645f994bff2f55a63a0827ec7678e5cfdf46dfac00f3058900f62dad0bdf1eabd68ab05b9b4d3afbb95274dc66df4f482c4 SHA512 964a3c17388641f44f589b23d83d492a01a4a47502382c1b8a18ed320219f3cb6ffd59f78318238be8ee8bfcb145025aa0100cf94face5cd2b06702aa3ba6223
-EBUILD pyflakes-1.6.0.ebuild 690 BLAKE2B 815b16d83de58a29829c94e288720fdbee9be35909e25ffb007a0236b48ca26f6c75f894abec0ed8ae7841e762c837861945719ef3d1f3b3a4d5ee68f910c1f3 SHA512 ba4c917d05113b1aa4ac7b1c7a59fde2e21589aa5c3662fa3fbb466690fae1eead31e98484ef13ef80f68fe6d992ff68e2277bb86370f3c6147ba3735a495f85
-EBUILD pyflakes-2.0.0.ebuild 701 BLAKE2B 0968f165e21a387dbab3e847f143769760856d4a53aa35a035439cf21e758ea43363faffe84218d55f95cc07a8133f1c0aa14a62e6e24a6975370290f1be978b SHA512 796ef54a7807e67fa2faf0d182a66e715e173c73249b7f8a9d0ebd801e443297f62189ca852d2685745e9c8826662af2c387ecc8172f670b1bdec2df8926e3bc
-EBUILD pyflakes-2.1.1.ebuild 795 BLAKE2B 4c6565f35c80a2a03f2afb2c70c2cc07b6a05a171dd7c3b48a5bc140f674b2f52d0a7c57324865c84c36a6529343a6a167ca56bae9c129fdfa294ea09d0035fe SHA512 a2f4346ec403ff519feba2ca84f18b53b95b8879fb01c374047cd12620daaf8c212e74719e3e8a46116faa2e9ac86cd799668541c78ce194cb26bb2083fa61e9
+EBUILD pyflakes-0.8.1.ebuild 723 BLAKE2B c76a63f2a3ffd1d3f31630654eed0dfd61aa810bd5751e618711cc3da169ff7c07fd838a3bd657b4430d384cab4efd6903787479f14028ecf5596de62ec67f8f SHA512 ebff66086a6ac6b38c706e57a5169f7036c3e1f54e843c964e027c286839550d925f9c90f525b1994af803c7b697657bcecf60867edff7a5fcb24faf608ad2d7
+EBUILD pyflakes-1.0.0.ebuild 749 BLAKE2B f958984d002f0864a220c0be3e061dc861da8df470a3149c744307ff9d5066d4943d4049c142740392e11c2f6fbc66a466df27ec639ac8fc140d7e495cd6ee3f SHA512 0b1a16f1574ba46a6881c3ce45d73d18fd71ed17f06499dd23923a66a898c74ac1939da34c4bd24389c688ac6809e545e465287e6ff1af210c81414b828cb2a1
+EBUILD pyflakes-1.2.3.ebuild 687 BLAKE2B 398170cf42a1bb6769c70ce0a9f42b06d8f75483c6950aac587ab96b5da9823d0ff29bb79f551f9b0b0ac1918ffd89d0e2f91676bd460d3d91a9f8083e27cc2e SHA512 ec2698fd7b758375f05f5309d692106b28dec6ca9a9567eb344ddf55e2bc9177933f03f05e529714dd16372abf231df1262671fce160151dc131750d4816df2d
+EBUILD pyflakes-1.6.0.ebuild 683 BLAKE2B 2cddd08ba51ad8ed799b3c287c98ced77cfd968acc0ce1a9abb7c6865fa53d004916966d6cf611eefff8fa9aa1f50e621d299dff52a92cfea2639aa50601f5a1 SHA512 8ff17220266200e27566fade2673d7a5e3f33b05764d5fde21f3aea0b54ba62ab2b0d06ed97d0a608a34a1c65c0fcbf4b79164520bf97810bb02c61a5855c6aa
+EBUILD pyflakes-2.0.0.ebuild 694 BLAKE2B 003ff1926059e9a1188b6956c0dad98cefd6b424c38820f3c43477cb220c806ca46146de9aafbc082a356883b1be4e7e130ae235c1819ede37267e69207caa3a SHA512 531833c4472b54acc1e015e8ef436d86482c4ceac02275b87212cc0136dcd96084dbe6151183d7935bfcb2ab6502db40b5517a3e65be0968cbf01454b1b34530
+EBUILD pyflakes-2.1.1.ebuild 790 BLAKE2B 1dcce54ae0450b801ea098191f085d879a7b7705dcd7e01560391212627f5ea8970afea0034ff177ffa8142bab11160c2c924c23f78039183e794974bae4463a SHA512 897f15151a8ff9e7cab011596c629990af940f277519250fa6aa96d5259a6dac38d0cc7598da16d9ea518c652dc18768f8ae8c3d5cfb60b21ddc796f3a99fd02
 MISC metadata.xml 738 BLAKE2B 5c1e0cb1452f9aebbefe7edd7a054cad85373344f834fb88ea37414ef69b12a36f774e6da05e73b898d6300a56189ec80891eca7a3c225c95b0fc8755daf18b6 SHA512 6ac45c3c5d1fd3eeae5c8ad9950a2c97ef31d0bb72e6034a1f8b75d2a28e997660df20719431ee138a76544942bc20d609fb6e4a26a77f0ef30f912c6d2c0257
diff --git a/dev-python/pyflakes/pyflakes-0.8.1.ebuild b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
index f0dc3293caad..c808c18397a0 100644
--- a/dev-python/pyflakes/pyflakes-0.8.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyflakes/pyflakes-1.0.0.ebuild b/dev-python/pyflakes/pyflakes-1.0.0.ebuild
index 6100857470d5..6dd529e80c4a 100644
--- a/dev-python/pyflakes/pyflakes-1.0.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyflakes/pyflakes-1.2.3.ebuild b/dev-python/pyflakes/pyflakes-1.2.3.ebuild
index b71d81cf5f35..fe7cf3e932a5 100644
--- a/dev-python/pyflakes/pyflakes-1.2.3.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyflakes/pyflakes-1.6.0.ebuild b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
index dc43699fa57b..d566ca2cc6d5 100644
--- a/dev-python/pyflakes/pyflakes-1.6.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyflakes/pyflakes-2.0.0.ebuild b/dev-python/pyflakes/pyflakes-2.0.0.ebuild
index d8a920782b69..896bceee4a86 100644
--- a/dev-python/pyflakes/pyflakes-2.0.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyflakes/pyflakes-2.1.1.ebuild b/dev-python/pyflakes/pyflakes-2.1.1.ebuild
index b9d46be20e5d..946c7628c9a2 100644
--- a/dev-python/pyflakes/pyflakes-2.1.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyflann/Manifest b/dev-python/pyflann/Manifest
index 2f469769a5e6..fb0a886bd8be 100644
--- a/dev-python/pyflann/Manifest
+++ b/dev-python/pyflann/Manifest
@@ -1,3 +1,3 @@
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
-EBUILD pyflann-1.9.1.ebuild 888 BLAKE2B f808105e7521c68ffac5205f644393e02aa41cc87409108fcd77631089ee8efc46dcb4473588fabd1a690f423a10795a62381c126b09672810a213489819ac4e SHA512 02244ad6204e7510e047ca5580fbfd943a7ee1e3fed73c693d2430a8573c6ea161b45f90f6f109f83639c9f400253b59a07da5ceae050aadb2cdaa3e2ead6c63
+EBUILD pyflann-1.9.1.ebuild 878 BLAKE2B b8aa4988e4b42431624d4ce82262e078e90547926a1a811b46a3e4cf42881b58942ea9da74250199e30bdb64577aeb76ee7a6a0466fa6be190d4e9a358a4c541 SHA512 690d74ef7eeeaa4c101a9711c311e38db1a2011805fa530a78000841d1a67e193b57ac6290c5f24ff727e1bbdd26b3e906bb7de2e3a60765dbba0941d9006b7c
 MISC metadata.xml 761 BLAKE2B 8f07995a5b919b587ce4621911d1c94072cc0fa14262417a607045033bffc6c314c18a85688b0d46e7db2a864f1348e2bb11ff205199bbe1c1e92fdad63e803a SHA512 0bc2639b02b93bfef45e8d0fcce984d9c75500f7f043ccfabd8df959c6c214f2ee67130276bc4b4cf5158fb2c3f8bfa629c8a2def6ec1c065916435da9aff142
diff --git a/dev-python/pyflann/pyflann-1.9.1.ebuild b/dev-python/pyflann/pyflann-1.9.1.ebuild
index 88b8626db00f..6c705d19ed24 100644
--- a/dev-python/pyflann/pyflann-1.9.1.ebuild
+++ b/dev-python/pyflann/pyflann-1.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index fd695544f925..488ffd73f09b 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1,5 +1,5 @@
 AUX fltk_wrap.patch 247 BLAKE2B c6f16fb2c87265c7b1b9d869d9b92454eeab50f6cc8830b3946a2cc2949a3a17a9a160ffaff66f60f875674dca51e1a4aa905f15047607e64b2f4791ae027f61 SHA512 4097f9a657f0cb96e37620b939edb35f4cfcb28b2be643b87f85e5dde8ff9a4f316052cbd5403396698de3e2034bafd164c7111c890a5b6d6bcf818185342bcb
 AUX ignore-func.patch 250 BLAKE2B 3d2a979b2580881ee1fa1a6e30b2afd639974d00ec7475c005d8ca967a599ef6858d158d2de95501d7397c1cf8c5e68c0bd0a72da5fbf037bf1fdfd0e8e04600 SHA512 66854b2ce487d1182ada54b437ad79ea5395d87e4b08d89c9ed85b67b21d426609406201c19914e0872ee558d3b3109d3b43a7af036ffb98b781e07731239419
 DIST pyFltk-1.3.3.tar.gz 946763 BLAKE2B 28798578e7a90f2c3b6d0be22241207b384643ed5269ffb4bb5940d5e8776e59ae3c2b740ba7ef61f0230e037d1b3488adf78d9af69338204df9572218ed8cab SHA512 dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f
-EBUILD pyfltk-1.3.3.ebuild 1090 BLAKE2B bd9ec8aa9675023b945c5703f7cd02082787937b36dbbdc78ed5f8f623cb1cf93b81ddb5463d3e1335e5f0056554bd564791ebfb244ed7636f03877cd749bb01 SHA512 62e3c5812ff0694aa9a58afbe976d8c517ce23f849d078fb90f3f1368a7244a625cc09e3eba9e0c467907c36f5c8972e7280d0bdfef61aa6733fcfdbfb4bd318
+EBUILD pyfltk-1.3.3.ebuild 1088 BLAKE2B 3de42e6c2bdd9314eb2ee6bdf26dc1ac01c2492dbe977536506ad205d999bb5aa453dcbc3d10b8a602a9fb4779470be862f7f0bf6cf05c4a7a801de094d5b920 SHA512 d26d075db5d9a41150438090f05fa9a9f1af2ca9cf0701b7514b5012ee7eeffb887bace443ae2ccbff574478d1c7746805b0b0934ff0c10d1ee26deb6e13b065
 MISC metadata.xml 473 BLAKE2B 0e5625017dc5f5196012da6388fd6f7ef598c005cdf6dcb358a230f7b15014f6e77666772bb351862f2e2ac8690d77132b269e9988ea63662855a85a720b321c SHA512 b6f4d80dd9e608ec2b4b1a8d799c5cf0d238a7d908de0b79d30da2d9b60f6745aa1595256e59867774814114ac0abd5dbaf8456c9f0a17f7fbcddb6d8354b4a6
diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index c28ee6fc1860..c200006f0e99 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/pyformance/Manifest b/dev-python/pyformance/Manifest
index 326608f16beb..781aee0126ad 100644
--- a/dev-python/pyformance/Manifest
+++ b/dev-python/pyformance/Manifest
@@ -1,5 +1,5 @@
 DIST pyformance-0.3.4.tar.gz 19394 BLAKE2B 4bd141df5b3264ae8abb5b5314fcba93aeeab960e4d1d70631a3d5ac072f94a2da48b480f74c446124fb9fbd54a8ffad9c75b2352509aaf991025a02bf736648 SHA512 5dbc83da62bf66767eaaf316824cf5683488d8ee594b72baee327c4ef594f84b5aed07654da483aff29bee98605e5265425be88c165a4bb06e7bdddbbf28e440
 DIST pyformance-0.4.tar.gz 20683 BLAKE2B d818832b7ff43a7e1db888bdb7dc333a532c7d3365dd472f9dbb3300f676cd3cc8f82f8d1c444aa277404ff8e72843eca35e3905542700ea37b1dad3e05c8b4c SHA512 a03324977b40f5097ae4608dd7c36bdbd2a20b261c9d3e32d1be19e5fca50e17fcc24df781b6c3ab60314534368c5e9cf08bc3863d4d2d7ecc59f9af26f8d20e
-EBUILD pyformance-0.3.4.ebuild 914 BLAKE2B 5cd97f70534ccca131faaedd955ccfcfd536149731e2daee1317c0f744bb30a0c50fe1158ddcd16942099290db4857094c9418835b9a5f8a299f7a84e961a1fe SHA512 f4dad6b588f35e07d9048e4dda59c0a96ccc3ff746012e2ddb1acf26af7d0851441d14a5da05b783c91031598aa74ff7217c6e99270ce8504308a8e15dcbaa5d
-EBUILD pyformance-0.4.ebuild 837 BLAKE2B 1185ef3f4f13ce26729811a9f036002a1cb0adfc1c7173a74a69f49dbd0aad5e7ef092aa406478fc384298bf0c911d566b6c3e71ce88956e4021524f7a16e652 SHA512 a143c89efaa58e270c36da2527470e89a754407699a940a543c89e6d11a9280acdfe8f7d67b1b7756a4137a1ec94cf38f5fe68b7115dde85ff9ccd20dd322fbc
+EBUILD pyformance-0.3.4.ebuild 900 BLAKE2B a23428ba3bf54af7f9b86d82a70939c81c74ddb8582469dcffdbbc21404b8bcdd98e91e80b035b76434e7640ab60e13b7eb0395c64571130baf97f37457f3486 SHA512 c7493340143d6c92c0b88c3ba64a06f97bf6f2b0bc10de7ee8352cae147d59688f881e0bd8cdd10a9e80e8ae1498bf8f0ef797d42c584f3a742810d11934a274
+EBUILD pyformance-0.4.ebuild 823 BLAKE2B c9004270922f265191e2e15ff1ae0a2b8001a59761cc3b7058eb01ea89684bf89e8de4f2d777dab025cada9f0b9a23b682c8dede039d2312a540bc94784f0059 SHA512 c68a801eb78a867c4be3edbd8655e5e7bcdff8c88d600b37c0b9f56c348d352b681afb949553beac490ad71f05bfa18a7bda334873c27c1670c8f2e43f6f52b0
 MISC metadata.xml 452 BLAKE2B c229f2c744aad33f55a3983a97780b9c0e361e8786a3c9b372f556656c7e1dec34dc30b1f9985747a8f917c8714e867b509143faffacb4242aeb1b61ecce54d1 SHA512 d1fb11333e19747774ae686b9c12f221c9b844be16ee6d2381f38d09d775118c4ffc3379d18217f83d2c0cf518de61a448680e78a1650e289c390d6437702240
diff --git a/dev-python/pyformance/pyformance-0.3.4.ebuild b/dev-python/pyformance/pyformance-0.3.4.ebuild
index 0c351c0fccd7..65e0604698fb 100644
--- a/dev-python/pyformance/pyformance-0.3.4.ebuild
+++ b/dev-python/pyformance/pyformance-0.3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyformance/pyformance-0.4.ebuild b/dev-python/pyformance/pyformance-0.4.ebuild
index 8aa6f2b08058..0092fe0ab5a3 100644
--- a/dev-python/pyformance/pyformance-0.4.ebuild
+++ b/dev-python/pyformance/pyformance-0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 5c85fca214ab..4fbac4f03950 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,9 +1,3 @@
-DIST pyftpdlib-1.5.1.tar.gz 127582 BLAKE2B 00233ab4acf5aae4902384f514de0d6da9a55b7312b7744ce3f16fd222b5abeae0c65f0f9309ff40d0cbd960baee2c269a1fc6ba72ed8f700c7dbfd47e646a8a SHA512 81bb634aef7190d97b5939b998c8dd8caf1ce77c2ca66d085826880590a03e7fe4aeefb5eb67f30f25b984962eaae740c4c8c1d5900909029702e37c36bb2b9b
-DIST pyftpdlib-1.5.3.tar.gz 183189 BLAKE2B dd563f59ff21b2059e1c6d6ac6015561d5e0de07b52ea212589afea61abe63a2a61deed86bb133969c8dc99b826b7e23ddf071e0b28ac7b84a066f3fa7f31d90 SHA512 f0e56f170fa77e0866cbbead52ad52276ee45b6c3244557bc59cd2bf599934ae4414a684661d4d47f76098b3da19e23c1a037aaa07a6a81f8d1be14b90191517
-DIST pyftpdlib-1.5.4.tar.gz 184986 BLAKE2B 6973b1f7e0fc0c89eb5d79e082690a706b56553ad4b2ece68a8216bb99c185d770475e349402ec71baf1bb06e5ecca5be2a3c52512f0d8283c4cc249bc28a949 SHA512 6eb308021dad28c1c51a88b366947a71b7bc1802571dc14cedf3a264bd0cb8504ef990d7e3110d10709f971d4d5b0001bee859b58fb4d02a1b0d46532acc9295
 DIST pyftpdlib-1.5.5.tar.gz 184314 BLAKE2B 2d02839c6809674c7b7c4dfd610610a9231799802cc53ad0a05bfabc8985e77c64d9b239628f13bdc22942460b3e923067f084c3c5ac2b7be7671279a08e0351 SHA512 27427154f893812f689adf3a9ceb4ec2d8f0ea7a4bf7b08671dc146c95f09ddd596a27c85e009d8d6647277def48c0bf0a8b76fb3fba5818eda3dfdc6c10795e
-EBUILD pyftpdlib-1.5.1.ebuild 1308 BLAKE2B 465973bea8105d650ca24253a656cb67224da65d90834c1ac29e2472632f71caa0034fde8d6d6aa15ce0896f5a033158214cece82b8af4c5fa91a66fda80f439 SHA512 d09644e533d258aea4bcb9d1c9d72b8aac57debddfee2f50ebe92790a9a3e3b0119a20bbb589f83f508078013258c657bda67ff100515ff389165aef913bc891
-EBUILD pyftpdlib-1.5.3.ebuild 1556 BLAKE2B fcb19b0a1c772aef4556ba5e221d1007098d5ee0059a743223cf680e52c32f9bd9093876221844aa244ef2c0190882117ea8fec4e2579c696cada3355dc1922f SHA512 e4cb5ceb3354bb0ff3c2e927c4d179a36211c0f09aeb4e4246cde5facf216843eda7bc3ec25ff8341eabf27936ba58d4fe4bc235b4ad0cc45ccc22059e849944
-EBUILD pyftpdlib-1.5.4.ebuild 2557 BLAKE2B 099f149f1cd35708b735a8130ba9bacec4321c7461232cb3f82496e5186207ea3262f766280b6c37c08ade856e681991af7f64db0a9dcca8414462322fd2a339 SHA512 cc2c586d71b50e6ddfec2f8de3d4a7de325baa38d0b51fbbbf80d70d24f20bf8d019f1ebc3b5d23e72aeb1f7e05fe5da05cfd83705f07c1b20d25b9f2809e8d3
-EBUILD pyftpdlib-1.5.5-r1.ebuild 3099 BLAKE2B 6ee1d19dfd00f46c358edd09926706178c49e17bfb1b48fb3c407803d16c1328f9dbb0b418724f6687841e2b71c690dbe6ae4693c0c8109cb50e7de07a28208b SHA512 993b73e1387410172574a10de1b39aecad3937417c324e8d453c2696eb09e6137695f6eaf00bcef397c7c9e7a45ca2bd19c9bc0eb3ca5f8ba202bab2a373139a
+EBUILD pyftpdlib-1.5.5-r1.ebuild 3096 BLAKE2B d2e90e44db5ab4bcfaad7f39cb6ba8eb4941bda1d954ef1dcf502d6f88facd205721a0ef361e8596dd25d2b2e37e61f095feda29513fe1f2dbbf9b5e48cea40c SHA512 fed1be4d590064ec1a67d8ef9efa654a51f0b2f7bd8f391d7d0bb70041ee8546b1cc9e26c10263a9762cc0688689559c8ec6bed3f95bb8479c6fbdf9044c01a3
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
deleted file mode 100644
index 10d6dfd7fd55..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/"
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}] )"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )
-"
-
-python_test() {
-	"${EPYTHON}" ${PN}/test/runner.py || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
-		! has_version dev-python/pysendfile ; then
-		elog "dev-python/pysendfile is not installed"
-		elog "It can considerably speed up file transfers for Python 2"
-	fi
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
deleted file mode 100644
index 4ce37c1a29ec..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/"
-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 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	"${EPYTHON}" ${PN}/test/runner.py || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
-		! has_version dev-python/pysendfile ; then
-		elog "dev-python/pysendfile is not installed"
-		elog "It can considerably speed up file transfers for Python 2"
-	fi
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
deleted file mode 100644
index e1af5de4a849..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/"
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pysendfile[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i "s/'sphinx.ext.intersphinx'//" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# These tests fail when passing additional options to py.test
-	# so we need to run them separately
-	py.test ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}"
-	# Some of these tests tend to fail
-	local skipped_tests=(
-		# https://github.com/giampaolo/pyftpdlib/issues/470
-		# https://bugs.gentoo.org/659108
-		test_idle_data_timeout2
-		# https://github.com/giampaolo/pyftpdlib/issues/471
-		# https://bugs.gentoo.org/636410
-		test_on_incomplete_file_received
-		# https://github.com/giampaolo/pyftpdlib/issues/466
-		# https://bugs.gentoo.org/659786
-		test_nlst
-	)
-	skipped_tests=${skipped_tests[@]/%/ or}
-	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	TZ=UTC+1 pytest -vv \
-		--ignore ${PN}/test/test_misc.py -k "not (${skipped_tests% or})" \
-			|| die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
-		! has_version dev-python/pysendfile ; then
-		elog "dev-python/pysendfile is not installed"
-		elog "It can considerably speed up file transfers for Python 2"
-	fi
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
index 9bd65b18de3d..759075bad823 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index 665a91d963c7..78fcead155d0 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -1,6 +1,3 @@
-DIST pygal-2.1.1.tar.gz 69757 BLAKE2B d79e65c374e9d191a8e6671fd3bebfee4680c46b54ae141db74d67a08696e8bfa9ef88dcbb07ebf9e267fa5a7024b97a0c9f91f056753caf169e0518a6f49786 SHA512 79851bd6278a3a71f067ea11f273fcd0755ac0ab2ba51266b161fff1f3b49d690bc2a1b3432255da4f3cd5b9cfcff570d713d0bbfaf6f2dfe5b6f922989c72bd
 DIST pygal-2.4.0.tar.gz 4554802 BLAKE2B 9627558e734420bfb3137989d0cc1978a0a06a597d3d5d071e13653876a4bb3266f12f1a8a358076619d997998754c29ee75058356ba66da64b112a24c2cbe2a SHA512 d69fbcff3792cb0b952addc3bfbaea76628d5546482c291ef217c592a820a73a65b1eb522c5d7877e7a794d19b74636126d99a4ff280e8467ab07a95000ba823
-EBUILD pygal-2.1.1-r1.ebuild 480 BLAKE2B c2cafe706abf183883c559d6ad3056a24cbe1b4c3eea5d3e07173929215764dc6add3edc1c1bf3cc919463f28eb6978f6af417a74de27bfe053bb2a6ea4e62ef SHA512 64b244df642c10c216b083583df75e9412fd42c4d9ace131904812e06dca21886b9f7b159bf5dfdbfc63e635673ee2dc7ba34987b78d838b33c92dc916f08bbb
-EBUILD pygal-2.1.1.ebuild 474 BLAKE2B ae5d0b97ff6446713134244d7fa0e7ca47e2c5eb5e7b9a5528ff61dd4ea0b84ba5cc043708125e568446aed2d51be02b7bd3f8788f37a9c43e23ec7bbd23a104 SHA512 f120842fae118560be209e91410868b416eb72989b20b91544da162be3b7bf17c31325ac489ec1ab3f37ddf3a184b8d16a467d2c6694701b1c2ef4728742faf9
-EBUILD pygal-2.4.0.ebuild 1574 BLAKE2B c19a5d08cc25e70cad43636ffea44cea876c34f5e155dca32a504271399fc188acdd80047e3e6f9b4f32be4653ade22be7649b94a0a7bc883fc46db93602a7b3 SHA512 6d1a09ab2ab85f09526f73769fd8ccb4ef4d5ea6c5ba5ec700c92128c12857be7b4a3283cb8b68acdea819601cbad52eddea8e7fe0438129c1a032bfef0b8001
+EBUILD pygal-2.4.0.ebuild 1570 BLAKE2B 2d46c42c81769ea1e7dd0f479762113477e68926007a7b3315491e08c12469187d77381c6a4499ae92c2935c12b63237d21786d36bb6ee2afb20c11e5a357177 SHA512 709e81f706876a0d6f8378e36762ef827cf43434e16ae72b4fa1afa8cec23914156a25014ec18fb6cb8aad90c706b02e4f5429d76c03ebd7c3571ba6ac077496
 MISC metadata.xml 432 BLAKE2B 935ce59a5a29aecbe4015fc52312fb03be02821a20863d20171378a68ced0aadfb43f7d1898fe52b8159cc0cd5a78ae0daedb97b730fd864de39abf3a617cd92 SHA512 1d2e68e4622a235b6df15390271b1f331b366a2ad1432740de81de20b494ccfc9e5f0e94f8b63acee67679e10267c0f21c66b58514e72f32d0fa3b5b262640d3
diff --git a/dev-python/pygal/pygal-2.1.1-r1.ebuild b/dev-python/pygal/pygal-2.1.1-r1.ebuild
deleted file mode 100644
index 2e4d0f4c77cd..000000000000
--- a/dev-python/pygal/pygal-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="A python SVG charts generator"
-HOMEPAGE="http://pygal.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygal/pygal-2.1.1.ebuild b/dev-python/pygal/pygal-2.1.1.ebuild
deleted file mode 100644
index 5e1734b73a46..000000000000
--- a/dev-python/pygal/pygal-2.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-inherit distutils-r1
-
-DESCRIPTION="A python SVG charts generator"
-HOMEPAGE="http://pygal.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygal/pygal-2.4.0.ebuild b/dev-python/pygal/pygal-2.4.0.ebuild
index 8b4f29776c23..bca21e1cba6d 100644
--- a/dev-python/pygal/pygal-2.4.0.ebuild
+++ b/dev-python/pygal/pygal-2.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 8dec8801f0fd..e0ff9aae4170 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,8 +1,6 @@
-AUX pygame-1.9.2_pre20120101-import-bdist.patch 1609 BLAKE2B 976556f860aa1d9be39a1cc56b0a771850aa6afad4acbf45103ac50f69da3b63f365eb3a3d94402c33233a45fd9adf74bec87e7c40c5e5c58f0b982b9a7d62a5 SHA512 d40d0141ac44d8081e51ec94c72123b7f59b8328569d5d590b8c54c3b33b1088e8ecbf56f80c2ba11a01c735421e5836d3f06b390da564f03448a6482d2fd319
-DIST pygame-1.9.2_pre20120101.tar.xz 2263028 BLAKE2B 401b7cdc32cfc6b960e8a686236d0a310d840b4a41211b602f6fe137f80f3bb358daa5e25758c4e152ab41e50c3864c183a0b6f36176e3dec12db80449e126e1 SHA512 1e82cf720da28d4e4213f6b7a029ab4c9dd592c3155f3d11da8272a7d81d28c54f93402383fa5fa4a4e8863dfc039062838d0317cfedde30a4455e52ce680576
 DIST pygame-1.9.3.tar.gz 2974541 BLAKE2B 38ba1f85d845cf33202819705ad564168fb3bc7041731d50d8c3f6bf1c55bebf41202f8ae9e4c4ba52cabe7335a9df13d7724104015b49842dc7f7aa7b0bfd19 SHA512 8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe
 DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
-EBUILD pygame-1.9.2_pre20120101-r2.ebuild 1906 BLAKE2B 3fa9594ef85169af76d135a47866d9ec23690c49e0915bb17c95bcf894f79e14fd8705f4d4c8ba5bce107649d74456493ca602814f4cb6b2c2862db12412cafe SHA512 93afbe080e69e19f4faa037afc4648b7a1c1fee5962d7498109bcf1709e89e562f5793fe90224c297356fee8c8d3f6bccd5532658d4538ef25b6a7a7fd3dd718
-EBUILD pygame-1.9.3.ebuild 1771 BLAKE2B 769e0442f92383d7c1faf8b589ead937f3db0d6f74b4adf5d3f0c1ae1813ad269dbb6c3eee5bf9938fb359d1ba111b0e57e1110cac4eb9b474c497d8b9c672cd SHA512 4be846496eef065d4f565365ea7002b818788a48622892cdfd1bac3ce67f7429a222f238fa5a8d8e111ef540c16cabc64de2d836ab84fb935afa841333c65044
-EBUILD pygame-1.9.6.ebuild 1756 BLAKE2B 40a7ff3948167a9757b69d0673fcd51a05dd3ff4465aa00e46053b684af7d4d0ba9cf21395ed61c4f69d2bd172093e462711664081ba6636776a4b45703f01de SHA512 f7e261f97588db22d5598becb2a2e4c7278157c485a19a649563562785d12f3364fc5ba12889714c2a5afddfeb61209ddb54970e97a330d3aa57056c9e2585cc
+EBUILD pygame-1.9.3.ebuild 1767 BLAKE2B b570549ae6098004f41cc62b74f63deea0af2d030ca5aee4ea5f1dc142300ce9b278e602ede00617e46da594290366181a46e285f211942c8e43f1a55d510c0c SHA512 1206617606a9dda9e90cea1e0dcc6772bca09994e9eef81bebb6d9c40b9c10cf387969888620a815b223dd2ca2850a69c182f060c5db784caaef9a1425683e4e
+EBUILD pygame-1.9.6-r1.ebuild 1747 BLAKE2B a0f79004e34151eddc9d8b63c4601c85d4f7a8131091db595363aafb25628bbf4fcfbbe49ac6914e5e31adb0d2bea102bcf1312cad22d3fb044e83839f9c859e SHA512 76d462569495a3ef582228bf6d0f72cc9d9e29e37ee20b242efa34e87b21e686a9ed96139e5518b61ba4ef9e3e60334000d6f8c6f9a00abd6d8a8ca460207cd8
+EBUILD pygame-1.9.6.ebuild 1752 BLAKE2B 1f3904140b1f87ec546e7cd9fd2a1d54371b225067db5f28b5b9be39e1ad3c95ae98979776bc1ed835e87e55c1035572166790197aa06a614539d4af68edcae2 SHA512 3b86bbf21e86375fe258ef5e22550516059d288e4f1f209817e40e0aebe6138c1ad556cc2a2c3ae6de8e2ccce7091f45dc63621f7428d7cf0ed0d8370b770290
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/files/pygame-1.9.2_pre20120101-import-bdist.patch b/dev-python/pygame/files/pygame-1.9.2_pre20120101-import-bdist.patch
deleted file mode 100644
index f587401ab25d..000000000000
--- a/dev-python/pygame/files/pygame-1.9.2_pre20120101-import-bdist.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f5ee3952769d698d7d03ae61a9c70f2ec4d85874 Mon Sep 17 00:00:00 2001
-From: "Markus (root)" <mo@wurzel.org>
-Date: Sun, 19 Oct 2014 16:56:41 +0200
-Subject: [PATCH] This fails with a TypeError, but offers no functionality.
-
----
- pygame-1.9.2_pre20120101-python3_3/setup.py | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/pygame-1.9.2_pre20120101-python3_3/setup.py b/pygame-1.9.2_pre20120101-python3_3/setup.py
-index ecee5d1..b913f18 100644
---- a/pygame-1.9.2_pre20120101-python3_3/setup.py
-+++ b/pygame-1.9.2_pre20120101-python3_3/setup.py
-@@ -99,19 +99,19 @@ if "-setuptools" in sys.argv:
-     sys.argv.remove ("-setuptools")
- 
- 
--# NOTE: the bdist_mpkg_support is for darwin.
--try:
--    import bdist_mpkg_support
--    from setuptools import setup, Extension
--except ImportError:
--    pass
--else:
--    EXTRAS.update({
--        'options': bdist_mpkg_support.options,
--        'setup_requires': ['bdist_mpkg>=0.4.2'],
--        #'install_requires': ['pyobjc'],
--        #'dependency_links': ['http://rene.f0o.com/~rene/stuff/macosx/']
--    })
-+# # NOTE: the bdist_mpkg_support is for darwin.
-+# try:
-+#     import bdist_mpkg_support
-+#     from setuptools import setup, Extension
-+# except ImportError:
-+#     pass
-+# else:
-+#     EXTRAS.update({
-+#         'options': bdist_mpkg_support.options,
-+#         'setup_requires': ['bdist_mpkg>=0.4.2'],
-+#         #'install_requires': ['pyobjc'],
-+#         #'dependency_links': ['http://rene.f0o.com/~rene/stuff/macosx/']
-+#     })
- 
- #headers to install
- headers = glob.glob(os.path.join('src', '*.h'))
--- 
-2.1.2
-
diff --git a/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild b/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
deleted file mode 100644
index 1b94bebedc20..000000000000
--- a/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit flag-o-matic distutils-r1 virtualx
-
-DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="http://www.pygame.org/"
-if [[ "${PV}" == *_pre* ]]; then
-	SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.xz"
-else
-	SRC_URI="http://www.pygame.org/ftp/pygame-${PV}release.tar.gz"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
-IUSE="doc examples X"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=media-libs/sdl-image-1.2.2[png,jpeg]
-	>=media-libs/sdl-mixer-1.2.4
-	>=media-libs/sdl-ttf-2.0.6
-	>=media-libs/smpeg-0.4.4-r1
-	X? ( >=media-libs/libsdl-1.2.5[X,video] )
-	!X? ( >=media-libs/libsdl-1.2.5 )"
-RDEPEND="${DEPEND}"
-
-if [[ "${PV}" != *_pre* ]]; then
-	S="${WORKDIR}/${P}release"
-fi
-
-PATCHES=(
-	# Workaround bug #516434
-	"${FILESDIR}"/${P}-import-bdist.patch
-)
-
-DOCS=( WHATSNEW )
-
-python_configure() {
-	"${EPYTHON}" config.py -auto
-
-	if ! use X; then
-		sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
-	fi
-
-	# Disable automagic dependency on PortMidi.
-	sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
-
-	sed -i -e "s/import _camera/from pygame &/g" lib/camera.py || die #415593
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}" virtualmake run_tests.py
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Bug #497720
-	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dohtml -r docs/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/dev-python/pygame/pygame-1.9.3.ebuild b/dev-python/pygame/pygame-1.9.3.ebuild
index 60b8c9f71b9b..771b5b844792 100644
--- a/dev-python/pygame/pygame-1.9.3.ebuild
+++ b/dev-python/pygame/pygame-1.9.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit flag-o-matic distutils-r1 virtualx
 
diff --git a/dev-python/pygame/pygame-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild
new file mode 100644
index 000000000000..3fcc368dae0d
--- /dev/null
+++ b/dev-python/pygame/pygame-1.9.6-r1.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=( python3_{6,7,8} )
+
+inherit flag-o-matic distutils-r1 virtualx
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="http://www.pygame.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples midi X"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=media-libs/sdl-image-1.2.2[png,jpeg]
+	>=media-libs/sdl-mixer-1.2.4
+	>=media-libs/sdl-ttf-2.0.6
+	>=media-libs/smpeg-0.4.4-r1
+	midi? ( media-libs/portmidi )
+	X? ( >=media-libs/libsdl-1.2.5[X,video] )
+	!X? ( >=media-libs/libsdl-1.2.5 )"
+RDEPEND="${DEPEND}"
+
+# various module import and data path issues
+RESTRICT=test
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py -auto
+
+	if ! use X; then
+		sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
+	fi
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+	fi
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" virtx "${EPYTHON}" -m pygame.tests
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+}
diff --git a/dev-python/pygame/pygame-1.9.6.ebuild b/dev-python/pygame/pygame-1.9.6.ebuild
index 5dc353c70510..f553a53417bd 100644
--- a/dev-python/pygame/pygame-1.9.6.ebuild
+++ b/dev-python/pygame/pygame-1.9.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit flag-o-matic distutils-r1 virtualx
 
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index de6f2bffff68..320670974b6e 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1,7 +1,7 @@
 AUX pygame_sdl2-6.99.12.4-mixer.patch 1513 BLAKE2B fa0134e7e4c458caf720169bdb655793e2caebe746e04c5204c210b3535830afa56e8cacf2972fb27953500c4e82dbcc5554fbcbbc20a098d7a325b4b30e08d3 SHA512 4c7fb5b9f55e8f4bfde5ac911bda4f83be535a101eeec80595f70a290228cbdddf2686595901aca25c429beac34ed4ee906c92ddb0522b4c73ce48c1e1556b31
 DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9f6a08be1a3ae929db63e358c53b7a05a16cda73d6e3625a7d522dd5dfc972be978f330f26bb30dc70f4657501cd5e5a6d44c1f6b81eebe3fa4 SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754
 DIST pygame_sdl2-for-renpy-6.99.6.tar.bz2 133501 BLAKE2B 6d23b9bad3fad1b508525bdc7b18dbf0801d7c7e36e15b843104e763b5946c79e22663bf705e071b35c8b4742e3f8e59bfaa0345dc95b18f91b9dd186e6d4df6 SHA512 de1a40f7e8acdb46a7e0b13250c7fffdf848bd44c07408928aab6214afbc741aa77e1e8314d9049324328d9ffc645cafe077a468457a721f36e49f98e5217d53
-EBUILD pygame_sdl2-6.99.12.4-r1.ebuild 917 BLAKE2B a4adfd1c5d45af36f7f215cd7c8343fb47bc7d2dd212f26466289d989779274a6e530e61ffe97916e02406c1fc6ae8261f4092e4e06d6a04e2aec80b0b0e2078 SHA512 c1199dd62a0ffe7e09b58f1ca14a28e9a53cb71340beb1faad1cde4fc37ac8857d205f4a1823d0a8a131ca87f667690ffdf3c50edc97916be9e42ffff9b57dd8
-EBUILD pygame_sdl2-6.99.12.4-r2.ebuild 996 BLAKE2B cfb7018979a679d9f7f37d524238709f4c01686cb4a32ad9f0d2bd629363c2ed457f6a47d7f42aa23a0ac21974429231582dd5f2df26e067e56c0d50b2a67d60 SHA512 a2f449c05d32bdf88a8ed299db9a1a04d02df484774f33002573750a8ba991d22788327bf57f488e5f9b8d53a2c6ce4d50f6fe2275d697991e4b255a165d6688
-EBUILD pygame_sdl2-6.99.6-r2.ebuild 731 BLAKE2B 396464cf4ecffb8ed6d289b923c53b2cb9ab23ecb3e24dd7f95fc2c340af2d92b4fea7dcb0efbd869d4938442044f734cb26e53c1fd7fdbf5812ab269092a01b SHA512 e7490cb3bd973f474e0380bfc51c32dad8ac1726f145158eac6ea447dd7109cd85d4aeb93f43523c7ae983cdba9acf24f2a78c253c6facf6e7a308d24255cd1a
+EBUILD pygame_sdl2-6.99.12.4-r1.ebuild 913 BLAKE2B bf737d3b287daf2f9ff36fbb1d5c90998b7a99dd44d8980dd7846508d7b16486984fea8aa8505b8fd58aa8cb74f297bbfdbbbee0967f4cb3e59680913ca9de20 SHA512 a6c85db2bb9b28869467d5a0fee36d8243159ab51887fd4835570d4414978c09e9c8d68f9eecc111c3c7b5d447a70e34fe2c6ddbefa7801b58de17c8dec354b6
+EBUILD pygame_sdl2-6.99.12.4-r2.ebuild 992 BLAKE2B 3db7b7f60e3dceb0aeda3b74c8dd9a06bc9d9a75b8fd7be83425c3be43e9d162ea5dc4eca80425c83eef1e90cc4674e7c6f7bcf6d75591d2c1e0bbcadcae3867 SHA512 3d142c9e99ba744c550b8a598eb539087af08d0a18c5a34975bf034f646f955cdc66e8101288144f0b2be27c0053fd4d7b9677c1fdc4ae978916f5ac8adab74c
+EBUILD pygame_sdl2-6.99.6-r2.ebuild 727 BLAKE2B 9ad1b1a062af198e3569f351cbcf9a368435650b327201f232f7632dbdd8cf90903c27477ca7ef78c2ef3d41bf52b1f0c628b32ec0c26a4cc4c29c723575a485 SHA512 7524babe800e84ff4e10102ec344c561cc6bcf17b99d3928a3fa26d47a73a39270e4ccfe8f0e4f883bfc4ef73bdad41a1233f634264284b52e565d4d498cc9bb
 MISC metadata.xml 332 BLAKE2B 3af5bfcb689c906453097e4bcc7a7b87ccec6bb1f1f8c43766d4ae5c473f9e220314b8591c63ab9b4ddd67eb411a27400a431a043ca5f696069fc4bf31291ffb SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
index dc01aea24405..d66b4262bd04 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 PYSDL="${PN}-2.1.0"
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild
index b7f2878ab3e8..c667a5816ee4 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 PYSDL="${PN}-2.1.0"
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild
index 8312566925b3..bd63debab611 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
diff --git a/dev-python/pygcrypt/Manifest b/dev-python/pygcrypt/Manifest
index 245cb5a9fda0..a7bd94cd3a0a 100644
--- a/dev-python/pygcrypt/Manifest
+++ b/dev-python/pygcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST pygcrypt-1.0.0.tar.gz 53619 BLAKE2B b5d18bded0b9bd8f1a1715919b6c88aae2a3ed3332bbedf6ceb70d9836952ffe7c9b8f0ca5f179484b59ae1cb21c6b6ec8f8c05333e927eb98f1c782f539347d SHA512 db0854dcb4bfbdb55674fe83a501eac8ac40c624722972c44c401605820de45f1353cf9b6368ef880a6b3a6f112c4faeccf18246cdc82e88dac797d150f06de3
-EBUILD pygcrypt-1.0.0.ebuild 659 BLAKE2B 4a1a97e8a398573e8fe0c1ba0a9381c930e4038eff5484fbad76fba9d7ade714aceebb9f5900d4d4ad18fa3cfc9c2997d84fb8d565206a93d287d6a84a398512 SHA512 c4f3e82567755058326bdb5ff00076c5947f815490448602a1afb1487276ef7f431ccf7f4a13d6d638a454030991ebfd599b1958964e63d9cc6e260d7f11d188
+EBUILD pygcrypt-1.0.0.ebuild 653 BLAKE2B 941b4681f481bbe7131b7700f38713b1d48e3ab4154d620b2e86eb3e47cd5845030aff4417c6f752377b90a46412e322ddf7657c87237d9a8bcf310f6cdd536d SHA512 66ce3ce0e41cce5bd233e6b2f64dc6de932242251505832b97e67b73ba0235ce55dd090d7a57a794d03b8e50a4270ecbbcda9e299bdf4f43e8ac11eb88521079
 MISC metadata.xml 397 BLAKE2B 7618ed12aed270e32135c69c1d4615f1f85ff38ae50f863e962a6899530b21732f0bc2d5f70db97a61570f8789e148de936c9eaf9c7a811c4811fcabab70bf4e SHA512 4146517e9433f37fa96a347e225a2881cd8c43dd1a3e5acf639e7f09427d514bcca4384e2a0c18067dc51ed35fe2ea0707178f4911c88c11d07223b92df2c178
diff --git a/dev-python/pygcrypt/pygcrypt-1.0.0.ebuild b/dev-python/pygcrypt/pygcrypt-1.0.0.ebuild
index edae8926b053..a77085cd052b 100644
--- a/dev-python/pygcrypt/pygcrypt-1.0.0.ebuild
+++ b/dev-python/pygcrypt/pygcrypt-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="CFFI interface to dev-libs/libgcrypt"
diff --git a/dev-python/pygeocoder/Manifest b/dev-python/pygeocoder/Manifest
index 3d702f03468b..f10f39294090 100644
--- a/dev-python/pygeocoder/Manifest
+++ b/dev-python/pygeocoder/Manifest
@@ -1,3 +1,3 @@
 DIST pygeocoder-1.2.5.tar.gz 8105 BLAKE2B c4e4effd3648b611304283ffb9bf67866cc8a66d81be80b29f1079db5db6a66ef4f755822bf1f75bd12ff376d901ae2bdb59a3b8d3873945dba99dc544ed6eb2 SHA512 eb395d2f334f5a1de9ed8abb6298d16b49ab7c29cc421daecc816737e89fd7c6f205024a553f2b0d559401df8f26729c042604fbb0ed49f5a763fe833db3745f
-EBUILD pygeocoder-1.2.5.ebuild 460 BLAKE2B 37e4c380b16869aab1f949594a33c69f3be2d90043c763781c549cff495fb1784297fae2cb7a6bf92e7e1c45940b4636518bbbaf1b6a08d13dea4b5a22eeb400 SHA512 2ff8971a3125eb9752aea368c0ba0565f46039da3495dfc2f739bd47148e1b097a51f4fff8bfa1183cb7e5d77f04a9d6477e15ca3c3a43424a2131fa7310a78f
+EBUILD pygeocoder-1.2.5.ebuild 445 BLAKE2B ad5ff76330f2d1a30b239be11c6c845ad2ae22819389d13391ba2c359af31c50f17d2ddb8b0c1a94c4b92d35016451e10283e770641d6c52877858385a883ead SHA512 2ae5623ef64bf71b986b09fff5553b3bb26676c062cf8bc92401d0b875d814ef7952b12997f7ce8b6fd6ea197ab1ed8eb448984a6a938f563199366f55498cd2
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pygeocoder/pygeocoder-1.2.5.ebuild b/dev-python/pygeocoder/pygeocoder-1.2.5.ebuild
index 1db74f35a151..c1482c174626 100644
--- a/dev-python/pygeocoder/pygeocoder-1.2.5.ebuild
+++ b/dev-python/pygeocoder/pygeocoder-1.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python wrapper for Google Geocoding API V3"
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index ae71d5155127..52ad95309610 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,3 +1,3 @@
 DIST pyghmi-1.0.22.tar.gz 123267 BLAKE2B 8cfa716d04411dc5228d86cf8813ddb4fb61b7bfeb6618f0182fe42c7ed1deb46e876e085a732d69b3c7390c37a8bc62a3bf15313166574ec98ccefa784b97eb SHA512 9e3bc6b5f33d5496d7e58d2ea558d20d45a7690d493f2d1ad56fdd5570279a38e8934d8425c3d3207d8001da85a9a0b1319463b802fa9f121db7448aa919bddc
-EBUILD pyghmi-1.0.22.ebuild 1257 BLAKE2B 4de0f93463594b8da31c618349e95f1647ac290719aaa821c3e0fb1ca9ebd53fcbe3fb000226b616907483c0b946b9d9298b48ec96c7c0bafd7f44d8e11399e4 SHA512 5bcac07ed08634066ffaaa07232865a7770f046ddc00531f959becbacab990d956b881dea61ddf30400e5749763718bf58a83c28d4adacd482970ed00e868ce8
+EBUILD pyghmi-1.0.22.ebuild 1243 BLAKE2B d73baf3b88f5846daefdf4381b0adc2825de42ce6f0dfab8c7d98ded4ebe489dc0417606c5a1ba8fc5ffd98663a80da1a9fd44ffbc7661f842684dae4614ed91 SHA512 3ce4d7be91b8b0df06d68718f1b06ba0e693f5e0e391af001c56a6c7ab79b8530924fa9628dbad1b8da241a9282db30b45bc26b197c9b7c66b5e2d7692bd5e39
 MISC metadata.xml 343 BLAKE2B 107a20dca0846a5e4dc8d61825da4193cc7525abad94e161022371ccba00523822c69cf0cae23d13b6f650ec11b98ef4640b5cf18437d60a9a5a6bf37867e9e8 SHA512 cb4c5f58339d6c5f181bb0e9a1aacb4e3c30c5690744e0ee6649e82eece03678246cfe3b13c219e177de8812c6916fe1b6b49443c2dc0a00ed1d024c8858b5c9
diff --git a/dev-python/pyghmi/pyghmi-1.0.22.ebuild b/dev-python/pyghmi/pyghmi-1.0.22.ebuild
index e1d842cf13d4..39164e26ed17 100644
--- a/dev-python/pyghmi/pyghmi-1.0.22.ebuild
+++ b/dev-python/pyghmi/pyghmi-1.0.22.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index d5c8cb5f6efe..907aac0c2871 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,7 @@
 DIST pygit2-0.28.2.tar.gz 496469 BLAKE2B 1173401d4555f6f40eaf5a27d9c0e83214b66afa609f15cc4d689e8c58cc0ae3865b4e6ebb31808d354ecef56f3a74cc777fe42314ef348c39f1f61d82655bc9 SHA512 3f742cdcc9d603c9cc9ef2e0a545da8bcfb555a0bdeea1c73c53a284b43d40ad6b28c87a029578ad7b1c8f2bf56ecd2859dac8dd836474bfc66223ff4af9e8f0
-DIST pygit2-1.0.0.tar.gz 501473 BLAKE2B 854f53113bda2ec5c1fd2ba7f2dfc4213d31d3e687fa17d8942b03dd685cd37df28fc8347bd63ede9650de00b980a4cf7aa1196b9feb9a2365e1fc118d187121 SHA512 33296f95aacbfc3cbce275f84c2025767499738495941408de15ac14f822de132995c05c713b815732dbfc3094edf64351d6240e7201e472b3c47035a7532eff
-EBUILD pygit2-0.28.2.ebuild 906 BLAKE2B 9454943a79010416c8bbde14d46822be2b5315ab6c1bf902bae6362597eb242951ea93e806b6fa6a2387599f096e4130a3f4d72c5a2d9ffb64d5e1f1168d525e SHA512 0658f9d3637c5e22ce942deace28d9e55e40eb72e76cefd6d93f76b9cf6f20bdfd592ba1529da38342a194c768fda38f4404feeb5c3c02b64a0633a50d673043
-EBUILD pygit2-1.0.0.ebuild 966 BLAKE2B c286b148744ff531e89531576cd5a73935ee355fee6317fcce459fb4aa425aab33cdd2b01e0f9f67b951ae02bf5d7a063a3287fcda0f8b9874fdeeb7da06cb08 SHA512 5768ae99ddd6b11a655c8522244721f60864a2de47bef6f6fdfc6a88930ee782090ee6de1418501d8eb0690a8405b9ed386aa98a6487613e9c0f1d12ff184bb5
+DIST pygit2-1.0.1.tar.gz 501496 BLAKE2B 6a844a6ecab453f589f407acbd94aba46018a46374ba745ef50e72f4a5eda35103873287af7533ec963a297775eb3703151beec36984dfbcb68d751057c46c78 SHA512 c225204129cdfa41bcc50d76ff219602bfe910cdb77e246c49ecf5265b5a88c5c4803a7d107f4e00c4ec2f0b0d30e1a729d15413bdca8575d6ec23bb9420a90d
+DIST pygit2-1.0.2.tar.gz 501736 BLAKE2B c8f1a7e4a3257af42d97b0fae8e14f26968e2be535e74863c97363e77e37774d929fa239bbb46982bd398a3c2032f3b3122bd42aa41760d3827a18b7b0b22663 SHA512 c76bf8ce2847ec8915201a714f076488a0dda4a790762293c02709b8b88a9a2b898f97e61565cf41cd11b10bebe2e1d76b5643ff2e86f9bf6a9517c87a988769
+EBUILD pygit2-0.28.2.ebuild 904 BLAKE2B d41f74f5516bc0bc7bb1a485493e36250aa76d4a210d2af30189641dde7a703bf111bdfab2ca0d0bd862fde21483682d4ebfdca3f90f79cf96fc2fc35ec867c2 SHA512 3c8bdd32422ac1f140ab2804a96f93e4c43df75e077c6c8a2f22a70bf4acf32290c0a6a97bd62caeca40939775bada4e38cd54eff431f4e8918dd1262e24176d
+EBUILD pygit2-1.0.1.ebuild 964 BLAKE2B 741670a4507817e32fa429acd6f8ff3641f11ad7f9464ecbc9c8edd218eaa728046ed1f2c7e3acfe14c3db70650cb9244ff5dd890949d59a554fc6a6bd2abf4c SHA512 61929067a21d707ba74d02a6106767c1952908c77e4aed1d60bda5cfc62b1f6d00e968e7f1ed9281783cfd7bfa586cdeaf502a3dbce1c35c450b43af5e9846ea
+EBUILD pygit2-1.0.2.ebuild 964 BLAKE2B 741670a4507817e32fa429acd6f8ff3641f11ad7f9464ecbc9c8edd218eaa728046ed1f2c7e3acfe14c3db70650cb9244ff5dd890949d59a554fc6a6bd2abf4c SHA512 61929067a21d707ba74d02a6106767c1952908c77e4aed1d60bda5cfc62b1f6d00e968e7f1ed9281783cfd7bfa586cdeaf502a3dbce1c35c450b43af5e9846ea
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.28.2.ebuild b/dev-python/pygit2/pygit2-0.28.2.ebuild
index 9c99e10b931d..af66f50b580a 100644
--- a/dev-python/pygit2/pygit2-0.28.2.ebuild
+++ b/dev-python/pygit2/pygit2-0.28.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eapi7-ver
 
diff --git a/dev-python/pygit2/pygit2-1.0.0.ebuild b/dev-python/pygit2/pygit2-1.0.0.ebuild
deleted file mode 100644
index ade7039d9db1..000000000000
--- a/dev-python/pygit2/pygit2-1.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-libs/libgit2-0.28*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/def no_network/a \
-    return True' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.0.1.ebuild b/dev-python/pygit2/pygit2-1.0.1.ebuild
new file mode 100644
index 000000000000..920c961be99e
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	=dev-libs/libgit2-0.28*
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/def no_network/a \
+    return True' test/utils.py || die
+
+	# we need to move them away to prevent pytest from forcing '..'
+	# for imports
+	mkdir hack || die
+	mv test hack/ || die
+	ln -s hack/test test || die
+}
+
+python_test() {
+	pytest -vv hack/test || die
+}
diff --git a/dev-python/pygit2/pygit2-1.0.2.ebuild b/dev-python/pygit2/pygit2-1.0.2.ebuild
new file mode 100644
index 000000000000..920c961be99e
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	=dev-libs/libgit2-0.28*
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/def no_network/a \
+    return True' test/utils.py || die
+
+	# we need to move them away to prevent pytest from forcing '..'
+	# for imports
+	mkdir hack || die
+	mv test hack/ || die
+	ln -s hack/test test || die
+}
+
+python_test() {
+	pytest -vv hack/test || die
+}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 7b1790d4766c..96d1e7385d35 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,3 +1,3 @@
 DIST pyglet-1.2.4.tar.gz 2122017 BLAKE2B 6e5e24ec78e24b9a9c8e9627791ede93d740c1af7af0176c6f75409c76981fa16752bbe14c9b5ec871438f5468b3587e7ce12194241d94ab3731d46cbbe395f1 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d
-EBUILD pyglet-1.2.4.ebuild 980 BLAKE2B 425916f41433fe60d4a021a6dc6c7483c956fbdc020decd850178655cafa28d36a6dbfe81130a3137cf6a0217c28ccae001fa11f3056274c523d0e33d385f6a5 SHA512 8ccf949caa9fd2835710442f539adbfc3b1d8f93c85e0d90b3977a8e1c3d02d81c7a540e1a10bdac93481308d9d635e1ada5c16153fa5182c80a292860ca6b7a
+EBUILD pyglet-1.2.4.ebuild 978 BLAKE2B 205420a5b69245a4e09a35dcd0989149cd0fb8d4c79275d76f25c7429eb1576f7efb8d3812b1e39ba3089027c1b96eae707157b94884d935de56a09757e678f9 SHA512 58483cfe7c448ee59a4e8a90f79a6467ecda870c98e38a181c09a8fb4d5ced13241106a6f74178b6a01ce792ae5a82b54351169045cd4c4523d10771aac14ea4
 MISC metadata.xml 893 BLAKE2B b2c9d0381d98ba205738e1fee69cb1a8952060c5d0095d134d84136af35fd38da8f81cca964a1ad748e615cb9c443b18f53a31f436a8356c83725423e16e8b64 SHA512 2bf1d8f350103309d98bda2834337acf488726e3ee141509f3423c46695c87d2a61557dec3d3c0e523815e09fd3d02eb3411779b4ce2fac05b83425401480269
diff --git a/dev-python/pyglet/pyglet-1.2.4.ebuild b/dev-python/pyglet/pyglet-1.2.4.ebuild
index 501bf522854f..399948d3dbbd 100644
--- a/dev-python/pyglet/pyglet-1.2.4.ebuild
+++ b/dev-python/pyglet/pyglet-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/pygments-github-lexers/Manifest b/dev-python/pygments-github-lexers/Manifest
index 366095db119f..e2e0628120e0 100644
--- a/dev-python/pygments-github-lexers/Manifest
+++ b/dev-python/pygments-github-lexers/Manifest
@@ -1,3 +1,3 @@
 DIST pygments-github-lexers-0.0.5.tar.gz 6337 BLAKE2B 21fb1a0627c9ebf42d86d6cceea3ebec4339ef29b1d881d8b3bd5f90060ec2ba76a69ae4bf9e92420a10950ae20c7ea7ff44d5fccf8add06be1f1353cd8b7800 SHA512 429a8a81eb0228c806b6fafe5e1c64be92e719170b1af666aa9c9c7923ff4058972a167193dd0ab1ace0395fa1f6621212f800b07dcce4e59970fd905e046d71
-EBUILD pygments-github-lexers-0.0.5.ebuild 505 BLAKE2B 77ff659459c031037b359a6dff5a17f7f1b38abaa650136db355338b22ddb99f750f12df82258cc3f3574cd520a737636ec13b84d5899e3dfdf399e61bcc1845 SHA512 0fd73be44c30486b7aa417f0aa8afee37237c1538b6f84c21da9bbc4721ea9cfabe29166a02855a0869dc1fb44aa22b6c6c2e74b68e6afd12f2113b9923ccf90
+EBUILD pygments-github-lexers-0.0.5.ebuild 495 BLAKE2B 2319877c736a15a46656e4bd0acef6c26f26ffbfd837409542485c89bfd96dd07ed722af6fe5685116e8e3e7e2a1a59a2dbc7946c0420b26e7b425357b325afd SHA512 aa6aa3491b893ef35c1aa6a915def22862f37017ffef3b22f8b947c5b7e4193572229c5a601269bc48a4bb095aa609c4335db7a5ddd14a85cd40907d3ce9ec45
 MISC metadata.xml 415 BLAKE2B 10624085521ef08b9c4940e52e0cb82bf448b185bc047d7aac6a21c8d040fd44527681f5d283b481fdeea76968b95ae051eb5fbd36046233580f7e4c85ec62d3 SHA512 073350b39334acb9eb53919267c3c63dfea0d68b277ce7abbbb52a9790a10456c412e9e01a565cb53c775d98384d61ccb28e62414dc954781c62c7aea78b0bf9
diff --git a/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild b/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
index 33275a6e1148..194b83795837 100644
--- a/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
+++ b/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Pygments Github custom lexers"
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 5f832b0ffce6..07e2619e465e 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -3,8 +3,10 @@ AUX pygments-2.2.0-sphinx17.patch 645 BLAKE2B 07601a0e952d6e5f978d111a273bfe8c6f
 DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23b72f8da49b4f8ce9b892d54ffbc1b490e87e87efe8d727dab297f775d0d8abfc4a31a734c5a7f8df885e5eda82f SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29
 DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
 DIST Pygments-2.4.2.tar.gz 9405880 BLAKE2B 20a955fce2b06ab12bd4ede4da9308f1cc5f2286391146fd83f3d598cd38ae66e7df3c1d779c8f6f5de67ad92d032ff02fef8f41141edb007e2f24d3586d82e6 SHA512 c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
-EBUILD pygments-2.2.0-r1.ebuild 1622 BLAKE2B 50757b289c730c4b9734ad87fb8dd1f050207578aa86792a37176be2901bae7123f4d2f98243765e313bb75b492afe2d34d9ce5752bbfed8970cfa4b7742359c SHA512 92e081bbce77d5fb02a7c7e99ffe48ebd9e3de267803db79814211482a635234ec0c336ba8c2e7edf8f1cb64f8097dcb6422c1e9cd6d7d885e91b8a0bc27a48d
-EBUILD pygments-2.2.0.ebuild 1773 BLAKE2B 75246df8db38092a27bae96a7cbec60492601976b65e6327c30609498d763c0374fd05f098f7283bb67184d59ea7ec7fadd9043180491bbcae032cc2f0b37806 SHA512 8831ad0edf46941a47200715316a19fc41c6a53fa2a16cceed70be04c9ae30e7ad0542bcf18d156041077d38e1349957e47996653ad721578ae7abe136862df2
-EBUILD pygments-2.3.1.ebuild 1434 BLAKE2B 00e4918dcf6cc563e79b66b32bf9df0e80b06b3840316be71f8696fa5d2d2a5559b07fad29b6d2f1302278c3df97bf456e408e9e0d81815cfa237f3aa0bc38ce SHA512 86dcded801cc7719c7aea75590518ee0a18738135e2df2ebc62f0b9d2ea07863e47dc3100c4f57b88cf181edce5fe71550345fc06c5246e0a2b24732ce3eca83
-EBUILD pygments-2.4.2.ebuild 1190 BLAKE2B 0b1181c1839ff1636d470299bb1b51c534de2b4072d01ad6444360047c1f26acdb63090d1ee62c6ca9a816a66a4040b06bef2d09ded2d907aa6f23f338727e7f SHA512 cef3f517a743ca04e7ce337322688c690d7847b9a27facf78289a89ec6bfbdb2f8a626048a6f41034eb8348ac9f557cfea1519ceb25d022aaa329ebabb3adbf4
+DIST Pygments-2.5.2.tar.gz 20263984 BLAKE2B fab5d11458bcb3bd9a825026f119c0bde6f672b00704f3d5db24ce050b959f0c1a34544642fc1b5911f6ae12a9b595a2cbedadc791d6a3e8c83da1a1add60471 SHA512 d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859
+EBUILD pygments-2.2.0-r1.ebuild 1615 BLAKE2B 768bbce36b21c4bce6dd631bc2a5a0b0255c67f8baa41602f14d21a0bb1cafdc765882cf8d5151d7f18ddb4d34ac989ab67b999c836197d294b1a738d69e8b2d SHA512 203332c057f87b4a885242a2f6b7c1d1578f2c79905bb103b4731e014de76e5caca16b8255286c121e736622c1621764a615d6461e43b7ed038ca0d25596caaf
+EBUILD pygments-2.2.0.ebuild 1766 BLAKE2B 9353b980a7fa969981e9f7a20c3753c7460da5d91b8b6ca2e940181504b06c235010865103231e953e1896dbe01426e30708030b758de84373e3b72755948cf9 SHA512 3f84f6beb408c38358a4c4c661e9835af5efb84db619caeed765b660a0efd85cadadddb4c5cb456e237195ce98dcbb238854213835e48ce1f0d6a725853ff438
+EBUILD pygments-2.3.1.ebuild 1427 BLAKE2B 0cff4825b0d7d763c016a5591e003690dd9e313b0b14ca9d4a742fa4b68778b0902c4069a12edd77c5420a48f3b10d43e0afa731d93d52cbb94284e870affc78 SHA512 835269bf0ca31b6c8fd38a97bdba2814dc4bcccc245276cd76bfd37cf8bc085cab52831f76d76f071e0d38d1f75fa332fc7c1eec0dd071f1dd57979297e23f37
+EBUILD pygments-2.4.2.ebuild 1157 BLAKE2B b3d1df915fa7a56074bea2bd51430fa1b1e6ba9a837e4573ac2c5f5e6dbb2d4c2d5823525b0d1dfd7ec98ba3a8b4b4169fa1f4dc882b866fa8aeb1dcc00ae842 SHA512 e82fd0d04cf54e193d7d3d4afcaf14a9bdce89e2500ac809866b2893efa164facc041ede9c54b8b1154462034555dcb102bcbb51bcc21ea8a5c393d8c9737616
+EBUILD pygments-2.5.2.ebuild 1139 BLAKE2B c0b3deecb13b5a0e5aa4d0847a5414eb4643aba959b162a7a3417b3357105ffb6537eb735050715bc7fa250e272b0887f811b196fd19cdf2df36cf6bd6ebcf0e SHA512 5297a48b0d2ce337ca8f2e201ff446b588c00b81233ad0f814e2b3b516df4471d4cedbf45334c0c465a65129267a205bd9235a7836269c9a4ac45b308f239848
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.2.0-r1.ebuild b/dev-python/pygments/pygments-2.2.0-r1.ebuild
index 5bd14604f253..f3d2d7fd6633 100644
--- a/dev-python/pygments/pygments-2.2.0-r1.ebuild
+++ b/dev-python/pygments/pygments-2.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 bash-completion-r1
 
diff --git a/dev-python/pygments/pygments-2.2.0.ebuild b/dev-python/pygments/pygments-2.2.0.ebuild
index f57a47742fb0..b1c137b172be 100644
--- a/dev-python/pygments/pygments-2.2.0.ebuild
+++ b/dev-python/pygments/pygments-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 bash-completion-r1 vcs-snapshot
 
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
index 393608490df7..89303b821fc2 100644
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ b/dev-python/pygments/pygments-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 bash-completion-r1
 
diff --git a/dev-python/pygments/pygments-2.4.2.ebuild b/dev-python/pygments/pygments-2.4.2.ebuild
index 41541677e930..23ba2c8178ee 100644
--- a/dev-python/pygments/pygments-2.4.2.ebuild
+++ b/dev-python/pygments/pygments-2.4.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 bash-completion-r1
 
@@ -11,7 +12,7 @@ MY_PN="Pygments"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/"
+HOMEPAGE="https://pygments.org/ https://pypi.org/project/Pygments/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
@@ -21,8 +22,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		virtual/ttf-fonts
diff --git a/dev-python/pygments/pygments-2.5.2.ebuild b/dev-python/pygments/pygments-2.5.2.ebuild
new file mode 100644
index 000000000000..a10df584c1ea
--- /dev/null
+++ b/dev-python/pygments/pygments-2.5.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1 bash-completion-r1
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="https://pygments.org/ https://pypi.org/project/Pygments/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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 )"
+
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/ttf-fonts
+	)"
+
+distutils_enable_sphinx doc
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+	pytest "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index ee8c4f59f55e..23050d67dcc4 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -7,9 +7,7 @@ AUX pygobject-2.28.6-glib-2.36-class_init.patch 11038 BLAKE2B d610454930cf4a568f
 AUX pygobject-2.28.6-set_qdata.patch 847 BLAKE2B 696aa6c48ee900db738f8a92265a625a3ab7b59afece84157bf0b9abd0aca5ae68b7ac8cc627a47a5b1a688029d592abcc38e403543a4144e055bcdac68285e4 SHA512 19025af51a8387061276ec9d6c8eb0ecadb5124bba2c4ab3755ab653df467896d19c366d80ce9313fd46e43b493b7c536f780014cf18a6ac47f4b1d2ad4bedb4
 AUX pygobject-2.28.6-tests-no-introspection.patch 1257 BLAKE2B 7ff0587b4b40a1519927f8837b5487847ad0d0aa25f57dbaa4b10eaed2eff79f52d6581ca29f1688ebdbe71db231aba56de06c3aa8b246fdd1799320d9a15cc3 SHA512 7d57cb9bbd0b16f4fb0ed9d5eca310c47daf86b89daefa41fb0cf5dd470a6f6a31d0dad31dd261332c039d39bd778f9de8de7260c5856f1b718f72b9aabc01b4
 DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c
-DIST pygobject-3.28.3.tar.xz 1005368 BLAKE2B 5c24fd25fa20dbdbd3ad18d7e2eafd8f47f5e28903d9f8dab6110f09ccfc13f865149f0d4bd84bc755bc6e4191b903646930e818d85382dfaf4e05f7107b3ecf SHA512 0abda393dd774f9cea04f883eab53f5ebde81d2439ed18cfe08ef39a1996054ab34bf4e770f70116a4485fb4f9970464b9a950ffa4af76cfa21ecc8d4dff968d
 DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd69b463b3c8aae7634a320cc8ec723e24301c0674b9ffbfdcb6d798fddddb5b772a723afc7ac28c23461e84cf7485a SHA512 5b325d0caf4f34f783fc2c664a795809f048eb1639d2f2e375fc147c852d6e29a8ab119438cac76786fb20220c72d5859cc06d6f70c29f976f6a5914e0169915
 EBUILD pygobject-2.28.6-r55.ebuild 3541 BLAKE2B d6d227ec9cf7d2797de5986fdf88ce2311dea6412abb0b67390f387aeaad6179a4c0d4c81d29b83204e668ea7f7432cdc20627c55179b341a56697b0d1bea6dd SHA512 cc3f51e95721b0d7d6b9f188dc6f648e6f325037f2eb902c563be92a88aafc3a73d493e566020e59bca979f5468cf3ba177bc0a4ef66dda58497830259efa9f8
-EBUILD pygobject-3.28.3.ebuild 2758 BLAKE2B 625724e90e366ad5ed6e500166e224838110921877d1f2910cdc16e1fa3ad3ac6a8fc804a7cc42fa0a12609d3c7c1ae47914a5ae41c317ff915685f4e348e3d3 SHA512 bc1a1e336afba64821e33c6ec21df4041f04ddbd5cdad1872f3b2d3b96faed52d4421bade2653295216e5eaf01a8fdf14772b75ca53bdfb9478fd970be6bb53e
-EBUILD pygobject-3.32.1.ebuild 1778 BLAKE2B e712cd75974d43444002d0344c692c0b501fe8fd98ba7ef9ccdd275d6fd207ff85a6c2b97734feff9086730d5766d8cb518b84b105cbb9cf298a748fcf980937 SHA512 1744efecbe48cedc17ee4caf771535798fd05a82ace19ebe1ed0622e3f5b10040ed8ce46c2510aa6810b510a59ec6c2fe9c2415341384452b9dda211f68f3834
+EBUILD pygobject-3.32.1.ebuild 1775 BLAKE2B 32c55680370a5789a73cd3cec4008e890f11c71cd9452bad8cb63da1a1187722490116d98942e08bc36c0f46c1b34206b9b8d9443eda9a6ec54d3330d7aa4127 SHA512 fd8e8fe1f8b0ae21d286eb61d9d1802422c656e5f340714770f1e9be2549527a1f42bd95bbfb4493dcffbeccb4e00bc55781429f9e9f82e17230a703991e5dd0
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.28.3.ebuild b/dev-python/pygobject/pygobject-3.28.3.ebuild
deleted file mode 100644
index 316b173782ab..000000000000
--- a/dev-python/pygobject/pygobject-3.28.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit eutils gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.46.0:=
-	virtual/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
-		x11-libs/cairo )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	cairo? ( x11-libs/cairo[glib] )
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-libs/cairo[glib]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-		python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
-"
-# autoconf-archive required by eautoreconf
-
-# We now disable introspection support in slot 2 per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
-# older versions of slot 2 installed their own site-packages/gi, and
-# slot 3 will collide with them.
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13
-	!<dev-python/pygobject-2.28.6-r50:2[introspection]
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	# Hard-enable libffi support since both gobject-introspection and
-	# glib-2.29.x rdepend on it anyway
-	# docs disabled by upstream default since they are very out of date
-	configuring() {
-		gnome2_src_configure \
-			$(use_enable cairo)
-
-		# Pyflakes tests work only in python2, bug #516744
-		if use test && [[ ${EPYTHON} != python2.7 ]]; then
-			sed -e 's/if type pyflakes/if false/' \
-				-i Makefile || die "sed failed"
-		fi
-	}
-
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-	local -x SKIP_PEP8="yes"
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		emake -C "${BUILD_DIR}" check
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild
index a9815d8af9f2..9dc9cab0b0bb 100644
--- a/dev-python/pygobject/pygobject-3.32.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.32.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit gnome.org meson python-r1 virtualx xdg
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygpgme/Manifest b/dev-python/pygpgme/Manifest
index fe55b65bb1bb..fb489a904879 100644
--- a/dev-python/pygpgme/Manifest
+++ b/dev-python/pygpgme/Manifest
@@ -1,3 +1,3 @@
 DIST pygpgme-0.3.tar.gz 50100 BLAKE2B d55ddc79a569ddf007552909a142836c54f97f6a5e9b503dec0405d1df387a9aac04f0424b3700cf35bb5d1bd891f0b90f2dc3fb7cc88435da83944adfccdaec SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736
-EBUILD pygpgme-0.3-r1.ebuild 535 BLAKE2B 1ac57467b605c37f6453d633651201eee7df048f1080ff8bc5d525604ee2633708d08b9e02f85f571af70fbd21c0e5b16e3dca86cec2e864ba1692675f79c8ab SHA512 6b7b317411307ae6b10a2ee500a71d4d3b6d692671683e161f9f753f471344b2b5fed2762748a670acec7d1d4a8e6258ea3cc93f6ed878cf16f17bcb8c14470a
+EBUILD pygpgme-0.3-r1.ebuild 531 BLAKE2B 95cab4d72b72ad217b3b1986214bcb5d88f8ae3da0228612912dfbb91e750b5625c902bb6e6bb9fea8cb595159625abe22742d63d26abbd361eaf1046a152b61 SHA512 77e3857e7a98e45751dc4a6ce06610f7e5460893666a7147b20db357732f146f9a1f355984f2403ab709d7d7152fbb3192b9b40016f5fdf6036c89742bce2689
 MISC metadata.xml 665 BLAKE2B 4d0fcdc592cc195fecf65d0f7498d562235ba978b7e9723bc7c89786fb6800ca69415e3a80139d7257054e2532b902528cf2862352e3044c5d23d65267844a10 SHA512 1e9974929cc266d7dae9f6f9cec2b7dab4f105765b87b22f675a62ebb75743dd2043bfba3bf8732e4edeb9d18f6301d54324815cd90f3db53821ebd2713702c3
diff --git a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
index 273bce489582..6b8e974c31e2 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pygpu/Manifest b/dev-python/pygpu/Manifest
index a04a91fba458..f3c93cb6aab7 100644
--- a/dev-python/pygpu/Manifest
+++ b/dev-python/pygpu/Manifest
@@ -1,5 +1,3 @@
-DIST pygpu-0.6.0.tar.gz 232281 BLAKE2B 73c4fd5598edc3b81296aea7acd24fa48d0302f54a0050de8bc5539a5150dcc4be052dbf8d0c1d822f79a8529ba47d60d51c3216ad774b5954915cab4c65b5c8 SHA512 ef2b37d7752d7b19e6034ca1992dfa0c82806bae7a15ce54aad785f5abbe06e57a77b804699c55b3b7dc94496afb22acaf3a43cfc15148c150f2c93085c23080
 DIST pygpu-0.6.7.tar.gz 256440 BLAKE2B cc0880259c368c02fe0fca1a7f9424ad78f057540426d28179ee2cb20a2559853566c9ebb7de3488d5fdf0fa0eefb4e9f16db198cda2727370d567fd16363480 SHA512 39cdb67ec12d0f939d7a3ebef9726c40e64387413200addbeaf205db4151d09efd90118fec4a71b9d1f81fdde9b52e37d2d97763bf2cc9efa1667c5b9ff716b2
-EBUILD pygpu-0.6.0.ebuild 914 BLAKE2B 00658bb46be83e379694a5229c857e601ec15e8cd37f1c03344ad03f87e7eaf8e779f45d815aad9617dbbb86b371ac8b46240ebee049424a7ee9568f14ad3a13 SHA512 b021b501cbb240e5e59fed2ef8ea99e43c521e98bf7df81df15ae78f0067129278c5b78bc502a1ba62d004081ff12ba577c0b2c0e06c092ca24b3e50e3d1c2b1
-EBUILD pygpu-0.6.7.ebuild 918 BLAKE2B afdedce6aba01ec4c28b59b200a8ed52e7ad7c4e470b8b33fc977356b6470fcc69ef406b3770bbd94fabf8423345d98bedf8dae183d2efedab9196a3e87380e4 SHA512 d7ab344ebe88ff39842a3fe5f26d0ff6d63b2baf060c802650cd4c284a74dfd36d2918f30852aaa4335bb8c161e1da506e5838f5f8878337b9cd12b0de98c803
+EBUILD pygpu-0.6.7.ebuild 904 BLAKE2B ecd59e0029c546b6243042b1dd9b7cee9aa704008c1c673c7dd92b792737a018130b97013a206f63f1e61df0277c1cd54cd8e55df79bac881629c9e982dcd5e2 SHA512 6c7ced336fb43b22fceaab68bc988ddb180f9e9001f9e7ba88eb3bc8cee04a6f23bcf1da0ac4faddc967e1a532b125622e9d28c7767b4743c77b99f6c8886371
 MISC metadata.xml 625 BLAKE2B 876c239967452f073b73a66ee4afa5e1d8affa03a8d849f5f74ad193d14bc51d0c1f1340744c0af5f3274a82bd81224bad64d5078142b65f09775f40907cc0e7 SHA512 370f27b57bd3815ab8b2f177e8d6755c4a70800c37164c99643a8f2e134acbe259e193d20998e47e521cb8f6c15d1a1703afcdd799499ef79dd4f313335979e2
diff --git a/dev-python/pygpu/pygpu-0.6.0.ebuild b/dev-python/pygpu/pygpu-0.6.0.ebuild
deleted file mode 100644
index f83a3b509637..000000000000
--- a/dev-python/pygpu/pygpu-0.6.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-MYPV=${PV/_/-}
-
-DESCRIPTION="Python bindings to libgpuarray"
-HOMEPAGE="http://deeplearning.net/software/libgpuarray/"
-SRC_URI="https://github.com/Theano/libgpuarray/archive/v${MYPV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda opencl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-libs/libgpuarray:=[cuda?,opencl?]
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/libgpuarray-${MYPV}"
-
-python_test() {
-	local DEVICE=cuda
-	use opencl && DEVICE=opencl
-	nosetests -svw "${BUILD_DIR}/lib/" || die
-}
diff --git a/dev-python/pygpu/pygpu-0.6.7.ebuild b/dev-python/pygpu/pygpu-0.6.7.ebuild
index bc93eb58bb32..c35fce34e75f 100644
--- a/dev-python/pygpu/pygpu-0.6.7.ebuild
+++ b/dev-python/pygpu/pygpu-0.6.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index c0c757809bcc..469807fd82c2 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -7,6 +7,6 @@ DIST pygraphviz-1.2.tar.gz 90913 BLAKE2B 2031b3d1366ce038fc10a1ed632bae9ae67789e
 DIST pygraphviz-1.3.1.tar.gz 103336 BLAKE2B 267c85ca4639a2f0ad8c06d36eaa1f2026c6afafe357be23ea4c108b7953aedac2f397bf262a68f336385a5810d77bec9d200bf86da3d101b4d402dcc2d77e1f SHA512 e1957d7daf7ae9e60873cb6f23ac19a3320b4b10579ab24a2307beb558dad11a8e82e1da528799165b761d944efb4860b7296e3218846f7885f715c396a8e3dc
 DIST pygraphviz-1.5.zip 117810 BLAKE2B e9139d6b8e01cacb3135b1ccd2fa8624c041b7a04848f66c7668c5acf55cf66380ab9f05193b1bb240133f0c01a21915e2314807fcde23246c287d22efb9450a SHA512 6d3df6642a7e23ecb6b687761480b80a3ee5886508ef50b81697041425be7d09d623bf46990c5cea3ef36817a28d9e5c2905eb32267296f55524fdedb2199ea2
 EBUILD pygraphviz-1.2.ebuild 981 BLAKE2B ec7393d162ecf32e423ed08b8464e1caf99d91dca43d7ffab048b25f9fe870441d32dd72849e89fd414320e32a9e8286ba44d7136eb8cb3e8e74ce5b4aabac03 SHA512 1e30090835e51b5bf59c8e26d2bf657b248a242b302a7f46ce5df8663fd38253588c2cd0e4850fc2b0e87ccad1090e321921fafa3c98dd6f1ed5ca67a6117c1a
-EBUILD pygraphviz-1.3.1.ebuild 1123 BLAKE2B 4578ff926360a5d5d0a7687096f5c58eb291d572f6e08355673d410235a7610642f2abee99007f5513d59fd9646d95778f44368737fb33164766a30e6c6d45f8 SHA512 a3f068db0a57ff2fa6a3b2cbf8b4425c911bc13c516ed2e1f42543e8ac488877a1413091bcec245d84f6addf58a9c89012b55b02126693906c382282fadb18d8
-EBUILD pygraphviz-1.5.ebuild 1087 BLAKE2B 78355678c477263bcf46677a3686a7baa578bfd862143ea7598cb5029e0296430f6f8f831dfe2726528b6a652e2b990d51bcf96a242d3c3be9aa5e0f319f176e SHA512 4bd47d604deda597fda779d7375f4ced6022dbf66faca05726874224f78ab877283d6ff4d3e4ac72bb8e448135baa1f775caec00342a77b06fb700b8b1711f4d
+EBUILD pygraphviz-1.3.1.ebuild 1119 BLAKE2B 6109e31df0d0b5d8bf73fb91b0afa846c9f498d5e9c5fbc982a5588da31a963c8517509cf7070c9985417f143c9c276a5bc5763f2f84741e6231e0f6b9c9ee49 SHA512 215caa815030f4ed8dd54c988bcfd7811f76501b186285d5b0d44bfcd55cbe3010ea66124e928758cd15a4d897b4412e8292b6a0aaaaa5fd92663f559502a0a9
+EBUILD pygraphviz-1.5.ebuild 1088 BLAKE2B 3f777db42953967a94235b43ef9c2d307856b8ece61a6294070980dc8f7e7c2387993e2b95eaf11416dbc07722378639d6fc07366fb69f5bdd1ec16e25144e57 SHA512 6dfecdcc034426d1a32c72788dd19fb49f050677510d65029005814198ce0c557970ab81a9d6ec24982418f5579daa99a43df3344a48415996f4bed0e53f43e8
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
index 6165f527d23b..174617915ba2 100644
--- a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygraphviz/pygraphviz-1.5.ebuild b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
index fa043febb96e..7f0c40611e5a 100644
--- a/dev-python/pygraphviz/pygraphviz-1.5.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 0956594686b9..9b33ace99789 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,7 +1,7 @@
 DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
 DIST PyGreSQL-5.0.6.tar.gz 648481 BLAKE2B 7e1d96b5c09a3d2f0e412504be27fcfa557804ace8a4c24d657f586a8e647f5001da943543d49f6d2bdec48a34017b7379305fb760436065ba7f36ce981d85c2 SHA512 fb42f462d749f824f52dd424464ecc3591e615e7e0d220a63a217797aeb3f05379fab071480946d09779dbdb9028351a596160989066589dde1be18f7d320ac8
 DIST PyGreSQL-5.1.tar.gz 642216 BLAKE2B 4f3ff4e59c47d86007884b41355ec5cbc3893ba21e3e5b7a354aab698dde947622ba4b7a1590325ae36f132759e26f37868844c3c21605ead068261129331453 SHA512 d36be0f121c20469193600c551e15b430fdc9e44db00e4ae7adb4985697ddc5653f52fb642b0f3de8316fb916616d07ac1ef03e1e6b20043b7cace131b232a3a
-EBUILD pygresql-5.0.4.ebuild 714 BLAKE2B b6aba084401746eff21c7d274de495a3b3a8a8f1fa27cbd33dc7a344f2188fa6a5efb681ea38c9f29478df5d7de99aa5aa14a335f23a9c45d8b7a9f2604e1b4d SHA512 ce194c95ae14ac485dbc53f5848614b8af1f0e87ef87e370e7810a95f59711d7c0c0035482669b9f4646f7238b6fa15bfac850f62baf8b64c14616b20050a6bf
-EBUILD pygresql-5.0.6.ebuild 680 BLAKE2B 35931862fd43c4121a47eb7dabe56ef00905b521bcf641dd30dd06de7cf1e1db705ac6ea10bf59feb0d90265c00d3b50060c8752d83cf8f110a320c0a4028084 SHA512 f16ba7b8baa228d4f218ccaf2c3821e0954d60b406b42d47f4e39014dc53344f9f10c667f0d8b1be07db7df61aa1a0e91a9ae7458193177f4f67948d73d51ec7
-EBUILD pygresql-5.1.ebuild 750 BLAKE2B e92e54177c0c17472631697eac80fa9e968a02ee55066790b1cdb88b3f22062e22ccfa6a22301116c9ca96a46150e532aa0e3ca5c677fa955df181dcefa64f6e SHA512 ccd96aa5e1ee1639d6629cbdb30f1e27854c8f578765ecd4cc00ef59b8fdbcfc8a92506b4d462d0f113db86a5401f29abd48544a1690aec67171792b18578b95
+EBUILD pygresql-5.0.4.ebuild 709 BLAKE2B 119babb7f445b2ee1deec43e4cecfcbbb02208d92e763702e763d096bedbe8fea583b1f4c295cdd182427f80959a3fa1d08bf9581fcade3d632664e9cac63e8f SHA512 733a25cbc3f219800517b00cca7f06a7795703f194fcc9e3c1173665b2cf63c92d529be857202ca05bfdf9fa364af0407cf2a2c2460928f0392fa0af6ad1c465
+EBUILD pygresql-5.0.6.ebuild 680 BLAKE2B 99fa462f850d5ecc8ac4303e0423d7e6a688b93eb9292fded96285cd73e0b4f22736c5f345fe20e0f68ab14ec96c52e168ba608ac80bc3fa34d125fd61e1a4e9 SHA512 e2ce13c6a2503967daf67a6a740fa7a6f8b2c36b4c96f8543e5e085362df516960d06c0d262fd85f9a537ff99a3ab72a7569675fc15752cce9dacd91ee3e8d21
+EBUILD pygresql-5.1.ebuild 750 BLAKE2B 0e6a2ecd8dbb47a8aae407bc1342d34fd74b3447d9beb03d03c8b94f3c8337d43fef854dc92826068ad15abb71defed955774ba7bb391956657fd7b1f64e9a67 SHA512 0e113b09e24c32a58927eee92ebcc818fb8d06c6f21ca48c62861140298ea340a1c1e43b2a2cad6ad4fbb8bd7f2c70229487eb585287d2a38530866cde6bcd04
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.0.4.ebuild b/dev-python/pygresql/pygresql-5.0.4.ebuild
index 7ee66e6f8b29..3dba0c81be51 100644
--- a/dev-python/pygresql/pygresql-5.0.4.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 POSTGRES_COMPAT=( 9.{4..6} 10 )
-PYTHON_COMPAT=( python2_7 python3_{5..6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 postgres
 
diff --git a/dev-python/pygresql/pygresql-5.0.6.ebuild b/dev-python/pygresql/pygresql-5.0.6.ebuild
index 37b859644fbb..ab6199669c5c 100644
--- a/dev-python/pygresql/pygresql-5.0.6.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 POSTGRES_COMPAT=( 9.{4..6} 10 )
-PYTHON_COMPAT=( python2_7 python3_{5..7} )
+PYTHON_COMPAT=( python2_7 python3_{6..7} )
 
 inherit distutils-r1 postgres
 
diff --git a/dev-python/pygresql/pygresql-5.1.ebuild b/dev-python/pygresql/pygresql-5.1.ebuild
index 1f1d7861a4f3..656803bec116 100644
--- a/dev-python/pygresql/pygresql-5.1.ebuild
+++ b/dev-python/pygresql/pygresql-5.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 POSTGRES_COMPAT=( 9.{4..6} {10..11} )
-PYTHON_COMPAT=( python2_7 python3_{5..7} )
+PYTHON_COMPAT=( python2_7 python3_{6..7} )
 
 inherit distutils-r1 postgres
 
diff --git a/dev-python/pygsl/Manifest b/dev-python/pygsl/Manifest
index ad4f3f73ac30..61198bf2d92f 100644
--- a/dev-python/pygsl/Manifest
+++ b/dev-python/pygsl/Manifest
@@ -1,5 +1,3 @@
-DIST pygsl-0.9.5.tar.gz 1674504 BLAKE2B 01423256cfda1d62aec0281725abfbe35f6260feec5fbb107819202cd9041405760988b1718e9aebf93284f4ab61597055ead308ad758d41d6eb37f867237b88 SHA512 7364e67ff2885be2cbe5410a573071209d3917f4807797b3b8525aacd03e6ab96e157e6d12d631c384e3b66602eab7e6cb89f9ab362f520397df900e77fcc875
 DIST pygsl-2.1.1.tar.gz 727636 BLAKE2B 42b87a945a41418a295ebc9ddd3c5a367256427145e4c3bbf980e561df0cc3d84a64ddab22f936c5d1a5ad58b4649e36b121648f125824e6922a3d34fcd07d10 SHA512 141232032f0221b756596bc3426160849749642ddaa3667d36b19abf3b4a22b76b5e0b0e9452898494b7f6ce0f8d17a2e392bdaba535633bbfbf1a672bf8d62e
-EBUILD pygsl-0.9.5-r1.ebuild 657 BLAKE2B d562cecdb0ed4a37099f4438e86fb2246e07110d052133bbaba3df647bce06bb0181bea291b2bc18f6724774f8d2d22dd385d8ae1e3a53f86403457c03610420 SHA512 713a637a7a05df265d66af98afac5be38f0749d9da99344632ba5bc5855a2ca99a7fd57ea5d87c63f8b6293c14ed5669ea220c2cad44dbe5f6874560b9773cda
-EBUILD pygsl-2.1.1.ebuild 671 BLAKE2B 771eab378875111d9a15ff424fc006708ead086ea186df42e8caa2886e13cae621fc10c20550196d8339a813fb85c7daff6744ff297566d55571ce9d7ae02343 SHA512 6d14d39b92f8c0cda4e7011d6f16949fb61a87b4fe89b7e6140522464937f15cf972c07dc4e3cfca56659ccf74fd799fe3d72cd0ae809745710118538e578cd8
+EBUILD pygsl-2.1.1.ebuild 661 BLAKE2B fd0e14a845e0d8c62669b2543a544573b0d4476df12f66a5822e3f65aa0aca25ed9b74437eb16b79f9ee2e8b95465efeccf5ade1c993ebd3177b980c2a8b23f0 SHA512 82559a4e221d1fc2ad8c4d3ecc239bbc7709626033c3f3d133ff2d3d128ef4b1a1f66909a2038f276493e7d8236cf1ae8919d32593dce0f6dc0a837f0c55641d
 MISC metadata.xml 453 BLAKE2B c9e06b215efc777dce1614d91240ed97dc87a32dcf0c0dc31c51dbcedf808026b7f89c191ab2eb1b50723bffe2cb5c536f6ac062ef07236f0a4641d9c78aba67 SHA512 e8fa7a19a1aca1b17b9490a7cd3ea612de43d01e5d1b37c02f2991b7e80327dba5875baceef9bc1b116e768e1fcc1457066a69eb94d74c381ecc8363b259b165
diff --git a/dev-python/pygsl/pygsl-0.9.5-r1.ebuild b/dev-python/pygsl/pygsl-0.9.5-r1.ebuild
deleted file mode 100644
index f8440315a22e..000000000000
--- a/dev-python/pygsl/pygsl-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for the GNU scientific library (gsl)"
-HOMEPAGE="http://pygsl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-DEPEND="
-	<sci-libs/gsl-2
-	dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-# Testsuite written to be run post install
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygsl/pygsl-2.1.1.ebuild b/dev-python/pygsl/pygsl-2.1.1.ebuild
index 4c29736ffef6..bac53ac9dbe9 100644
--- a/dev-python/pygsl/pygsl-2.1.1.ebuild
+++ b/dev-python/pygsl/pygsl-2.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyh2o/Manifest b/dev-python/pyh2o/Manifest
index 92ef475770a3..850d58063caf 100644
--- a/dev-python/pyh2o/Manifest
+++ b/dev-python/pyh2o/Manifest
@@ -1,2 +1,2 @@
-EBUILD pyh2o-9999.ebuild 438 BLAKE2B 897e47b6ddb82e3996e5541d350a8bf56cda146f15e956b18b6c598a8f8e80633e14259ecbb040fcb0355be3c028a2600d758f4295730293ec97e59425fa7d3d SHA512 345591e623ba2e77f6b7d8d208293d944229010783f38b6543452501918123398cb4274785cb93c43dd24f03b8cb976b118948af3f817fc554bd561a577fa095
+EBUILD pyh2o-9999.ebuild 423 BLAKE2B 3972c0be57d00723a36300117d786c8b50983aa7fb0be466af563a29ef0419ea4b859f82a11d34f35225a94ef8d9799d210e76c1d5bcc5a2f4b19b8ad8efeaa1 SHA512 155dded0a90aef027b3deabe4f279295b0ef56cc2840654f09e4b2164f16f2bcbf9c77911cb5f9b71c6aeed8cb59d71e44aff3e64fc6cf87ccaacc5be60164a2
 MISC metadata.xml 521 BLAKE2B 6f0fd3f19c783f63615643e3f0ff35cad870fa4ea16e4f111b645da056b0984f95ec9f886128c40e0d85ebcddde6768575652021b4c3f9db206a5ca8b5a05b31 SHA512 dff927c256adb5963ae243715b8a50dafece0ee94fb8a7bb416b7d8e2801cb4d6380412ae6ce36866fa27b403f487a1158a5919fc7ba727174ecfd9d5d10e7ec
diff --git a/dev-python/pyh2o/pyh2o-9999.ebuild b/dev-python/pyh2o/pyh2o-9999.ebuild
index 99192fd4a2ed..a48d5cdf68b7 100644
--- a/dev-python/pyh2o/pyh2o-9999.ebuild
+++ b/dev-python/pyh2o/pyh2o-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index d7749d5c523f..44c2b0661b18 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,5 +1,5 @@
 DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
 DIST PyHamcrest-1.9.0.tar.gz 376623 BLAKE2B 808c74aa4dff89467c126cbc0e18029a9504cb27bbf03662a90666f85c76d7d7617260f50d35acde3a8e9e437b846589423cbb3697f8ceb86d0b5b838c586ebd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0
-EBUILD pyhamcrest-1.9.0-r1.ebuild 2083 BLAKE2B 4d97c0cef51458dcf1868f306b5a4d2266f0e8c8f910890ad0abf022a8a473650280896fb1ca8900d2a3456d5a9d6ec54bd29e82cf4450cf65a1d3d9aab40aa0 SHA512 c8a445ae58fdf6d7c0fc3fe13d25fae1290c72f6b8a5be821fdb946cb8d0dd162d8dd2909e205e040b0ceffcff8c69e10c8e33dfcb084e366b7b0c524dff4560
-EBUILD pyhamcrest-1.9.0.ebuild 1222 BLAKE2B 5b50d8b8823b1d399ae78ca675b6ec9eeb7235b6fc1c59c70057148d0ecfaa3a47bb907411ada7a965d1ba42672fac671379e129f5d035175d05d01816b6bd69 SHA512 eee23278b27afc96cefb11410a48a76fb23daf64b826d66c16756a949ee7cd2e18229950cfbea1778f3629eb46df837446127511cedea8c33c8c400fff707556
+EBUILD pyhamcrest-1.9.0-r1.ebuild 2088 BLAKE2B 314d06e6e1ea5fa28a951b345822c31569dc6a6974c6b6251ed2b15a7c6996573573178e869577650c8cc2d2a687eb24eb333f54acc0f704369991425fec8266 SHA512 211c994d48be93d41ac840b553815fe11693aedbc81c27b28b57e4bd286d385d3a4c9bffb909e73a1e82f37b4f58e9b2bdc02014df0c9b7c8a58f7ebf9937a5d
+EBUILD pyhamcrest-1.9.0.ebuild 1218 BLAKE2B ffe0c2bb1126b917ccaabb54791579738244d071fd44f57b8dcd113212dd76293eb87a590cc248a9f33df7ec30339c3771907944f5b43a6a1442b16808057d62 SHA512 b89889eaac87b17f5f57011d9dbdd3f0038cb7fd4a53267cc323e101c9b6d16b924c348ce4d4052397a5b4a1e04f3a09ba7e29472c6c2b899a747e3a7ce1fae9
 MISC metadata.xml 297 BLAKE2B 1d304f6e46130d706190ceaa75f188fba8b3934ebcb42b48d7209f9a9dc67e3561cc2a823b9a591cd58a945161c382698178979e4dacf776178367e43c5519a7 SHA512 999f2517a446b5911d475789246dcb70a08566fba9ecec5f2b69fa29180fdfbb17f4f24b4c87ef71c422814bf7502da2812e5c7938293e96affe721d92e428fd
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
index 4e29ae715def..5fec9f66af47 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~mips ~sh ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~mips ~sh ~sparc ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags -3) ) )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
index 3c6b220d5773..4bb3d7d9b0f2 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyhcl/Manifest b/dev-python/pyhcl/Manifest
index 968504eb0cc0..c421831d6672 100644
--- a/dev-python/pyhcl/Manifest
+++ b/dev-python/pyhcl/Manifest
@@ -1,5 +1,5 @@
 DIST pyhcl-0.2.3.tar.gz 21796 BLAKE2B f9e76ca40d49d8ce3cbb7ebcb18f731599d061986a44641488af46bcb7e1ebbac0e775502958efef2d4af1efc996497a834aaf89272d8d6bc8bb167a6be5febc SHA512 09cc9dd53048170ad49794d0944acaacba2c08bc5a05bb8d699bb47dc0a03eb32881ddf4dc0771e8b6ee008f7a47b5e95beed4bd77b173c88c6cc322eff4678f
 DIST pyhcl-0.3.6.tar.gz 23682 BLAKE2B 0c6cd819a14c5488e303fc5931bffa885e7d7de352570fc2ea9cba22ec4758dad3f69b5e62ba9186c57bfc7cc6add8cc9e0fec52e6dc870dfa1c7b26fca6e0d2 SHA512 27cb190947162e62766f7f4e33b1fbda8ac6a9750418b17cb8d9fa2b9fd0de28fc3e2c9d27f59af7c4740239794e9c81148b7ef20ad8f5d4fb59348c0cf9c5e8
-EBUILD pyhcl-0.2.3.ebuild 667 BLAKE2B 145295be3209d29a79f681682c41bdd7c720ff87cba2cdfaf5046c47572419ae4b450a06345dff4a4347346fa3116bef926d47ef50b2d505d9a8a40ef437ae1d SHA512 866db39cb1958e20c9a2bf22e1b23058045ba0b2190d42810024692f72d475b97a6e1459de44699e5c9d0dd1b7e01eacf81825e129c583d371756f0d2d971fd6
-EBUILD pyhcl-0.3.6.ebuild 667 BLAKE2B 145295be3209d29a79f681682c41bdd7c720ff87cba2cdfaf5046c47572419ae4b450a06345dff4a4347346fa3116bef926d47ef50b2d505d9a8a40ef437ae1d SHA512 866db39cb1958e20c9a2bf22e1b23058045ba0b2190d42810024692f72d475b97a6e1459de44699e5c9d0dd1b7e01eacf81825e129c583d371756f0d2d971fd6
+EBUILD pyhcl-0.2.3.ebuild 663 BLAKE2B 921c6946a3fba46f521be6614ed488014ab18b0bd59ad59af3e0f0e13ece2ed38c2e0c0c6d3298bebf53cb62d47a26eb3cbc43116850614916cacf0f1d4c709c SHA512 f817926281668c387bfa2d02525f14ae010344dd1eaace7376013b1d436c8b9b9ecbe43d50447c235310ce102e554cbadad36aca50e490f68b1673076e6f7ed8
+EBUILD pyhcl-0.3.6.ebuild 663 BLAKE2B 921c6946a3fba46f521be6614ed488014ab18b0bd59ad59af3e0f0e13ece2ed38c2e0c0c6d3298bebf53cb62d47a26eb3cbc43116850614916cacf0f1d4c709c SHA512 f817926281668c387bfa2d02525f14ae010344dd1eaace7376013b1d436c8b9b9ecbe43d50447c235310ce102e554cbadad36aca50e490f68b1673076e6f7ed8
 MISC metadata.xml 319 BLAKE2B 031effabad2704b3a367b95ea2065bc003e5df6575cba63b83a786450e45d3969d4eccac42fa4a413e8484ba60fd25e9028efa05cd3d697cfad1f15c60295279 SHA512 dffa813a0f0b7c76a978c1321d13723b440392647bd2cdbf26366d9fb2d7c572d4b726797cc61c249f25dac38ce9df9d71ef5de517b513b6ac3000ef72e06640
diff --git a/dev-python/pyhcl/pyhcl-0.2.3.ebuild b/dev-python/pyhcl/pyhcl-0.2.3.ebuild
index 932781dadcba..dfa1b6a6e7db 100644
--- a/dev-python/pyhcl/pyhcl-0.2.3.ebuild
+++ b/dev-python/pyhcl/pyhcl-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyhcl/pyhcl-0.3.6.ebuild b/dev-python/pyhcl/pyhcl-0.3.6.ebuild
index 932781dadcba..dfa1b6a6e7db 100644
--- a/dev-python/pyhcl/pyhcl-0.3.6.ebuild
+++ b/dev-python/pyhcl/pyhcl-0.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index ee53b4aa3f63..85f875bfec0c 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,6 +1,9 @@
 AUX pyicu-2.3.1-testSurrogatePairs_workaround.patch 1474 BLAKE2B 7b9ab4f4c0021f8e987830966551cfd2a128a0dc964f0c45c80d74a171c6093d2cda4b9a18baddf40c264bb66c2d8765e1d78603a75db4be1af4044b817be767 SHA512 59f54524b0d8dbe6c146685901db30f50fe04f2438ca64c824cb97e737eaa74c831e736ec90f376b66a1d8c69e0cdd76d0743a940a374dda342322e70210246a
+AUX pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch 489 BLAKE2B c88ffa0b90c8201450e6d404c25381ec04ea92bf4ca457e0268c03f18c7416cbe406206998f140d27b4975786dd1dd37e166d7de2848ddb34ced80db87a51651 SHA512 3bc754eb0fa70f5b4a88d5a547bc97a2813a78daf0afa1489842aee6e63d7d1933911b18ba88719208463ccd44f318d9f4bc850aef1e762e4d2bf35e20b36951
 DIST PyICU-2.3.1.tar.gz 214761 BLAKE2B 6571f1c10b6fa15b0b6fde76c16b2e1a1fa99af83db615aa7f7a172844183ca2a818747749b38e36162ff297c3e99311cd3328333880374c1c151955fe983f78 SHA512 edb60320ffe649f257d4d691ad9cc8287a7611de6a970d33a25a6e12a14c1faa591023d99d0b10619b0860bba70d1b67af2eff5cf146381afcaa872f0af1be29
 DIST PyICU-2.3.tar.gz 214710 BLAKE2B ef676cce089962d16a88193e7aa2ffec739086e5bbef201c8779a372a5876bbb1e63e5e92a7c89c879b91f063e90d4fdb16a1967dff5f2ef658cde95f9fdca6c SHA512 2bdbc7fb7c83e58c9d0d53dadf8fef92d8dec02e9eefebc75bac43c19f008ef2a3219d41b62c426c41a055bb4530b2f7ef567162660d6021b8d2bf9e99090f94
-EBUILD pyicu-2.3.1.ebuild 787 BLAKE2B 5c77298af5013e40380c5b7b5d9a180f108eba55991b53bdaf6ec8423f735c49e215faa3843f0c620ea9d65f460859f10c9f108ae9b6496f69a8cc18114f41e2 SHA512 89f81c7e830cca17ce56ce9b82f97fae1e45dcd7c5eda5a88350a344006b347f85f139cfc07d976a293529bd9fc189dac92fd6eec867b9e2a6e75b4c05e481be
-EBUILD pyicu-2.3.ebuild 847 BLAKE2B 9bc49ccf574413e41d528c6cb07479a779a3ba6f8ec75694bb4a090dcb4327160324599488538b992d82e5070fbc585992b277f06db104691879d50adde9649a SHA512 e5a27af0360143587d228926eaa2de29e8f9479d3ad112ac91c10877302bca5d57870818e9ee1c4057330599c9bdd9b2126dfe080e5f385966143646fb68fd3e
+DIST PyICU-2.4.2.tar.gz 219356 BLAKE2B dc6ad1e8944e43560314e9dbfcd37e58b52b50874656f7ca66497a317b03bb9bf988515417660be87bb2e73e0484e5870cd3db2c5eab47fda1223e7514935fb0 SHA512 3cd1f632c2551dce3d721c54190a19c2a46e2554ef54915c9e07b133fa4a499b1a8c49f406abe9777721903799eb23a2d55d3b1aadd758870f8bd591f143a05b
+EBUILD pyicu-2.3.1.ebuild 785 BLAKE2B 04bf55c6ae86a69e7a28ccb7f84a85c17c4db2dcbb80cd89f2dbf60dea13c49ae51494b011b5f50a8ce51bf7bebf20903c8934c4d13fcf4ef925e45ba645b79d SHA512 bb29584503c784ba7a88bcf8c7499a2a9a23c5888943107cd64c71343662e046ca7058f9d24afe191c98fd9a3b5a59f695650452a342ca897c161b029d8a7f4f
+EBUILD pyicu-2.3.ebuild 845 BLAKE2B d9da30f3d1a1b140fa57dc4141bf00c0dac63220cde34189192e997453d51865a33c460526fe6e8fe894c8daa1174738fad304ea093a2549508f82e90c76c9ee SHA512 356fc3125222240ea87ccb50c35daf695e33ce931592fc80077a0acb5c97c08fae00108373f6f81c77cf0c35c0fb42a84633176bf0c1079273480cbe65a05bd1
+EBUILD pyicu-2.4.2.ebuild 685 BLAKE2B 6a9b23736c5aeaa0538b5985c06baadb82f85e7cdad078217cdf2a5cbf2de5cd172addb8859ee81528890ce221e4f93f7149039983b5faf1ec28b09cc32fa50e SHA512 5a76d1b93d464f207684ab334444f418af9dfe16677750c47601bf12c444ef80ed06266ee9c162be4fb58ac89a841cb1d21712d2bd023dbf42ce7e1b56de981c
 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
new file mode 100644
index 000000000000..ab1fed8dc7f1
--- /dev/null
+++ b/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch
@@ -0,0 +1,17 @@
+--- 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.3.1.ebuild b/dev-python/pyicu/pyicu-2.3.1.ebuild
index b4d01d5c5350..900deaced5b1 100644
--- a/dev-python/pyicu/pyicu-2.3.1.ebuild
+++ b/dev-python/pyicu/pyicu-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyicu/pyicu-2.3.ebuild b/dev-python/pyicu/pyicu-2.3.ebuild
index 5cb1c22282a1..d8979e1a150c 100644
--- a/dev-python/pyicu/pyicu-2.3.ebuild
+++ b/dev-python/pyicu/pyicu-2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyicu/pyicu-2.4.2.ebuild b/dev-python/pyicu/pyicu-2.4.2.ebuild
new file mode 100644
index 000000000000..f4acff57c10f
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/icu:="
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+		${RDEPEND}
+		dev-python/six
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.2-testLocaleMatcher_pytest_old_icu.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyifp/Manifest b/dev-python/pyifp/Manifest
deleted file mode 100644
index f6ba739b3e79..000000000000
--- a/dev-python/pyifp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pyifp-0.2.2-setup-fix.patch 513 BLAKE2B f23ae140ffca9cc4de8964d705531d3dc06e75976013ed85b6dc5bf30a850940036d1a9b3fd3b89113b8e2aa202adba24d82d6cd33921c228ecfc54393d1cce0 SHA512 c3c30b89c33e1eebc7bbb8302dcbaeaff0305920695fd526fc6c3838313de4f290564c3d5d4dbb59eb2eb6a2736e9bad718da5009703a4f08db7d4f0f42c6810
-DIST pyifp-0.2.2.tar.gz 21378 BLAKE2B 681b837c13232dedf69c827d0287e7a0e90e532764c6ac8dfc9234b2e957bda9c222db39dc2925f81f0d0bc9b69d6979e9e65377db8c628c195af717275bb3f7 SHA512 9d4b2fc41406c784e8fe9bb650760d750fdf9390b2c69baee1032cc33ffc726ec1a688faa043196a0d075f4e10530dac6637e76b4440b92142f69683cd65a281
-EBUILD pyifp-0.2.2-r1.ebuild 601 BLAKE2B f96e48be2cf5e22f04c3414fb27ecffeeb321fbc14ea2a7a9497550e246548bd4c8d99013ee6328c2b58b85d09c937d1bb64749be679a05d9f32aac21dc493d3 SHA512 a22a88c881d81246a03d7ccd7a719cd828dfd8463fc7fa0cd10a3d80f704cfedccf7eac022111625046f7e6cf300ce0b4155ace7acdae693bb287c6910b86481
-MISC metadata.xml 433 BLAKE2B 256529cd495b1f1869d829698f3e0887c264075477f014a5906e4a70d85ec8079b637c9765e64bded6dc3e9f695f53656f70331694434d09d34fc48dc37bb8b6 SHA512 d747fe4f9127678f0245f2a35d3c8244086a05439c40eaa0e8f6444c6605bbb7c1ee241cd9b22feb06454a972244465e615b5f14e0d158d67c17a0c8ddb3d61c
diff --git a/dev-python/pyifp/files/pyifp-0.2.2-setup-fix.patch b/dev-python/pyifp/files/pyifp-0.2.2-setup-fix.patch
deleted file mode 100644
index 2582e0fd8841..000000000000
--- a/dev-python/pyifp/files/pyifp-0.2.2-setup-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pyifp-0.2.2/setup.py	2005-02-21 01:36:05.000000000 -0500
-+++ pyifp-0.2.2-fixed/setup.py	2005-10-15 13:29:26.000000000 -0400
-@@ -54,7 +54,7 @@
-         self.swig_inc = 'SWIG'
-         self.swig_shadow = None        
-     
--    def swig_sources(self, sources):
-+    def swig_sources(self, sources, extension=None):
-         """Override the definition of 'swig_sources' in build_ext.  This
-         is essentially the same function but with better swig support.
-         I will now quote the original docstring:
diff --git a/dev-python/pyifp/metadata.xml b/dev-python/pyifp/metadata.xml
deleted file mode 100644
index e3560c535fc1..000000000000
--- a/dev-python/pyifp/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ifp-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyifp/pyifp-0.2.2-r1.ebuild b/dev-python/pyifp/pyifp-0.2.2-r1.ebuild
deleted file mode 100644
index e5adcfa496b5..000000000000
--- a/dev-python/pyifp/pyifp-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libifp library for accessing iRiver iFP devices"
-HOMEPAGE="http://ifp-gnome.sourceforge.net"
-SRC_URI="mirror://sourceforge/ifp-gnome/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libifp-1.0.0.2"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-PATCHES=( "${FILESDIR}"/${P}-setup-fix.patch )
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index cf7c16493a24..24fd2d572f4a 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,3 +1,3 @@
 DIST pyinotify-0.9.6.tar.gz 60998 BLAKE2B 7fb55cfe5b2c02682b5842d95859a58f218ab591a4eee689b707e804c6fe8cde4cc1fb3dfbf54a044ff743deefa0ee5551bc6e27ca4dda1c608218a6c24597b2 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5
-EBUILD pyinotify-0.9.6.ebuild 785 BLAKE2B 086c2574e29a9a5a63c7ee5228bd42e4b1273ae455f0aa728b106f29c18d798ab3284f1705baea0762a9badc07d9147a5d8d6f1a99ebe6b0a7ba3983cb3fa6ae SHA512 3c628464127f19c7c54093aab7d75dfbe8cedce7bebdd8b8340bcb2f5e74d8f1de80dabd80207f9976b9a1e7c54050ac1380da1de1ec96c83dcc43ac853892d4
+EBUILD pyinotify-0.9.6.ebuild 778 BLAKE2B d775c6436e9102ad432ec1181a3d05b1518fb093d1c9cafb0f30721a911382710d6d05c989caae99da1b79eceda37f79c87fe0703cb45ac77d46dd0a1561698e SHA512 b4619a2a513cc45b8de3b3bc9e41574d1ece0d50a489540c9ffba6b4f8c37ddc25b708810240874017513d648f2e33c1f3da4a06a489de0eef9091fc34a98659
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index ad7c005ecaa3..639f994035c1 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pyinsane/Manifest b/dev-python/pyinsane/Manifest
index 2e15b806b2af..c5f8a1718294 100644
--- a/dev-python/pyinsane/Manifest
+++ b/dev-python/pyinsane/Manifest
@@ -1,7 +1,7 @@
 DIST pyinsane-2.0.10.tar.gz 327159 BLAKE2B ae63e08fc557513ccac0633fac47bb29b3c8a023c481289ec60724f5fcdae0827e02d5f37d3f104d454ebcb1d1a7681248866461bce6201f056c988f858aa0d3 SHA512 bb882ab51c1e6cea7cad75851ffe5918ee08467d4772d27c23a0c5ec9f2dea3ee7d83601ae35e56e2f717ff7683cec5a45aa47b2a4e167fe4dddb9db3229a3b1
 DIST pyinsane2-2.0.12.tar.gz 56107 BLAKE2B 81085e414f162c4fe3623e05b904c35864b95c8ceb5aa25cb92aa87086d4ee44f9f1bea58239373217e93793bfba0d8bb894ab75d69d6c213741cf6e53721284 SHA512 72fc87d5c7eab078f4a9694569c5759046587a8439820fadfe1b8899b7445e063f9fc2f3e93a86b1f9329f729466a5e19b86e46c128caf9ac8b143cfd9e17817
 DIST pyinsane2-2.0.13.tar.gz 57172 BLAKE2B 26081f7df1d4077f2580f8968c20a88092446136f441fab16a8bc1e34ffc9d5e11221c6a3f74a111f66f839d3cea5ed7518ebe4321b563cba1f3cb3a6053bf74 SHA512 613ea6aae00df550089a691ef6cdd00ea00324ad3a02e35bcb1cd1b0723e34afe9692828100115432e5df9c7bef09f861ce3e1d06915c02c007f92bc8030a91b
-EBUILD pyinsane-2.0.10.ebuild 844 BLAKE2B daad64b5469cfad6e78f451752c16ac3e807d4b22f70616e6a269790da73ba40230efcb7161745699aa05558ec6c4d4fdfc41ecb6d349e7dff3fb3e1f3f011e8 SHA512 54f054b87034a56db941ab27ed2a778ae5dbf78c77fa47b5f25cb6a1b84ddedf489ac892b7311ad5f1da030bf1d14ac972fd4a31f87e8040aaee53978009d9d1
-EBUILD pyinsane-2.0.12-r1.ebuild 797 BLAKE2B 26e0fb37a67b192f74254cedea36dd2dbe1393167abae93f4aa28ab7935e1b16da4ed307fd7a2ba91fb3c0f7f0277c59026da2af6d537ef5cefffb262400a2e4 SHA512 3210ae99ad0fc5fbd22b7448be307fb35ac729a254d9f4e6a4feeed421de3e7a16a2c09004ed04a19df5e54db966dd7a4a5d4063671b02b9b269cee79ac06210
-EBUILD pyinsane-2.0.13.ebuild 806 BLAKE2B 9ad9902bd71e5182234fe06e93be47b6f4a46bcdff33b5b58ea35bfe130938ebad3055d930310433f2fbec35d15460c38eaa799a4bdbe808d7ce2e2c4bd87b64 SHA512 114ad968e00c4851d52e1b379dc2c4b93c85d992b534bf86072afbcc83b81ee953b51ec882859c4c16fa61e114e3a9b5c5ad5187081b2581f35a82e74d53a718
+EBUILD pyinsane-2.0.10.ebuild 840 BLAKE2B 8613c08aeff2ea0852e82e016b133ddd26851a4124b4d8eb636eebb9df2b262963ed424c0d514a14f30b82cc1a47e38f09bf695fdf9f034261db6da268958c0a SHA512 45c6ae194e5d6a7dd2bdf9c483151968e12a8fe6f73209e6f3d4e78561012a353d335c33ecb63345100cb818d1998b7476714ec543f9ca78fb146884e67ab86c
+EBUILD pyinsane-2.0.12-r1.ebuild 793 BLAKE2B 83df4a07b3e5f85d9a4e8235b7ac24301f80bcf6f3cfe0f5487ce7378d066d979514611de0f14214bae8d3e3df5a29f7853ca21defda04638c113407fd260765 SHA512 a87fbd7e86ecf705aae08116b26041e062966d04fb066813a6f687105585055b1328c9197f438a4e4f7722b06b61aa1866b9db90b759a94bd2c1972d96533c94
+EBUILD pyinsane-2.0.13.ebuild 801 BLAKE2B 30b35b95a5be24c11257bf94ad1be5ccb900c49302bf7bf571072c0a6e6ff67df668dd994408eefd6fedcc189e9bf1b7d372a2cfac08291c9f8c020ea16b0246 SHA512 221c6f63f7e28df61a47ab0bf1fc0f2de286deb19d9f8c034d8a22433e5da4faa691a45835dc194cfafb81fdc7e0dc1bbe811d6bdc8c0f53e41c5f9e52afe786
 MISC metadata.xml 970 BLAKE2B 66f9e22270e1f6bb94091085d49b6ee20aae2cc8c32e8e89b8325190b21932ce2431545b7bc72384ea2f82d9c71577d5ce08434dd2c9b237de9c7056307fc99a SHA512 1b5b839ca3e96ea99a6239cf6d5989710484b595405a3ce06192587984a0a5552bfbf0df770a3b986e078f4bbd27338d378f775cc0afdfa5bc4dc17190bf1e87
diff --git a/dev-python/pyinsane/pyinsane-2.0.10.ebuild b/dev-python/pyinsane/pyinsane-2.0.10.ebuild
index 34324e683fc6..c1bb4b1380a1 100644
--- a/dev-python/pyinsane/pyinsane-2.0.10.ebuild
+++ b/dev-python/pyinsane/pyinsane-2.0.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild b/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild
index 4a52e30d8c0e..715fc0d6213c 100644
--- a/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild
+++ b/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyinsane/pyinsane-2.0.13.ebuild b/dev-python/pyinsane/pyinsane-2.0.13.ebuild
index 5048615b8a4d..ea0d6273576c 100644
--- a/dev-python/pyinsane/pyinsane-2.0.13.ebuild
+++ b/dev-python/pyinsane/pyinsane-2.0.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyjade/Manifest b/dev-python/pyjade/Manifest
index 0fb94b1684fc..3616936901d0 100644
--- a/dev-python/pyjade/Manifest
+++ b/dev-python/pyjade/Manifest
@@ -1,3 +1,3 @@
 DIST pyjade-4.0.0.tar.gz 29251 BLAKE2B 0a2ffb949022e9bb9bb12d9a1fa7680650a14634158429b2256320b2a75acc06e6c2ee0cbcd7ffba1263f6bfbbd40b097d7bb99f7e3a8fef95951c413f6e515f SHA512 0a384b843d2eb5884f2690ed5bb9b9b253474568ff1e9faca356a5c50749bb53fb759a099c7719bef495dc7af0073f143afad1c0d6d68f0f61d63624506f12b6
-EBUILD pyjade-4.0.0.ebuild 838 BLAKE2B a8c054dcab6f4908fc9a6dcc805c524f4e2a076bd6ad2fe0467aeb10e6be0ae741c20f0bdeafa179c8014c47c2b7aed6818141f23121a3adb6c7aca093af605b SHA512 e9b94d0a3fae021e4cc67c1d213d5ba05f588a377c7e3dca172ae82c1da58f6e80fd9351c64728d7d8dacb47c969a6cb5c122cbc06c1fc3fcd7555a3fe4157c5
+EBUILD pyjade-4.0.0.ebuild 834 BLAKE2B 0e2ad3093021f1def540283ae0b2cb757411cf8457734f8f53335d0d6d628d657527e1a3ac384be7311284cce7b24bf7ecade8ae650203f0ee36250fa4725e6b SHA512 c6924b75a85cf4f4b2db33600ab80247d035114f1c1a18140f232dd9e0bfff3da61da8d6b008ffb0387bf25b80b5da08ac8cccf1f1ccb48c8f4095ff39d50637
 MISC metadata.xml 584 BLAKE2B 22bf5698fe68eb9258403988d1ffc4f1fd6532bbd598ec0c2252198af5ff39e6eb458bf26e5fb62fc12ed6877456268b26918f2fa195f63a6b01e999063fba45 SHA512 6a70d07be11b26ed7a5eb217df8dd8085df84b82fdc48c35889db2080b5923be1108feae6c44ec1dc99e87f0244870b20469b866f359e8b74d682c884394c620
diff --git a/dev-python/pyjade/pyjade-4.0.0.ebuild b/dev-python/pyjade/pyjade-4.0.0.ebuild
index 3294ca4c8ef2..52ad28eff417 100644
--- a/dev-python/pyjade/pyjade-4.0.0.ebuild
+++ b/dev-python/pyjade/pyjade-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 62a34cd1c07d..ba2bf3b438a4 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,5 +1,5 @@
 DIST PyJWT-1.5.3.tar.gz 73044 BLAKE2B ae2e3caec52ddd768d573e0398bbc355c6eedca238db9b1808ff1d723b9fdee0845cf119d78e561833fe770e5ec39000905cec43a5e96102865f60e204c72c22 SHA512 b25a9f6a04bd072020fcf00bb559b7560902adb79746fb880432c01fa356748238432f53f6b9a21db50ece3e59ed4c45ca3f48ecec0ca3c4095e6a739a5c150c
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
-EBUILD pyjwt-1.5.3.ebuild 1296 BLAKE2B ff64d380ea673bbbfcc15a841fc5e6e2475c4f88fd82cc9301f448f13b21bc07d593e0e2bd6858f5cba532663091d894a1419786e23a9c8c5d9185973e50fc4f SHA512 82029b7cd94b6cbd63045f0c1932907f3017c7db4109d19e4e2ed4c555ea437d7831f27beb7eabceba7627f578e23993280e91fef19f9b779bc0015d2445376e
-EBUILD pyjwt-1.7.1.ebuild 1320 BLAKE2B f6a4b3bd395cd396cbd34c211b57ee48ebcd1c628da51fd531d40c9a8f56b00c3db3a19b28b87f56c52ab9f03e29e787b5d9fa3b814e46763e00b0d3244c4e68 SHA512 10868d4839d72074647cf6fda1bc07902f815524dd2708e973a124ca086d3401125adc4b2b7067032bc807db641e76f1a96b8e56d79c0ad15524f2545e73823d
+EBUILD pyjwt-1.5.3.ebuild 1289 BLAKE2B f949371337531c7d6f7ff8a2c06587667d50440442959aaeba7c6897106fd54413475250b6f262d37437f53161636d54ddbecb2ac98b93792d49d3ee266bc86b SHA512 836c48af9bdfd92062efb542d459d9c2fbbc1ddfaae4fd89ea60fdf82572e535c4144c7e4ce17ea39845001ae5b5ff7673c28d68ad6cc779a9f749ca31915020
+EBUILD pyjwt-1.7.1.ebuild 1313 BLAKE2B c6fb3d75a4af0f3bea0d91aeba245d290f491613b092d4c947a5777df6b2a19517847ec5badfc20d230dcabf24e5c57b068585432c8879461142286eea73ae24 SHA512 b83bdab9905d9a685342c229699ef8e252a77294d1a8f25886adc73e1904c24ba633eec39f79b25945bdd446250c34bd2b4955859a5f5f89500232d649131d40
 MISC metadata.xml 374 BLAKE2B 29e7fb2995367400d4f8d836cda63346441ff6008ac4554cd06859827d92924d3c34f2fb9763291766014a364d1e02af1ae6412fb02d316c775c3c0c13dcb22e SHA512 87a019a49c2e355d19148214f8ac7212758f7a36f77e7b959d32df1146c145b764f93707fd7b45a8c5276209a66380c888670181bf78bc4d241d5a7294a032b4
diff --git a/dev-python/pyjwt/pyjwt-1.5.3.ebuild b/dev-python/pyjwt/pyjwt-1.5.3.ebuild
index 460c50ba6226..670b05ec00c5 100644
--- a/dev-python/pyjwt/pyjwt-1.5.3.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyjwt/pyjwt-1.7.1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1.ebuild
index fff6cf167527..54a9e37af111 100644
--- a/dev-python/pyjwt/pyjwt-1.7.1.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 5019a3ff0215..308f11c7d85e 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,7 +1,3 @@
-DIST pykerberos-1.1.7.tar.gz 35439 BLAKE2B ca732440de2b1d282255d3024228a742becd1fce7340ffc8be7ceabe1a4630e74a83d2b6f1d15e1e754308fca82de754a795dcde2f25f6fe3384d8043d33de9c SHA512 ad5882b7e962509af97cc67b118e50fa94fab6848e8121e2b7d40029d27987c8812eed9feb1687ddbb03dc95ef0724f585fc6c7f273c7cb85621e06ecb7ec7bd
-DIST pykerberos-1.1.9.tar.gz 35788 BLAKE2B 19fb084e10bba3b002e7ac919590d7249acb76909abd5c9634302ddc52e8b09bc6f80b7d51c069e584d481740ccf3a4932518bb7efad82fcceac1bb61d094b51 SHA512 1bf912628b7f069f15a67fa99489eab010dac8af6d42357ee2740a82808a5a3bf9fd29ae8d91571e4fe3069cf70530c98093857df63264b26881542598613323
 DIST pykerberos-1.2.1.tar.gz 24535 BLAKE2B 5c6253d99857a5061f708e213e24e0ac34a6fa2a39332d5a0f27f30f1ac9eec45654966113c3036cf9bbe27ee9642748afe4cef845d2ceda26286ced1e2277e0 SHA512 048ed0238911b3e9970a5567ddc2b5e3b551e24bd8d08f06e5807f238c566ead9998e0efb0e3207f178ef2a8c9116f4ed4b7c728b9279f7a88f0945a7c4b081f
-EBUILD pykerberos-1.1.7.ebuild 546 BLAKE2B 3b3d14175dd3e613f8a892f27f0229c913c1d3578973c935fd9b2a22e1a5e357dcc83013390c97a9c184122cc4acb6a51ca22930712e2e8dfcf2042cb289d4ca SHA512 88154232e01d41c35aa82e57b8850b199daf53a08f3aee5e8179383e18559727bfe14426ddbe2366b3073eaf9522046079cfd38501cf33c21cedb0d0d32fd746
-EBUILD pykerberos-1.1.9.ebuild 543 BLAKE2B 01884f831fbfcdab65a71f90c0ec97024cbecb8ac17c339b1302b8f2c135fae0fbd6393dc6166cf6e6b9c1b2c56111d25925031fcbc2560a21217fe3a66126a8 SHA512 fdd1de48e0b9aa123629d349e18a920df25bb28a309dfb50d2b6f9cc2f06ba7a34d0aee917a3bfea0809d022303a49fc86ea335d753f47022e034b711b8f6be1
-EBUILD pykerberos-1.2.1.ebuild 543 BLAKE2B fd4d8c57b5e8ff67f247039d05436d5711ddbe2f3637c06085956f7bf01edf41846659d7bb2d2af5046f058068eea32f6940b72cbd5593ecc1644873a1342756 SHA512 9c88baadbdc7cf179bb35ef3a45c7359539f1a59153e4af056fc858c16bead74c6837316b679698ea456cf9b9323b2c49ed8990560c39b8d8a3bb47b819c28f7
+EBUILD pykerberos-1.2.1.ebuild 536 BLAKE2B 0bd99d2ef3818ea896c4f84c312279bca0036b389b2308bce49535d031eca939c94ecafa63fdb0e9fe41e7934b166852876be1529af51550d200c7405571b782 SHA512 106a50e31cfd77b4138f7721df42fc3cc7bf8094727c3704d3cd3a3f17eaeea99a85493eb86ee371cca5c74b66853b53d0e609392045c6048e359169093a9f88
 MISC metadata.xml 332 BLAKE2B c6badaa93a0f9f3000d4865e58d38f56d57ebf51fd4ee4f8d6d6bbf3926dd4b0b7c97e46df5206622579a788c86e12de778f2207da80ba97814ff16dc8d04d38 SHA512 a3246676e0c2f0430c285ae4f58b5ca754376936860c9d04d9ef46ce111bafbfebcd25e8dc28f1abfeca92dcbc6a329f711272ad7dd501bc9a1c7b34876cbbca
diff --git a/dev-python/pykerberos/pykerberos-1.1.7.ebuild b/dev-python/pykerberos/pykerberos-1.1.7.ebuild
deleted file mode 100644
index e8fcefe05ef7..000000000000
--- a/dev-python/pykerberos/pykerberos-1.1.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
-HOMEPAGE="http://trac.calendarserver.org/wiki/PyKerberos"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-1.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	app-crypt/mit-krb5
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pykerberos/pykerberos-1.1.9.ebuild b/dev-python/pykerberos/pykerberos-1.1.9.ebuild
deleted file mode 100644
index b9e6edb51b1c..000000000000
--- a/dev-python/pykerberos/pykerberos-1.1.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
-HOMEPAGE="http://trac.calendarserver.org/wiki/PyKerberos"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	app-crypt/mit-krb5
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pykerberos/pykerberos-1.2.1.ebuild b/dev-python/pykerberos/pykerberos-1.2.1.ebuild
index e924b2e7326a..25739a108cb1 100644
--- a/dev-python/pykerberos/pykerberos-1.2.1.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
index 2f050fd6d972..1dd0b6770c9b 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -1,3 +1,3 @@
 DIST Pykka-1.2.1.tar.gz 46252 BLAKE2B 48d351924874c3a26436643aef1bdeede1dc008b1edad67a4dca5aa29b13d421fd1643d1e9ec23bbe9ba16e638911b382389df878a2b53f7826ebf3d9058adaf SHA512 22eaa735915e33146d8a3fa3f9dd5ea1dd608e7ad45ab21721a108b01ddf058b4cd00da67b762a95ede650c9ba1a79ee3d6fd22a491bc7ff348a56b7c0139cfd
-EBUILD pykka-1.2.1.ebuild 603 BLAKE2B 71aa26440aa5ffb65fcadefa4b6f25df48ecfa91ab56dd7bbf234680881b5f30624e85117aab350e39d98e86de01df7c2e5d398b1e754c681bdf9dd2bc4b01fe SHA512 1ba2699870334fa763f51a212ea9712bc1448b55f813d6f8ca68a5684cb4c882cf76ad759dea295178d9ad26922fe82f08e93cd08f093fc5ac67175b8a9a33b4
+EBUILD pykka-1.2.1.ebuild 595 BLAKE2B 0fc8d1842541d9312706a94207afdfcf0313223d54a9f0f5d3e71d682a2525c864236f453e4c8c53a7d2fe20decd51ced67760d7f247f8316dd5a29097851926 SHA512 b718331c5473b9734f4613529e9cef6ec5425b17e0a1efcb4dc5d44aa67110ca3ccbfe4d013a032083cec86628a2ac7567038485942c36151ef74129544a4e43
 MISC metadata.xml 359 BLAKE2B e2f0a68605f91ad6a1239f96c9f7e9fe16a4bc822b2c9996989a3924e0e075d40ef9cf82ec0e6fc1957207e1a6a780b2f885f494357da4bed58a80cf80422fc5 SHA512 ee8b1752f919c781167279d93af37133f06610833603c9c837e84c4f24cf6fa4be66af29097eb738d827a38416d9dd373bc248c6669ef2e5d042162bce0d8f89
diff --git a/dev-python/pykka/pykka-1.2.1.ebuild b/dev-python/pykka/pykka-1.2.1.ebuild
index ff425b35f2d5..13ddfa3a12b7 100644
--- a/dev-python/pykka/pykka-1.2.1.ebuild
+++ b/dev-python/pykka/pykka-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=(python{2_7,3_{5,6}})
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 4b44d4e740fc..cd6906ffa0b8 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,7 +1,7 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
 DIST pykwalify-1.5.2.tar.gz 42965 BLAKE2B a4c0479e12975e3b603c9293bbce04564415c07ffad88b54784aa6e723465c097f50a732bf2925833f80fc5e6c86cdd39b72ebd76f4b1ba118e9e2991e2dc2ae SHA512 1ec425f4a755dfd6e94b7e6ed098b49919e4d0de46c984e73c6452370ecb8898dc00cc383b01b27153b0d5e12dd6f5d1df4f6324e1e4f9413ed7a4d1565c5d50
 DIST pykwalify-1.7.0.tar.gz 69402 BLAKE2B ad2ecafad8457509a5517917cd3bbb078a244a9ef96e5560efc4f6b0c4a3939df7f20a9e3e72e43be97edb8af6315d49e2c2f3248aaf17d3c4f0962f60132185 SHA512 d0db48814712dc26eeac8f00ee0751a006c8b00521c9829e3c1a4ecedd6083194e9e28da1ed3c13eaff30d9b5c3dd1dbb499ba8864251400e34c23911110d848
-EBUILD pykwalify-1.5.2.ebuild 821 BLAKE2B f7a82f5ee03f82d7c6aed4640816cbddc48e77c63a3a05b1aa332e93257e38532731d8e1eaefeddf7cff4725ac7a64648f47cfc6f0bce2923fc295f758ee5583 SHA512 0756b34302ebc5dec5abe00d66e1122fd22a6a4399b32fc4bcdfb32b60600c1879ec13490e05770d1f699507310d8ee99beb7f5bce447407ee7c3dca31b99acd
-EBUILD pykwalify-1.7.0.ebuild 926 BLAKE2B 19a5c0f7aed8514c5af28e196ea2f9733d5bb3a7449f521e8eccfb8fe12418173aaf0055ffea092c435f46b57b27cdf3be6d1efe712d217d83490682d01af060 SHA512 65392ecec25092160a853a179588f279393bba6350aead0f27750091cad571a7b2904015fbfa1fafbe47da07c42d09545260ae57c745ef1aaa3a00e4e82d637a
-EBUILD pykwalify-9999.ebuild 914 BLAKE2B 48fb80d03660fd2fb609faccee450964f6cdb0c30aa5cfe851ea511001d64c11656964ec4130ec91510820128f4570e72d3241fe31f446b4c2091377c2810c4a SHA512 2308a2a0850cecee5333c8e83694551928039e96a18a0ecf874df86dd39a3db5b5f17080c69e27ac1f19fac64a99c7fdc1e8ff6b4795353646d4d2d8c5c02cf9
+EBUILD pykwalify-1.5.2.ebuild 811 BLAKE2B 88575f06a248979cb8cba12c28accd992c8a6948592d2b93f9c7546d6590b06719fbf19231f702edba08e96d4291b451cffe6c86e12603a044d6e19c035a5726 SHA512 7f0882cb9e7cccfaa836e3acc3b925bbf1f99bad8a463685adb500c86d1e3c45cefbb894d4f6e84f7f63e9480a00e9ae0536a63bbc489278ed0960b9a865cce8
+EBUILD pykwalify-1.7.0.ebuild 916 BLAKE2B dd88f1b8333c744882d95f0be29d07e90b15210adbdd1a7770e1abf9041cdcdae0d4a695853f738d73502c018927e17721aa88f52d682cec58493366ee94c875 SHA512 216b1fdc10acd80a3956aaee3b922a1563926a16f059397fe05ee9b96e7f8793141526e21b273ac78e892f36e4a0d9bb8938d0bdb8c8639dd91d7146c853b312
+EBUILD pykwalify-9999.ebuild 904 BLAKE2B 1ce13b42c7ffb139fdb8e280f24f0a6cee25d092d361f5cde11ae6b3bb049103dc5905dfb96da49b39105fc543c2c263c55e5ba47de7e257479f0bb1c610d8e8 SHA512 acad7084d3a4302d1a75d03f3c985551fb8c067453a3c147e644c4b8e5175457e193f34c8b23d031abdcf0a9432628a0bdbe6b4c665fddb83cba468d7ea0d3bc
 MISC metadata.xml 369 BLAKE2B 8c31d9164a8a1c9210a56c2f7f7a604f2fa2bd4bd7de3047420074af8a19a63f12ec18f4d5c436aa28533ea9d7e15307ab99c114cb8a0aeea419ec1d185ea7f0 SHA512 a99ea380231e9e3537bc693c2bb1ffa6bc250ec086f88bfa19a7c7a8df04d21be8dad752535f8e89eee4fa989b79c38e998946a44dbd9bae64def2cd2e858913
diff --git a/dev-python/pykwalify/pykwalify-1.5.2.ebuild b/dev-python/pykwalify/pykwalify-1.5.2.ebuild
index 73e2d2dad1b2..5afa8ea89c6b 100644
--- a/dev-python/pykwalify/pykwalify-1.5.2.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pykwalify/pykwalify-1.7.0.ebuild b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
index f78bed72ab1c..c7744c23108c 100644
--- a/dev-python/pykwalify/pykwalify-1.7.0.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pykwalify/pykwalify-9999.ebuild b/dev-python/pykwalify/pykwalify-9999.ebuild
index 43d6c6d24949..8e7d7e6f6bfb 100644
--- a/dev-python/pykwalify/pykwalify-9999.ebuild
+++ b/dev-python/pykwalify/pykwalify-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index d02ee70613bf..39a9fca6849f 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,3 +1,3 @@
 DIST pylama-7.6.5.tar.gz 33680 BLAKE2B a80d976a6a5e7903f3e4aa6b36777b6a938d52980232d1858bbd602d277bce4b058f8ad404e6dc6692e6950ff36d8e698ff0e3afa44c06334a6bdbe728f15cdd SHA512 0ce2438622cdb3e85fb70d4246cdcc29940181dce82a1a641f6b7900a13f09cba0f871038992019a2e1ccc720dcd6dd5e21786bd8a2df40479a34c500a80fab4
-EBUILD pylama-7.6.5.ebuild 999 BLAKE2B f7fa24e0921f48d75ea85a06e03b968f4b5fb8bfad3b60df44618e594725278a9d80e655b0920361eb135085ab09494740ae01ad6167b8d63fb47622ec567fea SHA512 25e425b5072bdb19a055434ba80334a283d9d44853189b0d711d40b7a54ab6b77be53bdade5ebce669996477d0081dca110e90eaee520257543c82e6ecbcc9bc
+EBUILD pylama-7.6.5.ebuild 995 BLAKE2B 5f046b5a4fc1cd149cc4b64f87991062ba3f6344c10be51e10461e3661348ec9a706bfc676436a6d849997d1a54fb40fcdf2b68840887492ee01753b58d0f483 SHA512 ad4c7b3890e1222276bb18944bccbdb72cf66c3ca65dc19169342ade2bf4257a78aaac43e1146cace28411691218700f9c055bae35a92a820396c1079087f7a8
 MISC metadata.xml 364 BLAKE2B e25838a0c27434d26117da6629070f6a3af99f5e48bd572812b2dadc979b99d551c3857bc4fa5ef23f7c9f53e16ed8bd2c5b91f1a1cd624047abd292e5fe5399 SHA512 add19bb038ff79b28e6af0aabeb1cd634214a38892533c3a5e4ca2c1ac9761e758dace11d47a276b449f9e895d74829b5532b7566c1b152e6e3b3dab625f36b9
diff --git a/dev-python/pylama/pylama-7.6.5.ebuild b/dev-python/pylama/pylama-7.6.5.ebuild
index 6b5d0decb02c..1dd232b80f8a 100644
--- a/dev-python/pylama/pylama-7.6.5.ebuild
+++ b/dev-python/pylama/pylama-7.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 03d9226fc711..83b7ac5d6d80 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,3 @@
 DIST pylast-1.9.0.tar.gz 42584 BLAKE2B b479fe5b780f6dbd30f20c0e183205ffe87703f26fe8ff04170c7f906705bfe737e965c2a7ebc562943c96a8f9bf7710e84999656d1ff22820254e4f4573f0e2 SHA512 ff3929583d88466738c9a1e964676652717c9f5bd4631f1a0a7855903e77cd394a612b0e2e8fc2f698ac84a34a135f4e940ff7760c2c88bf388ae56fc9c3da65
-EBUILD pylast-1.9.0.ebuild 608 BLAKE2B e52e0bf0c4f141f3e07f4268683d356045514c0b126c7495565261f591770afaad0a1741ab5b00d68d0eaa8d325a30ad67d5eb21ef13423e7a9056fdb9be1467 SHA512 1558264657f5fb3d090f04e9aa10816de1becc9f0fb9438a67fe4776dc13348cba7506a46b6258cc3fe4b76514e91148de58fb36459169cadb687c2db485a5ff
+EBUILD pylast-1.9.0.ebuild 601 BLAKE2B cfc5c3b25a62a2ed1842ebd0f0b62047d75b4c9b2b94b1dc2ecbaa6488a89f34f12a6d584b32d6b7dc037daded5acb184f294a563da0a00b7cf5a636c74eba1b SHA512 caca82e19581396e4f666542458c79a42a536ae3d97cb12fbe082fbc57ff96e7a99ac86ae99e4f22f0ad114afa85ee7547ff863854a3930c8679d575cd952fd7
 MISC metadata.xml 894 BLAKE2B 95fd1131de748819af98fcb484c6db7d90d9cf78794dbd9d1d06ebe755020bb09b9ca1d1a232323f4afb409c58a85098fec00994307939ba22fd07fd5de9ea73 SHA512 c5eba42bd263c572e7c73a6df8daa3aad56407d4f26eb1560e1a2fd21fff6a4228522d2c4493481ed7e767e24818cf82b6076ff00937d4214ef25b91986f42a9
diff --git a/dev-python/pylast/pylast-1.9.0.ebuild b/dev-python/pylast/pylast-1.9.0.ebuild
index df6295a3a1a2..e253a50464de 100644
--- a/dev-python/pylast/pylast-1.9.0.ebuild
+++ b/dev-python/pylast/pylast-1.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index ed6e8178ddd1..996d3d711247 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,5 +1,5 @@
 DIST pylibacl-0.5.0.tar.gz 23886 BLAKE2B fdc447701d2856a460ad6cf5d4a31e9334cf5cda668af7d44c780bfb3320d2aa9d58e44d43d2b43b134a9fbac76d657a03f9190fd0c8ce1b6f4061da93cee56a SHA512 c12390b6a0ca73fd351b84860a9d68d74126dbcd8656916d677a39002a6e4abbac704d450b0b0118bba40987cdd11cc11ad14008de39dac8dc9ca7587ae54c46
 DIST pylibacl-v0.5.3.tar.gz 32792 BLAKE2B 005785dda2b7933ff71dd1296b1d4315a6492fc893aba56136c775f78b9aa3bd8f9d4898bbe0160fac53a306329977ddaecd073739531ba42dd0b6cc622b9eef SHA512 ea648acc3df9e1cf2fd68576b0b691a353b257d00b74fc80aa7f60089b9dbc912452ebe6b84da2930cac888b9047740530dd0e38b4d5be52c37fc6d3a29a7ce2
-EBUILD pylibacl-0.5.0-r1.ebuild 933 BLAKE2B fb47d3663c5b8edb3b824823ac983a71e0b4224107ecf041de2ebc5d0c4ec75564f974faf2f60559e7fcffb830ef09f96fa447659e851ca83a3ab47c41e6be86 SHA512 fd43dcb49950c589da994f9e496a2a144f9b9ad82b23ffa76d5fbe3baa4e6cb56f23d81b6d0e572f12cf8789bc5322ab2ca735c9f5e7c71bee11d8ae5bc7182f
-EBUILD pylibacl-0.5.3.ebuild 943 BLAKE2B 488e6f177e70e7b7e22091ecfbc347813192f423e6b1943bc68bf33106acf1baa5ca2fa9a4f288aac1364792bdeb0487e923d4d6d8dc0f1b403a8b8b173ff008 SHA512 0969e7a19d70661d83a71e33110076e0df639a53cff4395ca9bb559e7f27f08cb28c5c78f55981b5a9f98bc1dfcf25606211b0af1298896463c3d008bfdd7d92
+EBUILD pylibacl-0.5.0-r1.ebuild 929 BLAKE2B 309c70e5bbc03a3b874b179484823300feba75bf9090dbb0bfb469271d0330f85a06e39a630d0a545bde5837cb06e53f34dd5ef71c0ce51fcf821b323d7c7fdf SHA512 810c25a04429c703b42e4f159db7c7e45b6f5f96647cb89b78b0a86f8514ca171cb14ac38c059bc66202a296647962b6cbe8ace43a9246325c4aafc4e9441659
+EBUILD pylibacl-0.5.3.ebuild 941 BLAKE2B 480436134dc2450b3eae79e7afdc8f9e793516dd0dfd5f5893273f7efcbc666adbbc90d119bfd6c4a6bdf4ddf5d83c93422ee6d1d61038011d49d4d9fd4b1e72 SHA512 548ebed97d2808e6f577de2aab686dcead9f367000971fbb2dae7fc6d2593bd8e83e881c13276e6fe3651ea514a6dd1ee347b5e0d0fd17561e61e9774889624c
 MISC metadata.xml 445 BLAKE2B 01fa6d3dbb4f640a84c7cde4fc2c0c2691345fde557c7d26af9b5aaf5f64ee281a9c50eb273471ef3ec1a4c7cdfd8b48bccfdf3e50804f88981353a7a5433ce8 SHA512 b5fd28a88149cc0afb3535daa5c5e8f67f137e98c0671595a381d9d748212ed93a3226339b4999c7cfce1779fa6fa0cf568f38610ef77fed685e62dff9f9a344
diff --git a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
index b54fe75ab940..87a70f1d5b56 100644
--- a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylibacl/pylibacl-0.5.3.ebuild b/dev-python/pylibacl/pylibacl-0.5.3.ebuild
index 623d3c0f5deb..1a57be2ea0dd 100644
--- a/dev-python/pylibacl/pylibacl-0.5.3.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index 7325b8b8fd7d..85c8425f395d 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,6 +1,6 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
 DIST pylibmc-1.5.1.tar.gz 69525 BLAKE2B 5039ad7d99a5ca57bd6cf7f00c77cc8bba122fe5852de164df34a71b4f5d1e4fcb428e749a66d384691b74f30b99e000f5cb9cd6479af2fc324d885b0fa59aa7 SHA512 efc40fae9721a6be589f87b66109132d4656725f718e1d63d7d25b9b27790b7c00fc3c7e4e47235895b7127cebc64229ddb284d23d0d903d3a510da7e1ce4549
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
-EBUILD pylibmc-1.5.1-r1.ebuild 1386 BLAKE2B a78d6dff1153fa91d85a8dfdca6260a2de047666875bf058677fa90901b66375e55a7940ae563da2699d5176b4c5f4b6589046e00eed67ff1ff9283d2d4861e7 SHA512 551ca4602b3ea65f5025f1e05c82572b3051dc2647b4304309d37c844c24c6cee421e3a8953fd60d150d7ae93b1efaaf5d65bc31475fa192c4460792998c821d
-EBUILD pylibmc-1.6.1-r1.ebuild 1980 BLAKE2B 3452c492e8605dc174db2a8b62d1a37849d0bc591cf2f3765904d56c132bede39b6ef3278c4f2ca832bab9a16aa1288fd2f37237404a7f728c88973e5b1bfed8 SHA512 dabbc91ccc9193d164c762b2a012aa5e296b28313262009b46bb70e59d0b6ebd0e6ee544265029975a24c805bc70e95f081841454ab4901393ca26eca190b7a7
+EBUILD pylibmc-1.5.1-r1.ebuild 1382 BLAKE2B 21583c85b025654e1a73ba9f4570e6a0c410ca9f71efa2bada619f92bfac3a4bfef60f5909fdc28c7993047170c1fc5f20ed775d3a4465b5bd55762bc2640e9b SHA512 44bb73a2c7b520879ecc492ac8f7da83482b9888fdf280055c60cf8e0a86054de5d702799440b3cf1f4714838579a0cc5010737e9f81a7340795f982f72b20db
+EBUILD pylibmc-1.6.1-r1.ebuild 1976 BLAKE2B 79301413bd22a709220b73cc8a2f67b4651d7e59f2c7c3ed0d2a3f2df1923c6e871cd8d202a6a35f9f7b0fe3b6d770832abce86df43f96d764a6910ce20737e4 SHA512 04d1bad43c50996bfd87ad22c4d921ecc6353c039aaf9337d36ec30938e6909c1481d4a2ad23544df243736a3c4850244e28c711eb0822569f0a476f1f21b94f
 MISC metadata.xml 366 BLAKE2B 5dcc369c40a052fcc6ff72c6f8fc46ffc8334c1a91e3f2e8ba8f9bf0bea7414d91833e5627f3d53b10e9d3d9f230b0af333929820a616433ff9d439cae888d2d SHA512 974f19bd4dd8043c07fa0001072e25b553aa82f4b9e9c00e579cb88e8819a4411a04b2e59cace18e0a8e2ce7395057e520b0bc78435865c4536b3de2e402265d
diff --git a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
index 7c3faf97d7e7..c5c3088a455f 100644
--- a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index 374710126548..0e0fadaef8a7 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ 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_{5,6,7}} )
+DOCS_PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 RDEPEND=">=dev-libs/libmemcached-0.32"
 # Older sphinx versions fail to compile the doc
diff --git a/dev-python/pylibpcap/Manifest b/dev-python/pylibpcap/Manifest
deleted file mode 100644
index dfcb6b5e0eea..000000000000
--- a/dev-python/pylibpcap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pylibpcap-0.6.4.tar.gz 49517 BLAKE2B 84d9e351e6669956c1fc776bacb74a9d88c19a61123d65e617bb7bf6d1ddda654c502dba82a3be94856026dd27ddcbb0cdd94d93c3a96c96eb65e149bf2a24a0 SHA512 5db891bc044065ea72fb24f800adcdc1c80280a95a169f241a926b65ecff9b2cddc8cca1f2210bdd3fa01f4bc358a696eab93438d49b2eea10a22b6afc4ca468
-EBUILD pylibpcap-0.6.4-r1.ebuild 538 BLAKE2B 10231f42d0197c9f0c03965be2c5d20696818fcb00000d02ac6df9de61798452a94e5d3f7f3f860027af99ef4062ac5075141e8c9a736295ee42d2fb0b53e537 SHA512 99121f340ecf98e25cb5abc3a4b97a5976d5abe4f92e915ce09733aceffa01e18a4caef76b08b65ce856ed0bc2eaf8c37376fe4831222360db530c6a986a8b70
-MISC metadata.xml 319 BLAKE2B fd23c7cd4934c4f31413493e8fe63f768bf0a39f05be2b4bf785a2d4949a621be436f6ffbdbeb5195a090dd72e23989e90e640e5bba06d91cb246afe000613cd SHA512 d2d7a2ee304ff8207df767701e491a502e9005a5561656149f10a3b022de36a6dea470e4f9531a44da4e97b6734dcd2d3ab9458cdcbc125f19e3be3a8c1bac75
diff --git a/dev-python/pylibpcap/metadata.xml b/dev-python/pylibpcap/metadata.xml
deleted file mode 100644
index 5b3b19d3c47f..000000000000
--- a/dev-python/pylibpcap/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="sourceforge">pylibpcap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pylibpcap/pylibpcap-0.6.4-r1.ebuild b/dev-python/pylibpcap/pylibpcap-0.6.4-r1.ebuild
deleted file mode 100644
index 598903de0bd9..000000000000
--- a/dev-python/pylibpcap/pylibpcap-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,24 +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="Python interface to libpcap"
-HOMEPAGE="https://sourceforge.net/projects/pylibpcap/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 x86"
-IUSE="examples"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 9f8bf2186e6b..d583b7442f95 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -3,7 +3,7 @@ AUX pylint-2.3.1-sphinx-theme.patch 537 BLAKE2B 62f83fdaa8c1ec45f8ef7b03e7aafd85
 DIST pylint-1.6.5.tar.gz 465578 BLAKE2B 05412a528878633ef7529dd2f2d2d1989bc9406666626d62764f476bbc024e34fea06883fae829fe6617ebfffde54dfa5600c140b9a25e6c9633f48d76f5c331 SHA512 2fac352dc752b37f1ce4f7fefe5afbbc880d7e6c38f164d1c50734716af1dd6fe31f7d41e145a8256837d5a63b1989efec40c169fc14840cf8eb4e18d9bb2410
 DIST pylint-1.8.4.tar.gz 512582 BLAKE2B 623e224ec71756cc2528346ac62b8e58ac4d5ef55d9e31e667d5389aa5b2dad712f60c7e90df5c831f57bf28e0ccbd00ddece4ade46410c28b67adb1a041a85f SHA512 07e55ed3f09326e1973215046e3b172f6065a7ed0ae657cba7a6825a26bb103bdbf8b83126bafd99f332fe0eec3547bcd6e618d6e9f612ddcf9c504bb850dcd9
 DIST pylint-2.3.1.tar.gz 577767 BLAKE2B 2af206a9d9be04f369c2bbc39c5ddb80c29a5a39c20d75bfec84498882eab628a7cf5abcc5786933304ed99bd00ffa142b9a58abab348c947799f962b877bb30 SHA512 924d8adc95f04ba750b3b44fe79ac569151ea7c8f693cc9867bcda3878209ebc2202931702b98f80709d161d3781b6e181aea0ded35a3323c023497e2a749ea9
-EBUILD pylint-1.6.5-r1.ebuild 1799 BLAKE2B ff78bbf82455322649ef9d4aae6305af6964443ed2507106f32f74dccd4ee84d8cf741f38135a421943a8ba66c3829860b2b7c1b64f1312c3b4c124a59362883 SHA512 9d3ddb77ecd9978253eb51bedb7d3028c69c6bf90ef8a22991b7417ccf5994145b58e71ec075a61e6319d4c9991926f0cce0a5433e8ed79ebe8072f0766cbfe5
-EBUILD pylint-1.8.4.ebuild 2474 BLAKE2B b9a7a1d24ec5ee6b8344c5f083efb5b7a80c55cf17a9a683b22220deb6581a2752e4f404c3580c06d9fd03d443774ae87b68dd84c1cac4c2daf2e904179fa544 SHA512 285f1689c606b368024a16f15725be95194bbcfd42a1e2531c18de826a7fae27af1fe54bd6971ee017e3a298142867701eb48b6638ef6132c9add0ef694f5571
-EBUILD pylint-2.3.1.ebuild 1651 BLAKE2B 0493c6772bcc013e5146591b041acbde19a3041b6ff40c17598da8264d21d2c135b3d5e48c4e056a505393c88828abce8e69f24982f8fb5a7d919070d6507593 SHA512 50e1016c9732c1b10c5bdefa14adbe7f04bd75eb4f656c05b21b2e04cd9ca484c4d920450b60a231e9a392e8c295816bcb56d353a6f31f3c012dd0bb2f50ce9e
+EBUILD pylint-1.6.5-r1.ebuild 1790 BLAKE2B 47754e5feebe1ec200269230c463fb4ad4df6fe7d9de8e3c9ff493f63c7e8c3e0964019cc31228fff1a0392d2a298e9f64c6790bc48002de13788e2be9b17df9 SHA512 ed478141eb00508d1c83ed7aac059288634cdff5ef6661430ea4b85c1385d4bce5b5bc740947eeb7d4917234b5f57dc3da726ecdcfc46f6ebdd4b484ab6becb2
+EBUILD pylint-1.8.4.ebuild 2467 BLAKE2B 1e55ff2939fe5185d4e8deb20acb31143de82a8350d9e39fcf1b091ab2a47dd57d40c617551ad6c67587490f2ac9ac7179ed03ceb92544e55a97e91e3b9c94cd SHA512 7e72496d0c6efe4731945a91f48477a02c8367ea314f370f41a5ea14eb619f4966f973929fe3ee79ae0b8967a11715470312e19b5b1675e197434ef00a648b15
+EBUILD pylint-2.3.1.ebuild 1649 BLAKE2B ef78c010054846cad6281e86a3acc9629469d22a58df635986dc82b101c07f349ddc19ae340ced07d7568285d2bff05eafcb246b8877df434a551600a6255b35 SHA512 564c255faa76b208c363b38c69f0e4a29733bf4784e3f62eda9eb54e4222afb5f38c0bd5e3f824216782d3e7659d0ed6e48817aa7508def98d57d13f5d7b650a
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/pylint-1.6.5-r1.ebuild b/dev-python/pylint/pylint-1.6.5-r1.ebuild
index 67a3f9d99bac..b5e847516951 100644
--- a/dev-python/pylint/pylint-1.6.5-r1.ebuild
+++ b/dev-python/pylint/pylint-1.6.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils
diff --git a/dev-python/pylint/pylint-1.8.4.ebuild b/dev-python/pylint/pylint-1.8.4.ebuild
index f2a293bb404e..1283cbb5b941 100644
--- a/dev-python/pylint/pylint-1.8.4.ebuild
+++ b/dev-python/pylint/pylint-1.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils
diff --git a/dev-python/pylint/pylint-2.3.1.ebuild b/dev-python/pylint/pylint-2.3.1.ebuild
index 603b1a3c77aa..34de30378fe9 100644
--- a/dev-python/pylint/pylint-2.3.1.ebuild
+++ b/dev-python/pylint/pylint-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils
diff --git a/dev-python/pymad/Manifest b/dev-python/pymad/Manifest
index 7eb9375dfbbb..bf59955a2354 100644
--- a/dev-python/pymad/Manifest
+++ b/dev-python/pymad/Manifest
@@ -1,3 +1,3 @@
 DIST pymad-0.10.tar.gz 26815 BLAKE2B df694f1fcc7b2c6d0d0aa064b60d061ade2240085867b6a12b3ed63a93cbcac20ac40b3929fbf5b8d9c7b6dbc52883130d02b309ce7690addda6c78813ca2847 SHA512 68a7c93031d174ab50dfa406eec4166be2158d39c4231baee18b7d9c879692376cbf491bcd3e5747e65c496b07a40d1597532551aedcdf05d0fa46f6e185a3d8
-EBUILD pymad-0.10.ebuild 528 BLAKE2B 0d6d0c6aadaaa8408e18db0b943c26d51c133ad02021b0e02c5555bd6c7a7a0bfb1139b518a81a27c71116e7d465b9bbb65605f82d6153daa194a1e66e8f614e SHA512 113592a1350b2c6058cff2386cd4aff2e12596863f33d8acfb77efa94d280e0a2c47e13c809f496fb800a283476bb872a2a290d33dfc0f5693301fb9fc1dcc29
+EBUILD pymad-0.10.ebuild 526 BLAKE2B b9be0d925ea073b736042b876ecc4a7e5da7ba3055af2a7fbd5af1d2d028d7c9087784666f84adf8efd0b704aba7305a4f96e2d336025049202bfaa100a24b9e SHA512 89a321f19cc74744249c24baf1063fbfe8ca705d87e6d9e10a514a05a7c10c067aaf52452ef5472c40c2d4f31b8bbc4a12de7748b66388a79caddee9a73ced1b
 MISC metadata.xml 310 BLAKE2B ebccbb3d64c5b67a00075bef2ee0bf4d4be2b15c2f661516274ebe5972f0db25667945f0f2917380be74df6e50f6d09d2625f94050f4bd2c10d2df819dd711b8 SHA512 5b6c98faed99761df114172e90e2a338530e9dd9c06c447cc661cbf63c2361364ab3f9fb34790a09122d6e570e51981e7c4d2091539ad9efacff8e39e5951123
diff --git a/dev-python/pymad/pymad-0.10.ebuild b/dev-python/pymad/pymad-0.10.ebuild
index f05e37f069e7..70a673dee65a 100644
--- a/dev-python/pymad/pymad-0.10.ebuild
+++ b/dev-python/pymad/pymad-0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/dev-python/pymdstat/Manifest b/dev-python/pymdstat/Manifest
index c89254123a37..0b2045c38e65 100644
--- a/dev-python/pymdstat/Manifest
+++ b/dev-python/pymdstat/Manifest
@@ -1,3 +1,3 @@
 DIST pymdstat-0.4.2.tar.gz 5010 BLAKE2B 4fe196916809513b063144ca4097676e2c826f38bccfdcb387aabd95d6b5d471eceec1a29fc5ffb41e7019e1570e2d805bbfa10f22ec7ececcb30afd7fc1a4ed SHA512 2e3c07d59151069962e1ba601b3751b331e233fdc6bbdeb0cada69ce36a731c12bcc6447218cc0c1ae4dd63d39d2be2bc3677aba739797cc534c5e38d1c72458
-EBUILD pymdstat-0.4.2.ebuild 612 BLAKE2B 5577ba9837621e49d99e0b905cca474e05525e5ff591302e28f7c45c08e4565962e5567a962de2f9e02ed3740f3c7ffa88fe484d1ab81912fbde0d99184cbf34 SHA512 ec7438e22ad5a18b4a97c3fc63310daff70c154773fa87227d874276067219fc3a7e6068f79bc2b71e304e49be871f1c05bdc28545337d4e2f5a86bd448aa1d0
+EBUILD pymdstat-0.4.2.ebuild 597 BLAKE2B 1194d4d0af109a3b6ea64039ef3fc3f18261d9205150d77d6717a5936c94c3ba0368cccccf631b99ae914e65765d8fb2b58327e5afbbefa78d7860b53cb24c6a SHA512 0bf67e168fbbed21bf8fec932a2778c606442f44ad67089c560969c1008d57ef1d393cdb1fc36f51da8ab9621d1cf66b9af81355da128cd480dc6e9720d561ac
 MISC metadata.xml 511 BLAKE2B 764b07013ad9a90442a60051d2cd17184b5058b24d1dfe08f0eac50102822e13cb38941e52b1f2a330682ab62d3b0f2983120b8985f0efc86e7dbc051d569f85 SHA512 54862557fb9d9ec32f94086ba8df5dfb5f4e4e804f1ea280157418b46ff9ecdedee8b3e333ec2643b8a09d54c769d010514789c3bc75fa28c75623b732a088ac
diff --git a/dev-python/pymdstat/pymdstat-0.4.2.ebuild b/dev-python/pymdstat/pymdstat-0.4.2.ebuild
index 63d86fccc41e..aea52cd31c37 100644
--- a/dev-python/pymdstat/pymdstat-0.4.2.ebuild
+++ b/dev-python/pymdstat/pymdstat-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index f10d357c1da3..87e2ea208667 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,5 +1,5 @@
 DIST pymediainfo-4.0.tar.gz 432284 BLAKE2B 1159f48f28f0a3473327830e56a27fcd14dc9d9dceeac6f90d52a048229d87e97d3b88ef865eefe454c8cebf55148981b2e88127e863682e00992d56c2906048 SHA512 988f0d8a212bc5893925bd96a5b41a1a2c8e9508c747e7aa1106f3a065ad5707a7ed9de71264d74ba6637a2b8efbdeeed3677d779167bb90f643d40f81c5a74e
 DIST pymediainfo-4.1.tar.gz 432848 BLAKE2B e4bac2b43ee7c6ecb978bb08eb5c7070f458b7a00607c0a1d68a5e74d4f6393d7bb44d7e3471a4ab83bc45e19e4f3ab6b7779c28c16845c27a4895d76fa34d64 SHA512 08ffca0c3179aa6dff5b3007faaec1f1a2f372b2995824039021f41b2c772a2a13370c1dbd37d2408d023be497cff71dd6f46b09c8989f168976d75723cd7722
-EBUILD pymediainfo-4.0.ebuild 1079 BLAKE2B b40ee689ca8832255547e14137db21b6ee88849f846c908ca4775ce98d1ad552c7d39f3c3833abffa82fe313203206924dc5b8a1874707a9cee5309a27235c07 SHA512 3f2d82b6a8d848ecf6eb21f5f9c7bed33d1380d5b33641a9f001fcc7bafbd5b57d018d7d427abc09242488375b39c78688f1fa45924e5c603fac9573ab12be95
-EBUILD pymediainfo-4.1.ebuild 1079 BLAKE2B b40ee689ca8832255547e14137db21b6ee88849f846c908ca4775ce98d1ad552c7d39f3c3833abffa82fe313203206924dc5b8a1874707a9cee5309a27235c07 SHA512 3f2d82b6a8d848ecf6eb21f5f9c7bed33d1380d5b33641a9f001fcc7bafbd5b57d018d7d427abc09242488375b39c78688f1fa45924e5c603fac9573ab12be95
+EBUILD pymediainfo-4.0.ebuild 1068 BLAKE2B 6825b82ea1f443d0e8f189c59fa1961c45b8983ec22e7c63d43101b014ef49a0ffa24f600dae7fc4bfaae42b738fbc7fd9e36c31179dfa3674001896017be445 SHA512 559b5519b73dc1319d7f288d26aed009a573846e56f6511c8d8f885cccc3fd2b145098d095e223ee180aabe92e74d7d2c84c282d81abdf538e75ca0d3fc18ccb
+EBUILD pymediainfo-4.1.ebuild 1068 BLAKE2B 6825b82ea1f443d0e8f189c59fa1961c45b8983ec22e7c63d43101b014ef49a0ffa24f600dae7fc4bfaae42b738fbc7fd9e36c31179dfa3674001896017be445 SHA512 559b5519b73dc1319d7f288d26aed009a573846e56f6511c8d8f885cccc3fd2b145098d095e223ee180aabe92e74d7d2c84c282d81abdf538e75ca0d3fc18ccb
 MISC metadata.xml 441 BLAKE2B 6dcb65038010218beb340daaab820392fa857e77a417aa8957f678983f0b56fbb878c508790f9c7f33b6acd8eeaab2320c7b0ca2d2533e112ccb984f9ec7d3c0 SHA512 a5052eb10a6672d924cd1a09505d2eccb26187cc11a16b2ab30dcf7e1ebf1e59e12e10f5b35426eebbe9c74a74611b25ea70464e661e9abaf22fee3ed361fea3
diff --git a/dev-python/pymediainfo/pymediainfo-4.0.ebuild b/dev-python/pymediainfo/pymediainfo-4.0.ebuild
index f2324113671e..d65479d3514f 100644
--- a/dev-python/pymediainfo/pymediainfo-4.0.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pymediainfo/pymediainfo-4.1.ebuild b/dev-python/pymediainfo/pymediainfo-4.1.ebuild
index f2324113671e..d65479d3514f 100644
--- a/dev-python/pymediainfo/pymediainfo-4.1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index 341ad31fbdca..c1e555ab5a3e 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1,6 +1,3 @@
-AUX setup_pymetar-0.21.patch 418 BLAKE2B ef71d8e8ae4084123f41021131dd547e458a500d01c4e7bc5d8547ef25bcca7672a25a4310317ec4311defc9980704a12284eea9a0171f1dab5ebe1f15f9fe6f SHA512 d7fa72eda9798512bdf1e3464123a4b0934a4b04ebb6e954048a0763e7ac7d20cbbbd2f0734a735b7032d9a58167b640f7355bfa3fc986d52dbefe9635e2154d
-DIST pymetar-0.21.tar.gz 22714 BLAKE2B ef6f5cdd6eab0ee7d006ea00c7ad154435afeef596d25d9465151912963d01aa683524fb5f873d3568f1ff9ac0f3370b67c7d1be244734ef456137b6d9b6b6ce SHA512 6c9e9e7906fe6fb327c667408d04992ca898d0d6037fe1bce08bc15ded59bcda670094da99e84b553c06c8cf991f33c6b3b7b41a9fbd47ba4c48dd4db1d8a2c0
 DIST pymetar-1.1.tar.gz 3162533 BLAKE2B 43cc79a0c8b27f7146a0f89d4271830ace0bd25790e8df006c19205419eabec88b90645d473019951b21952ee67df25261f6eea8c2d58de95e13186ab4bce214 SHA512 3e830065d3201373695c381f45969e7b532d69de8218cb32e107ed72235cd7cff8051e129c6ae4761154ed9d3fca81c530938520d6a54e7bf467cf28ebf9de02
-EBUILD pymetar-0.21.ebuild 547 BLAKE2B 5e2fae6b76c83c76ae6551f60a7742a03a4e9a3ff6487f1704a958f49f0dff0b7cecdd4cabc247f1cbb3dbbd2789d1d9afcb5eb27ac6d01e61981e86c2b4b101 SHA512 19c59c5769ecfd1562e109add1ffc09494488d103bbc7adf04b004632034f231ec9d93909d65a06881904e5d7eda445dd68590fd23c18bcdfdf50845bc67b70d
-EBUILD pymetar-1.1.ebuild 471 BLAKE2B cfb3ccdc4cef9ad73cb38e97afc6436d6c82081ed3374b3ea73cde7bd5a883b6fd083c37998388bf32f514255d86906be5a20cc59af837d6031f34198d718e73 SHA512 15484b9365f01fcf14b0fd24773bb7349d48a227cd3f68b1d9c60093cf1abd1a523c3114df6c1f036a28163d1bf5ebf5bd74e34cdf9062fe6d1403251928c15a
+EBUILD pymetar-1.1.ebuild 455 BLAKE2B 47c12905586b40d0b64c99833c97c68324cb23a6df9f668d14d77974618b2b5acda310be00a866a2028ac337aac5b55c8baf273830655093e721036cca75182e SHA512 1ff7be4fa29048200ee47b30f2a6c222e6308e6018a85e176c4efbafd5b2ded9de59b3b62edf3dbccbe1455cde0461f9512d04507614ce2ef747d89be83ccb5e
 MISC metadata.xml 959 BLAKE2B d9fc6e95f4c432c64667a617894a8e86e0c69801fb73d1a2d4dfbfcc490f84e32f97c3b2ff425eb30d30769b799d79f39863e4bf6dbc4cb848c03025a34d40d1 SHA512 de0134cfbc608c80cccfd3029faf769fa6e8fae8c3df9ed2bb7afb6231f6d68c68a6bc97fd690987b552aa026c40358e3dbd70d8a8df2633f4c6368ca7651143
diff --git a/dev-python/pymetar/files/setup_pymetar-0.21.patch b/dev-python/pymetar/files/setup_pymetar-0.21.patch
deleted file mode 100644
index 6b96d26add6a..000000000000
--- a/dev-python/pymetar/files/setup_pymetar-0.21.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py.orig	2016-08-24 16:21:38.558828272 +0200
-+++ setup.py	2016-08-24 16:22:16.619289653 +0200
-@@ -27,6 +27,6 @@
-       py_modules=["pymetar"],
-       scripts=["bin/pymetar"],
-       data_files=[("share/doc/pymetar-%s" % pymetar.__version__,
--                   ['README', 'COPYING', 'THANKS', 'librarydoc.txt']),
-+                   ['README']),
-                   ("share/man/man1", ['pymetar.1'])]
-       )
diff --git a/dev-python/pymetar/pymetar-0.21.ebuild b/dev-python/pymetar/pymetar-0.21.ebuild
deleted file mode 100644
index 9370c8024127..000000000000
--- a/dev-python/pymetar/pymetar-0.21.ebuild
+++ /dev/null
@@ -1,22 +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="Downloads, decodes and provides access to the weather report for a given station ID"
-HOMEPAGE="http://www.schwarzvogel.de/software-pymetar.shtml"
-SRC_URI="http://www.schwarzvogel.de/pkgs/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="librarydoc.txt"
-
-PATCHES=( "${FILESDIR}"/setup_pymetar-0.21.patch )
diff --git a/dev-python/pymetar/pymetar-1.1.ebuild b/dev-python/pymetar/pymetar-1.1.ebuild
index 0e20724ba188..5bfbb5db6653 100644
--- a/dev-python/pymetar/pymetar-1.1.ebuild
+++ b/dev-python/pymetar/pymetar-1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymilter/Manifest b/dev-python/pymilter/Manifest
index 92a83ed8f9ce..f4acdb2f7600 100644
--- a/dev-python/pymilter/Manifest
+++ b/dev-python/pymilter/Manifest
@@ -1,3 +1,3 @@
 DIST pymilter-1.0.4.tar.gz 1023222 BLAKE2B 1e5ce42af76ae1ac2f7cda87d40bdce404ed7e9fce9e88909572ec065f05e2c9effc8bc62d4fad113753ff7dc7e87c790515a9116615191745097cb2c3390042 SHA512 b356a10ffc0ba0172cdb228e4e15034e67c0fd82b4b8bbe1193e54e45e518626fd647033d824f2cd5a9d456154c528027726977d3ad2f2c2fe0e0155ad50d294
-EBUILD pymilter-1.0.4-r1.ebuild 567 BLAKE2B 6d71f2e22aaf824e2d393219ba517316a300b7ad176b26092da0c0f48abd4e21d7ffdc074e1ec14f3d5d0645f8d477d4b7bc22fab752289e9469dbe3c65300e9 SHA512 25eca55b7b96f10a5e331a4d0bbad228c0d9fdd933aca9562ed800ef9f7f096207e2b429e63d211fd35ce6c155c60990983531647afc8c0842a5b9fc9f1f1566
+EBUILD pymilter-1.0.4-r1.ebuild 555 BLAKE2B a2f50ff93af91c0b596abda5c7f7a07a6f77cc0315670860b07b65448077341557ecf6f946dc3d6c727c6d9711a83fc676e485750ebeb229f0a2aa0bd6c50d02 SHA512 b4cce6d41334ef3605a03fc50d2d1de5ffa4e95ac5d6201bcd800dcba2c6aabc79a7f7642a8dae2f6200b87ff7ce572856eb12d9c90721c060b3dfda67eec5e8
 MISC metadata.xml 745 BLAKE2B 20fb9f28930e8252bcbf5e678a4c53bdbdaf2dd0ae2d06a1ecabb993c1f172fb462419377b5a44d57d2e71a15b41676beee93c371a6b58642b5db02dbed868d2 SHA512 03a63f23eea33c7ea8d0de9b121b7edea4dc96199cc390a5488085865ed41272d7e599ff3f5043cdfe7582c3ed0dab7afb3d2bc6b173620390a118a282f5e800
diff --git a/dev-python/pymilter/pymilter-1.0.4-r1.ebuild b/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
index 67a6c24beae2..ab1081c7100a 100644
--- a/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
+++ b/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyminuit/Manifest b/dev-python/pyminuit/Manifest
index 666f52d9ac40..80a1ab6d640a 100644
--- a/dev-python/pyminuit/Manifest
+++ b/dev-python/pyminuit/Manifest
@@ -1,4 +1,4 @@
 DIST Minuit-1_7_9-patch1.tar.gz 430753 BLAKE2B 19c19177a19aa4af27e3feac9df7c526e6536a7e4fad45c94b83b5080e2286e26949bdd5055da298156c3468aced288b5e38d989d00cf93a07d7ad15f111da65 SHA512 741ded2e6e999e8edf1e067ce9c2583784f6c1a7e34709430074d1f312de3a5815249466fe0a1c5be0a2f77932f34cbdb4bd1eb9de1b3528223711f26cbc65b9
 DIST pyminuit-1.2.1.tgz 17099 BLAKE2B 9cefc9e59896d82cb7efd39085ab117a57b874bdae9ecc43fa2011b3148538fc3eeca0f086fae0d7b00cc654ff14edd9d63649ea71be35a795236bbe96c0e2a1 SHA512 b5bd954288d57a6c043e336ddb62a42cd4e6cc340847fbd700573db288c4404ef80a86a76b3c4e458913cd73b08ea97b20a4e411043a6ce826d9d88ee54fbe1f
-EBUILD pyminuit-1.2.1-r1.ebuild 825 BLAKE2B 494fdbf9bfbffd7efbdaf4efd7861e3348a292935128c3834acbff3780d7eac97b04faaa3c9cf204fcd2a25daba7b447572740936b810c2f8ab84cc442327f75 SHA512 6297eb0dbd2e6245f57025c373ef182376905f8c7bac0b3e58df3d47c6cfba8fbadb5f136026496da783346571e454d9b534f4b2d70b1c633ead43f3e6dbdbd1
+EBUILD pyminuit-1.2.1-r1.ebuild 821 BLAKE2B f786645a16195e77819824f762187f9a9eac06193d312ab02c6bbd4fbabf967d26fddfb06422aff77d9986131e94898b8183252cc9d95cfe32f9d3032ab57b0d SHA512 84f77dd75479cceec474a654d72b20e57340f97b306e512be1bf9a92f39e13195b42ad37a75f5deef95779fb7a3ef7865b5d455f711aa914ebb50a21e11fe4e3
 MISC metadata.xml 333 BLAKE2B fc246f42c3d2c2579bf2f1680c6189e76073224392758419b47399bcf44a12770203750edfebc77ee6ed45f3b76b6842a65aa59df0f2e610d9f8380db7c1206d SHA512 46169e56ebe63dbd8f7234dd06f9bd7b36f2325ca5c145207b638fde9805bb2d9361f070599aaabe69ed127df3ac419fefd6b10a98e9efe03afcd72aba2eab2d
diff --git a/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild
index 51eafea936d2..53450d42c7c4 100644
--- a/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild
+++ b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyml/Manifest b/dev-python/pyml/Manifest
deleted file mode 100644
index 15ba64c412e8..000000000000
--- a/dev-python/pyml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyML-0.7.13.3.tar.gz 5896911 BLAKE2B 740ee900fe2feb5105ae5f892c5def74881c45863e06dd3f17b9ef0c4b7052c42a3b854aa808dcbe2129c7ecef1bb956982853f5071abf288564c07ca7b29628 SHA512 9933be07122e6fc7ece017b28fbc895cd2ef2778d8d5144c7f084ddd2090e054e37a581341371450fd7c28713ed4c725e229a81daad571150f476945750a51ae
-EBUILD pyml-0.7.13.3.ebuild 840 BLAKE2B 66b942d26db7a410cdab0f7dbe0991ccf288b545be946aa33137b1079aedddf051e3203d27e695845af45ed6555a205d4a1a80a1f97d172fdb14734edd5baf40 SHA512 2ad21004ed4defb3c61ff63fa5430ef47c1d044b0097787234473c8a811274e4314cfbe3e85e75041977ce3e56f2cfeaca02be3874f47e4129fb34cc0756fedb
-MISC metadata.xml 498 BLAKE2B f5dbaca4fbaa5296de8dcdf0eac3e995b1a21d7b64b660ba093237b8912a4d0cb4f56753680f53f42ccef6b22f29622ceaadd1dc71241ed220a7c15fffbb8c69 SHA512 d549cc55fc1415a6bc7df6f078d279a9ede673f74b8bfe1867627a40d205ac91e343dae803a6b154e6fccdd11d788c78b76a87fc04dd32043f192992778a91ec
diff --git a/dev-python/pyml/metadata.xml b/dev-python/pyml/metadata.xml
deleted file mode 100644
index 16161c4accf0..000000000000
--- a/dev-python/pyml/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		PyML is a flexible Python framework for using various classification
-		methods including Support Vector Machines (SVM).
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">pyml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyml/pyml-0.7.13.3.ebuild b/dev-python/pyml/pyml-0.7.13.3.ebuild
deleted file mode 100644
index 5c72d12d6990..000000000000
--- a/dev-python/pyml/pyml-0.7.13.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MYP=PyML-${PV}
-
-DESCRIPTION="Python machine learning package"
-HOMEPAGE="http://pyml.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MYP}"
-
-python_test() {
-	pushd data >/dev/null || die
-		"${EPYTHON}" -c "from PyML.demo import pyml_test; pyml_test.test('svm')" || die "tests failed"
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc doc/tutorial.pdf
-		HTML_DOCS=( doc/autodoc/. )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymoc/Manifest b/dev-python/pymoc/Manifest
deleted file mode 100644
index bf14f9686946..000000000000
--- a/dev-python/pymoc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pymoc-0.5.0.tar.gz 33843 BLAKE2B 928b32a2982fa6faafbed04476bc3af444ae0e8617bad323f21d89bac8c6a21a8b24d721fb0502a0d5034e1eeaa67972666508e3fc2ad210c44e9a1c291a192b SHA512 cb327bed6fffa6eb4354c06f9b7e056baa9df1010d722b4fade6873fb862c4b27ea0a11647a510ce4007f7b8158e13eee7e146258d4c58ecee82adddf33bf89c
-EBUILD pymoc-0.5.0.ebuild 671 BLAKE2B b66b91942f5435181cfb21d0a17e3d7f519b12532fe67b74b94c6c82823055c524aa69a39b08fc708a84e98a9cdc8fe4a164aa80a6ac7d304614124d625c4edd SHA512 e67c035d4819ab44c98f643f47553c5ab2397ebc1d59754a42be599c2734dc51455f5d8a5e2d7a9843ef1bafa28310b60a1eaef8b6e710e8adc2185ebaa80f03
-MISC metadata.xml 1614 BLAKE2B 7cda82792a959395b3bc869efb67b836743b59412da5ad915c8752991a2fe116dd6c5ff5fdc26e7b53a590c95ecf677bb8994bef9484f91ce55a0b9a0a56de1a SHA512 5ea8168faa544523fe9f5ddc20e978ba09005fb94e6ac9ca5dbabb50c14fbd9bd3485e9a46960414cb791e9b761b8a9d88990dcbcbb78758b59a178f8ce96622
diff --git a/dev-python/pymoc/metadata.xml b/dev-python/pymoc/metadata.xml
deleted file mode 100644
index 0539850fc0b0..000000000000
--- a/dev-python/pymoc/metadata.xml
+++ /dev/null
@@ -1,32 +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-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    Frequently astronomical survey catalogues or images are sparse and
-    cover only a small part of the sky.  In a Multi-Order Coverage map
-    the extent of data in a particular dataset is cached as a
-    pre-calculated mask image.  The hierarchical nature enables fast
-    boolean operations in image space, without needing to perform complex
-    geometrical calculations.  Services such as VizieR generally offer the
-    MOC masks, allowing a faster experience in graphical applications
-    such as Aladin, or for researchers quickly needing to locate which
-    datasets may contain overlapping coverage.
-
-    The MOC mask image itself is tessellated and stored in NASA HealPix
-    format, encoded inside a FITS image container.  Using the HealPix
-    (Hierarchical Equal Area isoLatitude Pixelization) tessellation
-    method ensures that more precision (pixels) in the mask are available
-    when describing complex shapes such as approximating survey or
-    polygon edges, while only needing to store a single big cell/pixel
-    when an coverage is either completely inside, or outside of the mask.
-    Catalogues can be rendered on the mask as circles.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">pymoc</remote-id>
-    <remote-id type="github">grahambell/pymoc</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pymoc/pymoc-0.5.0.ebuild b/dev-python/pymoc/pymoc-0.5.0.ebuild
deleted file mode 100644
index 817be44e4c31..000000000000
--- a/dev-python/pymoc/pymoc-0.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Python Multi-Order Coverage maps for Virtual Observatory"
-HOMEPAGE="https://pymoc.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/healpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	PYTHONPATH=lib "${PYTHON}" -m unittest discover -s test || die
-}
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 94c640453c9b..cd33ac231784 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -3,9 +3,9 @@ DIST pymongo-3.5.1.tar.gz 1332463 BLAKE2B d581409a4b6cdede3e126e31747d34ed0e2389
 DIST pymongo-3.7.1.tar.gz 723014 BLAKE2B fd0be64f01006405f30e8d96e5edc0d565a8b67ec057a27b6143b4dd0592e2302efea65b6e3d4898d12e196b1efe01787aa608d8564573a83bfd193c703ba0c4 SHA512 34f7448c90a0741d1c80e5924d53e70d5c4bf74d140ea50cef1a519e11b7429dc8551ddb868ec4c02351da6619924ae0d4f7bfc12ef4fa9635c81e2f69aea30f
 DIST pymongo-3.7.2.tar.gz 628611 BLAKE2B 4eac5f11c8cd9a1bf8e0553a1fc3ec8f0a4bec0fd6b04dd75fe85da7315baa0e81a3c2b2aa4eba351aa4206aae974bce263f0630ac8828d8a982c4902cf7f518 SHA512 4d1dfe03d94f381f27cfb5c8dd4f75ecbab90567fdc4dd594b880031e68825eda6285c8b261a4c9d76fb7ccc92c91e27ae2f696525f7732b1f0084794042a33d
 DIST pymongo-3.9.0.tar.gz 701117 BLAKE2B c13b53f06fa1788f65de46b6a05474355e312a1cdd7798610b300c1a7bb9964d32243da52a4dad61d5b50e736c717f5549f61b28c06e1024505bdd3ec04ab99a SHA512 3ac8831ffd82c27bfbf8429a38fe26aed177ba68b89d0ddf043adfde326b8c01eea9be449bb985421f42677fab4dd5ab44e1c1c9eeb3aff41d792c660fe23e0b
-EBUILD pymongo-3.4.0.ebuild 2805 BLAKE2B f5535a901eeba5c185a1f13e6721df8e140f75ba6a12a4f0887cf0b07b67ebda1f241434af8706c781dc35902cd83cd387635377c7322fe1633477551d5127f4 SHA512 13fd2fb565ee9277386a5b0866f5401fa73b027a050eb6f2900b0b0b0004b9a2407a2469c3b0571dfbdb0c9bc7ec6a03d7dee5b75e0ed8899a525415754a84b7
-EBUILD pymongo-3.5.1.ebuild 2812 BLAKE2B af2b2f25c66a38ac6a381f703202aa7e02cb6cd117e3ebe688f93d8e316e02ec5f559a2bc8785de9fb0e3af0095777fafd2b940b11f7c37939e7a7ff13b80717 SHA512 8cdcccb0383aedffde36e9d303b7d01dc5b3978fe5dabf62c540157404f1bf3ac7ecba865529aa4a6f1c9e06cb86760c0dfb66310296e8a8d591d52bd7646658
-EBUILD pymongo-3.7.1.ebuild 2814 BLAKE2B 834dff1c33fbfd7078d7a294c28956114dad191986ea5e94cfb948d13f5f16e4ec110557d26634b694a091dbc189d4e1c1e6283578d820d0687cb135a8f5c751 SHA512 e799d39cc92a18ab59f7408634213586f8aa427e16d63f4bd89ee24e7643259c35f08ac29d84033769049aa4d79efe81c85aead55d7cabe7c2c5a0390497e0eb
-EBUILD pymongo-3.7.2.ebuild 2815 BLAKE2B c9d4983773b3cd75d2b8ef09e7d8fd87bf24f9fceaa7abc9b9291b24f787b758f63ebfd0df626e079ddcc5dcda8a95462e0e79b7e144086badf81cfd5ddc7382 SHA512 604e2296e59cc94911248c01a20a0a3e50cade9f1dd90139132b516dc1b86a5977551d868559ab048badf18c2eb4d09fcdf5648e2323b66417ad0490bec14608
-EBUILD pymongo-3.9.0.ebuild 2800 BLAKE2B 4faf95fd1764abc41f9b5875fe01cd44336030a72767da42dc01f05247cb281f142589cc759324ea4eec48a7a1e33386dcb2c2b2a4d406b07478f06f6dcaf3fd SHA512 d61fe777c5f2fdf775589fc72ae184acb3c9734029a87a20b9014b8c88dd8ffbace733a814055c125b17b0dd623a4ee218e4a96c69b79c2e591230d9431a987b
+EBUILD pymongo-3.4.0.ebuild 2795 BLAKE2B 43856dfce31ef4cf7d50f2e6d3bc2fd09597679f71eab8c6b04edd3812a020cbb04c5395765162403df2e95b3ef4d97db2d4da0be194b24d9e6f923461c37b56 SHA512 c14ad372bf065907d3733dc79adf708fcf67dbcbcfbcb368f12fbec26b8986d323f8e0b48983653a8a83469faafa601aa5ebf13dd409bafd77ada3eaf5504a2e
+EBUILD pymongo-3.5.1.ebuild 2802 BLAKE2B 019b1b0629975ae5ec2a7db5602390eb27d88c95d94e9c063728a79713d77014c1bf6f78878bffd3eba0a6b09b8bddada4d67d5532577fe98c94e7673b97a305 SHA512 a8e98e1f12ae28d0a1d7e5f9fc1fa04aea17b55a0de7d8d4e878564ecba12f61aeec4103e7d4006fa18c9b548df14ec3fe589edbbfef00258ab0b4b64d85db49
+EBUILD pymongo-3.7.1.ebuild 2804 BLAKE2B f30723d00d37aa15e2c090315d81a6d20b547728e6ea5fffc747dfc1e839d478c6686dc17a5688d0e394255f485e110e9d9e6bcb95575efde450afd87a0dfd8e SHA512 44560233da8d029a10003de7fdbdc23e7d556ec8db1fe93b384710be5613a9d7197c2cc072214d30f27d47d1b801ea2cf9106be778c8dfb2072c9fbd75bd43f5
+EBUILD pymongo-3.7.2.ebuild 2807 BLAKE2B 4ef10a1fcef666f4e2c84aab7fd2d0743d712f1177f2eff066ce3d21a595dbc5ab40c0c08638b4ac2ca71063d8e52baecc9f68cb4bf85671c896d0898da1ce4f SHA512 6666344b1d8b46d1cfd931261412d024b45f1d656f273bea290457fedf1f8b114c8bfb55928a899eae16f50483a8238e0cac85e54089991f209bf0e8000e821b
+EBUILD pymongo-3.9.0.ebuild 2792 BLAKE2B 46c1e090416fa9468beb2fe35e95932220ab6fd5860c35846908d873c33e3e25ef42c9112b90e486b5cea7d5a712645940f3e1ac1aad0503fa4f28882309ec93 SHA512 09fd9faf3f1afa70968519ec5b53d96594e8000ec615078103eab1544a0000fd18edaf4ebeab8a7b5345b6298cc7e1c66c8216000ec04eefcdcaacdf21fe7fb9
 MISC metadata.xml 672 BLAKE2B 48cf6ce2f03ec2865a99fd033455a1b0a53cf9e55240ab6e993483929a6dd93661afcea7fa255095b66536f0a8cc05b5c4e6a12bd044547a5cf190559a9e480f SHA512 89b8a3551a5b0bd495bc98ac2f9324daeb3f3d81d0f6b991e5537e02c7b369201f9692be5acbe228ddcd3581002a39ac777ea5fc136957e9ccb9683f205e38ea
diff --git a/dev-python/pymongo/pymongo-3.4.0.ebuild b/dev-python/pymongo/pymongo-3.4.0.ebuild
index a6cd9e3f4b03..370d58e2bb4f 100644
--- a/dev-python/pymongo/pymongo-3.4.0.ebuild
+++ b/dev-python/pymongo/pymongo-3.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit check-reqs distutils-r1
 
@@ -107,7 +107,7 @@ python_test() {
 	fi
 	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-	mongod --dbpath "${dbpath}" --shutdown || die
+	mongod --dbpath "${dbpath}" --shutdown || die
 
 	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
diff --git a/dev-python/pymongo/pymongo-3.5.1.ebuild b/dev-python/pymongo/pymongo-3.5.1.ebuild
index 2f6db2a8ea24..9d451611d6c1 100644
--- a/dev-python/pymongo/pymongo-3.5.1.ebuild
+++ b/dev-python/pymongo/pymongo-3.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit check-reqs distutils-r1
 
@@ -107,7 +107,7 @@ python_test() {
 	fi
 	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-	mongod --dbpath "${dbpath}" --shutdown || die
+	mongod --dbpath "${dbpath}" --shutdown || die
 
 	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
diff --git a/dev-python/pymongo/pymongo-3.7.1.ebuild b/dev-python/pymongo/pymongo-3.7.1.ebuild
index 452b6175db7d..15d6079ea086 100644
--- a/dev-python/pymongo/pymongo-3.7.1.ebuild
+++ b/dev-python/pymongo/pymongo-3.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit check-reqs distutils-r1
 
@@ -107,7 +107,7 @@ python_test() {
 	fi
 	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-	mongod --dbpath "${dbpath}" --shutdown || die
+	mongod --dbpath "${dbpath}" --shutdown || die
 
 	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
diff --git a/dev-python/pymongo/pymongo-3.7.2.ebuild b/dev-python/pymongo/pymongo-3.7.2.ebuild
index 084913914e55..b3549a7429a7 100644
--- a/dev-python/pymongo/pymongo-3.7.2.ebuild
+++ b/dev-python/pymongo/pymongo-3.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit check-reqs distutils-r1
 
@@ -106,7 +106,7 @@ python_test() {
 	fi
 	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-	mongod --dbpath "${dbpath}" --shutdown || die
+	mongod --dbpath "${dbpath}" --shutdown || die
 
 	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
diff --git a/dev-python/pymongo/pymongo-3.9.0.ebuild b/dev-python/pymongo/pymongo-3.9.0.ebuild
index f94fa7bf9545..29e70f7e045a 100644
--- a/dev-python/pymongo/pymongo-3.9.0.ebuild
+++ b/dev-python/pymongo/pymongo-3.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit check-reqs distutils-r1
 
@@ -106,7 +106,7 @@ python_test() {
 	fi
 	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-	mongod --dbpath "${dbpath}" --shutdown || die
+	mongod --dbpath "${dbpath}" --shutdown || die
 
 	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index f5834ce16f53..866392bb3fe9 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,4 +1,4 @@
 DIST pymountboot-0.2.2.tar.bz2 4098 BLAKE2B bbfbe631313189e6aef684ff29e73fcf2dcbbb998528103afe9c89e517e5a6c13bf6e05ced7c2eb05f668e0cc269212618b648043b65fb95da2e1b46c37476ac SHA512 bb6ec0772300b2edf9864a09ff64f67ad99f0cd29b009793e1b2a590be48146640c927b5772023d27e68fc2fba51652a55ab66d1cf875dd9b4134f043ac353c9
-EBUILD pymountboot-0.2.2.ebuild 615 BLAKE2B de114273c672574651df116cafa1326d9fa0ac3457d1ffbd117cf48e9727165ce04b69685f06db0cb53b6ff565e6b62a22367ba5c0458402e5e7e67378d4bf86 SHA512 3a7b02f50498c5a84cef10d7dfb0c972ff78091a9233f6e2f973e9985f0c949acd3a4790efad411dbbe96437699d7874cd72a62341ede465aa0163b2c295f751
-EBUILD pymountboot-9999.ebuild 572 BLAKE2B 540d38ffa2197a7f6a57bea60978beab6549a0d7d7571cfe0abe94fde3d8896e0500ba442ae56baa2a1ca4e6202c0f2d82caaf35bad39203b27538045d5b8bae SHA512 fdea9fd0052c1bb658babd110dae4fac8188f12aa310b036ce04c52c40b7bb1aeef660ac4dcdd54b00a079d1e6e198ef82601bf43bd5063eaf5625c85ac0a7f9
+EBUILD pymountboot-0.2.2.ebuild 606 BLAKE2B 54dad3dfa05af53df9a2d5c6c70810ed7af085afc69199105cba8fd58f7a7ecb68454e25228031d4e7e812e68247b427a40df612e740c93d69b563fb9246f6bb SHA512 84adb0f10115caa9aa690e0a9dcbb9068c4ccc33a55395c9624eec9abdef957b1640e827dadaddca9fa2bef2804f45549803cab7408891b04c6093b798fd6bb1
+EBUILD pymountboot-9999.ebuild 563 BLAKE2B f648052d9d7cee9a1598d6697de4411073df868800d94df3918977167bcdc9f71dbed182eb51caa84e07394bbd8d6fd3c2e14542ee988a8cd5bf2129c46428ec SHA512 73a99f2a5d2388e8a3a7a2749a69a842ef1bb56e814dc45ca1850bfb9d6a654306caa839760bc78a405e5a3faead904d6e19050a08b6ba33ea6d6fa680b4835d
 MISC metadata.xml 533 BLAKE2B 682a500aa018e96494eebe8a43af1bdd269fc0a0e049b2b022d014bd8e977fe8160202263d5d6ed5fb5022551ceee3b77ca92f58cdd272faa00141995afccfb4 SHA512 b0708a5c130422d6d5150f1a1d07386ea3494fa667acc4e05f41550d6c33e7334b559fd0b3e71bdce67b53e109ccdcba4e845ad10a0fd39b6505b8ce8b27d17c
diff --git a/dev-python/pymountboot/pymountboot-0.2.2.ebuild b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
index 8260ec0bb9dd..f1eb6e1e10ee 100644
--- a/dev-python/pymountboot/pymountboot-0.2.2.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymountboot/pymountboot-9999.ebuild b/dev-python/pymountboot/pymountboot-9999.ebuild
index 7c94b1e3d222..a2d798cbd2f2 100644
--- a/dev-python/pymountboot/pymountboot-9999.ebuild
+++ b/dev-python/pymountboot/pymountboot-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/pympler/Manifest b/dev-python/pympler/Manifest
index 3f6e9b51713f..916b2ffcf742 100644
--- a/dev-python/pympler/Manifest
+++ b/dev-python/pympler/Manifest
@@ -1,5 +1,5 @@
 DIST pympler-0.5.tar.gz 263627 BLAKE2B 5ce881664e2d57d1a7a9b87238cfc6657fd35a140e6ab906b55ca6e0ac91fc8a74377d4db21706708c55773f8ca65d3578c101669ba409339418e09ca53d0fb2 SHA512 254b758df70bafe57f315a973de0caeef6cd616bd0cc7b4475c74c3a9a94f52b3ac3da3f073483db3560cd0060536c95ed1297007c24dfe8db89fd893ff1409c
 DIST pympler-0.6.tar.gz 267267 BLAKE2B 84a8df3177d0defed949869bec9342beb4336c912be5539c597388207abcbc53fa5218da34b16a872dca804ff559a448dc092b4d33396d570164311c1808765a SHA512 891822ce0a76377d74aa99dd2ce8b21a364084f0bc03ab6d6fe505597a0e182dde459b218dff8e0e6a753e1d88ba9f01b3a4b97be31a20e73a93d6c6fee66e1b
-EBUILD pympler-0.5.ebuild 1052 BLAKE2B 5a702e59a73bb83c5af01aaf38a0e130cd3bf53a1f88d4eabdda1f4ba249c97c460f86d0f6f23d26d60b0891953242b12b64184b8b4b54e2cbd2db2fcf117192 SHA512 35c403653a3ad81da8429624a04018e2d4b668eb9f656525cbe71c05a5528fe370703476e5d49bf5ca666c8c22d53c91414d011982c27b2a9c98772fdd61386f
-EBUILD pympler-0.6.ebuild 1062 BLAKE2B 30a4ffe92bd2e631cf0bf2e97aa83d559c43564af8257305a529a4300e950f43ae667c70c700f6224662ddf7c9206b31f3d8dfa2b1fe4dd5f96250500c638d3c SHA512 e3f34cc44f39b3e66dac23b2e2eac0c903865579cead136b7d92716cf7aa9374a0ca051751de248306ae2fe4d6aeb85692457522017ac5a1ab4833a161063ddd
+EBUILD pympler-0.5.ebuild 1038 BLAKE2B cdcfec3799b0e3c8d9b4b18b56ced52cade40e92882d14b8a593247f8aa2dacdea4641d93555c41ee06496d32412daa6f88c8f5c5ed83f775620b6c777c0c84f SHA512 8e36a8752053a8feea708bed09bd91fbd6a640224f1559d31b3bd5a9c7d9b0e9792b4cc56c51b38befe0c780b1abec41640ff650d774c22a358db0ee91877630
+EBUILD pympler-0.6.ebuild 1050 BLAKE2B e14e974e0e9ddcbc384220c7798be9defc66c3b8d8fdf2a5905a905f907422a2df69fd1d0e36203cd55e380ba01a707133d3fa41ae6eed0c053d0ece96bd65d7 SHA512 f4e1dce7f5db262c792a5e4cdf4f53c1fd2765af1c09f52e8e186fcbb804fd0371745ce70829ab13737dae9da115f3c91cb927f8d308c872e1032a462e3941f5
 MISC metadata.xml 775 BLAKE2B bb415e7f09dec344f5f97fac36d3659c0670de5230a628515f26b1b9177883b6d99bed0ad2992af116f6b800a9f73aac3f436a6480a57c6ea5565e01f56c95b5 SHA512 e97ef9decf71b8f941e1fb54fee0aef66dee9c3e722f590d1d08f87dc20ba709713089c91891f0c686d69053321894fd6c8e6de690154f193e2bb72a5d879d41
diff --git a/dev-python/pympler/pympler-0.5.ebuild b/dev-python/pympler/pympler-0.5.ebuild
index bbef3e882bc9..1258d7361c91 100644
--- a/dev-python/pympler/pympler-0.5.ebuild
+++ b/dev-python/pympler/pympler-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pympler/pympler-0.6.ebuild b/dev-python/pympler/pympler-0.6.ebuild
index a8516170806d..bca3a99b9557 100644
--- a/dev-python/pympler/pympler-0.6.ebuild
+++ b/dev-python/pympler/pympler-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index 03410d83e69c..9fd8fdfe2418 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -2,6 +2,6 @@ AUX pymssql-2.1.3-DBVERSION_80.patch 451 BLAKE2B e9ab70a24db87e2f69eb502c491746e
 AUX pymssql-2.1.3-remove-setuptools_git.patch 243 BLAKE2B 51f598a199867a6278518a0d204a3bfffcba662e22377d0b927e404a420a32a771a56ab23c99b8fa819b216e95efd8efdb8f61955da1ed79e64c84cb6b6634d1 SHA512 e8a24dfd4e4c6320ef854592d890a8e34870884ac05e0e60a52bd4e05f5eb7fbac86311da98d1ba8be2a55233788e070f7dfc529570c1cefe25471abbd22fa20
 DIST pymssql-1.0.2.tar.gz 175469 BLAKE2B a88c04be044478c2bec76a15e05ff751b961d253ca2e071ee8293c0899e091f96206a87486333f2543de609c7b38ff9e8a1a4ba7686625489bb9ed5c56e3cf19 SHA512 6e9a2d26f2cc33bac093f2a2a41771aa41ba336413076c793137558c05e48cea7409f74f35530939b36a708cc47c66ec0dc765a768bd5f857642553568fe859e
 DIST pymssql-2.1.3.tar.gz 897987 BLAKE2B e105dd8d5dbbad5de566b9179f799ad66eb420f60464e8061470b1abb6ecf38f35ad7992ded40f2cd62c76a8e04255eb647e30df5c9bc4059334a1d5d4677e73 SHA512 a659cb8f077ddbe5e8de0b9b118d8bcc0c87128c0be4ff14343983e7029594e63ba6fb8a88992dc1f058df3c1ebbbd69cf371bf95a0918954cd0cec14c1cb5cb
-EBUILD pymssql-1.0.2-r1.ebuild 627 BLAKE2B 033a138c490f0373131cecd00a81f4ac042c5ea437af90e42d391b44b7a8d93436fff830a2e0759bcad174f1d2b5bf024f5f3935cfb0aacfa47503cff86d056e SHA512 0cad3e6d596fb53a39be2560569fcca399d2fc26e171996d1882883823a219ce547f851c6883610b34b65dac90d89e2131b9b7b667ea1093f62668d500b45232
-EBUILD pymssql-2.1.3.ebuild 1105 BLAKE2B faf508613dfe959006d9a206c50c46a5db9619eb72e5619b7d6630413de40517427bfe2a6d6cca90960a4cd77bfd9a6e1f6b526a3c28420e429dca9241362e52 SHA512 8dd849c3b0ae835a401e670603e40809046a81cc67d243cb8d8c7c51d9d7c06ed7ad5be3ed74587fb3211a855229d46b23764869953ffcd5393d4f01038c7163
+EBUILD pymssql-1.0.2-r1.ebuild 619 BLAKE2B 87be9f35236e57593f6d93407f5e5438824c7cdb396eaf095550dd1c961d6c042bd809c49ca4d95ff514b6b93c893a45679ffada389b7ec3d542ec4e82950fb8 SHA512 e6aa8a42772b4f9fc8bc14b302c21aeef42861bf7f78da5d69ded961b0fc915e6564da3c37ed0220c6e3ced1b9ab54dbf3c21b0e700fcd3b215ccdc39efc345a
+EBUILD pymssql-2.1.3.ebuild 1100 BLAKE2B 83155cc6d314510cfbd2067c1105717eff8c98e7eaca52ff01e29e537bb7d9f700df94876ab96b00a4c6731d831f66ce9361c8584ce086fb98f5ff693d944386 SHA512 673761d77b09c328412ac457e97784ae160eecd73ff4e568f5c83bac8d460aa13a99f9071e2f71471bd0b0a0cb62817e2bd56a5d1e005c4e1ec98bc17f55d20b
 MISC metadata.xml 396 BLAKE2B bc47cebbbeecb1c410ad5ffba2ebd275b9463e73f984ed9bac84720e3993365aca52a7b32a010c61a7e4e98e14b17aa3fdccf74692e327717fd1113ce087e263 SHA512 dea6de0ceb2f3661fad588992687c8bcda6204b731756390ad5d1a0f2ca2bcee77075e72b80f72a31ce681b57aafd830ffe984279cd8cfc96f520c04aa2e0eed
diff --git a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
index ab32f3830d34..cd1de058e1ec 100644
--- a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
+++ b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pymssql/pymssql-2.1.3.ebuild b/dev-python/pymssql/pymssql-2.1.3.ebuild
index 2f0c0f3a690d..5abf79744be0 100644
--- a/dev-python/pymssql/pymssql-2.1.3.ebuild
+++ b/dev-python/pymssql/pymssql-2.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymtp/Manifest b/dev-python/pymtp/Manifest
index d630edcc99ba..a3612aa65c81 100644
--- a/dev-python/pymtp/Manifest
+++ b/dev-python/pymtp/Manifest
@@ -1,3 +1,3 @@
 DIST pymtp_0.0.6.orig.tar.gz 22431 BLAKE2B 11f8b83e79af42906a33fca8dc6752c67994b635aafb926769a2271fd1411b7d5e5e9daf1f81783fc219e3044b8ca239dfb180076b7d2e64b3152b3540be3880 SHA512 f50249c6b2acfe2c86da5e5f8a24e1392d47e0ddd02d10891763a3150f9985ecdb8a0b7c7ce8bc36f53f2bf62073a26dd3a72b6c3f95d59cd447bb55684811b0
-EBUILD pymtp-0.0.6.ebuild 658 BLAKE2B 1027e3e55d6b23e426d3570f16df4ea9d50229fd0e942ab5966df61dd8fc080fd41581f749539c42dcc1b1c34da3d110ca5bba57a3cd8e5c0a268b24f4ff911d SHA512 7d2e714c04095dbb90064632d74feac6ef77b1f323f156744090f5be07fd964c1a1e6dcdd6dbb5cf62a442802aef7eed412d04e8780052a0dc56f4e675fcbbe9
+EBUILD pymtp-0.0.6.ebuild 654 BLAKE2B 1ffeeeb86ba4577e6d6180a29ad36621cd265c3ab52195d2b7cfb6accfe7947715a097bcfe121bad434ea057169b3b9ecbdccbf85389cf8114af60f17f6f50ff SHA512 c7c2d9f3e51ba2bb5b23b161f2130b3c96a68779a38a8436b6f651f0567e582bfab84aa4a45df23c6150f4feeea43125e72c0f95cdf34aa7b64155fbdd31b95f
 MISC metadata.xml 446 BLAKE2B 8ad671cc6eb45f9e3b944b7d5b7b2fe2634fbd98775622b4375038094700eda07d8233710ab304a74fc84bb2a64a44f97ccffea19e4e1cfa8f050f63fc2e19c7 SHA512 f6bdc3515407187d158c02ddf793cc5798025d6fab0d20e912ab12f877a1a5ed7b27534b9dfcd8630cc37fea56513818020dcbadb687e92743b85d9102c36e76
diff --git a/dev-python/pymtp/pymtp-0.0.6.ebuild b/dev-python/pymtp/pymtp-0.0.6.ebuild
index a9e108e25863..68a0ac427adc 100644
--- a/dev-python/pymtp/pymtp-0.0.6.ebuild
+++ b/dev-python/pymtp/pymtp-0.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 42d997a6f14e..20b689056d6b 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,11 +1,3 @@
-DIST pymysql-0.7.11.tar.gz 82213 BLAKE2B 45ef3b4c8f4d9a9d3cb5b706f68a52b860bc21298b9fb7d983ea3fc6910c5a53e9e963a712735f93588501ff7297a2f10a74b44965eab4554a554a4a9f0e2b0e SHA512 b83fbbf77fad8e775ba48cf56f32deb61d2d54d64bd1f83e097c61d87b33a881787125c839b78f18b413722299c24a8a14dc9b36f5df7ff7f9c6ea56b2597150
-DIST pymysql-0.8.0.tar.gz 82975 BLAKE2B c1345ff6d266d5a3670d8bb1d7d7becad218ed294ab912f3f28e49163851e2e36fc1bb5a13a5d0f62ba753d264f736a6a87e11d290cc4fd604714fe1d4f9569d SHA512 41597d3955a35283656b5cbc137b0cb63eb48658dc61f0ba1fc0c207bad07472896e557b2996e52fbc2646163bce69e7d2fed81349355e72368cf395f51e2916
-DIST pymysql-0.8.1.tar.gz 83887 BLAKE2B 0181970d714d45db644636b57105bba1ea8d8d3ded537555ab1ae5afdc0cad308dbdfe6a67c50905ba1a2ea8cd5302bac8f997f64f0b6874436e4b90a3ea8a78 SHA512 0a58bb6a74281aaec5d23c4e59407ff1d7f3fd379285a21a39f14ad18008303d79aa87b99ebfe2536775f8b369875b15907ae6653d038a2d44589cf47ac0a2b9
-DIST pymysql-0.9.2.tar.gz 86913 BLAKE2B fc1cd695a75c9f52c4da231f7caae58f902002f38a39a1702f19d23b46bdb1a4753aea98d90e051ec56a5721999149a13b028e1614efdfcac23c76c8382a8d33 SHA512 110306477c167d0b497700b7b22c186c001c803800975b4b4e26e98116f47589b0a4bb7e02d502a62beed6d7dc1ae3fe8a817824c1f3a5caee0898b5f5d21734
 DIST pymysql-0.9.3.tar.gz 86715 BLAKE2B 0ed09f7f5c47bd1fae52dd9d0ff0790367962d8e4b89d3933704b8b8d838e1f48b68455a9a3916318bf3c1c1f102fa11b4e1e3401d021f8a2d6137612a4affb9 SHA512 d906b7a6612d91db7d4f7f2d85a9375477e6655c568e0d1e7281ad0263d4a78f0ac4e80263605723f99e12db04c80f51c5c8ed79ed6f209a7afeb4b45bf40648
-EBUILD pymysql-0.7.11.ebuild 686 BLAKE2B 35e2fe96c36059f1e1364a0ffee4eedba05df8da84f16f603f9bf1b7b9ddbbc52e7298449af9ad4f6693271b32372dd761e091dc8ca9d7b64882bdff78705e7a SHA512 cd3ca2c5891fc4b68ac4b08820ea7ebd3433b967feb1631a6aafc3837407f48f9c8b9cd3177b794c264979d161ecadabaf626fd7c5ff4da4994330d80013069b
-EBUILD pymysql-0.8.0.ebuild 688 BLAKE2B 4a641a543bd9bbaba90242bd032c6a6e6f303d214a9298cad25e268e1e5a804f56c7c3378d89a291ac76ce404f2daea413da62572c02eb0a15adf8f7f504a7ed SHA512 db08e96d7566ea79b33591d5493ce92786eb8e140f6c2caae974fb17ccb5bbb6d0515e2a63166df384a4561917cb7ccd1c17f016cadc6e81d969b1d16a823afd
-EBUILD pymysql-0.8.1.ebuild 688 BLAKE2B 4a641a543bd9bbaba90242bd032c6a6e6f303d214a9298cad25e268e1e5a804f56c7c3378d89a291ac76ce404f2daea413da62572c02eb0a15adf8f7f504a7ed SHA512 db08e96d7566ea79b33591d5493ce92786eb8e140f6c2caae974fb17ccb5bbb6d0515e2a63166df384a4561917cb7ccd1c17f016cadc6e81d969b1d16a823afd
-EBUILD pymysql-0.9.2.ebuild 690 BLAKE2B 0ff9760f98c27c744f7501588ab7efe74d3c168f18947af5b2d774fba8dabfa015201e309c1c12129cc861d64f308149ca53d85be6f111b6f0560602dfa933ae SHA512 0431d27769a07052f365107002f48047e141ab30a8e9f652972d5c9ab5f5d60600bdc3f01e0c23f87134e2110d5ca831a9373e34b53b8ee0c1dc82905284d87d
-EBUILD pymysql-0.9.3.ebuild 688 BLAKE2B 70463377322369298e8b8f9f2c3565d9ffa2a9e32fd687a54a3df59f11d1c889b59d250649926026cad59c1f28be8a9e2c374237d6f3892842803c3afec98498 SHA512 f6a60eac9d34233271488fd3b4e9af81e6cc9d09b256a3264b112cbc814176bbf5a83a7d6c65e0d8dd7d8686ea365d2ff53484830be68956bdaa9dbca1919fc0
+EBUILD pymysql-0.9.3.ebuild 681 BLAKE2B 905d164e9bd84eddfa30df3f306c934dbae643ff244214806b0158ee9f5d169750a6c666b156ec7aa22ebd3f1f9730e658b13a21b3568d152af61616cfb6fbf1 SHA512 a0c7797311552d6f313e5fbf74e5436781fe2e7eb67c46d7831f0755886b4fcbb5335acda0a973c289d41282cbd866a5ab69f599e3d0f01191f1af4d8423b50c
 MISC metadata.xml 553 BLAKE2B a3f93a6e059fcb457326fe8ca880b1a268be1d5d847a0bd8648156036428a5e2f6cbe47adda3e3cb220c236b4307bb0dba8ea616842437e2408407fae01c16bb SHA512 3799a369db7d62654ead99e579ea2b7f19e33c35654fb4f721e37a46f4a449d67f1173f45abf8e34b330e87a872c0182d7a47dcda97a6d2c40e78ebfab6841bd
diff --git a/dev-python/pymysql/pymysql-0.7.11.ebuild b/dev-python/pymysql/pymysql-0.7.11.ebuild
deleted file mode 100644
index 1623e4e16315..000000000000
--- a/dev-python/pymysql/pymysql-0.7.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="PyMySQL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pure-Python MySQL Driver"
-HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# While tests exist, they require an unsecure server to run without manual config file
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} runtests.py || die
-}
diff --git a/dev-python/pymysql/pymysql-0.8.0.ebuild b/dev-python/pymysql/pymysql-0.8.0.ebuild
deleted file mode 100644
index ba7c8eb2ba4d..000000000000
--- a/dev-python/pymysql/pymysql-0.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="PyMySQL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pure-Python MySQL Driver"
-HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# While tests exist, they require an unsecure server to run without manual config file
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} runtests.py || die
-}
diff --git a/dev-python/pymysql/pymysql-0.8.1.ebuild b/dev-python/pymysql/pymysql-0.8.1.ebuild
deleted file mode 100644
index ba7c8eb2ba4d..000000000000
--- a/dev-python/pymysql/pymysql-0.8.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="PyMySQL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pure-Python MySQL Driver"
-HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# While tests exist, they require an unsecure server to run without manual config file
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} runtests.py || die
-}
diff --git a/dev-python/pymysql/pymysql-0.9.2.ebuild b/dev-python/pymysql/pymysql-0.9.2.ebuild
deleted file mode 100644
index 05b290620a25..000000000000
--- a/dev-python/pymysql/pymysql-0.9.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="PyMySQL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pure-Python MySQL Driver"
-HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# While tests exist, they require an unsecure server to run without manual config file
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} runtests.py || die
-}
diff --git a/dev-python/pymysql/pymysql-0.9.3.ebuild b/dev-python/pymysql/pymysql-0.9.3.ebuild
index 8698e794d417..8a6ccbb8e501 100644
--- a/dev-python/pymysql/pymysql-0.9.3.ebuild
+++ b/dev-python/pymysql/pymysql-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 67d9aa54d34e..641e7257b86f 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,6 +1,6 @@
 AUX pynacl-1.3.0-hypothesis-4.patch 879 BLAKE2B ad16a87df5bdcad6e07afc4474a0cae6284e8cdc547405af05b1b4bae32e3c01c9ca523f3045326335536f509cb72c7014d31ccee8a3ad8b2fffd3c9cd837935 SHA512 de3bffffd0a16934ec5653c850a2d9b2075468dd0ea59c646af0c2ddfc9c4dd2994413a917e58fc67d436d2add6d111749d4979b02e4bdb6b8ff4e946e283109
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb8396fbae30dc1e16f7702a559b7ea56889d9889adfea09ac6644732fafb98e07da99e3a41392303b6a45f0b494b1 SHA512 815c31a2069cbee1091d7e0ebf0b5572875c4a537311af561b5bce0b9d8051028e367a516b46481453d9780e60e9e7e2a4640d320164059c3974b0319d1cf96d
-EBUILD pynacl-1.2.1.ebuild 1023 BLAKE2B 9b328a99ca277c449e61db37d9f51601620a480466bcc4b2934e9f222d238208aa88f37d92c7e65401560f7a923615afbca04911c18b7504e6acc47e1ec31f15 SHA512 1dc8869aaa920207c7022e95d3a2b199aaaa752e9a7ea7a9ae9455831f45cb4f3d461efe74d64f572f3781ca19e7e2c31408d9c0e695805ca8cf1b67188ec2a8
-EBUILD pynacl-1.3.0.ebuild 1110 BLAKE2B a890fdc3aa003d93cf84444275cd1eb8784d2887d867096b2d9dbc611f3f0e2d43ea03b5d3a5c5a9a346a7fbf65476226ffa703a87d047e93870dc57abcd043c SHA512 0e8ab0278aea2e05e5c1c8ec71cb0a063de1770cac7fab21d9b2c5b910bec9bfb994f08e8a064b9bf527b44661e4afa992b93686c0e102d71e917eb5cf6c8066
+EBUILD pynacl-1.2.1.ebuild 1021 BLAKE2B b44726cf87bd184004506dbb91a8c4c4f147ac78bc648239874737f85d74201ee838e1da7d65aab1bc8b8f3cf87047028498e842c7de5e24183028f0508fb89e SHA512 c1a9e110cc33ad72691ab1b3d78e51f223a8f2c613cd40c67a20d99bdbf18028c20b574eaf3895d78e1978620c030c7d6fe8a5be7cf31e69c5745c26e3906456
+EBUILD pynacl-1.3.0.ebuild 1108 BLAKE2B f7f2af37ebbaa71ca74766a08141fc937fcf9d033b25a6685d60e9895a4b57990ab017a2d43bd6ec6cd3c1969a3058c6512603069ab3532f80233233da53c2ed SHA512 70226ef5577e29403d4a706dc0ba2347cbc1c113a161c880b6ac635f6a91cde61c5ada4e7cde574cfb212a93b032c4bce2b16b195b959e8a5bde79b829632664
 MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index e588fbf094d3..9a1e768124cc 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7})
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 
 inherit distutils-r1
 
diff --git a/dev-python/pynacl/pynacl-1.3.0.ebuild b/dev-python/pynacl/pynacl-1.3.0.ebuild
index 8e14dfbea888..f2df39ae106f 100644
--- a/dev-python/pynacl/pynacl-1.3.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8})
+PYTHON_COMPAT=( python2_7 python3_{6,7,8})
 
 inherit distutils-r1
 
diff --git a/dev-python/pynag/Manifest b/dev-python/pynag/Manifest
deleted file mode 100644
index 6a577ad1cdc7..000000000000
--- a/dev-python/pynag/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pynag-0.9.1.tar.gz 219909 BLAKE2B e04d5150fdf1f5d53b6496ff532ebc4b0dcbe63eb5b2d03e7b3384d7b4ede328f3bb5d4a2d053ad3a4eb21fb62ba4df2d16b3305c090fbc50dddcb6f4a503726 SHA512 9a16dc952a4ec468c551d31c9e6d85013da51edd30548e1b8ef886ae228b509578d84e7e7045b70d11b6b1ae77969f7a92afd58a254e0554fa1ffd839a82729f
-EBUILD pynag-0.9.1.ebuild 446 BLAKE2B 9010217563360be611112ca638af46f3afea04b644d26bc7ff6e61155917399c974ab02a3693530274b58c88317e2373f3cc3dc29f5967893f5e0fc86143654a SHA512 03f2b67360eed8a977232b6b114c469e2776d2d50bc9644a7b983ea72b2b5be8e4cfb204d67f7fc14aaace5ecbb23df39558dc6d4086fb1132cfb7657a74d989
-MISC metadata.xml 483 BLAKE2B eb1b2435f7c03937f39a05c5bff0778a99ab4bb66b25a8e475905e34abc4420ad2514fdaaf06ba0f233bb693fa2c13f4280bd8c6fc69677edc85147a61deafba SHA512 ba5bd1f53b4f6fea2ffbf071519af08e50c9d433a3474d77105e72640fd6e87d0ed72ac8e80604084a0d40d3747af3e05c0581f4d9d99d5eb3c6d9e280d45e6e
diff --git a/dev-python/pynag/metadata.xml b/dev-python/pynag/metadata.xml
deleted file mode 100644
index 92c314843a2e..000000000000
--- a/dev-python/pynag/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="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">pynag/pynag</remote-id>
-    <remote-id type="pypi">pynag</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pynag/pynag-0.9.1.ebuild b/dev-python/pynag/pynag-0.9.1.ebuild
deleted file mode 100644
index 7c0e001abd1d..000000000000
--- a/dev-python/pynag/pynag-0.9.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2017 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Python modules for Nagios plugins and configuration"
-HOMEPAGE="http://pynag.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pyndex/Manifest b/dev-python/pyndex/Manifest
deleted file mode 100644
index 10115f8ade6d..000000000000
--- a/dev-python/pyndex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Pyndex-0.3.2a.tar.gz 34651 BLAKE2B daf753c6835fae417e416bfbc61c7b3801a8947fa027f4d1b252279dcd69d960b52d5487159738568aa0d1ec13c49f841b24ae9e0c0a83f64f88e03fb6108fa7 SHA512 f1ddea8cde1f1517ed1c1319cab442ace3e4c9e2a6a2174aca2f348c915c5db2c9fe4c1543f5b16770cc8364cac930a40bef9bce8f7b76c3b0d88c8639acce75
-EBUILD pyndex-0.3.2a-r1.ebuild 620 BLAKE2B a08f57cace6979ff354ab51fd0eb62028e079870597c9d7af130e0d05bafee35632da0510042473b2fe6fd296038a7cbc784d4ea5bbbadec9616ab97be8f9ea7 SHA512 137fda12cb92c415412220fcb428c8836eeec0fae1b09b2d37567643f1c5ae1bbb25a2237777dc218b1422f77351f518aea3a76a170dc1c2bbbd26d3ef9700d8
-MISC metadata.xml 395 BLAKE2B 7502e9c3a3cdb2140383584d79545dbc24e3362e3a94e14bc6942401fc0aa9dd8a23d7d48043c7d7a8f888a33519c6f6b7103b3a4e1465707ccc6eaa408c2e11 SHA512 fa248fa63d5870a6a9393c7365d24266782d8f28386abfe372f2b3c6a0c45b2117600521e494da01a18cf26e2c29e8c23bb99661a6e76ae29d3a093eced8b00e
diff --git a/dev-python/pyndex/metadata.xml b/dev-python/pyndex/metadata.xml
deleted file mode 100644
index c1b46ba6d8d0..000000000000
--- a/dev-python/pyndex/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>lordvan@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pyndex</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyndex/pyndex-0.3.2a-r1.ebuild b/dev-python/pyndex/pyndex-0.3.2a-r1.ebuild
deleted file mode 100644
index 4d6a605f6fbb..000000000000
--- a/dev-python/pyndex/pyndex-0.3.2a-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-MY_PN="Pyndex"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple and fast Python full-text indexer (aka search engine) using Metakit as its back-end"
-HOMEPAGE="https://sourceforge.net/projects/pyndex/"
-SRC_URI="mirror://sourceforge/pyndex/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-db/metakit-2.4.9.2[python]"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
diff --git a/dev-python/pynzb/Manifest b/dev-python/pynzb/Manifest
index 3a38a8594c29..9e39af72e0f7 100644
--- a/dev-python/pynzb/Manifest
+++ b/dev-python/pynzb/Manifest
@@ -1,3 +1,3 @@
 DIST pynzb-0.1.0.tar.gz 5598 BLAKE2B 1448dc4ddf429e4ec23b6e9c6afd25c4dde70e761a632534a5d6fadf326f86ecf748f7323cb32d7b0970703c9de03ab93d047fde83b83d13bc9d4b188849c7e8 SHA512 c1efb43e56c67652bc12ec555700f134b2bd32546b9dd6c0a28a043db5c8ded5758940121b84541bdb972c7c740357cbc656e233ecfb77787d77727e245b1e72
-EBUILD pynzb-0.1.0-r1.ebuild 435 BLAKE2B a24b2df44cedad949b1eeb03951c624dc126f68e2bd1d5a529a389722c5646374173c185d55af8a04513bfeab1015c7c136e35ded9c9286e46ff00b0a7bc83a0 SHA512 b6c689bcd157444605a5765cc70ec96123ad01ee401bd4e82a812e49beeeafb1e6d63457d774c2a7187b7c5e5eb4c32e8806a38a2b04f08d38f09a76fbeb39d5
+EBUILD pynzb-0.1.0-r1.ebuild 420 BLAKE2B 39f728f5b78363eff902f0b1728fc04812c9a4c3a155ad59c4e88c9548347cc9d614198d8f46be0b207a188bceef1fe717444ded53fa90491c8821ade347f9ab SHA512 f14cb167ac98b3a44108110d414d21141b16fd1fad551257cf5605e04858f1ae35b42298be7c31924e842a52d9c0221568f3ff6046bf266120dc44285762b497
 MISC metadata.xml 308 BLAKE2B 03544eebdfc4e9f3b113fcf83265f73a2c83b46b895bbb9225593929acc5c3191541394984a586d3505eb63730b5bc361d76b8df3038977c275d6eac47876b28 SHA512 1772570155906b62858ca36263c7cee30df515af31c67b8bfbdb32417329151e2723257be00b184b5dc27bab3115486f580f4c959130a783e0a938b8c2a57230
diff --git a/dev-python/pynzb/pynzb-0.1.0-r1.ebuild b/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
index 45db71e17de5..6c61911376d9 100644
--- a/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
+++ b/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Unified API for parsing NZB files"
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index fdfdbfbd04df..aa9b2cd27a53 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -2,8 +2,8 @@ DIST pyocr-0.5.3.tar.gz 18067 BLAKE2B f7e668630f0227d1e3df90de673f7c7b437f0c7ac0
 DIST pyocr-0.6.tar.gz 17826 BLAKE2B bc7239a5a9d07f55650247d0586bc0856c8f0be6aa549d2816a3703559fffc8b53aee5e23b9e5a24a2e1c655d5c605c73dbaff9fd3129fe08ffbd6f24709b07b SHA512 f517f5c9180cd1cbf0faa56f733a8b6015abb4af25647f513f95022dd72ee0ba07350475b238dff810a35677278f457dfbf9448a50b9c275fa4f1aa08f4a4c2f
 DIST pyocr-0.7.2.tar.gz 65376 BLAKE2B 065084c19c7722e590c5f20abe5248b2be0c76dab864b4a4e2c457770ff61dec84df7254f19e4926753f39a5d1ed0618ed87827b85773ab96a51e3f7798c656f SHA512 002c3302ed20e19e06dc6fd995ce30150fb95650824df9e0a3d6b2bdcb4c0ae3f2295342c2df44e0d5a9c9bbf5432f47a9d7562e4866b87738ac3436a8c0dec9
 DIST pyocr-0.7.tar.gz 67838 BLAKE2B a5bb88ca981cf2bc68344d739ce35eaa7db26cae28c581cd72a7855e67ac668ea064ff2a71845ededa640a8e9a54fc0aaba464527cc43acea5eb4edf3812bd9a SHA512 054f3190eaaafea0e2b591af2220af519d8a2fe3c623417e4b84c52faf9d98339570e896983713e9fbb54087f5eb4afe0b1d6f56e43ea894f7206a7c17203438
-EBUILD pyocr-0.5.3.ebuild 679 BLAKE2B 8c7e4136251eac927fa72d7d12aaac341d6c77568cbe7a6a95123a8ae36a5646388fcd1702ec973fca97a95212734eb0f98d1769f905971a294e78cbd5a916f3 SHA512 8dc96807a2f6402f58dafde3f55ffc1b111426439aa1a29066c3439c1b30f126decd755217f245f41ecade68f5648cd8fd32cc48dbfc918e98ce8019c3339a7e
-EBUILD pyocr-0.6.ebuild 613 BLAKE2B 9aed7132d856272c881493af267fc50d064143d0e1a58e073ec6f0830ab0d7e72b49ba88746d01c99eb5cad9ea0acd4a2bac52854a439f1063e3426b0a83bf8a SHA512 64f07c267b0a89708f8cd22f8eaafad449a9de1491413e5306644b2e8b16527c02b711182a9515be4886080b3fc107552cf25664a5f332029acdb94d9ab80ec0
-EBUILD pyocr-0.7.2.ebuild 705 BLAKE2B 6de6a3cbbbed259dd59bacffc2667686fc1899036325d5f8faee0ab66f1ef6f2e7e5b2e1c946d2cda77f8bdbdc8fafe2154456642cf8f543a6e7b12e0569175f SHA512 80859eab7f6f3efe841f69acf3bbb46b30dbe8770ca5675bd862d47524fffd7593e5a833e5b5e5ba6754ccddc87b2c63e653c10d84580c0bf64cebd1a37efd43
-EBUILD pyocr-0.7.ebuild 705 BLAKE2B 6de6a3cbbbed259dd59bacffc2667686fc1899036325d5f8faee0ab66f1ef6f2e7e5b2e1c946d2cda77f8bdbdc8fafe2154456642cf8f543a6e7b12e0569175f SHA512 80859eab7f6f3efe841f69acf3bbb46b30dbe8770ca5675bd862d47524fffd7593e5a833e5b5e5ba6754ccddc87b2c63e653c10d84580c0bf64cebd1a37efd43
+EBUILD pyocr-0.5.3.ebuild 674 BLAKE2B 2a067307f564a198d2dfaac2c0de794152ae4e15119a898ea4f300391f0b6f84beff62c58a1f3211039e8c3572f7729089f3a443c5d0691f21b487ab6ac1a0cc SHA512 5b67af6a11c882dcc3dc752b91823a7012559b041b5b1c16c3b75c09876c9ec19efaf18b90bf97fdb15643bb6cde9e778c4db079120c2aceecd6ec419a4aaec1
+EBUILD pyocr-0.6.ebuild 611 BLAKE2B fcabc4767d0b06699103395fb93ffb31a47a9e132625e8e2646d3752e1504efcdbbe6dd4255518fd0fdce0f771cc455b0a1530818bc6b7a19f9d4273034a6e5a SHA512 ecc2c4020c0c9a10b82f214723ffec8200d0358c4eb469b5e13b21e8a83592f2a7a9b0403faf70cb84fb059953dc476877901c0f3434c7de4b1672ab27c43d16
+EBUILD pyocr-0.7.2.ebuild 703 BLAKE2B b4bcbe43db888f8dbe7466ac4e88d98346d847be5535fb2fdc6da1d05966aaeea33afdc825f81e57970e9b2ab447fd2c247c657b8005f6a1ffaeb2707c5ab683 SHA512 2673f3cc01e424d8cdc6d501bb8dfd2ed9db58679a9f0063ba8663cab7ba7c8151cd46cefb07dafa68e1e31e5fa5eba6d868d88fe44c97b3fe97430f36160c98
+EBUILD pyocr-0.7.ebuild 703 BLAKE2B b4bcbe43db888f8dbe7466ac4e88d98346d847be5535fb2fdc6da1d05966aaeea33afdc825f81e57970e9b2ab447fd2c247c657b8005f6a1ffaeb2707c5ab683 SHA512 2673f3cc01e424d8cdc6d501bb8dfd2ed9db58679a9f0063ba8663cab7ba7c8151cd46cefb07dafa68e1e31e5fa5eba6d868d88fe44c97b3fe97430f36160c98
 MISC metadata.xml 1111 BLAKE2B 600c0dd7b6bd10906b03db7aa0963b440eb5cd8f2f06a4a8672e0f63960838881d735fb2268f652dcc1a4bf865fb71eef6bba888c0ee72c88d472c0184c80889 SHA512 ff3ac9646095f8434423a5fe098563c7662dc447be9ba395879d5b66dc76236898e94964cfc2f5034b2bbd08caecc3635adec65369dbb5c21ce1ae2e23fb7cbf
diff --git a/dev-python/pyocr/pyocr-0.5.3.ebuild b/dev-python/pyocr/pyocr-0.5.3.ebuild
index f08810e858da..04c7d4119fb0 100644
--- a/dev-python/pyocr/pyocr-0.5.3.ebuild
+++ b/dev-python/pyocr/pyocr-0.5.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyocr/pyocr-0.6.ebuild b/dev-python/pyocr/pyocr-0.6.ebuild
index b258a6d678ca..e04aa833ed0a 100644
--- a/dev-python/pyocr/pyocr-0.6.ebuild
+++ b/dev-python/pyocr/pyocr-0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyocr/pyocr-0.7.2.ebuild b/dev-python/pyocr/pyocr-0.7.2.ebuild
index 07ad6371df5b..5c9f5232af77 100644
--- a/dev-python/pyocr/pyocr-0.7.2.ebuild
+++ b/dev-python/pyocr/pyocr-0.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyocr/pyocr-0.7.ebuild b/dev-python/pyocr/pyocr-0.7.ebuild
index 07ad6371df5b..5c9f5232af77 100644
--- a/dev-python/pyocr/pyocr-0.7.ebuild
+++ b/dev-python/pyocr/pyocr-0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyodbc/Manifest b/dev-python/pyodbc/Manifest
index 327c9df328a5..8d313791b9d5 100644
--- a/dev-python/pyodbc/Manifest
+++ b/dev-python/pyodbc/Manifest
@@ -1,5 +1,5 @@
 DIST pyodbc-4.0.16.tar.gz 204168 BLAKE2B 6e3ee7bad91f26992264edbac9db946d0c290a7a0ea7843ad4a13cc03aaec19272f91ec611e812bf9ccf86267d04ed3e69e07ede1482f5892a29343d39f543d0 SHA512 53f80ee7333210a1e20e89aa17ca7c2b57363826ac09069213454951ae35f8de689535c05b2278783e8b4a71d178860c3e1efebf51980343a59a9b190e41dda5
 DIST pyodbc-4.0.23.tar.gz 215152 BLAKE2B 856c7222394b2a8efa4bae173189bf4753c800f1fc98c8054766243400574b3ddb4e45841892b6baf87c5f872de5c78c7a1a3d6b48c3aef9d38a68653ba14fab SHA512 1788fd1118e40449af730a99427c3188a01ec85592bc2dcc7a49fdf0d4332e27add62cfc5e6c20d635064d8ff28eb8b800621d8127e309ffcac4aba144b49049
-EBUILD pyodbc-4.0.16.ebuild 619 BLAKE2B 37e6f46545420fb2a31aa4abdf4307d87af72b83d2bc2054ad445e636663276729f86ab64aadce554914721a7b0c7a27bdb97170a6cd4e65dd07406836d81a74 SHA512 d0ca58df473c80092ff9b3a185394ea9b8b1736546c032e43777efb3ee2a94ee8470744e074a0a6ab89f3fd200cd23af41bbae002aab39e7042cb68e5d7417f6
-EBUILD pyodbc-4.0.23.ebuild 611 BLAKE2B 7508bcf326afc256d010b80d93a77158d08c78cdc31f978f1b90198120f56ffcdd823d989ad82890d60fd47e0f5fdac696175210e540d74a3bada0d6d632b6ae SHA512 b00596a2d06984ee10a858ebc6e9443a3a55661804a8080b8811f875d7a2df261f6e31df53b6b4a60d20e29e693f383e3db8d72e3699cc6da8b008d6a288bec0
+EBUILD pyodbc-4.0.16.ebuild 615 BLAKE2B d85d03054c83297050ff8e52da3d8f42f2aca7c705bec19bcc5ea4ee60e216995ec8eb16167bae56a926e4a91ae6133be0d4693c9d2675dcb2001a186af3d33e SHA512 f315a108c45c01199df0d0bf58ca64d8521323173d032d68bd2480f4d1a562d132ea675ca1bf497144adb66d7c9f799f1f0a3c80cd94069d96dba7fdd15b35ad
+EBUILD pyodbc-4.0.23.ebuild 607 BLAKE2B 97502ccdc7a246b97182e01c93f96c48fc6284693534a958f4014285e7fecc5aaa796c874b1fa483141445b712b865f47f4667badeb050927931f10e3716aed7 SHA512 c6a0fb3d5ff93a095fbb19d521a9f81474a4861b4b9c9850289742bc7bd2335697974ac0a260bd57fbafc5be53ca489cac39421c3329153d4bc4ff923fc607e7
 MISC metadata.xml 367 BLAKE2B 530fc01148229a40c7c1e062f3c277b8812a5c434b1a96112425906c6976aac3b4396c42faff69b2cd03a1ed1e5990453cee9d8f1eb8e355f9dde2d0b4f4d42a SHA512 4e776353a7d6e61d0572fe852830214d0ee0eafbd9bad6ba19851e093f413e7d5fcd7f8d33c7c75be107b98a3003ddf8432390694c7372b5bf7eae05379ea38f
diff --git a/dev-python/pyodbc/pyodbc-4.0.16.ebuild b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
index 5adca9fcf57c..44bcdedf1ee9 100644
--- a/dev-python/pyodbc/pyodbc-4.0.16.ebuild
+++ b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyodbc/pyodbc-4.0.23.ebuild b/dev-python/pyodbc/pyodbc-4.0.23.ebuild
index 36a2830a3b6e..870b29529f3d 100644
--- a/dev-python/pyodbc/pyodbc-4.0.23.ebuild
+++ b/dev-python/pyodbc/pyodbc-4.0.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyode/Manifest b/dev-python/pyode/Manifest
index 59fc08944542..1c78bbebf894 100644
--- a/dev-python/pyode/Manifest
+++ b/dev-python/pyode/Manifest
@@ -1,3 +1,3 @@
 DIST PyODE-snapshot-2010-03-22.tar.bz2 55651 BLAKE2B 4ef1337f4a4c7e2bcbece57af0eff4d2da08dce1ad63d6772fe76a473559a7b102c8282ada3abf2add2b78e8609ca3fc3d67e3f520bdda4186ff6a854b4a5012 SHA512 fd9457d9a9c42a5e9834ce45886d6b57c9ecfdc68868353d986fa219eb57246d4dc175ca5d12c876c359c5bdac5bcdaf6dfc2ee65fff52f53337b1d10458e54c
-EBUILD pyode-1.2.0_p20100322-r1.ebuild 1087 BLAKE2B 0ae2e63d7d3db8fc6e56e4ae84305faafb9b60944a5c58e4525be486709083fbb45828bb7f52b2244bc1339ccdccf502a8b33f2336788ea236a3f5d6f18db2c8 SHA512 39bd49274481a04adedf87f81d15e898596064554000e81c5eb75fb388867887b1c6fafe637573b16c2509e925e30c4e8b926c8a1cfd14de787ad4c3a3ffd50c
+EBUILD pyode-1.2.0_p20100322-r1.ebuild 1079 BLAKE2B fda8d5fe4e46b9d7753554c83b7b70cb08791da09d90b6a0cef554c338a5c9874c0fbda999773982da364a05a122b537450fabd4a2083892f8673869e28697c7 SHA512 ab397bf1e0adedeb816417b39d9299caec04e0c4fb306d811acb9c616f1195850238405ac27610c665586fa009ab675a45bafc85fb3825f70795486d1a931a1a
 MISC metadata.xml 315 BLAKE2B 152961e59a3cc5114f7372f271e7877477ec2e976a2ecd8ea0e7000ac512e569453da3316344deca3b171e8a0282459dfbe06ceeff50b500298d4dab2408da41 SHA512 7ba6e25932ddc1fd466396957779165b27dca693b347b459da8e774cda05e69dd845f11ae641dbcb3743d047688a2f991edb89aa296cbf3aeb3af5f06869daaf
diff --git a/dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild b/dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild
index c918fdf726b9..3b8fa61d3bb0 100644
--- a/dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild
+++ b/dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 MY_P="${P/pyode/PyODE}"
diff --git a/dev-python/pyoembed/Manifest b/dev-python/pyoembed/Manifest
deleted file mode 100644
index fb94953ad6d0..000000000000
--- a/dev-python/pyoembed/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pyoembed-0.1.1.tar.gz 12941 BLAKE2B 0a3a5935e599450441e661b124034be36a0d3c529b936d9a8cacf997870d83f89a2d067f250902043efd07a44b56a7b3e10524dcf51dea603a033ece47200c23 SHA512 6ce7ec87082179c0f35dffe67f7ce91b71c40c57ed6bf7bd0ecd2ce654fbd1ab0c6f6469cbfb4e0a8dafc970bf496ffbc57f09838cf575e0becf7527553de63e
-EBUILD pyoembed-0.1.1.ebuild 776 BLAKE2B 61f069560ce208e3226c6454d972e81e4fcc35e2086cfd0d6d19c00fd8323fd81820f402a5b555db7cfa86c96d0efd943c27a7b29fd92f9dd8f364daffa9faaa SHA512 c1a6eeac8aaba5a697233823be3aa914d8ec4f7c1d639101e6f4c0e6c469c5681f7f31903fc973a0a3349ff0a9e9e53ac340dd1aa5ab240819df127dfdc108ff
-EBUILD pyoembed-9999.ebuild 776 BLAKE2B 61f069560ce208e3226c6454d972e81e4fcc35e2086cfd0d6d19c00fd8323fd81820f402a5b555db7cfa86c96d0efd943c27a7b29fd92f9dd8f364daffa9faaa SHA512 c1a6eeac8aaba5a697233823be3aa914d8ec4f7c1d639101e6f4c0e6c469c5681f7f31903fc973a0a3349ff0a9e9e53ac340dd1aa5ab240819df127dfdc108ff
-MISC metadata.xml 656 BLAKE2B 955e14f70cc8b4c92a51d362931dc8efb23a0ef24ee6616857456e8eda68ae4e8cc2ffff6bc1ab9eabb141786d158243ee40c211683e181b4321e09d1d53e2f9 SHA512 65a38eadbd1450933b37c210be72d594943761bf0fa543e20e9364e97d8e14ec3722906c653842fb1ea47fdbd58851a208cfd124630afad2e25f00d74e585bd5
diff --git a/dev-python/pyoembed/metadata.xml b/dev-python/pyoembed/metadata.xml
deleted file mode 100644
index 20911663d8b3..000000000000
--- a/dev-python/pyoembed/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
-	<longdescription lang="en">
-		A Python library for oEmbed that supports auto-discovered and manually included providers.
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>rafaelmartins@gentoo.org</email>
-			<name>Rafael G. Martins</name>
-		</maintainer>
-		<remote-id type="pypi">pyoembed</remote-id>
-		<remote-id type="github">rafaelmartins/pyoembed</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyoembed/pyoembed-0.1.1.ebuild b/dev-python/pyoembed/pyoembed-0.1.1.ebuild
deleted file mode 100644
index 0a74596a4f4d..000000000000
--- a/dev-python/pyoembed/pyoembed-0.1.1.ebuild
+++ /dev/null
@@ -1,35 +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="Python library for oEmbed with auto-discovered and manually added providers"
-HOMEPAGE="https://github.com/rafaelmartins/pyoembed"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=
-	KEYWORDS=
-	EGIT_REPO_URI="https://github.com/rafaelmartins/pyoembed.git"
-	inherit git-r3
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyoembed/pyoembed-9999.ebuild b/dev-python/pyoembed/pyoembed-9999.ebuild
deleted file mode 100644
index 0a74596a4f4d..000000000000
--- a/dev-python/pyoembed/pyoembed-9999.ebuild
+++ /dev/null
@@ -1,35 +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="Python library for oEmbed with auto-discovered and manually added providers"
-HOMEPAGE="https://github.com/rafaelmartins/pyoembed"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=
-	KEYWORDS=
-	EGIT_REPO_URI="https://github.com/rafaelmartins/pyoembed.git"
-	inherit git-r3
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 53786e78301d..99cdba53b865 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,6 +1,3 @@
-DIST pyopencl-2016.1.tar.gz 311327 BLAKE2B 6efb1e6cf6721e5ef606b572963938849b92c7348255be798a4af0604a798dc7804d839a46459275cf0720953deaa8ea6dc46aef594ac11fa61fa231681e2fa3 SHA512 3be8da315f9b4a4e03071152bb5968c5c7b102cbae6c70f358438cfd7951d12970a76dd8e922187ff73e47f7d0ce7a070e6f303dbe364c016796fa65d7e1de71
 DIST pyopencl-2017.2.tar.gz 350145 BLAKE2B 12c481893158f97dec612256b36e710ab52356c8b5f644f3710b5e34d4d10df3b27137ad76f29543fe16b3da725471e206aa5f69c646a79a65246d6091c686a9 SHA512 49f2ff619d8c214a3962b8444e68ba415dda032abaf9eeab259fcd1b21fbaab10bd057035161baef7f0182995834082218a6667464c01645231a94c88aa5c18b
-EBUILD pyopencl-2016.1.ebuild 1277 BLAKE2B a02cb49206dad5d98801b41365515ce7c2336c3532ff4c25ef1d5e5cdeb22d2e61ad33889d9a566657ae7541d1e2120eb11e9dea855ebe01ea08033714b10868 SHA512 2493f3ecb76d96b2bec112a3e8208781300b17483647a8952d7714b14c8bb1a811ccfc7fa203557c5b086c49ff57afecb922cc5cf658de99837a0f7b8deb5552
-EBUILD pyopencl-2017.2.ebuild 1281 BLAKE2B 4f374ce2495113dda6e746c8d81f172f38fef573d632958b11a80e4ff09119450daff6613e0d3a9be6369b4eca3217a6c376ba02687d459ad7f46fc92dd99a38 SHA512 098974e35ed1a7706930de16633242bdf6fda4c5c234289f27964899a7788b834832be2a79aa5144b6e8ce72586de67640add718cc0a43becc50c75298d5cce4
-EBUILD pyopencl-9999.ebuild 1147 BLAKE2B e3ee160b12e90e1c14ba89fe23468eb3d902c80293b2b51b28c9070a71385d1e35fe6e254c642c8338d44599ee13b520e3867c5597d6558e63b9617bd7b57d18 SHA512 38f745080c5a6a4321df382617806ca9d88df4fa98dc109976ea27e2220c8abb99ea9ace6a8a18fb3fd4af8172c8fb3559df42839da85e440d061953ef4d253a
+EBUILD pyopencl-2017.2.ebuild 1277 BLAKE2B acc3228f34f131fcef952401a6136fbdefaf5884ce2c5eb5ba7acc67b21458a0234ce79a1dcebb0c618066d4b4d69e05eb435687e196368df209fcd7e0f093b5 SHA512 6532433103c9f934941470711715a5d2a1b8a0f23061a85b2a4536690cd9a39ea8be57d7da8b9b1a7cf36e188db850b87a23485990321534eafe94f4dce2ea13
 MISC metadata.xml 311 BLAKE2B 4a843a4ed6ec77f0be47c898b7fc2a402f486d28dabd347983b1ab528e98173babd5f87270183812cf3d5f6cde6866e1a999e750e3dcdb1411d8b3f029eb10cb SHA512 14da0f2cb9db48698adc78e6827c161a93ac3307c0a595fbf69c45839dac9178966fa855193adf2f175685b7be31eb161c0281b3a35ef2e455db62f0ba65dde5
diff --git a/dev-python/pyopencl/pyopencl-2016.1.ebuild b/dev-python/pyopencl/pyopencl-2016.1.ebuild
deleted file mode 100644
index a755b7329f16..000000000000
--- a/dev-python/pyopencl/pyopencl-2016.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples opengl"
-
-RDEPEND="
-	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2015.1.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=virtual/opencl-0-r1"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${PYTHON}" configure.py \
-		--boost-compiler=gcc \
-		--boost-python-libname=boost_python-${PYTHON_ABI}-mt \
-		--no-use-shipped-boost \
-		"${myconf[@]}"
-}
-
-python_install_all() {
-	if use examples; then
-		local EXAMPLES=( examples/. )
-		einfo "Some of the examples provided by this package require dev-python/matplotlib."
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/pyopencl-2017.2.ebuild b/dev-python/pyopencl/pyopencl-2017.2.ebuild
index f08efdc9f3bb..4465b7bb98ac 100644
--- a/dev-python/pyopencl/pyopencl-2017.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2017.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyopencl/pyopencl-9999.ebuild b/dev-python/pyopencl/pyopencl-9999.ebuild
deleted file mode 100644
index 8055a67ac261..000000000000
--- a/dev-python/pyopencl/pyopencl-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 git-2
-
-EGIT_REPO_URI="https://git.tiker.net/trees/pyopencl.git"
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl
-	https://pypi.org/project/pyopencl/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="examples opengl"
-
-RDEPEND=">=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/pytools-9999[${PYTHON_USEDEP}]
-	>=virtual/opencl-0-r1"
-DEPEND="${RDEPEND}"
-
-src_configure()
-{
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${PYTHON}" configure.py \
-		--boost-compiler=gcc \
-		--boost-python-libname=boost_python-${PYTHON_ABI}-mt \
-		--no-use-shipped-boost \
-		"${myconf[@]}"
-}
-
-python_install_all() {
-	if use examples; then
-		local EXAMPLES=( examples/. )
-		einfo "Some of the examples provided by this package require dev-python/matplotlib."
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 25259c09e4d7..fd31649d8ef5 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,3 +1,3 @@
 DIST PyOpenGL-3.1.0.tar.gz 1172688 BLAKE2B 9865a10e8b5d2756192077b4b079658c680b9f47bdaccb33285fb1942bc678b29f6a69359a1486ec023b1a73d714a7e0209b2f57776fe8b5e4a5e2d0803dba4f SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb
-EBUILD pyopengl-3.1.0.ebuild 816 BLAKE2B 1090594abe9184e30f80fc0f787eff734037f435668bf3a6f67f9e1be96ee3e0fab68392e42e4fb941ffbe38e0d24165f82a97f134340e30ddc106e6da552dd0 SHA512 e766b2827d0608048e42bec2ae73d3bc0a229421ed83d00b369ec44d55ea9eae12bcfa479e88842618527e1d599f6edaf2005f17305539908129b49c2b9d9cf6
+EBUILD pyopengl-3.1.0.ebuild 812 BLAKE2B 4fbd78d0f9ea4a278bd1804c67e3cb7df1ffadca59e859f80a927eef9874245ac2e37bbecb3539ba23dd789e6c8b918fb9704f37b0ede45d6cc5ff84c0180e4d SHA512 f115beb0e06ac269baeefccd8890df8eecdd1adabc2a527f8bcb2d80d557380430d5bfae2a3789807480aa4290ca2adfacc8e42e561e7139abecdee0b76b76b2
 MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.0.ebuild b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
index 006ee2efcc92..9abc32dabe45 100644
--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index 377f388e5483..3ad816caa4d2 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,4 +1,4 @@
 DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 BLAKE2B 01a13b0ce6d35896c05f3e5c7b485f20bf9867ebd2c81f1ece50dbfbc1ecfad1c10b35276fa830d932bc7ecbac059fe8376e3789e5c10b678963219a577a993e SHA512 2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61
-EBUILD pyopengl_accelerate-3.1.0-r1.ebuild 739 BLAKE2B 94f5cd1b6780f4e0b5d2777dd41889087e75e54b8eaeab076334cf53dda22f45aba7ffcdb496b008307b14a85643f1e763f6f7e894d762da4c37f19b18de5246 SHA512 a07cdbeb18a020048fd03ff5f10df31f179ee822c8d42e39fd4737d02557c2dc6ed077c49ddad7694395cbe69096b3d13d9053f519d7b5d4ef23fce9a46b1b87
-EBUILD pyopengl_accelerate-3.1.0.ebuild 628 BLAKE2B 04b426ca29ca5c955b80e5d8b1230389137104dc3fc44c5dee3e39f11e275c5ed9cec92f198ff59d1344a28141b99882eeb1ff71f9dc208dedd8b44ca6dce25a SHA512 cf2e6665c48b4d9805e3ef88617887782380f843470d29ec80a30757d0474125aa87724e6c63fa891b8c2fe68b2e797758e27a652e3acdbedd5655e1661464bd
+EBUILD pyopengl_accelerate-3.1.0-r1.ebuild 737 BLAKE2B 2bb986142e1de34b023b3688d28673be4b8362b04cb18db812c770b5ec655299679fe248aabf3379a154acf7a006dba4d89eb0d6be9fd8364a11ab4116d88943 SHA512 ed37460a3ac75a52ed0ed4590bb6e4bba9aa49e613aad10b2a2d4acde4da4acde3d5f12ba9d293006fd1136a9d54602627a05d255d19eb89b71fc7455174313b
+EBUILD pyopengl_accelerate-3.1.0.ebuild 624 BLAKE2B 32e7bfd954f64df6eaeda6047587b0427e9fadb4bf3d93bf12e1aa87dcb070661a948fc83d98369fe0afbdddbfe92a22421f4b94689b4860fa85ffe053b4b3cc SHA512 c4552701391c8d533205f54ef597bba17827af9ce8f13e48fc8003dc6462e1cae2922b5949ee03232871038500f02f19fa67c8ebf9ed1fbbd10701095ca7b5af
 MISC metadata.xml 302 BLAKE2B 6554bf56c24bed0cacaf261dc5323e9c84c14e86973aee7cf510973a7e07999f5f0c1c5f595c224dcbb9bcab9d182ab1779afa5b304e116faf240bd9073baa1b SHA512 73ee5965c95e1bf6f45c78ad638b946d36d5a34115aa3307d84e475f5ca86e81a60283d5b50ccad3f32771e94220a06f9b8c85413047560dd99185f2b5ce95ae
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
index e78f3288a426..469d1d51f864 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
index 698acd9983a0..dd7855c19551 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index f3e8f10d4cf8..7a00e00745bb 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -2,8 +2,8 @@ DIST pyOpenSSL-17.5.0.tar.gz 170870 BLAKE2B e8b8986a7c5475ac3898df4877a8be86db35
 DIST pyOpenSSL-18.0.0.tar.gz 167296 BLAKE2B 3a9c8db02e92858353389508d9791d2ff0b07b54150d27a513b4c26ef62899167d184702cd8ac3a9fb5be120a92e31259ce265a400513de4622c30b1269ecd9f SHA512 7106d4116243a164c1f458ad495564c2cf3a46b4b0fbb1d452b4174ead4409bc9c783c3a4674231ed3c26ecf588077b01dadbdefe033d5e7251a61531c6f6c15
 DIST pyOpenSSL-19.0.0.tar.gz 168551 BLAKE2B 762d3358b3cc4f1e088e9464ac079e5212c537d25691e51edb3255a192c42276506c758ecf16eff999082bfd05aeb92a37741338d92036d2149b87c95008db05 SHA512 a7e12bf5be725ccebd1223d567a9b9e8bd35f79cbf3a0409108fa6f00e10ab137dd6876369e9dede02b2abc7d700786cc905532ca5c31b6e246f6df8b24e2818
 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
-EBUILD pyopenssl-17.5.0.ebuild 1725 BLAKE2B 0a44e94c9f07d03430e7e6afd57d239db442a27c3d44979b8605d1d4d6204fc197098d35cb7e5d40e0dcbedf20091e90dda24a2ad01d28b4d026eb1ba228576c SHA512 3fcd1b3d791f1059660f70cb8bfdc253f45e13dfe2d6947978e9bb58dbc4562ac13b40ca0aa0e203ca21af1d653b32211049d184ce00aea0d17ccf4c4211434d
-EBUILD pyopenssl-18.0.0.ebuild 1739 BLAKE2B ce4151ce341e9b062b66038f102e27f0e87360b407e0b8c0192a8668462b5fd742e108d97c14cf5379b6def08e256f4181e574dc901fcc5a8a948b3fee6a073e SHA512 1384c0686c22bc18351e4f59ac13d9c1bf7ccd2a44bbd889ab12e8542a2541750abef60dbc730e20d43e601b0444240bd53b87ab0dbc60647562760d41e022cb
-EBUILD pyopenssl-19.0.0.ebuild 1736 BLAKE2B beb3e48131715be4050edc057a31020ec47892397b21d1d75dae13b143c30edfb82228e5bb98d149f581f42789f7c93cc405a9035fa6b90317e517c3b5dae4fd SHA512 63c136e2badac4636003e37e3de3488b6f7cebfdb096331a78382ca7e93790913040842945db996f9986e23f567407845f631f994d71b89f2a68370ece2d7c0d
-EBUILD pyopenssl-19.1.0.ebuild 1414 BLAKE2B 1cb4abc6754aaf037f6f85a392e86674ea7a2e1e77da6d1590634fc6d3c84c61247e835b75880f91b871bc7f3f8100cbfdad30f9240639316619e4263adcafa4 SHA512 95b77e035279eefd1f84983bf8dcde104d4873f6736cb1c0fdb269b15a901d526a6c051b0d363534d13b93f142b414fa41c9b6fd87198d9177cec77469560632
+EBUILD pyopenssl-17.5.0.ebuild 1720 BLAKE2B 41043ab5a2684f64acd7b003eaf2c7d86fe12eae48bd033b59eb2a13d7a39aea9320af065d0ec2b99468bcaac924c7c883d3ea8098221acd70f085f84166cb08 SHA512 9664f8c2a77b1e3f60af5aad324243c5eb5d469a8c07d4e3447f28d5e7e705c7b91ef484f9f32e99c15476f4bbcd47c6a156165f0cb2d06009bfa6955971c71a
+EBUILD pyopenssl-18.0.0.ebuild 1734 BLAKE2B 0b2f65a21a71de81957e112ae0ec7b5dca06f3c669cc9f0b7ef773ba97eb15c4e8831ae21bf7f2136cf42f7f1608ada5987c35107dffe97227830bff6eebc445 SHA512 3d020d281ff64b1f33f821aee4395ed25725383764965ef6b765e6c359af8d51b7b0db78e38541d85ed92e1c12d9ea2db8a96c2862209d37cfd2ab4e8b2fd079
+EBUILD pyopenssl-19.0.0.ebuild 1731 BLAKE2B 2566b89c541cb469f574dc020d6525bb5f7eba0904654409303fa56db68a154b77cd3794a4a67af97c0b98ade6df2d7c0de1ac572b8c4ade00ecde9e2cc097a6 SHA512 c9ab929d0c04e5f82d5fc0ff9b9b362042fc8ddc59cd3ecd9d35a6852e8491ff8cb912639e38ee1c19dee9f1c27e94daf8370d76ae0f75b17d319ec39702c8e8
+EBUILD pyopenssl-19.1.0.ebuild 1409 BLAKE2B eb26308cb3cbd8a812be9c80532ade1f5bdc588237178a7727b6a06db1576021543161d7d1c45748abdce76fd0c89b2a13507d2de533583c08db2a1ea5866b2b SHA512 aed3fb4c129dd1848908838ef206403483813fcf1b382168a7dfbb63787d7bb2ad30a548f6938b38ba7d296449048b8baddab55c08948dcf57dd852745cbaf76
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
index a7d7cf3f88f9..51116a09100f 100644
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild
index 370f7551684f..d3a31ab8b263 100644
--- a/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
index 5893c16d4bf2..4ec6b717b05d 100644
--- a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
index fde3dc7c660d..039b35107692 100644
--- a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/pyosd/Manifest b/dev-python/pyosd/Manifest
deleted file mode 100644
index 72fdacc72793..000000000000
--- a/dev-python/pyosd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyosd-0.2.14.tar.gz 20845 BLAKE2B 44fde05a78c3b5eb23033489fefd81c9dabac619a456833c92e92590e499102839e7754f8648698dd2b52067c6f690bb253bb8525f81fd602f0f22af2af6740a SHA512 5781097ec5b082555c5a77953fd939a41d9eaab76fba32a132feec42d01e581f5dcf547fbed13122c56a5778e4b13441ae3d098a9bf7d6db8fac08361ad325a9
-EBUILD pyosd-0.2.14-r1.ebuild 837 BLAKE2B 67e779802511e3f872377ea46b92c9f7c8297471b1e05ea7557f64e91f5f92e118214d9ebf08a40adbf7fc34c9b9e5a453c8acef9fc4272854c4c56f7bd0d1f4 SHA512 634531d5fe5e00c3124346bf44f2505422029d2010536b52705bd96be7d84fd44d6f9f09542d87ba481eaadf2117e069b9153811afb881652853c8a4a3836f74
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyosd/metadata.xml b/dev-python/pyosd/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/pyosd/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/pyosd/pyosd-0.2.14-r1.ebuild b/dev-python/pyosd/pyosd-0.2.14-r1.ebuild
deleted file mode 100644
index 25009fa7a300..000000000000
--- a/dev-python/pyosd/pyosd-0.2.14-r1.ebuild
+++ /dev/null
@@ -1,31 +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="Python module for displaying text on your X display, like the 'On Screen Displays' used on TVs"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="http://ichi2.net/pyosd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="doc examples"
-
-DEPEND=">=x11-libs/xosd-2.2.4"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( pyosd.html )
-	use examples && local EXAMPLES=( modules/. )
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "If you want to run the included daemon, you will need to install dev-python/twisted-core."
-	elog "Also note that the volume plugin requires media-sound/aumix."
-}
diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
index 3e96ff2cfc17..be5e8ee55adf 100644
--- a/dev-python/pyotherside/Manifest
+++ b/dev-python/pyotherside/Manifest
@@ -1,5 +1,5 @@
 DIST pyotherside-1.5.4.tar.gz 183745 BLAKE2B 3dad2486dbc3d2632999aff0a7a7af41f6fefcae011bd1dd92b491b4403bbd62adb9a8520af627d5f96644f4fb25e89ee8fb49277723d5f80521d2add984008d SHA512 feaf95e0c981a8fb8b3a57926f48f803584a371752e7f1d2f3c739ee220960df33ad4ca2a38322f3e56d4f8fde193bd7342105303d847b2f532937e8bf2c3b65
 DIST pyotherside-1.5.8.tar.gz 184812 BLAKE2B 6d6688ded2c726edf12a82611953a8124c49f904ab41a26a733eb74ff9fa071a4dcde4f3a2a21c424feebf6d85a0e5b3bf6179f3b48bb3828449ce1e5e6262ad SHA512 ff82bf693a239560001baa622c3854dbc920310573f4e565f247ac79a8ed717446231bc9a9d4990e9b8cb4032ca05d0c5ec9a1c87341be09238a62d005e6ac0f
-EBUILD pyotherside-1.5.4.ebuild 801 BLAKE2B 267d5893bdb8cecbcf78af63e8d8f9ced5a18c021624fea942da354a536b88c2f890f0bbb83a507b3ebe68623cf19a3de0fde211765ca48dbd54a0de3e9023f4 SHA512 dd701b7b779cc5748c3effff70d3ecd9a4162b5db038fe26450e631504868fdc3321921e8909a2d2b65a42c48866fae1e5181a42557326cf53c1423d7624dca5
-EBUILD pyotherside-1.5.8.ebuild 803 BLAKE2B 8686563a2dfce1249a715695b05cc02eb8ef6b1131006e63228376ea1486f4112bb6a28a6d06b85374164c90712ce7dd10d08fb2197e211532132aa5bdd3f0b5 SHA512 b8249cd3168b30e8822c25f987ac67c22d71441c5f8894bc123ef2bcb07721e6c3210d0b4abb77e3c686e3ab8811539545a5c53003c9406b25b0d55c6113342a
+EBUILD pyotherside-1.5.4.ebuild 797 BLAKE2B d82083d5180efdccc1e02455bb2a0f51d177be955deddf1d2fc4dff0fe7d07d4b9c2f89a8c6345735ca72f200b84c53bfa845e6dbb0206109eb007b7edbd4075 SHA512 3746bb8e4ae2104968a73ad570141144c78d103aee095706fe62392171f43024d7c888f61c6c58bb79829db6d86dd586348fc4004fbf59637d4b0ffd0030e027
+EBUILD pyotherside-1.5.8.ebuild 801 BLAKE2B 7fa8362dfe1f49d560d191f12afadeed2768e8f92d6d2a81d737988816f07304860666de454eeea7358377cde4b65f8257a17015192b9063cf5c91bc60f61e42 SHA512 1e9341fb6fd5fb12895a348bf7da77a0ecd18f6e619ef82a365fe6a006988e4de6b438e936eb1cbb025b200a3878310efa73111d08581ea280f633ccd8f9fe1f
 MISC metadata.xml 257 BLAKE2B fd7fdb57fdce3a565a08cedc4d99216724e4013515d77ea89cb41a5c01e8f5479cab25fe53d44a705e3a71164cdc3c93e658e61deae654a13e5c2471dd83c57c SHA512 35e59430f93d3bb2e7e3042a2464b84f8e6cdf1e1624c1e7674bfc5147f9b9694da6b39ac081ed5fc22f1623aea889b743cfee11007911f3c8c17cf61443675b
diff --git a/dev-python/pyotherside/pyotherside-1.5.4.ebuild b/dev-python/pyotherside/pyotherside-1.5.4.ebuild
index dbeb5532b03f..38f0db95337d 100644
--- a/dev-python/pyotherside/pyotherside-1.5.4.ebuild
+++ b/dev-python/pyotherside/pyotherside-1.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit qmake-utils python-single-r1
 
diff --git a/dev-python/pyotherside/pyotherside-1.5.8.ebuild b/dev-python/pyotherside/pyotherside-1.5.8.ebuild
index 38785447e3fb..810fffe8af51 100644
--- a/dev-python/pyotherside/pyotherside-1.5.8.ebuild
+++ b/dev-python/pyotherside/pyotherside-1.5.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit qmake-utils python-single-r1
 
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index 5adc6e7d7c96..8c060b46368f 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,4 +1,4 @@
 DIST pyotp-2.2.6.tar.gz 10602 BLAKE2B 801f48646ff15a039b9295948ed292c3c432f8b0b629d249554259802335b7430a2c82f8c3bee1f54df71b0972ec293d69a2005c35cac120a51cec1a3548b2c1 SHA512 4f962704411ceebff967cf13af5ec5b815da0f82af665a086c4e5d53acc735453d638c65aa2afa40fe546e92d04a9250f6964cb22270a67c9609f8486eb5ba90
-EBUILD pyotp-2.2.6-r1.ebuild 589 BLAKE2B 7406e75b23e4e090a9dc39acbe4c23ef0612081227be19a4ccbc8d1cfdc97502a2947f97397e7c28c9f24feae1dd230b70130f629a9a81db45c3455e80aa3b11 SHA512 8013ba4ecbaa27a0c6b01b266cde1bc76d3cfbbb3daecdbed6bdb7733173024b45b84bedadf551d32404c0de20ea06844b8739b7e5dd759ecefd80d6db3c8233
-EBUILD pyotp-2.2.6.ebuild 587 BLAKE2B 7c3c17c42406c7fffd9db8d3c3b52af8c74d919218d195ef6fb5706b19d12f483dd863cb9f264820e2ec248a2bddce07d8a257f9bd61ecab117fb1bd7377475a SHA512 2412caf5642125b592ad6c5637cac56b781f3fa9d59b13718e6c236770839f96e635341db1af13d13a57aa696d5becaea6067e21a59f396fb591feca7d96336f
+EBUILD pyotp-2.2.6-r1.ebuild 587 BLAKE2B 9731c76b22a3b739f3c5dc029bff77c675ae4d1c95e602febcb8afc34b8b1165f78f88e84b7ef35cfe1991cdb03d87ddfd64b63d0537ea05e56a8b54fb7567f7 SHA512 d68ae838c229dd2a58ccfc6069a66761b7482c753678cd16ac56bf403e7b951e59db06d0a28fb20310639436deb14e335b518cf93eef66d24d8308c2cab3dd0e
+EBUILD pyotp-2.2.6.ebuild 583 BLAKE2B 95300638eaefc3cef89585a3800607e0d6668b7f3339280746e34dee125701fa6915eb255dba9b8cff29dd0ebe766d89ff32236ffca9329f53d20d519a34b0c5 SHA512 608f97ae8d9fef85ba32db25131af71971a5e632cdd9a480c79cd8182e33db97989ab7ced6ba368c4323eb1f1ebbcbc74423a99ea98e4c93b84e2fa0b9919935
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/pyotp/pyotp-2.2.6-r1.ebuild b/dev-python/pyotp/pyotp-2.2.6-r1.ebuild
index 6d2d87338477..12994f968fe7 100644
--- a/dev-python/pyotp/pyotp-2.2.6-r1.ebuild
+++ b/dev-python/pyotp/pyotp-2.2.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyotp/pyotp-2.2.6.ebuild b/dev-python/pyotp/pyotp-2.2.6.ebuild
index a777227680ef..86e42aab00dc 100644
--- a/dev-python/pyotp/pyotp-2.2.6.ebuild
+++ b/dev-python/pyotp/pyotp-2.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypam/Manifest b/dev-python/pypam/Manifest
index a01d73bb2ec0..9aed4552410b 100644
--- a/dev-python/pypam/Manifest
+++ b/dev-python/pypam/Manifest
@@ -5,5 +5,5 @@ AUX PyPAM-0.5.0-return-value.patch 1854 BLAKE2B b65a57aad50003ce62ac4b45d0b2a25e
 AUX PyPAM-python3-support.patch 5987 BLAKE2B 3c3723c0c3c121d6341aae48b1b8a47c2ed88db4eb6ed09b3c6e53a8e4380336b4b971fa83bda70e891b437ba0bd807af6b2ba9ca3b321791ae3dfa441f1cbe0 SHA512 8437e5648f4bfe7a4895324c4277e91b5588271ed31a7fa374a4d7f03af18b8f6038c90afe79f16c96219debb10d9dfb6f33883dc097edb2c67714d893acf13a
 AUX pypam-0.5.0-stricter.patch 335 BLAKE2B ac348ae8ae8db84a5e5b92c3dc842bc843e28af23c34e929b63fbe029f70233689efd6974a65e3dce48f0ce28ec4195698566268972f895106d96d796647116c SHA512 6cb56d4610fab8f14af83d64215de24b38c820c61099054c0c02bcc831b0f50dee5746def85e2ae669b8657dce2fe31fcc93f07a93e3b49f0c7a78f48acd74c7
 DIST PyPAM-0.5.0.tar.gz 105206 BLAKE2B 7778275cae11606ca8e522d2f99fb0558c55545cdaedb3ff7c55b4bb693ed3429e22566912f53c7795f73316bc45f1bfbdf5a53daec234dba87e1c141e2410f2 SHA512 9e0e919e34930d2283307cd6665c5287c664a76a5de56367bd975867ac26b376ae03d30cb3bc4a16390c977ca2690cfd2e90ac73dcc7886b8c999444da4a07e0
-EBUILD pypam-0.5.0-r3.ebuild 1030 BLAKE2B a8ac714953a0405aa87e3fd1cf08760f232e45bd42691b57a58eeb4390103a9db64b58941f7c597d12587a2a275b261bca1631b7108ed3165cfd1bf89f33f3c9 SHA512 8cd0b4f9523d62e2977b1d806e2e337f299d730a9774c5c42ababf61e4e63f89f3a4ceb52ea530806e93f50541646f5bd6aeda08fae6c7f041c5b308d0594189
+EBUILD pypam-0.5.0-r3.ebuild 1026 BLAKE2B 45ff551f52fe0c0f756f1e3e918bc22842b19aac9431af068d678d05d45656486d868372ac6f8e6c832f2527f333a35fb472295cff234618ee5a09d560f61d3f SHA512 338337ce668cafe7f2e2a1a31ec2ef508576a767249b1ee79004155bfdae9ac0bb01291e8bad95b23bfb7fa04eaa55f942078c09a1298cb9ce73d708401eebf6
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypam/pypam-0.5.0-r3.ebuild b/dev-python/pypam/pypam-0.5.0-r3.ebuild
index e5100010b1e5..a2bb5774fe09 100644
--- a/dev-python/pypam/pypam-0.5.0-r3.ebuild
+++ b/dev-python/pypam/pypam-0.5.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 33ba702db1ec..e6938dce1947 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -3,8 +3,8 @@ DIST pyparsing-2.2.0.tar.gz 1232522 BLAKE2B 59420548fcee047e2b385d76b8ce034807eb
 DIST pyparsing_2.3.0.tar.gz 624393 BLAKE2B 9fd9bee7742953d455ea34310ef1668df0a7633642deb4eeff507439228ae018e4ba99d3476c5cfe374a908b58b0311527ae5f04ddec8eb7e219a2a9d4cbc8ce SHA512 2a4de9b208ee3c557fb6d050d5c3c20e35a11b21d35996fce5a0876d4f52952072bed7ae2ed157ae0ba388543dc554f4828a1da22712ae7d9f0d38a16b0a546e
 DIST pyparsing_2.3.1.tar.gz 619405 BLAKE2B 4c1b9abe6ce6e511a998eff19eb32c835144473bfe47204880f43979b1ad72f5c73ff72bfc17fcaa3cf2a9b52875f184b122927cc0d9f9eca5cc4facdc4a119d SHA512 8c0e2c7a7dc7ec12f3e7c260bde25a33f325af89d9bc2329b7882ebd8a3f506fb06a36fdaba0fd8ed48040d5b7fc5288c41b01f2df84459a9980a035cb213dd0
 DIST pyparsing_2.4.0.tar.gz 625419 BLAKE2B 5555a255cbfcbb076fe4d385b2da967bc44a7110acdd1a4715fb3e22db2a3f5b7bef1ad61423f6d0419cd8cb403abe222e426a96ea755044d04e0105c2798317 SHA512 2888b60c2518b19979e00b01ea499c45cd0a98affe0551f80ea7985acd649d62b4e231e142d3efd65cdcd9e3a0182680bfe1c4d98e310fa2ac476f37ac4ff344
-EBUILD pyparsing-2.2.0.ebuild 1300 BLAKE2B 678c343985b4667f24664a56ad793932b213fa46bb0dfee554ecf511f2846b13491174bd1ef7bb67a2aa2a9844d3c5ca52a0b4cb5fecef2ef3f21214fa0e30a0 SHA512 2356f29f4effbbe97654c919c5aec73d82b0c15c15ff16c5aeb1d0fb58265489f04a14b847320bf47b0384557b7347e3c36c87966cd270d03a6dc34e0e0390d9
-EBUILD pyparsing-2.3.0.ebuild 1227 BLAKE2B 0254776352e08f944c3fcc80d0b2a4cd3e007cf14d400db90d942e9eef32426987d4a3601e1f47bcdc3c9cb51c14fd8fe0257259da3970a8e0d19eaf4f7a61b8 SHA512 e3f0cd167cde45e46ad3c25bf7338825c07384c4c89a151fc10de4b8272adf549a811cddb97191c4d03e8643e6a2bf7f388cab79179f00c232349122f162844d
-EBUILD pyparsing-2.3.1.ebuild 1215 BLAKE2B 3d7d8db955407d1323ba4692fb5408b1f73a61def95ff3e07a2b092ce4a87ee950f54b14b7a007990356b6ac17bf68ae467d961b7641f71a597c3030cfed92eb SHA512 2b3e574c0f9c2ab4209e8be6a80fcd477af82f8724b9553e03bf93dbe45567bcdf9dfa8aaa8175a2aeb0520114f1284171298fce3947f0c74147041537891985
-EBUILD pyparsing-2.4.0.ebuild 1181 BLAKE2B 5249bf166407966558407812f597cb52112709a9454d75dcdde606d9f445539124613c903ebfa639b576e954104ce5ac999d981750f4b021494f7cdbd671aefd SHA512 92a85c2cbd18fbe9abe24f7fbe0fc8d14e5bc754f38d51566436a7a154507ab48e8a6f03278ba1ab9484117b0bf86be02ec440367dba816d20601f374e47fd81
+EBUILD pyparsing-2.2.0.ebuild 1293 BLAKE2B 5ee1b9124f59ea54613551ae0e726207a6c4d0c3d85ee8292ce6b2e4c90283488733162e7129ab7573ea93f25e168b1833d5419762b5899a4ee28645928192c9 SHA512 7c686ad8b9ed2aa06fbff465fb564a83bd7102c7ecf20c5e4aa9254fd7b590088d265f3bce20f9f074e96a438745592d43f8bc25d4acef38bbc4b82ca9e79ddc
+EBUILD pyparsing-2.3.0.ebuild 1220 BLAKE2B 84e5ba0bf10639fad9c55093af9cdb67b866fb66464c6bccf746851c018402b3afff134611d097b3fd4aa78780f1d6bf6f34248ad098a026364e77935126cf44 SHA512 482e725a276b387165a4a5f891b3893050293d9cf2cf9535a179eaa2c973dd7aed451f3b15e006fec87ee2907a7fd05bd0c0f69f85778e422eb697bdf95f646a
+EBUILD pyparsing-2.3.1.ebuild 1208 BLAKE2B ac11a2f39c85192a4e793cabea896ee342d9fb3b2c38f7d468a99ae26ed4e4940d2a191b024d6aaff775a0d1cf8b40bd312dfd57fca9f41fe805597422b5eea2 SHA512 2b2794893cdce389c3c6fa373a04aebcc14f5c0af5274752216c77f8c6ad96c6d32431a734a2c16b83cf35298a9fcfd4c91854c9527573c3541706f906cfe78c
+EBUILD pyparsing-2.4.0.ebuild 1174 BLAKE2B 1b5d23f54c66eca6ed5d8f006a7661e9ddcc982999c2f08118c643dd7fac5ac64328fa226d1c168d9bc034c606f65428ea2d96ee09d73d84454cfee004dfc2bf SHA512 6a582bedbeea4de7a777b4d70bcfd8e03960d9e85b1393bba6c06b98b96d208cf6f125dcd2b62e70fa4067cd66c6fbea5fcb5f8fe874161fb79cebd8b7571bf7
 MISC metadata.xml 737 BLAKE2B 4b4199e79bc2e92c175ce249cc395d2324cdc3a3df25bb36db5884b79057ec04c63b2cef7ef27e9f656a58e0fd5aa162b8eebe076f6e673b227659a3e013df08 SHA512 2cab4251c3444c6479b4d5ff92221399e01ea5e4a6af96631ccf81cdce5f3f9cc2ab06993c9636f36469acb5b28660c41e594d0d7315c6cd9b5dbaec0deda7cf
diff --git a/dev-python/pyparsing/pyparsing-2.2.0.ebuild b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
index 4dac97f458d1..d59a01c863a8 100644
--- a/dev-python/pyparsing/pyparsing-2.2.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2004-2019 Gentoo Authors
+# Copyright 2004-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyparsing/pyparsing-2.3.0.ebuild b/dev-python/pyparsing/pyparsing-2.3.0.ebuild
index e309b60901de..281c4c2eafe8 100644
--- a/dev-python/pyparsing/pyparsing-2.3.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2004-2019 Gentoo Authors
+# Copyright 2004-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyparsing/pyparsing-2.3.1.ebuild b/dev-python/pyparsing/pyparsing-2.3.1.ebuild
index 7eb1e22e235e..7f896f83785f 100644
--- a/dev-python/pyparsing/pyparsing-2.3.1.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2004-2019 Gentoo Authors
+# Copyright 2004-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyparsing/pyparsing-2.4.0.ebuild b/dev-python/pyparsing/pyparsing-2.4.0.ebuild
index bed60583a293..e60814b8bd09 100644
--- a/dev-python/pyparsing/pyparsing-2.4.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2004-2019 Gentoo Authors
+# Copyright 2004-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index 21602b25b405..3337d7cd09d9 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -2,8 +2,8 @@ AUX pyparted-3.10.3-greater.patch 342 BLAKE2B 857734d2466e5d1e9a9b7575dd41977836
 DIST pyparted-3.10.7.tar.gz 99879 BLAKE2B f2d03415ec7623fbe25aeab70e53646aa5e576e9f20ac41ffe6c859be9572874579f5720b8d05191107f4143e2c6dd14d83a05798a345fa0ed8a81ce2634f599 SHA512 c57fed2a8d04511b12891fd59b6dd6840439aada7e5ebeab14a56e6e4f201c249046ee87d9d25af1b3f02960994efb0a2973f25928a9df85d48bbd1bc196ab07
 DIST pyparted-3.11.2.tar.gz 101318 BLAKE2B 0c79535d6f3a269d5dfdd6c31ec80569d8c7432cd058f90999ebfd61ef727762a395d902539c49744108e92ba1a351c1ec939c02188869bed6c808551a843f92 SHA512 de6e7387e3eb9c9cb11e01f475d2749d2ce22ec2f11386df20cafcf83f7e431828f2db936f29c717e42694ff390a592598893633156a21aa7c8d5700a3c9ece9
 DIST pyparted-3.11.3.tar.gz 105305 BLAKE2B 271d0ed91c187c66219f06e91def5e868d81494241a2e9137676162ffa388523f5cccb3ec6dfed655cb59da1ca56e7fde3bb9fafa227b86d8f7b279759fe237b SHA512 b10a89d076a27a074d606101dccb62176299dd8f9da75a5a4bf9c8a6683d2873b649d948736e991e4cfa21d43a54e7d2934da8e539ce8626ae5fd47e892ae286
-EBUILD pyparted-3.10.7.ebuild 711 BLAKE2B 33c2afa8b7119419fcb055f52135bf56abfb5afa30b7bf8552caf7c49a967cabb6e7f4724e0f05ad24097c176e6305bdfc030c7dca498321ca301f8411c8ec5a SHA512 89024095f27fab914273ca75eda377fdaa7f9f7d53b823d3154c2b4ca362ee2d3189412f14aff90ffd8b7c7c4c8e2e06135f2b12446975d3be2b23b951baa71b
-EBUILD pyparted-3.11.2.ebuild 718 BLAKE2B 47d81489d75de0cc2c9523d0c86079b6f4e669165947b25a14cdc1b88850e7aa9f511ade3b4b2c2b9a82bb0106c7a7c155836dcc0984ce8ae366c7365cad1bf8 SHA512 cbab55f191ec014c9c8c1e17d00b4e175a9982b25db2fc1ed6a61d0d17499beef30c74e6c77ee02383da1fab7234165675114600a2826b0db01dc5219f9a96fe
-EBUILD pyparted-3.11.3.ebuild 585 BLAKE2B 1de8ef6873750577444b42fc585d16c1612b6b9aa7880bc3e467ba9d39f894de3d388bf3dbf225fdda9567d25498343990e98c4c7be2bd1ad86ea38eaeae81c4 SHA512 14a111c031e6c703321f79b008ea2721736ece401add97275fe89235fe752e76794ce2d4f7a62bd347897335e991b454991c85aa6f3981d4de271741ab49f878
-EBUILD pyparted-999999.ebuild 513 BLAKE2B 15443103c86a2d9777a304c911e5c1495b2f663e0e16bca6153f36589da83aa015a3c867536d83a28c8537cbdf5546be385c27f61c118b22ec958612ee36fe77 SHA512 428e2e96f8470b3531767e1013d5962fa2776dc4e07aabb19dc87fc0d68a2eb0baf139c1bb88f22a34a09cbe81bd296aa1fd5ce7540e3b360ce1a43488eb6ed8
+EBUILD pyparted-3.10.7.ebuild 736 BLAKE2B 46f27961391d8e4092f3db59a16139c92b3adf9d5cf8376be7816194ec8d27ab00056cdaf0b02c9d910287a34792926044a7b6b4f2e469775545c5e39e22ec0b SHA512 958d126827209532de3b1600f2bc7390249f83a6c428d70f4e8a73009d3653b4608c1586601f3605c9293de3f86c8c5cdac86d27eecc1abf624f74c623a39eb3
+EBUILD pyparted-3.11.2.ebuild 743 BLAKE2B 4356386c47ef0ef69d335a1c9cfa2b845e42f2cd45044fac6efdb5b4c99f378e022db500807173eadd3beb17dbe450e13c7b173ae6b9b8932c8ebf270a7f1c2f SHA512 349fcca0abade57c3d2c5320957539bfafb8bbb037e3ad81bf79df6c81c8cb675bde5aa71a1cc4ff4554ed4ed6315e41ca140c3af7475f992fe4746bae035876
+EBUILD pyparted-3.11.3.ebuild 581 BLAKE2B 507c0d717d31cecebbd209143ed7c2140dea276bf881b8f9884dad6e396b1e6abf59d83553b9b2a5e3170f2b33db244c2b16ae96a0ff8a228dc592cfb14a4d4f SHA512 a5acf98a71aca4538fcf6bde3511008dd2dbd3ad432e764c520b8a773706a2c8139207370bc09fc10e322090f2a4807c663cc7d40a708ba1b6780eccf9833771
+EBUILD pyparted-999999.ebuild 509 BLAKE2B 5224c068ba54b9afe58941a7f63e3afb94e5933a03505ab325ba8092e6b0ab92281bda511b2b82f576c5971d2223226e2c634cb9bdecd7a209b66ba40ec5aaf9 SHA512 9737bf284c39f7a648443da641ad5c852705f9af479dbf690895ed6251b0773176ad817f2db3c6bb1c2124dfa62b8a1375369dec5f8a8c49b0d918ab97589592
 MISC metadata.xml 340 BLAKE2B 580176d023e57197a2b4ce868c4ad2403748932547b9a6337fe63dcbabc43db523ce8ae7a5691abf3811995dddc047b64a7e00aca2f09c65e1544d0a172a9d54 SHA512 dc34de6235dd150a24b2cea6fd14028328a44fbfff6a75819c51fdd623f54b2f4bfa55f13cd827ddacbf11b0f9206c56025234948ec116e9df47ead634d8766e
diff --git a/dev-python/pyparted/pyparted-3.10.7.ebuild b/dev-python/pyparted/pyparted-3.10.7.ebuild
index edf72c281128..fce9a031d3bc 100644
--- a/dev-python/pyparted/pyparted-3.10.7.ebuild
+++ b/dev-python/pyparted/pyparted-3.10.7.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for sys-block/parted"
 HOMEPAGE="https://github.com/rhinstaller/pyparted/"
-SRC_URI="${HOMEPAGE}archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-python/pyparted/pyparted-3.11.2.ebuild b/dev-python/pyparted/pyparted-3.11.2.ebuild
index 50aa313e7226..5a9a66752a3f 100644
--- a/dev-python/pyparted/pyparted-3.11.2.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for sys-block/parted"
 HOMEPAGE="https://github.com/rhinstaller/pyparted/"
-SRC_URI="${HOMEPAGE}archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-python/pyparted/pyparted-3.11.3.ebuild b/dev-python/pyparted/pyparted-3.11.3.ebuild
index 97c6d6e4d2b7..53553209b627 100644
--- a/dev-python/pyparted/pyparted-3.11.3.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for sys-block/parted"
diff --git a/dev-python/pyparted/pyparted-999999.ebuild b/dev-python/pyparted/pyparted-999999.ebuild
index f05348d00058..c31f80411993 100644
--- a/dev-python/pyparted/pyparted-999999.ebuild
+++ b/dev-python/pyparted/pyparted-999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python bindings for sys-block/parted"
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index 0a03074ab1d6..95bf66db805b 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,4 +1,4 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
-EBUILD pypax-0.9.5.ebuild 1096 BLAKE2B c01591ee988a552b132db6d45ff4cc2aa37e7a5bbfea019eb57711d3d980f5eca32ef0ed06e31fc04000cf7e7151d2e2a3db74695b19287d919b5203baa38af4 SHA512 0edbde367f9c7aa3a4994ae535a674ab9fc772c5be3d54c6cf7ac6c094525aa652689fd1a829c5186f3f83b584c7a13dc98e6c1a20d22c96f0a5bedf8c7fbfd5
-EBUILD pypax-9999.ebuild 1106 BLAKE2B 96b8552755f9084bc51e04f236956110442c1073a0c539aaa133f83c17d5f66dc6c86217d3e4d7981ac1a583bf41f6d4f6d01f1b1d41492fa8a7d1723613a8f8 SHA512 8e87b1f55973549026d9f098abdba93cfce362d74849172405ba43272bfd59411008938651ad169a6471cd60912df4a527577066cbda41cfb6e0f2d8164eee6f
+EBUILD pypax-0.9.5.ebuild 1087 BLAKE2B fc5a69163aaace98255dbdd0ff6ce31bb72619ccf16a3dd89e8b00d367c0a98f4c3425fc4827f5304ad1f2f160c82c34175f1d972e396ff7b91e836fbed4188e SHA512 0994b81c46332808f1ab69b0e986f2f1767563d2b8cbed7de95ea7fb6f1d0bb80c13e52a66c969f7d805e15ad210012ee83688b365b6d09f8b32b32990f86f9b
+EBUILD pypax-9999.ebuild 1097 BLAKE2B e817420fdb25b820aa19a58cb07f8ea6100e2d48495acef16a48fc990342b6200c6079e1dbbb419aa902883f8ac11f2f0bb90ab6315351ca2c98f99dd69b5f21 SHA512 70bd0d9244dbb2a3ce8944f8fcb3e5ea7562c25979d600ab3b7c3baef76937ec11b7c9f5fae225165353f961df42d41ad694942886ab9fa970de0d208dd762e2
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index be7f1db4da79..8742ac6971f1 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypax/pypax-9999.ebuild b/dev-python/pypax/pypax-9999.ebuild
index d2a8e6794024..ffeaf17ce2e1 100644
--- a/dev-python/pypax/pypax-9999.ebuild
+++ b/dev-python/pypax/pypax-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypcap/Manifest b/dev-python/pypcap/Manifest
index 709eb78c2c92..6626202b3a64 100644
--- a/dev-python/pypcap/Manifest
+++ b/dev-python/pypcap/Manifest
@@ -3,7 +3,7 @@ AUX pypcap-1.2.3-mktemp.patch 379 BLAKE2B 66a6fc449ce5863a0650a7cae5589b52e30755
 DIST pypcap-1.2.1.tar.gz 141506 BLAKE2B 66fb9e96f0e7741b4c1b22a54b2d42a952742315b3e054680ca03b7e4f3761331f62b96eee759a4c2419c256cc2e909e040046522c43ed80cc31d19bb98927ab SHA512 987ae06b8aa53047c31bb316d5301a03ab86fe7882394b07cbfd22da78a2f515706485f39b07c0073c549159616605fe2b03ace33e2067c7cdaa4ba9c4f33ae6
 DIST pypcap-1.2.2.tar.gz 141606 BLAKE2B 7611a7c61e23d2a20a0575dca5404e5c1edd6ba84f072ef0bdc303f35a6b26e69f1e0cf29f6d1a75c6934a84956f57cbc3fdffb39d6122882dc93231e243e3b2 SHA512 fa5b2ba37cafa83b9586d52345bba62ab6203c46a97a7b114ce166864be0e0947737d5bb79d9c12e054255aa9cb9f675a152c78b7e7b1c5a63dd6b54575b7282
 DIST pypcap-1.2.3.tar.gz 151087 BLAKE2B c40e83d46b37deb4064877dfcf64582ff5da272a0d416b51faa43c4bd20625b473c624818aad70238f9429fac2455ae5b0516279faf1612f76f289b53d55417e SHA512 e4f701b6637fbcaf847d72eddc1ed344438008c2f8cbd334c9ce5fe17c9ec36f1f2cb1a146a218b8e464a7eb9a57217a8834a82a035ee96c3c1b56ec70e53bff
-EBUILD pypcap-1.2.1.ebuild 712 BLAKE2B b9f83d200f46dd308597e054d45069c1228e68ce00adeb9dd7c858a0fecfed990cf06479b1643b2a57b7851f2a47a595b2344015d142db071ca9821824052e51 SHA512 e6fdfb54c3ea9e11f824bc055f4f74be61ebcdadd32034fc5f687245a97cf9d4a3a2c962398708de5acaf8375c9705f846d9b452bd17ee6b57ac7ff3102911b2
-EBUILD pypcap-1.2.2.ebuild 712 BLAKE2B b9f83d200f46dd308597e054d45069c1228e68ce00adeb9dd7c858a0fecfed990cf06479b1643b2a57b7851f2a47a595b2344015d142db071ca9821824052e51 SHA512 e6fdfb54c3ea9e11f824bc055f4f74be61ebcdadd32034fc5f687245a97cf9d4a3a2c962398708de5acaf8375c9705f846d9b452bd17ee6b57ac7ff3102911b2
-EBUILD pypcap-1.2.3.ebuild 714 BLAKE2B ae0b3a8be9ceb1343324b00930f7aaf4db247bc9c5a3fc6ff74019850dd2cc785209ca285b81523f4afa53f22bb59a628c641f1f0b6c286981575dd715f82af3 SHA512 052bf0dda71ab6668d1c3487ca6e4fd7ac0a33200c27347dc6999c0e5bded2b8c5c2dd13a5ec8ee7a57fba0f6295bfe9b14480f1bd5bc1d23660364529a78a3d
+EBUILD pypcap-1.2.1.ebuild 697 BLAKE2B ef3e01388feb95892d2fde23706cd2369a6bdfc79ebe0c08f3324d764215c245029719f900b22805638d6338055711b8a7f895024abd9d98199aafcea9ae874d SHA512 db6a618285082e5b739feb08eaee2b7163098f783675edfadaeaf224566ca301777184fea564f30b6e105f60c2df5eab8a291bac5e07fd4ab051484d0a7b6cc1
+EBUILD pypcap-1.2.2.ebuild 697 BLAKE2B ef3e01388feb95892d2fde23706cd2369a6bdfc79ebe0c08f3324d764215c245029719f900b22805638d6338055711b8a7f895024abd9d98199aafcea9ae874d SHA512 db6a618285082e5b739feb08eaee2b7163098f783675edfadaeaf224566ca301777184fea564f30b6e105f60c2df5eab8a291bac5e07fd4ab051484d0a7b6cc1
+EBUILD pypcap-1.2.3.ebuild 701 BLAKE2B 06b5042428ca51e974d3fac62aa52550e0a555e7171820043008a8fd0d65f0fff06dfceb1c85fb450f2c599cf4272526c7e045a54d211ff8f755050c2933ea6c SHA512 83715ba892dc6c378f7c66073f48d5e7a2b1bec30845df08ab09083fa2b51f94a01dd7a9b627f7e807344317ec560e3872d3fd7b7d22b56c0e5496994b4a4b8e
 MISC metadata.xml 577 BLAKE2B 395c10694cd2a574aaf106be5e2487caa66b4b0234b6110d5c83263f5b4bdf9f9c7239ceeaf07f3cab99b7cb1582683fbc54051ab2b686360640e256c6c03084 SHA512 f50b1b47d18538d5a9ef3888eba98cca67fa919a5f3315fda54d098cfea595edbeefb62038035b07bc1b74cad3fdb56399c136512d6cb5b71ddf240594261c98
diff --git a/dev-python/pypcap/pypcap-1.2.1.ebuild b/dev-python/pypcap/pypcap-1.2.1.ebuild
index cab3d6f1bb3b..e182ed45ee84 100644
--- a/dev-python/pypcap/pypcap-1.2.1.ebuild
+++ b/dev-python/pypcap/pypcap-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
diff --git a/dev-python/pypcap/pypcap-1.2.2.ebuild b/dev-python/pypcap/pypcap-1.2.2.ebuild
index cab3d6f1bb3b..e182ed45ee84 100644
--- a/dev-python/pypcap/pypcap-1.2.2.ebuild
+++ b/dev-python/pypcap/pypcap-1.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
diff --git a/dev-python/pypcap/pypcap-1.2.3.ebuild b/dev-python/pypcap/pypcap-1.2.3.ebuild
index f082ece5e7f6..f6efc21e2f99 100644
--- a/dev-python/pypcap/pypcap-1.2.3.ebuild
+++ b/dev-python/pypcap/pypcap-1.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
diff --git a/dev-python/pypeg2/Manifest b/dev-python/pypeg2/Manifest
index 5f7649f99a98..2a2d560415a5 100644
--- a/dev-python/pypeg2/Manifest
+++ b/dev-python/pypeg2/Manifest
@@ -1,4 +1,4 @@
 AUX pypeg2-2.15.1-test.patch 399 BLAKE2B 64afae813084e2bcceb3354d6a9819425f5454d7febbb3df12d7b7f73329bfeed1a93fd7bbd046c69899f26757d984fd70964e13809ba9bb30305b80d35cdbc8 SHA512 20428aa41858da3b73a262ec2f36aed0df8626999eae27438a6bad1908b1dc79056ab33069c273aae56eabc02dfd0c080daaf42fee7e7c92ec32b95244ba41c4
 DIST pyPEG2-2.15.2.tar.gz 40334 BLAKE2B 7a171824da4c0ccc3bfaef4e429efb16f5c8c4e03dd47c5cd59656a51fe37c9d0b3940e58e2f321a4d9976f66935fd5b9d526d24bd1e0342ef15a3a1341e77a3 SHA512 f78e3b1294169167809c5fe05f2a69af2bd6c7c4c1bcbebafb4aa6b8ae6ead181a46b051e41193bc31f49c4b4fa7b1ef231d172217c11d301d0ee21d8e411b6f
-EBUILD pypeg2-2.15.2.ebuild 712 BLAKE2B 371026db2309714ca361fd70087ecfe4efef8bedc1b73926f6e41088567c4b1c5e9b112f20c20e9fe1c6ddba75b77e5e5afdac9780fd3557eb2592f808f3a8a3 SHA512 b4fa4038ccc509f3d6ae3208937b8543f477423fb6284c8f2bd684fd29d9fd94468afeab932aea914ba999c9fc6ef329f68d07cfd0d3a5bfe51c21ce4bbce313
+EBUILD pypeg2-2.15.2.ebuild 708 BLAKE2B 964414a6f56f64ea1bec82252b2d671aabb155267e941f2433231bb7878d64dc7e73f31ad60afaca254d55e5967348b210710fa57d12f37bf0669784f6acfa82 SHA512 1eed31b19cd939b9b15b5432d0cac062b14117f1062fa386c731f8a9d8b8b49f2f079db8232d1f76414e5ef8ea732f703c9e3b1d68f5a8d73df0191c84c9620e
 MISC metadata.xml 362 BLAKE2B c34e5f667750e99f16f44361c62c79d138767c94e664be039f81f7b7fb6f295e6610aeca962ece7097dfbc1372e92e697ad99572c036910352362379eb3ab4cc SHA512 7eb0a3fbe48ee8f34bb9f697aa951faece1ce5da90319a5bd8f9958d569eebd2c91539d0d1bd46c51cdc77ddb5c858bb6d158be7268666af668a935e1c4998e7
diff --git a/dev-python/pypeg2/pypeg2-2.15.2.ebuild b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
index a51dfb337e43..512d830bc1d4 100644
--- a/dev-python/pypeg2/pypeg2-2.15.2.ebuild
+++ b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index 03ebd4fdb5e9..0bf542f2bdc6 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,9 +1,5 @@
 DIST pyperclip-1.5.27.zip 16938 BLAKE2B 653b2e74b6f56839ef1f9d59b864218ffd55866660aa7de4284f0bab4c28b0c1aa7a4a65bce0842003d4744a5d40c87943e05bdea13098e250e534a8cb6c2132 SHA512 cefd79f1d246c9aa9d4d0f3d8cdad291ad31bcc2e000c83e5e05704978bbf7b9b45d49667c2e88305d0a5d6baaeacfb47b26bb69fabf89b6b6e3a1e6f1e23d74
-DIST pyperclip-1.6.0.tar.gz 14273 BLAKE2B e91f198d23eb0791dc610e4b9af940694f0857243fbf5caf46d485882a588e3ab537e2a190a1b40e0d9ff4821c8bf977da19559a5b33694d106a68f1001f61a9 SHA512 faf1cd8568a911b263c167fedace8f5f6756e108e3a2484dffa8d3da441311fb3277fd703d5eaea662181250d7b2cc975e9f8ca484dfa2d1cd4470171bbb972d
-DIST pyperclip-1.6.4.tar.gz 15687 BLAKE2B e3520e228bfe2f2de1d307e927f15cee7e5327acfe07071432605d0c0c021ff6bb702e20a743da8120db58fd12a05fca19f5881e80851f41d2cc1034e310f6fd SHA512 4a07476b96fc704551248eb4eb2d69a910f75c266ef0adf4bf804f8694645d910089cfef831569e1d819570873ee75c4339024a89c56fe3eabc5529d07b8a540
 DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
-EBUILD pyperclip-1.5.27.ebuild 476 BLAKE2B 2b8f0a38d32a5879b81933e549f5a5dd41bbb4bbedcf17a20fa3496c9f095ee45c448f8f9ca30c0ba4df4ee460cff21cafebdfbf52301001234a6417f918c429 SHA512 bf7544a12eac638e0640b8497d1cf9c76015170a07bb7081b20ab7273eec18ea015c2d699abfabc2d323f8aaefee67ae756fbc22f45beecf4c2faca6b02e5a6b
-EBUILD pyperclip-1.6.0.ebuild 472 BLAKE2B c6d3caa29cd21b94bea656ee9f6b173fe54810fbeeb94620dc43fe6033372bde10fb0304917dd84edd096e0630ca6c2cfdf6311dd28fd8889ebc00b1e4ce8e59 SHA512 2977f1aa723f057a0c5f24cdef8937117638d2f11690df518b87eab8bc43482134f665718b01749f2e28923058a295e674ed7da36f5a7e66047f5c94494e648e
-EBUILD pyperclip-1.6.4.ebuild 463 BLAKE2B 94f2f385c34bf3294051bbba3bf99ea0cb404508d34d0b52019fd42f06f927d0d158a0395e579d57fd64c033dfd7fefcb327a5da546246ce4406cddc185f1cff SHA512 e3105ba6d7c3c6784cc6afb3b2d2728584e234c440153821c085e6bfceb3eb0fbafc6795e8f71f7c5985a8460640a05a392d1a45b254512bddaaa7f6763c49c0
-EBUILD pyperclip-1.7.0.ebuild 822 BLAKE2B 1c14a8f875a2eab710dc179b24e199a604a08242f90397ccf165779013b0f04c572cb8bb7b1775ecf51f74842806ce39c38c9ce1f8697f29a849419ee1027754 SHA512 7ffe2b90d9ac805f6f1e345fd873cf626d7bb63f3fc8d5196650d041cdaf78438a7c028e777fc6a13d32dc3b72355c5da9c79fcd21724ada481ffaffa3f1edfa
+EBUILD pyperclip-1.5.27.ebuild 461 BLAKE2B 8eb09aa277638b5d8d825c638c22f529901e0f61b6bdcd28c7c2b49c2c312b96f661cf2a98ed5b893f3e39ca9edadc22c0ade3774c2515d37fdfa3a268982a07 SHA512 a86bdf9352983e66cb7b513d956f92d081826794171b546886c3970b2685107739332f7fd10a35638434c028e470b0bfe96accdcd96b3c73a7e97b38d8ec0d67
+EBUILD pyperclip-1.7.0.ebuild 747 BLAKE2B 135ca3bc2f5b7849988d670febdb67bd6b63d86ed5b8c59d42c300c9d2fb7db89f96afc151ad8ed67d4f6bd07a05f62c929e9b407c7dc5acb5b629f7344aeaa3 SHA512 974325b488bd02a6b89f0f35b848ff079ba77ca8a862b4d1fa9e7ae3d83e272a7d8527f8844b49cee57eb0c19cc6755c2112be92f4a9e7f6b634543414fb3b3d
 MISC metadata.xml 430 BLAKE2B 0010f6ce7e189967ada83b89ea6449d6d4a894f9a04a649895f46f9d5af3349bc2b97ecbdb1e6f32a35c4ab3caa97c2799a950d6627e8225b0170bee943d6950 SHA512 883b80ca383707db508144d0434f091827e1809c9029a380c9369f8f98d920e69653767e9034eadeb730611601a0fbf09a222a45e015e08ef95c7fb54158d228
diff --git a/dev-python/pyperclip/pyperclip-1.5.27.ebuild b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
index 6995e045154a..551ed99f674c 100644
--- a/dev-python/pyperclip/pyperclip-1.5.27.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 pypy)
+PYTHON_COMPAT=( python2_7 python3_6 python3_7)
 inherit distutils-r1
 
 DESCRIPTION="A cross-platform clipboard module for Python."
diff --git a/dev-python/pyperclip/pyperclip-1.6.0.ebuild b/dev-python/pyperclip/pyperclip-1.6.0.ebuild
deleted file mode 100644
index 3f3081e7f90b..000000000000
--- a/dev-python/pyperclip/pyperclip-1.6.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 pypy)
-inherit distutils-r1
-
-DESCRIPTION="A cross-platform clipboard module for Python."
-HOMEPAGE="https://github.com/asweigart/pyperclip"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/pyperclip/pyperclip-1.6.4.ebuild b/dev-python/pyperclip/pyperclip-1.6.4.ebuild
deleted file mode 100644
index 2908cf2881ec..000000000000
--- a/dev-python/pyperclip/pyperclip-1.6.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 pypy)
-inherit distutils-r1
-
-DESCRIPTION="A cross-platform clipboard module for Python."
-HOMEPAGE="https://github.com/asweigart/pyperclip"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyperclip/pyperclip-1.7.0.ebuild b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
index 6b173121f867..c879f5e7fe78 100644
--- a/dev-python/pyperclip/pyperclip-1.7.0.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy)
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="A cross-platform clipboard module for Python."
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
@@ -24,13 +24,11 @@ RDEPEND="
 	)
 "
 
-python_prepare_all() {
-	# make tests a proper module so setuptools can find the test suite
-	touch tests/__init__.py || die
-
-	distutils-r1_python_prepare_all
+python_test() {
+	"${EPYTHON}" tests/test_pyperclip.py -vv ||
+		die "Tests fail on ${EPYTHON}"
 }
 
-python_test() {
-	virtx esetup.py test
+src_test() {
+	virtx distutils-r1_src_test
 }
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 12dbfdbb3269..071621e9b301 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,3 +1,3 @@
 DIST Pyphen-0.9.4.tar.gz 1092404 BLAKE2B 9bd96c0d0dc7a7ccb9bebaf7e864ec0212956ac910830d9a3286fc9569d9b044f7aedbc3d807260e5b5e1ccbe84ffa22c686680ebf7352cd23d6ed2755f7d92e SHA512 b48dcf02c5cdf5d7ee6d6968644958af9f31fba046612016d9ae1b8cfe44d438fe769592961f93f3342cc3f3af2dfc6cd40bbfe1be67e59de9a352c33f102917
-EBUILD pyphen-0.9.4.ebuild 544 BLAKE2B 2394b2245827f70f8b09f5da10dd921d7cd0c5c4993ea9d6f394e99cdc83fa416cd476c8891d4607f13b4ebfa208f6ca11a0d5e45f0933cab5308726c29cc312 SHA512 08b720c95e912f678871f273823a328eacf0ca36b8ab42bbe4e70ee08c372bb98f699cd6df2e8bc0401c70bca2e7de47c0b6a6fb514041ad62deec49aa3e0e25
+EBUILD pyphen-0.9.4.ebuild 540 BLAKE2B 932b7f14fd48ea4f2d7f91ade0f3f543fe7404ebe3ce418e0387b164e077a7d4dc4ada67242c39930a25a19f6395099582a18aaabde8faa7f3a343645c8dbca8 SHA512 ccbd92c6670da4811175267db4820249c1435533739620a10df42640cc13fb77ac1bfa714483080377a5ded9960ae1bce194963510a5aeafe73fa189fbb3184a
 MISC metadata.xml 373 BLAKE2B 08556f94edec361c59c9f274d110522b632863008a9a8782a502fb4fc39320f5865a4cb0377ab704452e19137b542c3bc0ff8d4fb435fc70a1d16d9e8f154dab SHA512 9c08d8ea794dab32dcaf659cae7eec1b19d1977fddad2e54bf321e498c85fe2355f4c73bb71c78acfa094c39f20a7775bb84bb8bf163c0e3d0dcccc93d9e998a
diff --git a/dev-python/pyphen/pyphen-0.9.4.ebuild b/dev-python/pyphen/pyphen-0.9.4.ebuild
index 08500c8efb40..673ae5a289ae 100644
--- a/dev-python/pyphen/pyphen-0.9.4.ebuild
+++ b/dev-python/pyphen/pyphen-0.9.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 1235ac718c21..564847111e42 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,4 +1,4 @@
 AUX pypiserver-1.3.1-no-internet.patch 3125 BLAKE2B bf6d0891897d1a7cfea6151df1ad274cda77dde74d85e355a2fb00815513cd612c1af393b4397ce5fa946634397980127545fba3a657e5a9def9eb50136ed12f SHA512 7775abae4f70e45888450a4dce6f55858b7d48d4c7bdfc9f1653319a65608fdc26010040b0beb781a5aa9e0804f016fb56405290426b85724e29177a68658b06
 DIST pypiserver-1.3.1.tar.gz 504875 BLAKE2B 18089a1d18ace55038fb2b114a3402ce1352139a858a2e32399ad36ef0cbe5dfcf9bbdb865807ea84330405bdd4da1c00265e095b7299fe2b9f56150d573f7d9 SHA512 425a557eb74111fb07911cacd275dfa35b8e8ba5e9f230ca5f86500c10b2ab33235eb3376150c75972de3d8ebd85b03ecdf935753b0af46936a78311d5f174a7
-EBUILD pypiserver-1.3.1-r1.ebuild 985 BLAKE2B 7e75419c2d8bfe150bf2c5ba46eaab4e6bc895c8b30a7ee17bebd3b8b4b6900589e5b6a4c0e7886f0783b362422b683fb50973a0ca33b3d51f6e12409e3e91d4 SHA512 54d4c3b91b3dd6ce17b3b9ba6da4d2fbec22b9ca284dd12e8132e51293d5c69f9bb5447debe9c427f8eb2dbbd2ad7bae1d2115d23978b26ce17a6a2922de62b0
+EBUILD pypiserver-1.3.1-r1.ebuild 980 BLAKE2B 3e83458a4d942a0554d2b23e353fe139df54b7c9de3341218534efdf708d8601857ef04bd443d6b40280aa82339e95cdeb41df3983bc39c288fcbb0fe42e0872 SHA512 07dffaa40087c95b7f9660da2c7ef754e25933a0d475a48c74f222d42664b114a53672139b5c39c150c370fb3e873b204f28160964ff810fb7a08885655ac972
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
index 66f4301a9b69..3d66b6ccb800 100644
--- a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Minimal PyPI server"
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index d29175720575..f4905742957b 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,3 +1,3 @@
 DIST pypng-0.0.18.tar.gz 377942 BLAKE2B e27540cabc4b872af5779a128b3213745ff173fd4c0c94ef7b7e9868b84a58beaca40e0ec6c5886a6a6f8652118bd792a0b61275920e1991cafb1568af8a5312 SHA512 3e44b0c86c3ff042c7e4bf03e82281c6807c4eae432c45b9bf4bf9fc844e24031a17245410e9060e6912ef77a30b9ea956422a3d9aac4331e7e81323da632e47
-EBUILD pypng-0.0.18.ebuild 448 BLAKE2B 2bc92aaee92de07e3a91902820d695a9eb68f8ded7b6bd447f2c57b9c4080e971850af8b540c6b12dde7bfb1adde9380088557a848d9c6d11d9b8fcdee4445bb SHA512 95476613460fb3d9b50f276e48b334a932d092a50376d731542959617d4a4bd2606e47cabdd2e5c8a152f2fe43f4d71893fca2321a7347ed6e74e48481f63d45
+EBUILD pypng-0.0.18.ebuild 444 BLAKE2B c4ce92689b1a95c1eee7426efb83609ac49d38757ac1c0bbc173155371673f6b05b7420963f7552b751e38d888519e99ebadd4f7536d92522c9a34299786aa90 SHA512 5df4032a1f481c5505f49e509412b983d657dfd59fc77448dabd50208e58b125d0405b4867a41e7c84a652fe19493d23e2ef2c6857314dda78f570c0c6d8a45d
 MISC metadata.xml 562 BLAKE2B 08122fff5bdc9330b443f957f695e2141417f8e484721bd8a478f164cfec45f3b67bbc54b18073b24495798d21d00f658d94708afc07f5f7cc1a47811bb3442e SHA512 4c8e61b10ebdfc5385f762fa6465fe26a559c6c2e220c6714ac316cd2458717a789d79483b2efc9383a719c8bd8c277b4f38abec245af95eb8b8dc0c7e0038d7
diff --git a/dev-python/pypng/pypng-0.0.18.ebuild b/dev-python/pypng/pypng-0.0.18.ebuild
index 232bc136c3b9..3bbfa383ef9b 100644
--- a/dev-python/pypng/pypng-0.0.18.ebuild
+++ b/dev-python/pypng/pypng-0.0.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/pypodman/Manifest b/dev-python/pypodman/Manifest
index 8244fc1430aa..d706ab9a01a7 100644
--- a/dev-python/pypodman/Manifest
+++ b/dev-python/pypodman/Manifest
@@ -1,3 +1,3 @@
 DIST libpod-0.12.1.2.tar.gz 5987875 BLAKE2B 11381c53e768c94bfadcb2013a028f64058b0001cd985ef289d1618163225cdf10bd608cff0cd6f7fc1c094497184fc6d0cedea32fde54f3581ebb51eb5eabdd SHA512 9abb46d7880c4577d22b48aed01baeae29662dc3dbbdbc297f1eebe8324fb734d9bac6cd105dc93f7600753874c0fa581142d1b16f7490175cea80b8f62b34ce
-EBUILD pypodman-0.12.1.2.ebuild 817 BLAKE2B ada434ab24d7384ab155563944f3a26a942ef6da6dec8ba2314a9c2dd8e9b2be95b913f739898cc2f0f253b66a35ef5373832f81337e8e3ac117d64a37d455c5 SHA512 d7bb69892c6fdf94543913c62dd270190759c558b57f3c84f7ac66ca0a5d20992938cfeacb748e3381d86daba1bae9c7c827b35d260f6cf0f245bbef1222f250
+EBUILD pypodman-0.12.1.2.ebuild 815 BLAKE2B 980f8fe3b90ca76df8268fa4c02a9b2d066ba86210b31b951acce9675682550f25f5d8794bba3302c578467953ccd2886e31e26a71e502b9d5793f1547197518 SHA512 e784b590c6027a4a1e3544c05239eef849cf54a892fbddee7128cb3163d4fa14b4fae9a2a880753801e647f2eb40ec60a2326a068dfa882dfba217a54d45db8a
 MISC metadata.xml 326 BLAKE2B 77218bd50d76e0dd8ffbeb168b7e08d7cea7f8768f9d552865fa85f7ae78b9e4654fcb672320776b28b013e592117a4289522bdb0a62f03f40523b78d36f6171 SHA512 2d777f25c03c813cd1ec96215d91dd793350d48ba396de9c544a53412401b313ee5270311612e4a13a2b1a318591ba7fd96db686d639e241c13ac432808f219e
diff --git a/dev-python/pypodman/pypodman-0.12.1.2.ebuild b/dev-python/pypodman/pypodman-0.12.1.2.ebuild
index b3798f5924a9..53645e0709f9 100644
--- a/dev-python/pypodman/pypodman-0.12.1.2.ebuild
+++ b/dev-python/pypodman/pypodman-0.12.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypowervm/Manifest b/dev-python/pypowervm/Manifest
index 4d2a7edca29a..2f3cc1948c1e 100644
--- a/dev-python/pypowervm/Manifest
+++ b/dev-python/pypowervm/Manifest
@@ -1,9 +1,3 @@
-DIST pypowervm-1.1.10.tar.gz 887266 BLAKE2B 61767773e870fabe2b2954b0e6d13488e7eee83360e7e575fc4ba330148a84f46445c4107929f2e9a2d5ef891195de6374d9c75fd0ee624c71444c338405c8da SHA512 9879b685e46efd4a15f463112bf800884d0e1bdf43ef0fe790bc65334b2f1eeea1b531a0796e1673f4114ea8727c3f3a57bc467934aa535daf17189d0068e253
-DIST pypowervm-1.1.16.tar.gz 895383 BLAKE2B 147912526d3d20b4c94be0a57cd28f611d446d2596c07986bc8d8239640e59cd21fc96b41c6107602ab4471f125750ec2da60d456ecd9d806499ebe84a116149 SHA512 d71fac1f6f9d0de903d0fbec6f9eea691882901b1149bd9c57173cd07615475175faa5d27b7e6c6e9a67c4b2ce23eb300dfd7c0689751d3d0d1bcc6d1b9541f1
 DIST pypowervm-1.1.20.tar.gz 906153 BLAKE2B 868571636f3c21b5d179ba587f7693dcf8e55661324d3ba5578be34813a67a5b2881441c3aa3744a9fc1c6ea34626085d62c5829368c43b329edb98804d9fb9c SHA512 1ceaf00f830caef918c27b342f1bf59a41e88593eb36f6c5f01c7a0ef786a69b15d271c87d161f069e12c1224ebb4f6cdf349e31a551bd26fac5206860ba9019
-DIST pypowervm-1.1.6.tar.gz 872456 BLAKE2B 02afd4c25aa5f0b005e621fe190decb2724ff289d6f1330744428bd6616a8b784e79486e4e26b46ee76a3e6346f16100cd788f705f264ca9b29b8522a2c8bc9b SHA512 31211b93f85cda9067e29700794daf9aed5c43478c27eb6dd5a150120282a7d46d4fa4fdf5fa038023153b02aae85f236d681e66646912a464bc3d265c87fefa
-EBUILD pypowervm-1.1.10.ebuild 1338 BLAKE2B d6cf74c407d4db99ce8701bf75a633e9a9fa619211ab99d58fb43bcfbf97382b66c0216653b55caddfd7523afc066dd6ecea0839e2c3701f755bccae8f15f104 SHA512 bb337c628680214d2889bf83da89fd2ac26d8e81df523474876f0a948c8cbf12b10a4514715d7d95b3798f6759d715b89dace213501265ba1d8d548bfb54dc0c
-EBUILD pypowervm-1.1.16.ebuild 1249 BLAKE2B d9182320a9cf47c7e1750a71192c3f97b406277445d1766de9da24783f7cdebb3b814bcb3b5de606330bd148ed5eb04a46febabf468c9888869b6a3c8626e2a4 SHA512 b40f87e4e5df0fa0133a627358848d6ab350a9a2a6a0cd1710654d2c0efd4f8cada71e60db142904e643bc4d8ce6aca6e5c1cf2a163d195d24ff7d31db6e2be9
-EBUILD pypowervm-1.1.20.ebuild 1251 BLAKE2B f66f6cb41e671de9c3a89e63942f3cb18a694eb9579a54fa94ef184679abc848bf685a23d79630f9f60d83d8dd983bd01df4dae681f6435c878cee02b215e79f SHA512 1fa614a4ca78d31ae93c68edc04db4b12f4fd37576451ee5738a81c812770f777c1a6b6e74a65356fcd68749b6618870a84a4cf7ae1110142ea341d2df2a173e
-EBUILD pypowervm-1.1.6.ebuild 1244 BLAKE2B 57ac6b14b5e97f9d8bcc76ee6e81caedac3600fd1111d5144e4966602c3ed113787fcb6c4ac2564c68f8303b3e212d4e56429be393b156ff7addbe9904d42b70 SHA512 90c1ba6097eb16d090a565bcac037aca2862a8683626cd8c2e7c95c361d594c9c64c36aefc7bd5e0d079485256510688071100b241820f72f4e829f750661647
+EBUILD pypowervm-1.1.20.ebuild 1238 BLAKE2B defcf7d650537d91f8ad2b2368cd3a2a8fdb1f2ba40d6b5dc57cabf9b32ce71d93859764844879306b5561a9339ba27b53b7fb8f9ac5a78b2dcbc1f21483fecd SHA512 441aba8bce12e7e3b05a86393990b8e3e3f38302cfa689a2c07e8955bef2a9839359e96fcc9971aac09464902b22f7867bb5b29941046f9e340f6466650e1112
 MISC metadata.xml 383 BLAKE2B be09e21c8e64a738f362727e96417344afd5a4af5e99314274cb2e77f2c7b32c8c5d68f7e8d44b053297aa597ceeb6a1e4b41d1a30954691920b976694416d8f SHA512 e06a03085a277a53d5a04e076d240d59cd81e83d40241856a2878776792366d50bdf3e9fba2dacf2931de17234f87583b3114f3f696db1254d8a185a9da06d17
diff --git a/dev-python/pypowervm/pypowervm-1.1.10.ebuild b/dev-python/pypowervm/pypowervm-1.1.10.ebuild
deleted file mode 100644
index 88c57d202a63..000000000000
--- a/dev-python/pypowervm/pypowervm-1.1.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Python binding for the PowerVM REST API"
-HOMEPAGE="https://pypi.org/project/pypowervm/"
-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="${DEPEND}
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	<dev-python/networkx-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pypowervm/pypowervm-1.1.16.ebuild b/dev-python/pypowervm/pypowervm-1.1.16.ebuild
deleted file mode 100644
index e1a062bd198c..000000000000
--- a/dev-python/pypowervm/pypowervm-1.1.16.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Python binding for the PowerVM REST API"
-HOMEPAGE="https://pypi.org/project/pypowervm/"
-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="${DEPEND}
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pypowervm/pypowervm-1.1.20.ebuild b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
index a1e5972a5161..c2d855a03839 100644
--- a/dev-python/pypowervm/pypowervm-1.1.20.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python binding for the PowerVM REST API"
@@ -18,7 +18,7 @@ IUSE=""
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${CDEPEND}"
+	${CDEPEND}"
 RDEPEND="${DEPEND}
 	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
 	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pypowervm/pypowervm-1.1.6.ebuild b/dev-python/pypowervm/pypowervm-1.1.6.ebuild
deleted file mode 100644
index b65e8df62b54..000000000000
--- a/dev-python/pypowervm/pypowervm-1.1.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit distutils-r1
-
-DESCRIPTION="Python binding for the PowerVM REST API"
-HOMEPAGE="https://pypi.org/project/pypowervm/"
-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="${DEPEND}
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyprof2calltree/Manifest b/dev-python/pyprof2calltree/Manifest
index c531ae0b14ce..c1af6cc08d86 100644
--- a/dev-python/pyprof2calltree/Manifest
+++ b/dev-python/pyprof2calltree/Manifest
@@ -1,4 +1,4 @@
 AUX pyprof2calltree-1.4.0-py3-test.patch 895 BLAKE2B 23fc01e9c0657b26ebf061bb8e42b966e35bf73190d8d46c3822a04a5f4f637448307924e4e89274ba809661c330c7b4c7ea58b85d81977857fc21a724e217ed SHA512 26f55492e65f8708c0587c594ae05a4ffe2611debe1dacabfa6b959468c02ae5e3c4b8ca0a86fc8f23be1646aef83b9450468483f7f40a8f746e026dac0b70db
 DIST pyprof2calltree-1.4.0.tar.gz 7784 BLAKE2B e8b9ecd857930406bb3b7f7851913a68f1e3433f3b42c262922b5d5b0fbfa692078fdad811d4ca358f7c74d14320c914cfa779ed0b9da8c4fcd7d8e021fd3319 SHA512 b1acba29cd4e5112012eeeffdac53900688a28707306ef3a8a3827f7422c35bc921d59d33db3209db923bb8640014e7d9d7d819eafbcb19e0cf7e6159537bded
-EBUILD pyprof2calltree-1.4.0.ebuild 670 BLAKE2B c0762270b43591ead766d7c7298edbe5578bcf710e5af2d3e22903ed7e90b23b74382c56d18b73f724a0e3bc23b8763cac03e07439a6acb36fdf3e8248f78488 SHA512 a49030aff341299d345a5faa3d1478f3d4ecb926b1d753333de0036431471d1c7af739bb4c2e420e289442c788a753abb085b1d669237eceb935194006def59c
+EBUILD pyprof2calltree-1.4.0.ebuild 660 BLAKE2B d8793fc6d7226475967de9b68ddda684a223206dd0590bddf72ba36547041fab99f8388d9a9ed73f6e281093e18b79a1a9be0d7cdf5ed23f34dfbe5a92a53d62 SHA512 60cf12057fc50f7fee97ef0b2176e4ed5ef71734fcc94aeb52bb9c2abc32c340794aa7d91ef3437e1e12368114ac534f97463a17eb7b5b021d802e4c7aea576b
 MISC metadata.xml 318 BLAKE2B 9a8c3c56c2987bb1de47d374f81d25eee0aec15c00432bfd1585dadd5c57aae4ba8453739ad12dbcb8b44c54de4c5042a41da9458585387e1000ec6e97b9a267 SHA512 7a75d6efb9f11a6e1ce086cf53e5038b12815fe8110bf16c9b6e781c31cb721ec8694fb6fb0d4d131f9581cb130cecbceadf0e10b1528717cb8f4ab977514372
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild
index c283ddfc7cd4..f341bae4d0e2 100644
--- a/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild
+++ b/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 9c9937b08b73..349eea37dc15 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,6 +1,6 @@
 AUX pyproj-2.4.2-conftest.patch 803 BLAKE2B 60806213e22edaf3457046e46303c95544085d9a870692677a8ef06506a48c7f7f380f4932a5b33f1465a8a0298e15a02033ce9cd690d631bfef9687a60c06b5 SHA512 2d5222ae3a91f61994b9590b08ed513c73be0dbb39b612c1eef4ca4766bef4981b4db23be0fb1ced2a88c3de7b400f8ba5086d4fb8837ed2a43a6cb6c04899f3
 DIST pyproj-1.9.5.1.tar.gz 4424543 BLAKE2B cdf954ec0fe794f354b246fcd5afeac01b796f84cc2456efce3e289fcfb12074d7352c9fa7e9d74356199135dfa9814c07da9379f85771dbb7130b8b9b7ecc34 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324
 DIST pyproj-2.4.2.tar.gz 463252 BLAKE2B aa80ee3052f42f0d49d02b1dfa3d1790e02fe6aa4092319ff8e827b0a341cff2cb4779891f74919c2b14781d841b3662154882b5f218a22b55ad79397f3eb4a7 SHA512 20f0a742ea5699a6d7a621e93157512478de69ba740bb7b0df46b6d5668f6db93b07e1fc0bf4d089362275ea8edddf3100a972a533ed8b6a0bc56a04a20d4ef9
-EBUILD pyproj-1.9.5.1-r1.ebuild 705 BLAKE2B 2f7086856381e17a62e1cc78b9f815d3ab1dcb8b36706f5326c82256c012fb07322bc9cf495d86b97e0b061e066013b13a8478197b9dfcd8de739e9c771c3460 SHA512 b2fadc42b327263b6ba6baafb23de6ad5c63eccd35cbe41853e22710584f0e025ad041760ac979e9c5a04b16108816760a864581e12dbac0a95968405fd8a47c
+EBUILD pyproj-1.9.5.1-r1.ebuild 701 BLAKE2B f75dab7a97febc7503649bd1fded422a58ab07019447d0b0a3d748af18580a3161771dacfd28dc3b158ee2e405da92389e1299df54028543b58125f710fccf45 SHA512 40f6d371ca16d92811c38a070ff390e7544aab4116432d1523e4bdcaa5283768793d12b7dbebd9fb82730352cf191f2d6d79e02696e41c8493ded3a5fdd04316
 EBUILD pyproj-2.4.2.ebuild 877 BLAKE2B 9ec467fb01b28fcf05e3d04beef3a0638e77598859247f88d242b6b67f7b5b89577842856f495f73b65bd867de482a778de1efd15d854f1a2b8dcde5ed908864 SHA512 a4e5f7098396c5a3730f42a2da391895d5750d62f3006c3fdcbb37dd5d469406d15ab964d2b66e4c48bd478827366c6d483b655a8f70a658962ed9271c6c44ca
 MISC metadata.xml 413 BLAKE2B 8b30b06984a66d228b50b463a7149f95bfb671d60c3089e88ec11cab7b88fc7c0f044cd879d9e5fec5bc61840c6f35b17e22b93921e3716ce42b3066fe8dedd7 SHA512 84f84c14bce12374abb5014771c1663bb8877d7808e65fe60f698c60b4c7df17db703c6c1c55cb692b0c8f6a94847758e756d6f9bd7e69f59e915b09c71682ea
diff --git a/dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild b/dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild
index 76396b18cd87..dd5d418d0547 100644
--- a/dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild
+++ b/dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
new file mode 100644
index 000000000000..f7dfe837fe78
--- /dev/null
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -0,0 +1,3 @@
+DIST pyproject2setuppy-2.tar.gz 7589 BLAKE2B 21abc62707b590e5676b53500094887f7768082ea3c6d89b2d447461c219cda726de59aa299ebb960a0767935ece06abdf4729e4dd22d3bb003370d95ce19858 SHA512 684b292a6c2880f756ee7a4ba34a674bdb12f27952673cda9bc488f90101b2d1cd134e240b924148044fb6d02c5b7a5068fb7a857fef3f0c3f65f91e14c0ca4a
+EBUILD pyproject2setuppy-2.ebuild 761 BLAKE2B b550dc24e84fe62ec9d141912dd5a4632e533537060e7539b76490d0ec762210a650070d2ec9811d81b9a0728eafa4abd530efad64ccab15aeb404ac91b4079d SHA512 3a3656b7aaaf4c9ae4e13457898a1e0d5dc2042c19cb8eee0cae20d20e211d9f0d5ba39e6fedd7ea3d885462d62b8e7497097980692a7f1e07f5441ce3a267b8
+MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
diff --git a/dev-python/pyproject2setuppy/metadata.xml b/dev-python/pyproject2setuppy/metadata.xml
new file mode 100644
index 000000000000..22e0d6d87f61
--- /dev/null
+++ b/dev-python/pyproject2setuppy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-2.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-2.ebuild
new file mode 100644
index 000000000000..e93f5bdf05f7
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
+HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
+SRC_URI="
+	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/backports-tempfile[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		' -2)
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyptlib/Manifest b/dev-python/pyptlib/Manifest
deleted file mode 100644
index 71cf93866f65..000000000000
--- a/dev-python/pyptlib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyptlib-0.0.6.tar.gz 239316 BLAKE2B 117851d5ce59e1eed4b37beef4b6b18135d693670fe50d70fddcd72ea3da2ad9eeca7c1002ff4ea0b0a3aab8e1414c63134e022c78f69dea6e6016aa368bdd91 SHA512 f54ee3ae51f2d6884b0157f8cec3e9af267f926e50728478b961551d069fc6c4a2840d59e74d5b0f93b4bb305d9f91f31b91fa4425d1931688ffc5783f6192f9
-EBUILD pyptlib-0.0.6.ebuild 745 BLAKE2B f8794636165add86b0958dbf2346775ed604a34e7c8e9ea39cad026c47310dc60f3688309ed3f3df49ad4287a58bfcf4525256f8ea6c7103b674e8a8e3bcc5f5 SHA512 177b0d47cb34619141b9185ea11e9aec03136265784ec8dfe4e92919f1fbf63e02f619c7c88561cd77861c1ebeed892b7185c556e81a84a740e9edcc302e3a14
-MISC metadata.xml 332 BLAKE2B 3a6cfed2be64b20bbf40950f4e40933ea66688d5e6fa80b8c5021356991dc1cfa779f468a32aa20db40dcfe6ec7bddb2dbb8b39ca8e628f3bf9e7d3bb05bb883 SHA512 d60850dcff84f4105ca91f7675403c64e3ec14e11f186282239623b0d58b47c0379cf3af19e0f440b2564d037a80d52c8abe89a4e415b5eaf43b66c6b1748a1f
diff --git a/dev-python/pyptlib/metadata.xml b/dev-python/pyptlib/metadata.xml
deleted file mode 100644
index c298cbef539c..000000000000
--- a/dev-python/pyptlib/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pyptlib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyptlib/pyptlib-0.0.6.ebuild b/dev-python/pyptlib/pyptlib-0.0.6.ebuild
deleted file mode 100644
index a5195aa22f60..000000000000
--- a/dev-python/pyptlib/pyptlib-0.0.6.ebuild
+++ /dev/null
@@ -1,29 +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="Python library for tor's pluggable transport managed-proxy protocol"
-HOMEPAGE="https://gitweb.torproject.org/pluggable-transports/pyptlib.git"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DOCS=( README.rst TODO )
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "tests failed"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 2fcf5d3a8459..ffcb5690bdfa 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,11 +1,2 @@
-AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
-AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
-AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
-DIST pypy-bin-7.2.0-amd64+bzip2+jit+ncurses.tar.lz 13208672 BLAKE2B 526e2f4eeb57d1f169344244384f3aa35d77bd0f9dc4e1f463248eeac023e7c98a21e565080d0cc3e56c1950128450b1fc6e830e33032e8267aa21c5beb4f80b SHA512 d49942d1cd97ab580850b95590cf0982eb7f53e0b88681408392266cdad814d00d195edd757b106e4016d8df9e0d3c53bf937de145f9257313f33ffb86c2229e
-DIST pypy-bin-7.2.0-amd64+bzip2+ncurses.tar.lz 7865924 BLAKE2B 1d3cf776274285aee433de2dc8ebd5e0bf52a7cc700f1bbfb16ca071ac5b6017dddad211d9dcdf809f97289e12d38e5758023dbd80c6a68323ffaa02e8c72614 SHA512 ad481a62359c615a0fcb1bb3e57b84c536b43d569ac88393000bd8b9e9d0fc3e685c3907cfcf241c3dc60479589d042009ffe1382a27be2581c8ab421e7f0397
-DIST pypy-bin-7.2.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9887935 BLAKE2B 177780ff596b1256f623982ba44ec2ec1c951e420a4521520ffee93e6e480864c59e8e55769f583841a0622693a578f84f408f6e577f97e7812ced7fb7594104 SHA512 dd0c71bff27beaef98ab0ce114108cd586863ef2d6eac999dbb0bdbef7cda1f5f568b465e803339a7b92262354bfe674cc6161ee1c0d479545c6d7bcd58ec3cd
-DIST pypy-bin-7.2.0-x86+bzip2+ncurses+sse2.tar.lz 6092349 BLAKE2B e285f4c5443c356cba90c0e56dcf9ad75357613bcf486e80816d4304bc9459ba53250a58f09155382f6ebb624610780a9f77c312aeb55a28236474cedf994e26 SHA512 0a4d782f5b074cc5fb206cd2843a59ea59c3a17ac8fd8bf2c74f0997d906e5f722142f0d33a20cdb3a7c7eb476f3799a797d5c2ccac2632c425317d38cb54b7c
-DIST pypy2.7-v7.2.0-src.tar.bz2 20219532 BLAKE2B 225e2cebdfa3ceb310f2a047b1d9e1d375b181c10707822890f39fc0a5ec9e6ddd7a8cf6e073074067960b766a0a813294042513a08b8e7e02b011f612e17917 SHA512 8f724490f9fa06686c8e25ddd3592b260bbffae460395de4c7d29d983780ce9b8925fa87434aac6446aac2034381cc1a13074faf252f5d1ac466a252f219f1ae
-DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
-EBUILD pypy-bin-7.2.0.ebuild 5696 BLAKE2B 43ae06070105a417d42e210567794e6252646c5020a80dd9da60c167ef64d004768cf17cfea86a64c12aa2ec7da73ebfd49d39a5f8acab643db656b654f645c0 SHA512 c91fa6531e1399c3da593c8230c5d9eded26a396911d5219b085c10c110faa5492db464edd7ff81d7101ac09f069a910335d327147a433d85a6d4c780db114b7
+EBUILD pypy-bin-7.3.0.ebuild 414 BLAKE2B e8e54866dcc6edc8ff4b5fa7d9f3c7175b3371e60e48ec0f0678605aad025990c31de89cd03b0e48a4137e589003ff7dc990a36bafb8d3bd32523fd8827d9d77 SHA512 1ee2344e69fbf4da92992884e0e9f9c564914844018e2344a8a6d1a194ec5bf26d9feb2cae210249f158ce6b6ba7d1faed02fa1d368f3c089864f9059f63467f
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
deleted file mode 100644
index 65321bb60e6e..000000000000
--- a/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib-python/2.7/distutils/unixccompiler.py
-+++ b/lib-python/2.7/distutils/unixccompiler.py
-@@ -297,7 +297,7 @@
-         # this time, there's no way to determine this information from
-         # the configuration data stored in the Python installation, so
-         # we use this hack.
--        compiler = os.path.basename(sysconfig.get_config_var("CC"))
-+        compiler = os.path.basename(self.compiler[0])
-         if sys.platform[:6] == "darwin":
-             # MacOSX's linker doesn't understand the -R flag at all
-             return "-L" + dir
diff --git a/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch
deleted file mode 100644
index f0268e296954..000000000000
--- a/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 07:14:11 +0200
-Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
-
-http://bugs.python.org/issue1222585
-http://bugs.gentoo.org/show_bug.cgi?id=599918
----
- _osx_support.py                | 10 ++---
- distutils/cygwinccompiler.py   | 21 ++++++++--
- distutils/emxccompiler.py      | 14 +++++--
- distutils/sysconfig_cpython.py | 26 ++++++++++---
- distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
- distutils/unixccompiler.py     | 55 ++++++++++++++-------------
- 6 files changed, 112 insertions(+), 51 deletions(-)
-
-diff --git a/_osx_support.py b/_osx_support.py
-index d2aaae7..8bcdb05 100644
---- a/_osx_support.py
-+++ b/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # configuration variables that may contain universal build flags,
- # like "-arch" or "-isdkroot", that may need customization for
- # the user environment
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
--                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
--                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
--                            'PY_CORE_CFLAGS')
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
-+                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
-+                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
- 
- # configuration variables that may contain compiler calls
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
- 
- # prefix added to original configuration variable names
- _INITPRE = '_OSX_SUPPORT_INITIAL_'
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
-index 767400c..7133097 100644
---- a/distutils/cygwinccompiler.py
-+++ b/distutils/cygwinccompiler.py
-@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
-                 raise CompileError, msg
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError, msg:
-                 raise CompileError, msg
- 
-@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
-         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
-                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
-                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
-+                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
-                              linker_exe='gcc%s' % no_cygwin,
-                              linker_so='%s%s %s %s'
-                                     % (self.linker_dll, no_cygwin,
-+                                       shared_option, entry_point),
-+                             linker_exe_cxx='g++%s' % no_cygwin,
-+                             linker_so_cxx='%s%s %s %s'
-+                                    % (self.linker_dll_cxx, no_cygwin,
-                                        shared_option, entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
-index a017205..bdc532c 100644
---- a/distutils/emxccompiler.py
-+++ b/distutils/emxccompiler.py
-@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
-         # XXX optimization, warnings etc. should be customizable.
-         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
--                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
-+                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
-+                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
-+                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
- 
-         # want the gcc library statically linked (so that we don't have
-         # to distribute a version dependent on the compiler we have)
-@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
-                 raise CompileError, msg
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError, msg:
-                 raise CompileError, msg
- 
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
-index 35f39e4..8dd032d 100644
---- a/distutils/sysconfig_cpython.py
-+++ b/distutils/sysconfig_cpython.py
-@@ -171,10 +171,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -189,19 +191,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -210,13 +220,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = so_ext
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
-index 368f232..4fe1f08 100644
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -67,6 +67,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "cc -pthread -shared"
-+    g['LDCXXSHARED'] = "c++ -pthread -shared"
-     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
-     g['AR'] = "ar"
-     g['ARFLAGS'] = "rc"
-@@ -85,6 +86,7 @@ def _init_posix():
-             # just a guess
-             arch = platform.machine()
-         g['LDSHARED'] += ' -undefined dynamic_lookup'
-+        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
-         g['CC'] += ' -arch %s' % (arch,)
- 
-     global _config_vars
-@@ -168,37 +170,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -207,13 +224,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = so_ext
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
-index dee88a5..558b568 100644
---- a/distutils/unixccompiler.py
-+++ b/distutils/unixccompiler.py
-@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError, msg:
-             raise CompileError, msg
- 
-@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i = i + 1
--
--                    linker[i] = self.compiler_cxx[i]
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-+                    else:
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
--- 
-2.12.2
-
diff --git a/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch b/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch
deleted file mode 100644
index 9be52cd0b753..000000000000
--- a/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 959e2aafbe6cabd4e6860f842bce9b8644f627ca Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
-
-[updated for 7.0.0]
----
- lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
-index fc43951da0..c2564188cb 100644
---- a/lib-python/2.7/distutils/command/install.py
-+++ b/lib-python/2.7/distutils/command/install.py
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -476,7 +483,11 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.21.0.rc1
-
diff --git a/dev-python/pypy-bin/pypy-bin-7.2.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.2.0.ebuild
deleted file mode 100644
index 45eeb5eebb3c..000000000000
--- a/dev-python/pypy-bin/pypy-bin-7.2.0.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-	)"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 tk"
-# Supported variants
-REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c
-	usr/lib/pypy2.7/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED}${dest}/pypy-c" "${ED}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED}${dest}"
-}
diff --git a/dev-python/pypy-bin/pypy-bin-7.3.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.3.0.ebuild
new file mode 100644
index 000000000000..e0bf0390f569
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-7.3.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Backwards compatibility package to install binary ver of PyPy"
+HOMEPAGE="https://pypy.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0/73"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm libressl sqlite tk"
+
+RDEPEND="
+	dev-python/pypy-exe-bin:${PV}
+	~dev-python/pypy-${PV}[gdbm?,libressl?,sqlite?,tk?]"
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
new file mode 100644
index 000000000000..08cabd17986c
--- /dev/null
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -0,0 +1,4 @@
+DIST pypy-exe-7.3.0-1.amd64.xpak 13515366 BLAKE2B 52a3640b7a905a5ca7097a752d747e048a21e55b354d60bd3b9ba146d995ec1682bb510e97b94d3525cc46c6b80ba9be0eff8497f1c4c0aa0b60374c89077b99 SHA512 2514d0eef17eb41a6ed4081662ae1fa57fe1e74b0b29d35ab7c46ccec5729a76603d97fc98a3d3213e5bdaca4f29a4a3a42f6368bd610161e897f74f9a14680c
+DIST pypy-exe-7.3.0-1.x86.xpak 10261761 BLAKE2B 60726089208c925baf233072de2d7f580289a5ba5d920cf3bc2a47fd146425dd38f08e0033ff16243914e95a18f79990b071bf93fe221f85a0296fe081ca94f6 SHA512 1afd0d3ab20ffb627159ef483260a446c6defc761ed69eea81e2b4edd36fcc29a0f43b91cce5f97f8fbe2f1f830fd395181faad281234cf60d1baf7ab1a48876
+EBUILD pypy-exe-bin-7.3.0_p1.ebuild 1087 BLAKE2B 183d43f4251f0f5a7b11988940d7c3b1e3ddf7d3127c0a4806ecc90c0c902229937807749d9d28b9ddd3f072d637cbcdc7176cbfcefbc959a75d4e02e26623e0 SHA512 0c0065219e6ee5183dc6f11d261db2e4756fa777bafaba3dfaa2c1853c20b1a1afa64d3fcd9831d57d07b30c78de01603cf2bcc4bde69b92e81ddadc6affb7ad
+MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-exe-bin/metadata.xml b/dev-python/pypy-exe-bin/metadata.xml
new file mode 100644
index 000000000000..ff5bc95069a0
--- /dev/null
+++ b/dev-python/pypy-exe-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
new file mode 100644
index 000000000000..1ad8ffeb016c
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy-exe-${PV/_p/-}
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	virtual/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
new file mode 100644
index 000000000000..37e0cd6633a6
--- /dev/null
+++ b/dev-python/pypy-exe/Manifest
@@ -0,0 +1,3 @@
+DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
+EBUILD pypy-exe-7.3.0.ebuild 3906 BLAKE2B 198a7e3807ec3c5c485e8c3132fcc9d1063f66326be19602ae2c0fe34fd52c2ffc70307c1d3b0e5f669c4bcab53a3c68621f21b81963b6b24d420de03fb3913b SHA512 3cc1b153462faa9bb394b52ba11468f80f6ca5250af897d7c032cb7992a4a3a4a198c882fa8e6ffac8b1fff03687a0e0dfa08d4dc42c5594f99f5351f256cbb9
+MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy-exe/metadata.xml b/dev-python/pypy-exe/metadata.xml
new file mode 100644
index 000000000000..cf6720905ca5
--- /dev/null
+++ b/dev-python/pypy-exe/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint.
+			This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86,
+			at the cost of lengthened build time.</flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
new file mode 100644
index 000000000000..520cf4abddcc
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy2.7-v${PV/_/}
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			(
+				dev-lang/python:2.7
+				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+			)
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && local EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV}
+	insinto "${dest}"/include/${PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index bad2839b5eb0..e4dfb171adf5 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,11 +1,7 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
-AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
 AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
-DIST pypy2.7-v7.2.0-src.tar.bz2 20219532 BLAKE2B 225e2cebdfa3ceb310f2a047b1d9e1d375b181c10707822890f39fc0a5ec9e6ddd7a8cf6e073074067960b766a0a813294042513a08b8e7e02b011f612e17917 SHA512 8f724490f9fa06686c8e25ddd3592b260bbffae460395de4c7d29d983780ce9b8925fa87434aac6446aac2034381cc1a13074faf252f5d1ac466a252f219f1ae
-DIST pypy2.7-v7.3.0rc1-src.tar.bz2 20416611 BLAKE2B acb971ec6db423d32aba9691672ff04257d4188d73852577a924305238ac16c71370e23e4a8da38b309e3e280baeb58cfa21a94a5b7252c0a1e54db5fd27dd2b SHA512 f24de1766da15cdf98333c8ac1942c14ab1990de23df2910c2cb0e63f65bcd1c72545f6c9913175aea53a17e9a65dd302a80fd3d424665c99c372fb6bd179807
-DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
-EBUILD pypy-7.2.0.ebuild 8167 BLAKE2B 16da9c60c45ae5db55a6483c1c4df0d9b18c2c779c030c00125df3c50e8ad099045675e2cb014f3ddd2649f7a10086be4373eb0d18ab0cc90921dd2af188a2df SHA512 68e166c11e98d827f3d6333410a50d9b705a5c7a7551ee94257260ffb93ebe482f8d7e99118ea7c3867cb751dabb395b9f991ec4309d306dd9d83ecb081fe1b1
-EBUILD pypy-7.3.0_rc1.ebuild 8077 BLAKE2B 5d2336ccd17d952a13e68810d89235e778c22f58de012b894183be3b1f86a8551be6c1ac90247874190afa3ca0751fb0b8084243b0547e0d7f40d88dd58d9874 SHA512 db03d8c2e7369418495cc8d17f411ea2399819e81e9a5fe6921309d10757c15dff691558336eb80475716b597b6a041f0e34a15fc49c8858b8385126a301c1bb
-EBUILD pypy-9999.ebuild 8177 BLAKE2B 3baed099da7afd1bf63b30320a6302ee3af831befbaac01ab18d16c88ae282ad1aec4a000f1a644c8f71e026689307725c20b45bad2f5dae6e748a26b0e186d4 SHA512 4e661e7aaee76c5c9097a1e58ef66db6b79b925afbb551bf0deebb9a214f05abbfd0b337a72ea8f40cb87f317dc241eabcf97ea9489f91cb6f8c1672c55b55f7
-MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
+DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
+DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
+EBUILD pypy-7.3.0.ebuild 5338 BLAKE2B a18cb8ab95852b89bbe7c51c6c5bf6ff8b9343f57a7c4fc7447894a0cf9e4f74982171f777c84cca694fede8223c647192a7c4e15521a32dda439dea11ad7eec SHA512 f7107bfc6b130b6768d31818801c7b0833317c028db03207c3217db567c7f61d4897cff6d70da23592569bfda056b3bbaade528cd59ac4eb0b40d60c12f7ebbc
+MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy/files/5.9.0-shared-lib.patch b/dev-python/pypy/files/5.9.0-shared-lib.patch
deleted file mode 100644
index 5d89d3b15a30..000000000000
--- a/dev-python/pypy/files/5.9.0-shared-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dupr a/rpython/translator/platform/posix.py b/rpython/translator/platform/posix.py
---- a/rpython/translator/platform/posix.py	2017-10-05 20:17:25.009954656 +0200
-+++ b/rpython/translator/platform/posix.py	2017-10-05 20:17:31.115666386 +0200
-@@ -227,7 +227,7 @@ class BasePosix(Platform):
-                    'int main(int argc, char* argv[]) '
-                    '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
-             m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
--                   ['$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)', '$(MAKE) postcompile BIN=$(DEFAULT_TARGET)'])
-+                   ['$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@', '$(MAKE) postcompile BIN=$(DEFAULT_TARGET)'])
- 
-         return m
- 
diff --git a/dev-python/pypy/metadata.xml b/dev-python/pypy/metadata.xml
index 89f86a0b2bea..ff5bc95069a0 100644
--- a/dev-python/pypy/metadata.xml
+++ b/dev-python/pypy/metadata.xml
@@ -5,12 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<use>
-		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint.
-			This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86,
-			at the cost of lengthened build time.</flag>
-		<flag name="sandbox">Enable sandboxing functionality</flag>
-	</use>
 	<upstream>
 		<remote-id type="bitbucket">pypy/pypy</remote-id>
 	</upstream>
diff --git a/dev-python/pypy/pypy-7.2.0.ebuild b/dev-python/pypy/pypy-7.2.0.ebuild
deleted file mode 100644
index 87c098986b30..000000000000
--- a/dev-python/pypy/pypy-7.2.0.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-python/pypy-bin
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED}${dest}/pypy-c" "${ED}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED}${dest}"
-}
diff --git a/dev-python/pypy/pypy-7.3.0.ebuild b/dev-python/pypy/pypy-7.3.0.ebuild
new file mode 100644
index 000000000000..23373c0fbe6e
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.0.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+MY_P=pypy2.7-v${PV/_/}
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+PATCHSET="python-gentoo-patches-2.7.17-r1"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		dev-python/pypy-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PV}/*; do
+		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x PYTHON=${ED}${dest}/pypy-c
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED}${dest}"
+}
diff --git a/dev-python/pypy/pypy-7.3.0_rc1.ebuild b/dev-python/pypy/pypy-7.3.0_rc1.ebuild
deleted file mode 100644
index 4dda5f32fd2c..000000000000
--- a/dev-python/pypy/pypy-7.3.0_rc1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS=""
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-python/pypy-bin
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED}${dest}/pypy-c" "${ED}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED}${dest}"
-}
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
deleted file mode 100644
index a6955da93675..000000000000
--- a/dev-python/pypy/pypy-9999.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
-inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS=""
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-python/pypy-bin
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-	mercurial_src_unpack
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED}${dest}/pypy-c" "${ED}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED}${dest}"
-}
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 3591be44f9f5..c78346219f44 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -1,11 +1,2 @@
-AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
-AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B ff89983185c9249a91e32bf69903e139d75efeadcda3c1b4b11e3cc23091956bb08ebf9c9dea548cd5c895ef093455fd69b7273027bc9916658effae955c0490 SHA512 a332c6f8454186f774fd4a0b7f8b940facddb894a17df405d144b2707ece4393bd11695df5ad3bf1e274e59d9cd3bf81c02c4c55226480f0890e5d7318545e0a
-AUX 7.2.0-distutils-cxx.patch 14432 BLAKE2B 7c2f5a22457781c4b7d21954a3ffe7b1dfb55f12f890205cfe294316be86e7b206c4ce732f15fbf021c0fc87ed05a20aa57918cda869226efadb01e5fb2823a7 SHA512 7ccb64419d4ad90d03958bf6ddbb700a253fec75bceca7f9355f5f8496e1aba9ac72b09d0616600ebf8169d5ec705d6b058556905b032db8fb5abd23cf9b30e8
-AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
-DIST pypy3-bin-7.2.0-amd64+bzip2+jit+ncurses.tar.lz 11429130 BLAKE2B 41de1efcfc72704a3b8fcee1fa0ca030bca0dc07b75856dbc9ee5a9e40c6298406360d3342dffde38131f6d708a6dc07d3708d6e6478dc95d7c6a6ece2d7b86b SHA512 7a97797a961e12d5498dadb5bc87ad9d43a9e9dea88a7617236dba79230f5f0cc02ab8ab21a60c279cca4a341dd3d814d50d4029b94be1f525bf7b9294d19269
-DIST pypy3-bin-7.2.0-amd64+bzip2+ncurses.tar.lz 7174734 BLAKE2B c2f916433a6105a04c70f6b53c43dc479b64f26794a75a6e6b7122fb7d2f4f825c47d2eb82cf95ecb795e494879718aad88661b2fe12faa87b737cbcd20b5a47 SHA512 c4a635b6b819a104ff1b1f3b39363c9bb5cab4299cff2fb6e78c64984691d3116b8378e8a47500f9c626bbf48c4a3a8d26fa23fe2daa945bcc3dc97db9b4a8c9
-DIST pypy3-bin-7.2.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8662494 BLAKE2B bf37ac682098c49efba0f05999ce70368c91cbc0012cdcde86303424fd225eb50a8b6fa058e0c3a9511c2668da47a042f1b836f9142ed4b112db43da3addd6ce SHA512 6fc0d15e5d82ab06937ca099d1ea2f77d00a6d4e1b4c6d9637c39944c0f077ae0c5eb0edb7c6746aaafb76cb0e8a0458340c888e340df2c8438515f55a38017e
-DIST pypy3-bin-7.2.0-x86+bzip2+ncurses+sse2.tar.lz 5625900 BLAKE2B d6642cc8b37f9c032ed23da41c5597bd41615c55312bee5b0de3e8543fb74ecf2504c74d9d3c8a51c0fc42285812835cab70d6f8a5a5f15f0d7b637260e0a656 SHA512 1014ea6d37cfa7a6cb60eb47b6a0e959036aaa5c774852484a57f75d4e5450fb50c1b170f571a1288ba70d710b0731e946773cb05751eca6478b4fffb185dc94
-DIST pypy3.6-v7.2.0-src.tar.bz2 21850076 BLAKE2B 756ea3034fe8971c979ec83c9cbfac55a680f3ef03b276475aa4318f3480ae5ede609b8413412df64db553a33979670498b1f97184f3b57406619c9db7f01127 SHA512 bcbb53062a473d504bcc082cf6286f6169c83d1f38d22c4d7c4e46ddc32bca9d91e71194637e6650db5bec02b29fe262b22fe236d627b6bc3e6e0c59c66c07cc
-EBUILD pypy3-bin-7.2.0-r1.ebuild 5522 BLAKE2B 25a5f48be619756585aa357204f42d4ed826191c6df0cd74e968ca6b5c212b9bf3fa0c0ca3189b13c18db6886cff36bed167f262e5c80aa989b3600d74116adf SHA512 df0f2744bb5474ed2445c35b2235fff3de15f179e00cb83dc8bba470fc1813a08840b74ef113c6ffd1b4a6e9e6ba6aa79893bb26f9c4520c75bc67a2d60aeeb8
+EBUILD pypy3-bin-7.3.0.ebuild 426 BLAKE2B 44a8a3ec4cb323c4e86fa3d72c5ec7f5a678e188c502d42be3e5e3fb80f957f1c9d2fd60cd01081abea29017d36af173251e3e8c4f58c3a9539fdb0522d3b3f4 SHA512 7257bc01b1effef5dd0119a67ec359e229979b78615f8914a96edfb10cb86bd030011a63cfc35b55c4c5c3555ca5956cdff812fb6ba79dbc95088c3bb85eb978
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy3-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
deleted file mode 100644
index 29d99dcfdb73..000000000000
--- a/dev-python/pypy3-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib-python/3/distutils/unixccompiler.py
-+++ b/lib-python/3/distutils/unixccompiler.py
-@@ -297,7 +297,7 @@
-         # this time, there's no way to determine this information from
-         # the configuration data stored in the Python installation, so
-         # we use this hack.
--        compiler = os.path.basename(sysconfig.get_config_var("CC"))
-+        compiler = os.path.basename(self.compiler[0])
-         if sys.platform[:6] == "darwin":
-             # MacOSX's linker doesn't understand the -R flag at all
-             return "-L" + dir
diff --git a/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch b/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch
deleted file mode 100644
index 135e496f2536..000000000000
--- a/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 44c16c344f137cc91a145294c4124174fc25ad16 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
-
-[updated for 7.0.0]
----
- lib-python/3/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
-index 77a1827d4b..255603967f 100644
---- a/lib-python/3/distutils/command/install.py
-+++ b/lib-python/3/distutils/command/install.py
-@@ -50,6 +50,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # user site schemes
-@@ -461,7 +468,11 @@ class install(Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy3.6'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.21.0.rc1
-
diff --git a/dev-python/pypy3-bin/files/7.2.0-distutils-cxx.patch b/dev-python/pypy3-bin/files/7.2.0-distutils-cxx.patch
deleted file mode 100644
index 89a38050c804..000000000000
--- a/dev-python/pypy3-bin/files/7.2.0-distutils-cxx.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
-index 1c36990..ead3174 100644
---- a/lib-python/3/distutils/cygwinccompiler.py
-+++ b/lib-python/3/distutils/cygwinccompiler.py
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 raise CompileError(msg)
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError as msg:
-                 raise CompileError(msg)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc -O -Wall',
-                              compiler_so='gcc -mdll -O -Wall',
-                              compiler_cxx='g++ -O -Wall',
-+                             compiler_so_cxx='g++ -mdll -O -Wall',
-                              linker_exe='gcc',
-                              linker_so='%s %s %s'
-                                         % (self.linker_dll, shared_option,
-+                                           entry_point),
-+                             linker_exe_cxx='g++',
-+                             linker_so_cxx='%s %s %s'
-+                                        % (self.linker_dll_cxx, shared_option,
-                                            entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py
-index b8340f1..a8c5473 100644
---- a/lib-python/3/distutils/sysconfig_cpython.py
-+++ b/lib-python/3/distutils/sysconfig_cpython.py
-@@ -170,9 +170,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -187,19 +190,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -208,13 +219,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py
-index bf1748e..70dfd72 100644
---- a/lib-python/3/distutils/sysconfig_pypy.py
-+++ b/lib-python/3/distutils/sysconfig_pypy.py
-@@ -145,36 +145,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -183,13 +199,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
-index 2944ceb..cf2f219 100644
---- a/lib-python/3/distutils/unixccompiler.py
-+++ b/lib-python/3/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError as msg:
-             raise CompileError(msg)
- 
-@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i += 1
--                    linker[i] = self.compiler_cxx[i]
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-+                    else:
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
-diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
-index 4d2b0bc..5ed9641 100644
---- a/lib_pypy/_sysconfigdata.py
-+++ b/lib_pypy/_sysconfigdata.py
-@@ -15,6 +15,7 @@ build_time_vars = {
-     'CFLAGS': "-DNDEBUG -O2",
-     'CCSHARED': "-fPIC",
-     'LDSHARED': "cc -pthread -shared",
-+    'LDCXXSHARED': "c++ -pthread -shared",
-     'EXT_SUFFIX': so_ext,
-     'SHLIB_SUFFIX': ".so",
-     'AR': "ar",
diff --git a/dev-python/pypy3-bin/files/python-3.5-distutils-OO-build.patch b/dev-python/pypy3-bin/files/python-3.5-distutils-OO-build.patch
deleted file mode 100644
index ff4446662a95..000000000000
--- a/dev-python/pypy3-bin/files/python-3.5-distutils-OO-build.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 90507018442f9adabb586fd3d0a0206b9c2f2f50 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 5 Jun 2016 08:18:01 +0200
-Subject: [PATCH] distutils: make -OO enable both opt-1 and opt-2 optimization
-
-Bug: http://bugs.python.org/issue27226
-Bug: https://bugs.gentoo.org/585060
----
- distutils/command/build_py.py    |  8 ++++----
- distutils/command/install_lib.py | 12 ++++++------
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/distutils/command/build_py.py b/distutils/command/build_py.py
-index cf0ca57..838d4e4 100644
---- a/distutils/command/build_py.py
-+++ b/distutils/command/build_py.py
-@@ -315,9 +315,9 @@ class build_py (Command):
-                 if self.compile:
-                     outputs.append(importlib.util.cache_from_source(
-                         filename, optimization=''))
--                if self.optimize > 0:
-+                for opt in range(1, self.optimize + 1):
-                     outputs.append(importlib.util.cache_from_source(
--                        filename, optimization=self.optimize))
-+                        filename, optimization=opt))
- 
-         outputs += [
-             os.path.join(build_dir, filename)
-@@ -387,8 +387,8 @@ class build_py (Command):
-         if self.compile:
-             byte_compile(files, optimize=0,
-                          force=self.force, prefix=prefix, dry_run=self.dry_run)
--        if self.optimize > 0:
--            byte_compile(files, optimize=self.optimize,
-+        for opt in range(1, self.optimize + 1):
-+            byte_compile(files, optimize=opt,
-                          force=self.force, prefix=prefix, dry_run=self.dry_run)
- 
- class build_py_2to3(build_py, Mixin2to3):
-diff --git a/distutils/command/install_lib.py b/distutils/command/install_lib.py
-index 6154cf0..049b662 100644
---- a/distutils/command/install_lib.py
-+++ b/distutils/command/install_lib.py
-@@ -24,8 +24,8 @@ class install_lib(Command):
-     #   2) compile .pyc only (--compile --no-optimize; default)
-     #   3) compile .pyc and "opt-1" .pyc (--compile --optimize)
-     #   4) compile "opt-1" .pyc only (--no-compile --optimize)
--    #   5) compile .pyc and "opt-2" .pyc (--compile --optimize-more)
--    #   6) compile "opt-2" .pyc only (--no-compile --optimize-more)
-+    #   5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more)
-+    #   6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more)
-     #
-     # The UI for this is two options, 'compile' and 'optimize'.
-     # 'compile' is strictly boolean, and only decides whether to
-@@ -132,8 +132,8 @@ class install_lib(Command):
-             byte_compile(files, optimize=0,
-                          force=self.force, prefix=install_root,
-                          dry_run=self.dry_run)
--        if self.optimize > 0:
--            byte_compile(files, optimize=self.optimize,
-+        for opt in range(1, self.optimize + 1):
-+            byte_compile(files, optimize=opt,
-                          force=self.force, prefix=install_root,
-                          verbose=self.verbose, dry_run=self.dry_run)
- 
-@@ -167,9 +167,9 @@ class install_lib(Command):
-             if self.compile:
-                 bytecode_files.append(importlib.util.cache_from_source(
-                     py_file, optimization=''))
--            if self.optimize > 0:
-+            for opt in range(1, self.optimize + 1):
-                 bytecode_files.append(importlib.util.cache_from_source(
--                    py_file, optimization=self.optimize))
-+                    py_file, optimization=opt))
- 
-         return bytecode_files
- 
--- 
-2.8.3
-
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.2.0-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.2.0-r1.ebuild
deleted file mode 100644
index 118713407551..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-7.2.0-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Test runner needs Python 2.
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
-MY_P=pypy3.6-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy3"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-	)"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/72-py36"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-RESTRICT="!test? ( test )"
-# Supported variants
-REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy3.6/pypy3-c
-	usr/lib/pypy3.6/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop curses syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED}${dest}/pypy3-c" "${ED}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED}${dest}"
-}
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.3.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.3.0.ebuild
new file mode 100644
index 000000000000..9b589591c45a
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-7.3.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Backwards compatibility package to install binary ver of PyPy3"
+HOMEPAGE="https://pypy.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0/pypy36-pp73"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm libressl sqlite tk"
+
+RDEPEND="
+	dev-python/pypy3-exe-bin:${PV}
+	~dev-python/pypy3-${PV}[gdbm?,libressl?,sqlite?,tk?]"
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
new file mode 100644
index 000000000000..696be97c7ca5
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -0,0 +1,4 @@
+DIST pypy3-exe-7.3.0-1.amd64.xpak 11650308 BLAKE2B 49f8fff0675acb75ca8fa525f4554807ef90307a5236ece6d4ca242ab016629f926559d1b82641fd9b15d77eaf9736f9c9a2c82fc280a492d90f4e99218cc8c3 SHA512 b22d90e14f88ce5ea9488f9796931fe9afb68dad926835a3311cd284e681e2c680df576d8859c00ece41508d56682dae21ef0e34dc77e47010141a6e58322efb
+DIST pypy3-exe-7.3.0-1.x86.xpak 8953475 BLAKE2B e271c61341d2d92cd05c0e521d3ea1a752639d5111687b625329679f295abe1c6f5d5221e024352fd2310d20156100b107d520021f2060812f2a2cd6ce12a4d2 SHA512 969a38fc6f64e994b13bb7b0e62eba1b0f86949d63bd72116f67012ab039b696212d412d9d8d851ed33099f0bdc7be739a082e080893546f080da60789d273f0
+EBUILD pypy3-exe-bin-7.3.0_p1.ebuild 1094 BLAKE2B ab144d136f421ffe7b6ed236180c57349fd6c416ccc1e0914bbb958262ea1ff807e2ec71403a1a975fe8876dbe12b5a7f62a5075bfc2b30fdcd258e6d7cdf7dd SHA512 a8f98d893603a18d980bfc82989154cdbd8af65f0de33e2a314c0be80e1b5fa4a688d95caf7dc83cf1cacd7ceaa4534efd8abf1c487d863bcd45ff8dd91964ac
+MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-exe-bin/metadata.xml b/dev-python/pypy3-exe-bin/metadata.xml
new file mode 100644
index 000000000000..ff5bc95069a0
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
new file mode 100644
index 000000000000..f74a892b39ac
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV/_p/-}
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	virtual/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+QA_PREBUILT="
+	usr/lib/pypy3.6/pypy3-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy3.6/pypy3-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy3.6/pypy3-c-${SLOT}"
+}
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
new file mode 100644
index 000000000000..148c04fb6183
--- /dev/null
+++ b/dev-python/pypy3-exe/Manifest
@@ -0,0 +1,3 @@
+DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
+EBUILD pypy3-exe-7.3.0.ebuild 3473 BLAKE2B c47382a372522ab4cba6709d89f9f5fe6e06a23868bcc058bcb325fcd1affc5041f68735e3fa091f55f65aba32e22580b1df516f901a1cf65e9fefbbb732a73f SHA512 71e41c14b3ba2cc0656dd9ab2ef795154b027421750cd539ebc1b2081501b38feb620c692695c1c8b531dab53579cfadf0f3d159a0a220e22bb3caf5dc1e65eb
+MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy3-exe/metadata.xml b/dev-python/pypy3-exe/metadata.xml
new file mode 100644
index 000000000000..cf6720905ca5
--- /dev/null
+++ b/dev-python/pypy3-exe/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint.
+			This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86,
+			at the cost of lengthened build time.</flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
new file mode 100644
index 000000000000..baed59372e8d
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.6-v${PV/_/}
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			(
+				dev-lang/python:2.7
+				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+			)
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && local EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.6
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
+	insinto "${dest}"/include/${PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy3-c-${PV}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index fd5c947215ac..9c1e5706df0e 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,11 +1,7 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
-AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
 AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B ff89983185c9249a91e32bf69903e139d75efeadcda3c1b4b11e3cc23091956bb08ebf9c9dea548cd5c895ef093455fd69b7273027bc9916658effae955c0490 SHA512 a332c6f8454186f774fd4a0b7f8b940facddb894a17df405d144b2707ece4393bd11695df5ad3bf1e274e59d9cd3bf81c02c4c55226480f0890e5d7318545e0a
 AUX 7.2.0-distutils-cxx.patch 14432 BLAKE2B 7c2f5a22457781c4b7d21954a3ffe7b1dfb55f12f890205cfe294316be86e7b206c4ce732f15fbf021c0fc87ed05a20aa57918cda869226efadb01e5fb2823a7 SHA512 7ccb64419d4ad90d03958bf6ddbb700a253fec75bceca7f9355f5f8496e1aba9ac72b09d0616600ebf8169d5ec705d6b058556905b032db8fb5abd23cf9b30e8
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
-DIST pypy3.6-v7.2.0-src.tar.bz2 21850076 BLAKE2B 756ea3034fe8971c979ec83c9cbfac55a680f3ef03b276475aa4318f3480ae5ede609b8413412df64db553a33979670498b1f97184f3b57406619c9db7f01127 SHA512 bcbb53062a473d504bcc082cf6286f6169c83d1f38d22c4d7c4e46ddc32bca9d91e71194637e6650db5bec02b29fe262b22fe236d627b6bc3e6e0c59c66c07cc
-DIST pypy3.6-v7.3.0rc1-src.tar.bz2 22009224 BLAKE2B f5b2557369a8ba101ef38c46437a6b2af03521a5cdbedd2d1b1ee6c1349b66b7bf740290620e1143b544ca7cbcac960192cca889ac253585185bd7776b487110 SHA512 3f39b0b1454f2063b321221453487b42ee96d08ecaf5a19dc788a2b9975e9601c39ccb6e7b0de54ee81c24f4def217d8ddaa09ed5541a857c77d05f9cfc62c05
-EBUILD pypy3-7.2.0-r1.ebuild 7372 BLAKE2B 7a7fa28a01e7f9a78a62b73dcc086dee0335aba592fcab5a6cd9e50679aa6938636eeaa94d7ea7912757d3047ec38f2af8093a905e7df372be4b39639ea537ea SHA512 df7dc437945ee6fc72e101f62a1d1d29ed8a78a621fe2f9db789ca4b37b9ac3dd0d47f9ad9829980819b968648fb4c2acb4be20b956a30232396a2ed2fc491fc
-EBUILD pypy3-7.3.0_rc1.ebuild 7344 BLAKE2B ec5d1af4538d9871a6587c06422d23b174156415d2a995be44e9b01d45c0371aaf36f82410a3c82d9dff0c9c60dae00acda5b4d8f514c7d09f42b11b8d0ab444 SHA512 cdb6815f6cb99ccd3ceef825632961e645a002c650495f782d6b4f11491c181d188da276b7480830c33e142e4a23704cb7db613ee99144d2555f4ac67fbf70f1
-EBUILD pypy3-9999.ebuild 7422 BLAKE2B c4cb3e80b31979b0523231faf2af60ed93692fe6e08b676efc577024834fc7de98bee3132579d0f6a4501f17461fb0cde672006a221139677b5d27cd635e2db5 SHA512 4b90d3797d7fd1572201ca67022ac2402a40d067b66521c06e5a3ffba3b9cc3b95184ce39033825d4faddcf02b528ed9b9f62d9d3b4e1e5a0a4518ba86d93692
-MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
+DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
+EBUILD pypy3-7.3.0.ebuild 5150 BLAKE2B ce3a2ae9431fe25831a434a69eef7303241d98226c8cdac4a617935795b2cd1c9e0150f7805711860350796aeda9d37ad83e20936e4795e1763c7d0d4b8f9ae1 SHA512 479f2468e76a5aac7194a315b07b8899624095f05df327ff0b299596d26edc1a65517105cd59c84a2acf5c8d23f175b63ae23b731b2bf3158f3eec4dd0757a9e
+MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3/files/5.9.0-shared-lib.patch b/dev-python/pypy3/files/5.9.0-shared-lib.patch
deleted file mode 100644
index 5d89d3b15a30..000000000000
--- a/dev-python/pypy3/files/5.9.0-shared-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dupr a/rpython/translator/platform/posix.py b/rpython/translator/platform/posix.py
---- a/rpython/translator/platform/posix.py	2017-10-05 20:17:25.009954656 +0200
-+++ b/rpython/translator/platform/posix.py	2017-10-05 20:17:31.115666386 +0200
-@@ -227,7 +227,7 @@ class BasePosix(Platform):
-                    'int main(int argc, char* argv[]) '
-                    '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
-             m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
--                   ['$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)', '$(MAKE) postcompile BIN=$(DEFAULT_TARGET)'])
-+                   ['$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@', '$(MAKE) postcompile BIN=$(DEFAULT_TARGET)'])
- 
-         return m
- 
diff --git a/dev-python/pypy3/metadata.xml b/dev-python/pypy3/metadata.xml
index 89f86a0b2bea..ff5bc95069a0 100644
--- a/dev-python/pypy3/metadata.xml
+++ b/dev-python/pypy3/metadata.xml
@@ -5,12 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<use>
-		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint.
-			This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86,
-			at the cost of lengthened build time.</flag>
-		<flag name="sandbox">Enable sandboxing functionality</flag>
-	</use>
 	<upstream>
 		<remote-id type="bitbucket">pypy/pypy</remote-id>
 	</upstream>
diff --git a/dev-python/pypy3/pypy3-7.2.0-r1.ebuild b/dev-python/pypy3/pypy3-7.2.0-r1.ebuild
deleted file mode 100644
index 0b49fbb2bc8d..000000000000
--- a/dev-python/pypy3/pypy3-7.2.0-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/72-py36"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 cpu_flags_x86_sse2 gdbm +jit libressl low-memory ncurses
-	sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy )
-	!low-memory? (
-		|| (
-			virtual/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED}${dest}/pypy3-c" "${ED}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED}${dest}"
-}
diff --git a/dev-python/pypy3/pypy3-7.3.0.ebuild b/dev-python/pypy3/pypy3-7.3.0.ebuild
new file mode 100644
index 000000000000..d584b9c26c73
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.0.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1
+
+MY_P=pypy3.6-v${PV/_/}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/pypy36-pp73"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy3-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy3-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.6
+	einfo "Installing PyPy ..."
+	dosym pypy3-c-${PV} "${dest}/pypy3-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
+		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3* \
+			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x PYTHON=${ED}${dest}/pypy3-c
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED}${dest}"
+}
diff --git a/dev-python/pypy3/pypy3-7.3.0_rc1.ebuild b/dev-python/pypy3/pypy3-7.3.0_rc1.ebuild
deleted file mode 100644
index 50bd413a6dab..000000000000
--- a/dev-python/pypy3/pypy3-7.3.0_rc1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy36-pp73"
-KEYWORDS=""
-IUSE="bzip2 cpu_flags_x86_sse2 gdbm +jit libressl low-memory ncurses
-	sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy )
-	!low-memory? (
-		|| (
-			virtual/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED}${dest}/pypy3-c" "${ED}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED}${dest}"
-}
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
deleted file mode 100644
index 10dbaca72bfa..000000000000
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-EHG_PROJECT="pypy"
-EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
-EHG_REVISION="py3.6"
-inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI=""
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/72-py36"
-KEYWORDS=""
-IUSE="bzip2 cpu_flags_x86_sse2 gdbm +jit libressl low-memory ncurses
-	sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy )
-	!low-memory? (
-		|| (
-			virtual/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-	mercurial_src_unpack
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED}${dest}/pypy3-c" "${ED}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED}${dest}"
-}
diff --git a/dev-python/pyqrcode/Manifest b/dev-python/pyqrcode/Manifest
index 4497d39d8c5e..ddd55c99223e 100644
--- a/dev-python/pyqrcode/Manifest
+++ b/dev-python/pyqrcode/Manifest
@@ -1,3 +1,3 @@
 DIST pyqrcode-1.2.1.tar.gz 36989 BLAKE2B 88d5274a503abd78d0b8cab462d12be0af925a5eee2a6ad2b47a276559710eac40643a8aec99f26a9579f94e9084182894163e7e71f0abd486c5c2913e510080 SHA512 784262cb15c10f3581b0caeac6bba046686b35b8c0709ee78684b805b6cba49f4250a004dc5f7d393cc25929cbf815c6c3a94e284a77d20ff7224a8dde3a036a
-EBUILD pyqrcode-1.2.1.ebuild 694 BLAKE2B 9feda9dff7b441612a0f1cb99093b7e4afec193b1c35a2410a353dcc1c344821abddcc853e5a703292f4f7f4073928e8f39a5145386e0360ff2239081dd9a444 SHA512 8e6531b2a0e0d2e28e482c376c7a39c0243e8743a46617d702d8e23f862f6ae33dac237dcc025c1af33c1f18600f6d8a813654c629180c97814a5e0781c49ab4
+EBUILD pyqrcode-1.2.1.ebuild 690 BLAKE2B a021f57ac46fb426d41e7ca691e13622474a834cd87b39ec5c09d605a19177707ce2e470c5c954b4d79db293a9217427b9756f10aa59fcbf9221c6c1860fabfa SHA512 1480b0fdcf34cc8dd45c17718f752eb3f5af1f0ea3f2c01d909cdab702187f54adc720ad2cbdff6b5d844c446f33961d11cc9028fdeb16a8ff9ae5a1f1d2ec22
 MISC metadata.xml 685 BLAKE2B da3a57e855942a58edb70ca2c55794f3e15684e5903f4348c5128e665ad6e76c1261053e05227d400f31c86292736dabcc581428feb20cfdfae4723ee01cfe18 SHA512 b037af38847498f60da288ba8776a9eb85662cfb72f5f0ecdcf677ee36474b989cf4dccd3f7ea034c8be92f90fa055f2db6ecfe4015d011bbd8a3304fee0aff2
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
index 609f10c59677..db05f21c496b 100644
--- a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/pyqt-distutils/Manifest b/dev-python/pyqt-distutils/Manifest
index 8b25fdd98ea0..0ce8d70d280d 100644
--- a/dev-python/pyqt-distutils/Manifest
+++ b/dev-python/pyqt-distutils/Manifest
@@ -1,3 +1,3 @@
 DIST pyqt-distutils-0.3.0.tar.gz 4659 BLAKE2B 2897696881c6ee18558eb24a923b6675588bd38456fc4e9aff6b1780e7c2c31576c4a7427104c0b15238bed1ad52e2f13ab316441adb06fc0ffd9cbe5052ef30 SHA512 052a1fa0e687ac9aba5fc9623c72f8fff9a25f6d19083668e900ad1ff98bdd99c66c0ac45ba5f5f0c09b76a97370ebf4a4fef9fbd266bc0312bb05567c4ae577
-EBUILD pyqt-distutils-0.3.0.ebuild 545 BLAKE2B 2ca5ca2b86021a5c84734d57c909308e09f428d32d86e49235e05a7ee4800ffa39dc8b6897dadb30cc265e4711ee10c677fb55b2f3374d8ad1fed2879eba555d SHA512 a492a13a04d564b91978f553257652c942eb93e58304a9f8eb2565f1cf8fe4bd85a47599471660db7dadc0c65c27d581b76b2be0fa029c50eab827b059402e68
+EBUILD pyqt-distutils-0.3.0.ebuild 522 BLAKE2B b1a6c5f57f19b4fa2108c7695c0ba5d2b3e60d028c25db78867c3e02969e58d37e9bbd5afca527d46d9ae279b7b198ac7c13e943c2ee6ab90aa6485e2d478c9f SHA512 f3462f74e13e88a9bfa72fd21c89e6ac9cf43c3baf3e9f19ac180b109ed51b8519303928604055333de7d4f937587041bac4a1ffcdb4684d59113921bc810519
 MISC metadata.xml 410 BLAKE2B 3ed7ef5688df2c5f2e4bec3044d79f225b8b8154ccae5bc487a444aabeadeed5af2e8d60392b09fb731103572da91edacc13fe669e89490a7d30fb585ace1d5e SHA512 52c81f7e76feeb110ca5bf49da1c3fbc82c2b4f61c02ba7622312631c4a9618e42df1cba0f62253f039427b21420751f981d0541b7892ff162ac6e27aeee7748
diff --git a/dev-python/pyqt-distutils/pyqt-distutils-0.3.0.ebuild b/dev-python/pyqt-distutils/pyqt-distutils-0.3.0.ebuild
index 64d95f96b728..c83838844b80 100644
--- a/dev-python/pyqt-distutils/pyqt-distutils-0.3.0.ebuild
+++ b/dev-python/pyqt-distutils/pyqt-distutils-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="distutils extension to work with PyQt applications and UI files"
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index 56dab94e493e..908bc2a9ae27 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,4 +1,4 @@
 AUX pyqtgraph-0.10.0-qt5.patch 439 BLAKE2B 8c0b5f766adf64d67800873145223ed8f9dda75ce1d5d62784129d827c4dfb9d44bd5532b44dbe42abc6bd67d5b13082c1691d8796c3a53b4ea873faaa2d7f00 SHA512 792a739e1cdc2c7c1ce059945c4a5280f1187a88dd767669fee83fbbdb5c315c022b99c5312c9c53d88afc6d24767fcb93426f6e05b9a5d08db084ba3110cc93
 DIST pyqtgraph-0.10.0.tar.gz 704972 BLAKE2B cb1295608536b06de32ea72503b2df2be7f4ae3065b42431542539feec5eb37412e3a7697e2ee97309594b9aecc19c692ef7b45f843f37bd50148a3c0b6e1d31 SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30
-EBUILD pyqtgraph-0.10.0-r1.ebuild 1225 BLAKE2B b66d0269c1fb2512b732934a57dcfb9a1af845410a55c6176516b05afe41583a0b2e93ad05393277898740a7284a5765e2e43d3a5e7abb6b0fe8f5c71a644406 SHA512 297ddb3372656b59ec9416df04972e68ce96f7ef9f81274c2ab65d6c5ab4064ba56108054a72caf6a389d1764965fcae1fae688217dc4e1ef2870a9ba3b47ad1
+EBUILD pyqtgraph-0.10.0-r1.ebuild 1221 BLAKE2B 2ad4fe97db1bb7ceb368a6a8600abd396d18dbc975ba154e370dcdedbf58b92c8fba7e62a1afceada878dfb44b3d1b2b0972e4a79357ea251d2874a31be4f339 SHA512 a2a15466184f322fc2750d8c0708fd0212054aad8a478053f1e5e99d9b61187c0a00a162a4df2ad984804926919e15e7333b74437a8c36bbf2610f66e041cb9a
 MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
index 322fa1bedf9c..52ba9b9bdb91 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 775a92116bce..1761cd03f445 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -4,8 +4,8 @@ AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f
 DIST pyquery-1.2.13.tar.gz 44032 BLAKE2B df257c6116b3f8804627a0b4a6556445c644410acdf008fe9afd08136a0a7f47d66b99071cce61a1569853ec9c3c38d20ca66aec0950532e94949b36d4814c3e SHA512 39a2bfe6f1eaefb6d1a78f73e5bdb4d12a9e223b26f6aff0f979ceaa68005ab08e41bdf11fe808489d22e0506e558621982dc59fa2164cd1e3d8168b0ef8ceb6
 DIST pyquery-1.4.0.tar.gz 45215 BLAKE2B cb748c09524f6cc6b22c9712370da754495c31b159a44f02e9b5f00e4e94295d7259d224e63066297e6efd74f0b43a508a56d1df4f4150727cd261b959402e9a SHA512 523bc058fc93332b13840a7249bce5a449b0029f6434043a739a2f24abdd89efb314da8795f1b2be2d7e4464a8e4bdf6b061d768b895d0dd1630f44ee341f37f
 DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
-EBUILD pyquery-1.2.13-r1.ebuild 1366 BLAKE2B 4b0327852781ce67e1d109174ed036fb9ac478bd612671bf37215ac79a7ee7f129440aa8c733b35c71593533432e29fb3d575185673e1b97ad632bdff032cce7 SHA512 b743ca204da5e24f0ad117483f018111cbc6cdc213512700cc7efd89788701b93fcb3f45d77cef0984297430d9505e53f0f4180bcf424d2da38adc0091743ea6
-EBUILD pyquery-1.2.13.ebuild 1352 BLAKE2B 00893f812a37590d6c9ea8692b0ea020387d20553eb41a8032b3d2dd62315acc1cfc96accabb2c60f616a71e508720a034c3e4f32f9f60822b55a2060b2713ac SHA512 4370558a57d7f256a05093bc4ad99fffce1cec4921cea7b54155635d181af0e36d3ec4d0481f0e2c0ba0fa293de2dc13e0df76b6c6ab79028ed77403e23c340c
-EBUILD pyquery-1.4.0.ebuild 1221 BLAKE2B 3d4759016dc76e0992bc522d449879a65f8190b8a5f06420bfdc3af9e486c1ddf9c3d3c3d8e9efee4cfe6bd532ee138c48c74c6468317988661a964d34117aa5 SHA512 c8ff1eea0cc9ec0a9980ccff87d853f5b7180a00083beb384d5724c7fe25b7da44d5d52a5eaa376a67e64138ee6715c4bf2813d9b1057027b432268511a244d8
-EBUILD pyquery-1.4.1.ebuild 1300 BLAKE2B 41c2d19eab4cf175de04dac2e37d9c97cb3c1c848488b38f41afc52121e19377d65b475180b66e62489c539dbfa35a11e65a3ed55f76529ea0ca28345ef46de1 SHA512 1a546548974b1dc3677698dd6c37476b6ba029b90d78cbd003704729f4a8c2af470c83fa2d9a5f32ec6febdd81d8bef08538149f671d2d0024e87638349dfdd2
+EBUILD pyquery-1.2.13-r1.ebuild 1364 BLAKE2B b3154caaa87434768e6aa9242e70ac2c82121a14a20d2cd73725f2eee5e481de1ff35c2f64ffdd1c2154301a75fd599a2ff11b93fa4759eac8148c7db7e0fffb SHA512 645e08930f8947055ce7528b991f9157e9495c3126753c4de4dd90f091656b67d52ab728ceb9a35ca7f47b19ff818a5e1824a3387ffc19768688b5b324410e8d
+EBUILD pyquery-1.2.13.ebuild 1348 BLAKE2B 11e2253af94f546d37a36a6620c8ecd2f9ad213e1fce9f5d22df898e3285814db8571d3a3284a92faf791bab2f285e63809f31e3976393a812068c51359df941 SHA512 243c1357a258a992a923d1c6f9b4de14b316ab7923e734f8dac8f4089e0ebcbc9002ee3f398e38f1c371dc3da83460380f4e13f995a48853906566e98b4a990d
+EBUILD pyquery-1.4.0.ebuild 1219 BLAKE2B 2a60926bab54075f9dab50f941c85c80edd26c82f9b668507ce450fe2bc6ea24b3ed910b567508210e2f9f88f8f8dda9ebe52878829043a3337cb56dfcd1a111 SHA512 c1b834b239f0b5993c292cb55a70315ac312b7322cdf9807f8558ff8bc9eb2eb6482da0cbd9fac3ff3e7291fbff775241f10ba9a509e6d39ad36fb721982fa3f
+EBUILD pyquery-1.4.1.ebuild 1295 BLAKE2B 015de1eb07641622509c2729e3145b7990c801b535be7c1043ec8cf2e2e1656b40e97a2ebfabd64464579fc90dfb38031bfe9e7b2976c4e5aabe38021dadbc16 SHA512 f170135a90ad26e536cc0d9bba46f400fcaffe1fc9030f2747928ea44fa8a97ceedb4325e9c5df6818a8b2bce2c3bfd381e7a2e69a0ccba4462aad152405cc35
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild b/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
index a8df53f6ea21..e05023718be3 100644
--- a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyquery/pyquery-1.2.13.ebuild b/dev-python/pyquery/pyquery-1.2.13.ebuild
index e47148170088..10c6dcbc39b2 100644
--- a/dev-python/pyquery/pyquery-1.2.13.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyquery/pyquery-1.4.0.ebuild b/dev-python/pyquery/pyquery-1.4.0.ebuild
index 04033cdd51a9..be3f853162a9 100644
--- a/dev-python/pyquery/pyquery-1.4.0.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyquery/pyquery-1.4.1.ebuild b/dev-python/pyquery/pyquery-1.4.1.ebuild
index ddcfe184a05d..7e4bcaef3983 100644
--- a/dev-python/pyquery/pyquery-1.4.1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyrax/Manifest b/dev-python/pyrax/Manifest
deleted file mode 100644
index 8337b992ef9a..000000000000
--- a/dev-python/pyrax/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyrax-1.9.7.tar.gz 313170 BLAKE2B b52d87f22f546d095ce7ddd6d83559d14b432e0e910839c33b54572e3e78ec1d7f1077bdcf87fad62f695948864e6445b3a1e4635d2ec9b09973fd66b3e32dc4 SHA512 e83c5e79d49eb3095e8e196b4c9db419194131503d95737564e5a1e3e20f06aa4b53196111d8d326ac50041cd0c2590cefeb41d7d6d654112a85df867b7495f3
-EBUILD pyrax-1.9.7.ebuild 1100 BLAKE2B 630015dd662dc233212dacad764332fac37aed0597c436438f3551bd20fea34273cd5a55238d57af958cf49dada250740e72528b5fcbfd16b5e6d0a05619f63d SHA512 2bc4b3229d3ba127606b35d61b92eae904efb60f86a23bdcd08a52518f968df4cd686f66d0a962e0cbf07382248a2dc233c0dcf80a43b4ada113bd50e9525b8f
-MISC metadata.xml 695 BLAKE2B ad76557a077263a066097827d9ac06581a6fcabb034852ba237815fa79deddfb248ec8522164ba2e1b62b09b829c2416837021177307c9b4516aed482c661bdf SHA512 b396d429fc52efdfaa1fd0773d336ead34bc18cf3f03e7d9813090a5cc0dc395f3e605b409d6439d529c90c0ccf45e524bfcca99e550a40138bb278cfca29092
diff --git a/dev-python/pyrax/metadata.xml b/dev-python/pyrax/metadata.xml
deleted file mode 100644
index 36c8d0c095f2..000000000000
--- a/dev-python/pyrax/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		Python SDK for OpenStack/Rackspace APIs
-		pyrax should work with most OpenStack-based cloud deployments,
-		though it specifically targets the Rackspace public cloud.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">pyrax</remote-id>
-		<remote-id type="github">rackspace/pyrax</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyrax/pyrax-1.9.7.ebuild b/dev-python/pyrax/pyrax-1.9.7.ebuild
deleted file mode 100644
index 3e870a1e7e98..000000000000
--- a/dev-python/pyrax/pyrax-1.9.7.ebuild
+++ /dev/null
@@ -1,45 +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="Python language bindings for OpenStack Clouds"
-HOMEPAGE="https://github.com/rackspace/pyrax"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.13.0[${PYTHON_USEDEP}]
-	dev-python/rackspace-novaclient[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/rax-scheduled-images-python-novaclient-ext[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	nosetests tests/unit || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( samples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyregion/Manifest b/dev-python/pyregion/Manifest
deleted file mode 100644
index f0ecf15eef06..000000000000
--- a/dev-python/pyregion/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pyregion-1.1.4.tar.gz 99454 BLAKE2B e8e58364d825261baa9a706e02c0d2c57fab3b0fbdc18da1bbb07015f308c856795802af0ed8a09ecfac30600c0fa7fffaa824d5c330f45377208248d439b139 SHA512 572a10593dc93f64ad6fd1d7a8f19582df04309b88a73fb41e3b4c71036d61c3857114cc01025e581ddd3a63af92fabb5375c1ee8fe487f83da2780569954236
-DIST pyregion-1.2.tar.gz 1133496 BLAKE2B eea77b0c015b96aa277aa971e890db71cae2e5de112fa34898df8a80fdd48bbc7f13b3f298582d51bcead609c62e90d3e5c049bda37603e8ae1d655cb4f618c1 SHA512 80f851ecc8ec60a287b11b558fab920da7565c3574b0e6e977b8c8e3f40951f0407b27cc1c24e0d9d864f9b853b03053e9fae3ee81a32ab36078f2c8ce6334b9
-EBUILD pyregion-1.1.4.ebuild 731 BLAKE2B eff28e36b07049b2beab2a3b093603b1974f18b76e68218cdf930146ab13be2c7ee63baa620dd7aeaf3e47ab4c4baec63bd91c785d18c723fd13504af9e8ebf2 SHA512 2b38e24c2b881a313b5561c73b52bba88acfec4c88fd4cdc96f64dbe180be54d103edf7c83deed293591eaf07882850606f572c76a6c96d7d6ff7939aadcfd77
-EBUILD pyregion-1.2.ebuild 1563 BLAKE2B 50fc1ee942ea7c956986630d0f7760b468953de669f12e801091ac5995daf372413c5ac61b1aff386d2be1b80a751625bedc023314d61a364ba0a33436a7f33a SHA512 301089dd4afc5bf56f0c6a8fa7dfac0c27c7621fe469fb42bd9d23556257be6c2c6f81dc6fce07cebbfa0c645cb43427be2c020327b17f0c7a6051cb5c4f8d96
-MISC metadata.xml 512 BLAKE2B 05d13186313d06a7f0c6370adedc1dbac3300662951ff249f63ef5d4dd33a237dcefe98c76d9dec07186ff4e27ec155b9ed60d7b0ec630fe7b500c906ab1f0f1 SHA512 0187a79d485d66fed785fc6ee8288be4cde62e47a7fec9ae3ffe0b4235125025e63496d53caa606d360ed95cab11fb448bf39ac39601d2913fe59f7a158aa946
diff --git a/dev-python/pyregion/metadata.xml b/dev-python/pyregion/metadata.xml
deleted file mode 100644
index 255624cbc7ce..000000000000
--- a/dev-python/pyregion/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>sci-astronomy@gentoo.org</email>
-  <name>Gentoo Astronomy Project</name>
-</maintainer>
-<longdescription lang="en">
-  pyregion is a python module to parse ds9 region files. It also
-  support ciao region files, and can draw regions using matplotlib.
-</longdescription>
-<upstream>
-  <remote-id type="pypi">pyregion</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyregion/pyregion-1.1.4.ebuild b/dev-python/pyregion/pyregion-1.1.4.ebuild
deleted file mode 100644
index fe132cb39907..000000000000
--- a/dev-python/pyregion/pyregion-1.1.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-inherit distutils-r1
-
-DESCRIPTION="Python module to parse ds9 region file"
-HOMEPAGE="http://pyregion.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="MIT"
-
-IUSE="examples"
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	|| ( dev-python/cython[${PYTHON_USEDEP}]
-		 dev-python/pyrex[${PYTHON_USEDEP}] )"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pyregion/pyregion-1.2.ebuild b/dev-python/pyregion/pyregion-1.2.ebuild
deleted file mode 100644
index d7973d321cd8..000000000000
--- a/dev-python/pyregion/pyregion-1.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Python module to parse ds9 region file"
-HOMEPAGE="http://pyregion.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="MIT"
-
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		dev-python/wcsaxes[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# use astropy-helpers from system
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pyrex/Manifest b/dev-python/pyrex/Manifest
index c921503da796..e7f3792869c8 100644
--- a/dev-python/pyrex/Manifest
+++ b/dev-python/pyrex/Manifest
@@ -1,3 +1,3 @@
 DIST Pyrex-0.9.9.tar.gz 255272 BLAKE2B 852e4caf784677742ce6e207d9556b64adaeb72dce7ec8dcfe008f37524890e12017babf74fbd022ef84b6736669692df7d60a9e3b04697c0e30f585a59207c3 SHA512 724b14278760fffb751bd9dc24e18dbe85732f069d186ee89bc9f28dd8f912d5f69492d28e705f55de2db56c343f10f21c6a1c39bda1d7c234d09a3d5e192f6b
-EBUILD pyrex-0.9.9-r1.ebuild 851 BLAKE2B b4efb15d24f6c77d0fbbf8fccb1e27516f7a4d94e66c11444a261053087ef635ad8848bc732f062268a7f95202455439d8389e8846d3e7364ccb85bfd4c55b15 SHA512 8ade6018d97a336eb0d17ba93aa354bc511785d887de1d3408c70ae23163149b7ed8b855fab3e9f63a82b3e75a2ed217c2cfac6aaa31cb9825367ed05167b73d
+EBUILD pyrex-0.9.9-r1.ebuild 843 BLAKE2B 001a581060fb10c5269330c19db8d55b65948af79b94c01224bf85c0657bea2bae1a7fe81a4ce09b5b3875a17732ed8bfc360f87d8dd7c031cc8a04839d2a176 SHA512 0b45193f9b44f49af756989912846f8e3ea54e71842d9cb5b95b1f3b21dd388435e383b5c242fd4037a244500ba809328c053f1fd71c78eb3f22aaeb31f84108
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
index 1c60234cc420..65c5c140ebb3 100644
--- a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
index ec07d722dd09..e7cbb27de30f 100644
--- a/dev-python/pyrfc3339/Manifest
+++ b/dev-python/pyrfc3339/Manifest
@@ -1,5 +1,5 @@
 DIST pyRFC3339-1.0.tar.gz 9325 BLAKE2B 4a02f2b128c34315def13500c2864d3198ba327fe3a39f04e14085d5dd945ffb31487c12d07e63e18c5946a14d8e380be8d85e7bea6b4df39f50550e6121379c SHA512 abcfcfcf516ab60214dc11de618d37415da2177387f51f85da99ef18b8cc0d37ed55f0ea6ba3e61292ce5a319838f322e01c1c9f3c0c4edb8341b4b135e575e3
 DIST pyRFC3339-1.1.tar.gz 5290 BLAKE2B d3094a22b6903937ae5cfee1210f04b65eb05dd606fe1d3245dca8ec0719ca1a079b720568d8c8e87fea691cebe1944098f99913b97a04570f06354a883e5694 SHA512 958b7761fab590aa42bb57a955c5d834441f717796a452b60df21663099dcf2fc046afe60f8157fd0f1edfd95c5e9c9c5349ab10ca4078d210fc63d848496a2f
-EBUILD pyrfc3339-1.0.ebuild 693 BLAKE2B e6781ff107f0519f6386e025f721f4da32902eed55da5f8f858a90fb65538a40cf5dd39674f393a82021a9cc248c5163f8be1eca1da494b4d033f855310b4203 SHA512 d0690a148e429fa7203d7f73904024ddb6c3b2488f5fbd8f1d15116a5b3311362203e270d9e9258d346b0747f84af0e7f590032c47daa273fdc7069ea4efbd03
-EBUILD pyrfc3339-1.1.ebuild 693 BLAKE2B 5c17026d8603a32a2aee769c00bdeb8b2b948a4a6582c359f937e39cde39b5e4aab843886ad84120fc1b57f0f85405f383e51d399d3ad875482a12bf4d928fe4 SHA512 0c325c7d384904fbf6db895704e0896002552c004ab5168f30c8734981c4305f67d6d940dad872b5536c330d8700212a3f54b365279b96578d8c561f7ed0a05c
+EBUILD pyrfc3339-1.0.ebuild 689 BLAKE2B 316dab17e317c07cd0e41940a30b961ed35e0fa8e4ec4e405cb4e2a0297e17ecf5f2f680b0dc65db2f722df4d3ffc863e35908166f2b1433e7e80fab85110fc0 SHA512 a1ad1d51dee185609ee3fe129a703443a92746851e881f947c2122d0bb243f1c6fab028c6624ed92d35eb9a61cea2bb13ab32845ab06792a4a4c3d3f511fd667
+EBUILD pyrfc3339-1.1.ebuild 693 BLAKE2B 1e260088c61d405a79e62b26a4bde0739217990e20847e9c782505ecad1fa0e6ec63b0b9e4de9d864aa6dd37799446a2c0e121a513391ea0295fb2a15249835a SHA512 95c2f1a6286269cad3440383ec14e960c807aae6e0903f3ebd320b8b32187e6186954df62c0737e8023a418f102f444dd29bdcc71bb957db759d57440abbbc66
 MISC metadata.xml 373 BLAKE2B c047241275de0ee6411fa663ffe331d1fa4cbccb622680120d5c1b96b4fe07ffdde9b36a67bd2708dfc086e893c14f071b51b3f1b292e63c9a7a054ea841a6b4 SHA512 0f0ef1e95f7cf557a90cbf2493f0f1ba51c29cbe10769dc40b1dd56eb24e91c7ca6579feaa3afc65c9d90724c726f6d1bb4f978d6485018e19f39ecf81782a87
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
index d29ff3a820e3..07c3abd95de9 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 inherit distutils-r1
 MY_PN=pyRFC3339
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
index 115153b6cbbb..b5754383574c 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
 
 inherit distutils-r1
 MY_PN=pyRFC3339
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index dbf4c22904e4..4b3193b21b0e 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,11 +1,3 @@
-DIST Pyro-3.16.tar.gz 298769 BLAKE2B 8959e0f647b854fafaf1928601ba60921e9914bd85e2ebbca96a11b701cbfee733e73c1a2c6e5aa65bd45a6a1007a92bc51a78116ac385c5340896b4a684787a SHA512 d0e4ae93120a6566a2b06fa52b66e20daa972324a9d57d639ca68171e1e6e5c412250f7e6af3fc307631d2270be3731ea5898ad35819dc0369e6a2d8341d5965
-DIST Pyro4-4.41.tar.gz 502294 BLAKE2B 0df5e593551d9ea95d01e114cafd746dc0dd55e3157e167ac7337e316b19d2b7811d2ed4c9b3f44a45171bc63aef3d20124a8da8b149037bcbaf38be6562dd95 SHA512 01c3f16448b39cd7a83c845eec86013315ee183a3e50c6caee1d327308e67ff63732833b413b189ebcb77cdb3fc65bbd7417ecbfc8575775ff79550678bce020
-DIST Pyro4-4.56.tar.gz 455253 BLAKE2B 3c63963bc2e248706727324078898c3e2cc9b8b32d228c0f2b87aab776a0e3437f72096031b8658c756988814fd823fa2dc1c8df0b971cfd0174b437f25bd0aa SHA512 88805f5d7108432f98d38267a7a881e35fc1e34ae32cc7a1640f4b6e0d69718a86bf195fb4e4eecbd53075667521585b7006cd5c5736e5ff1ed39b5212b91bef
-DIST Pyro4-4.76.tar.gz 477132 BLAKE2B 49621974ecb485e1809366d9933ccb1027d62bfc827c3f800750095ebe3eb3a662e041a9ff97522ac866b93b22f9c1d5257e1503aaf4b6543d2d74a9a17713ff SHA512 48cc63bc74d483fff1b4bac2dd9ecf7576503bfd91e721512a5cea2b5a115ad6480ad0524218aee31e412a867261a9e838d85650dd0f7a87593a4a03cfc5cdc3
 DIST Pyro4-4.77.tar.gz 479025 BLAKE2B 20c7b53cea55b77efea11cd7b74a1cfcc45ad721ba45e039947f1d869291bfcb054f16bc48fb5ad21386fe7d47785514ff94953b1bcf893266c2c41015bba589 SHA512 52a9f90cec8c5e23ec30ddb69484a15bb86d61024d1bc718d075e01678a3d9655a1ed21f18da1891c121bf0e95282fb1151762b2fdb826a6408056079d2b1a66
-EBUILD pyro-3.16-r1.ebuild 704 BLAKE2B 1270e3906b70a94640880fde94d51122843def778a244791c095dc4a353ddc7794d0494087f013662866f5703ad505ab133ee8ef280dc622aa90a09de1c63618 SHA512 6bcf4f64cb78d82e0d682c7e04112a127228e1aef9abd4977db00136d2eaf68c6a1d78515f71f6dbfd452b2da1737a15efaf67d5539641e2f7ab874b12207d58
-EBUILD pyro-4.41.ebuild 1899 BLAKE2B adf8da37af0fd4ba8f40a521199868476eed2d5f443cc5b2137c95d3afe03ef37f7b4fc89d093becbbcd6962a2a249fb91f7424e87a8b8320bbe6a8a73746166 SHA512 bcd0b7e395c3d153136153a23226664ccc3978a04148bd85b068152a4f7717bdb2027cd0812b05612d36dfb456ff29b75170791c2925f3347c99740369d9a105
-EBUILD pyro-4.56.ebuild 1899 BLAKE2B 8d33eb5762b5c2d59703d503292efe08d9af8dcc66b3bf4f89c9e77b1ef764dd4b1f87f7ab82b8982fb751b21cd65caf0ac063e4ef60034831b6aaa784bea792 SHA512 2a1316bec2ae7e14ed47e44104a559917b4b20428d91c2f1de3b1472f052085f7175f04e7dc04a1f5d27e472cf6b4884bd64ffa9be743df3a4844a98a1609167
-EBUILD pyro-4.76.ebuild 1452 BLAKE2B 76c3db0f7b5cc172a197443b7da428529e54ac200cb96a0eee20f4388fee16347644ab61258e68e00483681e6fe7b42e355bd5f449e4d1f054a6ba51d19b9f48 SHA512 4d911303bff81350025d80c50771188a0083564f5bb61f18ce1197ca4b3ec459579edc2f2fdd954f9224949b358fdcf58b2ce27345a1947cbadab217f9503cc2
-EBUILD pyro-4.77.ebuild 1459 BLAKE2B 3370bc4937b6ebd95c90cde23d7b312afcad56bff5419c08741136c7ace18eaa4d1920ce13e6fec3ff6fc306ff6bda22e513129d2a5238cd87c4e0929591ebe2 SHA512 892a8772f526b3aca08f8ca2f830d7f5381e3d19e3911425805f5d0a4f64410da757e460c57f1780357514508fe147b322ff496e953119e5d60bbeb020f49ebf
+EBUILD pyro-4.77.ebuild 1457 BLAKE2B 0a108201ae9d101b47e320ba75d81e8ea3b9d7b334e33913e043be11cc535f2dd222fbd7e4980e8f613c85d3b62ab8a5be874c11b9664647cf8efe6bdbbee392 SHA512 f1b5f1ae7f11df03288202e8bf8b06eaeae700ea57a9f6631e5f50facb145a02d10f9fd8723c34bbb9fe58f8a19e95a71906a1d5c324af98cd793d29c0f7fa6f
 MISC metadata.xml 370 BLAKE2B bf0ecf2b63d7e544a1193349f0d171d107d23e66a067012cdd0ecbc4b736631e3c78fabc0745e88efe711219e8c3ce187da3ac67f4477f8bcf4996546a56a94d SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544
diff --git a/dev-python/pyro/pyro-3.16-r1.ebuild b/dev-python/pyro/pyro-3.16-r1.ebuild
deleted file mode 100644
index a8c7feb047dd..000000000000
--- a/dev-python/pyro/pyro-3.16-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-MY_PN="Pyro"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.org/project/Pyro/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-DEPEND="!dev-python/pyro:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/${P}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pyro/pyro-4.41.ebuild b/dev-python/pyro/pyro-4.41.ebuild
deleted file mode 100644
index 6b4ee7831ab4..000000000000
--- a/dev-python/pyro/pyro-4.41.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-MY_PN="Pyro4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.org/project/Pyro4/
-	https://github.com/irmen/Pyro4"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-python/pyro:0
-	>=dev-python/serpent-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed \
-		-e '/sys.path.insert/a sys.path.insert(1,"PyroTests")' \
-		-i tests/run_testsuite.py || die
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/testBCstart/_&/" \
-		-e "s/testDaemonPyroObj/_&/" \
-		-e "s/testLookupAndRegister/_&/" \
-		-e "s/testMulti/_&/" \
-		-e "s/testRefuseDottedNames/_&/" \
-		-e "s/testResolve/_&/" \
-		-e "s/testBCLookup/_&/" \
-		-i tests/PyroTests/test_naming.py || die
-	sed \
-		-e "s/testOwnloopBasics/_&/" \
-		-e "s/testStartNSfunc/_&/" \
-		-i tests/PyroTests/test_naming2.py || die
-
-	sed \
-		-e "s/testServerConnections/_&/" \
-	    -e "s/testServerParallelism/_&/" \
-		-i tests/PyroTests/test_server.py || die
-
-	sed \
-		-e "s/testBroadcast/_&/" \
-		-e "s/testGetIP/_&/" \
-		-e "s/testGetIpVersion[46]/_&/" \
-		-i tests/PyroTests/test_socket.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${S}"/tests || die
-	${PYTHON} -E run_testsuite.py || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyro/pyro-4.56.ebuild b/dev-python/pyro/pyro-4.56.ebuild
deleted file mode 100644
index ed08f8770641..000000000000
--- a/dev-python/pyro/pyro-4.56.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1
-
-MY_PN="Pyro4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.org/project/Pyro4/
-	https://github.com/irmen/Pyro4"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="amd64 ~arm64 ppc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-python/pyro:0
-	$(python_gen_cond_dep \
-		'dev-python/selectors34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	>=dev-python/serpent-1.19[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/dill[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed \
-		-e '/sys.path.insert/a sys.path.insert(1,"PyroTests")' \
-		-i tests/run_testsuite.py || die
-
-	# Disable tests requiring network connection.
-	rm tests/PyroTests/test_naming.py || die
-	sed \
-		-e "s/testOwnloopBasics/_&/" \
-		-e "s/testStartNSfunc/_&/" \
-		-i tests/PyroTests/test_naming2.py || die
-
-	sed \
-		-e "s/testServerConnections/_&/" \
-	    -e "s/testServerParallelism/_&/" \
-		-i tests/PyroTests/test_server.py || die
-
-	sed \
-		-e "s/testBroadcast/_&/" \
-		-e "s/testGetIP/_&/" \
-		-e "s/testGetIpVersion[46]/_&/" \
-		-i tests/PyroTests/test_socket.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${S}"/tests >/dev/null || die
-	PYTHONPATH=../src ${PYTHON} run_testsuite.py || die
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/. )
-	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/pyro/pyro-4.76.ebuild b/dev-python/pyro/pyro-4.76.ebuild
deleted file mode 100644
index c13f60a48f2a..000000000000
--- a/dev-python/pyro/pyro-4.76.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_PN="Pyro4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.org/project/Pyro4/
-	https://github.com/irmen/Pyro4"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-python/pyro:0
-	$(python_gen_cond_dep \
-		'dev-python/selectors34[${PYTHON_USEDEP}]' -2)
-	>=dev-python/serpent-1.27[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/cloudpickle-1.2.1[${PYTHON_USEDEP}]
-		dev-python/dill[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests requiring network connection.
-	rm tests/PyroTests/test_naming.py || die
-	sed \
-		-e "s/testStartNSfunc/_&/" \
-		-i tests/PyroTests/test_naming2.py || die
-
-	sed \
-		-e "s/testBroadcast/_&/" \
-		-e "s/testGetIP/_&/" \
-		-i tests/PyroTests/test_socket.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/. )
-	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/pyro/pyro-4.77.ebuild b/dev-python/pyro/pyro-4.77.ebuild
index 2849678d3d10..fa6444d38e7d 100644
--- a/dev-python/pyro/pyro-4.77.ebuild
+++ b/dev-python/pyro/pyro-4.77.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index e185381f4c72..1f235ade45c9 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,8 +1,8 @@
 DIST pyroute2-0.4.12.tar.gz 562555 BLAKE2B a0101026d7dfb128a4e88d840a593357683636213a00a236ddc3497c9f4df107078ef2d59a9ba99045c4d7a8a95a1bd69fecd8a2f93937bc9e9983fda547fda9 SHA512 d666c29cfb8da1e13748976030dc5ec153d2740f6df7f279a6e9fc4ec9b6ad60462c2a2b57905c4a4c8566da1de30dca0bb24b3b6c5a97bb729c074584270e2a
 DIST pyroute2-0.4.21.tar.gz 577795 BLAKE2B 721f0e7958d50de356a424a5f87ab895e95fb0d630c070fb674c6da276d189a7c72f051eb4747ab889230f6c1ab1cf473f2d734255f4d178cc87eaf332538fd1 SHA512 e8cf2c66d63e4549fd4c0d5ed1b503fc72eb5eb6026b959e1b783aad66cad475118a645f5ca394a1a77e7cb0557d12565857db8e0f1b1cbe8c666be957a7a88e
 DIST pyroute2-0.5.5.tar.gz 702481 BLAKE2B 7d9db1efe0d76e5fbca3f07d0ce666f919001fa26c220bd432c719aa6fc3a4d0148ea6357ed84cd5d0a6e47069994f35d2501365115b9c497674159098c2e5e5 SHA512 c7166e667b6fd21eefd34a01a0bba8467f3ae4d9526af32d5a6e96747c8aac7590da1097f1ca9b12390158e90ddfd6ff9f68c85765abbe179e8761658dda6b86
-EBUILD pyroute2-0.4.12.ebuild 496 BLAKE2B 219ee433271a4366a9ac16bd916de6374b1e0cf1e7d389392f0ec8d86f213083ca17ae6cb25d46ed0913ca37993659e0bef91e0220ab8fe73685f6624b72a84b SHA512 6f06d47e00b1fde471d5e4774515b8df4b448aaa8771d1f19c8658c83c34aadd3bee1ba0b1b1d28ab39201a5382466ae982eddd15ecbb4eb8889beb9cc238fbf
-EBUILD pyroute2-0.4.21.ebuild 496 BLAKE2B 219ee433271a4366a9ac16bd916de6374b1e0cf1e7d389392f0ec8d86f213083ca17ae6cb25d46ed0913ca37993659e0bef91e0220ab8fe73685f6624b72a84b SHA512 6f06d47e00b1fde471d5e4774515b8df4b448aaa8771d1f19c8658c83c34aadd3bee1ba0b1b1d28ab39201a5382466ae982eddd15ecbb4eb8889beb9cc238fbf
-EBUILD pyroute2-0.5.5-r1.ebuild 518 BLAKE2B 95129c5e1ad4298979e7b6c44e1bb0f1a43640a5a1c6abc27fb7ca61b2b7ca5e9a41b4db0653ff2cacdb59448b31d2d59eb620c860b06667a58c45c4da47f8b1 SHA512 aff59523d73c8370271b65f719af36a3e6312c7f1378fb2eb7777ee181633e5aa65ebfc3d95c0215fb8ba876ab2fd3f1c2dafbf32e1d6e12da5b82e1549a8443
-EBUILD pyroute2-0.5.5.ebuild 494 BLAKE2B e388d2448e54b67391fb5992adb5b25724c65a40d822ec8b7a1a3240820dae532a2981ab70c0edf8757111f04721e03485f39e1f2055265553c2fa7f42ef9062 SHA512 2cee28c9689ba0fff89d64f230d19f9b3f742bdd1705049a183c90369acefd9f3ee9cc43599833bda6297e816171eaa36cf519ad8db34e5f07f541707bfffb16
+EBUILD pyroute2-0.4.12.ebuild 477 BLAKE2B fc4cf0ddb620004fae53d6651eb35bdcc48f482f698e4a228239bf4684a1107cd081a89de788e118dd6ad379cd82b4412587a7963cce91e1be40b8ebc78a9654 SHA512 03609671d04371abb1ab764770519c635620c8db644cf6dce4ec51532758cab8993579060ef6b48fed5e6e1e6432f42b14811b6eca8157d88387062d40c3ea92
+EBUILD pyroute2-0.4.21.ebuild 477 BLAKE2B fc4cf0ddb620004fae53d6651eb35bdcc48f482f698e4a228239bf4684a1107cd081a89de788e118dd6ad379cd82b4412587a7963cce91e1be40b8ebc78a9654 SHA512 03609671d04371abb1ab764770519c635620c8db644cf6dce4ec51532758cab8993579060ef6b48fed5e6e1e6432f42b14811b6eca8157d88387062d40c3ea92
+EBUILD pyroute2-0.5.5-r1.ebuild 501 BLAKE2B 9f8a59ea1744a308202d7b7ffc619e956be512dc781397b38d21cdfece16a358ad6a7fff6ee09a81d653347065505c273a4107c948a56cadd222291ef72f8c5b SHA512 487449e86e115bfcef143615e2cfa8448f60f1547a393a17843baa83fbf387e52ef1479b7db094d89775ddbdcabf4fc7037dce7962bd70cf51a64d58cd98d484
+EBUILD pyroute2-0.5.5.ebuild 477 BLAKE2B e56469e4e6322731b00ac4e30346a92dd4cd49bc1d325aa05c968ca046952fb02def08c43f614f85ca5a2df44969c773346a3cc484695fb8dc9f1c4adb6c280f SHA512 9a021bd84de056803dfb8d0216f77c24a4f22c3d21fd07546f464ae32a19af60f152efc9139c90a2f12344d64e7628138843b0dfb7f4c6e80c92af86e41ec6a4
 MISC metadata.xml 613 BLAKE2B 81956270df2ad42126ab220bfbfc35ccd4681abf9779bad96580ce6866bfc08ea1cd2216782a8fbbe76aed58d74de752fea55d0967f24c0d3d3b6bb01f66f18c SHA512 9c88578b74af7890a2ecd8437581eff4dfbb49696d9c3e6fe1bfa807fffad66f949538aaa08d57f56a11ffe95b48c9ceb9d6b97594635b429a8a54bac3db3912
diff --git a/dev-python/pyroute2/pyroute2-0.4.12.ebuild b/dev-python/pyroute2/pyroute2-0.4.12.ebuild
index 53a42eeb3e48..f9693f0ed719 100644
--- a/dev-python/pyroute2/pyroute2-0.4.12.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.4.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyroute2/pyroute2-0.4.21.ebuild b/dev-python/pyroute2/pyroute2-0.4.21.ebuild
index 53a42eeb3e48..f9693f0ed719 100644
--- a/dev-python/pyroute2/pyroute2-0.4.21.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.4.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyroute2/pyroute2-0.5.5-r1.ebuild b/dev-python/pyroute2/pyroute2-0.5.5-r1.ebuild
index c144bf26f0c9..440e626dfa33 100644
--- a/dev-python/pyroute2/pyroute2-0.5.5-r1.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.5.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/pyroute2/pyroute2-0.5.5.ebuild b/dev-python/pyroute2/pyroute2-0.5.5.ebuild
index a984ba407ed0..4612ac6789f8 100644
--- a/dev-python/pyroute2/pyroute2-0.5.5.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.5.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index dadbedbd207b..2ff52a1b9fd9 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1,4 +1,4 @@
 DIST pyrqlite-2.0.tar.gz 7224 BLAKE2B f3de4d4d6f0598c6dc21e323db4c717f7f8dc85f6e592ea9dfb209ba778d1f16049d40e39b8d98c94dec61c02949ba1fabeae29e25ec8afbe4810df52b6210df SHA512 9d284161e492683955000dd3e3f0593b79e69ba5eb087bee4d3ffc1e4be9de1c362212936b10e1781538eacd838e6ed22adfc82e8cc0dd00e1d3318a4dc14720
-EBUILD pyrqlite-2.0.ebuild 937 BLAKE2B d743a0bcfb3649d3d866eed1a5f2813a46c3fee8b68fa4854ddd13a99d8cd13364ecf62e7a104fc4f60f923c6e67cb9f6fdcb7f7b06edfeeb7656d517088a50b SHA512 8425595b6fcc9797a63550deb53795fcae8bb360830a488754ec409bd83df70655c374951bd84e60a00b00e1f6957eaf0cfca2b73b3fe0acc24097a06675eda4
-EBUILD pyrqlite-9999.ebuild 857 BLAKE2B 7d3eaa3706df5d8d942028145cc25b22d7bcd2b39f0a7031c14fccffeac8d3a2cdeb88c572d51f15f18713966af0826b24c54807729799fed8d4b66c23a01738 SHA512 aad3e763e3f93ee2731f736be85cd437cd3d97b4bcee13f3f614e8f2d5c9139e4bba2a5c9c3745b65df2ff5106c56c90f38a203d8c091976d5ed495809846444
+EBUILD pyrqlite-2.0.ebuild 933 BLAKE2B 8f146db1342d66fbfaf29833fe26089902df1fc30f8568aee06faea4a50f91b94822d06ee26229d1e4dae75b1eb077bc9fbe4134f81eeebd3152a5b6ef3bc398 SHA512 2bd8113aa5841aa7e4e9fef4a7f41f2396c14e3fde250ca987f812480a083e151f9c1f9bfe131f551d01cf4dc90db67473a3c46eaa1bdb11de8884a46f77a166
+EBUILD pyrqlite-9999.ebuild 853 BLAKE2B 078009f629cac0b4070dee7383c502423bb8ffd1666b2d32ee0bd7dcf70e672a7120958beb0fdfa07155972ae7912184543d758a8701784b8fdc48cf047f06de SHA512 21382156f6be4af7b218a97f0e2e80e137e8aed7dc89337fe9aaedfe0d9f6eb67737c0ea3f4c6e14606de4b807b4137ab825b87a3754c3e3e7ca17de6191d62d
 MISC metadata.xml 306 BLAKE2B 6848a797588465344547135639af1cdae67a9db23851e940a5f5aed347ad4c6e8114c2fc88159370356bb4360c926d4b44e1f4474c98a7577e3dd64403100d72 SHA512 f26c1056eb200c8b60e2d0f7ff54447465115afecd34949ba8358f812d95dea6d877928010ac81c8d36261479ff6a61982350a403546dd09e7f4bf9a082a9d7f
diff --git a/dev-python/pyrqlite/pyrqlite-2.0.ebuild b/dev-python/pyrqlite/pyrqlite-2.0.ebuild
index 2e76d738d2c8..590b45ff9686 100644
--- a/dev-python/pyrqlite/pyrqlite-2.0.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyrqlite/pyrqlite-9999.ebuild b/dev-python/pyrqlite/pyrqlite-9999.ebuild
index 10dad0faa6f3..823c3daab1af 100644
--- a/dev-python/pyrqlite/pyrqlite-9999.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 59581f620957..9219354b434d 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -2,8 +2,8 @@ DIST pyrsistent-0.13.0.tar.gz 96326 BLAKE2B 47388d7d48841c3a093c5309e20e92619b16
 DIST pyrsistent-0.14.2.tar.gz 97650 BLAKE2B 343990acbd1cd566a410508514393b6e3c4cf074bb2f1bb46404cd64af05a7397c3abc357ecc29fc82b9fd390f567ba4fa4a3c9c6dd52045f40f28fc7eaa97f7 SHA512 06ae1b9d15ac72b09d2fdb80e28849a105cd6955f206472649996318c2dc9915f251d76908a913c02d5583e1e818ff456af496b13fe9b094c043cd2548b2b6d5
 DIST pyrsistent-0.14.4.tar.gz 98660 BLAKE2B 08c6773ed6c8f4951bcddccd1b67ea11187feddb939b5bd9a529f3a2c3a162507a274f5efccdaf7b41a435484c89e42f78f065b4ed4d1f5dba02e39407096858 SHA512 6a2807be742c8aa33e8e244a449457774a9fed9a8a3d5f368f2aa91ca94904d3a8b73faec80a4e18bee48f765305fba4f8f1d2e66153a6cd3975ae412306fc35
 DIST pyrsistent-0.15.6.tar.gz 107424 BLAKE2B 432ce7223fee524cbcd65237171af6f0fa16d23dfcc65b7cb5bc8d19dc8216344bf21660d2acf9b07eb1bc9b883840c0b5de679cfe52a0f977e64cea21cd584f SHA512 42b259c66e118d5b09bcc64e57441729146ed9b40e9fd18cda83c4aa0523d5bc3acde3177113e1f2a1b5c1e3a14d15b369df9701a9218a88a656ba0359b5ff10
-EBUILD pyrsistent-0.13.0.ebuild 931 BLAKE2B 17bc9af2325c8687f2d1a70ba661aa69ff570b6b5bd263541f447ca97c965929b75e14bcae6de29ddccb3758f1bafdb8512fa08e26d6dc65647a1a446f5343d8 SHA512 4ba8c6c4601150824a0c7cd90b501fa4bce8cf630aeeb80cf296e54bc3c963aeafd9ae86a3c172a3700beec05483b8efc8d5049ae560eabebf7803d2035aa316
-EBUILD pyrsistent-0.14.2.ebuild 930 BLAKE2B 02f70b925b86fa754c727abf43a53c4769ed27331db0f4c26e62cd668b5cdd9753d6d862d7d88fac397805159b2ca053b374142ebeff88eada3ed9b9d7464ee2 SHA512 b52581684a120c3a197b477305a70415e7cf7c4176b3d34cc6cc811b6613d291b948e5bf7989baad1ed5f2c91fe0f684a0fcf9aff824b9af1efe71001232ead5
-EBUILD pyrsistent-0.14.4.ebuild 943 BLAKE2B 5efc4ca0278e4248f8f54d4120e42925ac7a1fe962d44a8f0a4a8ebf52b09dc0f62fa9a5078f88c6ca4abb480f8f591c974c263b519dcf6e94824be9ff2f1c9b SHA512 7e5f5e600ff9159e05f55c23f7deb969d4b134ee518cf43bbc0115918e004468cb04c2fa720f8aec3821c3fd687faa1f530c54af53fb3d4d2ab89cccec2f9a51
-EBUILD pyrsistent-0.15.6.ebuild 718 BLAKE2B da976252233dadad0bac68d8ef318664e1961e8e8ab8a2b8b8285b3181340d1c0ab46f81b68c52b6b6fc74202d0fe8c888d023802bdd77ce0e75382dbcb5cfbf SHA512 a5751104dcb9b1b39905c2a46450741076c6de59a95c51b1874ab70cd0e00c4aa3c2f81cfcf0673c38aaaa4c885cad6f1521aab914925c962d4eb293f78c5286
+EBUILD pyrsistent-0.13.0.ebuild 922 BLAKE2B 2a39e28d71d11f9c0386d85159eefeafc311c00d55272dfa354cb8b6f8c7d30e8c7bf54ab2b8506a6d37a1fd34f526277564774c8212bee1709a2b6a5cd5fd6d SHA512 be61d38a1fed89d02bd6bda2b93467c7edfeb6b5980c93236d7d1253a16f012d6541326b66ad75d7bc4b9ae0453ab54f70d41a214f082e8e4e6ba9772999c7e3
+EBUILD pyrsistent-0.14.2.ebuild 921 BLAKE2B 6fc36cef0a3b37263efc078434a59555688f5ee4eb74b4380affcb4401c629f7003bfaad98f61d2eb9576bb0ee2ded6304c9e9c4ffa4cafdfb52d202e51c2375 SHA512 c4e24a237eb1ee86e0d22c642e4e2edc009828fa3ea09f06e1cbcc6a26d239bf813761bab76a9689cac6ae666bbbca3a5688e907d7ee3b4766aadefca21145ff
+EBUILD pyrsistent-0.14.4.ebuild 936 BLAKE2B 478da20728bcdbef2dd004f0ca36f05e53d3ede982c81a6fd7a546087201023a8a8285c4f11b6e9f83c389d294901799b9bbb9d9d20a8030274b37e8f74890ab SHA512 1e98b843869a0f22c5554a8dcf5b7e0b930ac706fcded6e63d951a4e78c00baa4b6d283eba945dddcb68409f345fb7895b1886ed18dc769c8903c546e6abc067
+EBUILD pyrsistent-0.15.6.ebuild 713 BLAKE2B 03cda956e64721223c68b9f1afd46078e3f55eace3975b5f969ad248e3ee739354b337f5961ad9e79bf8501be2caeaa683786a7bb638441235bf962d435c261c SHA512 fa1fa8f2accd562ef0d1440444aca7537ff92dcf9ee66669a6071e3977b6320a4da6459477a0444ea728d16f1c635f26c9cc00d1001075f03457c97c2b49db89
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
index 0f58e35b24cb..95c365f23c5b 100644
--- a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
index 566632f86e76..586b0fa75391 100644
--- a/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyrsistent/pyrsistent-0.14.4.ebuild b/dev-python/pyrsistent/pyrsistent-0.14.4.ebuild
index c5e0e02016e0..b561c46161c8 100644
--- a/dev-python/pyrsistent/pyrsistent-0.14.4.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.14.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild b/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
index 52a06a76ca60..759cd08b3106 100644
--- a/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index 3f3fd0d77298..3bf09c4de822 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -1,6 +1,6 @@
 DIST pysaml2-4.6.3.tar.gz 316979 BLAKE2B cf393075903269ce93dd219bd23479949ce8e39383d8150f8ee30185733569fe79c7421b87b3439b95e707f17d5f513abfa2610be76441b8f18d8f75a5a9fdd3 SHA512 259f7395afad44caac32453a03bbdaf8c464adeeb856b78786b665281dbe75b37e8054efaf945a7d10333c0b09d9f516d606e95b157aed34c1cd0821b7255b9d
 DIST pysaml2-4.6.5.tar.gz 319131 BLAKE2B d2b78d00cc5e65717bae267fbe88c781d4583996025eb4a9602030215f842a29b625ba41905e867d887e4564bbacdb1251170af46e5f00cc0f9d202c7741418d SHA512 da9cd23f9bef37da1079bba539f91df6a79190fcf8ab20b4c025fd8eae9b147799623dcc1376acfb6ff06c8566a58d478f8da7765195fe058d54007a2ebe79bb
-EBUILD pysaml2-4.6.3-r1.ebuild 1233 BLAKE2B 235bd4ae23a6460c9285b73d0ae154a584a5e84742dd868d7cd40938010c7cacd21493177ffb2448bc0ceb2e5e8f1e2e0ae8389f8f8ce86955cb178123797543 SHA512 e6e5148a5b73a7d62433c4cf1a36aa87bb55300283c62893650858198749693b6e8a39e020d2f2bea5e91825c38e77e5b3e8c89e09b1076e766c9c4846f8f93f
-EBUILD pysaml2-4.6.3.ebuild 827 BLAKE2B 1db32be475a21ba00773fe7a4af8dd551717a126cae519dd04f246520b8720aa94915e3479f4e95770d03e388e9bb3b8aaf9502988cb3f2f27017326e7f94c52 SHA512 f6cdc1d2dc178c9719f07ee04700eb2fb8ac8a3bdd38e512e4e5df389e6ec357ce30eb30d52def456344d67df69921c96b1df9fc7bc16c02ea7aaf081e559607
-EBUILD pysaml2-4.6.5.ebuild 1233 BLAKE2B 74efc184b2c6bd01af8f45f9060fd9b424277ab494998fb17c1e10c04c50bcd50d1904b57599f54c89cb5de11271e106d3ce7aa5ab01a9872174f4b188c705de SHA512 cd66e34a5a5ab729ed1d6652044da758828373007f73d09812d50dd784328bda6e9d756f4b9867e72ed6dced626d833ef68b261cd68e4866e95e59b069582e0d
+EBUILD pysaml2-4.6.3-r1.ebuild 1219 BLAKE2B 5909b42219923f06b23f2ac16998745d46735d4a9f632d9a21ca47ea6accf080d2a980e4584bbb6a733c7a3eb55f1d6c31dc2f0e68395c0af2b712a9bf92fe42 SHA512 ddc2ec9df857b4625593eaac22ed3cbab90aa85153d3c6a8ac7800855bbe86b029ca16dce6ea7ebd08f06095d0fac750d75a31f44a0ecc618faff791877ddac9
+EBUILD pysaml2-4.6.3.ebuild 813 BLAKE2B 04fe2029b78a53fd2d3e71f3a06ab446b258ecb8c0ce5723c4fe7682bb57bc162427b61d4703722e049e45d75fceda3a55668193b8440223bf03d71cb6a81af3 SHA512 bd919956051b7be294896fbbee561c75c12327b8e0b344ea45dfebb2d4338d01aa93679402cdd599076932f7bf77b3ff34b778773f782314c146d4e7cee06e06
+EBUILD pysaml2-4.6.5.ebuild 1221 BLAKE2B 0e95b864ec534adbcd1ab94f4f717330c81c1ba7030fea8d66e08f4aa08089c339f8275fb1b9c503fca8d36b954ca16b94ffcbe910d0c6c5c2c7be1ba2507337 SHA512 77a64a723be5db3c1a62cc104ca5c790a65fcddd9d116be264eaad38503e808f37e5e14ef68a924dd5d5031de25e2d77abd2b0416fa39c84efe5c3d61f2cdc2b
 MISC metadata.xml 606 BLAKE2B 5262e7d7a6f2ff32547ab8570f3aace4dfc3af9d667fdaac6ba2eba77ffd562524a136154eb7b96d4f1f7dfb316b72ee7a0311efa46153afff150c3956151b32 SHA512 7b4facbe3e25898488fffb7b39f9ff7eedd12492f668fa294952711efb3ca9549f2653ab6bc2a948286deff5f45116b0b8bd9a5fc796e99413acc9334eade348
diff --git a/dev-python/pysaml2/pysaml2-4.6.3-r1.ebuild b/dev-python/pysaml2/pysaml2-4.6.3-r1.ebuild
index 2b95f2657abd..4a56f65c6b89 100644
--- a/dev-python/pysaml2/pysaml2-4.6.3-r1.ebuild
+++ b/dev-python/pysaml2/pysaml2-4.6.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysaml2/pysaml2-4.6.3.ebuild b/dev-python/pysaml2/pysaml2-4.6.3.ebuild
index bc6958e23a38..2ebbc1fd51bb 100644
--- a/dev-python/pysaml2/pysaml2-4.6.3.ebuild
+++ b/dev-python/pysaml2/pysaml2-4.6.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysaml2/pysaml2-4.6.5.ebuild b/dev-python/pysaml2/pysaml2-4.6.5.ebuild
index 89cbdf99e478..a3f675d0b813 100644
--- a/dev-python/pysaml2/pysaml2-4.6.5.ebuild
+++ b/dev-python/pysaml2/pysaml2-4.6.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyscaffold/Manifest b/dev-python/pyscaffold/Manifest
index 69e176ffa9e0..a0edbbc3ba52 100644
--- a/dev-python/pyscaffold/Manifest
+++ b/dev-python/pyscaffold/Manifest
@@ -1,3 +1,3 @@
 DIST pyscaffold-2.4.4.tar.gz 110337 BLAKE2B c436cc4967cb671cca36b5b28a69ef27f486264bc39d1bbc40d745ea015f57db053fbf38d66a92b53c5f6c82a60d75ed2b114b27b9906db02c5bb6cc14de24c2 SHA512 840d205a84528410674e898d6f32a57d3e89edf71e4773a4aae38a4f1fdd883129f6f7be437c2d07fe89b58152a3b250f4a9a7125d1a6d9461673a7f22094d70
-EBUILD pyscaffold-2.4.4.ebuild 1346 BLAKE2B b10b0c5be73208adde4c571e2c9c1d5fb1656659261ccf1662e177ef717d8329b0099d028813a8266121d4c819817e4e4dbcdb6a527f795aaa8aa4032180bc88 SHA512 82e7354852fccb6358aa9b4d46bdc3c6f50164be8b2c3454addf8bc3560ee99fee093e71067ff86129491387b72f700b4209cc8a1b15f7e25fa135cbfcdb4c66
+EBUILD pyscaffold-2.4.4.ebuild 1337 BLAKE2B 4c197fae3d79be44fbc7cbc4051f96b3317cd8049b1cebaf729266a03764d8a05d76be6ccea657b978f5068db17c8d9bf633d4addd32cd762fb61c66af707847 SHA512 ea8e528c247c315f34590fb6e1bf9e9d56be59a11f744662741fdad5677ce41e3478e213a3d09a915dc4b9caf8f3b3cfd189cea38fbe6c80914b45af0fcb9cd6
 MISC metadata.xml 313 BLAKE2B 1b765375308aaea936a0b57bec624de4f741b46226bd03f5cc0a63c2d64a9f2750132ac85f13a45ed44195435606a185a66ed889d6acb8ef7a8043a34a9c851e SHA512 631609296e39a646bc9ba622a70effc218e4863af3ecd88c6d7dccda05a0b21338918567a23d76366864cdd3947e6d6dfbf488e9a37aa81dc09931348ea1cc5c
diff --git a/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
index 7c52e325bf8d..da9f7589b3c2 100644
--- a/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
+++ b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index f9f3db5efd0b..08367776ac7c 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,3 @@
 DIST pyscard-1.9.7.tar.gz 144692 BLAKE2B 5a842b790e01ff5461c462d6fe2d7763a79725cd1bcb841c1aaa49f2b17decb251446adb908fa8b525b91f418a6df6a76ddf779a67b7e8547211993837aed2bd SHA512 339d6efd5fcaa361e30029e736d4e2e98e05acd701c39574b40960b4bcec4782ca9c1d6927cea0b3641c5e6a137d0b9fbd961b58422a4151cfbdfa067dcd4b4a
-EBUILD pyscard-1.9.7.ebuild 763 BLAKE2B c4cb245fcd8532a6a4536cec5ad05121c6e82772f2bd768fa69f4adcd99371e7d0a048fc551676c6f92c4272c6bd56a3f9f75860e4fadf17586eb31aaec0203d SHA512 9b74a9cbce39031b9a80859a1c111f4ff740a28196df407a4cae720d89bb0b588e0cda0b46848682e275ff198c91ec8b3bc44e291da445ae7c1abeff0a74a1fc
-MISC metadata.xml 418 BLAKE2B 7c2e1919ef8f47007374f1f7854380d5258fe75f257be89c7e1ee6303424ef5cb2c8bcd4d6f36cd0218e46b53d9af309276bff6e5fb49eb31e645e3a14c3b719 SHA512 88cd5d13d515f02d3c53e62900afbb7ee5307d2073696f4a53358e7f3cf658dc3fa79465b25477c4dcfc165f8a06021e1ce5dbeaacfd932d8efab922cc2b32c4
+EBUILD pyscard-1.9.7.ebuild 759 BLAKE2B bd78d1240b24225032a0b0844e8fb031b2516a32a1c1b2eedc3a77da74123f40010f95eb280db195b3729b10802c47f5374e370c1e5f6a426b6fba46c788f15e SHA512 145ffb36a8d5442f261cef4061014994318e6214e09905df3e7ac5911354ef39a9b2c75d64de108b1d80d7a49b75b6f5756b063021b77008199acddc7b94800c
+MISC metadata.xml 317 BLAKE2B f87dee8af30517c70bf141fe7da6a953f61f894e7f97897f3c2a594fae16212a518e80eb2141e2ae18da562a91a85ca74209e0c77f4b9bc54e91fe9bd02f650c SHA512 f0ee67c282ef764df07b1f49ea3fa4714ecc6094046aa6fb986274968e58801eb3f7a32463bf4282dfb607202b2b4e5e1b50a0d54f79e85f64a6abb2d68e309e
diff --git a/dev-python/pyscard/metadata.xml b/dev-python/pyscard/metadata.xml
index 95a5e2fc5f91..b3070c74f3f6 100644
--- a/dev-python/pyscard/metadata.xml
+++ b/dev-python/pyscard/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
diff --git a/dev-python/pyscard/pyscard-1.9.7.ebuild b/dev-python/pyscard/pyscard-1.9.7.ebuild
index 10811ace2045..b59ab8d1be3b 100644
--- a/dev-python/pyscard/pyscard-1.9.7.ebuild
+++ b/dev-python/pyscard/pyscard-1.9.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pysctp/Manifest b/dev-python/pysctp/Manifest
deleted file mode 100644
index a1bde10051dd..000000000000
--- a/dev-python/pysctp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pysctp-0.6.tar.gz 29611 BLAKE2B 3295de491661e43076dd46572301d897c42f211aa3e4f34fe6dbdf07548702234cad10a166001ed2d9c76b75767df1ba12a06b20d03d9ed2e99ff011202bee89 SHA512 621ddeecaec9eb0114783e2103405ae3eb0c8950a3c76fafe4505ad5311e2c004dd10219d90216fd5f5e79e033e490695e7428ee7c7a5fba26dea7d253e50215
-EBUILD pysctp-0.6.ebuild 598 BLAKE2B 67a8c9ca021b7712d1a46b6a262f11b76845d8a40ae38dc6cc0508b7c04f5f6582d9d4c1db8c73992d127e322b4288bade425c5fe9da3625fd414f8797033d52 SHA512 b46e1af44eee7a14679319c7864b7724f0238b88197191918aeaabdf1a22b86dd864e6bdcfd0864117fc9384ab8973e04f201526730c6ed7b087a29a606c4927
-MISC metadata.xml 342 BLAKE2B 9dc7d51d25f5f3680d0b46debb6454c652a298670698737553760c082316c9e92236cfc4955b2f2e4c70e117ac387b64d6858ba76c832bbca4356f69333b8a77 SHA512 5ac1525b2c423b3c59d24aba13aa8fec6d2644ae5350577ef48da4fbcca348f84fc0b7494678ff6aa3a1637b53d944eba5bb3aaa1990f0b5399425b78472ef06
diff --git a/dev-python/pysctp/metadata.xml b/dev-python/pysctp/metadata.xml
deleted file mode 100644
index 0c8a742e9f4f..000000000000
--- a/dev-python/pysctp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zx2c4@gentoo.org</email>
-    <name>Jason A. Donenfeld</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">philpraxis/pysctp</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pysctp/pysctp-0.6.ebuild b/dev-python/pysctp/pysctp-0.6.ebuild
deleted file mode 100644
index af155f705cc2..000000000000
--- a/dev-python/pysctp/pysctp-0.6.ebuild
+++ /dev/null
@@ -1,25 +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="PySCTP gives access to the SCTP transport protocol from Python"
-HOMEPAGE="https://github.com/philpraxis/pysctp"
-SRC_URI="https://github.com/philpraxis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-misc/lksctp-tools"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-	rm -v "${D}usr/_sctp.h"
-	dodoc test_local_cnx.py test_remote_cnx.py
-}
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index d9e25902cd62..e320a041f1aa 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,4 +1,4 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
-EBUILD pysendfile-2.0.1-r1.ebuild 594 BLAKE2B 71bbb6bc65403a581a3a953f180106d0e9be492b4321f44900c6844410a03fe1dea0e7365f1fc473329741b1645241c9f0a2c7640004146c8c6f2221069144c9 SHA512 f2ebe81e0289c99ca84504b864084011a752d7433e21ff73f43bfbccc2951ffa3861482e65132e66fa7b0c0a1ca18f4eaaa250bb56addc6c8363a4d0a9283ce8
-EBUILD pysendfile-2.0.1.ebuild 582 BLAKE2B 05743d12d39a96631531aa1194eb6051e43252ac2f278c83899d2ff580afdedaa5ce4840fd60d764c970cde42db9d73e43a32fe79fb610c6540272ee46e3703e SHA512 417ebf85d479bc4c34d794aebfc9fca6081822b78f4e8233135fe1e04b6fd513428d0ec719940ff5c2323c1cbfa8a59d57e4ba31615bac72eafd4bfe62f6ee72
+EBUILD pysendfile-2.0.1-r1.ebuild 594 BLAKE2B 7277293d666be67fd99386306b86c1e8ddbcde3ac946f000ee3707614d034bf96ad39d7e0c1397f545755946036025ae8f371f5d817c0f9c624f28a76f02baf2 SHA512 f7207b22be2c6e1654de6462e147dbb99abf9833b87c429f1730c5b44e7a5ebac24afe428b1b75d118471e5ab4939bcd25e7a5f46e947e0c24f2ae91375c5b00
+EBUILD pysendfile-2.0.1.ebuild 572 BLAKE2B d45a1d803ee34b7f401adb114d57962284110fd1dcde57dbb171e187e310267b50cdf2e2f1c9e322c78a1958105711092988d95366d4d196a3765026b2e05ac4 SHA512 cbe72c31d2b1e8a0ae399e72973206dbe3a992a73b6fe9633998245186c9624e265f04848ea66117d3acaef74b32a628d3af92304bfcc0c6040dfcbbfdefb72d
 MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
index 06d252c0b74c..503fe6217d33 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
@@ -11,7 +11,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
index 1ffa65ad29d9..890cf8b2ac20 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
@@ -10,7 +10,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index d8074bccfa03..df0a24fd5cd4 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,6 +1,6 @@
 AUX mapping.patch 495 BLAKE2B f9a2493c2ed0f522000b2ddc774c931138adda0c7d6f8d53875532fed631936436f5ec8cd572e8fc47bf5d9ada2663efdd315d6102cc5ec873d198a53c75a604 SHA512 2a0a86462291ecd78d06c9b88e8971502a58efa61ad9d47f0df2c94240245a41e7bbf9bfbd93e7761560a16fe15203cf8c5c52eaf3eb24e1499b00dfec3808f8
 DIST pyserial-3.2.1.tar.gz 147338 BLAKE2B 6c377d1527183fc48e1369f206f409d312e4488bdb15ae1d1ed93249073ffc56529a9e6059ef57c8f2ebb867cb6d9c0b7dc3a74eafbf653463a05e603b25d69c SHA512 8d3e580cc7781fc6549ab6e408642f4321eb90aafbe593f5dcf953001730f89ee32ce6592728764027a7944bfe4a0ebe2cfac1fce071777aac7c4f27ac94ab7f
 DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
-EBUILD pyserial-3.2.1.ebuild 1116 BLAKE2B 64d1776c61ee456c51cec28befce8530f06b102bb141abbb52c845df294b64bbd1347a379b1438d9ea5d74681b8e52262e57eebcff42067858d8d8873997e570 SHA512 2a5c8a98fc89aff6f46da8cd0145b59458e198dc7113f3cfd861ab0a8152a2fa9b1b87709a5a6ddc968b352c41acff98f0885ef9f25100c6cfa170d620c19be1
-EBUILD pyserial-3.4.ebuild 896 BLAKE2B 978df640318fee11594f305f6e70fb0a3775f6dfef11f99bbcf806ad11877d9e79fe4bbec1a81e89c90a47de64d3de52b7c5edaf2548e722b278b452b635f4c8 SHA512 83d816bce0f69d4e078dd0b112d58ad575fa1a782939650cf38a592edd00ca0d4d68fe5409fd25e646257f8aae716a6feb528e40ba121ee27a7b96fe9f2d6531
+EBUILD pyserial-3.2.1.ebuild 1107 BLAKE2B c988fea17067f8087d5c54ea530438148c59f10148a9bdcec2b97ce9a40440ef0d7c68428b03a8ccbdabd9116a7ef6231e5f33661c2a529ed5934b4a610f2831 SHA512 d00cb689965bba7fff7b1d958a6f6add8f15a2e2422d66860f2cfb3a3ade03597cc31fdd4a4d026ac6961de57e7460fcd54a16466c910c3449005e78e35fd3a7
+EBUILD pyserial-3.4.ebuild 889 BLAKE2B bc0b14db097ec9a743bb4837b54fdf4d3af5ccaaa2fe71002404b15d4df75f7452c63e57de49051668503d92be08c0dbbabed3227282c1239223837ade469bf3 SHA512 b857691aa348b52d595ae1422d1c38f38ea815edb5355681ebfe4f3f37b0b79358f660abbac718745a1c740692ea47608b581aacba067476428c7f9e2f9cd0a4
 MISC metadata.xml 421 BLAKE2B f3c94b0b72c3df17d9c539e8b76e1f644e0b4ae1bb3d905652b568084e449bf11cab07f27e7775031eee857095671debd28bf1d2eb8c1992c6b980620b32109b SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde
diff --git a/dev-python/pyserial/pyserial-3.2.1.ebuild b/dev-python/pyserial/pyserial-3.2.1.ebuild
index ebf633e6c7e7..5850a3cd9ec2 100644
--- a/dev-python/pyserial/pyserial-3.2.1.ebuild
+++ b/dev-python/pyserial/pyserial-3.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild
index 35aaf81c6337..470d2166eded 100644
--- a/dev-python/pyserial/pyserial-3.4.ebuild
+++ b/dev-python/pyserial/pyserial-3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
index 54f58e34289d..69f44dd39f4f 100644
--- a/dev-python/pysha3/Manifest
+++ b/dev-python/pysha3/Manifest
@@ -1,3 +1,3 @@
 DIST pysha3-1.0.2.tar.gz 829192 BLAKE2B ff0c0e1cc35f5e2efc0a7d3074022aaa1e05fa72cc151560180fe08958c8f83ec2b0f50f9e1bf772fd386647f3d44e8b4139f5593f6d0d678412eabe4829e939 SHA512 57476d24b9d399471cf56c8c1413f58dbc863c16d4fe9ebd2cf65df8092e139e2505252605e3fccd68978f5ee3fffdfeeedee6788aab38a54c918a452fc19720
-EBUILD pysha3-1.0.2-r1.ebuild 1008 BLAKE2B 2e9de68074bee8609a86de61dbc0006329d3ef9138034b650dcb200abb5dea7e511932b5f3a69ef928fa7da2ecfc31cc08ef626de505eb34d87781a44881899a SHA512 fb325b3be763a881bf6485949459922ee8c869858bc6b059cf93bdf4f9c74d523872716706d1863823b3598f48b2cf76cb0eeebcd20937834a3d57227eab8227
+EBUILD pysha3-1.0.2-r1.ebuild 999 BLAKE2B 7f6b6e2c7db68b04ba6da552acb64c990136c3b05c35b323637baec020b742eb005fb4fa06a36eef943615bac5997c2c252f4a5e8c2eef16c5392152dd08134c SHA512 3b9bf71e83c403f2b5db2e789b1df338de43576d1167023549f96045b1a525dfe2b2b3560d1569a657a46e1622a4cc49893827af4483da32974e9e4df7eec414
 MISC metadata.xml 447 BLAKE2B b29243faa53b7068fce5b86ff8ffeaef920340c92bee35620fb2977b02a1f543fb6cfbd5509fbe784753d9e1b123bb1ed594dfd59e2ba611b9ce0e1df6319174 SHA512 e29bf7eb65b03e9190be49df6e924da2e8a6d30eb74bad5cd5b3551df5184c720c9666a11c0cf4afe4626a3d433edd0989507583d97aa24cf5b8bb9ffb535b9d
diff --git a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
index f73d987791fc..e550539d2594 100644
--- a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
+++ b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="SHA-3 (Keccak) for Python 2.7 - 3.5"
diff --git a/dev-python/pyshark/Manifest b/dev-python/pyshark/Manifest
index 2b7cbe62d875..e92c7927bf98 100644
--- a/dev-python/pyshark/Manifest
+++ b/dev-python/pyshark/Manifest
@@ -1,5 +1,5 @@
 DIST pyshark-0.3.7.2.tar.gz 27232 BLAKE2B b93ee24fb29990b0ab455935e773e4844c26761c2515d1254c8e72d24d70be95aa17a590cc1f5b39bb5f76db624fb7c40d06e64731948ee75a5b8e2008830968 SHA512 dbd97665fae7d3067582bf7616e025b0c5e5fa14cacdaca59c89b4e70feb3017f2d8c7d899a70c0c8707589e4735b9283914bb6ccbf432e9072c64d7e957bc15
 DIST pyshark-0.4.2.3.tar.gz 29363 BLAKE2B 91463f725eb893c3c7f7442eec5e0a8304bb8f2ecbd0ea80582c49bfd8538a5fcdb1d5d1ab2373f8e67684c78c8852af697dadf8ff041d42f8ff18a8954a6248 SHA512 bbef857dad5e5141e0ec7c04dba9faca81b17d67a7151959e9935577428cd1415e173e9c7ededff46f8621bcbbdfbe7a96ca5cfd65d7143fb6f235c0167964b6
-EBUILD pyshark-0.3.7.2-r1.ebuild 1287 BLAKE2B 65b1591d8386e2c064489dc661ecbc1b4f3a2c2e6be2365309958142f8c238105fd5b603feb122e44cbf7d8450a05117c6cad2a6c4dcc24fc3a60eba30b24e36 SHA512 c5961fc47d79c73624bc7d038197c7640d1d4fc67b76a238c5d931c602f4ba1020ed41bb142819eb79d224b136b6f100b7d60620ff01b0f4408354c31168f573
-EBUILD pyshark-0.4.2.3.ebuild 1281 BLAKE2B 699474a5195e1dbfa7eb381ade9446db0fa49448328084d43b7c8926984483c88022593e434d670d67862b4935198887f898a3a5eaff15c6f6175b6d3b3d77e6 SHA512 29c8c46d9378518a4ecd8e6cdf00d01c6d7ad86ea0b4c667c7ad4779ab03c99484ff631ae05c816538356d2e300d4dbbabb390e1e8550ec6447210b161c8d5de
+EBUILD pyshark-0.3.7.2-r1.ebuild 1277 BLAKE2B 18216851de94d7d3e8ffdfaefcee4c5f1368d4da1cd94f60eba6217bc64d1b167d24e2750647f7417a31c1b9cb257b7aa651422b41ca93649aaa9f380f0b2a19 SHA512 4423bdbe4702575636c0a898c5baec3932a7a67c31dabbc7ec7763b1bdbf271ab88120efa739b4f99d0cdcb0d724a5810d63b2c770bf9db648afca8de6ceba83
+EBUILD pyshark-0.4.2.3.ebuild 1277 BLAKE2B 82c58eb7d69dfa113f7bc36e12ba452c5a983fa74b488d8420f781428cd942698f13d0e9a5ff076533a91d2bbeea98733b17c611b2086dc91c92ac81eae325c1 SHA512 b3d01e5b5336acce26a90fcb87ab11c02e0491804647944e2b92cc28a479a0aacf9a77433e620ca637b68a7fb73a8e6e9e631bf2ec56f07cfc5168d9f64dc696
 MISC metadata.xml 378 BLAKE2B b5d298f634ff4c3ef0921697ba6ad85d6704effd115e130075507d4ab5e7cfefcd3db393f044f1607dfc6b6442363c58b9ac693281334bc981c3462c0f1a775d SHA512 17d2661a631633ebf347dfc4def34aa070c4ad5713f6124b668c3ed5336a59b639c30474e4b4cb294661648ef186797144c161a390c0d93a21de82ae8d51d8c7
diff --git a/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild b/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild
index 2eb2fe6fc11b..7b6e6873a949 100644
--- a/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild
+++ b/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyshark/pyshark-0.4.2.3.ebuild b/dev-python/pyshark/pyshark-0.4.2.3.ebuild
index a08edb82c674..0fce6320bdef 100644
--- a/dev-python/pyshark/pyshark-0.4.2.3.ebuild
+++ b/dev-python/pyshark/pyshark-0.4.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index 7edf8a495bc2..31f8493b962e 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1,7 +1,7 @@
 DIST pysmi-0.1.3.tar.gz 78325 BLAKE2B 8f82d86e096a47944eccbd4b7ef846f3d9ca155f3f6e0790eecad88cf872c20a725a4071c8c2b9295fc348fa20efbd41ae7d0479cbd4ffe054e9956a6b6784f1 SHA512 d321fbbc68e4b6b2b18de5c1215dc450ad2ba2ea6c70cbeee9d981d2e2106b59582eae42b09da72bc02af789f7f58a6fc97712869b74f0137d8f7fd7238b2211
 DIST pysmi-0.3.1.tar.gz 93003 BLAKE2B 91fa382aa693d8849299baf27a2fe10116441cc0661aa553321d9b5584e64751df547172f185e207a7eb0c6438ded60a0acef5aa51263cc1f29219dd8cdef2fc SHA512 b7ffff85689a1f99c53fdfecaed3d9dc1b5c3685388695e715cde9b42eb8511aac8a47b04dcce243c0fb09a4823a799d80a0033ed576637356b991c71bc660c8
 DIST pysmi-0.3.4.tar.gz 93985 BLAKE2B 71b0ed936c196381f895b4f56e8e2e328ac274b08801a77b404b964201e00f8da2cbce2719414da358a4feb7992a3d04e732942f6e7006a0cceea4496f96b758 SHA512 720c8948a590130583d6ea388f0ade5d3bfe9e845821add7ffbf1b5495b5fe00b768ffb94f67b82465c6d86234f5306c6e1a5c2e49f4825bb9c31a0df629f7bd
-EBUILD pysmi-0.1.3.ebuild 432 BLAKE2B 717d2c04b44830cf575822a0b6caf64c6e5b853278f1b4498e5a8f6b28b0832584aedd6f714dadca6db45e51339699f5a8d0f743220926314812335ebd338b19 SHA512 005989f276862b8f2326dc8046f16c41773115f5d9995f4d70af98068dec8ed9f3908eefa5689bf2923a3bca95c497f0e38e02b63dc27446e4d28be9672babc8
-EBUILD pysmi-0.3.1.ebuild 434 BLAKE2B 4fbcbed85f1a540e0ec7d8bf61124bba7db339d0e254bec6c26ef5a2dbea5daeb0e273267415fcc4dd6078c09df5749d74263aac11548c9b688c52296939ff59 SHA512 d47ce7b8ccb6f0ac1f0c78f67aef400af6e68aa9f5da0aa51d88e14cd66e6cacb5a192054039f836ac8de780dd7a96fbfab8c2f862607a074a4a5fbeffa7947c
-EBUILD pysmi-0.3.4.ebuild 438 BLAKE2B c714947fa8265b16687feac379f560979856078b61ec37fe1d99b6cb3a2dd7ae9f83b2b36ea715de6171e8764f6476e74148d6996872b4b7c9219aecfd8df0ab SHA512 1f1a45389cc118af05ab2cdba64b155ac9492fd8498bf4b607dcc69f621d37d2c7a63500749f8278d03adede7698bc797baa1279df2333fd9c8bb048e25e378e
+EBUILD pysmi-0.1.3.ebuild 428 BLAKE2B 781f4426600b89c107e876710f93cef024c68fb6325456995251eda48516b47f30916b2b694a8db83e0a53fbb664c0212b9a4f48f0af6b1aa093f4a54798aff3 SHA512 4a33a0aaed90854f9f7efccdef8dcdbfe36f7b597044e82679c960f81fbd00bfa7a5f7eac618785cb140e3b3f3d6f04db4a7d3258893dd23b17e88d54881011c
+EBUILD pysmi-0.3.1.ebuild 430 BLAKE2B f0d11cca1a28a5eda414b0ec493c3ba6211703f49bec019c9c7018c6edf9e89abfd17ae0d2c97eb3a171ff81e9318bae3ee38cf15be2832fa2baac6a606fd8f2 SHA512 c60ef4c7d70b1f8962a04a49932976bac9cad8e1f70040ead95852b105633a56fa0855e6bd9f12a85dde364e2a18b2f782907dcd785cfd25ed0856fd5c8e142a
+EBUILD pysmi-0.3.4.ebuild 434 BLAKE2B 1614ff0b6b9951af6d2f9fd28f24acbda233cc214451f6bea6de7e78ff0ca5374540d74a6ddf49630a0839386bb42e0cee84ad4094d191e7013624c72a1412cf SHA512 30e29ee21e272bf0034ac62d39d2e27be06eb243821c61d006b74d266c90d3a81468b58cf313fcb440d2cfea27001cdc70f2c26ff287291b18465069a7c7fe54
 MISC metadata.xml 358 BLAKE2B c89fc0ed9212d67a3ac2992ec231ee3a26c473e19e317ab3c0bb1002212838299a55ec6db99950d852c6760941e5c698f04db2213544ce9089303519a38e8c79 SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d
diff --git a/dev-python/pysmi/pysmi-0.1.3.ebuild b/dev-python/pysmi/pysmi-0.1.3.ebuild
index 664b46b49681..d31475e12dfe 100644
--- a/dev-python/pysmi/pysmi-0.1.3.ebuild
+++ b/dev-python/pysmi/pysmi-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2017-2019 Gentoo Authors
+# Copyright 2017-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python Lex & Yacc"
diff --git a/dev-python/pysmi/pysmi-0.3.1.ebuild b/dev-python/pysmi/pysmi-0.3.1.ebuild
index ddd41011c2d5..6ac3e68b21d5 100644
--- a/dev-python/pysmi/pysmi-0.3.1.ebuild
+++ b/dev-python/pysmi/pysmi-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2017-2019 Gentoo Authors
+# Copyright 2017-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python Lex & Yacc"
diff --git a/dev-python/pysmi/pysmi-0.3.4.ebuild b/dev-python/pysmi/pysmi-0.3.4.ebuild
index 273421218aad..75fb19a60b11 100644
--- a/dev-python/pysmi/pysmi-0.3.4.ebuild
+++ b/dev-python/pysmi/pysmi-0.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2017-2019 Gentoo Authors
+# Copyright 2017-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python Lex & Yacc"
diff --git a/dev-python/pysnmp-apps/Manifest b/dev-python/pysnmp-apps/Manifest
index 2d6d5b4ac248..b70bb8541374 100644
--- a/dev-python/pysnmp-apps/Manifest
+++ b/dev-python/pysnmp-apps/Manifest
@@ -1,5 +1,3 @@
-DIST pysnmp-apps-0.5.2.tar.gz 27006 BLAKE2B 78e792cdeed6bbceaa6846a055e9071ac69759036d8fb5bbf648c071690c01dec1f1a90f1a0449a530d88af36bb387a8694ae63ef87d97448b29a5334937db1b SHA512 8f4cdd2d433c6d1e2d977502e9cec56e4526f4f0c2893f6489ee0d79351bdb41729b41e3db250d6515e589b622b3234902890d2fb26fe89ba4b48b146a78fb71
 DIST pysnmp-apps-0.5.3.tar.gz 42810 BLAKE2B b8a3cfd1103c8d1d7fc7a79af66c34e4e96091c6d07c124766cc10495f466646e5610f24f1a4d82b4f507b0d0687833f34bb1e6440c6fb0170833fc4449fa78c SHA512 dbb69cc6e394f7dc186172bdcbf5276efc176c0ae2c4e71b2426de9a5963dd2634ac7ccfd3fd56d794d4751f1105ee1180221222d481409a43a6a71dea4e454c
-EBUILD pysnmp-apps-0.5.2.ebuild 525 BLAKE2B 29056e1f3c6790513d6a468015a8d09ecfadf18ca656ff3408995360d5f49dae6bfd5cdfdfc5c298dd8db8f30fd7768d243909b4b682a6b44192f240efbfdeab SHA512 8883d1591776ca3f32116cc7439783d6304f5f27591a50b8b396a7a64da47d7991fcfd3b04466e173e89aef4dd58ebce52dbf246910511b8c7b59d45ad031943
-EBUILD pysnmp-apps-0.5.3.ebuild 529 BLAKE2B 6e3af508001d8792138a634bc5492065d3504b66eb2c2eab6fc2587b8c26eef5bc6e07c7ed433f5ce315d32732fac069e000c599442999e85a9f8f8d851619de SHA512 a908651ec744e5f381eee25475226285b904968ce20682920fddedef48992c48838479cc3167896771e241430db88be3c066f0255c5ea60f82b40a54c4edfb48
+EBUILD pysnmp-apps-0.5.3.ebuild 519 BLAKE2B d2d3f5229c18ad9eec04f9f5a788a850740004f5a5e84cd61c290a77894a8da5e417aee344c31fb3ed4200619391ccb6cac6ebf23c773b537b6721e34e78b999 SHA512 e048df872cab532c47aaff270087ae66fa7cac53b87b1788dbd94d8134f17f5e92a0d9bef59b2ff71c10b457d26e5e003d294fa842769e221bb9017d1e7de6d1
 MISC metadata.xml 1515 BLAKE2B 08b730f5ad6ca96aa54b303db0191a89a8a1021709b803465f0c87aab12092561574f6601f33826668e9f79be80c0dc3934c211b3d11fd72b1a0725cab2cde15 SHA512 a69fb4136f83b7f61f566802cf8982aa9c84e6f009d104c7791c5c8ad3977c9b6245bbaa87ef135fae126ba1fc15e0d0debe888d0906a03200b7c4a1efaee482
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.5.2.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.5.2.ebuild
deleted file mode 100644
index 0b2cb173642b..000000000000
--- a/dev-python/pysnmp-apps/pysnmp-apps-0.5.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="PySNMP applications"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-apps/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
-	dev-python/pysnmp-mibs[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild
index 2ef19d5aa248..bcd0dc42296b 100644
--- a/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild
+++ b/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysnmp-mibs/Manifest b/dev-python/pysnmp-mibs/Manifest
index 9c1dbf30ab62..4cccce9011e6 100644
--- a/dev-python/pysnmp-mibs/Manifest
+++ b/dev-python/pysnmp-mibs/Manifest
@@ -1,3 +1,3 @@
 DIST pysnmp-mibs-0.1.6.tar.gz 2113334 BLAKE2B a685dac05f11284c28c6ec9ebfdb4e99145d4cb48b982cda771694ee3ecf522af07d174a8b97430728dffa243de7889f8a831575113d8a9b35a494d1d9277b2c SHA512 6956d437f7815e31af13ac54ade7526e07fefb63a4c4bec95fb5d5c8f198f0d7bc8bee2cd9d0072c46d089f579d6cd6227152646a763e3342c626cce367e89b2
-EBUILD pysnmp-mibs-0.1.6.ebuild 504 BLAKE2B 037ce77fc817b4c70ec801aff18704e32d985bbd14306e3f4981cbf3161ff216d6eea181a054b4095029499a38bbca6631c92bfcb7fac1b5ad64aca1aaa79d4d SHA512 a60112f0584341c4bc99cefa7edec6782e2b634c66bce6f1a9c95bce2097e34db4ae6840048afc3413727ddae76241cd5ad7d8898989a3be62d0db75c4b0bb08
+EBUILD pysnmp-mibs-0.1.6.ebuild 500 BLAKE2B 2dfff790e338d8d3a881bbb7b388548d976cc2233ee48a5d92cd8ba1d99af6f13727e22bd3b1589bb99335f97a9609a5ac011f0ef3151bce8cac2201032fe9b5 SHA512 5d453e31b5f81ddb07ec1af1bf295c4cf9912e7bf22d801582c2ec3d58c63a81cf05be953470457d57ce51c1bbe984d1101e8923c54c94faa330e60fd0b8cb53
 MISC metadata.xml 1515 BLAKE2B 58cb9f0f443bd9923b3ec824cb54d0e5635ad5ffb9da178d98a9b920f14cf75640295106a8fa9928447d4410708ed15fc0850b3a2986a2228d92e7cddd431739 SHA512 99adddec026ae863568b6239dba0aaafbdcbc5b020c0c337c1466900a134de902cea3a304c8d2c8aad12ade54750379a1fde88120e13f879e7f75ced2bfd1be4
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
index ae1a78a187c9..4df3e04ae69d 100644
--- a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
+++ b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 58b3eda43fb2..43999ea892d3 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,10 +1,8 @@
 DIST pysnmp-4.4.10.tar.gz 438845 BLAKE2B 2ad444212d202a3e788b1cd2e4e95931ef59e758923ede9b99fe511fac9cd31b8ad02ebbd61fd2df4dec0b9f95eded2753465929aba3b070ca614353eae466d4 SHA512 ed7d705dda376bbf31366653566f1f85ffd71a8253e573ad197a8a073a60ec4fac356b28daf97ff1310121ea3a6b2fee17c843c6ca90d664916fd9095a462207
-DIST pysnmp-4.4.11.tar.gz 441657 BLAKE2B 2a1f14f9205ce34bdbd5cc22e1875e00aa8f34f0a3327aad37d920e3b0c2e4b5c2f0e877b23cf59ec65f803020bcfae0c7162666baa7621be19042506fdbfd26 SHA512 0f61ad0c095398b4b511c854ea7156aae78495f299457b14f4d3b50833670ec77c905e9cf4bdc30c21dd3c3e62d1c3473d7895f0352140af6345b18c1db3e7d8
 DIST pysnmp-4.4.12.tar.gz 442270 BLAKE2B 0e4e1c44d7fe1def24d8bd12bf88012eb54d432888745becacdc9c072ab5a653eb947ee418f6b7b3f84bed39d6656dac25ea00a2accfa546d7310be17b04c8ee SHA512 f22a346443cb07beea594b67b09ce587f5602a439c68148b8a655a0d2c769893848bfcfdd47b5f0002f48c650bf3a39186edddf977fb3ad2cc0d124e66f2ce94
 DIST pysnmp-4.4.4.tar.gz 436318 BLAKE2B 6e6616a79fc15d457b8da2e2260c65d9d8ef29888c033d80f2f47c8de035d0cff73dc4be1eeced8ef36dac1301b7da0d845837b780815792f545b6ad18d5496e SHA512 960ac73b7356bb236d3853432c094d3aa86a343f5e211065689e6c784293748ec6f2c1c17bf9d96b4cbe2d9d476ebbacbaff4bed7d86370e5ef61e6f03ba8c0e
-EBUILD pysnmp-4.4.10-r1.ebuild 1245 BLAKE2B 0de7581ca20c9c82557cd9c0f155caa3e895fe30e99f463344b81562d06e61d492687b25b740c6e8d91ca8299f11e70208b55d1dbbc3c4cc70a8d2abfd76df7b SHA512 89b3b7fc27ba358efb326be3eb3bee8baf520e87b9306d418a21c8809abdc974ab6556a8cf8c3cc84e247ab39782a963a0ff39520b43a39f4e2c9b1934c79410
-EBUILD pysnmp-4.4.11.ebuild 1245 BLAKE2B 0de7581ca20c9c82557cd9c0f155caa3e895fe30e99f463344b81562d06e61d492687b25b740c6e8d91ca8299f11e70208b55d1dbbc3c4cc70a8d2abfd76df7b SHA512 89b3b7fc27ba358efb326be3eb3bee8baf520e87b9306d418a21c8809abdc974ab6556a8cf8c3cc84e247ab39782a963a0ff39520b43a39f4e2c9b1934c79410
-EBUILD pysnmp-4.4.12.ebuild 1245 BLAKE2B 0de7581ca20c9c82557cd9c0f155caa3e895fe30e99f463344b81562d06e61d492687b25b740c6e8d91ca8299f11e70208b55d1dbbc3c4cc70a8d2abfd76df7b SHA512 89b3b7fc27ba358efb326be3eb3bee8baf520e87b9306d418a21c8809abdc974ab6556a8cf8c3cc84e247ab39782a963a0ff39520b43a39f4e2c9b1934c79410
-EBUILD pysnmp-4.4.4.ebuild 1240 BLAKE2B be85d4a952824ba075966ff6ed9e14fc20f8cae7e4b43b19c39cf756d691a549ec4c6592df9fa0a45be3b4eca21b884864e3e5292cea6f18413649c29c713728 SHA512 77abb8f8f35d93ee049533ba6a99726dcef9fc1581618bc8e2809bac1a0b192ee850f3e0cef4cf2583c5fae579bc155818083206d286d3639c6033b445301992
-EBUILD pysnmp-999999.ebuild 1250 BLAKE2B ce639aeb9e716e36df068d4de8cd82bb80cfe51a1a2db4e42431553984e487a887ba445685ccde88125ec39cab3afbcbd03c56acd6f264c57609a3f361e953b5 SHA512 81f2955f89550c96004cec610943b20f82bb8b29ef03e3d81f38c73f10b4b96e085c77988ce9dbb00c9e162093a2cff31095b2285afa94f21917c9923f5d2340
+EBUILD pysnmp-4.4.10-r1.ebuild 1243 BLAKE2B 7924cd8c9b5ddf82394e03349bbb15719237d16a640ec596ae62ba9357c3445a9c161050e1f32e3d32128cbcc4f9ba431ffc01cbc8c32efabb409fdb2470021f SHA512 78b9b5ce2137a16bbe1611e22776c2a7e41d5a324f9b6e88e9c10253419aca07efc1ea83545930f64773236644edebd3b3364ea9aad03dcf4c2a6626b9bbda58
+EBUILD pysnmp-4.4.12.ebuild 1243 BLAKE2B 7924cd8c9b5ddf82394e03349bbb15719237d16a640ec596ae62ba9357c3445a9c161050e1f32e3d32128cbcc4f9ba431ffc01cbc8c32efabb409fdb2470021f SHA512 78b9b5ce2137a16bbe1611e22776c2a7e41d5a324f9b6e88e9c10253419aca07efc1ea83545930f64773236644edebd3b3364ea9aad03dcf4c2a6626b9bbda58
+EBUILD pysnmp-4.4.4.ebuild 1236 BLAKE2B fb8c639e06476cd0b940f95b6b286440be9d87ab519e74598a4db8fa379a1058b6c4c9d095d3bcbc5f2eff8a5f90e9a69f60dbaec8e6efbe418f426065c9b6ab SHA512 c1521bb442f39f04e62171d77a85e37a6656c52d0dee3695d1fd39e47b21a4b20441239f307708cca8666b1ec8b2a81347562ae00ab2b942033b8cba947dc561
+EBUILD pysnmp-999999.ebuild 1248 BLAKE2B 25be2db5be8dea102996d80249902d43d1e8d36f08b3d0ac582b6ddbb0b0b2f7a49cb5d52e74880b8cee9928d7edbf44bf574e97f3377df4254b1bcd937b72f0 SHA512 065b4ea494d2a7128a1c7ef7bba5d1ddbb302d953a4a1726f065ee9e3a5cb15e56af50d32ba753aefcef3c7a4e976dc353bfbd654f8c3ca7e7fae238f63f6416
 MISC metadata.xml 1567 BLAKE2B bb80fc30033d338354e1b5539aa5afbb23df2ef574a55709f62ef399a67fa7d659fbbad4d3a10120d0a7cf2247e6637127c115deb3741421a73f3222b769d632 SHA512 3ec28aa833cf162493be384e095a4aa440dc9fb19941b5c503d81d1bff83428d5aa8af80dfa24c88055c573c09529c12e3fd4962dba3d171ea8d2e87a7bb7822
diff --git a/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild b/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild
index 842fff13fa28..cd7424ee5a99 100644
--- a/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
diff --git a/dev-python/pysnmp/pysnmp-4.4.11.ebuild b/dev-python/pysnmp/pysnmp-4.4.11.ebuild
deleted file mode 100644
index 842fff13fa28..000000000000
--- a/dev-python/pysnmp/pysnmp-4.4.11.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit distutils-r1
-
-DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc examples"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
-	dev-python/pysmi[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	default
-
-	if use doc; then
-		touch docs/source/conf.py
-		emake -C docs html
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/* )
-	docinto examples
-	use examples && dodoc -r examples/* docs/mibs
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "You may also be interested in the following packages: "
-	elog "dev-python/pysnmp-apps - example programs using pysnmp"
-	elog "dev-python/pysnmp-mibs - IETF and other mibs"
-	elog "dev-python/pysmi - to dump MIBs in python format"
-}
diff --git a/dev-python/pysnmp/pysnmp-4.4.12.ebuild b/dev-python/pysnmp/pysnmp-4.4.12.ebuild
index 842fff13fa28..cd7424ee5a99 100644
--- a/dev-python/pysnmp/pysnmp-4.4.12.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
diff --git a/dev-python/pysnmp/pysnmp-4.4.4.ebuild b/dev-python/pysnmp/pysnmp-4.4.4.ebuild
index 2ef0b9be0dc4..e04e7c866010 100644
--- a/dev-python/pysnmp/pysnmp-4.4.4.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
diff --git a/dev-python/pysnmp/pysnmp-999999.ebuild b/dev-python/pysnmp/pysnmp-999999.ebuild
index 1103f7a03491..3191e1376d52 100644
--- a/dev-python/pysnmp/pysnmp-999999.ebuild
+++ b/dev-python/pysnmp/pysnmp-999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python SNMP library"
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 7364b12b0490..3054ed2c5c0f 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,3 +1,5 @@
 DIST pysol_cards-0.8.6.tar.gz 17674 BLAKE2B b46c2a39b04e339e7e9a548cfb4e7f06e49969bbdfd9dc35f2662973bae60e52b576bc2174c86fa9ed33d69703257690d9d024b9ca474a4bbd028c5ec958b5e2 SHA512 da446e0deed0f8ff60a4da82a8bce5d1884d35e52ee887a6b07b82fa6fbf04b07d1758b8039532db5163f89395239295f6eec1f278cd183b22e41f1e90416040
+DIST pysol_cards-0.8.7.tar.gz 19469 BLAKE2B 94e438a9b0bb94c5657ddda92f45cc7b4f950ecfca43128ff6ef360c5066763ffe7d5ad86272aad343f5a42f66b9d71c412ba007cd0b7f39e6adef176bc2d5dc SHA512 835e03e110ff99e8eaa226b1d4f93e1ffe529b9311ec3e45f9884981f9956b0e5092f264426c80e94bea9f1ca57803f10d47a1fa2b587dcd04baf6bac4a015c0
 EBUILD pysol_cards-0.8.6.ebuild 547 BLAKE2B cd92b96ff3612a055fcb6f4e362bc10bbe362007ea5e9f1dde81adc86ae92109810e42ebc88df13647a235cea8841b51ee78186f96d9c343276f4d87f60e23c0 SHA512 d579086df92278f0807a361c5acb7a19f2fcaa9816b63711c781c757b2b881b754f888d55c6c8d8b3f02fa976643be1d7fefb5ce97c3957ec33f02bb47e12bc5
+EBUILD pysol_cards-0.8.7.ebuild 552 BLAKE2B 098411353cdd55e1f4c494625e985c762495056306b7d95ddd3e15ef3861a18e92f65a582cd7165c2ccac10f4906b9ddc6a7b04d7d0024b6e918fc4adee02827 SHA512 e0760c7d58aefabc986cd2856e3c6a90918bd254bbc5cea91a37a500c19143e8a034e80df095b516f82cae4cfc4c519b65abe720a6647e28534039a7ec75989d
 MISC metadata.xml 289 BLAKE2B daedbd790704b3663910c8067dbf69dd886eafcac1aad5b2cc18f54a8dc74596a9a4821a945250e2ed997c754151995b675965cbebc64abf5445c1c63db91ba1 SHA512 f48ef730220d3520d2230ebb0caee8e3456c8b8b7255bc978944897c424d1338f7d7a865c37455d279fdca077fb1436233fcf085564b1d1e9802d28e35d7fc1e
diff --git a/dev-python/pysol_cards/pysol_cards-0.8.7.ebuild b/dev-python/pysol_cards/pysol_cards-0.8.7.ebuild
new file mode 100644
index 000000000000..d64c0f21607b
--- /dev/null
+++ b/dev-python/pysol_cards/pysol_cards-0.8.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 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/pysolr/Manifest b/dev-python/pysolr/Manifest
index 67e6109dac47..746c8c0d069f 100644
--- a/dev-python/pysolr/Manifest
+++ b/dev-python/pysolr/Manifest
@@ -2,7 +2,7 @@ DIST pysolr-3.3.2.tar.gz 14193 BLAKE2B 855adfa730a05facdd1a0aab529f7e52a3c052c2b
 DIST pysolr-3.6.0.tar.gz 28485 BLAKE2B 3994f1586a16ab8a65013d7412c71581448f15356db077f39b87ba780606d508702e0650b9165b96d2bb2064ba4c03d9dd715bcf1f8e802a18bc19ab3aea69f6 SHA512 15d2599bdfe5b364d0c0497f3125945c8a14a61baca6d32bb775d32fac8a8c2bb9ae46e90e4a08ba144e5f6cc83efba7e456ff7ff617c9af34116432bafbac36
 DIST pysolr-3.8.1.tar.gz 46775 BLAKE2B 978869ec1e65699f61c2c33ebe1448c020aec0dee8e65780727a455e25058be6bb0ab7b5d44559d361df09cf338c0dd8b8db164273dc77da2348b6f5118b9c87 SHA512 34489f32cdcbcb7e8109d6d94339fcb200b1367a188a0b9fedf587a77cd64412570b3a796a4da4e0abe6fa3e443a401c4dc0e4946bdc437dd810fee7eabd54a4
 DIST solr-4.10.4.tgz 150059757 BLAKE2B e0f74016b6a92b4c10538ce816b566c17dbf0f7e68a7f1209bb477a2dcf06153da86bbb86d6ceeabda93d79a8c0595e4c96d873fdca8f0baee5fd58890c84da1 SHA512 f7a83504e0f9a4c81b0acafdf452c0c05fcbdf185375f383450bef4fd478812b5259705b55203460d03da46add12cec2442d399ad3716e4e11c393a9a9a01b03
-EBUILD pysolr-3.3.2.ebuild 562 BLAKE2B caf5672ce09bc449b501cac6a2497a6c842e58a641993d1f5e55c8ac5bd3b5f7b7160bb720bd60b556e492426fedd87f7412ad4e99bb9240548037a87f469ba3 SHA512 55640e69896c1c2cf23700601f044b9ac16c78694cdc32d6645ed4ce205591594fa1d3ba24a888de4078241dd031480e73c61a90293e69c704f7c20ad6f7cf0d
-EBUILD pysolr-3.6.0.ebuild 561 BLAKE2B e8f8b0cea1a2049603f247456d78ff8d5110d3b551ffb2ad75cb4457e87cdbdd99672077dfcefe56cbd53b42262171942ff898c686d577653d00e805e340b559 SHA512 2403e3271358ddf14dfad595e5176194934e30c3fb43bf950ddbaef49e203a0e845481a369194d2fba967f467b29b5d513802944db46603be477286cac74e148
-EBUILD pysolr-3.8.1.ebuild 1386 BLAKE2B 5b3e4494e0fcd481ea4fd4cbcdfee2fb84ac7f0c6d3dca748c5a2f04d1a4bc4e91734171f393dcd8b12fa2baefefa3e2d936ac60d1ab9ccaf7b863679f59e754 SHA512 36e84410e7b7dad5973ce1de1ccbe61754dc405cbedbb25beb8f280587c81a7359ecaa69a84f39e5650487fa8d5ca72cb1faf40cf8206de103e898d2b1ac6686
+EBUILD pysolr-3.3.2.ebuild 553 BLAKE2B 29bc3de5c65c792df8a2efc7c9663e818cb90d528ad106357ebd5fc1b623b8e69adc9f26114df3b95bda90f6495af24ba351487b4aeb63f409b81e7efec4a466 SHA512 0b66e9de3defc9adbc44cf8ac456d96a25a16d46c8a567aecd88b8d62c94fadc23e02d1d10e5dac9c0a57c4bb2d0d70e7448d3a31bba34be3d1ab9ba145eac69
+EBUILD pysolr-3.6.0.ebuild 552 BLAKE2B 3c7af72e673446c3b669431c4f8418e09a51c846e22fba26900ce53fb7daa935e8e1ae927a09bebc8a830c18f03842dd472fe6105d9dd05013d17b7c178f30cb SHA512 97b0c2d6297c25c29e8a2574c825577c61e79aa3ce3e155923d97ccecb7878a7abdb9bdaedf413d37830d13c32a82118934178b7b00e56c507f64dd507e61f45
+EBUILD pysolr-3.8.1.ebuild 1382 BLAKE2B ba1d604fb6779836ba68a6618f6e1be48db6b62489dc308efdcff7c868b3db024c6d40265977c982a5625e12859805c025f0f447dcd4473ac89d126ce80b1794 SHA512 b61b584c1f48aae97d096b0702ef597f4505ca097f56811da42a2a05a848c32fcdb69b6ece147421840c3b6f1071e24818791bb45ff889cfda0ffd916d39a535
 MISC metadata.xml 379 BLAKE2B 131131e4eb19987a2344df67b337646ab5102ad822757b77a5531a1111385ea9bfdc7e84b5f3e732c6f9f42763671628421b4ffaf4ea89d52234a294797168c4 SHA512 862fbb61da30df5733458c4a7267a3973bb7763d83ac7b817c42c7edef7dcaea6b1235de8df382c0ae6870ffb330b990b874b6dc169d4407da172959082e6491
diff --git a/dev-python/pysolr/pysolr-3.3.2.ebuild b/dev-python/pysolr/pysolr-3.3.2.ebuild
index dba6352857e0..f83fbb66e02d 100644
--- a/dev-python/pysolr/pysolr-3.3.2.ebuild
+++ b/dev-python/pysolr/pysolr-3.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysolr/pysolr-3.6.0.ebuild b/dev-python/pysolr/pysolr-3.6.0.ebuild
index a71fec994265..23075fec2fc3 100644
--- a/dev-python/pysolr/pysolr-3.6.0.ebuild
+++ b/dev-python/pysolr/pysolr-3.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysolr/pysolr-3.8.1.ebuild b/dev-python/pysolr/pysolr-3.8.1.ebuild
index 6f727c05e826..5ae3ad092005 100644
--- a/dev-python/pysolr/pysolr-3.8.1.ebuild
+++ b/dev-python/pysolr/pysolr-3.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyspectrum2/Manifest b/dev-python/pyspectrum2/Manifest
new file mode 100644
index 000000000000..f578274895d9
--- /dev/null
+++ b/dev-python/pyspectrum2/Manifest
@@ -0,0 +1,3 @@
+DIST pyspectrum2-0.2.0.tar.gz 31500 BLAKE2B 230329f9b1f12c7f7cff234b95d9715609cd0922c6c833726dfe72e7da0ba646e8d059d2f42d70fb97c8cb755436307369336551d44bf7954f2281f49d03ea6f SHA512 40c9f7dda808fd5bca05026b7418022b660d53b6ef52d684885ed04a47185ce2d1e2988bff5b874977c736bf5cf75f10f9daf752475504327844d4f1948f2286
+EBUILD pyspectrum2-0.2.0.ebuild 621 BLAKE2B 9e80421a7ee8bd08ea1e56f6726354c930b915cc77b5e17486ba277b0410fdfd9e09a5f659887dfb69a705d322eae458126421ff6503be5359f8493d70ef8d10 SHA512 5fd53d9d6f119fbf05fce0d6a2e36953787b3a2b762d7a6884d5aa285e7342a28cba1339ee1066fa13377a3a32f39974434437ec0ea22c96d02d1b85ed2f2802
+MISC metadata.xml 560 BLAKE2B fb53cfbb2cf5cf7fcbaeb4c94ac495f838c948c5154c7a22d8e613dc99188ce2a6b4559d9569a5639572cf66ba9df7694112da5d7806dcf656cd5bc8647656c3 SHA512 c3b4e7856ca8d1a178eaff246e75915ca6b73eba78373d91f8c2a1adfe35230a74e0e999a9db723f63cee336b9698b6cd7253db7f63bda72e2ee440e96b74136
diff --git a/dev-python/pyspectrum2/metadata.xml b/dev-python/pyspectrum2/metadata.xml
new file mode 100644
index 000000000000..a7931bdfa4ff
--- /dev/null
+++ b/dev-python/pyspectrum2/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		pyspectrum2 implements the Protobuf-based interface to Spectrum2
+		required for building Python-based Spectrum2 backends.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/stv0g/pyspectrum2/issues</bugs-to>
+		<remote-id type="github">stv0g/pyspectrum2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild b/dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild
new file mode 100644
index 000000000000..5e9e84db8831
--- /dev/null
+++ b/dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements a protobuf-based interface for Spectrum2 python-based backends"
+HOMEPAGE="https://github.com/stv0g/pyspectrum2"
+SRC_URI="https://github.com/stv0g/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	python_optimize
+}
diff --git a/dev-python/pyspf/Manifest b/dev-python/pyspf/Manifest
index 962b88279d14..2f9244965c11 100644
--- a/dev-python/pyspf/Manifest
+++ b/dev-python/pyspf/Manifest
@@ -1,3 +1,3 @@
 DIST pyspf-2.0.12t.tar.gz 67189 BLAKE2B 40ddecf6e9717da9e496c5852866259f28af11c5e9ef581ef1188b07896bce7abc3ba901063bfea2ec9f89d70e17275b0e2619f23f9dc334628ebb0af084b79c SHA512 1ad23b5dea4aa8edd03b3fd9fc675685bcb0e216474534563c55988df040abd4e2bbc8488bba80d26466877e8b2ec88cbadc2f67eb8c4bf6f26f975d8af81d8d
-EBUILD pyspf-2.0.12.ebuild 992 BLAKE2B abbeaa14964e12afbcd6ef23f68508602ddc962a32bf68bc932f215d1924eaaa358a0c499a450291e73b1e102eacf0085c783fb2168cc17f18442715ad9e37df SHA512 65d151911b65eb24642328a998ec3add7a61775561eb943a3be5e49f429a0db80c42100e614a31f593e8a2ad06190b456f806910fe3696c75df7c9a1f2a19692
+EBUILD pyspf-2.0.12.ebuild 988 BLAKE2B b6496faa19a4934342fe7ff67d98b8d5987999c0027dd0b4226aacbb7d8e6457bae8d8edde3e3824d884612840bab9c3f363a32d47fc337645914d96996dc702 SHA512 08388b12f5a9e2df10ec52f87ef876165f082598d7844cd36e9f003bd2c1f315686bc68ffccc3eee44dba74e5bf02dc6bddb5baa39da757bf77f09c8532a569e
 MISC metadata.xml 318 BLAKE2B 428f1f97b1e20927edbd26d3cb405e242e2bdc4c2cd301b9dd7999570b0ffb5af1c786a6cf596917d6d2694e29cf47c3809d3af97adb078064dc3562fe2690e1 SHA512 561cbdd0b14a8fb091ba9943987d93c8c1323a4b5f8f2b32f094284d683eec5562153a5a8ec77412a0806bac56c5667ec6e9e8d99e77bc2e45a5b7d517c8c483
diff --git a/dev-python/pyspf/pyspf-2.0.12.ebuild b/dev-python/pyspf/pyspf-2.0.12.ebuild
index 845adc1e79e6..2448c7a64e52 100644
--- a/dev-python/pyspf/pyspf-2.0.12.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="ipv6?"
 inherit distutils-r1
 
diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index b371d9eff44c..1b26f279e0cb 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -1,5 +1,5 @@
 DIST pysrt-1.1.1.tar.gz 104027 BLAKE2B a035234d687a6d7e69123a012087b8d065cad3904ce422b3a4390b0f6a0ad8471e35d7f5d9cd7e835ff2238566dd0b7a40a039b88d5b6d3a4be464e390847d79 SHA512 607f80c1f66702d36b6fa54b293f59c6a28415d812bf54d7210075d1c84a7547ce2776c0809910ed3d79c08a3c595ce74719976d8f2818820a3f4a306ffc1825
-EBUILD pysrt-1.1.1-r1.ebuild 809 BLAKE2B 9503e3105879289a60392f13a2bd64d891cf4174f4f15176fe76181bfcdddd86ce0e21e17e2ea0ea212d41dbc4b1e53b51bfa7d9260f58b0b0662f30c13b9430 SHA512 74aa9fe5caecfb054c9dd22f2b4b620c1dc714a727e5ef155c05e9b927aa01c3f657714b2d09793c19d815d03c3e04bd2912023a988f5456fb5603b8304bbbfd
-EBUILD pysrt-1.1.1.ebuild 805 BLAKE2B ef3a6ee1438769a71e54eee8ffc88b3b1b37b2cd0870f10414454542af12d2f206b8b56435b80bebcbe10cab45c72a23433595c38184bd14b12f2b5a2843245a SHA512 66ec2cbf53dca91e39aa795da52c556518b83dc23725862e178eecc730f9b05d608ceca5c98301ee8d9458f9d71d2cb7277a3fe80fee316af5343fc088e38d50
-EBUILD pysrt-9999.ebuild 809 BLAKE2B 9503e3105879289a60392f13a2bd64d891cf4174f4f15176fe76181bfcdddd86ce0e21e17e2ea0ea212d41dbc4b1e53b51bfa7d9260f58b0b0662f30c13b9430 SHA512 74aa9fe5caecfb054c9dd22f2b4b620c1dc714a727e5ef155c05e9b927aa01c3f657714b2d09793c19d815d03c3e04bd2912023a988f5456fb5603b8304bbbfd
+EBUILD pysrt-1.1.1-r1.ebuild 804 BLAKE2B 887147b7a0bbbe8c2dcceca3ce08e73f061017c723bd15fd9589ca052812ca89549b4cfd204b12013c91ef8453c7bf29c8ea9fffdfdb24bf9bf59ce37a78468d SHA512 fd9751aef8aa9f91b92a3d9c9b864d2c6027154279bb74906fabc01ac4dd7d35afb9ad605ffbcd68592f46324759969ef7afe1d204788455e2894ba75f8b1dc7
+EBUILD pysrt-1.1.1.ebuild 801 BLAKE2B 4812210faa5043ebd795556be29f7c248c53c1e68f83f02219178d68935d3563c01c40eee4796bac6c383d5efe8e1d022f27ea17bf6920cc24d7036ce809bb6f SHA512 b346f18fe6938271a1171dece6e4ba95ce5cc2870e34b5fcfeaf8e930a655bee1d54d62d3ba3f3166fc10063a2631e01e00a0251fa8b5907356f98619d07a509
+EBUILD pysrt-9999.ebuild 804 BLAKE2B 887147b7a0bbbe8c2dcceca3ce08e73f061017c723bd15fd9589ca052812ca89549b4cfd204b12013c91ef8453c7bf29c8ea9fffdfdb24bf9bf59ce37a78468d SHA512 fd9751aef8aa9f91b92a3d9c9b864d2c6027154279bb74906fabc01ac4dd7d35afb9ad605ffbcd68592f46324759969ef7afe1d204788455e2894ba75f8b1dc7
 MISC metadata.xml 425 BLAKE2B 1a1b0e96edd162f5349513bb5bd1a2b740a0764e4983c31ad71186227815c9767b0295d3c1b78fb019eca9fca59c6b119d5f4f571dc127b5f3589709837b8424 SHA512 a483c297944a2ec9b417a4703fd64dfbd34b8a7288f12a00e082dcf9c907c52d8c6f05eab5bbbf444eded62a42db6a9aa5799c35ae7d41d1b9e4e9b5417c2419
diff --git a/dev-python/pysrt/pysrt-1.1.1-r1.ebuild b/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
index ccdb27d86e71..dfea1772bb7a 100644
--- a/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysrt/pysrt-1.1.1.ebuild b/dev-python/pysrt/pysrt-1.1.1.ebuild
index 55c76a4fe685..315ab0b380ac 100644
--- a/dev-python/pysrt/pysrt-1.1.1.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index ccdb27d86e71..dfea1772bb7a 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pystache/Manifest b/dev-python/pystache/Manifest
index 954342e4fe60..cc39db3268b6 100644
--- a/dev-python/pystache/Manifest
+++ b/dev-python/pystache/Manifest
@@ -1,3 +1,3 @@
 DIST pystache-0.5.4.tar.gz 75131 BLAKE2B 3f0b9feb9664b8fc0a78f230bd4cfabbf6ca05be254ff01cbff0c3f94ed54feb066c455bdf69c2e4a940c36d46442c446975b9f4bffa769a6b8bae0a72874e1e SHA512 4ac325e1431f58f740218c9ec309821db82d89989ef4ca7fc3536dea0ef1c90e8e85ebaa7df27f33129ca02252b84bcbd7429a1ed999b496f62f174dd66502cb
-EBUILD pystache-0.5.4.ebuild 619 BLAKE2B 2be9a42f7c998a9f5e352ef93fe4e7c31d470e2c54ac1c4292082e249dd5831f2e33a0ed518b3d038d635a906112e7911b8acea1cd91fbe10628c82d88bf90f5 SHA512 ec983d770050c9ac5b67593bfc52a00b6aa1393a0cb53fcdae32383399f28feb986d26891e2623b751c83f40d2af5066d0156de0ccc5fbc8f845ed4181a8431c
+EBUILD pystache-0.5.4.ebuild 610 BLAKE2B eb3f4eda041f0fb6e75f4acd341a6a098fe04a422c31c6cc885178903f134b6ec0480d62203f849cc78eb26f778ba7e09f7c288ba1e700dda6b66796ad78e91f SHA512 082faf36b2ab38f2eb96c776098becde9aec68b1ec3f875aaac2f19e2946bb950f4d7eb9bfd9f8845e4b030389ae6efb8dbbe0015d7fd3978cd7992bb18b2ec0
 MISC metadata.xml 587 BLAKE2B b33d4b1a78e2a44eed11cf366ccc97b720599c3985c1a074c69bbd3ba1e9a2a9905a71f2013b62db3cfe519e28e2068ac7172dbb3a8fa4f84acd613d22a7edea SHA512 3d044de102f4c06604e6a53930b5232f97721fcd79f1ea3f14de5e4cee6497d6c4603cc3bcc45de5ac8f6358dc2a728002653b30d79af58a17ce627c22e58120
diff --git a/dev-python/pystache/pystache-0.5.4.ebuild b/dev-python/pystache/pystache-0.5.4.ebuild
index e99fa0b8ea97..9094d0d25e48 100644
--- a/dev-python/pystache/pystache-0.5.4.ebuild
+++ b/dev-python/pystache/pystache-0.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pystatgrab/Manifest b/dev-python/pystatgrab/Manifest
deleted file mode 100644
index 26bc07cda8ab..000000000000
--- a/dev-python/pystatgrab/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pystatgrab-0.7.tar.gz 84472 BLAKE2B 3f56ce2dd363114f57fd99b9f3bccd42e7719bc248a8a00db2964efbc5917c218179a9efdc2fbb55e1c36a938316956603a90643407cf81b7651ec50a31a5b61 SHA512 ce239941eebe5390a9154d19891ab45fc410515bb7313083450ffd30cfe23457a1d7e2d0ccab4434c844bb6f2cbfe6080ecfd66db7728720e703ce01ea219366
-EBUILD pystatgrab-0.7.ebuild 695 BLAKE2B 7cc2810a641470418b9b9892287bccb743d231d902fc55ef243687df36e3873a3f7ce6752c5b77ea071becd0c588342c2c8197b1ca10c0b2f5c5a6c5a7c87152 SHA512 a368253941a0e54df4f41e3eb2016bc2842d201537eda3422c58ce825d7987eb3f5639c1020a3ea930cb2e798dfa96d1c740acc305d3d52b84e61d62946e9731
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pystatgrab/metadata.xml b/dev-python/pystatgrab/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/pystatgrab/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/pystatgrab/pystatgrab-0.7.ebuild b/dev-python/pystatgrab/pystatgrab-0.7.ebuild
deleted file mode 100644
index 7837d02418fc..000000000000
--- a/dev-python/pystatgrab/pystatgrab-0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION=" pystatgrab is a set of Python bindings for the libstatgrab library"
-HOMEPAGE="https://www.i-scream.org/pystatgrab/"
-SRC_URI="https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/pystatgrab/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/libstatgrab-0.91"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-python_prepare_all() {
-	append-flags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" test.py || die
-}
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index 00f8fc05f9d1..eec3caa9f840 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,4 +1,4 @@
 AUX pysvn-1.8.0-respect_flags.patch 4633 BLAKE2B 5063e9491623033155fd59f97ef794ae1fd8205b0588b369395b5e021d40646fd8e65387bd27b5daa95d43f1f573059e88de5cf266b76b98d3d85834039e8ea6 SHA512 e573b995e45f7129b0e52e702ce1793180b7b2c3ef3ccebc8f1b16af9454beeca581f2486eae519437f41cd195c0dc6535c51e9dcef1258dffa57f5a99c4600b
 DIST pysvn-1.8.0.tar.gz 366583 BLAKE2B b7aae274bd2387901df4075ffa70d73e4462a127aa6690aecc406288a9e8dc2f31599297480cfc5fef14ef39c47daa3c309b6c61f49d781abb4d8c0f9a9fcb12 SHA512 14a70b910be986eba638a903edde5046c93314fedb08a7c15d464dc51da1c7efeb87147cc68c00ff9ac1b4ca506d099d3aedf7e4d86f92642c7304ef9540653b
-EBUILD pysvn-1.8.0.ebuild 1251 BLAKE2B 47cc6433b1dc96178e1e177bde909adb2bd766074c96584ab2d32778eceba5c22d64535d3a5c03915a3046b38121dfb35038524e10666e4442a6644ca75b246f SHA512 9d0b6c96816e546b87e021da415ef7731fe0c71d02dbc4527a189e2faa64a6e010af91aee58353c18ce0a14aef44defdfe5af8d75564cb98ea4991bf12495bb7
+EBUILD pysvn-1.8.0.ebuild 1247 BLAKE2B 7b9611d941e0a1c2c2ee57b8067e9e94e9647d4b67e3c3adb92137d1848174d51bcf44e5b4ae07f7099db0d48c6d78588dd524b27ce97aa9e2024bd7a1e9ca9f SHA512 1ab3efc11dff462b9848a26b6f707c20a4ed87a797983037ce600420b517c2b7e6a64bc05f8cf0765c7404910fc617c0548faa63b4986f8c68d2c8f71a35c5d2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/pysvn/pysvn-1.8.0.ebuild b/dev-python/pysvn/pysvn-1.8.0.ebuild
index 2ac689ba4c0c..2511ac62be9b 100644
--- a/dev-python/pysvn/pysvn-1.8.0.ebuild
+++ b/dev-python/pysvn/pysvn-1.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils distutils-r1 toolchain-funcs
 
diff --git a/dev-python/pyswisseph/Manifest b/dev-python/pyswisseph/Manifest
index d601ceda5166..f3f3b89c7e1f 100644
--- a/dev-python/pyswisseph/Manifest
+++ b/dev-python/pyswisseph/Manifest
@@ -1,3 +1,3 @@
 DIST pyswisseph-2.05.01_pre20160529.tar.gz 488382 BLAKE2B 3bcea971448b13c40f440473ce2da13ca18796ab645265ae813fed517ca7062342170e0526b48a19b8686ac82526a16654b7c8e4b7d2dcd8e854c116d1fbf911 SHA512 afec6ce93a34ee116ed5247ff0004cf7c3adce33b4e0f95aa251b6b533a8925340d6f6d847ab80dfb2cf75933939d282455e7dc1f812c28ad45a42f21ce1e611
-EBUILD pyswisseph-2.05.01_pre20160529.ebuild 660 BLAKE2B e3d59dd6436fba7ff678c2d9d602b4ac812d0837f10022631de6b81aa623453edf878ce47fb73931ab240f1e02c8ec39cf2b96fc8af6fd5c1c70bb7be9667931 SHA512 4130b900f80ea886af4af6f5e6d22dd351eee5cf0fc8c4a0a53b3d293e52ba60a72d1b0b718b1cffe6a33323447a5085b933bea28b09b03233a3b5bf02421e1a
+EBUILD pyswisseph-2.05.01_pre20160529.ebuild 656 BLAKE2B 2e0fb248b9710d2f81e0776b8ca59a3f86dd5c0faeab82dcfbee048c3033845deac4c8c15c099edb28dddfc022f689732444391bffb8168da51548efc5c93b09 SHA512 dc84501ffcd15ff78db2006ec2f05c3e619599763d941eaa665980d42ec14593a882ce1e4f6c8996802a10ff84938ba0e3780576fc88c003ac3d93e71ff1cc37
 MISC metadata.xml 511 BLAKE2B d88458ce79785b22bd75c3b39e845dc0a91cfb30aaaee7780e15b422edf1dd8fa0decf325238bbf34c469756fa31cba346a3cf8b9dcd7659a4a39bc967519f88 SHA512 b81b9b0110b7460c3a308a4a914ad59ccf21e1d5b003c898167b803b57720cb66e29d070d6998a6747d61039be9a364d907e517cee2ad31f7ad533e687d756ad
diff --git a/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild b/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild
index a23621bd1dfd..93becb1fbfeb 100644
--- a/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild
+++ b/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index 3f19659aaf69..8e74a024d8ba 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,3 +1,3 @@
 DIST tables-3.4.4.tar.gz 4626053 BLAKE2B cca4f87aa62db16bb47e131bf670e1013d363dea9c807f399688e184610f682c49b00b686d8e28a03caf94a98e51b11bf646df66f4e3db66f481751f096906f8 SHA512 2d0cdd36a6f14702f424773b64187d1980d73a72525ead43b272776bb32b2ebc4c6ea0b7e3343c8600d7f62c42d008b5e835439af30e76ea11c7504666631ddf
-EBUILD pytables-3.4.4.ebuild 1746 BLAKE2B 35544d9f9d8dc3fbbe0efe961f4637ef0b289537828b8181b514cebbbc8a667f83c4a0d96fd492cdc2bc09bee277ca23da95e736700847ffd626674d7159c74c SHA512 64c5a56314cc8a5bd84d32d1423771412d1ab9036d12a2601e85bf6598992d227188c36d0c7b926974b07a96f34bcd1383d15e37e23e11682831ffabd0566fa4
+EBUILD pytables-3.4.4.ebuild 1744 BLAKE2B eaba0470317e9cf0709c321ac5be1e1f4160ac5dcd06f6ae20bd29e3350043058492141feeba5cec4523840c2cec4407ef0667ea7bf4fd8dcade709e6504540a SHA512 10e54f260a9e617b27ded9bc496000e6077425083ea9a42cb4abb376f5efde2a0475e77bb95c1baf5c96d56d35a2f967349b8236495d68436f982a926a5f8a67
 MISC metadata.xml 894 BLAKE2B 279b64a5124a6471b3ea6ed8d2f82b8d62e5d8bc809168fb2ae1c3bfd8cfa07428c2ff7f07deb5042a6ccb5ba7af43bc45d0db82b9cfc79fa5d19c090d0500a3 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c
diff --git a/dev-python/pytables/pytables-3.4.4.ebuild b/dev-python/pytables/pytables-3.4.4.ebuild
index 6fe874de62ae..9b372c3d5fb7 100644
--- a/dev-python/pytables/pytables-3.4.4.ebuild
+++ b/dev-python/pytables/pytables-3.4.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 MY_PN=tables
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index 5cd424d9a929..749a8d2e3a34 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1,5 +1,5 @@
 DIST pyte-0.5.2.tar.gz 42719 BLAKE2B 00995c8427ade8a44dbc6dea4bea058431adb1409fbddc90b70ecd3cf4968632d66e4f21140ca5c071ea927208d40ed55606cf2d604f931970f99128c2b2dba8 SHA512 da903b31bb67e60bc8271c162f3429871d0def039cec5f63f07764fce1994236063876eb069a88783a4c7d8b0eac0646549c00f2a51ab8630287d852f05f4b0d
 DIST pyte-0.8.0.tar.gz 91320 BLAKE2B b973050912c7d3b67393208a5b17f382705fe78964528e003b71addc12586353a3a9c7eeb68c224dfb945b5f9d3b52823cd254885dd5ac6901be119583a71a2e SHA512 c488fd0a61c1dc34b27e12ed9ba1109bb2c331626c982da06e7540bdd168008cb5106a17c71e60e38c493f2dd9f21ba3cf05118928744dfa192d62e511b4c4e8
-EBUILD pyte-0.5.2-r2.ebuild 781 BLAKE2B b8c6970c1cef7b7d6c4abf86a0dcdb2c55991aa5ecd4ce45876a932ebd60f53a9b1f5b7773c560f43060583d2174a2b74fc53ce659e39befba1dd62890edc30a SHA512 570385418bf07917ef6cd322f8c30972f210385421ceb7aa56ff2509d63558376b7bc3022802e47fec7933a90a1821cc84eb3812df24aa1272b3d181c9a8b797
-EBUILD pyte-0.8.0-r1.ebuild 989 BLAKE2B acbd0c8d175240d2fd5577a420fab8fb51a30fec8c86f0c3edd79b763430d5734dd4bea4840df9234e527609e359ba372ef6cf26eeb2dc48c525d8f76e081fd7 SHA512 e0029e9aa187bb3d6d05786c0eefaa09afca3d75d852b6a43714fb5151ac89cb7789d353022a6664ef51050e47038f3072eff2d3adc9adb2721bb29d55a79506
+EBUILD pyte-0.5.2-r2.ebuild 777 BLAKE2B 5b1f863bf981d93973f2d46d1ae749fc66ab0bfd897bb47a7d7f1df3792aec84f09dffea49871ba9b326a799563a1feaf806cd223ecdb6fd7999c565b8c53069 SHA512 0953a52eb1ab98f4546fd3c686e4cf6b1fc6cf970085cc25909b513a89adfe93e589d6c85fb2cc825a99152dfe8e4875773ac631eb73523d829c0c650163367f
+EBUILD pyte-0.8.0-r1.ebuild 987 BLAKE2B 0b8dcf1349323005488c78664e19bf82edc87ad20dabf02cf6cf1cde7bec0cdf9a7a9a8e122a1f3322872a77063dae8d0fd6e4c2c6cab4c41a150fea6a8bc6ae SHA512 c53f6c2dd2fcaa07b4ad0ee02866aa82b57aab40ba597b8120c6920189223bc02a49d647d2267f5c5740757171a4fda88394d0187876f874a78a142f0cbd434d
 MISC metadata.xml 372 BLAKE2B 6e2290ce2905925561a7bb3bd42f754191dfa28b2bfe493d234e3944d9b80e1b7c28440105a95e0e31ba0d445979c235683c81b4ee4cec7930809a6ef6fb7cb4 SHA512 6ba189a1a43ff10537319bfdebf23046437a86dec5c6bb219e97076120b31e20aba0e4cdb8abe932c378d17c766ae2ae7a65d9538cf3926cb106bd20206901bc
diff --git a/dev-python/pyte/pyte-0.5.2-r2.ebuild b/dev-python/pyte/pyte-0.5.2-r2.ebuild
index 47eff703bfce..97c7074737a0 100644
--- a/dev-python/pyte/pyte-0.5.2-r2.ebuild
+++ b/dev-python/pyte/pyte-0.5.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyte/pyte-0.8.0-r1.ebuild b/dev-python/pyte/pyte-0.8.0-r1.ebuild
index 637664f315ee..b4ea4d05ae87 100644
--- a/dev-python/pyte/pyte-0.8.0-r1.ebuild
+++ b/dev-python/pyte/pyte-0.8.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index 1b4ab7fbb78e..a2f3e6e9ec21 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-aiohttp-0.1.3.tar.gz 6192 BLAKE2B 23f4eebdefe757328fc8621e29810835fee8e8c3e8cedf45134716cff77208bcd7aa82f537ada5d567b143d342b1a9fa14a5ed1e5208548e55353de1748b270c SHA512 2271f7730b91812a619e04522c13b7e2ff76353179a4588226d0b943b67f7397b966c1d3c24016861cc3eda3a541b3f0d3b2858a6ca3586f7707e10581c34e4c
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.1.3.ebuild 574 BLAKE2B c851de347f06edcc34b04b6d75847cc4637770df220de07debf9ba9abc567384f30fee0315fb751b9819825f39480bce11fa4cb8b9ebb3d3a325e6d0d5589e48 SHA512 47915bc93ba42e9ab83945e875eb24165d427163fa1256f60cd3a26778d646418bb8fb17f72795160a5da9c2dc8b720b486df3c3ebcb7f8682a78106fbbb2fad
-EBUILD pytest-aiohttp-0.3.0.ebuild 574 BLAKE2B f2e046f4c4a6f162b36c27d9acffc5cdc50493777bcc69a09259fd4ad037efbf57e5878affdea01db4d0fffaffbff3b4a2f9231b2df4f7e654ad3b9402787ce7 SHA512 161fe54ac0387d505afe6a9abf4b825d4a9279b7795401fff6637680011f2266db3723b4e59291d3bb340b2e49b4bfe75f005f5257f4cdd38c936be7c56f8b86
+EBUILD pytest-aiohttp-0.1.3.ebuild 570 BLAKE2B 18136d44c4be9adab2eb544d2e70e83aebf7fa13d849629e2965e765fe1c7443ffe8bc7bad52eb84dcb6dd5c8c42c6e0aa86d93b5e774f7d546fbca80670860a SHA512 8c76059551c5aee46764508b5b1b386304896e5597c7f46f766693723e58aaeb93578712ead0bb56ba844ce87ea358dad72e7ff621067c0b8d8136ec61627d8b
+EBUILD pytest-aiohttp-0.3.0.ebuild 574 BLAKE2B 0c88eec5edc7599aa374591a23f8f5b6ae8055c22368056238554665feee9f96d36e2084d0289f34bc0edddb6d7f22a3918f35266860219fdfaea4f75bf60cba SHA512 8a489f75eb96718299420795d9282dbac2286498ffd3cad9a04f078c9f83acd3034e9d8f61ac52d7dd59bdb4d1ebb13367e82e3f6998cacff0e997aed32f03c9
 MISC metadata.xml 358 BLAKE2B 8d7d3a4d56967f16b3c8b5facccb0af056201daf975aeaa8cb9b651db735183cb38e35d1a86037306d6c61971690b7093ac8bf0c4197b2ce6228d0323c15ed0d SHA512 4f7db25811be35ac9976bf5707b0ee0927dae9f00d8be85f18eb165708f08ec7c4bb7ebfc4ca021a6432eab8ab25785c8b27959df8ff9dfc2a969b588de68829
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild
index c08cffd23bb9..a2a34660166c 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin for aiohttp support"
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
index 7da2e586711f..f6b1a93479ec 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin for aiohttp support"
diff --git a/dev-python/pytest-arraydiff/Manifest b/dev-python/pytest-arraydiff/Manifest
index 4d737d449fa8..39e0a72f0c0c 100644
--- a/dev-python/pytest-arraydiff/Manifest
+++ b/dev-python/pytest-arraydiff/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-arraydiff-0.1.tar.gz 8752 BLAKE2B c8d262d38aff61b5559f33786bf7cc396bda8dc30789ea349f9955a12722e10f6b48ae862cf6fa526da85e4c52b6b68339d18d0be088e1f831c05fd57becccdd SHA512 321ea04ea7165753cb4d9aff3870d5297f78a0e5ddaf16aecd5dce622f061a2f664479bf8e3af1c7575e968fa66828ed2d0489473e7d8a236c07d1a31adfce5d
-EBUILD pytest-arraydiff-0.1.ebuild 640 BLAKE2B d23d3490c1b653ac5f40b697a46439a522ee91c43f3ee3f2b635a85d6430454f1ada46d3eba045c89385c0ce48b560a06af3c38a4888c640477c795214314ef9 SHA512 9cfe5eb9ff049b7a4cb1657db23b0ae5c4fcd2a19b91faf36f5e63357c30f8821935e648a3fbbfea477d108fba8cf0baea9a851e158b1a54b2635b0554bff35c
+EBUILD pytest-arraydiff-0.1.ebuild 636 BLAKE2B 8778e582220b772a47d1b7efb2af7ca47132bc65af23f2488c25e31748b5fa3d6d0d5d583ce642887970bdd63b7e8c3dfef27dbd68b77030e76de146f857e94d SHA512 230016528dae4915adbefb15581b3825924efd31825b24dcb821b6b757d9c636a5bd31d20941f0eb4a13d3a71a602968cfc2ba15ef4de4436b879f0869e1ebe7
 MISC metadata.xml 527 BLAKE2B 47c322c71573827902b8c93fa33d92162c61a31f4764c68f62754296c52929397db1bd7c70a7baaa96fa203adea26ce954e0ca985c799f2f9300c5bcbc122847 SHA512 9138033364e009d0bef6499aa1f5353a72033955df26a26869038783bf847c91e8ebdc1b62908e393c4471285420ddeb01118aff5905227b67aeb924bdf2738c
diff --git a/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild b/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild
index 870e81294a5c..619eff53f067 100644
--- a/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild
+++ b/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index e29316569f90..e75940c5412c 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-asyncio-0.10.0.tar.gz 13968 BLAKE2B 4e63d527b20c767b8f0777ed684a15abe54009be72db8a50ca3b37ef95dceb884168d8081c651e2bbd6d818529d6809bb3498055fedc7f951f5675d58f50e408 SHA512 78160d1918c5d3d2172f74fa07bf4bf6d0bc416666011dd5b83b3a7f385ec30fc65d49c01bba5dd0e16ad9dcd9d72d8ab062526f3268d60cd2e24a35b5a8f883
-EBUILD pytest-asyncio-0.10.0.ebuild 949 BLAKE2B 945bbebce007188839da358423aa11318088005a71d873cd4c223d83e0f99d0b2dba7db9bf8f8d6561de03ec144ae6320e407379df4755c191888c4d819f8b24 SHA512 9311b00325bf02b1ddb51925f1a3732b32db6d61ea4e95edf5293322f7637f95c81bfd3f5cb110ad7b7e0dc720061f784d4185b80579cf2cbf978e7f35ad1e4e
+EBUILD pytest-asyncio-0.10.0.ebuild 874 BLAKE2B 910870dda29a0722a1cc51032172c2e24f2af151e430fa33fef3e78222e97a629bf192a3e0c1c94173f4bf962fe50e4c9cba85344e9f2b31230feb35f2393870 SHA512 061ccc2f757cf6afd6924ec87d384becfaf36bddbcaef37d3f25c627ae4165f3dd18324fe83fde4d82f8e0a601e9d2a3a3bb8ab96813776901665090c03d5dca
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
index ee183d8b8079..9e9d67138cb1 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Library for testing asyncio code with pytest"
@@ -13,15 +13,13 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/async_generator[${PYTHON_USEDEP}]' \
-		python3_5)"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
diff --git a/dev-python/pytest-cache/Manifest b/dev-python/pytest-cache/Manifest
index 39a687ea72df..4197fda80d32 100644
--- a/dev-python/pytest-cache/Manifest
+++ b/dev-python/pytest-cache/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-cache-1.0.tar.gz 16242 BLAKE2B 90ebe56fab442c67513025bf3921d9d3ef4220de49fed5ae14cd31e5b8966e2fce4551faafb14bbaf1c3ddb45a8bc2d0ef4e3e9ab6fdece053d173b37e4753b7 SHA512 55eb66718a45fb0ad8931780d96fa4715cf0d9f2568be2a1b08b3399d391b818a7ae8b2afeb74b50aaf8ec8f7f0d8da8e7a7483845a50e884822ca6ddbca03ea
-EBUILD pytest-cache-1.0-r1.ebuild 869 BLAKE2B dce2914a1bced0a3303e2626300d6614889f80da597ba3abccfe2115e78b8cac479aff34b4cf2441e790a3d38c39767d2df436d8f88cd4c41c39ce0ff9627d41 SHA512 c5a250c8c993372b4065f5094aba05ccf8f856491b82c1ed901ccc322218edbd8bce3906e3cb5ee862dc24dfeb770766c5cab356d85a8306957985d24d8620b6
-EBUILD pytest-cache-1.0-r2.ebuild 876 BLAKE2B 9d068efa2371ddb51090eb90c4870be2a4d3303dcb3cde9e942456a740531b3db6dff5cfdde73e4c8c3901b62546a3ebd596560009b91d37eb6fea1c2c536961 SHA512 9bc7badbe095262032367c723129117478bbb0bb83eff10f10e8823a8d4581ce697de2eecc9d44f268f9f2e581646d461585181026059b00e6c3ff4f3c6a7f70
+EBUILD pytest-cache-1.0-r1.ebuild 860 BLAKE2B 5dac9257e19da55734e851ef1f688427686f4aa97effb0926c7c1115b8a5f73c29c83838950627d7f7ba5daa4b67ee0afe6469e2bcec387e7116bd6ead2fd363 SHA512 5400c4bf36edd724bcf9e754b7b7591ef447a86362400ed1526a5e618b7201e8de3b6e71f32d5725a20f921f206b80c7cfe05db0aaff87f7241101a28ef3df55
+EBUILD pytest-cache-1.0-r2.ebuild 869 BLAKE2B a73c10160d8459b98ac3e8d460a593c7d5c8b15ad716fe29b28d4ed2c1e2495471a3ba1f76d9cb83265b26d8d5f243a52838cfd6a4330c5462cdaab0e0479aa7 SHA512 481d77772fecd2fde86813628f5ffbba3383f934c7a7bae9299a77a8f7a630ddf294b2945e2ccc5a74aa68921502caddb021ce3a6c71c24d9ac3e87afb73723d
 MISC metadata.xml 424 BLAKE2B 9699f4ea942fab1f467f13318ec34b3827aafd5946f863fe73ed8411c8967c3aadd75d210d59a194f44cdd40a60f7911231b9b9f1b0da91b88be636b007cd205 SHA512 d5cacf7c2874eec32bd10036f6fa03f0d357569e99b229b397df2ca1978f3961b9f3e7cd892cba677e4f6c4e39a5d69ef496166285adf089e08e7406446c9a35
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
index c7a507c5f927..768a7a704df0 100644
--- a/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
+++ b/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
index 5deffb10a163..13ac45f4839f 100644
--- a/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
+++ b/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-catchlog/Manifest b/dev-python/pytest-catchlog/Manifest
index 77dcfd8ea373..ccf9fa96840b 100644
--- a/dev-python/pytest-catchlog/Manifest
+++ b/dev-python/pytest-catchlog/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-catchlog-1.2.2.zip 18028 BLAKE2B aecc020f34010f20ada7a65b069b5f6de79de301dffd765a0f395127582a90e7913057332a760de38e20f273f0b1ff6dd5afb39f5b3ee1d1e2f2f1e4187eb252 SHA512 bbeeb7213898844a7956712992ddaca1e28c52fc5712339b9730f181a124af5ec90b5460981066638658246da4321840a7583ee14eec7c0482e069e2a824d031
-EBUILD pytest-catchlog-1.2.2.ebuild 815 BLAKE2B 67224eb5594755e0f4389424ad28f790354db282bc30a52497a71ff09ba862bc0028470ee901cc702c44b4feb0847e5c85c27b5e06fad75ae8d49080eaf477a2 SHA512 80e8e9d58e70677f1b62261d8120f08fca9eb0c742022dbcb1697e32c5fc8c77bd098154caa05bd11e05bef7fb1a4dddadd79164a1bdeffe2ead227353078f0c
+EBUILD pytest-catchlog-1.2.2.ebuild 806 BLAKE2B f79d3fa1732018eb15e15271e76f6c671dae98bd154ba5f26b7e9eb41456fd64a3bad5209c4f0412d0578d54a9790b6af759c90cd14c1f6ba5e4864d469dd9b5 SHA512 5a39dd98369241e919106de3dcf3e8f320c6077853e0ef6b3bfada47fe1101ada7ea2a2d996f6836b111a61f713a0d8b1092577ccbe688bd8174e9d8bc29a8fe
 MISC metadata.xml 384 BLAKE2B 0dff6cbe91087adee6e5fba8d8d1e38ad51f94d97808c62d7e68844f5eb9097ce4fa22bd7a2e19456836721880fdf4e54d4abab42fc9c1285d6fdf5bc761a27c SHA512 2a49b6a72107bd42dbb524a060c14a2dafc1172ea5d21427f22589f43f7cf728e0b3d843f59c962bcd8c6a072663ab842606d13827ff9803d1a016da5c09f741
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
index a09d764a1f84..cd8bb7dd4e0d 100644
--- a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
+++ b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 71f6e502d03b..32e4f7ceb596 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -6,7 +6,7 @@ AUX pytest-cov-2.8.1-python38.patch 2522 BLAKE2B c09196ac945cd4b00acd75e45987be1
 DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
 DIST pytest-cov-2.6.1.tar.gz 35307 BLAKE2B 11974ff70ed5609d7db3c4c35f5b528b0ec36b48cfaf06974a090127706e0964841347592ac3f1e086f46800857ee10c05404045b6a4b467ffa278c2ee1e1957 SHA512 2dfd16e013d8bfbe5d14990f419291b651dd11560328a7e59b5449016d51b17f84d4ee3866fda866c3530389d206b1c4c67c84b23f097281c3963ffd19ea8caa
 DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec
-EBUILD pytest-cov-2.3.1.ebuild 1505 BLAKE2B dd103531a5baf5ce42f1cfb90f91384bc9036a4b8ff79996d721ffc8880e1e8dd142c3f85b73c4b996702d93c399260f748e6bc21883194be9a0e1b708733703 SHA512 96454933994134ba6989ffd540e54485ec5ba587624173367fe92ba368ecc04db61d16e46152e35a48fc0fceabe8739310667578785ed1f2be1a5fef8491cd0b
-EBUILD pytest-cov-2.6.1.ebuild 1460 BLAKE2B a2c2afae259530ddd882ae0fc5e1974c887270629e5114bf4f9e90ea727820520a81e737574e88da707515235ca7f2e4112cc944c9825da8cecdc91d0700fa89 SHA512 76abf489143d6d33b5ec63be8362a2dfd0e7ec65f2b0ae99c50ec1a8cc1cb3bd4d5ed5cdaa7f10299c40f80831419cb581c46f1c95d4930c101fa90b53423c36
-EBUILD pytest-cov-2.8.1.ebuild 1400 BLAKE2B 9256f74e83645e8e499e94fbbbcc993de074b1bdaae60c3a0a730cdcb27f7fe77f1543ca8258afb951549e0ee250b296bfef33de8e6a6ab4d424c1fab5f90147 SHA512 61c40cc9e61cd8d2265ad0e648927934500284eaa037f4f4f0d410475c6ae17748f515773f28b1b775061aa9714844dddc3d931dd068e24f270e719fb536b43d
+EBUILD pytest-cov-2.3.1.ebuild 1498 BLAKE2B cdeb36304dd46840aeda73316031a4e36de2e0b693ddc15daa50d2854cf3a39d48603524d3bd285015f403df1f8fbf4f996a37051562cda19071bd220177ae61 SHA512 d2f2a12196787d731635912e2a709f913feeec1e48129fbc657d9eda496553321b1660570291ae7bbbff29883e029250ea109f18d1d1f7c558ae175cff0c50c7
+EBUILD pytest-cov-2.6.1.ebuild 1453 BLAKE2B b8cd06dc858f877e34ff505a25cceab2f2f89c79397c8d23a20195405172bcd524389034404dc1f0597ffe49ddaeaeed4814b09e1a5e300aae51cf1baece98ff SHA512 c6f5c465d983315496f55e0632c678a6013660ffc05fbff6c8c7ba0f4673bac2bf3ebb1204d3e33877a3c8628c87bb673bba8b0ec45d56baa6823b5a3642cb24
+EBUILD pytest-cov-2.8.1.ebuild 1395 BLAKE2B 552aa23139e450f9a3be2b18b1480970fcaaf4de0e8129c77f840ba4d93b5ea95b226101269030ace6d74f3a9a4e16adf03e7d8aa5f06c4cf1640063e8da6921 SHA512 8f0036fa0d289d6ed452e0d313ebe5fe8c020b1b45ef7e0706e0bcfc3b6a0a0f67eaa83d8459cf31ff9dd00535f1b16cff56a8d1258b27528e1dd177f8d17785
 MISC metadata.xml 451 BLAKE2B 61b39473b8b03a8096c5e63b8b59098cf1cb07bd5c5ab875e6d12af03b9113c2e0ecc8d16b395e73ea70378a568efcc3ae18d1970004aca5bb4c8a45bb266c67 SHA512 097e5da22a24c3eb0636095b4385bc7102f45968a489121f296547cd29cf9d416264f44b7b0766bb8206d6364ed40408e016790e755f139728d36954cdf5312c
diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
index 314b91f54867..076d1c5a9ccd 100644
--- a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
index 7eee71a66189..2afc94aafe0d 100644
--- a/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
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 ac1732bd7f24..2004e0be8ef3 100644
--- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-cython/Manifest b/dev-python/pytest-cython/Manifest
index 033c897ebb6b..9f6a542699b3 100644
--- a/dev-python/pytest-cython/Manifest
+++ b/dev-python/pytest-cython/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-cython-0.1.0.tar.gz 19109 BLAKE2B 75895992402f36010385e0851cce4532825d374cc9d5af1b45d4dc938070da1f9e8c9901601ac10e3fa9a76fd4f0affd3f0dac6d8857eea88c73cbc1686ce613 SHA512 65d8d25f95f2419ae76902cad8f0f4c9b810dbbba80621d301f53d2128dfeb11c4d74e2ac4f1e39f63aadfc1404e9000c0668efbab4793d307f0b90345023771
-EBUILD pytest-cython-0.1.0.ebuild 527 BLAKE2B 44e2e2d5f9ccfea6d34bc3832254487522d5dc43c4a79d4e4c7cb0ffe0845b9decfcd2a76f061f5a8b6942520bd341e31789d52f66df72700eb4de2bc0ee6f99 SHA512 65ca1552612a40ff3c45f2ea1c5530d7d8fa49f69f5f1b7916d22894a0872d5a43118ebc43aa8107a636f596818f80fce343a2c86f3e27b670897f4550d17a50
+EBUILD pytest-cython-0.1.0.ebuild 523 BLAKE2B 3711e49ab937d33c45a16f6aa6eac83381dfdee2edfce19ca8d1a7cce6a27bb24a0bbe170a6f7e5ad72235e1e7b0dc3cce92cf28ac0cc600a69481438099fbdf SHA512 6cf8ba81552f3dd441d1876730a9b4eab5c23908b2a51ffb95f820afc1657afa01ffd5ca0975ed8d641f542fcafc4f9e4703f5730967b76117d9e0a40cbebcb9
 MISC metadata.xml 388 BLAKE2B d63e4b52d4d5ce203c3850984e6b09accf61f67d8c5de98782de50de276c8a6a6747850128fd5849f026a852a148a53a971ba371f5ab5a9d2ba9e549242352c5 SHA512 9a0cead855da37845b25a91c72b9211d9a273db49da4fc925c593f7f083f5d7aec6376dfd7db1dea88ee4ca0b51a3ad58e000af37960aa2afc8416ed78b3ff64
diff --git a/dev-python/pytest-cython/pytest-cython-0.1.0.ebuild b/dev-python/pytest-cython/pytest-cython-0.1.0.ebuild
index 525e5c612ff4..c08edace5cf1 100644
--- a/dev-python/pytest-cython/pytest-cython-0.1.0.ebuild
+++ b/dev-python/pytest-cython/pytest-cython-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-datafiles/Manifest b/dev-python/pytest-datafiles/Manifest
deleted file mode 100644
index 3342369122e2..000000000000
--- a/dev-python/pytest-datafiles/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-datafiles-2.0.tar.gz 66507 BLAKE2B 7cd2721ae2e447798afe54f858d697321a1bf88f3c307df14186bc71b7a60bdc9fcb2e99a858186ad058c4663eae8b121a5ffa3427e2ab4f76f4b471dcc36234 SHA512 05bb93e973cde8b6030ff4d82f295bdb54a8d0bcec87f0347347baed80c26851a4ea6980621f43d73b7fb843740d58b32aca37de9607117b664ede8928aaa5b6
-EBUILD pytest-datafiles-2.0.ebuild 784 BLAKE2B 211218d06bf3993b7af91fb1a16deedca75ecc69f5c06c63135f2ddf92673693a43249b526803e71db4ed297bdbf82613aaf62cda153b93e3d6d8f0e26e8e182 SHA512 ac6570949b7b589cbdd343443ddb14e7dbb8fc333c80991cdbfff8b74335c223553f1827bdb469bd39f333d3fe9ed8874940ef0c0102b78928f49410e38b1e91
-MISC metadata.xml 395 BLAKE2B be89156950d62b7a070f0da1f804761f17e108eb07156385262b6c6db6e22f739600910ce3b464dd5abbf6e356c68f606210f78039db5c9508d270cc5fc7ea81 SHA512 0d2214166e6347a79c0f202b1ac3580b12eff1243869b772df988cb1c985d1cfc73975f5b7b6bed7ca32a71a03a771cd03af1002c212d4091e53b2fd1e0fc0bc
diff --git a/dev-python/pytest-datafiles/metadata.xml b/dev-python/pytest-datafiles/metadata.xml
deleted file mode 100644
index dd553590ca15..000000000000
--- a/dev-python/pytest-datafiles/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="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pytest-datafiles</remote-id>
-		<remote-id type="github">omarkohl/pytest-datafiles</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-datafiles/pytest-datafiles-2.0.ebuild b/dev-python/pytest-datafiles/pytest-datafiles-2.0.ebuild
deleted file mode 100644
index 20f0b2542b7d..000000000000
--- a/dev-python/pytest-datafiles/pytest-datafiles-2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to create a tmpdir containing a preconfigured set of files/dirs"
-HOMEPAGE="https://github.com/omarkohl/pytest-datafiles"
-SRC_URI="https://github.com/omarkohl/${PN}/archive/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${TEST_DIR}"/lib pytest -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index fb851a7ed373..bcd4dca78ee2 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-describe-0.11.1.tar.gz 7226 BLAKE2B 5cbe722d1187fa67424e5c932eee7fc90335e6811d7493372515b44d4210d0de4b4d8f33f1583ac1ae400d91d9fb9795b2952a56fc6c2865ab450af279e45c09 SHA512 0634f17ca36f8fa346a6001338827d70dda410376660f370ba04b8857d37e009c5e33f06baee51d1c23a13094c88850668028f5d44a09c31b40baff0bfdaf1ef
-EBUILD pytest-describe-0.11.1.ebuild 864 BLAKE2B bb26fd225d4418a374acf53091b4a29bf102434c7eb49e58211ea3749372f0730154aa88b3e1fca7cdf994ce260c950f86af8d277616b22aa2939ee59d1e3acb SHA512 b682989b26ca29aab31ce0cf359a149efebc57a6f6abf66908a49f967f79f897dcb9ad6968d9d62604eaff9652214e85666a31b9ea7b9f2922ebeb89ff2c6668
+EBUILD pytest-describe-0.11.1.ebuild 862 BLAKE2B 6f96dc928c2cf2a126d317a47a966d5ab8aaac978049fecae924b82f30fdc9ff9bd587d0282e400f5bf1d39075f96c1c91dcb8753dfae201e10b721e51463563 SHA512 41b5b52eba8385f34680465290090fe45b3f0d622133528efb2d329cdb6c6bfe22b2e1dce01c9a6795b23dca4518255b30ade64180605795e7e665cdd8c32b6c
 MISC metadata.xml 379 BLAKE2B 5e73cfba60df9af4e4452172c35e7ba311b0f4adf05e4ea64ad936d33eaa540084593eeae26190607ac6d1e66878d54a79663bfd1a8e67a46fa99ab86f7c8a4e SHA512 3bd074c7380538441d32f94f960f99db2c7a6b3815d22d560d8a973e11eac75064ff687442a92afbfa1282e70ff10570546497e1f4e10996fe836e9858b97460
diff --git a/dev-python/pytest-describe/pytest-describe-0.11.1.ebuild b/dev-python/pytest-describe/pytest-describe-0.11.1.ebuild
index 7eb8fb6a5164..a86ba66ca203 100644
--- a/dev-python/pytest-describe/pytest-describe-0.11.1.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-0.11.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 573fefd61b77..b4d291e56e84 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-django-3.4.4.tar.gz 66962 BLAKE2B a989009eccab4bbd96e32ed1b6b5d03ca8105026c6d9219ea09f6b33fe2087a30d9042e2cd5a313196ed67cc1c5dc940d04fe981dda0da4f25cf16a43e88471a SHA512 a851b27e9abc4829a47abb5da40cbd69fea5c48b05c81f88910d4345696c6d01f78e07ac489cec7cfb5724dd8432891ff9260dc585e720d758491906812661df
-EBUILD pytest-django-3.4.4.ebuild 709 BLAKE2B 29cf21d0a2f01c65f3b5c93e9be647d31a63e0b590e58a974291857a131089edbeb86fc8486ff3f3f144f555a95c5d660a02d0e08b44c99307a10eab449d52b3 SHA512 d846320e561febc9c62a78de1d54156a98b4049fceb53073eed49d0861082d9c86c0e25a138e54727b28d53b600cea23e444aec5977f79b73a33e5bc8d61998e
+EBUILD pytest-django-3.4.4.ebuild 700 BLAKE2B 1c7aa674233cf94001c08ed5506dab9031909a055edc4f507912830597c47fb5b0a0421249d042466b275a9b4c4e5c9710e6c7a018eb439623c90a98a769478b SHA512 859778208bb0f0d007034394a356424f57adca9b03367eb63cae917f9a75a9032bb4cfe9e45f7a108e59ac41ee685491a662c2bd659de84276038309a29a0f3c
 MISC metadata.xml 380 BLAKE2B 6d349594a1198f6cbf2c6e0e80276f3d27454346cdbd24654506221647304fc3d3a0c9b8deadb920c4881b62c779951df2cda6a773f4f251c7c31d166fdf7b2c SHA512 65163d6f99c4d2be86bbedad07b756eda2aa639cd612e0ffaf95dc0707e72de8b406ad51d2a482925790c837bc7c3d4ccd5dc3fd070da6599e13278db03ab006
diff --git a/dev-python/pytest-django/pytest-django-3.4.4.ebuild b/dev-python/pytest-django/pytest-django-3.4.4.ebuild
index a09bd0408545..c9e5b83c92c1 100644
--- a/dev-python/pytest-django/pytest-django-3.4.4.ebuild
+++ b/dev-python/pytest-django/pytest-django-3.4.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index 305a76621a55..3ba94121fb2b 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0-r1.ebuild 733 BLAKE2B 60184e36906b38ce339eddd4f493ce540ecce25807d43c272888ef1cb207f9d19f593f2348475b527a1d032c49615bd81408ff9373129e52277903a4644821e9 SHA512 9690af23c228fc1b07bce688d44c05ae2040742bdc7360369ec029457444d164031ffbf176617c1a50744651f1b9c5a1edd847bf3e36b0d2cd7cd98c13b04799
-EBUILD pytest-expect-1.1.0.ebuild 694 BLAKE2B 4da61d87ad1268cdafce2bb9b750468394e9ded2f12d4c9bb0a1c568c33109c76e8d72db34c7fba6fe6c6721f758c6d67ce1e389b385a1bc92d1c44d0ca23524 SHA512 01e7def124d9d273ef4a6e04468917130ab8e172ad7fcb06d6285503ef1ca299553eca11a557cd8617888a93fd90112200da77cbe627647461b19f2af2fd01fc
+EBUILD pytest-expect-1.1.0-r1.ebuild 728 BLAKE2B 87bf3a8a35a152c16133c072603ad5df7e7852d97adc6f775c7cb365681862ef44996760dc6c4aa00c528749f20948532a0638e9abb19a6af2573ec8fd3632c3 SHA512 9502d74f0de51f76cf265578e13a24ac9b8491dcc4a16ffa2e2ef43443d0045b3645b322a657ec23f3b19a211fceb06411b4728202cd54aad4fa5f9d62c527ba
+EBUILD pytest-expect-1.1.0.ebuild 687 BLAKE2B bee99418264de8f068655a45592810767d7edff3091b24d55a6e3e33e5d76062865e748104455f0a93c3429c66d63194709c84f59e09f319e65447900e94d12d SHA512 4fa1118914644eb90726cccee1a320d7511ea7ce1bbbda09f29e3ce9a3669cb39a948c0dc5dc78ecbfb468fa90b7afa90702b7ec1928efcb6b44823ccf961ba1
 MISC metadata.xml 357 BLAKE2B 29b8df313fa5bb9f7666ba95df518d3ada2f9bf783c2e14cde2f404cf10504e5631ad2a512303acfdd0a4ffdad845fe482082d5234e6b54818f38c83c07391f9 SHA512 6c6151ca1a141fdbecdb4eae172cf6d21bd41f2827db435f8d1a6a4dd95743fc291f302848b9afad0e1fdb9e7bb8030bf0f8e46a69e8d4ad9ed0d648b1aef870
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
index c94a4af4d0ac..608a680a6953 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
index 21635f2acab1..9469ca60639b 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index c5c21a3ad9c5..4d591a4c275f 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-fixture-config-1.2.11.tar.gz 6525 BLAKE2B cae41f542fedfcc8587dd5a4cc117480f22fc8abd6f5b85b38451e8199c52d2cb20c4a44fd014504fdc6835be940b4935c95e73dd16cd42049a0e01737a65f6b SHA512 9d335621c7aec41ce769f450fb618ca1611a0e97bf3bd3bdaf43bb827dde62af28fb255a36643c4e6e9c958e7f7efe3f4fc308b3129fe7625c0504c0c46f1518
 DIST pytest-fixture-config-1.7.0.tar.gz 9884 BLAKE2B d844b07a8b7d59f6761ee71147a0945225a3f30bdd9b0751972bf6149b444ad95c49f3d5001d6414c535c1a230ed1e47ceb90b26c50324ec21165430e633cc21 SHA512 c861bbbb91efff338255734ddb4a8b615880c32a12c981160e9e7575d38adff8c5febad46bb9b4208634e39d4cfa73dec342265ccc1951168c1b12fd334cd746
-EBUILD pytest-fixture-config-1.2.11.ebuild 764 BLAKE2B 529f97cec1b1b4d0facfe7895fbd5a53708f5eb5530b5036dfd436ed6902b8a6fe5e851ad5bdeeff9e925be5eaf63646ed60cc878a6c80c77cec0cda57378960 SHA512 b7cfe8d9828b7736740686c2285a00015109738caef9b224ec64aeb67301d3e8aea1fda094093cd1f61f34ccf17ef9e2b9317d931b9a3857a6ca5f5dff72e1d1
-EBUILD pytest-fixture-config-1.7.0.ebuild 718 BLAKE2B 7d4d840aea064eb561882dd3b7a9d64cc1553f87b2198983e10abd72eeb69d181eb86707c823b0479a98ad2cdd91bc68538e5ad04b284b6ea061be450b2de2f4 SHA512 55e45488724b71142a138c52169643674d46fd06c3bcc67a6813fcd641350aacb6e50ba8b22fc86b8ee4da4f567999b311ad785391e2f15c8404e9712cfcbda5
+EBUILD pytest-fixture-config-1.2.11.ebuild 759 BLAKE2B 921f32103b9dedb2d51d9e1df3632ac06e07d9e75db17f780c774c639e10fe1e8f41487534d0d3522d352b62a5a07dc176edbd3eea12a316c213d2b41762346a SHA512 328f2f87eb4211fdf7981dfa04d99a06bc692a0fbaee74929b47c4ac5314b79e6b781eec97a67fb1521b8790ba402d6c7f091354036e62f7431bf154e91ee3e0
+EBUILD pytest-fixture-config-1.7.0.ebuild 713 BLAKE2B d3315a0506c04e35ab441b526c46d08b6d4d304a45533e7fff7c840d7546d4b4ee54095077293c5bd18bfde9d53d0b63a7c84ff5fa4b862690793d1512230a0b SHA512 4835d8578ec7b124776dd2433728ee1e2f4dc2c46acfe02a18e48fe185ce29f9407568d59f1931524e8f998520536007d2567838671c5fc17b9e0092559564ad
 MISC metadata.xml 578 BLAKE2B 5beabb8f2090baf84278de31a3db0f16af516fdc5f2952b57214a2fc6c7f3322c539d904d42edb5b121567b1d116f7c15bba75146207dd952c38498a4328effb SHA512 6e01fbba94b5c93f444b4d6b30f1e06c2b60367d59f5a86167e1e652c9d2a750a087f202798802260312dd1b6d217596072135df9ec37513fb66ae76eec44c17
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
index d437a78d0416..a3f002c1b550 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
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 4a9ef3f6013c..3b3f436c9b8a 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
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-flake8/Manifest b/dev-python/pytest-flake8/Manifest
index a793ec9f64cb..81957c55e4de 100644
--- a/dev-python/pytest-flake8/Manifest
+++ b/dev-python/pytest-flake8/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-flake8-0.8.1.tar.gz 7359 BLAKE2B fd45d50fa68e329569a5964407fae301075907aabf0ec2c85c7ad9b9c28aa7a92acfaf9b7b4e06036c940ca6c7a35388cefb0d9b9151471fe98c968a43cf5a95 SHA512 b49b4d42712040492161f144cce807b661f2d8fe5b484b29ad1a519fd5b0b0cfb6abd42c3ae8999f21263c4776fb773f91bf0776971b6b6727607d33fb49ca89
 DIST pytest-flake8-0.9.1.tar.gz 7959 BLAKE2B d0ef55385dbbf47968abdfc14e69a0420cd52bdf65c0f74ec72abeb1ab28ad27806593dd592f448f3c01dcdf29af4042c1e1c8affde46a1405ba7b4155c174a4 SHA512 eeb4f66022e367d92dee94544ae8fa99b79c1de0579a80e91c22e6f050752010cb7ad6c24094736d23ae753615b186a957b8b0f94c09754005183a971a1e4aa1
-EBUILD pytest-flake8-0.8.1.ebuild 604 BLAKE2B f42dac5cdf1c94e3c1d5377a54f71ff573960910c402d17a58d29837812a88f6900d291f6969bba74552d122a7d36f0e9ace1d1c0d12caf3079bcbc8b0c42893 SHA512 11a868b92b6299bd7d38cc12f265d43c13286774db5239d35efad7bd27d9973ec066ecfb78041cad4216ab25773ae8cae57017b456eb7c6a1dc9bedc6cc9e718
-EBUILD pytest-flake8-0.9.1.ebuild 687 BLAKE2B a2b970d59d0904ef3d42caea35268865a3f1610de91cba05b4cde68be7e33661a2e08a01dfc38495a203b0a173a0f82e87b4ce459f79e54db70e0d634f41a80f SHA512 3dead28a89275d0ddc84c94d0bd0b2c30fa65feabad4e6a9c88fb62a61fad0ddade0cb9a40a406ac14d30c971c49e5b4fcbcb23e3830b7c9ad10c80657892024
+EBUILD pytest-flake8-0.8.1.ebuild 600 BLAKE2B 7c848c88509086bc2e4db9e32df2ac264dcc3217826e38d003c374f460dff91636f649dd4bc139470adb1fd3b499c795a21447e1b7438babc9e5abe91cc9221d SHA512 bfabf09827d7f2401e26be1690e05a4db0bc1c82709abd1fecc546fa3a337a2e349f68d0fa40694308c8902c2aaaf2c9f8bcdfa475ddb479e8118d7766959446
+EBUILD pytest-flake8-0.9.1.ebuild 685 BLAKE2B e88808c77d3dcdad1424865807f48dc791b363f4d7f32ae21ad99c6f9c3f476d4eaa633936c36c5ec0a2c7166c64efaf10e0724ab145cc80b4b224562cdb05d1 SHA512 c4d08e58cd64c6ca845b9882eb2fc6065304389219e6744ec4f387e2b0898836cf4544a33a255b429afbe235e81bc99d9a1a62ce94e0755663a33f027c28ef35
 MISC metadata.xml 507 BLAKE2B 75290d0db230e858a4b5b706a2636963a998c882631cd2599bfca3a1961a2f6304dd67b1fa2dbf5a278a86dda00a4c50247f400ff8573845552d3f11b2704595 SHA512 0f022aea078d7eb1b41db5326bf4c1b950344102f4b614ef095e20555a81032687a3312ead75ff33ee8f6dcc81984651dfc110b95113b8c4f2b3e57f52e97baa
diff --git a/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
index 7a244253d20a..7ade828412c8 100644
--- a/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
index 490bc462bdde..1667ba9e06d0 100644
--- a/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-flakes/Manifest b/dev-python/pytest-flakes/Manifest
index 6ec041f9df46..72cb245b0790 100644
--- a/dev-python/pytest-flakes/Manifest
+++ b/dev-python/pytest-flakes/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-flakes-4.0.0.tar.gz 7138 BLAKE2B e3c43df60484c664672f8b9ea92f8d4e25ae33e0dffc9cee200867220a3c8840f7325be28a4bec44918a9b44c1d73d3b89517db8dfa9bb982ed92a34c3b09674 SHA512 e74fe78e713040e3e85f206e8d26f5b8d8ef27dd94c2afccf3cd0f1f982c5e6c30c5966f2cdb774c7a2a8052d1a5cb324626b1997a9e75f5a7bb7d4a5e99376a
-EBUILD pytest-flakes-4.0.0.ebuild 634 BLAKE2B 8d9258b2ec7eb0bffca5464f4739b39bef713d8783338e9d39c762170195ccf77fc3e5f5c67eaed94db357d146fc913b224d849da4e35486cd9809fb45de41e1 SHA512 6f2e44a92ef5286de60de78105690fca14d00d4506c7032ed7c3a9faf1a8570b6580c541dcf1f60e6663450ce5e7c38d4082bc434a2cd8052766fe7ecd3dfa6f
+EBUILD pytest-flakes-4.0.0.ebuild 627 BLAKE2B 67b943e1b169588e61b335ec6253887f03e4f835f2612ded1ea4cac1d5e6b1e9af517fd2cf208f6da2253f247b9cbf6521ebcf9aad306a8b3b476b9cd22b50a8 SHA512 a552019f17f2af03b706358cff30c7dc955a61533e8950ebcaf0b604fc71526dc8d70d290b24cca0a1423ab31132d8318cc7857a7864164ef80e3f6953809904
 MISC metadata.xml 322 BLAKE2B 4f4573205a169edb1b0883546480cf852d1eb0a9b5f99c7326a55e4f6002345c06961d8394e7de26d13616ec78f8744cfbb122964b40ce5215920749f92bdcc5 SHA512 129a0bb37ba1cd528848d3c537a7a776b7526eded473f97e986307a9a185b4337d60f6f5f0ed1beac1d0f18fee6d9023753b9cb89d77e3b3a06576104701273a
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
index 3acf89ce4257..404ad119b816 100644
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
+++ b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index ab1c5f4856a8..8034090e2205 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-forked-0.2.tar.gz 9617 BLAKE2B f306c968447b73ddd606f7929b730d222f30640544ff89f6e3e2171ec3b0e98877e0263fea6564d943789de6daa1c344022f001ef80ca37b2467c1b9c360eed7 SHA512 5e84fcaceed46ee9da8eec051e72acb46f09e2df3458511651604c35d68e3ad06fc41d52578127fd29f0c216dcb5fce1844c614f10501727cbf8fa8f2316f231
 DIST pytest-forked-1.1.3.tar.gz 7308 BLAKE2B 70711228a5a815de23cbd07b2b628e336a26ccecf420dc9d30d9e9b7ed33bc362b0ba74a8f90fb7cb8dc9e7e0f61d2ac22da55584a84e8ac3a26fcfc2878a802 SHA512 2086884b0e78841b3cdf8eb2b144b8fa60ba95e4be79bc58a2b5775a5f997dddef59377f7c993e54974fbbe13e73fe8688eed4d035e85293e35a143c5f0180f3
-EBUILD pytest-forked-0.2.ebuild 917 BLAKE2B 3c2321db92e733c5c99a28c4fddd924089a811d1b04fc34bf9f16d03644396adb209bc4582cb8a656ce12b0cfd47a0e2ab2096fd7dbedd17bc3cea860ebcb4c9 SHA512 08992cdc3c500633e6d10d7b5d91a69dc27ff6e1d63f16af96331964658d9670219e3ebca9537edbf24b18ba4d623eb2d71fa5423c8bffb35d3e735c068a09fd
-EBUILD pytest-forked-1.1.3.ebuild 832 BLAKE2B 6cea3cea2430a747b495ae7727591c9c7f8085380e7a2175334024e7d0ff00a8de6283cc0b817cfaf5716ccc2e9b3bc325e65d1c901e5ba0cce439aa0d1fb4d6 SHA512 ab9ca0d22f31657d04ad42a452fd61a53f76670127e43b2e72ee2920e79fa41226cc18e379c54467785f29e06f0193801df9760685463e0817ce46ae6bac334c
+EBUILD pytest-forked-0.2.ebuild 912 BLAKE2B c0be1af9ab48a07f51e925f1652b255562f18fb6f3cd2dcd46898371fdf71d601c570bdfb42ae3ca2d024db8d3c86d956a27767441ac55cbf118e34ac122e3f1 SHA512 d3e57b67d1986590ac91feb189db8b51d571c0498becfc105c18bea2fca8079b017ebfc7f7959def4a37c26bdcf8629711cbf14e2b993db04d1b3562f36abbde
+EBUILD pytest-forked-1.1.3.ebuild 827 BLAKE2B 352d77caa194843e01b94ed1ab075628f28b2760fd237d20073a2ebdeec780fdc96c76a4c19c49e3c65fe93a3aea85c00198e757c9d363c0be0e1ee716011bce SHA512 c39d79a9fbb57d4999ff9c468838630ee5f4af88a64e934b46801f5e361c277f951f5576e0f7d9c34bb41ffaa30f5f05c161253821d4f77773270561d351652c
 MISC metadata.xml 380 BLAKE2B 6cb0f7646f94dcda5b7adcd074d83ece86cf7827a69ecbc87adcd273289b777cb12acf856f7068b10b9b3ff7a0eb5746c7cd8f7d8acebbd4cbe9cd1c5efd4ca7 SHA512 9106660bbd3a3197a9beb92d5309d3b1be687cd30f81753364556b2db1aa19e94237c30f2e31a5517097595033fd80b774ceac44cb09c7850a1f6a1eee6325c8
diff --git a/dev-python/pytest-forked/pytest-forked-0.2.ebuild b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
index 9114ab04e306..3480a1c8dece 100644
--- a/dev-python/pytest-forked/pytest-forked-0.2.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-forked/pytest-forked-1.1.3.ebuild b/dev-python/pytest-forked/pytest-forked-1.1.3.ebuild
index 49d7af7dc865..f3e01f58d466 100644
--- a/dev-python/pytest-forked/pytest-forked-1.1.3.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index d1bdb13d0e2a..132877d57857 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-helpers-namespace-2019.1.8.tar.gz 5487 BLAKE2B 201e2e34f60baf95ce33f8cb5d3d8ce5465b4140e68c16f4802ba5225e28c4506c608dfc6ff4a36fddde30c7972a8c175ead976a11a731e2bfbc33e4b06cc04e SHA512 47b7f7c6638f4f3f0248722d4134b73357acb091f02cc1302d32894223d5ec06fd5382db207ae524f62749f2ebc53cf32d27eb8890d12baf250cd29dc6378a55
-EBUILD pytest-helpers-namespace-2019.1.8.ebuild 471 BLAKE2B 0dd35e853ac864934107bec66bc88257aab7f1cbe4edcbb628ce3bb29795444bb7a69b38be8c82f54efb5a505d93e036ae4b826180071e0104fef33208db68af SHA512 f7392d63ef5ca7dfb3556bb6f5102ecf674f0ab3e41a6ea79ebbc4bb4e6a26209216db9038c07b6946158c37d2b3018c29c055c72ba9a769d0d768f8910d16f9
+EBUILD pytest-helpers-namespace-2019.1.8.ebuild 469 BLAKE2B d62bec0cc25f763116e726357d4d468f32d2ba3fb9da15ba403ae3eeaaef734d422ccc8175994bfdc12ebed1133485363e6484b6ec9d745d5200a4b7c8ae28a1 SHA512 73c41250cefa43afc0cf83163cf8b87832a3a0bd0be625b2ae7cf8a10d735cc7be30922092d3d964d68281f140c556690a85eb505e376410cfe5adec81b9d738
 MISC metadata.xml 328 BLAKE2B fab884918d24353a3281a69d6ce042faa916c0fa3b8e33d6acac90e85b487f31d97388d64ab59257b0e9cb1aaa8891c7934f87e4b5a2f36a5f0cb621e937f264 SHA512 7cbdc338820fd09b283ef5686c59a1a7138a3b1e0b315daa0d6e4e4e0cf1f87b1802128ab03939ce24fa1b97954de7fd34096f9d734bf20e1ee8e99276e95941
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.ebuild
index d4be277a5446..f923818c09f6 100644
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.ebuild
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-html/Manifest b/dev-python/pytest-html/Manifest
index a37668a4593a..fc13810915f7 100644
--- a/dev-python/pytest-html/Manifest
+++ b/dev-python/pytest-html/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-html-1.16.0.tar.gz 23271 BLAKE2B 44ed26f5c4da0a3f03889ea7a78346bf1ebcac78a57b69e8f4027d13cb3545c673c823713bbe04f787467c5695d42723bb219fa1ebe6d2a2810313dc6b083f5e SHA512 ac79122e3cd5704d297030422181414704dd681e695ab6c71d2e569958a4b83216211064a842b11dda19d9c05689bdb39fe51d64f3d6169a305c6eac8c702afd
 DIST pytest-html-1.22.1.tar.gz 28183 BLAKE2B bf6d2aecda8fd3117a7b58307f1246e2d6f31f8939812c402d541c13dc329d7e7a0ab1f72ea70583d39614599d70dd0f4ffcc00b0d481ae4bbfce968f016adb3 SHA512 8adf1b1a27ea9f635226acdcd9d429bf78dc57ef9a67cf6616868c60b921c0cef117a63f4ef4c258350900759b607baa71d2a6b73cc8f9f718b405a7fba0d5e4
-EBUILD pytest-html-1.16.0.ebuild 785 BLAKE2B 458461bac0093fafd917a127e262b8ac520d8e44183ef42f6021a1240b6f546cb15dab885de131a3da1e1bd2001638177188907c29646cf5ce71f596db6e4636 SHA512 2e924c65daa32a020820a70058d0e29af7c18e96d2034e9534434f32cce703214bbe069ae5b96ed20c15411eb94d8129628c96c6136900cd296fb6a4fb30c4b2
-EBUILD pytest-html-1.22.1.ebuild 789 BLAKE2B 25904426fa64d125cff6735e960354150afb3839dee7564f66b2fb9d864fffc547468d2ea8ac1ae099b3209a4edff0f437e5042069033eccbc9579d12b7c9b5f SHA512 6ee83fd38bd39b6c2502cda5c2600c178cabeee1830fc00cbac96e800da6759dab4805dcb57ecfc1a54897e34bf1f72952e2135e47c7dcd4a714ebe4be94b6c4
+EBUILD pytest-html-1.16.0.ebuild 766 BLAKE2B 0779c3cfbeeb1280803c26fcfcb47236307c9f1004d510e3fc9ea73ec38b6442f18fcfa39a75d7bfa26a045839d3ad1956a055c7ce6acfebf0eb51edcfcf084b SHA512 3fbad8ee731344b8f5bde97166fefa9195f86c3b2158dfc6c802a5f42225df3b8213303eaa8d354e74b41ed71ecf3f19373b1912365c99b8f7d99e79626b8f59
+EBUILD pytest-html-1.22.1.ebuild 772 BLAKE2B c2450cd6d8fad192ff3c1ea07b5af278e5004480c017d6fb0e0d055a0461758ac59ef36ffafb1bca8abb7d8ea94998ee4b6f368e745323764e86b88b0d5f1615 SHA512 f2cae2d696a7565bfb972c9cd9281dae082bfd4e402012810bb4040eadebcfbd4f6899d00ffeb20b3052392a7fc1e8088d4b9df722ca8e890f58913f02a3d97d
 MISC metadata.xml 354 BLAKE2B 0c9325132cb715771e8b3b7f0cf8d24d3752d9499e4968722a413a319a4600c4647ebb39f95a3ce930d4649f8351b75272a0201c74c1add2a7f258916e8eccd8 SHA512 196fd5d73634e0dfd0c33c4c26d82b1dc8cfa905414d201c806a19a8c82254d512c31984744a7978a39903391844700745b45e25f2a762c8a9bbf203b839ed57
diff --git a/dev-python/pytest-html/pytest-html-1.16.0.ebuild b/dev-python/pytest-html/pytest-html-1.16.0.ebuild
index 046b52040c57..5d3f45a484e8 100644
--- a/dev-python/pytest-html/pytest-html-1.16.0.ebuild
+++ b/dev-python/pytest-html/pytest-html-1.16.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-html/pytest-html-1.22.1.ebuild b/dev-python/pytest-html/pytest-html-1.22.1.ebuild
index b7451b73e044..287430b32a14 100644
--- a/dev-python/pytest-html/pytest-html-1.22.1.ebuild
+++ b/dev-python/pytest-html/pytest-html-1.22.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index 0d654ffb4bfd..ccf2be5a48ac 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,6 +1,6 @@
 AUX pytest-httpbin-1.0.0-pypy3-hang.patch 1099 BLAKE2B 4bb8dd686aadc35aab144a6467d52e7de675bcc7d6de8f130bc5942c17fd19c0c914d9aef81af3ed0a815ce21caf40ad8e7c8f724710fe07290dcc8fb92d6a24 SHA512 b0f417e7fdf658783e9297a895f50587d7b997de5065f5322fb46644028caa7cd10cf6130c578f6dd1f8b6aefbd281342f6aa8f5477284de3d4037b799604f72
 DIST pytest-httpbin-0.2.3.tar.gz 9498 BLAKE2B ad41f72c80430eeea8c7f48185daf63c6adddfad36798179df27677aacc8af85419a678ba6f3df5281ca7f7ba0b3ee721cd97e5fe86eb5117417be53332f98e8 SHA512 f3c4eb67d1b02c27d8edb42622793fa3604e3f0bd5086e4986b8f0402a9fb8d7969a466be92fc6a7e301e829dbeb300183b40dccc9ec5da1d158cb4d08274f8b
 DIST pytest-httpbin-1.0.0.gh.tar.gz 17813 BLAKE2B b7e0ad9f131e4d236161b66b1d6d8e6087285a6d52df1accb044b30bcdac6c5f3350e9dbfe1cf33ab64b6d6aac6b463de81c31fd12dd950426b6ed8ef4eaf289 SHA512 2794134cc005cb969752e0c1119459d3f1e106f679942880a6b9ff507f2ee31c8ac4146a9c01b9a920368ea516443954b1b7044f7b1c270fe251f7d36adf7661
-EBUILD pytest-httpbin-0.2.3.ebuild 870 BLAKE2B 4b8b26728c2fee47e1a6d0d18495510a1b75804df4ad5ac3f77543a1b7fdf15c30cbbe6d2d04c369611405814194d29faaf760ba4c4ae403e913ca05d9d5190e SHA512 713ee77f16dc3a9aa0c07506b43fc9282665bf4e1dadd787b2d8b28d1c1005ff8aa0b253c2697142c6c85400fdef9c6913a8d7bd7bab6c4cb339ec32a091248a
-EBUILD pytest-httpbin-1.0.0.ebuild 766 BLAKE2B a3094859fae4fe52252be865f284d21dca67299645ebbef9e5fdcf9ea82dc78d538945dd4d49769f109b8664f0ba3de0a06a847977ce9dc96356ac31625b987c SHA512 de725a577b5aa1114ce158742930e3d2c7e6fe41ba6275291bbc3f4209a0eed5a78c6416655a22a40830186d4e749b3f8f9d4f9ce0ada2afa9bd246762f58624
+EBUILD pytest-httpbin-0.2.3.ebuild 861 BLAKE2B 1595922b3716998743d8651eb5c9568c1707cbc1b41104109563077de6563a2c0eb0110eb51238345f46d0347efffcbc4f691e15e91252dda439ebf91ee776e9 SHA512 f9f14a91746be8072b8b6546679a6cae77a382c51dc5ef27b957bd3aecaee8e8c744d777d8e217f94ecc510ae98adb46c69188e829ccbb83c0b20d8ffd6c02fb
+EBUILD pytest-httpbin-1.0.0.ebuild 768 BLAKE2B 0bf7e46ee54e1464913b05270b72ec66ad36d40ea364f039d3bedab064e807d8b8ecd37feede9d27c0bfe5781b72fbc08f70639302c753f65aa14ec1c08c30dc SHA512 f50eae49938b3fbdfd06c564e594af2bb4545f91e8a5e416dd5d774dd7d7140fb5ce276f1b26cc435b097d97ef818e4b3475268d1ecb4aec40f674fe1c11ad32
 MISC metadata.xml 521 BLAKE2B f3135defad3eccac1a8f9a7188de8e375a970fd3b6c665395fad1d4ed570aa4a3a90728644fe45f13af527d5c51216e04631ddec670cb6ce5f026b508eb5f58f SHA512 19e78d9a8706ad253eb0f7873f0e8bf308065d4cdcafc6d2ebed792f31f526c1d4c45bd2f7aecac338bd30c4ebda33b301b056f3075c11231b8d0d5ad4e77d2e
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
index 87331ca7c2f0..a069b7e6f84e 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
index 316237426a43..6caf54c29902 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-isort/Manifest b/dev-python/pytest-isort/Manifest
index 21811f96ebec..7887537adb7a 100644
--- a/dev-python/pytest-isort/Manifest
+++ b/dev-python/pytest-isort/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-isort-0.1.0.tar.gz 5502 BLAKE2B 9fb03759871d0dc35d53806ce460fe637b1580ed928e1e86485f1a0603b92042fea4972008aeadc890c79cfe42151e77a6628fc7856e4b230dc4e39293a8bb57 SHA512 86c964b6a998a32c9c474dde0a9400c45da8b26f3e8dd6f4092baa4bf1978a7f67a384bd910ec824f85a8ab49b4ea30967e1e7f908a31619ee88391d3505440b
 DIST pytest-isort-0.3.1.tar.gz 6429 BLAKE2B cf68cfe061be097c576c9cb7ad0a808729aa03f031128d2d1064bc960c7aa27e0d94fc18c238d95ac2074f056ecb8fb33064f6f0311756c73ce8379d1b8317f9 SHA512 2fd39108a6acacf18ce68bb537d2adeb4ff7cd8ea4c9611e5312edea5a0bc4841111ffb544318aa7b3bebe38e9f4744f07a45b2ebcbf872f79003b249ee115ca
-EBUILD pytest-isort-0.1.0.ebuild 654 BLAKE2B 41fbee69f0f96bdec3876e01a66437e37bc4920bb1f288dad39fbe0fa8bde9309d76b891c32f733b56d941495d434f3318130638c1e876dc3e58a2462417db14 SHA512 ce9703f3000fb94a71b5d908520338cffeb121b9e8505e3ed14a47ad77573a7ab8be01126826a74f7c7a9e048dbe23060e6cbc0a9c7b994feb70b6f0c407954c
-EBUILD pytest-isort-0.3.1.ebuild 694 BLAKE2B 1c77b2c0c9c82b8b12aeee37bf4b4c9c6194a9a8c81a46e897c27d43d14acab9c229f29d4db4871958bc7137ab19025c4228ee9320c890aeeff386940c25df94 SHA512 4cff6ccab6500b890b1f78ce9c19f4e0415c38f6a9771a50928a06a7b0768625f2f0bb5cedd62f0202f23a73aa32b395e16db73be71987e8b9bb245baef81268
+EBUILD pytest-isort-0.1.0.ebuild 650 BLAKE2B adc0609a3f6a144d2e0bc7cf078656f912eca32ce58dc396b43cf5a4bb3cd099f7be2c2dd0a3d7e3f65e7b248fa8b9ddec254032d73716405f2a22b5cf6ef451 SHA512 f7aa160d4ea19cea4c846500673e8d7ae5c2e9ec401abaa031cbcba26e235158e38c158090eefbbb28aa25612988db5f3447a6ffd5902668704978ee6bff7451
+EBUILD pytest-isort-0.3.1.ebuild 690 BLAKE2B 60c5652537e3fff590727e6ee96874b371492fa987e6b1ab3e182738aa761b9b46d0b944447c26a1b110b9564f26e4cc5d801c2fb467322734fafd5a5d83895d SHA512 0b6e8aad7fd4ea9ca450347a233bbf7e96e03d27858bb13136c38ae00711bbc26d8fe703001f39a23598c88b84ff0d0071b99fb434a03d2dbeee53fd52390fd7
 MISC metadata.xml 505 BLAKE2B 25a6f8c03a7bf69bfbfd8fd8e45d9ebf90930063ded11da4e7bce31732d3328f17975327b79c66ab3af85112f8e4fc1d91aa7784d297f10a3c5f4770176941fb SHA512 3d77c078c21bbc18af28a19cb1d69c9277bcb1fcdcab004b21d18e715242d0d8e97aa05ebb2d232dcc2411cf068ab40ed36728d56f21ec4ba200319012e94fa2
diff --git a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
index bfc7f2f14502..ce98c8967112 100644
--- a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild b/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
index 4f49aee54ec6..65bef8ecd039 100644
--- a/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 31dd8616165c..2c0e03cae80d 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-localserver-0.3.7.tar.gz 19772 BLAKE2B 388bb7c2cfd4867bc028c23dea775ee463d947bc9bcd0a3e671b3c240c025ceed8eac75a2d05011564ff4c8c1e1153759033272cde0ffa9c3b2128156ad1b38f SHA512 48d7e6a27965dafa1d5e5af1efb6118cc1c1c28ac4a46ae2d61b6b804292a126f481295bf13976f66f505789238f3365ff16e6f1207c8bc7fb4b258759fd4d99
 DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
-EBUILD pytest-localserver-0.3.7.ebuild 685 BLAKE2B 03399e4f2df4742ad408913b7b96fad61d87ea65816992e7211f184d06d254eb672989bdc8b11a2f8da9596c5777f1b8bd2d2ffc72a46ec64b951e95faa9d9fa SHA512 9f250ec0cae2cf4def61c6cd27aa76b4b527a62a02659d9cfc2a5d5f18f31698fc5501182278a15908bfb0a5e06e817ce2c16ace31bc880ffd3dcd0c0f2f6b74
-EBUILD pytest-localserver-0.5.0.ebuild 703 BLAKE2B 77dce1017f96da734c820af84ca92de501f9886e96260772f20e0154dc6b555affb0217734b7002b628f6c1973c5ac4a35c81f86c4e44a0511272fc0e259d69d SHA512 462a4b248ab2140d27d76de9e8f2575690561c09f81266621b90fa4d42275384479caa14d247aa5585fbed0a8410bfc7bd81ad90606ac0f30c1090c34fde2d68
+EBUILD pytest-localserver-0.3.7.ebuild 676 BLAKE2B e0cbe8194efb6be37d1c6ea1fc78d3665bda060eeac9b5cbf8fdcf075b030797fc62ec2918b00196613c9a9c58f2fbf8b5c5d579f32ba41fa99eda85b66beac2 SHA512 f6698b893979a766497e6a5d45ca2fef7d9ab892fba98632880920571403c3a6bd6a4de1895015d0cbe4fb82ad03680dec54f0980f9996be2f9bc00577c487c6
+EBUILD pytest-localserver-0.5.0.ebuild 698 BLAKE2B 4badb74915a4bc7253bc305c800bece7d01efddf67d07ee98f33ec2c1f9c3cd4155a458389c94256e5df3583b89b7885696df810f4d2f8fb91806f51d5b1634f SHA512 22a256f0f7e1ea33674ca4b70460b567e766c60c7e73ff3a9da1556e6931257e60a703b8c4d816b727648e9a2174ae3e409fa9c5a8f170bbe2a83703c7d4a4dd
 MISC metadata.xml 321 BLAKE2B 1965ab8ae78a55b07a92b65e39549bee5e4136a133deaf3c510aa52005dd7e97a030ec30779a8d9223048b90c9146513f761d61b30b78e5f772e2ae4b98f1609 SHA512 db2e0fe334587804689d91759326ad5dabf3aad411c9046943562273f89485b1524b0f62173c9bda2daaaab2e0d09309d23896e91b3e2716e36472c87bf5f883
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
index d910ab0320fc..2aca32cd6242 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7} pypy)
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index dd77d954ff74..fdeb8a085482 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=(python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index bf40522ee497..6050f267ccd6 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,7 +1,7 @@
 DIST pytest-metadata-1.3.0.tar.gz 4604 BLAKE2B 78987d2c28438b4942caae33d6c56b789d7859085074ae39549d0666cb725e0dc70c889ebce7bd7ff0b3846ba0c06e82cb85641c29bd0ee46b675813f1885492 SHA512 94af4defb1115d87fc456db80dbe16da01662d0b87325e433d4d1b30f35f210b7750bbaba091ac73d158296070c87054ce9f4c0687dfe5dfec3f02df56261d98
 DIST pytest-metadata-1.7.0.tar.gz 8254 BLAKE2B a7c5d7237ac6cf44122ff4af6f44aff8d3227a54dd340b3a5574161123319be1380410599a29920aaab41868ef89030a731a389232685e9e3885617d7dd9586f SHA512 85f86f1eb7486f19904bb513f1ba3212667e0ca2d74080621ffd2ef1cddb0ab9d6c01cc1c8eb69058d86ccad0974830bf1d6ad3b291fe0dbeb6196c06331e66f
 DIST pytest-metadata-1.8.0.tar.gz 9227 BLAKE2B ccc8d1ffa1f10540bb312bdc3a2e0342829935a108adaafd562efd75497768653a5eb452393b56eb97c624f4622a0b6ef5cbf860057d28ae340c28aeb5d7de2d SHA512 04871fe0c4c30bc23eba80a58919841cf45045b91d501e67630426cbac88a16005657eaccb1d2587263d4fcd940d37382f3a5649f142b1aab327f1f1c5d61963
-EBUILD pytest-metadata-1.3.0.ebuild 630 BLAKE2B 3c6ab7d44687eb9cb7dae4c9eb3d437219c9d3e1e4ec05cba8660eb26695d46517c5f6ce0c02685c803d2edc4ece69d7785c05aaa4b90f08188cd282b9c7240c SHA512 300a1ef706bd70c4a76cd292b03233d7c3e58acc2ae4b2dcbd516f53fd8a3ae60c6e4ac6bee66695751c18fdd56bff6ceea477fecf7fd582e91fd93e846b1b0a
-EBUILD pytest-metadata-1.7.0.ebuild 630 BLAKE2B 3c6ab7d44687eb9cb7dae4c9eb3d437219c9d3e1e4ec05cba8660eb26695d46517c5f6ce0c02685c803d2edc4ece69d7785c05aaa4b90f08188cd282b9c7240c SHA512 300a1ef706bd70c4a76cd292b03233d7c3e58acc2ae4b2dcbd516f53fd8a3ae60c6e4ac6bee66695751c18fdd56bff6ceea477fecf7fd582e91fd93e846b1b0a
-EBUILD pytest-metadata-1.8.0.ebuild 634 BLAKE2B 4d08b55b2d9f0c4e1a7d1190294ce0383a2b3487cb8d6acff975c3548fdf1bd940b70d5c4818c17df186cfcf04deb2e8ed6bc0defed50d8132a74d121dab55f7 SHA512 0b0ea859806d98043ab4e508b55d3a08200b50deb243f4ef2541ef14a091ef43def48a811e208fab72375e7b38135fe20c2c166e39dd44f15e32a71596d22055
+EBUILD pytest-metadata-1.3.0.ebuild 621 BLAKE2B bfb2a4152e7b084ddef7ca2ad040ab94d08d0a431a01c8996518a8c092db7abb1d2831ccfaf350451bb50b2d17bf8ae20a5d58df6e08a90fac31287d95c96ca8 SHA512 fd418b6bab3f9f9f345e8d4c77287aee2eaed92ac0ec9f8f292ff8b7e229467210dd545872609c0a66df9c8591201f4b26b87c88705479b539edad16bc01af0c
+EBUILD pytest-metadata-1.7.0.ebuild 621 BLAKE2B bfb2a4152e7b084ddef7ca2ad040ab94d08d0a431a01c8996518a8c092db7abb1d2831ccfaf350451bb50b2d17bf8ae20a5d58df6e08a90fac31287d95c96ca8 SHA512 fd418b6bab3f9f9f345e8d4c77287aee2eaed92ac0ec9f8f292ff8b7e229467210dd545872609c0a66df9c8591201f4b26b87c88705479b539edad16bc01af0c
+EBUILD pytest-metadata-1.8.0.ebuild 627 BLAKE2B 351bde06937e30177ed509448fae7f5da35f0701e0839d6d28e23d6a20df292fd7ab7d09b26ed0b1d1a479b139b1eac619311adcea24aed174c24c96f1399538 SHA512 2927f35a69cbac92f6066c977b1e0ee7341541f4bb7b32c53d692358960783e8d123a4f16c8f778e6333a545a6431b1907b4bad30f58d942b3cba0a1dbbfc5eb
 MISC metadata.xml 384 BLAKE2B 8024f5d5853f139e54a68c100aa021a51df69091041fac8ced7d30d773b5b0fc3360e8c6b13ba988828e87580b320e8cf5dd650ab630572f209225db932ffde2 SHA512 e932dd150d0b12c6055a7842eab3b31f8c08e28392eb668e6641b1a30008e713a982eae530c1fc9d99f86ddbaa1c6f19d4044280d23908069b41ae1ccb22b790
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild
index 7cf043548784..12f0b73f77d5 100644
--- a/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild
+++ b/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild
index 7cf043548784..12f0b73f77d5 100644
--- a/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild
+++ b/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
index 74c5123f7f89..e6a4966ba715 100644
--- a/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
+++ b/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 9374d2597709..d4c135167dc8 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -2,8 +2,8 @@ DIST pytest-mock-1.10.0.tar.gz 20754 BLAKE2B db60bfe6ee9d6d0a6ee4f0df7f5efa6ef05
 DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418198b84fa037faf4b6841d7fbfd388273a819a26bfe051e6030690105e74211a27d2b864448598962b3e03788958fa SHA512 6dc927ce35001d088bddd9d79e024141b9e8163033b07af14b1f63330ef8b93dbf88649702f8fcc4f6ad314212fa5cbd39486b539811ec918450b3f7a716f96c
 DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 4fbc0cbd951668eb2ce427496c54e958591fe368bd42544eb1d0379adcb3d0e10b223ab044956e4003aac88665b3132dcb9d167442d6d85a5be79edea36881ca SHA512 c3b897be9156d57d7012e95b620c543500b849d7076224e3328d3783311210c57141dfb82c01bb98e5e419125dce0f68f6631bd610f4909f5ac1798458a7949f
 DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3 SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a
-EBUILD pytest-mock-1.10.0.ebuild 1053 BLAKE2B 557904303bf9bd18f56a6dea0e3f9094210f11a5a8d55e9ee751d547812a89160fbded658aa8a9695742821322ec050f13e74eda728c6afa6835083cc31ed31b SHA512 105f9f1a88237c927715276d8720af98a11b52c26adabb2565ac09d9da639cad1aafe2ddc2251b1ca5ee7215d570af71d479de51be72f9a6be3037b71710da75
-EBUILD pytest-mock-1.11.2.ebuild 1461 BLAKE2B 6aa7dfef611ecea71251c2c8c0d7be218d12ff3fd1cb0e61d8f98060cf484d5fcd2939ac039bdbab44b62c269a7fed99ce565a0a540d4a4e277ff365c138f602 SHA512 7ffa49348dfd8af1384de09a13ad36da80338973b10aca0685eff7750914d25fc4b7b7aae3b85dde9292fddec5f3905e075ade3538ccb373c22c2ea423b37f73
-EBUILD pytest-mock-1.6.0.ebuild 1082 BLAKE2B 3bbb3cde15139fa3c9134250de2419623161f53a69689b64dfab6f81f73c4c1afa6001c0f8ba119376ebae6881f16c4f9a117609e0d6794aaf30cb4efc4be553 SHA512 c71cfc5c6c35799529fa21e9f0341dc5178bea61a7f6975a779c677dec3dad3e94540236839c5547a5ca179cb0cb16121cc3d0c17f7409c1812ef0312fe3c551
-EBUILD pytest-mock-1.6.3.ebuild 1053 BLAKE2B 4525429f621c5d06d9ec07ecfb14b429ac52fa7861168024d0d832449aa184ef04a5c331157cf10befe30c5902299741b2019326d2f197d080a6313388a42901 SHA512 ba49f51d47920280f96a9697c0ec81f14133019fa50b0bb43985a69908d56d6fc6ed7f1c12ff8e4c898de666f1a673216da802834f48420b0af14d77d9631a42
+EBUILD pytest-mock-1.10.0.ebuild 1046 BLAKE2B 31d2747d8df4599de796a5d9bdd1b7836337bfc70dee6326da93d37ab879c22a23dc64599a2b4bb100c6a8c0a95e7ae4d1b58183a58b5a32425e1eb428e351ca SHA512 cd4ec2689198202824f75370c9b08f520fbd29ceba9ebeaddc18f5d2335ef02c1992f11688322f31263dfe8c9df77282f207e53de9649260711df4915fd3d091
+EBUILD pytest-mock-1.11.2.ebuild 1456 BLAKE2B 39a3e10c20f40e0460dd0c5a5f5b1b2cb480c5652f71500c2d2f3fcff668f797af6701f203b3fc9c4edfc5ccb3079400744e1d85dc5f8b44ce6e08cdb6c91cf1 SHA512 91ff90516717d206967352e17b53a190d3d9cf7d45c794e2485bb9a62953dc853fc998b562e58e75f6b6b5042a4380e74f34404ad1de530e3589a58efc2cfc48
+EBUILD pytest-mock-1.6.0.ebuild 992 BLAKE2B c830ed45e41f6ee28ed7caccec251fccbec6d12d387993d22ddaf584c9cbc0e9b7be4fde2bbc538fc952407bfbc1cc2569919d0512aff1862d2b4cba5e1deba1 SHA512 5081ce4e0e2333aa54413f6d3c680c2ed3ecf673385f3a037b178736896b84774fdb011cdd5a6a29261827fd9212eb7ea71076fa4764d9066cf3e777f5feb2f1
+EBUILD pytest-mock-1.6.3.ebuild 1046 BLAKE2B b7f09c9ea65dee2637f695e56bc8b248baa09f22180458681dbd60fda8a9c6130b324fde44a2c7d8a1c7cf872173fe78576de0b310d8e55c93da24588a443771 SHA512 880dc8ee5eeb892647929544d16af0210dd7b42b6a74d0e8bb2a05c8320b586ec59acaab0a2276ff06b38f9ac51dab3f20b2c01087ea5c2ccc5d3b00a9f9c0f5
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
index 33faf60f43d9..898f8bbeed81 100644
--- a/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
index 533ff838f0dd..60339d3b6735 100644
--- a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
index 7ae62ae1e4d8..27fa9101a9a4 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
@@ -15,13 +15,9 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	python_targets_python2_7? (
-		>=dev-python/mock-2[python_targets_python2_7]
-	)
-	python_targets_pypy? (
-		>=dev-python/mock-2[python_targets_pypy]
-	)"
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/mock-2[${PYTHON_USEDEP}]' -2)"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
index 2d8b2c2a72d8..22582207b5ad 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-mpl/Manifest b/dev-python/pytest-mpl/Manifest
index 5f1981dcd818..88c94629c355 100644
--- a/dev-python/pytest-mpl/Manifest
+++ b/dev-python/pytest-mpl/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-mpl-0.8.tar.gz 194633 BLAKE2B b21b26ef95ca3d83d429348a639365d19eacce298ecb2cd5964a8be47970d077bff40692ee992a1cd412572623f1cc2a8a502c5b59f526b4f9830d89973f23cb SHA512 4f5f1316d0f545383b9125281b91d9077b52bfa7d91b4eb2f64c6f9642b1abe86c52c9b88171a521d806e579ab9279f49d1405b3f4fcae58a9e75ec5518bacca
-EBUILD pytest-mpl-0.8.ebuild 772 BLAKE2B b4b306acaca3f519bbc58624f41d9e8c4df32f75179e4290c937e9bb2bded800e8834fc2341227baa24bd34aa40b6925100c9b3717b02314a7614f9b8653a3cf SHA512 b3e869f2bfdc411da4d4bf80876e409dec4a0bdda31f67328325c328dce240006b3421a479fdcb63b292771fae356720663f0b7564a1b0323b0d53a18eb65465
+EBUILD pytest-mpl-0.8.ebuild 768 BLAKE2B f4a377185138a5867a0c4908ee4b0c452e7e8962f4d95c06a405231e9ae3fc8a47b664f01ab2ae78ea7b14769583d0023708fdef320edf1ecef60ca1db867bb8 SHA512 abd888e7997c4381964f2ad04c11a65e002ba3458cd173911d03ed7a3b82efcb05b16e03ee4526ee94051933e85d4a8e96152c44c4664c9c216da831f8a3cb88
 MISC metadata.xml 521 BLAKE2B 152f49e9eb75c777ad953a6090feb9e3415e19400a6c1de71c99529fbdc48f6073f189af8292ccd61ccad2be9d91849eb6091d315b20e3d01408bf614052d514 SHA512 5b8552f0e0a0c96577e14c8ec98bbdc0f1577d7d25cc41a2fc9d173b0fb45b4c74a9bd66e6357f665c0947c237feceb2d276ef3058046054598804acc6d4430b
diff --git a/dev-python/pytest-mpl/pytest-mpl-0.8.ebuild b/dev-python/pytest-mpl/pytest-mpl-0.8.ebuild
index a2dd7940cd48..a6b9e4310b90 100644
--- a/dev-python/pytest-mpl/pytest-mpl-0.8.ebuild
+++ b/dev-python/pytest-mpl/pytest-mpl-0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/pytest-pep8/Manifest b/dev-python/pytest-pep8/Manifest
index 244c698cdbc9..6335492d1aa0 100644
--- a/dev-python/pytest-pep8/Manifest
+++ b/dev-python/pytest-pep8/Manifest
@@ -1,5 +1,5 @@
 AUX 1.0.6-MANIFEST.patch 178 BLAKE2B 498bebd63c6be42e3a73063709dc2f315a2c8ec2234d43436ff3f076f768acf566d81a21ed76412fcf9da929290d355cef02200d91938a9c76df08a296d1baa4 SHA512 f63f80ea3ed7bf9241a029e4cfaae2e41ff9553effee7a85cd492cb3b57d9b54a17e684896be443ba5df08be1d07625c4e6769d9cab9dff952f10eedb92ca1cb
 DIST pytest-pep8-1.0.6.tar.gz 7271 BLAKE2B edfe2ac899586be9f7fd88f8bad5e5a18200da128d291735a30e374316b5ad449a08956b839605bf3f83b91931fb6890557445fd94f3a5136c7a44ee5e7f91f3 SHA512 162d9e25c264ecd82a51c6798ae75493c724a847ad8cdd953225f73e587f9a14298a6281e541695f6e7471a6121e9b0e4f694270f45ead851e392efcd7aeb758
-EBUILD pytest-pep8-1.0.6-r1.ebuild 712 BLAKE2B a73ef29cf5edf7ed0ad47e58af540c4b077a840abe985d255058d5f37e70c8e7ea49e75b019ecec3f38ef9d777e15df5e4dce184ffc7233fb56afd3cb57b2b1c SHA512 f80d4a6df1dde6f537b956add7c77ab38739d862a2212d12d1dd59087a75c64e65598383449fd7aaf7182099c7a6da2592c9c29a5038c68b0c2fd32f68e4ec52
-EBUILD pytest-pep8-1.0.6.ebuild 712 BLAKE2B 2efeff7a6de891cded51fed1d666e3d3f3a9f248e17706a303c52226a2354a0f8ef2c5bcb71c0c7c5c55ddc015b93390a38f30f074dd79bd748222556cfc8519 SHA512 ab63cb17fa93b68061057821b1df950f33a376ff319f07eee01b7f45545f372210d6e694be8b093af15eac94f602e516ef6333260254f9fdd7c6bd1bc74d01f2
+EBUILD pytest-pep8-1.0.6-r1.ebuild 705 BLAKE2B ed24810821c5bcd3b1f9677a7e044a74eb29f4570fd373dd2374664d91fd6917b1489637b5a15ca30ab534db28445c333209ba1623d13c6bb0ad565e41031004 SHA512 95f5a966a7a1039c3789f649c506b4867906e27cd6a5477321ccaf77c453a310da71474176f3501711bc379b0d893d036f80035de24d0a6e50eb0a27d2ca0244
+EBUILD pytest-pep8-1.0.6.ebuild 705 BLAKE2B 78e21d44681c73bbdab382689b246285e75f8ad7cd257eccdf0e4816dcf8742e06885f8d00aa01c9050003c6542d18cc296c6492818943cfa0cb52ccdd8f9e6e SHA512 1b0d616cf611160bdf915aacc5811ffb22621cd9b969561455a6f9f94b6cbc8dfe582df3efcea9c67671ad93c7fd344e34b020c50e4a78b19e6a9ae6715223af
 MISC metadata.xml 324 BLAKE2B 3e0d5894a9d05fcf94a05abcdaba2da483d9b6db134df730bd436b85295a60504b2b30004eaf63396c31783d62ea042db28e0a28e24ff27255c40c4e4704b09d SHA512 3622d9663e7966ff8a566971b51f886be021d2e58254836d3c5dfa62e5001289d8d9beabb3f980af243a91cbfd527a076db628a1b29fb6562041a88cbc617b59
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
index bdf4a19b0b68..39a230e6dffe 100644
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
index 75c30cd94505..dcf708678dad 100644
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-pylint/Manifest b/dev-python/pytest-pylint/Manifest
index 58532751adb5..007924b87c68 100644
--- a/dev-python/pytest-pylint/Manifest
+++ b/dev-python/pytest-pylint/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-pylint-0.14.1.tar.gz 8144 BLAKE2B d78892e3e606ec588b48a252db447e1cc76e27e45606670da3a3acddf040485004a7af84474732b044fdbf80ad760c07fda5e35030b9b2c9e5ce89f4809529c2 SHA512 697cd40e8e4c3722e382c7fd2dbebcb1728675e35b60396628576ec09735595af56431a2c080f29a2f35f304d912c80e4afdf0f8bd21a3adeae3156b9e58c751
 DIST pytest-pylint-0.7.1.tar.gz 5648 BLAKE2B 0baf011d9bbcfc5e66b8ea2c4fd95c8a3f8bbeedca15e2ec35d36b372b410d87ba619b0938acb26c667750c2f81d4bb09ca688731f9e184877fd999be04b6f26 SHA512 e2a7802f90ea25a909094e8bc67570eb631d6ab6dc130bb5cca1738ae09d069b4fa6c3c1349d9d62188a924138e832a3a37c8c5c8964290c95d69eecbadbd09f
-EBUILD pytest-pylint-0.14.1.ebuild 1078 BLAKE2B 43935e48778743a84bfc8cfdcb4817eb55f1a5b7bb91278d38b1ea27e7e0c5d45a14d7534199957deb6416365931fb7972e4deb6d3d19132224934c680ad9b27 SHA512 29d199f29172457e9562a60bfc61f2805c39628b2137fdcc8eac8e2d6ecd61da7f71cddd5d4c50190e04f2327b6c948a235ef61b9c1182e3eae64e5a47db91fc
-EBUILD pytest-pylint-0.7.1.ebuild 1042 BLAKE2B d7d4dde6a7cea5ebba7a6d759f9c102e20c5b856441a281a04ca542799319ac1c868b798f4087c45410379ae523ae6aef34d12915f76b9bfd58d489898b0c084 SHA512 9b7311e1da259a845368ace7eda9dc3df6b2aa197e0e4dc93746c91d4cb576ee404d068e9aabe2b4bcd75094cf0827e9ae24f21901802788d030e78718480f57
+EBUILD pytest-pylint-0.14.1.ebuild 1076 BLAKE2B 9f6f072bb863e99bad026725034a9b032061160b865df66cd02c0bd79968f8e48b9c4d38924eaf8a16b83510d0c6c56e2e0aef791bf756003bcbd431c631c722 SHA512 cfd47c381cec231e9325f93f8654e1c4b440ef126a791d96e47e96a232546aa3c54d8d1771bf6751ca18a633137e298b8803094a0fb309d3478c3d565375da82
+EBUILD pytest-pylint-0.7.1.ebuild 1040 BLAKE2B ff13a2225beb608cd6583e1af59633e3655f7e31a90316dd6dd8ec7dc9ba9c735675df0585532673de462b5cca76df35718f4cd984ff3d77cb9307b0008c9514 SHA512 1bfcac79da5092fbbbaa2635dac72188384ae3fc6f72ac5d5d65e14f0caf381c1b3755d6a7454cf84d0f8887873422cd33036d509d4ae65c7ee1bbafb16ccdb5
 MISC metadata.xml 306 BLAKE2B ef6d4e4bd779cdbec5e76617003defe8581c1c2b04b6098efce973a9b2eb154da51bdc27e8c202df1dc6c4a6393471b917dd47f2e95e75487dcba7a8fa725ae4 SHA512 726037520d25c038ab6a35c14edce11561e281fcfbb6a505bf3ead4d474cb10606b715f95c6df95e22e97f20f840c1694bde08984f9211bc46b5d0afb46f1c4e
diff --git a/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
index d6b1b1a0dca3..d794df777f73 100644
--- a/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
+++ b/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin to check source code with pylint"
diff --git a/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
index 69d21c81b464..7dd4b1919ece 100644
--- a/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
+++ b/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin to check source code with pylint"
diff --git a/dev-python/pytest-pythonpath/Manifest b/dev-python/pytest-pythonpath/Manifest
deleted file mode 100644
index 05b40682382e..000000000000
--- a/dev-python/pytest-pythonpath/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-pythonpath-0.7.1.tar.gz 1726 BLAKE2B bf0105bc717000d629f64e0fe48469d1e37b806d0debccb6d43e8c55215f9ce7c2fb9bcb60ac89a1cb5bf8ae9a93508997137567cc5e15cfd82b06f04d008637 SHA512 313020c7b38b91079694759ca436e1f7129750372f3a0a567dc2934b093d178c4c64894c2283719b86877a5e359128e83bd6e3b17ded283631ad6747541b2902
-EBUILD pytest-pythonpath-0.7.1.ebuild 569 BLAKE2B 1da9af7d992b3ce1a2bf05ad283ee9c81b37719d281e740302dd3d670699e9ab73db328c5136ef344c40af57e229e758430ed45e48f8df7a229474d28579357f SHA512 7c71a90d1c21bcfa567c7bbf60cf44531526cacea283242e3e6603bffa49d0d5417e2f6b718ea49329b19ff94d21ffbf416dd48d1863d7cfaf952dd6b37c040d
-MISC metadata.xml 386 BLAKE2B 6ed5aa37d3bd21e76db39ab2639f7a383d49d04855d5e3a608435cb2195b22bdb749605c2a4b9a817df231b243e52298457826e04c6aab968d46349ce24467e1 SHA512 2403e5bb6c4119ada573f3ac3df72494c11d4fcf23e2b6d64457f914bbfa3dc1128729dd7b5ffbd67974453a8d38d3a6fc791fcebd2ef31c6b381ed506eca451
diff --git a/dev-python/pytest-pythonpath/metadata.xml b/dev-python/pytest-pythonpath/metadata.xml
deleted file mode 100644
index 4b9f714e3d11..000000000000
--- a/dev-python/pytest-pythonpath/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">pytest-pythonpath</remote-id>
-		<remote-id type="github">bigsassy/pytest-pythonpath</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild b/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild
deleted file mode 100644
index f4a629bb8d76..000000000000
--- a/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin for adding to the PYTHONPATH from command line or configs"
-HOMEPAGE="https://pypi.org/project/pytest-pythonpath/ https://github.com/bigsassy/pytest-pythonpath"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
deleted file mode 100644
index 12d6feb9dca9..000000000000
--- a/dev-python/pytest-qt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-qt-2.3.0.tar.gz 106707 BLAKE2B cf02aed42481cbcadfaaa15c883f3055337f6f32e33b7dfbce986ecd9936218ee5bfe9f21e1a910aa970e7adf88dd24415d63f40655e8417863e96a4285fd466 SHA512 2bda4b5f60ba68b151ce62972661cd704e40f4cadaef2583882099e96100b5c5b9398de796e851579e026e9736e07539c4db8c10eef16929ce729c4dd7a22940
-EBUILD pytest-qt-2.3.0-r2.ebuild 900 BLAKE2B 7b5c214e8359e8a8120cffd3d9279636b368a4490af212fc5b29e8d7f659e448e581adbc9f88807f0337cb5d4eb3b7d4ce11706ae4c1bcffd9875ca2dde34909 SHA512 9c0c9c6a8c1c135b14300ae2064afd104cde04465cd5a730bceefca3fc9008816f7738868c0f554d94f00f1dad8b7d8766aa9a00bea5ba3528e0d491e7ac17e3
-MISC metadata.xml 396 BLAKE2B f4d5cdd1823e62b7b0443623b9f34ffbd2f5f7944ddca44dacbeba2b4a3daa438203483b96f113ab821d4e5dccdc6e9cde8faa3a6a4a53d190b567af07cb9b61 SHA512 c5c3149a783a4d72eb7f0582d416b0f6c408d86878892a0ccde2aa5ec672a55c0c2658af31cffdd8f66500420fa3ee43dbda98397a1efb3cc06697e9e1af84ac
diff --git a/dev-python/pytest-qt/metadata.xml b/dev-python/pytest-qt/metadata.xml
deleted file mode 100644
index 2b11b948e3b9..000000000000
--- a/dev-python/pytest-qt/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="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pytest-qt</remote-id>
-    <remote-id type="github">pytest-dev/pytest-qt</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild b/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild
deleted file mode 100644
index a62c2f52ae2b..000000000000
--- a/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin for PyQt4 or PyQt5 applications"
-HOMEPAGE="https://pypi.org/project/pytest-qt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/pytest-2.7.0[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,testlib,${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# Test make assumptions about Qt environment
-RESTRICT="test"
-
-python_compile_all() {
-	use doc && sphinx-build -b html docs _build/html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( _build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 009c021980d2..8e410c67d8b9 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,7 +1,7 @@
 DIST pytest-rerunfailures-2.1.0.tar.gz 7687 BLAKE2B 1c5ba90ab2b67c6a7b58d0569ef46847594dd6dcd5224050537fe3d645d131c2b450aa14a032151a81c6ff2c8b56d4355d03dd33a0e0f998e31a5df94df44c3a SHA512 9c3da462df07f334dcab865bf7f828f75bc611c93dfeb2306a802f2e6ef973332ef502d97dc8d676e09330ad77c227bc6a20ae67ff31f1446a5fb1d608d638cc
 DIST pytest-rerunfailures-7.0.tar.gz 12755 BLAKE2B 26ec453504439ba02afc2dc5912ebffad70a4e8fedc1f4ee75fbb3c187af4a657d8d29a341cbfe570423d2b743974286c00f911634b847536a66768d78088070 SHA512 df26952f4c88c43a7df59cc9b41d794987e4d7c43cf4b656fb2e10734e16b0218ea0dfcc184943f96c39add800fe519ee6b8843b3a0f4d36e9feb59109199df3
 DIST pytest-rerunfailures-8.0.tar.gz 13207 BLAKE2B 8a086783c5b6dae311aaa943a5c0eb56f5fbce4f687faf97ea0046bbce557cb82f8acd612247d235e249ef1a97157d3c356cf546b3d25a3dc4a4122286fcc04c SHA512 538fe5ca579ec50fc1689c4b7df3a55e0bdb08f87c2dfeb219ee141ef67c6c74a324c64f183f3ff85a5289ecfb54beef0fde2105eb0ae888ed861a15194a9dc5
-EBUILD pytest-rerunfailures-2.1.0.ebuild 542 BLAKE2B 311f196cb68a1148ec02c98518f80b6195b25b731237baf6a12c43b203864fb9b2ab014a9823519ce9d8f93175712967a937432bdbe2d6d733d7880c6681deb2 SHA512 9c1dcc6858905a36732ce2d09d8e6cc63aa3d1997dc5973c8c51064bfd18273921f92bcf3ea00ad3c0e891cb9afffd5f2f9ddfaf62448ecd2433b3d46e269b19
-EBUILD pytest-rerunfailures-7.0.ebuild 614 BLAKE2B b5d329e2a897a3a7fb1169e856862c227e37f4df1805d2c46618a311da4f056a4f06880ef742f780bb0df5bc7daaff3687ff6fa7fa545682b5d49196201c6405 SHA512 a6708836d29c14f6b17ae154f9a33f85557e5f2ed9a870e9816a046e8dda4419dceaaaf653c6f7450aadc435c5229530640f4f1c731242b864e1d114b0b63d43
-EBUILD pytest-rerunfailures-8.0.ebuild 609 BLAKE2B 71cf58f6cbc40f65ae10dc09620c67e940a3a6e597f5654ef4864ae0e4e3b5c1ce17ffe82feab0aec46e50f52d4cd1466aa0591feb9cbf2bf5019b426b7b0283 SHA512 6b1294e5bce85851ff878114eb8b1a8e75e2f19b0f660ca900b731e302051d125869b0725302ccfdd43fadbd1884e24ea9a71278ed3de5f6910a8de5600729f9
+EBUILD pytest-rerunfailures-2.1.0.ebuild 535 BLAKE2B 94d01472a5b6f07002fc1f82d24e6445185d9c54800fea4bb03827e30e63386ff3dbeee60c9cf326aa56973e4d8e78004c9ed25b97d1462491934ef13ced3f9c SHA512 148edb5c88d13bb8085e4e04943dd97850fdb4dd81d7cffd93a450ee9a9eaa85e414f22ee185bd115cf8d1c2245ca12737faa417e9415c311ebd7216eeb34da0
+EBUILD pytest-rerunfailures-7.0.ebuild 607 BLAKE2B a43b0f7ae515e21964f7eb974bc7f933fcec8523cfb606c287cbcf4d952ed373e7e0cbc147697cada1c261c4b7105f2452927d908877f1bb4ac72cec5786a05b SHA512 6ac56e3fedede05ca9830231908e5c619ac611c638cf99c6b87ee6d4f6d5219dec0c5600e74f28d42ffcb2738c98d228d0f83014523c8bcdcaf8eb38d22452ed
+EBUILD pytest-rerunfailures-8.0.ebuild 604 BLAKE2B ddefe8610dc0aa0d88bc8e45a5668462f8f460500657350a99edfb116121d8650ad3b99fac225db524cdf08e8b8148499496ad9a1485c813c05144b984dfb568 SHA512 80a8703590ff01dc55e3d18028e7491daf714d5d3284e48765db7d0f6259628869fd02fc9119cec8c4bfe82089aeada8690112b1ee0b27dad957e13849403877
 MISC metadata.xml 333 BLAKE2B 73b35ed1679008982384ced1ded01ba9a61c4b82a6646f7f4a1ad318690d3ffdf3752d438a7ca4064e1a39855a353e3f928329f0759f7f7dfb8ba45b01667a40 SHA512 8b08014dec552b96d1e8d79c44404333b62960b2fce3ce3905077af02d1e3436c2cfbf5b6bbe9844df7d87c5bc5f44ad86f4359079ddb8e2e54f30ecc42369e6
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
index e98660958fc8..e8277f93b60d 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild
index bb9404b0cc40..29de4e767d58 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
index e362572bb4c1..3ab1ac32161a 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
index b38a712f23ad..ecd9cd3aa516 100644
--- a/dev-python/pytest-runner/Manifest
+++ b/dev-python/pytest-runner/Manifest
@@ -1,11 +1,5 @@
-DIST pytest-runner-2.11.1.tar.gz 9661 BLAKE2B 300b63de61ef36c299a95c60af469b071c27ae483f641c7cad594f7b6f582d9e1e076192f9fd5019850cf9227af183e9f80b4049719d074a180e72c25521bc14 SHA512 5249e0a368bab21bb034a9b0121edbcda635f559cc22ba79c87565dcbc070056bfed47a69c16f4733403f61ea5b73adfd1ccf945700116043cbf3940d37d4067
-DIST pytest-runner-2.6.2.tar.gz 6379 BLAKE2B 4f676a4cd59309cdd0e6462c83718482622817781d302ed95a2b7cb9d92a0b0f38b411c1172ecce9003f5781cdb168338bce6f446b1c91069a2024fb75574bfc SHA512 6a993e8729d5e203986f2526d46e96b7ac19e65fc26493a55a98e858304ecde0c47576476864a0ee1817ea1a7b02cfda952fc03f79b84fff249021f140f3d00d
-DIST pytest-runner-4.0.tar.gz 11401 BLAKE2B 3be4527e68b8c1ae7e1bb5bad111367e459a07cf20de1f3b2d8ab993a7e016f9656618075bf515f576fef457aa86f99990f7dcc4c20a04166703bf9272c395c1 SHA512 a7f3defcc698f43b3b6ceec3f59dbd0e00c651167ddc76a9d1a093d722a013c9ffd2bad3438e49170688d503166cb6d8bf55bbaf7bc6f9e6d80eff049c202b08
 DIST pytest-runner-4.2.tar.gz 11947 BLAKE2B 97495bead800a81d879659f1ee522822f76fe8ac80579537d43e21e663323d7c10be8d2da7d05ffdb0931145149d8c10ef7c72b3ab4da2ce856d44d3f00a724e SHA512 278da7add27f77134e63470747ffd9fe663d93ab8e7cebfbae98902bb1d5ffba45277574107f958255251cb9e499b85a0db3e8173f9f10fb31d1561ca709a379
 DIST pytest-runner-5.2.tar.gz 15534 BLAKE2B 0bcbd5991808aaa4b85b9071ce142e03287683e919687fa76f5b7929ad07dca6ae6edaf7ad30a1bc1ba0163f43505ec18ab2cd5e0462399b8252c8ca761d7b29 SHA512 5fc62a4e681cfa0ef25dc815ccbbfe1a7ca0e9e7783c2ba2db0da7d2539f11c08d6c3fad2ab3dfe7f0d50fe7bfb41127b11ec9af67ef8e32361655bc910c8245
-EBUILD pytest-runner-2.11.1.ebuild 979 BLAKE2B a374d4e5c52c4798884df81f99c8a7bc04b429c40eb68fed68abab97199ee1304968edde73210e24cbd2f7cf3fef81e3eca9bd33faccfd8286a98ae3acacefad SHA512 7646eaf80e6c2b443a653dfeabee3d1f591dfce4f90b0e07233137f589da1a38c466b6dca21b8f6a6f10e81633428c252ec72030106f3d1113a9155d573eb6c8
-EBUILD pytest-runner-2.6.2.ebuild 1055 BLAKE2B e9002fb3f196d97432d2bdc0978d4bff585847f950f5db1dd478485cd810768e65b3473dd0d9e7ec25f28e7636fdba0f33042dc67e0b457a0e0368889c4e68de SHA512 f82544001c3df7f52e68a636bd6a5babb85ea6045dee24cb75d941d8c0731603c34ca37b97827c4b93c451684e1fec3e56fde8c0454c2ff75b8a6ceca5d14a8c
-EBUILD pytest-runner-4.0.ebuild 1026 BLAKE2B d2239fe5f511d5185d03388b70e3e9f004b896961a19915981ad60e187843e8b21393ca17a2adcc9b6035134a42eacb69e5ab99461cda3437a5eefd1146a55b5 SHA512 cd7e56e42f47d3f44a4495248ef9654ef51e73fd230017dccdfc57f7ce2e1ed02bfadce2410e47e9ed6f64d7dcf8c88923d1a2690ef2dde891ee62b598e680ef
-EBUILD pytest-runner-4.2.ebuild 1060 BLAKE2B 859c06ccfaf394ab741564b5b1d52e9c011484029825620dabbd0654bda422c0e5f8eeab0b04c2e3bfd398a85933c5397deb4ae8a219268f5105fa83718f7af4 SHA512 564981f719949e9d6ce1c2966bdf9a92c7cb83d0e4cfed8d3c0632ec51178cf7733a542c643c2cfd467e2cd248124ad3ddcf45ae1acd5c9724e4790e8b146224
+EBUILD pytest-runner-4.2.ebuild 1053 BLAKE2B 23ddff0ba9c17ef75544b305bdef3dbd6939b27b3c698a0276e8c371597b76c4f5238b0b96669f2cff91f1ec817f9e56a1e110e52eef06167f6878ca8f808554 SHA512 699123d3d4feaa302d8c16a2791fb53cf35596d9d31643284a43590e880e624f1b86eece260f24abf3202ccc37a9e3773bdf39dca0850e6a63aff9d804668bcb
 EBUILD pytest-runner-5.2.ebuild 935 BLAKE2B 38b2dd7aa56f712e8d99809a8d6bfb44f1c7fce0b531fe1fea3cb8f0fc588a9a05e45d72d1b146b9817271abf574975e1650f8e902a392cdb674f8d259f2ca44 SHA512 c180ed5d52928def4942787a5387e7af78c0fcf7b06b359b7359f64bcda41754903d9b83827fdc033a4b8c1af801d2721acb559d604e469c28696727488446d7
 MISC metadata.xml 611 BLAKE2B 51a4f30d72bd0b3cf396da6272eb95a2d99fb46387619110afe35eb4a3dbfb9871bbe1ec3c657a8265e77d24aadd34db780099000e4e5bde92a9d2bfac554b8b SHA512 b434e0768011ddd2e6d94bc439a4b487ccbca4c50956b81d8c45cc6aca574d46dfb1c6f9c92dab24160104513ff1e16dcf9c78366bb39465196b7ec8b75f0855
diff --git a/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild b/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild
deleted file mode 100644
index 746367bac74c..000000000000
--- a/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/pytest-runner"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? (
-	   dev-python/rst-linker[${PYTHON_USEDEP}]
-	   dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? ( ${RDEPEND} )
-"
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py pytest
-}
diff --git a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
deleted file mode 100644
index 476f6b3fba46..000000000000
--- a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/pytest-runner"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-SLOT="0"
-IUSE="doc"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	"
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-
-# Test not included
-RESTRICT="test"
-
-python_compile_all() {
-	# The build by rst2html.py makes non fatal errors building index.rst
-	if use doc; then
-		rst2html.py docs/history.rst > docs/history.html
-		rst2html.py docs/index.rst > docs/index.html
-	fi
-}
-
-python_test() {
-	esetup.py pytest
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-runner/pytest-runner-4.0.ebuild b/dev-python/pytest-runner/pytest-runner-4.0.ebuild
deleted file mode 100644
index edf96aa5c9eb..000000000000
--- a/dev-python/pytest-runner/pytest-runner-4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/pytest-runner"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? ( ${RDEPEND} )
-"
-
-# Tests require network access to download packages
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py pytest || die
-}
diff --git a/dev-python/pytest-runner/pytest-runner-4.2.ebuild b/dev-python/pytest-runner/pytest-runner-4.2.ebuild
index e022fceeda9c..30aaa4ebf5f7 100644
--- a/dev-python/pytest-runner/pytest-runner-4.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index 4512511daef7..5bf192c6fb32 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-salt-2019.2.1.post1.tar.gz 63824 BLAKE2B 684e1dee6df8f7459bfa1747ea017973d72bc69b87d22c65509ecada47469a94ce410034004a5df1396d5ed05557ddec90e34cb18792235babb5e0cf6d72d776 SHA512 7b9939c3bd1cbcb6d6d0b086c39e02deadd8b3c6fcc359924af7fa5afc2e443b927269b82aa5575413e4e6bbc052f4035fb17ab68dac59ea309320c0a647d36d
-EBUILD pytest-salt-2019.2.1_p1.ebuild 592 BLAKE2B 5a8fad4cc0b4011a1f595de8c773a6aaa4781e04bdbb0083f6692e2865369d4c68afb311569affcd55cc1f93cf476980f428cadf8b6071e20d5b8258f9a3ec35 SHA512 bd7c15e268d2cc7ea50a85a40b619f468a5f680fc03a57a682e22f0c61604a54c7a646f090027db4487d9ecb30bf1df56a35703487f823ff639a326c69cb0684
+EBUILD pytest-salt-2019.2.1_p1.ebuild 588 BLAKE2B dd4d02cf8feb003fe379263f2bf27e26dc7b72cbdd3de10a05dcbcde706ded3ef92c30f1a758ef66f890f88c3f83c9143e55655dd611a9fb5cad044c32414551 SHA512 42279b7c410f65b68cf489b8cdc4476bb9dba559cc41ff2a94f0f70fdb721cba2625784eca9450f3891ee813bbcb7c5148197ab31a36a5e7b041b730763f0a16
 MISC metadata.xml 328 BLAKE2B fab884918d24353a3281a69d6ce042faa916c0fa3b8e33d6acac90e85b487f31d97388d64ab59257b0e9cb1aaa8891c7934f87e4b5a2f36a5f0cb621e937f264 SHA512 7cbdc338820fd09b283ef5686c59a1a7138a3b1e0b315daa0d6e4e4e0cf1f87b1802128ab03939ce24fa1b97954de7fd34096f9d734bf20e1ee8e99276e95941
diff --git a/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild b/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
index 9b2fd5530cb6..476bd492befe 100644
--- a/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
+++ b/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 MY_PV="${PV/_p/.post}"
 inherit distutils-r1
 
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 4f1855f69589..583b40c31ae5 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,5 +1,5 @@
 AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538d1fb177735af3acb2ba2d7fed9c0a2ef006841ca0c4221fc51c0472a0a94c49bbcb72877c67b5c7630333f550e3fda1b5aa91 SHA512 7b5d4d5adb722936bd3593ed4e12fa2ca9bc3aa764565d9cbbea2d70424d9811d5838e97bbbe8fafa2f73acb8bdfa6c705e8c4aec12b5b6556b1e4c8db629ea9
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
 DIST pytest-services-2.0.1.tar.gz 20386 BLAKE2B 5ec94fdd0fbc5990216fcbae112973fa8b41902a6fa666dd4c5dee2422f76e128ce3a576ec93ecb86bddff5f6bca0e1afaf791583bd275b2543d0e780e45014b SHA512 445cd5346f0c19b68014eb3c27b06376ae6699e31d8c1fee0cb3cda6e927d0ecadbffe3b0b832dd38fe63bc1fe4e3108e2ecbcabf0641af0bdbff019681f0576
-EBUILD pytest-services-2.0.1.ebuild 1180 BLAKE2B 5829467f8c39f5108bcf79eefa013c3e6289808d17f1f95e8432e7009f9de6615b80659d37f41241e49787dfe082f943ec5c1d98e983db337871f49af54f0e2e SHA512 08d8f0e34710b6262eaa0867cfe2a9d9298737e214709a24423446a6d6b4102c0d145010dc53ff0a42cf4b35716e6c74e9555d17204b83fa01a44ebc94750a0b
+EBUILD pytest-services-2.0.1.ebuild 1174 BLAKE2B 7484ff7004563828f666cdf0c7f8535f8fac9b9c6e297e53e6c2c8a6d9e79e7ca1a677f108b4cebf11998806f49ec34ddc29d532560ca32eaed0163236d3bec3 SHA512 743c3e1f720043fc8bf014ba8683ad6799bef3816b030bf5b0a23ee10d388a65fca403fd15d82e090be5c42881e8fb2e176b99b5194025ffa8062e8dfbdba917
 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 a6c14c4348ab..bd37744da836 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=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Collection of fixtures and utility functions to run service processes for pytest"
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 58d8a4afd690..5ad2346d7e8d 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,9 +1,5 @@
 DIST pytest-shutil-1.2.11.tar.gz 18310 BLAKE2B a85f50a8a0e98de6dd71af0b27f76181b1ff80b518877155122998c3f8992c2749ebcc837d630dc19d60d988410eba8dc77b1be7faff7cf27003ebbba9194bcc SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8
-DIST pytest-shutil-1.2.4.tar.gz 16327 BLAKE2B eb5bb96c78be5b91de29f6c30634cb56a69e30b5ebee9b43a0e970691a7094dfefb83ea741650e0732ff60b9d08cc8ad94d80bb95f1222ba8670402c1fb1d5ab SHA512 9ec6baa3cf53bb80103b1dfbf6c26794090c26dd74b29cd19e76b1037c6939538c7b05ea16368a76cce6969216c291e27b00833a990268239bfd2222f69ddfb4
-DIST pytest-shutil-1.2.8.tar.gz 17051 BLAKE2B 9006ccd51bce6e5035ed93a330e460666bd0782fe56ef400f66de174914aa89b49d6684d1a3a2d2d69b308c4d8466db83eb0865ad20649106dac735b9d1e6772 SHA512 de73b2c350709e356810f58d2a8a4c7668144701639c45a0690081e707e7147762f650af2e9f826429d0488655dae0e3366611da5e8e3ecd0c6382e215170b2d
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
-EBUILD pytest-shutil-1.2.11.ebuild 1046 BLAKE2B 32686340418a8ea74975a9416516e1bc23438e299d61b5a137307a295d933d7ee9febd4cede33b135810f5378fab14f43be6d9332f759f275f503930e82d9e76 SHA512 a173daa7c6bc1cdf5a700d140582c50612ec70cd065fc53565f3764ce35f7379594f9694a340315eb2c8d1bbe039dccded25bfb59c77fbd9b1b9f5d9e6028efb
-EBUILD pytest-shutil-1.2.4.ebuild 889 BLAKE2B e81cc0cc82105af67a76cadb84e9d0a7e792994a44fa67e14b42e22e2d9832a2b6bb630350a9186beaa0ff8f21cd2bd40558a505a5ef347bf8099a2316f70aab SHA512 9db91ec18e66d32653010d2431e7ed4cfdb5b6001f79d81efe72602a9dcc32f3da8021ab89fd350e7ad4abcb8a7a485ea8f4b910e13cb3a69760f54d7de0e1f3
-EBUILD pytest-shutil-1.2.8.ebuild 890 BLAKE2B c19f1eb46c619673bdb33cc9b5523b798aa663eb279c8a824a986bc1a2c33f3df395d2def8fc2938c657ffa09b8cb1cc93d5f420b37fa05a4f10bcd6cb716d21 SHA512 cf2b5118f58838a1e7b546c7e629e90d3c1b9f36f009084c53fceee6c5ebce8124e8e600effe24fd85e4cec9400d5c6450bdb990e751c6668e99e46427d1af5a
-EBUILD pytest-shutil-1.7.0.ebuild 1223 BLAKE2B 44d35e321a4e96318627f0ac4b40dcb745a9301c67cc52e502adaf5c180872c8bb1b7fb09bc179880a5b6de09c17b532733cdfdbc75a2b06aac4ec4d1a3955d8 SHA512 b9f63f2b6c2f7de3bde519645e10490355b99ffa547e31d4e9c1ab173723de93169b8d4f636978f60761453ac8c780760857bdce23a15dc8196be37ae2fd765c
+EBUILD pytest-shutil-1.2.11.ebuild 1041 BLAKE2B 6f3b9c87573bfee8b9ef034761934797d9c239620e7eed9971855ef74972ec2c7ed2540f5c979101aac726a1971180874fc41e18fef6efa791afc18cfebb1376 SHA512 9e86d7b2a7a92cc6973f8aa18b550b70692bd258ff91e73a4e50565010c68668b8824b9fc3bd47afa9208e0d40e30cee5fc6bbcf94a45065b5979a97bf2f0baf
+EBUILD pytest-shutil-1.7.0.ebuild 1254 BLAKE2B 9a9ff6423a1d47aec927834e8eca7b025a5b60f0f1f3819e0aacbf5b83324d8de4e346d6d71882a8b1fbac309527c28a6bc58cc7ccde7abbd790de28767f047d SHA512 50af92f26344d099308fe00e4d7071f6adba58b4c35792fe72d8fce44bf33aeb9bbefb2bfecb64ddcbf8dd808658af1b6e6f1db33e7c21af51c21c27cd5a97b9
 MISC metadata.xml 632 BLAKE2B 120a7ca9aa183bf3d832638c09a1e83573af0a2b6313e1bbfc612d4dc82124574bef607ce2e3801bd6ee25196708e65902245838a5230d6e530fa7dd57c15664 SHA512 104cc71900f15c4983e3f3683b7dcc02670026908817064ca4611706bca03504e1e321e62d64bb47fe32d949792b1ed1bd586b3a03431433200e05c554eef770
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 10ae8992e31c..2a57a34b426f 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
deleted file mode 100644
index f7965032f9f1..000000000000
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-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/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/contextlib2[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
deleted file mode 100644
index 63b0189b886a..000000000000
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-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/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/contextlib2[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
index d7a72037c4a9..85cde7b4aeb1 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} 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"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~mips ~s390 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
@@ -29,8 +32,6 @@ BDEPEND="
 	${RDEPEND}
 "
 
-RESTRICT="!test? ( test )"
-
 python_prepare_all() {
 	# keeps trying to install this in tests
 	sed -i 's:path.py::' setup.py || die
diff --git a/dev-python/pytest-subtesthack/Manifest b/dev-python/pytest-subtesthack/Manifest
index 96aeb7d0c2a3..5d1c501510d2 100644
--- a/dev-python/pytest-subtesthack/Manifest
+++ b/dev-python/pytest-subtesthack/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-subtesthack-0.1.1.tar.gz 2410 BLAKE2B 3d41950ad46bb07da145db7f88eba7eb34a2bbb99273f47d2443cae5ab0e11737f1c2fe81bf473180178b2ad9e55b252c7717846f1b010cc58fb1bf61380d003 SHA512 0bf6425b535e65dc7f06f74493d10fbb6451e78a817174638661d7525f39f092f67db8da010228cbd54b400485e71e443118f91ebef660b9c00d2b354062a55f
-EBUILD pytest-subtesthack-0.1.1.ebuild 833 BLAKE2B 7ce9a0d3eecbb7306913566b6175ec13e91fc8a05b220227d785a7e431a6df5009f93d3862b43b8661146b5d7b076acb4650aa536d54f83e715df1a244649d9d SHA512 b9eaa4298a8190c5ff44013738d0ac19d96b5c5c8dd701b5f8691f9e3deba5ee070f2cb5ed587f9ff2c0a0ea3a17dba565825a7137a31833a7e59e3161e03190
+EBUILD pytest-subtesthack-0.1.1.ebuild 834 BLAKE2B 6dcd85c40ed1de2d0c3292f3ec9fd521ca56800a2f99d38494664355df3485a31e4e65614eae3758c39c7eaea7b5c6f19c0c361eef6349d5e52fd6ffe25a632a SHA512 f6d1a4cfbb550e3f271ffa7270ceff08389c8c90d3fd6389f0cfedf9ebc090916c469e915a3477f7887a25ced06a0c6a1ba6ea1852c731ebf7682a07d8e378c9
 MISC metadata.xml 321 BLAKE2B c9b07273af601a4874a8e2790c84350cbd5ca4218c4604de564b8a714a946106ef74ee744bafff29f160a4ab3bb6abd35c49a66cff74c83698a0a6f57b843bd7 SHA512 f1c6901c39e0eaaf79917b0699ae5d7dc9a94b15ed2db4ff08f0e3f2bfdaa567e3848474934bb4d8aafe56198536a4ff8f5a6b4379c2238ee20e4a718bfd9a58
diff --git a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild
index 90aae11c1a84..da9c8709b4a0 100644
--- a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild
+++ b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A hack for test fixtures, needed for hypothesis inside py.test"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/untitaker/pytest-subtesthack/archive/${PV}.tar.gz ->
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-testmon/Manifest b/dev-python/pytest-testmon/Manifest
index 544d23a71bd5..2197c7a06f26 100644
--- a/dev-python/pytest-testmon/Manifest
+++ b/dev-python/pytest-testmon/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-testmon-0.9.15.tar.gz 32468 BLAKE2B 72678f4a5ed9bbc1ee6a4ec611da105554856454dcd3a3f199084645977d7ce461697218c460f9ae3b5a56bd90843822e5e88c54fb43f55a12f2c31d4ea53658 SHA512 fb414c492188f59e34a5f940e9f378cc841dd9de311738a0238980318261f51b869c30e1218e3219dabf8c438f28bcb9b10f751c07240b533ead537f4b6d8d4e
-EBUILD pytest-testmon-0.9.15.ebuild 669 BLAKE2B a2c2b75f8edb5c407c0cd371df939842f3a9b82aec02a8f70fef51675437ef74f07b7dda228a35fd1018e1edc2cc7db68e6b8a42d4372cee7b0a3b921ba2529c SHA512 9d5528a4ede56d62d6735f735862cd097f2f6fe7464075202fb808a5c66349dc466373753ab88f8d542a12eaa016d47316b9633e6221faa0ec0c29795704dcae
+EBUILD pytest-testmon-0.9.15.ebuild 659 BLAKE2B ef50cf0fbc5543e2f71771fb17341be2bd599a266ad97dd26c17a8abab228ba51ec17489c225797a5ef70efeb44ca42cc54684ba429c12c93d75687664625240 SHA512 3bb55478643257b10abe3f643817ce1063279a27e1380ce031de273ab1b60abfedc9054a8995fdced0eba08a4cce3a493b7133aaed53cbb17ec9325660185cc7
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/pytest-testmon/pytest-testmon-0.9.15.ebuild b/dev-python/pytest-testmon/pytest-testmon-0.9.15.ebuild
index 9b55f300ceea..d216bc613b0f 100644
--- a/dev-python/pytest-testmon/pytest-testmon-0.9.15.ebuild
+++ b/dev-python/pytest-testmon/pytest-testmon-0.9.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="take TDD to a new level with py.test and testmon"
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index f39249ae2855..2e04ab5c8f22 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -2,7 +2,7 @@ AUX pytest-timeout-1.3.3-tests.patch 1113 BLAKE2B 88e8158169bb254b4c36c6eb3a32a4
 DIST pytest-timeout-1.2.0.tar.gz 13258 BLAKE2B 71c137fb0440c15cc8285b4bef51405a6b53deb850c109d1a892159e8758c712e9d1bae8f400adadf1b85cf399c0b87bd2cab51d959b4eb68023052f6c42788c SHA512 b86548843e9ff8c8f7d1c39735025cdfa98befe2860e2a8a5d422d08bd7f542032384f147125a2a2841268154cc3a3874ef0aa4765d454fd5390edb773b106ae
 DIST pytest-timeout-1.2.1.tar.gz 11498 BLAKE2B 65b50ed52409ed0031c7c9b07ef5b96c088cdf98c0155c1a6405e701fbddc2da1070a9f5a63e22428bd2d18e0ad4eec4050239f7d786fa854256c86eb6be0b1b SHA512 749a0dad83b82e93a97a8590900f2285679ec368612fdcfe3f5f7a5b64774ac85196dc31df111c6a99efda92dc03f751f17ec20862bed1f6aea7d7e4140a06bb
 DIST pytest-timeout-1.3.3.tar.gz 11627 BLAKE2B e20348cc461ad03e95c22a16e753b72441ee70da9769214f4d07db15818a8997339ced47244b15de62a61107eb749dff8d6f41ddb4720c925ef1e6eb9962db27 SHA512 633f5aee550d568e403b958f4490ecb828eb322811c9f18cfefb26613be4fc36da14232ecbef8666fcf2dc693a93674c00a853ab546ea8328a07ea34da79fb84
-EBUILD pytest-timeout-1.2.0.ebuild 549 BLAKE2B 9a64aa765063feb8a3f8d1f26cc34c146e4cc7ecb2e610d7b1f4eddc477d6db2d846eaf548ed6643e30d18cc9a2ba3bf7f6f78a2d6962639024a45939c27e0a7 SHA512 bb7bbc6944140406e64d514bc9ce1ac53f2d41a8c1d03369a7952a20ded3d17f241739a9457a87a6ed2498bc0ebacb07a5bd206d732e70704fc3a79c25569d31
-EBUILD pytest-timeout-1.2.1.ebuild 562 BLAKE2B ff1e18723c15b162c52123d7ee97fe61a9353bbdb77625b4fde56840e84ad746b942caa4391be0e35579653b012cd812cccfb727b8f50ffbb527b3c3b49344a5 SHA512 27399963f96a9fe8c0fe2bd81f19d101f8e5d6dd37780b4ec571222a81d93cc75ed46a92c2b3b8411802c65f2481920ab357b4fd575304ca4d8c141a3aac5307
-EBUILD pytest-timeout-1.3.3.ebuild 692 BLAKE2B 1e8a9d5c1f1fde28458b5ac497c274941511f20f7b6e24f8b0a3f4d7b3c4804e9c2ccfb950ebbe8367655668305728ed6645c895c6ff111bfd5dee3ac020ace8 SHA512 37deda05a25af5fb0426b171e823df1782be407d6ddea73b0d329bd6510dd87a76166da70f69fd122b37a7f1214a80e36eea8ae8dd9b595e96f1c1dfb0df4e39
+EBUILD pytest-timeout-1.2.0.ebuild 540 BLAKE2B c9271d3855ee6b87dffdc6acfdfd3ba5113b4e951149457b0626eda6538ffbf9068f9bd568442ddfa2b8651db7715ad8c14e9092538faee071c38220467cc665 SHA512 f8fd110f226e3beec669c3f7369e7cbb1029c7e77484ba33229187f0a60ecc566941d1a6a878b7d590be9996367db17c1770fbc6618bf5d67b09bf15a93e77d4
+EBUILD pytest-timeout-1.2.1.ebuild 555 BLAKE2B 39309d15a78bf9941db052ca743e5d7c722ffe3a5f2c71942d7f4214a094906eb091c14d69c2c0bce71db9365ca381bbe22b7933405c9e94717735b3bce6a4be SHA512 37594de2fbb33e6e9d0c87bbb75d3d7945df57c2ba4bfa0b248abd55620b12cbcf77b00a3fbb301f67b4a3d777bfdf25b914e9556202f900d23497582fe63ccd
+EBUILD pytest-timeout-1.3.3.ebuild 687 BLAKE2B 4c4474f3a0064d1a3f9416d80ada790e2f3e426e6d1e091797096af583f3d9e183b9c7db6378a55ef7f94343ef088d9c6e3db5d5b7bc7f9e8a543db79ec905a5 SHA512 f1a83fbc47a68cdea78f8be5f5c97a2a2376a9181bffdfb66b50dae445a935b72a84aefb53228c87e6530078fcd40e39767347091221ff4f260f5000077342e8
 MISC metadata.xml 327 BLAKE2B 23dc2e5e6f023223ab4774206b2d94fd27fc0a6b2592c8e0c317e1c1a0e7c26ed4f8e23187c5499b7fc9c4acc0df601a056ab1dced8115a47a9e72697037fa32 SHA512 6040289d134f65896f2fb80538d9caa4ce628911c5ed21568a30087d1b0ffb14b9acbf874956720b1d9c56290c78bb965ac9299bc400fd89a258f3627180780a
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
index 4364e61c1955..c1cb596f5d7e 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
index cd26fa3585d9..f983aa28e6ac 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
index 6f64383c9728..dce3187117db 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index 4c6e55014dc1..978d60b93cfc 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
 DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
-EBUILD pytest-virtualenv-1.2.11.ebuild 898 BLAKE2B c1d5316d72cf62cd2909f04567d3722e1c837d8aef762f90e1ddf8c660d8a564ef6d3f0eee78309c6f15e67e97b89df3c7c766c7497401f9c5d6749569d09e5f SHA512 100d88318f23b255726d8b99c91924faa77fb998f31a7ce9dab8f6b09f5d9493b9e4ff70f8338c1234606ae4e782c024c01aaed0ed6a18c53926b22310872fe0
-EBUILD pytest-virtualenv-1.7.0.ebuild 862 BLAKE2B 3e2ebd520f505f1aac08cee2bbc56208324069c472549ea69d5e0cca5af1e76854786fb5ea21161aa2430605030e69f91fd6c9ee7e9b182730d5f6af10427f13 SHA512 ef3bdfad282eda504b91f91b9024cf4f8c8cc2901abf376a7aa5734559687ec53dd8f40c18cbdea35964b9fd1fa70e327ed62c89d701b0777d9358f2b0092e17
+EBUILD pytest-virtualenv-1.2.11.ebuild 893 BLAKE2B 31c0b4adaa7bf9b529b57d9219f6f924f761bb196d3545aa1a6c6244f957200ff9657fa65c2ded24f662124a0a3cc0ef9ed54acf3c22beadfeb5780fe7006129 SHA512 8db3170852d84f78e543686bcf23ecf2811f67f010b1490be3cfd5eb8819cb377b928271a0c8899c014bd4b13167962cecf62a4aad01018a88b7b48e99b6eee2
+EBUILD pytest-virtualenv-1.7.0.ebuild 762 BLAKE2B 4ae7ac09ca02b56edbc7484578583f6b3f6e8fc6d3f66018757d23a07a9a7cbe22f4e659472338091ab5e2820b4f77ca856232b2e68381973db50c0eb5cecfdc SHA512 03a182a37de21bad121233f1d77a0c2ce0eb4a3a0bb8d083ee6ab24fcef99ac4041077b573ff3ec5a2e6eaa8a02bf67ad099f6deef23d6ca506d82eb98b0867c
 MISC metadata.xml 606 BLAKE2B d6e2018080e6c9a166106a28ce2eb806b647fb0f5755b9dfacba36475968c3cb5131fb553e76c910b2e480b036ce22e246d78dde1c811ed6e65811e36f635057 SHA512 e390b6d7cacf40a1942892b5541c217fe33709ac80d49def174bf5763719a4990147a7fc31d331df79953359055d5b4e38903735d66bfdad403bd13838fc5f39
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
index 6b52cfbc679a..a254031e2c1a 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
index 0f53a35b999e..546988eff4e3 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
@@ -1,34 +1,31 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-virtualenv/"
+HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-virtualenv/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~mips ~s390 ~sparc ~x86"
-IUSE="test"
 
 RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
 	dev-python/pytest-shutil[${PYTHON_USEDEP}]
 	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/virtualenv[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
-RESTRICT="!test? ( test )"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 86db5052df72..f1cc119d5324 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -2,7 +2,9 @@ AUX pytest-xdist-1.28.0-strip-setuptools-scm.patch 926 BLAKE2B 1943edbd4511b40b1
 DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
 DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
 DIST pytest-xdist-1.30.0.tar.gz 62286 BLAKE2B 8d6a79c123bcee81751f2dd3a87e1d8effc82ff48a701c8cf0014292e5df575136d25847794c8e9fc94eb88a37cb42c659a142212faf30b0d1a0b1f9f948d2d6 SHA512 978b67df2366d916db62af21f2c610ac5d2de43cecf3260ec9bf52f904098514c3052ce8ca2195c17addd4012f3c5d38ce8a701d26c8158142a821b0d0cf9122
-EBUILD pytest-xdist-1.23.2.ebuild 1045 BLAKE2B c17f7c95cf3d093a2202bb3a4889786696587a3bd2a438c12b16d258b3712418fef0fed8d0d4bd701e6fe1d5808ad181daa2c37eaab747a7062a6a0b98b8bd77 SHA512 380f7e9b68003227e6b0c95f84e46a658079d3bfb8f0d57b949dd8823181b899b4e3517b8800488a8357b0e5822e83d6af15c7a836f83befe1a610c88dac5174
-EBUILD pytest-xdist-1.28.0.ebuild 991 BLAKE2B ae57f8fe0aab56b88fa51ef895b889a2b7aae97c5773bc23b97270073c27ce9ecb2b618674ac70972f1b2baac8746149d936644427d76f840e2a65de59edaa03 SHA512 dfe74686d390028f0ac5a4909d14c283f8651460ccdd6d194a6b1017be3465285a42c79d86894e674d465f29f639f8c9e437fed35895441d3aaf9af4405dcab1
-EBUILD pytest-xdist-1.30.0.ebuild 971 BLAKE2B 7341a46c11c96c7a9807d11d0918c2f401f971de8ee64130be20fd52afc61a8aee2bcaa0e64104811d77363f095b080f1f0e0a8fbf6e2a2066fd60c7e5d8ccda SHA512 e50d7e8b69c2da45604f920cdd459fd78be5987b67406674ceae060c71f3f64fbb0d90a9c7eabbdffe5edef382e338dd154585e5b72a6394f413fff25c853b28
+DIST pytest-xdist-1.31.0.tar.gz 66133 BLAKE2B 79fe5f3bcad3421c1c751ffe6e09f0da42d4ff7c0016cb421ffabcab167028ec41ccfb02bbb275564cd74b13ade8d6e79bbb70b34995f3bc9000604a1533df9a SHA512 b7960d20295232b251c8ddcc5a3b9d6e7b761d577ba11c2647b4b4b410ee5c05998cf57fa57208561eb3ea7c4914db1fd446173794589d8c8e8e79ff8e0ad3aa
+EBUILD pytest-xdist-1.23.2.ebuild 1040 BLAKE2B d7b2c373a68f81507f411aa3f458658d5c63f38a39d01a6dde018857f7ee9c0abd0d601607d5fcda7bdc4d8ab9ad5d2873fd7c32bf94972cfe49b1fa04cac9a1 SHA512 11abbbf41401e53024d34be92c63f21797ff59762aa76b305c6c38ab22d8df8a0d910ace8d278146130591d98738ec233eefebd05383002fdf1c0ef9a4f522db
+EBUILD pytest-xdist-1.28.0.ebuild 986 BLAKE2B d86f45dbed162f88fd5b5e48ca031e922a95fa49a0d87b8eefc8686267a8dfa884bf202e0caa4c9d23dede106c0af69b05fcb119f8ee1feaa43ad6326308be79 SHA512 6d6f25f9cafe11725bd4403bf4fc5188860e29c0b70d05896b1198d93750e71cafdb9726eb046ff31fcb1aab84621e5dfec0c69e37e278bb2960abb09e6931de
+EBUILD pytest-xdist-1.30.0.ebuild 966 BLAKE2B 16872e25ce64a383b3f5c48297a10373f0b3e3e47c21ba22b3d024dae816711da4b1dc670f1d49ad9423ed459d0e254581f3db16a5a3e9ce712b8897e30c5b8e SHA512 578228d144d5a47fc64d68833a5997f35d06c707ebedd6e175ebd3842dcf4c0453e9c6b05deee68e724d80dbf298f9f9672abcd3d9d2cb025be001682c20b804
+EBUILD pytest-xdist-1.31.0.ebuild 966 BLAKE2B 16872e25ce64a383b3f5c48297a10373f0b3e3e47c21ba22b3d024dae816711da4b1dc670f1d49ad9423ed459d0e254581f3db16a5a3e9ce712b8897e30c5b8e SHA512 578228d144d5a47fc64d68833a5997f35d06c707ebedd6e175ebd3842dcf4c0453e9c6b05deee68e724d80dbf298f9f9672abcd3d9d2cb025be001682c20b804
 MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
index be50bc941c8d..ce4fbdd49ed1 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
index ded39d9392d0..ba912e6742bb 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.30.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.30.0.ebuild
index 75de4e5bfc87..b414d28e8faf 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.30.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.30.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
new file mode 100644
index 000000000000..b414d28e8faf
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 1b6a2a1085cb..88afa721e96a 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,6 +1,6 @@
 AUX pytest-xprocess-0.12.1-pytest-28.patch 1245 BLAKE2B 9d4e8aeead5690a3461f4377a2215ade77929d55aa3f8e842da05fcd0269f94f306d527acc93d56573e4c081bf0a380027e37223e4bd71e3a45b6763fd8d71a6 SHA512 4b114f676ff83ad019402ba7c84f2559e267c45b8aadbcd647f99b962d484ca176f59db6e98db297583f37f9560c5cdf54af9e4bd7ddf36225ce126bcecea134
 DIST pytest-xprocess-0.12.1.tar.gz 12078 BLAKE2B 30c3c2b41e79b79c5a18911c325ff273b80c45f29d269b96c4085c0c78a6897b2064eb1d2e83f9c061c4663d2f52d88230d9e87ea2ba4d114c6e04f42aa50a5e SHA512 fda868a12a056070afd5838c4bc466b4906a7138f685d4a0e6e0adbd975e5a1a2b9b37b8de36a45fb700e02ca14ae219cfe29c467f8d03e55d2a375a7efc9927
-EBUILD pytest-xprocess-0.12.1-r1.ebuild 844 BLAKE2B 7bb3de0638243becd5f170e67b9b3b5dbbf36889608a2b543bed3e8ae0f7bf49e5620343156b77aa1e332d9fcf6fa3040f72e3190443d2039d7edc90e7bf54c5 SHA512 e5838c61499982330c6e31a7acb5737fcdf1534cc0e570ce83cbf56846f8f1a91f6f9da57baaef9e6d06f842631c173b03974de0ddd863081a52f44a123c2ff4
-EBUILD pytest-xprocess-0.12.1-r2.ebuild 845 BLAKE2B f6bc84676c37e1ef36b96b84a7ac5f36d4158096ab889db0f6c54d037298f50aa2dc44e3c13e57e8aa701ad4401b607c80613d0d9b9a14756af933230db81a6e SHA512 7eeccee4103ee0bb0cd8e975d47e808442be9c45d5b15113fb4d5a2004fa80501852e5ffc77bacd73014bd337f87dfd0f7dc04ed1f620327f047c4e6681086c2
-EBUILD pytest-xprocess-0.12.1.ebuild 869 BLAKE2B 7fbe9ac9597d3ad6298d6ce7916616dc00925c797ba3a4294e869802e8ffa9cd25bd1e75f701cde4f3dd9cedb8bf1fda456ebffa74575528fcfe2203fe4224ac SHA512 59bd24cdf9f2f6fd3ab9d42ec1676312aedfc3d7eecae9db8401959bdecad190cf61ed5bf77ed65d64680351c1848881f8c41eb7e97bcd6ad48dd1973544f058
+EBUILD pytest-xprocess-0.12.1-r1.ebuild 837 BLAKE2B 54ad1fe3a4864f42e906728d0c017b692d9d9d737d24c515d852252fb48f8fc7e5368f35e14aae64429097b8d887f4716e06b6a3c76f7e07bd9c0a58a9da4c4d SHA512 c180a661f56a9afbfa7af04ba8837b05ad11706b482caa949f023f569c2d54109c6ac8af8d46438da096b5f76b1a2fcaccf2ea5bf18b95fadf9cdf92a33e2f4b
+EBUILD pytest-xprocess-0.12.1-r2.ebuild 840 BLAKE2B b14de3a86d2a68449b5eb7a35267d2af4cc8c0fd9e9344a26b369c75b7556b705e686afda0f4dda84b6a44f57b423b0ac515850bc715fcf9fa28dceddd15f20e SHA512 4cc2dc8d376f1ced0e7508acbba46fa64afc32aa18492e83c3b626b9d8d82fa7ee7b80113b038258e8067ad6d27bb18e3d45bbd26de0f2eb96c8914be5ee0491
+EBUILD pytest-xprocess-0.12.1.ebuild 860 BLAKE2B 6b85ebe03baa1413f5e80982efe69e23f66751b02ee8ed844ae08085598abb13cf8a93463b7399aa0279280db0214cd064f335dca63f1b1c11d619c5342957cb SHA512 ee5f0e1596bde058b1362c31da79a4667eff3219e906c5d2bbf1ff060f0e5ecc253c21d576e06f2fccc19c4f65b6015c324eb71a1ef04f8147e250543e792ed1
 MISC metadata.xml 399 BLAKE2B 04dadaab28761796767c7a588294f6a8ea34cd665a4ca6b26dad8155432e12619f7d7825265df05d1457dc1c09265c1064efaa8280487d8eba60f1629798c648 SHA512 ae6d3628465eac8e46b14f8bb00a46884f07e85dc3246c3f3c1c6a85e178c7eab35511e583d08cb3b036f5ac28c8393dac90cf470ffb371a74cfd883a5978830
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r1.ebuild
index 3e8064813561..ca8f808077c8 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild
index 37eec5e487ce..f953393f04d6 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
index faad3f3e3cac..e8c4207e4ef8 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index ea7ae9e8f099..e436fd54790f 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,14 +1,12 @@
 AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
-DIST pytest-4.6.6.tar.gz 954899 BLAKE2B d3d76ec1fff18d343cc799f1acd0889489f303cdba72747881dfab8656599bc1865f01b5ad2754f0d05bda04aca4d7edf8c2071f2257fdf41506308d1bc0f623 SHA512 c5b6c21c352787eadce06be7529ecb6f6fd5f5eb193ec29e5a4cfff3d7e305f50c6f07aeac15bddce007d88077a35a8f59633111815321792ed3d9fa1011b684
-DIST pytest-4.6.7.tar.gz 955616 BLAKE2B eb2276e715bab176fe4e497a51779d82b7146704749b33ebdc9dc07a0fcad144252553280a7bbbbcf23c6862fb74f1faf75de42ed0f5295ecd287fc10ac287a0 SHA512 d284cef48c0e39c901d23cd63949cc1d8b8cf01c3039fd2bfd99275bf6a45532c955e1176d556a7e2198e6206830e6dc4f4fb22c143ff7e08de6ffbfb6079fd1
-DIST pytest-5.3.0.tar.gz 992537 BLAKE2B 4386d1623bdc168313a75847dfa33413ab1b6a4de9380c67ae866a579dbeb62d8cd18da899bf0476827d6e4a76ddfc5fee7a2fdc652eff0c8848c0bd96045c47 SHA512 285d0b4f6b87b141d6d5dac368dc46eb80dd025d7ed4ad0db937fcc76efc1f8cf251ca9b0786ab1bdadd89c07ad8ddd74f2b3496f97326e9d7fccfd004b98aff
-DIST pytest-5.3.1.tar.gz 994584 BLAKE2B 3831902684d935389b4684af1279a5834edbbe846f8fdb1ce1e64990ab65d6fe8ed3cf5daa446cd20daafe9eedc6f57e01b16d74a55631ab746750a73056640d SHA512 e949a516c064a7050a0ad15356cc0bf25e4840e830f03e1925530c8a2dd9903d7632e55535894474422ba86fd9ed7a397c483d98dad297990b7b49456147189e
-EBUILD pytest-3.10.1.ebuild 2457 BLAKE2B 7da16cfafd27b53e17aba28a0d5126b1dd9881f2d645edd4142934bd5b6c41b1e478d5fd0fea875321c9663e066973f41838abff744dc1765146c327b68cf821 SHA512 5614e616273ba510196fb6e1c2bd64ff4bb2e4d201469aea34502edb643aec98fc0e8e355a9cfd3c8a1922c8763ae775758c77bf15ad1fa9634dec25aa65f298
-EBUILD pytest-4.5.0.ebuild 2104 BLAKE2B a29a19fc2d165cb9d267512ea66e045c251a6efa124c1885245818491139554464bc90b7265b8dd727375a5ceeff7cf7ccb06da698c9833701979e6708873954 SHA512 45ffd24a3f84046df4159b1b148725b44a9bec95affd26a2dc4386ffe69420f3ac5818d7cc435f1781f1147777a5403686380fed126b8e8fcd54db894a8094fe
-EBUILD pytest-4.6.6.ebuild 2287 BLAKE2B 2f83b06ed1a50390c5c98374d3059aeb071986c43cdc5b6f485fb2f3a12635a9c94d02ef706fbec944b5e645f6cf8e95795b7c3aa9dbea95c81fbecca8408ee2 SHA512 a7313c7476ebc5931f76001f9eaf7b532fd726c370e85e1209041543a79ef39d4af29fb637809a903730f99b50386db28ee45e8a8c735f312d3909453897074e
-EBUILD pytest-4.6.7.ebuild 2287 BLAKE2B 2f83b06ed1a50390c5c98374d3059aeb071986c43cdc5b6f485fb2f3a12635a9c94d02ef706fbec944b5e645f6cf8e95795b7c3aa9dbea95c81fbecca8408ee2 SHA512 a7313c7476ebc5931f76001f9eaf7b532fd726c370e85e1209041543a79ef39d4af29fb637809a903730f99b50386db28ee45e8a8c735f312d3909453897074e
-EBUILD pytest-5.3.0.ebuild 1888 BLAKE2B 03cb4634216a6d58295741b3fa6ac76a27386d18209ed89d8cacf0e7dafb840bbc918bf566ac080f4d736a8f277ed9ea026ccb737cae4194f72d6c4714223e64 SHA512 d5ccf8e993730b77d3f343c03b702214a10dbff7b7bcce32d0c7343eb1bc85a403f7007dccf9250888f58c245c277b154c7a5b77e0174a9541c4b38724e47299
-EBUILD pytest-5.3.1.ebuild 1888 BLAKE2B 03cb4634216a6d58295741b3fa6ac76a27386d18209ed89d8cacf0e7dafb840bbc918bf566ac080f4d736a8f277ed9ea026ccb737cae4194f72d6c4714223e64 SHA512 d5ccf8e993730b77d3f343c03b702214a10dbff7b7bcce32d0c7343eb1bc85a403f7007dccf9250888f58c245c277b154c7a5b77e0174a9541c4b38724e47299
+DIST pytest-4.6.8.tar.gz 956062 BLAKE2B f28e3226c7dfe4188168cfdf9623c96d0b274a2476f0d3132c24367e4566abd2e0b496114f229b6f26ae53a67d1ea1f9cb64795f4f9710fc9fe0852991467aef SHA512 b396b200a8a13ec9df8dbc4dd64bb05638b26af9ad6b24cbea3c3de4d806665b63a1488c7359b12c5634d014d45b43c8c208f0e329c62266882a87c492e80b58
+DIST pytest-4.6.9.tar.gz 956816 BLAKE2B 7eaeaa0d47c17836a35d9cdc97663f8ef65253099b21d60a7ffc3655d8bd93c6b4e33045caa6c8ab9bb8b920b93e596ba86d8eac4ab07b3b7a5989b38312f4fc SHA512 ab45a8662aa798a6ae224ad2cd68e043c605e4830c76cb6c6aca3cfccef232c024cbbb6c48c9bae19148099c339abfef3270a2208cc7e5c37a10b34b0aa6ba79
+DIST pytest-5.3.2.tar.gz 995560 BLAKE2B aaea9d89e884a82056eeea3068c70604c73d50c96b8d78c6ee14c67bbe066f0e6d882c1b8f95539a2338d6739e047680d901a9db108b1923fa4d3d03dc3f2115 SHA512 2ab39973848d2d4693edd1dbd7ab2798b574026c9277bddd4a18e57aec65b3d93de201e87f58eb26030183b5c71818e6e56bcc1cda8c50892546cb1c04d6984a
+EBUILD pytest-3.10.1.ebuild 2439 BLAKE2B 87a014393086daafd595ea8e94f1401ed79628b8c5e0a0715944e087592454f15a56eaebc953f1166178acff243701add12e376953999c55327f4681423ad067 SHA512 7e83d437cec4d3f7e0d834595dd1de605ed152e1f90384163eebd1d09a7648d43d872c623b02433bfc743bef8370973444480a97fb19af786806d5cb3c200ed6
+EBUILD pytest-4.5.0.ebuild 2087 BLAKE2B 5885f2b8e0b1d7954c0bf7682cd8ee8dd94d09a3d1b6f151ebb543a0ac17b84b9822d3497f7c89699011f250221ab440b5de73049c80974ef4332550f091dc9d SHA512 b4cea619b2f9ceaeb5b3411aff6d8d802ab831ac7c56fe5f244938043b514af84820fb0589800d971caa8674efb5460a98d0963259e45b4007cc715e813d3bc8
+EBUILD pytest-4.6.8.ebuild 2272 BLAKE2B 82dad69a74cdbcfc4ba788c69c7718608aab9e81eee8b0f35bede097597274ca5ab3280f450d6c71aadf8837fc4d0978e8cca2df83ff372e121acdb78000f8ea SHA512 a4664b2de0c77a2ac0046684cf77646ed6638d6faa07742e3662fb0273b9bee40a25dc50b82089ff97745efb8064c927eae4a7b609ec0107f6293efa7275d365
+EBUILD pytest-4.6.9.ebuild 2272 BLAKE2B 82dad69a74cdbcfc4ba788c69c7718608aab9e81eee8b0f35bede097597274ca5ab3280f450d6c71aadf8837fc4d0978e8cca2df83ff372e121acdb78000f8ea SHA512 a4664b2de0c77a2ac0046684cf77646ed6638d6faa07742e3662fb0273b9bee40a25dc50b82089ff97745efb8064c927eae4a7b609ec0107f6293efa7275d365
+EBUILD pytest-5.3.2.ebuild 1793 BLAKE2B 393b1a8d230062d04091436d55d5819f7f038bbc6eed96935109e7f6a42ce3e964e2b7069694ef48c7340c195af7d7258c554e8ce39b247bd8cdb0eb82266400 SHA512 78c659615a398d6e7a98408f2785f161b9f841f277050e952e96aba0817e82fddf456e1ca4da9d74f4c37d193733d05c0ff11d2f16fcaecbb383a62818239c5e
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index 551cebba719d..622bcb9bb453 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
@@ -27,8 +27,8 @@ RDEPEND="
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 )
 	$(python_gen_cond_dep '<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]' python2_7 )
-	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{5,6,7} pypy{,3} )
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 )
+	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{6,7} pypy{,3} )
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7)
 	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
index b0e9367f6a39..f9bfdba1a65a 100644
--- a/dev-python/pytest/pytest-4.5.0.ebuild
+++ b/dev-python/pytest/pytest-4.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 )
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7)
 	>=dev-python/pluggy-0.11[${PYTHON_USEDEP}]
 	<dev-python/pluggy-1
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/pytest-4.6.6.ebuild b/dev-python/pytest/pytest-4.6.6.ebuild
deleted file mode 100644
index 4f85c1855b6c..000000000000
--- a/dev-python/pytest/pytest-4.6.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \
-		-2 python3_{5,6,7} pypy3)
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2 python3_5)
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake cause a number of tests to fail
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch"
-)
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# In v4.1.1, pytest started being picky about its own verbosity options.
-	# running pytest on itself with -vv made 3 tests fail. This is why we don't
-	# have it below.
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-4.6.7.ebuild b/dev-python/pytest/pytest-4.6.7.ebuild
deleted file mode 100644
index 4f85c1855b6c..000000000000
--- a/dev-python/pytest/pytest-4.6.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \
-		-2 python3_{5,6,7} pypy3)
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2 python3_5)
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake cause a number of tests to fail
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch"
-)
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# In v4.1.1, pytest started being picky about its own verbosity options.
-	# running pytest on itself with -vv made 3 tests fail. This is why we don't
-	# have it below.
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-4.6.8.ebuild b/dev-python/pytest/pytest-4.6.8.ebuild
new file mode 100644
index 000000000000..5267018ca93a
--- /dev/null
+++ b/dev-python/pytest/pytest-4.6.8.ebuild
@@ -0,0 +1,75 @@
+# 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="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \
+		-2 python3_{5,6,7} pypy3)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# flake cause a number of tests to fail
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch"
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# In v4.1.1, pytest started being picky about its own verbosity options.
+	# running pytest on itself with -vv made 3 tests fail. This is why we don't
+	# have it below.
+	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest/pytest-4.6.9.ebuild b/dev-python/pytest/pytest-4.6.9.ebuild
new file mode 100644
index 000000000000..5267018ca93a
--- /dev/null
+++ b/dev-python/pytest/pytest-4.6.9.ebuild
@@ -0,0 +1,75 @@
+# 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="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \
+		-2 python3_{5,6,7} pypy3)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# flake cause a number of tests to fail
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch"
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# In v4.1.1, pytest started being picky about its own verbosity options.
+	# running pytest on itself with -vv made 3 tests fail. This is why we don't
+	# have it below.
+	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest/pytest-5.3.0.ebuild b/dev-python/pytest/pytest-5.3.0.ebuild
deleted file mode 100644
index 9795396ca686..000000000000
--- a/dev-python/pytest/pytest-5.3.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_5 )
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake cause a number of tests to fail
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-40[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
-)
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py -vv --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-5.3.1.ebuild b/dev-python/pytest/pytest-5.3.1.ebuild
deleted file mode 100644
index 9795396ca686..000000000000
--- a/dev-python/pytest/pytest-5.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_5 )
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake cause a number of tests to fail
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-40[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
-)
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py -vv --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-5.3.2.ebuild b/dev-python/pytest/pytest-5.3.2.ebuild
new file mode 100644
index 000000000000..3d6a7a5ab186
--- /dev/null
+++ b/dev-python/pytest/pytest-5.3.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# flake cause a number of tests to fail
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-40[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-afl/Manifest b/dev-python/python-afl/Manifest
index 729b930457c9..cf2c3d836454 100644
--- a/dev-python/python-afl/Manifest
+++ b/dev-python/python-afl/Manifest
@@ -1,5 +1,5 @@
 DIST python-afl-0.6.1.tar.gz 14795 BLAKE2B 7899ffb9ee2d0afa82a4621d7c26acd3f19f4711480f4d85a60007d7739f3dcac99a787bc7dea33d2b336e117320cef69037a20c54771ead695eae1771f2b7cb SHA512 25662ae96db23560ab0f7df1468f1a4737f8f68853bed75cfcfe6112a6fac110501c66941402f35686d6b96a6d124a2aeeaed79052d618583843528cb3eee3aa
 DIST python-afl-0.7.1.tar.gz 16045 BLAKE2B 05d0aba389dcdcc11b6ec789f12f8d282b6d2fa4f1706795832468d92aa1c5e9e1c829ed7e5bfaf77bec011098cf9fe30b67c9ac2ce66c0ad5bd84a6c3037f47 SHA512 e0b8d65378d41d8ba654c8b6f3d03822ac18543cb91fb650f35d490c4b72be6b038d1a13341a33cbdde2102ad92a7e533e5c8ade9a9f13d32c78a774d5e7f120
-EBUILD python-afl-0.6.1.ebuild 678 BLAKE2B f6da4b4e79a4889122f80e099c7efb95e7d1ee6cbcd222667ef4d49f668c3ae9bb755392b74ec225aad9324f465d222db0b0eadf27bd980b90cd47bb43db1f7b SHA512 c9180157cc8c7737eb65673604e77f18022d3a59a79f7420427d27466186d5726c08d9a1e35d1c7353308089be3155b77b59cde035385754b1e35747d6bb95c9
-EBUILD python-afl-0.7.1.ebuild 678 BLAKE2B f6da4b4e79a4889122f80e099c7efb95e7d1ee6cbcd222667ef4d49f668c3ae9bb755392b74ec225aad9324f465d222db0b0eadf27bd980b90cd47bb43db1f7b SHA512 c9180157cc8c7737eb65673604e77f18022d3a59a79f7420427d27466186d5726c08d9a1e35d1c7353308089be3155b77b59cde035385754b1e35747d6bb95c9
+EBUILD python-afl-0.6.1.ebuild 664 BLAKE2B 9293eb0a25ab0d4a723949cc057abcd4d837555279ace3ac3c10f0be9ceb583890be2f04fc74730ca94534c0a3f9f8aa5785c0196ae139d8b200500e3bc9c0e8 SHA512 a86ba010ba2b0690f9bdb9c93fa712630d2e93cdbe4c628359d4decc666cfc643840d36cc419b5c949f66971c114106fcb73a84533654a9a88ec5dabc1f5c314
+EBUILD python-afl-0.7.1.ebuild 664 BLAKE2B 9293eb0a25ab0d4a723949cc057abcd4d837555279ace3ac3c10f0be9ceb583890be2f04fc74730ca94534c0a3f9f8aa5785c0196ae139d8b200500e3bc9c0e8 SHA512 a86ba010ba2b0690f9bdb9c93fa712630d2e93cdbe4c628359d4decc666cfc643840d36cc419b5c949f66971c114106fcb73a84533654a9a88ec5dabc1f5c314
 MISC metadata.xml 369 BLAKE2B 17f8688a27fdbd63196d3a5735208a820b9354672c7c0cf4ad7aa9f9968cd0f82246113b7d0f9903b6e6e3e859e77d1a3fc2d989049fc232357e13e1f0b1a46f SHA512 2d9ed7de83ee4bcb366d1f51b9d821a847da2c17f8b83b486a81f9739fa3e4d9071780e9e22342fcb64f9c1d266d9a9003b6fe743daac68f8aba12f0ff6e59cb
diff --git a/dev-python/python-afl/python-afl-0.6.1.ebuild b/dev-python/python-afl/python-afl-0.6.1.ebuild
index 2298e1450cda..7002cbfda88a 100644
--- a/dev-python/python-afl/python-afl-0.6.1.ebuild
+++ b/dev-python/python-afl/python-afl-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Enables American fuzzy lop fork server and instrumentation for pure-Python code"
diff --git a/dev-python/python-afl/python-afl-0.7.1.ebuild b/dev-python/python-afl/python-afl-0.7.1.ebuild
index 2298e1450cda..7002cbfda88a 100644
--- a/dev-python/python-afl/python-afl-0.7.1.ebuild
+++ b/dev-python/python-afl/python-afl-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Enables American fuzzy lop fork server and instrumentation for pure-Python code"
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index ed4b3ff1502a..a8a61f8f4ac4 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,5 +1,5 @@
 DIST python-augeas-0.5.0.tar.gz 90667 BLAKE2B 5d563350c3f80db45aad87326c445e93e3563ca6eb8de17889cdc91735c61dfcf0fda4e93f15c0d450ee156d57cb71598f32cdce6f6716b0fd610b793f103641 SHA512 d93d9e21c720084ee3c1841a2172dd1a4cfb41e668de0f557bd214efd65e685a1e5fc713a7d34e0fed727fe908bb1e8a09a1c10587bc27f3708cbcdee575cc51
 DIST python-augeas-1.0.3.tar.gz 92747 BLAKE2B 0dda6ae6bbac1689c633301b91877cca4cf20773a3bf83bfd8a809dfc973da011cbeb39ed12f34b67f8f1be50ce5b9fc89e9cc7abbc992117853c11851b18fab SHA512 737b41e7bb438d80da75b55714c3f0b1706a4b2cacddd20fadf855bc3044e532f4079319b3775032e6f6009cf7f282af33fdf583332772b443a6c2d4925639fa
-EBUILD python-augeas-0.5.0.ebuild 510 BLAKE2B d7920da321d279ddaa31495a10f789699dbe77723be2af64b5746d04c055f724ba1b438b688320f097aee61203bdf4d676c12576b1d1376d96266b41930a8eaf SHA512 5aa5fd3c7579ad41d033be22eb4a3772b96d5b3c7a16a4b3819208abb6e96042ffc46ad38f6c2169d57f4e70deda57c42da3dfd5e7861581032986ee05ef507b
-EBUILD python-augeas-1.0.3.ebuild 557 BLAKE2B 6e2915ec3dee1effe92fb56fd9e04b6953037041cf42ae36ecb643a12f88c7fb6199d684030a9a8f6bb0e7947a18d9a0d356cb78a5b31f1f16f0788d1da8c015 SHA512 8eaa3f4781da80b1b9601620fbd7be633cc99dbcaae3fe35ef8376d56ac1f2634609359bd9b701c6cfe63490217491f43261a930ba262602e01d6a96cdd0597b
+EBUILD python-augeas-0.5.0.ebuild 506 BLAKE2B 3e6232c643f5761dbbff2e5fabb91c6aad57a9190cf3901348d31d5fe8bae23f941b3bea83859a218df0430001454ff809abe3ce90f78f8d6692f49cde94f3f1 SHA512 fa1afe2cfbf60d414b6bb87e9e9996ff3edbcb834e926fbdcbc818c785ff0c5f47d1e20d632da1d2f11877590fa52cd9e62c471eebc3cbe05f8aea96e8f243bf
+EBUILD python-augeas-1.0.3.ebuild 553 BLAKE2B b811899bb3a95f66aa867fc389d551ef882bd460c44b8f2badb6ba35b9babd53562739f6c4d71fde1b7757749d6605d0d4b765e537ca0ee20e05c5377e2d3393 SHA512 cf9216f63af63bab351e52e907664d7a28fb4036b5e7c15f1aec36c67c5000f2e9be4d149b32c03c3696e42ee957a670a077a0a80e8679872adec42513d26d6d
 MISC metadata.xml 486 BLAKE2B 8d3580820dd340e0021d4d016032e50741f1e975abeaea318433540848a62f67b24c00cb510da00f5c4e4890a153c899fc479c56b8a0fd535fecd059e9327d29 SHA512 8b95d59d81d418b1cd7ee5d95e445be02db004a3443d8aa6d610e03400d15ff0718a4295e8cb477f1da28b70e32fefd2e26ebe4c2eb75601c907440cfec91102
diff --git a/dev-python/python-augeas/python-augeas-0.5.0.ebuild b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
index 92a0d062d2c4..91a7f39177ec 100644
--- a/dev-python/python-augeas/python-augeas-0.5.0.ebuild
+++ b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-augeas/python-augeas-1.0.3.ebuild b/dev-python/python-augeas/python-augeas-1.0.3.ebuild
index 10b466c7506f..2ea047133647 100644
--- a/dev-python/python-augeas/python-augeas-1.0.3.ebuild
+++ b/dev-python/python-augeas/python-augeas-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-axolotl-curve25519/Manifest b/dev-python/python-axolotl-curve25519/Manifest
index 397fc30fdd7f..5f256574dc0e 100644
--- a/dev-python/python-axolotl-curve25519/Manifest
+++ b/dev-python/python-axolotl-curve25519/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-curve25519-0.4.1-2.tar.gz 100957 BLAKE2B cda4fb7ad7c78df7465a952e2b5f3c6616849876bc1c8b72dde08042a655c2b86233329d311f6bee1bfc6d2b32926968aafc7e6204320209c2c1bd008f1aa361 SHA512 cbc7c6caa47a9a811640c247a1be727d7b1b68bcdb4c5336e02b4d1eaf9fd2c57b7438b0da466a379a1c0f3f146756b9b7eea3c9b7945ce88478d4bf0b8a1e0d
-EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 569 BLAKE2B 54c65a347f3f575088867ef8a73039a9e35ed5fc8608c5e6c6841fbb73db52af95badf2ef0e39fb4ff0cc5bf25dbe862fa2522d502b76521fdc8e179756fe9b6 SHA512 25965a4f4b3448832c7819a573e38122385bacd848ed27b0fa81ef3921cc8328d6d94dfd7246bae688cbc9f9f375a5275ce76663b498fde825fe76528d3ad89b
+EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 569 BLAKE2B d8762fcea04ee47b356567fbcc6e793801ddf5eaac27594cd7338dcf2696925104e12fa15840624b03e8cf5621edbab47b4d314f4c7458511c2e8291e0692f47 SHA512 f127be2bc86d0fa089f1a6975824690d59a2e52e30a86dc53b7740d40a9c1baa50bc88f60020221ffa3590c69ad9ce9dfb538270950f42cefda3a836ce954d47
 MISC metadata.xml 758 BLAKE2B 44d2f74b77f128d9a539067c204c0fe8463f252c9234dc57dd10258e75ddcd9667876056dca4f838164cc64bd89a54e2d4de100ba21df2b5b11f92087ab9d08e SHA512 a6488a0bdf2401098547a3a48529e91bc9dd0144d4b24142ae37470e703a1fb9d152686bf908522eb44b3935c644357d4fb8d33285a647d3fbf1da6056f054b9
diff --git a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
index f2ef8bf17feb..0fcf7416e0b6 100644
--- a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
+++ b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
index 0041619d7b84..2c488f8e2230 100644
--- a/dev-python/python-axolotl/Manifest
+++ b/dev-python/python-axolotl/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-0.2.3.tar.gz 52139 BLAKE2B 8539f4ff6d9d7e57965cdbbd510f499cf344490091fe56b013d1ab60986092ac8a7a76248624993692077020043ea21c1d9448ecf9b76a698b43da4e014f37ab SHA512 1a10dc9df2f95d19b49909d4d136b5266aae19e24ac84f8b263ae7d4de18f77353c737616ac0648b600e05699a90d348f95c6c1659849986becefb4a0277fc80
-EBUILD python-axolotl-0.2.3.ebuild 676 BLAKE2B 323244d130ba6136af1de66f0f701b93214004408d38370f12dfe1d35247a3175f4d66d168c6ebdca687fc5b7edd23c0d8f9a2644ff4dc1a1655e488e5ee87f0 SHA512 3cfc880bd2e8c031ced89a6ed8b0d8b6b67ea381211e3ad3225ca971da944b97aea06dec08ca9d22e24fd197709a77682765ccc24ac2dbc8d3f4b4ab9411afce
+EBUILD python-axolotl-0.2.3.ebuild 675 BLAKE2B 9a2343df8c818ea994430d1d1290a9300eb834c087ca6ac4ca6147185a5021f8c340e084a7bfd0cf0d4515d7a02a2c12b126d657c71ded5b53d129c08e495ba7 SHA512 b5cd2cd374323d39ac6a55c2cb337c2c95a11980d447d35367131d6474700b1e9a27c1fb0d1f73699742c3ea8070ed7592b6e47728e91ec94ea417c4810ab7ca
 MISC metadata.xml 615 BLAKE2B 77180a7073525026071fcc934406859495aa2bd7cf59a0ca642f9389e686869e39f95cfbc72a98f5ab70c7c0966663463a2d8c65277a2e753f049e551fb449c4 SHA512 f96fe3592b1591c6db564751bf35d4a643521c4c9092f91de5937dff221463f09cca3dc69391313f29487318099a4c64054c5dd3f101d538ca85a9b1c559f3dc
diff --git a/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild b/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
index bd16db7b5302..cb9eea3e8118 100644
--- a/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
+++ b/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
-	"
+"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-backoff/Manifest b/dev-python/python-backoff/Manifest
index fe1ad5477b99..f6acc2f63895 100644
--- a/dev-python/python-backoff/Manifest
+++ b/dev-python/python-backoff/Manifest
@@ -1,3 +1,3 @@
 DIST backoff-1.6.0.tar.gz 10474 BLAKE2B 64e4b4a9cb8a1ac5a888aae78f50111400bb57f46bb0c123ecfeb4d660393a9786945d83b838599479e70244f2aa9b667428be2f0d57958b084ed8a045d0ea7d SHA512 a9bb5477d8a84397df61bd3904ad0914c5b214e46da9b55a2286ca8a81508184483e99a6703551dfcd1147e3e656396171ab7133f9e0cf2bff1bc17e6da49444
-EBUILD python-backoff-1.6.0.ebuild 548 BLAKE2B 691a70c3aeef63cd4ca368fb4088ae83e77ce621f83cf51688d143e53e808234450f0ae7efd1b8736fba0bb7c6dcf880e1011ad90d1672129291a53fb43526e2 SHA512 cdc275868ef40d2432d86a6bf121a8171eeea2315b3677d1ec4f58e5a5ed8bfc2c1c6d2a23a5269568c7805eca95dbfbef37a1e4e0a0426f6d3551d66c8fff75
+EBUILD python-backoff-1.6.0.ebuild 536 BLAKE2B d0d8d85da4ecb2cd9ff66d2293ae7759a4fa9263fcf571d68dbecb722d42a3def718f8d4342b851549073f6866532da454351bc300616b3af720008e31c60f7a SHA512 8155fac5f6280683b11b6c243da48f2949dd54e8d4cab38b2fa03602a00d8fb53ff308a35d82da4f954615257d6996e6693a4c534be62884fc8a0eaa22e9c3a6
 MISC metadata.xml 340 BLAKE2B a920195ff15b57c43e2ada5474cec497fa16c1914dea631b88c5e84942c5dd7a5d22d80dd2a162dc347153563274fe5e25d34dca0a9f0a3d22e12b0057e8ef22 SHA512 7dff40ae5c42b76769febb0b76b7e44b605daf77c0bd4cb1446e2e7f3414a6a539dc24a523970e90ef9695ec87982f12ccdde4f63c625895667d4880e27933e8
diff --git a/dev-python/python-backoff/python-backoff-1.6.0.ebuild b/dev-python/python-backoff/python-backoff-1.6.0.ebuild
index 18ceb6574358..43b9e0eac4ad 100644
--- a/dev-python/python-backoff/python-backoff-1.6.0.ebuild
+++ b/dev-python/python-backoff/python-backoff-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index 6e465cb41abd..85f3a820406b 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1,7 +1,3 @@
-DIST python-barbicanclient-4.5.2.tar.gz 112008 BLAKE2B 1ab2f361685809d5c87f52ec420390ba83c63c5357c9a62aff4528d0161766ab92dbb2934a90a70d810e7785f6cdc420347aee199b4157dd02a60553281bf762 SHA512 23f6b9d90d9488a9f072092716bd65f8fe42b01b0889061784df909d5e169fb264f1b71f11f8a3f48853522f3d17428e5c4322712e41a57059f7dd45d0d06213
-DIST python-barbicanclient-4.6.0.tar.gz 108979 BLAKE2B cf037b7818dc2ff5a04637a35760e7899c680abdcbd3ad87f432813b5fcae5bd878d2fe60a97e1d554d9001e29e6032fe23e805e09be2b719f3e31a4b5621746 SHA512 c114dc4b706eda9ea3efc961e1c30471f64e90f6e0b39271a5670e4e086e3e9dd26afcaa5fd3695187c60c30878bb75d10526d10a809f71e0310a2c05268695a
 DIST python-barbicanclient-4.8.1.tar.gz 118919 BLAKE2B 0c29eb4fb3b77d6ef69051a956db1aae8cb151d07156e4c888259888f1a9a6eac0be9e5339ac9a3dee9dabcb1c06c6e835312b47bec4338b34842e71546e3e75 SHA512 836b54156e72faf7ec590d6f11ccc2ca61258da38368410fb65f448b8a0e0ea272d224f46f5c6f08afc7477197a090be77720e07e3a4cb60ef71982367dbfcdb
-EBUILD python-barbicanclient-4.5.2.ebuild 996 BLAKE2B 38eb8852478a33d4596e497e30974b2285f763d35527e4cbff30b3fdd318df38d98e2f7498574c7ecfd045bad39c2dae296b8700ec1135aaddcf576914c88f10 SHA512 2f536b0bc3507906a61841c07f41a87503e7740893a4192670812cac6fb7380ffb5bbf85fdc14d343db1468d0ccbbd7440a92ad872a8d9038f9a8c68a5098635
-EBUILD python-barbicanclient-4.6.0.ebuild 1003 BLAKE2B 1f651e7fbb8a0cb91317b53606e8db479a0f856b1edf1a483a45baebdc7b664ea9f3c8780c8bcf72f653b96488cdc9af73a571d4f9d4e9dcc865a2c221a550d4 SHA512 dd21b0d4bd8abc17941b01ee70d821b2f7afe3aa32ff44035c7939222eed5b30bd8d972ed669f6b6509ef61acf72a49fde39b38b47b931f591b23e9274e1151f
-EBUILD python-barbicanclient-4.8.1.ebuild 1003 BLAKE2B 6f841b88741a7ee3a0eeb3da582e9625aa207188c31f1407e6e07806e2dae3d3440fdfd9e39839cb40079def53ff954d597d9960ca1788275453fc452570d776 SHA512 5b1aba612070f14af939a559acc1b829c05b896d9ba26e9f385ed5fb353618235798372ab5ab2a7093acfa736043eee5c41d4757d10b1bff97278d0e929d983d
+EBUILD python-barbicanclient-4.8.1.ebuild 991 BLAKE2B cfe86dd9b644fed9273b31a458ab5d190bf7cc131b3063ac3744707a745f72dd91d1f926c4810319ad0c08dad69a183ec937779a380f5b925ac355c6c4dd4050 SHA512 c5b7a8aec6b35747636abdb546ad1caa493581a44f6a2c29848381dd6927f6df9874d7cfa20a058035d39b607b6e46766ab3c65f798b0aff25e8e4384d5bb53b
 MISC metadata.xml 586 BLAKE2B be3884c7ffa487cd45252e4737bbbc3cd460a0e6075b2ed38439d74c66518832c2739e1826cad8184bc794ac0af6441cd900c7e3f88fe8d41361f21796f6f87d SHA512 7e03d93945bf23a92dce98fdcc0fe7f65d4b709ac5105155cffe338e979802c55c9e6e59b876e9f77cc9719c863b0ee18b2dc94e04be1230d1841e525a019cbc
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.5.2.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.5.2.ebuild
deleted file mode 100644
index 5d67b71fcb22..000000000000
--- a/dev-python/python-barbicanclient/python-barbicanclient-4.5.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client library for Barbican API."
-HOMEPAGE="https://github.com/openstack/barbican"
-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/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.6.0.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.6.0.ebuild
deleted file mode 100644
index a69808daa6bb..000000000000
--- a/dev-python/python-barbicanclient/python-barbicanclient-4.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client library for Barbican API."
-HOMEPAGE="https://github.com/openstack/barbican"
-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/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.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-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
index 326c7fc61e02..5b5b6f35f96f 100644
--- a/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-biggles/Manifest b/dev-python/python-biggles/Manifest
deleted file mode 100644
index ed4c0f079f2d..000000000000
--- a/dev-python/python-biggles/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python2-biggles-1.6.6.tar.gz 104256 BLAKE2B e2b0d8578fa45dcc3a9a1dd527c7e52618f7a4a3bbaf83e1f9a45288633b0831064e04c71cb389c865898d05e8b8288738e4e5343fa17c1bd7bb2184f4c1d1d1 SHA512 cb2f3d2bebc30b04423b8e56dab9edf1db7bae7901791365f21d9aac1b1adf767baea0f550f4791d3c9fa48b39d02471447b5821437dfaaae2b82575e8e29597
-EBUILD python-biggles-1.6.6-r1.ebuild 711 BLAKE2B ce7041d70359bfee0b6dc8aaa60af34f10429b69f65b0ed2e6e59a1dfd59a2d6a1f7e583a4b41b9c5bd5d5b1acee5f4a6ff4fb7b8b193092c9a2529d90e33894 SHA512 66def1b479650da1adfa8f41323b833ba34eb44445895f4d770ec321eaa7e12894efce33100e2bbd716f6e637a4eefb7ac1aab8383039d19fb3a44c989ffb416
-MISC metadata.xml 317 BLAKE2B 22ab412d75a93752948ac391dec4fabcce9bce7af08b04e83d775eb5d8b010c63e52a77d5efc1cae465bda8468af9cde08f5c3bc1cb383637608c483239fbdbc SHA512 d6805d02c8262ed0863bb1247b7b425d5274068177dd7c0dc1baf4acbacbb714a5f42ea3391d3418b170ac4716476479b50e927ccfe3ec23b3ffd0b9cbcac606
diff --git a/dev-python/python-biggles/metadata.xml b/dev-python/python-biggles/metadata.xml
deleted file mode 100644
index c13afd9a5514..000000000000
--- a/dev-python/python-biggles/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="sourceforge">biggles</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-biggles/python-biggles-1.6.6-r1.ebuild b/dev-python/python-biggles/python-biggles-1.6.6-r1.ebuild
deleted file mode 100644
index 64a0799b69c1..000000000000
--- a/dev-python/python-biggles/python-biggles-1.6.6-r1.ebuild
+++ /dev/null
@@ -1,36 +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
-
-MY_PN="python2-biggles"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Python module for creating publication-quality 2D scientific plots"
-HOMEPAGE="http://biggles.sourceforge.net/"
-SRC_URI="mirror://sourceforge/biggles/${MY_P}.tar.gz"
-
-DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/plotutils[X]
-	x11-libs/libSM
-	x11-libs/libXext"
-RDEPEND="${DEPEND}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/${PN}/
-	doins -r examples
-}
diff --git a/dev-python/python-blazarclient/Manifest b/dev-python/python-blazarclient/Manifest
index fce92eda984e..e719388c71a5 100644
--- a/dev-python/python-blazarclient/Manifest
+++ b/dev-python/python-blazarclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-blazarclient-2.0.0.tar.gz 32078 BLAKE2B a8f7359485889d41c8e6a36f90f6279a366210d29e3080353fe32e6ee6929784c954c86f0e645d4cefe104132b557648ce27a59873a8248c68d02a0c954490c3 SHA512 af57b7a9d914ed216fe53f6e102ade25654fcf9cc0d4a422c912b2129f5905f47272ea959fab38f0ac23678e719c8b5807fa5e852b22f5f7418c72a17d25412a
 DIST python-blazarclient-2.1.0.tar.gz 32950 BLAKE2B cdad6f6e60e95ba97fff6a3d54e642679e2ba203d1aadcadb8190c9fda38dab27808ffbddcfa41852dc72504e9009ec62863991f832d086d70e22bf9652151b5 SHA512 a5d2749969d354ff96b4f223d49f69333a874f167e62663edf4209879b3783d1272dc591157b5a8d1b25206e7c796aa4e0d5966de74aac4429c2ebd9670d1987
-EBUILD python-blazarclient-2.0.0.ebuild 1097 BLAKE2B b952db5e7f825eb086b0f2c1904f72e48eeba5f7077cde1dc5767027f6e871f8d38f3a73f88d4ed370da174437b86e07c2261efac8ac9e89836b3ebdaf4168ff SHA512 a63303deb74aacde96fcae0cdab111a0e6522b89bc7f9e95f1aa2ace0d7e48af1449dc06162d5f377b708a52e6fe5cbe0af3ad9e3cc2179ca34d9bb5b55f0081
-EBUILD python-blazarclient-2.1.0.ebuild 1107 BLAKE2B a89fe2fc803b37913faca942a8e5b09bee26ad4177258535c27bcaf379ca4908b46b11bf9f1cf91ad5fe1be8912ca81161f0edc985740b5ca5e50a1f62e74b63 SHA512 27dee9058cba1ec63d8cc3eefc7295883fce3635fa9250d587df0d896c1387fc5b2f6db15f5e79c2584b793cca3a429708de04cca47585b90b3517f2c49c2e4f
+EBUILD python-blazarclient-2.0.0.ebuild 1077 BLAKE2B a184f8864f3e7d0436c35fd0fe10b5a46aa4eabd705e7a24446c530b932dc5323d0fbdfecafa672a4787ef96db1d78842f3e0ae3896bbc116ad3652cf7d56dc9 SHA512 11a9d4a8b5d423469d73fedf22b18b6b985559fb9fec6bcd153a34f2e5b24f320e1aca5b255aac1dcbc38893c63025b8fa65c8a15bb31bed26af7864527f1180
+EBUILD python-blazarclient-2.1.0.ebuild 1087 BLAKE2B 80d9ca300260aae1098ed624caa350ac4ca0426c28dfa458fd0521dee5445944f5c4008c8460195478e14cbd4953e36364d166445987422df68f6f39f1b6713f SHA512 d61a02b814dff546646f990c2e757f7eba5167f63faa031eed221d16d07b6a41307ebb0ca43fd962dc7eee487bc4c42c9719a8145da2fba0a930ea3d5ac8ce40
 MISC metadata.xml 431 BLAKE2B 360c1bd7ad09d6c8ef45bab793e3b7514de1460df7eb22fe086584940812cecfb4a626ea975de1921234de7a5c151915fb80404c9ac42ba839fd8e87e1d45ea2 SHA512 2bf14d8fa014027952f8767e00ee336955fc1ce0c16979f825f1b3be7e060a2ee4f7becfaf14e885f5f08da896dc8faa15aaab797ebb522f74db7f4768f2875e
diff --git a/dev-python/python-blazarclient/python-blazarclient-2.0.0.ebuild b/dev-python/python-blazarclient/python-blazarclient-2.0.0.ebuild
index dd57a02422ac..dc7ff4ee8ab4 100644
--- a/dev-python/python-blazarclient/python-blazarclient-2.0.0.ebuild
+++ b/dev-python/python-blazarclient/python-blazarclient-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="This is a client for the OpenStack Blazar API"
diff --git a/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild b/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild
index ca9fcda2b289..a9a887a6d89d 100644
--- a/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild
+++ b/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 234dcb5e35d1..7dfa98902733 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,5 +1,5 @@
 DIST python-bugzilla-1.2.2.tar.gz 76026 BLAKE2B 1c5cba3e5abf517779d3db2e3b503a38190ec71455e23e8813ee7f495f1a3df117653141728a53781c1acebadc1781614937413d13698eda289f59e5738647c2 SHA512 bb4ce43ffbf054097bd537404861848dd4ff5883fa63f156dfa90bea9f2e89cfaf0670980ec290a3d9c90cee268709b914e8bd5bd38b7f2e29c8d7fbd0215ac2
 DIST python-bugzilla-2.1.0.tar.gz 78791 BLAKE2B 31819e04ea5627b5513c22e9cb963cdea4d1ef8d6d4db78d14bf08b8b5fb373afaad4bddb2bc0b05d4637f966bf8b4f3699ace58ceff8ea226d9ffd4aacc7f61 SHA512 40dd331e2dbb4d70ce6d356eb800d6242ef9878112310087761c8dccb7f05b259f0f5fdee6821713a84c68f1e5f9e0bb6ee45542bc385f00822b97344371239e
-EBUILD python-bugzilla-1.2.2.ebuild 621 BLAKE2B 0e8e9a29437bcddc43df8b5b742ea8e70f9f11249997a2b4a5a70e543153b8ff23e23d288515806e9c783bb4ac271f3afbe2f04e1c39e0adf3b30157a3846216 SHA512 5bd5dc689be7d20303e23bbb2722df7aa8746c3af12d329e0c9b6d8e674b738687af2c3e38c47f31859ad7b673e57dbdfcdb700cbaa624af722c768cd7024a93
-EBUILD python-bugzilla-2.1.0.ebuild 742 BLAKE2B 9d87c5f0069efe3f57c90d4d6bdcaa03d2f124d21a4bc8dd723941ea247dfc4a7712a9f992843aa0c8ba3c896d2c25c5592859158b7844b652e875356af9e377 SHA512 356d02120df48d527105dc2149a9c81d2b9f597fd05c0d3ded00ff2df9e2ad897f6b7623cf970eeee7ec4fb6785d9db61e810bb061a2a8e2781cd5f8bcf3cf85
+EBUILD python-bugzilla-1.2.2.ebuild 607 BLAKE2B 68e884a7a4925361d643f420742548f159a600159ab363b40e33f57cf470d3bcec88a6e06f98f9a47f988cebd3d9256a0fcbb19871804abdfe15c1b3ce787c27 SHA512 4659ee8d82e951a71695b8883989307872789bad581ca4870906aa1a410801d9692a592b60f0e392847b813c2f8fadb84cc3f93ee08639aec826537d0dc3431c
+EBUILD python-bugzilla-2.1.0.ebuild 730 BLAKE2B 30844082551ca552d6419b2fea5e4a4fd112b44160311fb583fb8e2f04fb03de64c2c57cb860eade4de140e6b0e5261f0e3b3fa36d0aa01414a78b50fb8344ea SHA512 b3a2d7dcf70e99003dcef24033e9ee916ba36fd10c2c6eb89ccdecf33a43b8d51c35560593a9b0a5fa52bcf749d5abce30baf3b3226135daf8f504bc414f6a47
 MISC metadata.xml 415 BLAKE2B 37720f51243092b0e7a73a1489d43df6f089a95fea6a406d277fa2874d852b5768fb504a0886a424ba555e09c250342108353599f6302350ad17f3fddbe1f7e0 SHA512 fe000f7f78ed2ddc76c496368d7697bb36b0984d7d7d0729af9cb0fbec90e2d27eca777dd43d13f41a3f6b14b6a9fd735ebd777e30b6a6943f0af735f9ca9daa
diff --git a/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild b/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild
index f6e75137b070..923a3e048290 100644
--- a/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild
index ab05a46e0e7f..3ee2bd198d44 100644
--- a/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
deleted file mode 100644
index 8256df31d9ec..000000000000
--- a/dev-python/python-caja/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-caja-1.22.0.tar.xz 288324 BLAKE2B 11649dc0d201e9bc0063ad8845ccf0ac7b474e87edce1938311723687253c73058f2411170897acf80e4166169ad2675afff171c31808b22269dcdf857954fa1 SHA512 36ac6feec8dbff345d5657d0bc9eceed7a58648c104ce309f20aaff18cedd8822fb8bc0c13662796d15391af72285fa3ae4185043cce9e471f22a2868f37cc2c
-EBUILD python-caja-1.22.0-r1.ebuild 1034 BLAKE2B 4ee1a90297ba6a3e91509156facb38cf484cb77d8bc0ca1b112943152595998d0c6d3ab6a06957d50e9584ca34127178348e06e958d55dbbd658ab917a7accd0 SHA512 78132bde6e4d385e4b9a1ac8ad935ebf34af6b85ecb8e04391a3cecbcb20306b175f61d267d0344c4a7de15fdd6a1496646c3ac66c556a8fb561a16395392a94
-MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/metadata.xml b/dev-python/python-caja/metadata.xml
deleted file mode 100644
index 2d0b28805873..000000000000
--- a/dev-python/python-caja/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>mate@gentoo.org</email>
-		<name>Gentoo MATE Desktop</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mate-desktop/python-caja</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-caja/python-caja-1.22.0-r1.ebuild b/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
deleted file mode 100644
index c0338e9ae4e9..000000000000
--- a/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.17.1[introspection]
-	>=x11-libs/gtk+-3.22:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/caja-python/extensions/
-
-	# The HTML documentation generation is broken and commented out by upstream.
-	#
-	#if use doc ; then
-	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
-	#	doins -r docs/html/*
-	#fi
-}
diff --git a/dev-python/python-catcher/Manifest b/dev-python/python-catcher/Manifest
deleted file mode 100644
index 6dfd51034dc3..000000000000
--- a/dev-python/python-catcher/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-catcher-0.1.7.tar.gz 3699 BLAKE2B 20d944f8a87a46423db6981e19ab68eb8abcc87d61d57a9a64332177d3c6b9fa13790a2485084d0754f875611ab57e03704eeeadd9a57637e0bd936e9a8e7ea2 SHA512 118bc19a7c7072cbf95d25810f95753aa894619c5a92b32f56e02a752e48c1b6ccbedab7d538184ec6dc30061826a7924fb0a4644e5afa26dedff9b9cd710353
-EBUILD python-catcher-0.1.7.ebuild 596 BLAKE2B 15e76a97a6a55bcf90585fec02160bfc80cb32a4e18d13a00df62b80b892858594949cb8917a6b6b29b48cabeaf9d760800982d908ac4c22bc5229b00c0d8703 SHA512 3efefc90312dc63dcfb1d19d61c93817d80f2cfbb1d170acabe99b53bf74d023be81ac50dddb1e522064c5815480d1dc3dcd0e706f1af41ca1738e625170a816
-MISC metadata.xml 327 BLAKE2B 5aafd5107217b394f3a7a45b9cda7285e7319d123ef2cde8f26f0a57dd1158aa1b0cdb6a559237d91e50f577cea972708acf2d9e6fd70cd1f0b29a686724b0e0 SHA512 c2c87719253cef67a0f872192250327649fc7db3417384fe4c96343025656455613b0f6ab02521c6249e68882dcaee03257b36a775acc6dba028ce6a11776c53
diff --git a/dev-python/python-catcher/metadata.xml b/dev-python/python-catcher/metadata.xml
deleted file mode 100644
index 0b5922bf69ed..000000000000
--- a/dev-python/python-catcher/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">python-catcher</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-catcher/python-catcher-0.1.7.ebuild b/dev-python/python-catcher/python-catcher-0.1.7.ebuild
deleted file mode 100644
index 24f1f8513dd7..000000000000
--- a/dev-python/python-catcher/python-catcher-0.1.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Beautiful stack traces for Python"
-HOMEPAGE="https://pypi.org/project/python-catcher/ http://ajenti.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	cd catcher || die
-	"${PYTHON}" -m unittest || die
-}
diff --git a/dev-python/python-cdb/Manifest b/dev-python/python-cdb/Manifest
deleted file mode 100644
index 04cf4a5c0850..000000000000
--- a/dev-python/python-cdb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-cdb-0.34.tar.gz 18865 BLAKE2B 210b4456eb7d31d772baff051aa453bf326253d457205db9fd7245d86408e205f68106dcbcd4ccb69521f8d1b099f7dddfd668f531fe993354c53510eac52eff SHA512 712e4c91d6285b8ce3436fb4c18f8cd0db76aad12eda96e860a1f0b72ecd480181e33315595dab4a2242149372166b0ca8a6c367ea808e394af4bd9f15d6733a
-EBUILD python-cdb-0.34-r1.ebuild 713 BLAKE2B 3c3bfd08b1839f4caf61f569a12f486f5bf9fef9be509bdec205286407eaa868528ac120a2c1c9a1dc88405a41ae2fbc0ff4d2487aa8dbfe6a95ec4dc151fa48 SHA512 48ef4bf55584195d05a24e0e44ca9a3bd23d8ddd8530c0a0dbd66a28c3fd9271343689ff515869a7177be351b83514cecd4a51aca77f409167bda0cb07df9cc4
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-cdb/metadata.xml b/dev-python/python-cdb/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/python-cdb/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/python-cdb/python-cdb-0.34-r1.ebuild b/dev-python/python-cdb/python-cdb-0.34-r1.ebuild
deleted file mode 100644
index 44da8c74ab43..000000000000
--- a/dev-python/python-cdb/python-cdb-0.34-r1.ebuild
+++ /dev/null
@@ -1,25 +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="A Python extension module for cdb"
-SRC_URI="http://pilcrow.madison.wi.us/python-cdb/${P}.tar.gz"
-HOMEPAGE="http://pilcrow.madison.wi.us/#pycdb"
-
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="|| ( dev-db/cdb dev-db/tinycdb )"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${PYTHON}" setup.py build -b "build-${PYTHON_ABI}" install --home "${T}/test-${PYTHON_ABI}" || return 1
-	# This is not really intended as test but it is better than nothing.
-	"${PYTHON}" < Example
-}
diff --git a/dev-python/python-ceilometerclient/Manifest b/dev-python/python-ceilometerclient/Manifest
index 26c66b9f5fd2..9c60907ac958 100644
--- a/dev-python/python-ceilometerclient/Manifest
+++ b/dev-python/python-ceilometerclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-ceilometerclient-2.6.2.tar.gz 94001 BLAKE2B ef2d3411df3920ed6a2417dc2201b8df4242770215514415422a6f7a783a933f25fa8565497a7d8a32dc14bfd159973d6c10e9dc0bf4b1798fb9205452493822 SHA512 547df2616adbe437a751026554bf11e74ba753a3bc905fa71621d47accabcf6d4e1a67ad2516af91b5ba9600d4721a1f4bce730862fb18b63249d5334a78972d
-EBUILD python-ceilometerclient-2.6.2-r1.ebuild 1768 BLAKE2B 1603ec8fa42885c8b192385bacd1c6090beafe88b6201458a1526ef6263144290e08c4858081a0d1407edb82cd2aea0975a823eb7ea08e1bf8c7911e7c7b6abe SHA512 204451800aac7e63ae93ab19b22d988aada0a244af86e4ef69c95c35beb974ff172be05c2e6d83d73f967564be1c8cf05aaf0de1dc107da0ca56b475dfecd78e
+EBUILD python-ceilometerclient-2.6.2-r1.ebuild 1754 BLAKE2B 3ffaaf524cf7c4c5f3f0be95f4ca3c69b106a46935cc91d49f4b59a8c70c2062539a0f00f722a7bd62165237a8adbfa6b12852fe96ab5d885d7d707175cca686 SHA512 af835b9b501f6e65f4c8205696208e5ccbd00cf759dc1c90f97f673a2edb76179efa0d0ea73eb0f9183d5fbafba796854c5dc8a336832c5582beb84f89bdba8e
 MISC metadata.xml 735 BLAKE2B ce8ca993960fdd7644f464f13f3a0cfe195465064c31e2cc9b337f85c585d350f57d5c454bad50d7c3c7de6fdde1057db1d056fa3a06c10ef1656e5e12504055 SHA512 063fcd419aa753e4e3d3dca57f8d72b8e0bdbd81b708873a4f6895785f6f04865f2184b0b684992e5dc9e6e815a5fb11ea9c9c1839c5cc483219f3138966128f
diff --git a/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2-r1.ebuild b/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2-r1.ebuild
index 463e8e7c7119..e5fcd00d4b48 100644
--- a/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2-r1.ebuild
+++ b/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index cbb418cfaf3a..3b4bf8c991f3 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-cinderclient-4.1.0.tar.gz 288464 BLAKE2B 492baefef164e74eca662cbde31b77ae751730420782b9926d265548d064cef08e993279482c566f1c810a62f6cda657e59680d511e5633a7c17be8dbc6fe7c1 SHA512 e895e90dd12802c5991bd05c825b712b30bded38a5dd0dc8d845949cc7e76440959a426cb680447496cccdbb0d5aa31f3b982838a91c7b36e8e31bbaa3fb7b7a
 DIST python-cinderclient-4.2.1.tar.gz 287696 BLAKE2B b79068acfeafd9e8ab85035fcda1cceaacc68d3a847b4d070fcb16efdf103ad362c21196afc0ea23eba6a9110f5e96d8de8e2446889740c9abccd912a972358d SHA512 e72af1163bbd882354aea3b7ecdc36cad0899589430e31006f9b1f5f1d00866c9c0de631d2a94b83b3dc358039069adefef54231ecb191ad167339ca3a37a588
-EBUILD python-cinderclient-4.1.0.ebuild 1117 BLAKE2B 94787b748dacc36053a90285b42b3a7f3b2c09f7f71d931eb8015dd99db406bf025a9d29141096cdaa8929eba55fafb724989ba948a83ae5fd243948952a67a3 SHA512 edce03675cbf2266dc7ea7136d5951a469b1c0ecfe651fef4b8eba7df96203abe190fa2399fb5c9ef07505e87e14b6591c69ab0f6f00bbf81d962b333496cc60
-EBUILD python-cinderclient-4.2.1.ebuild 1117 BLAKE2B 94787b748dacc36053a90285b42b3a7f3b2c09f7f71d931eb8015dd99db406bf025a9d29141096cdaa8929eba55fafb724989ba948a83ae5fd243948952a67a3 SHA512 edce03675cbf2266dc7ea7136d5951a469b1c0ecfe651fef4b8eba7df96203abe190fa2399fb5c9ef07505e87e14b6591c69ab0f6f00bbf81d962b333496cc60
+EBUILD python-cinderclient-4.1.0.ebuild 1105 BLAKE2B 1088a04515bd0a7e5b3848ecc5232ccb46ca2320ed473c7fac289f1f0a467ca2a1dc0d332bbbd47dd58cf1f7875228aa8819d34d90579efe2eac14aac0f90134 SHA512 8dfbb8d5739d8f3f53896a6d3b4fba40d9f2f63f231f16b80e13ed96d19bc0a33067e4736ff41f28d297c783c4d445339de1106b19643c9e90090772ed683204
+EBUILD python-cinderclient-4.2.1.ebuild 1105 BLAKE2B 1088a04515bd0a7e5b3848ecc5232ccb46ca2320ed473c7fac289f1f0a467ca2a1dc0d332bbbd47dd58cf1f7875228aa8819d34d90579efe2eac14aac0f90134 SHA512 8dfbb8d5739d8f3f53896a6d3b4fba40d9f2f63f231f16b80e13ed96d19bc0a33067e4736ff41f28d297c783c4d445339de1106b19643c9e90090772ed683204
 MISC metadata.xml 625 BLAKE2B a9011769fe7ab23b5b00cdfe6e209e92186abffd4a32e6b21e2741ea8b58848b3aee384d301c3bfeeaaea3632becc5db22afcd8d6b149d17db34198a89e86ca6 SHA512 397ec06d3fb289940f654600dd452f5450ab6a87b4584f5486196a5467b7b5b9251c241c28b92a17b92da9d0a094b1a4d4ec303fe8eb3087c50a560f423bf92a
diff --git a/dev-python/python-cinderclient/python-cinderclient-4.1.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-4.1.0.ebuild
index 0dee45615822..63d6cf10b000 100644
--- a/dev-python/python-cinderclient/python-cinderclient-4.1.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-4.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-cinderclient/python-cinderclient-4.2.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-4.2.1.ebuild
index 0dee45615822..63d6cf10b000 100644
--- a/dev-python/python-cinderclient/python-cinderclient-4.2.1.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-4.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-cluster/Manifest b/dev-python/python-cluster/Manifest
index 52e9a7caaee8..9ecbd0827816 100644
--- a/dev-python/python-cluster/Manifest
+++ b/dev-python/python-cluster/Manifest
@@ -1,3 +1,3 @@
 DIST cluster-1.2.2.tar.gz 44074 BLAKE2B b9a986d326e34d88f193d0bf7ceab404aa17aa8864a8cefa201f47ff0a4372d6a2103e05424f5bc0623cbec3f08beefe2d216c6638969bc85f1cb2432bd5665e SHA512 02600fa1fccdb07251bea83ab81908c22968fcfd4d6ccf382a75ab43117ee8ecc4385f7666f272d1e6cfc0634f7e15778635b50fde572773e564604c981e75cf
-EBUILD python-cluster-1.2.2.ebuild 556 BLAKE2B 4ba25612a4cd13ffb6e2881853bf3d418ac98982c14a5361c5eb405efa7b3033b04e86aa3e96c54514baff2c71c6774eae38e10b5ac4232d4601bb5f6a45696e SHA512 dfd79f613b0ac1d242b873ba67c878ace3104931c6845e64752eac993b49197efa001ddd012c5e540aa0a1cec1a6b84d132606788aa8f8607f8c9d12881d2586
+EBUILD python-cluster-1.2.2.ebuild 541 BLAKE2B 54d41f5ada82c4b21df985029bdf828dfdab8dd33793d247902bf0a316b32340438e0b0642962463a4b70568ea25150c64ffde6cc78f5884463951628ef49a1e SHA512 d9e8bc71122e96ad26d2fbd6a3b44b5ea06ab769ca69afaaa9c9596855b898d4e9ed6dc017f109074a0ca7a33f5678873494f413e7b15828d9240afd333e83f5
 MISC metadata.xml 383 BLAKE2B 7600b6607ec5a4890a61f6c72a110de4e0ca3d2138f0358c8d53a63ee36648f16af64df0117825961b2b1b228684589c03759594dc763ae98c775ca4277ec6b7 SHA512 35d45b3af02e3f3c1466d9b915bb8bbfe719105ce91ccf4cd3604c3aa6178228c648316ab2c4f17a113fcf50ed9d1eb94187bf8fced7df1f9f82fb5eaffff652
diff --git a/dev-python/python-cluster/python-cluster-1.2.2.ebuild b/dev-python/python-cluster/python-cluster-1.2.2.ebuild
index 4c579535de17..827b297422c3 100644
--- a/dev-python/python-cluster/python-cluster-1.2.2.ebuild
+++ b/dev-python/python-cluster/python-cluster-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index dc115d5a12e9..5dd04b349577 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,3 +1,3 @@
 DIST cstruct-1.7.tar.gz 8768 BLAKE2B 9b66c1cadb5c32965fe29de4e1f3bf2a3f00695d3c6ced4cf28dc85d8580b7fbad626633f9672e25521e5e2fde93049a953c6fe089fb154aa51c82f080427121 SHA512 c3a612ec4c5778801a9d506a49b8817b56fb99e1788c4894ce753178aa4472cedff3b842fe1f40a925e76efbf737166384c279ed0f697655d6ea8d5f1581973a
-EBUILD python-cstruct-1.7.ebuild 621 BLAKE2B bb9a282f85d5f2d4e098afb4708782182440f54098335e23110efe3386bdc07425f09f36419b0a5b302d2840039cdff952b724b2faf7a8ede10292ed31d3d052 SHA512 980917752a0637e032210337fcffa82d5810fb1c50a59d697adc0772751cd74d91c7904d3c3ab815e39e46dfcfdd660f64437a4f5dbf8f95b993ea287edf7add
+EBUILD python-cstruct-1.7.ebuild 609 BLAKE2B 5b5e7b7111947565bb9431a6d920e85010477fcee7e72513039bc1085afcaae9968631637bebd4d45ca6e889d2d8921c0f042aeae84a32754e8a2ef6d1873cee SHA512 f1761b561c51879a772d9a9039c9c023849e26064b41506b035a266a5dd5c81fd64405222bcb90e47708ee6d64ac9df0d1038ca0daed950858cbc83b459337df
 MISC metadata.xml 352 BLAKE2B a2478767166958184fcd375f35b563a7a8e55de1c27068cc0959eab9fe6ace8fd1d42e3db862114e73bf7bd30181a09dd0bb3342ed48bf5db4496a882751197f SHA512 979cb550fb49246beeb8dcc2adc4119af81d80c7ccfe2ad21be0eaf2ae0042ac0c38a974366686104038ba5ba960910464a64b86782cf12156e44bf0faa6b2d2
diff --git a/dev-python/python-cstruct/python-cstruct-1.7.ebuild b/dev-python/python-cstruct/python-cstruct-1.7.ebuild
index a665c955f352..7e559d966790 100644
--- a/dev-python/python-cstruct/python-cstruct-1.7.ebuild
+++ b/dev-python/python-cstruct/python-cstruct-1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ctags/Manifest b/dev-python/python-ctags/Manifest
index c4c01a8801d6..cbc0d49736c4 100644
--- a/dev-python/python-ctags/Manifest
+++ b/dev-python/python-ctags/Manifest
@@ -1,5 +1,5 @@
 DIST python-ctags3-1.2.4.tar.gz 47774 BLAKE2B 4b1844a6a0d6d89e014206b728e1f1d8b964db2b85afe599cfc254b68f663052d7d1169c257378243e22929297bd254e23ce4c21e1ea1c9a60d7007727c322bf SHA512 db6be08164da71b17de1a7fa46aaa60a5b83784f18ca4e2314e3b9954abe8996d5e07ed98aa024f70899fe87cf53d37671c9f42e567766b4a8af0f728df2bcfb
 DIST python-ctags3-1.3.0.tar.gz 54615 BLAKE2B b334b834cefb01bdbf2c061d44ef6e38070c2b3e5da6de25beb09d24bc9d5891a6892a4b0c9e8fa8f8168bf344c10880ac987e263844cb3dd21303f8c2d105e6 SHA512 3ad4433d69bd159879ff4eface5150acc8c0f609cc7597885824056ce4ec148e55ad234dffa53f07977aa3ace24846e180adce5316a2950ac8d4ff58ad128b68
-EBUILD python-ctags-1.2.4.ebuild 566 BLAKE2B 24f9de471c3d620a7cbc6d1dde806d24dd69cc841e20f964584fde5d3d989a1e9d1e9602d19999d3086c6e7182aa57fb7ce8316c794fe23eae6f7eafd49e4f64 SHA512 d60270be61e254c322b1913dfa5574561d2169dc19cd27380468a7a6c33ab859ff1c3d88ce3814e94bcdc535cea0053ab0a39cf92e6dfa1cde9ec41b9d6db7d8
-EBUILD python-ctags-1.3.0.ebuild 569 BLAKE2B 65231fa94e107ded3c7adc6e9b023b631d37f9401d3be0912ddcf44bcc83567223caa6bd367d8c47f4950e432df3a7d658e893091e4377d1237b63adeea50a78 SHA512 98cfcf9f58374303022b3e7ca840ef03f2c3afbf693fb4f3302e2f54a5ae0c930010d1ca7e686f48723c7c913f3a9bdda5c8b7954394916cd02bb9e6850b3dad
+EBUILD python-ctags-1.2.4.ebuild 559 BLAKE2B ff984d4978b11a2c5e6845c8f3fad677720ce02e6de6a1171e7b83bb43661d58b1b1557a1b460c28044bd082d7789e774721a07842385fe4816ce7a8ca574aad SHA512 7232a9e691fd8bddfb3419ea61c7c1d174b092919a3672b4b71c5a0e84d8449f4adfa7df26262ccfc08e488ad32296c13dd4414d0f8ea5f9d6c7fe1600768393
+EBUILD python-ctags-1.3.0.ebuild 564 BLAKE2B 455f7a72a6ae3fb545e15887bb4232b5cb9aa76f45d562b09d93d6d6c7c44aadcc2c409de5be269daeb4e01568a909368b5fb149e0df7b8752747863d9a324d8 SHA512 c325791b264828a14125a74603cd081fe9b8930c264b52f46fe35dbc8b054d88865ee84f512888b7ab5fab821adce489e424c2ac37e19656ed7a0a86b4e6a8db
 MISC metadata.xml 455 BLAKE2B af37b4a79a49f4128c7ed43a10ba5a384d5d6d4a33912cf74fb59ddbddd155184f1e47161519649ddac98556ad17cee495913321632f30a629704eabf7fc5d11 SHA512 480ef8e0ccfb6e278348ed31be811e51ec6a845c984c92d9d215d0375305278639dda7e409b66f18860ea980de149656b0dfd8111d26aaf79787e3c7a34ce848
diff --git a/dev-python/python-ctags/python-ctags-1.2.4.ebuild b/dev-python/python-ctags/python-ctags-1.2.4.ebuild
index d67335d0deb4..c1c2cd0d065e 100644
--- a/dev-python/python-ctags/python-ctags-1.2.4.ebuild
+++ b/dev-python/python-ctags/python-ctags-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ctags/python-ctags-1.3.0.ebuild b/dev-python/python-ctags/python-ctags-1.3.0.ebuild
index 51c6acde4290..c906ddf7d4d3 100644
--- a/dev-python/python-ctags/python-ctags-1.3.0.ebuild
+++ b/dev-python/python-ctags/python-ctags-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-daap/Manifest b/dev-python/python-daap/Manifest
deleted file mode 100644
index d3445068ce14..000000000000
--- a/dev-python/python-daap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PythonDaap-0.7.1.tar.gz 25944 BLAKE2B b8ceab556c2be488f0e9c768b31da193d6acede65bc41f87d45c3cb7d9fcea5885a546ad682b7a272e098d590066c83535fb914573690f584ed46a8ab98c9d39 SHA512 9ed6f1964fa0b357ee2d1e81dbdf79303f12feb1e753e6e8c987f28212a2eb3041fe1f443a4e5e43c196808192f116d045b0ea6d42dc76020ff4f252d423eca8
-EBUILD python-daap-0.7.1-r1.ebuild 712 BLAKE2B d6e88d418b45bdd85d68c87083f839353357155aa5f44668dfcf24909a04fc3decc8b6a256bca6995884bb89d5c12be94b5f3f4b788287f2f4778cc4834c3477 SHA512 ab2a794b71e1e3d2d162acec522f9b6a823a4a26e6233f86352e13564aa8cdc189e5343b9aa2c9683fd71a459e65a329ee4c226d5fbc9304398552681bdffed3
-MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/python-daap/metadata.xml b/dev-python/python-daap/metadata.xml
deleted file mode 100644
index d0913ee5d1cb..000000000000
--- a/dev-python/python-daap/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>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/python-daap/python-daap-0.7.1-r1.ebuild b/dev-python/python-daap/python-daap-0.7.1-r1.ebuild
deleted file mode 100644
index a450131628c6..000000000000
--- a/dev-python/python-daap/python-daap-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_P="PythonDaap-${PV}"
-
-DESCRIPTION="PyDaap is a DAAP client implemented in Python, based on PyTunes"
-HOMEPAGE="https://movieos.org/code/pythondaap/
-	https://github.com/tominsam/pythondaap"
-SRC_URI="http://jerakeen.org/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	append-cflags -fno-strict-aliasing
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 5d1b924a175a..d06dd2498b90 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -2,6 +2,6 @@ DIST python-daemon-1.6.tar.gz 41564 BLAKE2B 6ed3dcced0deef859efc733be38d807726ad
 DIST python-daemon-2.1.1.tar.gz 74276 BLAKE2B c2ca4d1680555a559009224391151cdffbaf49ee03c0a2985184b336a3d1a8c8372423b3b527199daa5f38a29d52fc879f18a719531afeb18642f7d6cb59df51 SHA512 e2abb9fafea32fe5bc7d239387e3c22aa99f63df31cc4f57908ffdb5dc7f2768358df6ba5f3e827b4f83163628649f58a973b548066e8c79ab3c6c6ce09d8007
 DIST python-daemon-2.1.2.tar.gz 76176 BLAKE2B f8252bb3ee23b9d2a4ac33057df98720708b2a7e10c38c188c537d3c90ad641e33ba73e39f1bbfca10655e2ebd5d550179ed55d09a2f767832fa1d26accc9e21 SHA512 28ae118fd652a0a26524215568df0b16264e3a844640fe47f0a08c45c7a16be1b60d78293c2fc13edfe1402a8b5dcd72ec11101c3b53e5b66f232b7e21d5d346
 EBUILD python-daemon-1.6-r1.ebuild 646 BLAKE2B 68847a1a5d1cf6919f3374a9a8a5976e0e0d7acd7db823875749cc2fc31167810b0b977fa8d7a6f0973d94426f3e64b75f9a46b70950deb83d30661688e43d6b SHA512 6a883bd79fb616e52fbaf3f858cdfda1e277c62614f0328492616cd9a7162b60ea56c3e6268b475e1e9797fe9f710fb16524de68110e3adc5b6493a10117c6ec
-EBUILD python-daemon-2.1.1.ebuild 844 BLAKE2B 57c0d786054200a77f8f48cafe7274b58f753b206a9d1bb2f409a5a6daf12cc2f8f0e297be3f45b234c0c066db26ddd53d57e5c0f5ffb34c24425587cc076c63 SHA512 6a14ccaa3d915521d70847fb589eae0672c774970fd78e1d07cdfff9df640cdfc93615756c1480719aee4aba8a7c0423594f6f27c0a531f7224f00007b211eb0
-EBUILD python-daemon-2.1.2.ebuild 794 BLAKE2B b98dd262dd9bb48b08bf4ed43b9f305b1725f2666414dd2fb68f9f6c5b903804824ff984f4c1349483b75430813adadc2b198293e838aff497650d90ddd114dd SHA512 204103e099122fbcff57211dd846543b7b4e6d85d2c0b9f099b3acf45a4ddc117bdc0a7d06e75deb227865c71ab42c63c3853c2eb94b7ee7e68e5bc547b0dd9b
+EBUILD python-daemon-2.1.1.ebuild 840 BLAKE2B 74645b1b04d82f0bf9a979aff8779ff7ef66fc1eb28f232eb54a8deb2559fec7f092839765e90f4eb3df25e02e58f16d744c0e60ac6f650f4c27f9903085dddb SHA512 ac95542bc2e438528d685ecc7973a49ac4d4ef0a65b3b6f901c20f51a30fe83d6e357fd44cd4bb532a668b50c8b0b59efbdeaa4148a2780620cdd45d6fa05861
+EBUILD python-daemon-2.1.2.ebuild 790 BLAKE2B b6adc2f1807df44dda122db2a75fc718964db5bd1dc99565b5477daf96a5c4a6b1ed8d99cdeb44e60d192234761581faa32ec88f9140707c0b37958dcc89f0e4 SHA512 de675b4121386a1957b648c41694cd9e24b49779814d2230f3373506ef4a2d618c307dd5b7d1f05de68446767b4de8dde71ce7e5c85fcfee66ad03badde8f08e
 MISC metadata.xml 316 BLAKE2B 413934d7b67818ac0d3ddb8c1e5040de2f3008a2e1c01efff6afa4c0aeb6bb849391bdb8730e14091c3efffa47566b831d44cd7728cc9496c6e3bbc7a6c56d97 SHA512 b3b79f6094ec59bc09c2a14e3752edc0722c0e50c9559ac59e6c1355577c1f36ff98ccf6af969d0624b1e6b8b907a7886f6daafb6c0d789a403ec402083b06a4
diff --git a/dev-python/python-daemon/python-daemon-2.1.1.ebuild b/dev-python/python-daemon/python-daemon-2.1.1.ebuild
index 652178c26af0..fa30e37c2d10 100644
--- a/dev-python/python-daemon/python-daemon-2.1.1.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-daemon/python-daemon-2.1.2.ebuild b/dev-python/python-daemon/python-daemon-2.1.2.ebuild
index bfbdf6cdc9b2..5e81e4bb934b 100644
--- a/dev-python/python-daemon/python-daemon-2.1.2.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index cf257bf4a44e..66455381ab9e 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -9,13 +9,13 @@ DIST python-dateutil-2.7.4.tar.gz 302229 BLAKE2B e2a43d8587f895a9a72ca5ab5c18a5c
 DIST python-dateutil-2.7.5.tar.gz 316043 BLAKE2B 29511f7e484c369084d696f45a07e01e096e7b1114f982026f8df71d569eea30d657956d3e53725ad57564c1e445414c2ed543e3e6d2dd89902d7838cbb9e6fe SHA512 762752191d584a3995b55bbcfadc829261a263e0e6515a52db2fc32157bf0b3f96f787107c49bbd77cab9ce7e3f692ab3e8f392260fc18e6456b74eb190b44d3
 DIST python-dateutil-2.8.0.tar.gz 327134 BLAKE2B 6525eee57aeaef3c588413210df7c1ad3627a380c6e44af78e9acc9abea523b29e8d9afec495f8d1e585d25d32ab82e6e28bf93dca148893d2e6a533e1f4ce47 SHA512 ec7da86203572582f883a4686acf8a732a2de4f396d809057eb51b2c60dbca5623a7fa90c2c0618c281a2282c60841739bd837731a51cc876f4ff369297f2f81
 DIST python-dateutil-2.8.1.tar.gz 331745 BLAKE2B 9785fe93976d9bbe21d6610133e37e558cdde4062a1a738ccbf2bf80aa062882ba59c60f2b9bfc44c53e0f8fc4b5ebdd5d12b6ba54a60706576360e453b2f160 SHA512 337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c
-EBUILD python-dateutil-2.6.1.ebuild 918 BLAKE2B d0333292ce21e4148d57a6abfcc9581c16905dad6ec7b9afbf67163454934eadb3cf78952e74f83e1aff6e9aac695a07d94456fb3be0d4c80b6f3c201bccc25a SHA512 271e22378c8a0404e420a64467fde4884e481c278a3bb150c916e5256a63bc3a99cb10355a9ca6fa146dd8a9560bfabde9e0fa37f1399a920e8e5034e3ad0f77
-EBUILD python-dateutil-2.7.1.ebuild 1132 BLAKE2B 6fa4909ec6a46b5eabeb68acd4159f8bcc2d5d09e3c6ec76d81c8b473a038b50d422b3ac8df079785f80204db72bbeb9080fdf8ec73f2c47d73229578b58fa9b SHA512 0e80558b3a8238c22795176b96b025fea9bf1aa55b6ce99667c2b2cac9e2a504897053a748512aa1dfb358fc6f247964cad4495c8d850b6e234abdc57c678547
-EBUILD python-dateutil-2.7.2-r1.ebuild 1216 BLAKE2B 6cba0f35ae579584c22d652f0bee1a1bb1df35cea395529afdea138ecec0041c3347016ecc219ebc29c468e6efec78192480c695e8df10c69d4e63ce72adc5f4 SHA512 076b172bbf0f292170fa650df30441369a59429089c37b7dbfac03e60e3b651187b42a0ee6b8f03148e77ed9e6eec347f5164d92dd65e409b47df1105007248c
-EBUILD python-dateutil-2.7.2.ebuild 1132 BLAKE2B 6fa4909ec6a46b5eabeb68acd4159f8bcc2d5d09e3c6ec76d81c8b473a038b50d422b3ac8df079785f80204db72bbeb9080fdf8ec73f2c47d73229578b58fa9b SHA512 0e80558b3a8238c22795176b96b025fea9bf1aa55b6ce99667c2b2cac9e2a504897053a748512aa1dfb358fc6f247964cad4495c8d850b6e234abdc57c678547
-EBUILD python-dateutil-2.7.3.ebuild 1227 BLAKE2B c78f0957e1555dd4c9475d0e515c6054da9dfa764ff72d708fff44b0159c816be74d20bba6c2e8854e950befd7680104d49ecf596941cbe6472db03d0d029dd1 SHA512 20083e2b8a73756235c202b639ae58b4ec67867e2b1c7b9f302a0c714e69310571d5db5bf9c1fbb1c6c04c9ff45231cb2c357c8bc62f86e5925791ae0f02fbf2
-EBUILD python-dateutil-2.7.4.ebuild 1269 BLAKE2B ba262eddf21efd49978b8c7dfd16142f4465653136740f6a12b0ec6b375c948ea26811cf02b49fa81da7c9f32abf9c6130a72519c34a2b584992b1e5df8e84e1 SHA512 2658c5b5c84170ee2db20a09d0905652a2b2c52a1b684577ac32c1ac1ef52506fa54577756a42605d20151d869081ebf08927d9327db9a4747266c6243f6119a
-EBUILD python-dateutil-2.7.5.ebuild 1269 BLAKE2B ba262eddf21efd49978b8c7dfd16142f4465653136740f6a12b0ec6b375c948ea26811cf02b49fa81da7c9f32abf9c6130a72519c34a2b584992b1e5df8e84e1 SHA512 2658c5b5c84170ee2db20a09d0905652a2b2c52a1b684577ac32c1ac1ef52506fa54577756a42605d20151d869081ebf08927d9327db9a4747266c6243f6119a
-EBUILD python-dateutil-2.8.0.ebuild 1270 BLAKE2B ba7e3b5225e415702bc813b1235eedd770e3a70512945ede801e03222abdab873cb86be32ccd649e4da99d37ba6756754130a8d7329b0b5f0fd3159b4b11c4b7 SHA512 51571efae0ceb73241242285c4091a0b410752254bf0467f52973608b40f0d418342a76e2711a4292ce9be7cf7a6f57d401a6eab69ecd20b8f347967aee7f504
-EBUILD python-dateutil-2.8.1.ebuild 1598 BLAKE2B da1b38dbe0f5c39974519c9e1f593d642bf97a4c3de9fe6144c69d2844c9e40f7e21a9676a6775d5feb8f64ce3fa8e3a287fd0499eee6cabf242d9866d46b2c7 SHA512 b470d6e2db75207776894860d73090413d5e706161383aad907b902de9b02f32342f306d3df41717032357f8e69af1d7616a6bb9795cd781c9f7bec93e436d92
+EBUILD python-dateutil-2.6.1.ebuild 909 BLAKE2B 6f0289a6652a3261839de98b5375f407a13cfea900cb831ed1cc1bb5190af36adc30234f13987539b3be9fd65e5a073243923f48137c47dfc9d33ae7d07a638d SHA512 8f5c0e1f2b42e7de5c56858e780522680ffb5d684c166c7d50e1ce474163ae3d418a04d4ae3d942ec4c4f93abe0b53dd959aeabb9e96bd01c72dd63342a06429
+EBUILD python-dateutil-2.7.1.ebuild 1123 BLAKE2B 3c1649109f0b8009d3dcc99fd56816c9089597b74605f435cc8498f0d69632ea6cb589787498be254ab663cecc20d3a08d11954cf6869567a45c9ab017911b1d SHA512 6425fd1a5513ca2aa93df4c779e2c7b3afbb77c661c82d1684399fe902d2c975884e51d5b843a48ff1330b3c5bb84cc5203df594eacceb2dba3d269418cc99ac
+EBUILD python-dateutil-2.7.2-r1.ebuild 1209 BLAKE2B 39b59a4e365d5c59682198267e8de48249fb0487d4d0f79045eda6382604523a5ffe6c95b5911afbc792e02454b5c8f83e1ec3d0adf86fc96513b803aee52af1 SHA512 b28100fbec9379367f8798451fd5ec56f436abbfb6e4709477a6abb876e752d3e6410af82c30573760707a43b95009a96a267c7b2f76bfdbf84e43ede5dac4f9
+EBUILD python-dateutil-2.7.2.ebuild 1123 BLAKE2B 3c1649109f0b8009d3dcc99fd56816c9089597b74605f435cc8498f0d69632ea6cb589787498be254ab663cecc20d3a08d11954cf6869567a45c9ab017911b1d SHA512 6425fd1a5513ca2aa93df4c779e2c7b3afbb77c661c82d1684399fe902d2c975884e51d5b843a48ff1330b3c5bb84cc5203df594eacceb2dba3d269418cc99ac
+EBUILD python-dateutil-2.7.3.ebuild 1220 BLAKE2B 2166d814fbbdc1e53012f764ade187e9abb65559d92999db42f42a0e50fc38b9ede4f4a0a9c28a4dde7028d6611a92fdc10361628b827f56f882983259893203 SHA512 18aeda72dd48ced49a15146df2b525d81c99c7e4f9e800f3029846d9e556ce3d459535e53694c9d18e178d32453826d7a11fb6353464f58081f943fb88f1d495
+EBUILD python-dateutil-2.7.4.ebuild 1262 BLAKE2B e08cb34de4e2f8440ae2276743688939adf2343f6abaf82f12a8ffd00d49c2617ef68d415916183bc899c70d79fed22df2800f9879b6d4ffedfb6fc72c8cf1a2 SHA512 82838ee91c912685d50e3ffd9991cd8882b1b405910842630d275ea6bf55b1932f722ca331fb5b09a806d91502a7e78852fdc13e5d6da1558328c92f1f4041e3
+EBUILD python-dateutil-2.7.5.ebuild 1262 BLAKE2B e08cb34de4e2f8440ae2276743688939adf2343f6abaf82f12a8ffd00d49c2617ef68d415916183bc899c70d79fed22df2800f9879b6d4ffedfb6fc72c8cf1a2 SHA512 82838ee91c912685d50e3ffd9991cd8882b1b405910842630d275ea6bf55b1932f722ca331fb5b09a806d91502a7e78852fdc13e5d6da1558328c92f1f4041e3
+EBUILD python-dateutil-2.8.0.ebuild 1263 BLAKE2B 60e88087f2d182a7c5422795f441c8e9517be3e894847b5bd0dbc8cc74609864957514b04081d796cc19e379e6192e3e737fe4fd5544ddc5524b76b0ecffba95 SHA512 45c458eed0e4e2c13b2b6a1c2ed9ef3c292b70c489e1c68febd21ee3f3d0fa9240e8bea8ee700ec832fdf2dbb418956e919a8cbc29a467c219066258924e34de
+EBUILD python-dateutil-2.8.1.ebuild 1593 BLAKE2B 67b20654e9d277d908c875ffe19d185af6ef15090400b4b00a03d9c87c07068fa16b6474948fe6428fc1ad9aebac0d504f22a1887786312cf19a3fadde70fe39 SHA512 091749992be5e576de2886ada387f51901975a0ac852d14ddde5685f553e4bfbaf9fa5a6d8704d879b4c27b94d1fe92bf8051b7bcf8b5fbd4febef27e754e816
 MISC metadata.xml 603 BLAKE2B 1bf49feeeec3ffc2f767228a84b3f9edf53cf44d8a1df3fa8f85798c0d3ea8f448d6113d425baa6b4b342b88746133d2770b951488d602dbb175f5ff9a99ea36 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439
diff --git a/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
index 4c5262e8d62f..7c142a518b44 100644
--- a/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild
index 92741e351bb8..3e8b8a761d9e 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
index 37827fa357b2..342d4169996a 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild
index 92741e351bb8..3e8b8a761d9e 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.3.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.3.ebuild
index 7453572a2ce9..f59d53c7364c 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.3.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.4.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.4.ebuild
index 1b253f58b9f0..84af5af20444 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.4.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.5.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.5.ebuild
index 1b253f58b9f0..84af5af20444 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.5.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild
index 77611b296b39..0b72619f569b 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.1.ebuild
index e52fe376857c..a92eae9c7e54 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ddp/Manifest b/dev-python/python-ddp/Manifest
index 80d5f4d54fc6..4371d9b97d4c 100644
--- a/dev-python/python-ddp/Manifest
+++ b/dev-python/python-ddp/Manifest
@@ -1,3 +1,3 @@
 DIST python-ddp-0.1.5.tar.gz 6032 BLAKE2B c549f1ae3252473b38f2b5742b664cf0eabd9d89e55a21015a94082979d58b3b60aa803a712a54f849c1a49d3126a53abae5480e3b4e9e2fba59c7464105b39b SHA512 25200624a4a2145d3189646c00ba023f1e55010ca1756eb36505f85b6faa24da8a505f2784b8c445232ed471d5d402b4c0f487b3c9460c948295cda74faa7fbb
-EBUILD python-ddp-0.1.5.ebuild 551 BLAKE2B 05dcf0798c7e57246415aadd3b391003327ebc757c41f4a6f85fe1969fc950ef1979c362dfec2b4ecad3ac0fa1178fd75a6c383e568ef85842ba556b1b436e06 SHA512 e9647b7ef7b27b928d6714fb3c9de0bc3cd3cd01799c86990e78d8c098b3935af246ca6f4c663cfe5ab56cb1e8de12b2da18a87e9f640e8fd4652f265aa10e9e
+EBUILD python-ddp-0.1.5.ebuild 547 BLAKE2B 94ffc244e2a6a44286f49b6c7c119627bdacab9366169b1ee5af00270a8da919108237d7e711ae3d46e493a2010840d62614915e3508ae11b2b0e34440204b07 SHA512 bb708a3a629d3c1fef35935bc534c3e6ba01b175bda25e4dfc59b2e99af87b1f7dcec5a50b274eae8f422225e02cdde3f54b65f8451925171754c0066197c3c3
 MISC metadata.xml 578 BLAKE2B e7994a0ad1cca168ba43ea03cb55cf1b4d1080f397b580c0f96a000a006b54442176222484d0f7904f600e9364028e9d08a4b248d146b36e0638b28f7d7075d4 SHA512 1e66e8908ef5f4fced36e2d6386cf0f53fa16bbddd0bc08891f8d6cdfa27e3f9546b2fa8015289b8a0a254dcf0b192269fc4c212df1187dba5729249ba5a8c45
diff --git a/dev-python/python-ddp/python-ddp-0.1.5.ebuild b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
index e47f500e8231..033c337b2937 100644
--- a/dev-python/python-ddp/python-ddp-0.1.5.ebuild
+++ b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 7ceff5a4fb32..2c3c30838cbf 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,10 +1,6 @@
 AUX 0.1.36-disable-apt-pkg.patch 6718 BLAKE2B bd4cff4d6beb2ac85c2bc9c3b223774e9579a5d4d13ea5ce0eed55d9049a13a47dae712ee7d6165d7ab562321741bf4cc7476512ca7cc38ee23772e4855f69e8 SHA512 7937c8f21fb1e352c707cc87f6de4f6d9393ccd551007dc892ff6e2824c22bd48a66fc3c7ef718992d545b5b15f146b460ec09ba41e16f4a5db3827f30068e5f
-DIST python-debian_0.1.28.tar.xz 292404 BLAKE2B 78634043fc0dabd378bae171a485931b080dc0d31cc7e2ea448c000a1c4250e322f900cf0a0a4c3a8505af6f10da692d0fad948bc253ede7a38e4fe98831924b SHA512 ffbc924fe2dfd5790d49aacf80109bbaa18126bb8d6c9b8ffa25e9ed8b1cdeb28024a8dc202587682088e2e558da1642385faa4afda925cbb2edf6f304592a0d
 DIST python-debian_0.1.31.tar.xz 295720 BLAKE2B 3b3a68ab5604571355a15afac181e488c278ca78ab4c8a6cba4c392a0a89fd778bfd37e69a369d50fbc72f5080cf37fdbd31771f5d973c386795c436112ea347 SHA512 d2bf071b088e53ac132f91e5983c092bddb9736b3fd1394dfd2654fb8b6af7f89982af8debba8c4af21086d4f8a3ef86393fdef25ef18bcf71dcb00a60a8ae5b
-DIST python-debian_0.1.32.tar.xz 296028 BLAKE2B 15e2678a1ec2f4d96baec8b9e3ce7b84d8ad37f520fe9f174d6fe9cac8adbcbb73f628d9c3cdf39eca2639855e797b8f8cef4c9517063d61aa1e3b3ce7f1df2c SHA512 2b55d9a3100028699ec63dd4861a4f60d44e03662cc144784a37cdd980f3ff276e6cd2e535a50cdc6db28bf44affdd576259d73e14e16a2bbeeeda0de0bdd194
 DIST python-debian_0.1.36.tar.xz 308364 BLAKE2B 1cc7e2844db8143a3a4cc4f59c4bbb90bb90ab024b2524335d8ab69947ffe8c64b2b41a54a5d199cd287a3d6b6a0173c75be708af9aedfeb871e354ac1873528 SHA512 3f2ca6d86f6b6d383a1628021a77d19b562b0c409d204dba4de6968d2cdd2c8fb4aa882429fa1ce6af5361352f7a51b339c481dd47937cb103a08132379d77c5
-EBUILD python-debian-0.1.28.ebuild 977 BLAKE2B fb35ea3ec33cc976c44d12f55c7a1dd8cef4c1a6b9941ee17780540f0833f4ddf15508419e651a64bcee1808f2de328a020b44151e4f8ddd817e2785808c3aa2 SHA512 00624b88e312930b8c152f09870ca1a43b90a35bb41b693926e1b7ef99578ab0a59872497877ab94dd180b7d49c435b7178863a2b83e407303edae41e2bb0032
-EBUILD python-debian-0.1.31.ebuild 1007 BLAKE2B fcb38efe2f9f98edd7fda796239d6a282b5bc5fbcc2c303a295547b32b84cb0f874c8b82553546a9cb37aa5b2d4ac595c30c65e95f45bb63b80d8b1523837358 SHA512 b824462197c0a8459d9a1e2ad520767f5f197872894c455123f6973317c586886fbcf367b5e1a8dce2026213365c4117fe7474ef5880526abe6f536cce23e0ea
-EBUILD python-debian-0.1.32.ebuild 1012 BLAKE2B 3d21e119cdcfa2f2037bd7c6b19a8e5bc8d22a67e005e74992375de7941a1e0392504dbf68dff953bbe67ae27d1c3acb02af5a4f4135eaed2544f123b36d5fb2 SHA512 5694d17336090fe21b7768b9d99f2259f9680f64cee3d0dfc5921ee29f988c41c8ac870a94d0595646e0e127983bb29b083ae03997f4ea895a6404791e569aca
-EBUILD python-debian-0.1.36.ebuild 970 BLAKE2B 1f7b5f7dbaf765791b03efbcd1086c1fc70d3eda2a1d15214d955e00081f5dfa6b1a94aac3879d0332fd2d05b6ce98982768bf61264ae106a86cdb0e9cee42ec SHA512 9072141ad503cf4af2c301de19091e84b8d973a17fe86b730924540797bf7da4a77ce5357a25b7155332585fff87e08d675a66e31d88bd02b18fd04f5c143ec6
+EBUILD python-debian-0.1.31.ebuild 998 BLAKE2B 6c58d96e7a3288d2ecedf7759b779527f9598e249d6e9176cf786732f514c9d9b32791f0dca8a6c982c40bfb1739418bf8b671fcc0e73e51582d4a57b1002b96 SHA512 b1fd0e382dccbf77f9a309416ff0fddda639e967d9916c37f8bba4e6c0a555558323fdf6c8f96457c77b4367db2ae40d4232d616dd91bd355d7003cd47e691e8
+EBUILD python-debian-0.1.36.ebuild 963 BLAKE2B 961bba936048931c1204cf83860fcc8be2136af686356384d1892567f5716e3b28c79801e6fab4b1246eb3b23055e2d0e4a9c4ffd9e92df12452be2d93a3cf0d SHA512 c01f67a94a794d5e4bce9d936ff2be1689b616c60f6f257df78e54a104830c8e582ef17ce41a19f35eeab49102150a689b69f915db4ca00228cda297def95eeb
 MISC metadata.xml 347 BLAKE2B ec810ad047c9d21228d5a0df18b78d6935168d4e474007c9aa057bc09bef0507cab59a1d087c72c880c98a055c36c4aea3d8ecadb1f6f746a0838d5630a61b00 SHA512 acad36081dda09984a3eee3348ea00e74a61c0d330ab5a9b14f1705fd1a5af82976d57e86a027d7c7c15bf9bda44dfce21eedc4c56f6337832769f8ed8cd1462
diff --git a/dev-python/python-debian/python-debian-0.1.28.ebuild b/dev-python/python-debian/python-debian-0.1.28.ebuild
deleted file mode 100644
index 4754c4177bd2..000000000000
--- a/dev-python/python-debian/python-debian-0.1.28.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="https://packages.debian.org/sid/python-debian"
-SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( app-arch/dpkg )"
-
-RESTRICT="test"
-
-python_compile_all() {
-	"${PYTHON}" lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	# Tests currently fail with >=app-crypt/gnupg-2.1
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782904
-	pushd tests > /dev/null || die
-	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
diff --git a/dev-python/python-debian/python-debian-0.1.31.ebuild b/dev-python/python-debian/python-debian-0.1.31.ebuild
index 2f0a73ed38a7..3f6380655255 100644
--- a/dev-python/python-debian/python-debian-0.1.31.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.31.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-debian/python-debian-0.1.32.ebuild b/dev-python/python-debian/python-debian-0.1.32.ebuild
deleted file mode 100644
index 6de64953b567..000000000000
--- a/dev-python/python-debian/python-debian-0.1.32.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="https://packages.debian.org/sid/python-debian"
-SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( app-arch/dpkg )"
-
-RESTRICT="test"
-
-python_prepare_all() {
-	sed -i -e '/import apt_pkg/d' \
-		-e 's/test_iter_paragraphs_comments_use_apt_pkg/_&/' \
-		lib/debian/tests/test_deb822.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	"${PYTHON}" lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover lib || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-debian/python-debian-0.1.36.ebuild b/dev-python/python-debian/python-debian-0.1.36.ebuild
index eb6ee829a2ec..524d945c32f1 100644
--- a/dev-python/python-debian/python-debian-0.1.36.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.36.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-designateclient/Manifest b/dev-python/python-designateclient/Manifest
index 790f64104f95..4799371c8404 100644
--- a/dev-python/python-designateclient/Manifest
+++ b/dev-python/python-designateclient/Manifest
@@ -1,7 +1,3 @@
 DIST python-designateclient-2.11.0.tar.gz 85761 BLAKE2B 7baaa417e0610fc59c2b5b3c86d69e5ddfd02fd23b94f19f0473bc55e545514a47923e48f6a831954f964f43a735668191de8e8a775e314eeb5e935718e47f31 SHA512 ba01da49100a7ddddb9394291babdbabbd1813db3fe3cb2ebd5e2be251795c7aaa8e5ea15e455ec4322a5a0481e6670bf59add49e91bf6799c748711c54e1975
-DIST python-designateclient-2.7.0.tar.gz 82808 BLAKE2B bda8ff688267ad682c0e7025f5e801f99ca7e40b8bce2a49789b18014e22e040036816638feb4cd96ce2d2ddb34613f5812a94f5158390169d2fb0934042ce45 SHA512 521399ea4b5da617a3fbb7e291215f4a17d7f0f54f11708d5d3467b43376123abba90586d61a740876770017c6d77a14ef2152ce50cd1816e931d04189ce6b23
-DIST python-designateclient-2.9.0.tar.gz 82386 BLAKE2B e36b3f66ba37b5024170c8621e293d3f1a9c50ec7ce76b9d5411e0a51b8c850fb0d104a6ee82c3f6c0dba962c05892650cae03d675e241cf17f0894eff8b2247 SHA512 04460395cf1b76d8628001e185e9301cc4964e06a61576268beffe5fbc42196e1c4015d0f273357fb93fb7b5079975e356eb25fb144cd4c1d355e704a1948e9c
-EBUILD python-designateclient-2.11.0.ebuild 1113 BLAKE2B 39066744d8574f809b2d40d33d0bf6ab8f39a8d7c3b6f084d08513f4c076198dcc95e013201be192cf12b256ef2d7f8031e85ab96ec83c96520c27c270b2c548 SHA512 f79986a0f12ef1f3549311b248ee928ba1fecd324e90e8987dac0f6cfed5f1c27f41eb4587ed83d986e7fcbbe73c58032f6c7f51c1710e54a88165d23334e7bb
-EBUILD python-designateclient-2.7.0.ebuild 1112 BLAKE2B 9148318cec5723cbc259483cfc0effce541e6d4b322c236229e2a7a24341db2cc36f1de3f3068b64791e9697151c7a662129623b8f6b38fdf4ccd2e9f4160dbd SHA512 ab439bbae985781299001aa002929ba6099052378dadce5d5e2e01a3d131bd9b5446e14c83c11a56197acc6b3707fa3ec65091a2cf4f2aec42a069b0ee71cdc3
-EBUILD python-designateclient-2.9.0.ebuild 1111 BLAKE2B 9210d92a699c936f20f22b83fd8b6f891e83290da3f1601bb69d392ec4e587b990eb76849c372fd3304b154e27c1749207fc0191cedafff2cfe9208ac321e636 SHA512 b5dd1a20d44a2e0e4c32464657fee9ad8fe1cc6b0720a819999c2e02c312f9b6e2418cc6cadaf88a1944b1130ab3d499830a4834117faa80daae46f79681aa3e
+EBUILD python-designateclient-2.11.0.ebuild 1101 BLAKE2B 0900bb792c8791b953b60b9ca64ff9c8822e102fa38552baadd4e434889d7c251bcbcc4525908dd54faec5ac1b083c02c4dfbcb0c6654ae92844e96c9da6cdac SHA512 babeb6af4295e2e76c89802519e34abbe28ea43abacbd675db6d73fd6eea93b9c06614621d1b60717c469be7c17faa811774a04aaaa92d678520a19c51993e9d
 MISC metadata.xml 620 BLAKE2B 5fa33f0a7ce50185042950605d92a30c786ecfbcf0cd6ce4b948623dbf9aa18192d832f9931715d898802f644b814b11940a44d8a18a9f659453ea1304f27ddb SHA512 b42ad7a3863003103bfb4660e9b2ecd02a4ea927337c0ddcb6c3cf0f04562f86f09174218baec94df52f082b0f2b4c8fcf94a130c4cb08ea6f7cb70972b4ba9e
diff --git a/dev-python/python-designateclient/python-designateclient-2.11.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.11.0.ebuild
index 434497dddd33..6be2f60a7905 100644
--- a/dev-python/python-designateclient/python-designateclient-2.11.0.ebuild
+++ b/dev-python/python-designateclient/python-designateclient-2.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-designateclient/python-designateclient-2.7.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.7.0.ebuild
deleted file mode 100644
index 09584a428317..000000000000
--- a/dev-python/python-designateclient/python-designateclient-2.7.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the Designate API."
-HOMEPAGE="https://github.com/openstack/python-designateclient"
-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[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/cliff-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-designateclient/python-designateclient-2.9.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.9.0.ebuild
deleted file mode 100644
index 0da67647dc1d..000000000000
--- a/dev-python/python-designateclient/python-designateclient-2.9.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the Designate API."
-HOMEPAGE="https://github.com/openstack/python-designateclient"
-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[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.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}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-digest/Manifest b/dev-python/python-digest/Manifest
deleted file mode 100644
index c47717be428b..000000000000
--- a/dev-python/python-digest/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX python-digest-1.7-unittest.patch 331 BLAKE2B 311858c9aaff3a99ee092b3711fb84e64f2d5b79ddbcb22154096c16d0faa211f77b77cff2486468c3b55aabc5fbdf4333060220268e1435fc28c7b366c8a2b1 SHA512 65b8c0cdceaa81fe816232b689579ec9a38bf98d7eeef17013588078b9a7a2c63ce54559938034704f8a4fb6605b07dfa70d500c03e7f2657602151321f68809
-DIST python-digest-1.7.tar.gz 10073 BLAKE2B 0e35bfc3958cc766978f383942ba933c7b838f32449fdef1121763afa49e676009d16b93fd62e221a8129a750893082ce0ee40fd579baba226f0f418d8bf0991 SHA512 15bfdb8e42275bc8f7fbc10f6f8bcd109852c57b77e98c8c2251784278fb135db494b0224341d34626ad49ea4db2a8803b2eb89d70d88b704819f4e6ca10f7e1
-EBUILD python-digest-1.7-r1.ebuild 699 BLAKE2B 5e4a97ba0540ef8dd67e5cd2784b03f85f11c3d82be17d7d1c3532106645ab9645c3715ce554833d0873b20b4828fad44c783575c9b99b18bbb0e15959422847 SHA512 867dcaf217169357e693da0aaee3de44072838cb3c163fabd0587b775c709e49f488de838c469de937970c519edb3e5671b0a294f5ee3e04fa682986e032de23
-MISC metadata.xml 390 BLAKE2B bec14e5f33bae97236e7094905d7e0d7d864ae76c4021ce12627e94bb99c927a24216a15ed65e441ad0bca377f3e8aac1169e2082b7fd4133b3f4ff072d83703 SHA512 1ed20fa80e8f527aa8294af69062629a1b4f166f7f95c9cd7b2854db22fa22f67b5f0dd49109a9fdc4fe4056467833d9c8af58ec838ac312f1287fe5c552b9ec
diff --git a/dev-python/python-digest/files/python-digest-1.7-unittest.patch b/dev-python/python-digest/files/python-digest-1.7-unittest.patch
deleted file mode 100644
index e3abe0b77c8f..000000000000
--- a/dev-python/python-digest/files/python-digest-1.7-unittest.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- python_digest/tests.py.orig	2012-04-25 11:48:30.212254059 +0200
-+++ python_digest/tests.py	2012-04-25 11:48:58.371585156 +0200
-@@ -486,3 +486,6 @@
-             for c in s:
-                 self.assertFalse(fs.character(c))
-             self.assertRaises(ValueError, fs.close)
-+
-+if __name__ == "__main__":
-+    unittest.main()
diff --git a/dev-python/python-digest/metadata.xml b/dev-python/python-digest/metadata.xml
deleted file mode 100644
index f8d390e6abf6..000000000000
--- a/dev-python/python-digest/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">python-digest</remote-id>
-    <remote-id type="bitbucket">akoha/python-digest</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-digest/python-digest-1.7-r1.ebuild b/dev-python/python-digest/python-digest-1.7-r1.ebuild
deleted file mode 100644
index d5d48380fd2b..000000000000
--- a/dev-python/python-digest/python-digest-1.7-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 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python library to aid in implementing HTTP Digest Authentication"
-HOMEPAGE="https://pypi.org/project/python-digest/ https://bitbucket.org/akoha/python-digest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-PATCHES=( "${FILESDIR}"/${P}-unittest.patch )
-
-python_test() {
-	"${PYTHON}" ${PN/-/_}/tests.py || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-discid/Manifest b/dev-python/python-discid/Manifest
index 8d77d186ec02..c6e85b8902bd 100644
--- a/dev-python/python-discid/Manifest
+++ b/dev-python/python-discid/Manifest
@@ -1,3 +1,3 @@
 DIST python-discid-1.1.1.tar.gz 30454 BLAKE2B 4ddf680ef824498ce1db318718b1f55067538a6f1e772df2c83b2cf6c9e75ba2b068587d447307a771dee6fe20725d64309e78b2afadfdbf8f6a8673dc30616e SHA512 b040137162a2588c653f390a4d0b549b322bb4e2745a3738c1ba72a1984722358fc85a306f4cd5d41c1e599e40d01c6e2b08d67951a820c2d1116d96eb618c8e
-EBUILD python-discid-1.1.1.ebuild 733 BLAKE2B dfde2898e89c05b0f469387ff3ab12bfcfa159260592d35ed762b1a1d5b8f0c6d8168b88baad29a35e37c21c6cf611dd2a9f96585a5ea07e75a32d163d68f701 SHA512 cf091b864333883f57019ea894640a0b7900eca3867058aa730e47642f9e9afdcc5fc5fc35c4c3cacae7293b310e8642883355193d59e190c562e6289cdd7ace
+EBUILD python-discid-1.1.1.ebuild 723 BLAKE2B 851daafc050ccb2d24fedadd8cd0191281edf902f4432e84a65e0341e1926bc0f20d37475ed151801da717115575086cc1063274a5c11025bb9f2aadb7f4e274 SHA512 24bbf6a159f2e7e17ffcd99becad8c8f753ed6dc16a9d01d497522559faf6e029f5166580bcb065f6542275143ee1f8fda95854fea43e26c182b04c799f78eb2
 MISC metadata.xml 336 BLAKE2B c6fb10b79d120db82b11418fa0c99466b7a34b26bfce044216ccbcc7e2fa7fd17716c3a5d1c64c14fba22452943700ffb691592bf9255a6a89b028a43ecce56a SHA512 1a863be4ff2f8741d43bf7cccc8e18e678abf401faac599a32ca363444376ecbebcba02706863d1b750d695561047f99a8777d34ed62ff5a05ed6bddf4e6f5f6
diff --git a/dev-python/python-discid/python-discid-1.1.1.ebuild b/dev-python/python-discid/python-discid-1.1.1.ebuild
index 1b53ca29f342..7c4172a6df4e 100644
--- a/dev-python/python-discid/python-discid-1.1.1.ebuild
+++ b/dev-python/python-discid/python-discid-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
index 97098d1a7195..a1f2bad3916a 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -1,8 +1,8 @@
 DIST python-distutils-extra-2.38.tar.gz 27748 BLAKE2B 5f47e27dc639a6259a812bd618d35c4bc0a39362f3b7bf1a2e35331dfbd06b6b16a3030e125a8f5869770324a8df6eb446a5855639ed1b83379297509ea48891 SHA512 bbaea59a8f251f354e6cf3799b67c12225095cc869c7c4e299e719ad7bcfd1292cff99f95ab25f04fb9c3e2432da5ea614ee76154781388c47960fdf2c90a3d7
 DIST python-distutils-extra-2.39.tar.gz 27389 BLAKE2B 06deca885aa283e0a52e38c89f71637573d45d73dfbace5a06b4bbfa04098a7fa4fde1c2891bde5cc5ed3a3a65e31d243feaa8465a4fddb4623435e7a47c902e SHA512 e3b4d1ed22767fb4c6dbbdccef960865b6fda01d18dc38cb8f9357c09c7eabb78466fce053e407a196eca257d07d57c5c1ef47f358a5979c7f22e4b11775124e
 DIST python-distutils-extra_2.42.tar.xz 37996 BLAKE2B dee4cc950bb34027b60dcf58e173bae502a7090062e3c2218fd2ec562d6350f5872ed5c0865b89f1463bd35be0f365f23e05bb0220f70a944181af40df42ee60 SHA512 ff0df0a25a29504bec89970dbbf24d0b618e9f2d5d07a037f67778b86c92e880eafee86dd102b4ada4f280abd3102de9f4a4e47dbc68c1eaaa05fb492cbbae29
-EBUILD python-distutils-extra-2.38.ebuild 1063 BLAKE2B ed1ba60ec0d9a2a4193550c54597a76e7e9d428670c0018e38bc0dd0ebb24ee5918f5d98d210851c74c7021cb01a3ba6b85390c1504faa2b568e154e5c37c206 SHA512 89eaea3dfadb3e385f17dc05eacf7d36f2766114be278e82a43851a1b313bda100b10dcfb03aeab42c59e8dda546ca45f40f47db4b5f1c24fc1838131416d320
-EBUILD python-distutils-extra-2.39.ebuild 1434 BLAKE2B ccfe4711062b806328eef64102c2d1a41f5c0da2828eccb72fd4bdb4698e8249d3e46668b104bfdfb4ed43cf4ced45690695a5c51c26387cb27383a57402f11c SHA512 c9bb28f93279d96f96c670d5cc7b2beef93472df7d9cb0237d2f8fc108578c17d31d4a3f7f755c01f08142ae698f89ac8dd8a02bf4fc21cb685b5eef367e7e5f
-EBUILD python-distutils-extra-2.42-r1.ebuild 1423 BLAKE2B d3c564fa3d1905524b09c5229156f1adfb271cde53ef71278dd5390fa2c6f8a8660818e6573b63074ef7c9e953773f43562df700e2a77a17b33c3de0779ff9c8 SHA512 7434e51b7c1e94d6b0131d7a1e5cba6b16d7395695582a05920374c5848d8449867d3c24c425ff1f01f07319e626c0c92e328548424b64ab67982bd6391492c3
-EBUILD python-distutils-extra-2.42.ebuild 1435 BLAKE2B f4ea6787f3b27d08161fcb5f276576e0b15a6f64306e2c7290a0059c29cb5732412d99c69d1c8c8c107e54a92b3be70294d31664708a06a4a5a37d5c2d2fb4b0 SHA512 c79ad758ea21e522f002fb88876ff63672ca8d6bbe5ce4ebbd12598d8675b3630c6833526ceb3f445867f93f80050f8129ef6c5754c42aa4c20f7d882af928b9
+EBUILD python-distutils-extra-2.38.ebuild 1058 BLAKE2B 1c46be026dab3aca2b6b4d31b9ab87661c8ecf4cc49e4b186c1dc498413f07944f6b8fc2642824bcb5a0cdf26f93afaffefe5e2e4494f111ca44644a1f8eb60e SHA512 c817b24fbad56aea283d4737adbdd0567fdd4de8eae986a4d7a0753a6baef1ee3711c37d784b4a7199885c70ecf723d69f7f34f42f47719b5e17832cabc38796
+EBUILD python-distutils-extra-2.39.ebuild 1427 BLAKE2B bfcc8654f9d5265de4d768c4936070ad58ecd407ac0d527e2d5707226ba18a7fad94d27d9abf810557034a9f70e883d38c177765d76c67e302cec4ce70c5a8f7 SHA512 0c446cfbf921e7ccc501145cb305af19ae361cf13a7936f8b687c627a6edefe57d91d14a989b196b7e5bd04135e35c445ce7a61e83922a8868e2e6e45f172bbb
+EBUILD python-distutils-extra-2.42-r1.ebuild 1416 BLAKE2B 6e3afe9d76b9d7f698175bf064b3ce4a7e2f9c0924c1db9ad6b9d96abcadcdc9bd62f2c9992759cbce2dc3ff476f700faea3a2850e80d6212c9ec4441bf2ce72 SHA512 987ed8e1224112de4628410e9ecd3f1de1375af5f0cfcc1459a95c217e3b71e0a30105b0a6cc9efc6636f99d09789644e2a277346cca81a9c98d4125cd634eee
+EBUILD python-distutils-extra-2.42.ebuild 1428 BLAKE2B f4cfc18fd0a0bfb05a343d7fc582f05880dcbd1fafea71a9d3917c33c7619a188257a5728d7976841612014eb70bb9732a00742a18408a8fa05010cc1e9aa323 SHA512 337af6ac668a07533925913c367a73bc934b7b756a533aeb8c3d1e8b28a65771946ef794ad8482df3b34f111d1f35fa8be953f8ca9cf3dd5e768abc82546d8a7
 MISC metadata.xml 401 BLAKE2B 6ba770986ed5364c9311bbf2a48957c0ec46f3c16e7718b564865b9ca7459f3c64cbcf6ee04c4b66564429e7f6714b0a128f83f2bd0d33f062b3670210d11858 SHA512 0dfe7658fe14d75a542a901de11983e7e0d8663b158032f5b8a71814c4caa93c14b4bc32e422c49a19550544c1b1fd4075be8a6644f0ea780bb23e1adc65b402
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.38.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.38.ebuild
index 408dbc4da29a..35c8e55ac67c 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.38.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.38.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
index 0cf77cb9873f..d361314f14e3 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.42-r1.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.42-r1.ebuild
index 62d980be4a82..fa75c797cbec 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.42-r1.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.42-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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_5,3_6,3_7,3_8} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild
index 532623b92a62..d41bb4926e49 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-djvulibre/Manifest b/dev-python/python-djvulibre/Manifest
index 250eba17caaf..52e7b2431d3c 100644
--- a/dev-python/python-djvulibre/Manifest
+++ b/dev-python/python-djvulibre/Manifest
@@ -1,3 +1,3 @@
 DIST python-djvulibre-0.8.tar.gz 85436 BLAKE2B fa30c4e78ce41a0f8c3af1580806f82fe856ac7012cb26dd7380158f5a0fb8b78d9f6e0bacbaf146959db7334fca4afec9caa324d8c2d6af697b3e0a171ee1ee SHA512 c817fc518f398bf16664a5f5dc80e8bd086015c13f82c5265548e5ca5d90f293cb2132961ba8a73cb184bc7883bb5868d2d49ecd950d045d0729f876703e710c
-EBUILD python-djvulibre-0.8.ebuild 706 BLAKE2B 1ce4ce6232dec9f627fa8dd518101c991024bcb0667949861734b11a79c7ea6af7ebeb01048a8c353c2dea3b6976479a5b36da90f9f5e4e6ff33958f1f08c97f SHA512 f39ea104daa3794ab51df91d6b959daf0b5d85cfdd00a44b0d1e396d57070c7706318a816f940955d10f721e7a845ac267a61cc0bf11611136ee0e7bd495db9f
+EBUILD python-djvulibre-0.8.ebuild 702 BLAKE2B 14baab9d456f5ab5c9ad0bdde9db0e654cf0f17defb49c811865073e0c95ad74994aff4e4470e49a2742b5cffe69b38b25caca672fc3c0eac345695d65cdaf99 SHA512 59888479e5bfbd3bb049f27bcd4f106f00ed4c4cb75a84ead249824eba521bc68a966bcb63399918a0a884f36601cd4ce5b5bc0732c2ef8483199d70e7a12af5
 MISC metadata.xml 246 BLAKE2B 9254d9230f40389806de235731356f89790a3a7c9bd8c3e78173cea5f21921ec2da32123b44d64e8630c1191d0accc2e922e3cc8b86d7edc4a7f42993d9b97ce SHA512 6099e01ca48241e19c169add69c7f98fcb503ab4726bc60779c5195c0f3b5f419112a7973eb477cdd3d6a60f34d99d821fa41f17b04f639de5e551e90f5164b6
diff --git a/dev-python/python-djvulibre/python-djvulibre-0.8.ebuild b/dev-python/python-djvulibre/python-djvulibre-0.8.ebuild
index 96d1af26d47a..9ad0623b5d67 100644
--- a/dev-python/python-djvulibre/python-djvulibre-0.8.ebuild
+++ b/dev-python/python-djvulibre/python-djvulibre-0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 34a9aa88364f..d738e0fd8fc3 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,15 +1,17 @@
 DIST python-2.7.14-docs-html.tar.bz2 4604956 BLAKE2B 743f3cf0c741916d2efbf8ebdee077800dad7d9e38fc7a2f60e2fb8f0e3dd3978fda8b286fccd6cbba87ed3e6fd289401019131c00a03809a1528533cd29488d SHA512 3a8c0e8d083880e5e174090eb39514b27b0f00021b3874a2ffcfcaf4d43020764d9d8415d2387e0ce8e59e6e193571cbad06dbfdd1d30f8be06e1f27b375bc10
-DIST python-3.4.5-docs-html.tar.bz2 5521895 BLAKE2B 59a9e1dfc6339edf2d8de498013383fdf8c132dd4f2e58c9054ea22229a305a2aa140d8d4e1703297c089ac206081d97fd0100bb6f90c0b7353f30f9df3d3274 SHA512 241a2bf46a2ae6606bcdf60c456e909d5c84c8c82661f38b621a91869c51dd0be980a5d7023d12fe98c2eb60b0ad913c67e7f94698c7ad1015d56c6592504bc2
-DIST python-3.4.6-docs-html.tar.bz2 5517260 BLAKE2B c8e605a3b27358c22e2047241a4b92b3918a6fff0ef3b8cc8153ca6fd8d17eb38e58f83f47e27a0b19ef73f3a8339f28dfcce7df621c1deeadc6fb746522d2e9 SHA512 a561ca54fe3fd8b9f1a419eb95ffd6001eaa303bf0b5ba75f726915d94926d3ddde0b918cd7ac8897e202b61226832d332aeb748ea1cda22db09132ce64c7c0d
-DIST python-3.5.4-docs-html.tar.bz2 5747840 BLAKE2B 013791c8d0023ffa3d3e07ecfbb82dd36d2fc3e14514f4e14ba90e3d65d05aa4c3ec7cf7c86fe88090dfa0323c444acdefafa36aa315c98db1b5f7af9c0bd5fe SHA512 b1c6028e91bdb0a85a6765ab66c50574804f0aa799c6d13ed4163e6aaba98eeecfacd8576fbb6a721028fe84049ac1718497ad491f993973e3e410a660a10084
+DIST python-2.7.17-docs-html.tar.bz2 4605137 BLAKE2B 40d67a1443fd8df792e6721354efd62116352980e9353f7d334d4f8f1fba64ed7fd87b011cf1ebf47822607bb0ae970d47246bb83370cc922a51a85fd433357e SHA512 e0f1b2c75297dfb7b0b8913423db0d6ee9fde171b346831244fae5a783c2f834ef49dd137d835d4f052bb65a5962e051835b298271ad679dcf19b1d9118d968b
+DIST python-3.6.10-docs-html.tar.bz2 5994263 BLAKE2B 5491942b7b19af3a880dabd146cdc5c1fdab583eab8cec38554c92afc824dd8d011553cfad957fb68abcea102f41436f25a716a28356ed7f18e6f70337d2734b SHA512 67a0e7973da0314031d9a8993cef4947b8bcab86c2c557364a3acebcc9047529acf22a26f16a26d3126489bc813d6bb7bf39d3e283c490bad434f215af92f754
 DIST python-3.6.3-docs-html.tar.bz2 5945784 BLAKE2B 88473f63c6a0d533d568184b8459353bea3bc49c24a0a0e5f3ea240556971f3a76018f08f18371b8c7cdeaee93c4cf466fb20eb774db96ad4e63fb45ce730e26 SHA512 ffd6ea459ba36b19c788638f7e2f72ecd286218ed7eb29493819137c4bc25c02714128f07b781ad642eb08826d00924bd1b90a236ba46107bbe17de6633fa1ad
 DIST python-3.6.4-docs-html.tar.bz2 5955729 BLAKE2B 71e6e198069297860ac84be125586cb5757a34e2b342358517d62656734545fc221812f3c54cdbdb877188648551c3e1cc9331f159d011ca2b0bef587847a471 SHA512 a4cf51ec0e7127f417b066e2727258395954dfc5f1aaa0ad1d25e81dae40ace0d51b18413600fce0f5b1002e4b130a3914b7c9244025375e8fe5332c8d86635d
 DIST python-3.7.0-docs-html.tar.bz2 6222504 BLAKE2B 150382e6ce9c241bf8654efc2c7515e1399291eca38b91c44c51d24302fc239a764af7d22dcc69378338cb3c0f7e2d7e517af238f8c38f32be8a76037880206c SHA512 f5583e8d2792932ff3c90575ce98446f0f11eab3a78a1ea8df0203f29583ff9c2831879817ae5fb23cfdb32238d385361b7956c352c6431e9801e6509d3c5f09
+DIST python-3.7.6-docs-html.tar.bz2 6248802 BLAKE2B b2baff27bf3fc61ebe521b5bf621c265a50336d63ec8c2e14f8f2fa75b552fa4f959b3448ed39ebf18bece46cdc14f8a7a62cae3fcdd4f44e3db09489807bf4f SHA512 52657627dfe088184afbc0827731cf919884f21ae483c934a84e1e93bd1b03fe7b948da8ea8dfc1ba80e0557504d14eab729d22b7230000ba34731e1b866a253
+DIST python-3.8.1-docs-html.tar.bz2 6527362 BLAKE2B b13fb15b93f7a244e082b7cc8ceac6fffac5b81bffa5c183c546e19dcf8839ad227d3263cc5662717e46f1daccca7dc1299260c1cadf601ac43dd61d501e256f SHA512 5cfcdce2fc12824d512e59689b070541f461404ff74aa5ab980576af95449c18c9340687a405af6ea48f7f1826f85a26cd86dfbe07acdb984687bc0fdb5a8edd
 EBUILD python-docs-2.7.14.ebuild 685 BLAKE2B cdc451f37cdd1248b589b5c922d0eb754b6c8cbb0f62624a31c1ae5f97687e97392c415fdade1b49eba3c3eaa384ab19b29f574ba691f75bec707263db85df33 SHA512 6b1a75583c9a74bf486039dc504519b7e659af37b2d87585c49af4ca01a72634e38ec9973ef0d24b2d9923cd94c285a3fc0720439ac31acf4b701c1071f4962b
-EBUILD python-docs-3.4.5.ebuild 685 BLAKE2B cdc451f37cdd1248b589b5c922d0eb754b6c8cbb0f62624a31c1ae5f97687e97392c415fdade1b49eba3c3eaa384ab19b29f574ba691f75bec707263db85df33 SHA512 6b1a75583c9a74bf486039dc504519b7e659af37b2d87585c49af4ca01a72634e38ec9973ef0d24b2d9923cd94c285a3fc0720439ac31acf4b701c1071f4962b
-EBUILD python-docs-3.4.6.ebuild 698 BLAKE2B 78d13344db43878ba36e7965152894ce1c6ff0de794e822792dd8b029bc5bd4642ac12f5640bfa407ccc3674cd74094752d65c1e943353ac459877051cb91a15 SHA512 35652bd2cbd136cd7cec9bfe268df42382cf70e29f310cff8153237c5bdc8e168c7072ed037de4b00fd538e98a96d8026d49a838ec07565e7347f68a0adbbce3
-EBUILD python-docs-3.5.4.ebuild 688 BLAKE2B 5bc29f99ad36e829cd47d60bce58ea1bb7dbd428365f0048051cd8810cd008b4f3b12a04c01420bfc956fec73426bbd0d0bbac511205d25a8403fcbcbeb3d2af SHA512 aa71c54cb695c7ae87957b7bb752e9b26a7beaf996ae8887d3169e9dc93a7b201fd310af28c26d17dae1718f4252bf8acfa770299687848ceed09d0305aa7795
+EBUILD python-docs-2.7.17.ebuild 639 BLAKE2B 90fe3bf4b5f2a85cc6690cb2e3ecff8f971309aaee674fa24693e0e17c139c3aa3366e0808af5d8d2c2fdf277da5765919d0bc8bcee905e8fa3c79b8e72727d5 SHA512 82276743d65be4eccd83a1c11d78182cefbc680e47a0c5969eb5ae25d1c3f23ea0a924a7c27e7c769860b68ac8c4ea6bf98eeb432119da3ed1a572a488419814
+EBUILD python-docs-3.6.10.ebuild 639 BLAKE2B 90fe3bf4b5f2a85cc6690cb2e3ecff8f971309aaee674fa24693e0e17c139c3aa3366e0808af5d8d2c2fdf277da5765919d0bc8bcee905e8fa3c79b8e72727d5 SHA512 82276743d65be4eccd83a1c11d78182cefbc680e47a0c5969eb5ae25d1c3f23ea0a924a7c27e7c769860b68ac8c4ea6bf98eeb432119da3ed1a572a488419814
 EBUILD python-docs-3.6.3.ebuild 689 BLAKE2B 43bad539aac8c7859cfe282ea0f45f377473cd71785b15c011f38a42b230ace2857bcf6d5855155cbbe3dda1edbb885e6b1f16cefa0821e57b2f97c779fade27 SHA512 1c6592ea8ddbdfb25fb17342d9db9213dda79a97f75ba9b6bd5b43bd708e03ded813c2d38a501bbc4ade7b994ef82252a383875d93e899bc68409c8bff9adb21
 EBUILD python-docs-3.6.4.ebuild 698 BLAKE2B 78d13344db43878ba36e7965152894ce1c6ff0de794e822792dd8b029bc5bd4642ac12f5640bfa407ccc3674cd74094752d65c1e943353ac459877051cb91a15 SHA512 35652bd2cbd136cd7cec9bfe268df42382cf70e29f310cff8153237c5bdc8e168c7072ed037de4b00fd538e98a96d8026d49a838ec07565e7347f68a0adbbce3
 EBUILD python-docs-3.7.0.ebuild 698 BLAKE2B 78d13344db43878ba36e7965152894ce1c6ff0de794e822792dd8b029bc5bd4642ac12f5640bfa407ccc3674cd74094752d65c1e943353ac459877051cb91a15 SHA512 35652bd2cbd136cd7cec9bfe268df42382cf70e29f310cff8153237c5bdc8e168c7072ed037de4b00fd538e98a96d8026d49a838ec07565e7347f68a0adbbce3
+EBUILD python-docs-3.7.6.ebuild 639 BLAKE2B 90fe3bf4b5f2a85cc6690cb2e3ecff8f971309aaee674fa24693e0e17c139c3aa3366e0808af5d8d2c2fdf277da5765919d0bc8bcee905e8fa3c79b8e72727d5 SHA512 82276743d65be4eccd83a1c11d78182cefbc680e47a0c5969eb5ae25d1c3f23ea0a924a7c27e7c769860b68ac8c4ea6bf98eeb432119da3ed1a572a488419814
+EBUILD python-docs-3.8.1.ebuild 639 BLAKE2B 90fe3bf4b5f2a85cc6690cb2e3ecff8f971309aaee674fa24693e0e17c139c3aa3366e0808af5d8d2c2fdf277da5765919d0bc8bcee905e8fa3c79b8e72727d5 SHA512 82276743d65be4eccd83a1c11d78182cefbc680e47a0c5969eb5ae25d1c3f23ea0a924a7c27e7c769860b68ac8c4ea6bf98eeb432119da3ed1a572a488419814
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-2.7.17.ebuild b/dev-python/python-docs/python-docs-2.7.17.ebuild
new file mode 100644
index 000000000000..5f4f82981932
--- /dev/null
+++ b/dev-python/python-docs/python-docs-2.7.17.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.4.5.ebuild b/dev-python/python-docs/python-docs-3.4.5.ebuild
deleted file mode 100644
index f5896c169c90..000000000000
--- a/dev-python/python-docs/python-docs-3.4.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-S="${WORKDIR}/python-${PV}-docs-html"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}" || die
-	doenvd "60python-docs-${SLOT}"
-}
diff --git a/dev-python/python-docs/python-docs-3.4.6.ebuild b/dev-python/python-docs/python-docs-3.4.6.ebuild
deleted file mode 100644
index 68b18149ba67..000000000000
--- a/dev-python/python-docs/python-docs-3.4.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/python-${PV}-docs-html"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}" || die
-	doenvd "60python-docs-${SLOT}"
-}
diff --git a/dev-python/python-docs/python-docs-3.5.4.ebuild b/dev-python/python-docs/python-docs-3.5.4.ebuild
deleted file mode 100644
index 54fe90c8c135..000000000000
--- a/dev-python/python-docs/python-docs-3.5.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-S="${WORKDIR}/python-${PV}-docs-html"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}" || die
-	doenvd "60python-docs-${SLOT}"
-}
diff --git a/dev-python/python-docs/python-docs-3.6.10.ebuild b/dev-python/python-docs/python-docs-3.6.10.ebuild
new file mode 100644
index 000000000000..5f4f82981932
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.6.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.7.6.ebuild b/dev-python/python-docs/python-docs-3.7.6.ebuild
new file mode 100644
index 000000000000..5f4f82981932
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.7.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.8.1.ebuild b/dev-python/python-docs/python-docs-3.8.1.ebuild
new file mode 100644
index 000000000000..5f4f82981932
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.8.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-ebtables/Manifest b/dev-python/python-ebtables/Manifest
index e10da3e31365..66d6e943467f 100644
--- a/dev-python/python-ebtables/Manifest
+++ b/dev-python/python-ebtables/Manifest
@@ -1,3 +1,3 @@
 DIST python-ebtables-0.2.0.tar.gz 20290 BLAKE2B adf76b13d0f008ef422789e93e61748a07b348cc8575ed3ce2d73d3f21a6f20fce654e33f6cdb9283708aa80cbd2aa6de44dff5726a032ee198a9e5a7b70b29c SHA512 7051672d205b8318dcf7d08b50c8e0f66d9bb6532794d9292a890c5f75a88845f9e0cd9abf41450bf2a0516623c494eb40330021dc99320e5e0ffa56c75b100a
-EBUILD python-ebtables-0.2.0.ebuild 516 BLAKE2B 359c0f96803d1a2e8c6449961540a6f4819e7d9b3ca3f2a945eade966b1564c4da5e40890dd48bbdac58dc9319ffbb7898d39481c15fd0dc236becd4bcd6cbde SHA512 5d3a7734062725345908cdec62d37aac841e6b0dd5d467266d1ac5edf6b95e1699be6c37f2f404a8631fd23bbc068fb1499b9c0d47c06c1f20226aa54f77cb59
+EBUILD python-ebtables-0.2.0.ebuild 506 BLAKE2B 3f3db31cd551cad143a5571bdc5a43b4a0bc9352f55a79fb41ca76778d91c6e190a7df55b28a90e68103e9d280104d9e5608f1e1a548a13dbb3fc19a402ebe4c SHA512 8e5b5b860a510dd3cbc93c83f05188cd84c46552cff02f5fecbff68cbd53145e56fa2b7333c1809b095c7eca038085a3f15fdb28e02c6f6e03707d53e7956d75
 MISC metadata.xml 508 BLAKE2B 08df10ff65a77f2168fead03d57f4d7352b5e7a790d744dcef389abbde88a2cc80f34aa6a156c7f679f95afc48d40f0a125ea30345f7a95e18a37ca4997069fb SHA512 ff808d70776d0dca06f0fc88f0e4f5fd873a85bd9e37d9cb86c88e1d72e24496bb273be2fe3735589884c53621425f1e7b17af2d11d69b96e559e8235141deb8
diff --git a/dev-python/python-ebtables/python-ebtables-0.2.0.ebuild b/dev-python/python-ebtables/python-ebtables-0.2.0.ebuild
index 586b08527d4d..479b4512df8c 100644
--- a/dev-python/python-ebtables/python-ebtables-0.2.0.ebuild
+++ b/dev-python/python-ebtables/python-ebtables-0.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for ebtables"
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
index cd202c713550..47ec2833e941 100644
--- a/dev-python/python-editor/Manifest
+++ b/dev-python/python-editor/Manifest
@@ -1,5 +1,3 @@
-DIST python-editor-0.4.tar.gz 6516 BLAKE2B 158d3a656bf5163a0e97fa5212c49f2c9392afeb9133ef2984b2cb49254246ea86b4575d98dae0ebd58452c315dff78c2bbb89c08066189e34bdacb41caf713c SHA512 f1fd4660e67e8299a6f9183e85a1e213e1156542d84eae6644e4f42e5e2804f813857ee50bd8833728b320415ee6f2be5df4ca69acb10a709f20d2306eb5e7ad
 DIST python-editor-1.0.3.tar.gz 6975 BLAKE2B 23a4b0990f8715eb0b0ce538f1fbf47d61cf7209588c8be31ae3fb047c706eaf2628c04b29dff517a221676566241f066053680749ab864d067334f875796eba SHA512 258d1ea17ea1c09d8ef52d3b624cc17710559f4a8db3c64696f72aecfcc0830d3509dcdcc9d1ac272155b2aaab432edb7142b0a37f2c3263a2505bff940a3cab
-EBUILD python-editor-0.4.ebuild 501 BLAKE2B eb650148766f45967d6cdda9f31e7870b93216070bf12c4f979db339989e1255fa5f59b8fae4ebdc0a07dd82c6c68b252cce6bb2fedb495efb986039cdbd0b04 SHA512 dbcc60c2186c2e85a0bac602f118f84fffe6aa3df65f887e4a0f059fdcdb0b57336d8f7b73dda2d3961a3552e87c34d1d6f03b40e9b71418ada3d01b16416dba
-EBUILD python-editor-1.0.3.ebuild 510 BLAKE2B 78ec6e071c08464d542b4a6bfaa9c33081cccafa70cfa1bea021becd458d98b18c277ae54d5a20077a0f49e25b352e98ad11dc2bfa2f9a4af6698cf7a24119ba SHA512 770bf1a042348dc03bf775a82d1c4459bf16091c4851e2735b45e9e34d6f6eb649361288f71a3fafec657e0da53cfb0d353f5f238ea0104ce0c7ecf6d8f9849f
+EBUILD python-editor-1.0.3.ebuild 506 BLAKE2B c8d352b89f78b138d8da6929af94250e7a40350c0416b592eefeed3cf76bd21aae0bc9c3e01a525a37fbd568cf1f710c2f8cca27d87f6b80e7094b096a76c661 SHA512 77d555dc2c676c343deb92ec40038371de3135ec8387467659a9c6f0510b50b6c1917a6b40e06e218ac87228867fa7fdc0e6b9f0e1dd2bb1867f8f42c220830d
 MISC metadata.xml 454 BLAKE2B a005031053af09882cc6f9e0a928d371d118cb44207567094e570b65a7cbc69c210ae2cdf6487473ab7d12793126953ef9fdf1d2954d9c31b58a2e783b563378 SHA512 2a75117477ebfe097dc4791d65581ccfd010406eeb3d5145c237edcee0b3af409ccee45abd83b18798ace1196206343a94032058f53e20a708c30ddcebe6b432
diff --git a/dev-python/python-editor/python-editor-0.4.ebuild b/dev-python/python-editor/python-editor-0.4.ebuild
deleted file mode 100644
index 32e2b7a7ca00..000000000000
--- a/dev-python/python-editor/python-editor-0.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Programmatically open an editor, capture the result."
-HOMEPAGE="https://github.com/fmoo/python-editor"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-editor/python-editor-1.0.3.ebuild b/dev-python/python-editor/python-editor-1.0.3.ebuild
index 0bf54a536ccf..2746008465fc 100644
--- a/dev-python/python-editor/python-editor-1.0.3.ebuild
+++ b/dev-python/python-editor/python-editor-1.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 8c29ac3820ea..fae0b2d8e226 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,5 +1,3 @@
-DIST python-efl-1.22.0.tar.xz 9523624 BLAKE2B b1b7573da8546f580dcd06be03e4746f2e991245c7bbc3477090c5a9365225bca663454a202f8e05ec6c73cbfb7496ee5f92bc2a9997900e6709b01017740db6 SHA512 27e29af764166e803ce6a833c8249a91226a4315dd658631cec57513befccdc9407b04b452054ceab3f77b429d899095b49dbada2e0fd1a63ff6059ef200e497
 DIST python-efl-1.23.0.tar.xz 9524832 BLAKE2B d738d3481a0805490c756d38fe169e7d54d9b4c8d6b18ba45265db029b28e59eec8d711675c3fcd52500e19cda8cabc49fb0a2d052d2b9be7800ff9f6dc78f75 SHA512 b2c4389795d704b8f0d8f2d0703b90b09daaeacf7a2d4b372d86f9e0b8f9e2f5b465f8651a0da7cb4bc1800357c317b9cb737afcb415fc0a4cdf4cbed62bdf85
-EBUILD python-efl-1.22.0.ebuild 1636 BLAKE2B d419249cb2b75e569d16158072f7340602c67e8c23123e3fae9ec5caec66960fb0287efc431a55bd55015ff728c6f4b638da95cc04299c5abd5a0b206e6e3b2e SHA512 954bf4b4732436f78c3f5c1001f966a5ba8185f17db901a3a3197064582fa539f75265e1a5f9abaee508cc32200581eb8209bb0dc5b7592838be8fc87d7bee71
-EBUILD python-efl-1.23.0.ebuild 1628 BLAKE2B 2569d9539990cf3e0efe7315718916389f6561da16f4f0ec0827bf8152d1e854986eea44c7663ed406e82f7c29750e02c28ae97ea08f53a9b7d08f5a0f5ccd2d SHA512 5e39ec74140ccece9d89b3b2e708624a622f04d03258be37d1bedbfc777dd99ed803d2551d0cee4d74fd82ddb27a6bc2f9ec5a7cf1d1e1d735ad7804ad55a90c
+EBUILD python-efl-1.23.0.ebuild 1745 BLAKE2B 09729291b6cb5fc6980837d0373eb0059467c836a1c1669c9ca7aa08f9fdfe4e77f8d832540393dcc54ad52e88f39e2c53fef43a5026e329b11060d5c3b80dd7 SHA512 be6201480b07790bab7af470b61959b86690fb1ca31d73dcba32af56938649cad0b6c42981d1ec893df6720bba59888e15e50574c759cc0c8671d56cf7f611fa
 MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/python-efl-1.22.0.ebuild b/dev-python/python-efl/python-efl-1.22.0.ebuild
deleted file mode 100644
index 8529f5f89dd0..000000000000
--- a/dev-python/python-efl/python-efl-1.22.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5..7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
-HOMEPAGE="https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"
-SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="=dev-libs/efl-1.22*
-	dev-python/dbus-python[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)"
-
-src_prepare() {
-	default
-
-	# Tries to download a file under /tmp
-	rm tests/ecore/test_09_file_download.py || die
-
-	# Tries to use that file which failed to download
-	rm tests/ecore/test_10_file_monitor.py || die
-
-	# Needs an active internet connection
-	rm tests/ecore/test_11_con.py || die
-
-	# Test fails because of deleted files above
-	sed -i 's/>= 13/>= 10/g' tests/ecore/test_08_exe.py || die
-
-	# Make tests verbose
-	sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
-}
-
-python_compile_all() {
-	if use doc ; then
-		esetup.py build_doc --build-dir "${S}"/build/doc/
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd tests/ || die
-	${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( ./build/doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-efl/python-efl-1.23.0.ebuild b/dev-python/python-efl/python-efl-1.23.0.ebuild
index 7721035b78bb..706122a303f6 100644
--- a/dev-python/python-efl/python-efl-1.23.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.23.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..7} )
 
-inherit distutils-r1
+inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
 HOMEPAGE="https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"
@@ -13,7 +13,7 @@ SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
@@ -46,6 +46,12 @@ src_prepare() {
 
 	# Make tests verbose
 	sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
+
+	# Disable any optimization on x86, #704260
+	if use x86; then
+		filter-flags -O?
+		append-cflags -O0
+	fi
 }
 
 python_compile_all() {
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 80deaa8508a8..50bc69c62cc6 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,5 +1,5 @@
 DIST python-engineio-1.7.0.tar.gz 22804 BLAKE2B bc807943cc24eddbc9cb25ceb55223ecf610ed37b281e5b0a59935705dc2d2c34ad5795e0bd96f1256cf91365756e43ed9c94b1082334d6f6c34f6b6e9472710 SHA512 1d184ccb9d1328d9f4e2fa22006f1d21bd17200bc893ee2588b4342da24775f98648e0e993893eb56a9159f95a114f128dfdacef9fa8ea296c7ace6c7741aea0
 DIST python-engineio-2.2.0.tar.gz 22137 BLAKE2B 5e864a4cb2bc5048f459f98e24894bf263caedaf58ce3225dbb216fc5f4722efbaf7f346c39869daf485debff1479db254add66f6f256066ed26a11a8be196b3 SHA512 8e601c583bea21b37fc673bf92e3b40d6f3ded7068e7b103111b60d6677195e67338398934a270dacc8621b040e52d32eb9652e15607c7be69b6c50a8d19eaf2
-EBUILD python-engineio-1.7.0.ebuild 756 BLAKE2B 1c2b58bd4416309be2d3e6f011fef9447582099db25260ce24bba0aa1adb6f6ef38ae8b34fb38a6ecba18a05c43132a3578646abc36295bfb6e3d225c2d09532 SHA512 46eed2e5a271ea23c0856e64889cab102c7fc1ec9183228eb9ce452a617a401d474f6f59e0fb82c43617841ce0de9dc8bf8c5906be615453ab486ecc46172bae
-EBUILD python-engineio-2.2.0.ebuild 756 BLAKE2B 1c2b58bd4416309be2d3e6f011fef9447582099db25260ce24bba0aa1adb6f6ef38ae8b34fb38a6ecba18a05c43132a3578646abc36295bfb6e3d225c2d09532 SHA512 46eed2e5a271ea23c0856e64889cab102c7fc1ec9183228eb9ce452a617a401d474f6f59e0fb82c43617841ce0de9dc8bf8c5906be615453ab486ecc46172bae
+EBUILD python-engineio-1.7.0.ebuild 747 BLAKE2B 069139113de608f77c17f4e162f2a315f28dfe807db72cdadc88d36961dd584a19330990d4fb5c141dd00f40587b9458c6941c48e50b5d34180656e4616f0136 SHA512 e25ed2d8ea8743a85c3327ca1eacbb6253b95e3b45f7be16f5c89295340047138c0078452540514e6bb432bee90b81249bcb7c7ed53e393044fce52c15460367
+EBUILD python-engineio-2.2.0.ebuild 747 BLAKE2B 069139113de608f77c17f4e162f2a315f28dfe807db72cdadc88d36961dd584a19330990d4fb5c141dd00f40587b9458c6941c48e50b5d34180656e4616f0136 SHA512 e25ed2d8ea8743a85c3327ca1eacbb6253b95e3b45f7be16f5c89295340047138c0078452540514e6bb432bee90b81249bcb7c7ed53e393044fce52c15460367
 MISC metadata.xml 466 BLAKE2B 6ed10a68ef43c4462dcc0fd1ff545828cb6a38d63323da41ea1403d62c7465c08b2668319a0924b31d07719ccc0bd8587461d63362acddd9e329f9800b26bda7 SHA512 4b945547b692e81069a2ae0d70af112945aa2200b935efbddbbcfff4fea60268a9933dcf7ba2936e6c7a6655ef805f93252f157e63771e068a7ac6fb82c4de1a
diff --git a/dev-python/python-engineio/python-engineio-1.7.0.ebuild b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
index 49058777b9d2..8e005c9fcd68 100644
--- a/dev-python/python-engineio/python-engineio-1.7.0.ebuild
+++ b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-engineio/python-engineio-2.2.0.ebuild b/dev-python/python-engineio/python-engineio-2.2.0.ebuild
index 49058777b9d2..8e005c9fcd68 100644
--- a/dev-python/python-engineio/python-engineio-2.2.0.ebuild
+++ b/dev-python/python-engineio/python-engineio-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-etcd/Manifest b/dev-python/python-etcd/Manifest
index 1481ef6251be..2ab6f90835c6 100644
--- a/dev-python/python-etcd/Manifest
+++ b/dev-python/python-etcd/Manifest
@@ -1,9 +1,3 @@
-DIST python-etcd-0.3.2.zip 35994 BLAKE2B 636214301ce339073ac01166ffc7c61d75f3c6a3ae7a9ff5a0cfb1c9df520dfc74b799236b54903de681fffcfbbe07d44fa27fad48b3b1fad4fe88629bf2840d SHA512 0a110e33cccc555a52ec9a5c8ff1c1702bcebbba80f8b948fd72e78baa5fb00e1bb96be08f3839d07230ea905518ec4247a94d7def39f979fe83e01c52da609b
-DIST python-etcd-0.3.3.tar.gz 26529 BLAKE2B 410e048a0223bb940b593e2fbc81a2aa3420b4f050fe8e1d809f26b8659bb9c9941ac243cbe2832b3e77cbb99e6a3cb6ee20ff1fcf5c0139db3feb50cbd5e425 SHA512 ab7eac02083ee23cadbb5c70ca24001eaa2bc14f9413984ccf3cea2ee91ad660c8dbe2158f7fb238e142585b8f79313f548517ae622236772d5e5f356556ab0a
-DIST python-etcd-0.4.4.tar.gz 38334 BLAKE2B e7d851c5c809958e43fdce02c011d66f1dfb6f923fcc8fa5441ceb2ae3bfb28d6b09bfe2155692149a2a3e46bed7688628a389f030657b46f306b4f4ff0d5f1b SHA512 8b1d51801141c9ea2e65ab3e95d7aff667f52c5888927d493b86f7677bbb37ee80c783aac73c638bfabd32b50df5eff8a2457117156e04b80bc4c6c592194d23
 DIST python-etcd-0.4.5.tar.gz 37270 BLAKE2B cdeae8ef7d668c7737f48a8f1513b5e0177b074d25d7f9d522051585699f11beadc26e9588209561f37a20ac0b4c9793f675bff07634ccdadf9720443e318582 SHA512 c59d7a67492a2e4e72b1ae3ea73ac85a073b9d4516d1ebc48601ba67ac9609fbc45574d97e8dfae3ed4f511f090343ff980160043676252125ce2e2edc7bd154
-EBUILD python-etcd-0.3.2.ebuild 533 BLAKE2B ef24ea6aa88b6520adeb815c7401e39ab675bc4b83340a24b013c99b8b085fd59ff459df6400d5506c7f550eda3b1e0a4a2ae98912f134e8b61792c828369a86 SHA512 b40d232774fc023d2c101ed69d1cc937ba25675df09dcacd9dd28198dd0a8a8d7d9fd2cc68a6d0ece71ff85bb75985485ae05fb84746150cdf5a1488cbf78086
-EBUILD python-etcd-0.3.3.ebuild 545 BLAKE2B 22c32aece623402b8ebcc0fe9da23997d43c6a754743a02038cdffb9a65103fedfdebbfd1797a92038779cbd98165ff24e6be17fa6944b26e9b55102526510b7 SHA512 24785c5a756b6994caa0ece1ebcec52eb3aa94fee65c2fa0e480f4cbf7e4f603e7fad552941402c1ba3dffe93331690c04705396083b6a5f210189dc4c0c1b78
-EBUILD python-etcd-0.4.4.ebuild 545 BLAKE2B 22c32aece623402b8ebcc0fe9da23997d43c6a754743a02038cdffb9a65103fedfdebbfd1797a92038779cbd98165ff24e6be17fa6944b26e9b55102526510b7 SHA512 24785c5a756b6994caa0ece1ebcec52eb3aa94fee65c2fa0e480f4cbf7e4f603e7fad552941402c1ba3dffe93331690c04705396083b6a5f210189dc4c0c1b78
-EBUILD python-etcd-0.4.5-r1.ebuild 734 BLAKE2B a19fff0b1322e2277487e150f34fa11d229800c83ab1fb8c9ed4cf1292a02a49e92b1dc6cf355db13961281c6afccaa476aa3bd52a64e75ba3173c884e23cd80 SHA512 14d99b4e56d480cd5ad70e08c25e6153848679a9bbd8425637489d7e1fc2e2b6017aa3e8fb7cebd7423b3d549f4e2ce28b4b639c5f4b42ea5d123943dcad1fba
+EBUILD python-etcd-0.4.5-r1.ebuild 720 BLAKE2B e90451b1f02c07282ce5b3017970228376114b6f733d83a932608754479c920267ea463140542f8d776743caaaf66c81225f2f283b2bbf3423692311150c5eef SHA512 4195294373c80fa8a1da61c659196b4810aa21ca418e3ff3fb6d2e1e429a8f4a1b9822faed36ed440e0be09d08db2166fc6ce9faabccd24fd756cbf8755be75a
 MISC metadata.xml 524 BLAKE2B cbaa775dd5120eeb49daef5068eb6c4ca8d5ec8ea0beab023eea17398e00098e07e63c1b8584de23836dc9647e35ddc21e271173def87a8dbe97d9aaa46b0c5b SHA512 3e629397cf00d97d1fc0e8ebc7edee5410e7dd50e09bde887f05388b788db22835b80bc3492bde3c4169c623605e7d84b2df465b864bf8b65e5623e74bad4f5c
diff --git a/dev-python/python-etcd/python-etcd-0.3.2.ebuild b/dev-python/python-etcd/python-etcd-0.3.2.ebuild
deleted file mode 100644
index 2b46c28e6a88..000000000000
--- a/dev-python/python-etcd/python-etcd-0.3.2.ebuild
+++ /dev/null
@@ -1,23 +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="A python client for etcd"
-HOMEPAGE="https://github.com/jplana/python-etcd"
-SRC_URI="https://github.com/jplana/python-etcd/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/urllib3-1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/python-etcd/python-etcd-0.3.3.ebuild b/dev-python/python-etcd/python-etcd-0.3.3.ebuild
deleted file mode 100644
index e58d6a96d854..000000000000
--- a/dev-python/python-etcd/python-etcd-0.3.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python client for etcd"
-HOMEPAGE="https://github.com/jplana/python-etcd"
-SRC_URI="https://github.com/jplana/python-etcd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/urllib3-1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/python-etcd/python-etcd-0.4.4.ebuild b/dev-python/python-etcd/python-etcd-0.4.4.ebuild
deleted file mode 100644
index e58d6a96d854..000000000000
--- a/dev-python/python-etcd/python-etcd-0.4.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python client for etcd"
-HOMEPAGE="https://github.com/jplana/python-etcd"
-SRC_URI="https://github.com/jplana/python-etcd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/urllib3-1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild b/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
index 82174597f8e9..5e17ffc52f8f 100644
--- a/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
+++ b/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ethtool/Manifest b/dev-python/python-ethtool/Manifest
index 8c801225e812..2a58b2c3f81a 100644
--- a/dev-python/python-ethtool/Manifest
+++ b/dev-python/python-ethtool/Manifest
@@ -1,7 +1,4 @@
-AUX python-ethtool-0.11_include-net-if.h-for-IFF_-macros.patch 622 BLAKE2B 94c1de49912575ba542824a800ab9c4095c0eba768678f203f1cef2548f665675ff0e34b9802bf7aa983ed01fa6f46bacf1e1b565a2d5605a47ce11f46d66d48 SHA512 796beab89f476138fbe799fb296631d912155227b4d40118eef20ea69ca244d272756a63c1afbb42f2941243425994428d82699e1026c4c52a9bb4616fde5839
 AUX test-skip-wg-dev.patch 1023 BLAKE2B 564aa0fc9250041b181aea79d14af9f10c2d298f34f15ddb33b25e00e138c3e8a21729cbd0fc4b3c724c89349bb700563c568f27fd0e3d47da2736c2e91d2664 SHA512 fea83748b18b646d4acfe6fdbf204c0aa5f7abedb122241e54dd29f01e0e7862c5166f1199e20606c991305bfd9aad9ee1022c05e9cab800f2c9e980e034d4c6
-DIST python-ethtool-0.11.tar.gz 37326 BLAKE2B b2345f5aece60c3b418d9fcd61220ab77fb49b9995a23b0ed6d97135dee61e4ffa177059869a8702430703b9f6518ffdcb8d690c868d0f8338ab16fdc36c58ea SHA512 227a9248dfdd36a9018a441d3ef4680691c23dac52972fe1ecc67ff30991f3de4cd71af0e48669ca382d6f177d1b3ebc97596e5a5ae4b4c80371456effe637b5
 DIST python-ethtool-0.14.tar.gz 41945 BLAKE2B d83e40e79481ee5f91f7e097dc4f6f0eb541f88ba83e13c13b3129ece2196ee999f9110310339ebbc2343b814a3b2c80405a3b4ce6931110509a54281b370cd8 SHA512 57a3f2d60dd8309192fc858614645d4e7533c90c03113ffc1eeeb810b86eb71b0a80b4eb209d3452c7624c5318a853de50d9d716d41334bf079e6e3e2490fd4b
-EBUILD python-ethtool-0.11-r1.ebuild 659 BLAKE2B 06540784fb06c039affead64ed7e298a6a064ded756fb9d5bdb8fa7275a3aba1e0f4cadd3537991c8f0bd599dc78dda2a5f0324cbe23848426537b82729a0c69 SHA512 f1e89637bf687d42025910326a5111bcc057606d693d2cfe87a6704d1366e38cdcf71895b8fb284c36fb3f4defbe74af5f1ef0c13e5111f5d8efb636ffc0f207
-EBUILD python-ethtool-0.14.ebuild 726 BLAKE2B 6e16d3c432f65763263eff1f95d9dce9c3bd1dfe8a75ff7b28bd5f33e5e74dc9356035b4427c175ee272ec6283308745da70af198c57508a7a510cb27092ec50 SHA512 fa6d487c3e392e3125aa814fc4eaedaeea50cb67fea967b7a2cfb9219a43498f18d7e45255d13122cec8754764a13031a9f03d971f56dddbfe743e611cbc08f8
+EBUILD python-ethtool-0.14.ebuild 714 BLAKE2B beb3b42d8978d9341810bbc8dd5d3aaa337b6ad53d663ad5572d4bbb3a0738d5d056079c2e386b378f6a051129139c42e03c4c63697d38b532d8c3de6278e636 SHA512 a4b2b2b654873b04edda9eef31e201baef5c5ca7cb7568d323afb592ab5d222e939cf8bea0b3809abc54ef36fa03edb61b167623738d33f889ed8509018a8345
 MISC metadata.xml 464 BLAKE2B e4a3eeee039ad5e3d1236e0067f72df7e73638bb550185f21de32977396c5457a3bb8d9358b65f3dad4696ffc1d818dcbd4ee6ca7f1a9692b3da0b7e56708b36 SHA512 26faaf69c1bcd592bfd2687b3e805ac9d5ecd155ad86a4d1d92875e96d24a2e21603d1a5a581fdb05bfb9883ddc9ce8bf86a5ca464d7521db65d271b5bc5485d
diff --git a/dev-python/python-ethtool/files/python-ethtool-0.11_include-net-if.h-for-IFF_-macros.patch b/dev-python/python-ethtool/files/python-ethtool-0.11_include-net-if.h-for-IFF_-macros.patch
deleted file mode 100644
index f5cb92984ef9..000000000000
--- a/dev-python/python-ethtool/files/python-ethtool-0.11_include-net-if.h-for-IFF_-macros.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a43f582918d3295b7cdef9e056bf5b1c4eb2ef80 Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Mon, 22 Jun 2015 05:18:44 -0500
-Subject: [PATCH] Include net/if.h for IFF_* macros
-
----
- python-ethtool/ethtool.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/python-ethtool/ethtool.c b/python-ethtool/ethtool.c
-index 0f9cdbb..5415ec6 100644
---- a/python-ethtool/ethtool.c
-+++ b/python-ethtool/ethtool.c
-@@ -27,6 +27,7 @@
- #include <sys/types.h>
- #include <ifaddrs.h>
- #include <netlink/route/addr.h>
-+#include <net/if.h>
- 
- #include "etherinfo_struct.h"
- #include "etherinfo_obj.h"
--- 
-2.1.0
-
diff --git a/dev-python/python-ethtool/python-ethtool-0.11-r1.ebuild b/dev-python/python-ethtool/python-ethtool-0.11-r1.ebuild
deleted file mode 100644
index 487265206570..000000000000
--- a/dev-python/python-ethtool/python-ethtool-0.11-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-# TODO: install scripts and their man pages
-
-inherit distutils-r1
-
-DESCRIPTION="Ethernet settings python bindings"
-HOMEPAGE="https://pypi.org/project/ethtool/
-	https://github.com/fedora-python/python-ethtool"
-SRC_URI="https://github.com/fedora-python/python-ethtool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-libs/libnl:3"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}_include-net-if.h-for-IFF_-macros.patch"
-)
diff --git a/dev-python/python-ethtool/python-ethtool-0.14.ebuild b/dev-python/python-ethtool/python-ethtool-0.14.ebuild
index 508b2ec1fed8..64886a510607 100644
--- a/dev-python/python-ethtool/python-ethtool-0.14.ebuild
+++ b/dev-python/python-ethtool/python-ethtool-0.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 # TODO: install scripts and their man pages
 
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index 78a7390053f1..7a3db9a5af38 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-evdev-1.1.2.tar.gz 83067 BLAKE2B 6434d5c62e4a072928d555bfc92e94e7f63ef98ebbf9cd95795a92d6ccdf7b5d4b0f3133a4b3f2524083b842f78ccc305a5da13af59052be3724d83ea4039328 SHA512 054b2e5af532079dc52919d90791d12d7caf75cade07d18b94ea519869659413ea059570b16ebb236a715c541b17016db380bea4e3c1cd21f96824c6303b45d6
-EBUILD python-evdev-1.1.2-r1.ebuild 640 BLAKE2B 1188b649bf34d664e2353f422b95506494c183d50f1020d635df7044681505c41295b461568ab9c8fc944e2c0b0432ccd9614d71b2e94321baac6f7605b9637b SHA512 21a60f04f67e3632376b0fccf030e2eb0d9372db294109ad02fceba7fdbec72b9b14545bd76f3d416fcf7540d78a36c26e7e3d963df313bd2ce8bd4824970fa6
+EBUILD python-evdev-1.1.2-r1.ebuild 638 BLAKE2B d1b7c02667dd4a3d7a556bb0048dec5030ab9ed521ae4d218ae36847a5b8b2f8b9852a7f47d78139a5a81b26d124704f7be7b3d755e99587171b7ac3ec5eeb6f SHA512 ee8df66286433dce3fd49764fc18d8b567e396d39b53b42515a46cd803d2b1b60ff3d4a8a10531f1829a141f7182ec15b28f3f407855bf1f2185fa9f9cb1f90b
 MISC metadata.xml 257 BLAKE2B 5c2ca1a3b14d55f8b7d0dd09b0811de8e397c4f748a58c4133f02e86e9084da2b2afabee2c7fb38f38d97d1a301c6de2dc6c4cf8ad4f91fe55c35b8580e6ff0f SHA512 2214f84571910c807983e21889732fb6b9619cd62bafc51a3743786f42b2c6248f1717ec5936685e767a70a052ec725a7a62c602b9c95fbb8e45838472146304
diff --git a/dev-python/python-evdev/python-evdev-1.1.2-r1.ebuild b/dev-python/python-evdev/python-evdev-1.1.2-r1.ebuild
index ab2048ccf81b..99399b759422 100644
--- a/dev-python/python-evdev/python-evdev-1.1.2-r1.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.1.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-exconsole/Manifest b/dev-python/python-exconsole/Manifest
deleted file mode 100644
index 42bfdbc2b161..000000000000
--- a/dev-python/python-exconsole/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-exconsole-0.1.5.tar.gz 2322 BLAKE2B 9b72a6bf16ce6f760d3fb09d5f256a13755a46d7f012ae68dfa72fd8e31a691b4b9fb89def0c4a31e1b6e9323209ae7521994f69d6f6947c65d15d08b10f1f40 SHA512 f60dd78050515701c66196e7b62653ee7221b0b9bbe390e0f7b08e14ba781afb8f0c49fe769e702ec6d4854c4a48f6ab033c9066a5e5e604d6258ee393fe1070
-EBUILD python-exconsole-0.1.5.ebuild 441 BLAKE2B 7b080e1a93d24c7b10f210208b2e7b66151191f22ccd1eac19af5428e8cbbf338cf2b84cc8b67a6c7ceaeac71f3f79d844977ff54770790bd0ad04c7825162fc SHA512 0136b6b7e8ea78dae81e709104436220a80cbe385daeb0e5d5a1786f2de6ba30d483da2c4d798a6fdd4f8725372a85a911493c45e826c594082730f6fae27c01
-MISC metadata.xml 387 BLAKE2B 0d57016ee540bfeac34c934261c978f9bd2b45ffc90f076553edda3f9b41a30e8fb523b2861e538a0ccc3093483a78eadbf208244699e2468affa7272789bf02 SHA512 466f63d6aecd837d5d26f218afdf13d189d9f108c170af5fd4a6f6d63133a45808ae354606a82ebfb6862bc8be16cab3c0bd82a47db6e3a2d958fb9b644ac8cf
diff --git a/dev-python/python-exconsole/metadata.xml b/dev-python/python-exconsole/metadata.xml
deleted file mode 100644
index 32ae0d89a595..000000000000
--- a/dev-python/python-exconsole/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">python-exconsole</remote-id>
-    <remote-id type="github">Eugeny/exconsole</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild b/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild
deleted file mode 100644
index fbd345761cc0..000000000000
--- a/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Emergency/postmortem Python console"
-HOMEPAGE="https://github.com/Eugeny/exconsole https://pypi.org/project/python-exconsole/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/python-fastcgi/Manifest b/dev-python/python-fastcgi/Manifest
deleted file mode 100644
index f203a8c57ab2..000000000000
--- a/dev-python/python-fastcgi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX python-fastcgi-1.1-setup.patch 452 BLAKE2B 6f2a965ee3884e5d23b3f2d65035943412d739a6cb8b13825c1125582cd931e97f68d2dce5fe866798245f13a9b7627a372bcf4433d4b769e8f17d07bbe7001b SHA512 715bcc32ac2d9151765e5163860b69fd3bb0fa4d2efb715dc7dcac1d12a10b436b2eb4ee0ce64ce95696c5b44d5a9702a7b60ae650fdf77fd914173ab48cc18e
-DIST python-fastcgi-1.1.tar.gz 11180 BLAKE2B 42884126798b67bdbe969a18016faaaa2b3a4f10be1bae56824d79e42a7c63585f42c0fab699c73697401c151fbedc470037cd0e8c98b839e6efc58e29065531 SHA512 316c5b07342d27bbad90704909d7a010997801527a9069d23e39975bd3a0e82ab7407bb5e5aa9bdf240039d4c2fec37887540c569d496ca3a328f3323390da89
-EBUILD python-fastcgi-1.1-r1.ebuild 750 BLAKE2B bcb682868eefe0f6c3646edfec062651b373291a0e5f58a59012ce66c3a609350a62d62c8005aaad714a9dd6b4027927a12eaab29a4ef46b1caeb5630738b365 SHA512 ffb79203acc5e481fe50c12c1f79350a678224e77fb04e28333cfcefd963816c2dffe173cafae1e6cb57ce1c58e238fee97ad3f80d990706fe7f9c8603b9c460
-MISC metadata.xml 317 BLAKE2B b409c80dfcef216e1c898e0ac2699cabb625dcb862275ef87b436d8648022b474f0c39c86d08d5ce8aecde4e2913e51691265691839d58ca367405ce341090d3 SHA512 2a826c8c090029b312458c77217502813bb35f5653ae176d60415a38c348d2774cb0a4ae5045ed7b14da530ce88a02854623fcfe2a8d7d7f9b77804ec9f7c117
diff --git a/dev-python/python-fastcgi/files/python-fastcgi-1.1-setup.patch b/dev-python/python-fastcgi/files/python-fastcgi-1.1-setup.patch
deleted file mode 100644
index 6ce721a5e004..000000000000
--- a/dev-python/python-fastcgi/files/python-fastcgi-1.1-setup.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -4,11 +4,7 @@
- from setuptools import setup, Extension
- 
- 
--c_ext = Extension("fcgi", ["fastcgi/pyfcgi.c"], libraries=["fcgi"],
--                  include_dirs=["/usr/local/include"],
--                  library_dirs=["/usr/local/lib"],
--                  #extra_link_args=["-s"],
--                 )
-+c_ext = Extension("fcgi", ["fastcgi/pyfcgi.c"], libraries=["fcgi"])
- 
- setup(name="python-fastcgi",
-       version="1.1",
diff --git a/dev-python/python-fastcgi/metadata.xml b/dev-python/python-fastcgi/metadata.xml
deleted file mode 100644
index 33b2fb0e7bfc..000000000000
--- a/dev-python/python-fastcgi/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">python-fastcgi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild b/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild
deleted file mode 100644
index eec37629089b..000000000000
--- a/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild
+++ /dev/null
@@ -1,33 +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 flag-o-matic
-
-DESCRIPTION="Interface to OpenMarket's FastCGI C Library/SDK"
-HOMEPAGE="https://pypi.org/project/python-fastcgi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-libs/fcgi-2.4.0-r2"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${P}-setup.patch" )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	append-cflags -fno-strict-aliasing
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-fastimport/Manifest b/dev-python/python-fastimport/Manifest
index e62723e7c149..87b9c429cba6 100644
--- a/dev-python/python-fastimport/Manifest
+++ b/dev-python/python-fastimport/Manifest
@@ -1,3 +1,3 @@
 DIST fastimport-0.9.8.tar.gz 39512 BLAKE2B 484ba865e749cca33df73417285e51a9117e7c905ab2922588d6eef9a64ea6b3d72de285a2affbe7d4a770ead9ece30f6242777087af1c469d59c8f2a4e1b008 SHA512 5d195b641cf6138fdbc6c75781a4a6d3699e3ada9743bbe4c4264879b2da2f8a2e995e7cc3955a5241e9c7a7f24f8114474a0a30907f86e2e335e2be4669f588
-EBUILD python-fastimport-0.9.8.ebuild 829 BLAKE2B b3a8f5e2c94df0b18d26f64e0c76e2f626183525275cab3621e913fcd305362f58f3ef119d7a4443f1cfbe738f3718b7c60bff3cc375805ac5c25ef2f2684cdd SHA512 a5c491256f94d0e04531d9c9ce6911f566e6ee31eda9ad7b3262413ae13443aec222d26f6f0ae7bf856eae9ab45e0beee9111f3e3a3b54bdbfa277e5b4730572
+EBUILD python-fastimport-0.9.8.ebuild 764 BLAKE2B bcbec0e9c90512dce0ffdb308436113f4c6216da86325e006617ef2778940bfdf2c497ffcf379844afe058d9ac7b8bf9501df3c5f6108807ce0c52118e06ac15 SHA512 faed80c354efc7c3274f645fb9b830c362715fd948474a623ffdf4b68a83daa8a05131c8a54acc6cee4205feeed78d6732669ffa0ffad4b42c28d946ad2fcfea
 MISC metadata.xml 509 BLAKE2B 23407a89645a4f2fbc0954f2f02eb60c74e8aaf2c7385d3d8c098e64fbf949b66f262378de964c5fae6d84db4e6e04d4000438c8cbf4d44fc629d74e2f524b42 SHA512 2242fe2ba9731aee3face6de5e7fe146ecab037b24825a7fd5ed26bbfcf4136ab50791ccaaea4bcac5a23711fdbcac30e2181a39c8d0a3d33cd7acfe56ea2f56
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
index 0eefa50365d7..32ad23a6c540 100644
--- a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
+++ b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
@@ -16,10 +17,6 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
index e0da6b85b2db..cc72d8e499e7 100644
--- a/dev-python/python-gammu/Manifest
+++ b/dev-python/python-gammu/Manifest
@@ -1,3 +1,3 @@
 DIST python-gammu-2.11.tar.gz 135567 BLAKE2B 133172cfd0715ff6b5bd47b93e5d93d52af3e608459ba1158bf008da9b5f24f6d155c04334dea7ff2cacdea678f00d986838a139290d5f8ac874bb9702fcd5e6 SHA512 cdf3a54fc538fecdbe3dae63f0534094ce94a289998f9b670a0b3e12a3c571eb46ee86eae67a7a8d2428698850046d5c75569753bf77551cd395d315e6f9b70d
-EBUILD python-gammu-2.11.ebuild 784 BLAKE2B 077c6bdfbdeef76ba8e692486f7ca372aef2d727452ee13ba5dcaffcc1de5c364961d61b78f30dfc7a9c8e35696a7b38f2f9f76f47245d240c503089806582e5 SHA512 5c885594b3bc838c8a4d8fe7bb7708bf5fa274cd8a78a890f004bc0540fb204d2583c8f509a96a96642374437927564c4588b8387c150112223b0ab79fe3ea34
+EBUILD python-gammu-2.11.ebuild 780 BLAKE2B 926a39d2ca3ad618a773052389cee216e893610c9180dca182087b89ffdc144c845b1b94eab1c53f7875f1b22690450b617e3a8544c9259d028f1d5b5e37c789 SHA512 9d38bfcf90c6e518c1b5621d148b2f0b586811409e050330e64f67b69ad8327d69cbb97b108a274100c8ff2eab67ef232c6da474b10b5642c807f7e20ecb261b
 MISC metadata.xml 375 BLAKE2B 2ce9558b6704f95ab2897b077cfea90e039faa0ae01e8c96bdccfc8cf960d532f17e464eda20c0a4790db35b2e33fbbdecf6eab96efed8773200c0cc045237a3 SHA512 ed96e59e555b77c67b72e065eee123a0cc111e53332660da5abeeefd046514ff40441810d6f496fd7992b130498fe1c5b0a4bcf2ffee72c2cb817c118f6d4c20
diff --git a/dev-python/python-gammu/python-gammu-2.11.ebuild b/dev-python/python-gammu/python-gammu-2.11.ebuild
index d9fffc345eb7..f6766413c96a 100644
--- a/dev-python/python-gammu/python-gammu-2.11.ebuild
+++ b/dev-python/python-gammu/python-gammu-2.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index da62f143d9dd..afa49fb0d934 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,6 +1,6 @@
 AUX python-gflags-3.1.1-script-install.patch 1178 BLAKE2B 26f5694548762a2d6b8e6787027862edba91e8baf39a7c8dfc573be61af48cebf7a280646c948c0b59fab48d3b46fd4049d8422f8d4e6d9a57afe6e363c63999 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5
 DIST python-gflags-3.1.1.tar.gz 52633 BLAKE2B 78966a7ffd924dcb16b4c6459d10cb06b9494150887433fec1e32e1b454f151386d4024f3ba1d307f756781128224c8106539480d9291dcc2ed82e85c8eef36f SHA512 28009cdc09b94b416af5237d3897d6ab516cc3b6a3eed18a31adb8c199f31a8c7d07b1d69794cb37de84b50eefbde1de57f9f0afaeac0a4747b352f4024ef12c
 DIST python-gflags-3.1.2.tar.gz 52093 BLAKE2B 4275b43ecf2c58f76fee0b1ff4645eb3176a9ae3b68fdd4a059c2f6f659ca1d9b6e4fad152a2fa48f1eb22c467dbc006835c241c21f89c0ca92367e484f34c6f SHA512 7a3c08b6b212cdb9cb7feaa48e3875d1204a4b3a57182508a078331565f70509d00c315400fa0316dbf61ed4d6a6a04ca8c1a2303567d37650d8dfbb329e2f6c
-EBUILD python-gflags-3.1.1.ebuild 853 BLAKE2B c4fe015452aee391fe8db9bb8a136cd75a72605580b2cbcb4ec6847a68e94415b11801635c556809fce18d4256a863656a7947a1636b880f4fd0ffa2476fe999 SHA512 3df6a26a20262391aa044a5bea5378a61b6f41761aa0363ce8cac5d4ded6cfe33ef1224931a399d2529c93bed42b8fc3a07307d0a9b095be70512ae03691ef3d
-EBUILD python-gflags-3.1.2-r1.ebuild 876 BLAKE2B 8b71ca0828cf411dfd4f4958b24a0b15f18e3a5c53c859e0059537b0518f592751698adbe8c2e4d33551f9950c4db79ff20ab1b37d6853186663513aa52b82a5 SHA512 dd108215c22c101007ecf92e28fc72f52431f4e5640412326a39051fcdeda40ab85c022e7ca51be0f471337d5b322db941ab0ab110ee4b34fc59821ef183acb5
+EBUILD python-gflags-3.1.1.ebuild 848 BLAKE2B a3893ba10aac27ab1c413288a78febd1224147f313f7688e79b89b6f2631c2de97c6800fb8d1a8dfb0d39ededb96e13bd67a95dd853c8efbad499c32caf91f1c SHA512 906c83b857b5080fd2a08f1320902c59f7ab9222d2f9e5f8223b08e7406d7a49877185c8eb914d36cd07cde66ceddd7f251daacbb152c083065fa38440e97c45
+EBUILD python-gflags-3.1.2-r1.ebuild 871 BLAKE2B 0a37de37130bf57486aa15337cfc1328507c9aa8fdd9709feadf13495431d0f1baed1e8165498e45c4bfeaf5a6437f4189768e4784dbcdddf9e3469d6872cc57 SHA512 a89f86534a29312b378c62ba905bab6e8bef40d2c84cbc3192cfd940350067b7c85f49a7e05bae9a362130cf9921b9183dbabf2ccc3d12497d6a5aa30bca094d
 MISC metadata.xml 376 BLAKE2B f93ffa8d2487172461a680a02dad64b46c2edb87ed47ffd8455c30c82278587daa1d2baa42fd0e77f0cbdcff7936e9b99a1f8a8bd496f55eb27975d708656069 SHA512 acea21fc3fc83a3ab1a24f47ed7250c1ffc15ac4507c4c1472716a55b42fa0740b0a5d2eb20cc3dbfeacc575eed67d59b59e722e96dcbfc87672ddf9b9787c26
diff --git a/dev-python/python-gflags/python-gflags-3.1.1.ebuild b/dev-python/python-gflags/python-gflags-3.1.1.ebuild
index b227f6d1ecb7..76980732b520 100644
--- a/dev-python/python-gflags/python-gflags-3.1.1.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
index 645b558ba52b..3c2e3ab5fbe1 100644
--- a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 4dd04cbd305e..d3f9c1cd556a 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-glanceclient-2.13.1.tar.gz 187298 BLAKE2B e2fa34ea7840404e183fbb77592f656b296d54942581b2e1dda71285f791cf7f7d5b3b6ef2da28deb4e314f1d35395548e923f548854b7ad3ef4aa50ad000d62 SHA512 deb8454aea8b2c231604663fac2f6515e3cd6e86dc1cf3cd2174ba2e35f9d605bf162f5a089d80f52da11f97c540f5c160b96864b85d7535463ec170cba81689
 DIST python-glanceclient-2.16.0.tar.gz 189395 BLAKE2B 9de8b162c1eb5bfb44700f41cbdcd4f8a983d8c7bd7b281df09db67df6a0de5dee905330f03c967be9e1c3b2aaa379e4c8594f7f4cdbb34870a1e87cb7ccaf1f SHA512 b853f529752247873d9f319d4ec6f4cabc89ee4c26a0c1013e7609fc38e3c9f68d774b3682166e8155e21572a0a011eb6859a84c253ca9f7a9b8b1ccf79b5322
-EBUILD python-glanceclient-2.13.1.ebuild 2509 BLAKE2B 4b1b6675eb548db77d26a093b554e606ded69368d4afd1e388aad2876d2940c4a71ba54898f917426f77c2dd2e991810dfb0d4ccc29b540ccdd132aeed132258 SHA512 f9b6ebe85a2acd1f6a727777e6bfb27218da6bcfeb0e27beea9894af76ff94cd7740a1adef60194d4c4d7598cd3e5f638f0804f7d1e3e53a6ba287f88ae7e629
-EBUILD python-glanceclient-2.16.0.ebuild 2082 BLAKE2B 81369dd880f7534cc66c6ccaa984d6bec87f6503b1e3eed872cd7268825a4178b956ef88e649c6586704187792157c5ea196cc421ab602c59aff1a34b92e4e7d SHA512 5afd950a8c719844b2fb45c7bb2bd580c054f0949118b95ab4dab1b2e9b037965a18ae98e483a9ca94476c454cf02855f903ea31a95e94d75de484768c9324d9
+EBUILD python-glanceclient-2.13.1.ebuild 2431 BLAKE2B f825cf9d0fa373f307a9bfac48c086e8b5ae43205497d97e98501cfda24592771b47d984b8d69bdb5921dd247a6c2829127cd711435cff2aa14d6827ec5ae09c SHA512 b01e49f8d661d51ea7e045eb4ec3bb9bde54077bad2f8f3d995584593b30bc624082bd5298752d8a6d9d5e118512cbb3f73fc17b8d2fd32fbc653c30a6489dd0
+EBUILD python-glanceclient-2.16.0.ebuild 2006 BLAKE2B d68ce198d7957649f5e6bc5c58e6be0a14a161780d9a3d63e399362cd707a3a22241760306b997547e0dd1474c14bc91a70626929fb903456b1285dde715cd43 SHA512 7de48e04276b2c2fea7efe5a5b9bc1b520231d896b2f42c7456b82b8c87ceb16183b2698f5cfbdcc4f8ddef52a806dbf8862b263eb8fb567d2ed7afab7d11bcb
 MISC metadata.xml 632 BLAKE2B 69885578505253d6ec3d0245779a89ebe5c75ab8a8e9fecbf95c29d4aa17ba6864e69c1806a01cde0e92080a86ccbae146bdb2c003f50fd3dfd32b6d2186536f SHA512 d807a9aadecb131f92d6a476a8bc0b0293d46c6ac761a2d1ddb596ac219c6c8ac349402e3f56d150e78ad81c5d2838a33b3d35222a18f9a416f969f6d6208d8f
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild
index a74f2f029072..e23ed64f762c 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -26,7 +26,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ordereddict-1.1[$(python_gen_usedep 'python2_7')]
 		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
 		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
 		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
@@ -69,7 +68,7 @@ python_compile_all() {
 
 python_test() {
 	testr init
-	testr run || die "testsuite failed under python2.7"
+	testr run || die "testsuite failed under ${EPYTHON}"
 	flake8 tests && einfo "run flake8 over tests folder passed" || die
 }
 
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.16.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.16.0.ebuild
index b4327bb76bde..885408a4fbdc 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.16.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.16.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -25,7 +25,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ordereddict-1.1[$(python_gen_usedep 'python2_7')]
 		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
 		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
 		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
@@ -58,6 +57,6 @@ python_prepare_all() {
 
 python_test() {
 	testr init
-	testr run || die "testsuite failed under python2.7"
+	testr run || die "testsuite failed under ${EPYTHON}"
 	flake8 tests && einfo "run flake8 over tests folder passed" || die
 }
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 585adca75dd3..3d09904dd927 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,9 +1,3 @@
-AUX python-gnupg-0.4.3-skip_network_needing_test.patch 2286 BLAKE2B df6f591f70a12b7241781eebc7cb6f2a425a9479bb02e2d482e69dff9beae4741bc931aee953e99306731ca77f405e9b12366b262d63c54cedc9168f2551f869 SHA512 2189702d0fe00afbff59c494de2c02d97a91fd264e3f241c2b6f4b376fd188110b1da2ba27700cfc92fe6dc8b3246ecb8a072933a1fca3d7d3929d6cf0acaa76
-AUX python-gnupg-0.4.3-use_seperate_keys_directory.patch 1847 BLAKE2B 5488b55302336f4ddccea517684f1825b6a52f3100989c871846e6b140e98869ca682ad062507f8b3c5af9e99833c995d5737bc7e69597d247fbd6b68c71c507 SHA512 fee4817a26f934c5e7c216a0390abd3d1375168467e2695e1b35be34eed2b279bbfa8ba32ebe0347913a7750111b00c05264418f758c56f094c91e7c2b7ece52
-DIST python-gnupg-0.4.0.tar.gz 43987 BLAKE2B 59e72f894c5d554ba2a7c348ad3625500798ad6ac18332a3bb668b42559f52b58e3cd0f8b79ef1a99f37e796b48169d0bf36414e938e9039784cede4303cbb03 SHA512 f486ec97aee01cf46d055421211ff5704093a382155043b7ced6f809dc15d7669d5869038a1b26c5f1831076d85c929d781bc22e35ab293a14bc6e2f5f27fa32
-DIST python-gnupg-0.4.1.tar.gz 44534 BLAKE2B 0b58312b9f094b29f7009bb7a44ea3607be826ae2fda958dae0ba9dd5a2d7f81843fe23a6fe336b9df85c059e5b114787dab372df42b14b83cb73fb02abee919 SHA512 0920a1de4d98a745f7747280672975db04c40b59ea4436745cdbefa86a0c88bfdc086d6dd312c82a0a9e9f8cafb5651f8e17d86e0ee37282b5fc36e7ac8d1a1e
-DIST python-gnupg-0.4.3.tar.gz 46958 BLAKE2B c83b13f8b36c136ac75e8a69dccb07025be3397284e27d9624677cd76ac8527bed67644be7a00958fdb248772a0c37de09257fb711eb16a2c982dbca0368dbd6 SHA512 9381acb1246b6ceec4de21091f2ce57dba9c6600dfb52ddee181effbd2e749d18935e6b6bb2183816064e9129cd1bb3ebfdd28a5dcddc9be1c56261a501067d8
-EBUILD python-gnupg-0.4.0.ebuild 668 BLAKE2B 15aac98e7a18c7f714dde3f4c58875e91d7cb0f45c00a2d9465d7df5c24b643db556e328cfc409eb0dd22b9c460ebfefbe289baa433dd7af5ad8a82764b57fb0 SHA512 33938c258738994351789a4dc947aab8c6a5ed0bfdddea063c583366bbe41d2790ee93ae77678b681efab84751c6a24aec3e74d7234ecfc0dc2c1bb8acfc8a18
-EBUILD python-gnupg-0.4.1.ebuild 654 BLAKE2B 6d8982c6c6ad2c35b1ab53d975d82d2a525a1c64ea785a3aef929b52e4ca1d226be6cdf64c4763c5eea30ea70aff437002e4fc755ef986edc50ed592d3c1cd9f SHA512 de4480fda18ec7718c6bc9052ebdb90721a240ecc7bbb159b67944a65fd7c84f94891def97fb707553059616e883ad33739864fd16c64c8616c51ee4a991fbc0
-EBUILD python-gnupg-0.4.3.ebuild 812 BLAKE2B 0f04a3328ff98482513ac60513dafa581e610774269c239ae8908ba2157fede95e46216eb438be729558d87f1733c816e1007cf2eb59482938beadfbeb489cd6 SHA512 25b778c54a721b6a28926725322b59b39d4b4397c5f98fe627087c048093c35fd9b2e5bffcaf3feb0cb664537f881185401a8cf3096e3deda89482b50edc857b
+DIST python-gnupg-0.4.5.tar.gz 48792 BLAKE2B 1bf9cc1c8efafd4fa783574724852d0f168d4d4d4ec188bade9a3ff21be61cc1b087bd4ae72f11f189d182cd49c765d9b57ef22d954a69555c0368f1d863f1fd SHA512 441b49e1f87a7e8e3abf2d6e90f677dc33f1b66a36483787f972378127f31308bacc5e200ae254dd75942191d2fabd61ca5a2f200cf5400be70957942f889ca4
+EBUILD python-gnupg-0.4.5.ebuild 721 BLAKE2B 77b25fe04d741c3edc3e61ce4e979d9876e76af8044676e9fcc237e5029e6a77325fc6e76f660ff8722fd19e532b5ab92c8afaac2fcbf78a8a0cd486b8e82327 SHA512 20b4421b6c704c2cf7848aa091d5360bd27a4b35300c9c53de4acc6e1a5ebf35c69ced91276f04fa8eec0ea799de6adcc5bd4255f82fee47d2cc6ede3417be8a
 MISC metadata.xml 645 BLAKE2B 23e7cfc3792cd9aa1c8eac9c52fe3d01076f93880a17f4fd8aed0c6c30d8e00b866a9f3e71664ca08c41d1a8a6ea4a1ef55a01d6b12285ce36aa0654e2a837ba SHA512 77f5c9739da1875f655257da826acdb16e5dbdbac02f5c05ab66a91c842d63b478b26af52901fb6dcb2ab0b6ea19c3ffd09e761ddcb1df0d5e55d25c105fbc65
diff --git a/dev-python/python-gnupg/files/python-gnupg-0.4.3-skip_network_needing_test.patch b/dev-python/python-gnupg/files/python-gnupg-0.4.3-skip_network_needing_test.patch
deleted file mode 100644
index f6df14348c1a..000000000000
--- a/dev-python/python-gnupg/files/python-gnupg-0.4.3-skip_network_needing_test.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# HG changeset patch
-# User Vinay Sajip <vinay_sajip@yahoo.co.uk>
-# Date 1528916733 -3600
-# Node ID f16d4e17cf349cf9ee561e117262a4041e4fe2ee
-# Parent  60ece27e564ef381392dc19a544aa289fb598c7e
-Conditionally skip tests that rely on flaky external servers/networks.
-
-diff --git a/gnupg.py b/gnupg.py
---- a/gnupg.py
-+++ b/gnupg.py
-@@ -1118,7 +1118,7 @@
-         >>> gpg = GPG(gpgbinary=GPGBINARY, gnupghome="keys")
-         >>> os.chmod('keys', 0x1C0)
-         >>> result = gpg.recv_keys('pgp.mit.edu', '92905378')
--        >>> assert result
-+        >>> if 'NO_EXTERNAL_TESTS' not in os.environ: assert result
- 
-         """
-         result = self.result_map['import'](self)
-@@ -1321,7 +1321,7 @@
-         >>> gpg = GPG(gpgbinary=GPGBINARY, gnupghome='keys')
-         >>> os.chmod('keys', 0x1C0)
-         >>> result = gpg.search_keys('<vinay_sajip@hotmail.com>')
--        >>> assert result, 'Failed using default keyserver'
-+        >>> if 'NO_EXTERNAL_TESTS' not in os.environ: assert result, 'Failed using default keyserver'
-         >>> #keyserver = 'keyserver.ubuntu.com'
-         >>> #result = gpg.search_keys('<vinay_sajip@hotmail.com>', keyserver)
-         >>> #assert result, 'Failed using keyserver.ubuntu.com'
-diff --git a/test_gnupg.py b/test_gnupg.py
---- a/test_gnupg.py
-+++ b/test_gnupg.py
-@@ -836,12 +836,13 @@
-     #@skipIf(os.name == 'nt', 'Test not suitable for Windows')
-     def test_search_keys(self):
-         "Test that searching for keys works"
--        r = self.gpg.search_keys('<vinay_sajip@hotmail.com>')
--        self.assertTrue(r)
--        self.assertTrue('Vinay Sajip <vinay_sajip@hotmail.com>' in r[0]['uids'])
--        r = self.gpg.search_keys('92905378')
--        self.assertTrue(r)
--        self.assertTrue('Vinay Sajip <vinay_sajip@hotmail.com>' in r[0]['uids'])
-+        if 'NO_EXTERNAL_TESTS' not in os.environ:
-+            r = self.gpg.search_keys('<vinay_sajip@hotmail.com>')
-+            self.assertTrue(r)
-+            self.assertTrue('Vinay Sajip <vinay_sajip@hotmail.com>' in r[0]['uids'])
-+            r = self.gpg.search_keys('92905378')
-+            self.assertTrue(r)
-+            self.assertTrue('Vinay Sajip <vinay_sajip@hotmail.com>' in r[0]['uids'])
- 
-     def test_quote_with_shell(self):
-         "Test shell quoting with a real shell"
diff --git a/dev-python/python-gnupg/files/python-gnupg-0.4.3-use_seperate_keys_directory.patch b/dev-python/python-gnupg/files/python-gnupg-0.4.3-use_seperate_keys_directory.patch
deleted file mode 100644
index b57137200990..000000000000
--- a/dev-python/python-gnupg/files/python-gnupg-0.4.3-use_seperate_keys_directory.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-# HG changeset patch
-# User Vinay Sajip <vinay_sajip@yahoo.co.uk>
-# Date 1534104706 -3600
-# Node ID aeb916c839c0f556dae96bb1136be760ccc19cfe
-# Parent  1a5795e58fe216c1227a11d169dbe4c09c625d15
-Fixed problem with a fixed 'keys' homedir on slow/busy systems (see PR #24).
-
-diff --git a/test_gnupg.py b/test_gnupg.py
---- a/test_gnupg.py
-+++ b/test_gnupg.py
-@@ -173,11 +173,14 @@
- 
- class GPGTestCase(unittest.TestCase):
-     def setUp(self):
--        hd = os.path.join(os.getcwd(), 'keys')
--        if os.path.exists(hd):
--            self.assertTrue(os.path.isdir(hd),
--                            "Not a directory: %s" % hd)
--            shutil.rmtree(hd, ignore_errors=True)
-+        if 'STATIC_TEST_HOMEDIR' not in os.environ:
-+            hd = tempfile.mkdtemp(prefix='keys-')
-+        else:
-+            hd = os.path.join(os.getcwd(), 'keys')
-+            if os.path.exists(hd):
-+                self.assertTrue(os.path.isdir(hd),
-+                                "Not a directory: %s" % hd)
-+                shutil.rmtree(hd, ignore_errors=True)
-         prepare_homedir(hd)
-         self.homedir = hd
-         self.gpg = gpg = gnupg.GPG(gnupghome=hd, gpgbinary=GPGBINARY)
-@@ -193,6 +196,10 @@
-             data_file.write(os.urandom(5120 * 1024))
-             data_file.close()
- 
-+    def tearDown(self):
-+        if 'STATIC_TEST_HOMEDIR' not in os.environ:
-+            shutil.rmtree(self.homedir, ignore_errors=True)
-+
-     def test_environment(self):
-         "Test the environment by ensuring that setup worked"
-         hd = self.homedir
-@@ -373,7 +380,7 @@
-             # and the keyring file name has changed.
-             pkn = 'pubring.kbx'
-             skn = None
--        hd = os.path.join(os.getcwd(), 'keys')
-+        hd = self.homedir
-         if os.name == 'posix':
-             pkn = os.path.join(hd, pkn)
-             if skn:
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.0.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.0.ebuild
deleted file mode 100644
index 896d81c3a1fa..000000000000
--- a/dev-python/python-gnupg/python-gnupg-0.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for GNU Privacy Guard"
-HOMEPAGE="https://pythonhosted.org/python-gnupg/ https://github.com/vsajip/python-gnupg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="app-crypt/gnupg"
-DEPEND="${RDEPEND}"
-
-# They hung. We haven't figured out why yet.
-RESTRICT="test"
-
-python_test() {
-	# Note; 1 test fails under pypy only
-	"${PYTHON}" test_gnupg.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.1.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.1.ebuild
deleted file mode 100644
index 9c2d9eda0570..000000000000
--- a/dev-python/python-gnupg/python-gnupg-0.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for GNU Privacy Guard"
-HOMEPAGE="https://pythonhosted.org/python-gnupg/ https://github.com/vsajip/python-gnupg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="app-crypt/gnupg"
-DEPEND="${RDEPEND}"
-
-# Tests are still hanging.
-RESTRICT="test"
-
-python_test() {
-	# Note; 1 test fails under pypy only
-	"${PYTHON}" test_gnupg.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.3.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.3.ebuild
deleted file mode 100644
index 5eaa270034b5..000000000000
--- a/dev-python/python-gnupg/python-gnupg-0.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( pypy{,3} python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python wrapper for GnuPG"
-HOMEPAGE="https://bitbucket.org/vinay.sajip/python-gnupg
-	https://pypi.org/project/python-gnupg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="app-crypt/gnupg"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-skip_network_needing_test.patch
-	"${FILESDIR}"/${P}-use_seperate_keys_directory.patch
-)
-
-python_test() {
-	# NO_EXTERNAL_TESTS must be enabled,
-	# to disable all tests, which need internet access.
-	NO_EXTERNAL_TESTS=1 "${PYTHON}" test_gnupg.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.5.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.5.ebuild
new file mode 100644
index 000000000000..7d18793f2bc1
--- /dev/null
+++ b/dev-python/python-gnupg/python-gnupg-0.4.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="no"
+PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python wrapper for GnuPG"
+HOMEPAGE="
+	https://bitbucket.org/vinay.sajip/python-gnupg
+	https://pypi.org/project/python-gnupg/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	# NO_EXTERNAL_TESTS must be enabled,
+	# to disable all tests, which need internet access.
+	NO_EXTERNAL_TESTS=1 "${PYTHON}" test_gnupg.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index 825c2fd8c6fb..46769c04436c 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-heatclient-1.16.2.tar.gz 173543 BLAKE2B f5b4016166bba804a2704b2cc3203438e7ebdae429f85b74e89ccc6d1b2db2de32d4acc6622138b211f5d8657876001b83977d55d56f0cd5906df99eb92a429e SHA512 eb566e5c0270a0cdb8994194a757102febf88869a61bec65e345fd62f8ae9c0b3609bf27f758d37088d69d2227cbbe086960123feebfae7f543ba2bac2133b0e
 DIST python-heatclient-1.17.0.tar.gz 172475 BLAKE2B 79dbaa2b6f3bc5e97ac4f2630e3e5ef5a320b7b37b1abdfee5ce66df6c63c9d488770135ffdaff53d3e88f93becd8f26019c4c1967624693c9c0ce1479055181 SHA512 44a16f32ede251c36546a0dcab2ca2ca0e145ce924f257c623cc375e52a851094639529a77d770d2703e28f9446e27e03424240fdc0272096e91703180dd6190
-EBUILD python-heatclient-1.16.2.ebuild 2829 BLAKE2B ab537c7d8c9e83115e64ab02262f13abe95b544904cef0e46483d3ea5c475bb8aa88c2dbf774ece9da86df75caff8b67be07d04d0583c9c9902bde2cbf16cd61 SHA512 8f01ba7cde241e1d116f8c8577a076439232adcd600296a7e980e53ff3862e3d263709fc684ea546bbe346791477c76d35cbe171263434e4bbe4bd031b7228ac
-EBUILD python-heatclient-1.17.0.ebuild 2345 BLAKE2B 0ed5735e1082324113cf88e4166d14c7d0704ea2d4c4bcfaa09d8147c06cfbda583c865cb6bd4486dbdc997289c17ed38ef2729e6c9c0818a3c6d08605bb0f10 SHA512 9055c60f463b35d6d1cf3244f93eff776e91bd202e4017ff61ced27014845c5aa95f69001593fce5194e08133b44ba09a4c0075a9049c2c96bf95152822bf192
+EBUILD python-heatclient-1.16.2.ebuild 2815 BLAKE2B 0a87dfd439075ca84288052650e644f9fc50216b8006dc9d37405e1499764943322a100a699f9d791f947f2e5bd9cb264f0cea3bc09ebaa67a6c74d9f5ec7990 SHA512 8e0db97bf95dc069cdf1beb7ce2c0296b53db32a4186d4c205cfa91e4eb5b9f2335ed74309a7d2287d48b5085cba6c246fceee7182360d049cd3120e0b1f1e21
+EBUILD python-heatclient-1.17.0.ebuild 2333 BLAKE2B 2c45e4b0c3ae93445e1bb463feabb669ae69ac85bc132378bbe4c11c2fec8eb6bca06ee5916b787bcf745309d21f74c953795a31bdca8e8f65dab6201cec1ce6 SHA512 7a530a7c4c68fb4dd2dd0ea0ee370abd8e942744ffc7601320677c9b77e2a3e5be61f3e44bd04bd5fa170aaa93c172cf64cd17461dd0d3095d0d37869229b9c1
 MISC metadata.xml 582 BLAKE2B 51e093bfad4008e3d662b8eb5d3714815f7ced2ce68867b2b4dddceff4cad927a60b84706dbb14a36609720e96259a744460a3cd82a068810e1de6173bcf7dc1 SHA512 b0af42a00c8e7e226f912a056edf53b3fdaf356457fd76edd34cb243d45e7f6427fac8bebd39e1aad57c0d16da8e222b3c6414fa9c5b85728294032afdf5804c
diff --git a/dev-python/python-heatclient/python-heatclient-1.16.2.ebuild b/dev-python/python-heatclient/python-heatclient-1.16.2.ebuild
index ca6084da9933..7ba108e57534 100644
--- a/dev-python/python-heatclient/python-heatclient-1.16.2.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-1.16.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-heatclient/python-heatclient-1.17.0.ebuild b/dev-python/python-heatclient/python-heatclient-1.17.0.ebuild
index 8fbca8919e8c..beae3589a2be 100644
--- a/dev-python/python-heatclient/python-heatclient-1.17.0.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-1.17.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-hpilo/Manifest b/dev-python/python-hpilo/Manifest
index f8296872aded..0bd092e41136 100644
--- a/dev-python/python-hpilo/Manifest
+++ b/dev-python/python-hpilo/Manifest
@@ -1,5 +1,5 @@
 DIST python-hpilo-4.0.tar.gz 178109 BLAKE2B aa8d4f9f74c053cb65d6c1ae77602a045923250aa9e4e3d689aa305094bb91a3a100a365d28fbb5fb0b69887d27a00796ffa2d9ff9f5eb26800f18672f73a6c6 SHA512 5a084899275b169a753d93b599c6b0d4d46d695c1378bbea340740d9e654723ff44e85cb71213c2e6811356d826e3912598b18f0f1aaeb906f19b0fc3064fbde
 DIST python-hpilo-4.1.tar.gz 178209 BLAKE2B f64c69e1009867abf7d065592cc360c2ab794a20524578b45fb42f9158a9bd20bc9616a03f99def0a87c0f13f4abf648e6b549db1ed21c0adb048d3f2e85814f SHA512 567ffac260c862dae4d7fb1dbe4c22afe4bf7df56f5e624077c50937931e864217eae49f411ad393a34bc1d8613fc03581a2b5af648174d95356b00f37e7aa78
-EBUILD python-hpilo-4.0.ebuild 477 BLAKE2B 25665f00c0465b7987642c3b2dc240e439fef11a4628d01330b1caca0e959bb747f4a13252a5626af75d8dcb076e629a9cd50cb0aa42cc19acdad26e89d0465d SHA512 703d7dfa9b73ffe20397efc254cf1bd0591844f565bea9d4c404a5dfa22557a2561b178aa06815c97b10828525e68194973336cf8ed32fe75b198edb30800e41
-EBUILD python-hpilo-4.1.ebuild 477 BLAKE2B 25665f00c0465b7987642c3b2dc240e439fef11a4628d01330b1caca0e959bb747f4a13252a5626af75d8dcb076e629a9cd50cb0aa42cc19acdad26e89d0465d SHA512 703d7dfa9b73ffe20397efc254cf1bd0591844f565bea9d4c404a5dfa22557a2561b178aa06815c97b10828525e68194973336cf8ed32fe75b198edb30800e41
+EBUILD python-hpilo-4.0.ebuild 463 BLAKE2B 0bdfad56c6a271f68490d071fdc2c5ceab4b531abeb39aad5fe5fc83ab389132e216a45d05b2e5da4ec4536acb4b5dad177664f8fc606af5a1383c3bdac5dbeb SHA512 b91f4a244c4fa22cc62e10b8d88d9830540183c48f7b26805484b3cc28b4a742571ea483aa62efc4a91ec043f7d3acf301d49096e9270bb51780a34bb3f2ab1b
+EBUILD python-hpilo-4.1.ebuild 463 BLAKE2B 0bdfad56c6a271f68490d071fdc2c5ceab4b531abeb39aad5fe5fc83ab389132e216a45d05b2e5da4ec4536acb4b5dad177664f8fc606af5a1383c3bdac5dbeb SHA512 b91f4a244c4fa22cc62e10b8d88d9830540183c48f7b26805484b3cc28b4a742571ea483aa62efc4a91ec043f7d3acf301d49096e9270bb51780a34bb3f2ab1b
 MISC metadata.xml 666 BLAKE2B aae5ef2572734016e24e84795420e0f8083b2c5bbb8357a49b1d90d0d273701c311c5feeb9df7f9141236f4c2eafbd8a708b01d79e1f2fc9e87244f93046ab15 SHA512 e177656c862474bdfc61bbd01fa3f2a06f4d136594491a9156c95082671066eaa7c00b570cdc0a6ae550ee6d98f62fc2569fa9129d66cfd9c8b3d1825d050928
diff --git a/dev-python/python-hpilo/python-hpilo-4.0.ebuild b/dev-python/python-hpilo/python-hpilo-4.0.ebuild
index a5434038d0c7..372a5e1a2805 100644
--- a/dev-python/python-hpilo/python-hpilo-4.0.ebuild
+++ b/dev-python/python-hpilo/python-hpilo-4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-hpilo/python-hpilo-4.1.ebuild b/dev-python/python-hpilo/python-hpilo-4.1.ebuild
index a5434038d0c7..372a5e1a2805 100644
--- a/dev-python/python-hpilo/python-hpilo-4.1.ebuild
+++ b/dev-python/python-hpilo/python-hpilo-4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-iptables/Manifest b/dev-python/python-iptables/Manifest
index b16ec504918a..3391ea387a31 100644
--- a/dev-python/python-iptables/Manifest
+++ b/dev-python/python-iptables/Manifest
@@ -1,5 +1,5 @@
 DIST python-iptables-0.12.0.tar.gz 40831 BLAKE2B ea53605a5dd581cad7e05059c1534376a53b3b3da89b8c172cbb38ae7482ca3972fdf786badf3328960847c12c96ce32278657c32c857a1682650621a3add47a SHA512 bf79288fac53542e523c8ed0e4e0711792cf524100e39f57f10d3581d1b958712875a765f690b3d5ec6e28af9de48d2f3dd0a787c7037ebfc6f8bf87b5e321b2
 DIST python-iptables-0.13.0.tar.gz 83456 BLAKE2B 9c8da40437d408c6bb49e700b8d1663e7fdb0a1001b15409cf4c8b9edf612f75eb546207bc86d0535f8fb3744e42244f3e067dff80037c5a3eadc028ec8024f3 SHA512 1693924b8ee79b3b0929b57e86908282d53d28044b063d7bd169a6e9c1b45b5b6b4a79e54d024beedbfd6e42f88417eb2d0312bf90895702a3b8bfe2c2eb22b2
-EBUILD python-iptables-0.12.0.ebuild 925 BLAKE2B a55a771505e84ab4e20925f2e79157ccef04958539f19e99b8b82c4a29ab919a2618fed209816f9f56dd696fee6faf514495dd1b743453a949df25b18822f3fa SHA512 ad6663819964960acdbf22b1aec8cd3411aad078f337c9ac1685b7a69c5d93b5e1537432109aac013883163aa87a5703c46e9e604306449b3dcae19a59c5749c
-EBUILD python-iptables-0.13.0.ebuild 927 BLAKE2B 89d8742a58ca1e5698297097305fb9339a57956109a2002336fd3712e14da3f402931f15a469760136182d3a294ad21fa71f6861759ca8387d95072e10e59bd7 SHA512 888408286b054e68be93835928006d2f946966b328696eddb5f0d4c527d908f66680a1fe7d7de5d796c5beeb9efe1b9daa6cbdfa5187b342d904c534cf6362fb
+EBUILD python-iptables-0.12.0.ebuild 915 BLAKE2B a813b5c0a9a80abe6fefa4d16404200ce4bdeda4f83c27ef1e6a486e40bac2305f49363bed5985dfb288eccc309a2f29aaba588a7eb495601b9380304ab1251e SHA512 96211f256288d895456f0178dd151ccf022f9f30f95138cf5bc460823884ca513c6e6b322bf3b203d2d7c0a5cf142d65a055908ea7d19d1d0cf0e21d7788fe35
+EBUILD python-iptables-0.13.0.ebuild 919 BLAKE2B 88a236355660ed1e9ea86584735703a399b623dc43c62a6087efd1412dedf586f325b2e3aa1d525998cad9cbd36bc8f4b1d1b26f0741a60427818c3d0ca52d08 SHA512 33021e2b05d79e023059a033bb296c274ea7c300d5430b450b0473843f886dddc6042ad39454ef0b7b477fc12b005e74795fdc2d603336b627115a85d5168818
 MISC metadata.xml 1340 BLAKE2B d7f6bd56d29a11e19dc402343c03007866bfa0e33415317d866bdc9e7b76bd2cc35238270db24299cb31986166044f5bbc84d90efa37e9fad36fe8b16ffc3e03 SHA512 90c875cee0c4ea9e2f34d509152cdd4d83a41010b8a858515fa3bc766bb0ba11e047957f4c005fdaf2e49b088df78cb3b4414a5ecfdb1b6ded550eb6c9dd01d9
diff --git a/dev-python/python-iptables/python-iptables-0.12.0.ebuild b/dev-python/python-iptables/python-iptables-0.12.0.ebuild
index 09bee2eb04ce..a8fed303429d 100644
--- a/dev-python/python-iptables/python-iptables-0.12.0.ebuild
+++ b/dev-python/python-iptables/python-iptables-0.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for iptables"
diff --git a/dev-python/python-iptables/python-iptables-0.13.0.ebuild b/dev-python/python-iptables/python-iptables-0.13.0.ebuild
index 1b924f0f2dc2..cbc03c5b190e 100644
--- a/dev-python/python-iptables/python-iptables-0.13.0.ebuild
+++ b/dev-python/python-iptables/python-iptables-0.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for iptables"
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index edaed0a6f708..ffc598e54490 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -2,8 +2,8 @@ DIST python-ironicclient-1.17.0.tar.gz 206742 BLAKE2B 8fb92acb02e146916dfebd677a
 DIST python-ironicclient-2.2.1.tar.gz 220436 BLAKE2B b36a5d0b2c297f52a121aa96007ce03556199d7d6139198e39114f2931fd7004bdf76fc5eca369247975bb9eb6d853a2fb4be133976de0ddfeb5767ead6c3c1a SHA512 1827dba991c59cea8a43dd11d0f8f0f1dd6ae41a7f1f28d9d200bac61ae9a4901ac280107fa91a95ebf24072634eadee2e0140f5e1cf5962496f34997815aa04
 DIST python-ironicclient-2.7.1.tar.gz 246190 BLAKE2B c31a439d9175a1915e34988e6e22fe2f05c722925928e30316a3f87023e393a8ee98ca1dbcca19760c009b28c7815478648259865316fac493e1c674cf70fce5 SHA512 654fa4f20b258094d4b05c34f059fa06f12638a210283b6821f6be5acf54bd15a03c73960a7a94d14635a1361370976d86e6b233bd1868c89d9aa82fc1fe7a8f
 DIST python-ironicclient-2.7.2.tar.gz 246413 BLAKE2B 28c71f619baa539a2d82b8aa1e2462de092a385f0b6efd88fa3f5c676aab5603b1060e671b7fd93c2f69a83e6ce4c065fe0492483dd93cdf0af6633403775cab SHA512 6a41ccc0e811fae571652837244ed7f23ec9a7ccf512a71519315406abe7fe0117013765c4d6c1e3c75daa21346b1f94881a32217b3a5829bf473d0b18470c0e
-EBUILD python-ironicclient-1.17.0.ebuild 2801 BLAKE2B 329da8ec234738821aa53fe0ff091021498c203acc16153751e86f21c1a735e66e7ed061b9dc61a2abdd17f42c1af4d531ec15dd588f00361b1d0647b3b5eb03 SHA512 0dcfc151cb864018d53b661317e40d8cb2c8db73999e833dd24cdf9718dfe2d8c3ee3945b8893dbde3b76062127d82c5b2338419f3748de783c72e6110bb1e69
-EBUILD python-ironicclient-2.2.1.ebuild 2608 BLAKE2B 3ed070e87313069b541cef7e73efc6ffe68fcc97afff737279b15d6f4c2208cc63355a8d5b0da5e40b57a7f21b0421ba66ec83e6fa7586d054ed84fa8fb8fe6b SHA512 9a56daaf6d2f145f68dba9ded6f6f98392b3ecd208cc554ff9821dd3cb304819142012779cb2c506accbd6df9d23222ad671377044491a27757e79d67aafe16c
-EBUILD python-ironicclient-2.7.1.ebuild 2414 BLAKE2B d40d8488d20e015d4fdaeed5b089e353879a2721ff143649c418eac5d9377a30522bb02e3a3f012031a99931a2be1b14e5ae6e12a2135c08cd5f5404ec65915e SHA512 4fe47c436b5e29368e98402f76bd815d82593f9c46741fe60a5ff030ec02160e28786e1cdde9d125ffd94f0d1ebb75d0241b9ca9fd1e5bb4df01379b563156be
-EBUILD python-ironicclient-2.7.2.ebuild 2414 BLAKE2B d40d8488d20e015d4fdaeed5b089e353879a2721ff143649c418eac5d9377a30522bb02e3a3f012031a99931a2be1b14e5ae6e12a2135c08cd5f5404ec65915e SHA512 4fe47c436b5e29368e98402f76bd815d82593f9c46741fe60a5ff030ec02160e28786e1cdde9d125ffd94f0d1ebb75d0241b9ca9fd1e5bb4df01379b563156be
+EBUILD python-ironicclient-1.17.0.ebuild 2787 BLAKE2B 30338449407090c8db02e7ba1854dc1a0ffeb1413bb6c5a7dc241b581201d22120ffe52495f41177858228f05ef5b6d309c405f8b930d296732f6df631520c68 SHA512 83d6af5c75ed00de2e3885d5d914e755e0efd6720b0e63435e47002f424a092820926b2f9b4b5e369d92b23f81ff7f1f6011b5f8bedda6a2c8015bdb9857da3b
+EBUILD python-ironicclient-2.2.1.ebuild 2594 BLAKE2B 9e527b4e315c4acb1d9a62f450ec97eb388f0d54148d5fd176a4af711f3eae11e530ed131389ec1ffc53c4c810503f24fd05c8dfd8f208b2d38e510df934bd65 SHA512 d7feeb3a09504f2a17a1e1ed667c2994f62e97a42cbc2624e057d75ecf43c62b807c5583c5f5d35b4a7dd77718af2aa9880583bb759d6020ad81b394e914e494
+EBUILD python-ironicclient-2.7.1.ebuild 2400 BLAKE2B 2c8a4a3ccadc77e9f2c1b9308798b392b01c32d8c1785e1d024ede3bc6961535a689fd1f13db6429765099e2de2c56b6c477e9193baca92138d3a927772b465a SHA512 276b6e4e2a066d7bf013ff30d18ea04916c9c79962e2e560611604c5ea9692c32466400ffc0e257473c8b9738d97a8a8facf2bd9ecfef795ae6ffaf9dc25aa7f
+EBUILD python-ironicclient-2.7.2.ebuild 2400 BLAKE2B 2c8a4a3ccadc77e9f2c1b9308798b392b01c32d8c1785e1d024ede3bc6961535a689fd1f13db6429765099e2de2c56b6c477e9193baca92138d3a927772b465a SHA512 276b6e4e2a066d7bf013ff30d18ea04916c9c79962e2e560611604c5ea9692c32466400ffc0e257473c8b9738d97a8a8facf2bd9ecfef795ae6ffaf9dc25aa7f
 MISC metadata.xml 462 BLAKE2B cda46aaa523a8b818fb5e2dd53bc4db023da327cace7f21db32939249266f7cda27e09718d41701fdd03a2e9ab7c131c147d379525c8036ea2564b799fb90b4e SHA512 8e3b7de241be41bf1af0431ba75d275c5295f197b1c80174d52bc1f38c413300c9a267eedd7034f01200ddced7ddd0143942ebb4a496665ca1105551fb411453
diff --git a/dev-python/python-ironicclient/python-ironicclient-1.17.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-1.17.0.ebuild
index acc37b62ff69..7eaa3acd6236 100644
--- a/dev-python/python-ironicclient/python-ironicclient-1.17.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-1.17.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ironicclient/python-ironicclient-2.2.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-2.2.1.ebuild
index 7aca05744d5b..f4aaf2b3b45b 100644
--- a/dev-python/python-ironicclient/python-ironicclient-2.2.1.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ironicclient/python-ironicclient-2.7.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-2.7.1.ebuild
index d8c21c3cfdb4..fcd5ed68f034 100644
--- a/dev-python/python-ironicclient/python-ironicclient-2.7.1.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-2.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ironicclient/python-ironicclient-2.7.2.ebuild b/dev-python/python-ironicclient/python-ironicclient-2.7.2.ebuild
index d8c21c3cfdb4..fcd5ed68f034 100644
--- a/dev-python/python-ironicclient/python-ironicclient-2.7.2.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-2.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-iwscan/Manifest b/dev-python/python-iwscan/Manifest
index 99169fadc0ff..6dbd31753c26 100644
--- a/dev-python/python-iwscan/Manifest
+++ b/dev-python/python-iwscan/Manifest
@@ -1,4 +1,4 @@
 AUX python-iwscan-20080402-wireless-tools-30.patch 366 BLAKE2B 23d65df7931bf9e8c46d975165a8b9cbe638f080bba9cf59b07678647ad248eed03d5972de1f181109c595f86dc2b93a4bc3dafe473ca6cd787daf0f13b8df09 SHA512 67687e0c3fe5dacc58dca129325542b7b5fe11b761ce1c699d4d38a77738bad8ed1ae191716d7ca10bae056481242454c5afce7b6e4143f34e5c45121fdd4209
 DIST python-iwscan-20080402.tar.bz2 16891 BLAKE2B acfdfba08f6c7fbd7a89ca8932c6155f306332f03bfa1aec70618370c12480779d13726836074ab049f1ba496111a3b02cbd15fb515c317d48fe5f66d8295df4 SHA512 9e9d5e1b2cc491879a4f8a216044f46253820c6c8f30904a1867f758f6d158a9270c9c70a91f22a80f15fbe0446d786869104c5dc5d6bfcab470a79478f533d2
-EBUILD python-iwscan-20080402-r1.ebuild 578 BLAKE2B 05ae7d3188ee31ea1ea56113c02ce8c82dd33b272ec9335d365ef66c2a9490bfcfebf3173118ec6f89f7761d60ae6b15b5a22bfcd890e0f0586700b52c7e23c5 SHA512 16ddd2ab6b23ab481a95d534c8063c403e227167397f0eb326034e19f2d43fe26e47a6b40d22e243b6f1a39ce1647e76feaf8c5d4c6d6139854acfe4d1f6b7c7
+EBUILD python-iwscan-20080402-r1.ebuild 570 BLAKE2B cb03626df7c68f48505af66f2cedd6f7e3a4c798c9ff4b6d9c1b9f6444abbaca7e7e41c7034bff07743218953dac902a7615955fc4eabf15d41cd50604d1c618 SHA512 4eed6889f0b6b632bc6314b6c97a6db2bfba5bb903c93fcfb081e15f322574c2a2a9a1edb58effe6d587a14b99165d8635c311545cd534123d45c17775364c46
 MISC metadata.xml 238 BLAKE2B 42382d5ebb1aa60ff6a073fdc038e223500028f83581747b85bd1d1ac43160aef294b49db65a26ab2e713ef88b2e869eb3065b0a9f0be787e32f4cead3ec8fc4 SHA512 47119affb0bb88a6fef7b2121569fa43cc30157b6aa8d1edb7374367a11ea9d422497da9bbc0bb7106b4124c90e3c980ced5ae202d96a48526ecaf875975db6a
diff --git a/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild b/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild
index e037ac41b7f4..1a0bfd3da421 100644
--- a/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild
+++ b/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
index 4559cbf807da..b407d32b6495 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1,3 +1,3 @@
 DIST python-jose-3.0.1.tar.gz 86726 BLAKE2B 82ad3cd1139b367d179e965aaf0e33f3592883da6b21ecb3a91e9fe98ff05dbe358e56156a3d34366ffc0d7bfa9efbcdef67c41307d803ac16144a0c0ac3570b SHA512 a39c3aa9acc6bcc0030e4435e499581043a820c54aa1a4b67ae478cf95f96f28755b03fa4453e484932a64865a61613a1ff4afe30249216e8f392638485693d7
-EBUILD python-jose-3.0.1.ebuild 1218 BLAKE2B cb7dfc89f219b129b74ee05baf9a99b9130021799d05a7bb8e8c4ceba80de03a6c7d33bac636ec9e68136ac7c04a66cc5aaf2d5a5971c2d02240654e79b53bd0 SHA512 83542feba70675671f48dd3c40fc93fcda01c72f0129d58f56ab56ae16f08eba2d30f69f820d53091e475d8b58c7109b8c052610b276bc416e239c52a81e9b1e
+EBUILD python-jose-3.0.1.ebuild 1216 BLAKE2B ece3cf7f90be50b312e9953d676be80f107a9973dd8026f3d888b5146acfc877aabb41062960080e61daadfb4f5de5d737d452cc412b719747e9713fbacc3f22 SHA512 3071a0e58ad1a1c7afa68df9992b869a3dca278d7263c84a7e2e1c3c7b31ac3f59775d5d8cbcab6c6a6654f53e3789c2de7b50bc57895fc0bdee83df38cbba98
 MISC metadata.xml 444 BLAKE2B f253d760dc81a5acb23c11eace88f17410135ebe2f336077e598b01f897e1a4304191feffdab06bdd5a04fb46430bbd090597a40e1ec96256865190a59a486fb SHA512 74ba057d1ffcb3d1995e1efe6436143260d8a973fe5cc9c1ffab0694932b2b3dd8eeccaf457a1d79fbb31f825b120fbc98fc3c0ad7b0796233e07df82357d160
diff --git a/dev-python/python-jose/python-jose-3.0.1.ebuild b/dev-python/python-jose/python-jose-3.0.1.ebuild
index 73f6c9b800c2..ec78e50cd6d4 100644
--- a/dev-python/python-jose/python-jose-3.0.1.ebuild
+++ b/dev-python/python-jose/python-jose-3.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
new file mode 100644
index 000000000000..5914e903e3f6
--- /dev/null
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -0,0 +1,3 @@
+DIST python-jsonrpc-server-0.3.2.tar.gz 32493 BLAKE2B b1e89c798e247b3b039645b99ca25898fa846676c646e58d8fabfdbd772e3efa1ad895dfa7b31931f1e7d91252c4327a324b929cd861b16bc2be32a64e064db1 SHA512 1d29858b8f6850a017c8e7e94196a972c985e72e9f57956afa2964feb109d9b5cfa33d534d279d817bd5a1454dfcde7d32cd13149c9a53fe1f9e6e0a5899f15c
+EBUILD python-jsonrpc-server-0.3.2.ebuild 733 BLAKE2B 8b6c1770512bde484c69d01791d5e24278492b3b30d53456567939888b3f1c38a606f0ba7c2a4d579bf397650e9143b21614a86ede709ef6e7e2057af36f2cd5 SHA512 35bf59965f1b7e3e9ef775152492456696f2ab96d666b6c38dbab772ad1f4b9d1cb71caea0963966ea553df3bdec17a898d9d6682b288795a41144086507c10a
+MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-jsonrpc-server/metadata.xml b/dev-python/python-jsonrpc-server/metadata.xml
new file mode 100644
index 000000000000..dd0bd9c021f6
--- /dev/null
+++ b/dev-python/python-jsonrpc-server/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+    <maintainer type="person">
+        <email>andrewammerlaan@riseup.net</email>
+        <name>Andrew Ammerlaan</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild
new file mode 100644
index 000000000000..ece8c0451d53
--- /dev/null
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.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,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A Python 2 and 3 asynchronous JSON RPC server"
+HOMEPAGE="https://github.com/palantir/python-jsonrpc-server"
+SRC_URI="https://github.com/palantir/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="examples"
+
+BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 835f6d076247..df4dae83c870 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -2,8 +2,8 @@ DIST python-keystoneclient-3.15.0.tar.gz 306850 BLAKE2B 5101f0854d3c9cc2ac2165e6
 DIST python-keystoneclient-3.17.0.tar.gz 308264 BLAKE2B f9c10a97c9b5e4e12d58a010274306af4923792909dd8646e9073299ecc284ef40902231f63e20ffc41e413f2a2c465b1fa949f0bc2d8772fca92718d9ef5853 SHA512 20b40a85498738c77070fd795a044693b55fe52aa2b50966112ba8d452fec7fe6a257d9f40aa4404401e7c4206f15230d7fdf65a14269922e281b910ea548284
 DIST python-keystoneclient-3.19.0.tar.gz 314873 BLAKE2B 32c445a4095dd1071820a7cd0a130d23ebbb38b1f3ffbf350b55ccf8645d8e87f11591f60d22668c1b0451834b8d793e99e2ad6c333974f3727e3d0145506248 SHA512 c55b17851cb39eda5fb9a86e0c1f4f6269afeb5af4a703c072444df073f520d0546b43f28356d2f401810b75728915c0f6beb6e36f141780b7b80c0c45cb60f0
 DIST python-keystoneclient-3.21.0.tar.gz 318108 BLAKE2B 3708b8f464fea1d09edbf7d887bb0a73cb096319c38604381fb60ec33cdb41896a145a5896ff3cc094f055bd30a47e04e30c1238d278edea57e89da8757047f9 SHA512 d705a6183be9cbfb0743da7ef535620e92ea0b4161d87b6c21ef1298ae5cd9e95e280163f286c60565154d22a2374bf5cd3d51f6274e212499e58569dc3a0f55
-EBUILD python-keystoneclient-3.15.0.ebuild 1221 BLAKE2B 87efdbee088afab007a68c2a3972fdbd471c8246802b49175394707b86ac338b56ea176ecc09b73261588c26dd115919798de368756c0e4e19d84ad6a3beffce SHA512 0962b73835a45fed0c02d45175d940cc188a9bdbe55f07089b76ef9ac147ed86df4f4fd0dd4111234e8e456e047059a442f0599f74aca57866141255898cbeaa
-EBUILD python-keystoneclient-3.17.0.ebuild 1221 BLAKE2B 65d3be04d90470e5e6e2f77b97e006c60ff61b1373ee3b412f762d1f41d5336b3a1f85efd25145de226b0c6465f945991b931f12f781a6dbc695413291f27c83 SHA512 ad70a58b6f0ae7a8f0dfccb3909f7c8114fba85cf37613016e943c9212071798e609d68c07be2d121d3d7358a386883d16c83496a9f6dc476b69cd91a1f5b521
-EBUILD python-keystoneclient-3.19.0.ebuild 1223 BLAKE2B ed8ec6a8348fbc05ad732739986f69d19e6d97b8bdab17eca90bd523d5bd022aa1304c1df6eaf9b04fbd6b9edff42da4f0663513a33319779fbed9583a972a4b SHA512 22bde83ebb76fbe41ccd5c6a77da52944421cd69b95bf84b08817c343e05137871580d4487f544f112283b3f344ab7673c3e79384b3859e38ffadeea450c6241
-EBUILD python-keystoneclient-3.21.0.ebuild 1223 BLAKE2B ed8ec6a8348fbc05ad732739986f69d19e6d97b8bdab17eca90bd523d5bd022aa1304c1df6eaf9b04fbd6b9edff42da4f0663513a33319779fbed9583a972a4b SHA512 22bde83ebb76fbe41ccd5c6a77da52944421cd69b95bf84b08817c343e05137871580d4487f544f112283b3f344ab7673c3e79384b3859e38ffadeea450c6241
+EBUILD python-keystoneclient-3.15.0.ebuild 1207 BLAKE2B e42bb86cd4bc84f5ae4261a241f8f1423ba88ce38125b150e1579843623ad7f507f25a9a3e91a30f856982d14fb5d1e074d4f3ce52cf56bce8cc64896efddd3f SHA512 676d1a37a6919b256d0f04f7a34953b7a7c358d1ac8c11fd2780a035726429b798b687c9d135e73de74095d01e886865e7e25d6584cabae3a4d44eebba501a06
+EBUILD python-keystoneclient-3.17.0.ebuild 1207 BLAKE2B edcc49510b7cab0e4a489a6a226300a4166de856b91b1a42f1105bf4743e9f22ff0c977fc98c954fa102cd8280ddfed77c39ed729d94da8512dc4c63e3b0fbc2 SHA512 ee58a1ee3c571d53a2d70b6e7e83d6fe920c5e7259d6d778d1a99f6c9923b00de489647036a693707e8238b7e7f94608364d779c45d113123237c920427f8de8
+EBUILD python-keystoneclient-3.19.0.ebuild 1211 BLAKE2B bc26dec4944f7cd78d9aa2c5178ad00f7046b78928c7171f2cb01642782fb64b21354035af97ee8ef660665f4cad1a9621df6354f54f94bc60d10e62fb0ba1f4 SHA512 b5e65f8ce108b98ac075826f80288856dfeeec08729269853b642e5f9ab6e54ff4a1e53fd12f6e1f115404776164648bd55c79f5292811291b1af1772a038fa6
+EBUILD python-keystoneclient-3.21.0.ebuild 1211 BLAKE2B bc26dec4944f7cd78d9aa2c5178ad00f7046b78928c7171f2cb01642782fb64b21354035af97ee8ef660665f4cad1a9621df6354f54f94bc60d10e62fb0ba1f4 SHA512 b5e65f8ce108b98ac075826f80288856dfeeec08729269853b642e5f9ab6e54ff4a1e53fd12f6e1f115404776164648bd55c79f5292811291b1af1772a038fa6
 MISC metadata.xml 557 BLAKE2B 83a915231d68ba03af636bfafe7a052f567bacf3d746e37093855c78ee1a2bcb11e919924f9aa4a721df0da9b22463ba732de9f9f105cc1ced03bc19ea1fe980 SHA512 5ec4344a761069fd31f8d86351548d0316c421e9a6795b604ece495883587cd8f579f535076cf43eba2114a4cf62eba77a6f96f49bca3a51acbcee6e3d24a718
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild
index 05e5bcbe7912..cad3612fe0df 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.17.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.17.0.ebuild
index fcbd969d6a54..1cf67d4f5ebe 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-3.17.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.17.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.19.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.19.0.ebuild
index cd8b0a506f7f..c9534e0be00c 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-3.19.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.19.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.21.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.21.0.ebuild
index cd8b0a506f7f..c9534e0be00c 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-3.21.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.21.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
new file mode 100644
index 000000000000..b3b3ddda0692
--- /dev/null
+++ b/dev-python/python-language-server/Manifest
@@ -0,0 +1,3 @@
+DIST python-language-server-0.31.2.tar.gz 64048 BLAKE2B 6dcb9d2a7eecfc1611f74c38b0418da5369f43d2e787d6402d49f03eddbbefabd3c95f8eb7f0e95f251b3088ccf4e94e060c8f8a7a7f71dbb0bb8c95d686dfbb SHA512 f36150b4621e818ea94d9f276e8752ac5a76ed46c7f387e8ae69991fa9d6145225ddb4a513f10fba696f4683e31085a547613a59b076006fc13310d05e752fe3
+EBUILD python-language-server-0.31.2.ebuild 1304 BLAKE2B 2f8bbc9d3244d88479cce94552ed984424cf0f080ddc856eae452a0e58111e6c3b55952164c6818e7c8149b500551b93146b1bfa38df825c3c8d772068c77c6f SHA512 41a573f05ce8dd5afb54cd8c1a1840472cf77a002f52cf2d3e9693dc399fc67b35de48cfe7ba5e66409fbf5b10d027d31715938f3f05fa7f1cab0ec9a11f3f5e
+MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-language-server/metadata.xml b/dev-python/python-language-server/metadata.xml
new file mode 100644
index 000000000000..dd0bd9c021f6
--- /dev/null
+++ b/dev-python/python-language-server/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+    <maintainer type="person">
+        <email>andrewammerlaan@riseup.net</email>
+        <name>Andrew Ammerlaan</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-language-server/python-language-server-0.31.2.ebuild b/dev-python/python-language-server/python-language-server-0.31.2.ebuild
new file mode 100644
index 000000000000..daf1642be484
--- /dev/null
+++ b/dev-python/python-language-server/python-language-server-0.31.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,7} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="An implementation of the Language Server Protocol for Python"
+HOMEPAGE="https://github.com/palantir/python-language-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/python-jsonrpc-server[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	elog "To get additional features, optional runtime dependencies may be installed:"
+	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
+	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+	optfeature "Passive checker for Python programs" sci-libs/pyflakes
+	optfeature "Python code static checker" dev-python/pylint
+	optfeature "Python refactoring library" dev-python/rope
+	optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 1b2e6fe0bfa8..83653b5f4cfa 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,8 +1,8 @@
 DIST python-ldap-2.4.19.tar.gz 138503 BLAKE2B 54e088743ccd3fff00f66d8208122b9ebcc154b788d3511f170a3deaf9cfdc5ba813ef05e4a40f42079d2bc60cf871ffae8618cc2e41b3632e79243bbd43cc74 SHA512 bfa8b87449f03d70d78bf890d1190ef5a153e1b84db97ca4b40465bfba9faedace2a69f4ae1279ef6323c01255f52993cf0e4374bc32d9660a5286dfc7c17b85
 DIST python-ldap-2.4.32.tar.gz 126025 BLAKE2B 2e16942680cc037c1251f500855c10de8d63194d400059f20449d541854c2ddc8863cfff5f84716818d0b37f331336a53e4b158e9ba55edc4becb6612d999ed3 SHA512 35a526330852ee87acd240cd285881afe498612fcedbffe93c6e41fb082300cd8b351d9100dc2b3049c658ed062d69cea90f28f9db51a80d94816ce249bbd028
 DIST python-ldap-3.1.0.tar.gz 366019 BLAKE2B 19e95ee096f40cc195257f82ccb5f882cc521561b14e77469be91e013d6b566102c6b426463e68353a3140fc96ebc622deed94929a3aa81cc14cb072440efe44 SHA512 71948cbae1c9a47f9e68fb8c6d65d91a2992261dd9aa535a0453f5733be1c2a25be1dda3c84abc6bdebab92150c89cc8caa757454331a0303de4fa46788b414a
-EBUILD python-ldap-2.4.19-r1.ebuild 2439 BLAKE2B bc8a69c583b7a9f611796ba8a720673795a6305604aed699ee8976b27df5a771ccfe03cdfbeda29aa7acbfbd85247054a982743c17e45697ec3522a2350da2f5 SHA512 28cd6632ab0b10535ac80ed2bf3a7c54b77650f52a591737cf3038c6240743177103e1e7ba39255795b0b6e7d3733a7917ede4eb2bcd096ea276b0a00ac9982a
-EBUILD python-ldap-2.4.32.ebuild 2227 BLAKE2B f2b3774dec40250c9460d2d876493e44820d2d622cd963084d9a0a4449cf1990fc198c4a1055e99e5a4bc4660b597ef0c4c78ff941c857fcb05ee21c2d33b1a0 SHA512 b331dfe48bd5da16dec2f360fb161a61489620439660367447c4d637aca16d74b4ba44c8e3cde6641e66593f2753750d3c6b1c9ec5ac63d40c7d500c28389104
-EBUILD python-ldap-3.1.0-r1.ebuild 2283 BLAKE2B 835600d430da311d1c1ec7e2d9fecdedb70f39e636fd6ee9e50fd5c935b0530abbc6312d3f38d03b2eb1ad178f1c70e104ccdafc8785715bb71e8c76fb3b21b5 SHA512 5c5525e41a5d59ef06ab18284d65b3a8c3e280d10bd39a7d0a014a848c736b4a69b4cdc8fcf1c1da40a017915154230c2302e380808d3268f12125726a187fa2
-EBUILD python-ldap-9999.ebuild 2290 BLAKE2B 9369dd098095150448fdc63a20b0b90bdf4c7c24415c1d12c95d8de07475ca1b84aa44481d544652a21103e1d4486c493848675fc4dcd13e7c2e8d6af3f281c7 SHA512 1df4ee1f722043c743e57d6e23766aa6e8bf5c0dc33d78773d8256d672143c9e5f3da17732ce8e4c9788d8e7e5273460c4cfa96d7f8978504577df24e885e93c
+EBUILD python-ldap-2.4.19-r1.ebuild 2431 BLAKE2B cf2d5158cf779081786017bfa59dbb8ad102df9871fe4787c6f9bc4c732d7b80668f5bfcdc49a17dc4164755bdbe9276f8eeaae8288bb6a53c82a3938e203d2f SHA512 3b48e7b4d942ec1664069bfdf0782a36092405ec43172b1670a18192f6dddb7c95eced874eae5bf0c9e96bf0c015346771344c5e5118ca4d4fa6fea02792d8ba
+EBUILD python-ldap-2.4.32.ebuild 2219 BLAKE2B 61e0715dcd6f88f78a6b06830e815ec57184e94ec9a19f5417c56f417b1ca8dd07e8e6fcab6640ca69e038aa7ad7e24164275c1869f0d026c6e03564bf0639f0 SHA512 245ac35b5d94121d5c5a8559f8a013882497dc4352b02182c4b1e5578c42a8d24a93f41e790bdcb3988f61458e034ff696197a8a799fc61fcb187654bd89ed14
+EBUILD python-ldap-3.1.0-r1.ebuild 2278 BLAKE2B 9ece417461fee8e1697163ce53dc763967905744def9779a84401792a2be94daad7f8ba2b2cdfff0bb2cca98415883a671f0fc9179af0403c3c263741d01d19a SHA512 365c72a9e3f290e20eb5ff9ae8b5c867041b6dad1f63b8e323ebf8bc9a39a4f1e6293a1d3c3f2eb3e5663b45f59ae6b49b221dc467c65faac0bb226f2cefc158
+EBUILD python-ldap-9999.ebuild 2283 BLAKE2B 3e4ee2edfc36a79c051624b8c1582cb03be6d9d4732b52fca0ae99fb4f412c172c6c8ae969deb5bad2580bc8a43e97513cf7c262fd8ed9631ce292be0e75225f SHA512 d4a0b50d09e825189a14d8a08672f034433dbca72ae703847371ffa36f1332fca1f906a439d23dff21bf6102ded65b31bd496ac78369e09fc23a008cc150ab3a
 MISC metadata.xml 448 BLAKE2B 4d845f5269cc16dc38e4516d15b3bd66e8eb793fa8d43cca45ef4e04784231757cab47386d43f9361de45889abe21557696d28936b1fd76cead93775393a60e6 SHA512 806ea3543e12f0b571212695f4d9e9e008493550b29b480fc022b55ce2ee1fe561e9eb3a81e887457b7c1cb98fb2c6d46f38890513cee9f4808351821b4f01c6
diff --git a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
index 9adf8b496e63..609affcc691e 100644
--- a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 # setup.py is written only for py2, which suits pypy
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 multilib
 
diff --git a/dev-python/python-ldap/python-ldap-2.4.32.ebuild b/dev-python/python-ldap/python-ldap-2.4.32.ebuild
index 22b3c2e82e5f..7cc6d562eacd 100644
--- a/dev-python/python-ldap/python-ldap-2.4.32.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.32.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 multilib
 
diff --git a/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild b/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild
index e3f987032f38..fa6322458b30 100644
--- a/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index 6b3d8ed6b43b..2e9dd826183f 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index 62f0a95e7012..31a190993378 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,4 +1,4 @@
 AUX genextdoc.py 7029 BLAKE2B 0d4b2c1110838696e1bbe7ef07b30d4bed04955da3451717558ed5a290ed5d1270a0fbea188f21098109f429979995e9548baedc3b9282e33e6703f03390861c SHA512 f03a6628e982da094d40e14d63cc2d233677d78ca1ad0dd0817bc69176d8d4374c2a0caa94a4d0891ba3b7ab14cbbad1b530319984df990176e151d79331b906
 DIST python-Levenshtein-0.12.0.tar.gz 48617 BLAKE2B 67a720f2a76152b008bce86405b4f15f14f203e55c09931f83624c85199626582dcbc255ace914e103e7cd459c8570b0ea0c0d69abfd2c314aa488cb235583a4 SHA512 95df064490970618b003bccbef9071b1a2a3ee4645ac8e851f4205bd4e8123d21ee0ee733adfeec79085faa01ba39902e2a4a26bfb21b70678377579157df4a5
-EBUILD python-levenshtein-0.12.0.ebuild 1090 BLAKE2B f1ea638ee74c266c656e59c087ec7762027b0985d01fe6bf77847926c8807e39f73c2e96a2f93c2c05cd36ffe7b149e3472d1a957ac2fff68c5c2e048a8062bf SHA512 7decded70d92e689decad02573a17e1868f94d7bd36695d40eaa408f536e068daa4862eeb714bd0b24b8f671f683ef0e4735304e6d2ed3d966974656e587f466
+EBUILD python-levenshtein-0.12.0.ebuild 1083 BLAKE2B 86bb9c8ce5dc0ebec17474217d55e9355399ada4300643efe8d05fb3cf9c70afc44f10c5a981695aa90f26654bb464a105a80998e9d47dbd02ca9f96585f0685 SHA512 6b1caadf3528df2964127b8d295da56618c9b0665d17a63bfc7786367490a73205c7d2409d737b324edac613e6d4429a85302d742ad16e02d4a8a9ae0a9a270f
 MISC metadata.xml 400 BLAKE2B 6cb97d53cfebfe6960f5adb6b1b10fef856a0944456e89d1f6ade86d8cf8183aa4acc33cbd4829c35a46158b6955a1454ce7143b5cd5538375ad4ab08ebf3097 SHA512 bdda13940bb23190d6d7c43f69d77a231413dbdfd81de5e35568da70e4ab2bc9906cab76890e78da7b1789a376c44658e476ba7c0a4822e7a97b0f37ce36f0f4
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
index 4c3e271ca017..be307a80aca9 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-lhafile/Manifest b/dev-python/python-lhafile/Manifest
index d6c56dff3b56..0c0390843609 100644
--- a/dev-python/python-lhafile/Manifest
+++ b/dev-python/python-lhafile/Manifest
@@ -1,3 +1,3 @@
 DIST python-lhafile-0.2.2.tar.gz 266494 BLAKE2B 03f4f8e58e261b74c32d65c9ea4507d088c5463424c4c279a320553689607e8f4ff13bab0c2e6fc4c252f923a50cae12ce8e4b8c14cb5d8eec2fd8129fa41a97 SHA512 304de9a000b76fae243f0a175040e16515524ccec051cffefd20dcf6995a37e3d4d2e13016794166a661b235700f540f8cc0be60979ed13ad6308056a95f1b2f
-EBUILD python-lhafile-0.2.2.ebuild 447 BLAKE2B 0a48924a6c65f8a4fccde94bbaf2e1fd5f0be3d271ae92f48d9b22144a57996db6bbda4b392bb111043cee4a2a7ac8c4941182c09092c94508b5bcba62ba15fb SHA512 3eb79ae26f65a2e1135916e45f0d6d89e5e42c2a14421f8559acac24520e8b521c0d82c6aaf06e9469be40fd235ca38d7db7018c978106d6c5be2650e9999fb0
+EBUILD python-lhafile-0.2.2.ebuild 445 BLAKE2B d8978d3dcd90ac62c883bba568eb4b7ef6def85d9b7a8279e22cf18ede50c47e217f2a631edf00ac70bba0b01239e19cc6585b338e28ef30c6f95afb5b608164 SHA512 ac9fa1908eecc99c4afe66e5d2601778154a7553415720d3f33cab64d67592a452cd196f49aa73b3b175c99cd65ae0e45283dca5dce2999f1ffe51f1d8449409
 MISC metadata.xml 339 BLAKE2B b9bf4602de40066fe97bbb0941842bf7b665183861cfe90bcbb8dad6a5e98321ec2adb6c5f7a0da3a51150df75534e71593e27ec1cb9476d150404aeacf7cabe SHA512 9638c1d17829de6fbd03e82977f1a7960dfdc7693e907baa0d71e09e4ba866dd2dca84385ff486b54a7a37f038e1ca38a9a5bd6688d4b0fd88a62117005c6d50
diff --git a/dev-python/python-lhafile/python-lhafile-0.2.2.ebuild b/dev-python/python-lhafile/python-lhafile-0.2.2.ebuild
index 61c3f0895e46..416e1a5ce06b 100644
--- a/dev-python/python-lhafile/python-lhafile-0.2.2.ebuild
+++ b/dev-python/python-lhafile/python-lhafile-0.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ly/Manifest b/dev-python/python-ly/Manifest
index 187642293ae5..149ecf16e225 100644
--- a/dev-python/python-ly/Manifest
+++ b/dev-python/python-ly/Manifest
@@ -1,3 +1,3 @@
 DIST python-ly-0.9.5.tar.gz 174780 BLAKE2B 9cac626f5f363a3239e0c60772db864ae5764a9c3556a484182f18a407b3171d796ddb3549debbb4ce91129b9956a224870ba4b63d8e98228905de3ae4abc3d9 SHA512 f43aa4fce0af970dd64b0cfb75caef57749048d4eb088de6e08e820935c359203de9e99134a0248f7dc26067d0e4eaf2b373a5a2b746e09dea7997437f99812b
-EBUILD python-ly-0.9.5.ebuild 419 BLAKE2B e38348f093ff6247c8f28cf0c2a6031ecfc7265e2919f61da932d76db4cbe40af32214c16ca0ad6347a577fe6961e05ab09f8ad5b542e3695b5497eff6989a86 SHA512 4fa0cc22007edf9aba7aebead2d8f2c36eb5738a10e6a081be7ae1a5cf2d245acd9e8b1cee587825e983fa47592f1b83306f03ffb543112113477267dedb30b1
+EBUILD python-ly-0.9.5.ebuild 415 BLAKE2B e1f5e9c9b1208637f52d01d1ee46d4e805ac0396b330f688cc85b50379ffe9bc039c0927420272e34c816dfbeda4ebf5620d11e68353c0037319f501db1bbd68 SHA512 bf946258d30e3fb96fde9cb09aa1f539117a91f5b34f60e23a05a05627c42e9a2f6b682b5badeb2e71733df5d9050a86da6706f6862f2524ed4793b5b7feb2a9
 MISC metadata.xml 302 BLAKE2B c1c2d9a7ad2000bd1273245b6137e762adcf45f8fd97dbd4c0ea53becc6f55fa9b603ae5fd6c0f7b4184bf2eb054228721559b5e8cd60495a78804fa3b350d7b SHA512 9e87419e39c35b0303c414eb36fa860847d1aefa9a601786a34bdf2c8e9b19ca7d775eb72f2588e538afcdd52d5ce13e153a9643b31287be9a807bd836dec6be
diff --git a/dev-python/python-ly/python-ly-0.9.5.ebuild b/dev-python/python-ly/python-ly-0.9.5.ebuild
index c66fc6076140..ea5992f6b48d 100644
--- a/dev-python/python-ly/python-ly-0.9.5.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index 3459d8c29550..aef3bc66ce0a 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -3,7 +3,7 @@ DIST python-lzo-1.08.tar.gz 13046 BLAKE2B ce4e2d2b1497ed93cdc15d157228bd7b3b6395
 DIST python-lzo-1.11.tar.gz 13823 BLAKE2B 4be60c85aae64e8837f7f8ec332c16f8c86d2e8b2e965e783cb9b0c6c942aa13750dc194679b71a6a0d733bee66313b8ca376853cee7063a46567222f80daa7e SHA512 580c68d2a5fdc43f6cb904507795c25b686c42074f217d067f51b336afa75d3eea10fcb7925c84aea352ce4383c591ff70583bef6c2fbc74116487ae87e1f87f
 DIST python-lzo-1.12.tar.gz 14042 BLAKE2B 7375e9b200a17cc1ad2c4dfdbe6491082af8d120b2b659b1e9bbff00eaae568e04dc12e5c13de3a028267a1e8e02bd1522a9335db73fa6a5a4ebc7ca4b341fff SHA512 811bdb282cfaf33427ad641d0342900c5af1f17b7033d76593288c3846b0feefe6ef93253152add97b2d6420f937de2745c8e7508dadf33e72b11545cac3be4d
 EBUILD python-lzo-1.08-r1.ebuild 622 BLAKE2B 58ad08becc27f5f6bab25a9e4beb590b049ffe0a0a0c35315ba665bbb415a9333e22e315cb6a64b9f0c8daa77e6d73acc225d9f028e14cf72deba7b65dbc7bc4 SHA512 908c281da215817826e0b9b2dbbc3b5b24179c504d0ddf2aa5b7b58a766a023a52f713a84f61a387518323658850b061c29a48babcee461624711b8d17c05fc7
-EBUILD python-lzo-1.11.ebuild 746 BLAKE2B 7dee50ca7c359d004781dfe5e830043c6fd4b3cc96afd9fbf483ae34adf5e91ece00bb02ed9faaeac4914de92583a2bb28e4b90c8fcc7bcff128f01ddc927b59 SHA512 8cdb29c615fdc78b3d22cd6cbbbfa023c0a4d408c28d548e300d86db01e8f927ff9ca97a928c65cec87554a55b6a623b3336e98e0c63f58637bcb0f88e41c272
-EBUILD python-lzo-1.12-r1.ebuild 756 BLAKE2B 45468cfc946037a291f2984f3aeaca51fc68eb962b1d70829622a7060b34f63da8471e393600b4826d7168096b95474dab5d740b3a7845c9e113d4873c72ffdd SHA512 605a5ffd33ce1a510902c7a2cb292d2b956f5f528fc4909c22e83d5beded3a1b23134f1a36fa9c38f8cbbebb60161bef98fbeb2116361e083e0c7ab774e82294
-EBUILD python-lzo-1.12.ebuild 750 BLAKE2B 421eb04e3b7a213358a243ae6618e192532413850ced1682b98932f23f0628ee36d6fc2721c19127c8d40c3fd45193833b704bf8307015cd6820a452174e1b15 SHA512 0e8c3095b2f0970c0d3c66283bcb9c1fb6a6afc0861c36c16f261be7c7edb8c4497439a61fad1e07dc4b7c11bc6b50d11143d5ca2ff7a843109dae64d6ee2306
+EBUILD python-lzo-1.11.ebuild 742 BLAKE2B 1b175d164c58ac9cfd3612c673b7ae9058a8b65575561e64f377857fde69181200e4a83cc2d26043441ba372cbb771aca8b0e01a535471000c136241f5da2274 SHA512 e4c9dbf5ec6fc39d5d9c54a74313abdd86706b91ebf569ab74c2824ba1c0fe047dd1341b0475790a60f37fd30175ff25d68c1585824d78531c54d0974a6b376b
+EBUILD python-lzo-1.12-r1.ebuild 754 BLAKE2B 37f54135f8e7d8d56e8a9b86cc2c70d384db28b9a07ef9969fb367c5f82497bb04e12150643d9ab386678c3deef57280ea1bac0ec62f882ae2c5354bce018430 SHA512 8382d4aa948df44d1ba0b9fe89c98c15daaa4ed6951e47ab88184243ac5eb2e53937869d86426efe957041e32c9be2bff4a01b0f59c5dbeaa0ecd687b305e33d
+EBUILD python-lzo-1.12.ebuild 746 BLAKE2B 8474c4bd1d1a0bc6034cd7f983a48db6b74b729ac23e0d23f4a9dc37d8834c6c13216bbc5ccf08b4dc93edc9a1bb31f7c1fa0cbc2aca01de86e923a5d6de3765 SHA512 a4798158a09428b77359f8a3a8298b1183a10750ae00fcd81904614d7100940b9e8b79c442671915d0bb5056670168bdc4a3a0f9feb67882c1f188cdd7fe06b1
 MISC metadata.xml 385 BLAKE2B 4a726b1896f55aa03b8b9a1a1f39107751f372b7bb7b0b9759447a7d42fcc97c142ea6ea3a2de8358d0bc00cb0e73b12c78c0b03e8c52c93092220761b6eecef SHA512 634d30e62ce3a8c09b3de241642e9ce8b059d9d3ff02e6530642dea4b0b4bcc8f108566bdc5ba52f6e63214546e11f734bdc094ef60ad13197b9f74cab71d03c
diff --git a/dev-python/python-lzo/python-lzo-1.11.ebuild b/dev-python/python-lzo/python-lzo-1.11.ebuild
index b7cc40dd10e9..a335c433c109 100644
--- a/dev-python/python-lzo/python-lzo-1.11.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 prefix
 
diff --git a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
index 839499710bda..ea2ed26e539c 100644
--- a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 prefix
 
diff --git a/dev-python/python-lzo/python-lzo-1.12.ebuild b/dev-python/python-lzo/python-lzo-1.12.ebuild
index 073715623bb4..de8b68f68bb8 100644
--- a/dev-python/python-lzo/python-lzo-1.12.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 prefix
 
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 0d30a183bd03..34fe482a162a 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,9 +1,7 @@
 AUX python-magic-0.4.15-fix-buffer-test.patch 2817 BLAKE2B d8eb024f3e2e3d5e5fa22f9375eb9ada1bdfbf0fecb9b501a2c2938dbfaebcdd0b853ce406536166444f3154618fbceade1940bab112433076e41edfb889a4a5 SHA512 72a9d171c7421f354c504e7a0066e7ba51feb404f28ea3dee26223d44f42ad9f41ad94c7854d81d9510df4967c8a0692664e1a5e8a1444e59fe92f137fbda35f
 AUX python-magic-0.4.15-fix-gzip-test.patch 768 BLAKE2B f97629ea04b4b9ba191087fd1eb3dbb0ed10deb81428754a6edfbd48ac48e0b8ae208b7e9c16e31876d050c9935eaf48165cd97ed58eb5cb72949d0fa221a32c SHA512 790c87209c131c4e394f605669297262b91ca6034309d910902dc19e28691102df0b66cb2392fc8c21727bb16c8af9baf6a316c0b6ca29c9ba542fdb49580e2b
 AUX python-magic-0.4.15-fix-jpeg-test.patch 1768 BLAKE2B 64899d227643a8a09d27e0f7cc5c80ac366cd8e0d70d4ccc076df51794cf0fac14dd1f6e4f5426fe84600bbfdf35fc8e1ea571bab7839f753720fceb575d4658 SHA512 5e31ae71c01334af8e781b2aaeb98da38a68a7772d39e5eb7b231623cb4ac66652a66888a3eae5d35b07cac3024944176a52c4ebf1336b976d68f9c558cbdef5
-DIST python-magic-0.4.10.tar.gz 3950 BLAKE2B f672b95082a68ff8fb2c4b50da0d22316456cda4b72b92d4244fdcd47c43bf599821a9577c76d99bc2a3ae578f4ff05aa76efcfcde684f27a06b90e28d58235e SHA512 8dadfd069bbca574a159dc034fca84fb110a3015ba54fa62c715006b586a5fd10373a5108a4847887bd86c6b7f2c4da90dfb7041cd5e4d51829ac1b94b8e1a03
 DIST python-magic-0.4.15.gh.tar.gz 75476 BLAKE2B dad4973f69a21d08972e1e29bc92a51bc92f405907cc28f18eb9357029afdf9f1ba68010ce651acd821140d60dc10eb2e04138627fb19d132f185a2831fcea28 SHA512 004d6bfde52d58a9d3019ef4ff8c5b18b6a4206bf89820d3a0ae0ed78813f80dfba422aee9685528f88c990526ba65fa2153ac3b95b8863ce6cb3ebe925bd780
-EBUILD python-magic-0.4.10.ebuild 603 BLAKE2B 679fd83141d603baa4de122f1ea1aefeffd5d4d16d0309a66d04fc1a70b35d8345dd6652dbd4ad73a03c6b81c80d51a55ce0f23ed3ed0d2cfcdbaf46ba7f5752 SHA512 b50c0bbd8009e048f3cee051db69146c8267654f771fb33c4f3976d42ca21ebe411b0496a189cf437ae2d4d8ff0c12f928d1915e7bac12d40d802c752a4d128d
-EBUILD python-magic-0.4.15-r1.ebuild 1066 BLAKE2B a444d7bc19546b113083207494b312e801a558235a9d22a4ebaee4529b089f76f1bb2aa1b9dbebc584a8ae8f3417366011800547aa2368fca0768679036bd969 SHA512 7122fc88e7333e219483b1738a2d8766adce672db706d86f2433e1433ba732dac1cf4f7dda5e0a2bd4440e1e89895865682c843b515f1882061b6b338920f121
-EBUILD python-magic-0.4.15.ebuild 624 BLAKE2B da59d210c28070e70455b3257a836c8a85c797cc5c0dd2968e6f927d68399f0f7a6b6bb1585f547ac75576e69f3b2ecd5b77f9bf073eb8ca7a71c2fda29c9633 SHA512 3031bdc1c70365bcfb784eae5e3059ebae3b63753be7532a4658fd5d27538deb6706ef2ad72d840943a355cd0613b2933ead4f86c7c7634306a21aa7ba5ee042
+EBUILD python-magic-0.4.15-r1.ebuild 1066 BLAKE2B b86b78ccc5d3c5239a4b9008ea203eceacfc8d0ce7f1209634ac036f8f113c06fd7de23d26287bb778168e103ea53c0e74839f37496aa26aaaa9b34df52ad625 SHA512 43102ccac2ddf39faca6cca218efc3d586ef8df84f0ac71575833d8498d3798b20a58cb09cc4c9879ee414fc7297f537bd1aa47262a6e0fda32d8adfddfae31c
+EBUILD python-magic-0.4.15.ebuild 620 BLAKE2B 14c8efa6b1daabd27660bfffe24ca5e6dd4b9c8e74e2ea7c4c07c85551510714912a369cdda75aea25b6208d5302fbf11d1ad578fdcb110beadd98bc344f6da1 SHA512 ab297382df0432ef7f4be3166e361211883c294ad8ff75d0bf2f49ec3aa03a0baf2904dded9e0f8b1078d4b46077ca2404640dca65c208a2b9a018cfeefaa3b2
 MISC metadata.xml 495 BLAKE2B 416789755f00235cc92891f85c214cd6f21751fd4c65df5d73199aac39b73245505b5fbba4b151bc03e92967859facaf8875aa4431e77af8cc9766bb2bec67af SHA512 014c7f81cb02bc8e06ff0f0cebbe15954f48715bcbb2fb34a0d9ab7291447a18359597592f026ac3d5b2082381cc9487257351dbde1bb7a2ed0ed7066563bdfa
diff --git a/dev-python/python-magic/python-magic-0.4.10.ebuild b/dev-python/python-magic/python-magic-0.4.10.ebuild
deleted file mode 100644
index e4a368ca597a..000000000000
--- a/dev-python/python-magic/python-magic-0.4.10.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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/file[-python]"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# https://github.com/ahupp/python-magic/issues/97
-RESTRICT="test"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
index 5bdd8c4f02e1..56dcadd63704 100644
--- a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-magic/python-magic-0.4.15.ebuild b/dev-python/python-magic/python-magic-0.4.15.ebuild
index 8cb0050942da..bda6697e8b72 100644
--- a/dev-python/python-magic/python-magic-0.4.15.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-magnumclient/Manifest b/dev-python/python-magnumclient/Manifest
index 5cfe306dea69..72fd35185bef 100644
--- a/dev-python/python-magnumclient/Manifest
+++ b/dev-python/python-magnumclient/Manifest
@@ -1,7 +1,3 @@
 DIST python-magnumclient-2.12.0.tar.gz 106073 BLAKE2B aec03c74429b1934ea46aa8109f4f779aa06281136eab2ad422c851ca347f6703faec9feadb7bc49423b4e335cfedb3ebecaddaba7c9cdb32e8a8ca0de9118ca SHA512 a6d8790b87801ca313bb119e75490cb2913a11558925b6a49e276a7bfed102cf8e575f344fce8e31223f835c4961c50c2918844689ef88ef34c72c8a1032f340
-DIST python-magnumclient-2.3.1.tar.gz 74501 BLAKE2B 8262d8c172018f1174c7462554f901e12249ee825d067913fa269e6fffc265c5a2a885065aa6a6b44ee1940d00b3308bd2502a8290bdd056bd50457e573be472 SHA512 17af04eeb22d386bd43d7d8e49a418b7b577847fd7ee5751880ac8706fd44993c5af43bd347e0a431013fcbd6ff220e4f38818f95ae0456f7f6cb6ce8de606e3
-DIST python-magnumclient-2.9.0.tar.gz 101660 BLAKE2B 528b9cc02832a91edab1b9f5f983637544688e35d5e01880294b8348bf3ea9889a23c4ffbe0a8fef8f57efdc0dcb226b427140da8191bd57441fae76c99d021f SHA512 2c320d20e7914081e93fa19b23c483b2454fcaec19868976e4b7f489e997f0550f1d7dabb4d58fbf7ff6f23c0c2e0962ac968ecb3a356dd995e4fbafd12520f4
-EBUILD python-magnumclient-2.12.0.ebuild 1570 BLAKE2B 01b915e12cd04c791574e1d7eeb873c17556266c1731035917f9774956de964fd1185864987a9c55570ffed0858ab6728a205144dcc12dd74de2c364cf97862f SHA512 e094ea0f1c6845d33850fdbb1c3cb9b32945b842c363352a7249944dd37208a5b05a68005f9c6096c3a711c0ca1ecedecb93da279fec8aa422918bea8df2cadf
-EBUILD python-magnumclient-2.3.1.ebuild 1652 BLAKE2B cf91e0a8207b8b81aa7263e99662463e95634bef9860ad50de680d1caaf90de699fa1559d2e56fb77be84dbf7f69cd406091369f65379577e492b575ea79343a SHA512 21e1668a948125143f04134c28762b49f2d5e0f0995267e4abc64faae233e156b0d8a95fe4f9c67375325e27dda7c8d33295df38b3460fc24c86b2731e1bad7e
-EBUILD python-magnumclient-2.9.0.ebuild 1619 BLAKE2B 98b258aa97935751baf8454edc25259a1f155712a99fea524c959520fff2bb3ea4924637b139dfe3f1cb02b1062dae046463c2792a790e28414e06af087f7997 SHA512 8af699f775271bffde17d892b740b3d537cb9eba2b5429dbac61ceb512b84e9d8c00a77132ba0e40a0a6383a7917e1d9f8d8a3fa9b323a6e492e8819d2292650
+EBUILD python-magnumclient-2.12.0.ebuild 1558 BLAKE2B 0486f7e5370bbcd5d89038634b13ab9968e0947b810945d5cf57a7ca5fa4fcef7b4ffd9db591523af5f00976a09626d69ec6d9975f5ceccc912976ab83a49518 SHA512 8854d7c42f303992bc5c71daec5902ea64fd06440ef94a84e854b137633e77fda540254c8dc44437d4a837500ad5fc6742e650d888fe9a413566bab412097942
 MISC metadata.xml 610 BLAKE2B 532ff58caf9789485db0e81caef4e9bfe6332e0194b15cc9058084810604a75622e405eb4199d90ff9b9f326a51fce96757772ab722dc683b65648168e6f3090 SHA512 598aef60abc1d45b3c6dd00f3db16a6effc1dd826e98d349348b422c9a4f1926f79531e9f3ccf106f934d59fef499bb0e5a1b3571d702e66a8d78dcbb90e3e0a
diff --git a/dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild b/dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild
index f608e96a8d47..2c2835d5a4a3 100644
--- a/dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild
+++ b/dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-magnumclient/python-magnumclient-2.3.1.ebuild b/dev-python/python-magnumclient/python-magnumclient-2.3.1.ebuild
deleted file mode 100644
index b05c5cfb2b9a..000000000000
--- a/dev-python/python-magnumclient/python-magnumclient-2.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Magnum API"
-HOMEPAGE="https://github.com/openstack/python-magnumclient"
-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"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-magnumclient/python-magnumclient-2.9.0.ebuild b/dev-python/python-magnumclient/python-magnumclient-2.9.0.ebuild
deleted file mode 100644
index 58f1ea1f6a86..000000000000
--- a/dev-python/python-magnumclient/python-magnumclient-2.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Magnum API"
-HOMEPAGE="https://github.com/openstack/python-magnumclient"
-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"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-manilaclient/Manifest b/dev-python/python-manilaclient/Manifest
index d2a6caeb4177..819c87843a0b 100644
--- a/dev-python/python-manilaclient/Manifest
+++ b/dev-python/python-manilaclient/Manifest
@@ -1,7 +1,3 @@
-DIST python-manilaclient-1.14.0.tar.gz 193535 BLAKE2B 33052c0c601d1a51f6200e5a05ddeeb96e57a174bf8adc929b848e99bce05764596ff5bf79922757d9b9d2785eff8c81681751f1b7bb6263d6d1eb88f8502e29 SHA512 9cfeffa8919af788b50b2753d722ee5472b45332a8e8dcfd290719344d1d6e7c7880ba0166ccc1c39b1eb15adaa1d8b012d923a04f4ba5b3a2a9774af981bb6a
-DIST python-manilaclient-1.21.0.tar.gz 208720 BLAKE2B 62249b9d3ba22e77d59e060e372901fc3447f44e06c91236c74ba9c16b69bf52ebb8a186405dc2906177bc974df979507c8c9b085a81b8da61618cfc0a07d1fb SHA512 bedaf6d23968a36498e7cd4500f02540debe2b8aa1d7eb73b654c09f1da6a0e397fdd68b978c5e7706365354dbb42f7ddbcd0b2801f3ae706aaa7c2059a16c62
 DIST python-manilaclient-1.27.0.tar.gz 214632 BLAKE2B 5a0b6433712ae34f52b72838a771a6e81c7c28ff0b049f208bdf9b5fd311025ebe90e850b071def454f76245f19a28b27fea5dda59473f445e9882917eae90d9 SHA512 0dd621c8ff22abdf81177887fc8bc7b9792d637eabc092de06d5059ed3fcea0218961643a1e5256fd130e5d1753be143b474342d9daf5c8e5e39c305527ad811
-EBUILD python-manilaclient-1.14.0.ebuild 1326 BLAKE2B 2ef68454bf58e1832f00088aba530d0e0d3ca711fd1fb13206d1cd679e05639cca54697b52e88fd6311f4e42b36c0f1a44c7729615af7f31add7169f41fbbe2d SHA512 bf4b5ceaab690f7b58c625400a86da7708f5d4a07e759ceb9a7924914db43f83b2a7c65c4edc1581ccc5f36af72c2bd1b1becf90900dfbbb082a3b021380aa3d
-EBUILD python-manilaclient-1.21.0.ebuild 1429 BLAKE2B 60639ed6ffd98934b8dcfded412148ba03d9d75a63e2dab61227ec5fefbd4e58d8c6faa4e6cfc95b05cabefe365fe51369ea2ebbed1ae22f3e580bcf4ac5b035 SHA512 da897884ea46d4ca009a45d578c2508e0027912cee6dd6640d0af2289c52205e2eb910f4f6c6b1067bce74c1ed5bb6c68e06fc8bc78f0faed54689b11b7d0c24
-EBUILD python-manilaclient-1.27.0.ebuild 1477 BLAKE2B 6f178522c8ffdae9754e7f0179dc1d448874b997fe3decb0db7c0b53f28bae660273d39965eef501fd96ed4980966ec79d88d6d833011ccf8870add628cd6b1f SHA512 4e990aa90585e76f581edf21bb8b683a241cfedd07553de0005a7e33dddff1798eebcb7dca5b5d87287e8ccd6f207b8ecf66aae5d73472a94bc1ffd1a4d5f32e
+EBUILD python-manilaclient-1.27.0.ebuild 1465 BLAKE2B 99e7d131dec95c5bcb40915cb4cdba4a110e880ed2765a40125f385dbd7bd23b9a3d92e5d6d4887df0a83a20de1672104555a472c65a1f41ad2670ea1638dd1e SHA512 2f0fa76a004de8ad302c9cbf3edcd3b00f65131fbc8b171a27bd0cb91c9021bfcaab3cad5244351a2ee1cf971a63e6c72b5d2d732157c06949e835b1c59a1753
 MISC metadata.xml 610 BLAKE2B 9ff81f126608795602d31173afdff53356b7dd97c211523dce93af86ab9dc0d57c84117401a72fbfc2c2fcc6467d0e1a0adceb7c1616c6c0cc9294945fd987f8 SHA512 917b1ad570615b9d3a509c55e7ab70d88f47cdc7efbc9cf0f141be5ef5316141d0327050b61f8a64a87836a409b08ae410886a8634a8df137cd032bf1c205208
diff --git a/dev-python/python-manilaclient/python-manilaclient-1.14.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-1.14.0.ebuild
deleted file mode 100644
index cb4a3dc2ce84..000000000000
--- a/dev-python/python-manilaclient/python-manilaclient-1.14.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Manila API"
-HOMEPAGE="https://github.com/openstack/python-manilaclient"
-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"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${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-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-manilaclient/python-manilaclient-1.21.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-1.21.0.ebuild
deleted file mode 100644
index 95a2fedd7550..000000000000
--- a/dev-python/python-manilaclient/python-manilaclient-1.21.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Manila API"
-HOMEPAGE="https://github.com/openstack/python-manilaclient"
-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"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.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}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild
index 143c8fd3a8a7..e1c0c831939a 100644
--- a/dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild
+++ b/dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-markdown-math/Manifest b/dev-python/python-markdown-math/Manifest
index a75fa0d0ea2a..b3fd59dc9472 100644
--- a/dev-python/python-markdown-math/Manifest
+++ b/dev-python/python-markdown-math/Manifest
@@ -1,3 +1,3 @@
 DIST python-markdown-math-0.6.tar.gz 6406 BLAKE2B 43172ba4b36b697f196bd569c93d56d1a3a05aaa306b1f149f3b70372e624e35fc0d3f3ea3c58c6b86e00c68408a5ebfe9fcc6562fe5065c7f8a7aa8683ee084 SHA512 af5773dc5b6d8968d811487a86fd027042d381b8b5b37683b519f03f21097bafd3d174881d8201cb6524e0975cd6868781e116cec6406fa20ffd3c6b9f9d4e87
-EBUILD python-markdown-math-0.6-r1.ebuild 896 BLAKE2B 47ddda0b9e94ba4bf807f8b087181e5779ab0039027662abc704c1dde402e17df4d1996778737ca1c0760089dbbac6a448a181f6e0c0155d6966d1b464695f1d SHA512 3b29685e63fddb68a0dafa23478137a7224e4bac032db3b8bbc5dea8f52cb0b2277f94e7e1243152906e7272442884cd687bd7ed37ff7063391adeb11010adc0
+EBUILD python-markdown-math-0.6-r1.ebuild 889 BLAKE2B 6fb111d461cb2d2203eb4464a93b64fcfd2b2757431f1185780c7cee5d5240f55d7cd5d79547a0a6c068bc4a2b57d2617b118aa3fd6f018e05bb8a44e277564a SHA512 4400e53df26fc0a0013c53d9c79cb53f9485c91f2b716efc4dc922cb1e3eddb3cdfe838ed2a791511ebdfdd8fd9dfd723ed08616cb449544669e91e3f4568fe6
 MISC metadata.xml 618 BLAKE2B 38507a41b254385cc67fc807c7bc9597c22f65bf7ccad19a128d619d1b1ee86aeef3244fa01c90ab652179a9999146f02ac5bed4f57fec308f82c03356bf88a1 SHA512 cfdc0f283f5351aa12165bf85cd9e428f8d1d4c80eda12bacacbcf11d2b195d6306bc406b64ddd7dbdc3b086c7d2fbde70a424e0169751a9b92ae48e02544802
diff --git a/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild b/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild
index dd47511ee123..c866cd66e56d 100644
--- a/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild
+++ b/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 inherit distutils-r1
 
 MY_PN="python-${PN}"
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index 24df5244f427..85ed2c63b117 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,7 +1,7 @@
 DIST python-memcached-1.53.tar.gz 35025 BLAKE2B 40d30ba35b8dc5d33c27a8a02d66ef7714c2851a3bb109b0cd4456f14408579e51baef8a6020ee75a21bfba468f6524c5163f4161676fc86788186832ff2ec4d SHA512 33ffd2778025a8e15beddf1660c4b5c9f1ba144adab5c36fd679e15508015c00e3e1185b5cc179cfcfc556b7c3ab44ed9914089e5ce9db66a04d0a658dd38bb3
 DIST python-memcached-1.58.tar.gz 30562 BLAKE2B 928aeca2b0d6d99fb16ee8c8c970ccc41aabb4c6385d962cb4208878f4f0eb1b1114c103118fc4ce6020e01d2260b9ffa83e96b2aba719cad6820e39d9fcfe3c SHA512 48f933f095751b476c122473fa1d9767cfe5c6c339a9ba71825a50cec23cbfc7b6493716458bfb1f2451c634c517519152105a2000be66bd0d389f94ea312138
 DIST python-memcached-1.59.tar.gz 22210 BLAKE2B 50387821d50cf974ada738346e016eb736043078721bf905782f41df1f27574244d03b6b94ac9e5ccab7aeecfa8ca4c5a78cec2c41d15fda8756c7cb3bce9aa1 SHA512 a25cbb9efb3babe85e1523bdabfe4644b93b3a6a7268787a3928f724f833ce0eea7d2ef676d1b7f894cdfe293129975b35cb46ec553c92810dbc18013bfabece
-EBUILD python-memcached-1.53-r1.ebuild 1213 BLAKE2B 76827f4837a5d0bd58e84262a58dfebc297de4272f37d5d322df3ca36018d9f273c73fccf4a2ab94a5d0b3597b5526ddd6d83818af29fe55b4695222e07a3218 SHA512 e104823d6aad4fc854203d8efa60934efd5eb944d8a172503e6cd9931a9fe9200388a6439eb2f55bd8a4f20057200b6b047341ebec1f59190b23ae3b8c580554
-EBUILD python-memcached-1.58.ebuild 1282 BLAKE2B 15d4930661b61ef1559a1e2e81e555ba304b7111184f3fb93d2d993258538c5ed7367619a28d60a67adfc826f00ef8882406b49ee75c967473d00fc75ef4b21c SHA512 e842f1d78e6e07c89831aac3ee1c1e1c913ecf4aaafb0bac54ddc8e3045cc92e1cd4b81f9413f47f836c5dfc30a8802c0fabbfae42d8c6516df285c6831561dc
-EBUILD python-memcached-1.59.ebuild 1283 BLAKE2B ad71ce3e12591bf1ce00251f6ae0d28c276fd0e50e7238b0f29a402164c619c70ba71b238b3f6ce6b339ca62605d426f01da98b10c6bbecd4fd170c117575a6d SHA512 94b3b63e7d3552d886ebfbcd2ccd7d46152fb3853d92d4201faaa0fab66279e5630759ba6d15c1be5ce1c92708946d60a96c0af90b129cd790c43177c98c5d64
+EBUILD python-memcached-1.53-r1.ebuild 1205 BLAKE2B 1e8844324d0a4d21f74284fde2f8f182cc93978b98e0ed7282c892108dfa5a52b71b388e8f31860b8b9422af8c8a3b37f6970cafa3e899a726d08b26bf4829cc SHA512 4d5d15d2ce277c92a84bd01d66d49cb70f16a77312d754e288576e66aabaa5db800a61308d647966d78d9ae996ec4dab0be55d5b3da2a4a4cf33ec670b6011e6
+EBUILD python-memcached-1.58.ebuild 1273 BLAKE2B 326b45c6361605b2071ab45c77e9ec72a250de2331110d6ab44891132694b98016eed7db39a2030c59fe9179eb680440fe02f91ed2ea45deda5c3fb748e5121f SHA512 5bdda83811802be40a956fc5191690eee712cdd676a397589bfe84c22a94aaaa7fa21f6b5588ef9670eea939eb420be83e3db6ed12d71c06836ed1bf452e720d
+EBUILD python-memcached-1.59.ebuild 1276 BLAKE2B dc8638d2d7c7411a2ce1e25d4eb98d0f5c4409063e35019da09e8566811e5cc5d69db60ed933533e95b9275cbc37a905661a0c66b928743368c3239389a2e4d1 SHA512 9b9c3515a5d703fc62cb5d13cc8792bc36a7b472dad92a68eee8ad6d12db3ec5a3284b59a33c318cfeef67e486ad16a37dbea9743f65f0a41409a9ea0946a2ff
 MISC metadata.xml 611 BLAKE2B fa7a75bea6b08f6ab65ff4b5d4d8e3022912ba8cb86c6dd3fd2d8f5bb224f89ae9db977c2197a39e6541193ed41366c4bdaa404138a18b2d31afc412b967cacc SHA512 9070f42bf5f3fb721f41309c7a24f29168f1179f9327f1334dcd5bd7b38ae98bbc682c2f0cfb7874c8e20e92ce25bffdc5d3f21870316c6d35cd57e1049f8d90
diff --git a/dev-python/python-memcached/python-memcached-1.53-r1.ebuild b/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
index 2a091a9ae4c7..6fab053b423b 100644
--- a/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-memcached/python-memcached-1.58.ebuild b/dev-python/python-memcached/python-memcached-1.58.ebuild
index 26432fd11be4..83aa225b3cfb 100644
--- a/dev-python/python-memcached/python-memcached-1.58.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.58.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-memcached/python-memcached-1.59.ebuild b/dev-python/python-memcached/python-memcached-1.59.ebuild
index 6d41a1745de5..10a27b7cc245 100644
--- a/dev-python/python-memcached/python-memcached-1.59.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.59.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-meteor/Manifest b/dev-python/python-meteor/Manifest
index a9df5b3dce4e..1c6254498273 100644
--- a/dev-python/python-meteor/Manifest
+++ b/dev-python/python-meteor/Manifest
@@ -1,3 +1,3 @@
 DIST python-meteor-0.1.6.tar.gz 7656 BLAKE2B c1ab81da13d3f2903779b07680a0ea96d03ac4f38f3a96c8317bcee60fd50f2f7e468fccda1731b22d88632da63b83cd9d69d83725cf90e2cd992bb9be5a39a6 SHA512 c654113714e7a4311d66d7390a996cce126bed2270e15f22791ddb8cec1afd5af321f24c8a83d8dc491c0959b8410fa91d43e2025534390486283f2da78a2233
-EBUILD python-meteor-0.1.6.ebuild 487 BLAKE2B 0292a235b9bd6345073c4422ea3ec88dff4a80c037f6b53aa8e353154268f3811bce7f33996ac99f26cc1094f22903f620a45dfc6a60c0d0178f9130dea2a34b SHA512 a27d9150b232e5c25a5fa78c1345882d227712e8563e6996e73c5686b9d41b52093e32761292ecafdd011f35ba44b4d1d29fa9e757774faaa0fe10db20ecd62c
+EBUILD python-meteor-0.1.6.ebuild 477 BLAKE2B 6658a1e91fc572516374b7822ce5a674cae4636cac3326a55f8fd17d6fdfcdc9a9e683bb819d0ae9c9c5253d87b00006b807126e71f98e4b38a9b527d8629942 SHA512 ed3c6563431aa9d4f13473beedaa7606c687c649332f0e3ff3cea2bf2ee9beba020be033ad2de4d886aee3a56c9bf77851bcd7f2d90b26c6edf77867c4a4b8d0
 MISC metadata.xml 584 BLAKE2B 25317aa7374c2da162d3f167ad05e183880015ac0978cddb21504c03a63ff1f1e1f9f951f21e3846f2c289926e36328bd2571bd16a5a1c27e602a503e2abca04 SHA512 73e3dc166d3e4f019fb9c12a4374a7537fa2529fee80a3ee83f74e75fc790b14dcbe209d171889f6c1f13ada3d510cfa6fd0525aefc02567d95869e2da1f9191
diff --git a/dev-python/python-meteor/python-meteor-0.1.6.ebuild b/dev-python/python-meteor/python-meteor-0.1.6.ebuild
index 16b19ad02144..85335454909c 100644
--- a/dev-python/python-meteor/python-meteor-0.1.6.ebuild
+++ b/dev-python/python-meteor/python-meteor-0.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-mhash/Manifest b/dev-python/python-mhash/Manifest
deleted file mode 100644
index fad680422915..000000000000
--- a/dev-python/python-mhash/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-mhash-1.4.tar.gz 17309 BLAKE2B ad9f8b630037a37502e1e02cf102da224bfc661956937176a3ea698d942e9dd08e9fc70d6001345f2460668afc99cdaaf79b9bb54aa5f8b2bc96d8976fc0c3bd SHA512 bbb81b35cb19d2dc051c4912e75e679dddeeae39c781240bd3506f58cd5627f56e25cfeaffd2a84db231d0043ee31bedcb833e5245222a80774c51f25908d07a
-EBUILD python-mhash-1.4-r1.ebuild 727 BLAKE2B a95e078353c352437833a6e9de6fa0e22ccb3dc580b7408031c49c48d349d54d9e1242f1d70d397289dadc41fdabb7cb6d872588df0e6c8c83735fce53fee39b SHA512 628d940dee40db69f43b2f44a41ee5b9e43f4c61e9663101f73df2a5f3ce1a186b3538fe358f79c026ac0ed04ffc2c6dbbfb943d07eefd07a92fa68171bbafd4
-MISC metadata.xml 426 BLAKE2B b6b1cf0ef5039f699c2ab96eecf8e1f7d0bcd10b5dc18f12d422e6152819740d4f1469b6668d0255a6295a752937c9f835d3d52090c96155665e51b92191daa2 SHA512 99f1476c3007c40fe76881d7ef0a7aa3b62106bf7ea5ec041f01cc667227ca32ca07a40433c80640e83500410fba668bb44a675f68c233ba19960e87b73a612b
diff --git a/dev-python/python-mhash/metadata.xml b/dev-python/python-mhash/metadata.xml
deleted file mode 100644
index 0aa2d73795b8..000000000000
--- a/dev-python/python-mhash/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mhash</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-mhash/python-mhash-1.4-r1.ebuild b/dev-python/python-mhash/python-mhash-1.4-r1.ebuild
deleted file mode 100644
index f0e2e90e5fe8..000000000000
--- a/dev-python/python-mhash/python-mhash-1.4-r1.ebuild
+++ /dev/null
@@ -1,29 +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 flag-o-matic
-
-DESCRIPTION="Python interface to libmhash"
-HOMEPAGE="http://mhash.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-crypt/mhash"
-RDEPEND="${DEPEND}"
-
-python_configure_all() {
-	# Note: review this when py3 is supported
-	append-flags -fno-strict-aliasing
-}
-
-python_test() {
-	"${PYTHON}" test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-mistralclient/Manifest b/dev-python/python-mistralclient/Manifest
index 20937d5b1f2a..c4d27203e848 100644
--- a/dev-python/python-mistralclient/Manifest
+++ b/dev-python/python-mistralclient/Manifest
@@ -1,9 +1,5 @@
-DIST python-mistralclient-3.0.2.tar.gz 78255 BLAKE2B 58d9fda6ac9b87493008ebc809ae128b2e71443af854b7719928134f9802b0da7877eab79ad96b60e47f222815b4c4476ff93f43af557e79dc88c2f714e0eb3a SHA512 3f2bcdf7723e3acba9c34947fb26c2ad3814b89ee43a26d3779f4ac7ae0845c4129c98d1a5b6deca2e2dcf77aec128639af4e8e650863cc19b7c03864bae7ab4
-DIST python-mistralclient-3.1.4.tar.gz 77670 BLAKE2B 37184cf32606affb1e08381c1a6f4d47a68d0dfc3abf4276110c7c667b12f8dc57f859f47561ff3368ccf36e684d63570dc1a82325f62a0d8e8e59366c7ba9e0 SHA512 dc9d79e79bf0f1829b218db43deb715ab000eb2dcf6d8cebfec912acac3b111d4dee9101aae7868d631a87fabe6014048709585e6817071c73ee95a8cd7f6baa
 DIST python-mistralclient-3.8.0.tar.gz 95855 BLAKE2B 2432ad1fd80a6e4803af512a96c51381ee20652a01a3dac07b3894717c8f599760907b36dd71ed172b853be021b63971d264588d27efbff208924fd4d4871a13 SHA512 02a4ef4cfada8f2733456082c5fbe8ce055bed4b9b768093851b57df3d115323416a6087803e1a0307245f8b107d2c08348e0d027b2dc813632c1002dd947b14
 DIST python-mistralclient-3.8.1.tar.gz 95616 BLAKE2B bc7185522b24e30321c5f57b6bc31cf239873343bce66e901e8928aedbc3caef36102a8ee67e01f6b46f77cc0d708006ac69ec4147a22b72e52e01441e39eec4 SHA512 ccde34b3ac6e12137d57dbfce597a8f9c43824a8b2450af15ab065fe03469edf0787a2b91c8e5e1da78de5d9d4d20213701e992d4c41e61c459fd987461d5298
-EBUILD python-mistralclient-3.0.2.ebuild 1163 BLAKE2B 30a532f84ca821a416b50d2013fc1c601bb8655a8c7eeacfe1fc683c2968f31d7ec4741326a38534c63993573be9d38ad1ad8664595a86c49c371cca30890259 SHA512 c5bdc38a7673457c7d3dcb1b7c39cc3e64bd96892973c42bff584032e6d4d734f8201c4ce83c4c54c74a57ba8b1ac0a0ee0d78ecf181a24fc2605ccd5b2b5a6c
-EBUILD python-mistralclient-3.1.4.ebuild 1194 BLAKE2B 3cbb8f45b70f52cda1890687b016476d8761e774ea1609d866469ce6c23cc0aa3860bd8dcc8cfb8745d9c0f4c2c9bea218cefce84e288433f3b73af0786ea9f9 SHA512 2e7f9e479fee5097e59f99328bd181e23d2fd528e12324cc3e337a74a4e2231a7950b4a70792627d60c6aa4c46c6f0f3bdddca78c6eb77f2636ae5935e810002
-EBUILD python-mistralclient-3.8.0.ebuild 1300 BLAKE2B 3e202b5f90b0133af55d6879d3132e13e6118d067b0d03ef110422a37160fa9d214f0733ff582262bf33dba8395601e7234b68707bc8d752289b4fd640931b29 SHA512 527e374452029ba22034602b826e22eefa705ef9209c38f66f51ee798206e87ed1b4fa54a09d3a6412ff9ad37a4225e84aa49b5a4efb21270b4c9be5515a73d8
-EBUILD python-mistralclient-3.8.1.ebuild 1302 BLAKE2B ae2083aee8aa6661a832cc6371b6ce965226d724fdfc3160a4fdeaf3c13de191ce8ebc32b696150e5b2a0d21d8908969a50d57890761fc02b8f46cd459a9bee4 SHA512 622fd589f181c137c8d7308d48f2ac0624d520fa3feda2fddcb624331d30a1873172d440ef79966523e1ce8f424187db6904e33e8d2f01dc7d282d27b3a8ab76
+EBUILD python-mistralclient-3.8.0.ebuild 1288 BLAKE2B fd29cfffc645bb4c30faf1658edcaff9c7aa58add8ee900960769a4cb5d817fa466d985ff3a5a53bc70dd3c82224c943dc1d1fccf5b4dc75f57e29b962e95e6e SHA512 8c68eb012ae43ce119c4ac078520c2ce24fae024e882a71b4e3fb9404480025cee35066c6de981f503e8f125f2a6c75cc4c5a0c9216583bc80bf529a6add53d1
+EBUILD python-mistralclient-3.8.1.ebuild 1290 BLAKE2B b441a37a070ca97b000a24f2eb4123a12fd525589b812965c4daafaa0d91ea33da65af54ff36353718d6f1056a5ced3fd105276fbc0ba4d5ee502b5323038a8c SHA512 d92e5c3057aa9d4bf1a98e0340a0fd5dd8d0d4e78bd33ea9ad9ac49da71c49a8ad25fb3a6ce1b35ee691cfc7be6fe7d4f016d206d258092536a1105b4a434db0
 MISC metadata.xml 635 BLAKE2B 7d074b84873590ac98f48bfde93536bca796bf1544ee050a900f0e6dcaf9fc4f48e47dae31201e530cefe1cf58343d4bd13a07c0cb4314b05636c732e2ae47c1 SHA512 f3e92e2bb38afdbfc7605c5244d6f60b0c72843617197e7bdb08031d69ca283b544b88af340ce75382bf2135150f9314eaffbf1b0e45c16a9434e15c89131622
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.0.2.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.0.2.ebuild
deleted file mode 100644
index 3b4892c8d2e5..000000000000
--- a/dev-python/python-mistralclient/python-mistralclient-3.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Mistral API"
-HOMEPAGE="https://github.com/openstack/python-mistralclient"
-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"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild
deleted file mode 100644
index 2973f824198d..000000000000
--- a/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Mistral API"
-HOMEPAGE="https://github.com/openstack/python-mistralclient"
-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"
-
-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/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.8.0.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.8.0.ebuild
index bf184dbd7052..59510b24ae2b 100644
--- a/dev-python/python-mistralclient/python-mistralclient-3.8.0.ebuild
+++ b/dev-python/python-mistralclient/python-mistralclient-3.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.8.1.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.8.1.ebuild
index 4ebcb5970c1c..1642554f46d7 100644
--- a/dev-python/python-mistralclient/python-mistralclient-3.8.1.ebuild
+++ b/dev-python/python-mistralclient/python-mistralclient-3.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-monascaclient/Manifest b/dev-python/python-monascaclient/Manifest
index 27322e409963..44b755289076 100644
--- a/dev-python/python-monascaclient/Manifest
+++ b/dev-python/python-monascaclient/Manifest
@@ -1,11 +1,5 @@
-DIST python-monascaclient-1.12.1.tar.gz 45871 BLAKE2B f90c6b9f5bdf9812b27d77de2080bb01ccf4f0ffc9ecb0d9d2cc5cfea8f51921789199bb376fdf86d8169ff616602d4ab8b680e227fd1e1574d164fd666765f7 SHA512 36966125bc1efac226323320fb6e7cf90fba6a540c2fa3817bba0d70b78bbbd4627a4dc9d46206c7ca94baf4822ad6b38796e7caf44cf75e742029d80f83a88a
 DIST python-monascaclient-1.14.0.tar.gz 45815 BLAKE2B c333b376b2ed87299886249a971b500166310cb397fd519a2ed2481aea775dd84d7c82345380c477e70c0fcf977d9d30522850d6e5189d4430c97beedf1110a3 SHA512 9b2c47ca01580048477ded52b28c15ea6a8bb0442e9f86943c9efe52c14ddb62ba7307bc5cdf3ef24a0e198caa9029ab88c91e1c750ef55d4b29dfd02b4718da
 DIST python-monascaclient-1.15.0.tar.gz 46868 BLAKE2B fe78e21e0324f6a4b95d8583c43a9bf166896b3e610ad884d278208cd3e5597038c7a04b96f5e3ad6913e2a23c13dbcb4937bed05982a12c154cccae6698adda SHA512 d9378d01d78742e26abfc82ffcb13d64451ce10e6d3182a03893f21bcc76e9b961c3daaed6d9635b6bc709e5782f44e20485b53468bb2d825d64b18c6b9bca50
-DIST python-monascaclient-1.5.1.tar.gz 62677 BLAKE2B 5edc6003cb5e234e6e8a54009232aee002bb52f4d48eb589e167e1309b4dbf30827e4100b1e7a75df97495d1b0083a1d8c033c0b068d88b6d0df0f7232cf408e SHA512 d6513b5d49fcf09a9f7b6c56ac8ef2dd27b5d18148a0ee20d58a62c3b1d332df3f154d559ddadcf972291a2e30bb204d4bc26b28b69a0ae568ab8e8b7ce81a1e
-DIST python-monascaclient-1.7.0.tar.gz 50363 BLAKE2B 831d908588ec4635b037ca968d92bcd2578f141448cbc35d62b44baa59e2dfcaa452dd66a824d0104a07b2090bb24933c4e0bfddb0022b0a4125067607ce7d4b SHA512 b4cdcd227aa02463be9bcd095c957cd0ab834724a2551fae40b2924a8cabd1dc879c2e1a89c989834a3523055a2f2faeaffe8e4f8b0d50b37dbf9441efbd8942
-EBUILD python-monascaclient-1.12.1.ebuild 1245 BLAKE2B c6ed75ac0479114dc39e73356e6dddc287b4fe9c635eb3cb85b626f4d77ed092f343af580422fe5d7d6bc11b8c8053b0c7c539f1b5bd83470d18c5dfdc5f354f SHA512 d32f696eb48597b1853cc492251d80c93e4b975ec955ff03f3488b6c56b28156abaacfcd100094ea16fda6dcada72e5fbcc1b226a39e2f6c9a91eeca9e40978d
-EBUILD python-monascaclient-1.14.0.ebuild 1247 BLAKE2B 80da652704da6a6663fd8300a2e64db30cd588b0e72131e9301e62c81971a6b9bbf73e3f66cb8df6a7a3597c9eb4d75e6bbfe8aa538bc33ab08b7432ec83886e SHA512 fbf38ed20795ac5ee172a4ee4c27ec2e7dc5e22cf74e61fc696eeadd19c4d68f4ffc3ddd4bb9d70f2a66dd4f81fe40293a440713dc072998ff77ddbccca4f70e
-EBUILD python-monascaclient-1.15.0.ebuild 1249 BLAKE2B d41a697bba124d737b5f9a1d3178e2f50806f734450596e7b7abd97ee52d7c87c8334363088a23923de8020c39a0496115abdfe7591dd491adfecc4571c3765e SHA512 af02aea2d407b7b4579393bffe79dff38a47d072d215720b73819e301d86d71494e7f255792a31ce5dc3fa327130c7e4f056808f72455625ce9b1d733b54088b
-EBUILD python-monascaclient-1.5.1.ebuild 1581 BLAKE2B 2cc3fd1d1a9965b4937c778568e9d4869e23da08ff02800bb659f1ce6c9f8fa91bc1d63e8d97f9622437ed2ab335ab41ff364879bfcdf4b2a2f37d88b5db62c4 SHA512 2acbde18e5afe53af8a558b53c939e575eb4d16ee0ac41903dc5073f299613d03964f9d888e4bcc95e6a70e465d31ad5a0a26f3f98dfc279fe89fa7a454a5e24
-EBUILD python-monascaclient-1.7.0.ebuild 1244 BLAKE2B 06406039ef101bace899cd59ef5ec877150264630497e56fb602b5fb26ade92870abae824108d9ceba58dbee332b7ca30e85e0a82e8277cb435ea5ba62545005 SHA512 5bc9af36f1c028f02f138c0f174d7a3ba6e39821a8e1340617d75d6d829fdc5ec25003ede7c892bd03ea051d07083c76fbb20724563a9da1db850c554672d9d1
+EBUILD python-monascaclient-1.14.0.ebuild 1235 BLAKE2B 9fc99a90cb93c1f6e7d2b24196de5095d9d65f260ff3eecaa1994353e5fe9dd727137c888efe3e1fbf96009024b7b5a3f49da5dc19fc56800b3162e3d48d8c20 SHA512 f2a6ad0acfe95c3cd053e4380f2d4603a0dcadec7a9413f32f0acd8ae60e7bdbce86593186ff25210a2c27e8fd486dc5058cb0928a77b00c05c25328c8660557
+EBUILD python-monascaclient-1.15.0.ebuild 1237 BLAKE2B 1823643ceb700f3bd60c3983ded8eccbaf3624a06c625ddc405a65764c89e39fb9d15dc67fa1387f2eca771977938e3a9eee96b480f38c9bdf45db02f2feb66c SHA512 2c1241134e7399feb55b38804e49a441b955b2acb202c399298c64079103a721f4b92dac34e7e896ca98eb9587d8f7dc73d91436ec501495ad1c468702831da3
 MISC metadata.xml 635 BLAKE2B cd2cedd1168ce9005dc1a4da260be2501333a5d93a5b82914d729a4a6033aa100a99b83c54695e1e28297883cc8ace8eeba9946c04733a273c79f80cd210afa9 SHA512 48ee0716888ea7082498f9e62a76c9b422bb4595b24ef612f771e93ad634ead94a25eeb77a1dcc89c49bc1fdf529d2e40a3083e273e4155f231c5be6e176fbda
diff --git a/dev-python/python-monascaclient/python-monascaclient-1.12.1.ebuild b/dev-python/python-monascaclient/python-monascaclient-1.12.1.ebuild
deleted file mode 100644
index e7364dffe15e..000000000000
--- a/dev-python/python-monascaclient/python-monascaclient-1.12.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Monasca API"
-HOMEPAGE="https://github.com/openstack/python-monascaclient"
-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"
-
-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/osc-lib-1.8.0[${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/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-monascaclient/python-monascaclient-1.14.0.ebuild b/dev-python/python-monascaclient/python-monascaclient-1.14.0.ebuild
index d403de6e09e1..946821edbabc 100644
--- a/dev-python/python-monascaclient/python-monascaclient-1.14.0.ebuild
+++ b/dev-python/python-monascaclient/python-monascaclient-1.14.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-monascaclient/python-monascaclient-1.15.0.ebuild b/dev-python/python-monascaclient/python-monascaclient-1.15.0.ebuild
index a899302fd277..5c379e049e14 100644
--- a/dev-python/python-monascaclient/python-monascaclient-1.15.0.ebuild
+++ b/dev-python/python-monascaclient/python-monascaclient-1.15.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-monascaclient/python-monascaclient-1.5.1.ebuild b/dev-python/python-monascaclient/python-monascaclient-1.5.1.ebuild
deleted file mode 100644
index a9472e624eb0..000000000000
--- a/dev-python/python-monascaclient/python-monascaclient-1.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Monasca API"
-HOMEPAGE="https://github.com/openstack/python-monascaclient"
-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"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-monascaclient/python-monascaclient-1.7.0.ebuild b/dev-python/python-monascaclient/python-monascaclient-1.7.0.ebuild
deleted file mode 100644
index 80684ddd032c..000000000000
--- a/dev-python/python-monascaclient/python-monascaclient-1.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Monasca API"
-HOMEPAGE="https://github.com/openstack/python-monascaclient"
-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"
-
-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/osc-lib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index e162cf457988..7ebe17282058 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,5 +1,3 @@
-DIST python-mpd-0.5.5.tar.gz 46334 BLAKE2B b0345c6ac2027e3881f3f2aaa6d7bc01dcf67b71de9bdd6d6a8b1bbd6f72ff9463100a0850db4320ce7ee818a1212537be68ecb624984e3f40f1ef4102eca075 SHA512 d5eec60045561a8a0e29eda2ec2fc341c9b81d61363260c884f0863e931077c31c32534e3c98a488ef31aa61cd3d21bdcfa625b7b062ef24bf3e8024dc1e7c5a
 DIST python-mpd-1.0.0.tar.gz 60032 BLAKE2B 9293dfc85363f83041b1d73046dabe6a3243a63de495ba630eedbda96d1b080cfb1cc635801794a91103bbd4b9145733d63ce3ad252748d01ed596cd3b0f7895 SHA512 5fab12d082be39ac4a3477ea10b5d1fa350ceac23c97fb12a46f6cd0cfa6a83999f31528d6d7f74c1ffe67f4e63dfbe8fd3debcf917a6e3705bcf84a55a458ce
-EBUILD python-mpd-0.5.5.ebuild 724 BLAKE2B bbe8846a705a8bf0da0b1b1b645e46cdbfecd7eeb94aeb0aea9d692c1b4c33cd88cfac257fbb2ec74462a086d107c9b6ffaad7101d527b76fae2d01894c5380f SHA512 d17583bca5f5f253950eefd69b813cd599d816f849bb96eb7e90a13e1ea7f017f05cf6e76bdf027d29dd2bc469d2c88a4e262785251c1f25fa76e3d2afbd5143
-EBUILD python-mpd-1.0.0.ebuild 995 BLAKE2B d837717fcba4e3b2ba5222dab366766dcdefd571e9dc5f86267aa75bd053bb74ab1e242c71a22e0f872b2111c68f2873202b9ba05fa530ddf14fba5d30620600 SHA512 c710ec8c3ef53c4fafe97851f0e15b608de3d9c64ba7a6b73b6f5cbc96e3c8ce55a14b9213e096c61d8c17bf7b7591c0c08b07988f3a622c9a8b0baca309993b
+EBUILD python-mpd-1.0.0.ebuild 1005 BLAKE2B 4da59d14668451d3ed9f74b47c5cd593346dfffdc77d30f20976ea1f03303316e5881880659dda6a6abd9c13dc1d90c2c66cd3a358f305f0adef8da14452c526 SHA512 661674eed79b3ba2421ea5627e318f1626c5cf34235429d020bbc3be21f0c25a6d1a2c9650e7d7e9b193761e6eca39c7545bbdc6bab8cfba0ae61ee3866afae0
 MISC metadata.xml 438 BLAKE2B 5429aa3c88046640fb1349404a60f1508f5d86f698ef410210507df39fd5b2d2502d8d2dafde32c8a6f02c2d01e92cca1dc37255435066dfb3a41d26850a367b SHA512 1101d7830907a54a4ccfa1a1db8e6abea802fddd3ee0827770d9e15157be6a3e9b491eebd4b80eab38074fba743fc0671686806c27accd060bf3948736a86c44
diff --git a/dev-python/python-mpd/python-mpd-0.5.5.ebuild b/dev-python/python-mpd/python-mpd-0.5.5.ebuild
deleted file mode 100644
index e07d5ff3dc60..000000000000
--- a/dev-python/python-mpd/python-mpd-0.5.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python MPD client library"
-HOMEPAGE="https://github.com/Mic92/python-mpd2"
-SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( doc/changes.rst doc/topics/{advanced,commands,getting-started,logging}.rst README.rst )
-
-python_test() {
-	"${PYTHON}" test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-mpd/python-mpd-1.0.0.ebuild b/dev-python/python-mpd/python-mpd-1.0.0.ebuild
index 067a3f07ca43..edacb331407c 100644
--- a/dev-python/python-mpd/python-mpd-1.0.0.ebuild
+++ b/dev-python/python-mpd/python-mpd-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Mic92/python-mpd2"
 SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 SLOT="0"
 IUSE="test +twisted"
 
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index a7c5e5de7348..a4cab89c947c 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -1,4 +1,4 @@
 AUX 0.6-fix-test-submit.patch 993 BLAKE2B 3347bd841f0f1b23477f387275ad8e6d40fcffc434150e93c0d57c9291c239639018c28e519032ee2cb251371343d0f3ce6c070b960d4ca8bd1dc5b5b480511f SHA512 ed5b6b674edddcc1d6047bfd97ffdbc1bd4ae3b83e61100b0389cabad84014dce894857faf5555824f245eacaea7541ee18424f630881698b8f2bebceabf8b78
 DIST python-musicbrainzngs0.6.tar.gz 110948 BLAKE2B 9528d966565f7c927a98d311dcbb6db73a84614efa3eb071fe944b29b655526f9dd6e8a4a217428883d30b93c18e45c3d752d321d3c0689e5af00423b5fd7faa SHA512 901729f736b207f2f086e3d44a3515d405f6621706ad9c7ca07dd304349e048c5790bb16b054393651808bac4905ceb9493dd66d9fb17a1612692427c0bd3bd4
-EBUILD python-musicbrainz-ngs-0.6.ebuild 1154 BLAKE2B 60a3fe28a2e55c5a1aeaf422aa2034e0bbe16f39ceaaa4d0cc7728e20f6175990a17fd2b0a4586ded0d640f3fdd97d21dd014b0f01e6324f2690419472504781 SHA512 ee05c46fc1247439cf3a96a2afa37ee8f6f4641aae1f0e5529a286d860ac32368fc220499ba4f83f5b841821cfa0933c20f2a0c01ae8bac956cb51936bbfc7aa
+EBUILD python-musicbrainz-ngs-0.6.ebuild 1157 BLAKE2B d634110b8940104ba4224f919a28f4f176e191a4a1359948fd676da68af33975eb8cf573a135e1c8b180ad5654a82f28f9fed58d4571337f5410e35d36715695 SHA512 3d08e5b39c324eba417abe7554569a78581b1833fc4171df2a9a1378948324ec1d9416191142aaea350ed2b5ed024edb75daa1c23f3844db738e4c95351139c7
 MISC metadata.xml 608 BLAKE2B 2fb7e36555a1ce07fc8da2d81e412e2b1194cbacb6657779e37a40831878dc6b462e0cddfbe983d301bb84736e4bdbb6d12002f94a4038f0afde45fe35c82069 SHA512 811ffe495005e46570b10c03f4de36d8fd096123108300f21afc12f7c6af46f2ac66a9c69d1df89f1266df4b83afc5281aedd1e978d7eabd7cdd9acda7a338b0
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
index dd950ff29ec5..775cb23c11e3 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-musicbrainz/Manifest b/dev-python/python-musicbrainz/Manifest
index 204e6c5436f7..32331b4b7f1a 100644
--- a/dev-python/python-musicbrainz/Manifest
+++ b/dev-python/python-musicbrainz/Manifest
@@ -1,3 +1,3 @@
 DIST python-musicbrainz2-0.7.4.tar.gz 76939 BLAKE2B ab41027a0219659e7e03a43d3d5cda973284afc4c1a1560074e252992f05fa5913724847af6862ec9cc3599f8165a0d6451c00240a93a767c6f409c7db33097c SHA512 dbf72a6f2dfa945398f390f20cbf75a5099ea69075b419ece37f1994c816ae36a62c1bf1d7490110e446b3ce441a7d486002c1e91ea4872aba3f4cc183bbf88e
-EBUILD python-musicbrainz-0.7.4-r1.ebuild 1012 BLAKE2B 75cd641eafba1126f378c98994b3531d8dae851420978eeb09928e5d057374434c027e61036bfc05665ab1ff689ef570074c0f76b0a6a0e9538b95a534e10594 SHA512 b2fe6464821532441b83caeaf915d2f8647c43f3837891b5228b6b0e8c3574c2a01e33a78b38faa07ebef2364b6ce141280598710a6c6de1c115573a4830be69
+EBUILD python-musicbrainz-0.7.4-r1.ebuild 1007 BLAKE2B 5d2809c83bf441323cd6e5b23a90c6f70009ab05a080ee1c48dfc04e31ab1263ed9050c5e790d9edbbc9468d5d2bf3b005cd6c8250dc1887505f85837c1b8eb9 SHA512 160670b80e97121392833060b643c709013d6b4dffbd12f9a2fecff4a4a2ef877e3bfc60fc1d089d706ef9853830f3349248ad52267dd365cb0d43acb28af8d4
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild b/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild
index aab2babb7839..a981d645af2c 100644
--- a/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild
+++ b/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 86642ddc94fd..70247899d027 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -2,8 +2,9 @@ DIST python-nbxmpp-0.5.6.tar.gz 1330311 BLAKE2B 8db09bf02c3bb6a82092a419066b2af9
 DIST python-nbxmpp-0.6.1.tar.gz 1331188 BLAKE2B d8ddad6897c6b98f20a3abfad66f3968b6fa318e2516ecba0b888c199a293770eb26222117821f145fddf4ee0ffd95968b767c0d0445fef2f0513a43aefac752 SHA512 399608b7be39e802d3302004b97f67120ba80aa870331553399f3d35d161ea01f04f690b65b9d6e82e30472701d981a539c89e608b741ae96d54ce6be11f03f2
 DIST python-nbxmpp-0.6.10.tar.bz2 1063786 BLAKE2B 6d7295a5e6f926cbca709e0774ae8c141e20293c723f3a431a52bacc64639e7cee5820b4e070fae35397a5e5d8c76089d5d1966bf53cef8f0da462134321df6e SHA512 0982a6035ee30edfe9f7d5cc11dcc870ad1dddca851fffc2c26088cd28083f56f5c57df49dcd28b5e6967f02aef03e0ad2f7b2036a908748c66e5e7510e6c7ed
 DIST python-nbxmpp-0.6.6.tar.gz 1332465 BLAKE2B b6e28842c8cd42b3e259c62cedc917c8e142d916bc4d2f711e0e804c69b08a0d362cd3951b40373d1be18e3bdfa29f7c7f56ee10e0bf543214cb4d73db508e24 SHA512 729ec2c5d170cb5784e0a7a0097276e0cfcf98671af6c1304bc8c890cbd81349d91ccbe68af88e9f3b95803e33371cf2bf7fbc3891d7d6106ccc06bb9036e2fe
-EBUILD python-nbxmpp-0.5.6.ebuild 532 BLAKE2B c8d5d16b06e0d3292e0e00271648c8237b7f7408dd9b59cbfe2e25de35184231d9e86597ce014f0769cc82ce36a33def8251cf115fca5279a1c33b5357001f0e SHA512 1baa9ae815ff95987d6c8ceff2490fde9b3ff4d7b13278b793e33106c348ee12c96e5bfbfaa5761d203067753e7a3366d0645a309eef9cd79e3ea084e855dac0
-EBUILD python-nbxmpp-0.6.1.ebuild 537 BLAKE2B 39aa9f26acd7f3cc9dcc12bda6fe88ce0e3070ba3a90cc4fc60616fc0419a020b48c15b57f75b7ca0c40821088ad7b8e0f8164ac804074fdfe0bc68ec5fa92d0 SHA512 386813550c503ad540abea81523388cca2a5b612a05c5f9f8bac9e967d2078a0446a6190796ab2922d1ed3595b7c779a734c159220fe474f9e90874cdc86834c
-EBUILD python-nbxmpp-0.6.10.ebuild 555 BLAKE2B f64d7dfea524b58fa881974181c8ac827507d3bd5034938cc2e2317a939c795c47992a72fd5b88993c3a0bf64295629453180e657a00e425946ee851e96f0929 SHA512 9a6bce8f71b49d5d6932dc35a6c0ad62710ce410444a10716dae08a40edb4b9227dd6023b876ecc7faca39657fdf895ce7f3a875c5b075e34311dc1b8eb00e84
-EBUILD python-nbxmpp-0.6.6.ebuild 535 BLAKE2B 2388c9f8e24b20f9b635e43e6850795953284aa20bea002bb364704ff556ddb873f25314482a0303581028c4e655f6466e66f8d92ab2286d5eaf7a868adb02b7 SHA512 2f07fb5c6b87979e97b456e580b92190adac58b389677399cad4da445bc6deab22655a92c3055293cfdbfc9fd88bd52b21f7fd771b4074a11252daf09db8dc37
-MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
+EBUILD python-nbxmpp-0.5.6.ebuild 528 BLAKE2B fb8f388d5358369462edf702bbc59071274a92678f3bf9a6bc7eb6e4ae147879476cd1c7f9c4e13313030fbfc106067309967862eb5426c8816880f5662d7a3e SHA512 a127840408bb07e9781fe7cab98969763da63ecbbb99f0777a0977bd3b99aede9c62cc2709b07a1474bf5925efb0bcf3bdd00d4a385e1f06e0493b57bfd153db
+EBUILD python-nbxmpp-0.6.1.ebuild 533 BLAKE2B c10e8b62b2aed5b12ca2300f03da68082105320e36aac750b3129422c2b1f0d72d89d252960278da2635a92e6d07b1b6c3d31eb9b68964f04b6e5181e8d93556 SHA512 b855364ab5fb1e1bb0f6c62bacbcb90e3bceecb7e5e102ca804d74385690dad82cea1e06bac2877c4a1decc80d0fe13ea7c01c9f90c162c151cb3d6daa55baad
+EBUILD python-nbxmpp-0.6.10-r1.ebuild 545 BLAKE2B dbc9233c90a038ac033ad3a6f4ffe96645186d17acf3c8132fa3cb7a090ff3e1362e2eae61b92e66bc0211b2086fdd62a34bac184b8407deea30a20c7fb0abac SHA512 6c38247e04dbec071254046c77bbbb022f1f3a8bfb8be644ee4030bbea1909dfe48f3f6980fa4c1356429c4a29fe4c8952504e79ae29372bc3d6ad0a691bfa35
+EBUILD python-nbxmpp-0.6.10.ebuild 553 BLAKE2B 66f6edbd2cab12704ae40028e5a095234c0ffdbb8189342bbc16644bcebeba3feb073cd78d745b7c1ea408f1b0d06cb0634ae2ab377a7408fc35792b7c036a30 SHA512 c78056b852216b317155c1920438b5e29b03e43e8be383897eba32098538da2af5fc427828508bbc2387841d08e7dd773a0ec42670ac3fe728ed617bc98bbaed
+EBUILD python-nbxmpp-0.6.6.ebuild 531 BLAKE2B 1709b2bcbaa0716a95c9104e5f321f1dfe427ce570de961fee31a966e35ab3403d114796d88151217cdf351043aece84ca5461c1bae1a04851f15596dfccff7f SHA512 6139e985b41bc51e9626d40337d73fccfa05defe40a0a7f96f02d1128068bf56258998e613538a52180a44176e161a5d335f9fdd6cd97aae1c5e369184854b73
+MISC metadata.xml 400 BLAKE2B d91b7691b7e19817b6441875611ead242b77cf55dcf1668ee543d7e2fd705cae7a30cd64aceb08a05f79b02e0c7975418f398cdfb96e2dacf250e3ba43ec020d SHA512 e017ebcf7a834286a653ce9ffbe662cf5d1e021bd51fcae75ad09d8541654d8142044e6961de60ca96e45e5b9bf66e06d8671cb1c3bcf2ad3f41843028e52f97
diff --git a/dev-python/python-nbxmpp/metadata.xml b/dev-python/python-nbxmpp/metadata.xml
index e24dd86faa2a..09d7eeeeb451 100644
--- a/dev-python/python-nbxmpp/metadata.xml
+++ b/dev-python/python-nbxmpp/metadata.xml
@@ -5,4 +5,10 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">nbxmpp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
index 8e3b40057f56..c9b6bf30918f 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild
index c88224e48bfc..72d8de8fbafa 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10-r1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10-r1.ebuild
new file mode 100644
index 000000000000..dba61994f157
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python-nbxmpp-nbxmpp-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
index b11c8aeba04f..d39a836d8a2c 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.6.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.6.ebuild
index 77c3808cc7f7..cc32e3a14ce3 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.6.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-netlink/Manifest b/dev-python/python-netlink/Manifest
index 3af9a4c76398..8bd512498c24 100644
--- a/dev-python/python-netlink/Manifest
+++ b/dev-python/python-netlink/Manifest
@@ -1,3 +1,3 @@
 DIST python-netlink-0.1.tar.gz 21664 BLAKE2B 09a920256adeebee6762fc8ee7dcdabb38fe7e603d196b8b0cb8210023ee297eec26ed94b5171db2b180b7496c4c8f98aaaf7e3ad55c965051aa73f8709fe0c6 SHA512 ae4a55f7a12b4eab48d4696e41a90a47b4f3a298bee953d5234b47b4889fee61190a6cf30f4ed529f378f05231584116fbd85ebc0aeaf1e14307316edf16043a
-EBUILD python-netlink-0.1.ebuild 748 BLAKE2B 6951c42449cf766ea6046e3aae8f347d13bee8cd4cbd4bb9bc23b313877ef8161d6dfcb2b7c06ae22aa80eae35bbad92f2c4a6fb1e411e5607dca7d23011fc65 SHA512 34beecf854cf9a369702c5380a989c19ee037eb03f9c169bccdb339958b582c99b6d6c43ea41025699e59bc0e4adff80056a639fddf5a709354d4bc4bcba3ced
+EBUILD python-netlink-0.1.ebuild 744 BLAKE2B d19e967f7eab62dca6b6d9e20147e9c606f218d9c5b875404ebeaeb4a9d40cd6f91c08501da4dadcbf85dc73f9f3834d4adc74b23acd887ee10277fad93f46c6 SHA512 8e3dec4d57b576560637ac3990bc2244575318097a2743b8258c8db5d3cda80fff12eaa369a4cc6b8c75725f99b904f47fde8bfd87e8a3c8945f3cc96e961c58
 MISC metadata.xml 351 BLAKE2B 664adb116a6714215debf7d93106e6a927222bcb090df2b113fd4e073e12248475a198042abbfa4759be50f0046a2235a51bf98ca0ce8ed58b5b69bf8f385aab SHA512 faac55a7c82da89d5947a9e877bb9faaa264ef7658dab357f8750da84c2ffef08eb89befc2c18b5d90a8a9dda87f608d74047cf4f69eb44c972d4f41b65b74a5
diff --git a/dev-python/python-netlink/python-netlink-0.1.ebuild b/dev-python/python-netlink/python-netlink-0.1.ebuild
index 94010f47b739..e8268a3cf5d9 100644
--- a/dev-python/python-netlink/python-netlink-0.1.ebuild
+++ b/dev-python/python-netlink/python-netlink-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 0842fee4a2f3..0a2c0b85c0ce 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-neutronclient-6.12.0.tar.gz 290025 BLAKE2B f863826a531708fda1b9ddb43f8bfd8f66fbba99ce3fe4afc1135d20fe4718dc7f11789c3e75cf52089690ce0286bf5339c9253d1e7e35916befb52ed905448a SHA512 c7e69e263b37aa14b59b08ecc12f13210e1bd6f10cde10d8b4d5b8b9f912d604e23ff41eed684baf09bb6dc278393a55ca87d6e41e0986235cd3366d321dd85f
 DIST python-neutronclient-6.9.0.tar.gz 284879 BLAKE2B 720d26489dae7e50617ec83c266ac1197dc1934a3b8f5e8a0e285227421cf8814d96d57ab30710b63eb92406663aafb29fe8d8d7efa1e1d2e74c116eaac5902c SHA512 89f5a2004c7888f11a1a17f4287ddf6942e083fc3871be4a8590a5bb86ec557584165a75cb6470ea3f19526eea882b0174746b20800211d11d10fea1210df74f
-EBUILD python-neutronclient-6.12.0.ebuild 3094 BLAKE2B 10a6c4062d83df640842e4a3d0a7cd0a07c7ed1d0e3f3621ad208db1b6658450ca8d677d43698e9fcd6f6e885965654f89897c4976eaba27b10edf913c100600 SHA512 98333962d1e0ab1b663afd3258fd7ea3ed3931e031914bf8a0c92d96bef97350045847b4cf63a2f3209393829859f25bd5bcb19ebca545ab8c6cbafb6332a8ba
-EBUILD python-neutronclient-6.9.0.ebuild 3430 BLAKE2B 22b0ad52a06a61b105800ae161a534a5ac643dd6f8581671faf774ac1f65ed5dc65a694474c534d31e8db9e8c1ecf82ed4c82489e148bc68d41d30be851a55c4 SHA512 ff0abd1f4a1c5e7fdc3ab93a8aa47c1831db62ad6843a2218aed024c7bdf11a99134040e82aaeb2aa71776b0719559c1e6023b7d571f0032e00d15677257e5ca
+EBUILD python-neutronclient-6.12.0.ebuild 3082 BLAKE2B 8bf4c70239268e0e1b6aef23d50c61c86e1d0a70dde14cbcb9ef82a8aaf4f79ee17287967e5e2bc41594a26c3f50cbaa34fd87d0ee54fc991a9055528bc0fac2 SHA512 66e3c88fa109d59de4070555fd1c205cae79891227ef6106f401a6036acbcf4f3e7695475acd6bb7e9524f49ee090887c0340c9e80771ba467e1613db2cfe088
+EBUILD python-neutronclient-6.9.0.ebuild 3416 BLAKE2B fb3a8658c8d3010e698e0850abafed1cf2747ea732fbdb07370bed8dfaabb563b3b70b1080d0af391491ad9a2deca75db629cdd945b7728b740ece4dc79e3470 SHA512 89d49435fbe77227bc32856de3fa215251d246b249f146a9898b2dfedbfd3de0ed2a9deaaef24ae778b8053e878ffa24cca6e0976b2c3d4a8d3e8f30dd06d742
 MISC metadata.xml 619 BLAKE2B 441c1d5a2f0b4d0cd6469cf8626e6895fd4dc36dae8db594a2f2364abcd1ea77c9f51f0c85b2deec8ae51a8464eddb00f71c57d2d11558523720caa8fb317dd3 SHA512 d99562185b29417c559143d8fe8102a062dfda0cd7c07f9f01d1c5f11a75eac521e98c9048a23ce74ed34e198ed06bbe2a40990651caf7f9ecfa98975a8fb91f
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
index 7d22558a6124..d48e3fc3cc6c 100644
--- a/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.9.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.9.0.ebuild
index 69e0d901dfb7..a559c56befc3 100644
--- a/dev-python/python-neutronclient/python-neutronclient-6.9.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-6.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index c7bfcd06e9e3..948a76b5da75 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-novaclient-13.0.2.tar.gz 312390 BLAKE2B 2a436a2f843afe466bbf3d376d16a994f25e2232dfcb67271837159c5f21d7970027ad6d946c331dd6bff5c248d6b526303205a96a18ef4872cc8b1b526ff366 SHA512 988264cb6b6034dd0c4cb3a79840f591bda9c1c0134ddf0124beea6d9992192dbaeb9ec20bbe73f5a831bf561d175fd3d312880093f58de51d326922502cd1e5
-EBUILD python-novaclient-13.0.2.ebuild 2387 BLAKE2B b0c089993dfa515dd9e3555cf558464b819c805b9a7e7d4dec21d8534456e7e817ce5badc668f8f38f063da579f786e2ec6b1236b51f90edfc6cf86f303fc5d6 SHA512 a79e45b0bd2399f4c9fdbd0e97e702a4a18ca413c0d8bc3f4bcd18e45667a14a932779b0909fe8e92ae7a3e635410a2d668eb8d3622ea636be392534213597c4
+EBUILD python-novaclient-13.0.2.ebuild 2375 BLAKE2B ff78aaa836cbf67d080e5c0cb07885651da984846a9433bc833b34eff5dfe322a47a7d4a6568cf45bde23cda0edd5c8eb02e85b20e06b874f58d0bdf78ab37f7 SHA512 299c4e06fb00c39a7e3c64029600c728d5306ecd9951340853cf8cfa7122b24662cb4fa8d56780469e8bdf6e28ed1232ff210264e9098484f7bcbb49448410a2
 MISC metadata.xml 760 BLAKE2B da041e2d4a5118a32574fd39fb38e5a4b417562e90f345f731b5bb9d1109c760044eb3d18b6c82c440f5a121791f1315213e58ac657be61518aab440e6a359df SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1
diff --git a/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild
index 341dc56ffff7..c7431df06cd2 100644
--- a/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ntpdshm/Manifest b/dev-python/python-ntpdshm/Manifest
index ccd57b93d296..e373f9ec1238 100644
--- a/dev-python/python-ntpdshm/Manifest
+++ b/dev-python/python-ntpdshm/Manifest
@@ -1,3 +1,3 @@
 DIST python-ntpdshm-0.2.1.tar.gz 12227 BLAKE2B 612debd1a9a1809298a690068e3872f727fa9d58496e62530ab236a9f80e020770d54f7a6b3caf797f33f22cb0b75597d79a2ed578e24b11dea787cca2c3c667 SHA512 1c03f38d3f17e3871ced238e6654c57704b3dd4ab49b8cebf1eb4af3a4263de2fb3769933ccf9ebbf2ce5ca5a0ec8875a10ca07161a7e554d6d1ce93e4a2ed4c
-EBUILD python-ntpdshm-0.2.1.ebuild 688 BLAKE2B 64d80a2e753c0adbdfde138820ca080ad60613fda0ea4c152bf23f3587aad14fb0b24d224e33568dcc42c3056364188df0e5edfa90514e4318d0720dc3a5cfc2 SHA512 7e0937db3b14111f6f452f243ccd8497007ad0c0c74163e4d1720b87ebb62e05494d1392cdabbc22770394150e08788c2c80c60faf60d040aeabbcee45f8d197
+EBUILD python-ntpdshm-0.2.1.ebuild 695 BLAKE2B b567d348ca27fe7585b2aea56cc22136f708b825ee80f42002bf33c546306cf9d0520aff34a7fb4f4998e7ad5c9949ac50319dd190b7d473e5d0f7fcfa8100b8 SHA512 012a7bffdb56741ead52bd7ad61073ab225704cea65e4ac697abc060774398e563158875f31528f9733d4efd0c081ee0e8f58537847520d561b64431407f7b7c
 MISC metadata.xml 288 BLAKE2B cf804565346328dfd23bbc04533dc8844d4a5e3debf432bacc1545780a249cc3a363efae85f6577c04bed761dbfd8f0259c3aaf05b2505528666bc6d83d4fbda SHA512 a0f7d154b6b1b48e88243ef1ede582c3cbb9056d73bc9003e4f8add773306f48c9b75f103ed85a1a18e870c31ef5eb0ec19f44a814261b3c866cdb756c2a75f5
diff --git a/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild b/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild
index 6f3c061f3c0b..434158ae2650 100644
--- a/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild
+++ b/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
 DESCRIPTION="Python interface to ntpd shared memory driver 28"
 HOMEPAGE="https://github.com/mjuenema/python-ntpdshm"
-SRC_URI="${HOMEPAGE}/archive/0.2.1.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mjuenema/python-ntpdshm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # Warning: pypi tarball is not the same
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+# tests may break running ntpd!
+RESTRICT="test"
 
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -25,6 +26,3 @@ src_prepare() {
 	emake swig
 	distutils-r1_src_prepare
 }
-
-# tests may break running ntpd!
-RESTRICT="test"
diff --git a/dev-python/python-octaviaclient/Manifest b/dev-python/python-octaviaclient/Manifest
index 35d2728274d8..ffd697ef2d24 100644
--- a/dev-python/python-octaviaclient/Manifest
+++ b/dev-python/python-octaviaclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-octaviaclient-1.4.0.tar.gz 50495 BLAKE2B 726032aee6d37b050cd9f4d1fa276daecdeae107f05825f2eec37236a4a4eaf3ab70143b5dcd3cac8a13fbb9655027c3d78b474771ba8b205be0a566991c54ab SHA512 216bfb56292bb479cdd8520931a509208454feaf8b1d5664679929bde570a4a99288c99cb195e6e9e81b8599d27a4bc68b8f24e5a7cc3aa1a82c22405078a6aa
 DIST python-octaviaclient-1.8.0.tar.gz 63332 BLAKE2B 7944fd80b5d0ac8b1ff5d0a324d45a4150f6afda865e1db5dec490e5f33850a3fda57214303e1b3c1a65f0b594ec16b49b2f3755e2a303c518ccd09dd3791fe7 SHA512 d73c36f683b6bec0a26d4d118bccb827cd0da494f315762c170b59a2cdef3d138481b26bdcc43e8f9f50128937a39fab8f83c0d8fbc52314f8e3f59f2031a92a
-EBUILD python-octaviaclient-1.4.0.ebuild 2062 BLAKE2B 94dcbcc6e6722e8be4c0b33e446175585e13543ff42f4bee8ecf40feb1edb44448cf59814706c611ebfc02f5923c10dce4317992ded76a78fd7077160b272646 SHA512 cc0d8852c8ca08d2f5a654e2cf4a2a4360ad33b0de253854da446c26abb31731e3e9a38d4e0f47e3f2932eda0fc0fda98828421a2a5bc73bf4c73a355f34a3b6
-EBUILD python-octaviaclient-1.8.0.ebuild 2180 BLAKE2B c38596874720753797e7a1f222e5e5d6cec83e0573b6e7501dee4d1e1488e95d5d3705fddec871669387fc8ac544a9fe9122d035044613ba11c925301544f37e SHA512 414cec1f021647bc34151667389b4200b94b056c8e71ed9bab381836072d7c2e1eb0b5092b8457ddd95a87d5c55ad0e28b7327ab30d2217f5f47d9c3ae14298a
+EBUILD python-octaviaclient-1.4.0.ebuild 2048 BLAKE2B d619105c25fc44e6527b031c5c0246cff2b51294ee21f8b81a0fdd0bed2bab73bdea22ac5be07ccb0d88af7117f963ef94da1f11e037750dd2264cf9880592a4 SHA512 7ab43d5ee5068c782bec327458f5608816e4622060de4be5ec83d031279526cbe0a9cdf25da9a35ab6bc08a76d5108250bdefb4341703885e7755b6ee03301e4
+EBUILD python-octaviaclient-1.8.0.ebuild 2168 BLAKE2B 5dd689819818ac9414053be70f6489e92e853209f44ffe38ba0597d57ed16d2fefed4d9fc273bed0f68d8a6500bf8ddc19ef9547dcac062ef19a4c0182f9a95c SHA512 3b27b236d26387f3d655c70dbac6ff5e164821b5d4a9f1555c9b19417e12d476dc7aa58d1fc8c643ebbcd0b0cb8c346f1ca7fa3a8efd96ac9dcf4c727ad92be2
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-octaviaclient/python-octaviaclient-1.4.0.ebuild b/dev-python/python-octaviaclient/python-octaviaclient-1.4.0.ebuild
index 513d87357448..41a29a367fc4 100644
--- a/dev-python/python-octaviaclient/python-octaviaclient-1.4.0.ebuild
+++ b/dev-python/python-octaviaclient/python-octaviaclient-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A client for the OpenStack Zun API"
diff --git a/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild b/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
index 995cdd35afd8..8d3e4316ddfe 100644
--- a/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
+++ b/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-oembed/Manifest b/dev-python/python-oembed/Manifest
deleted file mode 100644
index 154fc5d65753..000000000000
--- a/dev-python/python-oembed/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-oembed-0.2.4.tar.gz 7981 BLAKE2B d31df9c67fb51e2ddd624a8aa8cf7d844262c357508d412f9b93763ac85c48384b12e73b5ebf74a8e2da4f0547710e35e47a7c2b8c4862994f95be6e667de943 SHA512 9eaae818e17fcfed2e53e7f730ff6837b3ec55bf977892dc05c79846b0afe6a3b6808e046ac8e41bfca587de07d1be40343d6b0df1a502418990e9bdb8d81abe
-EBUILD python-oembed-0.2.4.ebuild 685 BLAKE2B d81c92a327d25f16938bf7393a42d770040bd5e2c7de7ba74217effcf676f18bf337c62fac70bab4b95278298acf39dd161a91ea5e6b9ab805819fce2f208446 SHA512 d4c420e1101910d4215609714ab78fbb2591f35151c94214bc0faaf67c85cae23bcee68bf311fe4fafaa3a3ff76285c76c466294cc2982852cbec2ecf1103d9b
-MISC metadata.xml 326 BLAKE2B 891071bd7c3dad3fa3fc93e14ae0a698bd139716db3f2669d7445415a6a24cb5b4473eb3a81074f4efa080be6d32f9141811c6f23a9f9e6310c79976fab47ce2 SHA512 501b084afb50bfdcd4a18fd9ad3e14d394fb6e7c33c6afb41c61345413dd976b5b56af25b4b77e1e43fddabedd152efe8dfd5310a0c2d5d05fd8dc57eb4a6d18
diff --git a/dev-python/python-oembed/metadata.xml b/dev-python/python-oembed/metadata.xml
deleted file mode 100644
index 334a97be4e3e..000000000000
--- a/dev-python/python-oembed/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">python-oembed</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-oembed/python-oembed-0.2.4.ebuild b/dev-python/python-oembed/python-oembed-0.2.4.ebuild
deleted file mode 100644
index 8947e78934db..000000000000
--- a/dev-python/python-oembed/python-oembed-0.2.4.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="A Python library that implements an OEmbed consumer"
-HOMEPAGE="https://pypi.org/project/python-oembed/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# all tests access network, also assume that localhost will have
-# no HTTP server running (which is extremely silly)
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_test() {
-	nosetests || die "tests failed"
-}
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 8a1d17f185ae..ec0b364641a9 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,9 +1,3 @@
-DIST python-openstackclient-3.14.3.tar.gz 670217 BLAKE2B 1b9b9f2a1ae4f4fda943cd0ead35de27446e6b6e616f196094f6a6870c657e0569ceea904ff31cef26d6af35186e5a8a5a64724156a0a82001543c34410fc7a2 SHA512 b3f81272fca1e47f241d95901081f711633ac984377e1ae8c5ff32b1fb256a1e409a404c92a8d933425ec98eb15594667556b3e97c4ba7398ea83becc5cff893
-DIST python-openstackclient-3.16.2.tar.gz 697555 BLAKE2B 11a911d8b11912d70c5e05df51b1d405c4e6a36b20378e89c8bda26dc7802d33fb4ca6b4e9a16b92bd6d0c33dc681b7540fc9af84742d42f69dd17d568558ceb SHA512 4966dc35e80c8b477629bd06c8f25c14ec32240669469c1b61b971654b0a62a43f5da7601343c40362b19f91c3c5a1e45b34c0c7c94da89e1503247d5dd80b56
-DIST python-openstackclient-3.18.0.tar.gz 719216 BLAKE2B 5895361b1d5a957a4d56d555e47c97519136002200e89dc3dfbf9966e4981a2803b3a63daa3b1905775101dede6de59c4cd82dfe36547587ba7b4c464fe58d4c SHA512 7afa430c9c623e1bb47b6a089307f9d4a788e08671a2e8539640733558ae023f5c5b1c8e34f3a01b1469f966e19d8680755757321bb93bb4c10a145fa5e0625c
 DIST python-openstackclient-3.18.1.tar.gz 721120 BLAKE2B 58394b6172f6bdbe2ebe5a1d8ea2209049887eb7cca635b9b87b558e6ffeb7130c2545aa8b3bd11d8f8b1cb6c315acecc5fdfa7dba21c2442ef049ed688af546 SHA512 2fb15e2c9d3daa9e70871ba2005d2e94be975b564e1f70690e8a5b2fc4cbfebef4870bb39d8099829968e05eae356f4f38edad154ff041d8ab20fe2ab68f2bf1
-EBUILD python-openstackclient-3.14.3.ebuild 1289 BLAKE2B cee402fc1ee5811cc8c27491669e377970e635289ec257b0838fd31306749531ba0491a972bdcf7f274cbd5fe15a4c23b210fbd971fe04adca0162c89b54fa0f SHA512 e46803e91dac3e03ca6bc3b3bcfbb169b628dd312f88086defcf1846773f6a8f2ebb2ea2168e5fd1f2e64b77ce2e9e63b80527e2f2587ce9617880558d69077f
-EBUILD python-openstackclient-3.16.2.ebuild 1291 BLAKE2B 5e1c5856991e06cf187799457ac8524fca0e5781fc93e67994ae0a8d7b37813775523d821ca85d1aeeb0af547631fa38619dab255ee64356c4b2fe9e8f60165f SHA512 e89deefa78a3385c14c53d701536b8eae1ae6d3f952b43af768a4eaaf2bdb767fd9a3d10f45ea077941d410b4fc778608d31bdbb61ee5a43ba9864deb30f6328
-EBUILD python-openstackclient-3.18.0.ebuild 1294 BLAKE2B 582ab810b104c0f2afed80537e71c1ec5b1a1343f9aefa0be36c30a0305fdd4b92e3156840fbdc2038978553c916738cba9a21b80ff7b588d22476d84ff47f38 SHA512 e91e2669922615be39875ca6cf73090d5b6bee8dcd74567fc0599d1ef31f7d08e55afff95708d0a57e10b85cd6ee773b40af81dee91f75efaa6fc48da168ffe2
-EBUILD python-openstackclient-3.18.1.ebuild 1296 BLAKE2B 01b60a22bd4d9ee3bc67eed9a5abf091fa6cdc5d75c0a55a6ae18e879aabf98295497f9c7699596ceecb4c52fdad7a895314df7fff89b5bd365436a9e5b909cd SHA512 ee8a6deca41958576154f5a9c79632f151838adb9723eb514ae0c3e08d4ca2d07916b7087b72c389daabc5abf647001b9df4373df68d95151f103911604f753e
+EBUILD python-openstackclient-3.18.1.ebuild 1282 BLAKE2B 7b3d5bff111a9fb0e00d702a844439faec00d7015d5a1a1ba87efebf4ee851c7ab7a7c9e4ed45bac715b4d9d544d6d5aee6da07638b2651d62c09ef9338689eb SHA512 03ed2e9bfaa50e852b2e497bc2d27909a2ddfdbbc5f60a0dbc113e409c6189966a54a98516c93b1a7636d9c969d33c81e3ba62be20409862d62139a88ef9018d
 MISC metadata.xml 632 BLAKE2B 4e989558d44ee733b380fae3f269ec9ca0c511caa1fd8259cac90dd3ded82f4137444f32801efd2440da95b98c2864509c5068432de830591ccaed2072029c91 SHA512 c37cb6d5ee55b8f7184a2db66dab3e6fbc3627b1869487e9d4e00928cdf1dbfb5d3d28a2d7f72290503b10b393a193a9849c497df6438ce230e418b68fd3ca4c
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.14.3.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.14.3.ebuild
deleted file mode 100644
index 0e5a724171a7..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-3.14.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-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/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.9.19[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.16.2.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.16.2.ebuild
deleted file mode 100644
index ffb06fd7dc19..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-3.16.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-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/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.17.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.18.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.18.0.ebuild
deleted file mode 100644
index 964cac874dd2..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-3.18.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,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/keystoneauth-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.17.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-10.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.18.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.18.1.ebuild
index 383df66dde4d..faef905306d2 100644
--- a/dev-python/python-openstackclient/python-openstackclient-3.18.1.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-3.18.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-otrs/Manifest b/dev-python/python-otrs/Manifest
index 116e5dc7d98d..f742d18c2f0b 100644
--- a/dev-python/python-otrs/Manifest
+++ b/dev-python/python-otrs/Manifest
@@ -1,3 +1,3 @@
 DIST python-otrs-0.3.0.zip 23640 BLAKE2B c865efc2cf38c8fafd8f760ca9b0758f6f0ad7af406997405990feba653bab34d2ba7bf457f5c50175d85f784acc80efdfe7ab2c1b770b61d14c049d586a2879 SHA512 d1c08c4f0a147d340af097a15afd0c294ba575172891e4a40385b670b7f157ece05abfdedddc380f5509c7dfc3021f1df81b227b5ad0de71e015c2ba6e067e7c
-EBUILD python-otrs-0.3.0.ebuild 456 BLAKE2B af0ad2dae3b8c8ff0508c069bd311647ef7697cd3e67af33e4be76228bceaedc4bfaf7f8bc92c7bc3f0af73e62606bb3db19383b1bf5653c6b57a1cbe2ea88fb SHA512 31870e5347ca1118c23010597c11c93115ef578ce7b19e19b1bcd0b9cb21e65fcf087586df3749f095a63d40d5e8eee86bc4b7f66a5b7a5c550c6575691784b9
+EBUILD python-otrs-0.3.0.ebuild 446 BLAKE2B 74d259ae789e34a44405fe26781623939556eb9ccaea16f8449c4327ec389bec0f6fd76e4c692b99344cbfa7045bdfa21a7c20725d586cfe20ce21caf28b24a7 SHA512 6bd43b6b91ffecfeea93256b3252a23aa0cf21413a3b9bb5d0cf9e7e7a5a0f0a9fe7035696f6a6d88cee6b54512a4f6e585d3815e83c650da3344639f78ad860
 MISC metadata.xml 489 BLAKE2B 7acebd325b0cd7a783828ac6a0b3e3cb6daff52e9558bcbdfbef7fc9d47f03fd8e2b031e5ca155c608f9003985b8acd0f5821df32fea4e4eb7260a0b1ebe3e8e SHA512 2dd15d140baeb3f7ceb100eefd96aa2af0753551bbddfa49da17a6bffadc7a57bdb310b4f70b955e20b2b25c103dd34a0dc5168dfeefe9ed245f1b0f1590a447
diff --git a/dev-python/python-otrs/python-otrs-0.3.0.ebuild b/dev-python/python-otrs/python-otrs-0.3.0.ebuild
index 468eade1c338..3021a15cb621 100644
--- a/dev-python/python-otrs/python-otrs-0.3.0.ebuild
+++ b/dev-python/python-otrs/python-otrs-0.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-pam/Manifest b/dev-python/python-pam/Manifest
deleted file mode 100644
index 0f8d52ab131f..000000000000
--- a/dev-python/python-pam/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pam-0.1.4.tar.gz 2637 BLAKE2B e5b2091f078c762ecb24e881a1df0bf8ff9c35e6538a448d79c1a6f26019babb3499d322ce79ea3d3610927ac02c88f4e3dec14acec99ec9ff048b63e068e627 SHA512 a8bce582f8ed375a5e503ec0b8e4853164125222e9cee40f6f6509def5fbeaf0eb0d2242b0ef7405024b7f8cfc0660ea7c43d266e8923a1a2ff3054135f5da63
-EBUILD python-pam-0.1.4.ebuild 502 BLAKE2B be5bba37f62fafb08d6fe4ee717a8792b15a606e6bde6df466251fa69554761555663c86993ed6b954abe12b4a961fa8ccbba6f1f0f6e76d294ddd979cb9ab17 SHA512 eb9434e824e71c718d99d1c5fb116a730dda622e9890ca7eb3324e1e287a50af1b02be7df4831e4f795b9713349ef6b01d5aa89750d8de2160a75567b2fc8f67
-MISC metadata.xml 446 BLAKE2B 56a55e1f91c9202eb29ecdbcdd5306123db6a38e1e508562295479ec0d08abde21e764c50248d536019f9ada29de94300996f5ecea338a1d502f9de6bd940f34 SHA512 b69b1ed0f56be4dfa7fb6fbc41bb6d07fa788f6b9a81a9d0aaf066fcaf89b1e2c05475d76f9edf2c71a749e477ab3de71ebb0a05649ea255d5446556d62bec25
diff --git a/dev-python/python-pam/metadata.xml b/dev-python/python-pam/metadata.xml
deleted file mode 100644
index 6c6bc5d28824..000000000000
--- a/dev-python/python-pam/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <longdescription lang="en">
-    A python interface to the PAM library on linux using ctypes.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">pam</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-pam/python-pam-0.1.4.ebuild b/dev-python/python-pam/python-pam-0.1.4.ebuild
deleted file mode 100644
index fae6c1f9214e..000000000000
--- a/dev-python/python-pam/python-pam-0.1.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN#python-}
-S="${WORKDIR}/${MY_PN}-${PV}"
-DESCRIPTION="A python interface to the PAM library on linux using ctypes"
-HOMEPAGE="https://atlee.ca/software/pam"
-SRC_URI="mirror://pypi/p/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/python-pluginloader/Manifest b/dev-python/python-pluginloader/Manifest
deleted file mode 100644
index cc73ad59cca6..000000000000
--- a/dev-python/python-pluginloader/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-pluginloader-1.0.0.tar.gz 4625 BLAKE2B 6da2fe78d09943e56df8331c3c0ca399f6e29d10c38c1408d49954cf2f272fa0876391f27b5553a0183541ee642570a47af97c17f441b4f964721dd2fecc1b10 SHA512 879ff3eb1ff9280a4a580f24903b4f449910ec34b7e3b08215c86cc81e9c65ec48279143ac0ed8564478d1c013074c8165f6a85b43bf08760c83dda78a19f246
-EBUILD python-pluginloader-1.0.0.ebuild 444 BLAKE2B c01efcb22ad8c8fc854782fe686ae4e9917391a363d5d76521595e69f34ad603d4811229c7c9034c58d45719e11e4b71d1314e1a4e96771d777c59e4df7aa65e SHA512 b85f217ab990d39e7fd4f0cfbdca4e4f4360334b18af5565f91f58b7d2c56a49e2e815e8f79a3d362b5bedf26915143d00166fea5cd42b0bda654dbc4faef088
-MISC metadata.xml 331 BLAKE2B b3da4653d8bd6617ad3d8b91ebab4d324de3d753f59b2b8cd84bfa92c26fbc5e2662f316f19254e9bf8edba4111a4c575b3b8145760bb4cf98cb1e64fa12de93 SHA512 339d7ec309d557c0775177f7da3940218c56c2f9b09797a9398471fd07f23096e062febcc66292e713d4c62e36061c11532e3fc268e097e143cfbeb6b1edca62
diff --git a/dev-python/python-pluginloader/metadata.xml b/dev-python/python-pluginloader/metadata.xml
deleted file mode 100644
index 6b761d971220..000000000000
--- a/dev-python/python-pluginloader/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="github">magmax/python-pluginloader</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-pluginloader/python-pluginloader-1.0.0.ebuild b/dev-python/python-pluginloader/python-pluginloader-1.0.0.ebuild
deleted file mode 100644
index 6bc0182da5b4..000000000000
--- a/dev-python/python-pluginloader/python-pluginloader-1.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to manage python plugins/extensions"
-HOMEPAGE="https://github.com/magmax/python-pluginloader"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-podman/Manifest b/dev-python/python-podman/Manifest
index 488518ac1560..80829eda5474 100644
--- a/dev-python/python-podman/Manifest
+++ b/dev-python/python-podman/Manifest
@@ -1,3 +1,3 @@
 DIST libpod-0.12.1.2.tar.gz 5987875 BLAKE2B 11381c53e768c94bfadcb2013a028f64058b0001cd985ef289d1618163225cdf10bd608cff0cd6f7fc1c094497184fc6d0cedea32fde54f3581ebb51eb5eabdd SHA512 9abb46d7880c4577d22b48aed01baeae29662dc3dbbdbc297f1eebe8324fb734d9bac6cd105dc93f7600753874c0fa581142d1b16f7490175cea80b8f62b34ce
-EBUILD python-podman-0.12.1.2.ebuild 799 BLAKE2B cb47bbd38f2650769ae850a31afcd8a84e9da1e77981d9946780efd61afd30c389be9105e25b31516d62846897cce25087424881d08b7c9124c6825a30aac53b SHA512 496121f68acc1ab9de5b99d4a63a8b3dff4c91c4195a0564270ecac1f7641577cb3b5ba190a6798280da3a886f420b9417fd6aff47da3557651c1674779424df
+EBUILD python-podman-0.12.1.2.ebuild 797 BLAKE2B 5faa8f22b0bbe7572775be626222fdf783ae0434b042c47a4d0828b4a3c4cc395aece66303a28487ab2a799a3a96898ed056ea6f00fb13bc0196575e211b6258 SHA512 fd02bbea4fad5f6e488a1692892bff9897dc4aae30002cac9b8b9050cb4e8c0e4b0a0a432a9d752e37762f2ea87428618cb212a700e6fb78047d44b3a56c5bab
 MISC metadata.xml 326 BLAKE2B 77218bd50d76e0dd8ffbeb168b7e08d7cea7f8768f9d552865fa85f7ae78b9e4654fcb672320776b28b013e592117a4289522bdb0a62f03f40523b78d36f6171 SHA512 2d777f25c03c813cd1ec96215d91dd793350d48ba396de9c544a53412401b313ee5270311612e4a13a2b1a318591ba7fd96db686d639e241c13ac432808f219e
diff --git a/dev-python/python-podman/python-podman-0.12.1.2.ebuild b/dev-python/python-podman/python-podman-0.12.1.2.ebuild
index d99498b3177d..3cc1637956b8 100644
--- a/dev-python/python-podman/python-podman-0.12.1.2.ebuild
+++ b/dev-python/python-podman/python-podman-0.12.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-poppler-qt5/Manifest b/dev-python/python-poppler-qt5/Manifest
index 06d332d82c1e..961db561ecb0 100644
--- a/dev-python/python-poppler-qt5/Manifest
+++ b/dev-python/python-poppler-qt5/Manifest
@@ -1,3 +1,3 @@
 DIST python-poppler-qt5-0.24.2_p20170214.tar.gz 20676 BLAKE2B 450f1f40618686f393a21bb2f9ae25b71ab31b4270420a278c65dfdad722a7505cab50d17968400304df936f8694a7d2d5aafeac355675756ca70271f3ff666c SHA512 28fbc4584d32ae18a0545beaf2954f89da6aaa5c2d4bbb25dc36996dd5799c38c491254330c5ac12f3a97df33656f1b49bcb672207602031ff37086a08cbb1fc
-EBUILD python-poppler-qt5-0.24.2_p20170214.ebuild 763 BLAKE2B 9577a61fa091777b41e04deea84e775653b18736cea565f82e9ad1e5af739350d9197aa51f7e785015d88600479e426f0687b7f58c4e2e25a5b9a90f1201db9c SHA512 ec799707bf69a82fead4de46410661535971035e65f3d2989800d786a0378fb477bc27331662dd98b2a5b4e10ce45ebb8ac607c96a12da4459775cda12c0a058
+EBUILD python-poppler-qt5-0.24.2_p20170214.ebuild 759 BLAKE2B e2602c774f89b616695b4acc06ec31d5f8613340e837eb63c20658af799a7c81f7646ae38eda22868c78889a589876e61d9402c761c0150898d471e20d60d94c SHA512 2b4dde9ee305bcadfd18f684b6893744a61bba23021479da7eb20195740783a7cd7b013bcd5e15fa4560050d14689240beef1646800fde8ca99ce502533028a4
 MISC metadata.xml 330 BLAKE2B 8ec299c2f0c45f1e6f1c0da00c43ea51ae4b93117b5c1fa29d31692e8b7b553c9f977f54bc379fd01addcd682a2a357670696972e953410972d1cafa670cc1cf SHA512 5ceefef72bdb03860d693c39df292964f2a81f477a872541ec2430062cadd5ec945c9e60ae7b157bdfea804016d3d5aae1ccd19c6fa75a3a86bd9ce3e4f30f14
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
index 7f2427bfc23a..750788a373f8 100644
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
+++ b/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 COMMIT=50fb2eb9ea34cf94e3756b7ddfc601af023267d5
 inherit distutils-r1 flag-o-matic qmake-utils vcs-snapshot
 
diff --git a/dev-python/python-prctl/Manifest b/dev-python/python-prctl/Manifest
index 77a6492c3917..3792c9f110b8 100644
--- a/dev-python/python-prctl/Manifest
+++ b/dev-python/python-prctl/Manifest
@@ -1,5 +1,5 @@
 DIST python-prctl-1.6.1.tar.gz 25788 BLAKE2B 48cf4b8f9bd50c0619218fca889f1d83c001a07d914bfd6cd61596957a467165cc8738abeaa0671ba32e90c46d8a96b56aca8443837e45e8bba6815a11463e72 SHA512 9d379f2082523421b69f237042826fb4360d1da6e96dfc3f7e5133cb7041da4e3ea9954b14a063967c6dca2a766d39fbfe7eda71df13ae38ce046ec102949f3a
 DIST python-prctl-1.7.tar.gz 25922 BLAKE2B 2d0ccc2174c62a74fcffec1115f3d157b6579c8f7dc138aacecc2d7ee479d71954b04cf1f7d881c1212d1f63c22aad800db07756e2803de2deac7eeb5d0d2742 SHA512 f2a18fc8e9ef469722c6618d5dd6b7b558d4060783e6fb3a8dc868d9ed3fa21ade371f94a4538a24dca92a71f623a96638c96882d9cf0d3d499a9f12dae8538a
 EBUILD python-prctl-1.6.1.ebuild 499 BLAKE2B 67e28211d06f8192e21b642afb4e05cd953b1dc16faaac657985c36c662daa2aa0119d9cd924129fc152ec44afd4682e68ec7c918bb21b146531ec768e00e14a SHA512 8053f8a206b0b475de487c834c130970d5215068e29239063d16bc29dacee2048322ea554c162f15028b4abf971baa591b669690faf69c64b639745d5175bf74
-EBUILD python-prctl-1.7.ebuild 503 BLAKE2B 448b664bc73f057f59fff2f60e049b83c37bbffd07e0e76acd0edfb47c38ebc3048ccdca9a9b26c95508e75bf78b0c4945bf5c3baf0ea297b968c218cbc11534 SHA512 47f148ad66d197c7082db50890ea63dbe19c7e1e03dacfdd75aaf55fc1f5a51a2a35e3abbc8554a6a7f8a492711ee0a842fd688c9ec14f7df304d5dad36de9b7
+EBUILD python-prctl-1.7.ebuild 501 BLAKE2B cf57091e4c967d2b2d0ed02f404830a450add5247e967853ef7c19f9175940aed8824dcf8c27540b73488c2869dc545396401322ee3f8d23285c617ba89e058a SHA512 59f2d13383df3edb78e1c0f25d40c009b8552d86a9e44baee8d954388f0e5d61e9db7feea6585187a5fad66a2f4324c35f577899322fd1b7d5b2dd3c1e7d5f9e
 MISC metadata.xml 334 BLAKE2B 1fc3c650f15c0c5663110d323f0a4acf970fa31ef8711ea894b6440bd7b04d37d2465db26168833e45bc728f6732f15352f1125d30d85ff16b9d2275931e0818 SHA512 42e6bed26bbf277f03865d151148646a4077baf61256e67616f04f004b807bc5bcb5122bded7a20d05f1eb57a2850cf0f31e469f3482c0dd214fd408b6494cdb
diff --git a/dev-python/python-prctl/python-prctl-1.7.ebuild b/dev-python/python-prctl/python-prctl-1.7.ebuild
index 47d8ce68b2aa..3e4b4ada4b57 100644
--- a/dev-python/python-prctl/python-prctl-1.7.ebuild
+++ b/dev-python/python-prctl/python-prctl-1.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-recaptcha/Manifest b/dev-python/python-recaptcha/Manifest
index 5fdde291f88c..c16a5134f01a 100644
--- a/dev-python/python-recaptcha/Manifest
+++ b/dev-python/python-recaptcha/Manifest
@@ -1,6 +1,3 @@
-DIST python-recaptcha-2.0.0.tar.gz 5556 BLAKE2B b752915eb95343d7cbce483f49ce9d93ecf837c85a1615e414e14226c54dc60ede3187bd127e09769106a7eb06156ab2b73b0a3839743c29b6aba6e6c4d96951 SHA512 3a60062f36833888a110d5979ca7a7f46cef927bfcf427aba72d2f6a99a9c401b20bea997ff8fb2b8435876bed3880371a84568b95da1341940d275cba8ff178
 DIST python-recaptcha-2.0.1.tar.gz 5439 BLAKE2B e985affe7d008f0dda270c9251315cbe381fc2a72514a219f422a1405c41e3d621326cfa32285588d4b5785c0e21251370546847695815b77ede81812d8eddad SHA512 103c0cf65d67fe3e4d4ca5bb0a208ea221642b1a6c11ad1997e3f1cfa56360c81665fc593354f6ea776deea43cbf72c97f3376e2b77fc275332cddee8b3a9739
-EBUILD python-recaptcha-2.0.0.ebuild 771 BLAKE2B 5889d47423245f88faa125e5d0983210b6023357c74476b19ff340a5f572e64172e1b184be9eb0e0f9e41cca817462c5f829c7fd30cdce0c8e4c779d05771a87 SHA512 c4bcecacfb9d341e0e6bb9c56ef7628fdb874e2683bbe431bdecdabb990d91fdb9a3c0015f947c4ea1f89eb3fd9162a1a0b63cef749ef4fc211441d4fbf5472f
 EBUILD python-recaptcha-2.0.1-r1.ebuild 655 BLAKE2B 86ae7e1ac9ae8ef8859dc4e67b397d1b39ba245f0c7aab2ce629ecb8279e67a93d971e79d79b7396cb1c5d9e014d76f657085bd70c90e5d8f31da7e2acd7099f SHA512 8d90b07d3e06c193f59905cd81fa4776df43e4e60f1a3fe3e5459bf2d6b101df0dccce1245b6988db95991d8d6d6b5e22f4cb32ba11354d9cb867631d3ee26b2
-EBUILD python-recaptcha-2.0.1.ebuild 609 BLAKE2B d781fa4d9cf79033a2a300f5cfd704d6f3ebd6a8ef11c93507a0b85815dc41f59e46a7e07240d12c5fcf7eae3ae013bb2bb85b516d42ac5c5a50b60adbd62271 SHA512 0bcfab41a0a5c05d4c54adbcd0f3c5054f3144f7affb1123390bcc567d8673c44f796a7ede736c9dcb69fb348b58f4b4f260ad5c578acf175a37a14998db5e98
-MISC metadata.xml 427 BLAKE2B ba42439a7701580eec32dbadf9a62d7bc8ffbb966d8e997724ff6bd72c366c3db7e2b92a966a7b88a4d2c5f28773c26fecdd6842003682d408c1833bf80795e6 SHA512 7bebdf6b10791c257952c29c3eba4c6886ed240823c14190c5652fbefefa847e25d1ade70e0d611011da9a627459cd5aaca81d6dd0ee57fa848146c3fbac0dcf
+MISC metadata.xml 320 BLAKE2B 09f14b8fe8d79184aac3c0f51099c9875e9c92accc720bfa6252fbceb59ddcdbebc62b8e00a842d4bd3378165327dd96200b805667c18df1725510c4a3db2ca8 SHA512 f8025b47914eff959d322d87070e00597b839a84a0b2d052cc172c34451450fb232a9a5cf4781c6e570ff5fa13c8b29fd9eefb2ffac7147720aa8885f48c4c6b
diff --git a/dev-python/python-recaptcha/metadata.xml b/dev-python/python-recaptcha/metadata.xml
index 97e2d6ed858e..9f3dd846fbed 100644
--- a/dev-python/python-recaptcha/metadata.xml
+++ b/dev-python/python-recaptcha/metadata.xml
@@ -4,10 +4,6 @@
   <maintainer type="person">
     <email>hanno@gentoo.org</email>
   </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
   <upstream>
     <remote-id type="github">redhat-infosec/python-recaptcha</remote-id>
   </upstream>
diff --git a/dev-python/python-recaptcha/python-recaptcha-2.0.0.ebuild b/dev-python/python-recaptcha/python-recaptcha-2.0.0.ebuild
deleted file mode 100644
index e77a89547183..000000000000
--- a/dev-python/python-recaptcha/python-recaptcha-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin for reCAPTCHA and reCAPTCHA Mailhide"
-HOMEPAGE="https://github.com/redhat-infosec/python-recaptcha"
-SRC_URI="https://github.com/redhat-infosec/python-recaptcha/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	!dev-python/recaptcha-client"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install() {
-	distutils-r1_python_install
-	# otherwise we have an empty recaptcha dir/namespace
-	touch "${D}$(python_get_sitedir)"/recaptcha/__init__.py
-}
diff --git a/dev-python/python-recaptcha/python-recaptcha-2.0.1.ebuild b/dev-python/python-recaptcha/python-recaptcha-2.0.1.ebuild
deleted file mode 100644
index 12afe927a4cc..000000000000
--- a/dev-python/python-recaptcha/python-recaptcha-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin for reCAPTCHA and reCAPTCHA Mailhide"
-HOMEPAGE="https://github.com/redhat-infosec/python-recaptcha"
-SRC_URI="https://github.com/redhat-infosec/python-recaptcha/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	!dev-python/recaptcha-client"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-redmine/Manifest b/dev-python/python-redmine/Manifest
index 58dde92d697e..605c14dad642 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 1360 BLAKE2B e89f3bcec7488450ba6418f8758ef5f5387fae195c73c58c2620778b973966cb8be51a0b3b5998703f8f469d9e4a9aaafed3d4479cc8c51b4f7f7c71fd587a87 SHA512 f7e6b8f1f25703ef87b7dcf927ff1ccf70ca8e3c2b826cb4c9c260d73a565a4f10dcc496db1560f8392a7fb2660f9388e4e2d4d9db249fa41ea4fd1c69ed8862
+EBUILD python-redmine-2.0.2.ebuild 1341 BLAKE2B 818d15ca71b689992a9dd88b6a104374e9903002e2c0a91700a22b3673e6230741c85dfce3a0902c0a9ce0a2e40eed61dddd53553dc7499bfb7af41663f8b615 SHA512 bb99e576cba58b978ea14f37736e720145af04ffb40d1a2e472527151a9efe7ad89d498a9cd72e4049ffadf6cec82f8311638b24bd5c155d495c77ae78ff5662
 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
index 04f68b9d4b7a..81541fea58de 100644
--- a/dev-python/python-redmine/python-redmine-2.0.2.ebuild
+++ b/dev-python/python-redmine/python-redmine-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
index 421ade31fdd7..040fca2a9937 100644
--- a/dev-python/python-saharaclient/Manifest
+++ b/dev-python/python-saharaclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-saharaclient-2.2.1.tar.gz 111417 BLAKE2B b4545a161a630caabca9318eb0ead796b417d686cdf2c134f7e8022e3e62e7b01e5db7cff1950826d49798d6e6ea41334138bcf918dfb23a2eaf6527c0788fde SHA512 f5ebbe76d00a9bab4239bc19df2bde30b133b261bf8abb63db12cde9539c5bc92fb1a24b6c9ed6e8a509a44ae2abe98f5e8b74655517a1e2c2126938cc5c517f
-EBUILD python-saharaclient-2.2.1.ebuild 1765 BLAKE2B 2446c92644c9d5702c4c6a692cee931254f8a60b58218aac4c2f0aa28d7ef50da8c5e276c3809de5f200eaa597311d1a1d57a57995a5427fffd635f5fc1b93e6 SHA512 02576dcc5c2c9d45d2e2249df9b0c11595a19a94ac83373e3c57c4a0cc2655e83fddd681dae4d7c6527ec781be67d6c3247ed204a65e028ea4713eda9e67d54d
+EBUILD python-saharaclient-2.2.1.ebuild 1753 BLAKE2B eaf9b5a76f3c1491b054389c11ffa27dbc53a4ffc487aaa929f978632c8f83eae1a54cd814221dd1ae1cd70bb51ad50cba0b49250fbf6b3c56459faa17361457 SHA512 cfc6240a5f7f62f05c94a166d507d39f97d7bee09b65551812ea2774094995cfb9969f9842ed938c18114c30bf0461ab93b7d55d4b19baae1cbde2dec50c4264
 MISC metadata.xml 643 BLAKE2B 2a3c45ea4f9fa3c045cb88796e093436e66719daf71739c7679882f11123f2ac405926c8405046aed4efb55328d7235619192b9b7f978f7571c673e306953834 SHA512 4ab105b6287560e19a7b6ba8e999da16bdb520ff8f1a812e0e17ebff9c1edd2f7ec1475978ee478c556d31af8c201555669c92ff388de45a206b45005ec95d2c
diff --git a/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild b/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
index ddfc3a9f41b8..1db9c625a1d8 100644
--- a/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
+++ b/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-scsi/Manifest b/dev-python/python-scsi/Manifest
index f5e75516d806..42f694194057 100644
--- a/dev-python/python-scsi/Manifest
+++ b/dev-python/python-scsi/Manifest
@@ -1,4 +1,4 @@
 DIST python-scsi-0_pre160211.zip 126606 BLAKE2B d5992732b2673ea5136f46e985a63bcb9d0285d67b314005cb3ee4ca447043c31654c8ddf038c01472b2d30ba7f10f4152461ce080fdcc496dad84513f0310c3 SHA512 43218dfe91eba8f79c0cc7b48e5d7ba3026aac3d0c70dc2d8865905ef70bc479c6a32c46104b3284a00b5832d8893daf4285aac84fd43f1a1ba80affeaf5e258
-EBUILD python-scsi-0_pre160211.ebuild 642 BLAKE2B 593cdd803bfeea835e8de825d163b7aaa01b7e4eb4594b869f8be11151712f08a534745102b20650ac9c0bb59bd0b2657151ee98727175fb74e532e26d4ddbc3 SHA512 4f2aa69a885afd963e0df13191f0c2d9e6074f31bb33883f7aa0b2f9431be2c8e9fc836abf2d1a1c1a212d4f04dbc097093856ac359372fb6587db3fe01e970c
-EBUILD python-scsi-9999.ebuild 442 BLAKE2B 963882488db212560e5c50eef8d31192f0c5fa377e232df43f4354f567e1f088428e1197348ce43c44f1598695c8e8818a93fc4fdd3875d78c465e5610cf7991 SHA512 a031c3b716c06e48c42ccb5733f66bb7d3a9268f93335fec0e3b488f94a1f721ba6025b98204d55e68747ea71ca2bafc9e6d0789cba756d2be0ca87b6c4ca74c
+EBUILD python-scsi-0_pre160211.ebuild 632 BLAKE2B 33fd69c4466c9e6c5c1b4000702df637041c81fd9ca3ebfaf43471f0b20fac27258b8427a8a89dee16bdbf0a0a1578236f159ed5841316cad91c4ed06ab994f2 SHA512 a0748fac230a25045deeaeffce96e9c10443e0c188a9a66b696ec3471039a15f0bea93a162195e73125552dc349916448191c9f9a273dd1abafcb08046c0c47c
+EBUILD python-scsi-9999.ebuild 432 BLAKE2B e2e158880b063a7a490d80ae352e41b3a3d408ef826440ea3235abc0365df74de7c81445dc4e3f2426c9c303db3e398b7b8d36472c4a1f2a0c68b2c6d31b1bef SHA512 44dfbbf42d147e55e070d586908307b3b6a3e928c8209c0425ec745549e33b4ae0349f98ce6790d81daa798b80dd37dbcafc7f0a8e5c5399c7c4329750955a02
 MISC metadata.xml 333 BLAKE2B 38dddf47085838ce106d76a1cf3a89f67e6390948190ee3e218813330a412ccb4b3c0e64c200fbcab0b855d3c2097963703d01044c0dcc55af449fc12da7b549 SHA512 bc4d5e48baa7202f81cab953519e91e41e4670df2ad69173f2d046eb73314e66ef62fe58ea740a71fddf9170570c0fd823a6546fa129a666193cebc389fce153
diff --git a/dev-python/python-scsi/python-scsi-0_pre160211.ebuild b/dev-python/python-scsi/python-scsi-0_pre160211.ebuild
index aea859a6eda0..3cafe6f940a5 100644
--- a/dev-python/python-scsi/python-scsi-0_pre160211.ebuild
+++ b/dev-python/python-scsi/python-scsi-0_pre160211.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/python-scsi/python-scsi-9999.ebuild b/dev-python/python-scsi/python-scsi-9999.ebuild
index 052187dd1ba3..a312a6b8653b 100644
--- a/dev-python/python-scsi/python-scsi-9999.ebuild
+++ b/dev-python/python-scsi/python-scsi-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/python-senlinclient/Manifest b/dev-python/python-senlinclient/Manifest
index b898ff053b05..9548eb66e8cc 100644
--- a/dev-python/python-senlinclient/Manifest
+++ b/dev-python/python-senlinclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-senlinclient-1.0.0.tar.gz 101396 BLAKE2B fa21d8c33424dab7602a33bb293a3351d904a2a7b2a2b90f4f690e212aa6d0e7de5f7106d2313cab53ea3b2d6a47818c702c37e15333823d92d087602738e564 SHA512 3e98cc9a238250ca4069289343011d27d9bf6b35e0c8709bbf209b7774ff7b84151533104795fcc21403202cf6c834503685a9994d320a48aa690a854e1570f9
 DIST python-senlinclient-1.2.0.tar.gz 107117 BLAKE2B cb1f70c59414b6bc54d58a3370ad5917851e36a19b65248125efd53bc24d29d3edb4fbc7734ba6d9d64c1ccea78307c7363de96c93c03fb801c66c83c1edf40e SHA512 1216e9511715a2cc5a703020a08ebb01bc24111150230f7ae8441ab750865c4cc07535f2b9d15ee8f7c93cc4f2ebd24473fb38b3946476063eff05c103d8ef6b
-EBUILD python-senlinclient-1.0.0.ebuild 1191 BLAKE2B 81343c84c8a1c18893ce427173a6a6c32ed930a09990d73a9cb685992391bbefb4e1dd83b4860d57a04446fa371369d17385bc721c1d6292c4442cb1df90f108 SHA512 df27a2c05e2eb5f6ce188b0ab2d6e7d433b0d3bbca4bd659e3cc2573db3bef2240237ef90ff92a8fd3fa7b3a820da006879442c8bcce152fe3bfa7ec9574e326
-EBUILD python-senlinclient-1.2.0.ebuild 1475 BLAKE2B 24bb7b6cf873ae067c8db503e789a027e17fe54f83cac6bd128c3229ef256af5c8b4e3fe412be79ba178d55d3d3ca82a28e0562aae6d54cd6d9baf2805ed69b5 SHA512 fcd99a157485e29fd3dcb084e9ca040345ec83744383e70894b5b6931e73a0787243b53e973849180f3bf8fc60f2d7b9b2fbcc147b0ff238b04397acd7b592c6
+EBUILD python-senlinclient-1.2.0.ebuild 1461 BLAKE2B 5f4bb8ab3cba3ecd8535d90fda2b7a8d687a18e466ed11a461aac9a30e2e38bcf384df3d5ed4b88fc4d376ac23731b0a0700df0d1e1fc97b31ed5524d5614507 SHA512 2dbde09317431513331f2849a21b2816603054f71ecc17f0ed0122dbb6a1b788ce256e4d65efc4ed9301e45e24770c9cb77f90fef0f85b34eeebda7bf0c5ad6c
 MISC metadata.xml 610 BLAKE2B 62bc9e2f9ef0cd99f8f61cf0ffbd07037da020d7be1074f917ad0e6710dc549aa0d9eeabefa63a6a4855d1ff2318f4a805a0e96f88accf41e2466c0f42167e55 SHA512 606dd0a5e69cfbc20bd104b7d163d860256997921407022a0740f90eb85b73a738ef9372e8c226f8f87ad9b7548e784c04c8b4f69ab39c77eb27b3f5b6c02895
diff --git a/dev-python/python-senlinclient/python-senlinclient-1.0.0.ebuild b/dev-python/python-senlinclient/python-senlinclient-1.0.0.ebuild
deleted file mode 100644
index defae795c85a..000000000000
--- a/dev-python/python-senlinclient/python-senlinclient-1.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Senlin API"
-HOMEPAGE="https://github.com/openstack/python-senlinclient"
-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"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.9.4
-	>=dev-python/osc-lib-1.0.2
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.4.0
-	>=dev-python/pyyaml-3.1.0
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild b/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild
index a9d55a48d985..413cbf9fa217 100644
--- a/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild
+++ b/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-sense-hat/Manifest b/dev-python/python-sense-hat/Manifest
index d679a39ea204..b71719fa9e1c 100644
--- a/dev-python/python-sense-hat/Manifest
+++ b/dev-python/python-sense-hat/Manifest
@@ -1,3 +1,3 @@
 DIST python-sense-hat-2.2.0.tar.gz 20841 BLAKE2B 59e6b9111fb90493e6bda00ce4a4c143dcb84d8b6529efadaf2f337adb38a8fb4287cbd9a303070ea4f335f1e03c6f4789e6f8fbe64a7c70db20675bdae7c6a1 SHA512 71914f6f22206cff23992a6908698978741a46bf9b98648388bac4550f39e8de73db6bd389b79585eba6e82160649a8c8da4217d515bbdbcb50d47218415f3ac
-EBUILD python-sense-hat-2.2.0-r1.ebuild 624 BLAKE2B bfb00d13e53d425791ae00d762ec65a89d0b5a437e3a2ba2d1e4e517e2f8101248e64b0abf8ab19db314bd8109ef28fb7e3f6df80f897e11b8c0a7a1b0781057 SHA512 a86182878b2088e2b1ec7381d7341877deed016d98c7e1ccb7fa3b2fe3799bbc1fe6094a83368a1532fbfcc2cf4c7f4cd0d331b185722eed936ae95e3394346a
+EBUILD python-sense-hat-2.2.0-r1.ebuild 614 BLAKE2B bf94895831390c354ffc456ed2912a834cac8d1e9ee0fbde61b551e72c23c2e7f1acfa9bbf9f756166515b9628c1f36a9153a674cbed44370997da957731e3f5 SHA512 0fd3c704ca7ea2e48ec6839129b45bd859458ed339809a1e5fbd56ca498032fc18dff699127fdbe04f76ec1bd68084202ea0a1d8d05ffac3a1926a4519e2f261
 MISC metadata.xml 652 BLAKE2B 09d216bb62cf9bcedb9c75f1d6e7c3b684f8c0716cca30332d90c17713d09ecf0796b453ec5d0714dbfa821e37a42d63c752b97bd4afe1a11c2fc6430a54678a SHA512 b7cd7d7f6380f4ab4a4d0dca35c611e0b783c8c188fd511fbca1908857f497542e3c1e9df5fe390fd4c850194b0fad1388bffc4563e1462bb4eb2d3531a9f151
diff --git a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
index 534933adccf5..d901ff21d981 100644
--- a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
+++ b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
index c676e1dde794..69a06d40ad56 100644
--- a/dev-python/python-slip/Manifest
+++ b/dev-python/python-slip/Manifest
@@ -1,4 +1,4 @@
 AUX python-slip-0.6.5-no-selinux.patch 2942 BLAKE2B 87cb1fee6aba70228b78ffc8b8a63b6b3bc0b11aad8f5e38369919e6c5a33780a9f255c2c81cc9220fe02b11b8d6daf24278bdbc495a831af03c92f1f2bd25f1 SHA512 64a742f93a38a2ff15d98e9d22c30a821ecd2044457ac958bf34cd7fd8e333b16a5fd56e80b169cc67c9ab35d13298d0caf418ad7a693372539701bda56f123e
 DIST python-slip-0.6.5.tar.bz2 25996 BLAKE2B f2c512274c35a451aa5a97f8c8b16d117edc34901cb2cc51d7d99314eec9c2e90c95019290ef9a35511b62a822471f40eac8c4228c0094bd72c71bd579bbe0c5 SHA512 84dfd4d74602e996797261aa4021fc1579a6aba554d2b3d497c0a7b8618366a9c0a6f12051b00c5653845dda923eedb58afdded37f2a1f31b5b0ce1a0532ccff
-EBUILD python-slip-0.6.5.ebuild 1193 BLAKE2B b4eda78bacb975c8ec6580c88791f371c8efc9503718d9ee8dc03262123313a745280ea79baafbe82f92fc6ff40eb40f6d3de9bffaced23cdc47f288e7270d19 SHA512 5fcd60f208c1423334641b95e5a30dfc385a054476e27c36385b302e140939afee6bc0644ce1fbff6321e2379027a66e2fbdbb5ef2926ecfb9827ad5880dc601
+EBUILD python-slip-0.6.5.ebuild 1196 BLAKE2B fa137e728ecb5fa61eef8d593500efcf9c6dc9e642ce9988fb37f2faa3741b95e21d26709501374b75a6a00c6aba7230931ce87bd298e75bb226cbcde77e712e SHA512 427d09e8949304e5a95d03fcb89ab3a606b579fc08bbaf95028b261665c807442158f1acefca6fe7c331883720c7d528c7d41955375603b913c5e44fedb4974a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/python-slip/python-slip-0.6.5.ebuild b/dev-python/python-slip/python-slip-0.6.5.ebuild
index f3055907f78d..7d6d12a009de 100644
--- a/dev-python/python-slip/python-slip-0.6.5.ebuild
+++ b/dev-python/python-slip/python-slip-0.6.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 eutils
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nphilipp/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="dbus selinux"
 
 RDEPEND="
diff --git a/dev-python/python-socketio/Manifest b/dev-python/python-socketio/Manifest
index 62a702681b4a..8f7a899802b3 100644
--- a/dev-python/python-socketio/Manifest
+++ b/dev-python/python-socketio/Manifest
@@ -1,7 +1,7 @@
 DIST python-socketio-1.7.4.tar.gz 23298 BLAKE2B a5337e6f124018172902fbc51935e193267a8e209e9d677fa52e72ff6b71ea27e2aa5284369082fe38013c5b4b21c8561952b9046acbfd3f02c824c0837b367c SHA512 fb31072420eca42fa0349f0a9350fe9ab6bbbac7dc32cd7ae76cffa026fdeeb4197b8c441d76bfc46af55a550c5b7e81e387b67d538c500075bc5b4e8f68d5ab
 DIST python-socketio-1.8.0.tar.gz 23557 BLAKE2B 085035d6621f2ec351b28095086c6cc5787c4466f904568d5ece0cf37261a75fb6793be1fedd9f54f7cbeccbb668eaee8463850698aa6f2a901b3454cf63f128 SHA512 2514cbad3e429c101f5e247bdf2e4a2b5a0957c19fa97e56ebe8cd78b36e81cfb9dc4500bee367e57460be3a08bbd1e70967a5c87109034ade847ff7f559711d
 DIST python-socketio-2.0.0.tar.gz 24180 BLAKE2B 33d0c2007acfe067264c670c98e2f8f6764a979b7c67d8d03217a3b2dc45dbccb699beeff151381f8ccd787610ad39bff3396d4737594ed467f29994b4b8f0a7 SHA512 285d6235aaa5914f21a883976ecf31e15947d28e396c859080cf418094e21b5f3a9c4de01361a2c3219edf43c3c587bca24c9f10ebb97be23bc12c59af79ee2b
-EBUILD python-socketio-1.7.4.ebuild 913 BLAKE2B aeec837da5bba3334b29bd6d689610d65d6bcbb76c29807db9710b83b9904d24b13ec8c0342447a1abd9d6ff0f0a6fedf60bbbf24134ea35720d80fe170cfe2d SHA512 24cf8b7d71b65b6f56c6db9f37f070d2a9cb07fdcc5be97a2e5580ddfd942103e1e2be38e5a2546821520fe16eb8478b625be579843672de2562fcc665978068
-EBUILD python-socketio-1.8.0.ebuild 882 BLAKE2B 54868e23a994bbc89b522739429678ddf2afb424f4c18a99f3f3a5bfc92fe53c75c97bede36d6d7600b75c2a45b204c73cd1567e083a28bd3ec54fca8c5c0378 SHA512 68f029eebe3adc1906c00057fb687e496960534dfe7f2d96ec52ffcdc0cbd7726f6ece18c0359c8514bb1f968aac16415c2c3803c439e80b932e1282189c51fe
-EBUILD python-socketio-2.0.0.ebuild 882 BLAKE2B 28644168af04bbe2b904cef1b9d359cf9e1c96367e826754d25e16f7485bc86f30edb69efcb18df2f082be90df044e3b9d56f3caddf5d4d93f0ccf3f0e26c869 SHA512 a5eedace323c18fd04dfb5cf04a7a793810eea1f1d8eede00037b4521c47c793d110cd0b47c466b4ecf9e149cafb3e55ffc0f681fa15f13e3cd4bf985687a49f
+EBUILD python-socketio-1.7.4.ebuild 904 BLAKE2B 74b323f17e7d0b4f7a439a11acbd43ecbd5b81b79cc30a211c8e8121d6128a4be8481e7d1caee5875411d4f90e2aea758fe39bb3f3384da53e9e67ccb818b926 SHA512 c9fe0fee1eb32d06dfdc4956a6f8447d871a88da3e8e26ae4ef7bfd3eb54c255e70d8976016dc546c02c30585ecaca5ea3016820d6d94cd8aa3debdd2b01c69d
+EBUILD python-socketio-1.8.0.ebuild 873 BLAKE2B 451c9db293398a73c08fa3d5490096eff5e4954d8c03a52e933f1d6e07526ac2c02aa1b82a17dd66c7a066de953d4c75852fcdd0b7c02666b3a1fa75fb78d3c7 SHA512 a2a08635322febfbe0b30b437c7b18d8cbc40e481cf4057a1dafce489405a049ee2d2d497c9b07431a87eefe62b1e254c5f2d24a7e8efc14f062110df3e15047
+EBUILD python-socketio-2.0.0.ebuild 873 BLAKE2B 73dc586d8f707c0471e25bd456ce82910950268bda8e525c9c38e68babdf4581214ed7594cfab0c3f4184869b5860c664f8dcec699dd7a4ac8e19fedeb362fe7 SHA512 f7dbb0b7a764eff23adad57751cf60bd6b3a685851cd4eff7ea5a2e7f304f6d759a73ef8c5e37d3b381aa0874f892fde63bad1fead80d181eedd1b176f2b66f8
 MISC metadata.xml 466 BLAKE2B c1aee63cf2625278f18fa3f65ea008fbfb4aeaa6c4770fa944c853636c44b2c12defebd46ba8483d08be818e28731b3850920931a40c386c11b17416c281ee5f SHA512 8e46ce0f84adfe7f52c9a99df6338b78755d097702881515605adbfbe2c68af0afdf6e07b05d2ec915e089bd97b01ad38bc0fce43523eb542a0271788b38e79f
diff --git a/dev-python/python-socketio/python-socketio-1.7.4.ebuild b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
index 702f4c338043..82ac6111006b 100644
--- a/dev-python/python-socketio/python-socketio-1.7.4.ebuild
+++ b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-socketio/python-socketio-1.8.0.ebuild b/dev-python/python-socketio/python-socketio-1.8.0.ebuild
index 133788bde192..f07efcf9fa5b 100644
--- a/dev-python/python-socketio/python-socketio-1.8.0.ebuild
+++ b/dev-python/python-socketio/python-socketio-1.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-socketio/python-socketio-2.0.0.ebuild b/dev-python/python-socketio/python-socketio-2.0.0.ebuild
index 859c583c237c..a9c1c3e9d3ef 100644
--- a/dev-python/python-socketio/python-socketio-2.0.0.ebuild
+++ b/dev-python/python-socketio/python-socketio-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
index 81b476c72396..dba4c0800e2d 100644
--- a/dev-python/python-sqlparse/Manifest
+++ b/dev-python/python-sqlparse/Manifest
@@ -1,7 +1,7 @@
 DIST sqlparse-0.2.3.tar.gz 60742 BLAKE2B 38d3f17d196d3a1d50ea75810b5bd3a890c6f4b12195621d571d62b8c40e2e2d13034deddd95288df37a15daba28153a5ca9221b78bfff1c0e3bc37eddca2dba SHA512 ec654e680f8ce423a89da92c4c74f85e652bebb19e9a40ab0b8067f61803897e49e1e6f8dd1ab454b1ed130974d76b4f973c799264fd4bf8a87f034ba9c44835
 DIST sqlparse-0.2.4.tar.gz 61614 BLAKE2B 2462fa5d77ca2c3028aa3539bedc3cb2d7abd35db3c736ffd8abad8626a33174787f0079453ec646739749c8860fce0f1c7d815e6a8485c24b851a40b5bf3b87 SHA512 abea0f084778976f2d1086006eaa88e1fc1d2580654d063b35557a44d9d9727b410a022e8ea06ae3b265f2829d49c48d347dddc61f2e56be9c3d6207104712b2
 DIST sqlparse-0.3.0.tar.gz 64072 BLAKE2B fbee74c7222fa50c5d627959d5c8652dcd85ab5b5b771e3c8375cadc6e009c2fb1adc3c2428e27d769c210e7976c350bfab367cb7aa44dd7b4183ad9722a4ca6 SHA512 596d25f5fa2c797fe5652e36e9633397e7867586ff0959f52d1ff861c16d0e7c73644daf03d74169dd20255e802b7369d4dace0a44a3d94c15bd67faa41df551
-EBUILD python-sqlparse-0.2.3.ebuild 1358 BLAKE2B 7ff2386f508d414fc713fea05a6867da59125dbc7e85a0e10e1176ccafecbd48000a36c9f947dc268f69f80264004507726cb615c109d935231e0300b65aa911 SHA512 91206fd8795e92589a16e479ce25d3937d035e0bab47c4576193646b9a6a71b49ed496aa4f221b35f596629aa90ba5168d2cf6364ae41f4652883b217e064ab4
-EBUILD python-sqlparse-0.2.4.ebuild 1360 BLAKE2B 3d9d084012a06a9611e1270a08f7ceb01b8050e83318b6f0e2c57e462c3aecb939449f44070f84626c553e0d971539a6ea82d42767982d5d878b9821611347bb SHA512 e32023451bff7c6c32aed112d2da383568ef89e1b6288482a1721154404d72ada7df90256d7916059627ff6602193019fb3077088eb6fae7a355631f88a7f7d8
-EBUILD python-sqlparse-0.3.0.ebuild 992 BLAKE2B d5d23ec85dc2e30f8f25155c7bbe475bca37a7527f084325bdb5f8badf393bd6f544835dc4721ff35a418f6b6789d9773863ca97c517982e6a3c8408aaa47f58 SHA512 0bef6ab73871352cc75c37375d6faf19f663e48c4dd7da6624c5bb38f0d5131f225f4e4ed118e45c237d2171c640c688d3e87fd9d38d164c27a2014a65085de0
+EBUILD python-sqlparse-0.2.3.ebuild 1349 BLAKE2B 751c2707d8f0a535676ef254ecca4cd15a7d09238a512057be92bbcec0a16b26bdd0caadcf9bffd779aae50614e0358308f727ab0ed3b3b9cf2629722d9d1d53 SHA512 9742663ecfc7c69e670608ae8e34984b38cfcad0c589271abc54e5700e5807d6de1f36df8f3371224e3c812915a90c5982c97ecdf212ee1d3c89dce10e0e2ae4
+EBUILD python-sqlparse-0.2.4.ebuild 1353 BLAKE2B cc873b7f263a17ff686f6b2a009a75127b71c367b8ff17efa11d6fe42c8d10ab87e32d1a1c5148c3e74c563f70a6f1e3fba63e504480c334c6466d15e39df7f6 SHA512 71a151706e709dc23fc45738a8cd10622a887b5b7a9ae72fb77afb818714c3b28ad49b2ff2fa4d091d331d5634b0e345edf409d0b2d39020fc185b000ff53bd0
+EBUILD python-sqlparse-0.3.0.ebuild 985 BLAKE2B c395b48396b7f57f3a728e22468d5361b35f4dca3771b191704086f1b20149944b80b4eb0f85b7c2e19007f2e7efb436bf17d7e0ba0e94bb54f10a3d16c97ee9 SHA512 bee0b03141050ef30e67a3291b735623eb73eb5703117aa0c16414fceb09a9c3c98bf656d8b7bb055feb5c03ee1b7236272b438709194bc4e2b7350e3773f77e
 MISC metadata.xml 453 BLAKE2B 2b04f47b565bbce71b1ddf27bedcd903f123751e7524ca62ea280b96788dbd14ae18513fda8eaf563d927c09dff7094b6a5c0d651c0530f2d3e07ee1d092c946 SHA512 5bb3c69c2dd5bc8ad2bc8c4a174be8627ed54ba0055bc153d36733f964ee289d71d0b392ec63127482a87f5f56fee9cf2900a2830a0ffbb733b1119be4abc0d3
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
index 200f8f09164a..8184a0645c63 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
index c80e76ba6a54..335cfbf6ca40 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild
index c838e4174db6..83cabf9bcaa8 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index 693aa7ca48d4..65f1a8f067d0 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1,3 +1,3 @@
 DIST python-stdnum-1.12.tar.gz 882778 BLAKE2B 49b0b83b8a76cf8963b35729b8acb1bb7f6cc8071cfee5490ba8f60fb2b74df28e11e65d9dafe6c717d297382628fe924ab5e193d8a39597cc214b98f12fa5dd SHA512 7eefc997494f538cddda8a6ca60d60c52e35f53023edd69b540c3f1aded00d795741ef429f84be6637e737e031b0ca771d4c1a060c94c90d7aa4144cdb0a536f
-EBUILD python-stdnum-1.12.ebuild 641 BLAKE2B dd6b4835068745a5b9b829fb59f74b3e8e7740be151f594e591d048a2b298e51db21502a4828f1f29ecd55df6b38938c06d29c67afba94b976182ad332998d91 SHA512 e915a3d92b4c90f2d88be84500f42ee167238fff29dafd46b40b901b05e7631193f3ed187fa2380dcd48067a5d5f54a1c77871704a1afeff28790a99a035e3cb
+EBUILD python-stdnum-1.12.ebuild 631 BLAKE2B 91be9c40596c177c1733a68a8e77234504343c9c370308fd84312668d9cad3d0f66beef12af6ecfc0a8b1fb735332e8965713a7ba1d9f0337f9a825ba23b82d1 SHA512 686edd48dc9893b8f107d0cedc7fc03225ca9a3911bacdba3f8f241f4d4f41fd9e5ec2d5127848dcc4f33793f32beee09f68d95bce49853f01c1967de613090a
 MISC metadata.xml 475 BLAKE2B 4a2fe0a8f727cfaeb086d33e384b52ada0555f7c57028470c1ab2524bf4e12cb4b501736a9e9b0d14cfc66880e2878d93cea188f035fa52b8c959dd99d034797 SHA512 4aae016f69e817168682ce7a08e9cd61da5397d83706b628b4a743491251c80ee0947f5a00f3f3657c2f80f276661f0287a5359041451b997c214ba94cd2430e
diff --git a/dev-python/python-stdnum/python-stdnum-1.12.ebuild b/dev-python/python-stdnum/python-stdnum-1.12.ebuild
index afa8a22186a7..d7f66230b1b7 100644
--- a/dev-python/python-stdnum/python-stdnum-1.12.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index 9b245f7e547b..da0d7f87ae83 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-swiftclient-3.7.0.tar.gz 190256 BLAKE2B f3e4c462f05a34af8f6b7775b9e238e14a29af0970f4838dbda21c0fe43481a84ad51be1f2f62592109ac6fc5a84931fce154381129fad9e1d7a60333c44c7e9 SHA512 85b762cbc9f5e90c7d4dcbb5f016ee4bdc61fe6c869d24fb9bc5f3a3c3e336b171b0d3f384b51ed7bf0edf38df3936f778be85598e4c6a9bf165f8dde0d3333f
-EBUILD python-swiftclient-3.7.0.ebuild 1514 BLAKE2B 54cb9fb41ecb43c65dfddf6bf79a2fcb7a513c23a05b6a28841e15aa1222623a9c0d18193e5a3113410897d9b6632e55d757e6a679d4015ff37d1c47c08c9e10 SHA512 26e9bd5d26906582f958926726f177da1e900f98b4379ebe1549ca495471ca054ebf32525edca968c41e7adb4565962511f78284c9f2b83aced8793b16fc142b
+EBUILD python-swiftclient-3.7.0.ebuild 1502 BLAKE2B d0be4dc37db4a6a136f2c7b2848b1f26893aa9050e092cef0e11ae2b74c7024fd1e2e00e9b068971c51abd7388c121491359dec9d17aa5611d7d7b5eb4f6c203 SHA512 ea02dadfe13c7019bc72cc8f1acc7f8b1111cc982e2398c20be5f0202f4978e19b49ab147510edcc85f81213bf7f1be10523e80d0767863ee937d8efbb5f0905
 MISC metadata.xml 597 BLAKE2B c32e50a6b0ff995f2c237c4a6e7ca80636487a9ca4d412c74e6032a32230141f36949fa42cd39ad293a456d8961cbe14e86d6df3a772f88c76283956c46830a5 SHA512 fdcb820e96b82093910b251aff11fd5831253b86972435fe6456bdbfbeba4cc0c9d0dcfe10078103d5e7b7f29cb84e5f379293be94c30ea54fe4af741e097435
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
index 8f417eead1e2..2a754760dd5f 100644
--- a/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index aad4c213dc58..97681ec9c3a4 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,6 +1,6 @@
 AUX 233-xfail-bind.patch 1077 BLAKE2B f2fa3f197887d3a14cd7bd2a8bdd33100eb18f4b348bf4ccd1877c843864a71bd52b19d53ed3c98f0de0b690c2158b6ceffe10682ed79c64c829103a2e34fe14 SHA512 63a5325812bb3530a8681b006fc66630a33cc6740ed63171025d4406a68783a3fba0b55141fd9620f049f2225191ce9cffd3d91a9d1c5cef7af94ec82b2ebd6a
 DIST python-systemd-233.tar.gz 49680 BLAKE2B 7d612022738d3114a39f7ad7f4d7799ac3d027980592a5205247d4c866ac3d9520d63ee02f143e26865f0d83338f30422dd0c2299f575e8b03f3112900e9af73 SHA512 92a6cc7123db586e5ae5fbb56e5065b17be9da47ced9dbc5920d80b7db7f56d15b127e72d30889c5b24b119724a33f68be1ef322529620ed95b0f95707e4c2ab
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
-EBUILD python-systemd-233.ebuild 848 BLAKE2B b1f96c86c7517d906fbdf525c1cb47d9b55e5308067071552c3dd320dad57757d07ba8a6d62a630d570ec2ebda9c6150664072b05da20e58a167694599edb925 SHA512 0b9e125b7d92ba1442d9232ff9aab4f44c2ea50cb2138d1032332fcef7273a9e5169cb5a3ef661651d80cd85762873017075a923eb9c79999ff3995fee635b76
-EBUILD python-systemd-234.ebuild 985 BLAKE2B c27d8ca44e2b41e5acc444f293d901f8531bd6a2301a152acf3b292aff491d3f8ee91cad47ecc60fdda9e27720969a8cc203ed772c513f1279168e995bdf3cbf SHA512 003e81a52a91e4d2a7d300076f5a0dba879363d50246ef43279b21201fae96c7520d7936a5a82359aaf1bcd551d322711db5e7318114e06530201544dbac2ab2
+EBUILD python-systemd-233.ebuild 844 BLAKE2B fdf4b7b77918de340decd17ebf24b6f516fe43bd232bfc7419806d81dc7f63333109ddbd16ad1721f107ce439f76ea48ea5a665856cbab59f2addcd86a348f15 SHA512 97353e4dc664f54f4e27f304cbfcf520aa7f011392caf1ef3a8a18e7743bb7f7c6d6992b4719e043c473b41d93b0ec2367c0da67efe594e29ff2168f1ea9f946
+EBUILD python-systemd-234.ebuild 981 BLAKE2B 790698d3ed8184fa0c9f576b649970e0b4d1f7e22fd03d68b65b6edcbaf5d1279e1fcbe5f3e7eafcd4dae9624c1be74fe4173fe571660cca4899f5f28f1a9f26 SHA512 eb06ed054d30f061dbc0612c1fd61b9b326a47afd27ff283014337e1f91bb242417b757b9b4f5f5786d6d90b03cc938ee2a40840587133737e91f37230d7a00e
 MISC metadata.xml 306 BLAKE2B 2e77cf6814775cb575c96548a69609034e4d9db62eba44684df463c98fe1b105ae5caffea7e1d05880ad2d8236405b2848fa24bd245e3a8627578d2cb128b055 SHA512 ca004982cde4fe1bcbd821109ec70f464a2014a2c0aa77f9976eedaec78ad68dc8d39e2e2f7023192bf807307e08259548f1ebb298ea7f3654c0b8658fba97f9
diff --git a/dev-python/python-systemd/python-systemd-233.ebuild b/dev-python/python-systemd/python-systemd-233.ebuild
index 42fb78362679..209005857e56 100644
--- a/dev-python/python-systemd/python-systemd-233.ebuild
+++ b/dev-python/python-systemd/python-systemd-233.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-systemd/python-systemd-234.ebuild b/dev-python/python-systemd/python-systemd-234.ebuild
index 14dc2725969d..8ec1ecdd6af6 100644
--- a/dev-python/python-systemd/python-systemd-234.ebuild
+++ b/dev-python/python-systemd/python-systemd-234.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-termstyle/Manifest b/dev-python/python-termstyle/Manifest
index aa3b9519cc4d..c421e832f819 100644
--- a/dev-python/python-termstyle/Manifest
+++ b/dev-python/python-termstyle/Manifest
@@ -1,4 +1,4 @@
 AUX tests-unicode.patch 212 BLAKE2B 0c4d38d0fbdf3871cc81741f0f4533fd989b9636f5d9f435230a154b33d9fabdc5c3ec135f8168a4be1d9f990767871cea8ad19b3f8c6af7e5ab7ca9f9c07500 SHA512 cdb60f341dd186febe72e09586a7b1d65087c0773b1192d9725188cfa4b9bae902026ec7bb723359863695e08992b2b5bae2a25d7aed0c2018dd22dadb8b850b
 DIST python-termstyle-0.1.10.tar.gz 5025 BLAKE2B af652f560f3c6657ca01080cdaece77af7a1ecdf0758cf777035427197142b04a7d39a249da6eee90dc06cc2d15ca484c8b1d086c8e32e761acb8adc0eeccf3f SHA512 a0ed484da8da10c7fe1b8422a26861fb115dc29c49ce79c113053f913d3371edf6222de1ccf40e6aa34c3cfa9da5805eb3928fb07bfae18a13683621d7547743
-EBUILD python-termstyle-0.1.10.ebuild 850 BLAKE2B c2b0dc32b17e82bb90889ac8cc667b9ea6611dc0b902aa7a1eea6e3d5fe336cb12adf80013cc9f1f5bdfc827df25959cb250e57c9cb135edb177a5c1453439f0 SHA512 a73142f1c20fce756b8d3b020fca7b816cca69b2b67d8c2d4620bb43de56b8af95ce20c72c10e3f3a106052a6366727a6b7b658a3f4fc7234f57bad2674c3a5e
+EBUILD python-termstyle-0.1.10.ebuild 843 BLAKE2B 30a64e54353516fc874cc4ec02e17609f4cea0217b1616b4148face0db56ba242b391e29aae42eb219ed7b14672aa3f99813662da304e9e055202010f639f796 SHA512 a5cb5d281a67ead91ef75395a2c8891e899aed41e1afcc078097a40c7764943a491555e77a98b4a57bc0be91c37162de220bbca58b0e347f2c5c086b2d9d5a19
 MISC metadata.xml 247 BLAKE2B 431d545f18d9c8ff5e50fdfdd55d89303f283a6bb008c5eac55d8762b8c9cb62dfcf40db999b66b1bf9ec286b9552033eabe7ca0376b415e5f6c7037a0eb8927 SHA512 6b6b38e681e7ca67b2f09aaef6db3340993b2f78c5be2f25234d46f8688ab3ab85289de8738f9199589817d3e2697de0788a45457cc6dfcef5e33ac5adbb558c
diff --git a/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild b/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
index f41252de6602..661b13a6ef42 100644
--- a/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
+++ b/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-troveclient/Manifest b/dev-python/python-troveclient/Manifest
index 240802f2d756..ee9bfcbeff3f 100644
--- a/dev-python/python-troveclient/Manifest
+++ b/dev-python/python-troveclient/Manifest
@@ -1,7 +1,5 @@
-DIST python-troveclient-1.3.0.tar.gz 130542 BLAKE2B 335358dd589ce2feeb03f2fe7da5185bc203c9f0823bb3695feeefa9d05dc4aafdfc6f582d87f05b4ac31c6c0028a3620fa2efe12ef22b36871eb6f0ad93b660 SHA512 aa26b587d8e2bd15bb65ff760b89354638f6a77a4e73ec5f37ab6dc3c374d6b8c238391c09347e7fc897138fc0bdc375f69ab479f57e14f21d0882b74cc7c978
 DIST python-troveclient-2.17.0.tar.gz 189560 BLAKE2B 680d76af88b8242956eb8e7a8644c11b47fee785eb0940bca1d3b8c5c500c3c233ac0e452d7a609d10028571e68ad52d47d3834898e98642cbb93b0b17f0db40 SHA512 b314115d2c50c87658b02f5dfe9a22f68cb31ba89c3baedf45bf87c4f482aeb235c751753da538bb38c514600b374b1d3f43e17d4a8b929738b4c742e28c63d8
 DIST python-troveclient-2.5.0.tar.gz 149926 BLAKE2B 11acb39afed5ed018a83861fa344e1d482bfa179e0bce97e517e392daf982d868b0c24aeae2406732ddb39e71ab977832df76b55354975d671ee17421cca72cd SHA512 83e7cafec8ce4d65a55d8854bc2e2fbc657d567e4dc2b42a64c527c656ba5f253839511582c5ca2dda970bebb4555390b895a882b87a2eacb86ccbfac9c09a97
-EBUILD python-troveclient-1.3.0.ebuild 1635 BLAKE2B ad2d75ec22c8cf09a58464a733780de70ab56c2cbb896f2550ed79259a74933308850e5b33c32ac2a97eef2041b543235b56eea0358e283f03c11727e5de6b9e SHA512 98d0922a00c5322e93375100502c0f4b8c07c357f358616a2ffdb34e24fee2691b5d5d67a3f679f5142c74cb43fc0b1af0d1d9966bc35ed92cea4b27d1c859ce
-EBUILD python-troveclient-2.17.0.ebuild 2125 BLAKE2B 7939dd31fa08149f4fc34b9011a8fac94bc7a33bccf4ec87800bd8b03d8bb54c6c868f68bd6bfbec41f5613f3b3c2502d034e3e591b92112f2805f7d09732381 SHA512 b09c7df3be96a7123b5274aba4338315e59a92c07d754f13f3099d905dbe41fa67d8528fd9fcbe2ac787da9de023629026c06dc6b77e854b2bc0336e0873d792
-EBUILD python-troveclient-2.5.0.ebuild 1870 BLAKE2B 09653a22742b3f095c16cb584a1f6216e1c055b18217fb411c394d33f76d40cb243267c953b9428c62ae8ba547a81d6351cb7e3c992bf0b5bce0fa62e21c9a29 SHA512 7cecd07089eca3818b6c5cf1d4732deaf6e882358b0abfbb1fed1c0c7f9c97f61c536acf1a58c482f63596b25892eeac4cc72b185fb0b3ce6191c80a92ad3d74
+EBUILD python-troveclient-2.17.0.ebuild 2113 BLAKE2B e2b7956848f2347db21386189163e74174173a9d9848d034a865ea950133547df1269ccf240565fc7a8bd43f8daf61cbad5d9892955bdc3a993ae9608726463f SHA512 7acbab15bfc31a25732719d228a45f4b957b39ac96cce657c12f52e0a7651d67e5a53d585abfaffb901716654d6a256dd836709491de0d9a49678c18aee51110
+EBUILD python-troveclient-2.5.0.ebuild 1856 BLAKE2B 8ecbd124bc3ccc211c007c307137b89a86bda5f1b02a03678a846e769b97797b55e268aecfe0f15e202dbce0b4d55e752bd3a6e31a638af6076cc1388128b02f SHA512 6fe667717f7f3fb9d8421650842151d822cb4f2a49f81052dce9859edd221c7552889ed048d36c4b1e7cb0b8cccc788adae37ee3a992daed1ca82a469f740956
 MISC metadata.xml 669 BLAKE2B 0cded2233b688bdcc98e7a140c018450a1ca1d151520ed71d0c3c4d1d079edbcd212cd0608d7e3d646555dc94248648767f88049bc375e4551a3aef3b9ba6a5e SHA512 ca61691e9d8d0f274e7d187ef24d080059f79f6fab866ded771a08740f15559456a50a5dd97ec2eb73dffec1324097331f4c4185bdd62a6dfbed37b75da2f426
diff --git a/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild b/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild
deleted file mode 100644
index b1f084ec9275..000000000000
--- a/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild
+++ /dev/null
@@ -1,51 +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="A client for the OpenStack Trove API, a scalable relational database service"
-HOMEPAGE="https://github.com/openstack/python-troveclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-troveclient/python-troveclient-2.17.0.ebuild b/dev-python/python-troveclient/python-troveclient-2.17.0.ebuild
index 2802dab16329..da9e540e4903 100644
--- a/dev-python/python-troveclient/python-troveclient-2.17.0.ebuild
+++ b/dev-python/python-troveclient/python-troveclient-2.17.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild b/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild
index 1f872f63ea65..e26f23e9d4e8 100644
--- a/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild
+++ b/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-tvrage/Manifest b/dev-python/python-tvrage/Manifest
index 8b1a92d29d88..ccc55c5ddac7 100644
--- a/dev-python/python-tvrage/Manifest
+++ b/dev-python/python-tvrage/Manifest
@@ -1,3 +1,3 @@
 DIST python-tvrage-0.4.1.tar.gz 10646 BLAKE2B a2d48fd8042fb7d59ca5401eb200e4936e1764e84404c2db20131cc5b7b8c144bb9c3d06a08662954360e78a3177b193a8128b69a115b2e7c91af2561b4ef262 SHA512 cabee676e85206b8c052b79b0f5fd039719ede104607795fe8d1947f2fd810fd9fd08ba8c6e94d1fa68dd5e51060e10fb9c12349f21b752242f7eae2b4771009
-EBUILD python-tvrage-0.4.1.ebuild 574 BLAKE2B e651a77894d3ff558e87acef02d4716f914cdc27ebdb17a15b4216da09922fc5be99c5a5948e7d2464b964aaf851aa6b57d6f0020803889a9170184b7b8f5311 SHA512 2acd183d6eaccf92caa0486219a6f075ea29b1512d9cd5fe7f90d6b5ceb270f1d6212c12bf38eb6389c7a2418bdaf634900439245275e725c942b2c9d31e48d8
+EBUILD python-tvrage-0.4.1.ebuild 566 BLAKE2B 5a6547ffad4668f605c7b1f1ffba448a3de24c6265497b7ab70066b574d131859dec63ba0650d5e5fe6dbf01f37ffdafa0bcdb3c107e8a428286ca14ebd679c7 SHA512 e74e9682ff8d4eccddcd25a431a39f2acfc223f9bda5235d02429b85334249fcbd270f31dff21096a6e5d0693857c33804592a8ad1c88b18e3879e4bf630cd23
 MISC metadata.xml 391 BLAKE2B 35dc04efa7f2405a58e1aeba8f4cfb11da9e5b51e524644424aae4325343fbec02b5a7e32c646663dedf3fb16b5a068b41e2421e2be40f86b2cc51a1b3b87c93 SHA512 1cae776c246c2337ef4f117db05bc36b5ec362be64a43e1ba1046c0d94d8da7962d58ba5c72ae376774376638cd1fef1a18eba2fdb77b298ef4c64622f605e33
diff --git a/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild b/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild
index 90e3d7bb6bea..1d2ec3e7dc67 100644
--- a/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild
+++ b/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-twitter/Manifest b/dev-python/python-twitter/Manifest
index c4956ce59257..f5f427728f96 100644
--- a/dev-python/python-twitter/Manifest
+++ b/dev-python/python-twitter/Manifest
@@ -1,5 +1,5 @@
 DIST python-twitter-3.3.tar.gz 84696 BLAKE2B aad833904e0127fca4043bf66187e7ff5a4175c7c86cf9b053c7d0bc6c9f25d2bc102a631d479ebd4ce81b515aea0f058473993a1b7f5a03751dd83f39e9a3c3 SHA512 72e4133abddf86a19b8701f846df7eb99b426b8835e457455935a656f38c266fb2930d8a145d5d280ef2e0f0096511b29dcdf98b94bd53b6a661ea575cfb3265
 DIST python-twitter-3.4.2.tar.gz 5145121 BLAKE2B 2ac45ae8fde3cfccb794d8496efdb0066c887101b6a6ac55ad6fd0f9fda8f50db1245284236c5fa0fd8eb7419c11eb253777d78092ea138d2f0a5115db861a89 SHA512 23d009e006864bb9dbf9c10223531a0e2aeefd4ca59852849f49f41e36b6db29e820a58c8a43f23c7bda0c68b6eb19a5557ef649bae2cbb1f1e406f78a918f92
-EBUILD python-twitter-3.3.ebuild 878 BLAKE2B c894906fea2f2588440cdc0fe3ca1e29408ad4d11325b3268af491ce1f33c435db6ef8a2205ecd42b7d7b440b2d0bba7e605f90875fd4a43d740b6c8dca9d93a SHA512 af4fe4d19006036892c175fa4e4e79410617b817d4f781dbe8cdbaf9b51aad47e02ae1bfaefcb525a9eb6d446a7c09af764de0f695b9a95c728ad4377b9a3ec7
-EBUILD python-twitter-3.4.2.ebuild 1635 BLAKE2B 9565cfd2efb8271bddfb646769073496942e4ff2710a3d14a610bc588f57975b85482791d36618347ca89e4b15e39d0629167036d8b328e52a3ae6cae3626a55 SHA512 aa600bcca4737a1ccef679a59d563e395a1bef542f980cb6b0738e4283b8e03a45a347935721f7147da187e5be0a1525e55e6936c0f8974af391f953b1fe7873
+EBUILD python-twitter-3.3.ebuild 868 BLAKE2B a9ff13f9562f73e78b4871c81c720ddd69aef62e2cd4bfa058fb5ee1485b0c3c77acb42449c5894bf3ed7020d04fdb01c9ea7e944fbb6a7bf0d9238a75e19848 SHA512 564b298b0705e96dd70e6d853d6fe3348492356f80a70d5f8e4584fc9485b36fa2b2b499151f61fa72ea8b7adcda2a6e630c1a79a0e158b4c6168cb495d31daa
+EBUILD python-twitter-3.4.2.ebuild 1625 BLAKE2B 0601e5af6bcb79cdd51ad9cedaa25f28af199050fbcb161fe394e51cc07d3fb67a00ce9aa0e02a68c0b72d9c219dfbe406f5c23d9548838ea63f7edb1d08e948 SHA512 3408df4466d936d45d853699d6ed8a185cbd85601a550b25fa30426b7c5a55a24e75ef5afdea511cf7fb1c867c246925d5235d60a72778992421763e65ac3e56
 MISC metadata.xml 443 BLAKE2B e04fea3c6771b010c3220bf5e6d2c3d5ef61a99a1f89ce6f1bd220f41c7e2aff1f58a8e93cc30a69e8d638cf5d4c4b6ec254f02541f8de91b09f124cdffd758a SHA512 afd79db4a927e251c94096ca6cb2a6a7fd34abb693b685843b7bbeb0c379ff82feb87ea1ee773ea5939e761cbc4d22f2e61710d286110ed27579316d52df229d
diff --git a/dev-python/python-twitter/python-twitter-3.3.ebuild b/dev-python/python-twitter/python-twitter-3.3.ebuild
index 9e1560a537ff..a317ab9ac6c2 100644
--- a/dev-python/python-twitter/python-twitter-3.3.ebuild
+++ b/dev-python/python-twitter/python-twitter-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-twitter/python-twitter-3.4.2.ebuild b/dev-python/python-twitter/python-twitter-3.4.2.ebuild
index da36830fd41e..5e9c145f8a19 100644
--- a/dev-python/python-twitter/python-twitter-3.4.2.ebuild
+++ b/dev-python/python-twitter/python-twitter-3.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-uinput/Manifest b/dev-python/python-uinput/Manifest
index 7cfa2fc2d2c9..7bacf0bd06ed 100644
--- a/dev-python/python-uinput/Manifest
+++ b/dev-python/python-uinput/Manifest
@@ -1,3 +1,3 @@
 DIST python-uinput-0.10.2.tar.gz 21736 BLAKE2B 789d0b2065fc61f734b1f8ac12a6bce68c9776231c13a73a79d535092cc65229b27f3f84b5bc28a6bf4bd48adfc00cc5c7ec92c0ebf2ae827b89e0fc26ec2bf6 SHA512 0009e3c3f82c5a5da61e9adf17d77a2efb9223f02324a4f7c7033b165d5e4e395566c34ccb11ef54cc4ce1623b1432a144614cbae7a88e9c06824b15ef00e1b7
-EBUILD python-uinput-0.10.2.ebuild 518 BLAKE2B 6c3a968ea2e71ed5f06083db5edbd33b6346ac6c045800f82189eb37a2421c2a8e289f0b87dd28cff8dd4d6f811dac67943379d2f8bd142de3e6ba2251121a74 SHA512 c8fd6280b82bd1e417ac95467b567f9b67cc956133e886e5da9b0feaefd35681066651afd18f602f864a077442b3de0fd95912aabc0f1b34f68c217d9055c346
+EBUILD python-uinput-0.10.2.ebuild 510 BLAKE2B 530f29419ffd65d7730e06dc438672aaecb99477f25b07d48abaea10b68f85d45f0bdea2707a2aa448732d076612303f359bb7f57413a6ea7257cc8b7f9eaf2d SHA512 a9b3821b59c02b1b49869a2402b4972aaf2ec815f59ac9297ca72de7e4b76b9185870ac2b6a864cad209349d76bdf6d999e0324fcbf50ba490e420a4f1bf23e1
 MISC metadata.xml 326 BLAKE2B 583f25e22df551db892a18d60ba04753b37c6a188e6bb338a118c02d72b07c37e938504002aafee2d9b3d71d4845ffe2124f94fb2143234b2fb3c400e0f6893d SHA512 f6fbc6b93ca26169abdcbe1ec78a7e216a90ab9aeee1f0195123e4afb74590216ad4179fe22503ee2b0999cdd394287b5908c094453b79b4d1bef3ccc20a8a12
diff --git a/dev-python/python-uinput/python-uinput-0.10.2.ebuild b/dev-python/python-uinput/python-uinput-0.10.2.ebuild
index 6122d347b0ed..2283eac760eb 100644
--- a/dev-python/python-uinput/python-uinput-0.10.2.ebuild
+++ b/dev-python/python-uinput/python-uinput-0.10.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index fb86f49725f8..c4b273f33eb2 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,4 +1,4 @@
 AUX python-utils-2.3.0-pytest-runner.patch 461 BLAKE2B 245e0a6a4c76a4286616e0ad1115a718b482de4945d0321eb9b008699df1ff518b0ad7e6e2f9c5ee743fcdb283bac3dba73423b889a8b62951e004433f343894 SHA512 6ec873a2492166ba7d592ceea96e3ccf5851ae88c7577fded1803ad2ef49bead549cbbcdaedc5a8565228c7cf885736ed402b85ee0890f61e91891debbd14c2e
 DIST python-utils-2.3.0.tar.gz 19384 BLAKE2B 1746deadc8dbaf49a6499fe9c79d25c2b5cfea68e2d1b7ab6f88aa72807eedcdb338058e24a7822c6360dea36f1a044145572443c57f43f4cfed765a76e48f0b SHA512 482ccf9c635a0cbe603b69488a364d9033f8b7fada279d901725b5bf91ac13b1cd4a6b7e8d5834a9355d97d8b0803397d5e13da2b7ba72f8d8e2f7f39fee027a
-EBUILD python-utils-2.3.0.ebuild 853 BLAKE2B 6fc6381d8f1e039965f621bfc090e9a08a710d752893ecfcbc03100b9b96f9531297da5c8eade01719e07baf00223ce72c4c547c9a49499fd059deab3eb7fc0f SHA512 f55de8a922fb2b772035939ebfa0754cd93995c8ae96c08d31e06759263874c164e31de63741a9576a43a7701467ae5f933963a54a1479263b1f33ee054e355e
+EBUILD python-utils-2.3.0.ebuild 846 BLAKE2B 317bfefd767ad98d4c5505d759e175e773f4a982debcc7ecb895cb42f11fd8c0acd07fd121ea048f622203c054190745b6fa413e289c5ad6258a1b8ff91d1b82 SHA512 c1d52ecc3dbe35ede39bc47324868e31efaab2704af7bf419494a2b71d960b5a3225b5984bf19cd022a5dd7e33fc146aa7d603134f802564c9387adcf39df48b
 MISC metadata.xml 321 BLAKE2B 7baf4b7d0dbc6064c0588cae9708d10df7d571cf178f6156124938d4786a6560263e9862d23d53bfd17f6e098f58dc24188a9b02642765dbe4aa9d1628a78c66 SHA512 3073d2409eeb35e53d4f55a774ff737496ee360204832c17e178a2d8d0288416cf09fef68ae66bcf5f66a30f6644b364721b402e9bcedf7bb4f1663f302641cf
diff --git a/dev-python/python-utils/python-utils-2.3.0.ebuild b/dev-python/python-utils/python-utils-2.3.0.ebuild
index 9aa6daa7f23c..39ce863e72a6 100644
--- a/dev-python/python-utils/python-utils-2.3.0.ebuild
+++ b/dev-python/python-utils/python-utils-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3)
 PATCHES=( "${FILESDIR}"/${P}-pytest-runner.patch )
 
 inherit distutils-r1
diff --git a/dev-python/python-varlink/Manifest b/dev-python/python-varlink/Manifest
index 4620b14c1034..e2dc304f8070 100644
--- a/dev-python/python-varlink/Manifest
+++ b/dev-python/python-varlink/Manifest
@@ -1,3 +1,3 @@
 DIST python-varlink-29.0.2.tar.gz 34254 BLAKE2B f0970c3395872ba10bdc3a1f26942a17a75944a5139f731bb1f481016ff73473aec7d7b6103f127d63dc93394fc53b56d036293d6c8b5d2bc708effb6efdd1c9 SHA512 c6e77b3179c6dac2a90becf92ba651b007ada2bd79caab63521a5732cf524118f927ef85aab9df3a27d2c0f66b1ba2c31cd76399266d31ab28f39c3392481108
-EBUILD python-varlink-29.0.2.ebuild 638 BLAKE2B 8db615a3a1f290d4a8f9b172bc3a70b383b7ad45330e6612866b689a28df6bdcc61a980225f1189575b7895ef6d6101f1dae9779b21598fb27a0734ea261b119 SHA512 9dab4894c24f4c724a6ff43bacb7aabe77c8b2ac74e2feee5db1db028fc73f45a804eea657a97d826b73dbb73b1de54fdf2179f0ed88a6849c0eda6f1487000a
+EBUILD python-varlink-29.0.2.ebuild 636 BLAKE2B ef15e247c9ba1774159bf3c837eb0323aa2c6fd2a3b40d93610f3c77bb4fbe1882aac808ef9eca0abd612ce9d9a35717855118a6486cd5a46689209bbd167d48 SHA512 6f755b3b42e354075b94df718457849dca09303f3c6825bc6197178fe74d1d593708c6e37882be7891427a60025ac2cb2b83e6c0772510fc5126eb62921cd393
 MISC metadata.xml 368 BLAKE2B 4af59ab1c33a904380f1c2cebd76618b9286ac076024008bf60961eda1a4895fab7c577fe8ae342238ad65d26cb21ba8e76ad9752e76313ca9e0460fd7b04a95 SHA512 3aa1f68a1ec8a06b0506e3b9500095c18b892225906ee57318182a1590e494c404d5ccde60af935e742683374fdf7a1a1db1c5746debd5be5af94bc940038388
diff --git a/dev-python/python-varlink/python-varlink-29.0.2.ebuild b/dev-python/python-varlink/python-varlink-29.0.2.ebuild
index 27d0103eec75..54f9a2f223e5 100644
--- a/dev-python/python-varlink/python-varlink-29.0.2.ebuild
+++ b/dev-python/python-varlink/python-varlink-29.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 3e1524caac95..13ad4af743aa 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -2,8 +2,8 @@ AUX defs 273 BLAKE2B 5e1883f4d09a438b14d11ecb943b1f9ac9d9d0cdbc10bab7dfeb7ad19ad
 DIST python-xlib-0.15rc1.tar.gz 188750 BLAKE2B e35a1904975a6f5bbeb5ab5215f8ffaf87052b51a649c1c25455ef8039d5643e51195a801024b3717df930c486a126f0a055822b15b2f01d207b6a17fe01d5ba SHA512 e27f56e0d76fac534e6754b1e64316636b49859eb6c9ceef5952c8b42cf53bc798a705fa54c283c896324d9a23778beec583cb62984a6a43b024643a70f3fe3a
 DIST python-xlib-0.19.tar.bz2 188359 BLAKE2B ce7555b05ea84c5b74dcaa8457bfd1d8cd73d2c74e5a5a08e984fbe56ddb1036c26ecf669c67434eac31f7ff4aab723c5fe5672114cfa83f4693eb72835558b6 SHA512 070807eed50ce9a17926c36686dac5c143deff0b687a2967afade1a2f776d42ffbea0bbfad3a7480118ba7b1cf5ac0bb64978fdd3ca125c1df651af456dba5be
 DIST python-xlib-0.23.tar.bz2 172744 BLAKE2B 81ded38baaa93da53ffede91f8b0579328e3cdae35b8a3436b8e0651d54c03f4972f3af621e3e17023fa50e57ce90d62cda7b59e459e0d883c8264a513c7d09a SHA512 5e97000e59459cc0e8f21f9c9ee525a064b316e1cbd6d1a5bdaed9edb178ffd124216c27b4a9f365471416e2548b4f7947bf1ebc9f75fe0c2266f37e7134a6c1
-EBUILD python-xlib-0.15_rc1-r2.ebuild 918 BLAKE2B 7584d60ff1a1dbdb638335c778fd599d8bdd1b30886e1cb42324631bea98766ac2a953faefe7abb60643a252dcf1c44c0bbf408cf14d80e1f489044600a858b5 SHA512 c18ff04b4aab7892dd16303bb302f5ff08c6d026ae2e9133007050b3bde17faf35915d0762479856be801a3ff87a90e39f546a3300489da6375112cc62a71056
-EBUILD python-xlib-0.19.ebuild 1069 BLAKE2B b7e881e1a6a38d06ba6ed00c99dbd9b154ab024c94eed1efe5fbe09814569d79bc1f69f1ff4fff9e7a9fdfeed538c25c686615a7eb99da48350f8f889f6f460a SHA512 f0b3fd29dac47d2579131c1d4457813421932dbdf6b05cd3114ef84b115aaed302a672345f81dbec078b9236359b518171c997617fff674430e711fa2c009b87
-EBUILD python-xlib-0.23-r1.ebuild 940 BLAKE2B 22d82e10799d5536e4f0fc432148907fe032e3d889e1e1e0fd991a2cc073a34fe2b03cf50b918395425812fdc7816838f798030b111e58f8578d57488d0d2d1f SHA512 3183c2d591adf9a218c0f24777116b03abed1159ae16170ad28aed2dee3ac7185f15bee4cd9c35ca75c391b43320b1c14b697e45ab66b96235d6ec5b2e33288e
-EBUILD python-xlib-0.23.ebuild 938 BLAKE2B 0f80b6111030b9dea094a8d139d865ceab24d824aeacd2d7650cb38a307d2a1915681faa8a63242f858c28a46b6f90fe6e50af38c7d2640595a79e40f4d2383e SHA512 efd273408a70a0b178cb7803953a9d9cdbd1b8a2312c0e3a885a70cb660ffcd5f292899007a6da2e463216754ecb343a1c35f1468ac2a1a0f3b240c1fa2dd393
+EBUILD python-xlib-0.15_rc1-r2.ebuild 910 BLAKE2B c5c697fb808dbb54f71fc8f968c5787bc538d3f3b87d7de84dd2d5ce00ea3f301ab25f9f869db9d12df57308a0df45e183c22f4107422831393dc5d5e1227548 SHA512 69cfb63dafa449c02e9aff8ee4ff962dbe52af72788b83d56b19f2ee10d9ccb0623effd4074db3ba60c085aa11e2e41e5bc7c8a1bc7a1b38bf34c7762e1730de
+EBUILD python-xlib-0.19.ebuild 1060 BLAKE2B f1296058ff70b80d7c6ffdce6818beb94998aaca1f42e16ba8fc8da17113cbec03079afc06ffb7c190bbf93ca0550319cfd6b495fcccdb88c02bd9ded26bafd2 SHA512 f10946db46ae1ad6a705b7498ca1d35aff8ce4a994fc524c075da392dc4662958a8b0e6731481c699b0a42358d8354011c7aa1653756b5457efc920029a487da
+EBUILD python-xlib-0.23-r1.ebuild 933 BLAKE2B de6b586df14a53eec123b17eb622de1e101915f545523b55660fdfc477cd081063825cdfd384a0c448174035859de061962d2672be5616c7f983924c4414ba1c SHA512 cd7bac717034a4f3e66d5fe6fa0f9113d7051879ea4d25d214356fc995eef5fa89e045f7c0e5f887e5489e73af9653ef46c4f73b8a63d2c1225b16fcdfe3fca5
+EBUILD python-xlib-0.23.ebuild 929 BLAKE2B bf0d8cd3453650c80c228cd36b7a051f8c3efc014cec2de6706d892004b4160e38b0c6cd2b691f80ed7f959a2280cf3ddd086b6d24d6849418dfd48e20bd26e2 SHA512 1fa9c12e4579f57b81d9742519585ce24d2c15b565f30d4c24fad20957ee9a2c0d3123909796ce8156267ec06b9e57e21eaaa7a228967e1a46929442fd31a2f4
 MISC metadata.xml 384 BLAKE2B 625028de31c0d62262d9b7bfda98f2978ee17e9c52890086e6d68bfe23810f8729e03814666d3ffc2a8118813740a94bdef706a391ab908444f1475723a3c319 SHA512 43a2e7161edf8d2a527f35cbc8e590655df487f699e570dc542ab0b3f25b4c577599fa43a09efb4f8f3f67bd6a964acc8b446aa810ffbb2ea7f6dc9ab0f2ebd4
diff --git a/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild b/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
index f004f5d31e65..3c77f997b4ac 100644
--- a/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-xlib/python-xlib-0.19.ebuild b/dev-python/python-xlib/python-xlib-0.19.ebuild
index fd56ed1ddb77..463754e79620 100644
--- a/dev-python/python-xlib/python-xlib-0.19.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-xlib/python-xlib-0.23-r1.ebuild b/dev-python/python-xlib/python-xlib-0.23-r1.ebuild
index afca44d666ab..bbc92c151cf4 100644
--- a/dev-python/python-xlib/python-xlib-0.23-r1.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.23-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/python-xlib/python-xlib-0.23.ebuild b/dev-python/python-xlib/python-xlib-0.23.ebuild
index bbde34a77d78..873077481d53 100644
--- a/dev-python/python-xlib/python-xlib-0.23.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
new file mode 100644
index 000000000000..4728ddfe41de
--- /dev/null
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -0,0 +1,3 @@
+DIST python-xmp-toolkit-2.0.1.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
+EBUILD python-xmp-toolkit-2.0.1.ebuild 1029 BLAKE2B 6b568a00089ed3f08aea02480cd664edfe254e0e5f0add9ae537c93bfda20e2faf99195fb4bc3da6936d8da028c811dc8aba87d23bab3b1dc2a71546902cf2b4 SHA512 91b11049fa51026df8429303fe33d050b571321a9a7b6bea1ead5a21b80e19b75a452fdfb6c7ccd1db86c600a9d2f5db645462381c887923914e50956366bac2
+MISC metadata.xml 416 BLAKE2B 5ef9300ed19a8ed256dd6c6958c2350526d5946893c3346cc17550d15754030315cdae84355872f64e09e890a4dd2da5742f8ded5945e3d4fec2f569cad075ac SHA512 64943f03cf1585d994471560ab50e7f2cfb7c7b2f234fa38b6dcbae004987741f4f2faaa728c2570fdc7b776140d68c0437960118ffb3067b03a67de90656935
diff --git a/dev-python/python-xmp-toolkit/metadata.xml b/dev-python/python-xmp-toolkit/metadata.xml
new file mode 100644
index 000000000000..b8fb5e9d7f1c
--- /dev/null
+++ b/dev-python/python-xmp-toolkit/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-xmp-toolkit</remote-id>
+    <remote-id type="github">python-xmp-toolkit/python-xmp-toolkit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1.ebuild
new file mode 100644
index 000000000000..7676128f1302
--- /dev/null
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 distutils-r1
+	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
+else
+	inherit distutils-r1
+	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Library for working with XMP metadata"
+HOMEPAGE="https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		media-libs/exempi )"
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-zaqarclient/Manifest b/dev-python/python-zaqarclient/Manifest
index 5e9936dbad5f..1a784798bf5f 100644
--- a/dev-python/python-zaqarclient/Manifest
+++ b/dev-python/python-zaqarclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-zaqarclient-1.11.0.tar.gz 85724 BLAKE2B 84e34998a76bd475b3aad2882f076f8ca89dcfc1a24155d0e88269fda3d82d4b1348461d1f59a5f21726dbc56b37219d9e75957737452e759672505a1f16a4c9 SHA512 4b57cd336a6517760d32a5e01a7c87a9ee0526323a222faa6fcd6e33a506b0746d6418e9eee3fa00e7ba4a01912ee108fe1feb3469e0a14089cc760a0756b7fb
 DIST python-zaqarclient-1.2.0.tar.gz 66649 BLAKE2B b1fc054661562b861c39344c73abc8c85fd585b47099a8625ed2a4862997693b793c77698c6147da44affda12cd17d529b5b028d867d5b74400bd7dde13ef4e1 SHA512 1590839460815daa1f0754d47ef789e0c2d2a078265bbb6595eac32114a36c5f15512a2781841955fe99cbdf2cdaa8a13061f535229a284f5b98f97d017dd8a2
-EBUILD python-zaqarclient-1.11.0.ebuild 1209 BLAKE2B 3a7ac912ec98359ecf6b935c775b75384a5f73796bb0845628b706247d6219fccbce940869e1cb7b4fc23c16357fd4a9532f1d7d02908926e683c4c7d6eb935b SHA512 7fe3425ef51827657ed6c94eaa7ef0448f2199088728824af860dcb7b6758ea6ccbf2e9c25645f7a3112c5751e50a0f1317c2d602c9db1c2ed4453dfb47e2979
-EBUILD python-zaqarclient-1.2.0.ebuild 1231 BLAKE2B 3f98d1a5e0da71b62d362b1d5619a58c88d1221e4830ec564cb44e4924defbbbc2fd211c6102570bffccbd513b2437aabac6dacb0f9d06749e7e8984c5e9dcc8 SHA512 2c0b856cfe3c72cf25a81c3c8d082579093880cd882c455f61bdce1eebd87885b5502e5df405d887efb87ed769074ae766ad509a134b9a4e853223a60f5bcf16
+EBUILD python-zaqarclient-1.11.0.ebuild 1197 BLAKE2B 950d06f78eb5510df2958478b706fa5c7e45b8c0ae13ebba441ba713f12390c2a3ab5730a0b3b40399ee518d495630c49e59fca40d14f38434b202168d9dbc7d SHA512 24089a1cb53adf8feb4c0d81a0457bf468576d72fb51519aba6e69d450e28684ab8274e1a780a7d3c18ff773126afcca41946a6124e3ff8b859d26bddf57ea67
+EBUILD python-zaqarclient-1.2.0.ebuild 1217 BLAKE2B 434c7d88cee1f01326547d1bc22d234b2978dc2b0ae155c5728439520726635854dbfb27ee6684093dae123f2bc723f67b99c30a2e32f0563c3ca3234a0dbdd0 SHA512 108a2515ca976e5d3515fc3ca24429fcd59119de650dcb650dd68b9f11e66b4c39107ce7cf276099d67760921747523014a292d137197e530c42dc9df06b2dad
 MISC metadata.xml 607 BLAKE2B 28721f37ce75146475891a79e765fc5ebc12f2e4067b259328fd63fc6aabb16d328d720c2e31cfe538841a638f15e63f141b35a930495e132470cdc0a3777a63 SHA512 73cd47155606b208b2ba83664732ec7fda229f075a86837bae68344bb3fbc10756a049a1f83815f65346d93fbee7a30b629c6769646da2385afab6237173038e
diff --git a/dev-python/python-zaqarclient/python-zaqarclient-1.11.0.ebuild b/dev-python/python-zaqarclient/python-zaqarclient-1.11.0.ebuild
index 88534f6f23d1..9562e9703a1c 100644
--- a/dev-python/python-zaqarclient/python-zaqarclient-1.11.0.ebuild
+++ b/dev-python/python-zaqarclient/python-zaqarclient-1.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-zaqarclient/python-zaqarclient-1.2.0.ebuild b/dev-python/python-zaqarclient/python-zaqarclient-1.2.0.ebuild
index f8f15737a346..f565f9a353f5 100644
--- a/dev-python/python-zaqarclient/python-zaqarclient-1.2.0.ebuild
+++ b/dev-python/python-zaqarclient/python-zaqarclient-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-zipstream/Manifest b/dev-python/python-zipstream/Manifest
index f9ac12f3e4fb..e4bd084ee569 100644
--- a/dev-python/python-zipstream/Manifest
+++ b/dev-python/python-zipstream/Manifest
@@ -1,3 +1,3 @@
 DIST python-zipstream-1.1.4.tar.gz 21376 BLAKE2B 84b022f93dedfb46da911c3ed800c3a6eb3685bf9c6180b9aac5d4d085748216f53759f83a085fa57f245033281aa4be1578b4051e8a855bcd2300aed7820460 SHA512 722c1d7db91dc47064fc51f1182417f46923b8f42a56e854f1fa125eaccfc7f86d3deab71709226a798a1caf5a84a8a7fa7d3564065ab91afbad434ed787ce32
-EBUILD python-zipstream-1.1.4.ebuild 608 BLAKE2B 5f7f96d81553020d2efddb1101bae9f5e58724bd058e4c325b0796aab33fe92e30130b1d15f361cc1d7b7298e2b43fa8b3d3b9d819452e85886f0dff93436be6 SHA512 27422998b8aaa678b6cf289baed6db17168418d8019d56ecb6592ebee28ecf8e3ab5cb4344fc0106eb42dcd41afda5545dbd1ee5c0b71f9355334b11a3b6333e
+EBUILD python-zipstream-1.1.4.ebuild 606 BLAKE2B de16f0092ea6f946c7d4d4583b899394636f2a6ebb8a19fdd1ebbee6fd0532c0ebc9287f5c6ff9d0d19ec20c19a00eefd9fee1223388bc5d572f47d6006ce63e SHA512 8781b7540b40326a27ed337e354f5f3dd15711e0bfabadef458ee20b95cfdc11cad128d152f682e374120a83fa64823661c84b969364d3a0f544c5bb43442843
 MISC metadata.xml 381 BLAKE2B 04230c4955e69e38535767e64a3bddd5e9732f248e79eb4ca0f12752a8a1e717786866512727f407cb1b7b07d9b954ddedb3c01d5704c99496f4e006cc986c23 SHA512 e08bcfff6419f5fb2ca82c62f3d3280dfebc5dee392b4c63b82ca0ab15c2767e3ac35779b73ec3512c8d822abe94956ca435454f8191a65d52ae8c49d13e6745
diff --git a/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild b/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
index df1327996cba..ac85e75a8aac 100644
--- a/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
+++ b/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
index 8febae17d5f5..4f8b9d8daa9d 100644
--- a/dev-python/python-zunclient/Manifest
+++ b/dev-python/python-zunclient/Manifest
@@ -1,7 +1,7 @@
 DIST python-zunclient-1.1.0.tar.gz 93906 BLAKE2B 7be9dc27b074e60ff5df37c406b96f3482e1737f338de01d3bcf5e46ba404da71b6e803aafc981f92dee416b764bfc2588652a61440258d0b155ecc7a3bfba40 SHA512 4a419ccebd7b0f924d549776c96d04cff5ff4507d9ab9c5c6a3aa71adeaffeba686ca28043726c96979760ea9670d86d973810543609fc783d401b23cae1fa2a
 DIST python-zunclient-2.1.0.tar.gz 99821 BLAKE2B 0784c5b47ac7bc1d9764e856173554f1cf37eb698e7a8f97d1e656de1c098374dc3e25fbcb1dd9ac5ffc223d18c6615a222bdfee0357cc8a109a67f9d8e79ff9 SHA512 b1d9f16b0ef83bae1d362edeaa83920259e604acb1e22619893597bdc2b7efd9ed7457f5f3deb53665ea69af36e6fdea9c68178ff2abd16e12ab73a2db781b12
 DIST python-zunclient-3.3.0.tar.gz 112986 BLAKE2B 4e605144b19e938c3d4fe556d647c6e6e112ab3419961318a3f711ac0e29d87f3fea5d5a1f16c836e669ee1dfab78f3d8039e0e829038e213d06a657743066c8 SHA512 1d3be57a673359efbabde71e34a3e5e7b0778d60d8f469273f087ad5927040258bf4dca264ced64d6a4236f05cde51fdca0f644a0dad4ba3af5d333dbaccd5fc
-EBUILD python-zunclient-1.1.0.ebuild 1108 BLAKE2B 92bca42c515930e85a2b20e788df6920a8e4101b66e7d9f9aab9e4ee3448091dfbf97fe2221a57f2ed0e6efdd0c7f6821678916ef9cdd7be8b0ad010a62aba04 SHA512 0ea222613ba1bbd577b85c0d24b970ac8885da07eeac6271c2a156357a53db94b43aa9da1bf271b21c2166353e170e9cfc4408f938deb9883c6f44c3d00e4b16
-EBUILD python-zunclient-2.1.0.ebuild 1101 BLAKE2B 2c8917305db22cf42bfcea00c7ee0cf03378c3f5564637c2dc33dd010a55f202d494577eecb424bfbbcdb6c26ac8c991421f9897682f7d8dfc7414511f681809 SHA512 3c5548b18e156d67cefe71a9cdd6f381d8d8b766df86d30545f5d37d3acf9a6a0c595e5cd32752f1aaf7e904641504ed2d1093b6e0f8e341aa149c54ccba11ff
-EBUILD python-zunclient-3.3.0.ebuild 1103 BLAKE2B 2b328c15b0fce2e1292ca9f2e55f427d68467f6a6ff0f5b31b65ecb2ba17c4919fe524a8520b3d7a6cd5836a7641c5603185b7f66b409ade8effda22c6d57693 SHA512 f94ff91ea0db2c6cfb455f91c29f5aa6f6a47e1ff5d34a90360c21a7e837c94b28e04fd715cedd1a019633f9d9a62e7c465172419c6c76c8832b8a7502f3b2a1
+EBUILD python-zunclient-1.1.0.ebuild 1094 BLAKE2B 540512e1d5de144e914e2d98f7c34ad63a64c55a2060703b240aeb029cef4c0257d6f4e027555155ec64fd0ccbd32aa8a68534cdad2ddec2c916d842f6d85601 SHA512 be5d98ad4bce2676ec3bbeab19f80e32a54eb3c6c9e0cb28783f376c3a8aedb30164baf1906c7d9d69f5b6ed04b45e57af14c34e6d027094d9edb78ea541f42e
+EBUILD python-zunclient-2.1.0.ebuild 1087 BLAKE2B 64d335186347af71a07eb43a0291bcd8a1120968c49a3ed69cdfa87e0f2319ee27ebd813fc9bb80ed7a04cfecae23f018b418a5b318b58e57affdc88f6607cec SHA512 2ee0666b7fc023384cf1bf5946046425bc76ac624b40ac5f13438ceed0345581b523e0b6f9cd08c351ab6e40d0c2548c2ff99b74f03f16c85800e9c70440f23e
+EBUILD python-zunclient-3.3.0.ebuild 1091 BLAKE2B 7a2b16f262b35d3fd18555681a14a5c7b86f03f5a09b1cc31dfaa1173f44476d77efc2d58bc15aced718993a1b168d1ff3909ee283c176b3eb3d8b5c56a518a2 SHA512 a31eabc7ddbc8b7f6d92bbd3c78734277db59f20301cc6d8d512bc953d6db772e4c44ff0b628ec1f304c2a3ddc0b793660efb2fb7dfcf53c43198366b232476e
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-zunclient/python-zunclient-1.1.0.ebuild b/dev-python/python-zunclient/python-zunclient-1.1.0.ebuild
index 46a92b8b9516..ffa87330c628 100644
--- a/dev-python/python-zunclient/python-zunclient-1.1.0.ebuild
+++ b/dev-python/python-zunclient/python-zunclient-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A client for the OpenStack Zun API"
diff --git a/dev-python/python-zunclient/python-zunclient-2.1.0.ebuild b/dev-python/python-zunclient/python-zunclient-2.1.0.ebuild
index ff9d0db4c832..83948b75a1ca 100644
--- a/dev-python/python-zunclient/python-zunclient-2.1.0.ebuild
+++ b/dev-python/python-zunclient/python-zunclient-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A client for the OpenStack Zun API"
diff --git a/dev-python/python-zunclient/python-zunclient-3.3.0.ebuild b/dev-python/python-zunclient/python-zunclient-3.3.0.ebuild
index c3928b71157a..18ae2b86aa17 100644
--- a/dev-python/python-zunclient/python-zunclient-3.3.0.ebuild
+++ b/dev-python/python-zunclient/python-zunclient-3.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index 790cbc2ba577..0483f071b9e7 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,3 +1,3 @@
 DIST python3-lxc-3.0.2.tar.gz 27300 BLAKE2B dc4ba71b156eb0f257bf9d717f07f22afee3d00666601b709341d9091a1a75d237c174f613a93b6ecf7c69b4e6cc75187316e656a02a1d52f0e9970b8f3af6ad SHA512 2fc776decf6248be39f9e8a607a967acf180f3a07e45fadd6be4450f01caa4a854f217dcf7e81e27b5b838c2cea04ef09c8ab8b87c5be5091185bba2eb6b6d23
-EBUILD python3-lxc-3.0.2.ebuild 487 BLAKE2B bae27e4a694208ca3ebbabc9e7a3defdb4206f534009f2b90e7c7fcf38807fa93f6e16f27ffae94ec6b29e2a3a4dcfebf67b543b39ee4fd36c88a2d19d3eda82 SHA512 f60783dba4066631831e55a31d8aacd51c048a8fd533d263460ea9f504556f36eb898f61e81109bfbdab56dd8527d33aa9991704594e5d775651de6da988759d
+EBUILD python3-lxc-3.0.2.ebuild 485 BLAKE2B 5e8c8c56da9081c123cff19355c1e23390d1908eeb66485d909e06bd27b0469c8d993d4f04cb53b8db9e062169416ec70a97126749ccd0701189b2782c72c3e2 SHA512 94f0bf430ceb49e5de3fbbec843340ddc182637697a06c8e5c8daa5e1357e65d18f3f21a39e3ed286301655456c95d28a1bb77c61e19f5a6a78d3496c4f778c3
 MISC metadata.xml 361 BLAKE2B ac875639b7fd2af373b46fa94f9d89755785417ab97ad2b89c3d795aae4d64516fa03c4d65d0872cb1f8b78e320f53dd71995b2a8a97f14420ecc6f8b0feeeb0 SHA512 8930d025f9924645eaf87661d863f6a049aa15fd9f965dc0ed483f77c37354f0fa075d00b19677bdb038bc122311ebb890d321453e0073e106554fa02aa3a589
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
index f24647ca3608..eb00eef10ae6 100644
--- a/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
+++ b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index 58b308167f7a..02bc1515dfb7 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,4 +1,4 @@
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1349 BLAKE2B 7d4a7ba74bbde43301eaccd5245d98fb887a3435121ed21f74aa5ad15c36e769f91fd4c45f189dae4be0fd4fc79d6730ab4f33c048a30a6421d28647071f7dd8 SHA512 b704a5b509804dd16e98eb39e551c7556ef55b905e9ca7940128222243a50ebef37c4785e49bd201151f85e0de2b19407258797943fdff2e903ce9d9e734c2cb
-EBUILD python_orocos_kdl-9999.ebuild 1349 BLAKE2B 7d4a7ba74bbde43301eaccd5245d98fb887a3435121ed21f74aa5ad15c36e769f91fd4c45f189dae4be0fd4fc79d6730ab4f33c048a30a6421d28647071f7dd8 SHA512 b704a5b509804dd16e98eb39e551c7556ef55b905e9ca7940128222243a50ebef37c4785e49bd201151f85e0de2b19407258797943fdff2e903ce9d9e734c2cb
+EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1345 BLAKE2B bea342eb7ee7ff8bdf394e7a4c5b3edf7350d77fe485047068e5b1c0b34dc20d9f0ccfb006757f4327894e937942639dc789d14063ad897b7e8546a76a80ab55 SHA512 1b6148906ca6bfd0601bf11dbb91255fee4548c4bbcef408a6f7dc1a11620bf8c877fb1060a13eda973cc84f194b39ef66ee75b36aee9763522da20ced1d590d
+EBUILD python_orocos_kdl-9999.ebuild 1345 BLAKE2B bea342eb7ee7ff8bdf394e7a4c5b3edf7350d77fe485047068e5b1c0b34dc20d9f0ccfb006757f4327894e937942639dc789d14063ad897b7e8546a76a80ab55 SHA512 1b6148906ca6bfd0601bf11dbb91255fee4548c4bbcef408a6f7dc1a11620bf8c877fb1060a13eda973cc84f194b39ef66ee75b36aee9763522da20ced1d590d
 MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
index 34c5ea2a130e..25bb636d7d74 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 34c5ea2a130e..25bb636d7d74 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index f156b1d40515..c5c9a5d0b669 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -2,8 +2,8 @@ DIST python2-pythondialog-3.3.0.tar.gz 1906527 BLAKE2B 67fbb2dbd2b9c5f5da4c74f53
 DIST python2-pythondialog-3.4.0.tar.gz 1487867 BLAKE2B 795af99391e7a3d5e9b0657116dba8fd85819261a9ac590e797d0144577d66261529515cf8421a4724b6eacd0b6c7ae20d030bc7eb22c56ef870294c6f2386d3 SHA512 f4ec3e3eeab9ee00146b4604a8f72c765fcc164a24def0f1a9cbf083123e55dbe371ce6d4790ad4c0b5ee6905a1877f9b8e90ca3443a780fa0965c9bcf4bf629
 DIST python3-pythondialog-3.3.0.tar.bz2 1827891 BLAKE2B ef78832972cc2417ecedc797cb95ea10b1fcca4ff1ab2f7db74a9afaefddeedfee8303f2f4b9ff7230f3d2eea305e359f3854112abaefa2a4adf4c801de7ffe0 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f
 DIST python3-pythondialog-3.4.0.tar.bz2 1415324 BLAKE2B 1135df25b988dfaacd45a68dd918409e001719f92436e9e88fcf1a66e9ba70f03fdef1b86ebb80ca6a1c02006353ed3f9df998a5bfaacb9505d6e8a96a37d5d9 SHA512 a810128459133c4e416f4b04b8dd98b2230f046b8762e6b29c4e02e1458fa96029d37137a71cc01aee292106867a6f30026941ed1f727b7e48cbe976d96d7ed4
-EBUILD pythondialog-3.3.0-r200.ebuild 969 BLAKE2B 7f7c43fadf1ebb8626bff6d0123bbf9ec0b61a94de7d20c9a88da273ae328ed96ea9a80b91bc46b1894e8139c4533af4990b1555785157898b2477d4a0ea4c5e SHA512 7d974f0c872bd37f0e8f4720ecaed58526dd1a7d1e75ebba4118fe5b0a3606fcded45fa231940aa01a22f45d54b59f045335027cd64dda0a2bc7f0cf82e85765
-EBUILD pythondialog-3.3.0.ebuild 888 BLAKE2B 7d1a5345dd7baacf34203cbf86c5cc9f68f884e1ef6a9132209c6a81ba0aa75b969d3ee1cfaea2aee492ea7f6121549974aad0bdd524b53b36f8ae135d634238 SHA512 9b1d0efaf4ac52f7ca15372fa204ccfe65198c7c01ed6b3f6138b52c28c36b09c07d23ff10fd9d4d20575dad0c847618752a6e7d1b5015e6c844dec24f247ece
-EBUILD pythondialog-3.4.0-r200.ebuild 960 BLAKE2B 06a8394d7a6e15da2dc14366809b69d6e63265bc05b76a3fbc61a03fe164e2989097af29bfc7d67d6257c46c0801e9d6e235986aa21d4d92a0b800af35e5965c SHA512 e8516de81909af2f15d10896f5916b31cb634c745233bb51bff469be39774b9920c1412cc67c2974b0351cc0b491cc0fac5216f9ca2df524f24f5c676a56b6a7
-EBUILD pythondialog-3.4.0.ebuild 883 BLAKE2B eb1385fed34079440cd5427b39bca9f4a80311751feaafb4bfdf6092774adeba3785038eff65c4e28a19a0f34e59324edffb5628af4475febbf9f557e3100c96 SHA512 367fefda2da3fe6dab80987c912212d3cd75e4798006c678a8b3ec20a8d0babb85019ae1f70c44b38872c658bece83eb5e4f8e7a6f2458d2552d3fb21b5999e2
+EBUILD pythondialog-3.3.0-r200.ebuild 961 BLAKE2B 2d684342f5b3ab054680c5d8b47275d60eac52c6f7dc98daf3698be83f0362d97a50e7ecf2fec6e30c665babcf2956a3d519513879ae0b41467f61c7c0060884 SHA512 d6354568e8954d4ba430df9da5c634a6e5ad7918f1fd34bde8b511b9ccc4e44f037b8f29f8fc94e7a574b4f0d1acef37bd88d8600a352e3365caa600c34ecf45
+EBUILD pythondialog-3.3.0.ebuild 884 BLAKE2B ad059227d7e17011b4388f94cc2234d04ff3b7e9a868da43a74a493b988c6a4087305603f0fcdbbe50a1742b81f46f2c962ad87429c3832141cd491538a9b12e SHA512 ae632e02ab5f5751332ba84236a62e6472dd45f82127649f47f790a9dba182e7c7842f25fe5ca0d5e1ca5986b0c2aa988fd3ab9775849e2f986b90bdf7eacda8
+EBUILD pythondialog-3.4.0-r200.ebuild 952 BLAKE2B 4146f6224137fe1bad5ec24e15d7719c4f55d7f9cca4b12958382651d69c7f4e958d5f5858f1f56d423e6878973bc68fefdb59e4fcde3b4cb84a62d942d80820 SHA512 bea775822f922e4ed3f6bf0863d67b7f0cd1a6c1c4d6f3de5d409ad7d9a10cbd3cde09dfeb6f571b08d8a362f96a23b990ff80686ad5a24e928591e1747e8dc3
+EBUILD pythondialog-3.4.0.ebuild 879 BLAKE2B 2112737b5b94b3e9ac314d3d5c7462c2a6d8f5d334d67e199a9fd32ec67d9afb42cb71aa14d7c9ebdc41f7dee2aead9fbedd804bd15d1f51648d261e5bd4b05b SHA512 11f89132719bbb5423d4b6915c9068bee0411891777bb652affbfd9d39f660f95ef26584ce5ac8c3d1bb7b521566004b2d7dbbc42216c35ef6d09453f5a7df48
 MISC metadata.xml 380 BLAKE2B 184ae9fd2e4ea5b2591d87ad0f5ff4219bf853ed0a71ce7e027bcd9b53ae80c2141fb0674d8fdeb3527c368d75b8a8c84c2ff4bd6e136ad672d97277dda3eb13 SHA512 d806bf2a24b109013cc0dcebbb9bf17a21f0db4fab5a66ac16315c985178de28d0659647d4535123279b2b4ad36f7ee9a9ecf40d2cbb9bb06fbe054a5cfe21c3
diff --git a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
index a3b1330fdccf..ba7858ff7a3c 100644
--- a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pythondialog/pythondialog-3.3.0.ebuild b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
index 92d6d183e682..426bf910580b 100644
--- a/dev-python/pythondialog/pythondialog-3.3.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{5,6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
index 961a39728139..e14a399c3c39 100644
--- a/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pythondialog/pythondialog-3.4.0.ebuild b/dev-python/pythondialog/pythondialog-3.4.0.ebuild
index 48a85514baae..3731822493e3 100644
--- a/dev-python/pythondialog/pythondialog-3.4.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pythonmagick/Manifest b/dev-python/pythonmagick/Manifest
index c4983bce7478..eb7be8982462 100644
--- a/dev-python/pythonmagick/Manifest
+++ b/dev-python/pythonmagick/Manifest
@@ -1,3 +1,3 @@
 DIST PythonMagick-0.9.17.tar.xz 271844 BLAKE2B 92ab2d877332e23c3e869b9e92290e48b2b3d3df107186b0f1b718b2d6b3421b9a27a95f6105856cbc75bfe4ddc3b6abf50b4d2a50a3c81c860e389b797f91ec SHA512 e50e5e0d27f2dc8ccd1b251a0311ecca825423b34e85a257bfce42696c4a285977ffb8bade487fb8a3a4f8cad26d0a41fc067b172b733d0c48e951a27badded7
-EBUILD pythonmagick-0.9.17.ebuild 1256 BLAKE2B fc043b2cd9c333f3eb31db0a8980d8b7b4618fb6a9d9c2c6f4e911d377f0eb4bbf89564f89917f1a63845fceea5b62fda7fdc83477ebfd2532dc9c8ba9e1a8d9 SHA512 e81191e8069547b111c3f8b117fc50c52eb9383c3c43f7865bd99a0bf4bb41706532188e4f6f32598e81279fb6e95f41313ca0beae5153b8124c1bc4cbc9eead
+EBUILD pythonmagick-0.9.17.ebuild 1154 BLAKE2B 59e93c7835ab5ecbc14ae4793fa1663389bd73cfd26911e7282a6ee03922e2fc84bad6ffaa6bf25464688debfefb1840530b09f4c553964abadd7519283f1423 SHA512 e07d3d2159aa6115e02f85e45bfdae066619a22cc295dc067c87aa1a65f010e955514faee433a03cd625bcf27d2347264bb15c0586b7b0c18125f944560cdf0d
 MISC metadata.xml 349 BLAKE2B 3701c88035855f490be6b943b8c778884f20f42803b4539ea8442baf90862c9bfdbc58ac99e3312d811b9defbd4264e39c4da195896d575fd5bef11da204c4ac SHA512 14d5899e6fcd0ade11aec2f92cfce123a9c1093877e340e49baddfbbde0ca2b3052dc77181e4487c19bb3e4ef7391bc0171b5e26b004517f6f26254c73393a58
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild
index 6a86f1f97d02..8df6dff77690 100644
--- a/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit libtool python-r1
 
@@ -37,9 +37,6 @@ src_prepare() {
 
 src_configure() {
 	python_configure() {
-		if ! python_is_python3; then
-			local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-		fi
 		econf \
 			--disable-static \
 			--with-boost-python=boost_python-${EPYTHON#python}
diff --git a/dev-python/pythonz-bd/Manifest b/dev-python/pythonz-bd/Manifest
index 8634735c7f17..7aec7b9c6c11 100644
--- a/dev-python/pythonz-bd/Manifest
+++ b/dev-python/pythonz-bd/Manifest
@@ -1,3 +1,3 @@
 DIST pythonz-bd-1.11.4.tar.gz 86065 BLAKE2B 1b7710129a6c764693cf3092725e78a7f6321ecf1bd0323644f421ee4f1c3c1a1b6defb805fbb137e58001c9869d9fe9d124978d60127a6672bb54903fd2027b SHA512 de945a1a49094eb6f4f1d0a2dbab4d5e73b60eb4a5d5461c4368fd46e05bf97df7177f7bcecfe963600016f9641e4233ace15a2c231f658ed8eeb771ddb51ab7
-EBUILD pythonz-bd-1.11.4.ebuild 655 BLAKE2B 79920198aad8f2da5bdc7d9511ee9b46c95ee69708d6c965f5516b13bbdf754bae07bd7c142076f259be9a1540aa947682316136d7298a547724219dddf9347a SHA512 d3ddc20c5424a45d276beba6e8c24ed0075779dc77fe848ab6e0958801218cc84e30b207ff7203c75666ca976b14bb50c0cbce9ecc80ab9167c6b1b5f40c69d0
+EBUILD pythonz-bd-1.11.4.ebuild 648 BLAKE2B 76b80cde92661b05c0d64d7d5f485cffecce9d5c7c642145885e7013b22971e1409d3e0b41f1f7b8e0a61df22063d818685002c7c28a6f5df0be5d605b824f8f SHA512 be46764acf95544e9cc49d2935af42ffc9f9600a33e6e5e9c0fc86b8fa4022eb0f7d21e94178464ff804c3eb2834699a7b55decad11506e70348e401b99cf97b
 MISC metadata.xml 439 BLAKE2B e9935c2cf2df4194b736a7d1a8ebaf53780289ccc7ebe2d02c0128e0b298c78f920602f25cddf052af016dba1c9218acd98576fe87874c2fc73241ed5f3c036f SHA512 e3d98902122dd0d5f99e139d58ed62f1291a606eb399c0531936d69e72b855a51bc1475998b7910b5773621ff7fd366253ed7e911ffa40ad61fc18c945f006d9
diff --git a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
index 5c06e39da4bf..ed5db348fd53 100644
--- a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
+++ b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 0c52fa7317f4..58ca438e8c96 100644
--- a/dev-python/pytidylib/Manifest
+++ b/dev-python/pytidylib/Manifest
@@ -1,5 +1,5 @@
 DIST pytidylib-0.2.4.tar.gz 86650 BLAKE2B 15212651c83ebbec5b74418f37bfcd0366e9b6cdfc0820953e34ec3142871248df02618a51415a36b84ac8c2e5a12d996ff7301b5bf3a001fb42297df3a98202 SHA512 443e9af0fd458d4f041e3b72415839838a4edc83f8a978e5cc0bdf53202584e269f1ad5df10967d8ae4b98b24dcffcf9f5a54e0e3f6cd620a8a6a20171da0811
 DIST pytidylib-0.3.2.tar.gz 87669 BLAKE2B 57eee794e3a6ba147b778360a12d2417c21579250620854267a83300d918cac0320c768faacb531517b66eed7fd7afc1679e76f2db626f7d7daa80af1667a06d SHA512 24f755ed2607e300711f5a1aee510df3a0a410cc7d8d8f46e065ec8d93c50e436a492cc2831e9d416ab9837497c603f9dc8705da543102813d3264e6de033ca7
-EBUILD pytidylib-0.2.4.ebuild 650 BLAKE2B d717d6d0496527a86381000fa210a668dfd846e925b983dbc77baed979fc6ec92ef3f3368720dda510cd726df018c03b5bcf31ec63223bc36250d9f50233937e SHA512 66ef8f87f96a6c9e136c9b9cf4f2838beb11da5ae4bf715f9da1a9f340fc9a7740828ea5ca2a7cca937a4ee351cec2922069009f469f5a23c9c61b1c8028329f
-EBUILD pytidylib-0.3.2.ebuild 695 BLAKE2B c83159fbc509f54de8b3c86142dd162a17f6ee3930d50689ebdf1b061eff4cc6b535ab371792df56313f151861b106e980125caf0a4e23c8faacea2df965cb8e SHA512 35f41cc3d660cb75772b2c1f052b36929335504944b97b06ade69f1211e29257e0c7944bb85a6533d3025bc4440b1a944ebd8517f9a6a292771d449d4161672b
+EBUILD pytidylib-0.2.4.ebuild 641 BLAKE2B 28a7e11fc3dca3e1256fc6dde2a765892886fcb03422c11b8e855339e5e4e579c42e55547d6fa162631b13e9c22add0712ef5a4519fe123a73230199091acd70 SHA512 0890b82d93fde78fdb9d15cb335b9b7367123cebd9c3b41a26760ecc9239952b5aff55004c6406855dc3ed7ca769c514355ad003df2d89f4dfa20e849eb47bef
+EBUILD pytidylib-0.3.2.ebuild 598 BLAKE2B 2cbd051ad72d46ca63b3da0f7fe36fabc5963529dc77a998ebc3cc45845980ca41f8cdec3dd640f67f88a8e68c876951a013e74745eed70c3508de2351394bfc SHA512 212bfceb2ce3999475daa815ced91a42b1a0acbab5ca1dd4b315939cec83fdffa87cb843b8b7fc3187bf78d1d6ca11ee77b5c9e53fad247669137a643c8d1e86
 MISC metadata.xml 385 BLAKE2B 6c53cf6462d81e85c2a9facf85c0fd7b6c0c870656fdc4cc63bcd67e646d51e14fc9246a7b75a527eccecaf4385677ea63b56dfa04aeab708b41b83c8bc4fcef SHA512 e41d4897a343c45e469fe4cd52a7ce93d525ea208dd570fe0517feda8f445fa9175d971e4c37b8f1941a7cb6931ff6473526ced82384489f02a11c4040fec933
diff --git a/dev-python/pytidylib/pytidylib-0.2.4.ebuild b/dev-python/pytidylib/pytidylib-0.2.4.ebuild
index f353923ffe99..1c38785d28bd 100644
--- a/dev-python/pytidylib/pytidylib-0.2.4.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytidylib/pytidylib-0.3.2.ebuild b/dev-python/pytidylib/pytidylib-0.3.2.ebuild
index cc0660c92ba6..f22aa524309c 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,15 +14,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
-RDEPEND="app-text/htmltidy
-		dev-python/setuptools"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="app-text/htmltidy"
+DEPEND=${RDEPEND}
 
-python_test() {
-	pytest -vv || die
-}
+distutils_enable_tests pytest
diff --git a/dev-python/pytoml/Manifest b/dev-python/pytoml/Manifest
index 7b125ef98362..cef84467e951 100644
--- a/dev-python/pytoml/Manifest
+++ b/dev-python/pytoml/Manifest
@@ -3,7 +3,7 @@ DIST pytoml-0.1.18.tar.gz 8110 BLAKE2B b3c68b20abc919b1c2f9849f8f754d1e9e2df1832
 DIST pytoml-0.1.20.tar.gz 8529 BLAKE2B ebd2ea0ec2ca3477371622a003b6a84d3b108c0a36b76e2fb656a8cc59406c39d0158986aef5aafb39036624871f3185041a1314866f17fda1d28cd8e7cde802 SHA512 9b913219e65e2329302455a1457a39cf5eb37e04c03025dfdbb81db4ffe60b547fb7e64fc961608004900365ccfddb4225042105fa2db8bd2e393fa2797fc24f
 DIST toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz 19525 BLAKE2B 4a0a90406c4388a4834f33b637569d156b1ed6b0006b77b44dfcc6968349b745217ce40405aad5680a690bb9c5ffb2dfd7e716ecf214a7354e7727a212914a72 SHA512 94dc6ddadac2c75095b1a9ef7c4f68e38908bfadba53203b75c29c7aa8d3c387c1f05cf9915c2c63eeee869f4290cdcef4b8768cb36dcd4031168b5af549bb54
 DIST toml-test-fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz 16627 BLAKE2B 8cfa6fbee59f6482e22a03034ea0c37751fce337b7b7f652d959365c05201826344c1096f0a696aa84c0cd2f79fa3df6dbac73c1bf32f86d5e84db77a46c3fc6 SHA512 fea37ebf547633016a83c8e59e7d01a8df2e2795fdb8954246d10e4763675474e112fc52adfed38d3d8ce25bb5a60ef820f798aec2477b0fb7755f1cd6a66a98
-EBUILD pytoml-0.1.14.ebuild 783 BLAKE2B 472cba68a9a675577c71b7641d992bda1be9fd2ddffe9cfad7a3ad14fa303145065937d985407c3b9405a4e9c54dc5a76093d3793b11b18c0cbf49aa9562af86 SHA512 69892e5d49bb5afdb1b1d40d9dc7f9cdc4fdc7db29204a01083df72ae4a93c65688576dcc187e7fcccf68c02028fbb75425faad3616e7f7aa9c71a9611f87bbf
-EBUILD pytoml-0.1.18.ebuild 783 BLAKE2B 472cba68a9a675577c71b7641d992bda1be9fd2ddffe9cfad7a3ad14fa303145065937d985407c3b9405a4e9c54dc5a76093d3793b11b18c0cbf49aa9562af86 SHA512 69892e5d49bb5afdb1b1d40d9dc7f9cdc4fdc7db29204a01083df72ae4a93c65688576dcc187e7fcccf68c02028fbb75425faad3616e7f7aa9c71a9611f87bbf
-EBUILD pytoml-0.1.20.ebuild 785 BLAKE2B 4d490759a96291eebe113316f9b820176c1a5c0cb2910c76120ecf3042fa86825b61a0e488f35b3cc9bf66f33f68fc4b3ede47ef258ded558f3d4c1a56bad245 SHA512 13e34e0c6435f27a08874342b616277b4e3284ea8f4bd04d30027bbd1e3c791d10ffbbc05322cff541c12749d1d680c6c03027e3e139d8d52c419864414c6359
+EBUILD pytoml-0.1.14.ebuild 779 BLAKE2B 1081c5c785b2cffe2b09757f382f9fef8ec29c9c8cffad590432c42b9ea70f5b24ef96149a90e5905735b484cdf39718b5c6ecc376e6aa7a92e55cca8cb7c30a SHA512 3f74e5bf18fbab0325b55c9a0249cfdfcf8b2b65f10863a3da02b7b80009229b312874963646beb6e198b249684cbbfa8cba143659229603e845cbe380c5cf65
+EBUILD pytoml-0.1.18.ebuild 779 BLAKE2B 1081c5c785b2cffe2b09757f382f9fef8ec29c9c8cffad590432c42b9ea70f5b24ef96149a90e5905735b484cdf39718b5c6ecc376e6aa7a92e55cca8cb7c30a SHA512 3f74e5bf18fbab0325b55c9a0249cfdfcf8b2b65f10863a3da02b7b80009229b312874963646beb6e198b249684cbbfa8cba143659229603e845cbe380c5cf65
+EBUILD pytoml-0.1.20.ebuild 783 BLAKE2B 14781d83f07f7d89cc739a339ba2094b6743aec6d63e0237fd2427b2d78c4d3f07109429555c62151384908d15dd55de90517d1b9095f88f7608bedf4dbec806 SHA512 ed33762453a55f87b41ff7cdac10424d6212421bc11817bb251fa9b12c32d5061321c4aee904313b93dab9c1dba5c8fd0f6ea9126930cb8d514eaf9fd45dd4d0
 MISC metadata.xml 362 BLAKE2B fade23ceaa3b73c711e020a55500ce06c2b948a3dbafc1d39900c813a19716a8c3688ee1c83e500427b361559b6cec31f354a33f8ee72669ddb1e46ab6ffe45d SHA512 6122e392ec59d0c033d04e9b5855c28f81993755a1be2b688608a4efecbb6fd3f61fb5a6d41b3af294b1c0beacfd8edec39a454ff2a34ed0db088399301bdc0a
diff --git a/dev-python/pytoml/pytoml-0.1.14.ebuild b/dev-python/pytoml/pytoml-0.1.14.ebuild
index b5ed300fec3d..6066bc8427cb 100644
--- a/dev-python/pytoml/pytoml-0.1.14.ebuild
+++ b/dev-python/pytoml/pytoml-0.1.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 TOML_TEST_COMMIT="fa9501a192b7c46b82059caddaef978e3de883dc"
diff --git a/dev-python/pytoml/pytoml-0.1.18.ebuild b/dev-python/pytoml/pytoml-0.1.18.ebuild
index b5ed300fec3d..6066bc8427cb 100644
--- a/dev-python/pytoml/pytoml-0.1.18.ebuild
+++ b/dev-python/pytoml/pytoml-0.1.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 TOML_TEST_COMMIT="fa9501a192b7c46b82059caddaef978e3de883dc"
diff --git a/dev-python/pytoml/pytoml-0.1.20.ebuild b/dev-python/pytoml/pytoml-0.1.20.ebuild
index 7274d7f58682..a8d4997fd98e 100644
--- a/dev-python/pytoml/pytoml-0.1.20.ebuild
+++ b/dev-python/pytoml/pytoml-0.1.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 TOML_TEST_COMMIT="b212790a6b7367489f389411bda009e5ff765f20"
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 440356ecb981..d0ce5cc42bfa 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,6 +1,4 @@
-DIST pytools-2016.2.6.tar.gz 49708 BLAKE2B e8cef0db856ca345bd06a0da16e07268c4f1801ba0cbfedccc47eb1379c658e5dddc8eee7e2ea00fb08539521497980a9474542168728a08e2a51b2cab2a3e98 SHA512 87faf5221982815ffecf8bbe4a81eb211111aa8f893132cb5ed0d23e3464b651dcd5070589972c5dc7fac7c4dce768dfe4e064d8346e637af4bfff36aea17833
 DIST pytools-2017.4.tar.gz 51339 BLAKE2B 725518ea3aab7fb158134f9539fe1f42603beebb547260e3556466d89b084bcd0adc367bbad63a461553c88eb5c50e2c2f510a02bfb99b9e3affab29eaddf148 SHA512 4f588b725bc478303d539851110ad627baa2768d5d013434ca20e36fa315a842d0f7c3adebd5ae948f642fc5b9ad4940fbe1ee6afeaf0f16c4bc937210e9fa19
-EBUILD pytools-2016.2.6-r1.ebuild 890 BLAKE2B 23e3f31d26acac15f8fd8f7db32f5c8e858a830524182ec46657b93642d5e92b377ec3e534f822cea3eec1617d51117da28c73d3f036a2528431ba2efaec3eb6 SHA512 9bc9dbc6a207d92aa8fcf02f45cb98c35a80f9de9e18746ff62790036bb8f15195aad930fa0307150853714a9bb653535fcc09900dd0e17c98ee01665730fda9
-EBUILD pytools-2017.4-r1.ebuild 916 BLAKE2B 9ca86596717ac068cd03b282ff810e1864ac4d3d0e6c040490b8bfdd496505c0f04ee75ef95176307c5ebbc59680796ffb93af5ce20dadb282b89fe5d5ee9cc4 SHA512 b461958a5c5303777f7d9f0844e2d1b8e4a6b700b7f45db2852c876a5e8639d63b65cfcbb6bc6c2ccb3b5345f0a50bab064d4d9201a84d2e50a3c314db5565c5
-EBUILD pytools-9999.ebuild 891 BLAKE2B 53bcbc0fe732a36febd91ffb5c514e5c38841bc97d1426d9b9522bce01f4604c4a17ef190ad52a81a4ab409b924b5024ffb150d5cd77d1c6cb74a2d6844794e7 SHA512 61a18187852b53679c77e28c94839d4a1951dd0cbc0dc841d5cad41e249f2cc5ba850c8f9958a61482c4eebb1814eeff66f4e9feb7a23e93f4ad83e34f001619
+EBUILD pytools-2017.4-r1.ebuild 912 BLAKE2B 7c253e5d64b9dbb66a9cfbb02a4c1d644bf25da9135cc216f571da3a960be0effacf9bbf4e83af240dd463c74564c690ffd333801c8ad47985a4c1b472dd3736 SHA512 a5c96dfb2393d07c5c3a0dfad4e4c44a0b9c1630a9b13dc0891249301b3f5e4e55c1dacdc6b17faa304a9f7ffd4e2dca96b6ebcce044e14dd135ab44ddccae73
+EBUILD pytools-9999.ebuild 887 BLAKE2B a474a8fdd0bbe4cc3b0a17151eb97597ae6ed1496acd46e560efc63373f873df11c18f47ae9cf04f4d030f42aebef25423493208064da73ba3b06107e0c25a8c SHA512 34862b9e6f042c3d11b9471e5c2e5e5e20233e465c882832ed54d11286fbd99fe9ea1fe7710f75cb884761c79625353fe1d884a0405ec06f3b93618b6b28cd96
 MISC metadata.xml 365 BLAKE2B 9c5220f78fa8d68a183b9a60a3d2531359b46761a57288ab4d8db1d0485de923e87718dccd6c91d514b7b436d4c292c29e5d4eaef279d9d46fd3113c6995d078 SHA512 5df10be2b52e92d013020a311d433d36b3d98ad030db8ea9d10becf9f1c46d2fc326c1d77cb9f7ec73778fd9716b74468aa2192f003654bf0ebf3b94bf706a5b
diff --git a/dev-python/pytools/pytools-2016.2.6-r1.ebuild b/dev-python/pytools/pytools-2016.2.6-r1.ebuild
deleted file mode 100644
index e12ecdd1e1a4..000000000000
--- a/dev-python/pytools/pytools-2016.2.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	>=dev-python/setuptools-0.7.2[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytools/pytools-2017.4-r1.ebuild b/dev-python/pytools/pytools-2017.4-r1.ebuild
index 554e7083d1d8..95a01c98b25d 100644
--- a/dev-python/pytools/pytools-2017.4-r1.ebuild
+++ b/dev-python/pytools/pytools-2017.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1
diff --git a/dev-python/pytools/pytools-9999.ebuild b/dev-python/pytools/pytools-9999.ebuild
index 4c530168de65..b797a82b2193 100644
--- a/dev-python/pytools/pytools-9999.ebuild
+++ b/dev-python/pytools/pytools-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1 git-r3
diff --git a/dev-python/pytrie/Manifest b/dev-python/pytrie/Manifest
index 4c68478b5cdb..9ea5f5e02097 100644
--- a/dev-python/pytrie/Manifest
+++ b/dev-python/pytrie/Manifest
@@ -1,5 +1,5 @@
 DIST pytrie-0.3.1.tar.gz 94678 BLAKE2B 12631652ea33d2f1575f86bc8c42982543f8fa146debc9cb86e1139ff089f0657e04e50bad97b9bc344f4a270d102ee98e03fd389eb2c56ba3baac32b2288670 SHA512 72cb4ffff53d01545658b27b6c0b798736404f95013bfe34586c51c8823cc923ac4b3a8e874a938b26e3045784ce98ce2d8e51ab70dc435ff50075ffaf9d6c51
 DIST pytrie-0.3.tar.gz 228709 BLAKE2B 84c415722a724ac668624b3da29bfe29998c2ec8662ad21ab0035bb2a694e94759e9d09de980842887972b5c1690d699e43de41bf9f62e84ef3fbee86477d0a2 SHA512 f1dc6f810e51385fa4dcf2cbec76cf7fe5c184208f8d6dccf6212d43260591580126095e68d28ab6c8b01a631e6e16b275fa088643ae81568493ca231dcc6161
-EBUILD pytrie-0.3.1.ebuild 622 BLAKE2B 8d6d4e1641c91167fbdfa7ad29c25cb67b99a9fc1d643a4eedcb1866eafd1424d586db7ee554751a5942d9c28907075b1762ad375f28f43aba8fd8f28afb1129 SHA512 9bb5173a125a36057eb5f412099915f287f4fc552a6e7f87aae16a8e28f49929871db341420eef12f10dd60344fe932d788fa6f7c3a4deb59d953e06cf8b3cf6
-EBUILD pytrie-0.3.ebuild 595 BLAKE2B 862638b14fd5cd871b5f241bb3ccec1e57afee8f8fef6b8c04e372245c02fa78ffe8fa3233d9a64288a32b1ae4de569bd06c06638b0adde7374594b95c96f75c SHA512 c45e370bdadbdc262d7d2390baac51dd3860804f67b52eafce89dba3c07d0791e3cfa1aad4dec211421b42218440ebb7ed658cfe13e21b14b84fd35a11b50b34
+EBUILD pytrie-0.3.1.ebuild 618 BLAKE2B 1d5d7b3fadc674063335a9a88babbe4655fb7ff9462b5a1757e0c98e9224b145d29ab8845cef0f3db862f185e3a541cec111f1fe4b331c7f8a1a3480e0c9ddbf SHA512 e961c18f34c2c2ec2ef45b34bcb48325eae75bdb50985bc64370d6b05ade1ecd3b751428c9dacacf1eba122fc27997953c373dcc5c6174adf4136e812bdb9774
+EBUILD pytrie-0.3.ebuild 591 BLAKE2B e24f325af010f6c4a1df6fdac317bf2f7dbd7d6ffd39951a6baf07e78069a2c441619d9ff10e788bb818978f8b6c1f186fe75141faabbd77284e4f6c0ec18716 SHA512 e59388b2b6a6f229d39e319d21c038cf93e11956087b94ea8202b4a95a6f18db45d61a11c625cd4f442b8ecc1d577e3f73e1c74ef3d592651021e8b3848fe501
 MISC metadata.xml 886 BLAKE2B 240f560df7f7c6c99a7898f22b6a7445c1b590cb57bdbbb1353d2447cef377f7a7e562ca5d206592514fdcfb7315a207acd73e77c3b9fc1306df86176aa45feb SHA512 0fe09489e422888f9f98615a3981b679f76ea3c9ad07c523926a28bb45a305420f0f7485176863e7db560266b963b742bca05defc5c5b29fdda195915483b60c
diff --git a/dev-python/pytrie/pytrie-0.3.1.ebuild b/dev-python/pytrie/pytrie-0.3.1.ebuild
index 15cdea2a11c0..6e691bcdaff0 100644
--- a/dev-python/pytrie/pytrie-0.3.1.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytrie/pytrie-0.3.ebuild b/dev-python/pytrie/pytrie-0.3.ebuild
index 8b1cbcc0ddd4..89b2e162a304 100644
--- a/dev-python/pytrie/pytrie-0.3.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index a4bdd9eed10a..aeaa08f8bf97 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -8,9 +8,9 @@ DIST pytz-2017.2.zip 502168 BLAKE2B a1e02967700d0624d2c48bcedde52b772471aefcb1dc
 DIST pytz-2018.4.tar.gz 308066 BLAKE2B 665cebc5b535aafc92a1858b718d22818810534d8680a82ef3a0b66e6092f24226c36eb74feb690e25578b4d6ab8288cc4825eb5fb793345e11b0e71c6041868 SHA512 8a15e64d0d1a4b75c1e92360b22c06a41a692fe54fc8bfcff8cfa671095232d87f7929240441cd4d46826cd13f21d348125509c899be5a0b19bc7a77fdcb43c1
 DIST pytz-2018.9.tar.gz 310705 BLAKE2B 38e4f403e299ca3c24e5cde66bc02ebb861abfb7be06bcb0556fa75f426a2d3e1ac42466ea2296ddf52d3ed0e0f6f2478733d9877d2b891b5f4787cd1e792d91 SHA512 c3dabe61d04539245761a5c4e3bfb614df1c3b8ccc2ffa1cf320c5ad642242c29b3321fe7855d32a2ae55c739acbbe8c0e1813df5b3c757b8f56fff910fee159
 DIST pytz-2019.3.tar.gz 312286 BLAKE2B 8a81caf3ead284a66404fadeca4f17a603a4f0ab2404f9b73b2b06a209d0094a25549065aa14d254239d6d842804c6924bc7658a876517b170f535be71868ead SHA512 b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af
-EBUILD pytz-2016.3.ebuild 978 BLAKE2B 68bf86ef19a95b0df3e8cae327c767a6c41562f201674c1df531d330e10b2374fd5278eb5137cce30d439c5829fedfbc238c78e671d572c7a05cfa699e8ed059 SHA512 239103025629a34cd702200d65d32d780f83c77f67549142422ca25414ef346480c56a0fae864de042552c94520d2b267ef34419b16fb55607534db4f09472c1
-EBUILD pytz-2017.2.ebuild 998 BLAKE2B 2f150f14f0850b17dd6cd7eb69ecafd9afc46c1c7eba91095612aa79111445ca36820b2f61c6fb9f521a79fbde0e237aa1a9b63743a253b12e69de0de8125394 SHA512 6d6b6e35d3554ae1046a3bcadb47b4e42ab1ddacf4238391d649d77e3bdfb50ad02d9ae8a39860fa5608b22aba0bc229dbf072b68af1579db92fe6cc8dd303f5
-EBUILD pytz-2018.4.ebuild 1002 BLAKE2B 5f85af0250267a9faaee6d332325592e8278cdd13aa54e0996ab226b6fcbeb2c66e38dfc1eea320ee5c769b5ff739d0fb78bf34355d04282e9564d4780a7b1a3 SHA512 4bbcd7b02b612bc5602689ee83ba315023927516e4d4d54456fe13d7982f3cca488e9e1aa7e5a8ec88a904ebe280a87a1849ab1d2a5f393cbf9f5d11090b5bb7
-EBUILD pytz-2018.9.ebuild 1002 BLAKE2B 5f85af0250267a9faaee6d332325592e8278cdd13aa54e0996ab226b6fcbeb2c66e38dfc1eea320ee5c769b5ff739d0fb78bf34355d04282e9564d4780a7b1a3 SHA512 4bbcd7b02b612bc5602689ee83ba315023927516e4d4d54456fe13d7982f3cca488e9e1aa7e5a8ec88a904ebe280a87a1849ab1d2a5f393cbf9f5d11090b5bb7
-EBUILD pytz-2019.3.ebuild 1018 BLAKE2B 924c4afb2805d29305cffb4577bdb2d31c87f53a9530514d314ec747e77e43daf28d7dd4908374530c248181db498a464468a61dba004198399f8b7e81ab3a49 SHA512 7f539d5525b46e91f9c08f7f849ce02dc2f6d624227edbc93c48424e33f4a42817677f495c30f26465cb4a7a30ce32d6b895c4d7b731b295bf8e92a07ebe678d
+EBUILD pytz-2016.3.ebuild 969 BLAKE2B f590c68787964b7b57a3723a549ecf6310af74522f9d27c523dab1808bf3ef45857143b5bf0ba3741cc970a0e6af96ecd44356eb9951dd5fd83243fac5cb4b93 SHA512 130eb6e6a3c9caee9ea56cc30dfcd4355d11e1833ee8041126d504bded239b63032a2569df7dfa35c32794da4137268a0bd39ce5d2501f095e9ab3e28fbb27ef
+EBUILD pytz-2017.2.ebuild 989 BLAKE2B a17a608d5df37bc334e051b5a2ce6651ca5fea7464108730dd4de901967ccc89eda845350e62ed87959f8bf9560fa458ca21c3ffdd6bc2c1d9e2d26d08965c6f SHA512 dc59c02754efb8090b17d6cdc95f4544d9989805eb4d4ba3fc4859c992b66a955755184517d16b16a41e8bfc2c4528241a424367a71c000c66ad46c9a0000fc5
+EBUILD pytz-2018.4.ebuild 995 BLAKE2B d21df2b0dd1df5932cf776c5fcb09e6dd7b492eeb75c9a76857a8092359d6449601916f5ce61b73653802db86f2ccffe87899881dae56d766ee09d460195b124 SHA512 d6239724306498128250c5243a9b08c4cba99e8dff5b85c76756279d6c61cfdcf07165776dc5cc5c770d2c228e9faca68293dc09bcbf0d1ba63c90a71df9151c
+EBUILD pytz-2018.9.ebuild 995 BLAKE2B d21df2b0dd1df5932cf776c5fcb09e6dd7b492eeb75c9a76857a8092359d6449601916f5ce61b73653802db86f2ccffe87899881dae56d766ee09d460195b124 SHA512 d6239724306498128250c5243a9b08c4cba99e8dff5b85c76756279d6c61cfdcf07165776dc5cc5c770d2c228e9faca68293dc09bcbf0d1ba63c90a71df9151c
+EBUILD pytz-2019.3.ebuild 1011 BLAKE2B c14b0033b17442a3f3707cc3fde27fb2ccd85e8c41169e61ddf3e6d3b7ec1d8f793c0ce4ea09169972032754aca24ec5a3f54bd9da3d6abca33d00dacd2f7489 SHA512 cc7007f0cb250502c1d7ad6b15a9ae938e252eb0e5ee5efcb5f29284e472caf19066e372543112b918962e2d1ace0047614e539a0733d9b55847599f2d86c8f9
 MISC metadata.xml 739 BLAKE2B d96611c8cdfc1d45fa86eabcbcc60ed1d3f7e7d2a358a2fc5cf54a64ac3427140299651263e0be1cc4d2f87750df81c4adac9512be75ab334d38f44a375238ea SHA512 b7c9e6ea1b5bd128f1c5ce0a77171d0b7cdbb6f8ffb186d92aa4167d2d84c60c28c647cae66ffc7532350bca13ab65aaab5eb441f68321fc786a14b90f8813e8
diff --git a/dev-python/pytz/pytz-2016.3.ebuild b/dev-python/pytz/pytz-2016.3.ebuild
index 752513ee876e..c4759de77933 100644
--- a/dev-python/pytz/pytz-2016.3.ebuild
+++ b/dev-python/pytz/pytz-2016.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pytz/pytz-2017.2.ebuild b/dev-python/pytz/pytz-2017.2.ebuild
index 13da43e88eee..7ad62430e50e 100644
--- a/dev-python/pytz/pytz-2017.2.ebuild
+++ b/dev-python/pytz/pytz-2017.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pytz/pytz-2018.4.ebuild b/dev-python/pytz/pytz-2018.4.ebuild
index 69328d758426..10952615333c 100644
--- a/dev-python/pytz/pytz-2018.4.ebuild
+++ b/dev-python/pytz/pytz-2018.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pytz/pytz-2018.9.ebuild b/dev-python/pytz/pytz-2018.9.ebuild
index 69328d758426..10952615333c 100644
--- a/dev-python/pytz/pytz-2018.9.ebuild
+++ b/dev-python/pytz/pytz-2018.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pytz/pytz-2019.3.ebuild b/dev-python/pytz/pytz-2019.3.ebuild
index 2b38219a923d..8bf688b64c47 100644
--- a/dev-python/pytz/pytz-2019.3.ebuild
+++ b/dev-python/pytz/pytz-2019.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pyu2f/Manifest b/dev-python/pyu2f/Manifest
index 7a6588cc33d0..ab0f2e3838b3 100644
--- a/dev-python/pyu2f/Manifest
+++ b/dev-python/pyu2f/Manifest
@@ -1,3 +1,3 @@
 DIST pyu2f-0.1.4.tar.gz 38797 BLAKE2B 4240083b03bd596d1f87e42047980ab7c75d0064eec0ed2050d77bb92d26fac651af515c2c9b10d338e27ecd778e80ff47b5c33a68cd86328dc913c0e70cb1da SHA512 16f948b812edd5f0e4d97350872809b7c1b52f38eea49170e4aa21e0f695935dc0d71d4fa077ee1c1a3ef2f0711d62f0cc49983a89c841aa31aadf7b76340035
-EBUILD pyu2f-0.1.4.ebuild 1134 BLAKE2B 9e52b6a6bff58b1fa5e147507e775d3807df99938d3542f006f2dcd7bd5a2ea50f045de1a62977132aa9a16b427f2ad8d8f03f3ec5af358a52298278d7ccc85f SHA512 e2035433f076ef408ef3fa1a5d685c56e0387da55e4eb84a315274da82d718a78c91684566455ab3c189c9c22d6516d00fe21164f3d27751de11310a92f8f890
+EBUILD pyu2f-0.1.4.ebuild 1132 BLAKE2B f07026730e1f21c18f9733180c7d67a8895708c7631f1fe57aa893219608d117be0c2945781f61a13722d40527076fd991fcee2963ffd633ee9fb7f5462a549d SHA512 e99fa11534ba4e8711699a6ec6cd9cd1a2545e098cae9af7f93053ddacf83629477d5dff55399d6c713ad72aaf5089d86d6e75dfc23417f4076e0506f689dba5
 MISC metadata.xml 364 BLAKE2B f739254d4208658fd33151170987b9214670cf97ec8babc6c97ea4acdd19f3cd29f35e9d719b8462d90fbf0ff71e3bdbf30cadc2fd91ee54f2868018cddeb220 SHA512 d1f71740b09b54385ca269bedf3ce44ac424272e69881245a77796eb6c9e618e63c8837009d097b43dee477c765adf31b9e4bab7fa26606e57c3894c7bed429e
diff --git a/dev-python/pyu2f/pyu2f-0.1.4.ebuild b/dev-python/pyu2f/pyu2f-0.1.4.ebuild
index b3fff3594026..ac6ee246d1ab 100644
--- a/dev-python/pyu2f/pyu2f-0.1.4.ebuild
+++ b/dev-python/pyu2f/pyu2f-0.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index 58a174145c6d..f9d38fc0718f 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,6 +1,4 @@
 AUX pyudev-0.19.0-skip-non-deterministic-test.patch 3497 BLAKE2B bfbbd7bcb401d807531321cb15c71a52b7b039a3c7ad5cd06e9c919e6b6ef232fb16419f0480ce89e316770db523bcd3e02edc7c4f259803f4a3c93e2b0edbbe SHA512 23c305242e4df0bd0d4cde458ca1ee129bef36f98f5b7c3b341c4866b7f21a51ffaf07aa56901aeb67ccb59a4ed6548d4799ae2c519e359b627b29e722119a4d
-DIST pyudev-0.20.0.tar.gz 93217 BLAKE2B 9426b3f012be0b1bcacb7f3ed8b33d7965a2a8d7c676f032a0f2f9e6013f52090ddf82434ba01411cc2886796d34f736dc3d2e1abd6f45ee7ad516e9d5f45f90 SHA512 e86a776a2b6d29f206cdd0057c6f9b1e705d981ec8c2de49259887647856531af68238b80751102a3ffc8cea6f234cc520d62c8bc2da686e453ed010da3ebb02
 DIST pyudev-0.21.0.tar.gz 89469 BLAKE2B 3bf9ac46442c5948d131932c7b62a59ef979755f2d55bcd0165fc1b69b865268051fdeab7605c8a1cb0694ce0f4b88f31a1e6a1893900a7300ddf6439734712e SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11
-EBUILD pyudev-0.20.0-r1.ebuild 1518 BLAKE2B 6f6f333181fc87ad331be4748fae03ed2aa34e3a52611207ce9710e666e0e29f8c5df3be5cbcb2582c499198d141df232a8ac64b170842cd41149f3736386000 SHA512 f59d4fb1b01bcd43094ffd5aa8c693748a88180d9ff7b1e52009a86ae23455b73ebdcfa2cbd42b46ffccf106ddae755dbf5b1901eb076f9e1de6b4a897e8c2e6
-EBUILD pyudev-0.21.0.ebuild 1512 BLAKE2B fbb76a22ba12bccca996a7284add5158604e9a61440083de85a720d0adecdf7f754069f19ee48899a887523636c127cbc02f7ab99610c9b8c9122e53e242ce26 SHA512 d99ac88ed3ff8a29203a9ade6cabf54b08b0c31895a1a58cbd8fe2530479c4ee17e13fafce05702fc74f960d45161dc36ccf9585ee81a4c49ce93123d4468532
+EBUILD pyudev-0.21.0.ebuild 1508 BLAKE2B 03586c193e81768325992d0b975ffcfc37a028b24f8a7b17ef8ee3dbc9f50689b1dafc3bca8b15f533345369d5be4eaf67959c951d9a6f66817317c04d5282a9 SHA512 1583ea23beeffd698ffc6e921358c3f25a7c217ca529a8e39d5cca5c5eb4b2a37300ba60c0665c7357d8881a0a9c36da09eb78d3d25d0ff662621c5e674da950
 MISC metadata.xml 652 BLAKE2B 15c561bbbbf2c96a44e6d0ff39e7d1cbef709b52800051d09add19b88318e7d4c9ceb09c0942e7b01ed3b836df1348ce7c84b0deb8db4dc6e5bcebe200ebc95e SHA512 bf46b85c588d646d7cc6179a059d9fb8143eebce038e64af50f3129056a71b65a63a3cd214924ca538e6793f48912dd0f824a7826b49abbfbb8b27a72214c89b
diff --git a/dev-python/pyudev/pyudev-0.20.0-r1.ebuild b/dev-python/pyudev/pyudev-0.20.0-r1.ebuild
deleted file mode 100644
index 7c77d831d72c..000000000000
--- a/dev-python/pyudev/pyudev-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to libudev"
-HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="pygobject test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/udev
-	pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGES.rst README.rst )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch"
-)
-
-REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-python_prepare_all() {
-	if use test; then
-		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
-		ewarn "change it to /var/tmp to ensure tests will pass."
-	fi
-
-	# tests are known to pass then fail on alternate runs
-	# tests: fix run_path
-	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
-		tests/test_core.py || die
-
-	# test needs needs newer dev-cpp/gccxml
-	rm -f tests/test_libudev.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild
index 894790a5b1df..88016e8f0f94 100644
--- a/dev-python/pyudev/pyudev-0.21.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.21.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index e81c39147a3d..19dbd2093e95 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,3 +1,3 @@
 DIST pyusb-1.0.2.tar.gz 68694 BLAKE2B 8910d9d6d7abd8b0dddf725ad9cc745ce5b06f69a4824a86ed9783918d0fc88d438674852288654964c4555d8278f22d3daab679149c64ea8a6fd3dd2f1cf284 SHA512 6a264b796e17612004196a7a526a7c6df99feac9062f8354540221016411a78a65d413731aea2fc1206ed5ea2b84787078898b9ca3754164f1dfe2a9878b75a5
-EBUILD pyusb-1.0.2.ebuild 820 BLAKE2B ef7581ceae27b938460f6b39b47ffb78f66550ddf3775584dcbcf2316cf50c97a94ef90a4b46d8672f49c754a1226df1f38c004bf892593ce29e2b6eb815ea58 SHA512 4eca133994c7a795cf375a9880cd5bcfc5eb28961df86b3ea233a8731ae6a3c360847b11751d187577b83c303b9b478679a62ebe15cf8853e239cc4c2ea960dd
+EBUILD pyusb-1.0.2.ebuild 816 BLAKE2B 75342d4562cd31fd00b60a16fc62825e88931fb034ce0d0eeb1c813141459791f09184cdad91a6c4f943227c26039d1caf3f42e699ac561fbc769fd30bf7ecce SHA512 58bdc4c381832e1ba6eb518630e80772fc0a63f12130c1b8965feb7497304abde01c6383e8d4e135eab387de37bbe061f21be06000da41ab6b9e2dc7b8cba998
 MISC metadata.xml 472 BLAKE2B bae31bb84443c5d215f931618d90cabbc11633d90a1dea5e29ade93e42671b4bf1cd037f235e9a58059d2571b0e9b32f0261508108bc6678544dc09f3293b8da SHA512 7db6620b2545b31d9dd3c3844f9d02d0403c266a931935ec8e5728bb936ed3ec1f5ec5fd5d7146668e4e17c9f8f1eb31affaaec90dc93e690864b574a7ddbc4c
diff --git a/dev-python/pyusb/pyusb-1.0.2.ebuild b/dev-python/pyusb/pyusb-1.0.2.ebuild
index 1666b403fe09..1a0858382292 100644
--- a/dev-python/pyusb/pyusb-1.0.2.ebuild
+++ b/dev-python/pyusb/pyusb-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyutmp/Manifest b/dev-python/pyutmp/Manifest
deleted file mode 100644
index 29a8f55f2c40..000000000000
--- a/dev-python/pyutmp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyutmp-0.2.1.tar.gz 33673 BLAKE2B 4a7edd454e229f9036179ed8479c16c4be0288df81d46c84ea0739627fe002b732063ebf4bb76c340530e3dc8a44f4689a1377a32eba524a48fe8acf2bc16013 SHA512 0b1195b9a485ff9069dc06795f157c4e93e9855c1f1abe904823802e369f32d2fc4676a69e4218aff1aff393ded927ada394f848057f3fdcf45d8c0f8030363c
-EBUILD pyutmp-0.2.1.ebuild 424 BLAKE2B 1d67599a29dd4309a89067a0a83e610f00695ed7128c9a5fef0f027a6e9d5f76ebf6e9d5b485fd8565da1fd37c3c8c9fb26aaedcd35749290268e1bc2afa236b SHA512 86109293178a477b82d6aa511265ae3731974791869a79acd7c9336f5ed914d322354c5b03d8e3f95b304c763633cac0a47bc31d22dcdd5d3b30d8d862e679f3
-MISC metadata.xml 309 BLAKE2B 19a6aacc711b8e299c67ce5a775f640e64b2d42e2196a6774f1c8ecb9b5ab26f42843d95cfef0c095a5cfe49f0f347e40744ebdf05c792ff5ee076d55f7678a5 SHA512 377365858dc813dd68192639b330bf45c52e177f75e689bd76dadeadbce31ef346f7e4b37a358cec3c98cb58317545c9cda9df1a7df35dbe2f0a5e9c53c032cb
diff --git a/dev-python/pyutmp/metadata.xml b/dev-python/pyutmp/metadata.xml
deleted file mode 100644
index 6243e18c4ad4..000000000000
--- a/dev-python/pyutmp/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">pyutmp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyutmp/pyutmp-0.2.1.ebuild b/dev-python/pyutmp/pyutmp-0.2.1.ebuild
deleted file mode 100644
index adcbb754f2c6..000000000000
--- a/dev-python/pyutmp/pyutmp-0.2.1.ebuild
+++ /dev/null
@@ -1,17 +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="Python UTMP wrapper for Un*x systems"
-HOMEPAGE="https://pypi.org/project/pyutmp/ https://bmc.github.com/pyutmp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/pyvtk/Manifest b/dev-python/pyvtk/Manifest
deleted file mode 100644
index 740080ab49ef..000000000000
--- a/dev-python/pyvtk/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pyvtk-0.4.74.patch 972 BLAKE2B 8639554b46a894b34acf016c422aaf9c310ed08438d2c9396de68400d4ebff4079d11676cf07ddb7f000dc496c5a57dfd77a9f6e849b9745f8a144892855add3 SHA512 697f38b9df00528ef1e82fe8302901b92a6f2ff4e38af1bdb45e8c47821b13248a0c79dabfa485eaf2e9b9fa256fac96381e8dcfa76f364e2a8b1a94beecda91
-DIST PyVTK-0.4.74.tar.gz 25700 BLAKE2B b1eef6b632d2a0eb9c8b8327a2922c40ef7ab077fb42aa6f7f3f2d5a7e0f182b78ac77ace38b3ef33cf9068f322534354d774fa29fc97d51bf1d9b7f3289cedb SHA512 c3b29dd067339c1708f9757b83a127cbe008b291265181272b69a85c0348bc1388c4914acc24efdefda0421a601eede10af762753e683fbd0518361035313098
-EBUILD pyvtk-0.4.74.ebuild 477 BLAKE2B ee2057a2adb70ddbd09a8df84c070210ebe23acbd447e0fb2abb74da377b4c7a246f055d04f76ac5982df324714ca31968c7ab21c68155311b5de790c1565ad2 SHA512 80661d3c0efa07f4e1b146b6cc81d295f23d6e52d677751f3f6ccf1120fd6a18b65fc786c51eb5ae96930f9ea2901f9cc4e18dfc53c3e5c24b68f924e3ca754c
-MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-python/pyvtk/files/pyvtk-0.4.74.patch b/dev-python/pyvtk/files/pyvtk-0.4.74.patch
deleted file mode 100644
index 651c1f5ec37c..000000000000
--- a/dev-python/pyvtk/files/pyvtk-0.4.74.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- PyVTK-0.4.74/lib/__init__.py    2003-04-07 16:56:08.000000000 +0200
-+++ PyVTK-0.4.74/lib/__init__.py   2008-12-03 18:08:35.000000000 +0100
-@@ -202,7 +202,7 @@
-         #print 'Reading file',`filename`
-         f = open(filename,'rb')
-         l = f.readline()
--        if not l.strip().replace(' ','').lower() == '#vtkdatafileversion2.0':
-+        if not l.strip()[-3:] == '1.0' and not l.strip()[-3:] == '2.0' and not l.strip()[-3:] == '3.0':
-             raise TypeError, 'File '+`filename`+' is not VTK 2.0 format'
-         self.header = f.readline().rstrip()
-         format = f.readline().strip().lower()
-@@ -222,7 +222,7 @@
-         for i in range(2):
-             if only_structure: break
-             if not l: break
--            l = [s.strip() for s in l.lower().split(' ')]
-+            l = [s.strip() for s in l.lower().split()]
-             assert len(l)==2 and l[0] in ['cell_data','point_data'], l[0]
-             data = l[0]
-             n = eval(l[1])
diff --git a/dev-python/pyvtk/metadata.xml b/dev-python/pyvtk/metadata.xml
deleted file mode 100644
index 8425c0d53cb0..000000000000
--- a/dev-python/pyvtk/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>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/pyvtk/pyvtk-0.4.74.ebuild b/dev-python/pyvtk/pyvtk-0.4.74.ebuild
deleted file mode 100644
index 84c5a47a2357..000000000000
--- a/dev-python/pyvtk/pyvtk-0.4.74.ebuild
+++ /dev/null
@@ -1,23 +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
-
-MY_P=PyVTK-${PV}
-
-DESCRIPTION="Tools for manipulating VTK files in Python"
-HOMEPAGE="http://cens.ioc.ee/projects/pyvtk/"
-SRC_URI="http://cens.ioc.ee/projects/pyvtk/rel-0.x/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
index fd1d574de94e..d90cf808cea9 100644
--- a/dev-python/pywavelets/Manifest
+++ b/dev-python/pywavelets/Manifest
@@ -1,4 +1,4 @@
 DIST PyWavelets-0.5.2.tar.gz 4430706 BLAKE2B 0a96dde04c0d6b58304b2a6a1331036c33bf89be717127df97ea178d638d193b9ce8994d90e34b969a4a6228e7985c943529fb386a3bc938ce61a78925549bf2 SHA512 6685b348009076b39a46e5a480189c34e5bc791ac110f47a52a8dbe0cbed1f3dcb64402174480d525bcf3776d12185ac89fe36c839727a14ffbad1ed835824ad
-EBUILD pywavelets-0.5.2-r1.ebuild 1142 BLAKE2B efd4be1d78b11457f04f68cb7c24cb17dc7f1f9d2e6cc6a2b39f9791d2df7c8ea53fa7f12af989610d6d412e606d19cafe3edf7fb59a394d598c497eb56d5a0a SHA512 da64feb7c0700d8f10a9275d9eab174d5da1f2da9d33a9088c7a78b1767586be5c79934ba7e017ede7b9fe99617c065dff46d1c45772c85152fd1fe26d331440
-EBUILD pywavelets-0.5.2.ebuild 1140 BLAKE2B 6a4812912b649c6a7c8cb5ddcf8d1f420200c770d24cd6c41ba8c402de95fc5301bc0c5fdffa8d5f4bb8aa97fb2c234a0fc2aefa6c0c1b618f679777a122955a SHA512 bba26440d91e55fabbb429c1427d9b494ba7b578345ebd92cb11aa5ad87c8ff2fce0f5d4ce1a7997e4ccd99a63e2af563d10f1145a117ec061f8bb2631e83104
+EBUILD pywavelets-0.5.2-r1.ebuild 1140 BLAKE2B 47d15bbc93512302743ec001aa4a98c21d91490cb805ed66649cd3fa6f18bd36c8bb3dfc5e04a7a60267aad65eede430c5b9ab9936127a48c378eae5ae7b944b SHA512 c14be9bc138dfadcbebcb2a28c3323881344915933441f51dafeb0b8247bb55c9f04a212662afb74f201a9c8b31ee0a2a32d3e370cfb41e2d617910efa110a8b
+EBUILD pywavelets-0.5.2.ebuild 1136 BLAKE2B b5339ba0c32506bc99f305b2806ebb7245dba3d758674b00ce1ce6127ee251e899156f8a3567d72b8fa705352401950769429a14acf6b00689075639ef092180 SHA512 4d2ed1bf1853dd124044a1deab7f76b925eb6cae6c55bf6ee1ddf053deea5350d7c16f2d2b0832c061088f12dd4ecb72531976274dca2f6939eee393ac22a1aa
 MISC metadata.xml 814 BLAKE2B bf95f588fd50238b95cebc807140d2fd7b346e474375617b4cdff4f763f896754a106cf2ee29854ed98a8a5caf5a93b8007718580db5addfe6d3a23e392d45c6 SHA512 02937ffa5a37a9ca5e9f3b8bcee990bbb84bf4b41f770f3f02cb0a447429d127f2d1337cfd26c936469858ee01c850db33a65798144fa65102940414df5f24e1
diff --git a/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild b/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild
index f144305566ef..f5b815f20181 100644
--- a/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild
+++ b/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pywavelets/pywavelets-0.5.2.ebuild b/dev-python/pywavelets/pywavelets-0.5.2.ebuild
index 561c7746aaf9..791d46262b6d 100644
--- a/dev-python/pywavelets/pywavelets-0.5.2.ebuild
+++ b/dev-python/pywavelets/pywavelets-0.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pywinrm/Manifest b/dev-python/pywinrm/Manifest
index 5a6bb42ee436..848d4d082138 100644
--- a/dev-python/pywinrm/Manifest
+++ b/dev-python/pywinrm/Manifest
@@ -1,3 +1,3 @@
 DIST pywinrm-0.3.0.tar.gz 25175 BLAKE2B bf020a2343dd317234d52600425930c9e8a798d07443f33279950d011c23ecffef97eb10042f4453ca8062d163c75c694d04b1e1f9facc3a6fe1da8d6840671d SHA512 4a6ec3e5cc4b9030275454d846fa4356f444481fe798f013f2be4dbfd4974f11ab2ccaabbc749f6e64fda985324ce6ffb1af906cdca02d2e2cb606d10bb94d02
-EBUILD pywinrm-0.3.0.ebuild 696 BLAKE2B b6b8eadf709f73594c79afd94b0dd0e5a047fe128c43c3720c9615d6724afed7e518e467251c8a7945556fd4ddd345338d475767ec59681373112911be54d6f8 SHA512 b4f2e8284f3ea7b2268efb77a921548a3e5883053a022a4d02eecce3562b58fe7de5de4f2d93e9ace06b02927f479c39c42ffa934e3a5b0e0646a48dc9af3fdd
+EBUILD pywinrm-0.3.0.ebuild 682 BLAKE2B fd80b2eeb18d173dd22308a270ba38fb770ba078bb59ba5ebe6e36ec0f183f3186a38c6cf26e7dedd00aca69fd62b418cc359485f3d31c7b180c82aa06c9209b SHA512 91097471269e5ea3d861cffd4fd3c018d5d157da27ac637065811f3f3598aef04d41295e36f60e106fd0532f9704eff8f49f158f5dd72ffe88fc88a9d9a7adcb
 MISC metadata.xml 316 BLAKE2B 303bc2b58c8edb651c2dde7610eb874282223fa0b786208f488b9f1f82fd6fd63ead38e561cd46d65ab9ad189e261ae226a0ea8f0e99cded18d08dfa32bf37d0 SHA512 8d18f71c55b50755a61086ce593cb81f1095b35ee6e423da418f0e652e1842c6025bed1af48115c2847808deea4d1137d0bd70dfbb4c4f1c9fd720c14a54a415
diff --git a/dev-python/pywinrm/pywinrm-0.3.0.ebuild b/dev-python/pywinrm/pywinrm-0.3.0.ebuild
index 7cafa3e452d0..2643b3da1972 100644
--- a/dev-python/pywinrm/pywinrm-0.3.0.ebuild
+++ b/dev-python/pywinrm/pywinrm-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Windows Remote Management through Python"
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 41dc51f16054..24dcf3fa63d2 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1,7 +1,7 @@
 AUX pyx-0.14.1-unicode-latex.patch 600 BLAKE2B d7e2b4804731372b8b149b8e50ed6163297e60548c479aad8d796df4630f87e3df7e28379c6e88158e135f1b2e1eddcc712828efdd3fdcae501681bdf5e602f0 SHA512 f2a6af35aeddcd10d936a9ced93f708606bccb9f249bb45c6cf86111744f7efad9c08e9ce9e41d63b04345069e973e2ae69df5a2b004535bb0fac09dbee3dc90
 DIST PyX-0.12.1.tar.gz 561989 BLAKE2B 894b507f78745e0688abca20db91f4161627812ce303a066dde64841a3ac4e6415e00fb76a9273b413ddd9dc72550726e2f39004c053c6350f4f76253b884be4 SHA512 4941f5aa21aff3743546495fb073c10d2657ff42b2aff401903498638093d0e31e344cce778980f28a7170c6d29eab72ac074277b9d4088376e8692dc71e55c1
 DIST PyX-0.14.1.tar.gz 2475186 BLAKE2B 5e18b2a052c586cfdcfcc46f5351683ce7c3ec41d508b6fd5e085be543ac3730ee866b636d3ab9663e782b95efafcc340260826c82a77955b586ad7a55676c5b SHA512 16265bbdcaf28ce194189a2987b32952f296c850b829454bcccce0abd23838bfca0276c3e9c8e96b8cbfaf1473bf14669f9b7f2032ee039b61ae59ea3aa45a20
-EBUILD pyx-0.12.1-r1.ebuild 1072 BLAKE2B 586af4a2cbec45aba5a320050e962b4313f20015bcab708223035ddb280629ea9d58832fcdb59e5d8872a1b2fe334797639ce15462039f92422ddaafa59338f0 SHA512 56dbfd2780dcc0c76c5728c2214ad7f28f71f55dcf074e5c214e4af9d98aa87ee0e06a95b366ac6ddefc9168980100ff0c2733df5f4cd664b26552df2d0193d1
-EBUILD pyx-0.14.1-r1.ebuild 1207 BLAKE2B 24c0d883cfe1631d30d8a197c78fc3dbf7234358e63db13f86b38775a26096d6c0addbc2f6a0a5e1087d8ea3f4c0d619d7f781d18e4a037da4e2f2b28bc5a4d7 SHA512 7d70ffff863da9e935d2fa1fcd3f6dd860affdd5727b6e850b444c9c624706074c6626473fca613d897fe87aa4cbc451df3d289e3b9facfb56822c76a6969e95
-EBUILD pyx-0.14.1.ebuild 1154 BLAKE2B bf3089978a25e39887024da8c4834cf54d3ee741d2c8636037fac7d9e701cff70df120ed8ab59b3f37dfb248f51bc747fabf5f6a5d77e3cc09bc511189aa6e88 SHA512 ba61ae7027ae667a74b3a4e2f9e470c96fb6d23b3f65d25893c50d6ca871b6c5dd4d5e303d5e10aa08afff133fadb44219e7d49b23132e0892bb28fdea0075d8
+EBUILD pyx-0.12.1-r1.ebuild 1064 BLAKE2B 24dd213a467b93808b203e7e8af9f481d477f1337b5ce7eec197a58393b1f552b6c6e958555bc81e985fce33bfde1e4bc8742fda705bdc78d27424006ab80318 SHA512 858962f65ac79fe6797c6a0b1b0add9ad1a81091a026a82171e4874c58835d66a1636bbf41b65881e5af2ac0c1d54c67285e3cfd2bd36bdc1685497842fd17de
+EBUILD pyx-0.14.1-r1.ebuild 1203 BLAKE2B a8f78484fbb512f5df1eda2ab56023c6fb6bc7aa4b03cbc5319e2bdc08978b2557c9e0c7c7a6892fe8ae3c8088d2c6eb6c72134c56814a914e96ada846b926ab SHA512 06051ea7321595ad18f5ae79844763a636de2f2270256a39887fbae911b7cf53fdae8c7804b434e79946673d36180a3f9a3dfaa473d898d703ebb0b61fdc59aa
+EBUILD pyx-0.14.1.ebuild 1150 BLAKE2B d10dca1165a11201e67e4b08eb43064e7783ca4f8c5a80ae217423ca4bda6da92c02fce4a171059921eae9fb02929243cdcc7333e3103faa3674b8f94313de5b SHA512 5e6d4acd635eb62e87d2efb4f18b70dc8d73989962c9e4cc53a7caa9faae7027bc5bf31cbb8ff7cd69d0c80779fdbea40107a40344c8b31acc0d0396c0e28e48
 MISC metadata.xml 642 BLAKE2B be6324da06bbf69bd5c56fb28aad984a9b36fc50efa418558c81a63d5e4ec01793b7096664c2a6570e24caad368f50b520d30bd83e01e41d9aa52654d5f54c7b SHA512 c95b0de51a001623d93ef15159eaceb5c62fbe38bd7c21f261d12d131eb00c1764ab4f4f124c4bfdfce575d80a1318a996cb02629cfff0a5f9b853fd078627e9
diff --git a/dev-python/pyx/pyx-0.12.1-r1.ebuild b/dev-python/pyx/pyx-0.12.1-r1.ebuild
index 9b5f5e293aa3..8e3c042cff44 100644
--- a/dev-python/pyx/pyx-0.12.1-r1.ebuild
+++ b/dev-python/pyx/pyx-0.12.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyx/pyx-0.14.1-r1.ebuild b/dev-python/pyx/pyx-0.14.1-r1.ebuild
index e43c228d4da6..529d32eab319 100644
--- a/dev-python/pyx/pyx-0.14.1-r1.ebuild
+++ b/dev-python/pyx/pyx-0.14.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 MY_PN=PyX
diff --git a/dev-python/pyx/pyx-0.14.1.ebuild b/dev-python/pyx/pyx-0.14.1.ebuild
index dc9393db03a9..b9e6d91ebb6b 100644
--- a/dev-python/pyx/pyx-0.14.1.ebuild
+++ b/dev-python/pyx/pyx-0.14.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 MY_PN=PyX
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 4f3138f5146b..29d025760098 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -2,8 +2,8 @@ AUX pyxattr-0.6.0-xattr_header.patch 1780 BLAKE2B 43244b281bec7166d539155c66e604
 DIST pyxattr-0.6.0.tar.gz 31057 BLAKE2B cf6e99c499dbcc74305970413803e5cf59508e7ee1bf247afe42e576c2dfaf118a374ad6f8721b9d9c482f8be0c222d26b82997dc1ccc79248d5f52b2064ed8d SHA512 c56bf57729b5f8c8e3e19e29fd903b7365c6644abe3dcebf57ffc2f97a1e92d0e22cdc0a967c5abee3a74ba61a2a379e31a1734f45449095bdb7895b8357a9bb
 DIST pyxattr-0.6.1.tar.gz 32105 BLAKE2B 0334d056ea652492fcc7958e0caf0ec438253e287c3f2ee663c0eb059fad5f01bba02963fc90035f84c129e19ee08e11bbc5573cebef6fd7ffe5c65adddc02ab SHA512 2c2defee81e2bd7e7e7f67d33676858f27494f12ba5c3d34bd548912a058cae562e9e9ed0dc5697892d1d55c29f2a5e10455260092b63faa54e40b841c42681d
 DIST pyxattr-0.7.1.tar.gz 30580 BLAKE2B 748ce0610ebc1a074dee87dffc67a88e1def0ea467f13758d2d85f9f5c37954586d85dfb8ceb1b77f4ef637295d57a153849b00d773e2e79b06902974fe01663 SHA512 093cb3f9b9637194b9737c07da7dde45b3d5083ec16a9209af80d30c86da8f93badff5aada395415be3dd48da73004286e47d0aa0671c95e65b0492d02e86009
-EBUILD pyxattr-0.6.0-r1.ebuild 1982 BLAKE2B c5cb7be7dbb4dbca943d7442dc84a3272de0f39ca1f5a73b6408a259259ab0aa766fb8b9d015bf2a7927616150c08d3b0c03794634749f0ae3763e95820019f1 SHA512 603e332a9ecf30e798a0ee6b6b8e9ac0cf666d7731dfdb721a4cdfd8bd66dda8bcd468cb198b8aa14e47060d8a9a699f2e650ac2d9ff188ff08a8996d41d44cb
-EBUILD pyxattr-0.6.1-r1.ebuild 1811 BLAKE2B 604e11e8683e717a5e5cf6834d8dc459b85ec8d27ecbdfdca44e74e6c30945a12935908106967fefb004d57d845a5a80fd5c8e20187db2de8d5dcd4d31b5315b SHA512 658e9a76d1c7e7afac942713b08491a7f2ebfc5e789c5b2048ca969ff310f559c7786d945c442ce2f166eed554e540e59c339e5a87d3802a12d2b88f58aebcf8
-EBUILD pyxattr-0.6.1.ebuild 1936 BLAKE2B bf7f008f074c1dad500802e87ebc12a4ad9fd11adda7aa675dcdcaa87124f2867963c75ff843451cfd81b7dad7f18e0b93127bfc990cac3093b9a576222a5dd8 SHA512 9129b3d5ad126998ae1d67a8b96a832ee2ef045d4d375b8f6e2e5eef1424aedebf0430a567c0f0f4e9b0a6741c4e23273a6eeee7bc3a28e67288087bc77f9f5a
+EBUILD pyxattr-0.6.0-r1.ebuild 1975 BLAKE2B 067e921cf25e1263bcbeb3a56602211029d292d7c60c539182f8081974d912b014e7f9e47064d8e351edc08dae54a29e029db5fbe386dcfcfac463837ec0f26f SHA512 cad8a2449f645be19b8bdfb5d1e9e93f9368bcd062ea077fe9063b3798cac162204adee9b95f0785629a73635500284c7cdde316f3a5943fce998fbef94ef4c9
+EBUILD pyxattr-0.6.1-r1.ebuild 1806 BLAKE2B 8b5559928fe134a74beb9179ceb1d954eda20cee80a6f24769357a82426b915555be8902b4df6169d8b9814616464e202a459306526f19f7062b6b02a778462f SHA512 f2c6d7b2b5dd5cbc735a40419600caa4bc5227c7d4dbd3fbb4d76b268664e6517e4eaba933304f28c0af8719a517ae17bb3b0161d89e93a3890c0312730c9656
+EBUILD pyxattr-0.6.1.ebuild 1929 BLAKE2B 21350a0858aa75cef010dac1d2e3ba85320f033a1dccb7ca5f2c7d7f6f618bc9fdde841a090c1777f5a914daef0d0c1e1cf17299739e931c45838bc868595282 SHA512 8e4c6e310ab4a2e25e05e5681bc69da5b917d196adbd89003dc944cc4dafe642b1e09bb1d90eb8985962cd1c6b85cb7b4bf684344e91804b90f5a7862e4438f1
 EBUILD pyxattr-0.7.1.ebuild 837 BLAKE2B d5e768895845babe7ca336830284fbff39fe57f3fe0ed820f3b0d53b7dbaae64f700d04e5557d1276af0a63e7eea01e50e70185a1e47a12850c1dd9eebe2935e SHA512 3f2d6aea962339cda2b73d7e88e160d63be831174990ec9c73c4a48765879645ebf1de085644e2734227ce5966265b516a6934a24e909fe02ca2b83a60ec4c64
 MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild b/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
index 6a55cd3646a6..238c5c22ec8c 100644
--- a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild b/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild
index b31d3d000ed2..9e62c609296e 100644
--- a/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyxattr/pyxattr-0.6.1.ebuild b/dev-python/pyxattr/pyxattr-0.6.1.ebuild
index 8be4d43ebe61..25785775563e 100644
--- a/dev-python/pyxattr/pyxattr-0.6.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index 6502fb8cfea6..c98d3f90f6cb 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,7 +1,7 @@
 AUX sec-patch-CVE-2014-1624.patch 1867 BLAKE2B 7345af45e863876b9c0f11c0dedb2dc124e53448c532bcf622f085e3a4c3040c9308352414e173c6adf74cb1c55efaac1824bb99fc8013f63dc8cfd3610989ea SHA512 f0ff5255108b7a5774d376a8892f1120f5056ec92fa543af7e5aabe3792e7ecd347ac78ff5c04ab36db35bba513a412f6aa06fe718933317a903264bd184b712
 DIST pyxdg-0.25.tar.gz 48935 BLAKE2B 8feffefff37da1e560040b36cc1ccb4ffdc57642b4de92f7a937303a02117ffe263a5dfc91bb6e85112ce60bc19509c21e7f8f859ef3ca5fca0e8c87a61cb128 SHA512 86cbf3a54fb8e79043db60dcdbb3fb10013ae25a900fa3592edc8a24bf3f440c19bc04626c7906293c785fcb56eab9d87d209b723b5baa872376ba1eb86758b6
 DIST pyxdg-rel-0.26.tar.gz 68435 BLAKE2B a95948db17da9909554e82c0ccf590c3f94ec26d1e34d5ba335868233a649368c08ef30cc19e878310ef038e5bdb6d18cd0e15e9413d9c54b70931f25844ee8c SHA512 0c11bccb74b8c0d98f3c63c318d35d08e1c3bbea128bf7b82792e1bdc0a60c8c4d6414b0612b19296cfb48f7951dfc6dd55ac8d23238e370e7faf6c4f64d1fb6
-EBUILD pyxdg-0.25-r1.ebuild 764 BLAKE2B 2e0653b240915b3fa92660d514069f37895a6ebdae4e3bc1dbe7c2fbd4170c0db45c42b4984c5fd82080d33f1137625930ffbcd99b646c60b3349b02b8a8076e SHA512 0faa1aaff74cc5a76ad693a0556bbad5dcef9ede2052eb9869f2478d4fc95a54249ac8cd5e1de7e1c48d06549b6fb8a18a8c6883efe23a6f8fd09b4addc1655c
-EBUILD pyxdg-0.26-r1.ebuild 789 BLAKE2B 69e151c00877d96b3b7fdaeb6f3be9a69c44076eeab0fce03e6ba5fda945e9793ea97ae9cf967655d0c9732782cd5d0117ff9624609c22a227c71b7607854f96 SHA512 e1fe842db45db8e09a4c106677e2cff1986c42e1b080a702fe8dc16451405686973294b8b5ca7322baf52d82fbfdd10af3869034525da5e6423e1d973fa9f12c
-EBUILD pyxdg-0.26.ebuild 788 BLAKE2B b5a7e1b1c0fed0ab6e303923b7c1107bee8b6579e2ac40275564e69d74d825efd2c13285e8df323847af53302fe4dd900f0f840e5077c0bf50466bd7f1161b59 SHA512 c4cb23939f6fe746fc136e059f0608ed76d6135978227e86b8dc38a4d77d0f72372fd2d87ed10792d7f88fd38b30b2182aa0b97e6de388211641edf457643ee0
+EBUILD pyxdg-0.25-r1.ebuild 755 BLAKE2B 9c4f3208b132af78d5419cad528abce48d8295b75e43238270d395e1431cd5938f1a33d75a7def8821444592073c2ff562f3929af415fd60624a278beb1e9b3c SHA512 da54e504545cc792935004f82a114bb517a6182adf0b393e17fe3a43a269e878c3fa83f23517afd7cc54b14df9ddd8ef3a9defde201fc36fbcaf62f872b5210e
+EBUILD pyxdg-0.26-r1.ebuild 778 BLAKE2B 643f87d407c216b5130b0ac2b8ddce6bb96b6b6d003e755d7f289c8c6549bb81cbe19044247986af7960f8acadfeb9dd473170242955641aafe77c880863ffe9 SHA512 e42a517f9ca920370a7189bc3495010a057e5fe4fcad378d163295c483b24399aa3df1a40cde05972008e97b3170d22647546dea92e32c1fe2700e5303acfe9e
+EBUILD pyxdg-0.26.ebuild 779 BLAKE2B bafb05527ca4ad8bfcb177674d035c18b76bd629d0cc8312869f76a40687288b5a13ce86abc76acf8ae8c765b68c02ed772581c0fe64878e1bd024f12a652037 SHA512 ee6098bb72fbebad4b91550c9dbce38dc237eff8412dddf2bae812cea62f777dc64e64e288e34f0de3e9cbade5b8ca15a65f1c2c73a63d16e55b08325e642366
 MISC metadata.xml 487 BLAKE2B 4967a9b3c1a439c3cc53208ad2095031b08c4848ade6f2bb08a69aedbef5f5046f28764db62bcf3cac4c1c33c68958a7d2aba03a3b4cb7b7a407e41eddfec5f1 SHA512 f00421023d46b9aa32d8038c5ba8bfdb1b60a732932d64f7d11fe6f0c163b734182e2162dde2ba663d7c74ba8c754ece721dfbfa0b8fa3081be622dfff3949ea
diff --git a/dev-python/pyxdg/pyxdg-0.25-r1.ebuild b/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
index 1aafbcf3b5f0..e86432e98a31 100644
--- a/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A Python module to deal with freedesktop.org specifications"
diff --git a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild b/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
index 88c274e9b62d..42c7aba9535b 100644
--- a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 inherit distutils-r1
 
 MY_P=${PN}-rel-${PV}
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/takluyver/pyxdg/archive/rel-${PV}.tar.gz -> ${MY_P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyxdg/pyxdg-0.26.ebuild b/dev-python/pyxdg/pyxdg-0.26.ebuild
index d3266af2214a..b7485e40e203 100644
--- a/dev-python/pyxdg/pyxdg-0.26.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.26.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 MY_P=${PN}-rel-${PV}
diff --git a/dev-python/pyxenstore/Manifest b/dev-python/pyxenstore/Manifest
deleted file mode 100644
index f9d88c8b2b76..000000000000
--- a/dev-python/pyxenstore/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyxenstore-0.0.2.tar.gz 4471 BLAKE2B 91e004884b880ad5307fa0bd13c3d07a57c540e9dc004a167fe82b2e964a75f2de0328aabd2f848c362111205e46e01d8e3dcd11bb3eea41b8b64555c5f2749a SHA512 0c4cfccd1f943d39f0524798504069514bd811886714b121cf03addb344ca4aa10a718178b3e8eb1cfc9ac9e4c2d6e61a1bbfaa47e1ec4941a7429e629f982d0
-EBUILD pyxenstore-0.0.2.ebuild 434 BLAKE2B 58ed6862ca4d011c7d2a16a4ec0dbbc68c8aa88c7390863da83b527eaf1f63c178c7c0aa45c9ebdd8e63d7298859402bd39288df5b6c93a1b99c77e872d7e324 SHA512 2ab2d977ef8cbfbcf786441b95fdd5ee6f98ddb8a424e7d47d2a0b45498432e442627fae9111882828cca74bfaaeea91eef00ee39b9e692c5bb545cd53c06451
-MISC metadata.xml 445 BLAKE2B 0838c540cc694048a7b9a305299f994b13e3195129d9727a2bcd2bdf8b30810aa71dbe5de0469bc9a1d33799f99eeadb878e2ab96046c295fdf6de25b68162b6 SHA512 6cb234fa3b6b01d216e9aa02dddb16a9862c7d589fea5f27d39071bd321daffa47a28d44887e8e0f3320b6aad4680dd93e76609cd19b01825e6ca2758f4926dc
diff --git a/dev-python/pyxenstore/metadata.xml b/dev-python/pyxenstore/metadata.xml
deleted file mode 100644
index ed1366b3a331..000000000000
--- a/dev-python/pyxenstore/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pyxenstore</remote-id>
-		<remote-id type="launchpad">pyxenstore</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyxenstore/pyxenstore-0.0.2.ebuild b/dev-python/pyxenstore/pyxenstore-0.0.2.ebuild
deleted file mode 100644
index d46520fcf2dd..000000000000
--- a/dev-python/pyxenstore/pyxenstore-0.0.2.ebuild
+++ /dev/null
@@ -1,19 +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="Provides Python interfaces for Xen's XenStore"
-HOMEPAGE="https://launchpad.net/pyxenstore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="app-emulation/xen-tools"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 70676b12e630..7686d507dfde 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -3,8 +3,8 @@ DIST PyYAML-3.12.tar.gz 253011 BLAKE2B 530f2910acb757af9e2a738d93ace45daee3fc576
 DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052abd88ea434137a4eb8a4c1e08f9ee1982a30df1934dadb615145f4af8fcff577d3d4e52058e7a8843aa8604 SHA512 93642286d0317e2fe970632c36d38ce6030f7cabcf971f28e3a1054f07390fcee5baaf7f167e7c9690dbd7b2adc61f5b7d75a218ace0abca34ff8815486cfdd7
 DIST PyYAML-5.1.2.tar.gz 265034 BLAKE2B a3f6fe4a0c0a24f8934b94545e7727fad26b397755416a8127bd52fd9ea5e8fea3c6452ddfbd91edfa2e8ca88522b1ae9061c9221f394c8fa4cbd1c2dc256f72 SHA512 b5ee201c612486a95c87b7e41d474313160284359b8b30ababc80b51325aef9dd7dc27eb3b8a03a4749cb8c7e3789c5684d5c285fe35d4b20be1f189641531e0
 DIST PyYAML-5.1.tar.gz 274244 BLAKE2B ea8cc4b56b9fc70bc7b01f8c654ceb8b73c82dcc936c939cba3c3654df04fe32fc46c7df322a38869d28ad5a58f6134b35cbe43924df3b4d5f3e54e33700dc73 SHA512 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd
-EBUILD pyyaml-3.12.ebuild 1046 BLAKE2B 9e060f8a0ba7593b851a78519e9171b8bdd6fefb945b21e3a9dd2bbe18491dbc457843cba38f3b28235b98bb3f982795650fb14dad3f45f5f57cfeed5b1e17af SHA512 7320ec18df4e5762fee93436f27cba47b9a48c698130e04f74a7fcd96e7c617e730c966b593bfdae932c1c5d763e38c223403fb080bbafbe3433d7d89dcb4026
-EBUILD pyyaml-3.13.ebuild 1048 BLAKE2B a6c2c84bd533a108e4e68ba38492f5c9a52fe51c921f10c1e9831c9aca2fc673dd9eae9a85889c5305bf9b1b4682e7655d551946ba027201c53137c69556d1ae SHA512 ef0408a3d99f5991f122ed773a3601b288fec2ed91139d1ff5b9482e274c5ef204c4056bc1303eb6aa528ae9f7f3c3e6dd80780ffd70fa71b92b479ceb6d5650
-EBUILD pyyaml-5.1.2.ebuild 1165 BLAKE2B 7d181c8343084602f152cda5e0c802e13497556586129f014073963ad85ca9f5cf653621a7c62043f8d9cf714f22655a87feff162d771cb1d0f0859aa0554681 SHA512 d822456615f53e5e65f371975167e8ac759295a828a7965af1d09519aebed5112d05eeadf3214e6320de9a5ba166998ce18ed6e78c508806108938710f66a2b9
-EBUILD pyyaml-5.1.ebuild 1129 BLAKE2B 52648efcbe5433c22de07e2db1d0718fc165560427efeadc58795a60722aac9d7dab8e9e9093a24672d2bf286c0f61defc4d23430874d1025d8c26bae61e75f5 SHA512 3c121c361e229b18cf6dc2245878dae51981903af858866ec5bfd279f4ed2d30bbf6defd7b1ddaf8ef9eda1cf16279261e854e080c3af09db0e63bb4f4c95456
+EBUILD pyyaml-3.12.ebuild 1037 BLAKE2B 579acc114fd2d56b5e0bf024f554596f91515db4af2d01d32e31e5034a40889b79c97fc45eb64bf46bc1deea762963d9a5e5824a07961f70cf7aea16d4245369 SHA512 7772e1792d9557a6e469ef7de071860116ba93e91eb8450d9a07495d415074c837cb918b5e8e5d9b8f80037f0389f01eaeb644639fd94a9b6c6762d8526e30b6
+EBUILD pyyaml-3.13.ebuild 1041 BLAKE2B 020d5a3a7db094b836ac6b4a87ab0e0eac2c22e89b4bd84bb960de1bafb2da6592057a203cfa3e29fb239ea846f609665dcb8dc728cf7da681ac37d893d037df SHA512 998d63405ceebf274cefa9202e45c1bfb8ab45d81e1f2207374acb20ef807b4652ab1258d35ffad3424be857bc36e4f61aac012dddf9b37ae6346d32607d264c
+EBUILD pyyaml-5.1.2.ebuild 1186 BLAKE2B f17711b03f88e4e2523dcd69df0da08bb9e956a76574ef7e3b62984d3b6b44a76b8e72b35d323c6d4bc2b9331d54951e1d411342aa6edeed070f239f8c2095ca SHA512 fa0350c39f5a4b4bc3474df58f7698a956b04eac5c814a57ebc1b94fca30164ad3eb31f01356913781ca7a868cd4e2d732d9a03aa8fefd1b002e1c45309a8067
+EBUILD pyyaml-5.1.ebuild 1122 BLAKE2B 2b914fb30d1799b010585bec48823f77b483a435390fa8744e84f3827494770bcac23fb096d34b3bd84ceb408e76c6ff2a285ad6886b33e468ae9399d2236190 SHA512 59563081214821c8dbf3e11a63d2185f0ca0890785c19d45ff9faeeb79e7ad084a93a4dbb3680754a20089da35c773c2803c3c008fc480ee7b5f29b49703cc48
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-3.12.ebuild b/dev-python/pyyaml/pyyaml-3.12.ebuild
index d010dd39cf6f..dccc41750660 100644
--- a/dev-python/pyyaml/pyyaml-3.12.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyyaml/pyyaml-3.13.ebuild b/dev-python/pyyaml/pyyaml-3.13.ebuild
index 244c5cb8505f..87b82bac675e 100644
--- a/dev-python/pyyaml/pyyaml-3.13.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyyaml/pyyaml-5.1.2.ebuild b/dev-python/pyyaml/pyyaml-5.1.2.ebuild
index 422b706b4b24..b63569118b84 100644
--- a/dev-python/pyyaml/pyyaml-5.1.2.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
index 2efa52728c0b..ca81b62bc1ce 100644
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyzbar/Manifest b/dev-python/pyzbar/Manifest
index fffe001cad58..9321e7ff664e 100644
--- a/dev-python/pyzbar/Manifest
+++ b/dev-python/pyzbar/Manifest
@@ -1,5 +1,5 @@
 DIST pyzbar-0.1.5.tar.gz 29654 BLAKE2B 2909ccae347139472398ccbf24ab304084946f649694e820bb62f8298076007ac7cb02acf02087e3ed5d59fb8a32f1f6b61b0af50a85753b0dd182029e98bc5c SHA512 785c3e4cc5b44a1035004e4b4dd2ee538613aa021300b84c6183cc457c751fe4b4a419241608ef0e5e548d312596a0d5f4857a7b1388c6cef77fd021a0e0034a
 DIST pyzbar-0.1.7.tar.gz 41551 BLAKE2B 497e920935ec6a50557123e2d78709c935284bfcff32705f8aebad3e13ead4ced7d6822adc8f377a94eb21603f81ddc4f563df9bc92b399e6244a9dee12f2163 SHA512 74b56658db7a8dc2d7a716992c001ec52a2befc9e31c41ecf7e5e1f277d4188963ef79a2433fc4befdd15d2f6e3f47c4f064582b530eef028c55e07e2c88dbbe
-EBUILD pyzbar-0.1.5.ebuild 895 BLAKE2B 4ea4a642907e6acedb1978ebe845155c943449d9f484011ac0a03b84453dc4e3766389dcfb545484824fb2745270943356bd89947f9d9e993074517a0a0e299f SHA512 d7e036b3e55970742e0dd8c9d9d65325593b43c329a828b8095ea958f214757486880573fbc0d5be49236a925e616383d6c4bf8aaff466c5181eac3b23bb6a79
-EBUILD pyzbar-0.1.7.ebuild 895 BLAKE2B 4ea4a642907e6acedb1978ebe845155c943449d9f484011ac0a03b84453dc4e3766389dcfb545484824fb2745270943356bd89947f9d9e993074517a0a0e299f SHA512 d7e036b3e55970742e0dd8c9d9d65325593b43c329a828b8095ea958f214757486880573fbc0d5be49236a925e616383d6c4bf8aaff466c5181eac3b23bb6a79
+EBUILD pyzbar-0.1.5.ebuild 893 BLAKE2B caf5d3a742d185f7e6c2569b11ff40144dd0e11c74fdb6da61867dfad340c8aaa02fa180cd0dc35ac6e0213fb4a7bf280da5ae88808b384337e2b7336e7135b3 SHA512 eac4bd8afd401c3ae21bb0a0213428821071491079cd45fe82919c74ab0c127e3e9f9f5fc89fe2a41075184145dfd33a2ac19ec4fedcfb26c5e1543ffc241b8b
+EBUILD pyzbar-0.1.7.ebuild 893 BLAKE2B caf5d3a742d185f7e6c2569b11ff40144dd0e11c74fdb6da61867dfad340c8aaa02fa180cd0dc35ac6e0213fb4a7bf280da5ae88808b384337e2b7336e7135b3 SHA512 eac4bd8afd401c3ae21bb0a0213428821071491079cd45fe82919c74ab0c127e3e9f9f5fc89fe2a41075184145dfd33a2ac19ec4fedcfb26c5e1543ffc241b8b
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/pyzbar/pyzbar-0.1.5.ebuild b/dev-python/pyzbar/pyzbar-0.1.5.ebuild
index e060e95abcca..b654f76e3a87 100644
--- a/dev-python/pyzbar/pyzbar-0.1.5.ebuild
+++ b/dev-python/pyzbar/pyzbar-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Read one-dimensional barcodes and QR codes from Python"
diff --git a/dev-python/pyzbar/pyzbar-0.1.7.ebuild b/dev-python/pyzbar/pyzbar-0.1.7.ebuild
index e060e95abcca..b654f76e3a87 100644
--- a/dev-python/pyzbar/pyzbar-0.1.7.ebuild
+++ b/dev-python/pyzbar/pyzbar-0.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Read one-dimensional barcodes and QR codes from Python"
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index f02b58876804..e33600b2ecf2 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,6 +1,6 @@
 AUX pyzmq-17.1.0-test_message.patch 725 BLAKE2B c756ffc65b1091f5581c1a8b60c5108c736a6cbe0eed6e5420900b39e0b8b4d656ec82851ad35cb734744486f90325c6bde9e5234735144b19c58a94214e0913 SHA512 4b97ec70740a03e28bd21bc50af145c69b3546e2c5c01b5e7db4b577facd3d1f01d84c5539aff7e6ac44549f90c86be52a09bedac3e2c027cc792b4dbed0da20
 DIST pyzmq-16.0.2.tar.gz 1026531 BLAKE2B b276fea116d56595ff2aca8a00b2b8918c0170cf1522c4bb457f6bb0d44a13e63de18e4d4f53238a1a5b515986e029ffebdded269f191d62eb36d988b328b402 SHA512 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96
 DIST pyzmq-17.1.0.tar.gz 1082716 BLAKE2B eed059cad8cc37e9315d16a43768f531ada1274b46bdf91d2ebe83cd0b4c269ea99a8532e3db6d0ea68be31600cf7d29ea4c4e894aa6d04c61534b11fb816d54 SHA512 7f1975c4d02e7d47577049da8df84753905d01672d5a244cef2e5b05e0b6fdb22e88cbb36f2e59831e95a8224819183d9a82baf1f9d7f599da61bcbfe2fc23d3
-EBUILD pyzmq-16.0.2.ebuild 1771 BLAKE2B deaafde44dc6556dca4413835dd597d9cfdfad729ca116f830e5b6eb37fdbf2113f2cf38304bccc8d6cdfc980c6ee03b06bd7c6144a5a86598d2026b6b0fb1cd SHA512 346fa8c66779ee0a5b7200efc5860afa9db2e182a8e9828cff0434d9c529d418eca8e8183eb43e14e86f30cd9589937f4bdbfe33ab66aa57da5eb37dad16d561
-EBUILD pyzmq-17.1.0.ebuild 1844 BLAKE2B 30939fa37926c3a1ded98660102ccf1ae4ae9122143a7f262430ca7bafea103d3296244f42bfe0faa3fc1b216c2cedea077de9a83e55468a6838d09961e7160f SHA512 8fce5dac2423663adb17cdfbbb3b633d08192962b11a5cda7e40847d0dc606cbc464dd64449f11ac0daf4de8a3b3d0c1d1d1d944b590fa04c6b99506c2e60ec5
+EBUILD pyzmq-16.0.2.ebuild 1769 BLAKE2B c17a052f1873a15ce9dfeeff85f3cc1df49e39eb8fea26821fd04cdebf34d2879f0318b3ad16c2603f078be0b2fbf6ba0c1281198aafc4f21b4e1f67fc33f9ee SHA512 9ef86b6adb8fd2eec0733e76be3da99e6cad72dd9f3647f0e0882a4220702cd9ef1ed6b0d919e2f118fcde6a4988d25604b95b5ced691ded5f4924be8b8e4887
+EBUILD pyzmq-17.1.0.ebuild 1842 BLAKE2B 5544284ec6dbc4b104b33d92b8435c85f74bde623a5e059508f5dceaf33f95920f19b81a1a407d3a8bebf1abd1fa0ffed4557db51a5794256736208dc64fb42e SHA512 2894ea32204d9dbca93a31638ef223900ba821ba4223856cbf92936d597c446ffd787dae597aed5367041f548c55c9177214c99c8eaa182fb5002f4f4f1eabd5
 MISC metadata.xml 318 BLAKE2B 332c15a9f2501968cf1ef1f794c6ffe69c196b0d1574889cf90cbffe394e01aeeb869d4644d3182bfb4fd6f1fd1b08e4d73bfdeca401e7071f547311fcebdab5 SHA512 82430ca9ef38b198825652b6a35b18070c4dbfbe9e662311755c6436e98d37b83c44c1d1aa9ade477b5eefadef85390ca1e6c3d035150a850ec08e8134b4f03c
diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
index 8e8ecf5271ef..914737e0cb2b 100644
--- a/dev-python/pyzmq/pyzmq-16.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit flag-o-matic distutils-r1 toolchain-funcs
diff --git a/dev-python/pyzmq/pyzmq-17.1.0.ebuild b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
index 64bee69abfaa..90216948f4ff 100644
--- a/dev-python/pyzmq/pyzmq-17.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit flag-o-matic distutils-r1 toolchain-funcs
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index c15588253261..82a82f0a2586 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -1,5 +1,5 @@
 AUX read-stdin-as-binary-in-get_input_msg.patch 2751 BLAKE2B c348d28eeb703ff9b257c915ba6c6ac62e95a1f389173ff2fcd034dbcfdf8b9d9fd075365b9033fe13a3f5ec6a24dad5110c468f54dc5417241cf5cb95e5933f SHA512 424d7b640e4f297bde5e98c92b7fec48c79998b07a710f685f786c673ef10981efc71647973fdd05ac84879387ab5eb97d5c734bf5b03827dd998cf292948d5b
 AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c25163f68738281c48638b86c8809b5dab8f6f3c0058f17b1e2232d7c704b4aa777aaaf43c63170478da95272e75492bbbaec696789 SHA512 d9f5308d1f9280db5a0556fcaf3927e261b6cd1d01ff42c05a912335c6f9343f78096eed645aab5c741c221adf5ece00137aa3ae6f950cafbeb77db1908949b9
 DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
-EBUILD pyzor-1.0.0-r1.ebuild 2158 BLAKE2B 02623413ccd000332bf6611d42b1ff13a43c36ca33fa816dbc42f3f5abd67b94163e2f2428b3d3a122dfb37c4b804d493e20a30a0fb771b565c576a2362ad43a SHA512 965298625e7a9a9be2af4e9343d8223642c91cc74d06492a728780203ee093e0ea9753fbdf6722c8a63304bf445434957ec80de01cfbfa9f5196cfa29b244dd3
-MISC metadata.xml 1061 BLAKE2B d2ad7e863f055f46e4ab2048cd8cf042444476da9423743c246ede1f6b3f2b8be4b9f980da10e741726ae25625af09a8ce6eeb7710c2f5a8ceb4cc4f915d2e61 SHA512 58d18a197dd3575d7644f0e9f446344ccfcc321d33493fadfd89f7f233a1dc58e0c899b42a3ae72b219dc1327e2de6eeaf90a8de3735fdc0dc1f6c67c5cc8722
+EBUILD pyzor-1.0.0-r1.ebuild 2015 BLAKE2B 4fda5c9b1549c2433961ca4dc23f03b1022d314e60d93c23cfc7e73131d802b3696dae2dcde6892d13058f3499339c32696b0557a53ba275ee3d3e86bd389635 SHA512 a22eeb8f485a9ad6b0547bca19ec840fcd628a18dd34c589a5835e3d502553969bf8ef90f19e72dac33ad1c3e36fcae42cff19a010fdf2274bd25308c8a05d0c
+MISC metadata.xml 887 BLAKE2B 5a399af14ad9aa5eefe9f37da9b43addf24e6c5416827721f110a5cceb44eb9f03c78ac0b149f31468e5206a10c93c98d3940783c39ffa8f04b840a94c3fa850 SHA512 c3967f9f0e2c64f510f04e7ce01f89a2c03a7e1f260ca25a3d29b6c7821dbcded3ffa4b16f640693b08f3763793c733689c30ef8710305a4bf0b706605eda138
diff --git a/dev-python/pyzor/metadata.xml b/dev-python/pyzor/metadata.xml
index d88c249a89ff..77b1c62d6729 100644
--- a/dev-python/pyzor/metadata.xml
+++ b/dev-python/pyzor/metadata.xml
@@ -13,10 +13,6 @@
     <flag name="gdbm">
       Enables the Gdbm back-end database engine for pyzord
     </flag>
-    <flag name="mysql">
-      Enables the MySQL back-end database engine for pyzord through
-      <pkg>dev-python/mysql-python</pkg>. Only works with python-2.x!
-    </flag>
     <flag name="redis">
       Enables the redis back-end database engine for pyzord through
       <pkg>dev-python/redis-py</pkg>
diff --git a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
index 77b1ba63737d..da62bba384ae 100644
--- a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
+++ b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
@@ -1,43 +1,43 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 MY_PV="1-0-0"
 DESCRIPTION="A distributed, collaborative spam detection and filtering network"
 HOMEPAGE="https://github.com/SpamExperts/pyzor"
-SRC_URI="${HOMEPAGE}/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/SpamExperts/pyzor/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
-IUSE="doc gdbm gevent mysql pyzord redis test"
-RESTRICT="!test? ( test )"
+IUSE="doc gdbm gevent pyzord redis test"
+# The test suite is py2-only
+RESTRICT="test"
 
 # The mysql-python library is always required for the MySQL engine. We
 # depend on it conditionally here because otherwise repoman will balk at
 # the potential conflict between PYTHON_TARGETS and USE=mysql. But as a
 # result, if you try to use the MySQL engine with python-3.x, it just
 # won't work because you'll be missing the library.
-RDEPEND="pyzord? (
-	gdbm? ( $(python_gen_impl_dep 'gdbm') )
-	mysql? ( $(python_gen_cond_dep \
-				'dev-python/mysql-python[${PYTHON_USEDEP}]' python2_7) )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
-)"
+RDEPEND="
+	pyzord? (
+		gdbm? ( $(python_gen_impl_dep 'gdbm') )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+		gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
+	)"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( ${RDEPEND} )"
 
 # TODO: maybe upstream would support skipping tests for which the
 # dependencies are missing?
-REQUIRED_USE="pyzord? ( || ( gdbm mysql redis ) )
-	test? ( gdbm mysql redis )"
+REQUIRED_USE="pyzord? ( || ( gdbm redis ) )
+	test? ( gdbm redis )"
 S="${WORKDIR}/${PN}-release-${MY_PV}"
 
 PATCHES=(
@@ -46,10 +46,7 @@ PATCHES=(
 )
 
 python_test() {
-	# The suite is py2 friendly only
-	if ! python_is_python3; then
-		PYTHONPATH=. "${PYTHON}" ./tests/unit/__init__.py
-	fi
+	PYTHONPATH=. "${PYTHON}" ./tests/unit/__init__.py
 }
 
 python_compile_all() {
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
new file mode 100644
index 000000000000..0a08b22644dd
--- /dev/null
+++ b/dev-python/qdarkstyle/Manifest
@@ -0,0 +1,3 @@
+DIST qdarkstyle-2.7.tar.gz 9156490 BLAKE2B 6c1c21c728725f391802b30acb6365dbd073328158fb3a60b4e2b5bb846337149c166ab447b1e84a404b01b4bc41e1292fff974b2a9756c6c42f4b40754c9a0b SHA512 6185cb85009d62a74021c3267039c6309757909903d67a1b67315877b84d4ffbc468f49cbe54ca4c7319710ea74652a3013e574698d2037cc4f2d83c9fb2b28e
+EBUILD qdarkstyle-2.7.ebuild 1010 BLAKE2B 9ce7130563f84ef439fc2cc7ee8fc4543df2b413f9d5ce62e906ae930b7695127d953e87cc113712e8655fbd294cf822471dd2c132a7101805b9ccd73da3436d SHA512 4cbc3b6f3405d406a822e5c7e0b28c42447cfe01502bf94b14080929ff8b06c4efa998e25e80e2b22eae6d39723b2b4eee9a99f277c5994a0389e1efc5e2fa1d
+MISC metadata.xml 376 BLAKE2B 66f5bc55ef2f40919601f4ed1fddd0bac47a7e42cf87f4a5fe085a90420d6d3ff21fb156319cb6c241b1241f7dfb261612ba0aa20d54dfbeb9801cbad34aeee2 SHA512 9741d92e63a63121645ec2c8f08a37850524b299cfdad5b4e70def0a8a50f35dde5c9417f4d4c067edee641b2050a128c7a792ed6d59137809e1b1a77fb469c9
diff --git a/dev-python/qdarkstyle/metadata.xml b/dev-python/qdarkstyle/metadata.xml
new file mode 100644
index 000000000000..20ab94177c12
--- /dev/null
+++ b/dev-python/qdarkstyle/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.7.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.7.ebuild
new file mode 100644
index 000000000000..ef8b2be9d963
--- /dev/null
+++ b/dev-python/qdarkstyle/qdarkstyle-2.7.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 eutils distutils-r1
+
+MY_PN="QDarkStyleSheet"
+
+DESCRIPTION="A dark style sheet for QtWidgets application"
+HOMEPAGE="https://github.com/ColinDuquesnoy/QDarkStyleSheet"
+SRC_URI="https://github.com/ColinDuquesnoy/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="examples test doc"
+
+RDEPEND=">=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
+	doc? ( dev-python/m2r[${PYTHON_USEDEP}] )
+	examples? ( >=dev-python/QtPy-1.7[${PYTHON_USEDEP}] )"
+
+DEPEND="test? ( dev-python/QtPy[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_install_all() {
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r example
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+		optfeature "qdarkstyle.utils" dev-python/qtsass
+}
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index c6749afcae69..2e66d88cf812 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,6 +1,6 @@
 AUX qrcode-5.1-unicode.patch 961 BLAKE2B f0fffaab08a6e20bf2897b4130f25b1639992a4184114f5ede1833cbbf7e8d9f7aa0fa9ae631d0af8d84ac4c372d96e4f0809fcba6168c2bd6d23a7c39e8baa2 SHA512 f75feb86c8796e73d7089fba8e0c464929452c4be24b2829fd231bd210d2152710529aa3e3266bb88453ee4f69fed2a1f6cdf337a8ff44a345f3f7d56c969af0
 DIST qrcode-5.1.tar.gz 22259 BLAKE2B 1aad710fbfdaa1c1be505038ceedbf02de8bcb2a37ead59265ff03af63b96d6cd740672cb2bd3a8f3b67eb981ed791cf2d53050c02d1499e6efcf1fcce2903c1 SHA512 67a7bb51fe2386f3b1ac0b799d3850d3ca4f61286fdc809654df3f5a1071b503707a9a3e82e595b7611dd9d7b7e74b36e19b86942fb5ad94c256cd7ca9aa02f3
 DIST qrcode-6.1.tar.gz 29363 BLAKE2B 5f31035b6c548c710d0d8198428612fc52417be7af5b5f412a42d264cb6a3ba96de65651049390107cc77e886df2b139942266aba579896f05692177b394ea11 SHA512 4831553932442f5535cba15d5958a656b399112f0f379c28ad9b610c33d88ec6d0613dc7047a2315606e49f027bfd13a15a332ce86b80040d56e1114a0f62251
-EBUILD qrcode-5.1-r1.ebuild 968 BLAKE2B af5927394bf487a4cd9f6f3f602e53f60a2933f7bbf18ae95459e1958aa84611e37b557d2ab913d53aea752c4793ebb8b24ecaedff805569cfefe0285f96bc86 SHA512 497e34df0780a354680cc6d1605ed8fb75cb8724cf20cc47008ae6d809fc8b62a8caaa2be015d837830d57aafc8928bd0cf55f54b2259d01327026e0ede11595
-EBUILD qrcode-6.1.ebuild 788 BLAKE2B d21d4e892f80df50582e3596feda7813514e5dc2d21df56cacc902db7f1a9dba6a0da16eccf9c3a5f2988a735e29b875bd86e949b0aa4f28cf29e8834417a4d6 SHA512 a78ab56df7955a1cf06af044289dbeeaec061309e2f5a3e2472f1455207a2de2dd7a07878e513e8cb73a326098a6ba98a9f242d024720b119572e0715b0f2206
+EBUILD qrcode-5.1-r1.ebuild 964 BLAKE2B 81d948b09b658702e2c3f9f4fe9126fff38b64c3fe39181c26a7a2faefdc2c508a66ba091cb1c35d76bd3fa702c35e3dbc1d001d79282814b4305d34281fae1f SHA512 782e82b0c830491bc91c53752b9675ed93a57730b028281c27aef6872fef319eacfe75bcaf26edcf56c7f4d79ddde74501e863cc73063e8942ee6488022a22c9
+EBUILD qrcode-6.1.ebuild 786 BLAKE2B b4181336f95a2a1ff0453c2e7f508bfaaaf1e35fecfee5b6b00b6f5d2bc956ce853fc4ecef1b1c23db441ebc32212f9102040326a4f1499499770239f2165f98 SHA512 2a0b4466a6874e7c38e24b210510d62ab732e2a4fe4cec002360799b8e94706c33fbba2db0075e6b303c446cc21424cc09f41bbce6d747d129a2d6d439cc79cc
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/qrcode-5.1-r1.ebuild b/dev-python/qrcode/qrcode-5.1-r1.ebuild
index c49e4ef69398..b31e50dc1957 100644
--- a/dev-python/qrcode/qrcode-5.1-r1.ebuild
+++ b/dev-python/qrcode/qrcode-5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/qrcode/qrcode-6.1.ebuild b/dev-python/qrcode/qrcode-6.1.ebuild
index 13b2c4b1aa39..a59ffe76e88b 100644
--- a/dev-python/qrcode/qrcode-6.1.ebuild
+++ b/dev-python/qrcode/qrcode-6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index be20344279b7..cfdc9cefa580 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,7 +1,5 @@
 DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
-DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
-DIST QScintilla_gpl-2.11.1.tar.gz 2932060 BLAKE2B 9f2f9fd89667cc04c95d0a36e4a615dcf3c1c11a5446e19a43104513894b76bc7478f2aed7e8c94ce413f940327deb09e51507bee1fa35c79c176e01e6b74767 SHA512 40b600aa8eec17bc99491a08aeaee72bf498a66f0257d310a8df2667de82805715b9c859885c092acfb03ba8f69433a6517d0d4bb324bf99bd9db461172c08d5
-EBUILD qscintilla-python-2.10.8.ebuild 1551 BLAKE2B bff3a35fec9120904fa4b3e9c5c731334a0d9bd61de51cfa582a0cf41a26d64602a682fe5fdc0f27d4c916b50418c71c1344cf3fe88d47ea05613886d3180c51 SHA512 b559358ecbb09e10250d64145b1629795bd0b57e228cbada6239199a8436a951e5dd298916be6d1904f1c99bc70ee04592b1b9cd300ca7f4adb1f42ffe340965
-EBUILD qscintilla-python-2.11.1-r1.ebuild 1746 BLAKE2B 8081d98716c04e0a1b8bbaaec121cfa7550c60894ab17a71e7562fc66f007b7a355cb2e348a1da29257ab72ef7f02ac184795217cd503a157da169d3c7d05829 SHA512 85fe725fd05114b438423c8ac6248c0b0dc3a9ffed4bc073ba803500d69974403bda0dcf594001c9fd20dc46a6c3a20865d725eba8d4a068e8feb3c7c82dd6e2
-EBUILD qscintilla-python-2.11.3.ebuild 1780 BLAKE2B 3f6a76d7518bf64053a2e28e274c23b8fb58c32e6bb93dae2ffcdcb02f362d00b09bdbc3957dc9470de14aff88216455f2ec320f3f79997e4986fa9c191f1cf2 SHA512 1973fe56f30b8fc94a51ea51fd9c0e0b9d206160f40151708ae3c5e91dd7979bc08bfc44958063406b511ad2459ecf8ee14abfafc66d86b526d87ec706316a88
+DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
+EBUILD qscintilla-python-2.11.3.ebuild 1776 BLAKE2B 505a26310b6a0a3827901fa77aebd7ea6bb8a5a070cac2360357a455ef2b1e87e983c72f1bf993154a95b9fe3b8e5c30f5d067a11f4760af06b471bf7e582079 SHA512 c36bfbe554bf1e20e92b24ab7c22c47c2a6baad097487a9177b2941a61417821b5d8e064bfad974b1b299822165cfe94e6a0e35d24dac3d8d717303cccf47d4c
+EBUILD qscintilla-python-2.11.4.ebuild 1778 BLAKE2B 912ff966eafab558411e83f6825d75336229233e2c41e246d813aa2d5dff5e3cd3186948ef991c0b2f443c1a95ebfb4816ac258f064feed389887d4f70c09689 SHA512 c068690bb6d0593e6e18190d697eb24f17360867a968b2f99aed37c58ac63a9c548da10cd9254dcec7eae287f352e3e53a3bc3192a30c05363d3177838cad9c8
 MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
deleted file mode 100644
index 1b2bcb06dd65..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit python-r1 qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	~x11-libs/qscintilla-${PV}:=
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_prepare() {
-	default
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			configure.py
-			--pyqt=PyQt5
-			--qmake="$(qt5_get_bindir)"/qmake
-			--sip-incdir="$(python_get_includedir)"
-			$(usex debug '--debug --trace' '')
-			--verbose
-			--no-dist-info # causes parallel build failures, reported upstream
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain, build flags, and prevent stripping
-		eqmake5 -recursive
-	}
-	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/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild
deleted file mode 100644
index e5efd8e7353c..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,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}_gpl-${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 ~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.14:=[${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.14[${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' ${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/qscintilla-python/qscintilla-python-2.11.3.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.3.ebuild
index a058f7a3eab6..0b538885a2bd 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.3.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QScintilla"
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
new file mode 100644
index 000000000000..faad16f73f2a
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
@@ -0,0 +1,76 @@
+# 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 ~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.14:=[${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.14[${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/qserve/Manifest b/dev-python/qserve/Manifest
deleted file mode 100644
index 34c68d6d108a..000000000000
--- a/dev-python/qserve/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qserve-0.2.8.zip 18637 BLAKE2B 10bda506ce66d090f11a6e92fbc06e93062be2bc8ae0c659ede28829e899035008a59041d22e3e9364794b92a5b3e105c223e1af56b122552ca5357869cb1d6e SHA512 5311606992c96fcdbd350c47598ea9611ad93fb513bdbed081e570a8674861a3f1bd83211af635f8ec6a943f7c826f5c5872d2e62c672f9065c19e71dbfabd34
-EBUILD qserve-0.2.8-r1.ebuild 619 BLAKE2B 6271d5e43d146feeee427af5959b482c0617e9fe93c8075031456a421bf38aad26525c26928d761b3347f84de5f45c4243a749c3217465c4471e597d974304b3 SHA512 e286d04c58c61b490c2aa41113b59f7328a31c469df0e6c01949604eedd05165465eafb4dc92d21e6d61fedc40392f083aebc154027088b9a92c614ce32df60a
-MISC metadata.xml 378 BLAKE2B 7b6106dd0ec54e7033d186ffdb6a31258cd8638cc50f56f12f25e5da9e0a5dcedfd56b6ebc0027a38f42120b4a2183dc7b1c5eb8114e7fcf70253096f19b13ad SHA512 a3d0165f485913196a0f766bc6bd9464bbe873f67f847cfe735d0da75fbac220510efa802dbb7ecf63a411748305e9d5bd928e292a2da5e83f73463bc67cc561
diff --git a/dev-python/qserve/metadata.xml b/dev-python/qserve/metadata.xml
deleted file mode 100644
index ddd1cf601d63..000000000000
--- a/dev-python/qserve/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">qserve</remote-id>
-    <remote-id type="github">pediapress/qserve</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/qserve/qserve-0.2.8-r1.ebuild b/dev-python/qserve/qserve-0.2.8-r1.ebuild
deleted file mode 100644
index fd04ac880766..000000000000
--- a/dev-python/qserve/qserve-0.2.8-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="A job queue server"
-HOMEPAGE="https://github.com/pediapress/qserve https://pypi.org/project/qserve/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 060eddbdb82c..c81d8265d16b 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,5 +1,5 @@
 DIST QtAwesome-0.4.4.tar.gz 159621 BLAKE2B 468f927b537eeada0926fc989498e6b1e2a5fc05a67f9f2286063c1feb0479798e95f07a05d8afaf51b07fb25b9717116cf4819b7830c0daa6e5807afdd6e756 SHA512 9dc8659993b8d61757865a1ec76f76e76db1232c6801f8216688c0578f612897fe189313c27107be264ac61c6ee2a866056acae51241be73a4fc5e9e5825008c
 DIST QtAwesome-0.5.2.tar.gz 610721 BLAKE2B 791e7fb6570c53f4c86cf51e1774218d09d7767e02fc70449fe61544a1dd71ae0acc6c95dcb5688d4137a220a15ea348cdd08163367d600944af0022c17ad46c SHA512 23b1fab5cbc36e2d99edd63a1f0b150b1ae3638297a3145028edbdd57de75a7d68328e70ecd7709f0f0faa75001b791505f031cff939660b0bd5737feeb8d669
-EBUILD qtawesome-0.4.4.ebuild 595 BLAKE2B 955c40c01c2c583eb2303fa834bb72b7753bdf67ed79b33b4ffc9cc9abab4262da149210d5ec6cc1fa224ee50e28718b06322c529e5588fc416079d706709889 SHA512 c9f7b0188d1115948e7bc8df439370ddf046baf947fdcda896c3cc61193d43a6f94c47eb46a8e4f0960eb72bd9caf83310e0244be7d49cd953a42323c3a0b3d2
-EBUILD qtawesome-0.5.2.ebuild 599 BLAKE2B 850d0a76f7ee44b4a6c377a34f53b4e9aa4848bc014a6faa85c4d01fdd38b7cccce689e99fbf03016e6ef6949b625e2f5f9478519ced6d0c92c7d9b5ca192a19 SHA512 ca9104b2256111a1dac72bdf55bd80cff476f8b3dcabaa5b1fae3b9841cbc5abd5d4e9ba820ef6b81e5a466b33af4b025ab0e8699e8b187e92bba9738fb63e6f
+EBUILD qtawesome-0.4.4.ebuild 591 BLAKE2B 3e50f5d6721fd84c710d8cbd1cdbd190aa0494f670f700d0494f5306a33cbdd1a7cba70938766e035abfe43e90f965126fbe1e10f61a4654e62be50cdfda8933 SHA512 804a5ebceb01eaaf0e6a6d8f8a577671772e1e13c779bdb0f38671795785c7bf10b2e615e5df25fa6da11d86858ca8549fb04cdb6344a88079a0911761d177ee
+EBUILD qtawesome-0.5.2.ebuild 595 BLAKE2B 9181a9ae881f231a7a78a9101f8c78cdc9c028b3e63cff6e569c2936e8a80a71c87daab48755c60521b425749938638c5bcfbdcec48456bfa7f8571c5c459923 SHA512 2b3f8ebc6ea8666c367df0409cc78f14d1a8a809ab5420eecfca3a54b94499f6ebf94e8a33b9ddfc175fef3c466c2f42b932c379f75938a3deea216c152ea098
 MISC metadata.xml 659 BLAKE2B 7b2b8a66c287c10e194f54a52cf3fbf0ee9b23a3bf8d04b036a368e08b5c5962acd9240cbf50146e34636589d3fdc50a4f0a36cca71ad78863aae622665fc99a SHA512 0e0b4b1ba22fde6a3f2bb78a57575ace1d8761cb3cbe352e5c2de606be7eddb1864f526b51766de3f5194b5eaf7152f1cf7020b1ebc8b785fb76f76ef71c9718
diff --git a/dev-python/qtawesome/qtawesome-0.4.4.ebuild b/dev-python/qtawesome/qtawesome-0.4.4.ebuild
index b5abe64fd020..fbb7d0c1308d 100644
--- a/dev-python/qtawesome/qtawesome-0.4.4.ebuild
+++ b/dev-python/qtawesome/qtawesome-0.4.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit eutils distutils-r1
 
 DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
diff --git a/dev-python/qtawesome/qtawesome-0.5.2.ebuild b/dev-python/qtawesome/qtawesome-0.5.2.ebuild
index 9dbe80a92921..abb7ca60df7a 100644
--- a/dev-python/qtawesome/qtawesome-0.5.2.ebuild
+++ b/dev-python/qtawesome/qtawesome-0.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit eutils distutils-r1
 
 DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 850d3b3a66eb..f9ab8c9a1250 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,3 +1,5 @@
 DIST qtconsole-4.3.1.tar.gz 416931 BLAKE2B ec47c2ae8527d7aee55d6cb8d2ebea39ab1bfd3a268c46306613b67f72c27904db1de52682a47d075d804dad9cd7c124296163b39532936fb1a497ae606b7ffc SHA512 f0f84d95143b4513c3d12af4712c6a5724143bf8c44e7a3fbc06d7a94e665b8d12072dd13eafb09476a3aa829155f4c75eb517ffb2bd6e8bd3c00af3c764e48f
-EBUILD qtconsole-4.3.1.ebuild 1721 BLAKE2B 6e316508e8863490ccd89c6782af4f7520321b815c0b9b0738ca4d673e8b1c05340500d8a2bb0b4d8d8e9ff0798b0bc0acd9a4b4b7875e33a57d35d533749062 SHA512 1c5f404931816bd9fe66ae09543bbb5ee2c0c0a70d0c5077a90756b13e12fd285663e6339d2b27db9da4cbca7b45fece83154b9083184650a9053bc7f1198169
+DIST qtconsole-4.6.0.tar.gz 426936 BLAKE2B dfd61258e2e8a0ba74421253f39392e2daa04acfd072361488fc93087e2aa4daa62203e4da501a24db43a79eafe7eaa8528f54edbf7b6bb6d547521cc92b8829 SHA512 196022af0d9ebe9e065bf46c07f90bddb2c314d4f0f778f828e20200b11085150ff3ad3adac944496b778b926a0ccdec7903de27be25b79be7fe3ba867148b0b
+EBUILD qtconsole-4.3.1.ebuild 1719 BLAKE2B 80f055d26d801710b9e3b04040e85a6389663cd4618e8411b2a8c7deb1ad527a69fb8988c14ae6392a5dc7b72414b69d09051fad61f6d1056012dffd8ddbb25a SHA512 334c6cdd176c845c161688b3102ca3ad57e5e66195e264dc7347f0b7100307137c59dfce79eb1a88d08593626ff9da4fe0f1624fdd943a71bcd92a629c630665
+EBUILD qtconsole-4.6.0.ebuild 1250 BLAKE2B 1c6a5f6e228254165e0c5115ac6ad7295a84138d248ff47bee9bbd60e2285fc15465ceeff8cddb2530fea391085ae6c72bd8ecf477dfd93b068b00ad8b0b9c93 SHA512 7d9170f152080c7220beb5d0d137128be01359c5b22ae2e226f6c48cf0327bb74f7ed072fdff5a505f255d45a137bbd6e6d1241d519a07e022e03c8b7bba7c6c
 MISC metadata.xml 557 BLAKE2B 09988fd98b75ef9c7847cc1035f6d8726375ec61638dc9ff01c0ac9556ce16afe987a66e0ecd674a376fb9af39ec2c721e04abd829f1153652d8eeee82c089ff SHA512 5f176e9d82b9031b0d15c32986074431f03e33843a50f68e94d7aa0ba10c31370e2c4ee0651481d7a5b42f873e0aec4771c9fc7ca996386286255166be20d8cd
diff --git a/dev-python/qtconsole/qtconsole-4.3.1.ebuild b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
index 187e9119d4e3..b4702ee0ac65 100644
--- a/dev-python/qtconsole/qtconsole-4.3.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/qtconsole/qtconsole-4.6.0.ebuild b/dev-python/qtconsole/qtconsole-4.6.0.ebuild
new file mode 100644
index 000000000000..6f4c7f149e77
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.6.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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	)
+	dev-python/PyQt5[${PYTHON_USEDEP},svg]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-13[${PYTHON_USEDEP}]
+	"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
new file mode 100644
index 000000000000..39f76e1965e8
--- /dev/null
+++ b/dev-python/qtsass/Manifest
@@ -0,0 +1,3 @@
+DIST qtsass-0.1.1.tar.gz 12266 BLAKE2B 5c070170262ae3f54286f2bdf480aeafc063f45c1a3cedf9a1ba9f729de941769f6267ceadda4e19bcee6a9309a174753b6a93b2ad982017a001cd72d9d77838 SHA512 5cfbb056f5091d18d2d7080bdb24bf7be5ae07964d440d3a18f5f955f19028fce0535b634c0fc4c3f78d49d82370c857547bd3dab32ae8567e797cdeb4d60058
+EBUILD qtsass-0.1.1.ebuild 415 BLAKE2B 2b9a5b2c273c7685b463a5983e4a94eaac5aa89830453c87663fb47a0293ece2ad22fdc4c209a892096262efa5ffcc14cdf094f6941ed10fab84a35ac63d16b4 SHA512 b4d96bd376368cf5dfefef6f05fe500c0885dfe24b9234de9eaaa009d8c2e53da18ad907bf346a60797e52baf3520390475a25b0415047fdede9a07948df5e41
+MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/qtsass/metadata.xml b/dev-python/qtsass/metadata.xml
new file mode 100644
index 000000000000..dd0bd9c021f6
--- /dev/null
+++ b/dev-python/qtsass/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+    <maintainer type="person">
+        <email>andrewammerlaan@riseup.net</email>
+        <name>Andrew Ammerlaan</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-python/qtsass/qtsass-0.1.1.ebuild b/dev-python/qtsass/qtsass-0.1.1.ebuild
new file mode 100644
index 000000000000..fdaf47419aea
--- /dev/null
+++ b/dev-python/qtsass/qtsass-0.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compile SASS files to Qt stylesheets"
+HOMEPAGE="https://github.com/spyder-ide/qtsass"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/libsass[${PYTHON_USEDEP}]"
diff --git a/dev-python/quixote/Manifest b/dev-python/quixote/Manifest
deleted file mode 100644
index 2fe9b1ff2493..000000000000
--- a/dev-python/quixote/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Quixote-2.8.tar.gz 474323 BLAKE2B 862ae01d546203cd4b8791d615e3c354990bf4d6f0d615873c4e987de64fe3d9dbeaf7b37d642cb3024da3ecd8887962e3d878f2a3fe4f07c1dd0be80b52b4a0 SHA512 d25e82228706966d1e3e24a07b8d1b62a016571f80ad375fa846be9fd720d6c2c8009b53f7abf72cd14ade36b3a69ac9a153d7017a88b5d420d571da45bc6558
-EBUILD quixote-2.8.ebuild 1044 BLAKE2B 33b8cc3d0d4b0444e94cdb638933576b6c0b0d1653f452d1334c906ce31b74e105f8c9c5a982fab225ff92a260b6d3b4a571fae7210e982ee77894329680e1a3 SHA512 dd27152e84c5c8c76ca716399ccdb9486c0e145a2bcebc50078244c838cacb77fbc522ca3a1afc2d1bbcda6d8e233f1b48ab1cf22565222d471e04a7f838cb60
-MISC metadata.xml 350 BLAKE2B 8d3b4403e785a7dc7165a349dcb7b48ceca5892ca1e96ce825d88d346dde0001519d2110b483ebf0c1b1fe18bffad9d01607a6bb1e5364f06fbb7d667b44d257 SHA512 f0e59fdd63ae61df0a1c12b78d766216aa09d552f5c90d4088cddd85477ad9cba6be93a866a78fa22d46de2c90a01cf4e43b77eb483f0e0b2e5303bb2d62dff5
diff --git a/dev-python/quixote/metadata.xml b/dev-python/quixote/metadata.xml
deleted file mode 100644
index 0fc88ced4a7a..000000000000
--- a/dev-python/quixote/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>
-<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/quixote/quixote-2.8.ebuild b/dev-python/quixote/quixote-2.8.ebuild
deleted file mode 100644
index b6c839af7617..000000000000
--- a/dev-python/quixote/quixote-2.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# Appears to be written only for py2
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_P="${P/q/Q}"
-
-DESCRIPTION="Python HTML templating framework for developing web applications"
-HOMEPAGE="http://quixote.ca"
-SRC_URI="http://quixote.ca/releases/${MY_P}.tar.gz"
-
-LICENSE="CNRI-QUIXOTE-2.4"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc test"
-
-DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/${MY_P}
-# tests require a running quixote server, prob. apt. post install. Tried the demo one but no
-RESTRICT="test"
-
-python_compile() {
-	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C doc
-}
-
-python_test() {
-	nosetests tests || die "tests failed"
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rackspace-auth-openstack/Manifest b/dev-python/rackspace-auth-openstack/Manifest
index ac75cf067de9..e7ce20e587e9 100644
--- a/dev-python/rackspace-auth-openstack/Manifest
+++ b/dev-python/rackspace-auth-openstack/Manifest
@@ -1,4 +1,4 @@
 DIST rackspace-auth-openstack-1.3.tar.gz 6799 BLAKE2B 33754daf35b7260af030da4a83f61224c6bf11ec9fe554282b45c5839aabc5687e2fe288b9af6252e4731de5bea381eb8e8a98a401371afddcf996652f892f23 SHA512 813fe85d38bc80bae65a3f160f50c17fe8bc7279dc3ad4689012b3fa9c0fdd1577c0491de0c87d3b8fe4e6ba5c1166cf30cc1d0533fa15c516a826ef6c36934c
-EBUILD rackspace-auth-openstack-1.3.ebuild 464 BLAKE2B 6d49b99ce6ec78fa8d5b4eb436a8ac195e14ecf2b7ae8bada7fddb8f4f468c004b15d42e0f3c22fcd48b8a7dc593f424ed75b8634f678c2852812512b7e78bfc SHA512 099e78653d04438d1381cec7410dc5ae74f731d494b67d869cf5d7f164c936705cfba3779acd94b6fb4157688df295dcfe57da2d9d9318b893b78d1a9e9f9a89
-EBUILD rackspace-auth-openstack-9999.ebuild 460 BLAKE2B ef42b3abf627d2bfce6728943250fe12bba8892bf1596b158fc0b7ed2b41fe55cdd76b529fc3895eefbd8f93ec9c40bbd7fe2a6909764d9bfd04fb393ac532e9 SHA512 fadb4d90b48548f5bf6150712771438798047cbbd83ad3aff778bd6360be2d090d0a990e557d20d80b1e9b41893fb5f649f9a61a620ec35f18dab73cb4b745f0
+EBUILD rackspace-auth-openstack-1.3.ebuild 460 BLAKE2B c9882d933bb005dd2231db1eb196322fc7766afa86f3a8d76e25cc50f97529b80daeb802c5338d99e1ec034837632e5f2ddcb529ec6daf7c56d7680b08ccd2ad SHA512 63b90b18f270b7390c249cecacb0ef2efa1ddcd797582787f72c045c813edf54c9c77e6926a6080fcadc355da5a7d4446f13a602650b82e5fdb06503ea3ff3aa
+EBUILD rackspace-auth-openstack-9999.ebuild 457 BLAKE2B b497939bdb705c7af05c27a8dce3cd02cd82f2c3794a2ebd89c35ec3c59de825bbd878ed7b98a692578515aafeca7be7baefd8ca0604e1c870b20b1ac489bc66 SHA512 91289b960d067a3a059d1322d154b3a32a080a4783b96309ca0576fe9553c01190b7dfd956baff2ec557045717cc8b06a4ed67f02ab58fecae8a99205860b373
 MISC metadata.xml 588 BLAKE2B b868993dca0c3a017ae5e12e57983676c97e8d84dde1b803f0c0ae2fcab8b1b19f581a288ecbaa7d547457a762ce30e9551e88d58d61bddf19bb126dd87cad21 SHA512 c59d7bcf7d96b1eca6a82cdef09e717b97df65ca1ddaa9696a0a931ccb3af0a330ef285c23a0ed90324c5f49a8fd007989faa6a718c3fc79c631b7e548272221
diff --git a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild
index eb23ef776170..ca24a9461d24 100644
--- a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild
+++ b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
index bb290d8061fe..7e7ca5608e79 100644
--- a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
+++ b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_6 )
 
-inherit distutils-r1 git-2
+inherit distutils-r1 git-r3
 
 EGIT_REPO_URI="https://github.com/emonty/${PN}.git"
 
diff --git a/dev-python/rackspace-monitoring-cli/Manifest b/dev-python/rackspace-monitoring-cli/Manifest
deleted file mode 100644
index aee09b08b71f..000000000000
--- a/dev-python/rackspace-monitoring-cli/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rackspace-monitoring-cli-0.6.10.tar.gz 156395 BLAKE2B 53571dbcf7ef6d19aa3ca3af0f4284eff23411f2f54567e423bb5c0e1538d09d1bc4ab980136958d40403c90a120f0b306b13df7f9c1696b9a0d40cc54526e59 SHA512 538ba6667557e40eb1ab381a7be147805a6cfd46f10d51d30e38f35cfe18b9324f4fdfea051e22b083b510d0501c254c80b4914c07470db9e3a1de7d247d1403
-EBUILD rackspace-monitoring-cli-0.6.10.ebuild 746 BLAKE2B f17c57efd328b215b0c2dabe65d9edd812d8a7f16f98beee6a272b059f658846ccb14dd73cd458f3a00a3dfc9d3f6a350d92803d04f647f93b4bc53fad650969 SHA512 e84914c7bf064c6221965098b800c7620e1640b5050cd4536491aa78162e68a194d28a1f7c8f5107c2bac44e67a2fa199ff33992fd94430422dac983a9e62241
-MISC metadata.xml 538 BLAKE2B 498971ecd33a94696bd0898266711c2add08771e7671498482cce1eb3fa1e78c59e12e9479852cb5878c253cb827c943b8507a04d3f802f82b7ced93a2fa13f0 SHA512 fa68ae31bc75f2a71a9f5f5f99f2407fd6d48592f03f83698d072b84edffab76c2fb661575a2594ae1de87ab575becd0d3ca08ea71505124de00552b558237e9
diff --git a/dev-python/rackspace-monitoring-cli/metadata.xml b/dev-python/rackspace-monitoring-cli/metadata.xml
deleted file mode 100644
index 385c4b243b7a..000000000000
--- a/dev-python/rackspace-monitoring-cli/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <longdescription lang="en">
-    Command Line Utility for Rackspace Cloud Monitoring (MaaS)
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">rackspace-monitoring-cli</remote-id>
-    <remote-id type="github">racker/rackspace-monitoring-cli</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/rackspace-monitoring-cli/rackspace-monitoring-cli-0.6.10.ebuild b/dev-python/rackspace-monitoring-cli/rackspace-monitoring-cli-0.6.10.ebuild
deleted file mode 100644
index ea9e10ff2ca1..000000000000
--- a/dev-python/rackspace-monitoring-cli/rackspace-monitoring-cli-0.6.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-# https://github.com/racker/rackspace-monitoring-cli/issues/49
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Utility for Rackspace Cloud Monitoring (MaaS)"
-HOMEPAGE="https://github.com/racker/rackspace-monitoring-cli"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-TEST_DEPENDS="dev-python/pep8[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/rackspace-monitoring-0.6.5[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( ${TEST_DEPENDS} )"
-
-python_test() {
-	${EPYTHON} setup.py pep8 || die
-}
diff --git a/dev-python/rackspace-monitoring/Manifest b/dev-python/rackspace-monitoring/Manifest
index 2904ee7d3d4f..28466fe7183d 100644
--- a/dev-python/rackspace-monitoring/Manifest
+++ b/dev-python/rackspace-monitoring/Manifest
@@ -1,5 +1,5 @@
 DIST rackspace-monitoring-0.6.5.tar.gz 31397 BLAKE2B 7e51dd95ca801feae7effbd4c59b3d1a2efeff08c17938b82341a1a4ed0635923d1bb518912a1dc11f98a4a94ff7638431f5180975896f09956b9cca0e8a5269 SHA512 513e02eb7b823ed4287462ffe6517011c389119dbf37d90df31cc08714f93806188d07e4f8d339453b59f17c067229a3f52f1ae7aaf13a7c6504c0ef63b1f4fe
 DIST rackspace-monitoring-0.8.0.tar.gz 32989 BLAKE2B 6b32fb0b90189fa6f7cb89eb39a90f9581ebca75b0b4f2eba9d4046b9a35ead66c4d4d5a1addd9143ef71c1d4bf05a5a81bb0582b69da80c5f8de7dfbe744009 SHA512 df0a2c38f1abbb71858f0b4347c5e64b481d03b332c02926b9f0def429b37f0b2bff8e026c5fdac566ed391234cf17f64ef10149186b9ac72a2938c205d2b658
 EBUILD rackspace-monitoring-0.6.5.ebuild 751 BLAKE2B a9e67e060179a564e3f7a3ee4b64b84afab8e8f2ae70da7961e12f60ca30461560448bf249b536e356575eba3d7f1f65d66772821b86940e82cdc4b1b36c24d6 SHA512 375096d9709f279ac0fd138f204f88a98bb9d45d25d2fb82b520ef17d8ec2bf7623447cb5587285ca9ce8dcc7332a3f4e7eebb2e6d75626e3f3fb46050bfcdea
-EBUILD rackspace-monitoring-0.8.0.ebuild 759 BLAKE2B 81e70126e32635457602cde65db1ab461825033ac80be4927521ca47e99bcde65b1da887caf939924ce3c1b4f8ac27460cb47acf6e16e6a80d57b8e1b966e060 SHA512 669462e31c1731c852dd6326be5fba03030e54eb6c32a729ddc862918babda329d9bc3d3d2fa4fcc15cc8b634c26c1ebc1c75789376fb234301edb2500f1ea06
+EBUILD rackspace-monitoring-0.8.0.ebuild 755 BLAKE2B e17e16f54968a7d3fcd11c69eab5849d36e3be975cd08671a934ea66e0ef47823cea67ba9b40253454d9e921eae4da1b8d9b74576da4980aea752170e7dfcfbf SHA512 fe9f3133c83e62c11326ee0be14f981f4a1c0f14d74f2e4f613747bb6c0b5f9f2e931ae98eb84691aa6bf22822f147f5e5c81d8c04f3b83ebe4c7e5e21ff30fe
 MISC metadata.xml 625 BLAKE2B aa5e2b5fe0969d8e75886b59ecb571eae8947534026b6700e9ca165b2e039eb82762f8e2f07353c19c5bb691e810b542a1c9769036a82c4b55ae4a7989735bab SHA512 32694d23bf7e16926d283b4cde2d1afe82dddd8da74c29f4c654173883386b54378d4d29ad2ce7bc65452b22a69c6fd582303ccda323d8be6ef6808b5404e326
diff --git a/dev-python/rackspace-monitoring/rackspace-monitoring-0.8.0.ebuild b/dev-python/rackspace-monitoring/rackspace-monitoring-0.8.0.ebuild
index 217c1def6a47..6358c861c62c 100644
--- a/dev-python/rackspace-monitoring/rackspace-monitoring-0.8.0.ebuild
+++ b/dev-python/rackspace-monitoring/rackspace-monitoring-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rackspace-novaclient/Manifest b/dev-python/rackspace-novaclient/Manifest
index 653bbe85eb97..f29b0867f8bf 100644
--- a/dev-python/rackspace-novaclient/Manifest
+++ b/dev-python/rackspace-novaclient/Manifest
@@ -1,5 +1,3 @@
-DIST rackspace-novaclient-1.4.tar.gz 1706 BLAKE2B a202b150d242b91420c4e4b0b9f8b3b34b2cd058e4bdd14937b9fa0cb27a7ace7963a3482722a96cb8c085d05851af4db9a08d0f80b6523674876f02fe876425 SHA512 d36e6e331f37a9cbd6802122d03d47678ff01a5e0b0aab4def337fccd1cba9b16e088c0b27873c0612fd31c188676471805f81240127d1432613f573c1cf4281
 DIST rackspace-novaclient-2.1.tar.gz 1729 BLAKE2B c9afb824c66bccf2a19c47f9d1a05d8372aaf98b57c463e4f4d6dbe58e3eeb4d470946b44e1a314445b34f35db601f6f48d127cfd9293d9efe3f5390d7034433 SHA512 81a3c4214ae7500909f2d5b48b86f9be5ff8d2881f5ffa18bc477050608f440cf105f8a461966b998cc98d839719348156035f47059ce631988bb3030ad65d34
-EBUILD rackspace-novaclient-1.4.ebuild 1007 BLAKE2B a0fc997a4e4b9848e38554d260b2858746319497701627bea0f6be17bcbcb8b82877972437777ef000b96ceb207e74246934e2f619d6d2b0d88441828297e76d SHA512 243da418d4c88742c2469fc17cdea22977ae00eaf5b9d38672072d7b3eba528ad0764105f342d36ed4fbf918b77a3aa6496da308728cc47d3daccd02d193c9a1
-EBUILD rackspace-novaclient-2.1.ebuild 1086 BLAKE2B d22426d2f3bf11fcb5a5aea399bb5427bc3e861474e5494763ab6a3fffc1a7b05863045e9289239fcc682b125269ef99e8f5dcb372ffe595ef2bff7090f62449 SHA512 163e3213ee9e6bba5d1dafd178472b93e90ee752c7db85f80f9a96d46fe77e5b201f49c1d074a83ce1f60378d5ae853f11083100b5a2c48f1103471de8a12dde
+EBUILD rackspace-novaclient-2.1.ebuild 1072 BLAKE2B ba3360f7f46cf055997f6c9bfe44f89933bf718b0bb82a94201ef66a9b3f6734893a6b556565cfa012acbd2328a5932877b5a276a1a2291d079b96ee118a70e9 SHA512 023a81889197dfa8632c9f43263452790fcffc9532c7e8379252329170627858aa860c02806482a1294f9ecf21fccd290c06c11cdf7ae18467a6a9446836c0a7
 MISC metadata.xml 541 BLAKE2B f8010045de4105ed1420cb7dc526454e2f58dddd9d2b9fc7fd030b29a9be160221bed47a142defc27b925f4eb69f2bdceebbfc13e945c9586379fe66f10daa94 SHA512 cde2a0d81876bca001456dd1754fb13d21eb13ba31236dc4fb42cd0bb9bb222a6ca11d808639eacee70711c586e254fc39b44e2e2adfc1a6379bb0921268be9e
diff --git a/dev-python/rackspace-novaclient/rackspace-novaclient-1.4.ebuild b/dev-python/rackspace-novaclient/rackspace-novaclient-1.4.ebuild
deleted file mode 100644
index fd48564fb745..000000000000
--- a/dev-python/rackspace-novaclient/rackspace-novaclient-1.4.ebuild
+++ /dev/null
@@ -1,30 +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="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/rackerlabs/rackspace-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/rackspace-auth-openstack-1.3[${PYTHON_USEDEP}]
-	>=dev-python/os-diskconfig-python-novaclient-ext-0.1.2[${PYTHON_USEDEP}]
-	!dev-python/rax-backup-schedule-python-novaclient-ext[${PYTHON_USEDEP}]
-	>=dev-python/os-networksv2-python-novaclient-ext-0.21[${PYTHON_USEDEP}]
-	>=dev-python/os-virtual-interfacesv2-python-novaclient-ext-0.15[${PYTHON_USEDEP}]
-	>=dev-python/rax-default-network-flags-python-novaclient-ext-0.2.4[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	mkdir -p "${BUILD_DIR}" || die
-}
diff --git a/dev-python/rackspace-novaclient/rackspace-novaclient-2.1.ebuild b/dev-python/rackspace-novaclient/rackspace-novaclient-2.1.ebuild
index 065158934cd5..707c41b1e07d 100644
--- a/dev-python/rackspace-novaclient/rackspace-novaclient-2.1.ebuild
+++ b/dev-python/rackspace-novaclient/rackspace-novaclient-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
index 2b6fb84ffb59..93cfa2a09cad 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1,3 +1,3 @@
 DIST radon-1.4.2.tar.gz 1645389 BLAKE2B a379a552b5e31c106d2a870a16b3cbe7d70f3565b0964dac5139dd0e6e09c5d945001386de83017d05f4e5bc9f58cf481e9386caf2edac3f1df5a8b187ea0693 SHA512 0e440b36a7edf0ae8002ee27d00cd14a351261972407b4a960d9033712fc0f7f04c1541d7bcf1dc918f2abd46e1bd720f914f3fa3c101f36bf502bd1ce8cb7a1
-EBUILD radon-1.4.2.ebuild 1193 BLAKE2B 75c8b8aeb618813649e429efb8680e02c7af027f2af2ea2d3c68c07643eacf9384abcbf95e8ddbdfc3340df01cf7b9f4040b81b87445cc53f20e65fee8ed898d SHA512 7b24f28eff785d38d99306a86b6456f4f79cf37b0fd2797420dab52324ad285768835003aad0ebddcac6a4ceb77e91245d9965907ba180bb67f8d6fccf4ec6a8
+EBUILD radon-1.4.2.ebuild 1189 BLAKE2B 17ee2de550c6c43a7c0277155508121b9df7b26edee24947e7537291beaa2550f711eaf1e2a94321156bbc0c56eb7bd127f28e4d35cc990bfacd7ed7e5382aa5 SHA512 2563497e9f578b2d5e348fc73cb9f47502347e1bfb3634958d3c80c2a99a96afb03be2229fcf5f8139deb67415ab456eddf45c3dcb951905b8ff1d6dc2b81ae0
 MISC metadata.xml 284 BLAKE2B 93c4d56ccedd9e190f11ff9efc0e8a9cd98b842c866296d72662ed89a77982e0262907e3c4e057c1a022a72c09bf4bcca752475489349adfd5ee76c2a563264c SHA512 d0c5d0f28e04d527461841465b2280b16622abc6f6fd784e9f1b2630fa794666fa3a88b9962520cf13fa4b9f2817acfe2645c18ecb3aae3f76b62fff198a7ac0
diff --git a/dev-python/radon/radon-1.4.2.ebuild b/dev-python/radon/radon-1.4.2.ebuild
index 963e8c527236..d1fa977708ba 100644
--- a/dev-python/radon/radon-1.4.2.ebuild
+++ b/dev-python/radon/radon-1.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index 199cf117aa9c..b4f0dc907b02 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -1,3 +1,3 @@
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
-EBUILD raet-0.6.8.ebuild 1008 BLAKE2B 0f454bc8f227b20dc96d45a3f8912b2c9b6cbd34a2b829f654eb25a5ec6bb709d1b15c5a0dedb6dc87ad12466496cda3c6024911074b29258564b1778e58107d SHA512 4a7e0bdf75d86fd131410af02a107be534acb9ed804aecc68e29b5255d59c9dda130581b3f79ad808fa171e8cdb87f6aa3c3041f266d9622babee870cebd938b
+EBUILD raet-0.6.8.ebuild 1004 BLAKE2B f6fec62a90677301b47355910d04ecb1fe1979413733af1bb568aacc231de5ab1659a61efd4e28bf84eba3d5e335e7178a416ca38b6f8a53442fc79c02d8686a SHA512 b55324bd124c3c29af7565c0a146d20cad9e42a62ca36d73ae63d9b4919dbb1420d0b17995fbad071555565e77f729bdc12ffa4ca611b60742a0ad4e8a501519
 MISC metadata.xml 489 BLAKE2B f5c03c42cb002c7d6c81692f7f98312ad51a06e306a33b63cd048cbb25d0ef1429e5322bc5eb08de2d3d5a179a100f61c5e73d7f874a43e009eb0bcad8013e26 SHA512 0987a39737bc4556adf615ced4c1550f69fd952d32f5208b91763da8d23021fa88c5bfebe0f12fa382fad2a4066f68fe372c637389543a936dfc818f1de5f621
diff --git a/dev-python/raet/raet-0.6.8.ebuild b/dev-python/raet/raet-0.6.8.ebuild
index 002fcb44de2c..e54be9d2ba46 100644
--- a/dev-python/raet/raet-0.6.8.ebuild
+++ b/dev-python/raet/raet-0.6.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 inherit distutils-r1
 
 DESCRIPTION="Reliable Asynchronous Event Transport Protocol"
diff --git a/dev-python/ramlfications/Manifest b/dev-python/ramlfications/Manifest
index 0125eb102154..5682c7620292 100644
--- a/dev-python/ramlfications/Manifest
+++ b/dev-python/ramlfications/Manifest
@@ -1,3 +1,3 @@
 DIST ramlfications-0.1.9_p20160718.tar.gz 1104645 BLAKE2B a33cb4529db10b92280c9ed6bc04e2d4c2d534cc4748ce219984f7fc4c7bc432ad51adc901ea021b64a3776402b159d38cbd34e2c2bca4b863f012026e2b3a0e SHA512 a21330cddb2d390744d7c13ee62edd701f74a83c16f87b897460e2353e265f4171e90e8b51bb0c17762a1f3494ddf8aeaa22c36f0aa093f936b9a51e2d75d1f5
-EBUILD ramlfications-0.1.9_p20160718.ebuild 1206 BLAKE2B c1464286a79bcee411d4bc14e068821b1455b068176d765f048c157ab85151f7ffcf55262cd9e1a010b5cd38297eb717a8f7839e9b048b8567ed7897a2a55c7f SHA512 6795e983f37d259380424bcfee16a577b253fb78c6029b9ce65b2ac7d33cabc02ed53b4b3c4e34966a9b1c5e8e4d3ae99b0beff0b871e2bc7debde4e78c75339
+EBUILD ramlfications-0.1.9_p20160718.ebuild 1202 BLAKE2B 3f65f5bb7170933d5a1a928269d0b74e5c89e85b9ad4e5ef03efc4b91a7d1ea8430304459876cc29af345fb7221b2a6edec7d17d071d71532320a94bebeec835 SHA512 fd76de534aecc1dd84844980595d1534171449f6794224076e3cd364a6b43bc2e62f9ac4640232d81fd4398b8d98a0330ae7d885d0575b90ec248f9dccdf0be3
 MISC metadata.xml 692 BLAKE2B 08237e74ca499f2e424c9650e1d0cd553e802cb50bec23bce46a4a8351266fef545b62eedfab60277cc9621093f378f350466561b5ead509649534b088de14e4 SHA512 71b7a6b4e4ac31680ee35e60cc514a2378ea94d48476369aba0ab172e44084237c7a4a54ad7a18d063cc5e297fb89d05ea9d15b5db0140f4672332a4ef74315c
diff --git a/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild b/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
index ab64a8eb7d78..1d489a02b63f 100644
--- a/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
+++ b/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 
 COMMIT="32a11cd7d75c4c5b3e3fc01c383314be298b0f9b"
 
diff --git a/dev-python/random2/Manifest b/dev-python/random2/Manifest
index 2d08c77c9711..a8097d9379b6 100644
--- a/dev-python/random2/Manifest
+++ b/dev-python/random2/Manifest
@@ -1,4 +1,4 @@
 DIST random2-1.0.1.zip 21088 BLAKE2B 69747711e355d3dea2b16562a6b9cdaa170732172e9eaac9a5cee4b8058f569e0c4527aec89e408e6472168fdecfc52b87703d23f153ec04f6ed2c049bcd162a SHA512 31de31c27bc6e07e99c24d30e97d9ddc3085fe557bcb0725881d4ab0b4c06e6208f64ba6267098c7b1be4f115ad45b399e841beecc90f71da2fb7d82982e75ff
-EBUILD random2-1.0.1-r1.ebuild 443 BLAKE2B afa6aa3623ab95ce4a58b1b92c6dbc0dbecaa5248969df5426d8b87037a84b72044aa37937e2c22e4f127b2a0b834e34b606a1ae13825a9a3c4fa6e194534699 SHA512 0368a3524379a3a05f31c3bee96416fa27d01e7355046755855230ab636696812b63d93b8b8355a74a392b2c1f8c63e436f7efe69d7a7a3adf79d92e744f6d73
-EBUILD random2-1.0.1.ebuild 451 BLAKE2B 25ff841764f78cc9651262d1a60f2ef79ad26999feeb327aef4f1b31d57d904b3b5285baf09aeb3ea3e1cd2c261d693928a804155023a04d7392e121e4304f6e SHA512 977e6704a30f034a0c38e6756541f3527d6d90cf754e1d88bd2db64b91822334420b9ba297b7c97dcbea0cd26efc8583a757b7a5c9cf44662f3abb4b95ed7b43
+EBUILD random2-1.0.1-r1.ebuild 441 BLAKE2B b952e458624fc479128e7623bc806b66b96acf748abd3963b80feac00cc15f796c5b2e50e3e46e6f9615b3a55ecdf626fa6aa5c964496d1aa1861014436ec2e9 SHA512 486aedcd44ae418d3f73376b878ee2b2e3df55f7376548e50b7e9f5bc22a9707f5c217798deeb35b14e60f76dcaab5577a8cdd51bd85775301950110512bef3d
+EBUILD random2-1.0.1.ebuild 447 BLAKE2B 3d6f4808b8bf132283e4111033df0c5840dd98a955a06c2f6c8b58ef8375b3f2d2c61e8157bdf652f85f62baf060aad0434bcff5e118e784169a7a0e9abc3a6b SHA512 3c33db517dc96daa6e5167ee588fbc97f25e5bb09d964a1fce2ee754f354a2a12d81234a5a81c5077e94cf9258e9b357b807f4468506a61ade06338f188812a1
 MISC metadata.xml 303 BLAKE2B 3510f40edd7e8583cebf85be1df4f124c3976f30c1a161fb4cf855ff57d3777a389c181346ba8e77234fb251e20f4b3b9fac10e9ee12f5db74cdda4e35e2913a SHA512 a921cabb1c8d9a5fc1271f2fac0c2a31b9a308d53e0b800b9dd14d3d830d5f9ccc7f0c8a773868033dac656891fabfcf19cb963bbcd035d73bfdb5aecee1f1ab
diff --git a/dev-python/random2/random2-1.0.1-r1.ebuild b/dev-python/random2/random2-1.0.1-r1.ebuild
index 3abc43f15a37..14c83c936d1a 100644
--- a/dev-python/random2/random2-1.0.1-r1.ebuild
+++ b/dev-python/random2/random2-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python-2.7 random module ported to python-3"
diff --git a/dev-python/random2/random2-1.0.1.ebuild b/dev-python/random2/random2-1.0.1.ebuild
index 7aaec7be4ba4..131215dfbdbb 100644
--- a/dev-python/random2/random2-1.0.1.ebuild
+++ b/dev-python/random2/random2-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Python-2.7 random module ported to python-3"
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
index 6faae613eecb..2fff3685f994 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1,3 +1,3 @@
 DIST rarfile-3.0.tar.gz 110665 BLAKE2B bdafa33600f1c7791af40f4e8c7b6a43e502980dab22bf6792a1b19eab53ea6c29bb6cb2ae4989b9f43d58c326b89ce466b9e2f82f60bad4892131895b15d400 SHA512 b0b816bf09fe455e4d8d35b447c30e7810468a6927555164a1b513d4161f3fd4e77a37439620bd935c3a12e46b1e5eda3e35d7d281899d2f9fd26b6e989aa6e4
-EBUILD rarfile-3.0.ebuild 494 BLAKE2B 8c9ffc5b6c7685670e177d19528b9b1a462f932bcd6c23cc301db494d680967b545b06471b31720339c81776fd00b91c66da993a54fd050e065f1fc752eba7a3 SHA512 c8870dc7c8b66392ad05025d5542e7e9ce6270bb231f61c5b6657c960f322632b3606269e709ba5edb06eee7b1e1df29cd910baa7fc33f829322eeed768cc99c
+EBUILD rarfile-3.0.ebuild 490 BLAKE2B 56bbf416d4d8077d1182d515f2da3f7171392483d109b226b01c40ad90acf1ec99339f0501c9550dbbf3960496de680a09e7ba693ec7c5110d0e1ba98be900d8 SHA512 c9bfc2aabe6d5ff69d01723dc2f8ea8bf77fb9f5702fb8c802319f0685e198cd317a1d1bd2494a99fb4d0a6dbcfaf40a97b2da734a58611f176f66acfe0bba13
 MISC metadata.xml 665 BLAKE2B 1e99ad6ff0a0a07251d392632d0f2443dd46b622ce8af2e7312e310c1d419459bd98d712c7d33660484b6357c7eedbb32bedbc7a714b2f8a42c9684b5e0db855 SHA512 265d14703bce5b7955872c2f415e537ebe1a6228a6b5b4eec112103679c8412073ffc9506a5dd4af648c20acac78da4c196e139d7f93bf280c77d28d9f024045
diff --git a/dev-python/rarfile/rarfile-3.0.ebuild b/dev-python/rarfile/rarfile-3.0.ebuild
index 3def2f80f896..39d4f36b37b1 100644
--- a/dev-python/rarfile/rarfile-3.0.ebuild
+++ b/dev-python/rarfile/rarfile-3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Module for RAR archive reading"
diff --git a/dev-python/ratelimit/Manifest b/dev-python/ratelimit/Manifest
index edc42632b17f..682c3a4713e2 100644
--- a/dev-python/ratelimit/Manifest
+++ b/dev-python/ratelimit/Manifest
@@ -1,3 +1,3 @@
 DIST ratelimit-1.4.1.tar.gz 10700 BLAKE2B d2fc1b0695c6bdc7653862ca790e9f5ec87b25513a93ec058384f334b47d5080570e3511eb6680b934b345ef5562771a078fc4ced3ceed263a7aafd26af3bfdd SHA512 ab8a2cc95b852f91c614ba5a5a677d2b4b99d5f810ec8a11e69d97af58cef1f67457e1cf686a286073c85b39c2ebbeca0a459382e410c9e8eda12cecdda57f02
-EBUILD ratelimit-1.4.1.ebuild 621 BLAKE2B 6f5471be5cb48c26475564c3063d5243cc4219ec5f334a2c4470a3980659f1a3870712eff41796e2b0512bf2a8e43dea558a63c825b2c3fab6d080e8135c7dc3 SHA512 c393bfcf712d07ea39d4b5cb2fc4bfbd7c6c139a7433a47cf6831d126a9cc35a2a12a573d8f5f0def8d10256910fa48f633bcb209aca6bfa8c88b11192c0a11b
+EBUILD ratelimit-1.4.1.ebuild 611 BLAKE2B 284883f0023cce6d1d542cc89761d0c6d8b547ff1f06cdda574cd6789903cad88e6117c34d3827024314d594f1b9cd3e60ed038c7c2f0d80bb6d90815f93c4da SHA512 9d80fd84a4da2f74969f9a9e89c486767f53a1e967580bbee5fcea4b386ef09940c2ff61c6e9d7b53e3cbe02ad4e269cb117419951290f29f08658cb940cfb41
 MISC metadata.xml 724 BLAKE2B 2ebbc8dbd58619d4978081c22d294e19682a10a159321b143e942e4a4f969400792a411fb6db3670d747fea6747927030d590c45251e753ff5183be3667297e8 SHA512 aec024dc134acf8c02150822fdd1b29ac3042aac96a5a54d5c1876e20bd4bf4bd2211374460b8dd4c19b37be44d063b5cd36ac77f196c30b4529c65bd7c45249
diff --git a/dev-python/ratelimit/ratelimit-1.4.1.ebuild b/dev-python/ratelimit/ratelimit-1.4.1.ebuild
index b00ca5aa7deb..bc4af83a74e6 100644
--- a/dev-python/ratelimit/ratelimit-1.4.1.ebuild
+++ b/dev-python/ratelimit/ratelimit-1.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/raven/Manifest b/dev-python/raven/Manifest
index d8509e7ab4c9..e93dc30167ec 100644
--- a/dev-python/raven/Manifest
+++ b/dev-python/raven/Manifest
@@ -1,3 +1,3 @@
 DIST raven-5.33.0.tar.gz 284367 BLAKE2B a66471ed09bb2afca4afe78f662fdc21464e89bb1317fdc5481f87bdca626ad2a0064e9b9681d63e6439ebecd3f25d38a0000666a0c55ace90ca51efb2ccd1c8 SHA512 b6924c36f1cf4e957e8399e757dd1f3fc8152c14af06b700d139cc93bc3dbde4186690fc6934afeda03c13a3b59e739ab3627759580b3adb890f0c1f1ddbe8fd
-EBUILD raven-5.33.0.ebuild 579 BLAKE2B 4dc5230093a36547f94292b136162dd1ced94fe3c5c9e9ca418686f88e65c6403e37be5c85c2a18eb26c44cf35dc8df9fdb1971f830340ad2229cc26abce0026 SHA512 6b3d89bb6179153716c779d6bd0de12a442a9752154167417e278c6886ea01887fc8da7c72806f83dc17688101c84649fef946f7a2e86ad641371d7f774d840e
+EBUILD raven-5.33.0.ebuild 575 BLAKE2B 675d44ab92fb7e642ca7cd58dc861a3f1c38b63574e9f205ff47eeec0375b09fb03e82cb1835c1744250e73f1efc6f7f158fad9c4579af53148a08cf2551aaf2 SHA512 783048346ae4c2ddb9e41164f1bfff9503d32a18c5cf85c0acd9ec582c80433864f6016c102aa8522b91c9bd3e8f624a0e692ee7af0d2b44de08b392f570d87a
 MISC metadata.xml 302 BLAKE2B 2948facec48fbb66ddb7c0acc7ddc49e671c9fc8d0dd82114971e1382aec4615aff364a954f9e3b2ed23285405a0e047ad0a6aaf33f4166c0253c0aac1d34a79 SHA512 d6de354f658e8eab89efec183c341052a34471cf58d339d29e511c0cfaac76771105e7b1b4f72ddc00bf95ee36a4621a7716c479b5c358fb2dbfc60d75083fe8
diff --git a/dev-python/raven/raven-5.33.0.ebuild b/dev-python/raven/raven-5.33.0.ebuild
index 57367eaa0448..b670000e009e 100644
--- a/dev-python/raven/raven-5.33.0.ebuild
+++ b/dev-python/raven/raven-5.33.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rax-default-network-flags-python-novaclient-ext/Manifest b/dev-python/rax-default-network-flags-python-novaclient-ext/Manifest
index ab6381a4cd4a..cd754dd30452 100644
--- a/dev-python/rax-default-network-flags-python-novaclient-ext/Manifest
+++ b/dev-python/rax-default-network-flags-python-novaclient-ext/Manifest
@@ -1,3 +1,3 @@
 DIST rax_default_network_flags_python_novaclient_ext-0.4.0.tar.gz 2498 BLAKE2B 564ee96ade82f043d98f1d86591da2ca7fbd9445d194bfd58fb6f9e6947d04920932d23a4b5b9f394602cbc60233a5ada5352790fca1f1ec7746fe6ac525e637 SHA512 f19481d70be657b086266d4d933d19ebcc5c5cbd0223afa72c3f14afbdd905d7f37f507f3b4599e9340a34f54dfa7686a30513faeccf3a43b7464d9d53e6d3f9
-EBUILD rax-default-network-flags-python-novaclient-ext-0.4.0.ebuild 706 BLAKE2B 9971f2adfb99e9fd6ed4ebc6b1204462f8206faa205b23de95e93c5c696b96a5b4d689d3999343fbe0b24d8df89a907180963c447cd3c55ceec1fdb0e4f81f36 SHA512 b1cb78a57134b167e595addac99c4e61c5a157c342b727dcd3c67b8a852ca44aa894b6a8c6ce301948f95c3cec1df79dd0ece85eda04a55a0a7e7985b106b8d4
+EBUILD rax-default-network-flags-python-novaclient-ext-0.4.0.ebuild 692 BLAKE2B e026bc5a3b7d432c132a4a4f15e4fbf5e7682fc39abca65020939e91f7fd346b48c1ab5bbd3cfd712dfc2c0e312dfb4775300a7f5a48440d80d97f9d65bf81d0 SHA512 2b2954deb0fc1e9654b13cdd4e3d28499fadebca83ee3503b24bd0a930c683c0c305cad909344966b847fa26361685e197d5a0f8de0dd285c039e8faab43649c
 MISC metadata.xml 598 BLAKE2B c79dd701a44a7e82d4a62c87876fe6ef3be85aad9c338027b29c613f2b95677d0ef120a339ad1048d5ef9b0159e47dd2c16f1ed7f55d56df9b9b119623a361e8 SHA512 553858877c24f7d356ba0331800fb0624281aa23ad5430a030931ccef0c97c24ebad5ca0583f90d110c0a7b6aaad6e1da428078f4b3faa9f66ff67e9431273dd
diff --git a/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-0.4.0.ebuild b/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-0.4.0.ebuild
index 552774e322fb..114745a49c6e 100644
--- a/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-0.4.0.ebuild
+++ b/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-0.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rax-scheduled-images-python-novaclient-ext/Manifest b/dev-python/rax-scheduled-images-python-novaclient-ext/Manifest
index 0638a7fc5734..cca37460e87f 100644
--- a/dev-python/rax-scheduled-images-python-novaclient-ext/Manifest
+++ b/dev-python/rax-scheduled-images-python-novaclient-ext/Manifest
@@ -1,5 +1,3 @@
-DIST rax_scheduled_images_python_novaclient_ext-0.2.1.tar.gz 2781 BLAKE2B fe01d1661861364a9fdc9c22cc5fedfaaa0fc6ae8b77ecdfa559f4e03ab3cc26367b64f01dfd4d47dd215386bc4b596776acda657a63aa9374e880e3c0a578d0 SHA512 d26fcb8c4cc70b7e4b31f4eb8306d094139d914fbdaf9fda846f13a2bb6336734b2aebc4c7322df5986ba1cc57d4d5894e744ded063f4a01d7a63d3642049672
 DIST rax_scheduled_images_python_novaclient_ext-0.3.1.tar.gz 2850 BLAKE2B 325fc6d922cfbc299af7bedac6c37f992118b7e06d4ed73ac4650807e5f7bb811937171ed716967209a39461a4bb8d05fe313f98218394819808f46edd724340 SHA512 231200aead561c32408237494b0927ba51f05d7f208bdf655d4f0642060899f6f30ab0f68995bbc694f8d0b36962c754c526e93c870b8422f20ddce48247e854
-EBUILD rax-scheduled-images-python-novaclient-ext-0.2.1.ebuild 690 BLAKE2B 13368c4eb907c6c906062797b6c057e6b60f0da4e67b0a078b2135996d85224200ece7d6eb6018f94f91044b5bf915ca16ceb0d3235fe0c52bb3ff6ca90e2a22 SHA512 86436b40ebe38b3e6b731a9739e6f3834135e30b83a24c77a752ae70eced094fca4b83df2a8da46523a599bc3573e28eff44f455dd6b92d0e8d7733058d4e07d
-EBUILD rax-scheduled-images-python-novaclient-ext-0.3.1.ebuild 701 BLAKE2B 4ec140e999515a75215dffe898283ba0933d3187e549f49b32b0cba148ec2a11ffb6dfed04690d37da48cbafa59bd16f6b615da14aa2300aad2ec4f01418446c SHA512 41a917a752440747df4e1666c0556701534e6dba10d8977451d979620c993d03bd989fdf82e362705d51a72cd70095212b05c9e8c8f4a0ee448f4aaa397be485
+EBUILD rax-scheduled-images-python-novaclient-ext-0.3.1.ebuild 687 BLAKE2B 80b2d610ee78cbf032228d90a4b1ba546a73be9bfdc64717ae8d8ef8552ca69509c893bfe57f07a0f2a596c9a2b4c315be16b09ea5a6efc750d44954ee7ce53e SHA512 9dee032d8d32b74dbeb9b82db89dcb5000033b21cf996f2bc620cacd081f14cb6bacea88de11c8d90e35535a1589aa69100b1aa8e822f5895cba90b89f35358e
 MISC metadata.xml 578 BLAKE2B 2067256d218b1f9cce4c525c73da743dd3ee19c6fc74d176d3bce979575fc901a91e5cf2e76ba1688663d0b40af236742e9b896ae9ab4a860f0b52d3f238c4c4 SHA512 f7947c2ac98db4afdd605fbaab5510851aa49eb136cdcf6f90c17d014adbea156c91c2c0dd11c2cd089428e582234afbdd6c3b9816c536791ee741ee55928201
diff --git a/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.2.1.ebuild b/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.2.1.ebuild
deleted file mode 100644
index a93fb0a5f9a2..000000000000
--- a/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds backup-schedule extension support to python-novaclient"
-HOMEPAGE="https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext"
-SRC_URI="mirror://pypi/${PN:0:1}/rax_scheduled_images_python_novaclient_ext/rax_scheduled_images_python_novaclient_ext-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/rax_scheduled_images_python_novaclient_ext-${PV}"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.3.1.ebuild b/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.3.1.ebuild
index cf82c9214586..79bcf29aa2ef 100644
--- a/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.3.1.ebuild
+++ b/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 5ca3570b8963..ebd3f133be29 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,7 +1,5 @@
 AUX rdflib-4.2.2-python3.7-StopIteration.patch 2064 BLAKE2B f9a646703c9f3a0e0767739d171c0649c855354484699f46d4f5a3d9a73979b54d2953ccff3a9d5f85ce1a26f5af2cab87fc24fb25af10a952eccba0d076a0db SHA512 99d28c46f8b857074d111ba09db3f5afe1f7ef1e5970d7c539e9c0f309ab6781ab432a3315a3a2cfe473e0eb38a4df9e81b8185bde1541de74dcc0a739871364
-DIST rdflib-4.2.1.tar.gz 889467 BLAKE2B cc5f675646ca7a55ff40d4d98eb138953d8763d8b44b5b495cdc9bb83df16d425214bb681f8f841e053a3cb4d52edd30988afcf2c301a96f699a70d9c129cca5 SHA512 49145f80a9e027847523faed059c16ec1de358bb9d8fc3ab4fd3bf95a88dd181986b1785deedf6e837cf0b064bd74ab8e27fbb5581e33310353da3546ae7b016
 DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c
-EBUILD rdflib-4.2.1.ebuild 2704 BLAKE2B 946b757dad1c44007504df4402631fc4eb3dd49b451f6b3396ca6554ca3129949c0bcb0cf20311c0a692f957de829a5e0491de7ae616036ddb9f44cb8670c90a SHA512 08d1a8c2a33c6fabfae421f8aebcc35addec3f7b90f38c3b5614e1516286199cb4cc1f50faee471fce52a4574232f63938925a572db082612a4682729d10b607
-EBUILD rdflib-4.2.2-r1.ebuild 2928 BLAKE2B c0f0f610ba6e9ea9b0e1f14e26c3bf5083d18b97ab0a0e191b449f937626d7afe4b518fd3b0f33347fba43e6b8c35ff08bc0a601d3ccd9d1eb70cbe431351ccb SHA512 50f12dfde99d0b42ccb08feb3d59ca89f6368d57abc830a32b1399759a70f233f676572bfed2c8c0af41d6fd79bbea1964fa45475c956387c7bc8c22ac067392
-EBUILD rdflib-4.2.2.ebuild 2742 BLAKE2B b27f77ac4338c4c6889425f4f433690447443830e064c600deb7bf1e83ece4a3bace0c3b4448b67a0918e1303bc2f6eafaae2f46717c2207ff6a131628dfefd9 SHA512 1f2847db3988678f06691915f57e3a8e7f325cee22086d262c1fdd52b827f68e351a358167fe1b190a926ac7ec23757150bbf1bd3cf79eb4217a2ecef6156dbc
+EBUILD rdflib-4.2.2-r1.ebuild 2926 BLAKE2B 36fd9a9f9050f90980c4404510d81d6c55ce4ba5fea94ff3323247a2f2062810bf0221c47fcdff1d7febf5dfe224d310d01a484cd7b4e9b0d91ca1d270b35f6e SHA512 e95b0d50573b3c5beb4e5a18a31808315e8e5f86807032b781c406c19b9cbfab3433abe756c1a3bd03e972f4a7e86894c52f35e1bb9db85e1a09d85a318fc993
+EBUILD rdflib-4.2.2.ebuild 2738 BLAKE2B d9d30ba77a826fc1f90e6f3fad749b9d610d1f1729fd6a9aa53d75bc6c35244213cccebe7a53eaa3af987e69177f083d585d661003832a017f1f65971485d299 SHA512 55abb2a4b0a466ab0ebec68a1db0d31731b8ead16ae37eb544cdec3929e922e796feee1f4851ff05a39de481b4c10cef028407a9c02328dea784ff7013291892
 MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78
diff --git a/dev-python/rdflib/rdflib-4.2.1.ebuild b/dev-python/rdflib/rdflib-4.2.1.ebuild
deleted file mode 100644
index eb48466e8ea6..000000000000
--- a/dev-python/rdflib/rdflib-4.2.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-PYTHON_REQ_USE="sqlite?,threads(+)"
-
-# The usual required for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-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 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc berkdb examples mysql redland sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[$(python_gen_usedep python2_7)] )
-	redland? ( dev-libs/redland-bindings[python,$(python_gen_usedep python2_7)] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/sparql-wrapper[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.1-r1[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Upstream manufactured .pyc files which promptly break distutils' src_test
-	find -name "*.py[oc~]" -delete || die
-
-	# Bug 358189; take out tests that attempt to connect to the network
-	 sed -e "/'--with-doctest',/d" -e "/'--doctest-extension=.doctest',/d" \
-		-e "/'--doctest-tests',/d" -i run_tests.py || die
-
-	sed -e "s: 'sphinx.ext.intersphinx',::" -i docs/conf.py || die
-
-	# doc build requires examples folder at the upper level of docs
-	if use doc; then
-		cd docs || die
-		ln -sf ../examples . || die
-		cd ../ || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://github.com/RDFLib/rdflib/issues/510
-	if use doc; then
-		einfo ""; einfo "Several warnings and Errors present in the build"
-		einfo "For a complete build, it is required to install"
-		einfo "github.com/gjhiggins/n3_pygments_lexer and"
-		einfo "github.com/gjhiggins/sparql_pygments_lexer"
-		einfo "outside portage via pip or by cloning. These have not been"
-		einfo "given a tagged release by the author and are not in portage"
-		einfo ""
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	# the default; nose with: --where=./ does not work for python3
-	if python_is_python3; then
-		pushd "${BUILD_DIR}/src/" > /dev/null
-		"${PYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
-		popd > /dev/null
-	else
-		"${PYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
index e933d39cedfa..46e365c58b22 100644
--- a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="sqlite?,threads(+)"
 
 # The usual required for tests
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index 53e245c83d46..a76252e0beca 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="sqlite?,threads(+)"
 
 # The usual required for tests
diff --git a/dev-python/readlike/Manifest b/dev-python/readlike/Manifest
index 6c2d4c506047..f9f69f62abf3 100644
--- a/dev-python/readlike/Manifest
+++ b/dev-python/readlike/Manifest
@@ -1,5 +1,5 @@
 DIST readlike-0.1.2.tar.gz 5068 BLAKE2B c716b4a36a2933b48ed43b2c5830dc922cf800bd4c4c83119a1b0b705bb2ff91e0a20bbc7e762eca37da306e428fe809207ebf67d40b8a9acb86d854af4c7e95 SHA512 4ecd694c69c615ec37da05341596af4ec26abeeda78ecf10fc3019533a7ab092ed1e1e4f8910a7835d7ffb157b203cb0395a2eba135d3aba861abb75d466980e
 DIST readlike-0.1.3.tar.gz 5023 BLAKE2B fdfe9fe80cd2bb9bd53d83efc6b358a8f375d757162110271aafd7bd7c4e1c941e760c1526c9dcffd60506322171c7b9f4f7d768acfae6569a74da02135ad4bb SHA512 f4ecaab4bc068660b0354092ff1594f245c57f4ae93e37ad53ddfe1eb33017b241237f6e573e9abff1ae87ce59da8fcb3fe2ae4a7bd962004ea5313c1fbd9719
-EBUILD readlike-0.1.2.ebuild 447 BLAKE2B 80e778d6f9999a32f60368c5786ac0b8adeae3bfb4f62de804d618845adf2f627dc4a6af10ac59616a7b5983aef0743a24db7102ce34ea4b0d46d846a5fa41ad SHA512 6054d6c5a73ca8f08f57bff203e51b9d51023de23ec822d33829319ccca8a82725d90c0af49f67c0551767ae085c4807d46d9c17c831d526186e7ceec9cd9ed2
-EBUILD readlike-0.1.3.ebuild 447 BLAKE2B 80e778d6f9999a32f60368c5786ac0b8adeae3bfb4f62de804d618845adf2f627dc4a6af10ac59616a7b5983aef0743a24db7102ce34ea4b0d46d846a5fa41ad SHA512 6054d6c5a73ca8f08f57bff203e51b9d51023de23ec822d33829319ccca8a82725d90c0af49f67c0551767ae085c4807d46d9c17c831d526186e7ceec9cd9ed2
+EBUILD readlike-0.1.2.ebuild 433 BLAKE2B f63356afcc078704a41c126af3f19b6480e71f3cf38771b59060c16ad406b0a6dd8f776b16c054e91e1a4fceb5b89eca46236c11827737dadd23ce5432a96e09 SHA512 969d1c036b7fd0bc63df0eb1a91c9f5559c6be1c686d3240d085627435fb5ef6c4a63c56d4ed0a45955c2b4cc31b359a4893ac2a066107299c8c1b241a423c6f
+EBUILD readlike-0.1.3.ebuild 433 BLAKE2B f63356afcc078704a41c126af3f19b6480e71f3cf38771b59060c16ad406b0a6dd8f776b16c054e91e1a4fceb5b89eca46236c11827737dadd23ce5432a96e09 SHA512 969d1c036b7fd0bc63df0eb1a91c9f5559c6be1c686d3240d085627435fb5ef6c4a63c56d4ed0a45955c2b4cc31b359a4893ac2a066107299c8c1b241a423c6f
 MISC metadata.xml 398 BLAKE2B 1b1d25877a4199f171b4cd18aa5c80cf6ff734e6a814d6a550a51e84c62f8a1a53d5742a1c7cd602f2643efd28e8aa32cfe8cc6139391e4440e52d0538e93744 SHA512 9652d90ccef384118b6a4c10dc1dd2c9e416c2f1a13bff3a2e803e017961b2e99f53fd51befaa80f7d4a43933add48b79aeb0e79780cbc4d9f37bf99dc39fa01
diff --git a/dev-python/readlike/readlike-0.1.2.ebuild b/dev-python/readlike/readlike-0.1.2.ebuild
index 0fdffd859b73..5b04e914ac8d 100644
--- a/dev-python/readlike/readlike-0.1.2.ebuild
+++ b/dev-python/readlike/readlike-0.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/readlike/readlike-0.1.3.ebuild b/dev-python/readlike/readlike-0.1.3.ebuild
index 0fdffd859b73..5b04e914ac8d 100644
--- a/dev-python/readlike/readlike-0.1.3.ebuild
+++ b/dev-python/readlike/readlike-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 200dee704b1f..1bbba5675a39 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,5 @@
 DIST readme_renderer-17.2.tar.gz 14643 BLAKE2B a41c2b1b426f95f026092e6776587e68b09fbe314f148a02ba21edc17f4610f563718cb8469e3fc4baaa9c1c95ca501da205bec6abbf7f70171a1ee7e8710159 SHA512 2c25eb24b04b88fa8522ff0068e3a3a7b57b035641d0053ff93c295dde50cc6f21af9eeca1061eef794f52b0aff184f97c95b3c232f02b308e09682e50a6d40e
 DIST readme_renderer-24.0.tar.gz 24038 BLAKE2B f9c9dea1284cf8ac0a8280395916118fca13a4d7537a455e95436d1d7b818c11d197618dd22c3810790eacf8982d31378f3e22dc349e82fd6dbce84192c47b4f SHA512 202a7142ccca3f5bc4e6d92330f25284fcc4f3984ccdd886e4be2789518242ed659660db5a7c7224f838dc8f5ea9dd6e14c65746cf08a102431ddd77d62a434a
-EBUILD readme_renderer-17.2.ebuild 880 BLAKE2B 59723b3243c91ea9f0556ec7263d6d87069f5378f758b1a3d373dab80ae1c55f5de6fe87caedf4c6143fba03d9c4e685b67650a73f9dfeced380a6c18c04a8a1 SHA512 2cb4f040803f609c48d8954e47308618a2bd0fe2b36b026af5134226d766bda1b2046f85a06f066f1c66af6c92b110460f89296cab72744cca0e42ec908721d8
-EBUILD readme_renderer-24.0-r1.ebuild 771 BLAKE2B 099171eb2918c690b6c21b38b3973ccc3057bbbd1d0bd5289b455a3161b06e6f0d21d43fc108cab6807cea1da3aed964fe403e525f60d7f55c9a64bc89c8406b SHA512 e82342208298d0a6d8edceb492769e6929390dfa0d6cddc64b3269b1a27654847d3614fa0fc12af6eca54acfc80720a9eac3b2d19b829baa478116cf76a1146b
+EBUILD readme_renderer-17.2.ebuild 873 BLAKE2B 1bdab463393f19fb2dfa4404d0d6087a2d5f35fe726b51c8465bb9d200c5463755442136459cea211b3f0712d2d70ae3ee96fbb10a0cb4d64aea255a0d00befc SHA512 248c1c543c403ffe8c36fd95bee90774ad1b44baf0e0e79ddcad81ef90c6dc737fc340e72877df4e580685f2b5e70f562afa272865358cd3bf10653e56903732
+EBUILD readme_renderer-24.0-r1.ebuild 766 BLAKE2B f81065300cf79d350e32c67d710aa721f8c982871c84e9d8c4e271a93f9db17be059aababf7a21936a44ad7354e0485ad7b9fff5703b754e031233e4516c0706 SHA512 414637148262a86a7180efa572d54bf39db173e872fb60f32c7da274770f1dfe07aec89c63a159edb4d63c0cfcd76454eebc3cecb25d466ff0e2b170488f9c24
 MISC metadata.xml 390 BLAKE2B 2a81aedd6207fe28eafb76c0eca7ead7543282f84979e07f3b417a4fb9ed6be27a33e6e41f60c37b649cea7c8bd6977703e596760d44a734a0ba3fa023339bd2 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f
diff --git a/dev-python/readme_renderer/readme_renderer-17.2.ebuild b/dev-python/readme_renderer/readme_renderer-17.2.ebuild
index 60a9e955c7e7..90dd6fff0436 100644
--- a/dev-python/readme_renderer/readme_renderer-17.2.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-17.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild b/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild
index 281788626d7e..9b4c4f0b017a 100644
--- a/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index 9af867214892..1b81e8f18f73 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1,4 +1,4 @@
 DIST rebulk-0.9.0.tar.gz 257342 BLAKE2B a08b2d74685eea35597331bb2ef3c48e8a9cddc39ad3821cb7f33b80a47184a21f813b339e9d64548b3003913178191075455a6f787ab80ffa2cb3bf7f0db35d SHA512 25a22b3a5f5519f6f8c10abf6a477f212c0500264cfdcc5a9be09d3818462a051b1a7cd78f94991c44ac6bcdc7435b9909e65de48d1bd8138989e0da98d10262
-EBUILD rebulk-0.9.0.ebuild 955 BLAKE2B 3dc3dfda9a418744f05ebf0d16859120e167303077578e1da721a7c86c0bdc5dd546b4ead236ae58a9e40c9428cad7c1c587d498add0f1a3f953263338eacf04 SHA512 69adfe79db2da3841349f9837ad4191cf1229a00ed08ab24c3d99dcc50e60c0a4aa43f5290bf4f4509663a61e2cd1166cad78e6ef17cddb4ed6fddcceff35450
-EBUILD rebulk-9999.ebuild 953 BLAKE2B fbd8c911de9bedc6cb26f4e64429e2f1a441a809ebfc7a5dae69d1b97318d765ae338684a7c094306e6fa1b8cfea8258a57056e910deacfba08af35f4af62eab SHA512 e327bc82d53a909c42d16bc02c75e0caea930d759eff8880b9bcc924d3c6ed076bde614e875b374720b11e32934a423a0d2a339a349d16f2f82b0ce020f5ea1b
+EBUILD rebulk-0.9.0.ebuild 951 BLAKE2B 89513c3b138d1c90ee23df8c1f0836d6ab49753450fc17a366629c6329903dae4c2ae60d5d40bd04db8967726d18db693b21c822449832e4fa4bd5fee086d075 SHA512 624c3738b28a4ca58678f4ed740abb4f5de91baa2219605cbb76e23120017bcd45b3ad8bb98f07b9d39c04267e745c0e54aeba53a3a048bf57e61a9bcd229214
+EBUILD rebulk-9999.ebuild 949 BLAKE2B be1fcf982ce0ee4ef819ec965933ff5c4f41e0deb596cdab7ade4bcd7bd537224b9d30f30992bcaaa959a306ff719abc0d4da4112dc1e751ff81f0c7e5e5650e SHA512 e8eecef74f361bc5d196071552b152bb5a485b4e997ea10dbb1ed366f6a7d96bbdd1fc8ed1c673893c440df0b64bb7d9abf37e944c25287b70d7ea6e6cb17ff0
 MISC metadata.xml 289 BLAKE2B 0b4705d4e9400951a5a9bbfd79a5f311cf4918e6665f697b8b94fc7daa4bb777457fd919d09f79627ab5cff49fdf473a4535146b0fb7decf33f1afe15b42d32f SHA512 d3d12fbd490d3b76d211a0a47691e7ed085b6bc6235e36ba5ddb6c976793cad1f206d61444d451da66ff16cc4e0bbc2208ce6fcee07fd8b52fe6a01e39417257
diff --git a/dev-python/rebulk/rebulk-0.9.0.ebuild b/dev-python/rebulk/rebulk-0.9.0.ebuild
index 4f58410daaa7..20f7e36ec368 100644
--- a/dev-python/rebulk/rebulk-0.9.0.ebuild
+++ b/dev-python/rebulk/rebulk-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rebulk/rebulk-9999.ebuild b/dev-python/rebulk/rebulk-9999.ebuild
index 3dce8ff53b0d..b9f3215d179a 100644
--- a/dev-python/rebulk/rebulk-9999.ebuild
+++ b/dev-python/rebulk/rebulk-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index 46cba9aa4883..38187cac647b 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,8 +1,10 @@
 DIST recommonmark-0.4.0.tar.gz 7112 BLAKE2B d0e0f95f251e859908523c90b012ef2b162823d72b87192651d08a9cb5217a8bf497caf0320cefd3e724f77d3ad4324db446ddb57de55fd308c7739b78f55c04 SHA512 30d900840093c9ee2c1a322aeaba64c06c6f236e4c86a8d7604edc7d9fb0e78d66387f844619364d9253585db3f38d212242d2798153f343bc01ad281c146c9c
+DIST recommonmark-0.5.0.tar.gz 22356 BLAKE2B e22c6741e704b7017ff81282bd3297272f36396628b3a85e9e2ac5548b363a8b02f6aeb3db256b885a3a9a0ebe681da10f4f29c18f1bdb33490da55bf375b444 SHA512 e11a86961e477e9ae258df90c666fd0129a0ae858a8d5399b7f768b9e9ec5b4952ef5f9383ea91d8ccb1379e2753151387f7250588a98f43929bf3ebe78b7df9
 DIST recommonmark-33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz 22085 BLAKE2B 2225f8854eb92f9c905c5943c3d4db1cb56ccf22826f32101c9e8db6ac1a1658a543d58a71bfdd8650f225229be5c47658a6db9c6f535718eab5361589436d77 SHA512 4b4c3c9354c3de223c7d441b1665879d49a2f9f2328532901c69d10f4f8d90ff84e28aab3d1b4884edecd80071193ec69fbdbce735527ec2edc574b5a3d1fe88
 DIST recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz 22249 BLAKE2B 7466fc1448b54c2fd6969fa06e10c11e7bf1f2d772d96d749de9023d60570387a5472c74d660e8bd0722d294dd2ac1dec8d7d6fc49b281eea14b1f9ce423cf94 SHA512 67fa0b13d49d1f6b08e2fa28cf127c6dadb6454329a35e1e1217ff3bc93aff1a1a040740478cfdcab1b72acd939e0a81d7d8638e7ecdcc76e2791ddc33b8f0ac
-EBUILD recommonmark-0.4.0.ebuild 544 BLAKE2B b7fdb2b4f24b4c557a8945e914a110fb48f85a706fbb812a759f4e5d87fe4d23fc26bda81bf3d69cd3f3f4c48c96cd48087e677fd65bd3e73eadd9f4676de3af SHA512 e1576d36853a39d628aadd069438a7414275af963ccc995ff744d119cf3e468dbe55cfdf3275846aecc72ca5bdb270a3bd77e47d6f62ceed2032fde1d28f2e7f
-EBUILD recommonmark-0.5.0_pre20180907.ebuild 982 BLAKE2B 83bfc3535728bc365db401b5ba51cc0a5e784f1a78822ebba5aecfd78c753b2d2bca8a104828b72fc30520ce28d0dba2f6b6a1250a1aff11e6f00f810a6a6c7d SHA512 067802ce72b763d9743d12836ef2d7929c9e02f355e8adf563de902627dcad14c60783a3537f08754c38b92879fb03015d0d36f7480ba82a8b6c38b39b095aea
-EBUILD recommonmark-0.5.0_pre20181012-r1.ebuild 962 BLAKE2B 3d018e8fa1cc97f95c2705ce45e4602d1b5810ab56372dcea0bfd21558fbc3a6c2873ed769e719c4bd249d7cbb08892d9fb4b421ebb7929671490f4c447ed2b4 SHA512 739e6a0a9e4b14e8f6f15d7f9e90fd8884e94ea3bc3a83225c3542ef1c23d1e0ccb9565d8db2538d3ffd81df9801e115a3ee944e97aacb282241a2463641d382
-EBUILD recommonmark-0.5.0_pre20181012.ebuild 964 BLAKE2B 5f3b6a73ccf02cb4aff4a10a1334b5b43448831769d6f9f6f88de0aeb6f5022743b003023457dc8dbe6e82cb3e00edbf2cd2c069183c4759f05cf69e327457ff SHA512 27b4501db5d85671dd3272452e3c8fbcd36e80503066656a21fe3f544399ffd2c5046655e405b1226a6226efe7b3d687bd51f94969016ff406e12f62f2d51aab
+EBUILD recommonmark-0.4.0.ebuild 540 BLAKE2B 2c177c57f2a22f87470711e1b326dabb010de096f66ef4518aaa033b56bb514f2ccd01a2b0e6b41251e8007d6fdd52eec13a42190bf3832427c9dd4c03d18777 SHA512 2ddc82b4e50c439eb5c3fee4478627c47d1be3485e1321c53a59d97ba8956f01676b91e3a39b4418bd71d5a3fb560e997527a6872f2d0470c747c3780d157235
+EBUILD recommonmark-0.5.0.ebuild 855 BLAKE2B 3975e0eb2d4db06fbca22b69f6378133c3f96dfc8ab647f939d06a61aa491bbc1374691b6fef963e6948cd8b9337c64cf2d8351bd530b92d584ff67e2c0152ac SHA512 d22648ebf733f1f606c1b1b049ba15ec5644d8e704ce3936848a85b1f8d24dd902407707180672df387756655663ebb226cf351a6e5d9a008d2f3208b0b102c4
+EBUILD recommonmark-0.5.0_pre20180907.ebuild 978 BLAKE2B 2af506510486d55bc9f7484f29f4655e9dc9f7341b86a07e261102981c2b8c744282aca3b14162a70aa0f87e218f507df1be0f1eca7cc048edda108be7c9183d SHA512 2b057f495d2c8ef8969f2277e7777b5132e07cc57b12aea0e62ff7fb4b503ce1ea10a53d2558623da512586363375ca5318e7561d4c4da907ced88d4fe74b935
+EBUILD recommonmark-0.5.0_pre20181012-r1.ebuild 958 BLAKE2B 8901756482f36dc9f16a358dde91289d680fef9cb5a5befc3f8cef1017fb4243f5db1b2f6e66bb14ee193709ed7f9f438f1cf1bf2abeb4f3a78c326301ca32e0 SHA512 4bfc7c29ef01ff9d5bcba37b04661edcfd55f076057be6490bef5bac7db151fd34906e44f515c76f0f2ee89301b1060eeea4a1b124a33ada6844e770b7e152d8
+EBUILD recommonmark-0.5.0_pre20181012.ebuild 960 BLAKE2B 5ac25ec8ced21df3d1d04783feacd42d8ac5e3296745083c7820bc2b1eba5e4f2cd4594c86215d4222a46f7536706dddbab3fc4815c9ac978d689b22ea7a1051 SHA512 64b07cef5b08067a5cba98b3cf25e0cc0ae546bca060eff98bf8368be9337a0f8bf29c4d832c84d6f014d36fe619cc3ca24a31b003cf11c3e53efa4efb7ced40
 MISC metadata.xml 519 BLAKE2B 8ea8a1e90a05ccb7f78d0de5213fb0ab447a8e8d9ebef7011eb4cb237c909d8bac77319282a76e3db32f58ec0dc6d76f6dfbe3c29c4c71c7f93398d91afffc0c SHA512 83dde1b703e097ce74627ad0139fe6cb97de26cd080bf0b191effe61ff8bd6593bf02a98be1e27ee142520142adebb48c4cb13066cb8d2109ecd642785b78c9e
diff --git a/dev-python/recommonmark/recommonmark-0.4.0.ebuild b/dev-python/recommonmark/recommonmark-0.4.0.ebuild
index 1d0cd28b5b41..371995c3ae04 100644
--- a/dev-python/recommonmark/recommonmark-0.4.0.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/recommonmark/recommonmark-0.5.0.ebuild b/dev-python/recommonmark/recommonmark-0.5.0.ebuild
new file mode 100644
index 000000000000..a6d116d158e8
--- /dev/null
+++ b/dev-python/recommonmark/recommonmark-0.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
+HOMEPAGE="https://recommonmark.readthedocs.io/"
+SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/commonmark-0.8[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
index 9b7ca409a81d..dc8566adf369 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
index ae236bc8af88..d12a9618367b 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
index bdf9cced10ff..f0a0ef42540f 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/reconfigure/Manifest b/dev-python/reconfigure/Manifest
deleted file mode 100644
index 305d64a43eee..000000000000
--- a/dev-python/reconfigure/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST reconfigure-0.1.79.tar.gz 31395 BLAKE2B 74e17f17088900a3c2c60be6e2d2993724a7064b43dc72ba62600786ae033b7edb1e1b6a3c00abd00f9364a8886b09af9694636e120990a23cb9de6f145b1e29 SHA512 c25e099b8934421356a10bc44a28354bc0c174e2a62bf41f528103561d2a4098056c4e76ba85d88851d58bbe8f4c1996d885a9b3542af68d7d3955d001b4ea6a
-EBUILD reconfigure-0.1.79.ebuild 456 BLAKE2B 8363babdafea8d07e62f2a15181cc1dd5729445ad2467161b77d70516f6f251ad30c3014c25ab38cec08df649f1a00896884b61110a9f34e509d119ef5021e5e SHA512 3a89c4465676ce06f00994fc546512cf500760d3bd4c45059f44022e4ab759daa11bbde0465456fb921318b83655838a103f4b558a5d79657c74b8c099050b7a
-MISC metadata.xml 324 BLAKE2B b6dd2ea775b5b2dbeedff5dbb4d5f34189ffd20160750199872682629b1417672192a11fd5110bede74345174e1d5ff04b2e32b12a449ef95265d912bc4b4858 SHA512 06723f586955d7e935b19b44b92046cf25d9c0b387f12b42395c19459f54cdf622aba9fad3160ea8f7f797a560667906d6a2c143aa6052c9b108b4e8f76c10a0
diff --git a/dev-python/reconfigure/metadata.xml b/dev-python/reconfigure/metadata.xml
deleted file mode 100644
index dc37173c0b64..000000000000
--- a/dev-python/reconfigure/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">reconfigure</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/reconfigure/reconfigure-0.1.79.ebuild b/dev-python/reconfigure/reconfigure-0.1.79.ebuild
deleted file mode 100644
index d509091d54a8..000000000000
--- a/dev-python/reconfigure/reconfigure-0.1.79.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="An ORM for config files"
-HOMEPAGE="https://pypi.org/project/reconfigure/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/redis-py-cluster/Manifest b/dev-python/redis-py-cluster/Manifest
index 425520c50da7..b1f7dc7824d8 100644
--- a/dev-python/redis-py-cluster/Manifest
+++ b/dev-python/redis-py-cluster/Manifest
@@ -1,3 +1,3 @@
 DIST redis-py-cluster-1.3.4.tar.gz 32842 BLAKE2B 3df49be7acea9f9d11fbe3e1f5b526ed92a12225c8f41aafc77e6fd93bf62e9a8e62ceadc32feed3064f0bee916f64094ba41a3d34c269f32585a8b171d60af4 SHA512 4119780da7c7633b30d3ea525de82ca44629470b37eb1cc9f7b000d0cf237cfd0265cd2de0c093f064a350172b82334bea12687c49737d11be46d4c670a3e873
-EBUILD redis-py-cluster-1.3.4.ebuild 456 BLAKE2B fc15ecdd0dcf18e83118a114b7e8136fcd0caccef084895ecc6535669ede8b8dd1c8c7f48f6e24f59c0cfb27db877ecf9c4a6975e7461aa48561bc9b46803ca0 SHA512 c0509b44d6cbaa57ecdf7f94eb59b9e52f8e3adfae7cbcc4edf44a6fa0918279ce102c8a2db6c1d9fc3d7c924dd99918b01c945efc1abd0d94649c12dc472bbe
+EBUILD redis-py-cluster-1.3.4.ebuild 446 BLAKE2B 53f7815fc65005dccc1b101376a0bf2e65cde5570a2efc764d35911bc853c2df305f3f13ad56ab5bc38e9ae869c24bc7a18cd01829bc037ad4781985800c6e57 SHA512 a73f1e38cdb539fce5151eb9ba3aca3d8b6e75f36d4a6754a8e47128b296cbc82b83210b696a1599b17d608aded38ca18e7d9019848db7bb76c6a5ec4bad0ee3
 MISC metadata.xml 395 BLAKE2B 09fa5ade89ec9e6ec1d380ea5a6fbadf53b342590e9e6dbd9b0822ea1aae0d7339a6065e4cf9b9696d17838c20b4273f2184d2d35d286576035d2599244ddd49 SHA512 e7e05cde2b959942181b918f106cd764519890f19de8b0b7af39e606422eb2dffe2f660350a15ac840a4c09bb2d5264bb86df4ec22a343b1fdd450e117b9faa1
diff --git a/dev-python/redis-py-cluster/redis-py-cluster-1.3.4.ebuild b/dev-python/redis-py-cluster/redis-py-cluster-1.3.4.ebuild
index 5625cb41488e..f27043f4e7f6 100644
--- a/dev-python/redis-py-cluster/redis-py-cluster-1.3.4.ebuild
+++ b/dev-python/redis-py-cluster/redis-py-cluster-1.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 2f1574712f71..32d8726991f3 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,10 +1,5 @@
-AUX redis-py-2.10.5-test-finalize.patch 543 BLAKE2B 5bb883a674bee5fd4c7466a7a7b08473cf90540a7e78cdef53e425a0b5f3282dac06857b3269d0d3bcb602f716062d68cf7ddcf128b7934124cb778da5d60265 SHA512 bd1e48117d6ec89fcf86dde41b38deab3782e4e1ee6038123d3b225214b9843703067ca0d4b813d7bf8da1f64e45ff19a1b5a9337f2a9953a7f3ef9766b7a441
-DIST redis-py-2.10.5.tar.gz 88610 BLAKE2B 092efe4fcbc500a59981fc2d8574b70ee322ce7ccba012e5babd022f30abb017e53f093b3f4d876a297ab2e4403a57e749582d4027f1efa53efcbab0214347b7 SHA512 b2e6cb85c274c8f1c63e27256bbab816d016a68c324bf7092cf53feae819a34fa94f45565b0f209ee981919d793b2963462eb1a6f841e9dde9885802e0ebbe8f
-DIST redis-py-2.10.6.tar.gz 97299 BLAKE2B 9fea87b5c8ae0f3574651717e664cda62ca7752e44c4e60f4a50b82b53a52a5d005dc79c72afa58abfb807bf303f46335761129c54a2ef8e4f524451543c6c96 SHA512 e7df464bc3b26e23f6a0d2d2896306c1e4792b9a2a4ecaea6dd8690ffa17853cc85345f063307295dd3c2da399f7f203f4b21d785f7e073c0501732257419dad
-DIST redis-py-2.9.1.tar.gz 62204 BLAKE2B 633dd00d5aa984ac4dfb223aa685f8fa6913f4f00bb5c5c231dc77b6e8d33f1cd57c2e2bc07c4ec4658ca3b7675fd172919187fa2e95afb8eb5345f65dcbca00 SHA512 6b4912acafb31c87a5bc47b0420834aa9d1eba57feb0bbacdea943b746fe2f24aee4c9f13e7b03ae4edc562043b22c370cc7f53e45be07c5408cfa9852f8ea38
 DIST redis-py-3.2.1.tar.gz 124692 BLAKE2B fc7a773ab0a7e13f034b9efa174806b024733f9263b962599ce72e9a0c88b11964c26081375b6ae2de49939b59a561c145ae1b69c262b801f9b887befe9dcc0a SHA512 be51642a8895325c3c61993dd83c3299a9e2cefc1010e04f182833f720ff161bea43d3a57d28afba991949fcf6e967c4f778002967641bffe651d5db384f2e08
-EBUILD redis-py-2.10.5.ebuild 1476 BLAKE2B ed2ccf247b45e9c717b20e08ea14f35e15b3b778cf4c060dd20702efc9a3934120c3dd45d6d31f63ceeee6ef64ceacb0d4bfeee0041303cd28b35e8290c28cfb SHA512 164ebef22114ce0626efd85ac0864cb31aac0e1237dd9f97c3b05ab67f7f9eeac61d06761f3e41e39b55275b2b982ece62c121bb2a6d6aca62e1f0b9ba7ca826
-EBUILD redis-py-2.10.6.ebuild 1489 BLAKE2B f85c9e984b361f23a3b1670fc8a25b3df62602d52be8ab79e5c6d59ea67a792667990b0e3dd454141ab5d4e4c0582f662f2bd90178acdd4e015fde06123086e6 SHA512 2437a67aa59fb30e37930cd9fd65acdc45dc46167ca2678f41e9c523f4e87bf7a0a59314f7ffbcb60a4dfb359677b88b45a4ed92acc85b1f18dab7616e4aea09
-EBUILD redis-py-2.9.1.ebuild 1547 BLAKE2B 2eb71e384748be8f604092e69cd1f1d58196bd85c9066e20a30339329d74053122aad83a0ef39be5b29d3de0f1d9978e5ff608c9d63cfae9d09969dfe57f8b70 SHA512 83a282dafeed1cac642ba4b047f26d1f6e7388238db5359540f8e2dae02d922e8e591294b0641153fa78f76ec315b45afe5459daaea136bb13029de45ed6e0ca
-EBUILD redis-py-3.2.1.ebuild 1475 BLAKE2B a1197835b47d0adae73a5be838e58bc5f8c7215ed58de477860b3fd401878f2744d82a635490ef338c361fc2663835b4d80ba1b07229864396d3fe093eb91fb3 SHA512 ffad7f3017fcedb8932cbd507a1de2d95bce31701192a72e88355151a1849215cda773ff980cc286036858bc990edcb582c79a1fc21fb56d27c27c5f2da51762
+DIST redis-py-3.3.11.tar.gz 131072 BLAKE2B 6becafba3da22bae796a4a9ba55d11a61d9ed1a8b693a734d4ef3f0e463c0c39a05c01546225f69eb36a788779d6e45d0136e1a6d6856ec63c3dd07994b5db9a SHA512 a32327fcebc6242367c0eda6c6dcd1a15d5d575527af2e9de0d76e05bc4afc7402566d9254e467663b81907a310731af3041236b6b135f3b8ff1429a502c1000
+EBUILD redis-py-3.2.1.ebuild 1468 BLAKE2B 2fe39db26b098d9a6fefde774ccebaeac8c720301e28bc90ada6e7e729c1069a6361910471bf1d15a1e0bdde3c307e82d054eb477a6a6823ff6145c734f9343a SHA512 6fb92bb8158c5e8c8b4044803462f997821163e36f817addf5e3891914896740b21ffbb6522356dda3d055385f3084ed26eb9aab5b3928e99fb904110b5b1cdb
+EBUILD redis-py-3.3.11.ebuild 1407 BLAKE2B 49bcc15c60ea4565bc3e4141a9a0baf7e2ec8807aa5041f9e3f730f4edb9cc9ec088597f3d07fa615a52c1383c027fcb6ceddb5f6bd163310acdba8e5d93e399 SHA512 ee542ed444bf53052660207b3dc352de8dca161153389bf166b172644631dbfe4f9ae877ec4efc612e724ba7c51921b6a24a2cc28e6cfdc5fd0e9d2e1ae28e6b
 MISC metadata.xml 380 BLAKE2B 993e671ed9c6a9649a8dc0d95207b4dc1f90cb38eb8af6e470fc9e18b496768b541c033ee961957d56ee93b335c54447b741fad38f71498188480822350b508b SHA512 5e03d25770ee53beb71d1efa039401a5598572bbf6cd441c904fb5c074d212c0c05934c6f86abb566e913ac65bd84db3cdaca8b83c182dad57d0fcffdeb9aa4b
diff --git a/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch b/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch
deleted file mode 100644
index 1a807480dfb0..000000000000
--- a/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- setup.py | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index ed8fd5f..ab648a3 100644
---- a/setup.py
-+++ b/setup.py
-@@ -9,11 +9,6 @@ try:
-     from setuptools.command.test import test as TestCommand
- 
-     class PyTest(TestCommand):
--        def finalize_options(self):
--            TestCommand.finalize_options(self)
--            self.test_args = []
--            self.test_suite = True
--
-         def run_tests(self):
-             # import here, because outside the eggs aren't loaded
-             import pytest
diff --git a/dev-python/redis-py/redis-py-2.10.5.ebuild b/dev-python/redis-py/redis-py-2.10.5.ebuild
deleted file mode 100644
index f12abebfef1c..000000000000
--- a/dev-python/redis-py/redis-py-2.10.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="redis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="https://github.com/andymccurdy/redis-py"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-db/redis
-		>=dev-python/pytest-2.5.0[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-finalize.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Make sure that tests will be used from BUILD_DIR rather than cwd.
-	mv tests tests-hidden || die
-
-	# Correct local import patch syntax
-	sed -e 's:from .conftest:from conftest:' \
-		-i tests-hidden/{test_connection_pool.py,test_commands.py,test_encoding.py,test_pubsub.py} \
-		|| die
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use test; then
-		cp -r tests-hidden "${BUILD_DIR}"/tests || die
-	fi
-}
-
-python_test() {
-	local sock="${T}/redis.sock"
-
-	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
-		daemonize yes
-		pidfile "${T}/redis.pid"
-		unixsocket ${sock}
-		EOF
-
-	PYTHONPATH="${S}:${S}/tests-hidden"
-	esetup.py test --verbose
-	kill $(<"${T}/redis.pid")
-}
diff --git a/dev-python/redis-py/redis-py-2.10.6.ebuild b/dev-python/redis-py/redis-py-2.10.6.ebuild
deleted file mode 100644
index 74ead466b5ae..000000000000
--- a/dev-python/redis-py/redis-py-2.10.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="redis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="https://github.com/andymccurdy/redis-py"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-db/redis
-		>=dev-python/pytest-2.5.0[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.5-test-finalize.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Make sure that tests will be used from BUILD_DIR rather than cwd.
-	mv tests tests-hidden || die
-
-	# Correct local import patch syntax
-	sed -e 's:from .conftest:from conftest:' \
-		-i tests-hidden/{test_connection_pool.py,test_commands.py,test_encoding.py,test_pubsub.py} \
-		|| die
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use test; then
-		cp -r tests-hidden "${BUILD_DIR}"/tests || die
-	fi
-}
-
-python_test() {
-	local sock="${T}/redis.sock"
-
-	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
-		daemonize yes
-		pidfile "${T}/redis.pid"
-		unixsocket ${sock}
-		EOF
-
-	PYTHONPATH="${S}:${S}/tests-hidden"
-	esetup.py test --verbose
-	kill $(<"${T}/redis.pid")
-}
diff --git a/dev-python/redis-py/redis-py-2.9.1.ebuild b/dev-python/redis-py/redis-py-2.9.1.ebuild
deleted file mode 100644
index e0002c9cb7bf..000000000000
--- a/dev-python/redis-py/redis-py-2.9.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-MY_PN="redis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="https://github.com/andymccurdy/redis-py"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-db/redis )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable pubsub and encoding tests, they do not seem to support
-	# UNIX socket connectivity.
-	sed -i -e '/PubSub/d' -e '/Encoding/d' \
-		-e '/use_hiredis:/d' tests/__init__.py || die
-
-	# Make sure that tests will be used from BUILD_DIR rather than cwd.
-	mv tests tests-hidden || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use test; then
-		cp -r tests-hidden "${BUILD_DIR}"/tests || die
-	fi
-}
-
-python_test() {
-	local pidfile=${T}/redis-${EPYTHON}.pid
-	local sock=${T}/redis-${EPYTHON}.sock
-
-	sed -i -e "s:port=6379:unix_socket_path=\"${sock}\":" \
-		"${BUILD_DIR}"/tests/*.py || die
-
-	# XXX: find a way to make sure it is killed
-
-	"${EPREFIX}"/usr/sbin/redis-server \
-		--pidfile "${pidfile}" \
-		--port 0 \
-		--unixsocket "${sock}" \
-		--daemonize yes || die
-	PYTHONPATH="${PYTHONPATH}:${BUILD_DIR}" \
-		esetup.py test
-	kill "$(<"${pidfile}")"
-}
diff --git a/dev-python/redis-py/redis-py-3.2.1.ebuild b/dev-python/redis-py/redis-py-3.2.1.ebuild
index ee675a119cc8..ef7ba5ab5ca7 100644
--- a/dev-python/redis-py/redis-py-3.2.1.ebuild
+++ b/dev-python/redis-py/redis-py-3.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/redis-py/redis-py-3.3.11.ebuild b/dev-python/redis-py/redis-py-3.3.11.ebuild
new file mode 100644
index 000000000000..42add4480b6e
--- /dev/null
+++ b/dev-python/redis-py/redis-py-3.3.11.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/andymccurdy/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="test? (
+		dev-db/redis
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.7.0[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Make sure that tests will be used from BUILD_DIR rather than cwd.
+	mv tests tests-hidden || die
+
+	# Correct local import patch syntax
+	sed \
+		-e 's:from .conftest:from conftest:' \
+		-e 's:from .test_pubsub:from test_pubsub:' \
+		-i tests-hidden/test_*.py \
+		|| die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use test; then
+		cp -r tests-hidden "${BUILD_DIR}"/tests || die
+	fi
+}
+
+python_test() {
+	local sock="${T}/redis.sock"
+
+	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
+		daemonize yes
+		pidfile "${T}/redis.pid"
+		unixsocket ${sock}
+		EOF
+
+	PYTHONPATH="${S}:${S}/tests-hidden"
+	esetup.py test --verbose
+	kill $(<"${T}/redis.pid")
+}
diff --git a/dev-python/redlock-py/Manifest b/dev-python/redlock-py/Manifest
index 00c49be81345..ca9f94e1a526 100644
--- a/dev-python/redlock-py/Manifest
+++ b/dev-python/redlock-py/Manifest
@@ -1,3 +1,3 @@
 DIST redlock-py-1.0.8.tar.gz 6035 BLAKE2B c728aa262b0c0a8b87829edef4819a35700423500cdde7abf2ea8dae99451055006649ea6f52325ce632178f746639af0c716ab8998a815a22709d3b5b0ba202 SHA512 16c5e52019baddf0ff2a996e227d9a469be19dc4cb16a6f33df873c121717f9338ca180f264171e9e0de34c2c9dbc592e47a5c7272b646ec6dd047f46b1349a1
-EBUILD redlock-py-1.0.8.ebuild 562 BLAKE2B 110f58a38da4dd01df3b583283aeddb34783a37b0af01f61c36f1f42573c651ea5d82cef1c96ced51cea48efdad0309c0e92ba0c90f21a8f85aeb7691e2ed9f5 SHA512 169e17f6d2892a4a7581f087daaa36696c52a23afe9d395fe1ed201df57ba94b84c0dc92daef31d99f7af70292b6bd8e544cb3fe87a0c0dabd7c01c46953b074
+EBUILD redlock-py-1.0.8.ebuild 545 BLAKE2B cda6cefe9de8e35c13671eadaa32595ee9df584c9cb5bc04aa9687228595c66723fdf46b94ea886bb481cc156d70370df297d6221750983734d74bb41c1a654b SHA512 c059d68b6c472b20498b8997b20fbab51ad8af6a3e3424d0fd0a326b6b5a41434df5357bfb0813e7474d7e9bee677e2de2e022cb5d6c6c4225c3d44b66e2af06
 MISC metadata.xml 353 BLAKE2B dd0204b4287ddb1cfcc5bd5728d83c84ea0b32dfdc1e5c552f50d5384cba0fb770b09f568ccf4333393d4935305ebbb4166883106341b83bff1fe6899cf88b81 SHA512 a5558284d50fb55c555137cb67dda3dfdf4d27245f1afa3f30c7aa8242e417c12f546f7d7c422bb98c8627de698f8d413bb9dc0fbeb00494c20cd6b5b5ad2224
diff --git a/dev-python/redlock-py/redlock-py-1.0.8.ebuild b/dev-python/redlock-py/redlock-py-1.0.8.ebuild
index b0edfcac2b8f..14102dbb1d3c 100644
--- a/dev-python/redlock-py/redlock-py-1.0.8.ebuild
+++ b/dev-python/redlock-py/redlock-py-1.0.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( pypy{,3} python2_7 python3_{5,6} )
+PYTHON_COMPAT=( pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rednose/Manifest b/dev-python/rednose/Manifest
index 54cf04c3c40b..6ba1c8ac2d29 100644
--- a/dev-python/rednose/Manifest
+++ b/dev-python/rednose/Manifest
@@ -1,5 +1,5 @@
 DIST rednose-0.4.1.tar.gz 5888 BLAKE2B b221403c676947ed61e6d9aa2f32c069ca6171a6594aaa0e9fb2d0299c304e64eb7634d845d03e64b2a608fa9be2694131428f563465f0c686db8ed7e4bdbef9 SHA512 a9ff3bbbf35e6799a66728feb81f6d83b88ea9804bbebfc64d626d4bdb002c8e7a655027861b694fda15b9b8b24d7e3de2554f284e1683eafbf24eb24c4a192a
 DIST rednose-0.4.3.tar.gz 6046 BLAKE2B 0486d4743d0aecbbcc49cbee108e3d6841d6f3f4e6165614c96122dc9b9a626ad56cea9703f04adad83db3a2dcd934896eed93ad5ebd30c9a7f6711e3e1be375 SHA512 e0169599f251cd90a2906e489b870e7d10322a82253a3a814bc71aa257bea34bd5eb833b637dbae3128f8f37df79929aa4d6331e246654c83eb16118d637182a
-EBUILD rednose-0.4.1.ebuild 477 BLAKE2B 8b8d0c98fbf5d6703e587c1b8eb90578de6f6bd8da42e7afa3b2176d26c16159b278d460ea867e463e2e34c0380aad31c4a7a4be3f05a9470ed14129dce7926e SHA512 954eef5bdd78b4aa21e80327836a8d96fd9c9bfccc38efd94ac1b4a3417c8b3ca0da3d2ba80b87ad9818b94f94911b724ae250bff901ef5f9b04268fc580aa0b
-EBUILD rednose-0.4.3.ebuild 591 BLAKE2B a4d66229d3347e1867abcc45fb0a6531de9ac4c49f16f93289730d98526631964cc3de252126ef0755f07e89c34a566367fa1c271b49a70e4e36695df56b210d SHA512 6da6a92ad070af97bf33d0f57fdad9c88140aca97042d7e6d9b450d0b2e804979ca187c56fa0648ee703ba26ef3c498bacccda2154111eee7bc2ecc36bc7b2eb
+EBUILD rednose-0.4.1.ebuild 470 BLAKE2B 0aeae91c3467646f6cf262c83e9dc0272158011ae51c6987c88c9b4a4cddcf37fc4047f45bbacfacd4c430395aafc16a9ff09835c6d3ddd56b93be5b9c3f4766 SHA512 2916fb3601de86f200544a3fefff50f8985b9cec90816a3d5fa8a6daff074c3cfdb8936c5284b2a7914972f12d935973ddce69047c0e55e52f20ddc8ab0756b3
+EBUILD rednose-0.4.3.ebuild 584 BLAKE2B 8962d357c15d488596e29fb32865018cab4c3baed5c6a44a944a8fe644515f18cf2dd0ee52e5114250d6a15ed0898711fb8cc1e5ff8ba7733ab30820f31fd36b SHA512 8e0ef953d29a5798b97879fbf28608de41e3d0fb7e8803cfc48b57aa0486c988d64245d6b69af3e1fee6b269fd520731673d7a912c9585eb5bfd52dee8413433
 MISC metadata.xml 240 BLAKE2B a0bef4c8cb43f09e3568f286142b660aebbb07ba60fd5d75916b57fea45bda9ed18f23eaac7e2bf20089ab0d9cdab1e2cc412be19eeb704f6437c0dd8a44bbea SHA512 fb4bb85332dd0ba19ce0141c882a04c4dc93e654ec0f63d4ce43e562b8c1eedc2d65471f2e1122952e14695d25c3cc4acea0f4e9d113c1d05df892637f2a9744
diff --git a/dev-python/rednose/rednose-0.4.1.ebuild b/dev-python/rednose/rednose-0.4.1.ebuild
index 1291ee93a360..4af2f8bafdcb 100644
--- a/dev-python/rednose/rednose-0.4.1.ebuild
+++ b/dev-python/rednose/rednose-0.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rednose/rednose-0.4.3.ebuild b/dev-python/rednose/rednose-0.4.3.ebuild
index cbbac622f9d8..b9138dc20652 100644
--- a/dev-python/rednose/rednose-0.4.3.ebuild
+++ b/dev-python/rednose/rednose-0.4.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/reflink/Manifest b/dev-python/reflink/Manifest
index 2d7267210e75..c9d3c76de999 100644
--- a/dev-python/reflink/Manifest
+++ b/dev-python/reflink/Manifest
@@ -1,4 +1,4 @@
 AUX 0.2.1-correct-test-deps.patch 325 BLAKE2B 33600ee1ffe704b26ba310dcdf4bd75850a6c8805e184f0aa90194600cf1bc6bf3005978ad957dcf2b8f14ea5de31e35f902c6304974f644c755013e4c6451fe SHA512 bafdd031a205891dc171a0ec0f8f62085c15ab7909e405444e88c6fede2f8640bcacc3e9c7f5e99244320770fcbcbf9009fc9da06d838905f7a388f7af124894
 DIST reflink-0.2.1.tar.gz 14638 BLAKE2B a6449ebb27619ead9ff8452df6c48f3617e5f06eb347fbbe14ab00b9a43c01de8e101466288ac6fb73602165d4d4e9315f941c2f28dffe245ed2c39a10a61cf1 SHA512 5995ed787bda93cb46d99a603110768087420edd72c01d5f3f7f08a3f8f63b4629b900a3c173dd7f3119a892ac19ab1a9c3000ddd83810b22a52dfb5fb892a28
-EBUILD reflink-0.2.1.ebuild 1018 BLAKE2B 7ab95ec44c2be1d3c2edd780826d566e5a198136350af693fe73f2634ff6d7732fb68500c5a144833309e9c2ab5d88f010188fe24999cf91c034e20cc3dbdfc0 SHA512 060460629366f61a9edd6c458dd54f33f8c7ba3e17cd12fe00862fad4352889abae82925236cd690f3929eacf5104aa2c1a351c6cdbf783f11cf98be38533306
+EBUILD reflink-0.2.1.ebuild 1013 BLAKE2B 8060c5a0485c439aee5ee0ce4af7867d2d809f808575f97b8900bccd5dccb5d05d51b5d23f4f02f84265b5a3717911b4645f8bd04b7986d08e6caea547b81906 SHA512 ef040a35c25d8a742139dae83b1e414b372d54afa9c80a9ea8b17d980ce03259ece1ea23bf9b8d23f2d096c9d50aed78036d9460d213ceed95003812b0e7173b
 MISC metadata.xml 493 BLAKE2B d7e0d0236537a68ada8c267aa6a2d6803a4f88e82938a73a7bcd0cf9cb5567177745f5fc2c1d81e92f17501672a430439845be6c63b7853cdf927302259bbec5 SHA512 8a4c8db0dc28f8ee0d6bd855554e8cf1f7661f5625f37ee04483fa918ac78d238487f1246dca1c96f647ccb6e9a35bd22b171d659ff06cd616c369d01bfba221
diff --git a/dev-python/reflink/reflink-0.2.1.ebuild b/dev-python/reflink/reflink-0.2.1.ebuild
index 6cb325ee6f9b..ec1fcbfd5d2c 100644
--- a/dev-python/reflink/reflink-0.2.1.ebuild
+++ b/dev-python/reflink/reflink-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/regendoc/Manifest b/dev-python/regendoc/Manifest
index bafe308773f9..56610e01992c 100644
--- a/dev-python/regendoc/Manifest
+++ b/dev-python/regendoc/Manifest
@@ -1,5 +1,5 @@
 DIST regendoc-0.5.tar.gz 5651 BLAKE2B 5e9dbdf51ccbdfcb741a6e17efe8a90d4651e1aa41ebd3223ace901cb6e29b00916c5eb75deec8848dc3b9b5da7934231289d29f1cbe5dfa702f61ff900219d8 SHA512 4da72c278901d3bb7ec711337c12738903c3686c7b7b30f95842c3fe2b04b4d59f20fa7b4b1c2334e8c7036ec02d551a777a0eb094541316928eae1945708977
 DIST regendoc-0.6.1.tar.gz 5832 BLAKE2B ae3ea674f7c5762f1c53d05c021daf3ab6133efcf9194106eafa87031004aa8e9b53cd86cd9b2ac2b2d6829a38dd11fc2a62db0c4f00d7e1b32a8771bcff171a SHA512 bb6551e1e50fc540649e5856bbfa36d7c26aaa609b8361e4f0260246c6479870cdca97b95db6730a0a6763fea626d4d6267fda1593769f90416447a95f34a18c
-EBUILD regendoc-0.5.ebuild 735 BLAKE2B 4832ba8cb0b38f7724ac099519be7bcf2c5e09fead3922c7f618f899b412d2334809afe25a3d990d05479ecf799a844c53e9ceb1c1e0d6b73bbe7c7bb5db57bb SHA512 00d6ac9dac069f84c8a0645a473cf80390c8ad1f478dcc05cd1da015252d375effb74a159ec6416a649be9cb2098d53148c30ce93e99454d888f456be855a2e4
-EBUILD regendoc-0.6.1.ebuild 874 BLAKE2B 83ab237b09c0b881c0cdfbd5b2cdf4e13a6a7a9373a65978c5a32734e0d8bf2a844678d4140fdec3e40d02e9e2727c79e59fdcddb8c983347ec92a90e4ede649 SHA512 32b71b580710249defa3381ad24d8d3ab6cb83d5100ad0971e988478ceb88fed39cdf67ec3e234d708b43d8ac2b4aa689505a4d8ce9851a21c266fce9f3fff0a
+EBUILD regendoc-0.5.ebuild 716 BLAKE2B 1402f934bbe84276921ff8b2e8472209792828067da763edcfbaed898f66aacb792281840bb518891a963e726b37ee9cc93b8cb6d8207ede997dd607559162f1 SHA512 8eb25b4656e1d6be4a31d2b78b6b88489d81c610fb62d0e0597b760e77b51e17a7f40c41ee9ff9033df94a289f5a4ac9a6eab318f0f4988856a47284f47a9497
+EBUILD regendoc-0.6.1.ebuild 855 BLAKE2B c439a0743f82f24b515430e1a89b0219a1bf793d6a8dc1b9fdc74957e9c4833b8be6f99285eba819f55d9e32f9870a15375931308902d012242c820d8e50cbfb SHA512 cf6f1df1e9ca83f5e0d4b5e4d2af28f3cc5ba48064d2d1762b4d3f6095d169291f5fb074575d8260515e4647e98acc027e8755a4cecf3d1aa13d6f33becd461f
 MISC metadata.xml 380 BLAKE2B 9255cca7329fef2ee19a090b29c4150f6c3d07ce4fc8d7da976308add0f1b5b39dc555e2f1b5ead6d4f2e7d6c269caa9a04c1d334738600ebbfffce4d02d7df0 SHA512 f7a80142633d3df1513dabfdbe8f2dea3236a668456bd449cfadda657103f4a4ac9c692145cfa47ff71f076e7f174b184d7a750f1d9aa065a1be80661f776776
diff --git a/dev-python/regendoc/regendoc-0.5.ebuild b/dev-python/regendoc/regendoc-0.5.ebuild
index ed302a880a5e..a7eac1aff527 100644
--- a/dev-python/regendoc/regendoc-0.5.ebuild
+++ b/dev-python/regendoc/regendoc-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/regendoc/regendoc-0.6.1.ebuild b/dev-python/regendoc/regendoc-0.6.1.ebuild
index 9b7f9e55814c..e55109098cd4 100644
--- a/dev-python/regendoc/regendoc-0.6.1.ebuild
+++ b/dev-python/regendoc/regendoc-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index b15392f1b06d..290b6026e3ec 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,7 +1,7 @@
 AUX regex-2019.11.1-pypy.patch 10520 BLAKE2B 7ba3b494c1562475ab3e5b996083bd75e2273104dd0e16d44a4162b5c6e994aa6ea109a05b1e338b0fc9e39be28edf193ca52d2642ac6bd57549d9dfde0825cc SHA512 145c7b530c807dc4a331a7c48a90a56418be1ab1cdd3072c554607f579836acf3199c8ff6dd56f74ef221dd24bf7ae390bde932f5d4a00761ce2e23dc2af1f4e
 DIST regex-2017.04.05.tar.gz 601638 BLAKE2B a7c094887b602f24e68c51c92098604c462d506b13f064beaebdec081fd28d39dac9934fface0de0444dc6145af5f4c0e8ab2cd3b65ecfc2c1ca522682b3bf95 SHA512 4c3e440e11f57e2323892e10fbed7f2c89b35771fdc970164ba69bb154dde535f6edb51a0997c924eb776c61e5efd1d04001abd343110518a89b5b7bf148ae49
 DIST regex-2019.11.1.tar.gz 669331 BLAKE2B b0b51051f88b6a171e78b281332fadf4d7e8588a76b367a86bb2754815614625738e882ffac66cb243d480b8d6920210423725ff4c1331cc199a3df7ed8b59a5 SHA512 fcb7d37f77937815428909ec3cf86785779ee80389a859f082c0f4b3c955779de6674490857737bc595f5f3a1c430cf237ba384ed54c37d254a8f0ffa1577148
-EBUILD regex-2017.04.05-r1.ebuild 1170 BLAKE2B dee6c1ebbd82c2c3e18cd9d98bcb3a473c65e440e446626b02958a4d8a80a2cc6265be295750aa8f9720720f9e34ef98c1c97abab6ae0c0512d7bf89a493ce9b SHA512 36322668fb20a194fb283538865d7789237d552f271d9d6cf7991b6b2d9b2947ca14836106c2049aaef0dff6756757f8ff954e32935facd39e8b4b795c347673
-EBUILD regex-2017.04.05.ebuild 1198 BLAKE2B e6063f29af772c79895de75964e18c543323036a3722e2a67dadff54ce6feebb2430f2cac6105147da672f81d41ff85c4651d571c25c60e54171a1714795ba51 SHA512 ff48b5d40321cd988d09a24ea7c730b062a743f3b3e72c4f522c649fe9c92f91c36bcca19d222585c964a39bd572299cdbf4e47b9423ac47323b351915d65a28
-EBUILD regex-2019.11.1.ebuild 894 BLAKE2B f9d906c6b7cada2bf19fdf36c0c190bfe034e58c5a42bc18fa56b13151c6d0b6643d485b732dd63c5c35419d31ff6c71202375a0a14c3e15391b40415602d514 SHA512 9c12a09de9446367da391c935c47881d317b14665a2920d2d7bd6b1d89dc64343238e3c1936f4d5b935f6870b5637e882c218736e0eb62aab5c5f705f09b7bd5
+EBUILD regex-2017.04.05-r1.ebuild 1163 BLAKE2B 07171a8bfb429f13a77442dbc5f6b92b2a59a94f05b10af6a426dc4441494a4329dcdbbbca3614b7cb589d45e305672835dfc5d067541a234b79cb8a5c148bcd SHA512 8194c03c29cab18031f54dab9452a5c8fbcff220c130ab7c529300018c3d06fa4644b3d93852370211e2c4c15fcaeb126aa30dcd99946ad52ee2bb95d57201cc
+EBUILD regex-2017.04.05.ebuild 1191 BLAKE2B fc424a9692403b003c4163eab9c59f29a45f2a3598b763311a2f364fc0ea9a88f138ab3d9927ddd3bad10915f89905b2a26955411a9ea67d6ad5fa2a40ec7ff4 SHA512 876865933a48804f0c0ead9097b67aa3878d156bb0e57afabd372c9d72f133fb2178db42abb700124115467c6d2a45fdc36ee3878659b0dad2b2ebc2b9aa51e1
+EBUILD regex-2019.11.1.ebuild 917 BLAKE2B 26c81acd5ebf0925812ba094d88a35a429077e87d35bf44583f882c65bd949269e7a9e5e7beba6a932f90bccfa6b688b1fdcbd95fa84916121a55064cd6c4b7d SHA512 4dc879fe38b27dec2a8ea882870ef12cd48e865aaa1c3f54270abb316cbed871512ba7c173fb623fd5ce08645be4af475f01cbeedd4725646b2836cd99d123d1
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2017.04.05-r1.ebuild b/dev-python/regex/regex-2017.04.05-r1.ebuild
index 436f25a41fd1..058bbc315e0d 100644
--- a/dev-python/regex/regex-2017.04.05-r1.ebuild
+++ b/dev-python/regex/regex-2017.04.05-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/regex/regex-2017.04.05.ebuild b/dev-python/regex/regex-2017.04.05.ebuild
index ab0e318c06d4..2202fd22586b 100644
--- a/dev-python/regex/regex-2017.04.05.ebuild
+++ b/dev-python/regex/regex-2017.04.05.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/regex/regex-2019.11.1.ebuild b/dev-python/regex/regex-2019.11.1.ebuild
index 6b42bd5991f0..d9d9dae8650c 100644
--- a/dev-python/regex/regex-2019.11.1.ebuild
+++ b/dev-python/regex/regex-2019.11.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/regions/Manifest b/dev-python/regions/Manifest
deleted file mode 100644
index 3d73c5780e32..000000000000
--- a/dev-python/regions/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST regions-0.2.tar.gz 535230 BLAKE2B ab44e35c6fede23da1116bf20fa65ce0e72daebbfd5effd64434abee510a450e5e2343a63810e8f7ab3a00296b55e8792b1f73777c98418cb942df21c58d7208 SHA512 1970e55a834057ca7d5ea9e29769e71f4287d184f2576cd03ed810df8381517145fb157f2585dadab483312e2d66dca295f7aea10ca5a65367c3a95726331b19
-EBUILD regions-0.2.ebuild 1546 BLAKE2B 039a08678aad73d8e8a183599b4f3aca30f37b4d62c0b190d4830bb194a7e3ffc1ffee4f655652cc0031ba97b3bae3d34b1d34c9ffadfc80ad1ea6dc39b2c0fa SHA512 5bed50cfedb4bd3561f2cfddec6a775223538bc81f9fe59d65ff0417669e7ecd86ab9fef0d5c1a4b5a9b3b9a0beccb4881fe816251a73badc063e56adc2af8e3
-MISC metadata.xml 538 BLAKE2B 7b0f5c066609f5cce6e5415c38f8bc215ef792a18a6ceba55e0e0f2ca3467613cc1e9d6e996c993fb4a1d58eb50aa3ec0d68866e6570b526d9513eb80f68221b SHA512 6a457b10fbc637a3130c8e94bbd441f8030596265864acf1003a314f464c082a49b72d87863ed996d1b80d84c69f88dce1987e48fc413afbc04e2cb949fad41d
diff --git a/dev-python/regions/metadata.xml b/dev-python/regions/metadata.xml
deleted file mode 100644
index 63ff2600215a..000000000000
--- a/dev-python/regions/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>sci-astronomy@gentoo.org</email>
-  <name>Gentoo Astronomy Project</name>
-</maintainer>
-<longdescription lang="en">
-  The goal is to merge the functionality from pyregion and photutils apertures and then after some time propose this package for inclusion in the Astropy core.
-</longdescription>
-<upstream>
-  <remote-id type="pypi">regions</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-python/regions/regions-0.2.ebuild b/dev-python/regions/regions-0.2.ebuild
deleted file mode 100644
index 2f039902cba9..000000000000
--- a/dev-python/regions/regions-0.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Astropy affiliated package for region handling"
-HOMEPAGE="http://astropy-regions.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-RDEPEND="dev-python/astropy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		dev-python/wcsaxes[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest-mpl[${PYTHON_USEDEP}]
-		dev-python/pytest-arraydiff[${PYTHON_USEDEP}]
-		dev-python/wcsaxes[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# use astropy-helpers from system
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	echo 'backend: Agg' > ${WORKDIR}/matplotlibrc || die
-	export MATPLOTLIBRC=${WORKDIR}
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index d3c6f23fcee4..893983563498 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,4 +1,4 @@
 DIST rencode-1.0.5.tar.gz 24530 BLAKE2B c650bf7befd62c8654bd0496f12f15a242a304ab9333bdf258222dd333081bd23715accdabbc55a271e8e869ca96f6aa0b43b335c6758be5b03073ebc05e3bb6 SHA512 809d7070b746fe77419e7b4d2eed274e1e0b3b4f15bcddb466806478a90f89965b0b456443b390cce6d1ca9df409367f336dd659f4481cd442e3cc459bd63c18
-EBUILD rencode-1.0.5-r1.ebuild 502 BLAKE2B b982c234549526716dd32c3de01bea0fa15794332ae2230b30f1be1ab2fa7b55f290e87e397567dff79571db424add0a06bef40d12aa4722b6c7db38e7786943 SHA512 09a8920962fa0a4c671380de1c020491ba43811819093b74b24f51e9bef636f1791041662fd0758ee52213422fa734fa9e8caaea281682fe4adc1ea94003c864
-EBUILD rencode-1.0.5.ebuild 498 BLAKE2B 192edcc6e87e6254e56b7c070f4ccb9d26989a5b3e19ab580bc7471e53fba909a8ea9f999110fa247acd8e9530e36a16610317e5c53503050f3eed94647cafb5 SHA512 00f3ef1b9de559c722885ad8c673045412fd286d81439e47005ba4c0c2369e6ce9c918a76c0bf42ea2adeb64a1cbd6d0323b0901b423ba6bb3a40c1ec431904b
+EBUILD rencode-1.0.5-r1.ebuild 500 BLAKE2B e68a32a660efe4e399a9c1a43fb5667d9756b4f1dcd51c22fa4ac54a4367f6bd2eec044065178d97a56812017924c78345029a55414da362897d13521511f72a SHA512 9151b68ae087622e7db91e73c97798f533ac2722832eb4bf608609a1727261a212e2595f7b5e0430f587a9b354ae9b741d0dd6ad261f5eae0fed2865b98678d7
+EBUILD rencode-1.0.5.ebuild 494 BLAKE2B b5d178c864317cc14db1a3e27e9a98dc638e7665b6a3c73ecefdd5863749cb3e84907a4d0bd49ec16fee81eea0fb777a9cd1eb110043d0dec81e3824105cb1bd SHA512 836106ea280e293bda8dc7a0c609319ddb6030cf54db519b93848582680266e8479059825ece9adebcc2611804e541bf687a092593b95c3db25ee37e83c15ee6
 MISC metadata.xml 666 BLAKE2B e4047d25b3bebfa106936f105ed4fb8ed1c07aaad32b42f5bb2645388028baf30b8fff228fd32737c2716c5273f6872c5290a6e132b850d4640fb1d44e257683 SHA512 026950a9462b1207463f2bf923c40bbe310c63ecf73676f935c9d392fcb7673b4150de82e7654ea0914c0fdbd6b1a110f00e57fc92b931a98a5e9ab032918971
diff --git a/dev-python/rencode/rencode-1.0.5-r1.ebuild b/dev-python/rencode/rencode-1.0.5-r1.ebuild
index eb75b5ce5c83..d1bbbec38a3c 100644
--- a/dev-python/rencode/rencode-1.0.5-r1.ebuild
+++ b/dev-python/rencode/rencode-1.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="similar to bencode from the BitTorrent project"
diff --git a/dev-python/rencode/rencode-1.0.5.ebuild b/dev-python/rencode/rencode-1.0.5.ebuild
index dec83adabb80..e9aa630d0b76 100644
--- a/dev-python/rencode/rencode-1.0.5.ebuild
+++ b/dev-python/rencode/rencode-1.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="similar to bencode from the BitTorrent project"
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index f05a9fd07237..26acb74567c6 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,5 +1,5 @@
 DIST reno-2.11.2.tar.gz 74623 BLAKE2B 5c985a81fb6ef7926eadfd1b096f1a1358cb814100b75c6175b6507c2d9ce64f5a06799164a7593cc40f00695cf538c9a49bee1a4d0f78c115519d660681b315 SHA512 b2ef0d9112e327d3a581bfe9b4d6e47b7b4edaa3fe463716772438aab0dcee445d94aaa93bfc7036ead297206353ade73a34d148521ef5d25abe9ca5e655a13f
 DIST reno-2.7.0.tar.gz 65269 BLAKE2B f3ba0e33246d40f7f16739f367ad313ce440cd33c6f03de268f2e02293446e0d3a043287c36492d8cae44b65c682c09d13ab0e2c86beffc23a85184ef27a751b SHA512 daf32dd7c08f9f75a9a334db8aa9e8c4fdad266bd5e68a43a87920751cf57549fba7906da26dc6c8f79b97bfaf51ad481f80ce99168cd65cfbd62848cb3d0cab
-EBUILD reno-2.11.2.ebuild 711 BLAKE2B 69f2119a10624298a1664ed1a8865edd473d67a36e01ce68d61768d235f11d78bcce0a7f72fdca94bad8be846acfcb24b7db3b044ded23de6694e1ddeddb9abb SHA512 5d0ffcf7a5c276fd145f6aa4a984f62db32d32633163bcc2c508bdf55b388d63b02f5a193c97a3c3a9cea42076572591d0bd9dfc5d474407be5755d766ba32f2
-EBUILD reno-2.7.0.ebuild 708 BLAKE2B 1d68b9de0a2b5aeb186b45034aa2644d6a79779f07d713864dbe47dc3f427b23f556a79a0bdb2a2eb21a2336a1455694b578a2ed457559f2b0c86c0a587fdf88 SHA512 c99877d8fd5631a9d6eb995578d4b6fa24b3e1091a79380d05deca60bb35cdb5bce5e76e79b672c03b08c01e6d180ff3020903e1b8c1ee7a9d8c34b36c4645a3
+EBUILD reno-2.11.2.ebuild 709 BLAKE2B aefc4d552fd0545c8478e49d36dda7af8166f98b653977c4cdbe927f422379d6238ba773c91cd075d71720169cb3ddcd3bd57702edfe78300daf252314f6f618 SHA512 b99f1ea5c1e44896760933afc00e0fbddc9a11f85f894c3c044dc7fc4dbdd5fde8e5ac930b3e168ccc6ea40dc0e4339e47f19b91961a5217f3af419b5c2ebbb2
+EBUILD reno-2.7.0.ebuild 706 BLAKE2B aa8edbed47032a22469d92dba873d39f254977553518b906a66e1a7f3e7ea63eabbbd5eab690c24117928ee378f0a3ea68c43728d1ffbd44d6f00538f2b3800f SHA512 46ce5fe99b2ee072273fb576c9b6edc980848133ece62e986eb5db11603711c12c9c117749bcb87a3d42a4db2143ea7986dc82f26d3fb7f656dc72a4396aa329
 MISC metadata.xml 321 BLAKE2B 3b8c9d905cae94a3bc7282b1a0fe9ac0471c6cd319e0e6c29ba9159e7a4a0d95f3eefa370a85c0741576d215719be3859e491af4a76bb4e494b84dc176337387 SHA512 fa7cc33d444469e942598d32710f8fba3999cb738407d96243fb0c2efa0573b330e5dbe38685a5cc8a7c0848ad89611c5ac11d2d9d1a693f9a7674bc8dc0a4f5
diff --git a/dev-python/reno/reno-2.11.2.ebuild b/dev-python/reno/reno-2.11.2.ebuild
index 97c7ea0c2a5c..c3bcf4c24653 100644
--- a/dev-python/reno/reno-2.11.2.ebuild
+++ b/dev-python/reno/reno-2.11.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/reno/reno-2.7.0.ebuild b/dev-python/reno/reno-2.7.0.ebuild
index 8cda7662f8f3..a23ec8d58ca8 100644
--- a/dev-python/reno/reno-2.7.0.ebuild
+++ b/dev-python/reno/reno-2.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 3998167b0e3b..7926bbec661a 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -4,6 +4,6 @@ AUX reportlab-no-pip.patch 419 BLAKE2B c09e5ea741b04dbeb7791f713d9171995d99da737
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
 DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
-EBUILD reportlab-3.3.0-r2.ebuild 1644 BLAKE2B 8c860f63f89895f2803215fb42e8f656278393754cf5527f715e523f831aa5e3771a82b0d251e83ea02c4ad77983937856d1fab1e50c8f8bb60a5649abb7e622 SHA512 7841f22a85b74b00afd454d7c39e2d76816dd0776b1dc67942d573bcd1de960acea21e8e6cff2a85ab5e9fa04148d69eef6d3a6fb77a03a45a88bcfc95f5c5bf
-EBUILD reportlab-3.5.13-r1.ebuild 1512 BLAKE2B 571221b188cf947dbac3e2b6b9fcf4eeee41d65b7ceb861700a094ea70bfc37dd652b1f3673b79c8553f48f91c298a622f738c031667fbc0d397c486bf5bb014 SHA512 b5f120a4a8b5ad3a0d3971ecb9f3c3fa1b65e838948477ef8579674a159e3d3d2ef9ef1b24852446826a5245367b7835f03aed3ab6f2661883656a4f0a108654
+EBUILD reportlab-3.3.0-r2.ebuild 1640 BLAKE2B 56ce615cf9df112a0bbc38c6177669d615de7ebbf941bb5308657233171c839570163e8eebebb1491abaf4be12931271031368eb40790274337d1c3ff3c57906 SHA512 11a8fe945c18ab2caaccae0fb5139109efb8d3eb450d278d0d6ac68ed2eb457dac12738d997693d399a6f0e1f6aa59400b0e724dbcc73734379a15bc957c63dc
+EBUILD reportlab-3.5.13-r1.ebuild 1512 BLAKE2B 3c16e3d9e51ad6f06262757295a2aeaffa0af7ddfe3f7439ba89f034c55caa226afc6f809ab0dd06b5497662a12f1759ace2114bf11b348616bc44facce68735 SHA512 1da526e05e20657ec6a8964b7e4acab2ba9f387c010bcf6662b960e6ad2c386c88ea934a58afff8e1064cdd44b054d292e06074c63bf2943b248d686ab5ddb05
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/reportlab-3.3.0-r2.ebuild b/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
index ea447a01c2bb..b090a00fc797 100644
--- a/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
+++ b/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} ) # Tests crash with pypy
+PYTHON_COMPAT=( python{2_7,3_6} ) # Tests crash with pypy
 
 inherit distutils-r1 flag-o-matic prefix
 
diff --git a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
index 96fc912a5b4f..02ff2d6238d0 100644
--- a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) # Tests crash with pypy
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} ) # Tests crash with pypy
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index e6e472992cb6..1e0858af9dc7 100644
--- a/dev-python/repoze-lru/Manifest
+++ b/dev-python/repoze-lru/Manifest
@@ -1,6 +1,6 @@
 DIST repoze.lru-0.6.tar.gz 19814 BLAKE2B af86797daf286daa709556194d9aac5d72151b1879adfb5d0f209f7f5a1198fe0772117ad8d13b7cf8caafc0d74c2b03b920814770c6a9db3ee44707b6d8ea8e SHA512 32732286f41ac6ad55e65fa15907e44558e7fbf089d1565c9c413be7c4af158b7a8ef9fc6be68998f8a9b4cd836028b8e706ba508a328a7fa338e95364e968db
 DIST repoze.lru-0.7.tar.gz 19591 BLAKE2B 839cd757ab51943b46cab22190c4e3bb829f7a94ad66647aa99072d535b7366778b57aedc556c8c91f012534154e6e2ef7608b2d4db2b64e7ba54486404a183e SHA512 c4d8b015931c4265fa8559f99c9d5016835574b368ebe0d49fe503afe908020b2bf29836606134e00c6c0aa436d52a00bb73d6ab80e98d0802f54bd2e4686476
-EBUILD repoze-lru-0.6-r2.ebuild 536 BLAKE2B 34db41f1a0011a812de3f5a32025cb87d5b1db8e6be99d9b6e47d74b8cc68a5c412fc0859d1bedbe48d2cd36d592bca410a4d1f87e80fd819a2198a9621ab8db SHA512 d5d9db949a5cb2f18ee7d7b9e8f18d73bf1aa68e22068f02bdcf80056de86ed2dad48b83fc7a6ca4c1adb034b7604830dc51f70b9756442a577da02136668365
-EBUILD repoze-lru-0.6-r3.ebuild 696 BLAKE2B 88fe62a7a2565defef5a55011ad3ac133b2e8c88910c02bfaf370a07ff3c6228473e725c5f877a49d084e33f8c749c140f9b45e0f8fefebd3bf1cd1900ea734a SHA512 bb2e5721c3282e31ff302bb87d43b332dc638ba0818e5180748420cc4957e69eaed28d931998b39ecce1687da3c5521205b8f8ec9b43cf23f4b96af90975540e
-EBUILD repoze-lru-0.7.ebuild 697 BLAKE2B 657a00c48f9ca91c43226e74cb07f315a52d1094e697660bf7890bfd57469276c1851b510906a4b91a71c58d4e1eabef1242c3007bcc313d311c16b377cf33da SHA512 872d3606373ff3fe9af60f38597a5a783a0c1f44712cb4297a26b6442af085f670ec905030e7f48fb04d4d1d0513642fb238dca35933e1a3871f99a8603c6162
+EBUILD repoze-lru-0.6-r2.ebuild 527 BLAKE2B aa3534f725bb95ac54122567f596a61853d4bb9a8e2055fe8ea628df095e84666d58d07e4e52e6784202f5d033d8d1cb91bb9c33c67cca41c76d280d1b7975b9 SHA512 0b58981e034f7e914f60e78cde3601706d3cb50fbbdb2132696d82669920e4060e3979ea3588e78479f52216f287b16390793be99e2af8f6030d1d93d3300779
+EBUILD repoze-lru-0.6-r3.ebuild 687 BLAKE2B 3a0cb6d44fe86b8a4697323d6752d6b86f3e046c6aa41a78b99851e441df60583204a8dcc17141ff2148e9471997f3f010fd5a88a9c7c22a1cc8645a8bc87483 SHA512 21567ec5f8ac2939ff38082a928226d9e11b1fabcab32ae7cbf1f482b1624a29be0673188b4407cf5c5c9f79aed107df81a8492868d0cae4dd786f3b1fd5c9e0
+EBUILD repoze-lru-0.7.ebuild 688 BLAKE2B f52e65da9a282dc44721d96da16ea675520df33d8c69def5112be217a7b13970aeb726d00d8a14fd5cf70a4462826b9401867087f5523bc304c31bf4c042bffe SHA512 2157903215e5fbfb4fd8c3835c89809fe7e0b3e519258be3e8e102145b7a553442abed9819569f1e9453f5ce7bb06f322e938632a5d23caa1e18ee8be6aea63c
 MISC metadata.xml 323 BLAKE2B e5e3343e9f27fdf721439dc80ca3704efa0bdf76a1c13b5d7d872c2541540cffa8ce4efff0ca2f5469af4130d2d37c52bc2dc3f0c535438a96e3dc2b7b3a41bc SHA512 cfe029f7e7fa262fecbd930ffd1f08e615e9f746678e28253bb0402bb3036858574595dbc03235e18b02ba08b7288a4f4f663d107f7f900e669d2b502b34e49d
diff --git a/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild b/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild
index 531ec9e5c77f..d02c1b6e98a0 100644
--- a/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild b/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild
index 3d7c4a7cf3e4..51e89b36cd76 100644
--- a/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/repoze-lru/repoze-lru-0.7.ebuild b/dev-python/repoze-lru/repoze-lru-0.7.ebuild
index 09eb88095d2b..64187abab66a 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/repoze-sphinx-autointerface/Manifest b/dev-python/repoze-sphinx-autointerface/Manifest
index ca1fb212c60f..1ee49c66c6bf 100644
--- a/dev-python/repoze-sphinx-autointerface/Manifest
+++ b/dev-python/repoze-sphinx-autointerface/Manifest
@@ -1,3 +1,3 @@
 DIST repoze.sphinx.autointerface-0.7.1.tar.gz 7892 BLAKE2B 8c7ca3faed9ede599c4d1a7c36cfb6fc2666d2a88ba75d6d903bbad2306bd6d5f2ff9c39a149a2a9e9171a4bba23a7211a3e8d4c9620f6777928e032e030881b SHA512 e2b2a41647a6e349bd33df8fcc08d2560f2a58b94a054bfcc9176cdcd97513ce78cc31945c7c12fd14f7906d21b23ba9c3fac0a06ed0c92ad7b89f73b5bf7ff4
-EBUILD repoze-sphinx-autointerface-0.7.1-r1.ebuild 978 BLAKE2B 9a3fe1eb06d010ea9bdf3f93ed78880016fdafc69c76062158f928dd4fbeccb108cdc2fb8a4201dbaabee980fa3457435c7d279abbbd715af9b678515f6dd31b SHA512 1828ed67d167cd21c3b2844be3f14ccfe6fcdc4c49e6d7b1bc005d1cea37550f673427de1cbccaf1b1a3466a9630f685816139c7795b0a07aae3c9fd2d8651a7
+EBUILD repoze-sphinx-autointerface-0.7.1-r1.ebuild 974 BLAKE2B b505950514f4cb6cfa5181cfcd55bb1ecb7ee536108a4fb2ef23d67a9a13b2b21291d7d673fa59aa897b08b94a094270a1965566d9a33ee3259fd3d07d5d4f30 SHA512 6ac6203208d1b09809bff3c9650c176d182b6142dd70004930818b21e5249e1470e7bb7341a4e8f2264dbaf73d33714409f7d43c6dc41ae97712c2beed1fe0e0
 MISC metadata.xml 330 BLAKE2B 62f755b2a31b7e0aa7889cdee9c2ae10fbc4f3b8f054a9f6658f4993e82e4ab55e139eafd1fa5314a071fc5ccfe50af0d26012c044facd4227a73566a812d7c6 SHA512 bab37e80962b4bbb37100966f20a648ecc5761dae56d01d09a140b39ee2662a91ea93a8c3e8406c285e94df572645a104baa810c941cf4913e73afe34ca185a5
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
index 2b3450e358e5..a4116587e668 100644
--- a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/repoze-who/Manifest b/dev-python/repoze-who/Manifest
index 53af7437d898..e6954f3aa595 100644
--- a/dev-python/repoze-who/Manifest
+++ b/dev-python/repoze-who/Manifest
@@ -1,4 +1,4 @@
 DIST repoze.who-2.2.tar.gz 308593 BLAKE2B 98caa042349f0dafd48e7bc1d3bce3a3d35293bea7f836c90cfda4c102e33443851c1dff71efc27ea16d1bad0cd629b9baca5503a0844a2fb39d1120a4562156 SHA512 1d4ea83e0b5c0d57ff56e19b9922d88b37bca4dfd5ec49df2bf5a1f2aeae15a5698f839e0071cda8cedee69fe4abbfdcb3fa632d4d4c8407739999853df87f63
-EBUILD repoze-who-2.2-r1.ebuild 1043 BLAKE2B 71dbd090bd27d5f0599fda4b5780310890f04f0a98d11477b576b2392466325807cab0a7b38f8262087e1815e0fdc2d9bdcfb120dfcaeaa7ef527515f2a8d014 SHA512 7697ecf587641ac2d32e98d13cfeae8a7470e04563e9e3b7dfa83f2bc9604c40c396b7a1ae60f19e52f81cef5c9641ac3df2921a1d4c7b2755b12a3a249c65f4
-EBUILD repoze-who-2.2.ebuild 635 BLAKE2B 43339f638f163c6b934aebad3090a95ae3b651baf1c10bd9a7d5a0c4dde9bb97b22b8ff959f57aebb409abad67dee8205e11598fbc25ed8aaae6c7c230ed32c1 SHA512 45d7280005862036fbb81962fb253e73bcd6e4d6bd5fd97e0f84e525d9f46b0eeaec07eafc0193293e6b0d3161ef90e19c5f0efda229800b4d99227e0e2f0b37
+EBUILD repoze-who-2.2-r1.ebuild 1033 BLAKE2B 966edb15cc41e87548f7e620eef8b44b9c8261bbfc7593838f34c491deb3416892629ff068c4b557ddbb23659779a2026fff9e6a87c175b512e870ca9ae60c08 SHA512 352a345e8aa0251a20939c18c133bd6a9ff59040fbff95480454cd309c934b2bc1542268d4a74c982bd5444575f6927dca74660961bda437132c2148a07f2217
+EBUILD repoze-who-2.2.ebuild 625 BLAKE2B 3ec0807521177c468a63680411fcb1957f47268ddb42553d574b11774068893b73e54089644ec5673e662966db3fbb98b77df33f06f6cd4824b1b33d37cc869e SHA512 7957258ad58a49bab05fbbf4bee645b7ff7c8b1a1fb4792fd7a4cc91cd978de54f527c58267ec506193c308dc1fe77226293672c680271a0f32065e715923f7d
 MISC metadata.xml 542 BLAKE2B b35278fffdf3107dc325b2754ebe00817264c886177e2650b17695829c3c20a96c197c1630ba917f775f2238fc05ea60f39796af50a5414d58ac436b5640b39e SHA512 b992d9ef5d5804cde66a2400de5371b309e84063675de92b41b64c8cacad6439036e37d1e3380dd55f820c64e74ac51a510dcbc6944116270c7febd88806e89c
diff --git a/dev-python/repoze-who/repoze-who-2.2-r1.ebuild b/dev-python/repoze-who/repoze-who-2.2-r1.ebuild
index 442fc125bfa6..87409ad3c0db 100644
--- a/dev-python/repoze-who/repoze-who-2.2-r1.ebuild
+++ b/dev-python/repoze-who/repoze-who-2.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/repoze-who/repoze-who-2.2.ebuild b/dev-python/repoze-who/repoze-who-2.2.ebuild
index 0013b402b61a..fef22958dabd 100644
--- a/dev-python/repoze-who/repoze-who-2.2.ebuild
+++ b/dev-python/repoze-who/repoze-who-2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/reproject/Manifest b/dev-python/reproject/Manifest
deleted file mode 100644
index 06d490341fb3..000000000000
--- a/dev-python/reproject/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST reproject-0.3.1.tar.gz 653996 BLAKE2B 6dca886dab21922d76bc32fbfb068264f206459b364c23beab7eb10990cdf6dec7c998e3b0cdc70fa8d5dd83c3c38010c6a39bca26775a8dbd692fc15295ac90 SHA512 5739ee812862e6558c46ebd79b9b73214093df2b6d0c603d94586c0f8908a4b29004f07380ca143fb59bcc4d33c19b0a81a1185b1a2cc60ff7be943c0f1e243f
-EBUILD reproject-0.3.1.ebuild 1044 BLAKE2B c246377d8c8807975ba8ba3d4d6cc40e9816ec5c02eed8d4f9bf5f1f2065bb5b3af2bf37549bf14dd9d494e8edafb293227a4dc8307b175cc1b952237c04602c SHA512 cba9c687cf576a7b9578d99710732faf0def06c39d5a9e51f956abe1cb2f99ea033dddd94a5733d0538dfbd6d56f2816ccf0e59b1ab410295a62a8959013b485
-MISC metadata.xml 901 BLAKE2B fbf2170e0b55876770052fb03497ea11b6c2cb1a8c1f5fd72dc5c338b90e6c26080f9beb1a45963578a67b4358f440d64cc5910ef727eb7bd7afef0374c07516 SHA512 6a80440fec75e6cf6419bc946c662ed8a6c4d177299291080d6ff1a36163b4b386ede0706a683dd27bd007167a0a98f671faae6fb813cf62796352c8e2d0acb5
diff --git a/dev-python/reproject/metadata.xml b/dev-python/reproject/metadata.xml
deleted file mode 100644
index 7a7ae6566090..000000000000
--- a/dev-python/reproject/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="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    This is a package to reproject astronomical images using various techniques
-    via a uniform interface. Reprojection means the re-gridding of images from
-    one world coordinate system to another (for example changing the pixel
-    resolution, orientation, coordinate system). Currently implemented are
-    reprojection of celestial images by interpolation, as well as by finding the
-    exact overlap between pixels on the celestial sphere. It can also reproject
-    to/from HEALPIX projections.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">reproject</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/reproject/reproject-0.3.1.ebuild b/dev-python/reproject/reproject-0.3.1.ebuild
deleted file mode 100644
index 9feca262dff7..000000000000
--- a/dev-python/reproject/reproject-0.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Reproject astronomical images with Python"
-HOMEPAGE="http://reproject.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -w
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index b50593b261f0..478bc49cb507 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,3 +1,3 @@
 DIST requests-cache-0.4.12.zip 44767 BLAKE2B f328d8ae8e3377af626030a6e3617c78e488024fa4ada9894576d339e571ba8ee6d905612ddc2802810bbeffbd8c94d90c743889e80fbf21418a7c67c5a005f6 SHA512 784d630eec99b607596d6ebcb7e51b0b4ed612b131437000391ecea6f3a684d1f61d169d57266ffc044a3939dcd4e7d6f85b9538165ae3613b1d3e55f18585fd
-EBUILD requests-cache-0.4.12.ebuild 846 BLAKE2B d4ad0477220b31c077c1fd1d6c2d1a4bbdfd463ca1dd6c1958574bb429a2d7e8f82888e577c23b08b456badd9a78a43c54328a6010e5bf63f1a7b18a59dad74c SHA512 d13c5429c3cb0799464046227b9635ce2c1140e945879cfc9ae1d807c9cd0a044a2cd8401a7a1df7aed835b22513d77e79a33a43cfb92b5c11f4e2532564151b
+EBUILD requests-cache-0.4.12.ebuild 837 BLAKE2B 6784908d623e3d0cb4839ffc6d50b53e0dad3b37e1e9469773dbd6a3a793ed0c677965a8ca2a04c8e160df8a4e0ac9b4f19319184060c9b4cd99f399b69d01f9 SHA512 a89a3b2a4475a910167fb67284e08a7b1e30e90e3358ac340f3fced156021c9e74e31265398cb76d21c0f40d0c85a49fe981d84deebbe34fc44883ca04fd78f1
 MISC metadata.xml 444 BLAKE2B 6008ac86bdb3740724aff487116d542902602f70670735ac2219b72db042b1974ffa6b4eab0254e59d16fa0438e022d8b9f675899b0ac181d88d4f82dd78d04e SHA512 0cc1b4cee3f1aecef89eb15ffd1e03a0ff4887f9b87a10ea90b6d11e3f5144b8d8d67dcad8c1dd26df3cea9e07140ed1ec76c4b1587d0db1b0f9c60b6daad41f
diff --git a/dev-python/requests-cache/requests-cache-0.4.12.ebuild b/dev-python/requests-cache/requests-cache-0.4.12.ebuild
index d7c0e33e0729..fbebceefaad3 100644
--- a/dev-python/requests-cache/requests-cache-0.4.12.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.4.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
index 1f129110d48c..98e1245e9342 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1,3 +1,3 @@
 DIST requests-credssp-1.0.2.tar.gz 21813 BLAKE2B 4626b31e9933e7fe5abdcba59834bedbc14afdd32b21d90124bbb458407213ba8cb92e98394f980f43aacd61de6c0e56e835cf47489ea55338a3dcdd171099e4 SHA512 8a076fc53eee73e24b08f6283b02a48519b9df076222b2e37c145c1d4c1756c29ccc41f0016c5a8ee7f5f7bf76c95fa158016f2cddd42b45a5ab2182939ffae0
-EBUILD requests-credssp-1.0.2.ebuild 709 BLAKE2B 29db594b766903293a60fd9141a60c55fb601135ff072ce72e080259139ab0c36bbb80b6f25b3db0ffde3aae343bc7720d25e9db5d4fe3ad14ff66067699f730 SHA512 d5ce11ff621f649efa45139c998e4a07ee994314ee074b1e537d2b97590549cd6c0472c97d1619d07f1ccf7004bd9e99032a3903d1a5e56d19a074d1a5d7a0cf
+EBUILD requests-credssp-1.0.2.ebuild 705 BLAKE2B d8eaa9d79b99ee6c7d488c0103c47db322055a5149b19bb52807b7e888c5ee92100d8d6c104c1eaf81fc45cb21220cec4f3c49b24f05e4cd81cd7cfa888f956a SHA512 78663e912a3464bba58bfad99f4cb56123a2a61b2efb54af16a520ccb8414e642c93e74128eea3a80f306743108684c8d3a4a47304676d187d9ca7f87f650647
 MISC metadata.xml 325 BLAKE2B 29ae1049a0331156fbe1f955fe60417f1d9c5a9b78d0248dd919077c9a6938843faa37f6a56fc50d60d5193f6f3593d2845ef5f371f4bea5d69bc03a9111977c SHA512 738d9d27265c68d240b23837c3c527f60067e1ca70630ed610845a3b2796905f236d90fb3b812958dfd202d3c91e958a9976dd3395a9ceda59ad06d6f1a67893
diff --git a/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild b/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild
index ed6df8e90056..076c56e5cede 100644
--- a/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild
+++ b/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="HTTPS CredSSP authentication with the requests library"
diff --git a/dev-python/requests-file/Manifest b/dev-python/requests-file/Manifest
index fb5a1001fe0e..64353e0ef0e1 100644
--- a/dev-python/requests-file/Manifest
+++ b/dev-python/requests-file/Manifest
@@ -1,3 +1,3 @@
 DIST requests-file-1.4.3.tar.gz 5252 BLAKE2B 18b533a7619f46c1d01d0cabca2137592ff614c2a33ccbe227d4f3ea2e4854b7ecc7973d56b15c72d980d03df7cee38fe4216eae35f5803bbbdb7845f8e3e5ec SHA512 b92294a11c9cc13beb5df598b636d999e0fcd46d05b775bbb69667f066d24ccf55b5af2135aec8d69c0096ca64e13bab3c3da64bee00f0c12edd05f43430d80c
-EBUILD requests-file-1.4.3.ebuild 534 BLAKE2B dc784b4a1b5ceb3d97ecf36d5eadcfd2ae9146a699460399a03ccfe17e16934ef3c427aa9d5f925ebf2e28693310f67039a3d8c5412556deca7d8753add267e4 SHA512 80e7014e04ac85082bb8d4e103701cf0453f37a478df24789e4cd6cca61f0213d5307aec5355cffb2c18c3980ad47d162e296b1115531a112b785275220c6bb8
+EBUILD requests-file-1.4.3.ebuild 526 BLAKE2B 9dc16bfdf37fcaf906b1fbe95a19a52f5c3ab18d3d2700665b6c8099f5fda98ac7c2bc8a2649eadda24fd1e6a41c18699979eb204ed8a910c04652b0f7626cda SHA512 77f2da38ec71966f196db23eb2b7c5920557f00980e4034234647c01c0710f01329e3fa8fb9bb114b0a1850697b9de689d8901991569090997c65538f68e91ea
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-python/requests-file/requests-file-1.4.3.ebuild b/dev-python/requests-file/requests-file-1.4.3.ebuild
index cd4d93fe4fbe..d050e9c629f6 100644
--- a/dev-python/requests-file/requests-file-1.4.3.ebuild
+++ b/dev-python/requests-file/requests-file-1.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="File transport adapter for Requests"
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index d08944c2ce2f..bb9e753cb67c 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,5 +1,5 @@
 DIST requests-kerberos-0.11.0.tar.gz 10742 BLAKE2B eaf764ae8f5c897db43cbb931952062d4aaf33c04dfa0bbae2cfd3b44326240f80435d0b69c7f8bfa3567d0d16532796d009f0436f3ff5956a87998b825f98a3 SHA512 8700a7a305e0e42823bbc87c95ecfd404a76807459ab8a87f3105e817ebd9954fd41d7a2bab421bb5e21c0ec1b62a589c93cccb1f926a3ba66d6adbffe5db265
 DIST requests-kerberos-0.12.0.tar.gz 21579 BLAKE2B 297cbecb0fc3508f5f62440c5860dcd94eeb077e68757c0646e7e3bec65cd34e19212b9992dad491ce0adeb91234db533528936f740599e42ff439f78af103ba SHA512 b925b5f9f6753e87368dce451927df09568d0d6126d4ae8514bbd99a794d983e32298b92b6239be9f95595483e2682259cf165c6997d17d9cea64a81d4af1a06
-EBUILD requests-kerberos-0.11.0.ebuild 605 BLAKE2B 131a36a45dea9fb0a4487dac70ad8401acd1bc1227944381d89b87e1554630fb8ba4a36dda5541bb499f7f195907207f568e2a15c16b8002be56fc4bd0768f52 SHA512 b68ab46e97f9192c378e21b6edbdca453b588b11af3b44e4874dfc55f3c68a9fc4afbcce3624e6bb6297c90f6ab6f9ec8c8263d32cf7f16531c8af719b494745
-EBUILD requests-kerberos-0.12.0.ebuild 794 BLAKE2B 3b229d87fee92e8c6bd2440780961303c1142b22c09065c6278e0c93acfed1042540833063f6b7dc94b35fa276fca49f98ffff2bddbeac25e9e322994f5adc96 SHA512 5d72cea02b3ae54612178c04f343b47785786c6f07d35324a3ae5f4c26048559e32e8a23804a04492704944482bb6b1365d0f832fb57f718cdfa81bd37d44df9
+EBUILD requests-kerberos-0.11.0.ebuild 601 BLAKE2B f6d0a19d15ce6c2afa6c309eb586a4b12780e19259b52dacefe768281ef09993b7cb376c442b53b6c76924d66f65aa529c6ced188dd6916279a1e13097ce8a32 SHA512 f1e6685d1c5ed62742bba0ccf439a8a55f4560fd86fb21b3b13487bc4788d3081acb2522e165dded8420a934191aeadd548236a50936a31b830d2a6f0b7c5ff6
+EBUILD requests-kerberos-0.12.0.ebuild 790 BLAKE2B c6bce8702c736a2205c27ab04e09eecbe8304b44c090405921f09de53ada65b87d6a5d31a9962b5d6ba5cd81f6f9f975847f49a90169cc223ad54ddac7167653 SHA512 025b7c4f57da9771b8dc5824fab3f392b56772a52026f7e33f1435c7a600a88907b53549056eaa21554109081b33a9bb3a908b1a0b1381f628991f3c8addb530
 MISC metadata.xml 320 BLAKE2B c58268e9df73385438694b43f3784a58d11f003adcebc306d70ddeea26789cfa22f709484a99902326074d16072563011c07f09eb071a9c141e4ee6ded7dbd56 SHA512 a33854d5f3c9a4d077d51a4254d18045a4fb0a50c223e809ea0a7415c869152e30122c3d7e005b25c7e07bd660678db5613449688c086582c172a77d19a9e540
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
index 8c3d0c5f6cfa..0698fafaf9e7 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild
index 336dae61cf10..0d00e7a81c66 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index a20283e1ac57..5ad1b2b11778 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,7 +1,7 @@
 DIST requests-mock-1.2.0.tar.gz 40219 BLAKE2B b5ded6c97d920bab0c610c1be1c80f299e56cccd393c824b5c9ab3e0c298491b8be0b285c440bc8ba32eb1eec2eca14ec363d0f188c5b095192a56d01383c322 SHA512 ed24d1809aef597219ae2b0b376156a0760040795ccd660ee38f84cd1ceed58cbc5009764d7a365d31f941ee16e2b537b92ddcff92bcd8d47b7e95c67dc8d82c
 DIST requests-mock-1.5.0.tar.gz 47824 BLAKE2B 90d540e2372430c70b0ada0bc48a3a8085452e062e9ab57a232d080df8312c2a722c01d61fb399fe2a6bc31a2d6d61914d8d0e2c912a2e439062b27bb31914cf SHA512 21838017ac4d3066e2240b40b27bbe16f3bd989f37eba90f0a0d0cdb997e7e65c6d9dc63b31f64daaa6146cc3c6bccbba86382eda3f2ca72eb7cc8381969af36
 DIST requests-mock-1.5.2.tar.gz 47581 BLAKE2B 46beefc45e01355939a76b85e43a5b57cb1a870666eab7f610cad3e8a04a17da6a0864f9776a0f09028c847e8a4f7d0d2389a36f9a0431ed733a364d0f712c0b SHA512 206c91e892df84e38dcdf1264559128cfece76be2ce43b9c98238dfd438795d8c4ce3fcd43feb30246fbfca2d78832a23430ce1c9d3a7dc6e4417df5d65a8d3c
-EBUILD requests-mock-1.2.0.ebuild 1025 BLAKE2B 88289974f3ab4bf7fe6d456274153e336e2e4765cc209b8b78b6acb3c4b5804a8d20b1905d33a42cda4eeb894a5c38806a0d64d451c051c87f73a1cbe91aea3f SHA512 d6daf8ec7eb4749752476a371ad9f8654971e45b532dfbdbf87e3ebde5e31a08a90e1596940bbeac77c09b0453d6e41da3fc1990952b8a7130b89a32183ce5e4
-EBUILD requests-mock-1.5.0.ebuild 1683 BLAKE2B 6b2051abb2465c03ed60e3faad56fe95e7fbdfc6837ba4721e6b82bb3f00572115f9639d09c1fc2dc520368ca935ce17111022d775fa52a5f0eab2587281029e SHA512 3c2eceb3eace4011c66e37c38e5440f5df7fcfe50ac94b1b5039a2352978e8cdf237d421d29ac134411f229d44fc2629d5dbe5156969ce1e6bdc6ae28197f78a
-EBUILD requests-mock-1.5.2.ebuild 1683 BLAKE2B 495d6fd9b993b14f048310572c7ffa1a00d82d33eb82b38b9ebc3ac76f59f4ce6d7984d66861db27ddc688188cf545f6b068746548d8bf8d6e634f02dc781e2e SHA512 0fba223fe66f49f9a7957d5c8d8d7a863fc518e0d2a93ba9a66f4a2fe41e72a4abd0496805bcbdddab8450f3e73cda9d3596cd564db672b0a560c7c647f65f51
+EBUILD requests-mock-1.2.0.ebuild 1021 BLAKE2B 8229bcb2a7ca999de2c8bc5cf466a2ffd9af2178fefc3ff6222af4421b247248c12c5aa6d045cc142e43b597fd0bc35874cb960106268021df95a78d9c27acac SHA512 5655a072f773314f3bb1ee50a7d7b811be1c13efcf5fc8f1858025260caa7bb292f747e3a72c93ccc225f643af6b3a2361604b124b76f9852adbef5f95d2b1bd
+EBUILD requests-mock-1.5.0.ebuild 1676 BLAKE2B bf43265a4c51d74b89a94c2456c8283c98990d6b598f60ebf96c57f01a7591c9d085524c86abafb5888f233070e62d37cf57fd28cdadb13ec58487007aab122a SHA512 b777247f2cf64bf306498d373b6fcb55afa26145b859fddc08a27aaf7f8ca483390dc3936efac5de8f68faa1f077fb4c38a3ba2e1ef4c1979667e71c926edd07
+EBUILD requests-mock-1.5.2.ebuild 1678 BLAKE2B 12918f2f207ead0e2f76590310093f286d727e2ce660d26f68bf9c8643db4a632ac3ab050ae6b987a92a08e41ec8c0586b9ddebdb3fbca0b2307d4599d929322 SHA512 a7394b51e8aeebdc391a54fe31f60bebc0f08ee2e4330d6fdab39a981a793dc8d2a5dd5089fcf6c2b71e1be712f5e309235b2fbcce0cdc3c3d773bc8bf80f002
 MISC metadata.xml 454 BLAKE2B bcadca6cd81b333dff341a15c22e548336cf6cf8fc342ec147783d516d72c1168991b61b9038979923e92cc3304c86021b2a38b39e5d55469b9cdfe95170a23a SHA512 9eb41db434308c8b293b881364482e08da91881266ae4d5b45dc79fa12b0187e5aabbd82d771ad7c5fe4e2840d581f9a8ce63658f0f3124a19e26a35c5f25119
diff --git a/dev-python/requests-mock/requests-mock-1.2.0.ebuild b/dev-python/requests-mock/requests-mock-1.2.0.ebuild
index 31add56643a5..1721eada7426 100644
--- a/dev-python/requests-mock/requests-mock-1.2.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-mock/requests-mock-1.5.0.ebuild b/dev-python/requests-mock/requests-mock-1.5.0.ebuild
index 5f2ab13e4535..fc6b65d6b006 100644
--- a/dev-python/requests-mock/requests-mock-1.5.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-mock/requests-mock-1.5.2.ebuild b/dev-python/requests-mock/requests-mock-1.5.2.ebuild
index 9a9f3b312ca4..bd8946a4909c 100644
--- a/dev-python/requests-mock/requests-mock-1.5.2.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-ntlm/Manifest b/dev-python/requests-ntlm/Manifest
index 34b0958d9c1e..54ff22adb51f 100644
--- a/dev-python/requests-ntlm/Manifest
+++ b/dev-python/requests-ntlm/Manifest
@@ -1,5 +1,5 @@
 DIST requests-ntlm-1.0.0.tar.gz 7786 BLAKE2B ed223722c3ef6d0434e62016c97f82214ec3908e82deb96e3aeb0b77b7b799418d0bd9de23276c418547e13bcfa43ca351a8b59de637305fa04d8460aeb01227 SHA512 62c8dcb674240944b8347b4d82802977755bdc871bf37c8054c6cd7d11421c32bb92d7d0765d60c4bc219e769176b709ef3bdc7355eb8c71f3745e0895c9f30a
 DIST requests_ntlm-1.1.0.tar.gz 5183 BLAKE2B 190a75d3f82ae2216e05295f855aa072f98908ef8a0d4dda68d6e39239655ccf175c707af137290cd78cf622c0a3d1741a0afbb1363f8b170f408c34a2682fa6 SHA512 9a74ecd6e4ed5c5e4381d2ee3fb9ff233352b49baa5fae4e0ecc30aaad12fc7a5c1b9dd936f35d4a3815ae7f6ec5bb8581e84128d63ff0e961181408daddb807
-EBUILD requests-ntlm-1.0.0.ebuild 540 BLAKE2B ea5e680ece45658addcfd0e2423b1fc47d025f233cc16b1cbe89b678671cd355437428f5729cdfee729c6d5619d7197f3aa6e9dcac3894023f5283126c68c93b SHA512 faae07d13a3237d8dbdbfb8e3999c8c923a7e03d0cb20d9c6c00a762bfa3455e6e0d663c648dca5ca46dee5e7b3df5f343bfb9d09379b82f7d8a01efa36b61bf
-EBUILD requests-ntlm-1.1.0.ebuild 575 BLAKE2B 0f08c09dc102ba7cb304cfed43f8e1684ebad7be19f58c4c5b8822cfa529b581bf5aac67c67f115fb1403c53641f3ccf6b150c6b8dff80024eb6dc8602887852 SHA512 f5f98a065173e751b26fa602127e45c87ba0bd12b26cf1b82b739af2d5888282773b55e872dd32fa087c0e527f7cda131b1ca6497d4d107ff4a2415caaabade9
+EBUILD requests-ntlm-1.0.0.ebuild 536 BLAKE2B 1bbebe44ff3980105734936c3518679f410e01e183fc3f64fc4b384886eff7566f42e7d0e3d7442e91321ef68cf27f0a280b9ac74a7907a305470776d7ef7b62 SHA512 f3f506b908eb9eb1ba3ef614ff5df6b41ff070fc688f85b3d241b79e5e7a8b222ed4cc328f621350ab60ba7a7bf55361ffcd1addc57408b5c6957e33a5b0c1cb
+EBUILD requests-ntlm-1.1.0.ebuild 571 BLAKE2B 0002e17dec852177d56f2427b9de5007257bc51981b7400dafc83a94b63b4da92971311cdb522775e0b9e6bcd9ddd3cef27cb348d9a4b5f0be14d954603e071d SHA512 d1a71114212966d3aa60c669846499e71e46c1a821826c0802cb77f7e61e5493724ad6159d0a550bf0618081c60d64904fc578b61fe5d4629a71c5fe6e45da86
 MISC metadata.xml 429 BLAKE2B e6f1e928cec0f1fdf663d132370e26df8fcd5169e8d36db83f5fdfdb63aba79ba479547237b982d33db81e65b0c2bff182cbb316c5e9208e0bd018e89931e6dc SHA512 ccb4016446f637c44fcba7446a7d3e3f0521164e76b6f7f5a52873fac8f14728100b67d853e7b96589c1f46f2ecbabcf67c33101a2c43e71f0d8fb2f8fe2f70c
diff --git a/dev-python/requests-ntlm/requests-ntlm-1.0.0.ebuild b/dev-python/requests-ntlm/requests-ntlm-1.0.0.ebuild
index a4aed99411c1..b66f32d44818 100644
--- a/dev-python/requests-ntlm/requests-ntlm-1.0.0.ebuild
+++ b/dev-python/requests-ntlm/requests-ntlm-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-ntlm/requests-ntlm-1.1.0.ebuild b/dev-python/requests-ntlm/requests-ntlm-1.1.0.ebuild
index 9975e4386a0c..c6aa33a7def9 100644
--- a/dev-python/requests-ntlm/requests-ntlm-1.1.0.ebuild
+++ b/dev-python/requests-ntlm/requests-ntlm-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index a1381324f2ce..323c0c405916 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,3 +1,5 @@
 DIST requests-oauthlib-0.7.0.tar.gz 40641 BLAKE2B 3c8e498652df706223dc74404185c14c8f131e0578b1bd2671986507e9f09f7328af7193b0779615499240f67cf6a0c395c103afa63bd6d7c674f2672f64a471 SHA512 9de7f3e2f67507acbd6a711d7c3bc4d598214ab658e7e331f2c56d7a6d084e11df8bfc2449c3ec5e985016404a5e7920e26081bcc3af52d6c91b28d1a69f6ed2
-EBUILD requests-oauthlib-0.7.0.ebuild 822 BLAKE2B 4f68c8b7e05520bfecd5cc6e26ef9093b788bf9dd06118385608ef41239123d6c095d3756697acdf8bb08feed03acd3e4d5b9588acade270ecdae718ddc33fee SHA512 a06a446ef70adcdf1dae21d816129830545fa39b2c0a423acaba505da3ea713a4cfbb37e8f8f16ea7328592bbcd10427551196b8915d74212e7a812026471d81
+DIST requests-oauthlib-1.3.0.tar.gz 45449 BLAKE2B b7d0df59eefe801e09329bde8604d09fe0f45eac146172c5ae5f1a77df59229a89c70d78a97fca0f7b546a015e66d6d9dd4ac3efdd4de0100f77f2427106e197 SHA512 0eebd209dad892567de7d37f1482b5c7523eced3a73a68054674b29447d090c885b2388fd6f2db26436f14098833051c8888ace8b137889a4012e010efb0e86b
+EBUILD requests-oauthlib-0.7.0.ebuild 818 BLAKE2B d5ba305f5cac202b92e304b62326af3e94a5cd7aeb85a0a19c05726b109db1c84485efcb310c1e9ff2014f831c068efd89057d4bab2a866097d0855f3016a701 SHA512 439857e4999adee1f1bad7abe9edb253139d13fd26f2b2f8a3893d107de406779737803175b0bf7876730399bbf462607b068c897fc1bec82d76352311c94e12
+EBUILD requests-oauthlib-1.3.0.ebuild 864 BLAKE2B 633eb5062a67b06c756a6d1b031a72960bc3e70f86cd9a193ba63777e0cd7eccd27d58c27e441e35b9469df8692c3bbeeadcb0ef6e52bd5f6088ba4241588c58 SHA512 60aceacf83515627817085b43ff7113a28f8bd900264cba567555d592952911c6e391d693d10dbc84124c539d3fc2918a941fecf4174cd698ee7e86f1ce8b98e
 MISC metadata.xml 331 BLAKE2B 7b904925adb6f8e39c1d1000e87c287ce5dbfa7a6e70544ab599b5ca8d254e70976d444149ee2727b4186d97326e662bcdacabc674f7bcc0e0193b2807e4c053 SHA512 871f44e56ecb16ea43e5702c30a43d24f911ae1b83fb2a5ba3ca4ab45b3676ee7d4841fc343f336c0249b0165777659bd393160728cb20e3484eee4854919d1f
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
index 88b1db707b88..32a0617facc5 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
new file mode 100644
index 000000000000..94b74433be64
--- /dev/null
+++ b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.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=( python2_7 python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="This project provides first-class OAuth library support for Requests"
+HOMEPAGE="https://github.com/requests/requests-oauthlib"
+SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+# tests fail with network-sandbox
+RESTRICT="!test? ( test )
+	test"
+
+DEPEND="test? (
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+		)"
+RDEPEND="
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]"
+
+#Refrain from a doc build for now
+#python_compile_all() {
+#	use doc && emake -C docs html
+#}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index a948802d643e..b107ea2e853b 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -4,6 +4,6 @@ AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c48
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.8.0.tar.gz 196129 BLAKE2B 435059ff2879c44a274641c49adae9986c761fcabe567826454d3f055db7e3e5c95905f1d178dcb37e2173bf856a9fb168a856c1301026e8c5d0de6cafb4be51 SHA512 71a4ed8961b742cb1b5b0deec7f9052a2a177d2ed6e4f13ebe22b56b7f1b6b1bad2736f1640c8b41398b082eddc1c1205f0c446602d979d5bf370fb0e10ecc88
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.8.0.ebuild 1042 BLAKE2B 7f94fcd22dea93322e3faa641fb54e0e4856191894912b8387806dacaa12386f338a257aba012c5a084fdd3a5738fd28f732c795346b4f0a5e7409d170ef4f14 SHA512 618f44f24bad2cffe25c3ded828593d9ede70edae37d83f60e38ea5c1ab48ea75610e23d0825e2532c497559d9a02534f2687f80886995f024908b858affa1b7
-EBUILD requests-toolbelt-0.9.1.ebuild 1168 BLAKE2B c4d3cd1d32249eeb1615ef9dc92661e4f9650e264bfd7b6f21273ff6eddc295108b31d8dbf86a30cf76ed888a473a86284fe4f06aa3684c146982b66a20f6797 SHA512 1ae2fb022cd046d85deb6e2a842d3b625383f609d5199da9c880ff8c2154295e4e87a549d4f68db8b69b2905bb7705302be1959fb0ed9de71ec9ea8151136854
+EBUILD requests-toolbelt-0.8.0.ebuild 1038 BLAKE2B 5c45a45c39719ab1c866f4eacd00923a2855e05aed6679a6d540c16b4a192af7bff0b6ff26466e87bbdd2cccecc1646d73ef1d66c5c3302247f84a21f7db703d SHA512 92c4b14883c4d2f85253128ee0e4624e54cac38b4a91bf949accbca9998e15d18b45e418cdcac96e0b40a7971d6886b58109755696e52ecab24580f52155b34f
+EBUILD requests-toolbelt-0.9.1.ebuild 1163 BLAKE2B 0878262e606eb032e47a4dfd5cb9b7ce43f4313ec32eff34ca72ad623feef4e4f4d5d761bd2f92e7629605e5f56c51f1cb433609c71802cf66d625ea02b24cfe SHA512 c1b7bd36c7d0bd1b56c27e5273355cb5597d80ddf05d9d20fed16c50a6416e339b5a2ec81c15d13ebcb812a25c24c9d21302f81affb6c28f312a53d1f0de6e7c
 MISC metadata.xml 297 BLAKE2B 0dbab9c3d9697a1ac5ab03c7111a1862d977546c23cf42967669a6e3a19eff6e81b2a0701cfc2e11904c220026a5bc7b19934cca17339ab7f9037891ab5b2c8f SHA512 46897583f3474724b466e1d1a6b5e0d4c4d557730ce38c809ac2224d2b1dec3e844c0b66b7b6d9f5e60f82cd51a791c1a3ddf545d9898d70038ea2af183a8691
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
index 54c40a3b4905..7fc33e25b828 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index 83387a6acd91..570ccee0e562 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 77289770ba7f..68a53d8465ed 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,6 +1,6 @@
 AUX requests-2.22.0-pytest-4.patch 1076 BLAKE2B 2631f9b2e0586072e3a16e132099bab467ccbcd2020ea41ca49299688e2f88127e0b7e67545eb62659ac2729ca02b46d1e5a8c015c1d6cdd6a5ee0f8170cd483 SHA512 1de7c78c51be49e4004decd28d40e183a44c15b1e321c41595abc114ddb829ad54fc02dfb573a620cfe71f0996b78c822cb37cd68b3fb2d8e395b5f829227496
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
 DIST requests-2.22.0.tar.gz 113406 BLAKE2B 36e1fa106f30af3d560c11edab3cd8f7e79116378c6f4d505052c8b19021846a22b4631567859b23331e7c9413896e77d7fc3288cd3af586f5f99da21c9181a6 SHA512 8b8e9da8a0c816fb4ff39be89ac7e1a9d5a99503ed93e44a0d78b28818f1c0eb253b151972a144151a616ba1b4bc5595245458a8268c5161391db54f740ac9a5
-EBUILD requests-2.21.0-r1.ebuild 1428 BLAKE2B fd14c5283f935d82bad2cd2bcd174205c7633f849bf6033765b24eb8e05cac239ce0b1f6e29a5ce820def922b8773ac22eaf4555e668b16b8d020d085cc0e023 SHA512 1f8625f76a44dfe4547dcbce5f03263650b478312fcc015f72db3c8f49e7d468faf3295016b6efd9925e9d94775d7f318371117b484d9b893ef5fc0b7eaeed66
-EBUILD requests-2.22.0.ebuild 1869 BLAKE2B 380a5cdc0b640568399b536b11568c687b762bfdd1981e599154a9e9bda4291ad7de73d1abde30139ab772090a1676ffe9a17461e53bbe6f2ea7d931390aff63 SHA512 64046bb303e3ff3e9e0050ff1343f2fae5d0fa24c07df38c9605d00925e40dd6161cb048e498991683da9b539acecd5081e90fe79afa5c3e9bfdb495dfadc74a
+EBUILD requests-2.21.0-r1.ebuild 1423 BLAKE2B f408cf2c277bbc63ee44f04f553656dcafd741ecbb573a7c51bda6596334943825ee4ed9bb66a052c3d363777c4e4f603eaa50fc085343cafd2b7af5e1f9581e SHA512 32cc49f324cf562117c33a60ac913177ecd5c74570ebcf3aa62ff12c2dfe3ba43e21b8fd078ffd93a4df521b032c5b036cc22fdaf2156ffb061ad7b6f238b585
+EBUILD requests-2.22.0.ebuild 1871 BLAKE2B a15133d80012d22b6337168f77c6f8ccb811f51ce45221cec9c88dfc4494e8d6acd41b668297a78bd36125249b6e8596fea0a36b609588aa9087a4e3c1bdc95f SHA512 e816a679c4d05823e5a12755ad97944e9190dbc6f489b61c038862fd7c764ef44dcf35c21e5fa9bf66765d959fa76695e9b717eeee8afd4c6271dd929ad776b3
 MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
diff --git a/dev-python/requests/requests-2.21.0-r1.ebuild b/dev-python/requests/requests-2.21.0-r1.ebuild
index 43b65d16a7b5..544df2c4244d 100644
--- a/dev-python/requests/requests-2.21.0-r1.ebuild
+++ b/dev-python/requests/requests-2.21.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/requests/requests-2.22.0.ebuild b/dev-python/requests/requests-2.22.0.ebuild
index 1902a0432fd7..6ce120594e8e 100644
--- a/dev-python/requests/requests-2.22.0.ebuild
+++ b/dev-python/requests/requests-2.22.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="socks5 +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests_download/Manifest b/dev-python/requests_download/Manifest
index 7077928da80b..995811ea12ce 100644
--- a/dev-python/requests_download/Manifest
+++ b/dev-python/requests_download/Manifest
@@ -1,3 +1,3 @@
 DIST requests_download-0.1.2.tar.gz 2584 BLAKE2B c6f2eb7a182e0f42ccb7b603dec47a077b1b946bfa93968972dce5267c7c51fa8c4158e15cd35621cbe229e12f6644db9734e52439796d8d8411be16a38e1e9a SHA512 99d4b275200c88befd2730d17a3329c8cbb155fa5cf9600a7466e8ab109f999a9fc9b8c668aa3b389bc2a3deb33b8a3fd390270d71f04bb0a8f998da67cfde82
-EBUILD requests_download-0.1.2.ebuild 823 BLAKE2B ff681fd7e8080cbb641ee57e6091fe9c73597b51103c3dbcf7f762f11afa5f453733ac0c8183bf6366be3208cf24ee59c37e405fcf4d47abd2041ec115347be1 SHA512 8af5d5204729443b13586fd2c7c0eb45d759708760da472a35919646eaf7eb69e5e8bcca1ab8e97c153b4379bf91841fa24e71a8f4eb7aace4b8b7133b76f468
+EBUILD requests_download-0.1.2.ebuild 823 BLAKE2B 2b22e8707e2db55ac181114a90d081ac741e108a0ccc6473c746a36badccc428c5c30bfe129bc086d7e75418ff76f142105f2dd98a0a4bee4e9ccd20018cfc51 SHA512 1ad1437f2fce2bc1f958fff5db38f35bd7fc0ca94ec0f95562f8d36e615450a4c2cd03be37e4d3878b627f93b055914d02d8836043e4adc19d31ed2538850d33
 MISC metadata.xml 408 BLAKE2B 2fa0562549efb76db2df8bf0485bf3fcd123de81dd29b89ea9d2a0b87dc72db068e577e4cebfc36c2569b2a4057d14ad26490b368770ec0e566cdb549b2fb308 SHA512 2fdfa8da4f76fd449807c41fd535356f388f71dbc8793a59b7bf2b04c9be3096900decdb014389097a43565642906114169163ab8d19dcd69901457dad3d9f6c
diff --git a/dev-python/requests_download/requests_download-0.1.2.ebuild b/dev-python/requests_download/requests_download-0.1.2.ebuild
index 231d3877ce3c..5fbed4968872 100644
--- a/dev-python/requests_download/requests_download-0.1.2.ebuild
+++ b/dev-python/requests_download/requests_download-0.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests_pkcs12/Manifest b/dev-python/requests_pkcs12/Manifest
index a645d494c0cc..10c0a8847c41 100644
--- a/dev-python/requests_pkcs12/Manifest
+++ b/dev-python/requests_pkcs12/Manifest
@@ -1,3 +1,3 @@
 DIST requests_pkcs12-1.4.tar.gz 3884 BLAKE2B ebeb89349163d4f9995c00dfe3d725036a76660870d36203f47029f225698fe7a15993a9dd756e0b6b33011726ad26323962609bb94f223f4478096658f20a3c SHA512 f77703b7b0ba1f13aa095fcf4955f119c34a20e0601e0d6888a29932d8d4289548cf2b7b0e065abfea2ebcda542d48a4d9a3ded32974c1d24bdae223893f0241
-EBUILD requests_pkcs12-1.4.ebuild 575 BLAKE2B f42d65935645720be3523ac37590224acbaebe5411857a5f1517d32be3a2492e6a75a79f1e54ef058ab82d9e00c9c503c607e1d668c2622ce9ec179b01b9a567 SHA512 52cc2fc2d9809dc712f2f56f32de93fb794c7fcbf40ed3ae233eb8382af1bddef3eb51787fc784e0cb6991cf7e52b3f37e60b72c712627ec5789f79081f017ea
+EBUILD requests_pkcs12-1.4.ebuild 573 BLAKE2B 77045cd12524ecc9605007ffde2ddd11ec417060acedd4059b84b704360f54d3e9eceae05aa806184c785879d892fc9d68522fe4c799883671e1671e165ad4f4 SHA512 6fe781d5e866d3d48c8dd5e4eb6a198d864074d543cc3a4befecaabaffde271b94df0823b2b190d9836c08c63869ea23eaf011441ea27d40fe3c99e7f772a8d8
 MISC metadata.xml 555 BLAKE2B d70dda6dc42c1a4da489771576e149a106fd0dae72477045e98a57c2fcd04552057d526b52da2c1b1ced97a118a6c0d914100ebe0e2996a12cfc55c9f66da128 SHA512 3ae1a29b15280f429202f4b031ffde905a26056964ba53610ae29f961d3f7c2562b8a5d27d701b3c1a72204464cf5c4ede628339ce3e6874aed62f127523f32b
diff --git a/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild b/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild
index 717b7c6e3fa5..8f426e92ba3a 100644
--- a/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild
+++ b/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Adds PKCS#12 support to the Python requests library in a clean way"
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index 05767cd8b20f..8ea5c939866b 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,5 +1,5 @@
 DIST requestsexceptions-1.1.3.tar.gz 6606 BLAKE2B 7dbbdc095ba1ec20b41a3c7a0dcef5f10fbcd8d9f6bfc9082bde09a23a9d75f1be96f79b74551691d038b758a7d7bd1568842be9fd139a4c4d3279e63376db9d SHA512 33a848b04db500b3481b7df2553e244e1967e5124de1606f73fb38f0b2681253ca2bd921386ce50f1144a8dc8d6f8e07be058a3d9f13c7831f77cade0a42fd38
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
-EBUILD requestsexceptions-1.1.3.ebuild 566 BLAKE2B a0fb43c9d55350e086be0ef0653b6061f401041c240ccb6be081cc0c2bc0dcdb6457efcf01401b2ef857b849c00c2ca3406ca02278e43c3764dd2431f5e460c9 SHA512 7016ddc7687165e391bd9f26105e61c91048552fe30de9508b4061046c2e699a602aecbffbd50ab9230b66fa4bfb83d49db1a6ac2af5a41e605c8ac58819753d
-EBUILD requestsexceptions-1.4.0.ebuild 569 BLAKE2B 5c93a7e0cfa44e63c6e64b0962cc3a42bb417d54cce4a21b833ab56efa1aa8ac1ea899b66fcaf849143008538e55b89edb53ebbdbe1ce9694934931c5fc4f6e6 SHA512 cbe627f39f9add9c609c366807ba2c380185a5e1d282489dbd0c7624e161b558ada0edeec0bbc1a47dc58d52d442a34c735968457791fdc64e9b57030259a74d
+EBUILD requestsexceptions-1.1.3.ebuild 562 BLAKE2B 026a9895496439dbecee1feec168cf970e148ad30f451c7573840464f2f229cb1f1232fe7288a332dbe8b28e2a531516bb39864bf43ef98cbea8a5f4fbc4d811 SHA512 bd805ebca7bb797ed279fdd945b242559fa7967106dbfb1be8018115d3a81be6f01236eb6b3fcae34996c93fa84c7b3d1bc2ec1ad19300347e898c3b47c6bb96
+EBUILD requestsexceptions-1.4.0.ebuild 567 BLAKE2B d7d469177d4b79c3d9aae28dbc1c3e927c6b7981ab898c78842084606f4316edfb8ddea78db843090597a3788042d44851c110e2b3fc1dc1c8cfb5b53d83ac5f SHA512 0ffc6e76adacc3f2cd28f7c3c21c0b5402c6c0d30a194340ca27ecd2ab31a802724150805046ca2bf89927ff146856fa70aa5c6ac1031589cf57736d1016a73c
 MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
index 35dad7e74587..dc9d810bd514 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 9f54950ab7c3..375b7eaf772a 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 3fa2a1968a59..75ad020c119f 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -3,7 +3,7 @@ AUX responses-0.10.7-tests.patch 383 BLAKE2B 3bca7b4ad5380fd13e29be1409d070d8ea1
 DIST responses-0.10.7.tar.gz 22666 BLAKE2B 9f6d8ee0cc36ebb94bf6ac4284b474d30754af339f623a8a899061392321ba48a1f2d21593fb5bf2e6fac7c65ca6c252b6b7a1072e5548f91db489633aa3b686 SHA512 dcdbac1555090309b17eec1c02887eea5080321ff359afc42e6b558954caec2ab757e6009ae539e6e4d002cd06f2289d909a28ae583e6fa062a5df89c301e1ff
 DIST responses-0.6.0.tar.gz 14073 BLAKE2B 27d4a4a380a9154ded1030278213c0cd87308a488199c277050fa2a0a1dad87a61086094bc35279ff9c4201d06c59613bd1b0dbd18b4d83b8321341f6f1c4bb0 SHA512 32d41be5850f0040a4f2ad82a057d6ef73f0f83f7d3c250fa223d5614470b0b8b58790667af76ecc6b0b7e8e2a0a069c46c7913e983730c968c603e2716dec0b
 DIST responses-0.9.0.tar.gz 19766 BLAKE2B bd98c24d6458f33f7b8ad68edb3d0fc595a7d7b31889ff8270e1add13d537d80d67c3628ea6630674e8d49837f9d3933f680b366b4a7fab10048640a50129c48 SHA512 e5312587845cc9a3a938fa5d052ac1f04950d2eea5d83192c54affe079ee6593f3e249a24a8b43b1985c9fdc9131bfb477b93ca8a75d0386ed33cd56cc37d5ff
-EBUILD responses-0.10.7.ebuild 875 BLAKE2B 4e879a10f4d579a644d6094eed8d809016a8f009ea174dbbe88e27c8269dcdcf073a09a5b992abf126da69533aa9207a1a8ed7b986c2e6c62bf22314c016bdcb SHA512 020ec07bdfe2eda6d43428a8bf92d3e25778f26ed3d3ef4d9403747c43ca326e6c73dfcc8806441d5689cee8d62bf0269fa5a4840127fbb9456200c7d635db97
-EBUILD responses-0.6.0.ebuild 790 BLAKE2B ef8ffa2f3fc521549b1b834069113ba54ca90399580cd6ebd2770773d5b3ddf22414fe7a54b925054dcb7783dab4edcf1edaacfa7b67c40c040e7e7035d73871 SHA512 6c74e8b45523dc28f0509e52d246bede9cd413b14feb118b632baf0468cf75678495b7ef950c92aa0c35bb6a8fa2b8db308ed41307023fddac7edbf879548995
-EBUILD responses-0.9.0.ebuild 855 BLAKE2B f55bb6b92d90d402d91eef004fc38ba9a671b21897a3d8d2f90d2a0cf3ce1f6ce7631514dd703fa55734026fa807745a7f777ecb1fce308724ce2c45769069d5 SHA512 f0729df83b80f982970dd20c64bf3bafb69527ac0edf7fa141a251d51087b8b3b99568585abd1d7d08dbd9d966fc388ea73e8ab39f2cd5be0be4660f010ba514
+EBUILD responses-0.10.7.ebuild 870 BLAKE2B 223bdcb31e59eafdaf5abfcd0a7c4f48e394f2785f087ea75a0484b4a7abc30699e0edc3a483ad3ec8aad1923b7aff2112ceae8de664e25c97fa856ad422576b SHA512 2fa669ae3dc7801a547215eccffe4b25c73a9e566e0bcd4dc3085fbef5aaf73f3eac072f3c3c56bcc0a1326763d5483e24321361098458c02025b3b305fee21c
+EBUILD responses-0.6.0.ebuild 786 BLAKE2B b13e0ff41c82b432e92d03cd0ec73ac630cb7e27b9f7305037ffc65e938dea314ab055721150257df9453d7c8487f0542ba0e6f42297268699efa5af23e9ae22 SHA512 cadf90fca9bf2bc79ba69e87552fe88f8c2a83c092b9183ac70e334c1652368d9bdc9a0f7538da8a6d69f04a072a363962a6960f1dea250394cef7fb4c0a7adb
+EBUILD responses-0.9.0.ebuild 853 BLAKE2B 3ae05df44771d1262dc17af4bb4e90b4db5c529b80a93f0e49d9460dd887da709628a63b0680ec6cd09bc3ee4b370432de4fa8cc55c9feebddc16f9e1ea23f17 SHA512 3dbb225b20f9e0a3c37ce35b39620fb8be49d81b45af22e1aab6f6049c42cc2bc195fb0993776951744e5350c753d7f52d4a4260977b6b46c3977952335da9ce
 MISC metadata.xml 438 BLAKE2B 9a2c389d84feb9087edaad524953e8a439dc914f293a1f5dc9a15f36101965ece4e28ab5f57b193dd30a2134b17e96feb218c898fd1164dd0c94234b54689a1f SHA512 efdf808423b4e47a6888b09d08b563f36a13867d355476ec10e7f247e6841bf682cb35c4432a011458d496dae79acb1ad4a38e03d3895a53e666edc3c9d4fca1
diff --git a/dev-python/responses/responses-0.10.7.ebuild b/dev-python/responses/responses-0.10.7.ebuild
index 090bff78212c..460a11b9e026 100644
--- a/dev-python/responses/responses-0.10.7.ebuild
+++ b/dev-python/responses/responses-0.10.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/responses/responses-0.6.0.ebuild b/dev-python/responses/responses-0.6.0.ebuild
index 053e092e215d..ebd96e53d16f 100644
--- a/dev-python/responses/responses-0.6.0.ebuild
+++ b/dev-python/responses/responses-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1
 
diff --git a/dev-python/responses/responses-0.9.0.ebuild b/dev-python/responses/responses-0.9.0.ebuild
index abf3afebb1c7..26a732bdfdc8 100644
--- a/dev-python/responses/responses-0.9.0.ebuild
+++ b/dev-python/responses/responses-0.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/restkit/Manifest b/dev-python/restkit/Manifest
index f82ec2b7eef1..1a4c7cc9b256 100644
--- a/dev-python/restkit/Manifest
+++ b/dev-python/restkit/Manifest
@@ -1,4 +1,4 @@
 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 1326 BLAKE2B 2a45c1f2f414c8b623ffe563e33940a6d9be010c9c544026f12bb3be2e0d14210782b65dde9d87fab671e3c743a0cd1aee10a396ecac80ceb19bccb9bcb1dded SHA512 c27cd979f1cad9b2c15156fb7886eee9a9b3bebb68dfe780e5d57769fdf1cfcd90c27fbbe6110fba1efa17a3599872151906d4f2f5df6fa9d2d2c382b14d8315
+EBUILD restkit-4.2.2.ebuild 1321 BLAKE2B 8c58e07b7d02b23ab0011844b6f5f707aec04ffb4510ed92eb2f1de8f3a7e78e995accac4fb944eebc8ef0d4f1cf065e692b028a762fb8b11af210cece620354 SHA512 5881f6cc6837cbdded007fdf4e1463285b55d14f66b19638e9efa65423c056c352493c31fd719aeb7edf2d5b4fcd4beab9022ca0a39174ea5a589b30b8ae901f
 MISC metadata.xml 432 BLAKE2B 577df51a2d5444177626d99df31020b61748deacf6586cc770fb36275f8d61bffc1b63c0267967873b5763d6260139ce236947614c716c2c5588c0dd1882ff54 SHA512 a7fe76d6995cabd2a49aa07e9479bebe385d7de317d9b8c5dce6cb82ad8381178a280b32a90c8447a78bb7e4294ee771cc02708f30bfa264a43a46d014f0684d
diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
index 3cba895c0bee..44cb6a1db701 100644
--- a/dev-python/restkit/restkit-4.2.2.ebuild
+++ b/dev-python/restkit/restkit-4.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
index 03d2c14dae58..27e9094dda7b 100644
--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -1,5 +1,5 @@
 DIST restructuredtext_lint-0.12.2.tar.gz 19141 BLAKE2B 69e0cf57540d5ccce8572a8c619506e3b76fd08e88019bb66c7a18a3ca2c2b91e72797c70428156e570143d6352d529088c324b18e2a08b67a8acddda7378352 SHA512 2634d740d30cafd446e3b5d3ad22e6942ec8e15d20440abe9c31ecfebebc7d1f50cc41492863ff1e6b01a8a3ad7139aa10e94022094dc7c314709e6f72176870
 DIST restructuredtext_lint-1.1.2.tar.gz 25061 BLAKE2B 5be51fb40ac3eb0ba58c053d5b54d79e0d1c0687786a877cc37d2e617dec788782e3d4aade62828a267c139b7e311405552cb61eefdbaed458c2c1206245a422 SHA512 f44eff61df3581ba345fb953a09d9bf6977003e05078bacbeea27287b0b14a6f16298db0bde5be4ebfd0843eac33de623db1e47ce6475b30dce47cdd3e9ea5d7
-EBUILD restructuredtext-lint-0.12.2.ebuild 628 BLAKE2B 4acd8dff0ee3d585f939f846592bba1af07ed6c3fca2bde525b4308ba9ef68fb0715ad82d202e1f60579ac52f9ea2b7267e6ca352910341f51da2620ea7bec40 SHA512 f71ee3cb34b361b210fa70c9cb8b551afc97da2aa4d201ae35c1474818d7d256be0a9b7e7d653ececb0348a081c1005b022fc321f91a47a4f015177c7a170c48
-EBUILD restructuredtext-lint-1.1.2.ebuild 791 BLAKE2B 11060435e464ead1c1cf2aa31669340ffe802d022dc62808a61920742641d1e49c5a4eba245ed076f445ec8b90432924a838ff251fc6095575da829376504d72 SHA512 c1e66cb965e65a5e492f1b3c78db49d291025334b4df5ac66762e0f902862f631d885f67936a97a59f064ff6c66d94f52e2d21265ac504b568d3b6d788d417d6
+EBUILD restructuredtext-lint-0.12.2.ebuild 626 BLAKE2B 55cf97b18539b1759504ac70c8eb79b2f9af06ee7f1d38c12839940799383b52721c60549d1b90dcf5fae1c28e615ddbcb6d3738e77742a251e5de5b8222b325 SHA512 fb6669e3b13ad66fe7cb4947b8a4d427dabf9210819ca41c6af4b29e68f7bee59a9c5197882eb1e33bd075c9d7a04c67559d4e9e9a4f16ea68c550eee22de233
+EBUILD restructuredtext-lint-1.1.2.ebuild 789 BLAKE2B 1e1ccc2b5b05cf1c45d41c9d0742b3daff40a6701ad9ebedd4b0527cdfaf9eaa4190c56d17adeb54a77bc14752dc13fd4cd47ff6527e5056bea9267495f9f71f SHA512 8327ab791b01bc3e14adc97cce78896a3fa0b639d12d5063c0bcac4c54b8740c8432a5ff0a95b1473746d2f261735d428c77debaf6cacc0c61a4485ee07141f7
 MISC metadata.xml 338 BLAKE2B c30f38fd31f802cfdb9dfd57839acc4269c793aedde4a2c17e937f62da0f04e94ccf2cd309b528f9c5753fdc747951ace9fd27a403d32907751ca1640955a3e9 SHA512 50f218c3b3fbdc1b639de1fbeb5adbcd6b6864027331f4521c4d52ba5a66d7ff98b75f746ce29dc8fc454ac8d3e12012cb53e8d8b0b157813a4b359d27760265
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
index 7c05e10d5c06..f6138f0f3dc2 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
index dda69c1a6391..8dd05897ee67 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/resumable-urlretrieve/Manifest b/dev-python/resumable-urlretrieve/Manifest
index d1ef001c198b..8b83921bf612 100644
--- a/dev-python/resumable-urlretrieve/Manifest
+++ b/dev-python/resumable-urlretrieve/Manifest
@@ -1,3 +1,3 @@
 DIST resumable-urlretrieve-0.1.5.tar.gz 320035 BLAKE2B 1cffa81020c120b289145d52a7d3dfae1d4868545242cae583350c9d9e3acc7f923af7e1d8b9349a781b2d2eba4f28a8d27220bdc1cc64ab07d079039be9ba87 SHA512 d9af75ac3301aefa0773731539075ff3ecd0614ba48ac7de4a84817b676dfcdcc68e67cf02329d4adc62629b173cd2b8efc525c0f48fa686b267a75c29143aec
-EBUILD resumable-urlretrieve-0.1.5.ebuild 566 BLAKE2B 7109347570a4172592485d3c94e3b9a048aa5c5f7be198e33f2274a9274e4400c7c8349ce20bfe01a7ea837374479a153a233a8f5bf7591b7a518a8df81ce3df SHA512 38c8d710fbf554b976943db601cbf9ed2738a46da20d7e39039176a7709661e598416b7203b7c292efaa9fd58676ea6a8e5195cb4411112a1c2345241f8f36d2
+EBUILD resumable-urlretrieve-0.1.5.ebuild 564 BLAKE2B f3594b2c09324cf54bef9c63f312aa30a3ec658a5fcc0171ba854ad5fdd6d2aa13b77cc52f1cedca101b7338b59a7010d17626dc7efb8a5734ae83b7fe4ef992 SHA512 ef0750b9f6c338883218750bb40d4f7124ab07c1d7598f46e38eb2301dafcfc984b7508e5fc5c654857dde85bc276f7d89911c48d46687b05db4ca741e12794f
 MISC metadata.xml 464 BLAKE2B 84bc493686b2688bdbdd4591acac96f0ea9b0f16d8e91fa7d6ec7ea225cb537842626106f598c44030f085d7a1502ce290289b7f7eaf5964f079be390fcaf311 SHA512 e8af70f36f05efac61eb6c378f93e5cd05fe7a80abd8f09c0f05ba4cbbfb0f9bb59859b96eed3b6137cde85c83d16c180681dfd4f079042b4e92dc6d426e60bf
diff --git a/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild b/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
index b15f72d62384..01e61c993be8 100644
--- a/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
+++ b/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index ba53712f4739..87cbfa0380d2 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,4 +1,4 @@
 DIST retry-decorator-1.0.0.tar.gz 2835 BLAKE2B b04d127ba3d357a61fb5e35a63867b297834acd82d0d7cdf736a69efe95fa33a263309799dcd4d8ae42e72ad5adb12b6c52557a81413ee8ebc49f5e0e728fa8b SHA512 f650740dd6d05010b7418b4d5ae7351058eb4418dabf7329390eaacceb72db60363bae8ff0bb15284301f0b5bfd9bfb731e71fdffb7231065a4db7ed6ce86da2
-EBUILD retry-decorator-1.0.0-r1.ebuild 546 BLAKE2B 6979cb267167269f4e5afd6b90bff20f2e11eb6ca67a3b43fbb5a102d7e1e004fc8880270fe0b22ec1571dca491e6d07010cfbe734d72503952ecf015b955b09 SHA512 01487b7e9745bea214675810bbccef9d4eee2d40606d40e1828d1a779caebedf5ee95b7c44d5f0c32a53b758d5bca07f2072805d815cd7d1b5dc7d865328d57f
-EBUILD retry-decorator-1.0.0.ebuild 554 BLAKE2B 3a97a8b125be55583d91b16f652b40c87fea4fda9482b94b59a311fafb61780e8e259774b18736ff83793e0bb82fb33ed863b35b70c29bb20ec97c1b026ff671 SHA512 26c9861ed63f79d4f8c2d8e639f996bfa452235b586bc39f09d5060abc8da9c44a90939daf5c24fc6caca3b3d57552ee2fa03cd22b311a399a754ca0f523d2bc
+EBUILD retry-decorator-1.0.0-r1.ebuild 542 BLAKE2B 98b42367d7a19a6ac3c766797efb4c5db526c6252abc91d68b334fc7ba328c8b2258cf5f1d8fae9ac279c5a2ca3b524905e55f633f739409eb50045a30565bc0 SHA512 4eaa7e78717d19db5d4b225f6448018455ba927e0df23f54cc94c0cf44723cffced5da507d95c78019ba604b5c18be1b3f55779d0b559a17b8b413e60262e31c
+EBUILD retry-decorator-1.0.0.ebuild 550 BLAKE2B d69fde6c37b5a2d4e74701798e07e2aec0e5f086ff95d827c3d61028f689e7e72ac1317e55ccd95c55f8487c3bd668b09a4957ed6f01b988e34fe4050dfefb13 SHA512 b0ffd6cdf2288d1c63c426bc7ae26f5724decc6374e2eb7efe8b8a9fcb31b3ab0494e6db6bffb035be69ef630f31c00e35cb6ee9c34b08364a0fe2a9c53fbbd7
 MISC metadata.xml 337 BLAKE2B 29715a3b27a3e28df0232103e6f826dc37f91a4ca981b25b3c4a786beab1c242db13fb942c1fdf0d646567439f7221862ff50c77ed87d376aa6ed6b04686434f SHA512 b94863fbe276838245ce8de2206145c0a0953cf8ec520ccab8dd4c01d6a58d191740c7ea1af0c1692567f41660ff009a5f5cc3147126e21299864d5957c979b7
diff --git a/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild b/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
index ca6ec3bfd7e9..8883a7f3f76d 100644
--- a/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
+++ b/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild b/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
index de229b1edfeb..6811aad6e89f 100644
--- a/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
+++ b/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
index 1585fa1e1070..7262262158b0 100644
--- a/dev-python/retrying/Manifest
+++ b/dev-python/retrying/Manifest
@@ -1,3 +1,3 @@
 DIST retrying-1.3.3.tar.gz 10890 BLAKE2B b7f2dd9488e99089e842f832666c6b71f94cb7fa9394bd504c27b5bb83fac2eb3dd1b7ed59cabe0c74a17c17483520502b65027d36887580744621d1776a2342 SHA512 99b81560caf63416f0301721ed9b9f9e3527a2fee4c53aeb0630b6e860ed81baf4b12b9819ca5b81346d45c4f40dfcb479a0b25305da1f560657fd3fdf2ffa75
-EBUILD retrying-1.3.3.ebuild 568 BLAKE2B edeb1ed9982630ba9e99e832b74d2258f87645f1b18413834d1dc68cf972e9a82d484c15d619aa184bee15bf7e514325bcc0c61762626d879432551a0c95c40b SHA512 299fc03a6dcfd674fa5617f2747bbea04424631943c19c648e0c79c0966a5938619009b59672f6ebbcc28998700314143d477abd350ed4879ed18a6ded78a5bf
+EBUILD retrying-1.3.3.ebuild 551 BLAKE2B 24fcd2799899825f3d918903185342c201c5288d7ba654ad18286b9cc5ba8f821e46729f502ccf50b3ea662f7362fe4eac8c250eb1cff7b4253d6638d14741b4 SHA512 727bdcacf9c7867ca0db1778ac34032909411f8a29cee202c24e5f3db4ff5ddc6a07b872c77542b343b62cbcc49b497955019b7479985813aa54830a8d2f6414
 MISC metadata.xml 696 BLAKE2B 66dd73d35f5f4fff4249e00dd76c8811177cd017b2714663aab2fa418e00c83bc596f8062a5e55b48a901b5b04b5debf947f366da9fec8809cbfc23316bb241a SHA512 e397e072f8f140fa55db71a21156adec37d615f41cd07dd07d86c4d77c7413b675e6a3032f63b5dab11f1f64a4f1ac547c2b8df685500304e9db48c3c5516289
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index 56d0dd6b4891..cf1180660daf 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index 8381b79f1303..e19e81628345 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,4 +1,4 @@
 AUX rfc3339-validator-0.1.2-remove-pytest-runner.patch 551 BLAKE2B 4ad2e2d740b38c0628d321bf77f0884a0c72448b65296daea25217725e526de27ffd5927a9ac52cde0bd9cab4ee46b6cdd0608657a4edff4d5de5b04fe0a5813 SHA512 2ebb2eaca9311944283eb09feca1796540298b16d99480931deffea6a441093f33c48437a2d4a6e44aa3293b2e984db1a00028e9b96805d284223090e5321f89
 DIST rfc3339-validator-0.1.2.tar.gz 7429 BLAKE2B 9c08ae6ebe12af043ebad82a716e359f323f318d44e1f23a41759773e1927f90d6dde95566ca3c9463db6ffc9f2c3a31925ee4668f7fbe1defc78e09949ac391 SHA512 42164f8258025b056a6c5584c1c5e76f4c4fddead1a18199cd5b115a5a576d8863676d741e5e9a12bd4b41cbf55e722632a57dc3f76688ff0ad886615286c567
-EBUILD rfc3339-validator-0.1.2.ebuild 704 BLAKE2B 4ada13fd1d1f04ca12c20ef707d66c2f62cb19894cc335ce14e01bf974f61f6a115003129e5027cd0f1ff9fc65ef94c97fc9f7258571dcbd6da1ab692f5f96fb SHA512 97ffe2f7f45a6847b064afd041ba0e99f50d142d7574f663bef5eb66018579cca2e499756846ee3ae9f974b7ee9d1d43a568fcea8bbc110b9b3e2703f53c9509
+EBUILD rfc3339-validator-0.1.2.ebuild 699 BLAKE2B 14419f06042c19296108ac3f88998bb3aabf6efc6b5fcafb15be06a0fc3fd9785477a0075b0e79ec7d8c48ed181fda9800f6022973167f049deb603b1e4556d5 SHA512 229030a4e6f6d22336aef5f70c5d8b722d12f355faa4f8bb4d06a8b676bf1f9dd06c8c449a453f684b5c242574710b7c9989e96b7d3227892892aeb6f88f1162
 MISC metadata.xml 374 BLAKE2B 4b440428addb3f4f1ee8556ca6fcf8ba55eb64571381eef4bac2b7744d13d8538942d0fefeb1513d558124e9e6806de73f81e39a84afa30d3de3634319b2b518 SHA512 579adade6871bd44f7cf9759c2c46ebaffdad553c78eca373bcce4b143fab229f7ccebe11c25884e6721736a506f03bdf2e67057f58cf8b18dc8af6d4de008c5
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
index 9f0280e058dd..a3aa8afc4d64 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A pure python RFC3339 validator"
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index 40002bea3316..97318a4e6728 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1.ebuild 836 BLAKE2B eafad573ae6cc9fa345c4b8d839d2affec4cfb8e8bbe6ba9f0cc6689854644857e11b0bb5a3862f06dc2932886a099780791c0863be99e14de042572f30c33fb SHA512 848234272944635726212dae5ee63df55837518f9f161b7856771ed375432ecff3c523e49738ae327bf69f8238e70ad569ea08ec8c5f36c241a1851bdb087058
+EBUILD rfc3986-validator-0.1.1.ebuild 831 BLAKE2B a4321e37cbe355637a0e90846ada071dc3b69dacedb8e7da2ea83015ec847ca7fa0c043259f9ef7854e23b17ab48cb9632b3c313365dc866c8466a2b2f89f9ea SHA512 5513cf4dbfcbd955a46920fea7723f180f4a98f940f2ff6595e99077f79d421c7e56c3ccbd110e782a541b9f0fa5f2c8ccd26d81a9604071ee5b787b4884c924
 MISC metadata.xml 374 BLAKE2B 154fe16f9c96a002adf4615eb298678ce77c21773cfca30ea239fc344e68ec2f98f104f79f078949b89606a3c2e1987f626bf3408d87d7ce4262980297945ccc SHA512 f5748ec0ac65035732c227f2eff35bd7e12abc04cfc6456ea9aab1d2f5dc51bfd6041a47f460df454c513735ebffa7571f1fa83cf7c5ab7db2f03f32a4524e87
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index 006c7593c794..889d6003cca2 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 18076d571737..be308121e481 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -3,9 +3,9 @@ DIST rfc3986-0.4.1.tar.gz 22354 BLAKE2B db2a7edefa89fd3780721904c5e1b623d34dea5e
 DIST rfc3986-1.1.0.tar.gz 39381 BLAKE2B cb890ae46c1428ddca1aed4a49660e2620659e7af64dbdb22c2514323ede374c28bbbd8401a5b4db257ba47e617ad7e8ae486f751fd4a7580808c68ff289ec13 SHA512 5e43ca7df586011900d2f01edfb20388598f77218e5a63904557bec0f1d0cb0a35f4980014de9c943ecc43a5a7ab3f7b815fbcfc9318e494c24a14fed2d1fac6
 DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
 DIST rfc3986-1.3.2.tar.gz 44225 BLAKE2B f4cc72ed3c2dcc7132527cd33fd6b9f0136f789fdb229cc33b02bf2dd596b2f762e3e4cf8af63f239408b55cdf056cf54315a0a9cdf734a4203fad24b00ce594 SHA512 c086c55295d80ccf33dbfeff06059303119e7a407bfc405b7f75ec30413221ec58d3061d75fd3ca696b7acf9b1be1dfcc785e01280bf659a53be43ab1f300b15
-EBUILD rfc3986-0.3.1.ebuild 711 BLAKE2B a6352d3b97d38c40a3fea4f46ff19475b205c8b37712bf2b1909dd474d09982323144f38ca864bb2df809a2d609a4a745e54c14101b553ad0d20b13db15003b6 SHA512 8e9139e1fadf8eb62107bd1d152ca436083c196b1ea0e9d7b30be6a9c5d83dac8d7477366736c75eca2567180725794792a43ce406f784024ff13483a93ce159
-EBUILD rfc3986-0.4.1.ebuild 717 BLAKE2B a28c4bad7c7aeb94f25ab3878f26a707e57b74b7a1115a6a970db66a6d826962e0e000d909e0596d2f48a3460090af9d0e781628349caa494096504c3212f6b4 SHA512 f76f17fcbe089df957dbc472f6937fc9135d7bcf3ea3296c6cd5147ebae33446ed2f981bb786b455fd946045bd1ca94153f47d25cc35248a231c9f9220407aa8
-EBUILD rfc3986-1.1.0.ebuild 715 BLAKE2B 96541ea1f8ad6720976053546ce45898bf4a2d326a92df77b03b9f252680a98e076b0d8b248d7d5905ae6ca4c43770261b2ef07454b87be4800e59ee000a81b2 SHA512 35ec0447006ef4b7d8a36056cc8d45bb7431df3b0b2a468b6163c1f39dc718d2e71bad74130a1a9dc5af9086177e6f172168a9a91b2153a2d48d9643b01beb17
-EBUILD rfc3986-1.2.0.ebuild 714 BLAKE2B 8c6969ee8526f3e4944cd2995d8595d54449522de6fdd7b98504ae47de7b049f08b584e8450e5e0a6d7a6f3e7546209173e2a1a03b72a49bcdf31c61cc64253a SHA512 d6c0f56bbb4f2df4a1fecf6cbe51e03692c130b09d57897c929e764b4aa8c4c1a15834ce6af686f491281342e43da54c338c0aeca06f57823a7c1213fb374296
-EBUILD rfc3986-1.3.2.ebuild 773 BLAKE2B 4da933dd44a193ac6a05cb4f0b049c4061f836fde79d945b76bfd4d370f14bfbd3629269a9ac6721acb03a668358d765f1a07bafb21a35510d4277df832ab866 SHA512 552b1f33a1d71045f434b36db674dd283000deffd4a38c56382afd5356596448466c7c16f94bbea01f13a197d63fa37bde0cf273087817b093725ba324b97121
+EBUILD rfc3986-0.3.1.ebuild 702 BLAKE2B 894dc64618f9ae2832add6866a27445d51017c4d4450719ec07cff99c9fa79973bff888d866e1a7d60e4ac1271eab8e379bb6135e30b6f7c9ca104d5b7efe6a1 SHA512 218d0e0222d7da3a03c38e6ef2e7736bd567179def5a72bfdd9a4084a65464a3a83b51bd094e20c60d44aebb52257fd88ac607c6153e591b62c007f07856a9dd
+EBUILD rfc3986-0.4.1.ebuild 708 BLAKE2B 54fddd4fcfd90c3ddfdc8b32c8477882127d5f3382ce1fa2fd76a3a801cf89d6d178a45003bfbc980380ce10455e1607c99c9b30ef9f25ef0744cbaf5e493d10 SHA512 6c63c8947ac62bfd31ba902b51cc95b71e5fc5ee5360cb308ad9ab006c6038a742022253d01ad44ad94d6525a54623b7c5bf3fc299bf39e3798099618499ebdc
+EBUILD rfc3986-1.1.0.ebuild 708 BLAKE2B 6f4022e150a77b35cd5b72f2cc33cbefbfe05c622b7abb955c554bd4e95a61b50fc641f59f67b28e9d043eadd3cb223747d4895d68f0d5a3440af26ad98999b4 SHA512 ef7c2d0f0653390412e181c6fe5f7adc0f13075216d3f31eac5926df91b521e0902bcc638660b1d14a8bafb31f58bf32cb12b32b3c2113d70ff41bfd71ea0e6f
+EBUILD rfc3986-1.2.0.ebuild 707 BLAKE2B 8c8e0a720c127ca7b8f20c8f8871ea2b1730768c40c9e09063d5749947b18b7c5fc3ecb9dc9ed3ccc4004473a79c50fc52a1d981a6df83999b264bb0166167a8 SHA512 b0c698367311309e39398b6b81c8c746b4eb0a612cab92b766da6c6a0c6de2db4b3cfff285a5b0e0ff5982c67ffa05166c9f11b3602cafcde3e03904c71393d5
+EBUILD rfc3986-1.3.2.ebuild 766 BLAKE2B ae24a2378b5aa7a455610cd3dbc6b58de941ece794d63cb0066c19ccdef8eeee868902731a1bfb38bfc7534649ad0c3e4ff294d76c9a91193f5a81229a3799cb SHA512 a8d5a07a9ad578137ca0c9517f62f354a5d8ff52691a49e4047ac587c9e33d1ebf6d89a4d423a2c66b32741be48f88749dfb354df71fe396e057551abffe9c78
 MISC metadata.xml 700 BLAKE2B bf4cbacbfd88c790e881e675d53493d4b382c9985bdfb8cfef2d4669be476b4d601600ba58759dd6015f12749d4062729595ec1b20df8a613cdb363e357f8bd5 SHA512 490e0897620a846047424f9a2219f0ad08330ef69f7dc7b6dc91cd8d79f5c0d41ce7faeb9162b836c55331e05f3307c89900da821e73b5b3ed61e88030af775a
diff --git a/dev-python/rfc3986/rfc3986-0.3.1.ebuild b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
index 302595e93329..ca64352e03de 100644
--- a/dev-python/rfc3986/rfc3986-0.3.1.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_6 pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/rfc3986-0.4.1.ebuild b/dev-python/rfc3986/rfc3986-0.4.1.ebuild
index 2f2d2417c6a1..dcd350dd993c 100644
--- a/dev-python/rfc3986/rfc3986-0.4.1.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_6 pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/rfc3986-1.1.0.ebuild b/dev-python/rfc3986/rfc3986-1.1.0.ebuild
index 0d79bb6f9e10..38294fcc58f5 100644
--- a/dev-python/rfc3986/rfc3986-1.1.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/rfc3986-1.2.0.ebuild b/dev-python/rfc3986/rfc3986-1.2.0.ebuild
index 4dacfdcd805c..1832ccf30d97 100644
--- a/dev-python/rfc3986/rfc3986-1.2.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/rfc3986-1.3.2.ebuild b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
index 905aee9d6bab..abbdaf3500c8 100644
--- a/dev-python/rfc3986/rfc3986-1.3.2.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 4f738d0c0e82..6c4eadcd9013 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,6 +1,6 @@
 DIST rfc3987-1.3.7.tar.gz 20701 BLAKE2B 234f3dc60d83e5615ae9fbbc14d063f9a993a532f5e7042144a8f5e995d44a27d88c284f7e12ff1f3f92d2440333438b3e1a0804ab43ca229305ce20ec4cb4f2 SHA512 c5fa8eb36358f7f42d12adc305031bfff7bd77e83316ad4458ed07acc6094c7d9109b95848b9296dcbc6677ce34aa59b1be8fd57dfcdc6be47eb92aeda51c518
 DIST rfc3987-1.3.8.tar.gz 20700 BLAKE2B 0662a5f376680a18eb58c76b5d1d4df653f62df7175f8c3f828cf8a410f900ba8feb81faf4ce40fabeecb74047e6b1542e170fba946d3189b18c553f16eda1e4 SHA512 0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c
-EBUILD rfc3987-1.3.7.ebuild 775 BLAKE2B 889707fd1be3b0e44876b927b5ef759e127f2924094b5a274072fa3280fcc5835d977e1950086590a10a5f42e8873bfa4f06d7505e48cbca169b8adb004b51a1 SHA512 d70d7ea2af6d15e87bec57208c16bfb3b1672aae594cebed8dd8a671f7273b55648a33015043a7588b95a357b3003b5d86b07820f5d2e704cd39cfb822c00161
-EBUILD rfc3987-1.3.8-r1.ebuild 724 BLAKE2B 9c90b1e634c56a17959d41f3e2ed04b4a98cd3388073980b9ddffc57f802e333752008c531c41ceff3e64485dab8b78b52b34258827f356411379268497589d9 SHA512 5fcb8f33a8a5af6ad13ce6bf9263d89c3f545173b28bf281d9869ccb7dea473e12151aca179c3dafd98cd27e8c638a40d7bf3bf0649baf12d538b908e55d3a64
-EBUILD rfc3987-1.3.8.ebuild 782 BLAKE2B b29265222a09251be28af998d415c1b0df6b66a8de75a4404a488941e662eb9a76792fe57de1084db415d83e9f42c2518e15b1ad3abdd8c3f34c2879cda6dd86 SHA512 3bb818fd54c8c6867d9c6b848b97f2f13b4677728ac550b9f4e558781e247c31f4c2c3b32d4964e84c791e138cb692bd1e90d9b74ddb1dd2ae40154eaec8337b
+EBUILD rfc3987-1.3.7.ebuild 768 BLAKE2B e598f7130b41ba53400a87d01b95e0622957695d7470b22ca2ea7e436dc72ec5ee65c95181b3768e61f8047e6fe84cf9fefe65767b57fc9900f95e413d4e11ac SHA512 3f8e22c54accf8fba22683abe6899e4f195370b0bd238fb70ef1bf5cb134d491521571525ec471046440e35b2957385a5b897db9335cb72257f88e66e1004a2a
+EBUILD rfc3987-1.3.8-r1.ebuild 719 BLAKE2B 3a0ee254d913fbd5fff5ca5310c8f871ed8c19311afbff48021ae6f11b572a0394dce2ebbec0631c35cde491f34c439235487119fc4b302ee239ce57b3eb0fc0 SHA512 32af05a12191fa65f04ed9cc8965274d78bc047a7ce76300063eeb371926089c61bc8bfda96b12863bbdfbf57d92772cddb05b21421a16d56efc8c09346838f6
+EBUILD rfc3987-1.3.8.ebuild 775 BLAKE2B 1b9b361c64a974cad789196a7a15d60dffd2d2c406eead57f48c4aaa330df73f03723e6eed65d12ee3087b662b0b622fc546d330ac2c02f724540de5ff481f41 SHA512 3e8c7e807dfbdbbb9adfbb19882ab88dad79264a86de9890a80660bbde415c7f1a587489631f71ee52c2fed1b03c92dbd60ef3b910f7e1c39b898b72689b9625
 MISC metadata.xml 571 BLAKE2B c366d3c4f3cb52d43bf469e77610cb6cfdd57b82ef0f46e8f1dbc739637bae6805edf5086deb4779738be7d29c4c73f7d658050112e9f5be62debc22a735f61c SHA512 2ced33f8245fc320ca1795072d9e63b5cc910b90f368306112316dcb444ee24f292e39ff76dfb027edcaf2c7a6dbfa636414ab8f9cfe777b0a2aeed17143e8c0
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
index 7d7ec0ebc554..7e41c4492336 100644
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index 6d79223db974..48d2e07d3ecb 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3987/rfc3987-1.3.8.ebuild b/dev-python/rfc3987/rfc3987-1.3.8.ebuild
index 0e58f437c1ba..5fa0fafe82e0 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/riak-python-client/Manifest b/dev-python/riak-python-client/Manifest
index 072499e26d59..030f53b8c6f3 100644
--- a/dev-python/riak-python-client/Manifest
+++ b/dev-python/riak-python-client/Manifest
@@ -1,3 +1,3 @@
 DIST riak-python-client-2.7.0.tar.gz 194141 BLAKE2B ae94f64ea71d253885053ea8207bc1b2a51433d2293f76bb172f5f85529c1d9196663ad3f760a58f3742158c8d0b32076c3aa32734e1bc228af22619662f54e9 SHA512 d63d031fb4b3598176480a3f1419158437ea814b46623a9a69e9105ced4172a1609d731bd163dd258c9301fa3b3c406a81f4c1068460b0ea397046fa6a1863e8
-EBUILD riak-python-client-2.7.0-r1.ebuild 922 BLAKE2B 41dc10e97e9f9230b47812e5d998543cf1acf47bdc845d1f9098ec3e57ad8096fd1c5153a791967c97ad46834c171985384c8995760c06610039d06ca64b8aa0 SHA512 7b25ba2ae05ff5eae1b2216008c8a024fc5f833f571223af8a494c9da0f951e9447984850cfdbf8a210d75a31135f330a78da179cdb27a0731ce05031e06e787
+EBUILD riak-python-client-2.7.0-r1.ebuild 908 BLAKE2B ff163dd0b2a6d80c3131fd01095df9e22748e0adb9cd787f534b00ec75704aeef83b52d8dfbf8a83e3a68478156f02e76db723cade525d50fd4808f1433acfc8 SHA512 b7ba5d833fbaa7726ba5c5b75e80e0e0f0d5f75a11f6010b7ba10e53ff5fa33e99d6be23c9cef11159b2b05995b3c22034851d7f1b8bb45b87b61a576f10a0be
 MISC metadata.xml 349 BLAKE2B caffd4d446589b6b2ab2ba81f9eda1313d9138d8cb2a8ee33a21d3a43d9db251bd3d6c7fc7935174663be8a27d2557b94c169317bf34043cecee86e141414add SHA512 613f92f27e8ac63fca2634eb9b058a30c26da6ba8751043ac3d107b5bf7bcf6d9af7d6b9bcf95a8a32158b5bcd0d32fef8ad43ee6d03656f94ee067411c48043
diff --git a/dev-python/riak-python-client/riak-python-client-2.7.0-r1.ebuild b/dev-python/riak-python-client/riak-python-client-2.7.0-r1.ebuild
index 8d9979326a49..2cce65354e4f 100644
--- a/dev-python/riak-python-client/riak-python-client-2.7.0-r1.ebuild
+++ b/dev-python/riak-python-client/riak-python-client-2.7.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rlcompleter2/Manifest b/dev-python/rlcompleter2/Manifest
deleted file mode 100644
index 0027a16cb2a2..000000000000
--- a/dev-python/rlcompleter2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rlcompleter2-0.98.tar.gz 10581 BLAKE2B 3905dd6fd5a53f0f0248c2a1b2cc4000da8da091691207d6e5f3bb0b601cda7d6f3b38649b54e72fcf09c7c64c7713d1adc97e84be195cb3f697b7c0d53ea034 SHA512 577118a8e94fe71a682a1210f5b156f5fa1078ae30efb1913e4b64569adfc44c64eadb993e9180d98243975589555204ede444fdd80d9094d279ede81e9e1801
-EBUILD rlcompleter2-0.98-r1.ebuild 568 BLAKE2B 79f290befaee46d2bfe5fad8aec0f2da0cf7b8046a6aed52fb7deddd543e94bc2247d64c813e57e3b501d31d43e272f8fe812b00fbe5fe84cb8daa520e4e632b SHA512 b8bc87a1239288839fe523932783c57673ea1766264f64e1b67839ff6909a02ca7b28079193bc45ad97662b8cfe57ec677535228e436e06a93a40ea8f9bb4857
-MISC metadata.xml 315 BLAKE2B 17c2fc072b6a43fcf828b9c775a81210683f1a8f647d778f556ff22f1d1bb57d3b995bc0be0fb0222c1c3dd127946b4c317374e196f027e706b88dbc7192378e SHA512 736c0f4374e2b2632bad58dad660164ab7215bd1cc35de93bfdcfd709dd5811d9cb8ecf8b4df50fcb7f1e31dd2fc374bb9feccd40140fa781ab89008cac4369e
diff --git a/dev-python/rlcompleter2/metadata.xml b/dev-python/rlcompleter2/metadata.xml
deleted file mode 100644
index 86374765d6cf..000000000000
--- a/dev-python/rlcompleter2/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">rlcompleter2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild b/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild
deleted file mode 100644
index 0da38cd4fe94..000000000000
--- a/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild
+++ /dev/null
@@ -1,24 +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="Python command line completion"
-HOMEPAGE="http://codespeak.net/rlcompleter2/ https://pypi.org/project/rlcompleter2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_postinst() {
-	ewarn "Please read the README, and follow instructions in order to"
-	ewarn "execute and configure rlcompleter2."
-}
diff --git a/dev-python/rnc2rng/Manifest b/dev-python/rnc2rng/Manifest
index 367c7efcc76e..d87b6338beb0 100644
--- a/dev-python/rnc2rng/Manifest
+++ b/dev-python/rnc2rng/Manifest
@@ -1,9 +1,3 @@
-DIST rnc2rng-2.4.1.tar.gz 13397 BLAKE2B 3d6a030470fa3caa98d4a9895015c628f00aa3da83fc8daa72925cf233132773a91880271a628110ad042713b6c781aa13e13c89693de5d847a7ee16e8a9e850 SHA512 d06c35e916c43832bc882fb5af20ad70213efc9d470d4b5cf70caba677874aee441f4c26de26a7996800bf41ef0243fec761a3e38336387c779f9b014c3d6c09
-DIST rnc2rng-2.4.tar.gz 13014 BLAKE2B d7bbc100ba00855432387365def160c5f966735c736f161cbf50bd2170cf5e97a0ab31d0f640fd02bda6188f07c9b718004e5a40e5149382ed60194cac3aa195 SHA512 082b2985e1fac17792b7513db67c0f467147a69a0c1f1d904665ea99b4ba4042e27cf7398f42b94f26c4fd6dc7a807505429d7d08f0537017d0dbac94cb9474b
-DIST rnc2rng-2.5.tar.gz 13633 BLAKE2B 4a2cc07cf5cc5ef63ca7a6e07c0163bf9103a48fbfcc6071a4e935d9c369ae0a4c9cdf1c1b3098c4d1b9fbb71c74f7438d07e4839d59101f34ede83551a65d0b SHA512 74772a2b7e3b4a560b318b11bdc05818a1cbbbdb00d3750e8780b68abb24c6ebdf8587b92fba8b04d2e030288b66c5a0a4104778de948ed0ceed5d8dfc6138bc
 DIST rnc2rng-2.6.1.tar.gz 14330 BLAKE2B 04d316f03da1e936603ca69cf5c8e087dd3a45f457d2b245452544e2a74a730d4c20a655a3eea5856f7f91e9154a7196bee89e8cc052cae887c6188da89b0574 SHA512 ab18b713d8756153fe03c76901dac7b090c7eab12042a251f2e97d7ae4e1ebfdf969a826305704f073c9df5a0980a6d8cd5d4e7a12a8caed018cab46a9196159
-EBUILD rnc2rng-2.4.1.ebuild 532 BLAKE2B d1403e36d58b7c09d7c84749aee6c908da197a3d53c14d89b2136cdf0302c84b573e1c65450ff5f9742c906df104f88f441f3c77202b7cb91c0d66bf6dcde609 SHA512 69160c9c72a0dbf52db4004f31912be3ae4250ed88cbbd81612c81328e0f0951bcaa30c4d2f721ae89c3ccc720ad3eecd6a8795e17e04827f57a39ca7ad459cf
-EBUILD rnc2rng-2.4.ebuild 532 BLAKE2B d1403e36d58b7c09d7c84749aee6c908da197a3d53c14d89b2136cdf0302c84b573e1c65450ff5f9742c906df104f88f441f3c77202b7cb91c0d66bf6dcde609 SHA512 69160c9c72a0dbf52db4004f31912be3ae4250ed88cbbd81612c81328e0f0951bcaa30c4d2f721ae89c3ccc720ad3eecd6a8795e17e04827f57a39ca7ad459cf
-EBUILD rnc2rng-2.5.ebuild 535 BLAKE2B 430c9e1fdf279dd532bf0460122ee9759051da202a107063257fc53dd09abb9124e96bb091a919546350060476bbfe8d71daa76067a0999a138fc5247c5c4cdb SHA512 56289a36f1f75c81df6fd58c1b7f717de6319e457019e6158940b25a81180b67d6183c4a7a148c1171f480f8437576cc69c3794218344f8154236cae0e36b244
-EBUILD rnc2rng-2.6.1.ebuild 542 BLAKE2B efefd163d4befc804cf743eca7b96c83d21c75b374be7b15726d931a4f88ebb0ab8985537f7590b95b153c069ea2e2155e1fcc1ec2d3823a000c7a9a6e017f8b SHA512 25ce5d01bc2c870c92b8ce5d030059800c1a4f855a735eac100298fbbca6c9b4c23e369c7dc971bd5d6182fa369ca4e5edb62ce3dd8274d2194465478c8559fc
+EBUILD rnc2rng-2.6.1.ebuild 540 BLAKE2B 120e8c650dec7da9a8a8a6f5a06a236e1bc2659ca05fa622c7d35f3fbe9aca05ba8bab4f11411715f501001ec54b6b7923671d79a3db7b2e4fcacde519e73987 SHA512 1b1387981102a80390e313a02ca52c53ff72ff2936603f054eb7a6bf5a7bce50075cdae06d99328bed7a9833ead1009a3979ffadbe189ca0591ea1da0a53b6cd
 MISC metadata.xml 366 BLAKE2B eb80555c7d3d419c9a0a0dca27330a2c4db11e2c0fd6d3edbc681733f12b33926842ccfebb2e818087876c92cd8ff17fd0e0a0ce8709e01237b70afa30a40ce5 SHA512 2c981a0862251c7fdb89078f62ed3eded580c221b3f1bbab7e2941b6e247f03cc7d86efb5174c5649b456bb9c6c5890b0664b32228c2c7ea1d6d18f2e6240198
diff --git a/dev-python/rnc2rng/rnc2rng-2.4.1.ebuild b/dev-python/rnc2rng/rnc2rng-2.4.1.ebuild
deleted file mode 100644
index eb1856a44077..000000000000
--- a/dev-python/rnc2rng/rnc2rng-2.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
-HOMEPAGE="https://github.com/djc/rnc2rng"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${PYTHON}" test.py
-}
diff --git a/dev-python/rnc2rng/rnc2rng-2.4.ebuild b/dev-python/rnc2rng/rnc2rng-2.4.ebuild
deleted file mode 100644
index eb1856a44077..000000000000
--- a/dev-python/rnc2rng/rnc2rng-2.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
-HOMEPAGE="https://github.com/djc/rnc2rng"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${PYTHON}" test.py
-}
diff --git a/dev-python/rnc2rng/rnc2rng-2.5.ebuild b/dev-python/rnc2rng/rnc2rng-2.5.ebuild
deleted file mode 100644
index 228fd5462e5e..000000000000
--- a/dev-python/rnc2rng/rnc2rng-2.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
-HOMEPAGE="https://github.com/djc/rnc2rng"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${PYTHON}" test.py
-}
diff --git a/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild b/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild
index e6b44ff88ee9..bc7ae740e20a 100644
--- a/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild
+++ b/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/robotbackgroundlogger/Manifest b/dev-python/robotbackgroundlogger/Manifest
index 102bd074088a..f411c54eba8f 100644
--- a/dev-python/robotbackgroundlogger/Manifest
+++ b/dev-python/robotbackgroundlogger/Manifest
@@ -1,3 +1,3 @@
 DIST robotbackgroundlogger-1.2.tar.gz 3910 BLAKE2B c79d848f8fb0767b966d5e152755a37c28bcb37af45a90a5583176a243c8a7258562c6be34aaaf6c8063d3c757b104d0a846fa2e5bae4c01ba166e2305eb7414 SHA512 29546cc810b30a4c87ccf2e0a5b1fc186d176d8b50d1fcf18076d97042e7f0123070d9988a795d9befedbe201007dbca30dc8b83d9543f30e5036e9f8795dcee
-EBUILD robotbackgroundlogger-1.2.ebuild 558 BLAKE2B 891ffeae482bb2e903e17092a8203a21e042a8eaa93442b42c5a2d6b4ab5bb3b3ea52d776e48a40545b0831690f559b236899559d424498d631bb5f26299b19b SHA512 88baa9c34dfb3db0fa07b26f123e282fb407897132d57c75e809388d8936db4963d33e28230fefa95fded694d81f33f1330367e196d02f50a326857f6341b5f7
+EBUILD robotbackgroundlogger-1.2.ebuild 547 BLAKE2B 53994a29ecb994127be638814d75775479a348af4957b8dcf44882dbf4461f9bdf7b344c71e491a6b1b5a0b41d656223999e9fdf60353506fd294a5ffb928f19 SHA512 892e886e3c0dabeb72c1399343ccd8690fd6b3e8b67dd2feb5a81ff261cb26ea3c241cfbb63e8039fca559d160f446d2e96148d66e94377f97ba0ef0a4d550ab
 MISC metadata.xml 378 BLAKE2B b0f4a1531c4a089912736a057f6664e06755b4737e0fb6fac825a3f361bceed3146254fc5649ee909e33dbf934afc4c3c7cb30344cd0a70a0a33615adbb2bee5 SHA512 0a61e4c19a9505c0d2d918448be4de95d4eb7c7bcaec57095cbfaa33e74a3ebfcbce25c7afb2ae253a584f6624f66a41c7764e21473108b2b538633e8c9bc921
diff --git a/dev-python/robotbackgroundlogger/robotbackgroundlogger-1.2.ebuild b/dev-python/robotbackgroundlogger/robotbackgroundlogger-1.2.ebuild
index 6ad59826aa82..6f1b9f37edef 100644
--- a/dev-python/robotbackgroundlogger/robotbackgroundlogger-1.2.ebuild
+++ b/dev-python/robotbackgroundlogger/robotbackgroundlogger-1.2.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
 DESCRIPTION="Helper module for logging to Robot Framework log from background threads"
 HOMEPAGE="https://github.com/robotframework/robotbackgroundlogger https://pypi.org/project/robotbackgroundlogger/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
 RDEPEND="dev-python/robotframework[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index 4d344e90326c..70ef9d4e01a3 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,5 +1,5 @@
 DIST roman-2.0.0.zip 7590 BLAKE2B c733a4e905ebf4ef526afb5088744bde8558314b059a4d8e9f86e914af2657f99b5c4364e9e8f9a11d9a1e4470ba9b1919b19951aab7dc06b55539d27b89ab30 SHA512 d62a95e835232821dbf7a81d0c6b7df63f18c4116cfc7eee0c691a0b31d3d7b69d2dc2e4ea26e0a169a8e24bf080e8bb1e195b853be4adf1491335a5b4d5702c
 DIST roman-3.0.tar.gz 5184 BLAKE2B 0951e15a1fbf0feecc98c4318fa631a535d24d9559d21e800f065923c71d094c387b18c5926ad55322ad8417a2db97626ada1e110549938d73243ca410e3ab87 SHA512 468a4ac7188cdf3155698f260de5ecc5bb2072c120c79d046618ac07b6de6f777cfc69661f2e0df4ca66359bb20169d22599b3f342edaa48f8575bdc17b40c08
-EBUILD roman-2.0.0.ebuild 637 BLAKE2B 89c22803864328f25730c4e9162c12d8fb33f62ba925869cf6c1ec7faf9323049f94763099304affa5d61ef44835005b87c9dce3682e2ecd314c4bbd394aa5fb SHA512 97fdb9a50c7b9cb48dac6f5ad7365c59eaaab76cdeed99dba78436fd1902045a1fd4b9555d26b884937f7a51d3bb5483f220070f13ce30cddcac8695bbe86bfd
-EBUILD roman-3.0.ebuild 631 BLAKE2B 91fb4e45530d84a70f8816542f7d8633d26a5f7a82650d8667d708e3b830620fa51699894cdf9ae5f2c173eedf17edb786cebd3f8482d0ebb946f8d0c3dd2fa3 SHA512 e17d2f6ced1010c6163a2f3867ff1cf001fb3eb322faab12dcab1502e39f7baf946f6b1d44838fd3c2c48b74cbf6e918920b9343960b6a14029b182ce44fc1a1
+EBUILD roman-2.0.0.ebuild 628 BLAKE2B b3636719c13a5ca264fc23ea7a893a5bf62b5a9ceb704751377b67432060f81129d9fe1f6ada4fd721ccdea6c4c02a878e9a789f94619473f4f76f3ac6707b2d SHA512 189e800b4bb6c077f2844bf5a3281e8a9b53475fd9c9b33604b44ffca3e30eaefb920489e6ee8ac31e1f31ac0d1a23c60d7459685989216b4354c1ba6d0a9f64
+EBUILD roman-3.0.ebuild 622 BLAKE2B 869875e3845e34f85162f5231f072b74571304911a34f805075bb2f34fc6bf9b75b2cc400369df522d9e6bf42aaf9dbd8ee147548df35df0ae0bd242b99eca49 SHA512 5bd9c2ef2ed559bd4bfeb725c898c4d9a68f91ae3f9a13608941f398c1183396b4aa8b7926b4c0952b6ff604d23aa5115e07e025e91c8412cc6441873690ca40
 MISC metadata.xml 318 BLAKE2B 3a028680f19314e15a2eab93b8bfe5338ef3b351e82f28ba7eb1d0988ffc0f9eeb9174f30c18c0f7e10b865958a5992043525baf6e25732ce85d819c65c9fbb3 SHA512 a2e3ce30465809bbac2a6684207eb0290787a1e2eafebb457a6754e474340f75208dd269f7d89f2fdf25a3529340310acc9c220feaa1be40fe688a177b2741f0
diff --git a/dev-python/roman/roman-2.0.0.ebuild b/dev-python/roman/roman-2.0.0.ebuild
index 0fcb9761e7d6..fe5f70808435 100644
--- a/dev-python/roman/roman-2.0.0.ebuild
+++ b/dev-python/roman/roman-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/roman/roman-3.0.ebuild b/dev-python/roman/roman-3.0.ebuild
index 198c432c0f3f..1b2c9fd3542a 100644
--- a/dev-python/roman/roman-3.0.ebuild
+++ b/dev-python/roman/roman-3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rootpy/Manifest b/dev-python/rootpy/Manifest
index 84777dad4812..ea6f41d2c56d 100644
--- a/dev-python/rootpy/Manifest
+++ b/dev-python/rootpy/Manifest
@@ -1,5 +1,3 @@
-DIST rootpy-0.8.3.tar.gz 417400 BLAKE2B a8120d7005082be96901820d602abfc43bbac5d797d41a8bc215fef36ed37e3bc7b797e0d4ca084ba45b840dcf8eb4afcdfb454f8c801bdf1edec146f3f9ac38 SHA512 b1d3c17fb0a6dfe36bdf3d9a345fc55af8a102d33433c951581f9a61babf377fabb1ae486c78b2d4654cbc7320de122fb3075f27a1565655a3dc17c2b4f56df6
 DIST rootpy-1.0.1.tar.gz 418618 BLAKE2B ce321e69d7e202877697d133ad2ba90df71cd261b206211718cb6a9ec8ee3ec085cac49526b9bb75166fafeb43f83b3f53bf231d9353f3d63fa7e4be381ce454 SHA512 db1c7edc02d1cd5a4a1940237c1e1c63d892bb92e612bdad028d14f9723a4bdc5f9b6711a135b0e099ce1895b2564b29aeb21ef0d2c3681354bf4edc9c6a325f
-EBUILD rootpy-0.8.3.ebuild 1062 BLAKE2B 85317c47af89837c58cc560db31d2f6c3266b52065a92536326e995527c45eaffaf16d03108530fd147a790e2b4196b512fa9c860e3f202c19897ca47fa61b50 SHA512 16c48103cdb703323a87757396e731abef22238dd40103ea4e389a5c07e8dc27e20527b5cf58bd5eba1d7bdc1e85249fe76c92eb01774f11f8f08fb99679822e
-EBUILD rootpy-1.0.1.ebuild 1070 BLAKE2B c1726eb00f1370fdb555e74a3c4b65b8447d8643f4729b9324d68f50e5732aacfa61d66087700322a492384ef25c4d40e4d5041546cc4f71c6a5038eca1258b8 SHA512 c16fb4e31cf7731b138e4733915831bc929c4eb820944552b4538371b9eb5b4926ccdc67af327b3a9d388b952e19df751ef89f434d18dd979450d689b2615e99
+EBUILD rootpy-1.0.1.ebuild 1061 BLAKE2B 5efc02ddedfccd590f2482764b138f0bbc46d472dc8567c218e9249e7505b0fe9228359492b176fa578ecfdba613cfeb6c8b5590db75c22f5bb178c14a199f8d SHA512 62edc05a31f5dd14c88aa65356d37b04021f111bbaf128268b0bc31c2c1d66bc0e2d1718dc7ee97d342bd3be8247532cf02b988cca63ea46fd21c01f490af3af
 MISC metadata.xml 525 BLAKE2B add8ec7423df97b01b5b9cad45c04339bd8aa2fcd62be3bbae15b66d9520603d7ad9c31232a7215fe68cf706f28348be54b38ca8bd05923a677b6c26ecafa7fa SHA512 6987f42215b8a3160a7e292499f63e26c05c8ffef69f7ade03fb4b539fb0116f14d7204602264e237d5c4e75436794770061c4d0d508072c06e24c1eec500094
diff --git a/dev-python/rootpy/rootpy-0.8.3.ebuild b/dev-python/rootpy/rootpy-0.8.3.ebuild
deleted file mode 100644
index 9823bde1b34e..000000000000
--- a/dev-python/rootpy/rootpy-0.8.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="readline"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic layer on top of the ROOT framework's PyROOT bindings"
-HOMEPAGE="http://rootpy.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND="
-	sci-physics/root[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pytables[${PYTHON_USEDEP}]
-	dev-python/root_numpy[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]"
-
-DEPEND="
-	sci-physics/root[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# TOFIX: tests go in an infinite loop error
-RESTRICT=test
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/rootpy/rootpy-1.0.1.ebuild b/dev-python/rootpy/rootpy-1.0.1.ebuild
index b4efcde380e3..6146c30b7abf 100644
--- a/dev-python/rootpy/rootpy-1.0.1.ebuild
+++ b/dev-python/rootpy/rootpy-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="readline"
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 33811169ec64..920dde457465 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -2,5 +2,5 @@ AUX rope-0.10.3-doc-syntax-errors.patch 1207 BLAKE2B 2eb81ffc507c532feff64a09b04
 DIST rope-0.10.3.tar.gz 226123 BLAKE2B e7f29545280a8615486547a8c29f44894d3c84659af9cb87ac596238a829f3a21a778e92ffe7e260cf27b52639983be1b3d62b38a727ce31a9c7ec225abc76ad SHA512 1d868aeebd086c3fc199316a71e61a8c46c76d85176557842051bb8f51d090f316df6bb84f766db5a46dc164d3e471eb90465805a102e46acb34e39b2b0ce8b4
 DIST rope-0.10.7.tar.gz 244089 BLAKE2B aebc1eaa3715aa4f2423490790f53040ad256fca35b3ad7b516e6b1f0af051b79f812f7b701ff5ac2414dbf2d1cba319da0f4cf241041329c0c750ae63e0ec33 SHA512 80343b8b7af883afbd04734b0fe4dbdab114301234654cbd95b3ae8be8dff40878105b7647209f5e899b981ab6a7ecb987d9bdf942b32ed083c745128c22ef95
 EBUILD rope-0.10.3.ebuild 1033 BLAKE2B a545fd4b68149939f9d6e07a207d16f4a9ed7934a0a4e4d8a08d3bd70cdae4a5fcedc8430dd6db22f7d474c7c233df837af22f771b2931c8f2b70d1010b22be4 SHA512 78312c709aa2298027ff4a8340b5fc010d742233db9acb1715eede323c85448e96b4f65f7d506bff6374b9437fdd8fae3c8dd85264f78c4922c5ce313fcf911f
-EBUILD rope-0.10.7.ebuild 1127 BLAKE2B b2c72d46983010da2b084d5af409d65825fe0dab747809077b297083dc3988e42fc7e4dc615ea075195c921e209798e96a946f1e1af8d668e1cb742564db114a SHA512 bfdb58312185c5ac9db845df433ee599a4b82c25e83a1e910a621328e45ea4c9598cd2321435a33878d43253bb2bdaaf2b73462491964a38e5a672cc79a1af9b
+EBUILD rope-0.10.7.ebuild 1123 BLAKE2B 83aef06bf60fea03210bfa9a3f8e2ebfb6413997eca9e54362ef681c7fe0ae51cb53b87122fd093128281b3a9b509d62a2bfa467194463005d3d5fc97bc8a492 SHA512 453745e03dd6b3024caa4ed62867b486335247eaf4f30014e87f09f3fa09f1b728e9b0d3969c53ead6356720b66b2aea04c3a84bfd65c20c79028b03912a2eae
 MISC metadata.xml 517 BLAKE2B 165eea4dc0b2ee1244b9b94f3763c90692c6483d4c09b6535197b34ace789d364c2b63de1dc9d50645ec01cc2975c6f20a95d7756c2bac78a40733e343b7968c SHA512 6289b55677d1e26372017042042229865bad64a396952c21a7d5a1f25322c2ccfed11c0a9ea0c0896573dd1f04dc3263dc3eb28ff7b0b804c2bddf231e924630
diff --git a/dev-python/rope/rope-0.10.7.ebuild b/dev-python/rope/rope-0.10.7.ebuild
index 26bfe5ead9bf..8d64d89e6545 100644
--- a/dev-python/rope/rope-0.10.7.ebuild
+++ b/dev-python/rope/rope-0.10.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ropeide/Manifest b/dev-python/ropeide/Manifest
deleted file mode 100644
index eafefd07d3b7..000000000000
--- a/dev-python/ropeide/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ropeide-1.5.1.tar.gz 88289 BLAKE2B 963f2910c34da67f11a59a9a51078e779beb9351504c8b812768b4b881fce86c7a382922825f6f442037c88a21740618486214ef9e33c446c743d051d13bd8e2 SHA512 fbdfc9519e49440c748c4d9fe5e8a3597b983dcee715f92ce3c9d07eb19b1792623dd3a66ee4f43790887848aa85c17b4596b006c4d1c86859c060af69c32dcb
-EBUILD ropeide-1.5.1-r2.ebuild 585 BLAKE2B 1637a9ce2fd0de521a3425d5c029b212994552689f32d641b84c1bdba8d93958a6c9a2a380ca681a89d7dc862b746490545d28372fc0956cedcb63ecc7cc1bd0 SHA512 cf5e26589eaad123e014ae7facae6ec2b846d6a1da0e1f328203a51b61ab458199d6e5d4f9d92d2c7592cc37b3be36e9d921ea3908ae17c85e5cb3168a83e934
-MISC metadata.xml 314 BLAKE2B ef98eea792dbe21c3eb21a12710bcc06230851ec27372c7cf181fc998cfca8718a3d949562b0bc6a72028fdce2bf89cc059d7c314f37fb1f857b20dc9d98aec3 SHA512 c24a36f613f4888cb906e98355c66e491e8b8bfd2b2bbed8c109c3530f21a9c32c77d744b15fbeb590c219e79b5235a6b62326b8b0f64bae634f35d095493e31
diff --git a/dev-python/ropeide/metadata.xml b/dev-python/ropeide/metadata.xml
deleted file mode 100644
index 115dae5b6ac8..000000000000
--- a/dev-python/ropeide/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="sourceforge">rope</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/ropeide/ropeide-1.5.1-r2.ebuild b/dev-python/ropeide/ropeide-1.5.1-r2.ebuild
deleted file mode 100644
index 36d9ec81b2d2..000000000000
--- a/dev-python/ropeide/ropeide-1.5.1-r2.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
-PYTHON_REQ_USE="tk"
-
-DESCRIPTION="Python refactoring IDE"
-HOMEPAGE="http://freecode.com/projects/ropeide https://pypi.org/project/ropeide/"
-SRC_URI="mirror://sourceforge/rope/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-python/rope-0.8.4[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	if use doc; then
-		dodoc docs/*.txt
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ropemacs/Manifest b/dev-python/ropemacs/Manifest
deleted file mode 100644
index 9fdee0b0a483..000000000000
--- a/dev-python/ropemacs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ropemacs-0.8.tar.gz 22161 BLAKE2B f45412c37762e90615ab0ac874b8e51d211250215d1999098d5aaf56ac5c46f535128bb6935b9e8a2b86eba24baf4648893ad710c784693958bb053fc65b2fea SHA512 3e42ce03758c13d8f6e66b69a4b9ab7620956ed0272ecf770c0cea204ffae8c85f41103b29e507db7d68d6dc006b14e6ca5ce31d8ca17b6a66bf743f1110a9b3
-EBUILD ropemacs-0.8.ebuild 831 BLAKE2B 0f68ff2957b6f3715055536af94a2de67046ff4121d05ab9b2217f41c796b1d32f00af5dd0eb8c8ece21cfbaa3bb117f29b11b830947edd4f9f58547e12fd7d6 SHA512 374fd085caaadf95c0cc279775a28c6fdb310cd9ab5d5c6fc2067dc842bcf61fca4cb119e9b10bc478cc0fb201f1f9239b2f08be0a94c27a33e5e5c03260d6c7
-MISC metadata.xml 476 BLAKE2B 385516edad9299f46479406e373690e09df8a9700c850d6d75206bce2ccb3c62adf10621bf89e1cefa09d46ee7cf26478648bd6a302c8f489a325524ad3b877a SHA512 2f7eb5e71660ad51be770eee8352df5995e4599d50a43f394cb1f532444fc52be98cf6cd9e6d4ccbc1f1067ac36a66e430d1eec12de68f03e3a9d96eda7e6782
diff --git a/dev-python/ropemacs/metadata.xml b/dev-python/ropemacs/metadata.xml
deleted file mode 100644
index f3a018c56488..000000000000
--- a/dev-python/ropemacs/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>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<upstream>
-  <remote-id type="pypi">ropemacs</remote-id>
-  <remote-id type="sourceforge">rope</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-python/ropemacs/ropemacs-0.8.ebuild b/dev-python/ropemacs/ropemacs-0.8.ebuild
deleted file mode 100644
index ae8bdf6d90a1..000000000000
--- a/dev-python/ropemacs/ropemacs-0.8.ebuild
+++ /dev/null
@@ -1,31 +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 eutils readme.gentoo
-
-DESCRIPTION="Rope in Emacs"
-HOMEPAGE="https://github.com/python-rope/ropemacs
-	https://pypi.org/project/ropemacs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-1+"		# GPL without version
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/rope[${PYTHON_USEDEP}]
-	dev-python/ropemode[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	local DOCS="${DOCS} README.rst docs/*.rst"
-	distutils-r1_src_install
-
-	DOC_CONTENTS="In order to enable ropemacs support in Emacs, install
-		app-emacs/pymacs and add the following line to your ~/.emacs file:
-		\\n\\t(pymacs-load \"ropemacs\" \"rope-\")"
-	readme.gentoo_create_doc
-}
diff --git a/dev-python/ropemode/Manifest b/dev-python/ropemode/Manifest
index 8913a2a898b8..8dd91505ca1a 100644
--- a/dev-python/ropemode/Manifest
+++ b/dev-python/ropemode/Manifest
@@ -1,5 +1,5 @@
 DIST ropemode-0.2.tar.gz 12268 BLAKE2B 630a00b0b66a663f7259faf823c288b9eddca5eb9a87b8b4d9cc606bc4d23df143f8de4f7748416de909d1d12d5c1bb1e529a6cf7e94c91c394172f68332155c SHA512 59b9a8f8caf03f480994c546b48c0be8bd85ebf44b406e216b6651e254b3fd9c6a532a5bab1be1301b12dcf756d3ad325f38e810fe5ea5bbcc700979cfbd5055
 DIST ropemode-0.4.tar.gz 12846 BLAKE2B 1cf2f2fd9528e078dc47e429631a3ebc7e1de82bb474435c6fe0c640d2d5bc706ed8d3c665b77836f07d715af991cd1cd202af9675429f70b0f7d47f05757d9e SHA512 b8d592b42a6cdeb73b123b94d24bbb0eedc38414b60c931c9d1a7bf3c6fc4958d2db0431f57f281987c89d3b27dd2e45701d386274024a2a79bf8183547c8489
 EBUILD ropemode-0.2-r1.ebuild 547 BLAKE2B 8634d633c374ed253b78b1c86e9128c2aafe0d2977f26d9f0a9fbb3dc0a7c33868128162a0781a468ba1433fc8cecca4f8d449f81c88f85df17b7b597cab62be SHA512 d3d6f5702d0c2565fbff15a8606a52a7d5a5f2bf32a18e9c4cec54c51ff3fc7df5b1958dc41897057732959ec8309a0e32ba95b675b399725cba491996b7d177
-EBUILD ropemode-0.4.ebuild 761 BLAKE2B f7b2db52f7bd1299281b5669c8f5d03b7bfdd01d214b3b1fbd03f03dd24edfc828d15b3e4db479aee529edd10ce0721f5f79f970812bb1bb88da585e51779975 SHA512 a8a0ddc222d1f2409566ab97366e7d9f09aba5d103fbac4031bdaa7ae9af1a0836a2d21c68f5d255d89a4565e720ba7e6173a8ead6ab3c873f9bba218c54e3db
+EBUILD ropemode-0.4.ebuild 757 BLAKE2B 9797f5603d90fcd226974b2e42d9033b9372032e5df2fb1265151ebb55dcb16a9f1a3beb569820e6a770c2f23f85310a6848c7b9b52beeebecc29fd11b12a690 SHA512 b133f4eae7d4a981d5fe642f8e3846a7bad86bef0a0fad6562334b8036b2ec7201e1fc77392cdbf8759efa0042d583d736faeb6997c2dfe920f019fe5a5c68eb
 MISC metadata.xml 311 BLAKE2B 7a391c7a136d22050f6502a996210bcddad6b45c6f7f6fa4ba2106ecebc46f9898bed02e707714dad4e2ba75e4c6a88b6e8c192e24602d7c4bc781a68036c538 SHA512 8c8dc80268b8e455abdd3d991500daf13ddf3c1ade4881b8023768b0c6fc0e7be8eb32a8f74a368c9664bcc24153a049362960ef74ab39e82def51248a120ca0
diff --git a/dev-python/ropemode/ropemode-0.4.ebuild b/dev-python/ropemode/ropemode-0.4.ebuild
index f8435d1a8d34..b1c88587cf18 100644
--- a/dev-python/ropemode/ropemode-0.4.ebuild
+++ b/dev-python/ropemode/ropemode-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index d3ed52ff537d..db859f7c22e2 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -2,8 +2,8 @@ AUX yaml.patch 10168 BLAKE2B bd9bbcc2d5cb1fbc99ccc6f61e72057efa75882eb18d5bd676c
 DIST rosdistro-0.7.2.tar.gz 60091 BLAKE2B 40f2a47fcf5a13d0b8b9eb29fcee9bfbd811a7541dac74e6be76e2c67ba34adf0b7c2df8804300e35262bbb36efa890128e06217c93ecfc834015010e344e42d SHA512 ca6c0d19c2218efe8bf27c1cc22c4c9b683dccb5f8029208e0b581cb358fbe32733895896b1afece45b6576f254f4535032cea962587aa47d93235767c6baf60
 DIST rosdistro-0.7.4.tar.gz 60365 BLAKE2B a2b9af6b584abc057d0b5e7d1087438834801eea33555fb094bc938e1ec642a5d41057f61ee3d3f80ca3ea083e8cb6989f6907cfbc9973067a32d0ee505101d8 SHA512 9e2cbc88290b3a132fa5aeec446ca25a89365367a57a97f49cc26533139f91b2a50a1f2f6176f4333900bf7fa21d49c9836d65e74dc8322fe8c5811c49794291
 DIST rosdistro-0.8.0.tar.gz 60527 BLAKE2B 9404452dc62c9f7d1482de3c13df0093ac26a60554c97fa097cb14548cdb814fbdc96a26db2d24aa1f2eb99de86f27807ecdc50e0e00a8fa727af8803ab5d644 SHA512 1f4620454f78bd03f75a8b1b8535588a8d6e50aeef17dbf346e8d0443a6fbc5ec83646767bf86521fb65508e205fc3edb8f0c97a81aec8d6b72088d9d78a14f0
-EBUILD rosdistro-0.7.2.ebuild 1061 BLAKE2B 5f771038734ec29a90ec5891723983112d54130570960d824c0959aa09de63ff7dd3e118747418db34d790d84b595bf576c4405e440fee08de0e009dd4261fb2 SHA512 27e73d49c98dc2a84cf3c095bdaec09be9ac071db562a1d837974da9b8daebdfcc06de51b1e125a659f2fcc18c5acea18daaf96fde601ea3963e19956b2244c5
-EBUILD rosdistro-0.7.4.ebuild 1061 BLAKE2B 5f771038734ec29a90ec5891723983112d54130570960d824c0959aa09de63ff7dd3e118747418db34d790d84b595bf576c4405e440fee08de0e009dd4261fb2 SHA512 27e73d49c98dc2a84cf3c095bdaec09be9ac071db562a1d837974da9b8daebdfcc06de51b1e125a659f2fcc18c5acea18daaf96fde601ea3963e19956b2244c5
-EBUILD rosdistro-0.8.0.ebuild 1196 BLAKE2B e2917a9bdc64d80bfc4675c023453a97c61814403aeac0976c98c570b9a60f08a304e4b357470964fa30ba2541a2e5a8ef0221a71a3a1e7e155f8619b1c832b8 SHA512 66c98cc53826e490cbe4d38dd8729b0cfd11480fb95d9c3f6297f40c3638dc01dcd810b1610621d23bf0ed70c80123994804873093647a94970dc6a98b373da7
-EBUILD rosdistro-9999.ebuild 1196 BLAKE2B e2917a9bdc64d80bfc4675c023453a97c61814403aeac0976c98c570b9a60f08a304e4b357470964fa30ba2541a2e5a8ef0221a71a3a1e7e155f8619b1c832b8 SHA512 66c98cc53826e490cbe4d38dd8729b0cfd11480fb95d9c3f6297f40c3638dc01dcd810b1610621d23bf0ed70c80123994804873093647a94970dc6a98b373da7
+EBUILD rosdistro-0.7.2.ebuild 1054 BLAKE2B c01d056b6569c4afb956b8818a2e15135b8fe2af86bc97e40dc8e050f403716967bc406ce5aaa114d054ba911dc886b3697adfc948891d4cd5dcc578be2f80d1 SHA512 d3befaf3723994c7a39b0ef913fff5d16f4e269ee2debb19a81dc15502ba85878325b2bfcd501714a302006e423dc4c028d0a4ffb05d9c26652597e906669471
+EBUILD rosdistro-0.7.4.ebuild 1054 BLAKE2B c01d056b6569c4afb956b8818a2e15135b8fe2af86bc97e40dc8e050f403716967bc406ce5aaa114d054ba911dc886b3697adfc948891d4cd5dcc578be2f80d1 SHA512 d3befaf3723994c7a39b0ef913fff5d16f4e269ee2debb19a81dc15502ba85878325b2bfcd501714a302006e423dc4c028d0a4ffb05d9c26652597e906669471
+EBUILD rosdistro-0.8.0.ebuild 1189 BLAKE2B 9e730fc6b33b4295ec2210bca04880872327888190c3d15a196153eb03478290b24c010f5be6268ef804261dda074d40ecdfd7bb9faf890454fb9743f25d3105 SHA512 e5d2780976287d8e317a832e15171717a2e12d20f8c24d3494d5446980c99b31955055fa905e3968a49039c7f4068819a5b818b3cde59984e7d08ca9928e6f60
+EBUILD rosdistro-9999.ebuild 1189 BLAKE2B 9e730fc6b33b4295ec2210bca04880872327888190c3d15a196153eb03478290b24c010f5be6268ef804261dda074d40ecdfd7bb9faf890454fb9743f25d3105 SHA512 e5d2780976287d8e317a832e15171717a2e12d20f8c24d3494d5446980c99b31955055fa905e3968a49039c7f4068819a5b818b3cde59984e7d08ca9928e6f60
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.7.2.ebuild b/dev-python/rosdistro/rosdistro-0.7.2.ebuild
index ef8fe8bcb38d..1366af7507e5 100644
--- a/dev-python/rosdistro/rosdistro-0.7.2.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rosdistro/rosdistro-0.7.4.ebuild b/dev-python/rosdistro/rosdistro-0.7.4.ebuild
index ef8fe8bcb38d..1366af7507e5 100644
--- a/dev-python/rosdistro/rosdistro-0.7.4.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.7.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rosdistro/rosdistro-0.8.0.ebuild b/dev-python/rosdistro/rosdistro-0.8.0.ebuild
index cf60a935e58c..c4a885cba031 100644
--- a/dev-python/rosdistro/rosdistro-0.8.0.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index cf60a935e58c..c4a885cba031 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index a8cb0768e822..0294fdc01c2f 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -3,8 +3,8 @@ AUX yaml_load.patch 2300 BLAKE2B 3d24162a4c2501d7ae431b602244d102e0e26894304c868
 DIST rospkg-1.1.10.tar.gz 90434 BLAKE2B 1eb128d7e3f6d07e8309ecf5ea6c4340afcbb6f0618fd4628543c046003782750c5013c13ff2ed17018abc6efc6ce2042ccf2c6dccea8933be7045ddfe3f4522 SHA512 54b1b0ca4683b9388989501781239cf35873f2bf2028d176718f624999835b21e44f0cc5988624b37f7172d21f0c01aa336d35a884753c842098e558c37ac6c8
 DIST rospkg-1.1.9.tar.gz 90412 BLAKE2B 4cca7d1ebfcba495aafd766f0d720a6bc6e5aade0bff098d4a1cbab3b55c7a720de7d1f97edf806a93cc21eeda4cac86e844b5e3b23f85cbcb7b328fd07da222 SHA512 d33005e29313ba06959189f8f563361fd9523c2368855f260347b4c509d8b4053f74db3e2cf5986031653d647ded097f272f65d617da93e13cf77a906cb56ca6
 DIST rospkg-1.2.0.tar.gz 90516 BLAKE2B 0c1d993c70f0ad383ab457c846416a22b9adf9611704a918c3765659231846749228073ea04950ddfdbe13f7e51f87ce5d17c1488f995e846a6590a0f9549efd SHA512 f059259a38b8b2281496a69f8a55fdd31a11e91583babb82e574363c40c90221a4abb7c1d7a5ed6be3b2389ee6aaf08b4e016260c73dd779f8c7993e6eba78db
-EBUILD rospkg-1.1.10.ebuild 1137 BLAKE2B e9b5927662118402785ac65a039ac9236066697d56b58790a5399107b84c01ab9fbc65564d5d8b5f6aa585271546621c736a28eebf14f757407de4f35f9c474e SHA512 003019a978f33f108cae8eb9f992655a8b98361c5756c70a87785ee54c4064d0496c02ff8f6667e5fc7fa8d42f765af6c01ee3609b1169085e9e436ae5bf348d
-EBUILD rospkg-1.1.9.ebuild 1137 BLAKE2B e9b5927662118402785ac65a039ac9236066697d56b58790a5399107b84c01ab9fbc65564d5d8b5f6aa585271546621c736a28eebf14f757407de4f35f9c474e SHA512 003019a978f33f108cae8eb9f992655a8b98361c5756c70a87785ee54c4064d0496c02ff8f6667e5fc7fa8d42f765af6c01ee3609b1169085e9e436ae5bf348d
-EBUILD rospkg-1.2.0.ebuild 1212 BLAKE2B c2d19b5e4edce654b1110fff01cf2ff2f660b9e2886804f003a0f5576f05424ff8846a7a63c35d5895a0e5f4799b65c2f87091a80465b05330def5c70e984308 SHA512 797d7f67d46d09bbe1e974fac303b73e762adda097ec0bdce3511a48b507b98a38f43c5544518e1b2a5d2cfcfc462edffadf08368a03ce1fd47aef3e17d17e8a
-EBUILD rospkg-9999.ebuild 1212 BLAKE2B c2d19b5e4edce654b1110fff01cf2ff2f660b9e2886804f003a0f5576f05424ff8846a7a63c35d5895a0e5f4799b65c2f87091a80465b05330def5c70e984308 SHA512 797d7f67d46d09bbe1e974fac303b73e762adda097ec0bdce3511a48b507b98a38f43c5544518e1b2a5d2cfcfc462edffadf08368a03ce1fd47aef3e17d17e8a
+EBUILD rospkg-1.1.10.ebuild 1130 BLAKE2B c21afc2be0e8cfd6d96bb4aa2f090e728282e8c26fcf5c002d05e5b1c16dbd0ed0cb396731ad0c95ba8f93886d9474545f5c42f730061258e33bc996dfc4d845 SHA512 fc73aff4ef1b12a464000c6e406f43d25d0002465004799e7585a7dbd2cabcd402e230d2a181963b717bd321183a487658c74a04e53f88dc5ae28604a7b938d6
+EBUILD rospkg-1.1.9.ebuild 1130 BLAKE2B c21afc2be0e8cfd6d96bb4aa2f090e728282e8c26fcf5c002d05e5b1c16dbd0ed0cb396731ad0c95ba8f93886d9474545f5c42f730061258e33bc996dfc4d845 SHA512 fc73aff4ef1b12a464000c6e406f43d25d0002465004799e7585a7dbd2cabcd402e230d2a181963b717bd321183a487658c74a04e53f88dc5ae28604a7b938d6
+EBUILD rospkg-1.2.0.ebuild 1205 BLAKE2B f33225623c87e439bccf02c9b8a8c5d27fadced5be4fe375ac7f6eb00e941117abf955b9bd0f497027cc2e131498d0a5a52050038ac93f68fb71e6e3a471b91c SHA512 8b1fa2c5f49f4a127a53e781f0055664eb8d38eb35c200acd83e510dfe1ed3bf890893bb2db142c31656154827764275ad13b7cec102ee929396b6263049acce
+EBUILD rospkg-9999.ebuild 1205 BLAKE2B f33225623c87e439bccf02c9b8a8c5d27fadced5be4fe375ac7f6eb00e941117abf955b9bd0f497027cc2e131498d0a5a52050038ac93f68fb71e6e3a471b91c SHA512 8b1fa2c5f49f4a127a53e781f0055664eb8d38eb35c200acd83e510dfe1ed3bf890893bb2db142c31656154827764275ad13b7cec102ee929396b6263049acce
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.1.10.ebuild b/dev-python/rospkg/rospkg-1.1.10.ebuild
index 4043929c6edf..eb111ee128dd 100644
--- a/dev-python/rospkg/rospkg-1.1.10.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/rospkg-1.1.9.ebuild b/dev-python/rospkg/rospkg-1.1.9.ebuild
index 4043929c6edf..eb111ee128dd 100644
--- a/dev-python/rospkg/rospkg-1.1.9.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/rospkg-1.2.0.ebuild b/dev-python/rospkg/rospkg-1.2.0.ebuild
index d798eb107040..d47115913724 100644
--- a/dev-python/rospkg/rospkg-1.2.0.ebuild
+++ b/dev-python/rospkg/rospkg-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index d798eb107040..d47115913724 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index 8c4cf782a5b5..32ab8fc6ae58 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.ebuild 1555 BLAKE2B 598c1df8f6ac50b78a1ae1992848f0a3284742011683db59753076607c044b4ef7d6d1435636e47c49d6f164be91beda1e8b8d15804bd84dc21e2344bb603c91 SHA512 110a23241e8807b9f783724331c44f3c1016fb5184a5daaa777ab4bc5cb58db935a9204213fdf05f0119f897b079ae663628db2f08db4600a3ee96c35957543a
+EBUILD routes-2.4.1.ebuild 1551 BLAKE2B 58d0f84ef695c927bacb44ad8b7b8d68633532bfdff5b76ae36d275d2ab3583b6ef56dc3ff2e99620036204100f6ed6fd4a92bf0ae662f0370f5d5fd8ee8c5f0 SHA512 cc7a933586c963da210ed7f00e7e5815f021c654a18ce3572e080f211ad0091295748ead78418c5e25414f358e25bdcf36edc2454d784035a096824823b5eb13
 MISC metadata.xml 309 BLAKE2B 58e1b02098e87fe7303e9a6ce962897750493b957d3b30f78feb58b9cbec84b5fcf80acde66da35caa71989b628a75d232ea567e679f891fb4b81d1c49f61d06 SHA512 6daa7dcc2ae185c198c2630961d68c19498e98bce96ea3b1390a4c159fb591a89af796f2ac90e00994bda52c36138792797a38975c772d6fabce09cf0536722a
diff --git a/dev-python/routes/routes-2.4.1.ebuild b/dev-python/routes/routes-2.4.1.ebuild
index 9a6f23b6b70b..55aa114e8efb 100644
--- a/dev-python/routes/routes-2.4.1.ebuild
+++ b/dev-python/routes/routes-2.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index ff3302a678ca..3cefcf4e9e88 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,9 +1,5 @@
-DIST rply-0.7.4.tar.gz 27392 BLAKE2B 3604550646e083bf685a192dcf0dbc80c03cf4b97f6771ed37e228c84909c2518a58bde73ea584085351f1a2b5c865418ae671843087660d48f08e0e44e3ab2c SHA512 e3c3a828eb4b3cb20751ecb2d91efaabddbe3702d52b9adefe1748c07c843da1899e3944bcf0ab79f627ae428b8879cf99739ea7e0c6fd1acffc4ac4dee1b652
 DIST rply-0.7.5.tar.gz 27462 BLAKE2B 0f438e6fd786e7436f135da50fe90208970a0950422bb0d8e26b06cc2def964c0ebd7c3e5e3e282a1d56dbb9e804ac267095dc4da16eb57899f455d66fed2d71 SHA512 ccecc451d9e2e0fdf9df7eaaeabface782d9159cc1caf1feae6e46210f6384aa1a78c15ea3c0e9dcc0bd0d2b28e3b1328c8d37e94a8968b07ef7938e5f5ce201
-DIST rply-0.7.6.tar.gz 26216 BLAKE2B 5ec93739179df0d34762ea0ee004a00defa235a23af8b5cbf283e1e44c250469a704c9247463a8cdf9796c35da8aed0be025e73fe21aece3d376b1e66ffda1c3 SHA512 b0edcff1ca32c465b404a0b2f548f90d312bcb98d3f4aa4a61fb44986c8aa7ecb6f046e72112e2c1f5654173bcfcc96ab4e0625632e908ccf17b43cdb3d8d99d
 DIST rply-0.7.7.tar.gz 26366 BLAKE2B 09e6b93e9581745209b2d1fede6e0e4f08c2a34cc2495ea73aebb27b012353bbdb749ef127128cd5d9df201607f73625e248945038a927d788e324fb632341b4 SHA512 c01166b7df067a6a55d1b43caa7b5a349045e838899daf82e2ba70a2c2525fd68e95f11e5319a1fe36936e696352a37bdc13f132f739cd52759a9a9c91e317ba
-EBUILD rply-0.7.4.ebuild 929 BLAKE2B f4abbc9e6c01c96a793969058a53bb7bc359607363cdf44df967d99a224adf73bc04b1ce96254c05329d807ce8fe9098ac0d88f815b8cc25f66311e9ed59d4a1 SHA512 271d8a628f81b7eeb441999a14586b263a816a6437a18ef725731c0dec3830cf5de45b960233901d363c31ec8cdd7267ba7583d0423069edca1bdb3d88a55a01
-EBUILD rply-0.7.5.ebuild 933 BLAKE2B 9e8d836d253cc1c48fbe079f9c3b4647267763d639ff879ed6b9d592bcbf24b09cd057593ae781283e714fb55d9a3b8048dc25cb1323a79ed7c232c2ba02c4c5 SHA512 8754c040ab3d69690132732b92f9daa647469604be2756a03ba8b368b3d9177bf89e04753ee4c575b6c8dae72a33602355d81165abe37f11c342480bd8a55b87
-EBUILD rply-0.7.6.ebuild 916 BLAKE2B 7b8b1280cda1acc894036a075c6f06339b7cf95d2528fe0b2dd4d7d2f8c4aa7022f35cbfe6d5f1ce4d631176d40378356a63e5c3b1bbb040b865c0db704f5e37 SHA512 87282212c197b57907c1212203ed1ab130dac5d042641f7bc9baa144ae1fb48b6ed577ae82125df8eeb8fa722de0b9ce287df17b3471c063d1d5d70f4737647c
-EBUILD rply-0.7.7.ebuild 698 BLAKE2B e723af385e80f35635cf3c432fe341dd578f291151b2c8a7e3ecd7e6b8deb27642c2aeb345c049b80060c66bc162e380f22dcb6ac7490409389686148e44d10f SHA512 e014828d0ac52e6ee1bc659066868294d2d4760b521be088a9fdb7807ce7538ba29dd62e8659ddce7122ab23701d16515157f61683fa79c535b43a2a8ae86397
+EBUILD rply-0.7.5.ebuild 924 BLAKE2B ac4442e2a6ec3698ee0496143043c8e3a42cdd8fc65a807fa9b43dbb4e090ae3dc99a6c09698a7afc09ace8fdc223153a495afc7b66f733bbc4834567d1dd2aa SHA512 4440c7b70c2d8df1ccd412a769c9ba94530f884b0bec31a12a2d15156e7169bdec237c42c947c0c750581bee91be2b2a87389bc8116bd70ca2fe784ba986c4db
+EBUILD rply-0.7.7.ebuild 689 BLAKE2B 1ad62b45dad29a874e9059293155019dedacde3f4f1d9b0610f7f43316503da8b7e74adec3161393fef42c88f629f58ac2265da2bf111151c1e2a3f32df80a56 SHA512 82f0d58453a2ee7885bccded2a0874e38ce042a540e3c6d6a0221c7d48e63c8eed16801b897742d46142666f5d58075bf3178c6ded6eb9731a097ad2a41e6d5e
 MISC metadata.xml 324 BLAKE2B d6027998ac0d5aee72ca31a60c53bdf7bbc628b16eacb329041fadb5ac5c9015f152e3e9f59495505eb73a2f8fe76ccff182026b6d5c80999274268056e63e14 SHA512 9378b0e52729cd011ed824e800aa1af7ed6b9f799de0802950dbf02eeb8dd27e356ea067a46aaa91b05d96f7ec5fc17a43c0d980b7b585fecb8220b0ddc20ba8
diff --git a/dev-python/rply/rply-0.7.4.ebuild b/dev-python/rply/rply-0.7.4.ebuild
deleted file mode 100644
index b8b99dc9e4fc..000000000000
--- a/dev-python/rply/rply-0.7.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python parser generator that also works with RPython"
-HOMEPAGE="https://github.com/alex/rply"
-SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/appdirs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare() {
-	# https://github.com/alex/rply/issues/26; fail under py[3-4]
-	if python_is_python3; then
-		sed -e s':test_simple:_&:' -e s':test_empty_production:_&:' \
-			-i tests/test_parsergenerator.py
-	fi
-	distutils-r1_python_prepare
-}
-
-python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/rply/rply-0.7.5.ebuild b/dev-python/rply/rply-0.7.5.ebuild
index c72956f10c12..53efea90dd6d 100644
--- a/dev-python/rply/rply-0.7.5.ebuild
+++ b/dev-python/rply/rply-0.7.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rply/rply-0.7.6.ebuild b/dev-python/rply/rply-0.7.6.ebuild
deleted file mode 100644
index 3499bd15290c..000000000000
--- a/dev-python/rply/rply-0.7.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python parser generator that also works with RPython"
-HOMEPAGE="https://github.com/alex/rply"
-SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/appdirs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare() {
-	# https://github.com/alex/rply/issues/26; fail under py[3-4]
-	if python_is_python3; then
-		sed -e s':test_simple:_&:' -e s':test_empty_production:_&:' \
-			-i tests/test_parsergenerator.py || die
-	fi
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/rply/rply-0.7.7.ebuild b/dev-python/rply/rply-0.7.7.ebuild
index cb3fca642b26..a3de9374a2aa 100644
--- a/dev-python/rply/rply-0.7.7.ebuild
+++ b/dev-python/rply/rply-0.7.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index 58e6957c021d..c11fce0d0616 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,5 +1,5 @@
 DIST rpy2-2.6.2.tar.gz 171655 BLAKE2B f590e63dbbb6f5aa9f18d7475136005fa993d32af41e12a8e33fda0232a73d444f83341aa2dac3ec8300cf68de83e377d5f6caabb27b5d439af795126670e286 SHA512 7a060ccc26a03dc93d75edb85d92f1ab31af96ba140932ff8e699cd5855e6078b1e0ffceed135d32deb6c8f273ebcc8b02be38e9b8fc66778cc2adab5745f542
 DIST rpy2-2.9.0.tar.gz 193062 BLAKE2B 92492821856e516f8f620397cba2e0ffb17718156c7c3a0bc8df8e744f0adf1ea6006e5c762ba99aa142fe06d327a240bf5d616175e81a80d28a21265c9771aa SHA512 55be876fb7316a08f507f3a332ed29d71b52f733c1986482f141e694d66d0e01a51a9c3f0260f6fe0086d7bfbc1f58b678cda4570665e4f1ffdb120c793ef1b2
-EBUILD rpy-2.6.2.ebuild 1286 BLAKE2B 5afc4fc41414707bab09fefc4724c2ed89c4631ef8a81eb3c68a544f180b20a1879d4c57444150345ba8d5952c5819210a46fecdb891277bcb98df833a6636e7 SHA512 82bcca2babee0dd571094f311d9d6c3c05eae0a9c3f6f49a98e818d78e7bfeb3cb33448572012eb0b3c6e33696987bce52c4eb605b0c7727095a73be7883da0a
-EBUILD rpy-2.9.0.ebuild 1222 BLAKE2B 5ff11513c904fa7adfa9f44daf5897d8b7577297a3429c3b9e5ad5b186f36b2902b0d757733186ab72432b6b467a2ab4108606761ca4e8dc779f35eb494cadda SHA512 fa4e8fb27e6e3b60f7a2b772f35fe653cdaba0a73ba476253b851cc26c81e27b77e218295c2e54de1641ab6d49cd387da9d445f7c0f326b4e21208dece452b52
+EBUILD rpy-2.6.2.ebuild 1284 BLAKE2B 385b8551efd6e67fedf147fa4be4c01c12ece7b3c9abe90b54b47239c2f5aa0df9b1d99e97399ad885eb3e3d5ed4312bee1090ca8f70f051d4cc1732b044cc6c SHA512 5d74443bfefb77a4f97de78f4066f0f07887db9ef20b241b020a1f41aaa1e1e795d1f0ff273cbc7803e1e6f777d9a4398e92805f3f57757cd8d9b24dc9bcaeda
+EBUILD rpy-2.9.0.ebuild 1220 BLAKE2B 1a19b9ee5447246009566fb790a7c8be0a0980c8ab9c44f238197230388adad512a24b92c6c44ca21350fdd444e00c297c52e5c324837ec02f4813e5daaf8015 SHA512 ffe031376ecc151b8ddd007b0c9feaf5343167d0bb68aeb54fbb986d94b4472e8fcc8a513a08c0533af62f6fa36b774b2de579154025aee641dcd93c7bf0a38c
 MISC metadata.xml 700 BLAKE2B 42fce60e594dbff010837724886940504b6d01545afbb9330238139855b4350247180cd05875935e9ce807808e02979733b000eb15558a7dd764b7e444a7b4c1 SHA512 f70b91d3a53220b814460d8836d0d04500b0c9fa62395a8264d81a8d952ec8f2090d20cfa55cd60ccd2698a947b61c6284c036abc298a9c18a7807302c15d8af
diff --git a/dev-python/rpy/rpy-2.6.2.ebuild b/dev-python/rpy/rpy-2.6.2.ebuild
index c6cba764b411..39ab1094a6e3 100644
--- a/dev-python/rpy/rpy-2.6.2.ebuild
+++ b/dev-python/rpy/rpy-2.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/rpy/rpy-2.9.0.ebuild b/dev-python/rpy/rpy-2.9.0.ebuild
index 8ddae4532eec..96c50803dcca 100644
--- a/dev-python/rpy/rpy-2.9.0.ebuild
+++ b/dev-python/rpy/rpy-2.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 flag-o-matic virtualx
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 4f0635feb9ee..ff4d5295712c 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,5 +1,5 @@
 DIST rpyc-3.4.4.tar.gz 56199 BLAKE2B f56ef53a55d25335708c6750282c8e3d94492405f80e5cc03bcde879f8afbae70ec02cabe6d92bb62413dc92025ef42945e62802c7adb083b880fad31ebeff0d SHA512 0a176b05df28d92e67cb45372b46260611c1bc89f997c5a6760a760dff8792d5bb93505fdeccbd25c5ae7b04cf7aeeb7fd8964d4f124b00e50fbd3d55d7ba7b1
 DIST rpyc-4.0.2.tar.gz 53877 BLAKE2B 91b2b8da44df91258f1355886019fe70fd2029141c025c3e71d1d2996ac9eaaec2ee4344149192a02ef8835adcf6f3cfad5cdc33f102577ec4ff8e955f0a0d19 SHA512 91fd1e5a65bdb5a5d8c424bc0c8cb0688ae76ae644278855cd7c22f9af47d7a6da3a80f7383643c2161521633425b6a2486960aefbe2e02864f93d53568bca2d
-EBUILD rpyc-3.4.4.ebuild 489 BLAKE2B 5ad117b282f2b13d5aa2447c23d48c6b3a4fd809ba4cea8deae07a30a1ede14395c23d6ec808d97e3e2a32f0f4fd9ba4d81feffaef52ea5d9ba190920531471b SHA512 2290da246dceab34d7f63b46133606694b86feb1cb82a25b0557aa8a92b3fbf709e9e836d40518786df03687d2d472483c0df907202d12aee628e57170a79b35
-EBUILD rpyc-4.0.2.ebuild 513 BLAKE2B 230ba8cf6ad822322ee0ce441370e334fdeb8c70dbdad97d362bc16d804024ead5520f5078a3498dc23eb4bf4a73d70bd28491dd498c9e2c2b08f2b7c51f2967 SHA512 2defc2ad2d8dfedefff287fcaddc09b6525967ad5236fc381c9c0b88a908adcfa3d93312f2c7351dc0ad9c0beae7d0ad5c36408e555218fe78f6f61b9ac52568
+EBUILD rpyc-3.4.4.ebuild 470 BLAKE2B af15b16f8e6c6b8daa15470b2d9612dc5e8154c5bb294717646e4dc49a05798fe81a2db2feed5152b0aa7ddca10ea77090628667cacb8252672509f9b8ab4265 SHA512 ded6d0f7d198b03d25c2c8010c34acc9c95f058b937314b1c34ba41700d277931e6ee60df19125d7e371db8380e357b1121c6565e9ff36b167964f85998ee45e
+EBUILD rpyc-4.0.2.ebuild 494 BLAKE2B 1cf781a9c81bd87384c1dc521ba5027747375c9d7b7548634e37770ed5040f67aece0ff0d8fcc72c260d6d32d55131846c592cc641db3a322c67a21bb54e5f44 SHA512 d5b43eeea7c7dc227832a8441e0e9d5fbd631b3b2b4cc0203cd5aa24a048c2b5d596abf75b97ece60f4faba8f3b14e921fe82110751e517da6a13c6e49edb985
 MISC metadata.xml 518 BLAKE2B 023033edd4ab41716a110c97b8b21d60ee9635a3b411401c3e436b69ae0fc1241a2dd5c34dfe98b3a7e32b8351534011f533bb15443205c5ac0740d2ef89d44a SHA512 4ae598f55ddf591e0d75a9cfba54948b3ff78825377c8085ca22ad56184f18c44ef94947dbe53d207996f7bcb708454f417a74a72bbdfe22d76410acdad2f584
diff --git a/dev-python/rpyc/rpyc-3.4.4.ebuild b/dev-python/rpyc/rpyc-3.4.4.ebuild
index 0cf647f2ebaa..013c3def2817 100644
--- a/dev-python/rpyc/rpyc-3.4.4.ebuild
+++ b/dev-python/rpyc/rpyc-3.4.4.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
 DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
 HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+
 RDEPEND="dev-python/plumbum"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rpyc/rpyc-4.0.2.ebuild b/dev-python/rpyc/rpyc-4.0.2.ebuild
index f3e1ff38ded2..32fff1dae369 100644
--- a/dev-python/rpyc/rpyc-4.0.2.ebuild
+++ b/dev-python/rpyc/rpyc-4.0.2.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
 DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
 HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
 RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index f39e9f501f94..cbb41f3b780e 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,5 @@
 DIST rq-0.13.0.tar.gz 45487 BLAKE2B 1985a097d419b50b19771a5f1c1526c8b8b3e9b960f7ecb2817cd731a9af0c37dd38e215a556d35ae8107cc93c3da9c023d4e73eda90e776d62a994d74f5bbda SHA512 f8cf5c3cf7360e0640a2ca97a42c85e67e59835317d04dc752008463224e073053c70ede17e179e1e8d287b3e4ed832971a0398636c49e2680f1183f0ebd2302
 DIST rq-1.0.tar.gz 45516 BLAKE2B 10af545640c757671d2da4691d06b03fe0b61c82351824a51f8f382bb0e7380312d6902ceff86bb5fbfe06ac3bedca3275394063e6576db33e78d20610083527 SHA512 eb3040c5c312123ff99158d504f5fea8377c382a1067d923db29a9087e7e0f7d5214ca1ab1df190d3e9872d6d00917c2435730c121dee1a4c410e65d2875d918
-EBUILD rq-0.13.0.ebuild 517 BLAKE2B 43e42a588fc0ce20d86e0b5feed41504288b6d4db77c8a27185a849d872658adc77d3af8fb207b210ef7e1d9895f075f28186ce52a534b4478df362caf445433 SHA512 8fc44fcd6cdea706be024d5975e004603b4ebab7345018bf959572cc8004fd4e58330c84e4a743f5bc45f3e6a3b319aa8bd53d1bfd4539285a2dd2d4187d02ae
-EBUILD rq-1.0.ebuild 518 BLAKE2B 8cab95159ac28836339f82e2409ec2e1fe0f972021b085c69c0e763dea9e5440dbfc7079f4979f225ed07d5c3d565f1171cd41b12b7247e7b693b9e9863a589a SHA512 b1fa464889fdbacb193b5f80f4a004b2599724dcdafd61868e8c4f9752db6618691a1eeff1777cb0e5599a6261a6ff7ad83b80f497da6cb617b1af8d29535b8f
+EBUILD rq-0.13.0.ebuild 507 BLAKE2B 72c9ac1a0aa35a4b3666a7e827ce0ebc684925549f77cfe3d0922337e370d66276288d059bdfd3e1d26620f1a15cbf8d71ecb77eb1a18455d116241dbf4a292e SHA512 d94ba297ca69c382e8ceea15dbbe627734afecad31d16400056ff7e17cd1e8df32b0f78e12e4e4a0fee9713f9efbbbac9b4aeede0a7382823a86fef8effcec67
+EBUILD rq-1.0.ebuild 508 BLAKE2B cf52e0fc30b0d71248b0e8ab51fe67aa6c4e6f045039342b176ec1ad3bf1d74133c6b74772c70a68b32813e02956f14dbd8f63830f3b7f7ffdef88c6bad3d9d7 SHA512 04ca95083982f3bba4306a0b91cb5613d6beec12787bb0b78960fb0f72cd8b06e5e953872179f822aed884beacaba7f46a5d41932356884f279aac8dd4e7be00
 MISC metadata.xml 327 BLAKE2B d4518f6d7090440fec7e9518fbce9813be8c9e7bce9583bdf0c47b1ca456a078d23fea12f20febd4f4bad6d2e57109e5acf301bdf724c6cdb5346749a3e42989 SHA512 88bc51ba0079d132b0bf9b053e33262f5cae9c4a66f561d6c7303066f117e2196fbbfbce5b4cfe35c7f1cc5020b3818c365dab4dde696d5543dc70ca32d40ff1
diff --git a/dev-python/rq/rq-0.13.0.ebuild b/dev-python/rq/rq-0.13.0.ebuild
index e0b65c4fd2d5..a3a8698d29fd 100644
--- a/dev-python/rq/rq-0.13.0.ebuild
+++ b/dev-python/rq/rq-0.13.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="simple, lightweight library for creating and processing background jobs"
diff --git a/dev-python/rq/rq-1.0.ebuild b/dev-python/rq/rq-1.0.ebuild
index 41b1969f2d48..1bef41becc10 100644
--- a/dev-python/rq/rq-1.0.ebuild
+++ b/dev-python/rq/rq-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="simple, lightweight library for creating and processing background jobs"
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index 017314ec235d..662cff302cf8 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,6 +1,6 @@
 AUX rsa-3.2.3-CVE-2016-1494.patch 3843 BLAKE2B 94721282f4079aa0a77813dd8ad1c0aefd0924272d4e2b3e8a6ad745375bafb6b6fe5e50af621232df632a1f2261be097fde92b5ad3f57b74ff7976c22daa9bc SHA512 9150b25bc1a9dacc8eee0fb93d46b9d024c868d540097b9166be9a7879fe116d8fd47cacaaf5614b86cd44e7cd10602a0ad290eb2ef116539683101d4057a231
 DIST rsa-3.2.3.tar.gz 35628 BLAKE2B fa30e8212d0102b7763a5e8eb408d0778520d85d9428e12b603fdfa5982c559682c04fec2eac4723a8c9e06c9ed77365021a832c8ad96b07fa07eb93c5a626e2 SHA512 52b33e0278e6e1fed64b1cdebed29f7caa31fae733c2d5875e6cba5a045aaa829616799d8de84fdb63c546780dbdafcabf1f85f25930b8e663861151479ef7e2
 DIST rsa-3.4.2.tar.gz 40956 BLAKE2B 9a6353c84329303c655e7a25fcfa2ca42ea846c913fac0c26fee4a27bb85f9380de876b2ec07ae2212eb37efe5d2e401b2672f187f74bbeee1e9ef1099629e36 SHA512 62b0ff31fb3b9c18ae65bd102329e69726b853560576b1b66b9b89b26d3ff79154239af7e7a581b6a27c7017cc013f738762cd9662777ef594cc11c5b1f8e267
-EBUILD rsa-3.2.3-r1.ebuild 801 BLAKE2B be0dac2928252e7a5051328aeece688d4867f08ae70f8d01202a3b445841e76541326f6ec12a9485947f94f227c7d0e4fc852b45cb2a10a9279909bc63430f38 SHA512 f25181b1f5a4acb54ab79331749325e7d58c94c80646cd0b970c9a107208584a8ae66cb485043474367ded3d24dee65a947174c960d88dbdb1bc266100706eab
-EBUILD rsa-3.4.2.ebuild 758 BLAKE2B ae5e8dedbb694f3a710d7d1d6047a85b47218521d6fac97ed830dc24fe893af0e9111a8d721f2c0693c5c3f7a9e39de00fa802bf16a9d7293ebe37a78a0ae0e6 SHA512 ac003427bd142fc83b180f4af469af9e66e133a5dd30a95510b7330d78187c7ed371607b93352297f588b414eea17f80c17633fb40f8a2c6bf206a316133bc67
+EBUILD rsa-3.2.3-r1.ebuild 794 BLAKE2B 9076129ea18e833d5691ca19c1f262ebaf16c9c4263d10ccb7d104b7ffa5a6409c1790723dada3e4b1464ff27131b5f0ad4e9e16210a98e7a205899723e3c9b2 SHA512 ac63bfded4def96083974596977c746b8ca6e0850c1a75f31aa33f847800d5050f0341a345da9637bded982cfe9108f5ced8196bc5e160748ef64f3dfac1026e
+EBUILD rsa-3.4.2.ebuild 751 BLAKE2B e1d1638dfcbb4413852ccede514df4c4e85e4c92f3e0991ad2475adbe8ca349def3f3fccdb383b9c1ea84ccf6d9ac93edf7b82de0129adade25df8e978175a34 SHA512 ba43b750a99bab00faefada5819f7695f21a6f41b941a158757109a7e52304216c20ee625cc9b510e8ab5a84b60060b2cb0d57c2234530f07933f73d1859e686
 MISC metadata.xml 316 BLAKE2B fd1e4f7bdee45f5ab99e67cc3918634b9ac5ecfad75167aad5f2ee33cea308f99d8d03aab5b5e0c01e8c1bf41ca8a45f67146c5126f84af4b6d914f58af0ea38 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1
diff --git a/dev-python/rsa/rsa-3.2.3-r1.ebuild b/dev-python/rsa/rsa-3.2.3-r1.ebuild
index 7fd8e2da41a2..7527eb77a561 100644
--- a/dev-python/rsa/rsa-3.2.3-r1.ebuild
+++ b/dev-python/rsa/rsa-3.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rsa/rsa-3.4.2.ebuild b/dev-python/rsa/rsa-3.4.2.ebuild
index ba8945a9ad8f..43599947175f 100644
--- a/dev-python/rsa/rsa-3.4.2.ebuild
+++ b/dev-python/rsa/rsa-3.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 6f1a449c6ab9..a0ca9370042e 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,7 +1,7 @@
 DIST rst.linker-1.11.tar.gz 12569 BLAKE2B 5418f651322c28d8aff2dc735f8ff72325e895d8f2c12dae4985112112f74023c6103e344f4422e944b32b692713834ae5239bc4193edc76bfa85d9e0a674f4a SHA512 8e748330f60e2e1f859fa3ec3fad706d7bbafc78a402b0df242bda7caff1fad3f1b17873fa9ee749d3d214e094f24a35695c627cf9a8d8f08ca99ee6ad0e4e6d
 DIST rst.linker-1.9.tar.gz 7618 BLAKE2B b344495a217d7cd1c057256701130851975e46c45a740251ce20efa5131feb46a074fb1367a645e89b436b7e093baad1a484d06ca069ebc0f59eca8183ddd36d SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7
 DIST rst.linker-2.0.0.tar.gz 12861 BLAKE2B f52ddab3c8119f0bac64e294e4a5a3cc50916f19f49ca1ca4983d8b5d2bb5401c6accb5873df38609386e12fcd1cb02b867f3633edd4d10606a98936e96e62eb SHA512 ea9fa95de66c95dc384c888446512be66b180d0d76e99fe7a6b8f8348436d4be959d3d567fa521d9fc925b537467a4fdf05f9e9d17f7a6df4aafd6dfd323e4fc
-EBUILD rst-linker-1.11.ebuild 1512 BLAKE2B 691b5144a537af1ae6862f48e329185fea040ee6d453046110cae9dc01260e854bd676868532667e2576da45f60b78695b5bc799043d0ad715f5cf6bb0484856 SHA512 6993dd38ef9bebd0d50e1c39a404f3ab63bbe33b6f92684f8a2e1b1b4ae8a38e191da2bd61097759992c9af55781588847d4d9997af27016a097d06416e048ae
-EBUILD rst-linker-1.9-r1.ebuild 1399 BLAKE2B 8e494289a86a9af714e8a0c599eabd7edd27482a21f1769fd9c6fe4b1bf6d29ff78d2c0bb67ff952ff953ef42419a7896b27f560bd7302fcdf719b1ffde760ec SHA512 3dc5fc5c84312ccb249e6fc636e497565cee369ce9479564c55bda61e81835eee79165e370b76c287d0c2da9e7494f3b5b2d13c6acf5b039443c35d1e9b3cdf3
+EBUILD rst-linker-1.11.ebuild 1507 BLAKE2B 836c2cec916ea90336f2f29efd03615096ec083350992dc10ee9ef51f44b26d4d89aba15c0a62afe1c30d4c6f02a4c767f95c5d4cdded084c8210f71c5597ed2 SHA512 2d2f851ff616744505adcca7360d1a06b415b31883d4db4733d9419a9dd78f6f10ba48fa008df559e95e3dd2e8eeedecdf81b765ce879c45334a52d7b18b088d
+EBUILD rst-linker-1.9-r1.ebuild 1392 BLAKE2B 93a7299bf9e555d90e5259deb63c2512d91ec35fb65f0b010b0b24d75c586c9950b98f27ef3a247e9e568dd2877b37a8f2a29de1c01d86d9cacc4e927b70fb90 SHA512 0ed604d076a9a14fefe7eb681ad1dbaca08c462d05a8e76d22dcd0858b16b10bb8b0b03424cddb701e9bf88aedc8d9bb70ae5e50a0791cc98913b1b301ab414b
 EBUILD rst-linker-2.0.0.ebuild 1349 BLAKE2B 3b99c6d0150b92e2dcf07fa334c9c0366254004734ccac2f4fe362b12a4bff57e4f4975770f4d5a7ec3300d307f8fa7d11023badcbe2769c0aaed09b7e06cef5 SHA512 558fe27f0b6ac95bab6fb10d3824761aa40f3a3f276f594a3482c742b87e28c292ca91a0e7e772f50cfd8be09b394b6be229f0a56432439bc64f377eddbc060f
 MISC metadata.xml 440 BLAKE2B 01a949c99d2843942dd04dc1e3834552dd8b289a776d66acc4247c33064dd7a5c0591504a0c347558788642719fa78db8b95b5c5c06f12f5eb223df8f2343fd9 SHA512 6adc5406eeaf65eaa92644a56006d29909ef2e3cbf41753968d3efab6364a7d41bc98d9f03ed59a1f4c6ee8d2f6b4c75fa02103d04d4e9f065764fec6c0dd9b5
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
index a590722d60c0..2859cd77e70f 100644
--- a/dev-python/rst-linker/rst-linker-1.11.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
index 11d52d1516bd..31da635e50f3 100644
--- a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rtimulib/Manifest b/dev-python/rtimulib/Manifest
index 280f05145eda..d3f20c312337 100644
--- a/dev-python/rtimulib/Manifest
+++ b/dev-python/rtimulib/Manifest
@@ -1,3 +1,3 @@
 DIST RTIMULib-7.2.1.tar.gz 915114 BLAKE2B 5d8a54d4b1083105c1bb3b854e8474cb81cfd5eff843422e2f66f363ae04dd9e87d4cffc8f26c2a68c4f535d77ca229bc7bb7840c59ba3c6d2d45d5ee7f31987 SHA512 2a9d40f5c4db7c875fe82bd79408d97f9b00a3cd0d1be9b19baa3808b4cd260200b8ce5f5d9a6298df760aaca10555eb317d4a2431cd1c07a1b7953448852b23
-EBUILD rtimulib-7.2.1-r1.ebuild 569 BLAKE2B e6bc42272cafd9a8a3a19a7ed18e4b914c46de30be5c5edb0ebbe435215ebd06f68ce2dcbce09d140702e781e749fc086557733bc84892727482be2dbe49ed0d SHA512 228b55c70ed6ed5f10ab9d887440d69e4a68c5d04d11d3fe959e803b6a80a26dae6bbc8c5ce106bd818e208840121806347b82049b6b61cd45fd39bebdcfd347
+EBUILD rtimulib-7.2.1-r1.ebuild 548 BLAKE2B bb0c3489791b749989031c2768525366aba21d451e7d17e43d78c036bab79ce2ff2457e16d18a2ef7ad3779bf24d60a328c6bc03f72178d8dc92f249434c6a04 SHA512 71f33e276f05214783d7ca2e8f3b575c1d2dfe0a07130ca0075dd2bbc5f8c0b20bae76f89afec085ac290adbe7225bc3293156fe5d94550e239b812c4cb24fa3
 MISC metadata.xml 729 BLAKE2B ae7173f56cfccb78e8fdd6e193e1e49c67ceff9b0c09d2acef7b39a72c0301a9606769519001d5f5d54c931333644af9933f23af16b7dc274db4e17aa2ef706d SHA512 c4463d749d453f4ca85bac17309b9948912dc5fd67824e71cfba6ba1b1a6519e39c8bcd8d1c8a86fca6348b18d60d8431497a906caf187f16564e657cb57833c
diff --git a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
index 496e2e73de59..a123feeb7cf2 100644
--- a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
+++ b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+DISTUTILS_USE_SETUPTOOLS="no"
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -18,6 +19,4 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 S="${WORKDIR}/${MY_P}/Linux/python"
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index 2519ab0816b3..ae2a3b1b354d 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,9 +1,4 @@
 AUX target.service 330 BLAKE2B 81d01885925feeef2a1fe9214b520d0d4035b971fea22f4efcbe295a7316568cc6b6e152aa53a7e7defa602e55df61c3a06f3c028ef20301bb0032a4c919a43a SHA512 3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5
-DIST rtslib-fb-2.1.62.tar.gz 64481 BLAKE2B 121da0560decc4297e1b695038dddd83cb876bcb0c7523b60119d74922cb10b0389fb6d9246a86b79dcf9b6dc55e263834adbc107146a0e96fdf7eca0dd2a0f3 SHA512 12202f828234aaaa3a4e86ac45a2e3771baa76406d57496765c4789bae00f7043f0105c71f1f5501a37eff8004788a41dbb788532f93ebee2ab79b3e5eb00c76
-DIST rtslib-fb-2.1.66.tar.gz 67612 BLAKE2B ebfddc235ae2492f6e9f44cff4c80f767fb5fae34833ae0027cc0fc0fc32df49393d55e553ad326e64a53280108256374f486f10cf22db3ca8834f382b5a2cca SHA512 36feb8614edda50fe91b9c9db18fd3d73c8f7c8e0cfb9d397f5b928dcd6683586b0a8a6e446d56a551d04a7d27243ab13d7ccb51fd906bf4e8ffba7cb8fa4bb6
 DIST rtslib-fb-2.1.69.tar.gz 69825 BLAKE2B d5bc7a526495922e9c00f81d11f5436b77a917aa1c29450a54a4099fc7b97f9b3c3b8d623158bd02f8c1080e5b646c5f67f673496b1bd5bef5aa664df43eeb74 SHA512 8ff956c8b593a1d0a79a9a527502ddd1422bc27f272bfa708d145a66779de1af65adb20d822bee59c5b60282fb16f15429c10477d3523c04b215f963ec850073
-EBUILD rtslib-fb-2.1.62.ebuild 603 BLAKE2B 5d6105a09aaac61200ae008cc683dda2d28661082beef081fb936e33b667fd9cd47e93609176dfe6c9dac2c672a92efaa81e996c2a6925bc5b763e8d736837f3 SHA512 393c11607161fb1d4e63fb345c736fd9688aaabc21c68e1b56762b28cff022e06ccb5ee1b9ae20cfc8b2245fa011fbea1669a8a80270da80bcc415cfd4763a39
-EBUILD rtslib-fb-2.1.66-r1.ebuild 613 BLAKE2B 42da9aff9404c1b3ae1b48fefd61d9d66c543c75e30cfe121a383e286b338d175993877a8f4a31957fbebe3868af0aeab5c3a074ab4b56faad68bd113d77cd64 SHA512 3999bac218ef47173311cb3ae7804a74f329e39fb1b1a3c5d6fae55d497168a39b0965ded2cbc997db0793ae68cab5e73ac1b8a0e9016a00e8920502447a0feb
-EBUILD rtslib-fb-2.1.66.ebuild 603 BLAKE2B 5d6105a09aaac61200ae008cc683dda2d28661082beef081fb936e33b667fd9cd47e93609176dfe6c9dac2c672a92efaa81e996c2a6925bc5b763e8d736837f3 SHA512 393c11607161fb1d4e63fb345c736fd9688aaabc21c68e1b56762b28cff022e06ccb5ee1b9ae20cfc8b2245fa011fbea1669a8a80270da80bcc415cfd4763a39
-EBUILD rtslib-fb-2.1.69.ebuild 687 BLAKE2B 728967c3f3892180e7a6ad85a38692abd6ac24d1fc9f109092d8b47e4ec8bb885d3aabd07394385c56e043f7e45bddfa8423c7624f0e35b38f98749231df1213 SHA512 9d7c7ada67af15ba0bb2040676f9e2b49d867ce53fb13f59af599728297cb9dcafc72fc986f70780108ba74286b9994b92cc564fcebf1e9a6a181dc153e50c45
+EBUILD rtslib-fb-2.1.69.ebuild 675 BLAKE2B 74e94a2ed8e30b842a86c896f0c60520a620bfa74c2e78520ab918e4cb0fbdb590f75b60acfc1a17c4b3cb735f8b029ab4eca6490d48cf784407d436f9854667 SHA512 a2490189809ff5ecbb573503d3725bd4f525b34ac1d921fc6d0ca5484c83b7ed9a4868f549ad283cf6512761b2e5e89d2343f1e2daffc0b9ad7225d16219bfda
 MISC metadata.xml 827 BLAKE2B 488d8f9e2e3cdbf10224b0312e83fa23887952e960b6aa8ff95780acbbd9ef96175aa51bbd14e934af300903cecdcc50795c6078d210e833b5db9654bd5f217c SHA512 2082be66a05829bef801444b95306dbfe427e11f3f3f64049c1e96207f62603708c503bae6c92ababb371e640a2c0a071bd07bf37e69d341926d5654c6b8337f
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild
deleted file mode 100644
index d27a78deffe5..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/rtslib"
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.66-r1.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.66-r1.ebuild
deleted file mode 100644
index 8efdff785100..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.66-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/rtslib"
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild
deleted file mode 100644
index d27a78deffe5..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/rtslib"
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
index 7da9795dc0a0..09e04b963202 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 systemd
 
 DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index abab606ca6c4..2e397c7b8333 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,6 +1,6 @@
 DIST ruamel-std-pathlib-0.6.3.tar.gz 19520 BLAKE2B b403338cec80b38104f012c2b2626d473f12d557c2300d606462f2eb009bac72cec65b2f4e5a88192832a99dfc28573ea9ba8e7b73078ad8bac77136dd929040 SHA512 1210d8f7ae77c6358fc857c3ee447b2eb9802eaa31a210804acd74ec23dfd6ac9dec90dd7b21c79dcb4845dff4ad3614dd615c4798d3d7a39cc3a877cb9b63b0
 DIST ruamel-std-pathlib-0.6.4.tar.gz 20719 BLAKE2B 7189b10e61c941d2bba9bcbff3b61f2ad52849d78160b181721fef3bf3a9170aac823631e1743de98d1c132e38092a38781c9c8d0d213e4b94cc1e6051edb2b7 SHA512 591aec63c14c269d6b0838ae4867d58bd0642cf84cff841eda53a4d60f076ba68fdcb54d7e2932b248ee61feb773bf28b6309947886d350af34ed9f580c9d939
-EBUILD ruamel-std-pathlib-0.6.3.ebuild 873 BLAKE2B 9ba63f53385d49fc72d8bceb7df2de9338ee84f3ac64144072f70bd0e65345733ab9f7c4d720ac5d16afeb524e8ad6c50905ff670314338e8a931bbeabd3f472 SHA512 d97911501b951cb56a57a00f893eaf9c5d060035a6ffac0eb98fbbb3f6bd9306fe41be5ba604bedf169ecfbff8d0ab9c7fba6a7f55897b7f19e88c1e7edd0b4b
-EBUILD ruamel-std-pathlib-0.6.4-r1.ebuild 709 BLAKE2B a8d038cf509ce117de43f3be8b97cf9a337a8632ae94cc54b7df5744e312303fcc28712ae048427bdb1f145c50b19a0e3027026a3361515eb73fa30209f3db39 SHA512 dab05e7383582582f4a26d816b2ecf6cf39665149651ee46c4fb814365c5e4e8ecfa49e11247d7d5f20c3617d32b1850a75e2edb4b05bf34a5b312b625bb294b
-EBUILD ruamel-std-pathlib-0.6.4.ebuild 876 BLAKE2B fdb3053f62adcac5e1397873153e6df3442fd33fe0c7ac382822eb9fa2ffc7124ee3c0af03ce79d2aa967757a7102e115d8db1d9ab177c521ce8f4cb7ce7b437 SHA512 7045702e83f159d8709d94042898aa96562957e6c4a4995d8b85fdc8a296ebaa163d741527958693bfcf52993124dbfb5070b6fe02c19c7078a1f45f4b2b27da
+EBUILD ruamel-std-pathlib-0.6.3.ebuild 869 BLAKE2B 5531db32baab7a97a4d44def5a2054fda9ff87e97efd8469f36095aed44c63f07596c3be5eb3dae2d269ff2f871c1b124eebf5af6c62879324d77bb7997c71a5 SHA512 b1b9fb97f946f3b9a0c1f1c9aa4cdb99cddc54f96b8c3b3618b29de80e8341b91be5d10c81d868505a219c259f5bf7ea41d14c8e8f7222c2ae34161f25979f82
+EBUILD ruamel-std-pathlib-0.6.4-r1.ebuild 707 BLAKE2B c933d78af5e6ff6379351c4dd46b16b243be9235ccbf7c64c732e485e0888fcf50c52e4c484f8482979252f7f49e7348a8ed1800f8ae3f1aa7e8a2190a95f277 SHA512 d020a5b5f58b934e4f90bd0ab85aafa98c5c323dffbc6a513686c3db0203524a9a51ef58aaff7232062496758748121e8548b2db58d7d5c0d60740b6e83bc59e
+EBUILD ruamel-std-pathlib-0.6.4.ebuild 874 BLAKE2B 97f6e417710dc6c39031435473fb1857a26722297b37da3240bb1e0f8298f28a7901e5e0553188fe5e02c711a9ec1c64dfa73f425f527826b6106e158ea1f532 SHA512 2461756c42d459062f34baed44e49b9c7a8706a7f23c479ceb0af25f3d61cfaa28f234a1593917e8bea4351ce4530c651a1bab1afc4352bdc4c4912990a629ee
 MISC metadata.xml 501 BLAKE2B 2f6ee42e968d9135f317a1c6f9b2ed2b6949587ee0059c227a60b20b5e3ddac3aeac4d3f782ba5461c0efe64fd9729edc87e863f66d4e49439879334fc214d79 SHA512 52dd1e3a6cd36e1c24795584779030c5e2cde11717628bab030d53d9e6cfc70cfd36e0c0cfe2fd72281b706a14445eb30b8b10614d4b5a6a7c27c4e3fbb09dc7
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
index 212734f33457..35072d1bf874 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r1.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r1.ebuild
index b54c2d7e12d9..2a675524e689 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r1.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4.ebuild
index 7340d6159323..83d6c481d0f0 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index b83f5bfe6993..2717ba2c8da4 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,7 +1,7 @@
 DIST ruamel-yaml-0.15.35.tar.gz 344241 BLAKE2B 3e77f5da4e2a7f64099da1d79a108adfb093c5e47baaf11611462637ec6e29091924088e0ce261b21283a0ab07123da45a1ea7b0c522692d1e96cdcc27502541 SHA512 9e335d627db20b85ec0384f16d7ea03c310c01e84517e7b9bced1af9289fe542b87eb31da8ad960b17d26f35f2cc33a87a5a5b976e0e5ca587339b21b4b53fca
 DIST ruamel-yaml-0.15.96.tar.gz 399206 BLAKE2B e17f25d9501dad9fd17688b003d33fb0015b700f3c51d405710ccc0635263ced7a86140a3ed7a4aecaaf9e2e73f2eff17b99e96fbd9d9c1be3e9110c28758a62 SHA512 be76a03c46ce8826eda365791e212783243b64781318a998cc48c201bafb9af6b318e7544241fa10ce211e25bd6b26d3e57ef6a1fcb0c1be6dc4552c341e5492
 DIST ruamel-yaml-0.15.97.tar.gz 400728 BLAKE2B 04b957ba7739ceebcfc802d86252ace5bba8960cc75ff0bea00ef8ba25e945e80ef878a9699d1a8d1664ed8e39d23eb47542f2bf70e0628b1bd1904d80e8c034 SHA512 2c61609867147c3fd9fde77d03c589848765a068893197ae4aab4417933a7f54b46c4eb81e9359d116fd45a37f5e5e357ab3ea19d0b19455f2ab3c022a40349e
-EBUILD ruamel-yaml-0.15.35.ebuild 1113 BLAKE2B 5f54cf4049e6495ae13c07fcedfa02f9bc52ba4d3d4162e01bfeb3dcab3e609b2c9a18d7656686a5178ad4ecc61e2e81056eee23ebf695b54b3523fa517b9a74 SHA512 bb84986a848fa3c60ca559d387d962c99f791d68182f1dcc7f2c4da4940e9bb6d7d8fc3972ed4a95680b7058c7ef7b62c78118d71b9b40b45393a893df5052ac
-EBUILD ruamel-yaml-0.15.96.ebuild 1114 BLAKE2B 2e00b4d99397d151b50770d6800666547098f60e1bf8b6ddbacaafa73de01e9dce48b97dbae9834b2019d8a9f312abf1fcb8e6b17aaa8e0c4ceb3a660a935531 SHA512 d0ef20ccdfc9293e05a94864ddd1690a40ef9ae949a6cdfebdabb8b35e7f60d9790f59dc271c259a3e371b15e33e25926724972d589441e95a2ecd52485d5b8e
-EBUILD ruamel-yaml-0.15.97.ebuild 1076 BLAKE2B 789ac2209ed69f49cdd2218a5dc461131ed8e0fc28fa7791aba5f1bb0516bd77c14ca494545064810fde6260ae4af4116dd3fa1d76b18e31f0d0c26c85940ae3 SHA512 c9fe15fc25ef56f6f5f18945a514ff06176620bb7a39ff811d5e24f16c5f8afea3748238bf7bfcdb1011f92931c5f4c3fb708d8f7c6355f781b8f5bcc81cea2e
+EBUILD ruamel-yaml-0.15.35.ebuild 1109 BLAKE2B 1e949f71a37435a5e3e1f5919a3a0cf0a04b8b3b0cab7d7578aa9c6a65e21365b0e37998b531db98b7411c67b0058792c68bec7b43d3975236ac3ffd62335fd9 SHA512 4eb2233b1194f99b4a8a73f129402bfe2ac380b15582b99c0cb99010c3ad61d5b214ce1506589d2427757f9d3a817546d367e3820192203214eee1f33ff1de16
+EBUILD ruamel-yaml-0.15.96.ebuild 1110 BLAKE2B 4306d0c5b8320858bf2bfde7bbbec73e529f803c3fbbd21b28d4c2d91ed18892d4e5e169d1d8a3e5d84c76f745e436569035b9d71f1f7ff1c0798924a937f2ee SHA512 ca84d1072a0d0731d217769b8053a98cb837dba3bd27e82ab4a00202fe1802d81e8a8ac7ef78d59cf9959bfe7779296af0222a7fababd51a565628179cecaab9
+EBUILD ruamel-yaml-0.15.97.ebuild 1074 BLAKE2B 4ffa2a34a6c09066908e45cf1cd51482ae1a6eee5997672c6a346c76ca2ee00ba601bd3d97871611ebc2c691f18b1a2af286960d6777c05c6afa2c7dbe470861 SHA512 842e2638faa0bc596c313bf7f12826c0aacc3b0ce5bc5d58f4c481637d2f33022421961b6961a3395d0cfad815bb6decb0a5fa4f87b3073c77d3b8309af43248
 MISC metadata.xml 487 BLAKE2B 1f1117b83ab85b56b1277601cae14752525805739f74a8919e04395585fcf704b4dc4994c3bf090d02fa02315f88c5354139867d0a4cd637d4970caf586a56f1 SHA512 3dd5725605481094d184e1deb16bc9ac0551c4a197012f0e3e902535d2f294f69f7c40144dd858037d0057acfd8a2faedbf2cbf6e823789aa7682cf4274ec710
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
index beef8a3d2526..d4219db1524e 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild
index ae2feb5bec63..6355a44cf349 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.97.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.97.ebuild
index 9c18de145ac1..43e303aff944 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.15.97.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.15.97.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/ryu/Manifest b/dev-python/ryu/Manifest
index 2d5073ca3509..5aae982d372e 100644
--- a/dev-python/ryu/Manifest
+++ b/dev-python/ryu/Manifest
@@ -1,8 +1,4 @@
-DIST ryu-4.14.tar.gz 1492205 BLAKE2B 2a4135ebb68fdde9346fa1e6431a0581138bdc7ac62394b7143326e001bed2039daefd79eb7a6f27b32ee23c7eb10b995ad2441b6a67fcc13637512dc17f2f6a SHA512 e3fd7dc340c4b5cd191b8013bfcd8c0d6dd81489032dbb842fd1bd9f1adddddb715d8c8b92e59bf83fc4adeb7d36b9ee81bdb79caab1f4f10559e54f4da37c76
-DIST ryu-4.21.tar.gz 1513472 BLAKE2B 814db9cf5aff130c1b1cebb4eb2e3bcf2a868cb20a004fde9cf11c82869ac710834c8ea10d27c5bb542cce34145e5932148a10dbc69f20ec521dd1799bf21100 SHA512 03001eb2cf03e3b2051cb05a3be16b9c9c5f9c15e549bb7490f67216e62ecf21c229016c97546477298c4475866cf295bd706746ba7b5a47599ead2564dbcc5b
 DIST ryu-4.26.tar.gz 1518130 BLAKE2B bc6c03ad746b5b20f53c1b5ab8d9637efcdf92dec83eb2ea105898125b4887fdf03c478122b3d33ad099da4be8d51368c24875cfe0aa1aca58ca5b3f26255adc SHA512 a88c98904945270b8465b8daaa96c57e067e0091f7b300086f2ab8b07a7c024963382fc73c018fd15eac6c25a565125107e3ef4e79c2a5b49cf297c74511a260
-EBUILD ryu-4.14.ebuild 493 BLAKE2B 748c8ae1baa77b1d640233d0754acca498acff4ddcf1b0bdbca4c686856d3483e831d9f30aa53a9d7eba3edb238f858cbbc743c5996baeb1d5c3b433b0a0401c SHA512 621c8d9473ae1d60d87e34de03c1bb064fe03867c8a08c26e54d12708d44385f8224e4bf88b9a372b67d629e385281233d09036b04e2bfc4c0440e642e9df658
-EBUILD ryu-4.21.ebuild 497 BLAKE2B b8eb2d54084a43238ebfaa297bb1a7815aeb68df93fd4976840f0f8401d3d29ba4c10280547ecb873763b4923796f1e9b4776945d37e407623d460d3b6f386f3 SHA512 814ecc32673734e389cf2e77cc01ebb3bcbcd98f7e6708bc5c742fab6ec3a056097073b4240a8dc457f7dc39b376427595cab28b3e57b219a8f24cffb01de4a9
-EBUILD ryu-4.26-r1.ebuild 590 BLAKE2B 181e26bbf894d46ee10eb314f90812ddfae076ef6b20f27a6bfe654913c282fd06917879f6edd070ea2de12d3c91bfdb1c660356f7206c1bc6a3bd7c050da943 SHA512 07dfd0c714e7c16f1a7f2d5715785edf4b23e10f1e111cf845cfa191d394cedf524f1e7d0f717971492e0779cea9a6db910d81ad51524a8cdce3bc8cd0d699e8
-EBUILD ryu-4.26.ebuild 497 BLAKE2B b8eb2d54084a43238ebfaa297bb1a7815aeb68df93fd4976840f0f8401d3d29ba4c10280547ecb873763b4923796f1e9b4776945d37e407623d460d3b6f386f3 SHA512 814ecc32673734e389cf2e77cc01ebb3bcbcd98f7e6708bc5c742fab6ec3a056097073b4240a8dc457f7dc39b376427595cab28b3e57b219a8f24cffb01de4a9
+EBUILD ryu-4.26-r1.ebuild 588 BLAKE2B 200cb00a68dc10e25b521b80272f3804eeecec9f0a0178c9774686c8bcec2e786370d32c13d2e0c4514483958be21f3bb29e4eb4c0d22880dc018a7174e8df2e SHA512 64c0f0a3bd6d0e12d6cfd4106040f937211d7e9cbde0a50e9a286abfc49461c51d9e332f321978e1c91f3dec326abd49413a34cf34c4837b6e19d95aa6b311fa
+EBUILD ryu-4.26.ebuild 493 BLAKE2B 996660087cfe643dd656274b6d954e9b32c627ceeda7d3bc569c598f7e6c6bd0b3a64b8537c66ddacb62007f38c15e06ab327f01615372292eb306a99350ceb1 SHA512 0f5a04e0bad69ad136cf90f9bfbe373f532623aac767291d6ef5fec40b8fbd550b5e933a6770c100e5cc9a5552308f5b6dfdb90f0985073bf66625dd82a87314
 MISC metadata.xml 320 BLAKE2B 53cf3eb4dc8485edcfb30a28d51e9191a4c24a3770fe376e3df73534e0ebf7481b5eac783a3bf8d8ffcb6f963c5ec22ca49a568f66c983a6d619b8505d2289c2 SHA512 44ad18c381ba7c542ed25119d53ebc3ef8e6a2cc46cdd4bfdec51fa07d6250e9a59212e8ce3176f0f6b219726fd869b706f487ac86f5d3b8645ecb485ff68028
diff --git a/dev-python/ryu/ryu-4.14.ebuild b/dev-python/ryu/ryu-4.14.ebuild
deleted file mode 100644
index 80aee84b1e52..000000000000
--- a/dev-python/ryu/ryu-4.14.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Component-based Software-defined Networking Framework"
-HOMEPAGE="http://osrg.github.io/ryu/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/ryu/ryu-4.21.ebuild b/dev-python/ryu/ryu-4.21.ebuild
deleted file mode 100644
index 7e1c1297364e..000000000000
--- a/dev-python/ryu/ryu-4.21.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Component-based Software-defined Networking Framework"
-HOMEPAGE="http://osrg.github.io/ryu/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/ryu/ryu-4.26-r1.ebuild b/dev-python/ryu/ryu-4.26-r1.ebuild
index 33804a643bbc..06d5157312e8 100644
--- a/dev-python/ryu/ryu-4.26-r1.ebuild
+++ b/dev-python/ryu/ryu-4.26-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ryu/ryu-4.26.ebuild b/dev-python/ryu/ryu-4.26.ebuild
index 7e1c1297364e..4c1a9d06b507 100644
--- a/dev-python/ryu/ryu-4.26.ebuild
+++ b/dev-python/ryu/ryu-4.26.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
index 2df44224c468..67e75cdd1398 100644
--- a/dev-python/s3fs/Manifest
+++ b/dev-python/s3fs/Manifest
@@ -1,5 +1,5 @@
 DIST s3fs-0.1.2.tar.gz 24574 BLAKE2B 2b62202d8ceec078ca93c6da895a81648c83e0fbd764dbcf4cb1a0ce2c2a8a7cd16a3cc5162d095ec1272b52c9da743d8c8d21f5b351e6a4f3d63cbd77d9b43c SHA512 52be23ccb2dd8c63675287895d00fda94adf010ac878ca12e5c8eefa25c7076c000b53bb4d2bb7886550cdd0d226cdf51aeee12f2ad7bac46537f190ba72ec2f
 DIST s3fs-0.1.5.tar.gz 27215 BLAKE2B 84f059eafe14a4faf8945c355763d31a49f38c3ae6cb05170dbff0e7ad435f9ea79617fc538d237b565d20a0b11603ea44d9e71339fd40c1ad16ad0af903bbd5 SHA512 5285da6d82de1e68c4cb0fad5a93eeb59fdffba663691d79cafd1b428b60e17fa21e0ff3a50df701cad7f351017cdc538954b0516782e5ddcf6c3d5910f71144
-EBUILD s3fs-0.1.2.ebuild 664 BLAKE2B bfa4ca68e6b1fe3104dc3c332f4f68d1d923d3996c343ebf4ce7d84124877a3e75fd9792b7231f3de5cf86041bf16a93f042e35b03b79ffaa16a5990a336bb04 SHA512 ef32130a49d2bf7fa719cbcbb3d9b7772a22f14cc3be315580e5218b77e1573cb0a75f2f6b8e4e8bfc1aa200c7b4a098922146abc5170d69f9e4d6fc6a4ac346
-EBUILD s3fs-0.1.5.ebuild 667 BLAKE2B 853a962634faf3ff500255001c0762f4d871bae6211e2f174656906e24bbab123e7900d12534f48a74cdadcfff42af09dfc6f23ef90bb03cba12b5209425ce6a SHA512 09dbbf682d484355c2c81fdb3e91770dee0d4c6030c846abe0d0fd137c38bde026dfcbee6af162a53ee12e19c6b4e675abcd60f5feb6e577a0fcc9e3ede3cf47
+EBUILD s3fs-0.1.2.ebuild 660 BLAKE2B aded55328b77e679c03423bcb5a14fb142645930765e530dacdc2d998c40aa388bfd4b40f2ecc2c4515f3ab50f0216eba92bf2da73600e3d30fba3f9fdb1a000 SHA512 8860fee364f06e7d21322d3d8bb78e036585523c77c7e9413c93489d0ca994f4010ee4ee1d9f8582c98d686e4169a946ead1f17f6433afe51ef7db5bd2d403b3
+EBUILD s3fs-0.1.5.ebuild 663 BLAKE2B cb959efdb66d326034fd7d9782e200ad25cdb1e3874aad03123564a53ded91788c5d452b9b37660c7eebf6ab0a0035e80fd7eb7bcc989c624da04e05ba3b2e17 SHA512 dd07798346f19c0cd4267438e108ce3cc50e96d35fcf76a849f10dee70459bac3f1ad37392e51d6d421f20272620f98d6519fb57b02f67477d3dd87a155a790f
 MISC metadata.xml 519 BLAKE2B c4ab17bb17c687ac00bf13ae441685f6484334dc588f65138dc616f7cd8a49debe0eac5ec11c2d7485eb48855238ffcb25612d687b75ca52d58a921b311e455d SHA512 f8c6696ea3f62243be9f39ea56dafe0bdf137b49aaa3ac2bd793301c043645d2ce63c6cd7cc1a476a8f554317ce518f501ce0775f89f8bebb66e3d3d806f4926
diff --git a/dev-python/s3fs/s3fs-0.1.2.ebuild b/dev-python/s3fs/s3fs-0.1.2.ebuild
index 4ff765562de6..26601563c46b 100644
--- a/dev-python/s3fs/s3fs-0.1.2.ebuild
+++ b/dev-python/s3fs/s3fs-0.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/s3fs/s3fs-0.1.5.ebuild b/dev-python/s3fs/s3fs-0.1.5.ebuild
index ef6a5239c888..379772cc916d 100644
--- a/dev-python/s3fs/s3fs-0.1.5.ebuild
+++ b/dev-python/s3fs/s3fs-0.1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index da7af332e282..310399ee7814 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -2,7 +2,7 @@ AUX s3transfer-0.1.13-tests.patch 753 BLAKE2B 7b168d35c9287eade9b9e1ca0393c625f7
 DIST s3transfer-0.1.13.tar.gz 103335 BLAKE2B bbc6e76647a9b531f0ef70912ddd17a186a5bbe4ecc9ed21de4674cdc20d39150be3212065bcdf6145c0721644c59d157fd528b79039bb091d750f28085bb476 SHA512 90aca5cacefa19cb8cb21b7b82c5f3383bc0478503557de9c2277db2f39d98f6e11ad74bf56ec84a1fc8c4a920337b0bcb34bfcf509a49f347144b7f13afb37c
 DIST s3transfer-0.2.0.tar.gz 118361 BLAKE2B 0cb0a29e6dfa82762084396db1950a9e1baf4de1d9c8b9f0db3dbf1e274636f60a89ceb959d55cc22fe41c4ce175ab53f414c5c44f08624cc43f0d289f768863 SHA512 2e37a13da67cdabb49deeb177fd9f8d6393128e757e6c9bd93c99eb95a3edbd14736025e284f3173e8247d23239abae3700d894ba0d138f970ceaff748aa6e9e
 DIST s3transfer-0.2.1.tar.gz 119635 BLAKE2B f8978afb2ca367238392974dc98c0a2547cf95c42f0dcce627694dda5d34ff07c92db1b838ea4cbb111db921ac9f0ab2bee81eeca99827d0731cf77ea111d70e SHA512 1494436fa74ba6eee26e96fb0d448062acddf4c4179e56baaa47d62785218d9e91c5fb50b6641e488d0c84cbaab53bd552b4277bb873cd170904074e6509b0e9
-EBUILD s3transfer-0.1.13-r1.ebuild 971 BLAKE2B 52816870ba95182dd2526c19d5bfd02130357f1486a35bd69e4be84a7576ccbfe420a59d4b5b09818e5e65edc28bcd202b96ff367e95ca44404a0f7c028474b8 SHA512 d2982bb893186605941623a47115fb588eacb73f50c97e0b8a5e1feb99805dde556e1af0ab398dbe7ed7829c284bcc6808e862c0ddd7a7615cfca589ba020a19
-EBUILD s3transfer-0.2.0.ebuild 915 BLAKE2B 26c1d21b5f3642291bc568d7c60868ff7166e982aee9d3403ff3bb7374044320e1f5d0298e7a067bb7458a7d622b39ec5451068eaeb96d0344e92e9dd24d1ff6 SHA512 85147153b1b3e6ebaa80ef47d23b2cc462f29110ffb8a22035eddda62937d7092f10a7479994c6dcc76cbb10d4096e7c108ce8b8597ba45843e323399eee5a12
-EBUILD s3transfer-0.2.1.ebuild 917 BLAKE2B cb3cdcfbb8215a02e9352fcbad7ae5aa5d4be737ad50961c36572e37492f38bd4adcaf02266fa29826aff9634856e100ebd1d9da82552feb5f97d353ffd6a797 SHA512 fd27f815abd8f15646fa60c217c5f0abdbe9f73ecaa62d02067b814fee939d9e4391ec60db56a44dcbb05875816b4c597473279224494bb1f84adcf9fca99a0c
+EBUILD s3transfer-0.1.13-r1.ebuild 961 BLAKE2B bbb17004346e4a32e2991202038059ebb77e85487655110829fd572a8cb812d8d0d694082394ea4021dd9d0e9591c443367a2ceb2eebdd4e14f146beedf21e26 SHA512 e11703abd6191d9fbeac0baa62a4733ebcbd4a532703bc86f0c088bee2636b157c15a724bb97066e52f84108956a14760bcd9c57f0c6beedd1dab17b9dba3da4
+EBUILD s3transfer-0.2.0.ebuild 905 BLAKE2B 0534a7e6a9cfea8a1d7a57c8f57becccf390b19acd0b8b63abf98b066f1fc0c0e080ffe547510a53cac5c862962de85c1ed6e239e8cdf2f8248e386bf70eabc2 SHA512 f8ad66c4eff56167e14811384f8a6464c59360c9703b906d250fc9b31a817836475f1df0ef75a833ff9ba8ae3036161d7482fb6383ae355b06d3fcdda39e8ec2
+EBUILD s3transfer-0.2.1.ebuild 907 BLAKE2B b3798be9de3ed367a0062307dab68df9fc307ab6f2fa95b7c8497e60b05bbeb0b0f86e5efbf452fbb3230723687da3de322e335aae1b14a2cf69182a3965754d SHA512 408d5d9ab839dda6f51a3be15f6bfdaff44d27c7efc3da0b65d1197dcabaabf14800bb07f2647d3aefe42072af9c403859399b3c02afcbc6b4fe457331e0abcf
 MISC metadata.xml 379 BLAKE2B 71ab13315921746f0b71ac09c3f7a5e4e182e4efc0dda7f0e9cd6fe2948f52eddde9b9fe7c117ced64f4e3f6646a2d15a1fd3630ab814b067a10dadd11448def SHA512 452e566006f5a6ec91765cdeb4fe75edbf890f3a8e495bca7d1db859a882109eecb252dca18f1d1e4dc970c62c7810b5e51cf1b5ab61553c76d4dc04e38bc5ee
diff --git a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild b/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
index 1416953e14ce..4d559303f474 100644
--- a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="An Amazon S3 Transfer Manager"
diff --git a/dev-python/s3transfer/s3transfer-0.2.0.ebuild b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
index ded47b3ba007..6e6dec8bf7da 100644
--- a/dev-python/s3transfer/s3transfer-0.2.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="An Amazon S3 Transfer Manager"
diff --git a/dev-python/s3transfer/s3transfer-0.2.1.ebuild b/dev-python/s3transfer/s3transfer-0.2.1.ebuild
index 38bf130d07c8..91f0527fc86d 100644
--- a/dev-python/s3transfer/s3transfer-0.2.1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="An Amazon S3 Transfer Manager"
diff --git a/dev-python/sampy/Manifest b/dev-python/sampy/Manifest
deleted file mode 100644
index 490b9dc2ad66..000000000000
--- a/dev-python/sampy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sampy-1.2.1.tar.gz 63520 BLAKE2B 40091c22b2b3cb6f3a0836c062725ca1e40a6c1e1fed0b6f9443fc79f1de88dcb9f22337896213f3890eba4c92bc7ff5533af32491095ed624a9910681460363 SHA512 a531d797b1ce3539a78cdb6ea9b943adad1537ce4e151925b9ed44513fcff1de625026e2d23abc39cd326f69cf71849124395c3cc874c603ecc60ab14e188d13
-EBUILD sampy-1.2.1.ebuild 460 BLAKE2B 7013c47de636d36139440851d7be8a35345d1f5e97145143291475e57d382fd45d0d36bcb70737be019bdf431d802f50e828b9862efcac36a1ae38febe6d44b2 SHA512 d141621bcb46f6662032f74f7e11d729f8a4685a51367dae0433c1d74568acf65874968d80eca3667b0eb14bd0200e4291ef2fd46732ef081c0df1e58d7ad822
-MISC metadata.xml 537 BLAKE2B 9f6fd3923d316c0a13200770e2c7baee95d09fbfdb64a721f70432d20c6f8e2d2a60c62522201fb112366a8c92740c506a2f62f568b1066a9180d4e378b2cf19 SHA512 be34835ecfdc10e52648e3c0ce500d5d6341266b16ca8accc12f60832186f39a5ada1ca711645f52eb4c53daf8e1ccfef7eda9191aa4489ee9156311446683cd
diff --git a/dev-python/sampy/metadata.xml b/dev-python/sampy/metadata.xml
deleted file mode 100644
index 8b8a18adc9e4..000000000000
--- a/dev-python/sampy/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>sci-astronomy@gentoo.org</email>
-  <name>Gentoo Astronomy Project</name>
-</maintainer>
-<longdescription lang="en">
-  SAMPy is a Python implementation of the Internation Virtual
-  Astronomy Organiztion of the Simple Application
-  Messaging Protocol (with Web Profile support).
-</longdescription>
-<upstream>
-  <remote-id type="pypi">sampy</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-python/sampy/sampy-1.2.1.ebuild b/dev-python/sampy/sampy-1.2.1.ebuild
deleted file mode 100644
index 2658fc8b64a2..000000000000
--- a/dev-python/sampy/sampy-1.2.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Simple Application Messaging Protocol messaging system implementation in Python"
-HOMEPAGE="http://packages.python.org/sampy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/sancho/Manifest b/dev-python/sancho/Manifest
deleted file mode 100644
index 1d82060cc0a9..000000000000
--- a/dev-python/sancho/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Sancho-2.4.tar.gz 7962 BLAKE2B 10e57286834276c6ca37638f4e550d676f5a31f2fa7fb567dfcceb492111c92ffa5aa313886f1d0803048f612aad905f0fd4ebcbcb41838942af083ea1dec2c7 SHA512 49230ee8a05dbc5bf3d7b3900504f47a3a47f013878e75f93c277610e4d22f9714b9a58a41a779e25b0ddb9c24ff351508c0b72c78fe146b8371024345629e21
-EBUILD sancho-2.4-r1.ebuild 1078 BLAKE2B ccf4104ab78a38dba0a064c442123a5c2697977003d14bae6c1d4b1c4c0a697fc4ae746f8d6f4a1d6eac067bc9173f1c8d8a630bd5f7cbdac295ddf9168459ba SHA512 60e44923fee2028ce42616e6959c785fa2aebf1bf196b60ba2f0f66175cab2ea885afc79192f9332a4e8043f84cf57643c9daf79c7f8cbf627ada6e5561dd8c4
-MISC metadata.xml 312 BLAKE2B 99dcf5669889a8657e61ef5d89d2f7a34b29d4b5454f078537085e8a44456a2d26a0d8407ea66a796ba76c36d21f64d9e1ac85a6076abfbe9ceefc6d40a70479 SHA512 088e74f48915eaf8bab9d7a17ba2f4ffa4696b6c93ec291c13406f48665b344dae925cc46468c9d99523eaa848c0aa6fef54bf6a7bee752f4fadbe149bcda59f
diff --git a/dev-python/sancho/metadata.xml b/dev-python/sancho/metadata.xml
deleted file mode 100644
index 9cbbcb5053ac..000000000000
--- a/dev-python/sancho/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/sancho/sancho-2.4-r1.ebuild b/dev-python/sancho/sancho-2.4-r1.ebuild
deleted file mode 100644
index 38d99a97417d..000000000000
--- a/dev-python/sancho/sancho-2.4-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="Sancho-${PV}"
-
-DESCRIPTION="Sancho is a unit testing framework"
-HOMEPAGE="https://www.mems-exchange.org/software/sancho/"
-SRC_URI="https://www.mems-exchange.org/software/files/${PN}/${MY_P}.tar.gz"
-
-LICENSE="CNRI"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	cd test
-	local test test_failure test_failure_count=0
-	for test in *.py; do
-		test_failure="0"
-		ebegin "Testing ${test}"
-		"${PYTHON}" "${test}" > "${test}.output"
-		grep -Eqv "^${test}: .*:$" "${test}.output" && test_failure="1"
-		eend "${test_failure}"
-		if [[ "${test_failure}" == "1" ]]; then
-			((test_failure_count++))
-			eerror "Failure output for ${test}"
-			cat "${test}.output"
-		fi
-	done
-	if [[ "${test_failure_count}" -gt "0" ]]; then
-		die "${test_failure_count} tests failed"
-	fi
-}
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index c29ecc99b1f1..401f249adfbf 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,4 +1,4 @@
 DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
-EBUILD scandir-1.10.0-r1.ebuild 693 BLAKE2B 59d7268f8aab38c923329eb8dacf52c0cfa9493f673100defe5a910711cb6a94cd725118628532d7e9e1c8e4c0b28afdde857c2dd26f581c5ee19876a126b8ec SHA512 8231081e720807bdee19602683f22730b3043f30578ffd252106edb46d89c64ec00320ee7cc5123ac37736ea65b54d56383b521dfd12db554d02d1cb18604183
-EBUILD scandir-1.10.0.ebuild 676 BLAKE2B 7d7d297c8b93bbd53b1af80d64dd61af8adf99dc2bc19e155874a6d0cd65d057c6091ea262445cb0118e329a6cbd71005637793e23508b76926229d5fca0a27a SHA512 d587a54562fd0dc0f66ae6b8b76dbd19d6ef4d481807812666a8fa5aa2a98cefa1ce44ed168b725f53464d82a3f7b0763631f26a4a5492a20ac9e77e8bd77f6f
+EBUILD scandir-1.10.0-r1.ebuild 686 BLAKE2B d07e95bddd29e9ee488a981cfbeb57e32b2632ca43aa6bdc5dba34a5bcbb8e2c6d6e00e0ca447f146f12247b31e14fd0affb8139d633cb45e40e6472df4e3094 SHA512 a124d6449ba708d80a35238e52a1decc1610c0d650514e94665f65ebb3f6f473ed621ae2c9e570e26764a6de96bebd8f93a901e6c34967c4ccbb4cfb0776e834
+EBUILD scandir-1.10.0.ebuild 667 BLAKE2B b96214368368b92f5fe3b83bb52f7ee05cf77ec2400357a70e6b322ff5189a237a5c1e75968837f23833cdc1007ab5fe6ab813db6c766145cccee05f5f6c7aad SHA512 ac2c550d988c96fbd5d5dd932619dde5101e4088d36da86f22cd93a4ca2ffce9c8493c39a5b94a815f09db866550a15bb99b1f9c784e215028c59ae0b13e4b53
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.10.0-r1.ebuild b/dev-python/scandir/scandir-1.10.0-r1.ebuild
index fcda1e7fad72..14571d8a40ea 100644
--- a/dev-python/scandir/scandir-1.10.0-r1.ebuild
+++ b/dev-python/scandir/scandir-1.10.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/scandir/scandir-1.10.0.ebuild b/dev-python/scandir/scandir-1.10.0.ebuild
index 1b4f2b7430b0..764b48c5ec39 100644
--- a/dev-python/scandir/scandir-1.10.0.ebuild
+++ b/dev-python/scandir/scandir-1.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/scapy-python3/Manifest b/dev-python/scapy-python3/Manifest
index 406a79475060..4c0acdb69443 100644
--- a/dev-python/scapy-python3/Manifest
+++ b/dev-python/scapy-python3/Manifest
@@ -1,3 +1,3 @@
 DIST scapy-python3-0.23.tar.gz 2196173 BLAKE2B 32a3b48c83a2e2a4262f47307bde02c272106f863bb52e362dc0e1a23ef2095426a7cdfe7ae53bc6ff980ef08277857a3e877777a6222d89a26812fd69b030b1 SHA512 9cb214a46f6f8b90c10afb903600472e389c30840e6e42c876cb035d18fe13f2affb2914263a668e802ac55727e7651e8dcc1c0ed753a92cd234488158a9ff60
-EBUILD scapy-python3-0.23.ebuild 517 BLAKE2B 21c8c8e47c1ee8d3bc8286ec145c1686c8594f937c9eb8f5b7d4d34b93474ebc62d9b504b8758470a60eb31be5f1b7aa1fdfb2f21e1bdb19332771ac786f1e1e SHA512 fb3fc542b462d18e57d98ffdba333e570a8877fd006ccd175e9219286eef3f5435a7600854f6e8f431509d31d812c6f4aeea88eef048cbdbcfecc6fa48207dd0
+EBUILD scapy-python3-0.23.ebuild 513 BLAKE2B 312cdef5938abf91b27487240c3d8363cdc01eb8f396801c4da75a3dcbee5feca201564d2b3385faaad129772717efc556d51fbd9eb40ef0720cc6786b25b0e6 SHA512 6f27a210a72a47c34a7b24422bd44f31443457fe6055350d1c678582d19844818e8eea6ba67c0f17c497f42d2fbf4494b5c515e9b243c3a76f15c46913b6f24b
 MISC metadata.xml 337 BLAKE2B 1204e18d13e75e84fb042ccc42351c4a9f73df82a47ae54dbff341f71390353ba5fd52265db2a444bd2347162e8947b5df32239874a0802b655c437521bcba4e SHA512 f1db650a75e270880cb99040ed60756d8f72abc487289f2e4eb88fad0b5bb40047eef1f4da5eddcbf3086aa9ac0dcd03a79699507e027865ab4e3d06f12d1d04
diff --git a/dev-python/scapy-python3/scapy-python3-0.23.ebuild b/dev-python/scapy-python3/scapy-python3-0.23.ebuild
index 0648689c4c71..63da26d36808 100644
--- a/dev-python/scapy-python3/scapy-python3-0.23.ebuild
+++ b/dev-python/scapy-python3/scapy-python3-0.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/schedule/Manifest b/dev-python/schedule/Manifest
index ebae8f51091f..340cbbca61e2 100644
--- a/dev-python/schedule/Manifest
+++ b/dev-python/schedule/Manifest
@@ -1,5 +1,5 @@
 DIST schedule-0.4.2.tar.gz 10104 BLAKE2B 84089e7dde29587f4044097b85ddf4b9e3639c59c63da2268d6e2c94e94192271a6d0d65c385c9492cefac49d7abee681ebb0f56ff78965b67402306124ede40 SHA512 f088f82a0449350658028b2035c5fbc71bda4d019856fe6ab3363798e9d8d940cce603be544401ecf5f844606e5891ab560c390f5c334a825bf611e6ebfb00ac
 DIST schedule-0.5.0.tar.gz 10850 BLAKE2B b79ceb77d0149cccad4bd12c6fe8f3524a33898039319c411bf202928316d74586626d84e6921595d0c0a79f87115cbc27beb03919c4252b8468dcddf469c95a SHA512 0d89afa3c9d986c53a8c61a92bfda08e23290c6556100d63f2c647003806398b8913c4bfa75a57617aeeda73f8f2eb26490c224ab70d621873453ca5dec35b0b
-EBUILD schedule-0.4.2.ebuild 570 BLAKE2B 4be8b5807542404a90013ead40db7c30c95f4a9e2319c05cd40bef5f4c5272e78d8bdd7e0a6c95441cae5d4d37b70958389baede27a0b240bc63a7731ccde8b4 SHA512 011a96dfe5b983e383c9697f4bb039e7e2e6435b385a77f7531cfec02172d24ff7e5cc42f993a8ead2e1811c76033471c637a43c88b03b9751fe848645c870dd
-EBUILD schedule-0.5.0.ebuild 572 BLAKE2B 9818e43b90d23fd4c97cd34d2f105de86c2af713af7ed105c1dcbc92ed853afa6a71544afa634fe36622452f59d82671d07d11c22b1fdc41e4d916f59594c0d7 SHA512 a0409af01ab16ba3f593dceb6c67b90bb161687d06f6841bd40e1d409c746e6cf52789eb0e617fe51fb660e98e5598edfced72ef89b931b13cc4f187c42c5796
+EBUILD schedule-0.4.2.ebuild 554 BLAKE2B 83deac8f446712b4e3041384a62a6835523cec4c1a5e712104b6231b6e08a2c2ff0c90a620180c8272fa28f6574605fd7f6af97bdf104ee9f08b164202cbbb62 SHA512 52d2b0b072c25aa963cfbd7995d3f8dfba1508cf8bc3958f63bc885edbe319170007a3bf627bf6e7f60eb48198fc2c590e9ff30d8bde113f987544a2d612e96c
+EBUILD schedule-0.5.0.ebuild 556 BLAKE2B ee612ee404d94da4037e171b1696f2316e7af59af0bb51a09d7d66b744896465dee0cf58aa3b34cbc1368ff8b91fac9f2b286a6a177525052196bd511d47f9b8 SHA512 8be5dfce0a5e604a83d4e61cbffc4017f4363d2d83289fb167aa41b577f35bc4d705f642e8067b6c074a5db61c42f2c22c4b4a3739078cbf3e99c01f434f0ecc
 MISC metadata.xml 366 BLAKE2B 37e7e51799b9632dd1dce72d1bb9decfb8ba87f310292ae9244fdf243c07222fef4769f9caedaa2a28589d4380d19f194e8d75b14a4403278c212924f64aa48c SHA512 79904ea302d7997cab092bbba036ccece5871ae66cb8623d0a828dc71e00c86d4db1e8e0233aa1ddd2d0bc21129d3afc8be13e0f7c4868472bb4a9fbb734fe52
diff --git a/dev-python/schedule/schedule-0.4.2.ebuild b/dev-python/schedule/schedule-0.4.2.ebuild
index fc5673e058f8..9e6017cd861c 100644
--- a/dev-python/schedule/schedule-0.4.2.ebuild
+++ b/dev-python/schedule/schedule-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python job scheduling for humans"
diff --git a/dev-python/schedule/schedule-0.5.0.ebuild b/dev-python/schedule/schedule-0.5.0.ebuild
index e4799c721d68..85fc997488d8 100644
--- a/dev-python/schedule/schedule-0.5.0.ebuild
+++ b/dev-python/schedule/schedule-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python job scheduling for humans"
diff --git a/dev-python/schema/Manifest b/dev-python/schema/Manifest
index da4a2d75c323..359832921906 100644
--- a/dev-python/schema/Manifest
+++ b/dev-python/schema/Manifest
@@ -1,3 +1,3 @@
 DIST schema-0.6.6.tar.gz 13490 BLAKE2B 6398aa3883a7bc8334a10a3a930c49647d58c3a6e5d1adbd8ae7cd48d0cc58469e7b5879202aa877c1ddc09219eefce679a88dac56f2ffd09e8610ac3b280763 SHA512 1a0729b30eb3190396401f1d8b7976119e11acaf2e1902a05e5a8239337004bc0a416939f0b1212dbe16304bfb0c1e28051752c2a81bfd0f14899ef76a166bb6
-EBUILD schema-0.6.6.ebuild 562 BLAKE2B ebcc5e600fd3c310185403108101cc2661d4ae19a9a7562f25e41dd7a390bbd5d73ebdec9b01d85fb2fdf56015c91709a7dd474455c5281fa340af45d7e6e587 SHA512 5036396faf0fafe74820e1b5b2ba45fdb3280ddc3b3657f44c1c4e5f4ae963bda587299c9fa1cd3f31c5fbdf76d65272a90378c0821cd37031e251f0b878f0bb
+EBUILD schema-0.6.6.ebuild 543 BLAKE2B 950557713029110fd102bb3b16086526a6db2d710a0eaf109f4b81507109a074128c9a3d67debb4ff7022a3045792d8fc376d0ca7eed79330804af1f7207af78 SHA512 ca7b8d4349e754db0da1ff16a050993204fadb46bc3eb4bf5141a84dff16f83cbfcb8d30fc73a1a501b508e96deb8ba8a400d80510b09d6d2dadb745cec44bc2
 MISC metadata.xml 376 BLAKE2B 6f93639c72207a159fbbb7280beb8ddef39dd545d06b9e2f0c8286c223033c990f808753115ab5703ef23149db31e57f05bbda679e2cb301dd6541d755b00f1a SHA512 0a27a52700fe812f2a0bf7c563caaa3eb47b02e97314dc0d7635597ce958f8898ba187c0b869722e5cfc04a4358dfb78d30383e3be2cb57f1f6becccf475961d
diff --git a/dev-python/schema/schema-0.6.6.ebuild b/dev-python/schema/schema-0.6.6.ebuild
index 80665c6048e3..a5b0129a9bb2 100644
--- a/dev-python/schema/schema-0.6.6.ebuild
+++ b/dev-python/schema/schema-0.6.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sclapp/Manifest b/dev-python/sclapp/Manifest
deleted file mode 100644
index 93db3a762fef..000000000000
--- a/dev-python/sclapp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX sclapp-0.5.3-testsuite-fix-from-r235.patch 1276 BLAKE2B be9b737675d5aaf9f7f190b27d7685c7fe4cb895eecf1de37e75cf568f563a20dba274417bf5878942ce2fa1ae6b4f5b1d40fa27000998fe859710c112d4e28c SHA512 2bf15b6423db0ff7fd113eab3014dbf0f8327a683d7c9570ae086164b5a364413d5bc1f5637deebef52b4f04f089cb99ca2a86c00445b372a57358d711618f8f
-DIST sclapp-0.5.3.tar.gz 47646 BLAKE2B 7c36d675c38d9ff79cc7a84d88da0ceb1872d882e997a366c11dd4098172420d691ea2e953197f9a664ceeed337b21a247cb680a40c272e400fea7f5eb58719b SHA512 e615310b2ede517717cf8ef70aca02c070676d71fb8880e381e3cc66d5c6006e47b4dd7c4355dbcb34e76898ce7a7a2e4522454490353970ac185c5d1963e49f
-EBUILD sclapp-0.5.3-r1.ebuild 577 BLAKE2B fe2a187d3c1b797dcbc5d494ed41d1f95bb39495bff6cbef5d13abb246f37a3f0fa5c1d7cd37c6d4b0d40216a5a6c2a2940c8756e5a275cf5554722f0be19011 SHA512 757a544d7b349101ff75ea2146eb7682cf933fa1be09d6f81a4a2c4b4f91a1d6f389b447160648a44490d828fdffe7efb553a42d9c61eba7f3bba87f274d8920
-MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/dev-python/sclapp/files/sclapp-0.5.3-testsuite-fix-from-r235.patch b/dev-python/sclapp/files/sclapp-0.5.3-testsuite-fix-from-r235.patch
deleted file mode 100644
index 45965f01b1de..000000000000
--- a/dev-python/sclapp/files/sclapp-0.5.3-testsuite-fix-from-r235.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-=== modified file 'NEWS'
---- NEWS	2009-01-14 11:11:28 +0000
-+++ NEWS	2009-12-21 14:12:02 +0000
-@@ -25,6 +25,9 @@
- 
-    (Forest Bond)
- 
-+ * Fixed output protection test that was failing on some systems.
-+   (Forest Bond)
-+
- 
- sclapp 0.5.3 2008-07-21
- =======================
-
-=== modified file 'tests/output_protection.py'
---- tests/output_protection.py	2008-05-18 21:46:03 +0000
-+++ tests/output_protection.py	2009-12-21 14:12:02 +0000
-@@ -109,8 +109,10 @@
-   exceptions = ()):
-     def test_fn():
-         pid = failure_fn(main_fn)
--        assertLogFileContainsExactly('foo', foos)
--        assertLogFileContainsExactly('bar', bars)
-+        if foos is not None:
-+            assertLogFileContainsExactly('foo', foos)
-+        if bars is not None:
-+            assertLogFileContainsExactly('bar', bars)
-         for signal in signals:
-             assertSignalCaught(signal, pid)
-         for exception in exceptions:
-@@ -171,7 +173,7 @@
-         'test_stdout_fails_without_signal_handling_without_output_protection',
-         _stdout_fails,
-         main_without_signal_handling_without_output_protection,
--        2, 2, ()
-+        2, None, ()
-     )))
-     test_stdout_stderr_fail_without_signal_handling_without_output_protection = (
-       staticmethod(_make_test_fn(
-
diff --git a/dev-python/sclapp/metadata.xml b/dev-python/sclapp/metadata.xml
deleted file mode 100644
index 6d2298876faa..000000000000
--- a/dev-python/sclapp/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="person">
-		<email>sping@gentoo.org</email>
-		<name>Sebastian Pipping</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/sclapp/sclapp-0.5.3-r1.ebuild b/dev-python/sclapp/sclapp-0.5.3-r1.ebuild
deleted file mode 100644
index 9e2c41922be7..000000000000
--- a/dev-python/sclapp/sclapp-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,28 +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="Framework for writing simple command-line applications"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="http://www.alittletooquiet.net/media/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pexpect[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-testsuite-fix-from-r235.patch"
-)
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/scoop/Manifest b/dev-python/scoop/Manifest
index 28d108970bb8..3a5ee07fae88 100644
--- a/dev-python/scoop/Manifest
+++ b/dev-python/scoop/Manifest
@@ -1,3 +1,3 @@
 DIST scoop-0.7.0.release.tar.gz 598566 BLAKE2B fa3a9b29bf0182e3429a9e85df68c16d5e11b41a1f71f13e16a27372801f8827c13e418218b3afe43ab541a2bd815ef6d065508e3d022c118333ce1ae33e8e26 SHA512 4e8378b6c73ef7d3d2d6ad8387220e0659b12eed008d834fb99a661ff1ff5f6b842e897156cec41119f5c392e341c3e8e5b912f01f0728b585daab46aa07d270
-EBUILD scoop-0.7.0-r1.ebuild 567 BLAKE2B 9ed944cd6444207a44fc525a0851732d4dbe035a77976e52928457942afc645f91f310d60b15a840e051abec4df1c0233bbc3e881bca1fbb88cc195a8b3a45f8 SHA512 7b508dd0f003f1b4809aa503b5d2d4519b3dcf5114fa492f6ba1e748b0538fb398926b175b741394d3bf7ceef728a20c21999344f503e754425f6596db547319
-MISC metadata.xml 532 BLAKE2B e6deb9b23036050d86d3503352d7838bb68c877f510813a5f024376c26370dfdee596e1b98f0af962a41515c5c93937739d58812306efe4b4b89b3f3d17876ff SHA512 3ceec38b6eceae4b4d8f44c1f423a369f9bb2183fa9b52aeb16f5f32650660910725a48918218a5198462d33a3c6ce0175984a3598639294b05ce01700dba455
+EBUILD scoop-0.7.0-r1.ebuild 557 BLAKE2B ec37484a01582b32ba1edc1510edf5d440837dfe79dc79d9e7e155e0daff97592fc9449e4156d7165e12fe59603fb67737a1d3719fa5f8a97aab1ab9884631dd SHA512 03235935c14f128b6fb78281c8fb9d41b76a6e0ffec0daaeddd599140c27b5e503e1382e82a372e564a392ba015fa199c60c3f596769d6646e07a4daa4ef071a
+MISC metadata.xml 481 BLAKE2B 66d497b25564dfae939f3d500db7fbd169548ab182a75166423cc872a62901844c2b1d534cc429fb0ad37f9507577241294b44a751cdfc6f7d38443ec7f287e4 SHA512 e8f0a3d71c047e2c63534dfbdc4838d862d06c87a68f9e303374361458bcdcdbe15b2e9708f952d7273435a1fc6b9581b8db396bfd84f3f527f90ea467c4384a
diff --git a/dev-python/scoop/metadata.xml b/dev-python/scoop/metadata.xml
index 71a278e78db4..d584a0a62029 100644
--- a/dev-python/scoop/metadata.xml
+++ b/dev-python/scoop/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
     SCOOP (Scalable COncurrent Operations in Python) is a distributed task module
     allowing concurrent parallel programming on various environments, from
diff --git a/dev-python/scoop/scoop-0.7.0-r1.ebuild b/dev-python/scoop/scoop-0.7.0-r1.ebuild
index 052dbd26be2d..e8bd3157042a 100644
--- a/dev-python/scoop/scoop-0.7.0-r1.ebuild
+++ b/dev-python/scoop/scoop-0.7.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Distributed Evolutionary Algorithms in Python"
diff --git a/dev-python/scp/Manifest b/dev-python/scp/Manifest
index 231467f6a09a..af5f8fe85ba3 100644
--- a/dev-python/scp/Manifest
+++ b/dev-python/scp/Manifest
@@ -1,3 +1,3 @@
 DIST scp-0.10.2.tar.gz 6230 BLAKE2B dea7f16d037243788ab53994547c70ebcea0d40ad07e9067a6b339f00d98ed9c46c3e87d8c069d35764f1e57c3024e2d10db7d558047bfd4d08818188b004ced SHA512 165a0aef1207a2603bb0e15bd6d3171244ebb83b698b7e7d354e7c4d08175a711b168d31e60174c16f1597dcd35b2e070b544c1027d0b52c93be8ed024bac680
-EBUILD scp-0.10.2.ebuild 491 BLAKE2B c8d5833b009c6fcd7476a4981714cd82fb6a125aab8c47acf6c7ef993d1f23094bcf81c89c6a3581b622203f851279e698d81d021d4918881152331678377cdf SHA512 ffac280342efda103a1f1fc4dbacbbd101794f9e5f7866ab8496008b09929466067eca01eb1e9d0c54eabf2c5dee28d266a55c5e6aa45db6c84d81c446416efa
+EBUILD scp-0.10.2.ebuild 487 BLAKE2B e30465c6c2f47b0b4a9213ce69ce5816781f071f836ecb29be190e0e90265ea93f810df846e155748181e2b85d1c4753eaf483cad522d474ffe44c15db1f00d5 SHA512 71519ae52eb01417ab9680abcd62dcc8cad8af84e278d9ad714aa7c39000b4f99d14a10add8c466dafb8c554cf21d9612946e7d373532eba75ffd79174277821
 MISC metadata.xml 484 BLAKE2B 23418117ace875133f1e90a7840da898bd3919f32e51083d517888dc8fa8433768a9aed3a2b79875b44477ea3defae6edc1d011345962b9715ee2a0964201165 SHA512 f95b1cf4ec6a3a30183e63cce28f754220a1a9c82511118ac6eb1f3a211734f62f5394a646a1d07fdde7afe2f78120812f0a2e18d43104287f29a17b9d67c08a
diff --git a/dev-python/scp/scp-0.10.2.ebuild b/dev-python/scp/scp-0.10.2.ebuild
index 5dcbb5379deb..4954af1570a1 100644
--- a/dev-python/scp/scp-0.10.2.ebuild
+++ b/dev-python/scp/scp-0.10.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="scp module for paramiko"
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index 6884fb2643b5..a9a53bfeb8ed 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,5 +1,5 @@
 DIST ScriptTest-1.2.tar.gz 7208 BLAKE2B 07e63e636ca88b47c0cb9129cf4fc02838287b4ea1cc6b2ae47eec1320ad200179d4a6b8f59860aaa24aac75edbe1d55e45da2de91ef222e621f74667ea79c49 SHA512 0dc09e6af5554f38aca6ee45b9afad2fa4c1c53a4d3c43edff95bbd6ea8d57e94bf6b7bdcfd26afff6bf2b10690795bd2816013801911f726c67e8171546cad2
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
 EBUILD scripttest-1.2-r1.ebuild 543 BLAKE2B f155cc6257076459eeb3ce5b4cffb30dd1035da6f987bfbfe49995d6d6d3b497d9fd603484ab98fb686be5450b1e4e14a6264b1bb581523314a11d088e6582f6 SHA512 33787bcc9603d6e0038912aef34bff3825f4c3e82da172b8cac72cb181c91fe8101c1bd2f7abe499d83292a3bc65631e5758ce4a171202f390ca9666530452bf
-EBUILD scripttest-1.3.0.ebuild 580 BLAKE2B 3645103dceabb6c98935a186394c8c372d5428e4ce84547273f126dfd37d70335d60d43533643bb156c6de2438c49a10bdac5ee466913d723aa569c3c48ba43d SHA512 64970658badf397907ff86baca6af5590c1c05a885a2ebc4cd2374bed70fb9c705c10abad8d4570f4b30b1c288b40eebda836b84506db556821899f26f449cd5
+EBUILD scripttest-1.3.0.ebuild 575 BLAKE2B b44a20ef1767d6f97a6a2b979eacf2f44748e215cb65896384dd7992fa280f83026e984edf559377b2c85741f802087ad623892035ce46c81da703d39dd13cf3 SHA512 e6342e035b6ed270aea1767ffc0fde22bcd41f0b7a932ba48ee7771efa4e6957c6da866a93789260df90af4c88e7f9afa0725de106d4891abd09497e00a522b3
 MISC metadata.xml 313 BLAKE2B 70bc88a2b745b46e0da17a41ef420dd6b0ae2fcb3f444ed6be3d6bcdea63a4b0019790e0dba51b46c3a5d82c93f667f25b116793623604edad4d01841af723f5 SHA512 ae1c2257d3367ea3bdba8e040c0efd98674fe833f7a025c1b554e8cae6e1a41de6867e63c3d792593fa2f4baab158b046d2efaa08d6c8376f8ec749cdc7d4ff9
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
index c2d581b8f29f..946ea360010b 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index a5d982301523..be3163dd111d 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,6 +1,6 @@
 DIST scrypt-0.8.0.tar.gz 39042 BLAKE2B 305973f0093fd3f9f132c448a5155c58f7306df31912c909401cccb224b89a7458fa72a4f659c37bfb81f31daae92797624fbabf7de723bf2869eb92af333853 SHA512 2619b6af84b1bb5b9586af3a0a903baf606985357ff7db34612b032aba65e002998a727882657f19bff6c7a987125d9b2d8daebbe0ba3717f3dfa6650975e52b
 DIST scrypt-0.8.13.tar.gz 53606 BLAKE2B 924b870d2dd5d8dc6765ab2679e71a819fb08a75cfdb0e7a6cfa9c305f35a376892e78607007013d9dc7d9a6b2bc6420019f8b27fadc7f468b3b2fd685a1c3ff SHA512 a65e24b0a7dbe02e16c0b38b52c66549f36370e267aacf348a107cb980221806ca783cee0caa95ab6af978dd2b0d8efdb6b06798bb43742d4623bd8f6535e9a5
-EBUILD scrypt-0.8.0.ebuild 615 BLAKE2B 2afc001298eb4b14406828cf0c8db16aaa9b187f00dcfc038a1287bc223b0cc79e2a1bc94e7934472b7d222f71de34dc7545e5d24d8968f024cc0fac6e84cf71 SHA512 76b1fb11f31019c149d0b65cb319e83117354416e4ab0d2c4c9a86da5c83833b8c80a5e923c39b06159eed39145127e469809147b570c42962c90671dc884ffa
-EBUILD scrypt-0.8.13-r2.ebuild 595 BLAKE2B 52b45530246cb00473e5f88a935d2c5b129cfb721e69cae90f924bcec1bff08895bff8f44a53ed4bbbe75ae5c4df0f441da2c69433363fa64975318dcfe283f4 SHA512 deef995482b4010a22149db2b48e3596778f9b5da02790d2150c91c2c8f8b398c8b7869128e9a06a2fac3380eda816d9740c68c0115b5b85d41c39e6e8a4c465
-EBUILD scrypt-0.8.13.ebuild 596 BLAKE2B 890e0678aacafffef95602ccc06c38309df3d187be01d26cac8d32fbb590e6e674566c676d2c03311a90861140b087aedb3384eb411da4125f7bbc8e208b42cb SHA512 2e58e2578979933e1a74a65e7ddff41bd3cea1cbca5d72bb3668bd44795cefaf339ac99526a89f3c54d91d42efe065506daae4164087ad236fff9d67e9c750f5
+EBUILD scrypt-0.8.0.ebuild 606 BLAKE2B d8e80e334e4e380184da8a9fd61da11d32938b53fd94cc6600128165c058a86a3595bd249efb86f57559aa636845e8e29293cb34a35fb5c95377285fc9a10e7f SHA512 9e7c4d2cd67937d4556425c71f7eba7bf9073785c7ce9d30df302956449dc5a0aea542720065352149243761fb0be7cb046275fd5cc07b55d444187d4915a73f
+EBUILD scrypt-0.8.13-r2.ebuild 590 BLAKE2B 89c5731b32ac269c3a25ca2fb68481e5ec786db49084a90379364ce70ff512069b0ec9406d9f4e62f150c3b10220950b436c47cbe25080334917756b4587e63d SHA512 cffe1f409e3468a5033f326feb5c2e1a451725f74e28b50ffb5899166fec0150a48be731dc519efbf32e29ac322cf8d528327d10f2f66fd0df35b6ae231eeb57
+EBUILD scrypt-0.8.13.ebuild 587 BLAKE2B b8f855a55d872ff017320e937c5c524e0e65efd0dffe2cd3caf8dabba70cd5f631ab8420083db20f9262c1865463a9c64b562fce5c9e147dee255afe933f07ed SHA512 52d01d396fafd7904805b7031b68749b8233b6edb9e4a17676a460c107c194cb8247f81311effffd2cb0d99e78c71eb2bf4ac51cb89628bc32fe510e361069c4
 MISC metadata.xml 586 BLAKE2B a5f49db551f2768d1474c483127fb555d0015d59896d3016c4036cf19d719c4f996c31f2f3bea9bf92c0e4d8d21979dfeb917974727944c16eab40a3bd15e82f SHA512 67277df1509df252e7366080edf19500697aad8ffe6192839f61fea76391803525ca05c377e8d1f1b67d606e47fc7047b4714f55a2cc9166642329a4af4cb92c
diff --git a/dev-python/scrypt/scrypt-0.8.0.ebuild b/dev-python/scrypt/scrypt-0.8.0.ebuild
index 47a92cec85cd..50b68dde6f2f 100644
--- a/dev-python/scrypt/scrypt-0.8.0.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
index 5f0529ec3951..7b19722095d8 100644
--- a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/scrypt/scrypt-0.8.13.ebuild b/dev-python/scrypt/scrypt-0.8.13.ebuild
index bb3e776a695a..617759f1ba36 100644
--- a/dev-python/scrypt/scrypt-0.8.13.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sdnotify/Manifest b/dev-python/sdnotify/Manifest
index 47dda059c77e..18b81098edf0 100644
--- a/dev-python/sdnotify/Manifest
+++ b/dev-python/sdnotify/Manifest
@@ -1,5 +1,5 @@
 DIST sdnotify-0.3.1.tar.gz 2513 BLAKE2B cbce1d3c2bae3b3a02102cfea9ac104e7c2839b784a78309cfad0a66fc8b13bba66ae4bdb8dcf1d2171378e04f2c18e3697b22545a3e3f0593edff8adcc19dc3 SHA512 765e75e727ad5128269bfffd4d3f64666df654adc50965a54f3cd622933aca583faee5453f7fec3a23b6f754f4475522dd96a86ba643984cd72a575ec082709c
 DIST sdnotify-0.3.2.tar.gz 2459 BLAKE2B 1d1846e37889c36cfa7242d14e4040ebb9b73d3e53f5a3423447ae1a4912373e4249faa7803ac212e3c7d64371d1fe9e1be2d56f8604791cead2cbe22e422053 SHA512 f7e7d38c8d7f56ebad8b0343361a0bf6177208b94916430343a0a392015622d7bb62aa391e17956e5aa9a0d7189c79268cb86c46bb52b36488df5aebca5cfbd3
-EBUILD sdnotify-0.3.1.ebuild 525 BLAKE2B ea191361136f0425495192d4ad6f7a58345f7d4a65fc2d9762541e0d02e13889162e5375cf765f18bce4431ff3f07d3a2c0103f4ad6fcb7656cc53c263a6a302 SHA512 696a2bec9d82f030fb2977ac5bc5f8b62cb822a3be68dd5d521cbf44fd76ac78d875abf0ca8e29a17fc6394b3313c0be9e795897aade9d67a0d57f4a7a62dae5
-EBUILD sdnotify-0.3.2.ebuild 530 BLAKE2B fbf928b6bacfb44c00524ae1b0970a7eb65884d5737840fc28d8a5ff8b4d5c49872435400a004b5bb3b4901b468798835611a312caca7254d6ee11ce15bec77e SHA512 8fe18da0ec205647ac447df1020bed7e1effe52565b13fd76fedccce305138ab3d33dcdacdb9d7dc5b373095389ded2c8e113cbc16003ad4d0fd1615c510c00c
+EBUILD sdnotify-0.3.1.ebuild 521 BLAKE2B d0e3b614b545e9edcd54bbed69e82c8fe19d718fbed11c25fe4bede3109026143e0d2d1f82356e78ed44a67c25a116db102c28c1f68af25e284c40cce1c79f6d SHA512 9d4f6aef7f17d73441331da0dcfccd820a8daa9ac88fab22446337d868facdc287540d1632d65203091402c4b57573d3994365538db19ce269c22ce78fa90c82
+EBUILD sdnotify-0.3.2.ebuild 526 BLAKE2B 5cefcdfc034e143013c65877b8a7247ccd32d17a941a375d6dab5d8524a012c087148b698dfaa5a2ee5980df9fbc6ba204054f72ea08b1ecbb1597d6d43715dd SHA512 2f8e08dba830ff11d5c9a410b7a7d24093de33d18b9dcc03c9cb085f991364031fc03b796e32a2ab1754eb2f7286e9212cc88e888f34c385722d4964c675eaad
 MISC metadata.xml 800 BLAKE2B 3841a502690a98b0fd6ab419349f359dd167899f5c7b8f53e610a7677d060fba149338196a1108ef66bdf62fc42acaea6aee03169e6020d2eea1db83b54b6cff SHA512 2ad4766fb8ef7abcd0a5444aab298d97f66fd84d5dc6e24e6e597f075fc82273d7991e5186b08a2f1ff0040675a8066b3046f1761c4a8200a4894f66990c8a3e
diff --git a/dev-python/sdnotify/sdnotify-0.3.1.ebuild b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
index c350d06eb210..3ffa5081818e 100644
--- a/dev-python/sdnotify/sdnotify-0.3.1.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
index 877af9d028a7..d278fda3980e 100644
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index 12e4fe87f795..ff9163e90b27 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1,7 +1,7 @@
 DIST seaborn-0.7.1.tar.gz 158146 BLAKE2B f547e41306634f41091ca5641319abcdb1d22359d67591f115009cd95cdf50463e3683fb1ac911ff9dee3d7628320a76fbcbaa9c91510937907a40a0daa259c4 SHA512 6c730d87a97f0df3b38b78ee9255d47b900aece1308127e2772dc982b19691efe6afe192752c89cba9e9532b567dc1c3c103675e580e6f1151355ea89d1019b3
 DIST seaborn-0.8.1.tar.gz 178865 BLAKE2B 7f81e0737331edac805e88183f387ccde38d4b27d601e43462342855cdfe245cf1c721ef03ae7cd1b23cc6641e20d51f38bba6c8ffc4a9621b069c6528d0249a SHA512 05ed621c2624b4b981118f9e6100f593ab23620e8f86c82b55a298944135f3286798d5cdc6c215c134f2fdecf9b3a7631be8c5136c0dafaf1f97f05f7c6739d7
 DIST seaborn-0.9.0.tar.gz 198184 BLAKE2B 4f4072a186986f9eb649c6fdb6edbc7a28b6f4ab6cc132652b8c4c595c96500b4853b5593f39b46f6f0073d916f9cd51f3ecbb2d23f4d69991e46e702f10ca44 SHA512 01cc9a8e80102eed6a35be8ef2c3357d1f5eee53004887a5e0eb1f4dcf696987e19b9e371e95fad01fff60042ad5a2873a6d265a43cb506172a50ecd5ba55b3b
-EBUILD seaborn-0.7.1.ebuild 876 BLAKE2B 231bcba9fc0e86d0b85c0fa99a09e947545c1864a5ae43269885e878817b0c8448ebee867bd25aac28fa71d30490f604b8dd7016c25bd643e4a360ccd4d2611b SHA512 6eb70c314abc5154a1d8255630709c563f1575605d5cddf1ec4e2bc3f58338c1e4e29246d054caebf36ea14d4a224f36dd1f9a361eb27ed115f13ed81d3a7021
-EBUILD seaborn-0.8.1.ebuild 876 BLAKE2B 231bcba9fc0e86d0b85c0fa99a09e947545c1864a5ae43269885e878817b0c8448ebee867bd25aac28fa71d30490f604b8dd7016c25bd643e4a360ccd4d2611b SHA512 6eb70c314abc5154a1d8255630709c563f1575605d5cddf1ec4e2bc3f58338c1e4e29246d054caebf36ea14d4a224f36dd1f9a361eb27ed115f13ed81d3a7021
-EBUILD seaborn-0.9.0.ebuild 876 BLAKE2B 231bcba9fc0e86d0b85c0fa99a09e947545c1864a5ae43269885e878817b0c8448ebee867bd25aac28fa71d30490f604b8dd7016c25bd643e4a360ccd4d2611b SHA512 6eb70c314abc5154a1d8255630709c563f1575605d5cddf1ec4e2bc3f58338c1e4e29246d054caebf36ea14d4a224f36dd1f9a361eb27ed115f13ed81d3a7021
+EBUILD seaborn-0.7.1.ebuild 866 BLAKE2B 1c5a3f155115af2b89ea7431f8e9ce27d7c2fa078045553ba8efd6a17ff21651c04d2429cf0692fe64838dca71d71ee8cc2c5ddaef25c0f4bafe8b9eea15146a SHA512 a9a4f5192eb65708fc466e911f268d0221ac0b3ec839d5cfb7675c61fe7f205325a08e73b05b056a8ccc44259c446f8c52566b3f44153f57b63d30ef04e5a0ac
+EBUILD seaborn-0.8.1.ebuild 866 BLAKE2B 1c5a3f155115af2b89ea7431f8e9ce27d7c2fa078045553ba8efd6a17ff21651c04d2429cf0692fe64838dca71d71ee8cc2c5ddaef25c0f4bafe8b9eea15146a SHA512 a9a4f5192eb65708fc466e911f268d0221ac0b3ec839d5cfb7675c61fe7f205325a08e73b05b056a8ccc44259c446f8c52566b3f44153f57b63d30ef04e5a0ac
+EBUILD seaborn-0.9.0.ebuild 866 BLAKE2B 1c5a3f155115af2b89ea7431f8e9ce27d7c2fa078045553ba8efd6a17ff21651c04d2429cf0692fe64838dca71d71ee8cc2c5ddaef25c0f4bafe8b9eea15146a SHA512 a9a4f5192eb65708fc466e911f268d0221ac0b3ec839d5cfb7675c61fe7f205325a08e73b05b056a8ccc44259c446f8c52566b3f44153f57b63d30ef04e5a0ac
 MISC metadata.xml 1741 BLAKE2B c1c19f61b7964ce77784415d3d964425a53e7a15d5e3148b7ee8474603f771eb07fe7e44fd0fc0a155687831fcf11425e963ed884c982541da707bf46e393658 SHA512 ddea613b7d13e3fce33bca903896fcbc0cf8f383f423cf6362190c9159675925cb297f57307ee223b43d2b15d41634e39d8ad2535071db0771a4ac9e891265d1
diff --git a/dev-python/seaborn/seaborn-0.7.1.ebuild b/dev-python/seaborn/seaborn-0.7.1.ebuild
index 8e767cabde8b..ae94dfafbf2a 100644
--- a/dev-python/seaborn/seaborn-0.7.1.ebuild
+++ b/dev-python/seaborn/seaborn-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/seaborn/seaborn-0.8.1.ebuild b/dev-python/seaborn/seaborn-0.8.1.ebuild
index 8e767cabde8b..ae94dfafbf2a 100644
--- a/dev-python/seaborn/seaborn-0.8.1.ebuild
+++ b/dev-python/seaborn/seaborn-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/seaborn/seaborn-0.9.0.ebuild b/dev-python/seaborn/seaborn-0.9.0.ebuild
index 8e767cabde8b..ae94dfafbf2a 100644
--- a/dev-python/seaborn/seaborn-0.9.0.ebuild
+++ b/dev-python/seaborn/seaborn-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index add2b90ea3f2..57f8b6a41e61 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,8 +1,8 @@
 DIST SecretStorage-2.3.1.tar.gz 16073 BLAKE2B e4769e748ee39596c51012a6ac626dba2b019238a8237678c47d713c2af4b0e88b50d0068b5dbf3a405b9f7b14a7df64aabf751009dd21ab25de65ead2a79c38 SHA512 69a2c86a1abd904b7d71bbb59cead3b2588cf88d7f35cbaf64d18ff9aa9ed62ba9f79d0bebd10136aa8a0edb1ff8a1d1aff70cf8e519dc74303993ef0d564047
 DIST SecretStorage-3.1.0.tar.gz 17767 BLAKE2B e234a7f34b5ca2debfd04d4f3b4b4e2a1625aa346133e464bbc1f094381445e3d0c5460457c687f55f6682c6b6085a757edb23a6029fe5c2abf139278203f326 SHA512 a044009480b359aecb0c8782f04e4d02c3c1c0e682f72733896c98f386562c43766318963452d60028d0a92d02903130278cf26a5c206f5f0909e106bdb2d133
 DIST SecretStorage-3.1.1.tar.gz 17036 BLAKE2B 1dda10a5f74727ec29392ff2a3ec65b841aff86db21223ebdbf291afcc9ac7ee68de8c62e5929aa45aafabc791ac02ed80b6785e69f2d4b51d827fce8bbb3443 SHA512 295e0f75c772edf153480730dc20051f06e60e040a18f169620cb4aaa37b8c1a254a496464d3794a38cf49fa884a7b561fe364816f0d12a5b2622c77259f03cf
-EBUILD secretstorage-2.3.1.ebuild 685 BLAKE2B bc52c297a34d07f8c80f7d76c83f5dfc328618a1fa0a691a2cdf8d19f00eabcbf4b7e5ba5e45507b7fdc32b59de0206540ab856f3a2f0798d35904970c404b21 SHA512 a4dc1d2c2e156ad187b202b06c2e116c51ca229985a1bed269c99e9121952ab2f130a104c680a55444cb18449cf5d9f4239340e0103e08c645f028c441f727a9
-EBUILD secretstorage-3.1.0.ebuild 1096 BLAKE2B 3ad36a17333500649601d4f0f637adf705d38fb038ee570c8acd1e41b4f02b9c49a54d87540eda56706627be35b41e491e6c68fbdd457e61780e6d0895ca1554 SHA512 cae132400c7a1bb0821de73e446a22eb052bc19216e0cddfec10bc9cb25ce8bfa861112fe0dc1f4d7d57644eac601c7b803f63342723d70381842f6daa0fa294
-EBUILD secretstorage-3.1.1-r1.ebuild 899 BLAKE2B 23423c4b0b21406dadef77d13e31816c3b6bb1c0b9eb6fb4dc17fdad6e4048c35f4831e60dcd39004a9dc3bd949deafe8b3506a1f2a5a76c8b4fed19075df43f SHA512 7040a209cb0162216bbea4de705cd2b9c4aae424e19c425910e7ece772d75b600fbf774833b4786efc32d364a265b46f46f3787714bf17bb852382699ba0e88b
-EBUILD secretstorage-3.1.1.ebuild 1096 BLAKE2B 3ad36a17333500649601d4f0f637adf705d38fb038ee570c8acd1e41b4f02b9c49a54d87540eda56706627be35b41e491e6c68fbdd457e61780e6d0895ca1554 SHA512 cae132400c7a1bb0821de73e446a22eb052bc19216e0cddfec10bc9cb25ce8bfa861112fe0dc1f4d7d57644eac601c7b803f63342723d70381842f6daa0fa294
+EBUILD secretstorage-2.3.1.ebuild 681 BLAKE2B 1b2b7d0af3d47df38022c63287709709a5e95d1a99632d8b7eeb4a3275e96818225e60f82949046265a422b9b75adbfb547ca209de45d378532609ba9811a511 SHA512 060cd69d75eaba65724d66c7537a274ab4fdaf460bdd32af9a5249d494a2d94728c7adfe286b590c3beab60f7578496911e804e91259685af24b28c5440f26e7
+EBUILD secretstorage-3.1.0.ebuild 1094 BLAKE2B 50b0c4c55fa9482e3cd9396f0fec287417adceaac0fd2c8cdd802af57665a0da09990a08fea4a023790c3ce0b29ce9ab6ba0b218daaab16053c6be5d0ffe1535 SHA512 c79c893024941b8da1ff34a72096f4cd1512ffc827a4348fb417ba6d556fee2b7f9bb49ac11a8c14b6ffbc84a4ce32098b29d8f665cae62141b651e59c6d6064
+EBUILD secretstorage-3.1.1-r1.ebuild 897 BLAKE2B 20823f9a861665047c9e4320a96f745aed3147ebf25480676005d0df83bc09ccd72cd6e7838810f0cb3686444bdf3f06161dd30c77bbdf0d3bd93eccb6b3cbc1 SHA512 89a29e0a0385a0e2741536fac657c6dc241ee724d79c9db8c26ce3908453c3afdebdf1f1a3b42f3bd38a0a01d5267ca19229019955d97968e1351c075c0702f2
+EBUILD secretstorage-3.1.1.ebuild 1094 BLAKE2B 50b0c4c55fa9482e3cd9396f0fec287417adceaac0fd2c8cdd802af57665a0da09990a08fea4a023790c3ce0b29ce9ab6ba0b218daaab16053c6be5d0ffe1535 SHA512 c79c893024941b8da1ff34a72096f4cd1512ffc827a4348fb417ba6d556fee2b7f9bb49ac11a8c14b6ffbc84a4ce32098b29d8f665cae62141b651e59c6d6064
 MISC metadata.xml 377 BLAKE2B 6401f07923ff58cc70bb0eb9d08efec05924c5b74102e1ff2e9eac0d1f2dafc1f4ef8e31f2434344ad25a6f2ee71061aa23c232d23214d91c4ce5c7de437da64 SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95
diff --git a/dev-python/secretstorage/secretstorage-2.3.1.ebuild b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
index a706011c6aa2..ea8c22ddccdc 100644
--- a/dev-python/secretstorage/secretstorage-2.3.1.ebuild
+++ b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/secretstorage/secretstorage-3.1.0.ebuild b/dev-python/secretstorage/secretstorage-3.1.0.ebuild
index 7552a0485127..45d4986b371b 100644
--- a/dev-python/secretstorage/secretstorage-3.1.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild b/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild
index 4c7bdeef370c..319e9541c1a9 100644
--- a/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{5,6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/secretstorage/secretstorage-3.1.1.ebuild b/dev-python/secretstorage/secretstorage-3.1.1.ebuild
index 7552a0485127..45d4986b371b 100644
--- a/dev-python/secretstorage/secretstorage-3.1.1.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/selectors34/Manifest b/dev-python/selectors34/Manifest
index a505335b7e85..48f56ae00c80 100644
--- a/dev-python/selectors34/Manifest
+++ b/dev-python/selectors34/Manifest
@@ -1,3 +1,3 @@
 DIST selectors34-1.2.tar.gz 10145 BLAKE2B 6cf47acd1175de7b46dbf06d4358973740b84115bcb62bca695358ab761476f4ec527f4fe3afeae3c3129e4a68c7034b50ee4b317e7d85cc43e0125de81f5d16 SHA512 66fd545d5163ee3cf7e160e428a36f70d43c5a6a8a5adcd6a3028fe67ca818911bc3de934d862d06806dcf051516856baf34b99d9e2a062c214eca667fdff65d
-EBUILD selectors34-1.2.ebuild 493 BLAKE2B b130d3b9bbf5b60775b8d0b0b78d9c0e2b944085ac9a26aab9a0e75a6d0c956ffecc0f0babbaa958fe2a4df0eb8046e0dd95a0b1b0643fc69684c2e7f4d04bc4 SHA512 185ec7c0bf3043d37c583aefb289dacb7734b95d76c0bb34b9a0aa4355512f6d81b4e857eac2b7c1ac59c4b16878c2224a26ae279203bac504de82a2512c3883
+EBUILD selectors34-1.2.ebuild 485 BLAKE2B d14bcb6d3a9e276163c64e595f692d76ada3e68f31c1829a4b1e58efd61a57e87a4618cfb757be728795e420a1150a8ab1820d798c65b375195e22a11b00782b SHA512 77b3d104dcf793c4f8e43367c9d8634601ff453dff4d65686e44e810203ca79608c1ae0b9a7adb56e773f8a086719f5aacbc85acb9419f7aed560e3e93003d0b
 MISC metadata.xml 378 BLAKE2B bdc18fbcccd0582723bd2806e6f749aad2735cf55d6a82b88d2141b92de24c0c63a0bd55e2b49613fe91406c4fe7d35c1e7cc7e23ca0064ba0edb797b59e4fc5 SHA512 3aa7b7ec03e37413a17323a3db7633f05044d958b1547c3dd420588ee3056c8b938d30f23b69fb7584cffa9c59d7ee69689be9c5d0d4f248fc9b3a093191d297
diff --git a/dev-python/selectors34/selectors34-1.2.ebuild b/dev-python/selectors34/selectors34-1.2.ebuild
index d8ef9979d6c5..71907274c1dc 100644
--- a/dev-python/selectors34/selectors34-1.2.ebuild
+++ b/dev-python/selectors34/selectors34-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index a9446b0db3e7..9bd5ecd1e476 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,7 +1,7 @@
 DIST selenium-3.0.2.tar.gz 830314 BLAKE2B d6d2e5775fb1fe9d043a54ecc1757e5290326e048e16e1647d30ff4445e2a24d0b7acad7cba7d122f265d00704b665a4ae302d8804a97a7bd8d9066f6c926f8a SHA512 6ddbe68e65d8999dfa362fbafceee008967b73808d51efabbfa5a7e79325597ee6fa226a45347e1c5b7e479cc607af4f0233c31cc7296067566a4dcdf1f86496
 DIST selenium-3.13.0.tar.gz 852146 BLAKE2B ef70397669f2c6c23942437ca1513882830bc952be5c20f37808d45d474b2ae85843662f186b9e68bab29184645b278fc6532d47635e4dfd3a851ddfd0c58111 SHA512 cc089032f9c1adac0cd629246d2ee3f986a0e448907408a40714381f42c0ea11be479b9714443f86460a65fdf86e107f9a840d3fde7a6401ef99f5ec491453b5
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.0.2.ebuild 591 BLAKE2B 24d7d19f57a53be64e863b296e638c4ee28cec15af7b36c8f03b8ceb6814f0725e02420a6bde77cc551d93d60004681a0a8f1004b0e350291dc07d9407999f44 SHA512 04f28d7c57b622b0f5ceca034d6b8606002407eddc37542a5684b9576063fd105758a257d3245194d1cc8292bf22e397f47e73fdfe335a71c222e880a9b5b46e
-EBUILD selenium-3.13.0.ebuild 591 BLAKE2B fa6b129471614451f6219e78e70ddf35b852d22079a04acd8728cd6f5573bf9d2ede650a292cd376189a320197e77a414d28e5f14988e5fb50bef399e2ce5e61 SHA512 8467144e9659a2232dd1d31fd6aed7d1d76def84a496a7e921b98c0c14fead48f0a89c15106b2a31f57773588eb3e0bc0bb4fa074ba720630298d9e64f5b5f57
-EBUILD selenium-3.141.0.ebuild 591 BLAKE2B 6f5453534c2b5ceb7dfde8183cdce3961a7a57f4dcbb1166c75995bb4cd51e6de5153418a8aa4d5b859187dbeabe6cf2dd5d2a4398c04edc6dc8d52ff744f52f SHA512 00c65249cdbfff734a2ca28a889cf5b20424f5270c90a0231977caeeb21b5c784885655379c05ce4faf5b071f90bd1d498bc7b0c23d69a1fd49c36c2c4719c7e
+EBUILD selenium-3.0.2.ebuild 587 BLAKE2B ada701e1ede406c5204e740a32aba2a67a4565d5fba37a3788052b2e014d4cefb0386084bf1f0343794e8ce1cb8ec5cc0d68bbf27d6b917f0608c1bd5601210f SHA512 19ee59fc71588a3d03aaba94d154fa26c014577f0e549ff3e5f5c815ad1105769ab271993ccc8d97d0c824e75f8da54cafd4cc7b21844f3cdc0f2720e39c434d
+EBUILD selenium-3.13.0.ebuild 589 BLAKE2B 79fae43397afbaa880f1b7197f17da3ac3c3c11c40218007e21cec4161a9a5a267ca656ea6f840f2bab40f7684905c5588910b0015fed658498b618858abab0d SHA512 769d65a954b01de06cf11248338b25190fe7b1311384755110297df502fdcad57f1a3ed0936561db24457a975281ef9f4e1a2b1cf3d437fba4a590065591a0d6
+EBUILD selenium-3.141.0.ebuild 589 BLAKE2B 620880f1663bce10cd5d68e1e2fc7f107ae6591b42fd978034f97ac9c1639b734883d7d9060e54c6a1e56e367d56271953f76d2e4aaa87c4b507a78d0996f17b SHA512 1ebd2c59fc14ea37d80a800fe818494d892beb43cea99133046a009104572dd6f91907443291a9c6f82730f1d6b46f307138f1fc9132d370a6c671d2743d7049
 MISC metadata.xml 382 BLAKE2B 2069f6989e396728b0de8e072c064980714dfa75f5bc8ac56b17d7b311e553c2a821a2d58433ca43289b059ae40f7a822c788c1af1d8eb883936662d6eb17bfc SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955
diff --git a/dev-python/selenium/selenium-3.0.2.ebuild b/dev-python/selenium/selenium-3.0.2.ebuild
index b6323abf9099..7612c95e7ece 100644
--- a/dev-python/selenium/selenium-3.0.2.ebuild
+++ b/dev-python/selenium/selenium-3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/selenium/selenium-3.13.0.ebuild b/dev-python/selenium/selenium-3.13.0.ebuild
index 72b77a8bf84e..dea5ab9657ef 100644
--- a/dev-python/selenium/selenium-3.13.0.ebuild
+++ b/dev-python/selenium/selenium-3.13.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/selenium/selenium-3.141.0.ebuild b/dev-python/selenium/selenium-3.141.0.ebuild
index 0ac1802c399b..44a541d79ec5 100644
--- a/dev-python/selenium/selenium-3.141.0.ebuild
+++ b/dev-python/selenium/selenium-3.141.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index 99ea97245239..2d447a3b7585 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1,8 +1,3 @@
-DIST semantic_version-2.6.0-1.tar.gz 31678 BLAKE2B 030189762a11559fee8527bf1735fbc596caa4e641b61fdce90e1c1cd6e7a3e957aad13dabb2d90ade2f91028c5a7f35c39c1a9d47afd76d3274c2b755f2b14a SHA512 18db9279c2728565b13362c54bedbf569f0878cbe6bb58e631d87ffe7cff7d9131a30a2592cbf511091c03e854851159bbb298fe7469f53e8a2d92cf26ab4d0b
-DIST semantic_version-2.6.0.tar.gz 13919 BLAKE2B 811b3bfdb8ffc4cf8358400da1f18d5d0851c2999ff7df73fc0380e508b4039ce760dcf9d438bbb5d112ff1754b1855b3e062652b28be7f607516d8d017b9830 SHA512 805449e7219aaa59d28cc267c27a6abab5cbbbfd52c72d66f24bcace39c9f864e4ed944a3dc614e14a700a5bc92272fa6420312f3169b01a4cfd9ddf3ffb42d6
 DIST semantic_version-2.8.2.tar.gz 49243 BLAKE2B 73c66696b2fd6e30dc74bba6f1d4d84d71bf470f8ecd2ab93b4225f573bb0575f797b573d8fa6605ff35636de713a8f69522a2719949cf0bfebd0791ab5bae99 SHA512 f54ad2bb2e8392e154718c3dff8e7a7fa7663d7df0ab4b196444e0ad22440fe9d9a3abe9043824c0e0121f9051121b8c9d67f76a615aa5348c321e217b3a5dcd
-EBUILD semantic_version-2.6.0-r1.ebuild 661 BLAKE2B 7b5796e2af3d6aaf93a5061cc85e15dbcf3e2ce523e8ce868dcf3edd84052b13a528932ac435fa1f792508ad3ab06a3f0a1ddc75a0f45b6c6cd1448b024d9f11 SHA512 0f50bc2588754543c4204abd1e9427e9f35fbbbcdfd0871757079c991cfb4228b8fb05360043c4e86c6d84614e00d0c74b3f06f845006a19ab1888793d2db2a2
-EBUILD semantic_version-2.6.0-r2.ebuild 941 BLAKE2B 56d578ebfa6e23202b218a42399a4610538c883e3be9e3982a54429277587fbb00dcd29503f9b502aec82cabdab439aab14701a6d556ace285486c5e1a413d2a SHA512 9641e10b58dfd4cf7145613d85feb1de36172c1b64b4a9b175c43bb381b14658dc0ecfd0b6927b20d2541ddee60bb272b6250d6539e29f8a9be50ef3d040ebf6
-EBUILD semantic_version-2.6.0.ebuild 514 BLAKE2B 621c5212704be28d0f0fb7df9cbac31f502e05bb719a4a4ee4db5b0f3525d7f5a819f80041fa72c1b4f43d3fe370771aa8ea27383d01913ec9ad328c86993257 SHA512 b9b6efc4e0089e35c87c1a117de7d9bba2598b768d9b3d20e8e1a95d49f991c7c6c5a2024f384edd0f1f8c2875f1c9c12cb2666def2be2834bf1be5efd7a1e07
-EBUILD semantic_version-2.8.2.ebuild 961 BLAKE2B 717ceeb53f46c234e8dec4607b4e8d0b7519a6c1468629ef72ff45e05adec67e4e98056dcdd490289ac47634472453251157b32092f6d235bfbba268e3db5070 SHA512 99a880c0ed37b296612d6871c9c246966bb1d1fdb55423597d835d05f3e8f07b6aed549f2e8835fb20b230d180f8d0d226a572d1e842bca2d3a19dab63f634bd
+EBUILD semantic_version-2.8.2.ebuild 955 BLAKE2B 709e321caf6ee789c0f7c6dff06dc6a7f78c13daf18839a24451b827e3ea5c8e5f031e8fccba8556805cd81f8290eb427be21b8d276fdc1f61951c8afcc4edf7 SHA512 6122d887010a092968213abce8b838ee9d1e6397434c18758387571a5a1386cb56dad4cee88fae0786525a159b1e32d119683f2719c316e60b5b0e221228bc7f
 MISC metadata.xml 794 BLAKE2B a5db43eb58726664155e05adc00491fd2f87b1eb15a1ac67f0f856ad5388488ce3329207863a294ed899aebad0bf3c99ceab93816f36e2ef8149eb24e0dcbb58 SHA512 2374a074dc02721044ed995e7f3502b4a7c25f751efc19243a21ea845b814e20a375e45865bcb4fec36906016384de49f4e137c03a64aa84f4188140151bcb38
diff --git a/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild b/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild
deleted file mode 100644
index 0882933a69a1..000000000000
--- a/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library providing a few tools handling SemVer in Python"
-HOMEPAGE="https://pypi.org/project/semantic_version/"
-SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/v${PV}.tar.gz -> ${P}-1.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/django[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/python-${P/_/}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/semantic_version/semantic_version-2.6.0-r2.ebuild b/dev-python/semantic_version/semantic_version-2.6.0-r2.ebuild
deleted file mode 100644
index cd93fd604422..000000000000
--- a/dev-python/semantic_version/semantic_version-2.6.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library providing a few tools handling SemVer in Python"
-HOMEPAGE="https://pypi.org/project/semantic_version/"
-SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/v${PV}.tar.gz -> ${P}-1.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/python-${P/_/}"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# The django test hangs
-	py.test --ignore tests/test_django.py\
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/semantic_version/semantic_version-2.6.0.ebuild b/dev-python/semantic_version/semantic_version-2.6.0.ebuild
deleted file mode 100644
index d8ebb37e49af..000000000000
--- a/dev-python/semantic_version/semantic_version-2.6.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library providing a few tools handling SemVer in Python."
-HOMEPAGE="https://pypi.org/project/semantic_version/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/semantic_version/semantic_version-2.8.2.ebuild b/dev-python/semantic_version/semantic_version-2.8.2.ebuild
index 645212888092..760fc93c5e61 100644
--- a/dev-python/semantic_version/semantic_version-2.8.2.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
index f31aaa653233..5805d072d0f1 100644
--- a/dev-python/semver/Manifest
+++ b/dev-python/semver/Manifest
@@ -1,5 +1,5 @@
 DIST semver-2.8.1.tar.gz 15000 BLAKE2B 71fee2372713cefd11778fb223d58cc1e41909cc8adb8b5b3330770eb1ebcaf45c3250c553c40b85c54a59b1427308e7c143e1cfadf6276d7652df339263c65d SHA512 a457b1a170b309ee563955e4c506de56a061acd4e7e92a58fd8bd78801e33207fbc5e0e026fc0ea243301bf9ecfe0b219c0d95681aa10066480cbd3974e17d3a
 DIST semver-2.9.0.tar.gz 24767 BLAKE2B 5fb9eda8c5ccc6b02997292eb6f7be0080480b21bc38bb629fa48af674ec7a356f2b9952459680281a187243acbde17968060c48e4c1af70d10f3bbdf984fbe2 SHA512 5ae9a4a66474fc82cf7e4612796a6c0e0280ad9969ff8c509e99cb266154f39a2c03c68f6167f8e17fda1ac16ce17a838e63d81bc2e78debfd07adbb7cbc098d
-EBUILD semver-2.8.1.ebuild 673 BLAKE2B f1241c5243c516caee8bd14f375c7520266567db8d488084ec953379b5fd43f171b3dc0268afa0a8d33ee5449f35a4169523b3a851643d8a6942fabcd3fe8cbf SHA512 ddcfa8d60dce60e00ba95e764a39d446fa4e21062a764ee3e3d96c047092b83d6d6a6483e7d88bd51e764627affabd2811f68001ebee673ff1e9cc4a3c3b9b65
-EBUILD semver-2.9.0.ebuild 731 BLAKE2B 6c3b5f912cdbe23c7a182bb9c1d59650977d485ad7410c1e5465e5fc9d650b9e174d0680f250a8e6d0d13c49f60d56ccbbb5acbdce10169001561a00c384335c SHA512 b98d63e4459e1a9862db9c7feb64b8d5934fc62ed6caa134b6b53a409eb555306c90c0b8cdc5890be82823d50cfbeab84de136594b910437e71fd6e46d015290
+EBUILD semver-2.8.1.ebuild 676 BLAKE2B 66a1ef41d05d93c62ec38e74e6b33e57bbbe0fcf254e886eb1db4ba7e1f27ceb70ebd4918ba26cb72cc8ad7914e045ccff9cf42c5988467431fd82e285c35b68 SHA512 5d62292de9d38346a19ed18ee14d35467247cc635c3b4463145c9951aec3e1d8ba228a3111c58561e1ed6c3889a75899957062ad4a74891d8863bfdb88ac894b
+EBUILD semver-2.9.0.ebuild 734 BLAKE2B 0d5d7ca793b247d4b0d3790cfab24fe0e1a66064d535dcceb45ee84b7b88036c67f599cb3f7116b64ac1e39c8434207cfb1db54cebea2e4936411af8c310659b SHA512 8b015998917f763c0127d2ad10a49bcbd4a8a76834a1fb7b234a0fd3cf336a1ba8e8b6f0f4d72f6c5c56911a127842345e4f25049c8f731a0bf694b0ad8c0f8a
 MISC metadata.xml 501 BLAKE2B 09ad734b4d8f01e46f57b531eb47f27ce9ff18843e1796b96dcb664a23ca1a675fbfdcaf687452fb702811daaef61e1f3314d88d239cda37db75dda9764bbc21 SHA512 24204b5aece1f9f750ab0d6b0ffccd0d46aa33bfe87020866c4e82f5e3939028fef305b39a1b5536efb521e838a300972b755295b772348569f0b6cd8f30a763
diff --git a/dev-python/semver/semver-2.8.1.ebuild b/dev-python/semver/semver-2.8.1.ebuild
index fb57bc48207b..96c5f29a8abd 100644
--- a/dev-python/semver/semver-2.8.1.ebuild
+++ b/dev-python/semver/semver-2.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/semver/semver-2.9.0.ebuild b/dev-python/semver/semver-2.9.0.ebuild
index 0f3973eaf290..d7908deebc85 100644
--- a/dev-python/semver/semver-2.9.0.ebuild
+++ b/dev-python/semver/semver-2.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index 6a885afc353f..d684f3343a3f 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,6 +1,6 @@
 AUX send2trash-1.5.0-fix-broken-tests-on-py2.patch 862 BLAKE2B 1d0e43f642c47f5b9f56c5e82361c7376501c0b1f5f34573b6a954bf849f26fe9d2bac456ec474c1cef0a24d62a0481a5a62d04b92c943556b97d45e574e410a SHA512 2b63d6fd6c684c950fb3e60df5412931e95dbab18c360a0d3c21a3a99ed011a2c494cd74b1fae933de1e2edc81e7bb9b6f7d46f84c1b04f9c6b3c1b6b6876fa8
 DIST Send2Trash-1.3.0.tar.gz 5563 BLAKE2B 54fe34a5f984ded219a3c17f0e06b74a2e5624a8bda8d5723087a918217041bbf6a2b20976b0b4ba71d4a1e08d9ce645b8d5d7fb022ec8e5ed72786496e1ee90 SHA512 d308dd06ef7a11ad7bcb5d9195fb52aa0c0b8e76590ef11b1576d14815501c32c48b96167eb0a325e4f27d0dbf77f41c012a128d30c8f05d9d5ebec9967e21f3
 DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172
-EBUILD send2trash-1.3.0.ebuild 616 BLAKE2B dcf1f7363c76916232db265f9fee4108da31b128d7943c431b9a10888d2edc81190856a0335ef1e5ab6b8166a271b3376ba69695fa068c00ba99a5e3e958f74d SHA512 d91f43d71d15cc0821891d1cee1614fedfc1b82e695950590c92da1d41549ef1e04dbcf3e71c7afd263a8bd7e83973f1617438a7fad025350f45aa118bb7216b
-EBUILD send2trash-1.5.0.ebuild 685 BLAKE2B 43c2bd003375b6beee3066f909d3fbbbc36a00d3db8a4b56208b4a7b7204a18897934673cf79b42be730264fe6d6299fb8144935231e8c74ff94844bfa1f7391 SHA512 6985af7f0bd2a44ffd22120b52c1f80e4e8439af7bb471df352dce80cf4ecf46f9acbdc691b54586c5ee9a8279e3d4e65944a916efcc739e5f1e10ad015f4cc4
+EBUILD send2trash-1.3.0.ebuild 609 BLAKE2B 2c6de96430ec0f74eef7c0c24c927121eed689319220680998fad0d9fe1a11296056eddce162f3fce8520e162d0e9d88f264302672bbacc4a3f6355812a5731e SHA512 a925426e385b18290bd30282e9f1f0b88db16b563b5857f9091ed600f6a30e106baf7312fa688352f1ccf164010e3b018884fa2f7a9da9576d434d2ff8e891c5
+EBUILD send2trash-1.5.0.ebuild 678 BLAKE2B 5fdb6ea7c361c598b8e07d682d25a1577d1074f3d5a6c75ca5f065ab70790d7f7d8fa19b7088b4ae016207b602b071e96aedcfdf7c5637c48efe40259c67a4c8 SHA512 20681e659f7bdffb1b3149e41d628cec2a732a87be4c3fa61603fc650350a40889cd4e974f2145a818306c02d3d6988a0ab86138b08f287c14d36251da6c8f27
 MISC metadata.xml 381 BLAKE2B 5afbd1afb5fab636015e710ae55c2e7b6c9eb24d1ffe0418f4ae4c6d02befdf4d50922d25ae6dcd134e2f17de1cc5a7bcee0467cdfc03ac86cbf5b31d33153dd SHA512 309a92e88f854e9384519bb8a959025c97a8c75a7ee317a17d2c51c0a444b0fa008fd46fbbe07be3dd95ab2fc1930cfdf2a0c6df7ce68fc190610176f841067c
diff --git a/dev-python/send2trash/send2trash-1.3.0.ebuild b/dev-python/send2trash/send2trash-1.3.0.ebuild
index 437197c803ee..3420408e9afa 100644
--- a/dev-python/send2trash/send2trash-1.3.0.ebuild
+++ b/dev-python/send2trash/send2trash-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/send2trash/send2trash-1.5.0.ebuild b/dev-python/send2trash/send2trash-1.5.0.ebuild
index 3927f5b12513..121fde52dd1a 100644
--- a/dev-python/send2trash/send2trash-1.5.0.ebuild
+++ b/dev-python/send2trash/send2trash-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index 2d45c8a75594..f3339d297586 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -1,5 +1,5 @@
 DIST serpent-1.19.tar.gz 12055 BLAKE2B 1adf86abf58b4afb82a9d2ee3b8fff4107f3e1cd383a33359687b80b2b917ec1af8f15cb5b849c0979035daecf2aaaf1230553a478e59480f160d8df456b5fd2 SHA512 9adac06bb63dfa73ca0043a3ddf868e0afebc81ff7d637e41667314cbe8e0ecb2af807db6c60f5a5a6a6ff8fa11ac42063d83a7376c7e8bcac22abfd3ba5b1dd
 DIST serpent-1.28.tar.gz 26912 BLAKE2B 7608e1a25b4157b8e304fe6e2265f0204a3056c752a58ac0c7eaafe41b4fed9246792147a8af87dcadf5c6e94d3d494f7b561a073e1bf91e412b60a286b00a10 SHA512 776bc497c7cd815c4ef44107bdf53b62bb92229beba0be7efceb9fba57dc7c677bf09832db335485df3e466acdffe6ebf4b3636ae9b49e60075379a7419a29ad
-EBUILD serpent-1.19.ebuild 605 BLAKE2B 87ed39a8e009c745003c852f4238752b643f91aba1bd7bd9aca7823106963a8894abba8050fae6bf67bc8d825419cd03c210fc695fb3dd535de2b976f02651c0 SHA512 3a9d52c6be29f56645ff16920ec553d2ddc8b1342ce5a47ecf97b96a82592347943dddc16c5bb42c5f2a8326525b1984bae43599e0fb5b1f869fb656a7a26bb6
-EBUILD serpent-1.28.ebuild 540 BLAKE2B c06fa6f3c21db9bb6143e6901fd57015dba80da3a43a9c6ccf5b7048ba2a2d0fe8c0b76ac42e292004797053d4b23f714a51c099ed200236a5861a8c16c29954 SHA512 b9436b6e7e70131db419eecd661e3afb59d890ef74f28909a7970570e39ebce4ba9538a3bbcf29b644fc67aab50019f2f4f899e1b73ba4b14221350d64a43742
+EBUILD serpent-1.19.ebuild 598 BLAKE2B 267348b0f05ce61cb443a0bd0aa423f308cf729c8346bf0091759989c7e4d2a62add603b766fed82aeabab6e1a78b11f327cdbd550877821d945f2d88230269c SHA512 84206ec8d1da6cc7811bdb013efa6a8cdad442e26e9fffa4c4b0f42a270eb5469398ac1616a4c9297801cfd855c9824510b4eac09950353ba05933740910e705
+EBUILD serpent-1.28.ebuild 533 BLAKE2B 288b02f08ffae3a805f92f3f3dcaed3f3c6318d614753241061f2b6f7269b86ad3f889816be84b03846c568dd6a9862569b4c240969a49a12a5fe1ccbf8974cb SHA512 75ff7b48cfd69f42acf62b8ca2665e167c000507cc6c412ac0718bae60a407a50dc0bb951afcf0b81770bbfa715cb85e7b93adca240c9b178efad6d331bdfddc
 MISC metadata.xml 363 BLAKE2B f40df45db2fe2c0b0a35e6a9554ea3d39f25575e6e83dce3fb235a72bd1cfc3bd07bb106661470fe3f01f79bcae06d0e70ac8213cffbc9119bdbf4a3c4475eda SHA512 c0ecbe2e072730e43679dd09334c4fa300c1660a740cdb7071d6d87f112c25493b169f0ca7c5a99fe4a978a8d81f87a409519170cbb69430994f16a8bb193500
diff --git a/dev-python/serpent/serpent-1.19.ebuild b/dev-python/serpent/serpent-1.19.ebuild
index 9a0ddfc2e4bf..2befc32339f2 100644
--- a/dev-python/serpent/serpent-1.19.ebuild
+++ b/dev-python/serpent/serpent-1.19.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/serpent/serpent-1.28.ebuild b/dev-python/serpent/serpent-1.28.ebuild
index 7295837605a5..405c52911bb4 100644
--- a/dev-python/serpent/serpent-1.28.ebuild
+++ b/dev-python/serpent/serpent-1.28.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/serverfiles/Manifest b/dev-python/serverfiles/Manifest
index d50e1959fbc5..7bb37c6e9530 100644
--- a/dev-python/serverfiles/Manifest
+++ b/dev-python/serverfiles/Manifest
@@ -1,3 +1,3 @@
 DIST serverfiles-0.2.1.tar.gz 10506 BLAKE2B b653248261f05b20fa65a566e29065e97679383e44d3e8c05d10d1601376de2c39e1690a7ec1b1b3c680f407086294ea0769e030702fd01bff8833cc32889b8e SHA512 80512dfd8381f12aa143a88fb656bc7dca99fbc3c07a0b6cd9c7be8477de984a5121ffdb2f4cfe0f2150b83100b68ee478cfa7f26ea2f29e4a6fb7fe4eb0c18e
-EBUILD serverfiles-0.2.1.ebuild 752 BLAKE2B f994819d0281b400e408b0214738e9670e5ca1a1ec292fe141eb5c530224702b284ff77eb434dd40eb834472e62d2e1bd2ca1a5c08801c3a8150d57b75357759 SHA512 a346044eb63a860989810687d0220fc9e8f2492b65685d719f5cfa6009a1cebb0c9eaccbe9abfd3bfd7a25f54b0fcf569c19410e1482a612c74a8e98edc85abd
+EBUILD serverfiles-0.2.1.ebuild 748 BLAKE2B 5bb3101ec110da6272d4874cdc17e095c8df274e3253efedbf5f7fc2681ea191d56bd0b437b9e445621d2303d76070a092045b525043fb1bdf6b4721992d11fd SHA512 797dd203d0f72980bf0de5d525439de24d069ff77caeee0ffd871ce4ff96dfae0d0eef7b495b9475dd6dd952b68a8298a47e0731b60dd31d8788aa0a08da43da
 MISC metadata.xml 214 BLAKE2B ee4a28a5b07deecdb0f59f382551a5f75712aac4c44a3f1b6086bdc520a5dc1cfaf67982ddeada2044128fcd551b40aba54d463d91142a3c35236cb09e119416 SHA512 e38be8dc636f8d2db14dbf8a5d673224ed83adc030db673cc59ef4c2db90884de5f4e61c3247524d12015486769ee984d1c188acb7488826e659fb36de1b46e6
diff --git a/dev-python/serverfiles/serverfiles-0.2.1.ebuild b/dev-python/serverfiles/serverfiles-0.2.1.ebuild
index 73a27519ef26..82c01548fe96 100644
--- a/dev-python/serverfiles/serverfiles-0.2.1.ebuild
+++ b/dev-python/serverfiles/serverfiles-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 inherit distutils-r1
 
 DESCRIPTION="Utility for accessing HTTP server and storing files locally for reuse"
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 5fd97d434154..7e8737e30453 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -3,9 +3,9 @@ DIST service_identity-16.0.0.tar.gz 30270 BLAKE2B ced67dc2be04db57d79c60f4fa0e33
 DIST service_identity-17.0.0.gh.tar.gz 29078 BLAKE2B 4fcf8ab697d87c13268da880f8d8caf59ad2d5d8734b7a8c65100fdeca81a0261e8c88d21b7c91bbd42fc1e271bd4440826254003eaedac17f66c09312a9f15b SHA512 3824cb473420a5ce6779fd35ff931189ed68286ad1f7f2936e3253a785cd76a77bbb95210a4a5fde1b1ef0c8d9c762b8e89ab44dce60ee43e34b2553ab78b5aa
 DIST service_identity-17.0.0.tar.gz 23502 BLAKE2B 49218eb0c4021d7a69b09ca79d60b3f421c3c35b606de9bb47812e949b0f1284f0fed5bd9e18615bd569ea31b426339fb8ecacaa7e30cca0cb0abf488bea02f7 SHA512 4ba35166b520bbeb391c047b5fcca1dbf137a65e0624c92a6b6c2229f9521627be95195a8e502cbcc5a887d904598b1f0e63b47f6a38ee9f78afe13278d692ec
 DIST service_identity-18.1.0.gh.tar.gz 34252 BLAKE2B 18823e6b8ca9444591f063b4835362522e3ae374cd669f2da299389fa2977f42e0a1d715b35d90e9518bdd8ac8c76e0adf4e121e85e2352de78e621d5f1e6259 SHA512 6b6da48c543bfbe0d9da9f0d03dbd735ce97e64a76cbf9eae2b615ced7b91c5fcca1f25353e53858c48da9c4e0c0be4e33fa4559adb50899a79689cbb372f49b
-EBUILD service_identity-14.0.0.ebuild 1182 BLAKE2B b7cd6acad1c6b00bf29f56b3a7cf1792e9c6b1a395ef2a3dfb962492c334a00ea5a168d1e51b324422eea02f25f114ad7467f0900e9130026264cffa17ce53bc SHA512 f754175ead0642e1268aeb99d20cd7dad8dfe4da50feffddee5ce3f12f8f6a0ddd7750707a6141aba3f07f4b5d54d4b167b5df1ede3afe2cf48a21dd10e4d260
-EBUILD service_identity-16.0.0.ebuild 1178 BLAKE2B 4bf7495b5d918383408999df840b25237f20e28bcc20aa98226fa4aa836027caaeea8bb300d859b251c49250f2baab221d51bec15d98e598ce47feb0a4e441e0 SHA512 bf3b38cc1e7292581ee88545e8524261397344ae4584706d4e54b6d41e4e7705f8c9c7480a5bd678f2da89811100699a6fb27f43f49e64815b6883c82ba04d91
-EBUILD service_identity-17.0.0-r1.ebuild 1259 BLAKE2B 3d6d907f40393e5a0e6b4d87e862ed526750bbe8afc0ace95120984789038439c83873383275b6daeb4420d1f3d2bcfe3460165cc53ad95acda7bda3da3a970a SHA512 3c7e0d5e808dc8aded1e25dfa923db53b8e84f3fb02f9be50ec41fdcad39369cc0e1fa3c37e1a5e3c7c3a4552db372aaa470c18b0576f22effb7e0051d237fae
-EBUILD service_identity-17.0.0.ebuild 1256 BLAKE2B 1e98516c8fb374a0a710ef68b98e697fe287d3162c6971da89d7910fd2c7c58fdd51ddc4c0089d37caf0062eb3981b071a330bca4a6ff934a64ceb1cca02ef63 SHA512 a21d8f63695fc0fc7f60a05efc58460f2b2d714832f0fab9ed6a5cd2d2c694f7d76ece39d99d5ab3d190f85c8a7167021266ea0aa9428f4a5205a64924919257
-EBUILD service_identity-18.1.0.ebuild 878 BLAKE2B 3d00e684ba3b23cc48f78007101dcfbc7d7774d04ca77ac19ea68942ae8bc96a82ea1087e5aca41d485b8481769843f61d174274744a12fefee48f1e6f009692 SHA512 dd18b328c4cb10aafbe93d285a169eb8e157c51df2c3fa0792c5870795aa40ab9bcc9c3d78d8bed36f9123b0e42b1ac3817dd8fc9ef6f8961adac1ae52a6b1e4
+EBUILD service_identity-14.0.0.ebuild 1177 BLAKE2B daa2f1ad55727b05477d68db3612429d200d22dfc51747cf896124e59bf2cbe2c2d9b3adff748b95962016ab1062570ef29af630a57a6a5ced076ae1d42b6c48 SHA512 ec584370e306e0157e25c3e6912bd7063ecd5a95041c5d3e1cd7345df99b1bb9943c21de130b36cd1fe7403684a8b4f8969793ded5518a4cbd6045c8758e0bbd
+EBUILD service_identity-16.0.0.ebuild 1169 BLAKE2B dc22221d2eb2267c26cab543c2656dcf449ac395efdd29b337ae267274f4307eb2bd02c09623f51be7796f704fe16fc51b5afb3cd732f609b6b3d9fb4fa72a95 SHA512 f150fcb4de8dbbb220a427fc55422bf9a0143c129e335e8939c02044fd984fb9d3f7c1492205cc28cb1d1ba77434219dd22c993996654e97b1352f0f7d52944b
+EBUILD service_identity-17.0.0-r1.ebuild 1252 BLAKE2B e3abd5d96ba0c1dc3a8070d9416da58dbb6e1585c3e6f9b9227daf57746afad604a6abb9160f93e0bcd989fd8e349df04f5db09da6a5b70da5fb0ea981dba298 SHA512 b15fed2694253b5e2d43a0b07a42d13ebfcf5a37acf9ac3c747f042043b3e10054c66d8cfa6469a8978699406004852b6d5008271442ee02d9d524ac7ada5459
+EBUILD service_identity-17.0.0.ebuild 1247 BLAKE2B bad11e134bab2c5246ba0ce5f2d0e47143cf06972f570fa5045f7fa533b7d5a86708cf6f4b30f25f429eaa0ea49fe31de3f855ae9f91043215f3bd61bb6a1ad2 SHA512 03b3ee881961fd2b4a83a80dc1866aa6bd7d1a8fa0b6b9d1326ee8e8d4a4f7041f345b82b12166f43c46671b48267881695bf0999cdc28405e3b7cd4b01df433
+EBUILD service_identity-18.1.0.ebuild 871 BLAKE2B 3a51d1055e89dcf4ec6f74f52c07fd7e4db0c8875e20f2bc073906d082ed9b91536fcbbfc742c03eefb831a2e86b77a6a0bb39bea14b1b3bc9f77db05b005ed2 SHA512 fa5420331a5c48a9295cd47865cd7e09b2ee9eff8353f78ffb4e1e9b11a98b392f04559d24eb2b2638efdd7047843af56a5e9e3d7ec57345acec7de015aa8bae
 MISC metadata.xml 392 BLAKE2B eb095e560878b45595b6b82e8acd6e07c89e68af20840190b09acfcc03191167f3efccace6debad6187c64a204191ab5036f40a4c47cee8a38727b24f9115057 SHA512 2140a0ffee3fee440a0ed3846b557ed7be08e4bf37be391ab3c3b7e6823e1f3a44dd30f143927e4fb75b50b029413dce3a69ff1cbaf640f6e5563fc65d9cb5e8
diff --git a/dev-python/service_identity/service_identity-14.0.0.ebuild b/dev-python/service_identity/service_identity-14.0.0.ebuild
index 3ea7283eee11..69089f8ba92a 100644
--- a/dev-python/service_identity/service_identity-14.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-14.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/service_identity/service_identity-16.0.0.ebuild b/dev-python/service_identity/service_identity-16.0.0.ebuild
index dfd2127d3262..524902aaf3aa 100644
--- a/dev-python/service_identity/service_identity-16.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-16.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
index 258f36b34cf5..6ff7ef93ef52 100644
--- a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
+++ b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/service_identity/service_identity-17.0.0.ebuild b/dev-python/service_identity/service_identity-17.0.0.ebuild
index 1adef7fb5168..754c443ca025 100644
--- a/dev-python/service_identity/service_identity-17.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-17.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/service_identity/service_identity-18.1.0.ebuild b/dev-python/service_identity/service_identity-18.1.0.ebuild
index fd27f0ccfd0e..5b7bde943c63 100644
--- a/dev-python/service_identity/service_identity-18.1.0.ebuild
+++ b/dev-python/service_identity/service_identity-18.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 # TODO: upstream made pyopenssl optional
 RDEPEND="
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index 4b03624e9b92..150d31b26a96 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,6 +1,6 @@
 DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
 DIST setproctitle-1.1.8.tar.gz 23208 BLAKE2B b77fdabe04b274e0dba2555b195267f57f1e52b82c523b1a690b5583eecc8ded90a35452f1c6ac15b5b082acc1c76dba973089bd9c11b4244a397f7fb1263168 SHA512 9d0ab8e65afd7e1ac019ea47995498dae1f82d8aebb333dfc4c953e745441cb9a8db942ad8417522d1f9a805bc50ad680f3a37cb4cbbd4214d261d4fed600b20
-EBUILD setproctitle-1.1.10-r1.ebuild 1269 BLAKE2B 25806494a66ee87ead05cea063adfa9b2ca440f5465722e4717a162d1ffdabbd9f29a27ba4f648a93d64f7ea99128a7da59e0501e5e75973fa0a1653036636d6 SHA512 ba154cc2e3953a80f999113aa1d7eaebe9ec6c694d906263fa3e0f11c5c06e8e5753f60867d04d141285316d9ae701bacdc5aa3a50ec8022cf00ed1da7cbc412
-EBUILD setproctitle-1.1.10.ebuild 1262 BLAKE2B fc03a58cbe73d0066f061eeb3385144dd49876cf16376f82f179aed8ceb844f20da986fb57e3fcfae08ecc4712146e3cd8a8c25b28a302d93021ec57e9489715 SHA512 ad4faddd1750d2f68e0d63a6659f18c3837bad989e938ae0ec8def919caf97f359fbf2ae96020f176ca5184e75e4a3d7f7b91fca44473f6c3ab1a9cbd3c797d7
-EBUILD setproctitle-1.1.8.ebuild 1535 BLAKE2B 98777647a395b524494d95eda30212874a7bced7c92ec5ff809ef601fe4296c9599297c7f271c4c5940159ead8fe5f713939367707acc2957332f547d83a9d00 SHA512 d251d671a7894ce5572f00672991d0b0865a25505693341bf252cf14aad9c4da325515878515d8e37e6ce73958548f4005065bec4dec62ec517ffc624409f133
+EBUILD setproctitle-1.1.10-r1.ebuild 1264 BLAKE2B 70bf203df084090dc77878270c371455dcca24d0d6b31cf20d7d8116c65c0df1762bf61ff729fb38edb737e0bfa30f3e9bb03121947e692d378b1edf8cff6691 SHA512 63c9d1a1f8bed7a65d48b50e27d2987e31c91436f7cf15c3fb68c02a5525252958209c968ef2dc6087c00f8a4e5990676d40d4d484b23851812d06c3ee43ed9d
+EBUILD setproctitle-1.1.10.ebuild 1253 BLAKE2B 18006b44dee8ab95f93c70dcfe5ed5823ac97caf55969b5d775678c51f43fa8daf0762768e32c14afe98be34cd54bc058382f563cfb5b79aead09871d878fd6d SHA512 99ee3462ef7dd3b84de1c2a2cfdcc243360d962145bf4042c833c9adcd9ced1c1b53375f33077c3b0f51cda9ec2c2c4d61d247a109d49ca5cdf72c6f7842dba6
+EBUILD setproctitle-1.1.8.ebuild 1526 BLAKE2B e1ae0823575c8465b73d74d4b7c1939cc24830535085b174ac2bf373191daceab4dc0b142b6c8b8b4c4ca89477a783d03a5f5678dc3f7464ffd2b7fe22279b2f SHA512 f0729a7ae4e0e66f8d60de7e552113533eff4431a8737b54b69331b607b80e6c52eecbe66409f23e95f2bb13420cbd4c5b21bf550138f08eb6f10c79cfac952b
 MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
index 9c136256bd0c..98c0ee5baff3 100644
--- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 # pypy doesn't get started in test run. Still required by www-servers/gunicorn
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/setproctitle/setproctitle-1.1.10.ebuild b/dev-python/setproctitle/setproctitle-1.1.10.ebuild
index f78908e3083e..44bd7e73fbf2 100644
--- a/dev-python/setproctitle/setproctitle-1.1.10.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 # pypy doesn't get started in test run. Still required by www-servers/gunicorn
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/setproctitle/setproctitle-1.1.8.ebuild b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
index f385f2f49521..b418e4d83775 100644
--- a/dev-python/setproctitle/setproctitle-1.1.8.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 # pypy doesn't get started in test run. Still required by www-servers/gunicorn
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index 45f28a26abe6..54bb75bf6a24 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-git-1.2.tar.gz 10546 BLAKE2B 52b7cd8387037b1eaee91e9df7de9944ea08bf02f4cf9ea74fa9d0febf85d930af989e9a07289935d8886f0fa4439c4cb46556ff81343981153ca35314703a9b SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156
-EBUILD setuptools-git-1.2.ebuild 681 BLAKE2B bbe31174a603753bd3d9ae30c5e001beb9091f4d95d128045f839c6332ca8e88e21ba860483ca44db9b7d18aac1038b6d554c446387efc5592d6b79ec8a02718 SHA512 f7169f77207d4644e79f476238051247825249b60e8d9eebdd679692ecd41b55bf0623002964cbab03603eb7a1b42ac5120a0cc137944f7d68ef30f3993c697e
+EBUILD setuptools-git-1.2.ebuild 676 BLAKE2B 3b11e1797b71ea45b3443912ba190812e7c77aa6ac2b0f662c39a8d2b3dfeceb778d7c8d2ee4f947095bfe6b70afb14d295e93b6a6e573bdeea28ae4612a000c SHA512 cd5791446d7c5894f941aa57e32dfb5a1dbbcbda16d977930d96179516cd6363f8f622259f8dc5fa7eeb09a0272fb71247f898bf1ce68b569f428a46ff479e67
 MISC metadata.xml 617 BLAKE2B 6a8553d2d3deaa7eedae6706e516b6cab014df33acf8a4589084ce2ddc8b3bdc619253ccc176cfa28a7092efe9044ab171b585fc87d933ec5e833303ad2b6dc1 SHA512 057677807a316be80d26eb8aa9b07a87a60251a6185c85ac1042db7040849ef4e9554be1d9ac15d1b8ff212df2f39446f3c56208fe83d12581fb0ba283d1ebff
diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
index 2bc70bc711f7..ae4ccb58199d 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 3a877f175302..1c50cee6f766 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,13 +1,10 @@
 AUX setuptools-42.0.0-imp-fix.patch 1839 BLAKE2B a11f8fe053a4b0ad8d326be339ba9cc95e3b90441b8fdeb4ad589d8e8248abf63a11f97ff1917aea73d3f3daf054d9fa831e805ad6823f31d474e25d67e15eb9 SHA512 c93a5b24f0169ab64ba3c80aa9c64a70609d89c776ee491de3088dc6dc7149d709836f79affde03aa58e2065e014318182a2359bae753fbb47c98d05fa9bcab3
 DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
-DIST setuptools-41.5.1.zip 851097 BLAKE2B 2411db77cffb24190c1510c7fab623ae0fb2a248994eae01e1a79427d35d8bf6a2f065de0d95dc11105df0bb42962a57c914486b48dc91115ec32e4dbcbc059d SHA512 eb6e944c80448873f8970477aaf474e75879e2b81b91fdc7a308670fed231d52880c3be3452e7ed3f094f20d4afe54b1db24ec4d98845ed47ee5e71dbf66261d
-DIST setuptools-42.0.0.zip 852125 BLAKE2B b3cbba2eb97f7d6d0bb1a1d582c927680ada8d4589c4a196886f95cddd5b8c8b14fb5f0a2397ab7bcdc4ddd5fe6d4eddfab53bf9f43e0781a666f3d88efb8117 SHA512 d430605f8da3820b8d902d339b63bc382b9ec1bb0187385f792226bdfa8c191634df69881e1c43ffa8900599307d0ba202cfcb2d30df12d061f8220b9eae854a
-DIST setuptools-42.0.1.zip 852264 BLAKE2B fac352a9d87245655f8183a8037552d454441ca5d18be60986d3d7883472a8be6af83614cb73896b76a251eadb09c1a67db9789ddbc5beb1dd9c3e1ddadd671a SHA512 d8eea952dc3cd925ddf3aaf059e9042dcb2684fd841446d92f309fcf8ad1869a380784d137006ca1b46ee539b4e1867e5b61eae80553295897df702966447232
 DIST setuptools-42.0.2.zip 858444 BLAKE2B 2b77dbeeb9a3b4138810a96fe7ac0a7800717b4b68d6e9db2d146ca176127d5bfd5e4ef07adfa98758f8c4d05396152ca08e1707caf3d91703c7b268bd291f28 SHA512 ab623fd69b92111d3ab19a3ad9de9c07b4316f4130f3db4068a436d3c13c971d97506f7307c9f64d9cc9ca24a5f3800b68748455e70418d0c0cd240c93ebae35
-EBUILD setuptools-40.6.3.ebuild 2090 BLAKE2B 3d5b2b7f6793664885627b739f456aca0b5903fd9dc4af6604b2e3d9dbb40aab227c5f1619a47aec82759b9e0aa60214bf2ce27a4bdb8ff3631f24cd81a694b9 SHA512 ac07fdd5b84a305f16c1105ecce8288ab69c8c7032538cbf8bfec41ae3c4eaa7ef52706d7068d1135bc3e73b9be8d2a010bc9ac8397ebd4cb20921c7c9da290b
-EBUILD setuptools-41.5.1.ebuild 2619 BLAKE2B 684e57f73715d975d9152a214b6b896f001be4274448ce8618abe4a0cb29f432dbd3b8add384a1a7419dfecd67c295cd0f6199abc6efc3439c622ece4a485757 SHA512 0f0a9a8b1e7faf816d51121103a65b2e9f20676e2a3417cab29e68c0c0557d3ec31244e771b9bb7f454e4d94539908af7a76e1b1f09c86ec6b0c9767263cb91d
-EBUILD setuptools-42.0.0.ebuild 2767 BLAKE2B f04ab6f1810e19600eaceb55a991652a4fac4020a56d0ad1f4d7d092a09c59cff00034cab007afdd7774b74b2db10932ff8c3d36683f4cc81ef9b1f2f026af80 SHA512 28aa998f85729d19569161fadfd56a4a80b55bd8229bb0b2ead0ac7eef6735bd7a83e9241dd379ac5d322db3243b76ee80a5f1380eb2bb99889448cd6193818c
-EBUILD setuptools-42.0.1.ebuild 2767 BLAKE2B da3518f4d491659e511749dabc8247c5271a3076054a6bfb622ffb68168daae439b702c298b6dac92132ec0a9c51e3ecdcd3d87ddc5720421330245d72c12677 SHA512 4ab7c7ba69b5b8fdcbb6e717c6ba470d31994b0baa6634be70291c13c7260f9c586e475caf3dcfda0ac671f0769ed7c65c325fcbd49833f6069dacfcef88c1eb
-EBUILD setuptools-42.0.2.ebuild 2767 BLAKE2B 2a57c2994d54eec7b5f36b7ffb1f32a832cfc9c6549ac44d6a8c8be3a56ea2802de7c850ffe7f7d34f93d5ee7f00c9acf1a99281e1f20b627895c2c792dee93f SHA512 cb7de930f97de13a666097963ca39e342716e40d4e186b4a4dce40d37451dc2b64637304f812ba20d04ac3da4046beb27b080f5b8bb30964ee9afdb2be3265d9
-EBUILD setuptools-9999.ebuild 2080 BLAKE2B 173232a16d3d5fe048b479b021145045960224c4fff9ccafc84e9c7747c4d32cc6f7b1ebadcf399bf52a75db5614fcee32f6c30f26c1c9f6842b422be094bb07 SHA512 e64c7bc081d53057788661659218d82a788c949668bf95e6d4606587da5ab629560a667b39b696dd59f57dfc0906b6dfacd8c8bc5fb483f4b9d8c71a46235acd
+DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa SHA512 bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1
+DIST setuptools-45.0.0.zip 859461 BLAKE2B 060cd64efb4ce67b931f5a5672222d2cb6e2bacb68edd50af5b14b8de95b5b9b7727b76b970084257ec9f3afdf4a7bf4acbc6223b6e355d033af3660dfe4f1aa SHA512 d912d093866dfcf7b0e22ba2df51ab0d366c52bd5796f0aedfa0b1848abc80a2e30035897b83bed08b67d9d7d0fce4b0c4981c2a80196b8637c19f34ec269645
+EBUILD setuptools-40.6.3.ebuild 2085 BLAKE2B afc2dc6270cdfee0e067ad34dac83b0284434ed79329cbb704191388485d4c5c5752e1f546d59e06477041f5ae92fb1b9c34786542deb4a90c7b563c084aa437 SHA512 33ac468d760f3a211b5fa60f3d7104f8ac22a90c94236aa686ca5d41d91229eae1022df90d2d92622fba184dd9d19ef2b3914a07a861dee0f41fe3f3a26aba96
+EBUILD setuptools-42.0.2.ebuild 2214 BLAKE2B 68e0af2f4b69c7b353fb788f00266c839ef74841b2b4770f386ba1d71359e959e93b5dc84221290ad869a4ee79080772ce3cc02799ad122a715538a0c9ac91cd SHA512 5575e21c05fb85c9ab95e1f3f2e8827ae7f0d7074a49abe981adfca1873aeb5bf2fc95fc30019ce553c0805409263707c5cc7ae43d4397aeb7d49e97ed489451
+EBUILD setuptools-44.0.0.ebuild 2223 BLAKE2B cc143e093bfc793aceff351f68b58fd3edb4597a28379f9347d43cd96eb7c55c3b0cf841c56391c3cd92968ab344552cd5806626ca4378d89d55b0588bec59a1 SHA512 8a3ef21926e9ecf6f78f4e56ff4c5b436121dce97046bbc66cef9c244403f5373b8f97e0c686959cc715edb2e2a72c5e7dc0bf0a4ddaa275e27e9248315dd9b9
+EBUILD setuptools-45.0.0.ebuild 2014 BLAKE2B 8a697c77ff7fac9c56ce3c6fc5c817c078bec067a65ba828dad2312da3f4a035aae543e66435f99de778b29c42c16583299da7c763994be2f938d3612b258ac2 SHA512 6e551124454d72c1f5b31db6b1d5fef86ebc4aae4dc4174fde7f559712e647be091643584e8d29639dda4b8c3e694b209e585f392d8c4bc798380d79155ce7eb
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
index a21883a89f89..94be23de816e 100644
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/setuptools/setuptools-41.5.1.ebuild b/dev-python/setuptools/setuptools-41.5.1.ebuild
deleted file mode 100644
index a7b9022b6a0c..000000000000
--- a/dev-python/setuptools/setuptools-41.5.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-"
-# Temporary hack to avoid py38 keywording hell.  Please remove when
-# the test deps all have py38.  Also setuptools' test pass with py38,
-# so you need to hack them all in locally before bumping and test.
-TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3})
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/mock[${TEST_USEDEP}]
-		dev-python/pip[${TEST_USEDEP}]
-		>=dev-python/pytest-3.7.0[${TEST_USEDEP}]
-		dev-python/pytest-fixture-config[${TEST_USEDEP}]
-		dev-python/pytest-virtualenv[${TEST_USEDEP}]
-		dev-python/wheel[${TEST_USEDEP}]
-		virtual/python-futures[${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() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# 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
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python3.8 ]]; then
-		if [[ ${PV} != 41.5.1 ]]; then
-			eerror "Please disable py38 hacks and test locally, then update this."
-			die "Python 3.8 support untested for ${PV}"
-		fi
-		einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps"
-		return
-	fi
-
-	# 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/setuptools/setuptools-42.0.0.ebuild b/dev-python/setuptools/setuptools-42.0.0.ebuild
deleted file mode 100644
index 8c33401e75bd..000000000000
--- a/dev-python/setuptools/setuptools-42.0.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Temporary hack to avoid py38 keywording hell.  Please remove when
-# the test deps all have py38.  Also setuptools' test pass with py38,
-# so you need to hack them all in locally before bumping and test.
-TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3})
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/mock[${TEST_USEDEP}]
-		dev-python/pip[${TEST_USEDEP}]
-		>=dev-python/pytest-3.7.0[${TEST_USEDEP}]
-		dev-python/pytest-fixture-config[${TEST_USEDEP}]
-		dev-python/pytest-virtualenv[${TEST_USEDEP}]
-		dev-python/wheel[${TEST_USEDEP}]
-		virtual/python-futures[${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} )
-
-PATCHES=(
-	# fix regression introduced by reinventing deprecated 'imp'
-	# https://github.com/pypa/setuptools/pull/1905
-	"${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
-)
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# 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
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python3.8 ]]; then
-		if [[ ${PV} != 42.0.0 ]]; then
-			eerror "Please disable py38 hacks and test locally, then update this."
-			die "Python 3.8 support untested for ${PV}"
-		fi
-		einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps"
-		return
-	fi
-
-	# 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/setuptools/setuptools-42.0.1.ebuild b/dev-python/setuptools/setuptools-42.0.1.ebuild
deleted file mode 100644
index 58369bab16cb..000000000000
--- a/dev-python/setuptools/setuptools-42.0.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Temporary hack to avoid py38 keywording hell.  Please remove when
-# the test deps all have py38.  Also setuptools' test pass with py38,
-# so you need to hack them all in locally before bumping and test.
-TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3})
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/mock[${TEST_USEDEP}]
-		dev-python/pip[${TEST_USEDEP}]
-		>=dev-python/pytest-3.7.0[${TEST_USEDEP}]
-		dev-python/pytest-fixture-config[${TEST_USEDEP}]
-		dev-python/pytest-virtualenv[${TEST_USEDEP}]
-		dev-python/wheel[${TEST_USEDEP}]
-		virtual/python-futures[${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} )
-
-PATCHES=(
-	# fix regression introduced by reinventing deprecated 'imp'
-	# https://github.com/pypa/setuptools/pull/1905
-	"${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
-)
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# 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
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python3.8 ]]; then
-		if [[ ${PV} != 42.0.1 ]]; then
-			eerror "Please disable py38 hacks and test locally, then update this."
-			die "Python 3.8 support untested for ${PV}"
-		fi
-		einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps"
-		return
-	fi
-
-	# 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/setuptools/setuptools-42.0.2.ebuild b/dev-python/setuptools/setuptools-42.0.2.ebuild
index 98b924808219..e9fbfe3f93bf 100644
--- a/dev-python/setuptools/setuptools-42.0.2.ebuild
+++ b/dev-python/setuptools/setuptools-42.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
@@ -24,19 +24,15 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-# Temporary hack to avoid py38 keywording hell.  Please remove when
-# the test deps all have py38.  Also setuptools' test pass with py38,
-# so you need to hack them all in locally before bumping and test.
-TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3})
 BDEPEND="
 	app-arch/unzip
 	test? (
-		dev-python/mock[${TEST_USEDEP}]
-		dev-python/pip[${TEST_USEDEP}]
-		>=dev-python/pytest-3.7.0[${TEST_USEDEP}]
-		dev-python/pytest-fixture-config[${TEST_USEDEP}]
-		dev-python/pytest-virtualenv[${TEST_USEDEP}]
-		dev-python/wheel[${TEST_USEDEP}]
+		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}]
 		virtual/python-futures[${PYTHON_USEDEP}]
 	)
 "
@@ -70,15 +66,6 @@ python_prepare_all() {
 }
 
 python_test() {
-	if [[ ${EPYTHON} == python3.8 ]]; then
-		if [[ ${PV} != 42.0.2 ]]; then
-			eerror "Please disable py38 hacks and test locally, then update this."
-			die "Python 3.8 support untested for ${PV}"
-		fi
-		einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps"
-		return
-	fi
-
 	# 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}"
diff --git a/dev-python/setuptools/setuptools-44.0.0.ebuild b/dev-python/setuptools/setuptools-44.0.0.ebuild
new file mode 100644
index 000000000000..7a3bb2682436
--- /dev/null
+++ b/dev-python/setuptools/setuptools-44.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+
+LICENSE="MIT"
+SLOT="0"
+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}]
+		virtual/python-futures[${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} )
+
+PATCHES=(
+	# fix regression introduced by reinventing deprecated 'imp'
+	# https://github.com/pypa/setuptools/pull/1905
+	"${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
+)
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# 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
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# 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/setuptools/setuptools-45.0.0.ebuild b/dev-python/setuptools/setuptools-45.0.0.ebuild
new file mode 100644
index 000000000000..b3c6db3ab76f
--- /dev/null
+++ b/dev-python/setuptools/setuptools-45.0.0.ebuild
@@ -0,0 +1,66 @@
+# 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} 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 ~sh ~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}]
+		virtual/python-futures[${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} )
+
+PATCHES=(
+	# fix regression introduced by reinventing deprecated 'imp'
+	# https://github.com/pypa/setuptools/pull/1905
+	"${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
+)
+
+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
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# 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/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild
deleted file mode 100644
index 34b0627c0728..000000000000
--- a/dev-python/setuptools/setuptools-9999.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	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}]
-		virtual/python-futures[${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() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# 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
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# 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/setuptools_hg/Manifest b/dev-python/setuptools_hg/Manifest
index 5ce864e4b482..34bda0635056 100644
--- a/dev-python/setuptools_hg/Manifest
+++ b/dev-python/setuptools_hg/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_hg-0.4.tar.gz 11059 BLAKE2B 1214c4bded416da5758033c498b78051b48f956011d3ca172ffad25d754357ca2e384bee43b37a6c1f4e3ab1ca8ed9e08dbe27b275728e5c1547ef9adfc3a986 SHA512 95fd8930a8893b8db3f94ca42e51fb0b417818fc96842b0824318a383f4eff2ca54d8e0d51cacfe856abbcfa386aadb0a9cd05017f4b3b26fe8d634d8b5d3908
-EBUILD setuptools_hg-0.4-r1.ebuild 563 BLAKE2B 09fe45cb944347809babc1e757aac449ea4c4e4cbbeee9ade1e1a81594b45228eca09f635d456037eb00e4fe54823975a04746605590f68027b67d56fcdf2a16 SHA512 944aed7c19780e8be818c6e5b09e83df715e022beaf78ee465b9b4dcbe01017dc2a6de01ac010616c29606965039cb1f04d001bf512a6aaeea665b739841146e
+EBUILD setuptools_hg-0.4-r1.ebuild 548 BLAKE2B 478406aa60c363c28d44d61516bba37ca05b76130ff43abce8611b0f4992e2572085229bcae44c8e579f7f681afeffced267c177cd1187e0673f1558476cad79 SHA512 2a2bfc58edfa1d7a093df53cfcde4846c4147c29813fb6a4cdf40d141da997aac0da9487d91a344249865534a4fa359d38d1590b7e87dddcb1ef0600ad4bf159
 MISC metadata.xml 551 BLAKE2B 868bba2cd959832bdf3b29475aa39d5c93601ff622bca3af6603706ee46fcf0be79d176b7adfeef6304c7f3133dce84e04685b2bf0363392d85b9797e60f95df SHA512 54fbb1b88255f33015c6649b36cd87ae8084d63b0b3b07dc05dbdd53041ed56069533fd4d3de501bf431578e2048ceb3a87b064f847cb4f64a86e6af881b528e
diff --git a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
index 48962ef713c6..bade05acb314 100644
--- a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
+++ b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index bbfe6759136d..b354d1928b65 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -2,8 +2,8 @@ DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b96413
 DIST setuptools_scm-1.15.7.tar.gz 15426 BLAKE2B 6c23f2bd74f51ec8633a814ce22e63e5afb9953244659833a61e810c9029227e1cc25a067a59cec5666add76863070ae5b7dc2600953a45def886e52378a3399 SHA512 0aa6056c03fe100cdaa7b11c9d2073431bb5c3904a80a994a8263c0ccac81f7a2c0b6c7e6dfd09ad605c5ff0e86981b894b42920cb69d1ef1d43ea08b2ddd4a0
 DIST setuptools_scm-3.2.0.tar.gz 39646 BLAKE2B 922e2e09a9826e8573900e8d279daf937289f91f8fead5230ea7082d85275d5d988d655854a36afd48d6b621eaa261ac9a0cd486acc115f0e389fb6828645e8b SHA512 1995754654f8bf509ec7f2186857ba0005dbaea0b1c734f521becb9d022c127e7b36f21da8defd5ec9883de5d0d4afe006f9d152c4cefe6beadf8b878e949eb2
 DIST setuptools_scm-3.3.1.tar.gz 40183 BLAKE2B 417cb000c3edba7da8e92b8fb5b1d906d2ef0170eecc4c0b9d2ea490ef6bad4cbf5ca172bee0fc536c83605d361604c728bf4097f520ef8e62ee2d4f004e3db1 SHA512 cd8f3d1e97743097791001197c18a2c8336b9e499a543ec5d1ab6e9b613ef1417b59e34c329507a73c2626506ee892ccaee74dddc5c0950ff71c0bdfba954dc3
-EBUILD setuptools_scm-1.15.6-r1.ebuild 1369 BLAKE2B 99673d974473af093429b261e0ff50ecd6a80db77b290f90fd9d44a5c7f5598bf5ad029773a2ae9d8f005be57dbf116bf182d2d1e0ea8897d4f22b45a99656ea SHA512 eb1eca65372621b2436af79345a0fae61c5f411fc71dbbdf4be0e6c7c1deb2ca3eaa3a425aa9906459dfcadc3520bd20b7c2fffbdfa0c7811ab1ccaed7951107
-EBUILD setuptools_scm-1.15.7.ebuild 1493 BLAKE2B c4f12f5dc9cf52b1823be2d139ebd6384a1f8a440b6b97f599eff1e03287b9c22905a0f0967dfd22265a2a29b058cfa42c50e8954f3dc8e83dd18cc8beb5bca8 SHA512 e1f32c53488134321f7d9e05dd62bae08ebc667aeea1959f2d0c1934257ce815ee4e904a69d43b39df9147ed32eadb082499094026c83a2925002eb19946416a
-EBUILD setuptools_scm-3.2.0.ebuild 1294 BLAKE2B d384327842fb368efd7eb63a8e1b55aa92da5f19f5301f11f113337e849316b8ea57392526d8ef4ff8770024fb532cdcf03e1e7460ca90a40b310962f77dad0a SHA512 9fdf138a968c9e46e265fe7203606f9c111e67e5221011ae63a9af51eec629ddbfaea28c9bc0c569cfe540c6ec179661f92a0d65e84e9651bf701f1e961e2e21
-EBUILD setuptools_scm-3.3.1.ebuild 1445 BLAKE2B 8c65b85340452d78fa35c2f2b2613e674ffc0050956beb1e9ad8ea70fb670c58bad2ecf91c4ebb00c38fa1fc850b009b83f00c79bdc22e10c5040fd32ec96021 SHA512 3503fd1c9ea738340030af82e335fed4bcaf56d07090829d99a9b273e6170338058d7773fa7cad7905d11ce84d2b89453e48ba453a1cae513f8286530608fcf0
+EBUILD setuptools_scm-1.15.6-r1.ebuild 1360 BLAKE2B 7018579392a1c34971b2699ce6a518e08411bc5aeb08dccd4db0a1ad75f20bacd4f66a94d361fead49ced2d8af4670dcf8e88fabce1613920c136b49a9c4e043 SHA512 d72323b9f2d3a111925ae5d05b9ef3bbc101e702598381376ff828041384677746545f520d34fc0b9686590ccfc5f8da5c6535333014e4f1bff64115afc2c2d2
+EBUILD setuptools_scm-1.15.7.ebuild 1484 BLAKE2B 5f8186e980579a7d151033144574b50a80aa151ac9b86d56c95133cc7114da61eee74ebb02cf190033afb07a48d5e43abbd38c5d8b83a43c5e0ad5ceff780dc2 SHA512 d6f6491bb7d85aad75ad4387cf5de04b9e7a3fdb1f1296f438aa95c81bde946e574bd102183509724f8cf2afc33f87ad668fd63327efc6bae4cd5756ed36435b
+EBUILD setuptools_scm-3.2.0.ebuild 1287 BLAKE2B 570ee5970d4c19082a8c1dc048488a715e36a290a712c6495ccbf0f9b84c2439893d23832e6fdaaa4b03655b994d934eff556d2cf379abbdc9dd80ad4f02ef06 SHA512 e5a12f836c0b7c29aa123a7116f025cb4149e585d4d92a2e0de0572d842ea85acd3633682585172e3100c7d556873c755370c5c72fad9fa1f1ad7e7bd8cf9cdc
+EBUILD setuptools_scm-3.3.1.ebuild 1438 BLAKE2B 0c731ce4b9337cfdc2668d3b024191f39fe2d41c27e319390711049eda48e410d31252df9940613b8fc7232313c659beea92b1e67942b79ec7a26f9ea67992c3 SHA512 8d71d8c57765e2ba7eb748ed8d5fd29cd7695216b39929639ef3dd8df6fab62036e7466551f4ab2c9901cdfcddfcf2c74515f425126b3f91b2faa696055128a9
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
index 7d2537afc106..0a41121910b7 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
index 693c850fe6b2..6838fad75688 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
index 2fc83ec82518..910dcbad9edf 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
index 042257c239ef..5ac85ab63f04 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
index 106a651238df..1c9d53f75008 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_scm_git_archive-1.0.tar.gz 2553 BLAKE2B a5ed592384800585b3f58b40571edc929872908bcb5e2d012cefe34e6cd84ee420a3bbbb9e856ef0fbbb972931abb4913d245b98d54b82aaf659247b92a1303e SHA512 fd1a06c86d1a8394e37b91d374b93dd5902906795360688b49077a4530240fd6be575ee66d51c3f61931bc837711bc3c59491d7c9cd165c34e2ec1f314b4cfbc
-EBUILD setuptools_scm_git_archive-1.0.ebuild 720 BLAKE2B 11e79cd3108b9ea8867c686e2510f7607439e9770033fb05ff01e3cd0f2ad2b2e3701cc7a72543f4bc213e5851c7e48bacf638c64bf3362427fff1925786cdc0 SHA512 fd6c56b6c05c7191aaecc5da023375f95931c885dd31f645dd000422d51c211460775b94b7e78e85fe2a32f49778ff90d4df9f0b1d4bdbb579a4ffb326f21922
+EBUILD setuptools_scm_git_archive-1.0.ebuild 720 BLAKE2B 1a32dbd31031a97c1f2e0b51a119f80f6ef0638e0ca3520532791a83db85e864cec2e6a189320f8002e0093ccf558bbd6d2c0c1c0ee58dafbdcc9a36549c2a9d SHA512 bcf408469284be620fcc044502e7d1264cc06398e03a983b757d2fa10a9787728b3f489af6e250b29a6d481b8a32e66891f231e7b3714e29f3477786f1e50c76
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
index 819a015f8fe3..02288254e43c 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A setuptools_scm plugin for git archives"
diff --git a/dev-python/setuptools_trial/Manifest b/dev-python/setuptools_trial/Manifest
index d380f1d9bcda..abdd9b7b438c 100644
--- a/dev-python/setuptools_trial/Manifest
+++ b/dev-python/setuptools_trial/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_trial-0.6.0.tar.gz 6227 BLAKE2B 2df7276197a5630b8140dce17528b75045ea86e15495146aceafc4428f6ab6493fbe8e2edfded30ae644523455df02f3cb85e8bf8879bd4fafc9a332d9f6bc40 SHA512 9104b98627f57ed53c90d22042346875c5324d7b30e1ec9ba1718b5c59a786915a8fe0a53789a5dbd9318a12b27122661234f5be403365261db6a8728ce39827
-EBUILD setuptools_trial-0.6.0.ebuild 670 BLAKE2B b3cb72394d40a6fad1e14626fd223e04187bca32043470fe5e481687f21ea7600e945ca207a7debf769975edfdfc9068432f56b1e19e7df3bdfa6f5aefbc33db SHA512 a550b6ea6f15f7a4380775de789aae518455fa0ebe0606f2ea7daab7a6f3cb1cce445be0d6b76786f317a41228805d3ac9f58bdcc2eb4a26e6e8e35851cb5efe
+EBUILD setuptools_trial-0.6.0.ebuild 666 BLAKE2B fbecaa16ee40ddf597b167610f5407d1fb70d632d48d4c72a901b9c0fc4fb47584c7b4cfb2c68c1a52b1b120b61164cf336ea7e44720b6cd592d271657b979d4 SHA512 c538635f1064d3b741f7c689646697759a42064ce8f87b4022e328b150d7d4baf4a0c6d831d9891890fb9a8909e23c4e8f29568422fc82c6dd5ab956ed2f844a
 MISC metadata.xml 766 BLAKE2B 18d950cdcab937287b9b7c719b629cb361aa63619cc32356d08f0a22a278edafb0215872cb1f88652e4da8dc7fd5a736e28e84e9bf5059b8c4fc8723adc60a7b SHA512 2b7461cf40ca95d42649a7aee7ab1ab262c7ea8cd23f16dff3b6adb2f3450be2f559b273a1c96c151ff654d0c593e5bcc357cfb1506bbba1236d84997a3dd704
diff --git a/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
index d9f1ed17ee31..031cd9a3a5e6 100644
--- a/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
+++ b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index 861a7e0e74bc..8fa4dbd50cc0 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 527 BLAKE2B 8bdc472c2123171bbb937e0a6535c6f7fed01b95b9e691973ec1e88bf50f18ef530a2e99a1a8890605069227fe48adecc5bc67957d0f30c0c17c739fa8923e01 SHA512 e438700837978eb30235a6f30f3c0437fd5c7a287f0e7e831f2f75cee1dfbc55ea7919f22943b34e9d8c60c4485b27653e4341bd409519f5fe200a8a66e9d458
+EBUILD sexpdata-0.0.3-r1.ebuild 523 BLAKE2B 97681eadac4b3584880cc8cb1131b9d40138e333957107021c5ae24573994ce888af3054f024afc9ed9d5c2c61adfaf83b3cd151a09dc9574acc0d7bca24a850 SHA512 bdb4f90bc4003b16a130d1442f67851e1bc5f1b27ec01f768e8ef610d13e2fc7ac72b8eeddd2279207fa4910e26fd66f15c09ee0d6f223f7efa67e3bf0d812d4
 MISC metadata.xml 247 BLAKE2B e205358ad766c8aab0a8a989527dddeefc2f823cbcf03bab4b79f6a8fa1094286715eaaa0abd97c10f9d3a1c58c2a486ef9846e851788daade0e567c31848067 SHA512 9e0ba28b7310e552922e103b228d991b97d2e670bdf48f384f496099b676234ac5449e4ff2cccada5affa0510272bb33c125226f1f54733fa83038e8dccb8e6b
diff --git a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
index 45b2f30c034b..1f1fbd53322d 100644
--- a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
+++ b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1
 
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index a06985668cec..de5f8e75d59d 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,11 +1,5 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.12.14-tests.patch 1261 BLAKE2B 57c41b50078596998758410f79f0c54458b7884015382f28c82c893223620b42191d19f7fcb4a7065c38e6f2c35ee3e5e3c238667154aa0a2ad3ed6c6e342664 SHA512 e31ef40766e793e1717d15a537a30bf184cdee767d97b06b073074e0545c7d7fbb6a215e21d86ac70e0991a2a4d1bc35165442414ffdea4ece9a7c6a0c73952d
-AUX sh-1.12.9-python2-unicode-tests.patch 674 BLAKE2B 18153eb571fd50faf9c4e733b53f63f0630e7cd172eb5e5bdc04f550b49e247e9bdfecd6fc81868125c270e21899de29cc418e807d6b26df5ea8dd97a85d5b16 SHA512 c33cc195c54232dc7790aba2b34750f623a00ada51f55fc5da3ff9979f2c83359a904e47c0c3ded9f016ff256fafe5099be824261d91af0603f2d714c01e2342
-DIST sh-1.11.tar.gz 36821 BLAKE2B 30ac7cdb814b307c810190deea54f819d7ad3d134440040c5e0d1718b970331ec4764665f79784acf40b3905da074c19e9dd0338f7306e07d086a583dd058517 SHA512 ccaf178384b5a609c00bb44796a6bec088750414385f19b2d8ffcb93cc8f5ddb6bf82fb966d2bf519651f6efed54258a3c6542a9827d01e6be64af8cb8f86d3d
 DIST sh-1.12.14.tar.gz 56861 BLAKE2B dcab86c518fdfdf763053f05a6701fbd0faa76e05d710d6ef709dca89b7527157385ecde355f5f358ba08f7da8e551712732ef43f3074f5568fc7092ed12f014 SHA512 5f2daa2666cf8efe90ba550c8ea5875f2a8812d787597c9d9b933f58feccd192e1ec0ab5695b756bdbfbf9748d106c2045be20838e680b31dac3f778970b5786
-DIST sh-1.12.9.tar.gz 54077 BLAKE2B 6a63a07fe82479388e5d84655d7a22d01fb2be2cb858884f2f69799aa3390443cbf7e6d42b640be6432239ab5d1a0db0b69f1e39bc3e30719dbba78c6fc8f5f0 SHA512 378ebfe148de6d1fb0f6488a42a39570f1fde6bb2d3ce40cbe29a6920e102f4c31d38a686663e52b2968099d85a0b5867e112c5d53ca0a4527a2f2bc9e607d35
-EBUILD sh-1.11-r1.ebuild 505 BLAKE2B bcdda93f27cae340b57c54df8cafc2a3076b88e93a3ee3b30345711bfb945c836288d95832a3e4f9c6e5d2fef5bb66b77d6c275e1e83595c5c66e1a9197c471e SHA512 2b7b8d5f0e95e71f22a035cf42a95c51799d5c092c429ee39a1acedc22ca0dc46d0d96a0df55d0a9300c0482ad2fbe91f0252b7a64630b64b7783dd937a5c452
-EBUILD sh-1.11.ebuild 495 BLAKE2B 550a3fe10a5e82fa8c251bc61dee8fee805b45938d07dc1202895563ff59fa3a2e1bf635333fe53222834461b339748b12f29317baceedb76b188a5de3210467 SHA512 5e3c5fafa966277c1d227079ff70fa340f6c4b3e7f48ca3bf93861f1980c7e195cb7545512cbb11234e9b7136a06482826339e4cb33375005d096b05d13047aa
-EBUILD sh-1.12.14.ebuild 672 BLAKE2B a644f818667bb00ab0423caa3291f68276e25289ab9b7b5a7c07895c70f3e8fab657337c0b6c4b1ac964da86300167a1dfbf6db735d421c4fa96209919255f64 SHA512 7559fafe47d08f47e21fa36b4016f4bd24528576401462a2960adfc08b6ef5ab4d734092cdb8f7b52cdbf3e6d4a81405cae4bd075f7a55d03fce69e839040cd7
-EBUILD sh-1.12.9.ebuild 575 BLAKE2B 117dc214f33b5820d3f2c36ed55b09018f75765ac3cef57c5f461fcb488bc82499e538f7255412aa14030a758fa25375e118c79a81c9ad0d960963cc00239971 SHA512 b300e0ea0b7863b4d3165a3f537c4ed95880ac4d3f6e6ba8dd28d56ea315ecb84330c561447232d2e5ffce314bc92cd08f4e024942e1c7f937b5ef0233db894b
+EBUILD sh-1.12.14.ebuild 667 BLAKE2B bcaf7fa8b7160f5126103efb90745449fad781392ba4aae7ab10e6a6d1a02291f6fd402cfe3e42102327f13790c42803d40e10a89c2bbea24c11ae0dd3d21a9f SHA512 5ee9a0bd52d1579ccf77498a7b97e697caa10818e514b58603750ae91e2178e5208340deee7313a2256930e6122277f1a71295d7d731f2b285e17d6ee34fa74e
 MISC metadata.xml 676 BLAKE2B 217e170b6b5cbfba2e5029c250dba3927f3cd2b3bbc5111cb5ea459fdcc1bcff0448a8dd2e4e2d8afe42f459e7a485fe4fe04202e9c253bd51f785eec216eb5a SHA512 4d4633de70608259eb2bb288af89992c90fe192258ac157d07f2d568922a88b497cf6a3e2961b266603089e55ce7cfcd7ae2831879ed9afce4c3c740479c2756
diff --git a/dev-python/sh/files/sh-1.12.9-python2-unicode-tests.patch b/dev-python/sh/files/sh-1.12.9-python2-unicode-tests.patch
deleted file mode 100644
index 230b16ae5fb1..000000000000
--- a/dev-python/sh/files/sh-1.12.9-python2-unicode-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/test.py b/test.py
-index 78e00ab..0487594 100644
---- a/test.py
-+++ b/test.py
-@@ -502,7 +502,7 @@ for key in osx_cruft:
- print(os.environ["HERP"] + " " + str(len(os.environ)))
- """ % osx_cruft)
-         out = python(py.name, _env=env).strip()
--        self.assertEqual(out, "DERP 1")
-+        self.assertEqual(out, u"DERP 12")
- 
-         py = create_tmp_test("""
- import os, sys
-@@ -515,7 +515,7 @@ for key in osx_cruft:
- print(sh.HERP + " " + str(len(os.environ)))
- """ % osx_cruft)
-         out = python(py.name, _env=env, _cwd=THIS_DIR).strip()
--        self.assertEqual(out, "DERP 1")
-+        self.assertEqual(out, u"DERP 12")
- 
- 
-     def test_which(self):
diff --git a/dev-python/sh/sh-1.11-r1.ebuild b/dev-python/sh/sh-1.11-r1.ebuild
deleted file mode 100644
index 809a920a6c82..000000000000
--- a/dev-python/sh/sh-1.11-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="https://github.com/amoffat/sh"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${PYTHON} test.py || die
-}
diff --git a/dev-python/sh/sh-1.11.ebuild b/dev-python/sh/sh-1.11.ebuild
deleted file mode 100644
index a1d927e6592b..000000000000
--- a/dev-python/sh/sh-1.11.ebuild
+++ /dev/null
@@ -1,25 +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="Python subprocess interface"
-HOMEPAGE="https://github.com/amoffat/sh"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${PYTHON} test.py || die
-}
diff --git a/dev-python/sh/sh-1.12.14.ebuild b/dev-python/sh/sh-1.12.14.ebuild
index 2d02b529b89a..3e665fc94200 100644
--- a/dev-python/sh/sh-1.12.14.ebuild
+++ b/dev-python/sh/sh-1.12.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sh/sh-1.12.9.ebuild b/dev-python/sh/sh-1.12.9.ebuild
deleted file mode 100644
index 4f3271d0964f..000000000000
--- a/dev-python/sh/sh-1.12.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="https://github.com/amoffat/sh"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/sh-1.12.9-python2-unicode-tests.patch"
-)
-
-python_test() {
-	${PYTHON} test.py || die
-}
diff --git a/dev-python/shm/Manifest b/dev-python/shm/Manifest
deleted file mode 100644
index 0df81e1c70a6..000000000000
--- a/dev-python/shm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX shm-1.2.2-compiler.patch 464 BLAKE2B 3512f44816c1bdb13ef876ce657ff43695814f9fd0ac1639a6585790531f006e3d643817fbfef1c5e7e6ee133ad93565ae5aea001faa4f420a9d2a5e1775bacf SHA512 165d898892eca56abd410ab0c70879055eefe1429afce42df2b0af48f0182c8f926e08772013efbb4551d2a684d425c7c6ea9f280af51ed5745b9ecd860d9ad2
-DIST shm-1.2.2.tar.gz 25258 BLAKE2B 6adc3dd1aa8e5510029b48210e87dba672415bd142cef312717f3c8e6537eda8553adad7054c0fcea5c6226633729ed1cb416384f5aca1cd7d967e03ba1e62d1 SHA512 d3da728d7c314b208b235490ae45b9f9ed4e7ac5c233867844b842ee511e50b684c52e75cc9258d0f65aa93ff2b10bca6a4bebfa6aef9b43d07ab284c0cab2a6
-EBUILD shm-1.2.2-r1.ebuild 662 BLAKE2B dae5a213aa54140666ea9b6d833021e3874676e5d05cb8c7ebaea473700c7ed985b78958274efa20257d2051d3bab54eed5a2298e51484c3121bd236281c81a1 SHA512 457cbd2b5ad0c9357297e9b83ff2ecafead74befa755fea99cc2d326cc179833a89a555d512c16b8bf166af40a16ae20112d9e15b5bfc1abd16d2a4800b68522
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/shm/files/shm-1.2.2-compiler.patch b/dev-python/shm/files/shm-1.2.2-compiler.patch
deleted file mode 100644
index e9e1bd22a3a1..000000000000
--- a/dev-python/shm/files/shm-1.2.2-compiler.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py	2010-06-26 03:29:30.000000000 +0200
-+++ setup.py	2010-06-26 03:30:10.000000000 +0200
-@@ -84,7 +84,7 @@
-         filename = "%d.c" % i
-         file(path + filename, "w").write(src % ('_' * i))
-         
--        cmd = ["cc", "-c", "-o", "/dev/null", "%s" % path + filename]
-+        cmd = [os.environ.get("CC", "cc"), "-c", "-o", "/dev/null", "%s" % path + filename]
- 
-         po = popen2.Popen4(cmd)
-         if not po.wait(): underscores[i] = True
diff --git a/dev-python/shm/metadata.xml b/dev-python/shm/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/shm/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/shm/shm-1.2.2-r1.ebuild b/dev-python/shm/shm-1.2.2-r1.ebuild
deleted file mode 100644
index 5a0f1e3388bd..000000000000
--- a/dev-python/shm/shm-1.2.2-r1.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="Python modules to access System V shared memory and semaphores"
-HOMEPAGE="http://nikitathespider.com/python/shm/"
-SRC_URI="http://nikitathespider.com/python/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-compiler.patch )
-
-python_install_all() {
-	dohtml ReadMe.html
-	use examples && local EXAMPLES=( demo/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/shutilwhich/Manifest b/dev-python/shutilwhich/Manifest
index b1a4db4004ef..1392b60f2fc6 100644
--- a/dev-python/shutilwhich/Manifest
+++ b/dev-python/shutilwhich/Manifest
@@ -1,3 +1,3 @@
 DIST shutilwhich-1.1.0.tar.gz 2300 BLAKE2B 0b510fe364991bcb1b2a627368e0aba23550a60dd0c8f892dbf25b5f23696f49ceedec487d91cc6a5acaffe28c29f635bacc633cc3c3377799fa8c75bd8bcd4d SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21
-EBUILD shutilwhich-1.1.0.ebuild 517 BLAKE2B 8f559d0044422b7ebfcacefd51a2abed640b815b34c85bfaecd19f74794d38a13eebffe81c525ac15feec2f65f97c7043f88866f2c0eb13422cbd8de94e0fa96 SHA512 a2123cf69adf89a95714d1015cd49682dd1d2d44cf43afea4df405e5bcaca051f56c56aa3a8bc0aad6b1bb87be4adda38ec3bb2c3c43500121c3d223b30a0504
+EBUILD shutilwhich-1.1.0.ebuild 515 BLAKE2B 9d12ea18a8b0f8071b880714426ef663702ceaf47a044a1e1a90043ab1e54928b2dedd4edb502af71e2776e7aad96efa687e62e23738477d9a65cc5710b08ee7 SHA512 36e67d5a293e9eab987dd48ee972d1da0e5f5143b498ab62330cc5445cc45cd0a54ced473d66c11685e6a8b937ab759f1a8a6262e942cac52ef5c403cf6d970a
 MISC metadata.xml 661 BLAKE2B 939bf0c624afa004f9db51b5dcbed8b9425dc18ab380ff1a17dea7970541a27583a69c137b90ce19396a5b83da7aa6668f9258f6c388b5a4205bdae2d4057a38 SHA512 962875eb4e6647865b9f16c66b5e40c3ff84406e1be3429010ae1914eef102ec8f7353f31f9e8697511830224112ee23796adc69cbed17fe1341892c58fd3a3e
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
index 97ffcae4bc45..633740548c5b 100644
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/simplebayes/Manifest b/dev-python/simplebayes/Manifest
index 2b6e42daea5d..6b09c323feba 100644
--- a/dev-python/simplebayes/Manifest
+++ b/dev-python/simplebayes/Manifest
@@ -1,3 +1,3 @@
 DIST simplebayes-1.5.7.tar.gz 19260 BLAKE2B 373820a19c1a3188f0dfb57cbe6ac8e27fc6a96e9d1686d698a1f109122afd5240715678d965d843482de3c12b8b806157acef17008d4c6fac0103b343dd44d7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc
-EBUILD simplebayes-1.5.7.ebuild 704 BLAKE2B 3b5bbce64451fba86d86113c12c6f2e2dcb6719cadc26ebee000fa5f21b8e29813fab02c9747653fbdf264be6259860238f2ad3ea718c5a731c4e8e734d4e97f SHA512 b3cc8994eef85e5f2a50382b18e6c0e1611140d3f33de1d77bca7458b0e3ce4484e8a006ec602f5d289994505ce2ddc24f7673eab01e6944c8c068aba2650c76
+EBUILD simplebayes-1.5.7.ebuild 700 BLAKE2B a24687bb6d5d41cc05a6442740efa0982a2818597cd09a8b1e64e24a334c88f7f45793ab853a8bd03ccdb492561b4e50d90956ec11fea31b97efe454f9c31fd0 SHA512 51f2fcd841cf7474178a5e83a1c24b12c1561bd4e52f9526eaeb93d193b3b4eb15b25ef1518228a3dd33a0b7f544ec1ee12f432e74f92196c8f1d7e0df088cf9
 MISC metadata.xml 613 BLAKE2B d2456e6bcf0c65893658fe5f64edd2a407b394ef468f4afc9c7f7386042dca32602acc7ed9822dfa7445f6853d3ecba4579b397630d73a9dbe62389495386bad SHA512 ca6a18f6ef26a213a83f4dbd6fba4542c868365fc713f386a0ab92e4cb60a9faf0fa96f82bdabf81ec301745a63d35e821203ae67dc0e1b6ef3b18cadf50a97b
diff --git a/dev-python/simplebayes/simplebayes-1.5.7.ebuild b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
index 9b847a519d56..0e213daf1600 100644
--- a/dev-python/simplebayes/simplebayes-1.5.7.ebuild
+++ b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index 010815655f27..3ffc0dd6ad3e 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,3 +1,5 @@
+DIST simpleeval-0.9.10.tar.gz 26687 BLAKE2B eccde3c580f65bc22e88711cdfae4b1d6509515d674d62bab501d1cdc5dc1e91f76d391441e012f7fa51221e2c807b831dda05e7b620303d0845b5032b1a45be SHA512 50710221b49ff618218375d6d9b4eb9ee12b875ce0cdaaa63e2dfcaa112918f5bfdf8f02bbc3b5be98c7abc312f99563d910985bc5ad86eb846df935fc072eab
 DIST simpleeval-0.9.8.tar.gz 24554 BLAKE2B 92adb2de03e2e70be99adef625de54c02c39305475f8df4517862c9a2726ef5c36e3e411f6cd1b4e47d57ed20ce66b3fc55ef402e705c4f3d49b8b2389919e18 SHA512 3aedb78571442283bc7b2bd1754dcc2197f81b264c6e629acdd8307a0adb7a4f06e084bb121caa0c36711153253b884942cb5c50614afb58e0e895247f8c20aa
-EBUILD simpleeval-0.9.8.ebuild 522 BLAKE2B 4d8c6f45ed7e59e18f431d529e0e87eb064877a64415d8ec27da15c43f41b40b662033599b558997f44fc47417e69de6e3c162378eda8678d2c5cc281752d5e6 SHA512 91f73a4ba7f59ef372b16a435bf24a8b2d22ff7ccb3cd1e2c1308775bb1735cc326d61935d7f3e23b0f372cbdd0694758e0c53b1acf93c5a546b38f7cd4ed243
+EBUILD simpleeval-0.9.10.ebuild 514 BLAKE2B e01d622c9c0a1c2d8648c6f1fc40dabe395ab9b35b9e6e4d32be2516a939da2a701d15d55bd1793d6e3c0ff94a0487572df0676b773984e0591d3d26dd4c37b0 SHA512 fca490c1d49dd2fb41184f2d9e30324ff0f68f90c9453527135c68702127da5072470f82018301cfe7e998b27666bd24c3f0f68323f92bdd3d7c802ed1a123eb
+EBUILD simpleeval-0.9.8.ebuild 510 BLAKE2B 1d2c41c755e70df8031b1f498bc7661bf00e90bfd44359de445be0b3a434c11a4ab7a4859a39511807398053fe37c36c5018efc4c9276b9b150726f002ae4c64 SHA512 55d5c26a9a078096c0c76af8dd85611fdabdf9a2c8bb5f05dfad93cec780d7df90a58bea94bba77d237ecea9517e5484f1f33d19f3cb7250144f1d754d0b17c8
 MISC metadata.xml 483 BLAKE2B 5ca6ac5ffec78efa1b4c14df21173e15050efd7a024d87cbbbd86e59835afe2dabd4ac44c277a23276eed79dbe889f0f5a5a514048aebce42aae9c46f8d832f0 SHA512 a2f3d2ad7fb0d4d887022003498692c18db8e4ea6de1f5c5eb2a10e48af624a887dc2a06d91a73023c17a2fadb52e30e9e14b9686f0c0d73b60b6fe35ac39222
diff --git a/dev-python/simpleeval/simpleeval-0.9.10.ebuild b/dev-python/simpleeval/simpleeval-0.9.10.ebuild
new file mode 100644
index 000000000000..082108d43d4f
--- /dev/null
+++ b/dev-python/simpleeval/simpleeval-0.9.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple, safe single expression evaluator library"
+HOMEPAGE="https://github.com/danthedeckie/simpleeval"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS="README.rst"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/simpleeval/simpleeval-0.9.8.ebuild b/dev-python/simpleeval/simpleeval-0.9.8.ebuild
index 4412a5111fe0..a21024cd9adb 100644
--- a/dev-python/simpleeval/simpleeval-0.9.8.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.9.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/simplegeneric/Manifest b/dev-python/simplegeneric/Manifest
index 1f6b444cfde9..b2bd1c9184a0 100644
--- a/dev-python/simplegeneric/Manifest
+++ b/dev-python/simplegeneric/Manifest
@@ -1,3 +1,3 @@
 DIST simplegeneric-0.8.1.zip 12663 BLAKE2B cc3d70f8f4f04209b7ce259c6caaccec001515a3da04736cb8baa5fe7e6091f4f85bdde0c5c4227a01bfe52739f51ab0116d8bfdc4bb58bd2188c3a54c5eac37 SHA512 74c25d4e04fe197058cb43fabe3702cc5901989dc0b0bcf7511369f4f3d90fd98e4225174db0680c8f39389914f82824bdbdaf4c302b53998fbabbf0dba393e4
-EBUILD simplegeneric-0.8.1-r1.ebuild 615 BLAKE2B 8db24bedb543223f3dbc37d1f4d37db6a32ab7c02ccace7d6dc438688d7b413a3d5512a92459ab39998ab72e68ccebd04e44a8858606833f7c5d510562e641c4 SHA512 1bd15a90f4192b7d819d67bb2c871bd3dcdd3cca9b72fbbbc7f2b4af799ae24d2d41d6418b558e2e0aafd9c4208348cfd71a600223335103d3635c3b326ed503
+EBUILD simplegeneric-0.8.1-r1.ebuild 608 BLAKE2B 042d69ab4945ff7e7c2ea1133c8fcbb5031c4e83485dfab74697d01626cdaeaa8ff2fd8e879ed4cf062ca1d8619b209638c06fb8958cefb89d03ba77857402eb SHA512 9d0d94bd56a0c13d628f7b87f3f21bbb7d04101e94d3285622ee797bc58bfd3d22604b01b46fe24144c57b0e85f7284826be65a64e4a6ee17b827da0319b21fe
 MISC metadata.xml 732 BLAKE2B 0547a9360068981db23bed7749d4043fdb9e1d42da49043a1b986e67598a613e2af2b7261b06bdd2070ff8e1b6c37522a023520f71e18c7d1e44170e49ecf09e SHA512 3d138aa823f1fa2f8384dc4a29039c8f143c3ee77d8f2b410be55b01dafb402d6b678272e0766fae588c12a6816a6df57f84823d8196dd4e748b9ab01742e50a
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index 05c774b1519e..9743a6f4da10 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index b271d2dded86..c36db251da17 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -3,9 +3,9 @@ DIST simplejson-3.14.0.tar.gz 80112 BLAKE2B 5866adeba886b4b4f526d4d7fb7ac65f12fa
 DIST simplejson-3.15.0.tar.gz 80963 BLAKE2B affa7da859bc2b2426389d881b53abdd086a2f7082decc9f8968859f54354d50747eb6f1cb8c4cc0151ef1e2cb8ecfb8aabd9f2151eaff2f39c4d08b9430f432 SHA512 601d575a5b8be66a33df28f27292ed12e5aeec39c74aa5a5108d82890dfb45a086e7a3a5072e012031209465c5c518909b4c1fb261fc055e6b9b1523a6bc39b4
 DIST simplejson-3.16.0.tar.gz 81203 BLAKE2B 84b465cad6d78814b13ecf5e75b09cc63a9aaaa12b1412567feabdfa02f9c0e83bbcf8191425c517cea38f6bfccbd691442fae4322957dc6ead6565d23393d6b SHA512 c90da313b21ab862b6132e7bbe4883830c8a26fd36224f307859042852cdb900e36e41cc7c6773a1d4cf89476cdb68e1136642f38864ad6ed398716390122968
 DIST simplejson-3.17.0.tar.gz 83119 BLAKE2B 979dbcb5d50aeb55fd1c16daa398ef915ee1f23ca25a84870a3132c265202d1cd253090157cdea179cecc6603618df293a28adeadc795238ec3ccfceda88ea0a SHA512 383ee4fa3b2f378cd83152ba588ffbb620aa0e7cec80d3e3097edfb406a60e96afd6c5302a5b64adb710d3a52479c609873a2db7ab5756d7ca7a51412029e4c6
-EBUILD simplejson-3.13.2.ebuild 850 BLAKE2B c571ef88be326eb5b0e9a1292e9c962f939c00d80c20f5c994385d949352341d50d644040feb28f32f7b08d97fd4567ade53effe5941e40d8db0f5f612aeaa50 SHA512 916ee02c477de949d9a0c4c46a80df194dbd17811e57ed9abbc159a621db93d90eb888c08f852d9ff252c925bd740180317aa9d43b6e89e7413b53d1f85cb0a1
-EBUILD simplejson-3.14.0.ebuild 854 BLAKE2B ccd0dacc0439ce689468684172e9b89ab5ee49cb3ec639c5971efb99e02d11d76ce5d6f74ffe6056a9d7900679a006a7f5633f16ddf4a554fe194513b0f22305 SHA512 960cc42f106b5536ba099d16543f1fad778083d9df9e68c6c3b124ee4de83913cbffc557612d1f3d1e269abe9fdcea815102edd883f48cf4cecf302dd95a9505
-EBUILD simplejson-3.15.0.ebuild 862 BLAKE2B c598ca357339472b9fe0fa3fd24e806b0933d96d51ea33d7c2b194b98d883a3c475d434d7c07d61062bdc414c12a0ccba628ddf9249945837b35c6251f1c4f83 SHA512 b9907baacd9f1fc0ddf3aa219eb3f514e85ff2f1038f07b18878666c621cce212be6789a1cd485fedefc77e8b1822a2396103030da1cf02daf6660059b758a2a
-EBUILD simplejson-3.16.0.ebuild 854 BLAKE2B ecad7bb6191e1772733f8fccd46a6d65802ab68a507741ef57f5bb120a5ae87ed7905df9f2066d375892a497e5644a081919db7b08c1a6da57c936c528a06948 SHA512 5ec12fe3405b7a18ac525d55ea1e5978b1f530cdbe55174ea307c507ff84eb63440b977ab7d2231c7148b61540c9233fb652e647a8547f8b0c438c628cb3ef37
-EBUILD simplejson-3.17.0.ebuild 837 BLAKE2B 77f3b0e6dc2a78ef849c83ebe6a5c482316a39e718a62bdf7ef25108d1e63e2ea896abe6d99bbab8ec031bcc316abeeb333b50ac731e9d726f3c5b6e555eb315 SHA512 178200ab604240e788aba5ac6cdd28c2b2834eda5b978a02633af44670b6d4ff11d155ed105741cdcd0993757f02400f0cc381855070f30fb62bb7e6101ffc2a
+EBUILD simplejson-3.13.2.ebuild 841 BLAKE2B 8e9b3598a91754c54309678352cef6dddf9c26c7eafaa65f52279328d7d19846c59d9432a1ee77385b076ddaf9510fdd66347e1a6f155adef1e480a27b01e001 SHA512 cf62e0ae57d913a1b4049f9b1c433873ace5de1f26b4a8bcf708f3efa119f4fcb198df5816cd303b539527ffd7995d6f87b6f94faa2cdf8d5796554090c496d1
+EBUILD simplejson-3.14.0.ebuild 845 BLAKE2B 507a53ac1a2155d39bef2955b9df21b9456d864c498c24569428722693345cb81f9663ec8d12a23cab4012a239cb05edfac084b8a1a102033377b3319d22518b SHA512 c9c79842cc382aa4124eff61e6f704d6e0b64c539508126cb34898ba754ccfb6be13896556975af2645f2ab78295efd08361015cafca91f57d768cd986ed4999
+EBUILD simplejson-3.15.0.ebuild 855 BLAKE2B 4384e149f57083e4918bacfec2c32513ffbc2ad860270f0465da959db98c8ce436e944b2635d4a69048ca4f8a58db9995281a6e95ee66a1b88caf20aea344096 SHA512 bc1d940322afef606f064c512a97cce225e2e361ff56a528ac4fa84b7c799adb7f44fd130d93fcf79f1d4e24f948a21bcdcb02e3026b2a9234a5da62d91c40f1
+EBUILD simplejson-3.16.0.ebuild 845 BLAKE2B 73ac5530b7e9364a49d4cb9f67917ebce4da28450918af73bfd772073b712250fe3035ae9e77253fb0e9b1b9eef3d8f7287a1c0a99a256740713cb737466fa07 SHA512 97f8fc7a91f89aefb7f26ad90f83d91b0e82441464477f0d714f4d1f123f48974c289d5a8809a7353ecafc72f7fc3a1d7db587238ddd78c6760e8f08e3e3995e
+EBUILD simplejson-3.17.0.ebuild 832 BLAKE2B 1eac43ebf4ca9fe10d5b64fb021f15749f19611de99105a9f69fc86a20449d19bfe1c3833ad7d9ba4111b00e548ba2f9819aeb633a279ae4fb7fbfb7c52c9d73 SHA512 90b065034b9cf8eb1069ef915bb84547475ead9fc7783537d11cf58d5801508dd06c779ef5f866b35982cd6f8a0229aa459d3989b5fdd3fe967a942a07e4e640
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.13.2.ebuild b/dev-python/simplejson/simplejson-3.13.2.ebuild
index 491d52cc2398..2da13f8ca024 100644
--- a/dev-python/simplejson/simplejson-3.13.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.13.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/simplejson/simplejson-3.14.0.ebuild b/dev-python/simplejson/simplejson-3.14.0.ebuild
index 3e52cbe1ef85..cb34981e5891 100644
--- a/dev-python/simplejson/simplejson-3.14.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.14.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/simplejson/simplejson-3.15.0.ebuild b/dev-python/simplejson/simplejson-3.15.0.ebuild
index 291c3847e0b2..499aae6059da 100644
--- a/dev-python/simplejson/simplejson-3.15.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/simplejson/simplejson-3.16.0.ebuild b/dev-python/simplejson/simplejson-3.16.0.ebuild
index fb3f3518ad58..b8b4251c519e 100644
--- a/dev-python/simplejson/simplejson-3.16.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/simplejson/simplejson-3.17.0.ebuild b/dev-python/simplejson/simplejson-3.17.0.ebuild
index 08d29701439c..899060345897 100644
--- a/dev-python/simplejson/simplejson-3.17.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest
index 2fc6013d3ec4..a32f78ec25af 100644
--- a/dev-python/simplekv/Manifest
+++ b/dev-python/simplekv/Manifest
@@ -1,5 +1,5 @@
 DIST simplekv-0.11.11.tar.gz 19708 BLAKE2B 558475867f2a023af9cb6c1cfc7a161107db7ab6550d19bc4f9ab126c586808b15378a11f23966e2026ae142764533d7efa3960c4e929ea87edac48c52635434 SHA512 8b44e817213b90c05979ac0d4b2a7444a415eca6b4a1b565c41826f3c42370ec844ffef6c35d097de4349747b9d669ec7a8e57093685222709e228f1bc083505
 DIST simplekv-0.9.2.tar.gz 13750 BLAKE2B b3e64064ee8326a3e168cbb0ff7196e2b82ffd38c0388ca42d63c5f5ddf3078c071bf9ae2cb5b94bf7ef05a338800d567c9e61a4d560eb11f0e95b7eed8b1f9d SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045
-EBUILD simplekv-0.11.11.ebuild 508 BLAKE2B ae06dc730eec765c017aff8575b9c2fd629076e7c28717a25428e5ad79caf5e45a38d34341642f4e9008b9b5f29b7b498348459cc8c56b38a95ce5a09ca82b5a SHA512 e83273ade1691f5d989d2ef436f13b0b5321161127169f955f9ecee1c06df49a00dab22f81b7d7908f1a2a126a0776fd352f354b8e7116a4e7231154444c9f17
+EBUILD simplekv-0.11.11.ebuild 501 BLAKE2B f5b9768519406be94721591deca4c30c38f62736ec1ad446ccdf0298bed1e4506ce245e2090eaecd53dbb5557cbc08392daed1b0adeb9ffd1a17b7ad3eeec99b SHA512 d702e1e128f9c7182a30a7781f3342d81194b54fa6cdbe0b216c2c714f93493b25111f387754803c010ce9ab027a9591ffba3b85c745ca60bae6233b2345cf69
 EBUILD simplekv-0.9.2.ebuild 443 BLAKE2B 59f5f15afcbda168898aacb1ca94b24ac3c7c4585f908c9dd53ba8a97d35371fc206e183689644ee67cf3ee1b82566b0559ef2b761f6378ffe7b5f6345814f32 SHA512 2fa65c4e2bd44404c5b094d7a681077aea5a194e829146b303aef86dc58398580ce6c8f26bb4c05046d9a2421d4201dd8c6b8800b43da5832776cda3df1d4ff1
 MISC metadata.xml 569 BLAKE2B 5d890f0ff8aedca1963530773432220abf8c88fbbd14283dc112b5060c7aabb4d00f8b74d53eea766e84cc01875425142c775326047536a0715b69bf7d344f16 SHA512 15775631b85b66248deed75545717ef7ccc4c2426851d651ddf29fc8fa9a225bd139415a43ce068510c323c143c1fac64e8ee143a0fa3a4e53827f7c6b82f7c6
diff --git a/dev-python/simplekv/simplekv-0.11.11.ebuild b/dev-python/simplekv/simplekv-0.11.11.ebuild
index b6198e56d66a..1a3f25f5574f 100644
--- a/dev-python/simplekv/simplekv-0.11.11.ebuild
+++ b/dev-python/simplekv/simplekv-0.11.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/simples3/Manifest b/dev-python/simples3/Manifest
deleted file mode 100644
index 317e34f5ded1..000000000000
--- a/dev-python/simples3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST simples3-1.0.tar.gz 14630 BLAKE2B 856637f01e0ed9a44c27530a741b6bd331130163c2a310e4a780a7d57db4f1c0a5fcc0e08e2faf5fbbbfd7de37847caccd004504a783522c20b9c0732ddddd63 SHA512 3f715eb9dc7cae22f0d08e01599d15e33f5f52441d17a85b6017c15bdfeb125d473ef0d0f19de712f7d09d4127f71e423adc6aaeec461c32fd7568e9ed4c7e54
-EBUILD simples3-1.0.ebuild 760 BLAKE2B ff88e404a17193ac40054d642ddb42233a7f20550bbaadbd5b67edaa4f97b5e7e7469aa037b21ef197d30a60b79e3f750879ebd5cf9dd12d8c575693e88407be SHA512 5ddcc4b0d6fbf962323d203f96b699b3560c762e1266423f540c0ff88a460ac300616b42e57ed0f1bd703e3eb0faf0817bdb7b390db4b0a7bbd7f25adacefece
-MISC metadata.xml 311 BLAKE2B cd347f42ebefd940ec84ffafbee7c97895bc42a8e61e41d9c09672bf538041db47fe6ff0b162da8d096a067bdf105a5e4556840ea2902f2d336a7ea09aa4303b SHA512 fc6af27fb7a7f4c826f6273b8a3a91755cde5ef6ba1e9d7745a0ad6c0aea797c00b22432e0186aed95dcecce73a2fb49283546a0166140921df969a3d6e27859
diff --git a/dev-python/simples3/metadata.xml b/dev-python/simples3/metadata.xml
deleted file mode 100644
index 2742517ac630..000000000000
--- a/dev-python/simples3/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">simples3</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/simples3/simples3-1.0.ebuild b/dev-python/simples3/simples3-1.0.ebuild
deleted file mode 100644
index 449bbf00f11b..000000000000
--- a/dev-python/simples3/simples3-1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A fairly simple, decently quick python interface to Amazon's S3 storage service"
-HOMEPAGE="http://sendapatch.se/projects/simples3/ https://pypi.org/project/simples3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( changes.rst README TODO )
-
-python_prepare_all() {
-	sed -i -e "s/setuptools/distutils.core/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/simplesettings/Manifest b/dev-python/simplesettings/Manifest
deleted file mode 100644
index 90b474f3c685..000000000000
--- a/dev-python/simplesettings/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST simplesettings-0.5.tar.gz 5998 BLAKE2B e6462a8e327eb7a3d0a12b07301e0079115481583f23413bcc87f26e8d2bb13eb8c390f1676203582194b78978c6b0f6097ff469e09d6fbc038ce6559ddb74b5 SHA512 7d7fdfb827dcf86558560b96594016896b9c62843509acf4fb47b8b669e12bb3cb3093eb65312198978c1ace689b848c251f1943fa9fc9952479618ecc9658b5
-EBUILD simplesettings-0.5-r1.ebuild 438 BLAKE2B dcb6a4c9e02935102c4472641c0a4a454e3e387b84f4cb5e742dc96cf75b3e14af9d8f5899cc7c1781ff2b79d6737a50076b8b123abd2863bae981660703df95 SHA512 041970668dce0b2469b1b57f1d19e01acf4e9daf6b7f88c7f37f520a93b010d0266d7896b3628ef05b6f2016ddf39b219f5a6d73b465df24f8a2dfad43139d9e
-MISC metadata.xml 317 BLAKE2B fafae436f21a36741924335f46cae870ff8a583628ea01d84e08ca941add20ea4dbffe39bb2a7e17ed603129d357e3aaa87b2f82155bdd873387571bc6bf6588 SHA512 2e4c46a1ecffd587f5ffd0794b435cd3e9ebb69d8e5dbb57253bfe488c2d96868084934fff752bb3627d4efabee377ffdd4a2a8cba35c1a4ffb97350d59cf2a7
diff --git a/dev-python/simplesettings/metadata.xml b/dev-python/simplesettings/metadata.xml
deleted file mode 100644
index 87631f147a0f..000000000000
--- a/dev-python/simplesettings/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">simplesettings</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/simplesettings/simplesettings-0.5-r1.ebuild b/dev-python/simplesettings/simplesettings-0.5-r1.ebuild
deleted file mode 100644
index a439a23563c9..000000000000
--- a/dev-python/simplesettings/simplesettings-0.5-r1.ebuild
+++ /dev/null
@@ -1,19 +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="Simple settings initialization"
-HOMEPAGE="https://pypi.org/project/simplesettings/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/simplesoapy/Manifest b/dev-python/simplesoapy/Manifest
index 177623f0fa97..b3821eb5518b 100644
--- a/dev-python/simplesoapy/Manifest
+++ b/dev-python/simplesoapy/Manifest
@@ -1,4 +1,4 @@
 DIST simplesoapy-1.5.1.tar.gz 6129 BLAKE2B 766369677208a1cd58939e917fa16a30c87340fb6b76c5667913431625b89a8e97684ad4ba0af14fb4043ba42b2cec7f2b84eb968f128c3c3fc0e178c610cda5 SHA512 5ef0a4fcd84e1da9207154d4b8c4679e8aa2c9885ca76eacb17c4fbd39f489be459f52bfd42ee9b369790c33a02ecc5d776735cf1665f3ee034c1e315fdbb818
-EBUILD simplesoapy-1.5.1-r1.ebuild 714 BLAKE2B 00149faf08e67840409cf7d1661bfa6dac1f7393e65b07ec417599c18b27871dbc1419c26cb094b96a211c4ffcbff8406f756c069c891c6bde6f028e4c05dddc SHA512 24a3ba06c1828702daa11e5e4c327fa53c9cae7e8234127edf097515ac6cd31e63a3d71bab31dd1da316fa2d4514ea10309518e4b3691c753dcf8d8f9bb233ed
-EBUILD simplesoapy-9999.ebuild 714 BLAKE2B 00149faf08e67840409cf7d1661bfa6dac1f7393e65b07ec417599c18b27871dbc1419c26cb094b96a211c4ffcbff8406f756c069c891c6bde6f028e4c05dddc SHA512 24a3ba06c1828702daa11e5e4c327fa53c9cae7e8234127edf097515ac6cd31e63a3d71bab31dd1da316fa2d4514ea10309518e4b3691c753dcf8d8f9bb233ed
+EBUILD simplesoapy-1.5.1-r1.ebuild 714 BLAKE2B fb06b21e6673246797ff46866cbbab512af1f29dc76665051c82fac70d5a8bb8c36f2fa56aed6aa5070550865eaf32abf0a236c72acf1e5f35f42e297fbddb20 SHA512 1e6a28ddd3405d2e3e3f2e988fb553c62a988c6d07c0220b190d88c9a5ebe534eecd58a0368892c50d134c5dc1679d505e3890ff812b8d01d6ebe2c9d6fc0e66
+EBUILD simplesoapy-9999.ebuild 714 BLAKE2B fb06b21e6673246797ff46866cbbab512af1f29dc76665051c82fac70d5a8bb8c36f2fa56aed6aa5070550865eaf32abf0a236c72acf1e5f35f42e297fbddb20 SHA512 1e6a28ddd3405d2e3e3f2e988fb553c62a988c6d07c0220b190d88c9a5ebe534eecd58a0368892c50d134c5dc1679d505e3890ff812b8d01d6ebe2c9d6fc0e66
 MISC metadata.xml 429 BLAKE2B 84cf04d41eca07be79f494f3739abed09056869566c2e6892bc674301454f7098be15519268b929368d21beb62a0c604eaf8e125ca4ed0ea5c39d47d1d456957 SHA512 7fd663c2a81603dd9db3c4ff88f45973f696c0505005330035216da43c8bf15145d2e3898d36583457d3b99816ac88a77826dbba9dbe52b1658d6c7e1868940e
diff --git a/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild b/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
index a90a7c6e9931..896a0e61cc46 100644
--- a/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
+++ b/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Simple pythonic wrapper for SoapySDR library"
diff --git a/dev-python/simplesoapy/simplesoapy-9999.ebuild b/dev-python/simplesoapy/simplesoapy-9999.ebuild
index a90a7c6e9931..896a0e61cc46 100644
--- a/dev-python/simplesoapy/simplesoapy-9999.ebuild
+++ b/dev-python/simplesoapy/simplesoapy-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Simple pythonic wrapper for SoapySDR library"
diff --git a/dev-python/simplespectral/Manifest b/dev-python/simplespectral/Manifest
index e2d9db4a1503..41738535218d 100644
--- a/dev-python/simplespectral/Manifest
+++ b/dev-python/simplespectral/Manifest
@@ -1,4 +1,4 @@
 DIST simplespectral-1.0.0.tar.gz 5750 BLAKE2B 04ee4c90f9cda35ade1d250162ab1bcc278ae82a4d7f9a22d1aee6a1eceac7819ce6aa19f52e024469c51e08c00dc5f19253ff2b85d9b668dafdcd7a18c78d6f SHA512 16da3cb19cd7c567b64709a26ed5def7eb3047b08e2cb48db6962036a6c3e34c122dadf71821b6a22df55ebcf3c2ff95e3af3898efc8b4a6d5902e48de8e050c
-EBUILD simplespectral-1.0.0.ebuild 777 BLAKE2B 6b4f61cd1bf06c4181f025910dd18c548120c715747c07424219575291dd9db630f261d392ef1ed0a44d18ea4b032e1b7e896a196968cd1739002604b39c19a1 SHA512 a3a43b5e248cf3422090f11c828f466155971a419fb87e037c146eaf6e479da60cfc75f23b915b9e20cf80aea3ad38da07a74d966df893563b187775fbb528a0
-EBUILD simplespectral-9999.ebuild 777 BLAKE2B 6b4f61cd1bf06c4181f025910dd18c548120c715747c07424219575291dd9db630f261d392ef1ed0a44d18ea4b032e1b7e896a196968cd1739002604b39c19a1 SHA512 a3a43b5e248cf3422090f11c828f466155971a419fb87e037c146eaf6e479da60cfc75f23b915b9e20cf80aea3ad38da07a74d966df893563b187775fbb528a0
+EBUILD simplespectral-1.0.0.ebuild 777 BLAKE2B 8c42dfdc78cb4f106f0ec038fe9b375a537a7bc72052481765edacb6fdb0b0788bd693eefd7ac0c8ef71e617b228c9b8f723d0af8acfc3ea3652ecb22172b560 SHA512 237789761b6ef84b9b56ff14cfa157e3935fdd66aa03510c1092992e69d6980d0cc8136eff6c16b54060892dcf8612b50545a351cbf6d82f1b121f8d7f9a3f60
+EBUILD simplespectral-9999.ebuild 777 BLAKE2B 8c42dfdc78cb4f106f0ec038fe9b375a537a7bc72052481765edacb6fdb0b0788bd693eefd7ac0c8ef71e617b228c9b8f723d0af8acfc3ea3652ecb22172b560 SHA512 237789761b6ef84b9b56ff14cfa157e3935fdd66aa03510c1092992e69d6980d0cc8136eff6c16b54060892dcf8612b50545a351cbf6d82f1b121f8d7f9a3f60
 MISC metadata.xml 620 BLAKE2B f68f4bc523bee842dfbd36638e33526dd950ada21b7356ad91b5b685f39fac41ad00298954b7037fb4f5a6ee0b0688e843f0f7520ddbd5a124d3a901d9266145 SHA512 a2052f401c0c7fd6ec4d0894abe33e7eecfd6f2c6f17ba52b747177e88901db4fbf323645ce86a9662a7db66de17b90d4ba93b140ac1c4266cb8361974c92e68
diff --git a/dev-python/simplespectral/simplespectral-1.0.0.ebuild b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
index 197bb5281182..6bf7df5c0f98 100644
--- a/dev-python/simplespectral/simplespectral-1.0.0.ebuild
+++ b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Heavily simplified scipy.signal.spectral module"
diff --git a/dev-python/simplespectral/simplespectral-9999.ebuild b/dev-python/simplespectral/simplespectral-9999.ebuild
index 197bb5281182..6bf7df5c0f98 100644
--- a/dev-python/simplespectral/simplespectral-9999.ebuild
+++ b/dev-python/simplespectral/simplespectral-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Heavily simplified scipy.signal.spectral module"
diff --git a/dev-python/simpy/Manifest b/dev-python/simpy/Manifest
index c0fb0616245b..4755ed57cd21 100644
--- a/dev-python/simpy/Manifest
+++ b/dev-python/simpy/Manifest
@@ -1,3 +1,3 @@
 DIST simpy-3.0.8.tar.gz 402664 BLAKE2B 434f0575ed2b5c99f29e9e403bfbd07da23b6abdc5a8fc183933a503ec574d8726535e727f5c15b0de7e1f331fb332d6b79ed933d5a2f3a6eafd3e840039f5fc SHA512 c8c468ab60da1b357a1c62ca516a0cce51c6941f7b7795ee57c905cd8457f5614c5ff1f6d7586c0b9d9148e03251fd4f77b4e2c3c3d438e532e49bc4583fb08b
-EBUILD simpy-3.0.8.ebuild 968 BLAKE2B 9c902b59fe8d608948f5b2088b6193b1f025d891192d6b47617109165859fa8e02862366be8806b1c5d3824713bec1d0f8a08544afc63eb574d7c6b442f1ecac SHA512 d36fdfdc2dab54aeaa5c28531d6eff0cfb223b44b988dddb35628c771c06eca39a95b8ec69e1ad8fde0b7a2afd873f3028b891870ba03335b11b401e8786380d
+EBUILD simpy-3.0.8.ebuild 958 BLAKE2B af1f5f720335c58db0cbf3521ddd67d7048dd635ef2f16c2abe5725909879939afe5ec9b22d2dce1b4e78fc6ebdd245ac0f255308c041ba8550e48fa375da3b1 SHA512 c00d8c453943f692ae2bbed66234398c358a238c04ee4012ac135a6f7192470929bea429cc5371291e4d04795d757185eb0d7af04d010e79e5c99e15441ba3e3
 MISC metadata.xml 383 BLAKE2B be75ad8df2181d19f5d653278454051eaa5c455fc5ff3882cf8e11bb50787847fbac3db1e33034c3f1372a82a15227d494f71af9644d6aee42069b41fb6b4f17 SHA512 fe339084efea01b5fe7375a1fbb2a8c21105164fea3881de4b5499771d6c649f6cbadde20cca9d02050d8a143311d2bcabea48dc30bd518e7e3ff2bb2f1ab169
diff --git a/dev-python/simpy/simpy-3.0.8.ebuild b/dev-python/simpy/simpy-3.0.8.ebuild
index 571c717572f5..089f4eabe048 100644
--- a/dev-python/simpy/simpy-3.0.8.ebuild
+++ b/dev-python/simpy/simpy-3.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="tk"
 
 inherit distutils-r1
diff --git a/dev-python/singledispatch/Manifest b/dev-python/singledispatch/Manifest
index c549a93b0960..75bef84f6f13 100644
--- a/dev-python/singledispatch/Manifest
+++ b/dev-python/singledispatch/Manifest
@@ -1,3 +1,3 @@
 DIST singledispatch-3.4.0.3.tar.gz 9529 BLAKE2B 51e948c1a60adac7db3b97931becad4c699277b7c6af2e211e160fd6ec8fdf0501a3a2b40780b9bf7a2a5c62d08d905c7058c5a771018f9ec78a60688e3b03b5 SHA512 ba065d36092ddee6527be3d7cb777c51c0949855bf6dd0ffb7c25acaedaa35d36fe6dc096587acddcd1e9e54c6ac5f92c196b11f9ee1270cc0c1cf2f410446cf
-EBUILD singledispatch-3.4.0.3.ebuild 641 BLAKE2B 307a50a95e635795e830779f40a3b97be797468a24d886e92e3bd12619f381885b355b1cd42fae5b4f44eb5309ae074945485cbb6126ebde2cd2b2d75abefa97 SHA512 e5bea5a2d4c37376c1ea5916fc19381e5d47d216ba0b3f40280aa507c875b1af8ade135b11fa583ebaf5e2fc059ec2ee99753f4edf8a802da4efa215b0ee3e48
+EBUILD singledispatch-3.4.0.3.ebuild 633 BLAKE2B 104d8062be6efd07d6b756e1b083aed505458cfa1dfb3f18973a5c6bcf1fde5958673093f2ae131e02d236b708cf5bb5a07c1444cc3091743783b8c3620faaaf SHA512 d53e9305735f71b41b3a51f288a53ae0b77f56f745b1793cee4e4b7134dde0eed8cea5ace00fddfbf31dc3ddb450de1d2bd23a7cfe69b8a6f867bc5bca1bd368
 MISC metadata.xml 463 BLAKE2B b72d957aeb11979138c6d0bb9b7181de4bc7a899f7fa5ea5f91c58b447a0643b6c94263af24d1fea434752a0fd1178f1d388ea5d4e0e1f043ddd9b93b4c60947 SHA512 5375100b85310a816ee67ed7ccd23b7e17e3bc35e483166673c7cbd3a49b82166e9a4f4df0effb7b5f0bf1529fec26f3f8fcc692677ae7849d2d7501cc326950
diff --git a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
index b6bb68b9552f..dc5dc22fab34 100644
--- a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
+++ b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 08e8d7c4d8b0..3c5ea86af08d 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,8 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
 DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
-EBUILD sip-4.19.17.ebuild 2377 BLAKE2B 4cc5fff41fa36333881196b7fe668c3add3246076264f1c8b57c0139775db7c169f7e81006c7ff82521248d59a17a3cda2a16107dba57571bc1c112cafc18d44 SHA512 8f587125a62da80198e81f00be82888320a86288ebec2e111f67951a098a4e16fc9c3af18f199fbe85e501c3474bdbf2662304e6e3f67c0b5de5f22211117ef4
-EBUILD sip-4.19.19.ebuild 2387 BLAKE2B caf8a873579ba9b764c839d3dc6a8a4633a6d047630ff3af22b4f613e67e8f7f7d2d4ad7291ab419b13ddb93a12d3e4c25789c41e4036d3778ba978ef4300229 SHA512 f0131e25de07b46ba5a65f40269b3c2fc557dc6508ffa6dcb9e1396af054da8ee69d2a66a75f599e2c805d9f0b70a65a037cfd2d6779145ca284d6df02b31059
+DIST sip-4.19.20.tar.gz 1050009 BLAKE2B 2ee7ecfbb2fa2c1a6a7ec57ab91113cd0c93fa5be4f5a05b8edb568e0d26e1d248a504e95cfd1485bdf156680e7e076c26f354e05bef45d7a37e9f79f7f0a0aa SHA512 d5cd49f6fcae08306ac5f993710c40b82804d6b268cf3fa14077e73f34b02d551aa3caf57a985fe39b5acd61c465b00372d2ada722ced76e670dec14b5f8de44
+EBUILD sip-4.19.17.ebuild 2375 BLAKE2B 385500583860ba528d43c2a663e3934dc9109315ef78b9813d760a9effd46dbbe15b31fc5eaa2f0e98e69f17d4913f1ec1cb0ecc04a16943faa8a66bba6b89e9 SHA512 4c98e2048ae74f5ed10e0d83c3d13c7eed4030c251b3db27492af4075c37b0a11ddba37bf4c52c782686c38c060fd7f8079a59903eaf09889105c9cfea60c13e
+EBUILD sip-4.19.19.ebuild 2380 BLAKE2B 9c2ce5da73c9463f28a85c53c5b4348469509f22b7fb2ffb3e903d2e6854354c39ee404758babd76702ff8b490d9cf7f703cd7542c9be601929d6029dbe5cdb3 SHA512 b74a3fd0ad0a840bc8dcc445289aec28ded48985fd8a1d11f3e8ab163d65bb06b95787870212228443cbfa755d90eedead0aa6baf410d8c67174b4d7da195712
+EBUILD sip-4.19.20.ebuild 2385 BLAKE2B daea4934c6dbcbdbc5f94388ae35b19a6fcef6c14b70b33eea484f2c8ce3e2f5768e031d9d511549504a5cc7b752d43611ed21079a3782bba10379f6a69e7d36 SHA512 0d3a27628f23a5758590a2a4e821cd18084c9ab46f6c5d7f56b2940b600dda34c79ebc1bb638c89bddfa87ad5557bec9210592868126864663807407ae8bf403
 MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
diff --git a/dev-python/sip/sip-4.19.17.ebuild b/dev-python/sip/sip-4.19.17.ebuild
index caf91ebc164d..50fb73dc27dc 100644
--- a/dev-python/sip/sip-4.19.17.ebuild
+++ b/dev-python/sip/sip-4.19.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
diff --git a/dev-python/sip/sip-4.19.19.ebuild b/dev-python/sip/sip-4.19.19.ebuild
index b8b2a0668235..5d7a76a0304b 100644
--- a/dev-python/sip/sip-4.19.19.ebuild
+++ b/dev-python/sip/sip-4.19.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sip/sip-4.19.20.ebuild b/dev-python/sip/sip-4.19.20.ebuild
new file mode 100644
index 000000000000..320cc98ec4f1
--- /dev/null
+++ b/dev-python/sip/sip-4.19.20.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+
+MY_PN=sip
+MY_P=${MY_PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+
+src_prepare() {
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
+		local incdir=$(python_get_includedir)
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--sysroot="${ESYSROOT}/usr"
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--incdir="${incdir#${SYSROOT}}"
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+	use doc && dodoc -r doc/html
+}
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 32fa0b50f6d7..ac994b16396c 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -4,8 +4,8 @@ DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c58
 DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d9abff96ce6fc3eea4464e577511f7c52328cbd9e6989db2128fa8d1ee57f9ce7bfc36b83ff655691b46c9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24
 DIST six-1.12.0.tar.gz 32725 BLAKE2B f40621076a7bb2b3b86d9f6ee49056a598e4853c6150952902053b8cfde86e562a7656b6ca3c3108f407d392cf7c1164a61b36142efd565eda909b8733c0bedb SHA512 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151
 DIST six-1.13.0.tar.gz 33726 BLAKE2B 9910a72eea4adc030710b67252d01fd74ce4205bd4e0ccf662bb2bce8837853cf341c765e4f9ba2db3aaeca050dd2b1ccabefacf5c71383dad1d275326313ef6 SHA512 55eb8e23e529cb0d2ab9e7c85868e695f36c8235e914b1548eb4b9fd561e4237266bf1839457f15a9513d57a343cbf8ab809d6187499300791fd9356854fcb00
-EBUILD six-1.10.0.ebuild 1817 BLAKE2B 7443de4831c75bfd5ce1a856d9f0d198ed1f9d31a920cdefd269169cd4d77b0be751fb399838a6955476a1b111a01c28a9d0565c99f7ab87cd226514c18a4a64 SHA512 b6445d44d055372cb8ef80c388a264d69dea07d35ceef38c59a0209b341dc7909b418c3e9031c699cb85bfadd0ecf7b19b5a0a2269852198fd6e761728a7c1aa
-EBUILD six-1.11.0.ebuild 1081 BLAKE2B 021bf40e06a696a942d17cb55ae695f91b5d2c2fb77cba644cc4718ad48dc0a3b159489fc0d57fad278965d7875bd739d53309de433b6ff53e2f3c64181a4a49 SHA512 6ea68f2540f037b31877d4b24fba3f75f6c67088943599e5b8bedfb7f62c48240ed3ac56005541b9c8931a82206a74d5face3fa173d5393735b596fcca9b3de0
-EBUILD six-1.12.0.ebuild 1081 BLAKE2B f7f65cb2f3f2a60b0f28f6d3e26cbcfee37b025860f43d8d8536f710e4a63997c10c176c4215b21236bc461a038c8b27fc5fe0b84c69183c74f9059d357ac1a0 SHA512 70451b867e4c5be35f22d3a10b0b34d87fc64769a5af332802b03335a3e58f0a8be9209f814ef83c30620cd2c6ce48f10aab5e8cb55f41a3b4b3a084e93b1d5a
-EBUILD six-1.13.0.ebuild 970 BLAKE2B 39047611afb72a627d1211f07db4c15725cd693806d0082eaa0394521c632b279281e7d87d97aa848d1a066f9cb0ed7d973c71850cc34265b66b030041039010 SHA512 7cb3e1d3325b1006b0b0bd1bf688dc09e7f951bb41c9fa471c81dc3ec5a8cc2a11f05c4eead2871ed14797f756c295dfe7efd6f9f496e7de47f8efbd6f8b1bc2
+EBUILD six-1.10.0.ebuild 1808 BLAKE2B 1e879d66f425baa518b6574ced30f94d16fd6f40cadf478c0d5faedfb7c1de076142f575c6f95a50aaaeb70585f3ae938173935b5ea9e542d7262f16b2ea819e SHA512 e1ffa907c78c1f3f4524c8402c01947f95bce12f144038a37bff1610f68be29b79424187c345435983e930b363a917f806b26841981bc0b2a68b1c78f48be17d
+EBUILD six-1.11.0.ebuild 1076 BLAKE2B 60f82dac0f0dd2d410d96b709a83a599405408812a186e7739ce2935cb64990cb2002632342b081a96e53610eb9afde6eec491c5cf713706fb609a362d226ed6 SHA512 af0509c47479ce9822f7039c335d254b543a161d3b20e139d0f6d2bbf3fd51b51789e5c28fd163b5c24d14e79dccda4907ac7feff388170d35b36bc6b302ba80
+EBUILD six-1.12.0.ebuild 1076 BLAKE2B b2bb88413cfab571026d7154338dec8e2f168673ce5648391c094ec4065c86994420f79f43777f4428cf77a5e7d6fa905ea954e9d9113dccdc898fdec3e502c4 SHA512 9d3f4460cc9724bcb25a15c08d842fb7756b9e9469984934da105efb906681dd00da57995f4e3e2364bdbbd86c701cc3803f1bdf0d565d08057748680dbeaf7b
+EBUILD six-1.13.0.ebuild 965 BLAKE2B b17cced2a16ca0172e4895df375638e24f22d920c191eb4af89680f522da2e09eb6ffe03cbc007a8f065c86a1133f2afb2212a4d0f618e97019802455a483269 SHA512 79178727a2f1b4dfa42d90f6cbb53693a8ee176550956638339cf723447710ff3017fee46a214832f029151ee45f2a4ac67d90a4fb3cb22a0ddf4411f1e04c93
 MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 7090da247874..97b6b912bdb7 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/six/six-1.11.0.ebuild b/dev-python/six/six-1.11.0.ebuild
index 1ee693a812e8..b8c67bbc0b26 100644
--- a/dev-python/six/six-1.11.0.ebuild
+++ b/dev-python/six/six-1.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/six/six-1.12.0.ebuild b/dev-python/six/six-1.12.0.ebuild
index a1e28891ddc5..00e6f60420f7 100644
--- a/dev-python/six/six-1.12.0.ebuild
+++ b/dev-python/six/six-1.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/six/six-1.13.0.ebuild b/dev-python/six/six-1.13.0.ebuild
index 68e1c52e8f8d..cd119c861f9a 100644
--- a/dev-python/six/six-1.13.0.ebuild
+++ b/dev-python/six/six-1.13.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/slackclient/Manifest b/dev-python/slackclient/Manifest
index bf9617d804e4..ac0b60f72610 100644
--- a/dev-python/slackclient/Manifest
+++ b/dev-python/slackclient/Manifest
@@ -1,5 +1,3 @@
-DIST slackclient-1.1.0.tar.gz 16479 BLAKE2B 8404be6eddbc3d8ca3dde74b04da7e18e80fa165842c0fb0b33fa28d6c2a182b8c553aaaa07f1676a7be202c324a95f23e7729ae24f037f0290dc263d18addf4 SHA512 3c62869ce4d830dd39e0723e4ab14c25eeea45a0f64965c2514095e0f8d11dbc07829f945d2fc3030119f9e41bbba29cddab33fcf314bcd80717df9d0ed1c3b1
 DIST slackclient-1.2.0.tar.gz 14062 BLAKE2B 92f297dd0e66b81008e144a4b2b4736e43bab77abf36a7c8d4a6c295025dee856f676d9a09aa121580a6cd59dad78bfeb9595d203ac7cdb496de1440468ca1bb SHA512 4886d9fcf31bb6163f33185e68d255cf006c10c7c7c421f9ab8e4309a6d5dcf053318083153f1697e70e3489a5928a215833a7446dc0598399834bc0f9479639
-EBUILD slackclient-1.1.0.ebuild 766 BLAKE2B 7133a8da12b8ba7c5dbdc5b1abeb333365599c926268d11b2ece00a694f53ee27f0d625e65e6a5f17ddbcfb51d6ca789c53a739da48eb833f3395a98871af18b SHA512 c3e2759acac33e0086bd21a97842126dc2b882819013443da04ef9bead2f20e9f1d3d60d4c12e0cff4ff937c4bf3cb65dbdd767a3b3858d4c306630cfe6614b5
-EBUILD slackclient-1.2.0.ebuild 770 BLAKE2B ba5f0409af150f71e29290556c5306116890c1f4e6ecbc32f235ca2511675a8b2ea3b35f9fa6c81de96e6074af05821298c2329f14c4e7af09a0e01840c6c01e SHA512 c9ce39463be8478683d55f2902d73222110b6bda21fb46962bc19e790c20906d82db9cedda461c0887860301449533481dfb1b39ce0342878c6d0825475da3ed
+EBUILD slackclient-1.2.0.ebuild 753 BLAKE2B 4f551a9b179390eaa6cc496ee29ec9ee717e8d3e5c1d0373f5e351152c79575d425481f2a351b35468a9033ad12282be555a45174db5dee87af4d88f4c041576 SHA512 e68fcc9f0e56d7c835e6a53c402e9b4bc6bd18d61f78b94a9f085ef5aed609e5a3252101ff3afd528cac61182f3541dc48f1d8298f1113cd245ce22ebf642de0
 MISC metadata.xml 381 BLAKE2B b373bd7bca301f2bcc906e229ff17ef0cdb69482b76567cc45a98774246169d17d3f77f6eddea8a52ea6ffaf3ab20d018246ccd224e81a660634922447d0e2ff SHA512 36faa9a06a4d10f9d8c75e9ce29a69dec2a2f4fa4f8bb836aea318364ae03a63062deab63c78e8f7713ed141db49d42fea92acdd2e5beda9cae2930a90f399da
diff --git a/dev-python/slackclient/slackclient-1.1.0.ebuild b/dev-python/slackclient/slackclient-1.1.0.ebuild
deleted file mode 100644
index 4595dd047eec..000000000000
--- a/dev-python/slackclient/slackclient-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit distutils-r1
-
-DESCRIPTION="Client for Slack supporting the Slack Web and Real Time Messaging API"
-HOMEPAGE="https://github.com/slackapi/python-slackclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/websocket-client-0.35[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.11[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
diff --git a/dev-python/slackclient/slackclient-1.2.0.ebuild b/dev-python/slackclient/slackclient-1.2.0.ebuild
index e5eadfd28be9..34e32aafa062 100644
--- a/dev-python/slackclient/slackclient-1.2.0.ebuild
+++ b/dev-python/slackclient/slackclient-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Client for Slack supporting the Slack Web and Real Time Messaging API"
diff --git a/dev-python/sleekxmpp/Manifest b/dev-python/sleekxmpp/Manifest
index 615e67b59c7d..bb899edc54f0 100644
--- a/dev-python/sleekxmpp/Manifest
+++ b/dev-python/sleekxmpp/Manifest
@@ -1,3 +1,3 @@
 DIST sleekxmpp-1.3.1.tar.gz 1014004 BLAKE2B 19eb8a38f91410b266a8b2a1667993a44f619591bd2ed98e4c9ad23da4f9aa2eed6e662ed6e367cc1444aa70835a8a02ca946de996923a078e94bc10e6800267 SHA512 1f3c68672536da0d20cd8717f7835096003019f03a05fb08ce87f784b0636d781aa78691ee54927d4755e71a57956972af0a653deb6eff0f7eb16b9a236baa65
-EBUILD sleekxmpp-1.3.1-r1.ebuild 641 BLAKE2B 6ea3aa2c45309f6eb2b25262bc8c56b30e7b2a34e057311ba946ee6188123802d7ef87c0aad0414f05e7ce196bb83bd053e84fda65896118a1312be289f53871 SHA512 e1e2aee38fd55c9e58bb339a2ee3174526dd330d924bd997eaae39c5eb329658c0aac7aa3e221312d51f38c49f6c56fc8b90eace78f015386862a1e5a99356dd
+EBUILD sleekxmpp-1.3.1-r1.ebuild 632 BLAKE2B c30df82667738aae58248a23f2ab62b5af33dd792800bba22e2ee643249e1188c4974d999b4017a8b59098f7557126cc57b2028836a8a7926946b143edba679c SHA512 6aab8e87d90e5561d3c54d9c2d8ef343ebb19b4e6af2701357a90cafaede2f3b9b8a6d3f0d368d4499f2f417b3adf1ed1d3dd34a4efa5b0b1c22e71724baf913
 MISC metadata.xml 331 BLAKE2B 8ccdeaed866e106c207615b170742123a43befcd7345365cf77de09af67ac3b145f78170f2b1b7d5601a9159b6ea6b32cd634cdac9d5973e6bd40fa127eb92e5 SHA512 f3d68d2a4052973dcf2a984bdc524d9f82254a3678f37d2b75db220b363efc6f2fe8155c544189f88869dfce840d487650e76ad2df7e06066522b1230e09c826
diff --git a/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild b/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
index 12993c921f57..0851971dd130 100644
--- a/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
+++ b/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/slimit/Manifest b/dev-python/slimit/Manifest
index e93a8873bf8e..fa3cd8e27c23 100644
--- a/dev-python/slimit/Manifest
+++ b/dev-python/slimit/Manifest
@@ -1,4 +1,4 @@
 AUX slimit-0.8.1-fix-python3.patch 18813 BLAKE2B d4cdfcce63635ad35ebd7c1c4a42ee9b1d4fba2dea4aac3a97274c98e012b615dbd121413243e1279c00ad731527bf311aa5fe4dc25fa174b5142abb4f990c32 SHA512 fad15e30fea0000f797db6e113ca83d847e412c5906e42d15bf1d8afab857d617403f92b733ebad761cd6182e16e5a8f21081829d2410f9842bd8fa8f093b8e8
 DIST slimit-0.8.1.tar.gz 90096 BLAKE2B 9bf7a00fa7aa48a47950b2db66868c03e3923ed7b878ac4d93bd92becc1909cb79a15365db8185f6d8872028e0d01343394e4c768149155bc6aaeb4acf69954f SHA512 ce33dd15c755b8327a73121322b525738b5f8d83c08b0b6329fa6e090575c68883b4bfa29df04544e5f566f3a81a60e480b5e760e2b0e67644a7db5e25604cc0
-EBUILD slimit-0.8.1-r1.ebuild 1132 BLAKE2B c53165c8d72261e5aa47683345536af9869f3464c04191291924e4515f0902193844f0050fce1254147c15676bc15f9c43d1d24b91808c75ff2bb4bffc0ce29e SHA512 406c7225c51ca265d8adbe3034fc8507d2845c3550d0be2f56d69e81395d1b46dd101422c6adb51ee8a2c8385c7ac048d78b40466e010ba384a36f8049092ad7
+EBUILD slimit-0.8.1-r1.ebuild 1115 BLAKE2B 7aa39e68359a71e4f7fd340b2e70a0dc8fcb2176dc383a4c64a24a482e8bc3f650a66baf23ad7f2c47c48d25fcb23a522715f78be1a7a39f005e87e956a6c7ab SHA512 83f1ce88d951d92fd3a3690d1b8a8a65081e8801f66aa76abbd3a610c4990625c47df825551e275fd383d8c1814774e37fa30ec1a9e521a7498dbfc515665076
 MISC metadata.xml 381 BLAKE2B e72dd60346098d4cb6e0886a32c5bea0139c33eb086282ad337b3125154f4b7badec99e22b539430c38ab224a50e0da28863c85eb91f5f03243328b327f75999 SHA512 54ac346d7d9d2f0d267ad22b777d8e504fdd9f2b5e9aeb1d7465d0047c820208e323e24a57cdc0f5361c3ef35feece064b67d3d42c6934562362cda319110986
diff --git a/dev-python/slimit/slimit-0.8.1-r1.ebuild b/dev-python/slimit/slimit-0.8.1-r1.ebuild
index 63cf71e71ec6..c65e63cdd426 100644
--- a/dev-python/slimit/slimit-0.8.1-r1.ebuild
+++ b/dev-python/slimit/slimit-0.8.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy{,3} python3_{5,6} )
+PYTHON_COMPAT=( pypy3 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A JavaScript minifier written in Python"
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 4ee7d2ccf042..a6042419b298 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,6 +1,6 @@
 DIST slixmpp-1.4.0.tar.gz 862826 BLAKE2B 940c6c66f7f98574c88da6fbfaadf7103c4469cd198e096fbad57978f5e206c53b86933a930a24a8b891415b961c4a255d4c9c25885a8bd630f5d6185486fb6e SHA512 586fa5156641d786f9e45df8e6a1a20b8cb2dc2b9baef2a0713daa9ab8a3321202fd4b31d5753cf2659cc9311a4842bee9991a7fc295e62dfd78a869d8619d20
 DIST slixmpp-1.4.2.tar.gz 864608 BLAKE2B 9689b274a9c787174248c094329ea33783627a45ef39708a611013454953de4fa8799ca5a35950a3f3ed49bebf5c56f6f2bea079bcc2a3dce7d2648bfd812371 SHA512 3b3356352af8d7ec8cca15210c0524ce0bb5e313d8c5455bec13e82aec261f6d094a99df9f08642418a0e4abea4ee1ff607e42e1c166b9be1c26534b690c330b
-EBUILD slixmpp-1.4.0.ebuild 767 BLAKE2B 3104e2a79129792d61f3ac559dba560f375cde01cc350152d9cc784e36555034cf8189d1d899d5d7e9a20f2a236c0a3a9b870a31fbc5ad91fd46a57ff8bb6303 SHA512 e7950804c85f0ede55fcc690fa25018cd7c3124268084dc19bcf94f95d0f9c4d1fd07df98ed8a914b74dd95f97f98f1952061422ec69d6b26607396eb124cb6d
-EBUILD slixmpp-1.4.2.ebuild 798 BLAKE2B db806612305334eac78261450a315fedf47fd6af9ccb8768fbec607b0fd9b777a39c9449d2b088dc741fcaa92884d6cec5e04d01366e25b8cb6e78e7129b4697 SHA512 5d21923f9382f4e817b80bd0c6268c0765d9ba3cc70409e83b51687b8e8780146586aaeec9f2e202361fdc1ad3f6ec9e04eb4d04035b20f1b141145fa1076a9a
-EBUILD slixmpp-9999.ebuild 798 BLAKE2B db806612305334eac78261450a315fedf47fd6af9ccb8768fbec607b0fd9b777a39c9449d2b088dc741fcaa92884d6cec5e04d01366e25b8cb6e78e7129b4697 SHA512 5d21923f9382f4e817b80bd0c6268c0765d9ba3cc70409e83b51687b8e8780146586aaeec9f2e202361fdc1ad3f6ec9e04eb4d04035b20f1b141145fa1076a9a
+EBUILD slixmpp-1.4.0.ebuild 763 BLAKE2B 8ff4ab8691a2a97f1fa62aea383ac5eb1319709d5dcf9764570d4e4430690e365c64a5f4b0e06b8e3761bd5718c709275ac2cb7d51b6851dbcce659da19bc80e SHA512 11ecff4610a50bf87fcbb7e3183aab6344ab6688852e7dfd0f5829bdda6a82eb906c7ed2f9a57bb003aa9c775ba979e17151dde1b3c868072a3112502ccb90fb
+EBUILD slixmpp-1.4.2.ebuild 794 BLAKE2B 3d0739f1dd3e23e7df08e87bed7b4217c654f0a6cc2deb9fed87942817a9e850501ca63760e09cfad3dfdf22dc2a61a6abdfeb96a6016a4c6532f84685b39c82 SHA512 518d53ef2613a87f883132e52d53be67b8cef8af414b3d317f62314845f4dc218d5f9da273080af8a7d76ff9bf5c2fda564c0cfa57cdc9790c86c65ea256af8c
+EBUILD slixmpp-9999.ebuild 794 BLAKE2B 3d0739f1dd3e23e7df08e87bed7b4217c654f0a6cc2deb9fed87942817a9e850501ca63760e09cfad3dfdf22dc2a61a6abdfeb96a6016a4c6532f84685b39c82 SHA512 518d53ef2613a87f883132e52d53be67b8cef8af414b3d317f62314845f4dc218d5f9da273080af8a7d76ff9bf5c2fda564c0cfa57cdc9790c86c65ea256af8c
 MISC metadata.xml 321 BLAKE2B 263ceaeeaf4eb1405ad1fa44a5a064ad778b1759e9b4f72dd4e110b28c4bc904897029441ea4c5b1d577472f13dc1baebd2bca0dd11ec7f624708eefed6d4db6 SHA512 1d3070cf4fbf0feaf8473e8f9e354f401c64cbd526f94bf42721528fa94852146084219beee4c344138a1d1241783b12a47e6a4fd9de95cb330dd82baaab92e5
diff --git a/dev-python/slixmpp/slixmpp-1.4.0.ebuild b/dev-python/slixmpp/slixmpp-1.4.0.ebuild
index 5fa849c70abc..890b6d12d3d3 100644
--- a/dev-python/slixmpp/slixmpp-1.4.0.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/slixmpp/slixmpp-1.4.2.ebuild b/dev-python/slixmpp/slixmpp-1.4.2.ebuild
index 0f216ad7e875..60a233b71f8e 100644
--- a/dev-python/slixmpp/slixmpp-1.4.2.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/slixmpp/slixmpp-9999.ebuild b/dev-python/slixmpp/slixmpp-9999.ebuild
index 0f216ad7e875..60a233b71f8e 100644
--- a/dev-python/slixmpp/slixmpp-9999.ebuild
+++ b/dev-python/slixmpp/slixmpp-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/slowaes/Manifest b/dev-python/slowaes/Manifest
deleted file mode 100644
index 39a07652c2e6..000000000000
--- a/dev-python/slowaes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST slowaes-0.1a1.tar.gz 7017 BLAKE2B d1eb2a520f45214097215e9926b242242199ee7980d847e83d6bf157d0884eebc6ae4a403cc26c376da908fa9b443af0015d02cf4e619791a03a25b0d7d4e789 SHA512 09126a6cf2a0da27c45b12d25c3a9147f47448311f9e36b6db2aa62d8b85f3fdf66f10f8f5d84edf48cde7f6c766d9ed384832f9ca0e28f95104149a7f424d95
-EBUILD slowaes-0.1-r2.ebuild 447 BLAKE2B 669d03c59ff08da978550a5b94076b906054e93ceac83850de0604f4d03f5cf24aa2753f875162599ac71130ee5e86c84831638379533cd2873c4234cc1dbff5 SHA512 a0374a0f43f390c0c1a550dca3f3f95d0447b16b15a11847d93a893391dccc19e5c7c7e0ba96d0d0282f8f0305886f06c68405d3e91cae3365c23d1a09bb7e03
-MISC metadata.xml 579 BLAKE2B 3b71b4f10e18296ce61cd1cbb25ecdd619ae9fd215a55f408c8b1a1915b624970e19831fb0a2b9fed90e72941bc5fcd5c0182cc26ce7b95dc543ebdff8911203 SHA512 9842a344a5f60dee65c10bc29d67db397b736a0cbef5a28fc63eb9e482f0effdea8c21ea464cdc2f8ed724a0811f735cf68478088e2ffc72074d616bea194290
diff --git a/dev-python/slowaes/metadata.xml b/dev-python/slowaes/metadata.xml
deleted file mode 100644
index 56bc5a2b8dbf..000000000000
--- a/dev-python/slowaes/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>luke-jr+gentoobugs@utopios.org</email>
-    <name>Luke Dashjr</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">slowaes</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/slowaes/slowaes-0.1-r2.ebuild b/dev-python/slowaes/slowaes-0.1-r2.ebuild
deleted file mode 100644
index b219bb74776a..000000000000
--- a/dev-python/slowaes/slowaes-0.1-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-MY_P=${P}a1
-DESCRIPTION="AES implementation in pure Python"
-HOMEPAGE="https://code.google.com/p/slowaes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index 491fdcaba63c..aa50c287bf66 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,3 +1,3 @@
 DIST smmap-0.9.0.tar.gz 22082 BLAKE2B a0c7e5957a4ea829a3f7855ac5d05660ac2bc6ed8e58a50b805a4c07899ce5022d5bbc0329604dd2296dace3e6e6165cb108be8014c4c834629f830af14a4562 SHA512 704e1c67b1f3e1303578cc26d4af8296a11b5f5013e8e8d933d3096e588911b801ddfb162d0e35a49c00256032824386d77e4f38d58704cd57baf21586b40e03
-EBUILD smmap-0.9.0.ebuild 699 BLAKE2B 248074a8c39113d1a6ec35ca8b2189b457b5a4b77ff045996e59909867832925569dfe31e7d1d896d203dee89edad16befb2699ab21d00a78cb46a46d27ea600 SHA512 61aff87a1b659a5c7bd556e2ef6d26c50e5415d9c223c8516027217f201161ac131304fbfdbdba9ffb29c4302ac256251c49e754520da1ac576daacc307f185d
+EBUILD smmap-0.9.0.ebuild 695 BLAKE2B fb3fe3eddd73f71c440ee7bd822d826f2739b8559f55e04f8583ff2345cb411f919c4bc18e72a18a1e0ad362cd28e8cee8bd1ecda0b7854f02277d5650291d02 SHA512 20cb959db20ad1bd61067395446ef0fc394574e2adbd986725ff79ce03c744db5ca21cdfeb34525a77a35a66e4dd854ae09fff2359e660c5ad4e99177ed0a60f
 MISC metadata.xml 371 BLAKE2B 3e42cbd127ee25fe4e316797aed0977eab484119096a606b517fa8d57d2ecbeebd4c4b51570dbda7771d1b9bf6bca368b5fc97379f08e2c1ea51121628d109d1 SHA512 9f6f41b53acf58ff0b7ed064469b5b66820f6c173b657ce59d9501d78f87ff2667b84bd0be275f6aa2d06752d875c5aba83105f5414b2b50a86fce9008685f3c
diff --git a/dev-python/smmap/smmap-0.9.0.ebuild b/dev-python/smmap/smmap-0.9.0.ebuild
index c8a12637386d..44edec321ab1 100644
--- a/dev-python/smmap/smmap-0.9.0.ebuild
+++ b/dev-python/smmap/smmap-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/smmap2/Manifest b/dev-python/smmap2/Manifest
index eeb8d80daebf..f8599a7dac89 100644
--- a/dev-python/smmap2/Manifest
+++ b/dev-python/smmap2/Manifest
@@ -1,3 +1,3 @@
 DIST smmap2-2.0.3.tar.gz 23049 BLAKE2B 225ffddb4461caa5cbfee210d086ff62d8d7b2a809640cc972ec831fae16bb4fec0418fde30d86308e84369128a2024d1480e38e85e758dba3550b3469db019d SHA512 f5623247fbdb6b0e94bbfe7104ffd84ee4563a0c32781256d92d46fd23e05280d7a0e3952a573b6834e253e9b68175784babc36d91ab61edf6d0d072830e1fde
-EBUILD smmap2-2.0.3.ebuild 718 BLAKE2B 80018fbe0e5d2eb6cf5bfd42e8b7cbe9e9e0dcb70b213158c55dc000ca014fbdc580ac79f7c2238f620a39ee669fa9346624c3a622c4d377f063cfd86f9b62d2 SHA512 b6fcbc0489ec9e83c0cc06b3de50fac10d51094534029458bac450e46bbdb4e7719aada8642b5c76ad40815b6e514afe45e3b853d1841610e76f4209d1ce3649
+EBUILD smmap2-2.0.3.ebuild 716 BLAKE2B 45fbeda9e3e543606dd1cae9968d5129fc2a7e7c52bfbf1b7d714443a19cb840a5c0b372cca7e6cfc0ca5648a624b9dc3e448b95264ff2b3808563c1ef22df21 SHA512 cb80aabb89ebcfa8fdce16c9f6d7da3f0bba08a0f8b0a052488b65298e1b32d69d587e446655eecb8ede8ee71ef4f91de8e378bf5b68804ed54477127393d31c
 MISC metadata.xml 387 BLAKE2B 70154d8612cf6e5634d429efaa1bb8eeaa9c09be7dbe7b8279ae1fb5bedd1ec0cb008eb84fba44f78b488d9cb2faaf39751faf39a62399c13a9709e62644fd8f SHA512 88990d23bd28d820c1c6ff4827ed74dcd381ddaaace31efcde02cc66905f4a96ebfa05dc5de080273dc60f88c50fd3111649a34cd1bb8f68e65574f92b55793d
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
index 2f298840a67e..f1bdf999cb60 100644
--- a/dev-python/smmap2/smmap2-2.0.3.ebuild
+++ b/dev-python/smmap2/smmap2-2.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snakefood/Manifest b/dev-python/snakefood/Manifest
deleted file mode 100644
index e70559e2c13a..000000000000
--- a/dev-python/snakefood/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST snakefood-1.3.1.tar.bz2 1026656 BLAKE2B fdc0482ef8526818b6a74f957421c46df750e56162705f8a9f8ea0efdb0acfcc5f7bdf57b031f242fe1cfdfd0d3b113a6c4a0707f8c3a9cbf5c21e2a415710eb SHA512 9609e593e3d0adc946cc78ee1734f6f0ab710205b8fbbbddac9fd25525522c31864b3593476b3f0dd319986238f270e5a1854b9e0abee96f8be3ca2f4bf81a38
-EBUILD snakefood-1.3.1-r1.ebuild 407 BLAKE2B af9bbc3c8d3929ff07237c289cacdce39f4deb22b0b341fecdf245017294a961b93ac6cd2e830ed15c6c3128273987d780489e81fa3ccd848af887a153488994 SHA512 230d9b3807e5366415979278ff5437c9a6aee952d9c42f3e7ceb4ca726bbc2817208222e28e9e5ce236718671a17128fbbbcc4796ab72f0dc4a3ef07189422c2
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/snakefood/metadata.xml b/dev-python/snakefood/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/snakefood/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/snakefood/snakefood-1.3.1-r1.ebuild b/dev-python/snakefood/snakefood-1.3.1-r1.ebuild
deleted file mode 100644
index 8f6a82906885..000000000000
--- a/dev-python/snakefood/snakefood-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,19 +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="Generate dependency graphs from Python code"
-HOMEPAGE="http://furius.ca/snakefood/"
-SRC_URI="http://furius.ca/downloads/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 12fa353af49d..569fe93c5fc3 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,8 +1,6 @@
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
-DIST snakeoil-0.8.3.tar.gz 297775 BLAKE2B b08c2c1bfea98e391b1da59ba0fd28e2187a83291c9c665f1394ed2b985b959ff5f5328db6a379d0d29e0fd86c82f965c40280f38ef5064727d4d9b173905c42 SHA512 d17a410f1684bb0398a115bbe6539895ea84a2ff7a1f3d05a66937f5f83783f2c503e985839d26f03565e960040a10e1985c43bb7376feda7c088ae279838be9
-DIST snakeoil-0.8.4.tar.gz 297551 BLAKE2B 1c79805c65a9bec5f392e7c43dd36a9d085fb4f58371137e6fe1a5a72fd57b665c69f534175fef76aae3ae185a85343115671acdd58d214733c5b057468c8e54 SHA512 7a074d37b8a14260a0123acb63d16a2c004ec59a132ecccf3f528cac754e02661b766b0169646c8cc7743d7401160b3d7d469806e3da5b055d2352edb8bcdc68
-EBUILD snakeoil-0.7.5.ebuild 988 BLAKE2B e8c19ea871c3b1cb50e0d88e6b4f479d051e97e4242c14599ed797504b6bb0f97442e18c10f94a2912e108834ce2fbde7919036c74f4f63e0b89bea3b2b72341 SHA512 aa3363f6683756af247abe3332fbc2415d4fd86e79d6cc906baed190a8442ea949ccac5d49e8229c42dcbb95ff886357cfde09ecf7d181d10a611c02bdc17217
-EBUILD snakeoil-0.8.3.ebuild 896 BLAKE2B b6f652353377722aee74310e2a06ddea5b3c2ab7b819a0a30d5630420249464885f80df21325def8ec9e8a3213a79cb9a3fe4c5f2364cfd0cb8f80d08d44c369 SHA512 4b07fcaae6a30f4a37d4761e7e39c6c90370a05321c26acb43f2452feace12e297b5c04145c9aa872bc9f9af70056e9d9af5d6192f52c5d48c51292179c11944
-EBUILD snakeoil-0.8.4.ebuild 853 BLAKE2B 9035eca1303cdae4f01a2e03e0da75eceef89499c9e93f9252eaead74a21f4252f14d6482aef81cc6c945a0bf4e0394b41453eca8d471a752a325d80bff473bb SHA512 6c6e4100121bf66814454b37b6e51870cd99533e7e563505d6c38f6c0505e79fd9520b07d1115a23d36f97aff20393f60bdb4471ce2a51696771995f423d66b1
+DIST snakeoil-0.8.5.tar.gz 296311 BLAKE2B d88b3f5fe299511343676ffad5a1f1efd10078f50d029b74feea66f6b6f65897e2d4dac2e96f65e0cbaae0942c5b9867fce868adf12be746c9c4ebf6f6a7f52f SHA512 d25cbc105d5c881d8e99d5c2970d524914838917a4a716d8f7269a85af0d9a067b9bb9c26a37b9eb49239f97360938bece1a1ebe87aba04340b0fe528f44dc4b
+EBUILD snakeoil-0.7.5.ebuild 984 BLAKE2B b480540e185705f812b51c48de0fbedc68bf9c89f4ba7c5a595de9c60391021fee3963acc5d578c8bb3971a5a4b2a93f3de5efa387148aaae953829205a091c2 SHA512 a30f8fc467c1d28c8dc5382d30d9166b67b121bff6f391fa6ca9ac4af26d30721ce7626cd28e2cea3e62210e582ca313e21df915a18c8d123db40d41e135850b
+EBUILD snakeoil-0.8.5.ebuild 853 BLAKE2B 9035eca1303cdae4f01a2e03e0da75eceef89499c9e93f9252eaead74a21f4252f14d6482aef81cc6c945a0bf4e0394b41453eca8d471a752a325d80bff473bb SHA512 6c6e4100121bf66814454b37b6e51870cd99533e7e563505d6c38f6c0505e79fd9520b07d1115a23d36f97aff20393f60bdb4471ce2a51696771995f423d66b1
 EBUILD snakeoil-9999.ebuild 853 BLAKE2B 9035eca1303cdae4f01a2e03e0da75eceef89499c9e93f9252eaead74a21f4252f14d6482aef81cc6c945a0bf4e0394b41453eca8d471a752a325d80bff473bb SHA512 6c6e4100121bf66814454b37b6e51870cd99533e7e563505d6c38f6c0505e79fd9520b07d1115a23d36f97aff20393f60bdb4471ce2a51696771995f423d66b1
 MISC metadata.xml 385 BLAKE2B 7e7195d4876c5cb5db98288566121559c8bd9208138fbd211edea15b324acb11d09a2bdd96c0200554d7e9c734202c7fd341f0d134f271c82dbfdfe75e5774f5 SHA512 32645380ddb0bd1edca1895714aeaef3e0c61c04cbacb50a414c2fd26b6978c8ea83b3c420538cadebf3a631b5aec2e9e3fc0dab98d1e1a99cfbad33b8d58715
diff --git a/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
index 5a750a275945..b47ad42ca036 100644
--- a/dev-python/snakeoil/snakeoil-0.7.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
diff --git a/dev-python/snakeoil/snakeoil-0.8.3.ebuild b/dev-python/snakeoil/snakeoil-0.8.3.ebuild
deleted file mode 100644
index 186d88f724ac..000000000000
--- a/dev-python/snakeoil/snakeoil-0.8.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD BSD-2 MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/snakeoil/snakeoil-0.8.4.ebuild b/dev-python/snakeoil/snakeoil-0.8.5.ebuild
index e073443aa4a6..e073443aa4a6 100644
--- a/dev-python/snakeoil/snakeoil-0.8.4.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.8.5.ebuild
diff --git a/dev-python/snappy/Manifest b/dev-python/snappy/Manifest
index bdf0efc0205b..889ca1809aa2 100644
--- a/dev-python/snappy/Manifest
+++ b/dev-python/snappy/Manifest
@@ -1,5 +1,5 @@
 DIST python-snappy-0.5.1.tar.gz 15252 BLAKE2B eede689d51123968bdea64b8c89dc1fcb7f700fcd4e5869339717657ea6db88cacfcdaf59f00899773c65953c16ae271c5a6e03d6a17be16ca1e3dddf2b37cd3 SHA512 95a6389c58790aaeff61419bb9f183a29ad801733cae8144a67eb6203a8ebf6c6790bea7c025b37588dc98ebd2fed20f37857d2f30199f507f52653d2475c16b
 DIST python-snappy-0.5.tar.gz 12495 BLAKE2B b4456e4b5f2264122787a44e1871dd2cc74621bd6911ff9608b9a58215cc0020079080937b8dc89e1bd7a62834823beab5b9258c53122cd47c6e50c22e2185a4 SHA512 0be15ea133e3a47c6cdb2a340061bf2779d4aae4b34848cd60e6657c168a76970c41f2bae4f57993862bb65c75baa7cf6a562fcbff4c81e22fe7bac69e7d73b1
-EBUILD snappy-0.5-r2.ebuild 620 BLAKE2B 8e66295a06a699e8564a8763bcb8111ecdc11579a85e5d75d4ddf1f34bc4ec5c653af94c743583b8ea38fba6ad5f13dacbe0f103df82de10c6ecb053a2fb6053 SHA512 65e109a895b2cdc630f4004b62a1dedb8a7749c19687eac25db1e47a0eabb6cabe99364bf65204ff25225540bfbd2276277fb607759eb14e96ac3583e2d30ad4
-EBUILD snappy-0.5.1.ebuild 695 BLAKE2B c07845e42ad17bc653082dc251ffaadcc3dc0ddfbf2ae919bc5257a446e7740d1eaf9bf5129dc2f3cccb9a3c3e9052455d9694cd5e84823b45deea676544514c SHA512 800cf4206616c54b57cc7834ca7af9bf763faa5f73eb6cdf116aa0af7d4a1edb8515a5b4000adc8447bb2abd51903d2328c64f6a553a281a941307619cf30429
+EBUILD snappy-0.5-r2.ebuild 616 BLAKE2B 7756adac460652c2bfc3e00510875d7abeda0549251e6717aef5c05acb5d8a28fae521cf4af06c66afede5f28e56eae1b43fc09e04b2d720778d6af07f265e8c SHA512 13e42ce5eafceea9b5d15efad2dd70061153e33f29bea171beb842fd4616033e73ca48441b52fa73052dec1629390da856e9a92f051aa04a7b92df0416d03ad9
+EBUILD snappy-0.5.1.ebuild 699 BLAKE2B 9170e525f7a2c734571f25d85c3d67ca9edd722965092dbad3905c6d5c6a48b51188765ba0a4af5d87379280abccf097ccaef023e9a3879010dbdd8256a95627 SHA512 9af49913da83daa43ae8a85bd259db03e6c074a33ce9be59fab32c89e05bc1254c23a2d90a3412fbe94942010d6097bcf4e9e8f1d6eb32d5e1a990d47acdff83
 MISC metadata.xml 376 BLAKE2B 534d91b9ba78233f6fdcfeb7ae6c8aaf426a4848c111ba297f3814671079d3aee1ae505a93c024f3682dda2042907c424db70e3b0a40f7902d020332889e1a0b SHA512 6760eff3990221e541650ff83fa59902230892c992209ab707ac1e8da67be6c097e50b80496500938073026ec4f81ba4016a7b43a84ddfa0f07f3171163fc1ef
diff --git a/dev-python/snappy/snappy-0.5-r2.ebuild b/dev-python/snappy/snappy-0.5-r2.ebuild
index 0b2aad954b05..f0da0bb8d5ed 100644
--- a/dev-python/snappy/snappy-0.5-r2.ebuild
+++ b/dev-python/snappy/snappy-0.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snappy/snappy-0.5.1.ebuild b/dev-python/snappy/snappy-0.5.1.ebuild
index 13ca53a22ff2..f04166d9fd85 100644
--- a/dev-python/snappy/snappy-0.5.1.ebuild
+++ b/dev-python/snappy/snappy-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index d4be61997b43..f3bb58f408d4 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,5 +1,5 @@
 DIST snowballstemmer-1.2.0.tar.gz 49639 BLAKE2B d53682e63ee1ab2776ca6869e109f364e4651be182908968c72db143a739fa43bfe387147cb9381b68057d9870eaaaad46720954458938ae83d15d544e820d84 SHA512 3359657867b9478bb58e6cc67a08212a490d5af07fed7098871b1e6a59def0031bd0c2a846cc9a0d70c94c64ba4d2ccb2f41afedde61d4a7235d26f68374bd02
 DIST snowballstemmer-1.2.1.tar.gz 49626 BLAKE2B c9967c45b008808bf9f5a12a4dbfcfc970c5878d9b10b37b4e5f1a4bca56ed6efd72ae4395b6a4d1a19d642786b6ccd1d01ec6e99b104a8237935ec8e64c1ee3 SHA512 09f860f383d84d12a83c87ef6654fba4ac10bca07e8d2ce88dd428c72754110d56a4b698e125a18818699a289455bf61cf67ea68e349ee8a12d6dfff0a3fbed9
-EBUILD snowballstemmer-1.2.0.ebuild 519 BLAKE2B a5477b8d28c4310d2d369b114b4557706118031dd53ce626bc71462a89847f491061f27a0681bb1f2f9cb7f86968b51f57c3516d71f22700d4a42969495eb7b0 SHA512 c984b56762d3b176e67a305269d377016cb6b6fdd3db20e3a8905d608a45f3f7bd0a45ac342d7d128a70eedb47cf750c3173233951a415c006d6ca40c858f1b0
-EBUILD snowballstemmer-1.2.1.ebuild 534 BLAKE2B 370aec38c24128c3f36fe124755d1087c55c0d0ae8632e868a2bd2dbe9e6de87677dc0f1cf839963a2ec16071c2ab0c5a6aceebe78452f9420c965ed67532f51 SHA512 64531c82da77180d95e78174ae6db6020725ced708cef59a146bf6078724746fb96df31a8f2ecd663ce789315b118b1c4b05aab9d793be4706e9111c61834041
+EBUILD snowballstemmer-1.2.0.ebuild 510 BLAKE2B ed698b788c6d3b48f5fda0354dee3d04b3d77c6cfbbe8442a29261339d0e02d5371e1b97d1b355b8ebb70dc198d8f7c6226b19db5f8c08dbd4e1d72cc7978988 SHA512 3b051f337f7a1977e3d251de8f4b8e8ba69b1a426f586018c106a9e7862004932ec00f2484b4b3ced6ceb92130890a3792f8e5fb575e8878c195134b077d504a
+EBUILD snowballstemmer-1.2.1.ebuild 557 BLAKE2B bacc3461c7fcbc4acf1d177a9ed9d3574bafb01c7550f4f36228f8e76555424537ffbf18eb229384e7d989e243afb44228862c506abb55f4147cbe730c3ddf69 SHA512 6d1e96d4e84c4614421e79be286daeac9ce301cdd8d63fcd73284b3eb6edbdd69c8de122561dac79e3ccac01d5962a8a9d36e38853a55bef810a1f59ea674d65
 MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
index b918778a3d67..56b106af1059 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
index 4515f1964935..fda5f81e7627 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/socketio-client-nexus/Manifest b/dev-python/socketio-client-nexus/Manifest
index f2bfc7e0cef9..08777cfcdd06 100644
--- a/dev-python/socketio-client-nexus/Manifest
+++ b/dev-python/socketio-client-nexus/Manifest
@@ -1,3 +1,3 @@
 DIST socketio-client-nexus-0.7.6.tar.gz 20128 BLAKE2B 84b032fda25a7aec40a4223f18d446da563a4c46054e79bfd38d1871233c88a66cb0213e3e825e5c91f6f587e671f5cfed75465c6f6895a84e1f2409facd330c SHA512 5c0301118beba684e1220c8984052e619d29037ec2c819eec13ac2ec4120025c85fb5b410285ee8466a105330f4a47b87f80116d7ff292c6b3e47a19eaa46702
-EBUILD socketio-client-nexus-0.7.6.ebuild 717 BLAKE2B 9c51efb794be753615d258327d4ba3d456d44f9c5363744ece65ddfc53da6ee4c0cf5152242ca9702b86fac487b248f89c98894c94eefd99aa9c68faf12d9ad4 SHA512 49e6d9f88da80f1f4a046735f2a4d10be878f679039392942083998ad1b119a4372834ecab33ae1dcc0b7940068eaca374f8019293b45c8c9975d364bfab884c
+EBUILD socketio-client-nexus-0.7.6.ebuild 705 BLAKE2B d7bb95cf1b85950d63dd79c9f4d461e103a78d209955f63edad93dba1d134baeb062b9553d3b029d7ccb7d26ac4992bd96daab84cfde6951baa86e31c8a0c3a7 SHA512 838e4ad0bb40bec954de8daa39d3b268f19558ae80b1aa827100fbd094f6c15d504354fda6013260b29c7bd7d4f55df14fc9894cc0600923948e87ceacb1ab31
 MISC metadata.xml 374 BLAKE2B c3d0feea5a61f13a9198e1d1904e1bcea718e9dde5ab62ec20a209f22498ee680693f55d3acf3d2d34a947d0a61b8e19620229c3e5902f8c8fade284f77c28f1 SHA512 6c2c21782939445fc5f470b60cd004ff4aef1909098794a970765da39d15c85440b2490d68a48113e80c512124519f090d528f4c786c29f699b7c95c29e42d2f
diff --git a/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild b/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
index 7aa6d2cfea71..34196888fc82 100644
--- a/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
+++ b/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/socketio-client/Manifest b/dev-python/socketio-client/Manifest
index 0fbde19c327d..872d3a5e004f 100644
--- a/dev-python/socketio-client/Manifest
+++ b/dev-python/socketio-client/Manifest
@@ -1,3 +1,3 @@
 DIST socketio-client-0.6.6.tar.gz 21829 BLAKE2B 72e47f9aa4bae06767aa1860fc7d57f7f2ae78dd037e46aa50a8672f4e168982d6e602ed8f80f203081e5747cacb0f6fa2959311271bc578c1b8b5bf70ec506a SHA512 aa21d31bf9e9062578fc6892a7624ea41ef3437eff132ff3ef2829a589c0fd19953fc514ab05161a32d06578708fb7f41b2f636d3d60a2700094e676d72cee47
-EBUILD socketio-client-0.6.6.ebuild 1470 BLAKE2B a2ec6bb60ad1ad9673ca2d68a28f148a3f69f27e9deff0929645cc3826c6ebc41c23be8f19e6ff7b3ebb7f083a537fd92601808058bc817cedd5fde57ca69be7 SHA512 aaf63a6ee6bf7e8cb76e67a5efced65ea9a7f0f8548e8fc1e52a0ce8a8ba971d5c542f872a9d99b82354540e5877279c5fe7b942d1085e9adcb5be123815d157
+EBUILD socketio-client-0.6.6.ebuild 1466 BLAKE2B 16f410d456bb1bd430dfe7d3bb6987dc8163dd1b680b728a9818ea2bcd1d4f0b96a4fbc7fae5c3309e4376745f4fe52bcc84f0d3869179c6455f1626d6502bd3 SHA512 9e62cacd4269182c29c5563305a691216584130cbaf4097043adb3719e7cfb46902aedd5949fc3d5265e202d023713cc2556e2086e0dae91ec31427df9573b7e
 MISC metadata.xml 466 BLAKE2B aeae4a6f57347d31b7eed388cc7beeb819174f5f07b438a418f99532eb01ae092e6fa9a5758512de10f96f9e8aecef0e234d6e893ba39a353ddb1e42f1574b41 SHA512 a5d48ac121de3b0334d12ff4e472aa04be849f87f8ef39222a5a112674d36390d1ca69936d675cb7a42d11e73cdc5019540091ac64b727842d515b2c96b68c09
diff --git a/dev-python/socketio-client/socketio-client-0.6.6.ebuild b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
index 9fa4e7c123f0..d225f8da3c97 100644
--- a/dev-python/socketio-client/socketio-client-0.6.6.ebuild
+++ b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index c503aa77d446..f88ea1b18174 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,6 +1,6 @@
 AUX socketpool-0.5.2-locale.patch 615 BLAKE2B eecb66a15dff1ca068da3147b7e27618f49cb414e34a27b10949565dfac46f5b714bd00bcfc152c9d3b98b59ae4282fa5431aff61295086abcf0e5367f45954c SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce
 DIST socketpool-0.5.3.tar.gz 9793 BLAKE2B 89b7b71d9f05f7f5e560eb3cb5e7cd4d2254ff971066d236b98903d790dd96f6c580333e9fafeab7314c50f499c9617df706a20efa1c52de069c583b6dabd928 SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7
-EBUILD socketpool-0.5.3-r1.ebuild 982 BLAKE2B 166a886297269abcd8f0fb3061e4dfb40103aefedc9916187321b8d0e822e196855f4eb744e38197699b187ea88000c84e365030b7325932b2e7a7949b2d6c95 SHA512 ae57c6b3c6ba190f48ae23fe48aee4c0d8ebc338db0da3d57269907e7782eea9228b20c4a3f94962897d073ad44277b4f17056adc394c612ac7cab78d3270f38
-EBUILD socketpool-0.5.3-r2.ebuild 1043 BLAKE2B aa5bc09a3dee1136e77f62eac1a1df7b88bfc5466ba1b22e48c050f4a1986024ea475f9e29b055b50630ec448cca787968807a07c11947069d30c7cd92b80598 SHA512 a9924a35408d545a1c181eda6225b488bf7ce29e0b9d25d727828f464591ecc95d0aceec1c38ea565d577078f402c37069c319acdbfa8e08aa2a7096f4ba4050
-EBUILD socketpool-0.5.3.ebuild 969 BLAKE2B e5a5bb8df4f37b753ccb1026c70c96857ea15d97b9eff8aa33d3abb1d408f0ff755518323216b9cea627d879492879fcf52989a02dd41f8b67d22743110628a5 SHA512 944626f2b01dd0a9b1533a740b0742a69f7166c3b440051378e7980a55cd99994ccda638fcecf9ee9a690ed9d300ca7e824c89f9c5887793bbf1fe5781b32973
+EBUILD socketpool-0.5.3-r1.ebuild 975 BLAKE2B fc5001b9f6fa4b613af376152a1c23ad6427d3c0b1df476b3aaa0cc8e5ac133c56707bc20a1dffbdf196b57b050a076c99ca3dba21bfd820922869ef24c0decd SHA512 84dd02208f0ce80490197c81d36581be83c1074a7e42afbeb93fb8ff49eb2d2e8c645a327ed5398d17869a92ea9585fd56a0e2dc660314ad20bd30e851aabf92
+EBUILD socketpool-0.5.3-r2.ebuild 1038 BLAKE2B 8607a30281bcebb44c3cf4ee57f334495a5df8b8424512f2cb39555b7c4d2a8d3cb62a154beb2e7672d623deffe8fc14f31f29a6a14027afca5a16bd021eaaca SHA512 fb1b9cb14bee5b146989a302583938e7a1746b3e922290e1a4f5183967408724bd66d790e7f7e1e2d658879f466cebd75e4e4da75bfcd208536e83a7ae184035
+EBUILD socketpool-0.5.3.ebuild 960 BLAKE2B f0bb63520f399faafbee2efc6ad1e3095649f4f6c28a8792be351af2beb43844955aa68b8a362a11cc9dca206aead000d510e64f2b7db25a782c1abbb30f35b2 SHA512 b28b229eabee3fe410ad28153c0ce443aa0ecf613390bad07ac5551d23a3aa855e770be9ba49fad3464220e7dc5aa0c338988a2c4d1e7af078957eb3b535536c
 MISC metadata.xml 383 BLAKE2B bd4f1eccf7f3fdd7c416bfea5e96ff6b1b28b4bc5e703e1e236be4932e20bdbb8d9bdf6712f0bfd8845b49fe0a7ebc032f21bfadfe419554ce54c2b790cf73ce SHA512 3051b0487ab4dcdf440c36b12829a30c03db7256c99eef6623497b8223ebf6cf188a9ae054342c468771b2a38f8b3508ff0f49aa19398f3aec0a25a7bc1e9248
diff --git a/dev-python/socketpool/socketpool-0.5.3-r1.ebuild b/dev-python/socketpool/socketpool-0.5.3-r1.ebuild
index b4e7c0ab25f1..e423b7512595 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r1.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/socketpool/socketpool-0.5.3-r2.ebuild b/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
index e03c80327f44..21521dcf380f 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/socketpool/socketpool-0.5.3.ebuild b/dev-python/socketpool/socketpool-0.5.3.ebuild
index 84cda4f5142f..15d48d4d48b8 100644
--- a/dev-python/socketpool/socketpool-0.5.3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sortedcollections/Manifest b/dev-python/sortedcollections/Manifest
index 248d937edcea..626d17c00bf1 100644
--- a/dev-python/sortedcollections/Manifest
+++ b/dev-python/sortedcollections/Manifest
@@ -1,3 +1,3 @@
 DIST sortedcollections-0.5.3.tar.gz 7021 BLAKE2B fdef18b938502f0fc7ce1683977b0982c23aa915d79b6bac30cf9cd74aa19af695f2aacb658a8411304497f28d270e9ba95bbdbcc47220f0302cd376edf312d9 SHA512 e0076017d1a97d7dc18b02bc4e3739c535ab001260be739fab2784cb58deac4323957fe21b4c679f55a790d864ca696695a603298709225b04eae740d859ab28
-EBUILD sortedcollections-0.5.3.ebuild 594 BLAKE2B 5dd22c31b3218485eb89f52b0406fd55da9ccd99310c132ef5fa4ff493d75b645e8dae5ec2a1ccc722009425ae2498455cbae84ccfd03565a43b2f5aadc09d01 SHA512 bd586b5cf75ebe87c786863ff6ef02428a5ad0c54a23cd63fc4dde36f220bd8a482470311a39ba3d330a21fab1f50084012feb78c53b7c81782a3246cbd3a286
+EBUILD sortedcollections-0.5.3.ebuild 592 BLAKE2B fa62d3864a6a9569a46c1a5c018015a938f7bb5c19a81a6cd3c379ee9e3a246797b8ab7ee96fd309dca69e207182bab77d5d9392719d14b4eb80396468e400c0 SHA512 d10de17ed9603e59511d5390e1f5b1d519b09800089b5a4981473923266efc31bed390d3780416c14ef1cdce27bf0ad36c0f0d15d9afedd2a4cefd318c085f84
 MISC metadata.xml 498 BLAKE2B 5638984052d38b48773ba3efad23de34d7d22e5de6ab570a0f1c8494918b0f331b2a3f7cd72d976de9d1d24ae623af07370bf9daf6833792019472a1a23c2fc0 SHA512 d332e588cdf6194708c1e3f00e9e8159669eb36cb21b4c6eed8e5af44f09f7e71f12fe437ce889b96599994f7a9c9d7c4fa6642c2ab74cedb0490d21a3165d21
diff --git a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
index d8c90690393f..cf93ff3ae9ce 100644
--- a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
+++ b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 2d7d4ae56547..6212126b2b51 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,3 +1,5 @@
+DIST python-sortedcontainers-2.1.0.gh.tar.gz 9220860 BLAKE2B a667fa817f0b240b8af9758d5d3942710cfe6a39109c41e6e66d0dd464b300d2201a679335e418442aaa6e1953e38a43b46c2bd6ce631b7c168d6173ca36998e SHA512 1c56daea5d491dbeea9c677677a79ef5c4805325ea3d5da97005cd3b269003a99459550a793dfe65820f152c774371472ba471a7daf61c9d97b36744bafb013b
 DIST sortedcontainers-1.5.7.tar.gz 11970881 BLAKE2B 0ffdc19a9be82481e71a7ef59391166e19c44d7fc4eac7696d153cac707fdc4beb84a36039e3f1e194c43dc9e956eaae5dfd909f24ef12db4ea99c8548475cab SHA512 a9f2ba152c47eddfda6ad8ef7ecfbfa5d51b17afb4042b0b1e6d8b3dbc6caf6f8281af415dfcf1e356aaf80aa3212865ba926fe0d6e08961c8fbbc68adb34108
-EBUILD sortedcontainers-1.5.7.ebuild 598 BLAKE2B 8fc11ffc583ac946ec75c2ccf59d40caef1d508dc1d508148ffd3a2311c53ede4fb7a74e72f71c24b74455e1700309cd62b9c3e59c4fdf53409ae7cefa4c7a4a SHA512 de5af62454b0d086ac58f5fad22a0a86b003c39f423c83b32d1c010dc4a5998f1d33d813131de857255176e349d2e1ab94fa81c8f96d284e9bbb7ffdaae861ef
+EBUILD sortedcontainers-1.5.7.ebuild 596 BLAKE2B a4fc973ee9b1b4adbb2147b9654a54500a229b06196038c657c8452bc2a91b67caebaee9c60bcc9fc94029de98c64831b85deb1cf2078204331626a87ec2bd25 SHA512 50660da8b57a9cee9bfb4eb8e33fbfb284432a881ca7b1545dc2727a9af247cd0310fcfa3a9fd2d18a863cc9707d9a77deeb46a8078b3a790dc368e3cdb5bbd6
+EBUILD sortedcontainers-2.1.0.ebuild 797 BLAKE2B 452ad4f72e80bea98fd54f5e2f9686f8c9c6849517e05ede4ed3e59eb3cbdeafb51c90af5049df012f226ef5c2c48d6ff7121dd2c28cd3c61cd515012c53c687 SHA512 f4768a74ee1c089049ca89a233031ec415a6af36d53f787881151873fae4d02248b9af5dca2d59271bdc580f41b46b2355609a30c8b7ba8f7fc233f4ceb754fa
 MISC metadata.xml 528 BLAKE2B 24ac135145b3465465b8ad8eb90b92a2265bf1209451f042ef5e6822088efb05278932ea2e94e5817bf5889bd6653726b5435ed88c633f609184c9e4fb43ef04 SHA512 a5783cd12e4f0e372da9b4256ab4d7cbf42727e773342d110126f5509611a335d95b949aff706658508d6bd37e633635af0f32b72f514661eae68a79072e5531
diff --git a/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild b/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild
index d7b83d580b0a..b2043c1da57b 100644
--- a/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
new file mode 100644
index 000000000000..344bf6d619a4
--- /dev/null
+++ b/dev-python/sortedcontainers/sortedcontainers-2.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=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python library to sort collections and containers"
+HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
+	https://pypi.org/project/sortedcontainers/
+	https://github.com/grantjenks/python-sortedcontainers/"
+SRC_URI="
+	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONPATH=.
+	pytest -vv --ignore docs/conf.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 4c3836820ee7..c6cad3f2e18c 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,3 +1,3 @@
 DIST soupsieve-1.9.5.tar.gz 99119 BLAKE2B adf2f068ca536583557dff5b86fbb8020de8139c346ab124c8f78d91d2c0db49553cc9b8580a4e8af0fb74e19a8f8b6e5459b654a900034d76a677e60ea0fece SHA512 38cf37c7080ec6054291a076eb4b152bbf5267b9fed25f933a340345cd7807f14f4a5300707090fd233382e96841f6a33305876cf02740c96dd6aa9d2af06868
-EBUILD soupsieve-1.9.5.ebuild 902 BLAKE2B 6b874a4b1a9cf3417d656f1bd0480434fcec9cd9bfec78c48974b55359990b99483481d3269fc730d733c90fe6bbc99bcc3dc4757211ec305c34b04d268e3f9a SHA512 fec529a5876d42990a9188a351bc0321d04fc184e4d8ca508d306d6a56bc93c80f7334ac83860caf9b4968f6a81e62e51e6f059daf7ed44d89b8a3d89efa1fdb
+EBUILD soupsieve-1.9.5.ebuild 897 BLAKE2B 51577ae407be745c42263275b116cee39eaab09f5620a832fc1aad6aa175946e1a18b6e019947999f813c2e911e0bd4d8f44d6ebe53190098a62d9c68527f12e SHA512 2e896efe656a22bfd51734092766c55da07a43fb74dc591ec663eb3e3b7b56fd91e025e0b91b05c3f4c07d33bfb4e96d773c97df0d38ee22542cf39bb0d6b20e
 MISC metadata.xml 374 BLAKE2B 14941be3b61b2a2c4cdbd3f488d5ee9043a01d2b5d216947d41cc96822a80a34f435ba0bbaaede5ec6bfa21e01e3f7a6ab09d2b79bdc58b843b7da794ed92d25 SHA512 22a17406eaebb4e49a1a78d0edb8c155a8416fd92c21fbfd277ec74f54b65c55de1d08c046c979f1e3a3742900d853d5c820032e22e5e61e4624f2b1bd0c5b45
diff --git a/dev-python/soupsieve/soupsieve-1.9.5.ebuild b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
index 0e81dcaba08f..78ee602f0a1d 100644
--- a/dev-python/soupsieve/soupsieve-1.9.5.ebuild
+++ b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/spark-parser/Manifest b/dev-python/spark-parser/Manifest
index e3245aabfb52..6d84926327b8 100644
--- a/dev-python/spark-parser/Manifest
+++ b/dev-python/spark-parser/Manifest
@@ -1,9 +1,5 @@
-DIST spark_parser-1.5.1.tar.gz 111933 BLAKE2B 2ad1045f17ddc2f8fc025ca7b1567db56ce519714b59374b4653d5bfc504d12192d9c6696fc7ff8fee8ef9fc4328fb629b6cd72d8d235f8187780dadef3c9039 SHA512 d46e4bf27b867e7e20e5d9d226d606428cc2173afdca27d5f8d26db2515a7ecb89b7a27cb091ff3d7d7c9cde748cc0e027b1f9212a2fc7b75144e156d16c8916
-DIST spark_parser-1.6.0.tar.gz 133871 BLAKE2B a7c57d77aa81430365c7e1156f35535b923e5f326adbffc4a7ddd2c270ce70749615ff94723825ffc0195c8d266ccf26e9e75c68b7bfdbe31e27210ab528c826 SHA512 56a89114b35449f0bcd34e2d8c6363d249b839395827fde791c0ec2e425f75a5e5e48d960a5a3c115ca4c7088ea720aba1be03c8b55611d14b18d07f9873a91c
 DIST spark_parser-1.6.1.tar.gz 134114 BLAKE2B ec59af20c84e488a3211cc2d8ece8e89a70bacf52c0b3a28c78cd535fe33d5bcae45e86ee6da7e7b68c95782d1b79577a186a140f76b2255720f7bd7337dc161 SHA512 290069ebe37aa4d5dddacefe3a4d48607076990fe1f27f914d154fa48a5249cddd0c9d238b7e4c7a9a52ddfc054a3cd5639e52b618b5f4bc5b833c4e38b21c2b
 DIST spark_parser-1.8.5.tar.gz 123974 BLAKE2B 29efbeb35592bdd95108b5289448a6530f3211b31afa32dbb66721d1d473c1a30abc8f4700a6dee6f9dfc47cdfb1de036fa9fdb4c783d7bed7274d29b69a2038 SHA512 12ca0ae14c39edb825067574931b005f85eb46ac2cfc8e2573169da1fb54b4247181b9d2cc8449ab9a0dbd45742d68e415fd766764ce708df620bd7288b18130
-EBUILD spark-parser-1.5.1-r1.ebuild 716 BLAKE2B 6e909f07d8eb3d8d72ed0241745005f7a63d1d33b0a9827d8824fc298bce3b73b9faa66bf38201761502e29d8f835c18efabb27eaff255a6e6b5057970ff961b SHA512 1cb8055b0d97fc8eed7935d36c2b0173efe636c4380608efa8111df8369ff4c5d69f412eb003d5dd8d1ed09888523e673a100f2665d2ce1929b619fb50e06e1d
-EBUILD spark-parser-1.6.0.ebuild 720 BLAKE2B ebaf47c9619c197bc1bf8d305afd70d8ad031560059f1d7772d7a0b911b57d29e1abc4db8411313d84fab82fc024deabb0d397c230b5f8b0d69d49b2074befea SHA512 8e8e903fff07a263bd332273a7f9efa2f7ad493a670133c2891fdab685722ad5d9c54aaf96d54807a57f815f70973c2c2bee13990013cd26a9a17ca243c943df
-EBUILD spark-parser-1.6.1.ebuild 720 BLAKE2B ebaf47c9619c197bc1bf8d305afd70d8ad031560059f1d7772d7a0b911b57d29e1abc4db8411313d84fab82fc024deabb0d397c230b5f8b0d69d49b2074befea SHA512 8e8e903fff07a263bd332273a7f9efa2f7ad493a670133c2891fdab685722ad5d9c54aaf96d54807a57f815f70973c2c2bee13990013cd26a9a17ca243c943df
-EBUILD spark-parser-1.8.5.ebuild 720 BLAKE2B ebaf47c9619c197bc1bf8d305afd70d8ad031560059f1d7772d7a0b911b57d29e1abc4db8411313d84fab82fc024deabb0d397c230b5f8b0d69d49b2074befea SHA512 8e8e903fff07a263bd332273a7f9efa2f7ad493a670133c2891fdab685722ad5d9c54aaf96d54807a57f815f70973c2c2bee13990013cd26a9a17ca243c943df
+EBUILD spark-parser-1.6.1.ebuild 711 BLAKE2B 404230f0825b773b9a6bf097c6f2d91de6f9837aa87446f3b7bddf5d445f92bdc61567680cf7c98f7a01e48935c8b4588124906d481552742d9f05f408f4998a SHA512 000b22ace73a6aab4bdfb4ec231e0efe1b3308b0476b1fa7dce9c4177ca754ff6e0c7aaab8aac648b5fd650a47501226fec53744232befd27591287c330bcf77
+EBUILD spark-parser-1.8.5.ebuild 711 BLAKE2B 404230f0825b773b9a6bf097c6f2d91de6f9837aa87446f3b7bddf5d445f92bdc61567680cf7c98f7a01e48935c8b4588124906d481552742d9f05f408f4998a SHA512 000b22ace73a6aab4bdfb4ec231e0efe1b3308b0476b1fa7dce9c4177ca754ff6e0c7aaab8aac648b5fd650a47501226fec53744232befd27591287c330bcf77
 MISC metadata.xml 792 BLAKE2B f23bb836d480fa5f0d6723343c86bf2f6d3f535a977013d023aee828e88dd88cac3df0cf5effb9f33aef01a5ac484638f1bab7074a9a3926e7e4f7a3ca2c7909 SHA512 ba7cbf1cf29885a44864347b4469511e0a97f8144a297ce17c88c518a473200277f7ba2a88ce9ff7fd79c48000f5620ad723c0f41adc6b5f9dbe47dc60c7c517
diff --git a/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild b/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild
deleted file mode 100644
index 1e2513ff4794..000000000000
--- a/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 pypy)
-
-inherit distutils-r1
-
-MY_PN="spark_parser"
-
-DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/spark-parser/spark-parser-1.6.0.ebuild b/dev-python/spark-parser/spark-parser-1.6.0.ebuild
deleted file mode 100644
index 03de6c2eca5f..000000000000
--- a/dev-python/spark-parser/spark-parser-1.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
-
-inherit distutils-r1
-
-MY_PN="spark_parser"
-
-DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/spark-parser/spark-parser-1.6.1.ebuild b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
index 03de6c2eca5f..af0989704ad6 100644
--- a/dev-python/spark-parser/spark-parser-1.6.1.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/spark-parser/spark-parser-1.8.5.ebuild b/dev-python/spark-parser/spark-parser-1.8.5.ebuild
index 03de6c2eca5f..af0989704ad6 100644
--- a/dev-python/spark-parser/spark-parser-1.8.5.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.8.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index 7421e90fec26..87737049afbb 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -1,7 +1,5 @@
-DIST SPARQLWrapper-1.7.6.tar.gz 26597 BLAKE2B ef98640257d06e1814d57812864b2fd23ccbf2bb2121e77b84e87b26f4daf9cac576dc005659a023ac318d7da4dfdf4b6f96ea30f159e12f444cbf7f93a7e97b SHA512 cbaafe8986f7da88efc383ee7e694559c9314244a03f616e5f2afd186205ad625fe0601a2316013add4c11621fc697aa6d4672f8bbabdc485c11e873ca6342cb
 DIST SPARQLWrapper-1.8.0.tar.gz 28775 BLAKE2B b8ef5d3e2d52f4e17c47a7a398d01037dac3f6b62722faf92b6b76f37f2ac7e242ebf3cdfa93788744f632e58caf95207d1c37c462639151e20db74a94f4d69f SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907
 DIST SPARQLWrapper-1.8.4.tar.gz 56757 BLAKE2B 1d181a4269d4d2eadfd860e014f31f9134b500d4df437ab548804166821c574cfaedbe011c6b24328a40296da88378205b45839d225ada2b4afc6ffe28360f2a SHA512 301fce7f58b369009a13988a11d782fce6362d73472811a07dc4d962062097b48470c573f5bd1dc337532db467e75936f9e89fcc64dde91930077ce4a1657179
-EBUILD sparql-wrapper-1.7.6.ebuild 597 BLAKE2B 3adadab7edf7687f4374eb178c3e5e90490b5970cc66d8c265434643fc8049a73d2550612c162f3207fbf42c4fea06aa462a85f604e4617b61437341f26d13bf SHA512 94a99e4200137e0eef68b1a80768d807dae5e0d3d605307d5bbd84ecc0cd00de19ba50aa494337a39805e8388cddae320fac16673eb303176558aae0331e6534
-EBUILD sparql-wrapper-1.8.0.ebuild 614 BLAKE2B 15416ad7b3f78dbb1c7fc14e331241db43a42c65973f6e02c75f0962c3c275d0d0f9245f8c4ebe05aeb7a94b9e248dc72fa9ab914966b355ca421b9bcb002029 SHA512 62fbdd3c0c3168777cb6842ffb08349dc4c0c831b8f7497ff5035909c5bc68d070cccfe6fa4043255032e75d91ca34b59bd3c2b7a5f001e9a90aca2b75b7fce5
-EBUILD sparql-wrapper-1.8.4.ebuild 622 BLAKE2B 92098e305f4b78f6e8605aec839e770fe87732b67cf4a2549a9acd85846f7ca5b8e1e6d8cf32186bfafb0702159217d3245f2234c3babc500c61e4d1e6a640a3 SHA512 17c64f4fcb1277052a6e9a7558306d3df978e9bbc7f509d0d42f9b99a6fd7a632cc0df4e30c164acc8a9aedf7520a1615da0c49efbfd2408d2cf0ce9be785e89
+EBUILD sparql-wrapper-1.8.0.ebuild 610 BLAKE2B e9c6061f6fb3ad1a5b9d3cb8b12cc095b5b967ac1d78bf22dcde5696b1bdfdb62c5dc79fe2f484c90226a231e40207cc627ebfb83a222a7cd37339f869863d2b SHA512 266d4cb22956fbdc95c173a30b522f92d145596473c5702d4510346ac16f4ef28cf71e23d7476d12e3167bdb7c3dfe3beaa175315dfcee97cea8ed0e8d37b354
+EBUILD sparql-wrapper-1.8.4.ebuild 620 BLAKE2B 2fdf8956b4679820c3bd3b7dc76213199276afa9f7312f892065e48324a9c330915ab99fc6b9c7282bde60c4181e52693cf2c1b52ae035c72111fa80080ba06a SHA512 139f32edb4b7fc0d1f4fd4ce9941a2624b62beeee48578f93e0ceaafa359917b36c80eb9edf5d2a58b9f7108773f4e9e33940fc82b2cb2a4f3ed64610d186a49
 MISC metadata.xml 326 BLAKE2B 0c3bfdc601d5e93c90d7966cf8b7de667f7c71b2353ea1a7c28ac0c52028999484f4cee8601d346d78e963055df1bfb115a1acb79bf0a07e8de6df600b63c83d SHA512 9cc7b41b1ba7fbcde0ecce7638a3b2df50d6290d65d9854ae6611ed144220d9b292235ab8916330c828a4f9a1c5605de6d0d71d1a08fb0f6ddf37f7302c03e40
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild
deleted file mode 100644
index 8c23e4e7a152..000000000000
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-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"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/rdflib-2.4.2[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
index 704ca71aebd3..e7f02e5d63f6 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
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 b228c3783258..757df0f3f8ed 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/speaklater/Manifest b/dev-python/speaklater/Manifest
index 422764e4c9d6..c253de1c33ae 100644
--- a/dev-python/speaklater/Manifest
+++ b/dev-python/speaklater/Manifest
@@ -1,3 +1,3 @@
 DIST speaklater-1.3.tar.gz 3582 BLAKE2B cddf87583670ae185336b73631b28da3dc26b74b75df82224da23df6c528ee074ca31c95d5fbe2971eb87c50480be022493164de62f02f1987a5768d7ae69092 SHA512 ae137d94c497cd4214e230c8906f3ba40e092f248206d37b61de2571567e39e27b7f58bcf2145bd0c81c195c3c5ed03fc0428e0a50c657c5c909ec82719454ef
-EBUILD speaklater-1.3-r1.ebuild 824 BLAKE2B aee3e81a2d09b2e44a99aa1c80421879b2884b8771cb0a79f21353c98f19ed3a0c318dbc2c39a0c29de3af4297a144a5e7ef01258fe2236dade4148ff57b1f65 SHA512 01f2adb2498391171cff8bda03fd0b9c19c5a31123e97bb80bf6d6443dbd83f0012f2f7c35767582c9e2001c6fb1fa139b177157f4b01866b9b3fd134bc9d474
+EBUILD speaklater-1.3-r1.ebuild 815 BLAKE2B b141f3a48b28c4940965edeadff1d316991489586fa431d9ab3d2c710c06fdbc28690a8194ccafbbd0df1d8d42f8add7111f9d17754aec480302cf82bc425ef8 SHA512 80d1dc8a4aa24e9c8caf1e4bc8b237d05b4260dde1009a9e3e0d49224fd22efb28f2ee8cc9a53b0fe5788bcc035b0d8b70f9830a0c30459a7fc6182ef3bc27cc
 MISC metadata.xml 455 BLAKE2B 6270f4ecfb1f4a889daa446a01a3c135190af3d595231e410ec5040e4b869b52c210fdc33df13174566ed720130ad27523b0734baf578527412e25420eae8140 SHA512 8108151c4b3dec1c435e76c7caea98d68913812d32ae75cc72d000fbe90d20ad726dbbaa1186ea1443d1c4323785bab06006a4bb3176684fea6e534ab3d21e91
diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild
index 321e2f29a60b..46da280e4265 100644
--- a/dev-python/speaklater/speaklater-1.3-r1.ebuild
+++ b/dev-python/speaklater/speaklater-1.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Lazy strings for Python"
diff --git a/dev-python/spectral-cube/Manifest b/dev-python/spectral-cube/Manifest
deleted file mode 100644
index 225524d07c78..000000000000
--- a/dev-python/spectral-cube/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX spectral-cube-0.4.0-looseversion.patch 6250 BLAKE2B 8ac525adbe36563ca793f2d628977551387271e129905523506e1eb126ce288a936fc14da615c388e2ee0ed632499e056fae81bc53c6524977c97d06b6df7cea SHA512 caaec6f1e405e6986a148495be716e120ac8a6abb0738d7f1906efde4d4097966b10fce73dd8b538b3ea616a5245ffb1b876c1a16ad85e2362206b7d0d52ffdb
-DIST spectral-cube-0.4.0.tar.gz 290453 BLAKE2B 3e41ca0e6d925e36269c638aabc9e4df70ac8abf9ac2a59c4425435bbcb2d0b9b1ec1140e47828d597665a0164dc7c0b88d929762ca5c7bf72b5b16aa31f97d1 SHA512 20970d1be0d836bd07ea96ee909300f28eaf2ab4ded7b4525eb68399d242b864fe93120a16ef2ef35eba5f547c0cbe90b07c27ef44ab1910dbbe97230fbab84e
-EBUILD spectral-cube-0.4.0.ebuild 1244 BLAKE2B 4a95812dc14557229257e93b4d00d39e0849f81a9b5504f3b8bfd8c30d1af2ab399e3b322985a6bc233e490ae41aff7c647555f1d26d7d36d1d479e7fcb02dad SHA512 6f605c749c4469c392aad534a1c96574a907c247e4d28f49db102ea7d604a0efda73823861f9e355b8133fd0016fb512c21730af704c5d45248df5af620f917b
-MISC metadata.xml 773 BLAKE2B ed1f11a1efd762bc880b9d10d40780c8876c6d6a2216ad0617d9219db1fa9e56b2ea1aa05a653fd613715703f12320df349fdd1ed2b1331972ca6c7773a9b717 SHA512 407cdc09e494af2429bf809dc946bc7e05c300e9e4cbad68e75021628f2cfc187561c3a183081cf13cb7b892631d2bceebd5ae0a0109957a1936ec64ea4f6d4f
diff --git a/dev-python/spectral-cube/files/spectral-cube-0.4.0-looseversion.patch b/dev-python/spectral-cube/files/spectral-cube-0.4.0-looseversion.patch
deleted file mode 100644
index 42147de559a5..000000000000
--- a/dev-python/spectral-cube/files/spectral-cube-0.4.0-looseversion.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Tue, 12 Jul 2016 08:54:59 +0200
-Subject: Use LooseVersion instead of StrictVersion.
-
-StrictVersion fails on numpy RCs. LooseVersion is a compromise until something better is available.
----
- spectral_cube/np_compat.py                |  4 ++--
- spectral_cube/spectral_cube.py            |  4 ++--
- spectral_cube/tests/test_masks.py         |  4 ++--
- spectral_cube/tests/test_moments.py       |  4 ++--
- spectral_cube/tests/test_spectral_cube.py | 10 +++++-----
- 5 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/spectral_cube/np_compat.py b/spectral_cube/np_compat.py
-index e72b4d9..dd9080a 100644
---- a/spectral_cube/np_compat.py
-+++ b/spectral_cube/np_compat.py
-@@ -1,7 +1,7 @@
- from __future__ import print_function, absolute_import, division
- 
- import numpy as np
--from distutils.version import StrictVersion
-+from distutils.version import LooseVersion
- 
- def allbadtonan(function):
-     """
-@@ -11,7 +11,7 @@ def allbadtonan(function):
-     """
-     def f(data, axis=None):
-         result = function(data, axis=axis)
--        if StrictVersion(np.__version__) >= StrictVersion('1.9.0'):
-+        if LooseVersion(np.__version__) >= LooseVersion('1.9.0'):
-             if axis is None:
-                 if np.all(np.isnan(data)):
-                     return np.nan
-diff --git a/spectral_cube/spectral_cube.py b/spectral_cube/spectral_cube.py
-index 231245d..fa61119 100644
---- a/spectral_cube/spectral_cube.py
-+++ b/spectral_cube/spectral_cube.py
-@@ -34,7 +34,7 @@ from .lower_dimensional_structures import (Projection, Slice, OneDSpectrum,
-                                            LowerDimensionalObject)
- from .base_class import BaseNDClass, SpectralAxisMixinClass, DOPPLER_CONVENTIONS
- 
--from distutils.version import StrictVersion
-+from distutils.version import LooseVersion
- 
- __all__ = ['SpectralCube', 'VaryingResolutionSpectralCube']
- 
-@@ -2072,7 +2072,7 @@ class BaseSpectralCube(BaseNDClass, SpectralAxisMixinClass):
-         import yt
- 
-         if ('dev' in yt.__version__ or
--            StrictVersion(yt.__version__) >= StrictVersion('3.0')):
-+            LooseVersion(yt.__version__) >= LooseVersion('3.0')):
- 
-             from yt.frontends.fits.api import FITSDataset
-             from yt.units.unit_object import UnitParseError
-diff --git a/spectral_cube/tests/test_masks.py b/spectral_cube/tests/test_masks.py
-index 9116cb3..42a2125 100644
---- a/spectral_cube/tests/test_masks.py
-+++ b/spectral_cube/tests/test_masks.py
-@@ -14,7 +14,7 @@ from .. import (BooleanArrayMask, SpectralCube, LazyMask, LazyComparisonMask,
-                 FunctionMask, CompositeMask)
- from ..masks import is_broadcastable_and_smaller, dims_to_skip, view_of_subset
- 
--from distutils.version import StrictVersion
-+from distutils.version import LooseVersion
- 
- 
- def test_spectral_cube_mask():
-@@ -370,7 +370,7 @@ def test_flat_mask():
-     assert np.all(cube.sum(axis=0)[mask_array] == mcube.sum(axis=0)[mask_array])
-     assert np.all(np.isnan(mcube.sum(axis=0)[~mask_array]))
- 
--@pytest.mark.skipif(StrictVersion(np.__version__) < StrictVersion('1.7'),
-+@pytest.mark.skipif(LooseVersion(np.__version__) < LooseVersion('1.7'),
-                     reason='Numpy <1.7 does not support multi-slice indexing.')
- def test_flat_mask_spectral():
-     cube, data = cube_and_raw('adv.fits')
-diff --git a/spectral_cube/tests/test_moments.py b/spectral_cube/tests/test_moments.py
-index 9b118fd..82eff40 100644
---- a/spectral_cube/tests/test_moments.py
-+++ b/spectral_cube/tests/test_moments.py
-@@ -1,7 +1,7 @@
- from __future__ import print_function, absolute_import, division
- 
- import warnings
--from distutils.version import StrictVersion
-+from distutils.version import LooseVersion
- 
- import pytest
- import numpy as np
-@@ -78,7 +78,7 @@ axis_order = pytest.mark.parametrize(('axis', 'order'),
-                                      (1, 0), (1, 1), (1, 2),
-                                      (2, 0), (2, 1), (2, 2)))
- 
--if StrictVersion(astropy.__version__[:3]) >= StrictVersion('1.0'):
-+if LooseVersion(astropy.__version__[:3]) >= LooseVersion('1.0'):
-     # The relative error is slightly larger on astropy-dev
-     # There is no obvious reason for this.
-     rtol = 2e-7
-diff --git a/spectral_cube/tests/test_spectral_cube.py b/spectral_cube/tests/test_spectral_cube.py
-index 025e6bd..4dce3bb 100644
---- a/spectral_cube/tests/test_spectral_cube.py
-+++ b/spectral_cube/tests/test_spectral_cube.py
-@@ -4,7 +4,7 @@ import operator
- import itertools
- import warnings
- import mmap
--from distutils.version import StrictVersion, LooseVersion
-+from distutils.version import LooseVersion, LooseVersion
- 
- # needed to test for warnings later
- warnings.simplefilter('always', UserWarning)
-@@ -468,12 +468,12 @@ class TestNumpyMethods(BaseTest):
-         scmed = self.c.apply_numpy_function(np.median, axis=0)
-         # this checks whether numpy <=1.9.3 has a bug?
-         # as far as I can tell, np==1.9.3 no longer has this bug/feature
--        #if StrictVersion(np.__version__) <= StrictVersion('1.9.3'):
-+        #if LooseVersion(np.__version__) <= LooseVersion('1.9.3'):
-         #    # print statements added so we get more info in the travis builds
--        #    print("Numpy version is: {0}".format(StrictVersion(np.__version__)))
-+        #    print("Numpy version is: {0}".format(LooseVersion(np.__version__)))
-         #    assert np.count_nonzero(np.isnan(scmed)) == 5
-         #else:
--        #    print("Numpy version is: {0}".format(StrictVersion(np.__version__)))
-+        #    print("Numpy version is: {0}".format(LooseVersion(np.__version__)))
-         assert np.count_nonzero(np.isnan(scmed)) == 6
- 
-         scmed = self.c.apply_numpy_function(np.nanmedian, axis=0)
-@@ -667,7 +667,7 @@ def test_read_write_rountrip(tmpdir):
-     assert cube.shape == cube.shape
-     assert_allclose(cube._data, cube2._data)
-     if (((hasattr(_wcs, '__version__')
--          and StrictVersion(_wcs.__version__) < StrictVersion('5.9'))
-+          and LooseVersion(_wcs.__version__) < LooseVersion('5.9'))
-          or not hasattr(_wcs, '__version__'))):
-         # see https://github.com/astropy/astropy/pull/3992 for reasons:
-         # we should upgrade this for 5.10 when the absolute accuracy is
diff --git a/dev-python/spectral-cube/metadata.xml b/dev-python/spectral-cube/metadata.xml
deleted file mode 100644
index 0cc45ca202a5..000000000000
--- a/dev-python/spectral-cube/metadata.xml
+++ /dev/null
@@ -1,19 +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-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    The spectral-cube astronomy python module provides an easy way to
-    read, manipulate, analyze, and write data cubes with two
-    positional dimensions and one spectral dimension, optionally with
-    Stokes parameters. It aims to be a versatile data container for
-    building custom analysis routines.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">spectral-cube</remote-id>
-    <remote-id type="github">astropy/spectral-cube</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/spectral-cube/spectral-cube-0.4.0.ebuild b/dev-python/spectral-cube/spectral-cube-0.4.0.ebuild
deleted file mode 100644
index 858ca8c5b280..000000000000
--- a/dev-python/spectral-cube/spectral-cube-0.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Manipulate astronomical data cubes with Python"
-HOMEPAGE="https://spectral-cube.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/astropy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-looseversion.patch )
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		PYTHONPATH="${BUILD_DIR}"/lib \
-				  esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	pushd spectral_cube/tests/data > /dev/null
-	"${PYTHON}" make_test_cubes.py
-	popd > /dev/null
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/specutils/Manifest b/dev-python/specutils/Manifest
deleted file mode 100644
index 755dd4be49a2..000000000000
--- a/dev-python/specutils/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST specutils-0.2.2.tar.gz 3349951 BLAKE2B d5014908fbd0f3c9a72492109b811998fcf09b721223eb5e1de6921ccc0a2469ac95133e793164ee0352a5b43fb58852e8b7a3f0e55aad34f8c73d0af40f2f4b SHA512 34afeaa33dc529372b926d905024c88786fd622864b35c3d811ce9f99ac26146b13951ed6334e1041c98b0f31ed86e60f21ec9306808b5d52167d9349f139e07
-DIST specutils-0.2.tar.gz 3348219 BLAKE2B 8189c6a3f1679bcb7c4ed7acadb87239204fadd2e4c62c1e170b5addc043fc1c8dc4fe6c064cafdc76f49f4c91b9f20a0382dcc47bfcbab10ea2a24cf1455d2f SHA512 ac05a795ddf3e690c7f5f7fe1a4b0340b546363ac132ce78bedc6ce364feb7418d896e18302ce391717cc507dbd37de210f5b6dfcfda2c44f9f8e0191619bace
-EBUILD specutils-0.2.2.ebuild 1269 BLAKE2B 8fc92ab0918ca9078ca25b32eba9b93d04a4f16327bd64407a632fd1543dd1db0613da3ded77bc7c7c38c12ded06b2d7836d8a01500ce153a07aae86935b44d7 SHA512 ad52ebfda204c5a8ade604e33631691e96b95fd8bc214a02570d4f9ae83490f00723fcd461cdfc928b640f7794387c05a6e9f4ba0b054605dddee68fc9fa990f
-EBUILD specutils-0.2.ebuild 1265 BLAKE2B 1ef1669fb04b669a479649a19d94db3970b3b65a85b08ef956aa4fa18169f6d9c9c1fc3423f17d326632abba6c872c8a477921b82573569fcef8c1e88b16eba8 SHA512 80417bf9f16af033466b7066314d8f82d04e021a3fb1fd2114812db2754dd671a58cf8b19a4cd64520dfe3142e03e43bb2e7a25bb56f63ed684896511d341a77
-MISC metadata.xml 663 BLAKE2B 802c3140758ac398b0e20c1622c859afb5c05763199b90df40ec4d3803594346f541e00d1f425fdf9c6de226cc6517720f1cb43ad6cee6b8e2ed0c735bf93bb6 SHA512 8d7a288e937215506aba4ad3cbd82fa693aa10395d71dfe371d6c9ac783521d1349e9f6cddf5abed730b918c48c77fb4162f199a75288469781ecd01ac7dbf00
diff --git a/dev-python/specutils/metadata.xml b/dev-python/specutils/metadata.xml
deleted file mode 100644
index 45d4e24160ef..000000000000
--- a/dev-python/specutils/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 type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    specutils is a package to implement utilities and data structures to
-    analyse astronomical spectra within python. It extends NDData from Astropy
-    into a class with special handling of 1D spectra.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">specutils</remote-id>
-    <remote-id type="github">astropy/specutils</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/specutils/specutils-0.2.2.ebuild b/dev-python/specutils/specutils-0.2.2.ebuild
deleted file mode 100644
index 75a2d1dbf032..000000000000
--- a/dev-python/specutils/specutils-0.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python package for astronomy spectral operations"
-HOMEPAGE="https://specutils.readthedocs.org/"
-SRC_URI="https://github.com/astropy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DOCS=( README.rst )
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		  dev-python/matplotlib[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/specutils/specutils-0.2.ebuild b/dev-python/specutils/specutils-0.2.ebuild
deleted file mode 100644
index 971d6abbee42..000000000000
--- a/dev-python/specutils/specutils-0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-inherit distutils-r1
-
-DESCRIPTION="Python package for astronomy spectral operations"
-HOMEPAGE="https://specutils.readthedocs.org/"
-SRC_URI="https://github.com/astropy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DOCS=( README.rst )
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		  dev-python/matplotlib[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/speg/Manifest b/dev-python/speg/Manifest
index ef07414e5611..ad418d06377a 100644
--- a/dev-python/speg/Manifest
+++ b/dev-python/speg/Manifest
@@ -1,3 +1,3 @@
 DIST speg-0.3.tar.gz 2592 BLAKE2B 1b82d6e122783fbc58f2c711a67e9b8b721d69c08de5ac2815d1ae459ce337552d10bb747cd1e31363f48f4a50bbc967b650d7e6048668d28d4133b5875aed14 SHA512 9faed6af0eb1a6ff0a7dc2e2f5b885a58a5430938b463420ad52277fe2900ae98531057ebbcc21d8cd259d4779bfb0c919125043503635721afe574b4f1f99ce
-EBUILD speg-0.3.ebuild 458 BLAKE2B 8b14514063bb5f316055222947a3f0231b05c4e83d07034f0792df8909152871e3a1469a396c88e3234196855388d628fb4dc490729a3e840deb496e2c2be7b8 SHA512 dc61070fd7daa5f9cbbae6efe51c9210dec076e1c3572ceb9e3242de2542c69a76e2ff2887b7198c44874413f8972fa66ace8cdb3d706298061cc6c23a83d733
+EBUILD speg-0.3.ebuild 451 BLAKE2B a4c33a5038d498a6181e482a9d6c73a18100e0a516ac30cf6c583f5fd1d6493ed87ba08f5013ab53e48d76c5e180518206d5be5ffdbdf324a07558c0fd41c447 SHA512 f3febe6eda31a70940fbbcc5646cd626762a2dbfc02867296b320d7e48baaa1b9c362d6c8bc17f46e96d9b30f8ef149273acb9097a456a79bb1c25b6f65a8f7e
 MISC metadata.xml 376 BLAKE2B 113a90a20506bc63a3ff04dbbadcd4816e77cff90a67af41fffa4607b3d04846e10a32aff17406fa6020b0e7352ab856f04f0633985ca99a93aded3aace8786f SHA512 06f948d869175579e428cdea7b74c1074418fb0eddfa256492ad54d8905add9528100f95b42357271ffea24c4d73545d0d4dcdc66cef8fe656d753f175317a6d
diff --git a/dev-python/speg/speg-0.3.ebuild b/dev-python/speg/speg-0.3.ebuild
index 365e1144c657..4893e0337497 100644
--- a/dev-python/speg/speg-0.3.ebuild
+++ b/dev-python/speg/speg-0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 DESCRIPTION="A PEG-based parser interpreter with memoization"
 HOMEPAGE="https://github.com/avakar/speg/"
 SRC_URI="https://github.com/avakar/speg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 770531d411ca..ab3dff873503 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,7 +1,7 @@
 DIST aiohttp-theme-0.1.4.tar.gz 10723 BLAKE2B afc398bb65e69fcc931f214c613f789da07c89bafd26ff207d4c5666edbe323f77c4a6fec09817d4dc6bb1d40e21ddd82f0b7b5c25dc5fe89b8b83c1c423bad7 SHA512 b487c9095a677baf9471b93be5b9cc3a697f62d2674d27ea4a7aee043e5dd75c5543a0e0a2e51c28e36e5bbf324bcb6d06786b31ae3b492ad2f972c6776c40af
 DIST aiohttp-theme-0.1.5.tar.gz 11132 BLAKE2B e405d3a3ccc0d8568ecc42f8891eebe405d2d75cd47e60910f59ebc979da07362d3cbc20833412a462454b2703aa945f491e85c10b206a356545a13cbc07984a SHA512 106a77665d907c45db1fc2c23990eab61cc70f9f373ce7fe0d231f9744efe5dc7119606bcbdf558ceb038edd7e0cb955531fd74c496923038bcfd799bf67616c
 DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
-EBUILD sphinx-aiohttp-theme-0.1.4.ebuild 564 BLAKE2B b00223be97236b9e638138ca3cbbb37f49e304ec1a4cd852641ebd29d4fe3c1410bc69e2744b75a4934e4b6af27beb70dc978da00331deb8ec17b841f5682d3a SHA512 90c40bb2301d3a37a6a85220637b77738ac2b63c0eb7ca337bda899a68da786a13960bfbc0d484d3bcc1002751f15555e76bda99b607d82cf1be6c79cc43bec4
-EBUILD sphinx-aiohttp-theme-0.1.5.ebuild 564 BLAKE2B cc9c1ba2f8f8e7bfdc678c4c3fd17e5a8f10882efc8954233f9c10fd5be6ea39f744f065f5337cb5f9a6e69174c267d46c6e8a2fe91d0f9137d3430339f681a3 SHA512 3d5b1c56350dd7b10a410b5b131d65b83ae48d7483ee2a542fc4ed3815e61d0c0f52114c78f37f69d9e0879b3a46064c17b38bc90ffb5bb9da14c8ff614d3cdc
-EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 566 BLAKE2B 525cc18aab65b52e73e3429bf6a5cf60a0765f3eb544d0a1077ce82256a2e93497862018e48315869d8e3d7ae6196f6c9bf06a653260b19d6b34607223c8c0d8 SHA512 ff114b399f620e2271a83ef2cf4ccbf1a20838d3f8289a4d7eb9e27ab71122b4953f40ccd2d3a93fcee761217f2ac647b8c7a595d7eeda1adf8a6399f3b2b844
+EBUILD sphinx-aiohttp-theme-0.1.4.ebuild 560 BLAKE2B dc93302b60e306b0d501668b8562b16cec80cc5b7104dcf7268adec919f93dbfd06efb647af965e2ca28acedaf1f33c4a16f69be90a93aeb87a6040d764c100d SHA512 4a0a4c8f340920c7c1eaaa21a57e299e3760277edbd5feee7b8555822641d7752eb1b4be68032805a6a4cf990d8c402014c57b87c675b943af0ef2e09e892bd9
+EBUILD sphinx-aiohttp-theme-0.1.5.ebuild 562 BLAKE2B 262862ad29b9f6f856ebe82522823d8a632deba86e5b00f88868e8db1685d113edfcde385a87d7aaea0f2c14c0345a105c47c5576e6e32b993e2aeac9d2632a3 SHA512 3084fed85d481ad806b828679af3ee7d736a3e6d94786005ba4e1bed5894eaf482d53a14e7f176c7b78a9132384d6bb8587d1a7db491170d4ab264a757e6c18a
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 566 BLAKE2B fd6bd10110660c04fb35786437c36f8629c286fd4d53f552a724bfb4026214dd0a7b783924413547e8a39e03edaf11107639aedaded16038e78ef79536c26a9d SHA512 66cadf3b06d101e1355177e0080458ddb5a8bb7e464dc3cafce2e951c1edf5e42d4e190e3abdee5e3cb24a2357be200b6f24676dfc9497e8ac9ce9abe6db7993
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.4.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.4.ebuild
index b5382a35304a..8e2566a63239 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.4.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild
index fd1329a2cc0c..c9ade4c3ed3b 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index b6446239067b..6bd7f2baa375 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-better-theme/Manifest b/dev-python/sphinx-better-theme/Manifest
index 7e606040be18..711e8f461f95 100644
--- a/dev-python/sphinx-better-theme/Manifest
+++ b/dev-python/sphinx-better-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-better-theme-0.1.5.tar.gz 7276 BLAKE2B 3fa32181bc567b7db614990be56ff382368564ef5698a306f07cc42d7b5d56f085ab40fec5143e85935dda63766b005e89d0310744f2e4d36de3f274a214db39 SHA512 06e50079967e166d5daf58a44c18e477cfc71d326ecf2e0a5932200c911e73ee188f720fd5bd15c2e298e14f7e3358e02e94381470bb7958edb0b0aed334ef9c
-EBUILD sphinx-better-theme-0.1.5.ebuild 569 BLAKE2B 188f5c9fc8c00e94105d46f73e9cd4cdfad12d57ce06a9b53b28aa55d2065b7d48be46ae9c5eab0a40ca543e170d9b3c2beb76a135b0a8de75b3a6b16710f53a SHA512 893f1c2becb7b35dc27d464a5af4f2600a9078b5f210f06b01c5d9917e3aab85bdc87e81e6fc73e7e43da29393c0b5d2c3b907810af3ef52102a9ee8ae4a83e2
+EBUILD sphinx-better-theme-0.1.5.ebuild 560 BLAKE2B b74bec5ec0a65ccd9dfc7bc603f1712fcb45b6dee845a17bd752dbf755efaedb3328861f2ec2aed5c7326c3f3e08c96982359a2eac476dad758574bb6c542ec6 SHA512 24ec000001c845be7408f0bf9ff195219e52fbc8db2cfd3346eed9be8f33e3e7c69c40e939d040afbe1ade6f9544065fb0cc9bc828885e430819171e5149b431
 MISC metadata.xml 400 BLAKE2B 4adbe1723956764f4f2a24de5c5a3ea0329ae619821cdd4c9e2e85712eb67510ec1aa3513a6bf0cfe3d1b8251835f0ae795a6a87648314358045efcf7a075ee0 SHA512 7f8d3408daa82c2cb5576757172ed26d05c3bbdcd0dc6d1c474a60683d13f3ad4839fcb71521c30d2ccb0dc126c9fd2f676ee758830cbaf39c13c88bd7a6484f
diff --git a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
index 728e0d612c1c..f1a32af8eab2 100644
--- a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
+++ b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index 50a0782ca5c2..8cd9311e9411 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -1,7 +1,7 @@
 DIST sphinx-bootstrap-theme-0.4.9.tar.gz 1146587 BLAKE2B 5942958be76a79d0a986ada8c5e920acd1d69f14f75153d19f531e08167bd8c7ad5252334fc0c20ef01cf823bc454ef9270586fb9df239f9e778ca90e490efc1 SHA512 73bf129fb037aa7c14b6fbd8db2b4b02e9f514c9e4828745c51f8ee02e754c68dbaf3f57497566a996cb8c7b7da57fdc37ecc1e7704fa0780aa07c9eb219ac01
 DIST sphinx-bootstrap-theme-0.6.0.tar.gz 1232454 BLAKE2B 90fed63a388f71f1d74cc31be046a9c69f0b163fdf6389715756e0e3741a44ccae716a022b8dc0af1465cfc34377d644e6070d546cb3e9a4460d69adc444ad09 SHA512 92b81b95dd49e577bbade188544936193f0a14dd49012edc184c44de2876cb78c94fe0ef1d0a928e17c6e5d91aadf077ea07edf2064f992b40ae3f456f535fbf
 DIST sphinx-bootstrap-theme-0.6.5.tar.gz 1232943 BLAKE2B 76cd6f70cd485c552e9a76c559c8687129851fa40e03e206bdafc5fc0f948ed53d07ea8196908d2c17af1718eb721aaeb4fd1d65313e12a069a7186008a4f222 SHA512 30ef77364aa4c830000f1a2ee7f663740670124a6f433ed59af05ed408a59cb35643b66e3fea391edcb811cbd9ae3713eb174c76bf00bbad9801910935159bbe
-EBUILD sphinx-bootstrap-theme-0.4.9.ebuild 533 BLAKE2B 4870e3c391868e888db7725eea6dc5c8d8ac09d4dd6cf284f4fe15dd41ed31640ff59044f0e609f367928aeab372e0f7172c254a6ae4d2b386d67f43d70a6ceb SHA512 8b0bafb0d00551067f878c2677a42f4a875640c83d22b026d874950676debefe3f902cde6f469c62e9cbc84d6679deedebd86cefe3896aac4d22253144f4674f
-EBUILD sphinx-bootstrap-theme-0.6.0.ebuild 537 BLAKE2B 15e08479042fa90adb7bac190422bceda5b2748d0493af0b9d0d7d25eef272c0dd5d90ec84b92b4dfc471943f5ad557b62674869a0d9f8a95be87bad4d3e3bea SHA512 03568fed58e8c0eff6f4f7641d0948ddb36762ddb55c4c3901e5e7b606052bd948b81dac19d60502708d75559632dbc15b2c2136d55c4a46dc02e9b951f46c88
-EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 567 BLAKE2B a46fa2a16451f7c3e9cd106698d52000c6a749959eef1545e9d13c8e009b11784d23231c31e4f3131f7eb2111b7e2796d508ed64781006ef12be6d05bcb42778 SHA512 414e7e91164068156adcf0475703fe7f2a2c285a748d84f0cae525bab921812660ef49801d3d10c12956fb47e0101652ae334f3e2eaecb158ef5c1752e1d346d
+EBUILD sphinx-bootstrap-theme-0.4.9.ebuild 524 BLAKE2B 77ac2d304d567214873702e982aa7c2c037c26d41009578ffb24a9b23f47ba89be51676f613cdb23ab4c1bace320ac1cfa41e0d1437dd54f35a3d71b4eed4a0d SHA512 dfcaae140fc726c86e33b3cfe2d98611a9272f67fda4ee010f622f09af0749fbbc1dbb639ba49c9a4f030d5d9d9f1fbe61eb3d6831d5fb95380ab077dcd4bdd2
+EBUILD sphinx-bootstrap-theme-0.6.0.ebuild 528 BLAKE2B 1f00339eea19494d665d5839159072b12e909d721527c3e2a27015ee971be316b552321cc883d34b92ac79632cc35cabed3a0249764d80a86616433153ed7a51 SHA512 fd62db60422939ad18dae9412c30c17280ec4a512b1a239de11d19f88f05dfff4146ec09fef58f0c6ef6dc7ac38a5c41c7811426395282eb0068530fe76c9ab4
+EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 544 BLAKE2B 6c82bd4fea1f78a0093d4afc8519978dfb595e5cd8dd85a8d2811badfe5387a59b5b8424f6c9665b57d9567a8d003fa060bac2431a71baf4b9c262c77d3f3cfb SHA512 042cd20bd633491852ba472f66b46b38d41532e642998ca2c0c2677b7fdb203c91b81d33fa05974b0044977cde1c00f799856785c8dfa8715c88aae35c9f5c2f
 MISC metadata.xml 495 BLAKE2B f1850c5403281533f2edf707dd9db4c1e339e56f4e5677d9189c51376b892f79c084bc987c0b1f28ae2fd09030daf5f249cb42681e8f22787df3b31c422b649f SHA512 c6011ce51a2c8f73d33eb80eb3adfcda50911dc535a1c6f18862eeec7c601245aa76acfdf7a9f6f80f4aed2793ad5ac244ae2e0a893723106a36539cd7d0651b
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.9.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.9.ebuild
index 51b9e15a214f..23354da8aeb0 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.9.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.0.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.0.ebuild
index 4850956371da..9c495d5c0857 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.0.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
index 76f6f24ab703..4018f562c67c 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
@@ -15,5 +16,3 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index bf4ccb2be6e0..d529570a68c0 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx-gallery-0.1.12.tar.gz 68976 BLAKE2B c9f8f12f775df8cac0f0ad7d70b0dd099dacb3b005584d1bbc878437443144d7e2613ceecd25cd4b0c8941818c5596f6435c1fa223b1e5c5d5196827a69163fb SHA512 57e8fc3746c2f5c941ddc3e00c749a6bfa63fb5741b3e5551df02f798858c417acee05a6b35512506aa0c4866b14a093cb4269284501672c3bbbf2edfc1edc1d
 DIST sphinx-gallery-0.3.1.tar.gz 88807 BLAKE2B 79218a1f438e2b8607c52b14f098c0136cb4d5ce15a12d82bdb3caf0c7c1090e7c4f210437fc660d8d4d19bf87bbaa2ec3c208d2dc8a77ad9deea5b5cefa3c05 SHA512 c51eaaef63a7496e223a4541d0560f694420b6ac4b2cde3779c405f0ab92d34aef7a37e4c41da9e59bd8a050c8d3eed330df3799e76a60ae35cdbc6f7c9cb8c1
-EBUILD sphinx-gallery-0.1.12.ebuild 733 BLAKE2B 0f8cd47e017894f01752ee41baa318f634f88f08cc124af08fb1cc8a7c685048a9de1c329a59b3236f521d70a35c4c0cc53f1396d784f69a7be7a5d32e73e175 SHA512 cbd0232a27ebda6c892416584263c15fa46b3648854654bd9ad3aec2d62925865fcf4e606ca462781ab5a728962b6d3070af6303084a09052b435bb08d061e20
-EBUILD sphinx-gallery-0.3.1.ebuild 680 BLAKE2B 63f80723329bb24afc9c59b8ba39db351737d6efa0139cb2de714fe7ff60e44450cee82fb767263e53115663474b99065786b8b324ddc4b383a3ce39d153bcd4 SHA512 78c7bd2d208ceef98d6eafe8ba138c462ea53dcfd6c4c3280651c385d810fab30f052d35ffce6f0e9a694a7523296a4d2e18c9512f7880c5ea288d6b2b0d93de
+EBUILD sphinx-gallery-0.1.12.ebuild 731 BLAKE2B bd1272318fb6ceaf89fe2a81fbcfcd61b640e54ee62e4571bbd32e4d8f9604a7145e318254696df3031f9b6aee5c3fd19cb766dc600f9ded8918b7879e3bf304 SHA512 b23c8bb095ca9ece78bbc9937f024c587d4b7eeaef010c5cae2f0de552bb3fe55a6127c500d679114347dd48ac5ef372f5f5ebe4d5712df2a46bf989f6445cdf
+EBUILD sphinx-gallery-0.3.1.ebuild 678 BLAKE2B ca512d1c5c7b5ba37dbd55b98f9335b54e0fb801be75b057783c0a6110d0406dd3bc20a2118470d13c1b2f1ff71c9d6dde486dfbdbc54b577d7104bf29ed46f9 SHA512 5731626418800504870eb059f04cab965d9433e897d61b3de18aa191cad450e541edbb4c016ddc2c627f5e4d5c420120cb10d0afe964c20f405c24726a30f5dd
 MISC metadata.xml 398 BLAKE2B 9ba3eb9dc8d9d9e16cb83963ab758bdcd11c6f7c8ff5ee6a9244b8c0e9c9db2162a22b855bdcd43148c0d23ef8c31c075e36bd4afdffa1a2eb5f30d08ce00747 SHA512 3b9762099b163b539d7de52602291433608ef33a9e60d3713e07bcf0b2b8345a52a0b162f6be52c9a88cfd419e5bc4e59307d07213f1d5aa3c4ca892d91f8b9b
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild
index f20575557273..fcdba8ac9ddc 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.3.1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.3.1.ebuild
index 4f1ae7b02a29..68f969893e96 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.3.1.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index acc85b5d7046..9c7a3428373f 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-issues-1.2.0.tar.gz 8051 BLAKE2B 2f17738719f92be1e4ef2d7e2e0b7c123f6f924e4bfea82e2151ed96b9fdbe2cf676bddc5c009a947e1172a84131a1a58a3bf0758f045a636bd4cb7ec496fa68 SHA512 8814e910b111f0b241bc40a93de8b6ff1acd24437f1b014b24691b3bbaaadaadaded82175067d8992bb482f4bfcdec570cdd26b4c6858d7af60d5dd3f0638b64
-EBUILD sphinx-issues-1.2.0.ebuild 715 BLAKE2B 033620000beddbc4a31adc449a0cf8959ee0b7fd5caf43467b540cf5dd3c95abcbc891763991bf5a395213038fbff504ee34a153adc9fbe1cb1fbe8d33e0d4f4 SHA512 ae8fa6a5b2ab5bd455489e40e23cd8cb669a9cb7402e6072e22b91eb78cc3dde1e1d98707b6556193ccee900c216df65ca507188ba8d7eba8e83f23ef5684151
+EBUILD sphinx-issues-1.2.0.ebuild 713 BLAKE2B a85ba67817b30c3360946b8f4fef76f0fc5eb6ebaab8c44d7aa6a527a0759185a8699ff01f9338ec4ceea23f40907d5eb5460ffc54ebc7c5cc220ed352f36918 SHA512 73caa5d96af19b34661690a540f451bfaf2b47f2d87fb75e6ca181b9e5ec8a780441ef663f7960683db2f326972fe5028a20eb2beb4bd130695a36ec807d5371
 MISC metadata.xml 388 BLAKE2B 192707563103236482cf5de03630e3b39f6827f446ba6e058e29c384d6e989e3b96b3f54b5e353426022328f81596ba3c70c61f3f84f69b3c20f34163836b74c SHA512 3b29ce4fbde49727c8dfd8f7f28f3baea1ca5feb60a1ab21b8ac0b597326e702941cb0190903aa930d55358c092bb5ba6b31d27f9acf8940380557c562ea659c
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
index 4ca90e55ce58..89ef9f180d3d 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 inherit distutils-r1
 
 DESCRIPTION="A Sphinx extension for linking to your project's issue tracker "
diff --git a/dev-python/sphinx-jinja/Manifest b/dev-python/sphinx-jinja/Manifest
index f49532ac1833..56cc4c6c6d19 100644
--- a/dev-python/sphinx-jinja/Manifest
+++ b/dev-python/sphinx-jinja/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx-jinja-0.2.1.tar.gz 6676 BLAKE2B e009731381dff9aebbfd9ddddc3ce128a6dd172b64ef2610847296b30d2cc4ad5fc71f71d2e1ff5fcf2d0e717b92822bffedc25fbcb6215e072bfe285038a9df SHA512 4b5239c76493f8eabc2a079d82d52b8bb34e884e308aa7e1205cfa40690854ddd1e4c1aee9f7ff0624eee2588a3af9196a83a79f0f49359df315cb0886f09c94
 DIST sphinx-jinja-0.3.0.tar.gz 7035 BLAKE2B a43c2ab6c1f0178987ccf9f69acbf0b50974573b83d0503e7888a56bf024e519ad69e3ac6ec9b8d27d7e01e9482008b6579c6892ce114124c0ef12ef456c887c SHA512 b39211a0013db020112c865335811317699e7ade734bfd9bb24f51934df4652f0560b81f5e253fc663fbd8a269fd962ef2bfd6dc96eab12a397a538e758cddfd
-EBUILD sphinx-jinja-0.2.1.ebuild 868 BLAKE2B 2ae3213731dc447ea94513f60a00655e27b0dac1ef1b6a94327249ef31346c9307348d3cf7101fbcde6b3878272a4a1ee6f146eb153ded0df35455e6cb1493ff SHA512 4ad01c7db504c8f4d1d69912282d621ab762714c1494352b8485f877aaa9d264f8c7d62395174cb26acc06331ce3b062dd2bdf61f08a1685971d86e9a7901f55
-EBUILD sphinx-jinja-0.3.0.ebuild 868 BLAKE2B 2ae3213731dc447ea94513f60a00655e27b0dac1ef1b6a94327249ef31346c9307348d3cf7101fbcde6b3878272a4a1ee6f146eb153ded0df35455e6cb1493ff SHA512 4ad01c7db504c8f4d1d69912282d621ab762714c1494352b8485f877aaa9d264f8c7d62395174cb26acc06331ce3b062dd2bdf61f08a1685971d86e9a7901f55
+EBUILD sphinx-jinja-0.2.1.ebuild 864 BLAKE2B f2bbb339ad6b906fee6acc6f809af4919ef00b9420a8b1eb9ec2aa3db5d843937dec67e55e81d7228e604f0792f6ce0beb3d1324f4ee6aff690424daedde1d1e SHA512 0cb639c941f3139b2a3f11b78a823074170a7e46e1e3a63d0987067e7f2ec12b03652d51c46ea20fba7e32c0ae6b744a31dde26b5fff1a5cce758c2f5635b6fc
+EBUILD sphinx-jinja-0.3.0.ebuild 864 BLAKE2B f2bbb339ad6b906fee6acc6f809af4919ef00b9420a8b1eb9ec2aa3db5d843937dec67e55e81d7228e604f0792f6ce0beb3d1324f4ee6aff690424daedde1d1e SHA512 0cb639c941f3139b2a3f11b78a823074170a7e46e1e3a63d0987067e7f2ec12b03652d51c46ea20fba7e32c0ae6b744a31dde26b5fff1a5cce758c2f5635b6fc
 MISC metadata.xml 525 BLAKE2B 2a1e29ccf9ea29d66f54bbe9c0ca6382a80088e5631a2cb3634e02344a783a7045ffb4ab30e9363587cecf6213e1a4064490df3bbbdf3e410da23498267161d2 SHA512 2f42d584f3c61ed3b024073d1ab105b9486bc68962a44b6642cfc249c20ebd38dd6d9ac246891ea09cf88df8872bdfe611b709b484a9b753de37b0fe0055777b
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
index 0abd8871a294..3c50d1cb4723 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
index 0abd8871a294..3c50d1cb4723 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index 8e15f4d1ad13..02f9f2c69338 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-notfound-page-0.4.tar.gz 5685 BLAKE2B 0bfc6cf98e0731a5cc95f1802dad1e7297ed764a626831b970d75d82ec0f7d6edb45c404851ea13bf38decc39aabf0e3dd6b136714a591e8ab595f11e23e67cd SHA512 56e867e6954f26da498b77e8fa43e8d62961ab33ee9c16d2084745dd54a998df51c7d882a47560196135d2fb4d473f7305ef19b31373bc205f8eaf0d3d4946f0
-EBUILD sphinx-notfound-page-0.4.ebuild 522 BLAKE2B 62600caad2a3876f5bccd9ac5f48e8a54bc631707905f628ebe3f7d2b86aa7973cf673f306faf3005e664d7f61404bf6598be497d88be15f3b2f1036a77f540e SHA512 ea94649ef28752c30a96c3442e2d7b8e645af58255ebde1a1656a65b202e39a26f80bf54cb6836466254f5c28bf29c894a38cb8b163b886b2711ffd3b0a002a6
+EBUILD sphinx-notfound-page-0.4.ebuild 517 BLAKE2B fc67c427ca37bc0c962098a74bae0247fb9eacb2d02af203d45b2dbe1cbf86d6f67c7a91df2a66295fa6d3f42545f43c635695dd16eff2e17f021dd29b315392 SHA512 7f0e7ea344e90573d1593e8c8598529bc749382c34c4f1805b2105199775368355ee4039c0049f1494f5d940673999267a5c9ef721932161a578f74ab849c2e5
 MISC metadata.xml 440 BLAKE2B 0a08957b47eac83866fdbfd2fc137fa09413c2f6e4cbe961a0c587cb1604951d76061d41acae0a925a9f1775c785e8dc0808255685c14d88b5543e729052aeca SHA512 84b278d6a84dccb896c1e5c10ff1018ec801ea1a36083896f08629db28e82f8b20be2cad95a13b2ad53ba3751c9f6ba0c8a6367ad9baeb2881d22211793c2671
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
index d3d0c1a98b8e..17f901e5a1d1 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Create a custom 404 page with absolute URLs hardcoded."
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index aa6044350644..d9fe4ba8306e 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,4 +1,4 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
-EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 573 BLAKE2B 0b5ee437c160a62e452404a992f77dd40b34c199510c1e9f2445142143607af57d3617ed789b2d65f3614d044a2329afe98bcfef695847b117d9ac9cde93fba3 SHA512 81f9cea624aa4ac9d4090cdc2b96cb19862d05b83e90216e112591418afb41cefc34c34970408fc5fb89c49f0c68d28ed0100dffe926e88e83b33ee8e5f3624b
-EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 560 BLAKE2B fd058e27324a423825dbb322e9abf157074850615aed3adf2360ba80dac0a7311a82bb872f67082c46e109cbcf69d3504d8da70c7f956178eadaf685319fbeac SHA512 56ebad56807a778cb83a81a5de438fe3b9901fb7222d630c58db20d36a5e166689f3351f1647203996e6a2fa6538b395459acb879e17fbf35e4ae0d1678114ee
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 570 BLAKE2B 250069067912158958d3e9a657400aa5a21f3a3ee0e01464aba4e9168f9d4879386a21bf026761f7a4c51e65040b8c27ebcab425b54cc07a2abb064119cad158 SHA512 38fea52cdbff4477c09cd8e73348b37a227ceb5c6c5f807759682f8aac74357bbd75372ef3685beba41f0c77109c4b0061665152be0911e8abca17ad4463616c
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 551 BLAKE2B 942b32d95d0401d76ecc260e516af018f0f7c5419dd2683d4b4fe121c532b0eec7b0d1a85a1b551110543cd68ce7034efebd85d56946cd7b775a48930ab4fac6 SHA512 f54d409ae38ddfc6af9ac74ebd626c2d9b430183c5b3d3bef3c6e571f7a40652de93e70de3600844f930e00206970d6adf4c36ae1e1f58a241e1fa6a3f45ce51
 MISC metadata.xml 515 BLAKE2B c980e1ccb62fea64efb6bf54ed6c07acbb8241b2b65d0ba6043fb32908c12654f61e173898a452e6c56b9010744db626d1dac82bad68a09cff64866817015c90 SHA512 d22018d48a247400a976347285d69a3030b75505bcab3ee4e66a4eac419b2171f26dd483c0653e4725a60671ae165d5de4d9d3e2c058cfadfe277a26d4dd714a
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
index fb320f203ef6..f2a6190e8fe9 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Enhanced Sphinx theme (based on Python 3 docs)"
-HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.org/project/sphinx-py3doc-enhanced-theme/"
+HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme
+	https://pypi.org/project/sphinx_py3doc_enhanced_theme/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
index b66e4f808414..a03dfb376ffb 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 57e8d305a2f2..d7da52b4d976 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,6 +1,6 @@
 DIST sphinx-testing-0.7.2.tar.gz 11040 BLAKE2B 503e38eabfe8dbe28942f9165a83db2dec0f9ac52e1e55f7298848b7a6b55244e1b5623bfda7f4e1380eab16ef81cf51c6bc11e919a8b45506f17759ae0ee181 SHA512 d267c74d97443db2df69914a825da969021e37fc61b8a664ef382504fa826387a95230bf9259b58c6f26721f33985fa2168d2714342a2166b59740cf1b3ad724
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-0.7.2.ebuild 709 BLAKE2B f56e1bfec36539a036fc2bcd2c0372fe512f1af916e0613bead1a520a7e61bcae3f70aab23f9ee017c1544e115bab95dc865513b6050bb2a35758be743d8cc50 SHA512 3695bca15faedbf7a3f5de15699cc06a3e5ac86dcb043bab1536c1c02d9fcfa9451a687a2b2dcd0c3ee2a55290655a706a89d558ecb527647c8cf4126a01194a
-EBUILD sphinx-testing-1.0.1-r1.ebuild 858 BLAKE2B 564634a6c34dcf05c04209366553345fc6d57a77001c15050a7c1db9488c1d8175f29ae408fe103cca520f76105c460a86f9ff3de90b9a8a093b7da02f1d8332 SHA512 e9b1a60a46b18397c34035ddb227646d988a4c88f0a61d1786f8728a16c79e635aa36886f377c107660119bf5ce0f0abe21f0d70fa89add3b4a094c5d5379152
-EBUILD sphinx-testing-1.0.1.ebuild 865 BLAKE2B 6755375599b9d582fcf5d394816715f51b32dec3aa4c4a1593ab4d8476fa4a8b672a9beb1d08dd75856652250fed7798c99ad368809d3da159b2481a8dc04f14 SHA512 491178e69d3c47499eee70e0199956f14ffd0a22dd8e34bdc446bc719e09b92572c4dc1860aea1fbb828e9d586eaf57a3063dbd588d1e41b9d50ca2ee35938e8
+EBUILD sphinx-testing-0.7.2.ebuild 705 BLAKE2B 483934dd7b69b2c7ae770ae63bf387035ab97fc4ea550c7bf69bb8664e83053a98b72104064787f121ccbfaa9e69f24a39c34e398ae02263c4876779628a4971 SHA512 79c852bd8af7ea317f8ab95d924d18c9812514679f14d50bba88704ce2990e52784f5b9caa2f046a90cf3c5dd4bfb9d5b593b3d328430c4467f6e524a4ae855a
+EBUILD sphinx-testing-1.0.1-r1.ebuild 858 BLAKE2B bf6d1c4cbf492622e740012c96c01b46979b236aa5761b6608f179b90a67596787a13def3d7fa6cee9d382801e31c98fa82a78122f36ccac6dfd697980c11abe SHA512 cc3730ab23c5b55ae75af8779b451a0a8bf938c7c54b5c80235935792ada4973b2f2eb8d10c736f9bbc615d1af8820e4c55b8bb773f47daf63f3b521e24c7333
+EBUILD sphinx-testing-1.0.1.ebuild 863 BLAKE2B 65826fffa47b5b2a0a249384f210510aa910aa673970362d62290eeacb7f009281fb594275be05adb0714d95896ec10fe326655221a673d22b51200240cda87f SHA512 84d595a0c724268c82376e23c6976263ff24434a847872963c32d5a8937311ac078f34dc900c92c9e1c01a5b50ab53550285ad3b19d8408a548a26753c3782bf
 MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
diff --git a/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild b/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
index be983e78be85..55f4c8fdd4e4 100644
--- a/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index 63d200fdbe55..b540c458d3dd 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
index cf68a135de37..73d0dd77b454 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 4c32dd9c8975..b86f0f45b8bc 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,5 +1,5 @@
 DIST Sphinx-1.7.5.tar.gz 4726802 BLAKE2B 8d828dcae1f3ebb813c5f2de8c096a3fac4ab88b424955c27592349c544b775a21703c904a54efa7f86e1967198f4950804904a82a7142a3499f33c5343506e3 SHA512 db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
 DIST Sphinx-2.0.1.tar.gz 6017030 BLAKE2B a446aab8c7f5a4adc93477f4f60ca975690cb4c507d6e51393a4b2c4c56563b9a12e3ea3f85d214c6bdbc7834be107384fe9029d09a73da207fd9699c4b77ab8 SHA512 28430912917a8e3eb6efe6b69268e2a5ae06795c261f2a18ef62f781e365396832c4e4bcfaad7704b1c5f840e98a9dfb82e3b438a491a13cea5c10bee66bf23b
-EBUILD sphinx-1.7.5-r1.ebuild 3276 BLAKE2B 7bc5adf970d41a33607845bce228d81f281e8e5e4b8fbdc127d16543fec6bb861ed27f7e15fa210f7c0f986bfe6dd7a1bb3434ef08b3f502a4d3bb64eb7d2881 SHA512 53b5c6f78bfaab3976df57604d46b58249b24dc740e0ef05894fe7c6776a9bad2ea79070205349d715a6413b675bb05b1e92f1cafa979afebba75c1e34e6c704
-EBUILD sphinx-2.0.1.ebuild 3468 BLAKE2B ab5771200cda224743faeb75f42978324af649f966506c1436dd043b02646fb4dcc0aa681308170f64b8f3837634fa4c438d7f7902277413c6e9360997cb671c SHA512 29ed8429d81065988785045fcc9a07e74b884b1f96b4e44134fc52cee5b037c324f4f9a3a9eaab1552bb7d6f45631bc4d57744c3f340405099150e988eb972af
+EBUILD sphinx-1.7.5-r1.ebuild 3273 BLAKE2B bdf717574fff248aa76ec64819308b4219a474b78f11d8d8d669cec4e192cfaef35f6f6655f169fda9ad31dae7b826cdb47a4e0bd7361fc7bfba435449a4b5be SHA512 07882ab73becdb686a8b60a143cf3206cb042fd5e3cd639e0b6eb90e67f20d0e849666fc45bb78fc84e98be11f1664dc420f368ecc8e388dd21251432b5aa075
+EBUILD sphinx-2.0.1.ebuild 3468 BLAKE2B 605ec0abaeb47ba72beee736df6fe07c33898c87344403296abd7bd5c286914d3073e6e4a6407ae4016d74d4b336356787805ce733cddfb42c535a1ba29a15d1 SHA512 3d6c49d1178b9ca0b1024aebc9cd2fb6f2e300bbb590cbf61b4fcc908528a2e37643bb514755832bac12186b18e2c91e30d290ce1a75f90e83940667dbe2eed2
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
index b83025fe7188..e3a92af2e35f 100644
--- a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/sphinx/sphinx-2.0.1.ebuild b/dev-python/sphinx/sphinx-2.0.1.ebuild
index 2ac8b67fa3ba..4e6524ab61f8 100644
--- a/dev-python/sphinx/sphinx-2.0.1.ebuild
+++ b/dev-python/sphinx/sphinx-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/sphinx_celery/Manifest b/dev-python/sphinx_celery/Manifest
index 19a572071151..e1f6c7a1f1fc 100644
--- a/dev-python/sphinx_celery/Manifest
+++ b/dev-python/sphinx_celery/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_celery-1.3.1.tar.gz 15334 BLAKE2B 1e6d34e35327fee921c884c47b948b624f900eb3b98cb86b1e45d4054bee596d5525c2be2ddb4605d03d27167183844221e3789e27ae1f5834983e9fcaa5e66b SHA512 b3d11204fd02f85426e1f4bcb81e61557f04440656be946a18e142087180a50f864ca4bbb53d3fff4eabd7623bf5c3682d3c1e00b9adf9184de99a27de98b2f6
 DIST sphinx_celery-2.0.0.tar.gz 16203 BLAKE2B 439a9cd20e09071491338016ba83514e37c7cdfa34966e93e3c6062ed94cdaa0750351a0de9fc7b27be1b7e557b5625be73f01f1de59d15f36335e9d46d35cae SHA512 1beca69fe9b56d04cd3c42aa9244d50a364a860e9cf53f94897c0f690b8465f4e2a7b10ed6d310d3fa706d86f5882a338cd982a3ac7cec36586269756e9128a5
-EBUILD sphinx_celery-1.3.1.ebuild 575 BLAKE2B 0ea313a48054369a5ed83dc1040eb1a1977c94ec2b6b78573a69bce2c1159ba77d6e00934e47e69dc38af2c970e5b867d6b370529887f15281e61dbdb51b750b SHA512 4ba905ea2ff8728f13d72618a9cf5d607dfeafec85ae6828c53df6d6a818d33124bcdc6b1f1851c4c1c4eea06e9d027bc58596a83bf48c93fff31f083c4e6dcd
-EBUILD sphinx_celery-2.0.0-r1.ebuild 530 BLAKE2B 5c7ca25520b64935abfc299cffab32f45c417c4376486d0d21e25c114048e8e86002f44616300a1fef4cf094320792ca2e57cd0634f34294b368e10d57cfe7bb SHA512 79c63129068188fd3e5b7ae2afd50e131a0474815c7f10f40a30de7938e800a5b16ce2d4ffdbb56611e1b0f13fa57764f05df7aca4afffe4c9a7cc088b21c2f1
+EBUILD sphinx_celery-1.3.1.ebuild 573 BLAKE2B 511ca2bef7d93e27262a187e628ba645de5a9f144d1fb06eab73dc372372f2d6a86b5ad72107d281aa3219878af2466e34d79574767f79563093b99ca3234601 SHA512 191649b6c367af7c1b058774c342a9cf9eaab68b97fe9d6de43446abc0d25d980ac57a39ccf0c71bc11fd389bc0354a410cc08d8401f4295d37205371d5ff80c
+EBUILD sphinx_celery-2.0.0-r1.ebuild 528 BLAKE2B 3fe4330e5d59b73c25730ae661be73a39bf5da52eee839ce472efd57166b30d20433853e5a059c42da3772c293377325076c56ad961ccdebe6e35efe847cbb9a SHA512 de86e7c3f884b3a003af48b9c7494048d58442b96bd3bdff3dbe63ba0b0fc7fa624181cba39fdc54f64dda4ae15138c23d9712e63539c6f9a1a5cea8ce89ba00
 MISC metadata.xml 354 BLAKE2B af4b7d8c61b6eb65c84f867501d50d06730f6e651e3284d7200065a72a120e50705fcf96370b26aff14f5663ee6a2caf6af5ddcd8207e2081be3d4d954705ad6 SHA512 4cf6fdfa14fca7fe26e253a25bc81221e25220f34b13e08c88496d44a3f779dd2607fe4698682b27fc66158128d5a2e5f9d61a0ee58ca59f7b744ae37f909dc7
diff --git a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
index 8165361615aa..259c31c5d01a 100644
--- a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
+++ b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild b/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
index 4fb97cf5c686..dd350e5124ba 100644
--- a/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
+++ b/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index b84b6b003f95..f05c2fa5f60f 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_rtd_theme-0.1.9.tar.gz 698461 BLAKE2B 77cbf582412c4c800d18979165f501a684c1c4bdfd2e488b75ab10aee86e5696481751b7f146fe9b259ecbd94b7d456ec86f24ec2d4ef2333e79991c1846151f SHA512 e793a4da6209c26acb261efd03e6591561d7fbad97b3d7ab0a105e125a15a035d2066a1b1572a95954304d361abec39d9e1e401cd7200c6206cc8c89ad134d0f
 DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
-EBUILD sphinx_rtd_theme-0.1.9.ebuild 530 BLAKE2B aa24a209336f139a9f8e399cbcc8c2fe9f0a1e5df1d5d0162ccecf1a1b106e8db3244c61f57edb7babd27be6ca67b218ca64697cb88c2397a96564a342a3456a SHA512 b01d88a03f75137e382ccdabadbb37eb6442e539f65abb8ece31ad957d128ad0cbc180fefca60fc77b2969e61e52b67104e863bf50edf2fb3e58c6d0d3ec04fd
-EBUILD sphinx_rtd_theme-0.2.4.ebuild 546 BLAKE2B d50d7e9357d56b2b90fde9d1910b769e47c38dd0bc1290ab83acb25214bd8715dabf9b3b7b10b0bdbb5d8f3e9365a682ba80190cd23c616b1d1a5b1edcebd297 SHA512 e5baf8a0e0f1a1651dd37ff6160be87ef318442dd40772a605419837d903ec71ac299552cc5c39364be11a4a6f5f67f7da9d7007e6a5ea316a30131c412f8610
+EBUILD sphinx_rtd_theme-0.1.9.ebuild 523 BLAKE2B a642d19120b596546476fc7f3e0f40624af77b7f9a806cdd73553b76b5599dc7a67af9e6e9ea5a7bbe775b7a3824277050c1faa42a86b474124b6b486ba12a6d SHA512 e204e68f2e04c979cc1098a80a3c3e142896f13d148fc760e760ab500eb5daf4cbfd7c176ef4cfb9f1e988d898f7136d5fc1c1e7c183d0ad2398400bec0e77b8
+EBUILD sphinx_rtd_theme-0.2.4.ebuild 543 BLAKE2B b1c550a181052815a2ecdc3bd89ff7a98e2040f31c5db2aa213369fdba3444750d5c33c1be5582214b614ffe7cb44046d322fd2f8b8e28839a5cdce69bdcfa66 SHA512 71937cb211d0342ca71e3465eb0cb03b12a6f67b82a7d381988d741da6ea2eecebb0633b8fffa658889a52284a6f1fd8677a4d55e2068a660b0f1a580028b37a
 MISC metadata.xml 393 BLAKE2B 0964b64f29bebc684900cd181b7947897d10f617c091d6936ccbfb27f91356d83de2ad0172a95245b363cf6005fe2defe8e80aab2bbcec5f292bc79fdad7b7d8 SHA512 f3ccf901c6d0a891880bf06e1708a1e19225cf1ba60c3cad1e8bf5dfb665274fac7de87b4363734f8f299a9af589e3de64b9e38ca14a405fe33e4c63321e4572
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
index 676af3d85fb0..c0163c7baf8e 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
index c43a39d0540f..b5b096675207 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index 7802c35f3cd4..42d5ccde2237 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-applehelp-1.0.1.tar.gz 22086 BLAKE2B 6e10329a1712cfcb1f29a3b4c23be5169507398a43f800623f2b24fd350f7e2ad16a887e87a3b68253dc348337342d3d4397d3a9d81a460c389a77ed4bdc973f SHA512 a6500bc2899f25c0b04c8649e86a6f688823e573a3f58f2b786117768e8b415acffbe79b99cff8aeb6ae3c74dd244254de120b82b7432cf61c5fabdd38f21603
-EBUILD sphinxcontrib-applehelp-1.0.1.ebuild 734 BLAKE2B 04822a5ed0655100ea768c3a1b13683f6cd56249c99913198090adf61567b36c272dd87461712336db50270f74dfc122364c8e029dbd2bdfc9d626ac3bd5aa7d SHA512 e9bf2a46768ecf5f7889eadf9414ed70440a29e6abeb95e5f66c88a14262b50bfe695affc64fccc8e58f54ec2ff9f83137a12541cbb78b8c9de6378f3c6c8c2f
+EBUILD sphinxcontrib-applehelp-1.0.1.ebuild 734 BLAKE2B 857c7285bb061839a1f840ed73747369d486f4557519741662b153bf2a9c0ec6c3697e0c764e91213bcfd6c7cd742cc6dca7c7d9752a508407423d20a62abb72 SHA512 6adedc29e8647012cb1245c0cec1b8f3cc17ffad17f17d3103465eb4890f24cda4c0df399323c2a0ae1f3e19afbd441647b9d9b581df7b97dd350f176b5afc97
 MISC metadata.xml 326 BLAKE2B ad14acf80a55c014b396340b6f42885185c7059c9b2159662d0291c9fbc4b03b9000b612d53fd2d95eb861b410d35ca301cf00bde26ea3344219923ba1fbf3b1 SHA512 55187b429105dff1f05c80cf935da48c02fcf8b00dccd572a562d75fdba50b73183d2781d67c498c2fee181707eb32e09e7e5dc12a88e7bdfa7212f916c45543
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
index a25999ad239a..6bc2febfc222 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index ffea9ebbc28d..b08497206c00 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 1017 BLAKE2B f62870115c5080db54d9b8f7237f0975b7de4729870532ca2e94a9e9cb8ac03075aaa9b9c79fabba47bd1485ab25e35496feb65bf415f3414f9227e8b6a357bf SHA512 d3f315d4f10bb0f6f553922a18ce9b95b3936638cdc5d56a31fee102b01e9fca98858b1b55fde897e40934baae7326cdfece59767ae62be3a5256e6707574bb9
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1017 BLAKE2B f21430f14c5124db3cf174d6c5e737c40556cb87efae2c05129f813594d9595f344bcafc2fe751bd9d3e95fde02870bae4cdfe1261259a6c33112afe6c2e9893 SHA512 eb1cdb4a66338c5894f8caaf6ad4b3a2cf8a30c9c7ae24deff47ee6cd8ec66de62f442c2ac6f29904204297096cb5e07ea81d163f29786c96c303708702ac715
 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 91e8040b2f2f..524e0b9d2a41 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="sphinx extension to support coroutines in markup"
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 95c77a559285..e124be38f33f 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,7 +1,7 @@
 DIST sphinxcontrib-blockdiag-1.5.5.tar.gz 12066 BLAKE2B 4913aa53b365a05db2962c81c3f15df748c3424c88dc70bb5c97325c92492852698246b2d644748fde46ccc9ac6535871036851798db6d9db5e9610c5ef58b45 SHA512 4c007e2c394bf90ff84a000cf44ec1d50b39286a32929c89a64320299a70f10e44da35d942e7bb8697a9d61eb6a551f74bd15349cf0b439369aaaf12d175635a
 DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 923 BLAKE2B 29b6a166090519a8a6d7aa3f381661161429db8e5f912f0a92dcb669ad92b23c550097755ae57bf7024e23fd4b58f3dac496e9f973bb742fe75d083249afd816 SHA512 f5d13643c66e24c6095badf6eecc4072bfdbd41928b2042b901042818229ba21236fd4bb0de71ab6161a5031f861d008b839d1eea2c2b592892a47c52189d875
-EBUILD sphinxcontrib-blockdiag-1.5.5-r2.ebuild 1332 BLAKE2B 1729c17b7f5be02cd93fe1c0ae8465e6c1f3467b880ee35abdbe0ba44a90d2a3bd68013cd514a4963a9fb67d8a30ca4271972e26c4a73f68dcda3855be017861 SHA512 8e5c0bba10fb943b1ce19e27563167d49b1b1b64152f89b8a9838fda452d57abd2eec66436e10d1d4514940a3b8f817ec5f51d13a902b9d63cad710ad0e60e58
-EBUILD sphinxcontrib-blockdiag-1.5.5.ebuild 674 BLAKE2B 58d9d30ab0ac583c6414fb8a650bdc1bdd37ea55a942fba667cc0bdcd2618d842518c694636ef5d1a09990b36375c1e6ffcc68c68dea88f6d5e6e33ce50a31d7 SHA512 ac98f936ae0824a53ac52a3cbe87b10a67d44c938eef071ff2bcf3e8c9996d32b858acb4777adc39a0d730261dc35278479479fbffbf41176552373312235fb2
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1177 BLAKE2B 2804127cc9373b38afc66c1591fb2ec886abf5be001f38d8b5fea57c8f1b0c6cf84708a5bce852648b97c6c9ed0e0f5e0b0e25f25304d428a2ffd74c911567b2 SHA512 cb5f04267b91a778516a33c410a308120be5362dbea272f19869c0abe32d2d1a7a02e8c9e5d944f511ba98a85429c5427bcd5deb69e9316e1ca285c1dfffe698
+EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 919 BLAKE2B 6585aeeeec9a24c889ffeef5e06bd0c564f19060ae1348de49046108894ab808042f20443ec0cf5aa513c5ef6a1222fabe1515af0c83600271e59775c7d0798d SHA512 f7a19c97e35131c616db4edb2aed80bdd8fdd7c6bcec3362183c814e1bf0544d3a3cc7efe41c4c652bf999ce3c979c9ca907bc42860123edeee53725e25c3e66
+EBUILD sphinxcontrib-blockdiag-1.5.5-r2.ebuild 1330 BLAKE2B b5aa6ee74946a8c51a53b55a1f13e310f2634b51aba81e989be4282b4eff5e74413c11323029defb5b8eea2391efab12288869016cba88f95bf303444d38af13 SHA512 5f28ffb061e6d75068f99ed3c5699bc66a5443c82b69c61a9393ef20a201c341d8073bdb9164bbc7008edd45f886dd9f1c8c0e08454d3be1c5e0e13cd9811a9a
+EBUILD sphinxcontrib-blockdiag-1.5.5.ebuild 670 BLAKE2B cb00ac9da32f0304a8fe293d9b815030a4ecd5328202525947f7e7ff6a4fe4b9f1fffc7633bba14cc1e85e014998dc040979f4199296235cfd3773051e8e3e5a SHA512 33e75e8ce4fa07eec1cb381baae25ac9e55f8cc050439a656c2db24e869eb28400bc87f21b2365f38531d7fe66efd870377fbe730ac44b9c793fade20558614b
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1177 BLAKE2B 47e6a9f127caee1dfcf88d233433780752cfdd97246d86231ab68eb9fe35b13ef055084d031bc12a845f0da320dd4a384b0052366ee12c57f1b5d7918d2333af SHA512 d9c799abbfe972c37c769f440cf956464eb54d669d58b0cbad56408d3f914c05de0634c9c27d854d96bcbf5c8db1080beeeb69ab9c20708c936bc7c134685e5e
 MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
index 31208c5e314f..4cdb47c395ea 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
index 693d406f910d..d51e11c62681 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
index 4143ddc414e9..cdb5a0e6e8e5 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index 89d49e847b78..4fcd524df2f5 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index 8b00130e43e7..ee7f5b785c86 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-devhelp-1.0.1.tar.gz 14016 BLAKE2B 4b8c079773d65f5fb752870dc728d8e90e03fdd2f8a4b01324838928ef2deaf2c724c0b149697a61624ea7382445e81fe261ec2b726fa3cfb5547bd053286e4e SHA512 135d6405e330cc245391646d4055988cf762d82f6473e58c64a76f3a88e7f33a66baba366e7f29e1378320bd0c374af92b0f972bceeec8c05ad0fe652a81e984
-EBUILD sphinxcontrib-devhelp-1.0.1.ebuild 736 BLAKE2B d224516c1765c80ead463d7fef3fd2b049953ca6e074001f32250ad6054b2bb82b833ca5718911773b92f3f0de85dc045733132be15ce3386bbeb2cd5b086697 SHA512 819de5511c43fc6a31e1d04f1e2f12292f5008e74b9d973437bba23ca2d0d71efc69fd5c4569999e990d33b4508812e943d8b47bcc2dd235a4daa5361b2f625a
+EBUILD sphinxcontrib-devhelp-1.0.1.ebuild 736 BLAKE2B ec3db65b768365ddaae7e8057c60df6b395a3aa6d400e5e45fa9c71842ff059304c8cc6ddc7d6ff8127e71ef3c6b475fc4750d02807a261ca34177b0e98a65ac SHA512 28e47121a51e9d34cfb40f81d5da98b0ba270d32d67b854651a7b224ce89d250fdb8129df4cdc662eae9cefc1a17f5d40f924a2ccb914c91a7157bdb790c0cd6
 MISC metadata.xml 324 BLAKE2B 986204c86559fccc9a83332d2a443367be0d3f6d58ee2f50d5119688db2c3bf979aa14ad41979bfe0cabab649594e6d69e83c592a4d883e6d14b4840d3dcdf4d SHA512 d4f768df06e1c208502e7f87ec3ff4481f07ff84fd77721a5afc8a7c3bb7804a17a6a5798bc056e384d2ce433954790403c0d5d5cbba459ce835659bf8072a53
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
index e2c9322af1c9..8ad6c5320e2d 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-ditaa/Manifest b/dev-python/sphinxcontrib-ditaa/Manifest
deleted file mode 100644
index 2c79342ce7e5..000000000000
--- a/dev-python/sphinxcontrib-ditaa/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sphinxcontrib-ditaa-0.2.tar.gz 7293 BLAKE2B b5c32197c293f2400ebca44ffb1142acc5f60c3b7bb573c8b389a56950a54c3b06f478371756bc8a1cd5c8e360eb936c587c5d64e3d4e9bbc855c28197a21f40 SHA512 fc9f9b1475b7efb3f057156bd56be51414068c80f62cccd0fb5bf404b7047d296b3de05a1825b42e2b51a7ff6f0ccf1f3a7935ec494440ccd0fda487786adae5
-EBUILD sphinxcontrib-ditaa-0.2.ebuild 640 BLAKE2B e4f54c7da37d588df88444d7fd42482b1b212736285907e135f7454c45de6b9a9310a726c2dad83fd86ec40ebfb703a4e060bdc7005f747e47a1902902149426 SHA512 26f76e08e6982b5bd3d7619f155bb2060c5a263e0e3de04bc0cb7f88cc32dc191a5fc6f428d8767c85bc78fb7e869ecceae4a3237507886cbd792852ca3cfd53
-MISC metadata.xml 326 BLAKE2B 8df01b84111af49a1aa53a35a56b86d58b0a833f0d131aa31765adb90fcc893b5b6d5fbde71a2a1cf8512384e2394314495301ebae28546abad1dfa3d3f1529d SHA512 fe55a4d96c90929f68cc2f6a1b211975cc0f6e26061d2f1956d8bf460623d7ab1d611f0145b1269b37dc15dda84845425e62fb03b711c4e2de6e132ac85fd959
diff --git a/dev-python/sphinxcontrib-ditaa/metadata.xml b/dev-python/sphinxcontrib-ditaa/metadata.xml
deleted file mode 100644
index 7caa7628e112..000000000000
--- a/dev-python/sphinxcontrib-ditaa/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">sphinxcontrib-ditaa</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild b/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild
deleted file mode 100644
index c7b237df642e..000000000000
--- a/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Ditaa Sphinx extension"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-ditaa/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-	media-gfx/ditaa"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-documentedlist/Manifest b/dev-python/sphinxcontrib-documentedlist/Manifest
index 7f2cfc270e2c..924a2dc93f9e 100644
--- a/dev-python/sphinxcontrib-documentedlist/Manifest
+++ b/dev-python/sphinxcontrib-documentedlist/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-documentedlist-0.6.tar.gz 4983 BLAKE2B be38fadb91bb6763894de1c1f5e768926979bcf3b4d0e87e6032289222c82682bb98b61ebc0eb585e80c12abf9396fd529866ba074daa3be55007d1195110ab7 SHA512 9d7f14400b2a3e9b96f01ac003f70c0f7112d9286b2a978495f3089fe94137b034835bd91944e5709fb22553c30c9c324558c9a38ae82b932e1f2ba7f6927dd9
-EBUILD sphinxcontrib-documentedlist-0.6.ebuild 728 BLAKE2B ead73dbd9694b4db741ca2d586d9644a372f993aa940bead9b14a72bf8cf7c5bd3a9178470a2066facf13e82933369eb416cf96da6e179f53470cdc71a602a47 SHA512 b853c6fa723c8d2963e30cdc2db3e8fc9bb2870f23d92c88537bd4104ae820277e91439b110d82512f06f58eca103edf1266b527480a68ddc0909591871a9cd3
+EBUILD sphinxcontrib-documentedlist-0.6.ebuild 714 BLAKE2B 420a2828730699e127e08f474fd761b81192a6447c549c1ba050f3931bff93758585f567009d5354e7b472ede6dde6f9c5fb82a8bfb20b4cd6cb8ca55a789324 SHA512 a098340ded2b039f3d14238004d31fcd12770d653480039b74813ca4f1a1778d620bfe601c0eb9ed09b30c5fe1e44d34c36285168d4448cde9eb707399de381e
 MISC metadata.xml 471 BLAKE2B 62dbf6ef994c20149b77a542356cfaa88dffac4ff90d0ad7b87a0cbe21b70665e260469b95e1c81cd9a85f8542f30014c00a33546e13631f618d037de16684e1 SHA512 592f9dc8e3283c317def62b115c5d1da7fd456cba130922ebabb63b8c07d29e929f79491f23fa196b385858740147ecc0683ef0ddc81e3bb90d61eb03541b75b
diff --git a/dev-python/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.ebuild b/dev-python/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.ebuild
index 13f08e6fa80c..d3065debd0c5 100644
--- a/dev-python/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.ebuild
+++ b/dev-python/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index c4b5aec6be8b..837c3f56a532 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-doxylink-1.3.tar.gz 12401 BLAKE2B 921e05ea89111b2ead396b9352e46806654d494c0e90708d7c47e2b447707ce010131c5032b8bb88e46cc63f9a92c16bdcf51d13434e52427a348fdb084ac99c SHA512 5a53061cddda22b682b4b640725d4cd763b54d9dfa3599b666dd55d72660f07fc89318abeab07d114d01313b215e69e421a3b5251125d28c3dd326426830f9ee
 DIST sphinxcontrib-doxylink-1.5.tar.gz 11391 BLAKE2B 569eaba41a2cb802d05b0e7da28a00f41399175e2103979eeae35750e2935f66670c20bb0a560980d553a8a751ab57c0e200d0110983eb474eba60b3a2bfcc10 SHA512 caac418ed2b11f1b72bc3cb2e5c6bd22a680f9e6debecf6c0028bc1e92fc41e017996be05a7ac7c2dc96c907e59ebfda32bf8b7715c92c33c39404ef356c2a13
-EBUILD sphinxcontrib-doxylink-1.3-r1.ebuild 923 BLAKE2B e0a05c60e3838e1d3af408354819ffce4fbea6dadca66b2d0b262ba201705f6eaa8f53c075350128ec6d7d49a79232ca634ee81e1cc65f6746adbb9dfcd486c7 SHA512 7271c0a4d8b050931cf031903b941e16a4c191586fce30b5638f1d9c820f0ec8a34489e6f3504c7e5e2ec5ed006069ecc3006c588d9643f9bfbf089617a3a6e8
-EBUILD sphinxcontrib-doxylink-1.5.ebuild 924 BLAKE2B 873d13e27ee5a082135b5ad733419bef9bd340bfa7fc1434fa1cd90ddaf499c65679c828d0b1f872e1509d0e0daffcb4f67bcb5b75beb005c074843947fa94d5 SHA512 587f4cadb193242f8bcfe5f4c7e94eb8fabd3f55504f3f0e4de2ba358e590181a5675bff3e61e1e85438f0fcf50c4eac2c804ade87591da6d29ac9a330d46278
+EBUILD sphinxcontrib-doxylink-1.3-r1.ebuild 919 BLAKE2B 3dda8d1f0d91b975dd56f4d5c823d51cbf9561894472233047f862a1a60bdfb69302afa3cf7a9ef3415c5f5276fecba6dd05ad66df2aab1c8241a347d044c9dd SHA512 5bf701b900a22b136b00748b69194ccf9118e27761ce1c73c882ff54a35b4cff1ed674974da18f140ef87f8e17110ff33134bf36e2300d208137e31c71defa97
+EBUILD sphinxcontrib-doxylink-1.5.ebuild 918 BLAKE2B 3928cc2102a76a26660edea37fb33a821fb7c9801abf7f6d5b38d33a457f0f0df932d237924950e25f05541c5f921d6dfca9c9df0fe0eeb4d0f92ddf8e276d0c SHA512 145ff0353683cb41bc81778716941759ea84c24fd6e6aa258b07c93528b1656461c103ab46770ef4c70dee4b3f56bfbf959b46207cbc6ac7a7a3092918dac4f1
 MISC metadata.xml 599 BLAKE2B 2734ab4f50acffa42b0eb381e6236b1b675480b54152f653430d560113718da2533bdf256c8a49817fe7cca950b36a764dc7615b8e0ffb0d73eca3118ae243fd SHA512 5f025fc40b2f4a0d36600d98dc205637abab07dc40bef0dde88babb5bb676734882145e087b7f6c4d11374d94340b226b5c37271044a70c9cb1ceedad3864fee
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
index 25eca2c9c6ff..8d05e6a162a1 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild
index 663ea9286091..5de1168d83de 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index 218383514e42..91533f0c1780 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -3,6 +3,6 @@ AUX sphinxcontrib-github-alt-1.0-setup.py.patch 598 BLAKE2B 7a4e2a1692368334ce0d
 AUX sphinxcontrib-github-alt-1.1-setup.py.patch 598 BLAKE2B e740a7a90e6e158a7c88943f60c81160d4c6616280a961d6afdc2d9dca59cd04b32b9e62b6b243a16cf4c133d5c5dfcebfc4bc79a915d4699385b1af2d270690 SHA512 763d38a7c01f916382f558635b68c2eacc7013b2e6a5f22aa5299bcd6303223994b9166ba8a4b8c51a6f57c8f592924d9f389b0547dbd5baa45d5e26e0229b4d
 DIST sphinxcontrib-github-alt-1.0.tar.gz 3213 BLAKE2B b2449c0b635769735a23187f422f05c21c52098bd25057f4dfec5412040992417451ba21bd85dcdd71c75fe2d0ac935f745b6595bf5c77bb3facf91d48a39cef SHA512 57f5ab3a5d679634ce0c2ea8c78069f37ed5a5d3c32fe6cf61851ed4a9e8b6b9b6c882f486eb84914153b4121dacc25fd4b11edee111630001ae9bc324f2250e
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
-EBUILD sphinxcontrib-github-alt-1.0.ebuild 916 BLAKE2B b36fcb43ee0d39c34e3a732b549efa601424cd92b0ea6f4cd6b0ccbddbc0e9d75e8a420d76751c8819c3af7488d7930f7d915995e96d63ec71943fb250d3cffd SHA512 ae16c8fcbcad046ce034caf6490e4f4dcfdd31c5911aa2d9809bdfcc415d64e76d84825f76bef1107c29bc0b40063b4b02f4df512622ad98f9b67fa6d8b2f550
-EBUILD sphinxcontrib-github-alt-1.1.ebuild 876 BLAKE2B d3ce075e405a7f7570366c300a048f8241603225c9c02d52d59a5dae220c7de915c860674e413e94670c662a46772d5923de7ecd67dd10b72cf6bc185273bf75 SHA512 3a1f86748a01630e6cb8461a434026404952a3734def3683785bd4ccd2effae07e562ebaf3fb480f6aed97aa5a310b34d7fbcf2ee91678756fa20e4e6f73e6f9
+EBUILD sphinxcontrib-github-alt-1.0.ebuild 914 BLAKE2B 46f37d7868ac1a72308b788928b64edf47f72ec834d39f4876631082981b602c7f4b3aaebd7bee351e2745b9be449076d656a28f8ea133bccc7789df30d1aec3 SHA512 7ef605734fd9ff7d1fff181071d4ef5ded27b11b4a96d285807ab1f87ca26de74b4a49a34233dde67d636dc374146eb347f1f5d0b7d8befd23e8f01037e444b4
+EBUILD sphinxcontrib-github-alt-1.1.ebuild 874 BLAKE2B 2cf478b03ceaaa5e01f65566d4501f0d838aa6d76c8ce457bfbb1869e86c7bbf066a39472cbef3873b08edd4bb3034f7925c711ea6127a42c16fed126654da7c SHA512 fdbe1db6ddaeb565be9c216ca12d9be5dc7a5cfe34c72959e015687cc4de88db9ef21191227a718ed280daa7fcf2ec113f996c8e42e0a3518eb42a3216ca58c7
 MISC metadata.xml 412 BLAKE2B 2cd07799a32942d97bbc9aaca814d37fa7a02eb748ba60da3740f6d9b37ede1abcdda4b7d36f68c5df26e9af0befa1741b0e55a3b7289e986aedafba98ec703f SHA512 6453593682ebdefbf75a1818ce26347827e3be0819bdaf7d6f407eec24394e45275d3bfec3e1cf254216b17fb6f642b2ddd06b5d92d3488706dab78a03d632a6
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
index 9c480fbdd00e..6498da59cc6b 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7}  )
+PYTHON_COMPAT=( python2_7 python3_{6,7}  )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild
index 11f1121260fc..05794e64fda8 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-googleanalytics/Manifest b/dev-python/sphinxcontrib-googleanalytics/Manifest
index a835ef295c0a..b305a8377516 100644
--- a/dev-python/sphinxcontrib-googleanalytics/Manifest
+++ b/dev-python/sphinxcontrib-googleanalytics/Manifest
@@ -1,5 +1,4 @@
 AUX setup.py.utf-8.patch 413 BLAKE2B 831b51cc5c0509a26fce8d078da208849936260bea42976642b943cd99974e2479281bb67d29ef234fae3cd96689c17be19ab3e03131b86a122b5fb17d5b1f6d SHA512 dcf01e5d306cf41c5092328de26d0d83d183c9a969898ae42e19025c45f8412f9c1bdc18ba7b247e10ac5d33e77b5211eac7fe4d36c69603ec6c6526f61a90d8
 DIST sphinxcontrib-googleanalytics-0.1.tar.gz 2892 BLAKE2B 22cd2ef55a619bd4a249c3d33a4c0d8a27d038c434f5f1668854cb494f134354cf654abd187da71e3aec10c7f0d422bc3abc310c8208a12a85848a5ef5cfa97f SHA512 fdec9108f9c1d86c6c59cd2bcfa55d82cd5cd48aca5b7aecec7734f3cd29b0f6c080aad7b7009148e3d95b7cf80af38ffb6ba230879495f3c1488ddb661fbf48
-EBUILD sphinxcontrib-googleanalytics-0.1-r1.ebuild 529 BLAKE2B d34a3f6e7c95965136c3ffa43365fc77825e9642a38add75e6414f6ed7a8473a713ae8a80b4080bff81f457b13ec9bb00bd557102a6fde007a299f5abb274b02 SHA512 54a5a3cae53216b236562981f413e619d62013363ec0e3091ff99ad2149143bb98d0f657650dfa04653cd29e20606b9f7939f0e1ee99caf3d2ebf55f16d2e5a3
-EBUILD sphinxcontrib-googleanalytics-0.1-r2.ebuild 721 BLAKE2B b3084f584941eedb4fd339bbada952e689df82662becd71cc8c49c64712d60beed67585cff5b29885832464ef7aa1230bd31204b42298b44e56d488d1e176354 SHA512 1e437d3c10714046bc56d4d8354a99022e5af570f87421a1082a68ef970db050aa3426d02bdc765e88569895c07e6285665834ad8a45198ccf39dec9df5967b0
+EBUILD sphinxcontrib-googleanalytics-0.1-r2.ebuild 707 BLAKE2B bca9e9bc2cd44bd5e23904e6bdebc745231f6a1995f7ed2e9cf4b29a16db64f3a599f58e0910cbf666d515d4e6afc8b9e968862e838f8a7401896fb5777448cc SHA512 342eb7871f38a04517d7650acb67cc6578ce9fcf24ff488abfc8fa8c7f731629109c7f9d0dc056ea71bd5175c634179fab2a6d8e1736378af50d968b6f83732b
 MISC metadata.xml 412 BLAKE2B adf7b6eaeebfecb34c4ca1facc156904cf70a26070b8203e159d715b3da57083a1358e424072bc84f24930d047ed887a105be26b13fa26b1a3e4ab3446e96dfd SHA512 46c62c4de72309bf938f9d91b89183968e51741b4ce25646c359de043ff463fa6690b4f91484388007b96fcff64b0c293907bc07ffe6160d29cb68c391b15afa
diff --git a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild
deleted file mode 100644
index 00daa2122a81..000000000000
--- a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild
+++ /dev/null
@@ -1,21 +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="Sphinx extension googleanalytics"
-HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/sphinx-0.6[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/setup.py.utf-8.patch" )
diff --git a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r2.ebuild b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r2.ebuild
index 79fd0a6b834b..8e3ec3cf453e 100644
--- a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r2.ebuild
+++ b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 187151c4b6b1..d83d2f9ba599 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-htmlhelp-1.0.2.tar.gz 25417 BLAKE2B f5f13cebf0bdeb8065fa37b12d90dcb4cf4775377b2290517105bfdcfcd7a168d10b0c84a90cdcbefa95f0d40b6bb644532e75b5616562cc37c04e103ee7bc4b SHA512 2ee6c8a91095d8f87208ea509153edc5495b9ef78231add39880e133413b1fa95e152264e5c9dfe6afc89afcb107acacc241754e7b5d86137bb5c64a851702de
-EBUILD sphinxcontrib-htmlhelp-1.0.2.ebuild 733 BLAKE2B eaad98b737250b33446df4ab427399047622dc535e1370308c3f2d87b15b8bce9b9aafbb85a981252218051778e9e3f388c31b01c9b7b5478ca56b52fc92f237 SHA512 3f3cec93e62a0da9686b450b7af722409d14ab301cb58572ca9c888f466a26bb2d21d4eb70600efacda25ca8e3d727b51763e0ed048f1b4985e771889393b0c4
+EBUILD sphinxcontrib-htmlhelp-1.0.2.ebuild 733 BLAKE2B 504e4afffde78ec8f6aab06c53c9610d1f58dc4f9c08f4e107efaccfbd6007fb1511df20d1b21e3e02a869ccd853a294e102e658c68691f6aef023cedfcde61f SHA512 c48c0159754c8a19dff820f5dc042cf58fb06e662511c0de44ed88e71d5edab01d7dcfa68c54bd3ec782d8f9b6cb469c8da2d1e32534643869f6de11deff6dc1
 MISC metadata.xml 325 BLAKE2B 86b320327210716251580bcde7ca53cece58e22f07973de023d09bb7a6b68cc4e4c4cace4c9b8ba73f15482332e3b94e38650468fe790e8f6c123c77b9f2ad48 SHA512 700c19351b017fed0536e0e57728b410052b2c34bf06912aedc754e4f931614f3f4b31a10bb67381134c9bd5f61f9af23f204641e8e531ec0ff9a6c1cf9eb41f
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
index e5726a0cd299..53a92621b62f 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index 43fa39b1d4ce..2fcbd4f32dcc 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-httpdomain-1.4.0.tar.gz 12192 BLAKE2B e4250a3814448d87255a6cef4fafb9be86bec1d7670fd30d2988cdc0c8d6db67fd18a1e9e02588754bd03ae7261806ce1d79d7bb8d94f47f2e2086a6897a67cb SHA512 85d4d0898a1703a1742755814200253b875795b5f267b08adb00c7d8d7c15c434718ce0f93656e7b698df89c958a9f6f3f3403bdc6d08f6df322fd80371f1d70
 DIST sphinxcontrib-httpdomain-1.5.0.tar.gz 13981 BLAKE2B ca08a5cdc22d9898c6972ce8b7585fc4f185e3a0c8e49302bfafbfc88b4bb69d9d3deaf15cca2dfcd2f218199f509023aeb542129fea2003cecb2e8ef8215fd4 SHA512 e393690314cb7a7b81207ee42826eb5360ca6cfa8ad1b57c9a8dd5897ed1ed97bad4a46d8348aad9d5f6b6145e5456af629b14973ad2561d5b90b2f8dbf2163a
-EBUILD sphinxcontrib-httpdomain-1.4.0.ebuild 628 BLAKE2B de6da6768a19e3f1635c3e74cf98341057e02ea9309cd3e79783e1848b7627fd8b740bfc6962bcfcd590ad20f12baf7a2b0e4cd46263709477d0cf1e2729021c SHA512 a57f1863814760beba628ad803ac1893b1a7e40444be6ee66eba9b42f1851ca10fa10aaa82b5e7b4c7b2d5c3b61f3b97cb256b3fcd905effe5f85e9d12ce929c
-EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 813 BLAKE2B e857583568e311e9081dc22a30f703cbc0fc2016218d9088d1d73bec71fe5965ab36dfe97103b3d2cd30b534bc2c9c64fb0b53ea3b4c04c4824c55d6fec79328 SHA512 e61e1363af9ce7f46b797fd77a4d6eceb0ee8bd9d8284c6f04b26dd799f5a894a7d068fe1d31f044a64ce3b56f87bc66d7d9efc16b7e6fc4fdda3a9c184360e0
+EBUILD sphinxcontrib-httpdomain-1.4.0.ebuild 619 BLAKE2B 220d896457ea4cf629ecbcf9d5149a0eb5b8db6b520fcba9bd9099892c75901bead3eaee79d6c4ca1da8c1701ae083249189cb0a0ca707c206140d86b7bbfa22 SHA512 981cd83ce2fb98a6290de30d0adcb5fab13038daf033c7dbc7952e732b97da38cc1061c0da7130d3066acf7dd070e89ba8f9032a098d21622bf8d0a92de99cdc
+EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 804 BLAKE2B 47378833ec38fe832f218c0ee8ab5df5720329729b2a1c43060cd0673bb17f20abe0449904f8d65660f71ca790a1a4bf8dfcb375f3e24e68470b19dc2ebf7621 SHA512 df660bf8cd75780af18e605f32707500c29d523f8b4fb66b1f966e0e95988990c41754a67a6a4e1dd02167c1cca184912ab67baed4b8188a013be9074aac2cf0
 MISC metadata.xml 407 BLAKE2B cf0e92bcd492b79892ebc97b7639c016b4d1853a87bed8fcd1e367a9f6cbadce01015895d22011425aba76a4895b245bee0e5536fc959224a6bed08daef74a88 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
index 065750513bc5..0381f1e2d77e 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
index 7ae35c21f4ac..dcdf36543b1b 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-issuetracker/Manifest b/dev-python/sphinxcontrib-issuetracker/Manifest
index aa9a87d9eea8..82081ad7ff14 100644
--- a/dev-python/sphinxcontrib-issuetracker/Manifest
+++ b/dev-python/sphinxcontrib-issuetracker/Manifest
@@ -1,4 +1,4 @@
 DIST sphinxcontrib-issuetracker-0.11.tar.gz 30351 BLAKE2B 304526543f5d24cc4b2cc76ea8d242d8942fa54737e3d1f0924e816d24aa4838e054b8af468837447d601cacaae987cd285fc706292b979d29dc84f1dbb77ddd SHA512 fb4a977bea22451a3d90b16821fc2a38ed53b17913666ca250e9aab8bb1726bbdb52fb2b6dbb2ae512a0ca6cc3d33dcddeba758c02c77b099180443d67e147c9
-EBUILD sphinxcontrib-issuetracker-0.11-r1.ebuild 1396 BLAKE2B 504e3706bcf0003eae9082d89d685c236af9ee2d7bcba473ed23c051582147d2ca81a2dd48771d2320f368cc852d931d9bfe065b37ee4164b2f58a49d0b857ae SHA512 d1ec812d8ff82620fbf2d15588a3cbaf1db8f00c3650a0e8ef449e6bfc4985f0b663cf68b3bf512c5bd7b183c2176787ee1b27cd5d053552983ce167d52d2a3c
-EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1572 BLAKE2B 0e0efb38ae2aa39b367c1f6b1ae0deb0793738b3d2aa3b1539586bcd6b919244afc3496de74ee90106ddfc7ec5419013500bee3eb585e4e0df652478059dba04 SHA512 6a5267927b039b51f4757a48b703cab8ff66efc675fc94d1950826b112a53305b0f742512ed011618c23876226a3d5d6e0f75ccbed52946951cd8f266e136b9d
+EBUILD sphinxcontrib-issuetracker-0.11-r1.ebuild 1387 BLAKE2B e374a6c1b9423d471fceba627ed3f7f45cef63b8716b2813a7de3d362fdd84bfda4083d668ef3cd9240bb2337359ebe8c0bf8e58cc0612605f71f4c3ece827cc SHA512 32a100c36f928a44ecce3652fcb80e4f1f00571f282c2b881f9a9108a1e208a0dfe509d163ceaba7a3b3d64d7cc11bb9f3e53243e5866c73da579346b80699ce
+EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1563 BLAKE2B 5ea3c7bb7b50829bd8aee149cc415b16bc57857bba94d01aee27f663d9e0e6fe017d189ced974048b82ba2de07363e211fd240095a1d31263415b8cd0d29e21a SHA512 352f9e791c0520447cdb47388a070db355b0e83441e0bcaa1bc4951d7d7e894e042e0fa721ca2c2e61a2d179cf8d81a5e5545ec099621cafdd85f7fcfb81218d
 MISC metadata.xml 329 BLAKE2B 6c548d2fa97bf0724181e8afbdcf74b9a6a0fc429d9541db316d5a416ad356508685884a5feda0fbeeb2cc931afa8f5e8ca7c8123f0f687386694c9f3c224d9f SHA512 16db67eafefac64ab7b17d99e0520c1c6f58cfd929274e9f82af85aa4842278ebe29fda98ad824c673b3bc56fe8c5cf469260fec9ec2c977ca11d51b8343a2bd
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
index 3a5c2666b3e8..c4d9c3705cd8 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
index 971ff1b20fb0..c39aaf771409 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index 0436112c62ac..ab45c33cd123 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
-EBUILD sphinxcontrib-jsmath-1.0.1.ebuild 754 BLAKE2B 0e4e1111867b4c5f85dfb71e7f2d11cbd944ca738528f321e18eaa1896d0b26a868cfb1063d3cd0c4fd5c09c8127d6a5fae69576ce829a075d7bd7fa6ab0af48 SHA512 bf0dbf9bde411c0ce6e873e2f9f44e99a5ee2a3b2996ce3be79e7872d09e467a585eb94961809af699a8474b6290fc40a031892835b347d53290228f10fbc4ac
+EBUILD sphinxcontrib-jsmath-1.0.1.ebuild 754 BLAKE2B 48b77ab06cea30c6a5943ddb3d5b813b6a04f9358b44c94cd55144b1d59ad7a3ba7e29c69ee4dc6897f48bd5a070ad807ff97d15be2da23e52d93ae7c6cf60fa SHA512 0b76dc872020d31577792826573c73e607ef04de9a525a68c401436cac7787554a20d6681ef91f2299eb71b108ede24a97590fa5dbe88859da326fd32e082bc0
 MISC metadata.xml 323 BLAKE2B bae56c440e079dcb99602f6e513fb9bf5c2415292f4c058e9da93fca5c14e0048789b1f9c1000b4d83cc37bc08d2fb3008898c2417a819c1128d1efe19e46414 SHA512 03745eb2d0defdb73cfd778eb7ab217cd839f9f94ce7cc1ef70c75c326cc0ba94bbc745624f8adca19e9049a332ca57c0951b0249f8a21b95ef6015ed6f545d0
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
index 7e8721430a49..1ec0d3a96988 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-napoleon/Manifest b/dev-python/sphinxcontrib-napoleon/Manifest
index e454180cf5f4..77d32d34f999 100644
--- a/dev-python/sphinxcontrib-napoleon/Manifest
+++ b/dev-python/sphinxcontrib-napoleon/Manifest
@@ -1,6 +1,3 @@
-AUX no_installed_tests.patch 354 BLAKE2B ef607927f008c407b28ee361dd1bd0b95243cfb8501b7babffe53e6b6f900fe607ccec49130e2333c5f16c8ff2c1b57905aac106ba81b6c19d8aea981bcb5e23 SHA512 94bce4612ec269d10dbc74823a7c3cb6d37787b738aa99c31afab4bf6137449358d61ca9bc63d5eb450e1921eca6cdbce15abff88d91ce11ffeab2213d25af7e
-DIST sphinxcontrib-napoleon-0.5.2.tar.gz 24939 BLAKE2B 80735db4176019b164a60c6327600246949a6dd892c161d35ca8046ff669fdcd68661083bfdd94400b8e32a3eb89bfede31bc569df1b17a37ac28071392020bc SHA512 5f8d31c4ce66a042aa0c79ec06b7592539154bd7a397c1898db0cbed15b9891c908bb1d51334ef0b759e5d44ac99cf124616f0e4b3a1b1253f0f92312c949a8c
 DIST sphinxcontrib-napoleon-0.6.1.tar.gz 20057 BLAKE2B fe56c257af9433ee10dc92f7a028d581ce0783143f1d187cedbc226a72d3a2af9b185cb528549b80f77749aea15484bdbea5d0bdb7d5b087ac952ed3b855e1ad SHA512 1809fcadf964622bd75cc3ae17aaad467b7003f82e6df4de039a0ba86daa5c5b199af0c185129e79d3c4f8738c0d6c2411950888969fee3bb32ecc8cdfbc84b0
-EBUILD sphinxcontrib-napoleon-0.5.2.ebuild 1008 BLAKE2B a7eabe8c598728b53790844b78585d2eae5f13ca57cf8382d17603935c46c2b99883e6c926cb80bbd0c1e17278e309bd8802228d760907527a28e70039793067 SHA512 bc4b0cb06c19aef79a8933971bfb00432d0a633d72fa345bbff5d0b705bc71daf879044e973e2bc49faeeba435c999740960f914ae98f8def628a1fe70d9dac7
-EBUILD sphinxcontrib-napoleon-0.6.1.ebuild 823 BLAKE2B 27cdb0fbd0f701aa14b5e7c094f589d41451e8a0462b3c2c81b5b325109818a751643862d11b9fe8602800edb2d41e8af8732a0ebab41e78b578e12a5d2c83e3 SHA512 83c2ad9f498b558c95bbc41c4ae20f686bd99ec686651ba516a76748224d35ec0375e7a3e098576c6f85dcb73cfe834a73c7dfe6bdbbbb8ee2cf655bf4e1d91a
+EBUILD sphinxcontrib-napoleon-0.6.1.ebuild 809 BLAKE2B 7beb2655c42771716b475f07376aa6db8cfaf945af40271a1f423c7a887f68b1a588423c871662a90397871c78d01386483f9bc9573c92873fc3e3028ccfa6c2 SHA512 0c37d226d20c9bd70ff20cf4cf5a0da9e05a485049313b0444f0f179fc83d51bb87aac201867bc7f86e44fc828f3463e489258f1feedd20746aff258e89e38e3
 MISC metadata.xml 346 BLAKE2B ade26e4c9a8a00f8fa091b1d12339d4803210a3eedab2e091fe9cb19cb9bda9defa3291b4baa3e2de4b04a144635e87e10b57872caab1707b62843d6414e9165 SHA512 7b97ddc38c9d50f07fdc4188d22425c6e8ef8dfeb8a874c5160ac39d76367ef9bbcf198da2d0de08a1e952bef588fd20f316fcb762bcf4dd9780b4ca00d45d68
diff --git a/dev-python/sphinxcontrib-napoleon/files/no_installed_tests.patch b/dev-python/sphinxcontrib-napoleon/files/no_installed_tests.patch
deleted file mode 100644
index 20ba790b8523..000000000000
--- a/dev-python/sphinxcontrib-napoleon/files/no_installed_tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2016-08-03 16:43:35.775261808 +0200
-+++ setup.py	2016-08-03 16:43:56.126054227 +0200
-@@ -43,7 +43,7 @@
-         'Framework :: Sphinx :: Extension',
-     ],
-     platforms='any',
--    packages=find_packages(),
-+    packages=["sphinxcontrib"],
-     include_package_data=True,
-     install_requires=reqs,
-     test_suite='nose.collector',
diff --git a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild
deleted file mode 100644
index 19cc3532cc1e..000000000000
--- a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Allow a different format in dosctrings for better clarity"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-napoleon/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=test
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/pockets-0.3[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-			>=dev-python/flake8-2.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-			>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-	)
-"
-src_prepare() {
-	epatch "${FILESDIR}/no_installed_tests.patch" || die
-}
-
-python_test() {
-	nosetests tests || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.6.1.ebuild b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.6.1.ebuild
index 8fc2318b8483..f973c17f4b7c 100644
--- a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.6.1.ebuild
+++ b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 0efb6255cd2d..9b363578675f 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 825 BLAKE2B ef5cdf356731e9d3d252684ffe6c8d705bbf3625ba6fa8d0855deb272a3d2d16c1db10bf41bfb47bb5de4adccd362bda3e2b92c3fa7414e1b5e5c4bf589b724e SHA512 3dd49fa315a75fbc37cc0b38ad3e161622362c567f39f331afbb62bf6ca5139ccbe42ab1b0394ac418c3ede92a0196885d0796c5878534f2e5dd43a3fc64322a
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 825 BLAKE2B db7badbd1df59f4c532ef6702bd65f22a8909f6cd9cf631de9fc54c73b81d0385064e2bcfd1a74523b037b815a8d8cc94eb2f31eef50a71245c221bbeec7d207 SHA512 19e59290f9aba440106972d11f7c5f32c9c1df981ddb691805c0b2e1c3b5aabbeaea1833befd3fc3dd4dd212847ab5abee8492fbb2c63c295cab48be5ee68b59
 MISC metadata.xml 326 BLAKE2B ee27050dba4cec236f08ae168f2cae643f35f0e20e20d0803f7783694f4f6c3289faea1df4ae326dba6125eb6b7f8d275f449769b76220eca973bc5fcab11e45 SHA512 e47c6ab16713c27cbd5353250642751d73d39bded06b14a6571c2221f9ced2f73c6f33156acd1622789a1aaab6779a49bb85192c130e77aeb3d05d9a1513c69f
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index 4218c7aeb85c..d85863b21da9 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-pretty-searchresults/Manifest b/dev-python/sphinxcontrib-pretty-searchresults/Manifest
index 0b9de6fd2d70..72bbdacee4f0 100644
--- a/dev-python/sphinxcontrib-pretty-searchresults/Manifest
+++ b/dev-python/sphinxcontrib-pretty-searchresults/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-pretty-searchresults-0.3.5.tar.gz 9996 BLAKE2B 64324f306aec1d6eac9c791acc0f3f4a0a434f734abcf9bb0d34151137e20407d59e95ea3a3a981e425ded6b6fd82bd36627323a3ed493a47b92979ac5fe2f77 SHA512 30c9a0af183ffada3300c03495afb9f52fbba5522dd386c5a05a28fa1e6dd0fb66725499db7a537534496843e6707c7dcceea45511ee3953d02c3e2275e68630
-EBUILD sphinxcontrib-pretty-searchresults-0.3.5.ebuild 991 BLAKE2B 2facf90a30d07fd8f6767dc1884fbef632ad57b657d6d1b8d80977c51449b37aef7b6f829623fa248d91759b9db14f9e00c5c2b62ec464eb95ff3a72338eab8d SHA512 63994167a5ba78035f12e43503294aca4604dd27c0dcde772dade8672bd282de4c00c4beaad07a3ceb55f5ce25fbb92801d40634673939ea2af66a7bcc707c81
+EBUILD sphinxcontrib-pretty-searchresults-0.3.5.ebuild 989 BLAKE2B 3a2d7b0fd2b505bc1541ff7b42f208ad2f056cc9743121a921e3aa6487f06e39f2bef24c0819c60bb2caaaea01681f1489cdc24ee164b525b85dfd2acaf1e44e SHA512 1a035b898a5ac22aba271edd7541cdcb7d5acae5f6cefe74854e9f4e94a4229a8f69e3d4439aeb31aff9ca0f6786cb5aa4ea477c4ed2cb5740f2ad7db8f55548
 MISC metadata.xml 936 BLAKE2B 34793935ef5b64e806d2cf26f638a87520098d220ce0b1546f44694be606bb426a1f2d6e558ee116f6647f09e87288a1cf2342dfe1631872536289f4f2dbd354 SHA512 92fdac98a9755a66cf8b5e13567861202b6940903fbc0a83f563888bd87b753d16f7b540abcc67fbeeed087905de992b92998e884102a016041f0d7fc30465c2
diff --git a/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild b/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild
index 329eb5fe454e..394b9756c615 100644
--- a/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild
+++ b/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index 0a8d45d5041c..70f1c66bf8d8 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,5 +1,3 @@
 DIST sphinxcontrib-programoutput-0.11.tar.gz 18267 BLAKE2B 790483b09a00199e4f6a4bb723827001e3dc252b294244ddb5ed3edc78cd8dde41fd0c5cab6d4fb715c85f8c447bf25d690b4f921341769de6d7d1c9dc7f4a71 SHA512 4aa655f8632093035de986fa31291f95e95c4c0f4d1458bb8c8cc077cca73d579b16a8bf103d7b34faafb2171c617c40200008d89186f8ed37a812459f0376cf
-DIST sphinxcontrib-programoutput-0.8.tar.gz 14419 BLAKE2B ab902026ffbf4b590a5ff2617a609bff3adbefb9ef76982b6ecbbc34b7393f154db36e893b85e6316506142038f2b67f96c08e2158180164692bdbc28186dbcc SHA512 9ab769f794cf8c47f2d755b343c1326b8335c1f8161294727abada81af189545d549350536d28ac2c5f27cc309330f875b7affef6f997651e3a9f9dfbe6bd174
-EBUILD sphinxcontrib-programoutput-0.11.ebuild 1008 BLAKE2B 150343415422a3fccbfa05f5e301b2db2521cb9e7d770d8ddd9188ff93eaaba3076d3a4b15fa7c41d689407b8f6452c909bacf0aea9258454dd0495326ef0730 SHA512 f1175df4b893f4ec4fc04c32dc9f7ac09302837a057223c6e287225370dab6c0493cff51f1c01fc78ef7e40c76e872aa3ae28d1a5f8fca89d859857b15c2f028
-EBUILD sphinxcontrib-programoutput-0.8.ebuild 883 BLAKE2B fec36d833161fb93039549c153d35eab34f90bcf338ae3a605f9fd777e788cf49750c858bd2330e4a91e29e137f92546cc0481c1f199ffd526d17bbd1f6d1a21 SHA512 8b125dea667d57788385320ea7f82babf3d73e3cf5b0a0a74d297e241038934bb8a880a5bd785b2edeca49441bc9ddffb1ad4d4662c9a861fe8533406a3b52d8
+EBUILD sphinxcontrib-programoutput-0.11.ebuild 999 BLAKE2B db69b578e012ffc8ed293d80df579076da8af7a8a129a2853860b79dbecb5afebedc6cce2be716a0fa107e0c11267e28b94bf9b81169bb0afcf786edd7d248bc SHA512 beb65a75030fb24b8d0e4e201dd93f74928f178b7b7ef69438d56310a6f5c88c804aa63be265399c47cd52de7bc0473b654b64ec3f780d3d0ba079df55459528
 MISC metadata.xml 527 BLAKE2B 6a601963d2cf81b69cbfdfbb3190e6a9b497ed48d08127d41ef6643cd4501028ac8163efe34dd3587e3ef19ef579c98d0d3dffedb065ff26909aaf1854af76ef SHA512 27ca1eab6719f5d577938ea7c105fd2aec99fd94d80b8d1beb14f18233ee3290a5c9a3046314c07645306a7967e14d6dff269cc377c0bbac72e309a5d669d181
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
index 4ccfbe6596e7..d99ac1bde4ca 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild
deleted file mode 100644
index 24754c6574ba..000000000000
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to sphinx to include program output"
-HOMEPAGE="https://sphinxcontrib-programoutput.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="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/sphinx-1.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test -v -v || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index d992751fdb84..43c230a52562 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-qthelp-1.0.2.tar.gz 17804 BLAKE2B f3d6a67469c82e2a6e90b75d506ee3faa896d8ec408d60f93f74c8cc4bafb22772f85e36c286a96cecf2d7808338da233910055404969ef311f935173f06f376 SHA512 8fe840e011fabd596194f539d27a502b77ae8a6030ae1a7646b1af9f203d3578b7420ead655297b2a752f0cb0e6803247c7a79b2ccd2d4662ed9f58398947864
-EBUILD sphinxcontrib-qthelp-1.0.2.ebuild 735 BLAKE2B adfb120c377b63128970e40dcc56f760416786c7a0ee9a085b64b755dafe0b40384c033a1682aa7f5eb43ec3a9aba87e2b71295e8856158826cf57efa6672699 SHA512 57e59881c0bcefb5a637c45fc26184343fca550199233a3c3b6e677a7f5072479750f155931b38963f9883e7ca8e711bed7a1a00b9f06430b0453678b5f9be96
+EBUILD sphinxcontrib-qthelp-1.0.2.ebuild 735 BLAKE2B 4dd47997a30ef3ab13d94537306a831b751bbe4ed6c98ea40fff3f50d63915492e16bd033c9d045606d6776b87b5d2c63eba1de1b9a1083f712b1b376d3c6d5a SHA512 a81e5fbf7fb56928ac7afacc206bb4e47ebfb25ec3d82ec87a1604996b2034896b7e28eb36d440041ed58b991bd99d3374bd61d76a705d82207bd2f5ecc97ff2
 MISC metadata.xml 323 BLAKE2B 958abf4a10551f32a30bf4a103bf38f001d827dad8f8b7c0d737cd8d6cd5a1a7bd4bb0de765ef457875bfedc913a9303fbb94d4f8f796dd6114b1c15a3849b3a SHA512 5b1be7c4599df98adaf5c3b08b078cd15c207957c5e8e7025181be66f09cfe3331b0e1c53404c10041612c34e3cb0af388f1b1c34e3e508b609721c617dc89d6
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
index 9a235ce46304..05f0d7463aeb 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 8cbcf9dab401..89a5894a69d7 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-serializinghtml-1.1.3.tar.gz 15799 BLAKE2B 92771e87c61658cadfd6c1b07b7537ddd26866b94efed26af968e92929ddda5ada37cfbebd06a3ac14854a3831715ff67cd6f5401c317bbfbd5bf2d014d7356d SHA512 984d1760c61886408fe16c717aa1daea6591721928291267d519ea9c6eeab65d8a46d018a7c57aa8508ca408c9e919b7094d2580d30141ce7bacf5a18504cb55
-EBUILD sphinxcontrib-serializinghtml-1.1.3.ebuild 748 BLAKE2B 1d0b8496522ed7af1ba3b350d41c523e55981888ee9c0cd960d5127ad5eea51a2f28f12c53f2a224bddf6aa545aaf6925c5a32a9b6f86315ef216693151bc50d SHA512 62fe53a5d936de8e854c97237d28983e76cefd1ad801630466a506d9405c4f8ef0faeee0e0d2eae556d2a80c92e813be6402fcecba3c7251e6d185b698d10d4a
+EBUILD sphinxcontrib-serializinghtml-1.1.3.ebuild 748 BLAKE2B 7b598be56e21f47910f3975be02c665f42305b662632f5fcb20a9e4a94575c7bc3b038fe57b25cb33ccdaffec3a1e204bfdc9e0dd7a474b3808bcbd57f11e951 SHA512 d4ef7021c028a22c8ffc0f8882457c6104e580d9276a398d1c2cb451749ecbf1165c66b18ba0417f0edaa96deb82fb45d9d99a93146b5a06f85628ee4e4d7bcb
 MISC metadata.xml 332 BLAKE2B 899af9aa52c89389d9e459271ba959cef6ef3fc63701e3f0926fcc9bf93c548364cdd2f0b821e167e64ddbd0149d36b75faeaa40abb53bb83d0cab1a8d08247a SHA512 f50027d55de1b3fdc6afc87b99b2f043378cfd2e6993accd208019a84416f7d32824bd0849a18a185db739f0bf77beee794a7b3a7e6430cfd2af71f3c011e235
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
index 898323b3d100..8a7e01514738 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index fed225fd5c40..73aeb7bc8817 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,7 +1,7 @@
 DIST sphinxcontrib-spelling-2.1.2.tar.gz 35411 BLAKE2B 9738e18664fb68f6f8f7aafb626b6712f7c30947681f6c5ed288dd76c2b24245cb4083887330fc05ef4fdc64756245d997797ae36899c2c762489fff13219a21 SHA512 993f371e064e8748eb61faae649fb293b154a35955ff84d86fd041f4e2cc4c6e22c686007a67c3b63b0c50fc01ed226708f27db347e58847a46ca733c997d51f
 DIST sphinxcontrib-spelling-2.3.0.tar.gz 35687 BLAKE2B 9b48f1953616875bd5f0106ab0a01ac22d176b93eca88da7e36804eaf744aaf6e941d3dcb9f905f9bfe54ea51eb5c0d14d954b3def809994e7ba661e09cdb18e SHA512 194023d2c5ba594a264740a2a45ebd90d37fc17fbd3bc8c53fa303581a652c58332f998a159c9c6c58718dd9898c9b4639e98ee114a2ee1e5f2097e545134a1a
 DIST sphinxcontrib-spelling-4.3.0.tar.gz 38316 BLAKE2B 4bfcbfb22c10b5bd181ef5ba7b64815ccaeaa50f01ccff96adab914cfbe6674ce28088e5eb5717b44531565f961b1f159014d235275065070e22d96d08cd4af2 SHA512 0d1575079be7994df905de02d31ad2c9c3af9634a487fbc9c565067fcbef6c36fd4fbd326ccbee4b40b3ff14696ad85a97c68018a956ff3e2f7e1be46bb3a074
-EBUILD sphinxcontrib-spelling-2.1.2.ebuild 1030 BLAKE2B 17b72f45a6a60fb47beb5891bd75cff1882712e30bed88f8c109c189455b5b8f74d79995d169c0d83f5387dd588aa3cbc2f26429eb5eb96ecae9a0e7eedc05c6 SHA512 c82b01f894211965b68e1c9da73ad0b09b622465415175d647ce2113727775a887742401528d3182c09b87f629cffd11befae4b98d117f98dae01f6175a2db97
-EBUILD sphinxcontrib-spelling-2.3.0.ebuild 973 BLAKE2B c9f7b69345a2367be31bd1527eba0c2e96e71f681584eeddd65b4c87dc189c4f5cfdb57e6e7b351bb10b4e81d8ac109e166287e3eecd0a3ae4d9a646fc9cafbe SHA512 3a00a54d44f22027dd15fdaf3a6405eaef877d1d657d9cb9c3f5c089377b7838249ee523113fd9838dedf12a42b69fb5923c4362b881b67b72fc9078970c0ab1
-EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1217 BLAKE2B 8c0800dfedfa4344c5e8d96da8986ce90ef3f40d233298f1f87e278ebe2f55fc873e2bb8464e3cd5458ff2a64031122cc8d175aca75237df58736bcee03fec12 SHA512 ae9a5050b79f434e6b371193b535c1c97592f054d59764e51cd4cb4542a197174148ae49e0eb0a6212f98ef381383cb9bdff455ddb881eb1f1e8f55573a9f7f6
+EBUILD sphinxcontrib-spelling-2.1.2.ebuild 1026 BLAKE2B ed5c6bf5f9ab282fdd9daec124fa409e580d9ba3560454ad46907ab70da5e4b024c739a7f8ef050ab7dd8c7306f663bd6d008edd3aec3d126d586a024a7fcd21 SHA512 f3087c09c2a5f50a9d2939f8493bc481cafb5eca8159c53ba4b17373c05c25edadd2082cb5a7319d7ae10bdd25717fa72ba7c49864b3e632d6acf9cf6f7d22bf
+EBUILD sphinxcontrib-spelling-2.3.0.ebuild 969 BLAKE2B 8757945ada857ff4e85e10cce018a4035c2be51e77aad0db69d057a57e9a3bd950d64ea9bd84346ee8ad99d5823e5b5a58abb2281c32614f095606396bff2093 SHA512 b40bb02553175c73a0753baf971de369030326de87e4bccbeff1cae53d170a20dde71085af1b29731ab6180c7cc70a0dd1a71abbaaad3d3003e252c39eaa460c
+EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1217 BLAKE2B e3a688cf9aaee855106e921e02634eacfd0c8962a0ce00076dc1c4fd5d43c28143bc98bd20e815c5e012135c4f307353c491d50f886c2909ca861fd3c36d1b1d SHA512 2be456b5924a9c8e0ac1d7d215d2551dd655a145f97043213d49fb1c54bbf8b1d71917afafaa7e0850a19889b3cdbcad7778785180e41403a935175733c1a7c7
 MISC metadata.xml 378 BLAKE2B 238ea1508c65e2b5c05360aafab23da6f6f25693c677232862302d372dcfbab0530ad8964d6e393935193b5f9341f697de28dc2a3634c7b726a7f10762df8d73 SHA512 b5b909cfff41351a21e2fcfda9a9c022d600943038676ba63cfb525cef2d7b85c78b61bc58e33965f14a0d559f74cfef1f943058a4bc7c70cac2be34cda8dceb
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
index 56af8616c682..fa48462ee01e 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild
index e35de0dc92aa..004e5b1cafea 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
index 42f55e34ddd6..91a2e0dbb8d5 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 59c4ed27a90b..7f07d4e65cda 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
-EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1175 BLAKE2B 4bc5c8d8e8eeec7094a60f503d5f96ec2ad1e83045bda8cb40aad8e2e12f811e382130029328a44b84ce9ae4c3276467b50b4f62b0781744a0145e636e5721f7 SHA512 e7d2be67c26fe21bba7f9068ea13fe7400f0817d3e1983f25f0cf7d7e654f9311f9b1d0e4e597dd1ae0d4d7020623707c65bbbe24142e6cc705ef2439bfeec95
+EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1172 BLAKE2B ed9b847bd4cdff2ecabf8a458b4ee3098a40afc76d4471bf0be59ff147885540c01fd97fcbb4c0344bf6b153588c03fcd38291f9413d44a73e017077dc370ebe SHA512 53b4b46715e362afd0cddb160fbebe170374bcbe15ebd75108338fdb32ae7929aeacf41c13b24f26a7627d212f4e032f15a70430a57a03ffc16d2dfe8aa7f019
 MISC metadata.xml 588 BLAKE2B a7a777dd8df5b09707041ace4566bf80cee826c98aedc1e13b7dd48ddce2201aeaa79f2091ac549a66da2a04449f3ba69c243c8b1a44e0f0b661240b7dc2fbe6 SHA512 eeab14e556d91f99f5bff45a490eaecf47bcab9e295c992b817c94359fe87483947f43986bdf4633257b1ff69ffffd7b2f250e411e728f68b39a65f5b53a29bf
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
index 61359df3df8a..809d6ffa3faa 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxtogithub/Manifest b/dev-python/sphinxtogithub/Manifest
index 0324f937441e..e9db16ff0764 100644
--- a/dev-python/sphinxtogithub/Manifest
+++ b/dev-python/sphinxtogithub/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxtogithub-1.1.0.tar.gz 11103 BLAKE2B 58cf7209da147df161aaf447131a408a9f2a9e9b8673e95a11fd2f8f6e11ec71d2904a2cd077c460088a6889515461a419627ff08562eda4101148c9f0118fd4 SHA512 190c57535c58f86a84a3e80bde61f99d35b8d3826d18d77d9eaf857be853c84b35e49cbb517fb13d8993934757892cbda4a820ecd24f3e5ff2908e814e53d664
-EBUILD sphinxtogithub-1.1.0.ebuild 769 BLAKE2B 629e8b808058b15de4aed5ed38f6e6bac227b9546a6b46ef246b1438af52f3d31143b6cfba6d914db90caf256f3fffc41d3cad71672ca056ef3a2ea1c5310434 SHA512 657ec05028781ff1c460e9ae0913f59562bcc6ccfaf02dd587284e5231d6bebc17b82eb5101cdc3608a22ef4437bfb3ab695d0cd8911db1c1259c8a634c15e44
+EBUILD sphinxtogithub-1.1.0.ebuild 761 BLAKE2B aac2f2781c5f6e09633d475be7702e359ffc623a1d9b104bfebe1bb913684f4ac1f4800f2582b7cf8e76cb4eb9d4426880581378fad5740ffce0ed88db5489ea SHA512 97ba7caf963fc7bf1e7023c4d5cca6688d46bff1111368a54202b583311b92aebcb198eaf28236286278590471336e8dcce0d2a097572ef5ff20f2d26c880325
 MISC metadata.xml 398 BLAKE2B a668d73ec1bf324753827d3542d37faf1fda5516f0fa13774ede87ffcecc9f08ca75f248f036a218a75036fabd1eaef2bddb58890079e0f7d9a046605d777332 SHA512 e15d63d81faf57bee3099a25418ec787c0e89b68e12a217d1748156f43598b56b5f870916c14728bf3a8749f68cb9cc8f3c6c8041639407642bad9bf7cea6d86
diff --git a/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild b/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
index 30fe193c91a1..db9d06f4ba3c 100644
--- a/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
+++ b/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index d1b1b2881ad6..6db6f42e9af3 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,5 +1,7 @@
 DIST spyder-kernels-0.2.4.tar.gz 35750 BLAKE2B 85cc767dc1ab8e071a6c08993b3d8d383e7b9bcf85be704fcd1bc3b321ff7ec532a7ecbb6a30dc2bce2fa7fd8d74812fae07dea5e10eff6309b3ca13fb16e6d5 SHA512 d5b8af3e0b8c5af9e29864912ecd27ee27a605938f36c0a7681167fb782e4b7fb79d5ffb4ae9b77fb82676301be664a1e1dd64f2f206fee2bf047f0ef9e05941
 DIST spyder-kernels-1.0.1.tar.gz 35936 BLAKE2B d3e572ba04823869bf8a602e96195a95c39da3c0e29d6bf17eeb305e21d60d72fb8c6bda9f111558468655759f1319e2d69d12b7a3c4011c18d22570d394d64e SHA512 05a4124e44cf1ba1d56927295dc9a2fea315ffe107d0f835a36d29b0727c2d7abe35e41974d62ece23b2d5ef78baa18c1d29910c0359b6fea900216e8f093d97
-EBUILD spyder-kernels-0.2.4.ebuild 594 BLAKE2B ff85a43d4af5b3c8e2d910f4a963c206815a2da05adc29130fa3ec53706c780b53be66fd25aaa69838527d84ef3de2a4476c18cceb00e6c8018901f6d5e60993 SHA512 3019b752e33820b8dd5d46a3cd6a0907dd10a885f956ef57f2a9470d9237a05d9f704d7b198a6af43b4a19c01b0239b0e3a1394660e50540048540e1f827b8a7
-EBUILD spyder-kernels-1.0.1.ebuild 594 BLAKE2B ff85a43d4af5b3c8e2d910f4a963c206815a2da05adc29130fa3ec53706c780b53be66fd25aaa69838527d84ef3de2a4476c18cceb00e6c8018901f6d5e60993 SHA512 3019b752e33820b8dd5d46a3cd6a0907dd10a885f956ef57f2a9470d9237a05d9f704d7b198a6af43b4a19c01b0239b0e3a1394660e50540048540e1f827b8a7
-MISC metadata.xml 400 BLAKE2B be04b011bd69c34b161a14237cfc5be40028ead99bdb657f5ed565ba33eca7817e9d0199a4eb13df1c61e87d75ff357483ed339623ba5629815e4c8660fa948d SHA512 a1c77c20cf6330059824f513b447d97b08a46ce2a99d2930193b0640428ac7543fc57689fd375968825d5452fbf055ced0b01fa6c797966b35976c4386f75e8d
+DIST spyder-kernels-1.8.1.tar.gz 52588 BLAKE2B 50cdc515da8b489d4cf3027e85a5c0e65f6ca715244eeffd4b5c8000f81a2eb8c34e64f221ff02d1a613b48ae0aaf8fbd6aa51ee78bf3f590bf3b70d786091b0 SHA512 c2bdbe862450a4c881cedfbdeb7c8a117b3d20a0faa593439308e9f52ed4d4576b32151f8edb0b1df460e538894e31971dc7dcd792b4c999b0ef9dedee654d6c
+EBUILD spyder-kernels-0.2.4.ebuild 585 BLAKE2B 71f1f3ed4344613fa7416a49d191de416bf4f968624067eedd0d1cea0c268085112dd82ef38a7b0f524dfd3c584f1e9137bf247b50a9e23d01d631f1c0beb09b SHA512 4759fa11afad501ea96af17933695c460de7b05403a2298dbc0bf7bdfe2a24fbfa443a1cae27b4f44eaefdb9b78e42f0564f6f4cf2f578cd0ece0baf1faab3e8
+EBUILD spyder-kernels-1.0.1.ebuild 585 BLAKE2B 71f1f3ed4344613fa7416a49d191de416bf4f968624067eedd0d1cea0c268085112dd82ef38a7b0f524dfd3c584f1e9137bf247b50a9e23d01d631f1c0beb09b SHA512 4759fa11afad501ea96af17933695c460de7b05403a2298dbc0bf7bdfe2a24fbfa443a1cae27b4f44eaefdb9b78e42f0564f6f4cf2f578cd0ece0baf1faab3e8
+EBUILD spyder-kernels-1.8.1.ebuild 661 BLAKE2B 4bfc86496eba4ae9bb6ad27857f4018929545edff21a3c7b9e9b7e72043ccf9521686d4cf9b80fb627e44ce7e8cec5d59273dec6329b08a09a67bd5dc7a96fea SHA512 c7c44e2c28fcc02c53548a6e00f1426d5a00820fe913eb1d3ade08e2e182ffb92813163076bbb82de7ed2b4df51d2f0b397127a963fb65cd53f68aeaba8395d9
+MISC metadata.xml 648 BLAKE2B 571d097dacb5bff623fac2098059d24dfe73241f2dd75f77a451859479779b945d478c13e22f4f69716de473437576bc6db870a01002a66e046d5219ab052af6 SHA512 13b2c212ea44acd0a21b30386e84f6ca2b0fa49e9ca5bcfb952d951215abd5bce5d14441cad0bfba0b39685c8e5f5e2fe1a1659101f48cb6787d17a8403231b9
diff --git a/dev-python/spyder-kernels/metadata.xml b/dev-python/spyder-kernels/metadata.xml
index d72ada7efcf5..d6e17923787d 100644
--- a/dev-python/spyder-kernels/metadata.xml
+++ b/dev-python/spyder-kernels/metadata.xml
@@ -9,4 +9,12 @@
     <remote-id type="pypi">spyder-kernels</remote-id>
     <remote-id type="github">spyder-ide/spyder-kernels</remote-id>
   </upstream>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild b/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild
index d5d3915ad563..9d258220b017 100644
--- a/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild
index d5d3915ad563..9d258220b017 100644
--- a/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.8.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.8.1.ebuild
new file mode 100644
index 000000000000..cc6a13af51d7
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.8.1.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="
+	https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
+		>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+		dev-python/pyzmq[${PYTHON_USEDEP}]
+		dev-python/wurlitzer[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 9d7c838af9e4..96429eb62226 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -8,9 +8,9 @@ DIST spyder-3.2.8.tar.gz 3414627 BLAKE2B 95f85f719eba20eb9fed5183cfac582b040abc9
 DIST spyder-3.3.0.tar.gz 2782654 BLAKE2B e85ef52109c723d6b1b011f0e81ab3a46d3e0e6ba72fd34a1eda9ed650c9e03532e8fd72e05365367f62035a6f03d6ec32d35314c54438bf639070c7bebfb4d6 SHA512 53a2b438afe245092eda4d202d2453b5b93d6682aafcdb00bf251ddcdb30cee2d81d8adadbe23fa36f64fa5f917b327690cb8f9e2cf5c0da2841b5eda648a26f
 DIST spyder-3.3.1.tar.gz 2786730 BLAKE2B d906b5750cb620db41aec514a64d132b9ee5a992047828faffe11af5abd22d0cec7b876dfe79c6d378804373e8db5c661214f5730833e7599bf13b80d4dc16d6 SHA512 91d648a2717b5d5386115ba800fdd98884e609b213007dbaa09c7d16335f1b9ec3d0bc6b32d1677db8c2704e990e70eaa04d6d1efc800008cddfa511105e9c68
 DIST spyder-4.0.0b1.tar.gz 2986758 BLAKE2B 7fa918a569ed26d1d71ea7bce725f1b7d5db54badf3fb7bad1265d93f2ebdf25b1246acefb4f8517a6f34968bf8f12331958afcf72fc3c162e0d06d9dc4d4c72 SHA512 5751434b7ffac4d1e0c535f8a842656c3a306ed3d8a275a06a0eb57d3cd9bb36d01341723159292cba8616fcadc7157387fdb334b2ab0efbc1bb6b920102015a
-EBUILD spyder-3.2.4.ebuild 1664 BLAKE2B 6512ef15b4a1079e0d951e0bc42cdbc395a8e35bb61eb9b2770f95a31cc05ee38c9a63c4fd883f79edd09ddd657253875e29a0335e1b949ff919eb68a5ed7557 SHA512 6a6b98bfbff4c1a58873b448c6ef1e81bb61a7a51bbe4bff6ad797fe26540cba249e8f9b4f94413c3d58055ea350cd600ae7188ccb837c1cf13c87797a2ab151
-EBUILD spyder-3.2.8.ebuild 2522 BLAKE2B 0c55749cf50021b3e768b3fadd303ff636bd64929e194ef8bc44ef5c6cb180555eb162f8343f165c5c6d08b11f9b12d7ff53c3f73b48b11a003a0f951894a9e7 SHA512 6966487fac855273372f67abcba7f5dba6a4ce1be3e184f48a264f275a6dadacdb98e36fe0208f590d2f3d5c946eca8ccdbf260aaa8c3502caadff0f3cdb194c
-EBUILD spyder-3.3.0.ebuild 2404 BLAKE2B c4dd48a6f04c7b460a76190c59a4ae4d2818f2a21879f63a83e6617de3a22355e56bca3b7f076258559d6c4a4fe3bb1633ca23df1499a4fb8d452d54ada41dc8 SHA512 83fc45278de3c4351da10380dbfc2ae17415862f1433346dd1492988c4ff7374286818700f3116baf5ca710d6040ca5204f71c5ac4c09efcf3926e7e6cb65f3b
-EBUILD spyder-3.3.1.ebuild 2404 BLAKE2B c4dd48a6f04c7b460a76190c59a4ae4d2818f2a21879f63a83e6617de3a22355e56bca3b7f076258559d6c4a4fe3bb1633ca23df1499a4fb8d452d54ada41dc8 SHA512 83fc45278de3c4351da10380dbfc2ae17415862f1433346dd1492988c4ff7374286818700f3116baf5ca710d6040ca5204f71c5ac4c09efcf3926e7e6cb65f3b
-EBUILD spyder-4.0.0_beta1.ebuild 2459 BLAKE2B 8d689c946b5b7c8cee043d1c1452fd2b0c17247bf6ea959fd5a62304f7cf59f1c2dc47ec68fed87ce35152a9bd52551d3acbeeced6a7bd30b27e7e98c5103fcd SHA512 a7dd13b033a8eb7e7464a7253f3f78933349c43e28041aa0bb4ab0cd07aeb851d247c3849474423beb88d172ba4dea5791b7fe22056ea73378fcba31fee2e4ee
+EBUILD spyder-3.2.4.ebuild 1658 BLAKE2B 555e0c53bfb8a5e036d4b6a243c82c724e9db332cc619702d430402140eb557d5a7d5569b8d57ec55634d50455d0167599f636f44e4efabcebc5e77b8ef52f65 SHA512 6078fb492ebada12f02fb7fde976f71e630a5170e7b2d857ab670ce975ea56033c1fbd3506ae9e61ac154273e45d435561be8fd9fed7129733a474bd64e9068e
+EBUILD spyder-3.2.8.ebuild 2516 BLAKE2B e08a262255f8833e0e59733fdccd7c931ce570859c6045120b90cfa6f67e6ffdae463dee54397f565fca2efd8cbb6b8797f8219c3e5039983d69ff4fc62999e7 SHA512 a8cc91c90aa9a2cd0a3289b42bc7133b4010fe26cc93560cff7240d5d2f58f534c552c7f7602dfc6da09b42a96d2fb571d578349b61f484ca86fc943ebf71cdc
+EBUILD spyder-3.3.0.ebuild 2398 BLAKE2B ab72c384cd51bdbadb87bf96e3be91088f7aa1d96ff1e74499d980326d47cf57b3e5284fb9c2771aad843c25edf7e83806beb06788e80ec3dc9a9b894b059c69 SHA512 b4c7922fc340e05aad0b99ddcdc08218797f664bca6e9a54b6dc398f47d53107548249e83a4b957ebb6a3918e2be6a706fd66ae10c4de9114b7ba0ee68346378
+EBUILD spyder-3.3.1.ebuild 2398 BLAKE2B ab72c384cd51bdbadb87bf96e3be91088f7aa1d96ff1e74499d980326d47cf57b3e5284fb9c2771aad843c25edf7e83806beb06788e80ec3dc9a9b894b059c69 SHA512 b4c7922fc340e05aad0b99ddcdc08218797f664bca6e9a54b6dc398f47d53107548249e83a4b957ebb6a3918e2be6a706fd66ae10c4de9114b7ba0ee68346378
+EBUILD spyder-4.0.0_beta1.ebuild 2453 BLAKE2B ea5096e533b650d279c803e083cc26716378d9e59434e75a51c310116d3faf7e3040467a227bb8c4baff532a7ce2c946ae603345da88c1f78adca9ef5e14f5ac SHA512 a3cee247168990dbf67f3f9a2c8d7f5cf0e9e10d16e6ebb91cd178ac044ed2e3357195462cd08af374ad68e9319e401dfc7616934f87836273630722ecd53617
 MISC metadata.xml 1371 BLAKE2B 1b79aa84224554c57dc9ba4cfb888a9d18ed1b5fc99b6912de2603ac9c7866a4abb0a43a8a86df516b2b5ef3c4a0cdb18c20ea648e59002635affbdc813e2589 SHA512 8af58f099e6a7d97bd266c2d09b44ef51ec71a3ae51d61caf49968d6ecb8d830e4003171080011d390e9a27fd3010f95f22e9555a702f26e6635a4e1e02db537
diff --git a/dev-python/spyder/spyder-3.2.4.ebuild b/dev-python/spyder/spyder-3.2.4.ebuild
index c5b0a43c0a4f..c3313327ca4b 100644
--- a/dev-python/spyder/spyder-3.2.4.ebuild
+++ b/dev-python/spyder/spyder-3.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/spyder/spyder-3.2.8.ebuild b/dev-python/spyder/spyder-3.2.8.ebuild
index 63adb0c3a346..21993629d5f4 100644
--- a/dev-python/spyder/spyder-3.2.8.ebuild
+++ b/dev-python/spyder/spyder-3.2.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1 xdg-utils
 
diff --git a/dev-python/spyder/spyder-3.3.0.ebuild b/dev-python/spyder/spyder-3.3.0.ebuild
index 5a6d082fb34f..300204dd1e12 100644
--- a/dev-python/spyder/spyder-3.3.0.ebuild
+++ b/dev-python/spyder/spyder-3.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1 xdg-utils
 
diff --git a/dev-python/spyder/spyder-3.3.1.ebuild b/dev-python/spyder/spyder-3.3.1.ebuild
index 5a6d082fb34f..300204dd1e12 100644
--- a/dev-python/spyder/spyder-3.3.1.ebuild
+++ b/dev-python/spyder/spyder-3.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1 xdg-utils
 
diff --git a/dev-python/spyder/spyder-4.0.0_beta1.ebuild b/dev-python/spyder/spyder-4.0.0_beta1.ebuild
index 31503c82555b..7800f95826ff 100644
--- a/dev-python/spyder/spyder-4.0.0_beta1.ebuild
+++ b/dev-python/spyder/spyder-4.0.0_beta1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1 xdg-utils
 MY_P=${P/_beta/b}
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index e62d610dbbc0..6d97aa08dded 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -3,9 +3,9 @@ DIST sqlalchemy-migrate-0.11.0.tar.gz 128299 BLAKE2B 1b13890aa38861cbcb6ff57b116
 DIST sqlalchemy-migrate-0.12.0.tar.gz 128499 BLAKE2B 352b34f0c9490019748183dfd9c4b7e0064fece007de9ea46da88bcb7187b55ae3b502b45c919aac0d89586e4b9a19955be2df3ef81dc8b8328a0e9da7177e46 SHA512 bbab28a67afadfeb33a0a3c303c7e623de051923fef7c30b1896cb2f34fe325036c3730d93ad5f88ffb35aff25de22e1c770dff68dedd6acfbc4027e127857fb
 DIST sqlalchemy-migrate-0.7.2.tar.gz 105862 BLAKE2B decba0b4007143c2e98ad0b36880bd92ad6f771cf6b08ce4472cd2c0361658f449cfecdac2c8d5b12b1df8a00940dbdf714ee7d82cd9fb7f429187ec899eb19a SHA512 31c56da755ccccdc0aa5eacddcb097a4bd6431ab72a5b964689b0943b50ae4b23e034ae84d8dad4707d4cf9bea5b538e015ff755318685cc17dd82497a4cb4a9
 DIST sqlalchemy-migrate-0.9.2.tar.gz 124175 BLAKE2B 9c4edbec78074ffcc4be800c952b7c38a919ffd4dd829da34c5f4b3b3b06d8b31bb703e71dd43555bfd68cb7e82bcfbb632a362f9382fa61890a27b1f18c0c22 SHA512 25b218ae97e9a99ad126e4185621bff04da2e9d47d2e47620965974a0b865a9dad161c4d284aaf316f01f0241743d11dd6578942ad6673f2843476fbeaaa4688
-EBUILD sqlalchemy-migrate-0.11.0-r1.ebuild 1400 BLAKE2B 059811b0c64097ebb1b0e898fbcc25256e26f1f88c1fdaa6030ef8252ae1f3115376698e2fd73890d4498be2fb2fc7875bf986893b677fecc40eced6186cd49c SHA512 f6a3c3c30b3c64298c50c2e799d7ff150aa01f5b0af1968f93cf6c162a64665678d2f1d1448488b13af43ed184b8fd9eebef332d3477ab1b56d1e47a9d95cd06
-EBUILD sqlalchemy-migrate-0.11.0.ebuild 1593 BLAKE2B aa7258eaf0e0640a994c7941f954c64348586d909f7f0d61271631e455717d47248086bd0bfb7cea151e301d6126f4a3b897a1ad051e29e3f18d0e5a9f0c97af SHA512 f7c82bd114f0f55511a5c43718749dc4034e2f5c39e4c6ae2bc3d0f764aa6e6a25dbc2676f8ccb88a2d6bad3017caa3cd287c52691971e6e6aa399fa32a2d157
-EBUILD sqlalchemy-migrate-0.12.0.ebuild 1378 BLAKE2B 22af840cdda450f66e06c94e45ca964aedc7901f73cbc9819844a3a7d75d00fbaca35d0bcc071bd0b15934a6536fb453b5b98a0a919151cf4c7d28cd98485567 SHA512 6495c64340cb3053fb207d02b3c5da053863f16aca7111fe009dc4f9ef6a0ff29535ebb3e4673190951170bd176ec8f5796a8db151e790530c0b60ac1e2dc6b9
+EBUILD sqlalchemy-migrate-0.11.0-r1.ebuild 1396 BLAKE2B 5a299df0d3fe4ed8d5aaff5a11d8f2332df80a86d2d7349a55b324c8e0e98abbf967e096e37c31586c6b48e1aeb52a7f0228a5b992eaa5b37efd98d059522921 SHA512 285b61e407f29a7e9db09bb6820a2c95acaf625b1a6dd534ef7f24c5cf77ed331d2294b16403ebc13b05c72e16865a4fcb5b0b6d73c3aa454dab54f63a702c5d
+EBUILD sqlalchemy-migrate-0.11.0.ebuild 1589 BLAKE2B 6b7cf6681cea4e77db358ad02cab65f97d7926894887481defd64361fbb8bbbdefeb3fe887b187ac2125b249d69ceb71201169b5383c35082c959813b787f0c0 SHA512 e7d93ce3a7b29030e61b5baf0287f168c133500051686060ada011ba23b30a71c28f4fe02851906dbc91df518fd17c4a4ccb8f9e1fc20a9cc40adae7d539af1e
+EBUILD sqlalchemy-migrate-0.12.0.ebuild 1374 BLAKE2B a784f9928b506f1cb29885b671711b89ce192821172c5ebcbeda340f2342028c0dc3e996aceb0d77fa95ab56a0b56ab55e4e6b950f1fd59935584bc2a1d1303a SHA512 9c8dbaef670778aa14d0798f1b644d6a4eb3259e6097eca7cbcf4c199b9298757ecfa4a24faed5e0ffe704533782ae35b8e2e902519bc92503c4acc3c07926d3
 EBUILD sqlalchemy-migrate-0.7.2-r1.ebuild 703 BLAKE2B 7e9385f0fb1dc023875e821e8a80bc4c64986e5077959a85c6f564a60509275d75418549f94b7187337a5661bb4d45dfbe2395916cc267c8c7529117eb2f32bc SHA512 34de48bf99f44bc001afc6dccec0fd01832ac3f8175e518a6ff6c370f48b8803e337dd5d1dc3cd4c8159702b2dc6300a58b99d255cd1d2d0c664782f8366bd13
 EBUILD sqlalchemy-migrate-0.9.2.ebuild 845 BLAKE2B 95799089253a2bb9403b41c1955aa285f007d771505115af6fb15f7111dd8977de5d4d87782418c7f0a0b8037df1615e90fd1358704115a9b90f954f3de20448 SHA512 889dd37145600cd04e5f701bb88c15e80fd6bed35bfd43a0ec8351798028968c0ddfe13e2a1f8128c9b4840afc2aed7bd023496e6a60d3bc3fa68a036bbf56f1
 MISC metadata.xml 331 BLAKE2B 0f9105a458c3ae2b81bc9d2a6697d5b3ca8f249a8111564d34c49850d9017f21f2b85e1d0f1f7e458546f1b28a1d90e5e5c33286e78b77695598ac85b7c9d53f SHA512 6c683c14c1fe2acf94b25f6d17cd02d3d74db9259df9d241b3a2efe9abab2076f04a70e00327a06a3d8411244323a3061cfd1bd82d59eaec8b56682e79e41fc0
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
index 4687b6bc6238..7ac37e2373d9 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
index 496cd9854974..816b77f663cf 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
index fc9c7059b29e..e4ae122b728d 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sqlalchemy-rqlite/Manifest b/dev-python/sqlalchemy-rqlite/Manifest
index 69dcba8b69d6..c76ac7ae2765 100644
--- a/dev-python/sqlalchemy-rqlite/Manifest
+++ b/dev-python/sqlalchemy-rqlite/Manifest
@@ -1,4 +1,4 @@
 DIST sqlalchemy-rqlite-1.0.tar.gz 3910 BLAKE2B c2a07ba91812ea2223bdea4e715b364a96b66057f2ed1c7bc0d373860880f3e0d7188ea8d513b127d8c7138695b9703b4a2ed5f6a4a001a8b2ae68020189a058 SHA512 794d0a1d80803f624af4b530efe277947d3a8fa7001df2177de6bdb34ffc9fc76e22c8b73caad7cda02429ddc251fdcbdd8e95ea286a6540054efb28ee53d2bb
-EBUILD sqlalchemy-rqlite-1.0.ebuild 1054 BLAKE2B e5a4cfd22ce88cdfe7a746754706cd9849f8010ae556378a80075cb88cf506a3c166d2333113649647a60866f047f1b1d26ae66a80e0af8a70268ec373e089b7 SHA512 eba43ffc03421550c93144030467d7a6e1a35442e3b4a4a7743f7188c4f45da0213ad8db745efdc5bd898e0abba9fa487178002567dfdec42054e9bc592dd6b4
-EBUILD sqlalchemy-rqlite-9999.ebuild 974 BLAKE2B 4890ecce0de2fd5bce2a3269d0f46fe4a28beeec531573fb8f732b86ffd28c4a2e541ce99ea72dba7178d164322c69de9c677fd22e0a3ae29af8f45f6b952f60 SHA512 4f4e652a7428b9e83d91c39d1f09ba8493ef2a835cb64804d1b3685f8d73a57213b26959246ac90b37883a394f4fff68526b094b44935bb1766693cd18e8b39a
+EBUILD sqlalchemy-rqlite-1.0.ebuild 1044 BLAKE2B 9f69d8d734ecca2e86760f782a6124b1b5c831aaf4be5de25ca60b0701aaa6b4332fe261ae3d36b43e8a1335a97c6b9631a2536ce56031bee69bcdd565f68a98 SHA512 2cf15554358756245129bddca0b922492c89d6a88dd6276d578763833ceb847b5752fa0a010a34e240eb40ac34b29b1af98e8ff83adda722467c9b1e8b58fdca
+EBUILD sqlalchemy-rqlite-9999.ebuild 964 BLAKE2B dbc174487c58499974c6be32a281ac8c5c9d5d1579545d701500bb062d6af846ca1623679a50d80b4df29309c8914ad1aafbc4a48c6d484ef9599f9e6d7cd76f SHA512 1ba4e29ff0a8b0537a54a06b6d715c9eec1e5e4552cc7d47bdc47b36233bcf3e24d68effbe1601f8366ca9119176035649372ee8ca96d951a1f92b51b43c563f
 MISC metadata.xml 307 BLAKE2B 29ea763c455895cfa0961f68cb2933a3354eb233efa9bf18398146aee9a4caf8a50d53dd4542d76e3cd5cd2c0b412ad435cb377f27559209df3e92438c5c712d SHA512 ed97acffcf63e1d7d8ec644d8e050848645f93d77b2114e11e49fc841cdc35f7e2a5be4a1fedc235b1ceb4bbf14a03db47d6aa805b48537acd164357638582d9
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
index 7060d4ab3036..6a9c5db39ea2 100644
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
index 65fd04d1333f..8e6f85629134 100644
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 9e84ee7451f7..abf0588ca363 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -5,8 +5,8 @@ DIST SQLAlchemy-1.3.11.tar.gz 6007784 BLAKE2B c889ea28ae08fcb83d338ab01a64533142
 DIST SQLAlchemy-1.3.3.tar.gz 5864870 BLAKE2B d109e0daf0afdeaba946c4b18d14428c108ff15041876c9a35cf8e5783f9b9a1896e69760b249c53af35e4575e66f4b59c855b4a244d7f6569fadfb52c5a400d SHA512 f8e0f580ba5cc7eaed985e5a3af8cdcc2dddddcd64bdf02b247242eeab542b5666a93d46166b5edb4b28af3b89df44bccfa92d5bf94cc0e173dbcd369ae6487c
 DIST SQLAlchemy-1.3.4.tar.gz 5877278 BLAKE2B 1200da89ce6ad077cc93c58a4e41f856a2222618b3570badf3bd8543d70659e0313e4add0ef779e98654dbd60f8445ae6839830ac15e72d9c0fa259eac328251 SHA512 6f29aeeceafcd996bbfc781b79dcbe0bbc681f1214cdab2d52b140bbae8492a633defa97dcc720db7a6d423b062834b0805e965e6183f88f99648a8f8f8a73dd
 EBUILD sqlalchemy-0.7.10.ebuild 1594 BLAKE2B a17f6b8adedf40005bfdc2f3e39601083cd16e29d84c9f73332427e51d9ba38516b3f2952b66ec6dc8ea7ef59cec8569860400b04ad6217b15ecdb5878714443 SHA512 c723bcf5317afbf83fea22e43d96ceebeb25fac6d8d93642e63f2890743441fe55901e739db15b7f8457e1d9688e72ac04823ff64f3539b9768bf7c13c2b7324
-EBUILD sqlalchemy-1.2.18.ebuild 1806 BLAKE2B a75cce085738a205ac5c6bae25be512294d60b2f191e1ee17090527f32e010cf70e7e32f43d74570d77458b61363df58bbfc42042c85d11ee23548d3c2f57b50 SHA512 a62d28d62433d690e4720e6a9caf1b113bf747c4a24090f025fcf6eded5b7a147d8ee694d6c0b144ae2e8a9e918fb45c3a6f305a8082ab65285ddca83cb75986
-EBUILD sqlalchemy-1.3.11.ebuild 1535 BLAKE2B 517287ec22064efe23e200e30ea3144b75f1c87d9f8271b615ee2e94b6bfca28705317580f9e78dd45a4b9b97141461835ae6c9c223f06ea236b0b10f1958d04 SHA512 e8917dbbffb1eb9ff0252e2ff7f3777be5fd260c70aa4802ab7c150bbbfe432412db1e088d40297973cfcdbf3e14d1067fee312803d93855802323962b8382c6
-EBUILD sqlalchemy-1.3.3.ebuild 1639 BLAKE2B ed51ef5986e1eb6065dcb1a8f69deb3d00f5e7fd6fc64df5614c3c9f2d27b61cef4da6d3d9144e4216f8bfc244f630cb8d0c410b07656ea5158055338afbcbcd SHA512 153d76c257ebca17bb65bed1a69aa2a9d1e3a3a46886975daebf75b698cfeffe8a7a5f51371b395975f09039d919959590d7c9c056e268276367f79f9fff9d72
-EBUILD sqlalchemy-1.3.4.ebuild 1651 BLAKE2B 241952c9aebab9c6ed94722f841fcb75d2b50e62252c39bd1b106465d32461f884d48b7666e4910d37a89417949e8783b8eb2935ed19e49c5f47d961c50d4443 SHA512 2df18cd078dfa10a5a36042bea6a6f94984e1bd92faf78861e212c20f98b346142c2140043a75d285d55e4ecb39d76036c0c102b5134fd015f5a954392aed05a
+EBUILD sqlalchemy-1.2.18.ebuild 1801 BLAKE2B 801345828c76e6352b384b8795c269f7a9c43465c115774c424bf22238493badb1917d458394accb8a3fb68130b472c0e8c5a5dc9ae18d4b3d803ed9fcf9309e SHA512 975662153ec6bbb3dd6ad0aa56e0cda5cd6a364211d884785f78a0f1cbd784c1e820ccec177239dca1f5ae2399b3551daf10881b61a574a15ff2dd8387c44a50
+EBUILD sqlalchemy-1.3.11.ebuild 1530 BLAKE2B ab1d2b2f0288d1da6a71ae6038fca40dba1242093a298fc175d186e0dd45d3eb2763e0ee607d7eaf694511c07e6a302cf903b0007604c9a21caad679da9f438c SHA512 03c98c853d19f2c37126622ba48e210cbb6989caffeb4d816f63b15bdfa9edb0a90c5bb1140cbaa00429c8c4ce8567504fe2a969d0182855b97ff2ef55d200d6
+EBUILD sqlalchemy-1.3.3.ebuild 1634 BLAKE2B a5830c333ac61c9a5d441735b4609641168ffd201ecba2c4fae319b0e5837d6144652d4b9a82e31b744acc5f1e45fe1d5ebb21583722f050fa1d0576294d3bf0 SHA512 43c09b213adf2b149f59836f2b1d0deffc3649a70bcc583e8f74973d78e8df3cf66cbea94cd10cf9438d1a86ac52038ac5a1e4cc463cf6f396ea5a47c91bf80f
+EBUILD sqlalchemy-1.3.4.ebuild 1646 BLAKE2B b37d8915694008971306941eb64c51423dc45493c2e9a6b66aef5036b5c25d011a3d04736c8abbde22c4654aabd3c6156ff51b32c4c010cb2c9182c65d304e96 SHA512 88623532cd2609a83fca57a0f583be9c1e3e3a4a721834f7bd14f2f2174942d75f4e32d40fd128594565bde44b45ab760ed5a5b97d5b3a50ccc9f9a9391036ec
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild
index 02f3f4cba2a5..d8c4aad2c978 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 eutils flag-o-matic
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
index c616f812e76b..838ac1c7939c 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 eutils flag-o-matic
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
index 1585d6c5e281..ed73e343a0d0 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 eutils flag-o-matic
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
index 0759f412b978..33bf1df96d82 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 eutils flag-o-matic
diff --git a/dev-python/sqlitecachec/Manifest b/dev-python/sqlitecachec/Manifest
deleted file mode 100644
index 7dd68f20c56e..000000000000
--- a/dev-python/sqlitecachec/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yum-metadata-parser-1.1.4.tar.gz 16469 BLAKE2B 963db29d69573fe58005fa2fda654a3d12652566b49acd11de3359c50c224fcef268c110881c572c070cec0f61ccdb959c89d078104f5f7283e67c2aab96cfc1 SHA512 51c1c3652171713a6decc165a4f8c4ddb5641f2ad3ee9b84fba3514d5c9afbb0c7ebc7dbb26156194b58c29227ef7b8d40ad760082da1c568254bcbee129d68c
-EBUILD sqlitecachec-1.1.4-r1.ebuild 688 BLAKE2B d2066c911102f22e335c0e8435acf31955ad0cb518172e9bb907b9f8442fffebb8075be780fc81cc1e9baff5b9df6b0c9da8094503631ffc1dc4d3d819fb7d8a SHA512 4c15fe13a2e06c79b78339c21885e5f089cf3af0bf3483818adfab977585ee562cad7021bd396ef321bd682474f7843972f71ba6a78ded8b9d6bb6aa682031e9
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/sqlitecachec/metadata.xml b/dev-python/sqlitecachec/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/sqlitecachec/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/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild b/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
deleted file mode 100644
index 4a52424e5a67..000000000000
--- a/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P="yum-metadata-parser-${PV}"
-
-DESCRIPTION="sqlite cacher for python applications"
-HOMEPAGE="http://yum.baseurl.org/"
-SRC_URI="http://yum.baseurl.org/download/yum-metadata-parser/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-# glib and libxml2 are used via an extension module written in C.
-# No need to add PYTHON_USEDEP here.
-RDEPEND="dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/sshtunnel/Manifest b/dev-python/sshtunnel/Manifest
index 3b2a2071c0aa..8eedd95c79e2 100644
--- a/dev-python/sshtunnel/Manifest
+++ b/dev-python/sshtunnel/Manifest
@@ -1,3 +1,3 @@
 DIST sshtunnel-0.1.4.tar.gz 48330 BLAKE2B 5fdc5dd602274a16025f250fcc3a36453a17c921f51367cac0cb0ef36be6251f687b53b1df6072d1e32456a5c0fa5ec6d2fd8e5d4874977a641a6c9ba81ac57c SHA512 c228fe79cf5172c950777a40b27ababd42a31b7aad8a8472d55a2b3babf5aa4c5308799bb271f33f0e943c309eb9adedee321045a03324cb5e30a385178751ca
-EBUILD sshtunnel-0.1.4-r2.ebuild 528 BLAKE2B 18a2323665789baeea21e55bb2f569b8e9a5a16c7a6f22c572762e2dc7fe9d00e49a9de24af7ff45e671d6070f7e49811be5f2bcb6fa301349c4ee08d487cdb9 SHA512 9b649136f1f2020683cc34c09f27f24c1e9ecb9d9128c1867bea41779a51a77eecd344e5d27cb40baa8abfd5150083a12c2a999ea001379050a99ca0d2ba8ba7
+EBUILD sshtunnel-0.1.4-r2.ebuild 526 BLAKE2B 4f024ba1b6f07c68ab699ff4713c7e6389b0796f878a0115519f883977dffe94c5a6638f98f50524567504f86e95067fbea07fceff7d82d9685f12424a683ebe SHA512 0e47cb858ed247fcac84d0a0ab4ef19edc9c9ae55d5b9dcb15087f82d6d255ba08a8114f423b37932507561b7a0727ce1ebd22029e42c5be6429eea029a08434
 MISC metadata.xml 253 BLAKE2B 34807135fdbc8396660d3fa85339e80c0c14693b937e360de963062b40d1a4306d86c3f6fbe60c45146632f934695d26c06083a2977031c36bdee17f57140f72 SHA512 06255a02d9a177532c33fb7a9271f8f538cef82354feb7689c839e2eb1516d53fd0e78aca22fee2f9a19dbf1e3f7ad96dea23c8d97efdac952e4b754314664d9
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
index bd32905db06e..e4679f91e4bd 100644
--- a/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
+++ b/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index ecb86a464f64..b2d956bb6444 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -1,10 +1,4 @@
-DIST ssl-fetch-0.2.1.tar.gz 10703 BLAKE2B 9e87b89e3602267aab16c8c12b8576962d2393cdbd866e00069c74134a7109bd4d41b8f975bd6c2bce19f8f5c05c9c02de715b73366872de6d821998e38ef454 SHA512 ca4c4d29463d5761fbcea151f1229152bd0092418254ce614154b012af9a23c0c52bb733f64815499b5ae0ae9325a808ae2157e7ff707345e92352b672c98966
-DIST ssl-fetch-0.2.tar.gz 10945 BLAKE2B 76cb8e874ec18c4765fabb5249749f1cc0ce5c3c22d373cddcc8290683c5c3075f77ca909d55d4e1ff85f8651033b0687dc8141ec5783127ea43b672b05300ae SHA512 30aa040503eb05d8b0a7775ce843215ebbc198483fba2133e78a5da57f8b998c65018a1241f4f7bb3fbf66045c45bf050b59adb94a68c694aa3aeb6c0b5f726f
-DIST ssl-fetch-0.3.tar.gz 11283 BLAKE2B 8793b8edd44fdbcde17f95f5cfc5efad940ab6afaddd4e9904cbbbecda87ddc41e2aade1bd7a5df7af68e0bec3f2b486a54fef86e51091343d3f88c5cc1132ee SHA512 82fddbccd3a5da73e81803ce252171d42428d88d301a772127071130ce4336742e46093359f0a996c679cd12ced02d09035af283d4d2f505c67a551283328756
 DIST ssl-fetch-0.4.tar.gz 11663 BLAKE2B c75173f40367d1e84a0ed3e13dbc7e6b8270302bf64168487061195cd1d24a593630ca650bfac4ed867d4146e8bad438cac8bfecca86180d2ca23d9ccafa9e5d SHA512 6b31a5dc5d3a566eded6ca284a3edac8c308596dd5a1971d13223e55abdd2ddc4d3e1eca5f369c1c05540bafcb6c273e5ef1eae627a7a9170bc262a0cda06696
-EBUILD ssl-fetch-0.2.1.ebuild 1162 BLAKE2B 8dce6bb7aa3f5c598220f266a762e80a7a1adbde84953103bf3c88d65b49f9aa2351a54d00b43333129c44fa0f1e52e3473fb23a0e6a9b96f6d79131ed5105e1 SHA512 e824bf1b73ec600f4a9279330f3ef0e909a009510ad211bfab6bb042ba8ca21d4b7e2082ecdfb98986778084ca5c3bcdc6f5aea01702872c3f19bd40577edb8f
-EBUILD ssl-fetch-0.2.ebuild 1111 BLAKE2B 08bf0e06f4a9d411cc35dc72801840086b4587d0dac37bfa1ab52aa2206745b20fef08c73f7bbe6fe175222e88f4537e489f461051cd59383e42213c8bb34deb SHA512 12cadd5bc45defbfcca33710d8e5c7d44d011356eedbbe6c231173a21bf5b84a912aebaf036f2db44e49d19c7d4f13ebb104caea9997f6705e09b7e3caf62db9
-EBUILD ssl-fetch-0.3.ebuild 1165 BLAKE2B 29de30612aad35e5a892b68bf04790743a313a136b1648755efdb5bd96041baf700dedb1cf44a88b66c1815b9a6f8b003d67deb41c3ce8f8aed17e53922d7363 SHA512 61edf2eb1edd508b3fe382022edccf03111d5103da9e1e703a1bfbb30c0f907cc169388a20fb955e6db40c766c088e4b13e18488929cfe2b75a2fa7455460e30
-EBUILD ssl-fetch-0.4.ebuild 1204 BLAKE2B 29b67f711a4d6afba799c7c8c0dadbb6452f10a6e647b4275b8ce8e5ff4627e9319c7b798437d291a18705725d6c6121c0bb49028da415d82d35bd867b6f5d7a SHA512 3558d2cc25722ab458e03971a06a37d403cdc2681640ed226f4b7fcfd7bc943630ff00090011210bc04fe5d5ae91db2946f8707f43d99c1d5e47bc659c5509da
-EBUILD ssl-fetch-9999.ebuild 1085 BLAKE2B 6fc68b93de130439a4abd11c3da18e77f290d5fddcc8a4aa0310bccc7170591d62c35a8ce4c857ad5e4147d873b1ef3b22436f8689e371666c6599985d492866 SHA512 9576f7889573b5fa5a4cd891548df5d6fc761b366d1a173bb93a9f880fdf6480072afc025736bad4e9fe51332b1d50996a2e18e89fffb8ef7e1eeb184e7248f5
+EBUILD ssl-fetch-0.4.ebuild 1197 BLAKE2B 3a1e341c8417a1b5b597114529a83170d974e7c41733edacc59b26119852cefebdfd752f19d6eeebea5949fdc51b6dc2e5da34662c2d2a187e8511b4a5b88c2e SHA512 9c21d09a8352ae249812850b0bf211a3cede9a893b748de702f769c5471d5b7c70ccd089e5980b317107ef7a2f6df6c1bad7bffbac808828923d3daa0c495d99
+EBUILD ssl-fetch-9999.ebuild 1078 BLAKE2B 98ec73d1f51af732bc1c3584085916d2cc87f9d555620664a9d2f33f90b8d2c6e093d38a4a6df4ed0d02c4d8529e6452adb1fd6fa100ee6604d9a583d6bebd0c SHA512 35ca6befc9754abb12e3e5beaf152a95cb35bf20c7cc257ca59cb2e94f43813c2e051e9529ff210a67c8f33fce29b166a4f68603fdccfb14db4f4855311a35db
 MISC metadata.xml 473 BLAKE2B 5b8b4e2ce1dd31802946dbe506e7423f0b134d1a1cad24c33b7f005c20a8adeb4a89319c3b47f4637c150ab96ab4b4f44eb7d049faa0cf5a79f8b45e11b1b269 SHA512 832ff018c61d870c30ea89ccf300b4ede17e5a2b03b079a14d1b53a2ee95224e48e9f0091e07f8a79703190fceb77646458c3d760c53de08d29339143724c447
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.2.1.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.2.1.ebuild
deleted file mode 100644
index 7398a53d4711..000000000000
--- a/dev-python/ssl-fetch/ssl-fetch-0.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A small convenience library for fetching files securely"
-HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
-SRC_URI="https://github.com/dol-sen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	python_targets_python2_7? (
-		dev-python/ndg-httpsclient[python_targets_python2_7]
-		dev-python/pyasn1[python_targets_python2_7]
-		>=dev-python/pyopenssl-0.13[python_targets_python2_7]
-		)
-	"
-
-pkg_postinst() {
-	elog
-	elog "This is beta software."
-	elog "The APIs it installs should be considered unstable"
-	elog "and are subject to change in these early versions."
-	elog
-	elog "Please file any enhancement requests, or bugs"
-	elog "at https://github.com/dol-sen/ssl-fetch/issues"
-	elog "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the freenode network"
-	elog
-}
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild
deleted file mode 100644
index eb70e23e1cc3..000000000000
--- a/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A small convenience library for fetching files securely"
-HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	python_targets_python2_7? (
-		dev-python/ndg-httpsclient[python_targets_python2_7]
-		dev-python/pyasn1[python_targets_python2_7]
-		>=dev-python/pyopenssl-0.13[python_targets_python2_7]
-		)
-	"
-
-pkg_postinst() {
-	elog
-	elog "This is beta software."
-	elog "The APIs it installs should be considered unstable"
-	elog "and are subject to change in these early versions."
-	elog
-	elog "Please file any enhancement requests, or bugs"
-	elog "at https://github.com/dol-sen/ssl-fetch/issues"
-	elog "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the freenode network"
-	elog
-}
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild
deleted file mode 100644
index 913054507fe7..000000000000
--- a/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A small convenience library for fetching files securely"
-HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	python_targets_python2_7? (
-		dev-python/ndg-httpsclient[python_targets_python2_7]
-		dev-python/pyasn1[python_targets_python2_7]
-		>=dev-python/pyopenssl-0.13[python_targets_python2_7]
-		)
-	"
-
-pkg_postinst() {
-	echo
-	elog "This is beta software."
-	elog "The APIs it installs should be considered unstable"
-	elog "and are subject to change in these early versions."
-	elog
-	elog "Please file any enhancement requests, or bugs"
-	elog "at https://github.com/dol-sen/ssl-fetch/issues"
-	elog "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the Freenode network"
-	echo
-}
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index 1f671ad49d72..f2da56545e00 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
index ea99a5f90322..052b8b73862b 100644
--- a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 EGIT_BRANCH="master"
 
diff --git a/dev-python/stapler/Manifest b/dev-python/stapler/Manifest
index 1112115926d6..bbd3f90225ff 100644
--- a/dev-python/stapler/Manifest
+++ b/dev-python/stapler/Manifest
@@ -1,3 +1,3 @@
-DIST stapler-0.4_p20160424.tar.gz 34318 BLAKE2B 081f32c4eb30a8f26f0c64784c8ec05b621f1c4051e1c76f501f3efa32f6d59aaf7be8318455d379c2d933aa34b5d9d5abc230c575e2eca926f18a4af35a7013 SHA512 b93bf0f253ee6214aeabde2d4c636d2544d446c90fa473e6ee5698936c2605d64c6f6e672ef99387f79458d7e52005e7e2eb76db0c5e2271fadd1603418e2cd6
-EBUILD stapler-0.4_p20160424.ebuild 676 BLAKE2B e4cb27737befa32cae75ee7ef519882c06a1ee011a4ec7cd9e98827d19fef44508e4b8b75aa8adcc9b162972cffa7bc8dd74cf6889711108d80fdd7ad8510e57 SHA512 4735613a8ebbb23212e7744599614d3dc5aca7d1e4edba14fe0851013b35f29be4b1cb1be39c5da4647416aa0457ddb410df0749513996cfccd88f5d0486fe6d
+DIST stapler-1.0_pre20191215.tar.gz 37483 BLAKE2B e13db364fb91fc4e537f4a1c65e90bf2bbd950ba771cc02cc8dc95bf826c0aebc0160dbe098ad1cd5fc88ab8f0d0656bc96b594bf1d6444cc6bb03265ad8c2d9 SHA512 f88b88fd70dc4083f7bca8bbef0033c1d02af4bbb69f99af7ae80473b297a81fd11a27efda1d9be2fb4290c714444ca8b05ab1bc16e012b91be3435cb53b4b85
+EBUILD stapler-1.0_pre20191215-r1.ebuild 691 BLAKE2B 7d458cf6a016f8ceb588c61f31fbba2e1bb74c86c960f64bc1338f440d30404f356cf84fc50de66b06a8c671a4156f7f4662017845621dacfabf59688994e9a7 SHA512 ba4ed776885200395601e471acca57329114a1b0f4a45c820e91effcfccea94140743d31d094bec781a2da108ef27732313befc8ee122b06e0c65f9d772894f1
 MISC metadata.xml 339 BLAKE2B b91a9626e467e14dc1d87ffd3fb7359d32cad66424c6035b713648db59bd9fa35a9a51047891248ec1b3c3d5de7f50da5ee3924afc1727c5e398a44a0a5508f3 SHA512 7b9296a37b87d3442d563ebc0369469183b4d9cd97f066798c94288b7341352b62f8eab5d788ba3a8da51416fb7222fc0d2c88ab464289ca921aa225730ae4ca
diff --git a/dev-python/stapler/stapler-0.4_p20160424.ebuild b/dev-python/stapler/stapler-0.4_p20160424.ebuild
deleted file mode 100644
index be3f7d8a2f89..000000000000
--- a/dev-python/stapler/stapler-0.4_p20160424.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-# Commit Date: 26th Apr 2016
-COMMIT="7c153e6a8f52573ff886ebf0786b64e17699443a"
-
-DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
-HOMEPAGE="https://github.com/hellerbarde/stapler"
-SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/PyPDF2[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/stapler/stapler-1.0_pre20191215-r1.ebuild b/dev-python/stapler/stapler-1.0_pre20191215-r1.ebuild
new file mode 100644
index 000000000000..e4d24fac0d30
--- /dev/null
+++ b/dev-python/stapler/stapler-1.0_pre20191215-r1.ebuild
@@ -0,0 +1,27 @@
+# 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 vcs-snapshot
+
+# Commit Date: 15th December 2019
+COMMIT="875325103234b4a3ed96a4a5167ff78c291edbff"
+
+DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
+HOMEPAGE="https://github.com/hellerbarde/stapler"
+SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/PyPDF2[${PYTHON_USEDEP}]
+	<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
index b81b368eb96e..0c9c354ca5dc 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,5 +1,5 @@
 DIST statsd-3.2.1.tar.gz 166047 BLAKE2B b0bf102823cefb8a698b759881ebb395c7408b8b5fff7cf304aaa0ecbad2fa8381fe05efa3cdd9c36c44c7188e46173235f9fe2cbed9fb940d8d5231f455d6bc SHA512 c5166fabcef2158aeb29b07b9bd1d241bc30847eb0e2c7694ee097b3a262e2590189ee10daecb368807002bd96fed16e749ca744b51b5e946d48fe2931a0d8e8
 DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
-EBUILD statsd-3.2.1.ebuild 636 BLAKE2B 1f18fd9498fccafc45a1045b18b7668e481d125a0fe38bb50681542e17e4b0fc4c240a7ec004e6202496a13fedf9c7f283e57511f7858e9a2892eaa7c1dc98a4 SHA512 a6ae5b1fcbf3f4dc293acdc005be9729c8e8472d821795336dab50fa9b88558352808cc3c45d3cae705dcdb1fb9511561f4285d64604ef6500b32d7fda9b4114
-EBUILD statsd-3.3.0.ebuild 636 BLAKE2B 020a6ced442f1a3851d55dc666951610b36db4a2daa26f4956f61e3e36e07d773795e660efac9c96458d63f49fd36cc18508a804725ed4521a2c3a093c8359da SHA512 7e57c30798e18bc62ed7e8a5f200f13f23753d4e9208cdf02575400cdbfe64ecdc7343579fdbe3208b481b0775da6836484667b210f6f8962a5a9c8614d066ee
+EBUILD statsd-3.2.1.ebuild 627 BLAKE2B d9df869905a66fbd67dfe97479e33d6a75c0ea3ece7c93cad37dd198d715ca4f622a0a169bf18c7a5faf99a57789e55fe5ee3166d4629cf2856a659bb6d559e4 SHA512 06dd4eb5bc829f2191df47cc009bfd0c5b99b9365d207af0127c286132d9c00267c7e189b629a876dfcc3f887ee87736ca5d21bf15a69e3088b6876fae399604
+EBUILD statsd-3.3.0.ebuild 629 BLAKE2B b6aa791de57654063339397c1431e75314c951b0e23c78aa7b6f6dd94576ff6365a06264d652c8a4146fa3ae2bef4a73cbcad3fba76abc4964f5cb469edbeea1 SHA512 8e613fb38636f888ff37740899c35df4549ef9fb118b4efc91046069a9d36ad5e287f9dcc8ab8588d3a813d456b979b755f05e9f7f7f49ae3f0a0bc29b342734
 MISC metadata.xml 498 BLAKE2B a8ee652db5a3283200bccbd950e8a927442db0d995fbd9181ec3b638c1875614792024b11486450ec60b9554374195c97623b7e2a6bda6e11fee5a77f18386a9 SHA512 02243a16aaec81a9d06a08f0ff1c741d5bcf6f9d8fbf3c2037b03c1752112257c9c357720957871e25f963e84c93121fe4a5ddb69208bcfb2c29937ec7743ebd
diff --git a/dev-python/statsd/statsd-3.2.1.ebuild b/dev-python/statsd/statsd-3.2.1.ebuild
index cb5b1dceae7b..ffee144d7ee5 100644
--- a/dev-python/statsd/statsd-3.2.1.ebuild
+++ b/dev-python/statsd/statsd-3.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/statsd/statsd-3.3.0.ebuild b/dev-python/statsd/statsd-3.3.0.ebuild
index 3a62aa344d8b..cdd7f1b7039b 100644
--- a/dev-python/statsd/statsd-3.3.0.ebuild
+++ b/dev-python/statsd/statsd-3.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 27d4dcbba0b1..2af4f2e539e4 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,10 +1,6 @@
-AUX statsmodels-0.6.1-numpy-1.10.patch 910 BLAKE2B cfff850a68733641fdad5913529e6f181b24ee1c541c8bd1f74752b3ec1cb60ba85ebd1627b76c103ee34e231c02da2db3072619cc25fe5b9cb7b5593d77d9a2 SHA512 deffc2539641a91e728f3b8b5e4d6d98efe2b874491aca360ca945d8dc6774bf14b3e14796e1440728a8faad4472c846c69d4278301e37a29689adbab1e74c63
-AUX statsmodels-0.6.1-pandas-0.17.0.patch 1043 BLAKE2B 0473214de500e911a36cf3ba645b57536ea6ada17f7123d193d31fb266ba07724aad7297cd705b51b34a394791656a72b891ab94cbf3969935b59324813a0100 SHA512 0a4394d672105337fd03d435a402dbd31862a39b8010658f859114ed9694de9be4d6c3d641b5f385986a6651f0434a3602659d7192bf99f749e49f33f53a634b
-DIST statsmodels-0.6.1.tar.gz 6980841 BLAKE2B 5ac16df0fc06d051cc79d037bd3a9b097526498a48cdc0bf750babd5915f27a0dea23d8869a5101c62bb780ec0c54c503a766c7da6db59fb8d10dc65c70268b1 SHA512 9047b8cf4b9d19bd697867cecef1c4608fd86f3d16e67e44d8c152e1e25918f5aff6b4843c58395e71614be401551e3e48d4dcf158480cbdb45d9735b1c5ea77
-DIST statsmodels-0.8.0.tar.gz 9464851 BLAKE2B f4bcf38c0292dcdfef9e3e34519f4dff004795bf76f54773f551c6c767f16f9cee0a2756408cff6f727df8eebc269bccf2c8bd28915a729eb022eba34831628e SHA512 32bb7f36acc16796c445e5f695d958af4525fbbb2d374376fb4a73c972e3796fad05532456cef4aa5ee59d6fce11921174e17bbfc2e05d2488ce1ceac5175239
+DIST statsmodels-0.10.2.tar.gz 14065612 BLAKE2B 0df1268de5e4108b3cc541df87a5b9d2321bd3062d4daf1cc1aa62ab08ee777bace2f10bdfb51f088a66f15287c62cf851b3f43efa7eb1227e71c06632e80d55 SHA512 bd1c0784b0b17a3ca69fef5848f5eea8dcf76b1943599a5e5c285e45b7fcc7e44c0e388f007913d420ff6f3cb66a653d1c43e6e8addef534ff5572fa69ffb54a
 DIST statsmodels-0.9.0.tar.gz 12658359 BLAKE2B 1b451edc281ac8bfd35441d7f31ff02c7068b854c06a5e50fcb6fb2ff3c023bbee264a25407078f99ca08e467676a32c1a0156dec668673bad3e8d7a46a95154 SHA512 a0310129ee915dce5006e4e40190d19c3a09facad398ff089fa4a244d51a035f9591267fd8d34a00ce82e4cab893df96787596f9d350d878e97a0bb3305f1bd5
-EBUILD statsmodels-0.6.1.ebuild 1819 BLAKE2B 45383e261a264d471d58d2e0f8d82c6afda53b8d8ddee7fa6d271e0656535f0df37c027e98e29f18f939b3b9042b764bf09b6b0f6f02112621ef02b62b247b54 SHA512 486325376f9f5589ec2d9d370294b035f83e575ee4a078b8a624a24c7a1158f4558461744b2bc7d55be1313cb09d86a0a3a8a459e12d475773aabf1490579db5
-EBUILD statsmodels-0.8.0.ebuild 1976 BLAKE2B 6fb90cdba814c95cad4b4f4116072faa7fdeb9971cfcb8c73183fec3ac038ad0b736dd13c9501dd020d45ec059ab635ef917ae6c9dd91304a7a3a9bc453449fe SHA512 a7f2f8b9de37e511f2cfa2b178f6bd8ae2a0e7d8b2267e8f26d879f2aacea2d711ce3d1de2490f6b761206b34d524dc7e136164ed0336b3d003382649f726db9
-EBUILD statsmodels-0.9.0.ebuild 3445 BLAKE2B 46801231fd7cbf2830f633c1bafd9387d639bc6c40735fbf42043df16923d1672d07c7b36b68079a6f60f6b0db2a0b5a7041ef48ea76ed8acce97429f4eb8b6f SHA512 ee6fdcad22827c6e0cd5bd91b038ebd96a5c1641f8727075d7261958a17e79d94625badb1d52322e8453eb8818b874cd34417d183d6586a6f21f59f9928a527e
-EBUILD statsmodels-9999.ebuild 1996 BLAKE2B 9c60389656e2954f069690e275f6e0b20c8bf74623b74bda35a0d5bf8a4d92748f0ee901b4353b4228c41e9e3e08ae2cde08a9ffe543c56812671563f5dc3ac7 SHA512 f241f27a358b5e5452f4fce55e121b63ab1ddcbcbb4878069e491a1981a8cc3365cb397c3d126343bb53e725e6e5bcbc7c097453c786b4a70d415713279a6858
+EBUILD statsmodels-0.10.2.ebuild 1855 BLAKE2B 37e32e5ed9b3789267632eddceddcefedb2b7821bb3527f4f57bc2eaface01c37f0d6e55abb1f1c1b96abeedc2ef777a931efba858c9b2cdf93d5e8e92cbc2b5 SHA512 df131133e2fb36f017cfa65dc9bd0e5b213d7c4b3080c439c7c1b6882303882c413ad1b98d22a73e4ad55b2fc046c54b9ec7ec015060e370ccb42210947ffdfe
+EBUILD statsmodels-0.9.0.ebuild 3443 BLAKE2B 033ffca5c8b09358d1d5b845b90ff09fa7e8e6de0999a1de27c23ddfe262132a208068519e2a5044e3662e4ca75ef9d048dd158018f13d799009e8062976c18c SHA512 e0fd866ba0fad317d3511585c40e0eba57d69a057a9a9bfad063ae686744733cc68ba74b70c85a5b0b1f5b87fb5b242834531cd5c5b6ca017a21fcd948a9ac80
+EBUILD statsmodels-9999.ebuild 1994 BLAKE2B 3f9ab2f7c4c6abe4b0cb7d24d2e53612b90bab1a924a758d28257ef37de024f1072ac0ea6bb2f2ccd43e7b57ba88bbc2c48fcc6312089a3476077037422b84ed SHA512 5bc45cc5e06314e60ac847b8fdd8d25291a956643e2e64fbe5ac6fa92063b61c22ff6be51561d8a330e0c3838b8d13bd67679655874604f2099cd962294362e5
 MISC metadata.xml 1318 BLAKE2B fda44c0af74692331673e5e440e4180d9610cbf50d96c19da4ff19728bcd31ec6cd30a48fb382da3489904b2f361957af54c7bc6983320b9b6fca04ca561aa52 SHA512 30d166a37e102503c22ca6112f297cb6db6d2f795062657f23d7c98cf1871275c28faea7be4bcc117817aae122eb5bbed1d5da1a327058980a3f87ce083fcb13
diff --git a/dev-python/statsmodels/files/statsmodels-0.6.1-numpy-1.10.patch b/dev-python/statsmodels/files/statsmodels-0.6.1-numpy-1.10.patch
deleted file mode 100644
index 2d9720c5fec6..000000000000
--- a/dev-python/statsmodels/files/statsmodels-0.6.1-numpy-1.10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- statsmodels/tsa/ar_model.py | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/statsmodels/tsa/ar_model.py b/statsmodels/tsa/ar_model.py
-index f0af7ee..fe05634 100644
---- a/statsmodels/tsa/ar_model.py
-+++ b/statsmodels/tsa/ar_model.py
-@@ -256,10 +256,8 @@ class AR(tsbase.TimeSeriesModel):
- 
-         Vpinv = np.zeros((p, p), dtype=params.dtype)
-         for i in range(1, p1):
--            Vpinv[i-1, i-1:] = np.correlate(params0, params0[:i],
--                                            old_behavior=False)[:-1]
--            Vpinv[i-1, i-1:] -= np.correlate(params0[-i:], params0,
--                                             old_behavior=False)[:-1]
-+            Vpinv[i-1, i-1:] = np.correlate(params0, params0[:i])[:-1]
-+            Vpinv[i-1, i-1:] -= np.correlate(params0[-i:], params0)[:-1]
- 
-         Vpinv = Vpinv + Vpinv.T - np.diag(Vpinv.diagonal())
-         return Vpinv
diff --git a/dev-python/statsmodels/files/statsmodels-0.6.1-pandas-0.17.0.patch b/dev-python/statsmodels/files/statsmodels-0.6.1-pandas-0.17.0.patch
deleted file mode 100644
index 540135c9e125..000000000000
--- a/dev-python/statsmodels/files/statsmodels-0.6.1-pandas-0.17.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- setup.py                     | 2 +-
- statsmodels/tools/testing.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 1a7da9a..a6d1b33 100644
---- a/setup.py
-+++ b/setup.py
-@@ -134,7 +134,7 @@ def check_dependency_versions(min_versions):
-                               (spversion, min_versions['scipy']))
- 
-     try:
--        from pandas.version import short_version as pversion
-+        from pandas import __version__ as pversion
-     except ImportError:
-         install_requires.append('pandas')
-     else:
-diff --git a/statsmodels/tools/testing.py b/statsmodels/tools/testing.py
-index 1fde1de..92e77fc 100644
---- a/statsmodels/tools/testing.py
-+++ b/statsmodels/tools/testing.py
-@@ -17,7 +17,7 @@ def strip_rc(version):
- def is_pandas_min_version(min_version):
-     '''check whether pandas is at least min_version
-     '''
--    from pandas.version import short_version as pversion
-+    from pandas import __version__ as pversion
-     return StrictVersion(strip_rc(pversion)) >= min_version
- 
- 
diff --git a/dev-python/statsmodels/statsmodels-0.10.2.ebuild b/dev-python/statsmodels/statsmodels-0.10.2.ebuild
new file mode 100644
index 000000000000..866fecd254db
--- /dev/null
+++ b/dev-python/statsmodels/statsmodels-0.10.2.ebuild
@@ -0,0 +1,72 @@
+# 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 eutils
+
+DESCRIPTION="Statistical computations and models for use with SciPy"
+HOMEPAGE="https://www.statsmodels.org/stable/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/jupyter_client[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "/sphinx.ext.intersphinx/d" -i docs/source/conf.py || die
+	export VARTEXFONTS="${T}"/fonts
+	export MPLCONFIGDIR="${T}"
+	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	${EPYTHON} -c 'import statsmodels; statsmodels.test()' || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Plotting functionality" "dev-python/matplotlib"
+}
diff --git a/dev-python/statsmodels/statsmodels-0.6.1.ebuild b/dev-python/statsmodels/statsmodels-0.6.1.ebuild
deleted file mode 100644
index ffd1a3d0f625..000000000000
--- a/dev-python/statsmodels/statsmodels-0.6.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Statistical computations and models for use with SciPy"
-HOMEPAGE="https://www.statsmodels.org/stable/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/numpy-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/patsy-0.3.0[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.9.0[${PYTHON_USEDEP}]
-	"
-RDEPEND="${CDEPEND}
-	examples? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	>=dev-python/cython-0.20.1[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/matplotlib-1.1[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pandas-0.17.0.patch
-	"${FILESDIR}"/${P}-numpy-1.10.patch
-)
-
-pkg_setup() {
-	export MPLCONFIGDIR="${T}" HOME="${T}"
-}
-
-python_compile_all() {
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts ${EPYTHON} setup.py build_sphinx || die
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	VIRTUALX_COMMAND="nosetests"
-	virtualmake --verbosity=3
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	use doc && HTML_DOCS=( build/sphinx/html/* )
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "plotting functionality" ">=dev-python/matplotlib-1.1"
-}
diff --git a/dev-python/statsmodels/statsmodels-0.8.0.ebuild b/dev-python/statsmodels/statsmodels-0.8.0.ebuild
deleted file mode 100644
index d83c36457cd1..000000000000
--- a/dev-python/statsmodels/statsmodels-0.8.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Statistical computations and models for use with SciPy"
-HOMEPAGE="https://www.statsmodels.org/stable/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-RDEPEND="${CDEPEND}
-	examples? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-DEPEND="${CDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyter_client[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "/sphinx.ext.intersphinx/d" -i docs/source/conf.py || die
-	export VARTEXFONTS="${T}"/fonts
-	export MPLCONFIGDIR="${T}"
-	export HOME="${T}"
-	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	virtx nosetests -v
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	use doc && HTML_DOCS=( docs/build/html/* )
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Plotting functionality" "dev-python/matplotlib"
-}
diff --git a/dev-python/statsmodels/statsmodels-0.9.0.ebuild b/dev-python/statsmodels/statsmodels-0.9.0.ebuild
index 03b23eb7f0d3..16cdf47ab6b6 100644
--- a/dev-python/statsmodels/statsmodels-0.9.0.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/statsmodels/statsmodels-9999.ebuild b/dev-python/statsmodels/statsmodels-9999.ebuild
index dce6c0a6892d..113b10d44fc2 100644
--- a/dev-python/statsmodels/statsmodels-9999.ebuild
+++ b/dev-python/statsmodels/statsmodels-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils git-r3 virtualx
 
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 7876073ee097..a2aecf8d289b 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,3 +1,3 @@
 DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
-EBUILD stestr-2.1.0.ebuild 1075 BLAKE2B a8743e026ecafb119657966b6d5d89c771c9914eabda0cab7e891ca6a79cb0b7219a0daf32e7a8d750500e988cbbf4f2b0fb25ddbb58840ab37004f06d3c55ad SHA512 b4e3eb333daf86ca07b45969fb17cc9ad4343034f2946f3e282c32233dbc6b719552545c86c72bb3e233a95249797c27a863e8c1d94f2cff60e7476eb55c8e24
+EBUILD stestr-2.1.0.ebuild 1065 BLAKE2B f76f941a1dd0e20e8d72c3b934a0cf23b189c529b758a8783fe6321372bff6b694ca96387d8d37079e1da1e64c9894878f9323cbcc469affa88bf34217bc071a SHA512 0409fcafee325bd6ed51b87675e1912c366750a8e885cab6af5a81a19e0f06ef391e31367301774c79b7226e27223708546758f1b14a25ba11a6fa84282b39ee
 MISC metadata.xml 615 BLAKE2B 59ec048ea712845ca6de6e55aa4ca514da16e6c6387ce2324effc9e6eb82d99aa5d3601914fe78398fcc83be14c752a1ff4e546f36746f8711e36aaf4cdc2846 SHA512 d13186ab5353fe9b9310ed047a828b65f179b173c7c220fbaba5a80e36bda817dd44ccaeb4a9272b342de6246e44ead8d959fdc7a4b4e7f00c52848eb0a613c5
diff --git a/dev-python/stestr/stestr-2.1.0.ebuild b/dev-python/stestr/stestr-2.1.0.ebuild
index 547a59bd0a2f..18acb832372e 100644
--- a/dev-python/stestr/stestr-2.1.0.ebuild
+++ b/dev-python/stestr/stestr-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="A parallel Python test runner built around subunit"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 4d8746f16357..6d4bac368522 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,7 +1,7 @@
 DIST stevedore-1.25.1.tar.gz 509014 BLAKE2B 22580ac0e5af56eadd81e7521888e3b2458a1c03a3bdac69df1f2eeef20248f1ddc1748447e3e961b61cbe62ebc939e36c04ff011b7845b3278e18a5fdc9e14e SHA512 f3d2a7360e783c800c3c2488f6adf6f9f76e34e4a4e6f3fc53d2f1114b889c443c13fdf217ddce65a41922dda2c782f19b2077847807c70e732a522fd2166ff0
 DIST stevedore-1.28.0.tar.gz 504872 BLAKE2B 6a9ba88ab950f17898d2dd76d75cd7bc7031cbcf441523863520e15916bc5c255fe6a62444f46b6d9967ec1f5f716420b36cb114995907ec8e2c39110ae7918a SHA512 e148560e255a362a51ce91e8bc2380828ba9a41e1988138bcff2d5b270097cadffdee30f3c98e123d8ced9f6f0ff350b52e793fd400ce6b45095860788bd6b86
 DIST stevedore-1.30.1.tar.gz 507795 BLAKE2B 92af8ac52dd28d765df32bd127d76aed0d0d66e2a4edc772aecb35ae78b52e9091203991a457be732d62a2987cc378d0c62cdd94898ad7e41f33b320401d4fa9 SHA512 3316ba9c73dc5499588a65fb0abc85ffc8eeea14dc94fbaced6379246098f03201d8a13dc64510a0840cb3d266ac83ffbb957738a61ee2a36440611833bab4ef
-EBUILD stevedore-1.25.1.ebuild 1658 BLAKE2B 05a04f295bac5145f87546bfb8bc31ee497d375d52210926cb862a1670bb4a5d16cbc5464c7c3c318ad08bd106ea44efef7541f72305d5c4c3ee57a69ff748b5 SHA512 b29337409ae56e49ec680aaea047980b414b936689fb1095c7f46a95decf9ba61759e2cdad498dbff5c293c262570f1d8cb706d20baf14995d12a9bf1c09efdd
-EBUILD stevedore-1.28.0.ebuild 1660 BLAKE2B ad7441d57bb50e905ac7317e53a562bb59fe69f68ac2ae396386e5a5f36f00c50f54266f1974b6571893f622f375aeb003847a48e70c63a8efb4d09e441975bd SHA512 1b38840fb55b990a807dd5d8894074efa9170e430f1607b8631e9a096ca2e58e2138dd621ccc8926df7b61469b9d697831054ba770f5f22627270525e68c90b5
-EBUILD stevedore-1.30.1.ebuild 1743 BLAKE2B ec3a13bfb8e6670cdd8f589dd052395d28d8169b2e4c033344cd1fb45b53b942e8875eb11186d27e135c2bf3ff6ba93f439ff0250ff05868ac7cfc7490bec5a8 SHA512 5dd2db7f37daa594fd94df926f3528f3250b2efa1801434d984a2149c961b42b059058bf91700686b03afbbb130c0c4a88bbe42e252dca6b98c8f9252b9ad3c9
+EBUILD stevedore-1.25.1.ebuild 1654 BLAKE2B eed0a9a0bc3060cddca16036565295e396cdd66fa809419702ee2266dee3a59790f697b1c169f969f821604c4a5dfefc5e1b2cb0f2df4246511ab88e63a8d58a SHA512 615c0a461af5e7df37d4311613255f408fa74e86c9aae5788049ecd761f6e21bcccb939c4125f13e26b585d758d8c2fb2f68fe58a1d47bb41603c57df53b4d9a
+EBUILD stevedore-1.28.0.ebuild 1658 BLAKE2B 80e6db12c462571344c4535e49b4c0a5d735cd883ce5208c986ad54bd8962ea2e3ca5c7a6cf589ccb7e081c13ebb6f437d1c7216dba033cf4a07feae133aed35 SHA512 19ba33f588e410ef03cb6e280e17b2b99b6a2fdb2e1c2880d98a9e2ea553df0d94f9cae8374989606d0636d6595dd6d332a526eeba2ab954f84bb32577031336
+EBUILD stevedore-1.30.1.ebuild 1741 BLAKE2B 4d24e7122a34c472ba928bcf3b8e5383f27e07ee7afe3c067435370186880bc02c36d0093118c3b5dfac2c46a96749db66c5c1bac2a6b15fa0f7948b1979fef8 SHA512 cffd593849c7a12df7c2d17e836dc891293262ecee069565cfeda3b92ae13b4e369fd1a1089ab498c69e9385a0750c8931bb9bf944f35889005bd947fe9edd06
 MISC metadata.xml 496 BLAKE2B 4de4391203bfd30055b9b6399abeb5b53c2a363779c895d4e0efb1de2d929510a0d7e02541290000a63526d44d32d50ea7c41728a4ec1e5d6ab41a7ab57414b4 SHA512 569ee9efc45e2445b71ffe7201ea92a7bdae048de528664d2a908b94c3fb23f6632e2457623c5b0d961dcf7aac2d96c6385d225628a3c5234363159f56961f00
diff --git a/dev-python/stevedore/stevedore-1.25.1.ebuild b/dev-python/stevedore/stevedore-1.25.1.ebuild
index 2852ae1281c0..e171ff0daad3 100644
--- a/dev-python/stevedore/stevedore-1.25.1.ebuild
+++ b/dev-python/stevedore/stevedore-1.25.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/stevedore/stevedore-1.28.0.ebuild b/dev-python/stevedore/stevedore-1.28.0.ebuild
index e0182c84691b..b0a9ab6f656b 100644
--- a/dev-python/stevedore/stevedore-1.28.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.28.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/stevedore/stevedore-1.30.1.ebuild b/dev-python/stevedore/stevedore-1.30.1.ebuild
index 56667d8099e6..2eec276bd2bb 100644
--- a/dev-python/stevedore/stevedore-1.30.1.ebuild
+++ b/dev-python/stevedore/stevedore-1.30.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/stomper/Manifest b/dev-python/stomper/Manifest
index 11a422aef016..9cabdeae2d1d 100644
--- a/dev-python/stomper/Manifest
+++ b/dev-python/stomper/Manifest
@@ -1,3 +1,3 @@
 DIST stomper-0.3.0.tar.gz 21051 BLAKE2B 79505d042933fe1127f151f209139c48d268d73ee443a21acabe5768b4ab627b60100dabd7116b62501fcdd5795acbc6bc400bbbdae370f46d8bde94dc0db3bc SHA512 ba6feef44bb33a9b63f789043b131a314b903fda847dbb3ad909614a2a6b2b39f2d98dcd5bf19b070f4de9cec9dbce9cd79eb135911f16c1e8dc6d5f52158516
-EBUILD stomper-0.3.0.ebuild 757 BLAKE2B 01d18c52ea78e3b6090eb91b1971a7e2709779eaf020569f1fd6476390374280588153d5fbd6fa5ad898b4d7bc4645f8f92e62a398a03a788d4c66fe88f4bf1a SHA512 74d27ce4b91ed181b29f4e391f550c076cf97fa001c9b883e21f2385193a23d0df4b1b97ad386615d7e2b6dd9629d6384ae2b09dff13b41e57ad6c19086424da
+EBUILD stomper-0.3.0.ebuild 749 BLAKE2B 01473dbabd250f3ad389bdcb4fbf07515d3e54d6ddf765bd8ccbe5ec0dcdf5909c2aac13e11f7e1f66da9e185f8039a3f610e7294256d3daa8850393dca6ac82 SHA512 a2c5f679a6c29b658b37da35135717a2ea39686405880ca84a5aeb9edbf13bef35c313dcffcea9a8823d02b979f7149ce07d3bcb6a91ec4be8bbbbcd5c7c5198
 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
index 726d8d2a319c..2f0b31c2890c 100644
--- a/dev-python/stomper/stomper-0.3.0.ebuild
+++ b/dev-python/stomper/stomper-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# 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 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/strict-rfc3339/Manifest b/dev-python/strict-rfc3339/Manifest
index 787c4610f94c..3607c39ede17 100644
--- a/dev-python/strict-rfc3339/Manifest
+++ b/dev-python/strict-rfc3339/Manifest
@@ -1,7 +1,7 @@
 DIST strict-rfc3339-0.6.tar.gz 16856 BLAKE2B 635da447439282ec64dc7c27a2602d35b28f0a02fb36c16b622b38e73f907e9a39b709c5d87319269ef1357d5716a1d92de7f205f66b2aa77339d63aabdb21df SHA512 7f1e15d60c2295c00647af84b31a1836b6c3994fadbb2695f5709861caae543ae69a3199dffd6dcf7e0768eadf39e496a5e600e291dd0befbe8fc35fa60897af
 DIST strict-rfc3339-0.7.tar.gz 17552 BLAKE2B 74370e28134ee22545c536d9eab383c0de6bba66d1440a77d020c7dc754699c32072300f380bf044e5283ca663beb370a587ea9d111dbdeb46985f76b5c9dfda SHA512 94a2992a9ea41b75527348f0f8dae1d118d57b0764122f874baa85f5e3b523beb219ed83c2d7224725e504cd3737a6bde485957135856dcde470f32675e44e77
 DIST strict-rfc3339-version-0.7.tar.gz 18756 BLAKE2B 45a38c5eef2b74225408e9a0de9e484cce24778eaf830d9cf052a26df4964c761d8349a71c892c5b4b5129f98802a9aae10b1e9205156bbc4eb6c8f5df7bfb88 SHA512 5db598b33680d60eab8c49dde9d831ece9632811c89552c7ccd9ac7cbc0f603bde5aa14434a388abe669181e643bc2fe97f3c48b08c88863f88e95f17d958bd1
-EBUILD strict-rfc3339-0.6.ebuild 633 BLAKE2B e3a7c14bf7f8c8176b98c00b0386ddd956a74d6fb9ac59a803e4119e0b8d4339f9e69db483cce4cd200ab8ee463b96bfcab5a7270161c7b93349f43db198fd8d SHA512 178a43fe87aad00c19ca8edab6f1a39bef89f1b3c24df94fe27eef77d7c0482c051d7b9d219f7b7c9a58ffa1d2e6d9a2efeb7a2b8746405cea72b88b51c82c78
-EBUILD strict-rfc3339-0.7-r1.ebuild 683 BLAKE2B e6abb95c0eb2c32231736e62c982e356dd872a572cb8958d1b03d1fd286a7f0c6e2d6d1daf2dc0936dd8a07cceb098b3eb319e081e5f3e4ff231cd3506c2d7e5 SHA512 537a7a7f3d66fd4e964ee0794788eac65148c4bc530d22d77eddcff3553a4460bc2780d5e06ec22259ce5c121984a6a0995c8878bb969e48aeacd83a32522467
-EBUILD strict-rfc3339-0.7.ebuild 645 BLAKE2B 82e3f0a8f65f66fb07f21b01cff4c8ef3f13dce550cdbe819d88ca5f421025b4d124310797da3c756d187196d462882716276f25075bdd759f69cbe55267aaaa SHA512 5e00e19ec364cbad0d46304d300970989092c15e07f62f0ae52b1c12822b4a921fc929a5686e561a50f55fc10285e351021f0e7f719444979f85d06a96b324a5
+EBUILD strict-rfc3339-0.6.ebuild 624 BLAKE2B 2f13df732cf1881b18fbf2c0c71840aca5c1229a4079eb2607a210c551fcbdc491bb2c6086be9ecc88cacac8e899f8ef6bde61c76553a908089c7388d9d43d98 SHA512 713d55551ba05481716304081b9d40ceaef8f745ee480edb886d0fe901745fdca8a8f7fab97fd0d0bd88abb261520ad61f6483ec2d82170509e5dbaf9bfc1aff
+EBUILD strict-rfc3339-0.7-r1.ebuild 705 BLAKE2B eb94516c1521cac2697408193c729a60d5b792d86f3aeb55deb94ac38b263034cd96500d5d28cd6168fea3a3c071d4f5c7014627afb6e852da826b81c266c17b SHA512 f819bb2eac24a02ecb1fd00fd280bdf6f8ec07352d895dc36b0a84bb4be0d6c779f6e820d55ccd373ac6e126f71eb28a8e08e19f009b075e006e6651532443cb
+EBUILD strict-rfc3339-0.7.ebuild 638 BLAKE2B 24a2c21114ef1d1fb5a74d8845f478a9c37b4dba8b6c0fc7503af94ef56469c222a42d56eeed01f4ceb9b119a1a089dae4e672da27818ef153478690f4451882 SHA512 614ff7752a7167d4ae88eb6ea3767595277a98298b95bfc1ce41e1679714c92bc040e185f73a5b8a3c617119e23c8a51296b7edf9df069abc601c3dcfaeabefd
 MISC metadata.xml 385 BLAKE2B 3b51a7f471d2ff03a26cf4c129dd6ef190101b5312d21b303226a7c2c65b06d4910959581c413675030804904029931004edb3a005c47a0bc6caf11761f9928e SHA512 c825fc57c6aad0acc8775432fe511055f26a7bb453628340e56c1615b777cac4ae43dafe6d648a7ded7dd4138ebccc3e5620ec9c5f947f2f491d544d2c69ccaa
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
index 0f0f76928b34..769ee8fafd0d 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
index 07ea220922f6..36185cb5b75f 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +17,7 @@ SRC_URI="https://github.com/danielrichman/${PN}/archive/version-${PV}.tar.gz ->
 
 SLOT="0"
 LICENSE="GPL-3+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
index eeb52b41aeeb..cd1ea1b94c6b 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 91113a291fe8..3b6286205c06 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -2,8 +2,8 @@ DIST stripe-1.84.2.tar.gz 213050 BLAKE2B df6c195a183d15bdeb7ffbfd2f5683b0b667e8a
 DIST stripe-2.10.1.tar.gz 218299 BLAKE2B b1d836ef92dabfd5a5f292ede69264886dadb0b87b72927e444d615e9f0518efff513f34f2aaee778921f7cb68169f7981a5e84993b19221ec394a1d5c07c622 SHA512 877a87e848d425f333ad3e40c172010a3b1882de0894ff8c5c0623f5d09fbd7ab51d9d53ead8773d3680cdab8d07df32f4210abc08c796adf6feeb4014b671f7
 DIST stripe-2.3.0.tar.gz 213813 BLAKE2B b383c724331d5ec21452aee2eee49c789e2503057c4648d9e879fc561b87cc70ba918bb1e620db3bca380150e62d41433f1bfa7f9b6f164731d3d68542d5f056 SHA512 ba88b18b7328d917379d8474373a1f87717d67cf305022b80eb05c74b8055b825cf30cc879c4e99dbe06dc99f03464649e637d83d70c902b84f5873dd0776453
 DIST stripe-2.34.0.tar.gz 206926 BLAKE2B 30a4d3da4ad58ffb8656c03d1755e20afd7059cf23a693e59af467720e88769f64e53bf62b06c493f7713c50bc251f475501d37045ed0db1df99c9fad72f51eb SHA512 e9bde04ffcd7bfd36afa1a32a9f9bf3454cc262ec2b760bc606aa6b24f8b0d8d0fa37309fc5472ba88dc63f1384c03fc451d2b6a6007728a8ec9fd0899b8b717
-EBUILD stripe-1.84.2.ebuild 452 BLAKE2B 6d2301cfd3d410fc0c6873ed6b51275a23c8de3412a379b337c5df7f33e7737dae899248f9e21d10add3bcec636159ed7329c832e7161510e9864093bb558ed5 SHA512 3f7b4b5576161e9c71b1acfb5876ee31e4befed15a61b7951fcf8ed3ad98c641bebdb7712e00933703730eabe8447a2d1901bf1a46c1344ebd21073889b06254
-EBUILD stripe-2.10.1.ebuild 2202 BLAKE2B bf80256a61b6ea995d3d0ba49b2472b00cb0ccc033b6fa3a19ea92c6883084a463feb0a80780e22c9b7e91dec1cf4b2e3b59e5e249da44cb0f9145746d455bee SHA512 9da45008c3f9997dea71531b07abd3a25b82fb84c822a12f3f7b1e6d30d9f16ee35ff1af61eba5f6192eac37a32e9af1ee296ee58337a04de1e9f45d669794a5
-EBUILD stripe-2.3.0.ebuild 506 BLAKE2B 35a504a59675810feabaf8e5b488802f3e095fadb13aec1cbb3e3a7319570050c5a1ef3aba926449cd07070e343ca8711c81b9bade83ed0db8cd8546c32132c5 SHA512 ca7269f4cc894bc9d321ea712d083f97f69ffbd35cdd26fe5328b00f5cd95d256fe3c8d53a6e1a38d5b151030b40794792f7147fb94a1f65030ec1cfde5bac33
-EBUILD stripe-2.34.0.ebuild 2177 BLAKE2B f4b98b4b91724222695bab1cd05deb37808a5ef5c530a3a00b18529efda625d387fe7b46a4a895b55214dcb9d29b64f556710f796d3a38fb96aa14eb8dd75dab SHA512 eba0f3fb493404e29734e1d5ada5894e09a1b1b9f73c01873f5ab44acc80fca95ab6910fad3d2825377cdad0d7585a7d70056bc4e9e414103edcd2907e13dc6a
+EBUILD stripe-1.84.2.ebuild 438 BLAKE2B 4f588938d612034b231051c4138dbe427739776f9a29013c92d5c50d6b85faa4bd25921c8f22726658a034947ef20d7d85e37b2d0425446a8d32e9feb6bcc04e SHA512 0b8676b897766260f14e7a299f4ac4ce8c1c8d8d7137f81ba9d545d516ad23a8f4c27efaae132ce747d160af787bccafd9a282b7ec0630adf9bba14661aaa8a4
+EBUILD stripe-2.10.1.ebuild 2187 BLAKE2B 3eb981fd5773483b0800a39aed5edfa1cbe18998fd7fba484751c8e5701bbb732800c416f02bc65143f1c94e74d7d019a035c377337b6cbd9c9c1b726950ba99 SHA512 1dc6103c6fc6b5c9c966e7277aba29f3d25f6571551d71b25056b7b8e038188549d037f798c67b781517c26f888a4a337497b895b650667d1ed288309324fa43
+EBUILD stripe-2.3.0.ebuild 492 BLAKE2B 89a7fda7ccaf59319ade6c4d5cf1252522f8c462dfc9335c9e5f7c95a66965d15e26402dc9dba684198f666401bb3b78f562fd87d5f5343ee32571b9853d216e SHA512 a71aaf052891ab14cb97bb3624a3d48ede7a2da26fb5b0f2e8543cd0ca0b4b83839b9da9b03e1676454108b24bd65ac3ea486d70604af23a7ec086b3d6fc2a0c
+EBUILD stripe-2.34.0.ebuild 2162 BLAKE2B 3f351c2ccf0cb65e7ec64144dd5217574a42324c0c5b20d6a2c675bec6c57bdd0fa90375d8408aed7ee3c0db896959bea98b5f98a296114365355242d7145caa SHA512 53031d78caa2d47052e3887dd736e479cc96df0df9ce21b43a0d7602dc79d63220399eee57cea3d2265af4c6cc8981481a6fc2972cb0a9e9fed0c7606f0d8c77
 MISC metadata.xml 539 BLAKE2B 9232265d094774d1f04cba8e358a9655034184c10561bb8db4f8188381fdf7583971f67d5418f2969ad4a12db46a94b4c87c3eb9486eb0ac251fad9bb68f7707 SHA512 f0052ba8457139d76ddce67313bc973564237b409801d3d6da181c495c2d80184076cbe36468850a1ddcd60de50327e728fc3433a8a4bfe9608713a33fdbe9c1
diff --git a/dev-python/stripe/stripe-1.84.2.ebuild b/dev-python/stripe/stripe-1.84.2.ebuild
index 7bb4d65b5e8a..f4b272ecc1f2 100644
--- a/dev-python/stripe/stripe-1.84.2.ebuild
+++ b/dev-python/stripe/stripe-1.84.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Stripe python bindings"
diff --git a/dev-python/stripe/stripe-2.10.1.ebuild b/dev-python/stripe/stripe-2.10.1.ebuild
index fd2bb82718a0..edb3c66b5c30 100644
--- a/dev-python/stripe/stripe-2.10.1.ebuild
+++ b/dev-python/stripe/stripe-2.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Stripe python bindings"
diff --git a/dev-python/stripe/stripe-2.3.0.ebuild b/dev-python/stripe/stripe-2.3.0.ebuild
index f7f075eb7ee2..9def1b79b23b 100644
--- a/dev-python/stripe/stripe-2.3.0.ebuild
+++ b/dev-python/stripe/stripe-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Stripe python bindings"
diff --git a/dev-python/stripe/stripe-2.34.0.ebuild b/dev-python/stripe/stripe-2.34.0.ebuild
index c7cee4c2e881..1eec06317a28 100644
--- a/dev-python/stripe/stripe-2.34.0.ebuild
+++ b/dev-python/stripe/stripe-2.34.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Stripe python bindings"
diff --git a/dev-python/stripogram/Manifest b/dev-python/stripogram/Manifest
deleted file mode 100644
index 0950767d4fdd..000000000000
--- a/dev-python/stripogram/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stripogram-1.5.tar.gz 12195 BLAKE2B a252533a513d858d251bc7a6c75b1f2a525f92cbaee121537bb1e99c280440c145ca09012e373f37d5bcdf3aa2e3fd3b6960ef35933ed135680c50c38d21f3f5 SHA512 7973f22492bdc564b8aa6cefd68c3c52cb77a079d97c867cec9e2e69dd495a2f9cd555ef3ea48c4b90897fd21fe0509fbc22a59f4de3f56bfddcb15e803bbf68
-EBUILD stripogram-1.5-r1.ebuild 444 BLAKE2B 0c3d28d3e79fa3cbfcbe616e6b10ccc32ae8f254b131953dc138850b41239bd199a97dbf7480f2740611a6df4c2853e9b363341030ac25f0318467572340c8b8 SHA512 408d6bbcd67799baed31933be7229314f0f72ff02c36e22cb04f9969617aefb63752f26473626eaae28600b836132ca7696c461b258ec5d55859132c8b94821b
-MISC metadata.xml 313 BLAKE2B 934f234e212e61f4e3e7a0195b3164a98c2b67e63ceef16b588723f2ea15b2b661f3ce2e9f21f601eadd47e24b8864bf855557fa94aec9f08952797fc5819f0b SHA512 a1b891e8cd09a5b724c362af841a03d1eb3359579c05ec0b01b7da4d829082bf75826770fbf8a05558a8fa2eac8a1bad5ebc8289a28696a3edfcdbe4ea9be108
diff --git a/dev-python/stripogram/metadata.xml b/dev-python/stripogram/metadata.xml
deleted file mode 100644
index 34a7fa0a8e41..000000000000
--- a/dev-python/stripogram/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">stripogram</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/stripogram/stripogram-1.5-r1.ebuild b/dev-python/stripogram/stripogram-1.5-r1.ebuild
deleted file mode 100644
index 2186cc5ece30..000000000000
--- a/dev-python/stripogram/stripogram-1.5-r1.ebuild
+++ /dev/null
@@ -1,19 +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="Strip-o-Gram HTML Conversion Library"
-HOMEPAGE="https://pypi.org/project/stripogram/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/stsci-distutils/Manifest b/dev-python/stsci-distutils/Manifest
deleted file mode 100644
index 1b24df68bb80..000000000000
--- a/dev-python/stsci-distutils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stsci.distutils-0.3.7.tar.gz 48831 BLAKE2B 1c1d0399d4ff7108e24161239655e5db724c2cb2b3aa0f6b92072b45e9935929426cf0dfb39878cba3faacf8575a09a863ff6830ad583e3f9cfc171b92c8890d SHA512 8ef81afe43dc080d28ce7e640c1e03cd0e0a857151ad307af742ef434e3a1abb489213a63a95618bac39a743624510a0d59a2817b6cadb929a2bcf64406ac85e
-EBUILD stsci-distutils-0.3.7.ebuild 633 BLAKE2B c0a2933e5f5c1793671938a559780b46ef154b0adb0d745c0c284239816cd66f1f4c1f8603cb0c69231b776d839fa3fc4ec9a6384939df7d6de41f4387f738e8 SHA512 19308a65ef2214a6de51ace857ecfbca1a1418f7a76de08031b1449b925414e53d11700583e7cb115b98d45ac26686d672c62ba6120a03d3df096bb057c06b99
-MISC metadata.xml 840 BLAKE2B ecf230a9dc003fa83b69f324ff1d6c8b09d34e2aa30d32d2916b22bb9792ff855042dc6b24efb56fa6560d12591a2dfee3d0937ded149e5f4f48405e77372d71 SHA512 c438ce545bc4de08dd5de0d0c0ab3b19dc9b87169d8847078e2e3bcb4fde113f0db7dd073a42a047ae268eaf4e25efece85eeac210b6f2e5260b53de48d4987d
diff --git a/dev-python/stsci-distutils/metadata.xml b/dev-python/stsci-distutils/metadata.xml
deleted file mode 100644
index e839bf3d66e9..000000000000
--- a/dev-python/stsci-distutils/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>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription>
-  This package contains utilities used to package some of STScI's Python
-  projects; specifically those projects that comprise stsci_python and
-  Astrolib.
-  It currently consists mostly of some setup_hook scripts meant for use with
-  distutils2/packaging and/or d2to1, and a customized easy_install command
-  meant for use with distribute.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">stsci.distutils</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild b/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild
deleted file mode 100644
index fef550057902..000000000000
--- a/dev-python/stsci-distutils/stsci-distutils-0.3.7.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 python3_{5,6} pypy )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Utilities used to package some of STScI's Python projects"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/stsci_python"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	dev-python/d2to1[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/stsci-sphinxext/Manifest b/dev-python/stsci-sphinxext/Manifest
deleted file mode 100644
index f9aed156330c..000000000000
--- a/dev-python/stsci-sphinxext/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stsci.sphinxext-1.2.1.tar.gz 75591 BLAKE2B dc448475bc5dd888aae50bd4ffdcee222b4de3b9428823c52225e2c2dc7ba66baf09ca2f1770c3a85f44ad380b30d9170db7d610ee9262eb4e4a437f2a9ef15d SHA512 98860d6748a6be00a853b12adb283ec138c8111d7c990c5ae7f493089eb5974943aa9fb101ec8b4f280b77c49d07ce6d44c50384477d57710ded0f3382155943
-EBUILD stsci-sphinxext-1.2.1.ebuild 785 BLAKE2B b02842662ca580785105450c2cafb27c2f727bb74d41ebf2e0a06d78ad5ac9e4eb220c20ff5560e897c012d6825eac1b43a3370d6d4863509254300942985dbf SHA512 d5ea5a1fe07920e0f1f6be9c2b05ca91dbb895075c8fb41849910b6506b0d6da144943ba5fc17be069657b3fa63a9eb480a4f5191d6c8ee2ac976b7e1868d2eb
-MISC metadata.xml 477 BLAKE2B 38209c9db401ef2eb730a6a61247dfbb49ad25732417585fc1d423b34e5037439d01c826967d08194280e76ea45669da7ef47e40ee6017d8056530c915dbbb88 SHA512 67126020b606cd33cbfb87afbcd912f75e11393670e2c655e6f4e1b7406eb1db44fb4897b5101526ef4889c71b083547bc255eecf1a53bf097fc293342425862
diff --git a/dev-python/stsci-sphinxext/metadata.xml b/dev-python/stsci-sphinxext/metadata.xml
deleted file mode 100644
index 2c7222a77c29..000000000000
--- a/dev-python/stsci-sphinxext/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-  This project contains extensions to Sphinx to build documentation
-  from Space Telescope Science Institute.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">stsci.sphinxext</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild b/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild
deleted file mode 100644
index ad92df08e283..000000000000
--- a/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Tools and templates to customize Sphinx for STScI projects"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/stsci_python"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpydoc[$(python_gen_usedep python2_7)]"
-DEPEND="${RDEPEND}
-	>=dev-python/d2to1-0.2.9[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/stsci-distutils-0.3.2[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index de512179ff73..ffd5fb80c141 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.0-tests.patch 1058 BLAKE2B 4373418085d6382351a99bc6cee59ad8c65b4048ce83df2abf3b4c895976d52de658cd98dd9e3c971d96c185f0e9e82f12c42e6bea7193fd7a960193ebe89cd8 SHA512 b1accf4434415357a8c235c6b660cec440096616887e62fb45a2d15e314a3abb9be825bf4e8ec8d4b18d7ab08197cacd6916bbde87dc5b88c6f3e80ca89b1de0
 DIST subunit-1.2.0.tar.gz 460532 BLAKE2B 7f8a459afc576efed8fbf271a9d2e175ae9de9dda68acb26322f222ac46f12fee5dece4cb2679fca608ba307a3692aa84b13d0e093606bd89a53c69b2081cd44 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c
-EBUILD subunit-1.2.0-r1.ebuild 2657 BLAKE2B 9433d9339c8987484ed91eff3daa95f4a6b0fd4342b18f40ece87131cc26cf9582c1dee8f9b64b598eff9660284e4f07a587df628e92f0b0b556d058d3d8cffd SHA512 816aedd23cdd8f35b430e3db61340cbf9d85a945aab149ce0486dca462a20972e3a95134644020ed013f26e034e7aabe9e069bc38b7eb47c49db92bfdb9fc0cc
+EBUILD subunit-1.2.0-r1.ebuild 2652 BLAKE2B 069747d0d2ece8094cbed5a32edff52c0e318d5d50b89d29193bbf331b4b81857fde4d6621a460280320f3bd89192bbf8e7c5890ff12e79d67f99cb2f02ca192 SHA512 0c64c7b641e45c211ce999c520f6665f63f420b2a721a9e7d85e3e528e7f6b9855bd1ee69c06c959111460258c0c8d32659de7fa9ebadbeb9ed513f505228a6e
 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 fae3d07142e2..2800670d1bd9 100644
--- a/dev-python/subunit/subunit-1.2.0-r1.ebuild
+++ b/dev-python/subunit/subunit-1.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 eutils multilib-minimal versionator
 
diff --git a/dev-python/subvertpy/Manifest b/dev-python/subvertpy/Manifest
index 0c6c0c28306d..bbe7acb6a174 100644
--- a/dev-python/subvertpy/Manifest
+++ b/dev-python/subvertpy/Manifest
@@ -1,5 +1,5 @@
 DIST subvertpy-0.10.1.tar.gz 116661 BLAKE2B 81fdc21352f168c1a8d31398be21ad83ed72adc824dbbca7764fb1836cba4a7d7f03e4a96636ab29f4804682658ce834eea3fd433b5f161e61a702dfc6790e22 SHA512 083174ca6516541c48474673e6d601ff3098f19d204f311101f4de81bcd70d73bdb1e73dffe43fc584f35d286020cab1381dc1c44b514442735a139d2a9cd356
 DIST subvertpy-0.9.1.tar.gz 110972 BLAKE2B 1f11b55b81705b6b144e0c4ac53f2e0e5a847b96bb43589894c8c910492b443d61bfc5bdcbdba1e2bb757fbd587b029d0be113084a45c17aec8c0befdff0e12a SHA512 977e291c011e680cff9e26312b4235c0479374076964c7c4a4c3c7ec75bcc44ff7c458513ab89f1aa2b599d3bd8f94cbc6d1000afcf725a9f937a90b39456148
-EBUILD subvertpy-0.10.1.ebuild 708 BLAKE2B 0d25235eb32c264296397c77fa0fef600cc9c9f4a9e4276559390db76073475efdc7225536289bab8726ab3664509634b20697c8b2c57ce20870c5127d16b29b SHA512 35aa9682a7fcbd39175ccf736e8199821e8fa648703410df641faffbdd9ecfb9126b51afad40b0e61d63b8c9890daa8966c8d97f3894ea04f0e8e435b4d1382f
+EBUILD subvertpy-0.10.1.ebuild 704 BLAKE2B d9c8504ad95849dc03b94346ea30e87a7fdb777d81e69d5c11d8356322ec6e5851e38b61e60b64f5903ffbf72092683c514989738469fccde4251acb54612065 SHA512 dbcf61fb52b93ed4b429054ee04e4d9c10cb6a6b9aa363a699d646f37804bb3b78351bde71fc05ae301d2f6803de43c7f91655197add4c633b20cff6b59ef362
 EBUILD subvertpy-0.9.1.ebuild 1006 BLAKE2B ffa2b6c20de3029746694a6aca406a4b7659fa426bdc84fbc25ed1ebc6050a8b141b73bf7235f194e4a1d9047b2fdfbbc6a20c18750719d4bb9bcbac19da7f30 SHA512 80c53292ca9f168d262034584f89b042fd4820fd71713e0b6f68e3ac0f2edb7e921e65b2f6ef8800c94cbf6f417e0e73e3835c072eaad5f2fa5fd99698d610f6
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/subvertpy/subvertpy-0.10.1.ebuild b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
index ba73dd838da4..1ac7b93b8117 100644
--- a/dev-python/subvertpy/subvertpy-0.10.1.ebuild
+++ b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/suds/Manifest b/dev-python/suds/Manifest
index ec3d87c5c933..352892dda7ad 100644
--- a/dev-python/suds/Manifest
+++ b/dev-python/suds/Manifest
@@ -1,3 +1,3 @@
 DIST suds-0.6.tar.bz2 143985 BLAKE2B 3d97d51b4e719102ab40a6a95a35eaaccda15a47e20bedb0297203576949883eea253ac6f382c8849a522e1720393ec517ec1ff3514329b504c83a928a260881 SHA512 ec078b159bd83c5799e293d9607138ee1da90fdc64da203999555a4324ce7be0235156d3c7ad28e46f84180a6e51e2f3f82228e5e77ae41c61ee20f3db2c916b
-EBUILD suds-0.6-r1.ebuild 1641 BLAKE2B a491fce5be1b9715976cf0acc3bdf6bea40e6376b1a3921421a9c827eeccb2bcdbc08bee5cbc253d2a02821e1367211c2c67e522b595133a873b09d4c658290b SHA512 b2ee21c0e5140441677dfcdf2d5838cba39bbe417f69f0f084624a05fd479b4fa4b2f38a57c6f92ecba5f59775fd804f9b3b96bb9d53c66c9f3d0c957ae0d5d6
+EBUILD suds-0.6-r1.ebuild 1639 BLAKE2B 259197421ae183242f64180ffd1b0bebd432e335ed52cb0f3b29e7fb3144ed4db462422ae73e5b22d68359450e2425ea337a49d7ab6ed512799004bdfd890b1d SHA512 7bb80df58c77c08a67224f0ddb68e13040ad6a9fd73c994c7e220be0d023454970c13d1135a3f53d845fbfd0aa85a9eb321386955e4e2b53688967f46df099d0
 MISC metadata.xml 467 BLAKE2B 0da3f0b6af9a58a5468a019a9dcd1502765097c221a9b90545320c7209260f7d1ce5b2ab8cf495a48dd3867c63a70f68feef01352976feae2cfbaf7d7805fc22 SHA512 b2db05a4b1e5cdebd8132837510bee73355ef88cf2f22ec8ce8c439be5eb6a7d3a3f14639dc7dc9a5a3d99d45ac96a4322b9fcdd97719161b5699602d7b880d2
diff --git a/dev-python/suds/suds-0.6-r1.ebuild b/dev-python/suds/suds-0.6-r1.ebuild
index 01d1f425961d..e243f32a0a7e 100644
--- a/dev-python/suds/suds-0.6-r1.ebuild
+++ b/dev-python/suds/suds-0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-python/sudsds/Manifest b/dev-python/sudsds/Manifest
deleted file mode 100644
index 47e0ebee8845..000000000000
--- a/dev-python/sudsds/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sudsds-1.0.1.tar.gz 84196 BLAKE2B b78feddadd3bcbb6ed69862209c8721f8750ebb8bcb54b1b999cf51a8018c1a87bc1115e026a3784cb59b989dd361fb28c838e81b0b08231af2a0ed0066562f1 SHA512 11f064702300651dc7f7100698d20946f1ee06c8d08963fcb123620fd8ce34608ffb5a5df9d28f5b241080ead32680a6376ba224253383901a0d81240957be36
-EBUILD sudsds-1.0.1-r1.ebuild 470 BLAKE2B ec9aebdb7573f1a4b6dfdc38b9d092d5c97a3d266af561d4c6af6da82d31c2dde1809961d8656f61874ec843f82af4421b12b2ca71718c24f3418e8315defa8f SHA512 f4e21ebaf8b8ddf83f7d845e0f10ff62cb0fab8e316271bd6d4d8b2247daaa77eab514e8fc455db550a680107627c7ff8d1f4c5b5bd15e6e10ed017df4b6ec19
-MISC metadata.xml 373 BLAKE2B bbc67d0f1de381d2a967a74c5395292616b9a7c4b21a1f9eae933bac0630fd9522d1c36110765b9276bf4d70c2f96e200b043197aa754d5fd2fca9ca9ece6d96 SHA512 2a45aae0cf567cbc9e0dbafed05a6b5212baa2be839a70c7b43b67df77ef36efc5b6e310a8b21c8a540b9646a1fdd5cebb8aa7a0b81d870f93b51833d61969a4
diff --git a/dev-python/sudsds/metadata.xml b/dev-python/sudsds/metadata.xml
deleted file mode 100644
index c46e7f526c19..000000000000
--- a/dev-python/sudsds/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		A lightweight SOAP python client for consuming Web Services. Czech NIC labs fork.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
deleted file mode 100644
index 13d2eb3f9c89..000000000000
--- a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,20 +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="Lightweight SOAP client - Czech NIC labs fork"
-HOMEPAGE="https://labs.nic.cz/page/969/"
-SRC_URI="http://www.nic.cz/public_media/datove_schranky/releases/src/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/sunpy/Manifest b/dev-python/sunpy/Manifest
deleted file mode 100644
index 692fe5c542b8..000000000000
--- a/dev-python/sunpy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sunpy-0.8.0.tar.gz 6336169 BLAKE2B 554e64c27bb2c9c68629401bef83da3248a841c728d040fbda77465f04bd2c6a2cfb48f3a5df2bb0b15a306d6664f635aac7342e1135cf3bc61e1436a4db934a SHA512 7996fdcb47e4143159253180b2250ea7ac4aa8fecf8d3f1eae930da018d39ce4e663c843b4b0532e900f97d2bc9fadfd7c17837f4f045634820059a5af802eda
-EBUILD sunpy-0.8.0.ebuild 1441 BLAKE2B 60f98cb154d058ea595862f847c457febd41f6fecc3d83324d497aa95c9d602566f87d198d40f205d1997ed04d003b6cb341b551101ca624a24217d154ad8a73 SHA512 8d6ca9d683aeb87f49f3c7fbfa5c6412d0e0aba8147a49c1e260d4266e774f825d305b76989157220c01e666b52d13a58cbbd3ec46be17d56c01e480c287bc1b
-MISC metadata.xml 746 BLAKE2B 6e29c441458f02b55f3daffb617f9fb6d6df165999ca690403a3e563448e21a08a3648dbf110c25f29f4590b4831593c9404277471c89d716ddc9c8f03781a51 SHA512 73242a446a71a5f670e1993dd20ed2a66f06a3f3751e351edd9f24a2e77989f0aafde489b348d51264c0e4b1eca5fe34552b7378dc0bd19a8c351294adeb2b26
diff --git a/dev-python/sunpy/metadata.xml b/dev-python/sunpy/metadata.xml
deleted file mode 100644
index 1915944eec82..000000000000
--- a/dev-python/sunpy/metadata.xml
+++ /dev/null
@@ -1,18 +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-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    SunPy is a community-developed free and open-source software package for
-    solar physics. SunPy is meant to be a free alternative to the SolarSoft data
-    analysis environment. The aim of the SunPy project is to provide the
-    software tools necessary so that anyone can analyze solar data.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">sunpy</remote-id>
-    <remote-id type="github">sunpy/sunpy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/sunpy/sunpy-0.8.0.ebuild b/dev-python/sunpy/sunpy-0.8.0.ebuild
deleted file mode 100644
index c0c051c1581d..000000000000
--- a/dev-python/sunpy/sunpy-0.8.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Software library for solar physics based on Python"
-HOMEPAGE="https://sunpy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg2k test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/astropy-2[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.11[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/suds[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	sci-libs/scikits_image[${PYTHON_USEDEP}]
-	jpeg2k? ( dev-python/glymur[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-mpl[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" -m pytest sunpy -k "not figure and not online" || die
-}
diff --git a/dev-python/superlance/Manifest b/dev-python/superlance/Manifest
deleted file mode 100644
index 46de7d2a4a53..000000000000
--- a/dev-python/superlance/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST superlance-0.14.tar.gz 36237 BLAKE2B dcf1f94ae1832b912c800945930bc57fed43a91c8ac3bcb9f523f0f683132091c080ae77932704213f424cd094bdaf08bf118be96b4573f46aa91bd86ed8e410 SHA512 41fdc9cf83ce636aea3665aed0fa9b1a37c2fe4d3740db694c20f60676d44ee6cc534ae038018edc0a1057607bac9dd4f0d14ea365735148a19a10e138723efd
-DIST superlance-1.0.0.tar.gz 36909 BLAKE2B 68d6e4e778abe78200b1047448c9016f578026231ac92987e3ca469b4f2cbbb6a3a70d7af00ed3ed3078121a9224d413592c27be461b8bf988b10b60f20f477b SHA512 f85dbd0768820e2f679b374c5178e6b74de21cebd813a485f615203784e25a968ddcbae72cae41dc56f4f105dab9a6ead16acf4d4cffa3cf30d91650ebb20611
-EBUILD superlance-0.14.ebuild 837 BLAKE2B 2626c055afd7baf69f2fd467004f3f239df9774fcf53ba2b170abb350f4764aab7fa0641b812cb9e6c238b78ff53ac18f84740cb1a48af18cfd1204fdb954959 SHA512 59063b6d645f46b5d2857a8ba3e3315e15a65af08763e392a1203dc23588cfd46d593b8fa910509bc70442ec41ed02ea08cc63d0a7ddb2dd3aa470759d150c66
-EBUILD superlance-1.0.0.ebuild 837 BLAKE2B 2626c055afd7baf69f2fd467004f3f239df9774fcf53ba2b170abb350f4764aab7fa0641b812cb9e6c238b78ff53ac18f84740cb1a48af18cfd1204fdb954959 SHA512 59063b6d645f46b5d2857a8ba3e3315e15a65af08763e392a1203dc23588cfd46d593b8fa910509bc70442ec41ed02ea08cc63d0a7ddb2dd3aa470759d150c66
-MISC metadata.xml 448 BLAKE2B b55a16bc0017cd631d947d0581b9e7ed66902aa40d9222521e9cabd32cbb5e7365614176020e44515c549b2b79041c15a55ad8ba65f721b6a85a443bda2bd597 SHA512 042f27d3ed8f7860649dcac68d1d253980bd14ce0e043bbf899c5bdccfd65346994dbd4612b5ac83109c44281e88047ecbb5f0dcf8e29f9dd76090ff1179babb
diff --git a/dev-python/superlance/metadata.xml b/dev-python/superlance/metadata.xml
deleted file mode 100644
index ad375d27b2c1..000000000000
--- a/dev-python/superlance/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="person">
-		<email>sbraz@gentoo.org</email>
-		<name>Louis Sautier</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">superlance</remote-id>
-		<remote-id type="github">Supervisor/superlance</remote-id>
-		<bugs-to>https://github.com/Supervisor/superlance/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/superlance/superlance-0.14.ebuild b/dev-python/superlance/superlance-0.14.ebuild
deleted file mode 100644
index e84aeb9d1ee1..000000000000
--- a/dev-python/superlance/superlance-0.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A set of plugins to monitor and control supervisor"
-HOMEPAGE="https://github.com/Supervisor/superlance"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-admin/supervisor[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/superlance/superlance-1.0.0.ebuild b/dev-python/superlance/superlance-1.0.0.ebuild
deleted file mode 100644
index e84aeb9d1ee1..000000000000
--- a/dev-python/superlance/superlance-1.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A set of plugins to monitor and control supervisor"
-HOMEPAGE="https://github.com/Supervisor/superlance"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-admin/supervisor[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/supervisor-quick/Manifest b/dev-python/supervisor-quick/Manifest
deleted file mode 100644
index 27397625d888..000000000000
--- a/dev-python/supervisor-quick/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST supervisor-quick-0.1.4.tar.gz 3662 BLAKE2B ad3c764b5a62833d9296e8ff2d94e47c92d684e9e7e4f2d1098bd992f06467ade0eb4651b850f595e36167a08aabbf099c6202ba6f195ce8359aca2440ca0df8 SHA512 e805cdb28a5f1b7d594983cd807cfc015c6c28c721e4595143b2856f29f82d8c835ec47969ea240922395cd8fa682da475ad53761f3a8510941d9c2e4f80f711
-EBUILD supervisor-quick-0.1.4.ebuild 442 BLAKE2B 36f5fbf02a938e50b22634752a9a0234240fd78b6067d5407329bb23d3014d1244381bdb44aef9aa9f446fec446bda66be14493815c3123691052a410aa3ddac SHA512 a5f988ced9a6cac00fc307bfae7be825a60c5e05e9f894490be5b748ec5324dd98d514446f0caa88251f0ca392f9a564fa3b585313db53083322267d08e88357
-MISC metadata.xml 340 BLAKE2B d67a793472bb117c8ceb3e73c9ac766009f960d9f60ed99577046e13c1fd40a6cf38525440900c9fefffa49baaef3b6f0b307a926b4daf79708f66bb865ef9aa SHA512 f4dc593baf929a342f017a84ccbc244f7b39bfd2b16d0ebdd60b0c8154a6ee426d9557edbbcb3a1fc32f31d38552ce144a24659ead87442f66cc19564a5b8dd8
diff --git a/dev-python/supervisor-quick/metadata.xml b/dev-python/supervisor-quick/metadata.xml
deleted file mode 100644
index a11c8199fa7f..000000000000
--- a/dev-python/supervisor-quick/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>klausman@gentoo.org</email>
-    <name>Tobias Klausmann</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">supervisor-quick</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/supervisor-quick/supervisor-quick-0.1.4.ebuild b/dev-python/supervisor-quick/supervisor-quick-0.1.4.ebuild
deleted file mode 100644
index 3e0963ff1480..000000000000
--- a/dev-python/supervisor-quick/supervisor-quick-0.1.4.ebuild
+++ /dev/null
@@ -1,20 +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="Bypass supervisor's nasty callbacks stack and make it quick!"
-HOMEPAGE="https://pypi.org/project/supervisor-quick/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	app-admin/supervisor[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 50def6857037..a2b2201a6ea6 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,7 +1,3 @@
-DIST sure-1.2.24.tar.gz 28089 BLAKE2B 2de015513f36fe101ea1d23a8499bbb06cf54d733bb55d99afc0eea274d1579a155d4d81e62616e655254d885d9fae55c6897560b2a845beca2c90a835d1c037 SHA512 875d2cb220d8915737909df372bedc2266c5c948c6f5ea23f3de5ee57b0f1179d2a0ae3455228d71a4f0f4279c098bb4c142a862b55462d67fd425c0def49a8b
-DIST sure-1.2.5-r1.tar.gz 52128 BLAKE2B 8370bccba9e9345030dbacd91758dc1be8d122a95079f20676e7867b5c51e335ccf3a41913dce13804d805136c98255605d757f76362e8d3c08c6859a9336129 SHA512 733df3a9482cc23e5f078b554a80a726ed87f4ac307b00166d5ad7d8d40de47fe7d77a7373b213d75fc78849a2ba0dbea89f71c6f29449f52eab448fdf847c45
 DIST sure-1.4.11.tar.gz 45933 BLAKE2B b2146ee56237f4575cab5122279023066a1b9ba20493ced7d729b1afa456f71a38071b721c39594c3ef2fcc912ba934e85e5cb5da576c3b2d20fa7d4926b56b7 SHA512 ed067385bf9cf317a5d55f6c5fc6ee54ee3d592825be398e47c37d31fc9c010cb9316d4e2bcf1d72d53d7e53fd470792d64348aa2bfa5dc43510daaff97742da
-EBUILD sure-1.2.24.ebuild 926 BLAKE2B 307f849a9e8799ecb4f046775240a85912eec92b31103e897a7d454c82a157838168e0fa1404d7208873a4aba108c47bb26bfc447454411fc65f337005ccd50f SHA512 5a7b15b635ffbc38dfd314eaf59c2e88187ca5a97886bb4b93701ae301cd2c0c8850ead6abdc57c3576fb9349d079438b4670a76f15cccdeb6835c6fdcedcb3a
-EBUILD sure-1.2.5-r1.ebuild 892 BLAKE2B b8c83315e11779f56f840241e0664a44642d49503123f0bc6916e413933ceb31fbb75fb6da94e5a0fc43a37f55d58bd86f1d7c3514408c9da940e9af03f47c01 SHA512 eef8d31f527aef5c1dc334d223b62bf9e158867c7bfb52bc24b46d55f1fa643cb7bd4533663efd430fcef33aba62b549c263149f75b971801c77967e91be6336
-EBUILD sure-1.4.11.ebuild 736 BLAKE2B 398e918a3124951cac02b9df131953193c35f93c05b401476a662204ee1b9898e5dd2b4dd1646b069b85f7ca1600b1a51e672337ccf1772dcc6b51285c9ba276 SHA512 74460d614e11c1bff26591e02610d0543aa635f16b54d706bf96f1e3f757731d30bf7d8c4e24e8e4780ca0fc8b260b97acb2ef7ae400d2a84b7468843bdbf81c
+EBUILD sure-1.4.11.ebuild 736 BLAKE2B f6b27c6ee4045bc693ce9d698e4f75193c0f904175f1895fc6ef8e356709549274b2bde68aa63145564d5ce4adfdb42071df1dd982df8be569c0d5d0ce6ec7be SHA512 8833d8cb067c6061990d176cc5eb58fe724dc6df4db9e80c2d3d762f10291bc49812929724d7afa4abe1fbfcd5954f4818d6fe26294e51c289f01fc03b2afae8
 MISC metadata.xml 580 BLAKE2B fd57ae5f0db3af8fa1a3752dbc6c5c0d2f614b19b3a791e416fae0e4500f0a3ec8f88a45b46b37745f92d7538f54846379b8ccb8d3cf6afb0cbd613b0eb4bf40 SHA512 ac9536e4de1fd74d326af98154065afb9a42e6b29b5ea2bfb22987be15da16236aa2dda813257be53158edb426c021e4e6a0f954299c64fe55be08f5b0f3b8c4
diff --git a/dev-python/sure/sure-1.2.24.ebuild b/dev-python/sure/sure-1.2.24.ebuild
deleted file mode 100644
index c1938b2a835b..000000000000
--- a/dev-python/sure/sure-1.2.24.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility belt for automated testing in python for python"
-HOMEPAGE="https://github.com/gabrielfalcao/sure"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	~dev-python/rednose-0.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${CDEPEND} )
-"
-RDEPEND="${CDEPEND}"
-
-python_prepare_all() {
-	sed \
-		-e "82s/read_version()/'${PV}'/" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v -s tests --rednose || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/sure/sure-1.2.5-r1.ebuild b/dev-python/sure/sure-1.2.5-r1.ebuild
deleted file mode 100644
index 2104788a61a8..000000000000
--- a/dev-python/sure/sure-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility belt for automated testing in python for python"
-HOMEPAGE="https://github.com/gabrielfalcao/sure"
-SRC_URI="https://github.com/gabrielfalcao/${PN}/archive/${PV}.tar.gz -> ${P}-r1.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-	~dev-python/rednose-0.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${CDEPEND} )
-"
-RDEPEND="${CDEPEND}"
-
-python_prepare_all() {
-	sed \
-		-e "82s/read_version()/'${PV}'/" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -s tests --rednose || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/sure/sure-1.4.11.ebuild b/dev-python/sure/sure-1.4.11.ebuild
index ba7f78aadd82..d30b2728f231 100644
--- a/dev-python/sure/sure-1.4.11.ebuild
+++ b/dev-python/sure/sure-1.4.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index 39cb66655709..2db466359a9f 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,3 +1,3 @@
 DIST svg.path-3.0.tar.gz 17077 BLAKE2B 6fdb51c982575639337d74a6f02f0bb3cc44dac56bd6982dec6493bed52d9caab5ed725ac59bf754f309cc62ef6f77faec462afacc8f93ce9a20b886ef2b5c8e SHA512 73d23f1386bbd4d1c1d805766f7e6fe6f8b7ac731e104020e7d853d7f1b46bc2681f44ef20d9c5343197d9d16b2af49f2c4ef4ba5945f4d25fa0493502203e13
-EBUILD svg-path-3.0.ebuild 632 BLAKE2B 461e8bdb2053ad3c869bb2c48f2e3d7fdfb734cf6403bd170cae84fccfd4e1e600d43e641f6826334e3d62135bd1d44b97655a3039c8239dfc04040302c5eb08 SHA512 241e190cc7aa3f0c2e3a61dfb0f7bf4b6bbeabc010b4823a3e978a962348e31795cb9cc657d1ecfdd15d4354d8532f6a80e5b99dfba46f3e2306715052ab70cb
+EBUILD svg-path-3.0.ebuild 620 BLAKE2B 5783d88dd07f851a5a5bb7eca50483de7806a4f9012ff94d1d4658d6f36185c67709b89c41504a6509817f023ec6003fc0d99daa1be5ec813c31a128dee34a6d SHA512 fb6dbfc3362126fc6585fcac984cf86cc5ab6f15405c707f9aafa3a8b566158c32f7fb50b38e4fc72655408c192946c51db255269a81bd94ff0a4f0a6fa578a0
 MISC metadata.xml 710 BLAKE2B e7aca93129d338f2100be70376ad2c995bd03c63d1625e6ebbe033ff69641f0a6d5f31246a71224be6b7fedb10e9523f97dbc2c7e80ea49e6848ddbdf4e70742 SHA512 62231c70791c98f96a2f52c653a2d8f3c80282ce23e445f0a4375fcbb98f797c66dbfc04127f6ffc2d13b6fef4675f83a478ac8d35110950ff21485612c96028
diff --git a/dev-python/svg-path/svg-path-3.0.ebuild b/dev-python/svg-path/svg-path-3.0.ebuild
index 51429bc96df4..9d0dcff79ea3 100644
--- a/dev-python/svg-path/svg-path-3.0.ebuild
+++ b/dev-python/svg-path/svg-path-3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index a1168ebe6b23..813d1ff14b8a 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1,5 +1,5 @@
 DIST svgwrite-1.1.12.tar.gz 202920 BLAKE2B a2b60f3c3829203342919bc75d01f64515f13ba305f357fa788c3754679451e21a7ab97eb517413d4e882e7271d063e7034a10bb70a1946d84734e23e838bdd1 SHA512 326fcc0dd0749925c0c35793a91ffdb25be1fd724d7d87bd6491a6396a6ab65fce073a387faac4f3d034ceadcf24ef73e3838cd249c4e1c19e20b1e82769cf1a
 DIST svgwrite-1.2.1.tar.gz 207371 BLAKE2B 8d6198dbfbc9230eb1592651bde3daaf3f14570aa57fb5b0a3e0989b36b76181bfeac9ee96ee7dcf0ad6e53d1e4ec7035e66d2d1f45ef92de59fa0305f391923 SHA512 8874a25ce5418dc86b0f7034555aca46619c415ec6c51243d713f168f9255ddec8d17ecde13cbfe1a4ffcfbad5b160db62d226b5b0106725dd263763d43abdc2
-EBUILD svgwrite-1.1.12.ebuild 502 BLAKE2B baada67e9f5fe67f03846b60f1fd381bbc40fd11787c62a422b6454975c68d52b34d9f28a66a35530e395354376e7a7dc807295a228e3ec4668fc06b52c3d1c2 SHA512 925d82013d9e649a52102672d562f0fa0552ad9289b1ba9be4569e63502bc82e35768f11454610961805d5724e1af4047a1e4c691805a00b8715ef74cb6d1a83
-EBUILD svgwrite-1.2.1.ebuild 673 BLAKE2B 7c22ab28eb1d901ed10e867c9147fd0bdb748debec2f6b4cb5e47f13b33683f6c696b90b22a9280b2c0d22068f4c96b6c1db4154aabe6006f67cc4fc2d4945b5 SHA512 5e572f2851aff0fded3ff170c371ceb3674df2e8852b3e4c0a59e4a3a5653c4ac3b7242f7008d8b557fdd19b588322bb7e11f21090090577462fe6411ad48216
+EBUILD svgwrite-1.1.12.ebuild 485 BLAKE2B 4a955c32f477ae8d70250c2cdba6190d6252055aa6e3fe1172c0203f1aa2b4bfb39874a0af28777e6630c7da3f16a4737abcc49531c64ecc03bbb1319d390249 SHA512 16aabcc5b8445858882bf7d69582cb3b612bcb311b21cf278e23e75bcc6aa47b62e6ea4bd6c80e6721075a130f45acc08f22d3c5a5fd815e52df039ec4aff5e2
+EBUILD svgwrite-1.2.1.ebuild 661 BLAKE2B 49bb7d727736f7c1dcceb1fff8c4453326ea6f411fdf888eb026bfaeab0295ad84c53858594e1b079be7975e378e6024db5676ff01f70d5a059adfae696031b5 SHA512 3acbe5fcc6448012e6e2e547836d6d1f11b1298ac52eb5eddd2f789f42115ee379ef4dc96cae1b44b7707568e608673b78b6e6e04414e270f132a6797150888d
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/svgwrite/svgwrite-1.1.12.ebuild b/dev-python/svgwrite/svgwrite-1.1.12.ebuild
index dde90e114ee0..d5f466c98e98 100644
--- a/dev-python/svgwrite/svgwrite-1.1.12.ebuild
+++ b/dev-python/svgwrite/svgwrite-1.1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python Package to write SVG files"
diff --git a/dev-python/svgwrite/svgwrite-1.2.1.ebuild b/dev-python/svgwrite/svgwrite-1.2.1.ebuild
index 75441f65484c..e64807ce89b1 100644
--- a/dev-python/svgwrite/svgwrite-1.2.1.ebuild
+++ b/dev-python/svgwrite/svgwrite-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python Package to write SVG files"
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index c61c78fe8355..5f41761a0d13 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,3 +1,3 @@
 DIST sybil-1.2.0.tar.gz 28720 BLAKE2B fc2fda9763a33cf89f47b5edf3aacf1d3c9ba712cc6e292dce0549393f2177afb6ff058e6c4ac96b0ffcc44149dab4c8da5da50ef6850555e374ca25906b1e14 SHA512 9355bfe2873eb9cec866a1c267deb876f3e6b1e452e0b7c951e5ffb642e79cb6602bc81384ff4e5bfff1adc0be2c95bcfa291d34b7690feae9b280a92b6b5c85
-EBUILD sybil-1.2.0.ebuild 460 BLAKE2B 4ce258e1534378f3d4fa9650a8f07cd46055acaabf2e390d4d541f799be254a393d1ca697cfc56d8dfba79064b303c5b40e5a4ac749135ca3cd6330a18b37276 SHA512 1ba467559276878c7a8dbf3e12cf1a905c084d342702eda4e04e2320a34aa34987ffd3fa9fd072e261212a6b827778f0e61e87f27279cf4560f591772bd63b39
+EBUILD sybil-1.2.0.ebuild 463 BLAKE2B 9d7cdab6de72469fa6360d5188162056b05911320f7fb1cfce7d40676832fbbabddae17d4823bfe5300ca3de7b0a9f08f011f2f3c70c27f4474f7f3f29de787f SHA512 109e072e72781f1d31637da0f818831e09c69dccd1178ecf321e411a3bb15b99eb63ac77a78ca66577819d288585ad2286d57432ebc26d5bcd07db4f8a13e5e2
 MISC metadata.xml 372 BLAKE2B ee52c5344be6eac7a7a79165e71cf7d198d8ee21591c4bbe5b8ebfb830019aa9bd32cb4912e6aaa59ca9e2147262278f2bafa3b24a89fcb67e930ed2a033c281 SHA512 c586f579a99f202fc403523fa870bc7aa31a437527091c413abf4c47795671ebbb783c74afe32790e25c75c9aeb19dbd0e6dd7367cdcb69ebf128367502b86de
diff --git a/dev-python/sybil/sybil-1.2.0.ebuild b/dev-python/sybil/sybil-1.2.0.ebuild
index 6273cc68d1a9..cb7660b067f8 100644
--- a/dev-python/sybil/sybil-1.2.0.ebuild
+++ b/dev-python/sybil/sybil-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Automated testing for the examples in your documentation"
diff --git a/dev-python/symboltype/Manifest b/dev-python/symboltype/Manifest
index 3e41c8174aa7..a69e3a226c03 100644
--- a/dev-python/symboltype/Manifest
+++ b/dev-python/symboltype/Manifest
@@ -1,3 +1,3 @@
 DIST symboltype-1.0.zip 9507 BLAKE2B 35032a90dd1b73dcc1226e445427ff8567693046fe03d25d0c24befb2d5aa2def7b2e9f3ef955486544547d16cd04a41a188e12cab9f3fac797c39436eeda90d SHA512 1484adf4bd2df4f6def5cb6dab50e17d21a2baacb12af8a03aa981478deb97d1cfd3620c0e7d0e6e8c631b0c6bfc3912196c20a0feb39a3ddd4cf9e9dc42b6b2
-EBUILD symboltype-1.0.ebuild 723 BLAKE2B 224dec8fcc6ef355ebec46d0ee4b76e9b884840ce656efa1937357e1b51a145452aa00ba4fa5315e6f86f8b556271364a2f6243d555012391af5acac5b631ab0 SHA512 364da5e7df724b74aabe76b974d3f159c4d8fb4de481565ed50b5e166fde0eff16bc16988d9be666be9dd53c35a713d9977035097964b5126f4acc248978d2dc
+EBUILD symboltype-1.0.ebuild 715 BLAKE2B 97c8ac70c15b0fc15b83b17cdf59a8030d4818da70294fb42374cc7b30583578927a29833236864d21505d862ca6b1788840a740f1e46ebf326596623dc7e5d5 SHA512 6af93c7d038c273131e1fac8e2978157b069a360c7c3bfec0708addb15e959c511cee95417894c61207a2c6817176d33727cfab3eefc25886e88ef8bb6d70543
 MISC metadata.xml 323 BLAKE2B 4bc599f34ef538bf30b1a1f20ad3773cd65c04e9341b86c876dba73eec725c49b7d47b252aa3cc18cafc51d29622625dd6e88eb5110f5fe502a067598f325d4b SHA512 8fa028634a6e9c5a60fdd9864555c2c9a626f1bfd3a5eef7e596ddfe0c66500c2839fd2aa8553615f85f02332d8b5255b2a920d531e4f939f46ed4a30f189b8f
diff --git a/dev-python/symboltype/symboltype-1.0.ebuild b/dev-python/symboltype/symboltype-1.0.ebuild
index dcaeb2058cb5..2def120e04b8 100644
--- a/dev-python/symboltype/symboltype-1.0.ebuild
+++ b/dev-python/symboltype/symboltype-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index d2b3944d7878..09e415385305 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,3 +1,5 @@
 DIST symengine.py-0.3.0.tar.gz 90877 BLAKE2B 8e1bf5741eb0c6ff6fd954b9f8b1827afcde61e55f0c5d6ada96bdc16d164003b21a51c2b485bc635d1f87e449c422f50e6bc8fca7371996dba7fdc096b0798b SHA512 9f43d572990744a93f4046920b09c80aff3ffa0e5735b2372298a65755140dee6c2c22c9c9fd964622f03379e31a1f1415d0051b213dda943ffc8e839059c7c6
-EBUILD symengine-0.3.0.ebuild 968 BLAKE2B c67f9c71f6560f2347301da9340ae9ee7300b21df1f1f9c468c05d4746d76a83da8e0f72d3834a474ba3e6fec4ede13493d47d0bf1ba216aca24a7219f34d35f SHA512 f63d779583d159168c2c9788d2bcb4573f4c56cf991c81b2f9ddaca0db9f8dffec2f304ccf2f1e76dcf1b994443f9882ad68716bd3ba4a97625da74e545318b6
+DIST symengine.py-0.5.1.tar.gz 110864 BLAKE2B 30309b87cc612df37fca94df5c3199401a2cff9fd782de2fa00910bf17a1bb2debfb851aefc6178a38eafe49055950b76373c6e9a81a2fe5814497c2894b5f8e SHA512 85df42245daad0387886f003a593e8d45f34e51db4ed207f6bb70f573704a33f24a1cbe30f1c67c2c1541f1e800208c90b3ce3ec35c9d4eab05bbdb5be570ef5
+EBUILD symengine-0.3.0.ebuild 968 BLAKE2B 3e6bd30cf2c16c1e21d012365355366b3e96ce03bb8c7327e623ff5c93b00baaba334d57bc34d6e7f92306870f3a8148c364429315915919530839272774bab7 SHA512 5d8b261d224d83b7e5c8fe7c290f29ec2fde7d59c87472616a6668575ffdf858ddf28577129f1b66b8575cf4a0a33f1a17c432e0b22f620ae9512eb34a886bb7
+EBUILD symengine-0.5.1.ebuild 974 BLAKE2B 657a8e0ee0f3d40ab0ed21568886087b04ac417e5d46282c09cef6d4c425770f64cc771e60f078895ae95e93922106ef905c98425a3a9f71235b92fc6f604af9 SHA512 96fbc23e08aa89b92dc7337f40b3477f4eeaa4e68f861cc02c6b20e7a4ff6c942e3b8eef6187fdaae26d8bf14ffc0d787b74681e6abc70d8b124a7e4dad8c4e5
 MISC metadata.xml 499 BLAKE2B f8fdd047ee3852b23514589163dc6ff82dfb69c93b8c00e8ee35af3a8a819a3e83051c4acc634a03044caf12cf47a96f892ef5ccb491da55ec4a3f14b4475455 SHA512 e3b01c1a5e3417fff75d843b24a20597c15900defd0efad954831b61a03980c9163fc596bb22ae4fe4cb5162cd492c383247560ced28c395467e1facc49cd573
diff --git a/dev-python/symengine/symengine-0.3.0.ebuild b/dev-python/symengine/symengine-0.3.0.ebuild
index 9a03e24d150f..91da4535de47 100644
--- a/dev-python/symengine/symengine-0.3.0.ebuild
+++ b/dev-python/symengine/symengine-0.3.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
 MYP=${PN}.py-${PV}
 
 DESCRIPTION="Python wrappers to the symengine C++ library"
-HOMEPAGE="https://github.com/sympy/symengine.py"
+HOMEPAGE="https://github.com/symengine/symengine.py"
 SRC_URI="https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/symengine/symengine-0.5.1.ebuild b/dev-python/symengine/symengine-0.5.1.ebuild
new file mode 100644
index 000000000000..531654017bce
--- /dev/null
+++ b/dev-python/symengine/symengine-0.5.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+inherit distutils-r1
+
+MYP=${PN}.py-${PV}
+
+DESCRIPTION="Python wrappers to the symengine C++ library"
+HOMEPAGE="https://github.com/symengine/symengine.py"
+SRC_URI="https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz -> ${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/symengine-0.4"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MYP}"
+
+python_test() {
+	cd "${BUILD_DIR}"
+	nosetests -v || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_prepare_all
+	rm "${ED}"/usr/share/doc/${PF}/README.md || die
+	newdoc README.md ${PN}.py.md
+}
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 38d92c8549d9..9f44ad6ca25c 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -3,6 +3,10 @@ AUX sympy-1.0-zeta.patch 1908 BLAKE2B 1e2ff1b8cc04505a956ccaaf310680ceb4d749bb15
 AUX sympy-1.3-eta.patch 650 BLAKE2B ad61ef317f4f2c13cc6473be2a6a5a6d922a287c8152b5f7201b85f3b2b8df0dde92f4826afb646b06c42cd208eea9fd83610b9a509f2caf388457aedca808b6 SHA512 1ebb9bea63695875c6a35bdc328bad3142617c63b2e8c59ece58e90e5d0cae280413e4b26b411bd4a917b3f6d9eb90ed6ed997ee9e2331aa8ccaeb1b2ecbf8f3
 DIST sympy-1.0.tar.gz 4281528 BLAKE2B b222be6ec486a01ac73e9778a7423aab45e368386003de965308cfa4e08fef07b64046f62ef707b6fa124ee6367fb051b9722e138bfe2eae4661f9e2a66c2365 SHA512 977db6e9bc6a5918cceb255981a57e85e7060c0922aefd2968b004d25d704e25a5cb5bbe09eb387e8695581e23e2825d9c40310068fe25ece7e9c23037a21f39
 DIST sympy-1.3.tar.gz 5885611 BLAKE2B 14b0639960432cd6aac087a57f81a80497a0bc40ed61eae92166cf5549deaefc611ce63c2e7a89922374e9bb902fb0a7402f5a4e425278f34c028cdc3582eb35 SHA512 3b47dcf80e9a0ca7d65860907264bbcd6f6022275c717784cd165a7a824dca3471bc5a3be9d1af6ab31e04b29f7d5305713fc47ccb67f798f45281e0ab7e03bf
-EBUILD sympy-1.0-r1.ebuild 2787 BLAKE2B 4dd41be8308b4f97425ec0a9980ef334f95a7d9b8b18fff1fee5fc01a185f404c1d2adc021d1345dcf1047f38eccea84d9d13d3f8e4e5db5499465d4e96bd137 SHA512 780527a85b9aa253d9b066b2f12b74fbf26542b0e5aaed6da0ba85555ab36ae08c6754de7379028ce2d2ce76c99ec3b89b4bf03a1a87571a281872f033ae6c48
-EBUILD sympy-1.3.ebuild 2692 BLAKE2B d415c49eccea363e79e85b334350a1ae012f6c659fac5d685c025506916bd51afb62718e912adb17c44a94be9263f2931d7632b82b70bbb152da76a70f14a2be SHA512 57ad69d617fc11505c2ab9b70adbcf12589cf1affca5f292610ffdbf0173a8775fa0756d344fdb09a1398bde2c160dc6bb7dbdc0e923ee27f8ec9465cd3a4d43
+DIST sympy-1.5.1.tar.gz 6815997 BLAKE2B bc74d01fdf2ccea6b83a06c11f810e3d105e9d35b397c8b87a1bcc4e316d00c456f576baf57d1b4a6175e056dec58f05fbb05893519775ffa252ac018452d2ff SHA512 3c4220243d2cbcff9eedb2a7986431b5b4d7d0007c78208a60b21830c9a3528d2171086874c42205c1227f779e44c19b9562943e2935d329bc352e7ea85396c7
+DIST sympy-1.5.tar.gz 6294079 BLAKE2B ee6764264d87454c9713a6e99b70b123e1cc2d36a691287a53e8b69a548df5503168989afa2ca85a08cd5f6792c952e5556352fde07332b1fe47b3746d02b47a SHA512 882ed99cbc7333cbed85d247d04a764a92855e3d26cee96163d18ece566115b9d38999bbe022225521834037dbdfc4c567548112dfddd5ece65af8f672a06091
+EBUILD sympy-1.0-r1.ebuild 2783 BLAKE2B 8e97b96c138dc1ecf12b771c7677c8d183888691f4c52c440a0a18c338118b495524fea9cad5aa93bd99ab6469a3d1d352b59fb2cb95cb56dc0e97facb272355 SHA512 e63b12d6509803108174c1254d9e26ad64d9f7b1f15115bf3da291d9bd03cb665713811d6bd954af3ae9ee188045d47cd1c9a5d5e966b6585c396e6cf4dcb9fb
+EBUILD sympy-1.3.ebuild 2688 BLAKE2B 58e68096e5390f576f8f9fc9d56729001c73252594e27fc3bd710eaa0fd4f5858056a522e2f492878d720b3353efebb463770677da7395ed4729ababc203ac7a SHA512 3d31d6e412f211023e80a82815ec2499737b0ff83cd6f7bb5e52e3324c1d3d45a8374ef46bddec938514bf55a19873d84963547972fed77a912cb5f6f24e40a6
+EBUILD sympy-1.5.1.ebuild 2658 BLAKE2B bf80f17cb99075edccdda39552bf406b13e0a9ece891671c12159c4a9379d9e0b9123d867a6a0b58ce88ce2b5c488b42104387ce3efefa790e61a3edf09b5005 SHA512 93843bfe83f2a155c574840b61fbfaab899a022a1caee2f5d3c2046a2a13336219df20c3e64daac87a8b4f2d6cbd54656343783946e2899ed5c8713a80488f27
+EBUILD sympy-1.5.ebuild 2646 BLAKE2B 01367bb54076e40fe654f317a84a1451410e744f92aeb41e8e8dbd2f02ff7d480a6ae571e0fc03bbad06f818895191ff9bbcb3ea6562c5c50310a6af231dfda1 SHA512 0e3ac939be5306dc402e2c2ae808e600758b2919c20c2efbc0cfeccd5a18bf59ac44e06d9a79202e6e536415ee916340574f4b4969fe872de556ee9ae6b463a6
 MISC metadata.xml 1476 BLAKE2B d6a0d7816ae7c0c2d61d6f584b9c872d0169053d43bb604f66ff242721df6f74788ade3de06b23db53239dc0da1182beda16c86eb7e7b383fb0964b13eca1883 SHA512 99d6eb86839fd09abd4db55783e028c6f97c9d0dfa8d68ceda881e6ca981f86877e55a0a83d34b432833f0824a896eea8af35eb9ea499bffe0c62e1e0a27c3c2
diff --git a/dev-python/sympy/sympy-1.0-r1.ebuild b/dev-python/sympy/sympy-1.0-r1.ebuild
index 90812d1744ea..ee681475875f 100644
--- a/dev-python/sympy/sympy-1.0-r1.ebuild
+++ b/dev-python/sympy/sympy-1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 eutils virtualx
 
diff --git a/dev-python/sympy/sympy-1.3.ebuild b/dev-python/sympy/sympy-1.3.ebuild
index 03a1e064eab0..966444c34242 100644
--- a/dev-python/sympy/sympy-1.3.ebuild
+++ b/dev-python/sympy/sympy-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 eutils virtualx
 
diff --git a/dev-python/sympy/sympy-1.5.1.ebuild b/dev-python/sympy/sympy-1.5.1.ebuild
new file mode 100644
index 000000000000..379c5702f687
--- /dev/null
+++ b/dev-python/sympy/sympy-1.5.1.ebuild
@@ -0,0 +1,92 @@
+# 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,3_7} )
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="https://sympy.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )
+	ipython? ( || ( $(python_gen_useflags -3) ) )"
+
+RESTRICT="test"
+# All tests actually pass, except a bunch of tests related to the deprecated pygletplot
+# It is a non-trivial work to wipe out all such tests :-(
+
+RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? (
+		dev-libs/libxml2:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
+		gtk? ( x11-libs/gtkmathview[gtk] )
+	)
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
+	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
+	texmacs? ( app-office/texmacs )
+	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
+	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+	if use doc; then
+		export XDG_CONFIG_HOME="${T}/config-dir"
+		mkdir "${XDG_CONFIG_HOME}" || die
+		chmod 0700 "${XDG_CONFIG_HOME}" || die
+		emake -j1 -C doc html info man cheatsheet
+	fi
+}
+
+python_test() {
+	virtx "${PYTHON}" setup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	if use doc; then
+		DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
+				doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
+		local HTML_DOCS=( doc/_build/html/. )
+		doinfo doc/_build/texinfo/${PN}.info
+	fi
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}
diff --git a/dev-python/sympy/sympy-1.5.ebuild b/dev-python/sympy/sympy-1.5.ebuild
new file mode 100644
index 000000000000..8fadc5ca34ac
--- /dev/null
+++ b/dev-python/sympy/sympy-1.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="https://sympy.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )
+	ipython? ( || ( $(python_gen_useflags -3) ) )"
+
+RESTRICT="test"
+# All tests actually pass, except a bunch of tests related to the deprecated pygletplot
+# It is a non-trivial work to wipe out all such tests :-(
+
+RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? (
+		dev-libs/libxml2:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
+		gtk? ( x11-libs/gtkmathview[gtk] )
+	)
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
+	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
+	texmacs? ( app-office/texmacs )
+	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
+	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+	if use doc; then
+		export XDG_CONFIG_HOME="${T}/config-dir"
+		mkdir "${XDG_CONFIG_HOME}" || die
+		chmod 0700 "${XDG_CONFIG_HOME}" || die
+		emake -j1 -C doc html info man cheatsheet
+	fi
+}
+
+python_test() {
+	virtx "${PYTHON}" setup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	if use doc; then
+		DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
+				doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
+		local HTML_DOCS=( doc/_build/html/. )
+		doinfo doc/_build/texinfo/${PN}.info
+	fi
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}
diff --git a/dev-python/tablib/Manifest b/dev-python/tablib/Manifest
index 48cd6c1f7867..cf50a92a7564 100644
--- a/dev-python/tablib/Manifest
+++ b/dev-python/tablib/Manifest
@@ -1,4 +1,4 @@
 AUX tablib-0.12.1-no-ujson.patch 335 BLAKE2B 199bb7440bbae26d0469b5d1963d26584d91ed4cf36e478260722404b6d2f7dd109467943599808a36cec20e792053bd5ada8495436a6f518f4637cd565197b6 SHA512 ac5dd04e07b09d0983f3aa51d9ba3b067eb758cedd67dfb38a443ae4aabf5413e789f031ced1687705a0445b791039af3efd35b4fa1f0a40f08b85bee5c5fa1a
 DIST tablib-0.12.1.tar.gz 63420 BLAKE2B a4c4b2cd7f54045480fcac41ae55150ed903810de9f97df1a04ae74bdce16cd7c57027d38addbca8230a05ecd591290f2cdfe7736ccb02597a05cf7ffa0f5f4d SHA512 5207f59dab59f465584fc6c55d6322150f550c50f50a35d6901a39ed05a624a52dfdb5a9a9ddf0d6bc7285e5a3a4972c458895e4cc204a365c3df0d9ada0228a
-EBUILD tablib-0.12.1-r1.ebuild 1127 BLAKE2B 264bf78baca032adc68a4e54bd92ee204f961fc080897a49142fc22d5bbd1f392bf15f5931d9e7f1405bb35d9ef3b24b8052052248161707968e069c1c52be0c SHA512 f98dccbc1e856f46405a8cdab388ec8f17d9ff22d0e8115f61778d58199105205223a53cc111bbca4532fec47ba87cac3dfb659b2b0dc1e6d427e7317529a326
+EBUILD tablib-0.12.1-r1.ebuild 1114 BLAKE2B 6ea17e82d5dcf1aecbe9143ba764d92f9573e5f406b73b081ff4fccd19aff312860362099278684232b95e77c545980722cd15cb9fc01c6103a25f06c95750f2 SHA512 6c237fb2ee1eed1a339d7c1e4f105c2eef76cde3066fe99fb66903bdbca0a0a1532997a0f153eb6d065f8389c5d86d36d7465c5331d543236e67d16fc8f03066
 MISC metadata.xml 325 BLAKE2B 0d538ffb3eded02a3816d40244c9561fbb269b14b2dcf16089ffb41f2b9808d416ab1adfd13329098d20a8887d0c41da5c3ef92a8342b82298dc503155d8a551 SHA512 abe357f80a305ac2f770f5fd7e40a7919abfe477cbebbe0ca36be32d49d630f7941f29d296222e5ed7b1d14482b794ccf86b3c4acaec47cada5fc7005e5dfc7f
diff --git a/dev-python/tablib/tablib-0.12.1-r1.ebuild b/dev-python/tablib/tablib-0.12.1-r1.ebuild
index 0d19104ca14b..a1c1d3f33f16 100644
--- a/dev-python/tablib/tablib-0.12.1-r1.ebuild
+++ b/dev-python/tablib/tablib-0.12.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 401b63f46340..b96934e73e12 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -2,7 +2,7 @@ AUX tabulate-0.8.6-avoid-pandas-dep.patch 2513 BLAKE2B afbaef53282fa6b775bd3a1a1
 DIST tabulate-0.8.1.tar.gz 45666 BLAKE2B f46a0c8bed50e37a2d536d28fe822fb92fbc124c7ac4c29260b6a7ab9828588f49b7e94ec8925505ef9724b1fb4647e5e9207d29b2f3a2f526641ac7ac229ce0 SHA512 f724fbabee53c738c846a5cf645470f5f97074e2b33eb030b4859478931661dac53e5446d77a656553e2dec323230bb116d350997e1407d794382f537e6dfdf5
 DIST tabulate-0.8.3.tar.gz 46234 BLAKE2B 1310de381265bf150cdef72b653175b1ab95a8339bf1934cece830ce9e644ed9d3d441eb3c3721509368334d11160054aa4d75a17751e493c47dbeee22c466e2 SHA512 7f0205a4d80ed0b426a45622a3b8ec0a9b77cf6d67c1207db7fbc20a12e83a15748e63d5f8e5e65fa348b6265fd0cac93be4d04f9c1c182476b93507e1131cbf
 DIST tabulate-0.8.6.tar.gz 39420 BLAKE2B 28cd8c175b258b56a406a78d7891919a49c867d848843365605ccdcb8ba0b307f1448967a124d57b0f6264169104c9cccc84982fea666a035a265a3c9f10cc43 SHA512 ec4d7a7f20db306be1a460276e0b1b1e63fd1ca14b208a45a297508bddbc07b034e03fcb5ff67fe5e2b9419f308900675994a6dccef755c975ad0b1e9124072f
-EBUILD tabulate-0.8.1.ebuild 669 BLAKE2B f06e4ca27a9cb82f430e94d6bd420a0e68efa5849570d6949bb7f13a70470c772593d4ae6bcf94c393daa8d0c3d100eef4f6d3bcfaa94180208e3e07e1264cd7 SHA512 e68facacc2298616861d53743ad0e0141324026299f2969fb6dc7ebe34580157c5bff0a3aff3a40246db6d1a2740f1991845a4a2045ac84d9ca225f12c6095b8
-EBUILD tabulate-0.8.3.ebuild 820 BLAKE2B 0906c3100855b6c01787169db035b8eaf029e275a1c7a9624255e048c55fe2270cf6ff58a5ade70e44d9d2305db44052b5f9a82f360c90e4f338a12956f4bf9f SHA512 d8ab95f8981b90ffd6fad3051839e29ad6b42ead52fabea18c85d8538f6bf63e5475b8c4c33979e6323ea8b2a5a6836ed4c1ff188b11452ce99e4b66d16c36ef
-EBUILD tabulate-0.8.6.ebuild 997 BLAKE2B cea6950674b03adfebc5364e34d66138f685f635d2771b8b41a10ba74da4289315bf1769aaa7d035995eb5c02554254aeac9f7bcbe13a6cf2db76e0c3d67cd6d SHA512 40708eaf93b47dd096540414588b2ecc9eea9df60cea721c1d2d1d7beea033ddb5b5e02c0120e9fd36ad6d6cfeb75c24e37a699f98731d67b52b2727b104fe10
+EBUILD tabulate-0.8.1.ebuild 665 BLAKE2B c51906e667a59e6039b2a2da3d25938c5a5ef9b11426dc95553979d41c793c41799d189eaddb0c2d1f011a93c921b40265a6bfb41d25dcfe3c37a4541810a933 SHA512 427ad041eec1d8d3c7ed0cdf18fd728e38368c30830593d74889cf1b0849261b8353ad0215aa28aaaa4b74e739ae3d0f264e1f2766e82c88befc77a9e2ac2f60
+EBUILD tabulate-0.8.3.ebuild 818 BLAKE2B ea5d6feb36cc53ce80cdd47ce524f56b3a612f8671764a2f6bbc136620b512edb475be37623bf042312a1991312a3f91ebb470c2d18dd3bc9ee689926af4d467 SHA512 9a59adfab4d971aa9687b4273889b493987100db095a8d00fc637cdcae9582bab3cab8604a82186fcde224f2a03d9178d30e0704ce94ccea95922de49fa4c3be
+EBUILD tabulate-0.8.6.ebuild 992 BLAKE2B ec3f82522c64417e1d01e2a7960cab41c78cb3b37d79a5418bbaae4f9124b51d3151c4d88dce32e4fe0696acba17928c88d7408dabf7fba243380d8d3342400d SHA512 fe691660ab1dad06615f473ac1d19be098c61924cfa045adc821a0a01750d7c216ea4bdd868d5a0f1fc35b1adc110d673809f58ea5c4bdd4e77479ffb70972b7
 MISC metadata.xml 321 BLAKE2B 8b68baf97f22e2360ba30d2a86e181492217d12162d7717d3f69dff5a51926867d5ac8a227fa93c345e3ddb80036ba97839e7ab22aab5df27ec974048b666a41 SHA512 4967ca411c6ee428e897be2be259da008f9dec1991754235f0e8f79d64b5175e69d460c3cfee72f49faa41704ebda3c46bb2f30fc157e95cec4d8d60ae7ba89d
diff --git a/dev-python/tabulate/tabulate-0.8.1.ebuild b/dev-python/tabulate/tabulate-0.8.1.ebuild
index e8b8831e3b4e..668fc09feb52 100644
--- a/dev-python/tabulate/tabulate-0.8.1.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tabulate/tabulate-0.8.3.ebuild b/dev-python/tabulate/tabulate-0.8.3.ebuild
index 3d5757f8c857..c84ba20f0fe1 100644
--- a/dev-python/tabulate/tabulate-0.8.3.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tabulate/tabulate-0.8.6.ebuild b/dev-python/tabulate/tabulate-0.8.6.ebuild
index a62b688f38ed..ee715933d244 100644
--- a/dev-python/tabulate/tabulate-0.8.6.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tagpy/Manifest b/dev-python/tagpy/Manifest
index 84cd71182547..b29a6207cbf5 100644
--- a/dev-python/tagpy/Manifest
+++ b/dev-python/tagpy/Manifest
@@ -1,5 +1,5 @@
 AUX tagpy-2018.1-readme.rst 725 BLAKE2B f40dbe6ab4f03fe0a6141a03ae6f504d202a5c97d605cb22dfa0b9695374260658f8dde0d49e84de0e7d289bff705beed1244215e70cc7f9d8d587d505322a20 SHA512 0d9cd79986a16ad78e76911f9d3c1b36fb706c74c58e9d29dce817bcf4bbd8b29c9596f1228a0524fdf6538f2c685901a159fd9bd0b629d0dd1d60c75c2820b0
 AUX tagpy-2018.1-taglib-1.8.patch 642 BLAKE2B 45c190b621dda7368583c1ab92a01f08fb84d83666953caa5f05c89803db16dc8cd1668e3b891c757c916d27439c4c3143a8a8a2115ad89a8b2f1806dc4a80c9 SHA512 6a3af752fdfd12f6c5f6e52019f3d4f322b9dc3595e810e93ed43e680c1a2f7728efeb8d1180473ca3dfaa7f548d437c32f0a306882ad7f7072388f57ea42caf
 DIST tagpy-2018.1.tar.gz 145501 BLAKE2B acdda6789dae000ba2f664e4a5582f6218f312bed20ec81c4ea54f358bec70d41aceed6704f392a7a32c39d263da81f9c832922942fa179e1865e423dcf28bcf SHA512 2010baa919adadc9fc231deeb093953622ec54c8b6011e2d6a3489b086032de0a71cc26f42439435f26bd7a1ff069e3944dafc61217abe6ea5e81b01b9d18c50
-EBUILD tagpy-2018.1.ebuild 1221 BLAKE2B 8fc91b57b82a33985d65295fcc2dbe87c09ee3b690dd2d23d76de9e25c4fb0e1f6650cef1bdce5d264f14bc3f496e797a705e43782104e9d8ff7d063ea6dd1a1 SHA512 57c5815a3c18e851dedcfef269a08ff81069a055fca79ae480d42345f6cc392afe0ef5bfd7396f612511b305764e90aa78f06d7e5e1f4ac4259d711e3f307d86
+EBUILD tagpy-2018.1.ebuild 1219 BLAKE2B 601bf3232a0f6cf7e505e9b24086f3a1b7b2d74f56fa8c71d4b63e38c4f86b2f351211bf61d499a08995337db85691ee67b3d0d0ccd6cc410e9b9c552e90d5a6 SHA512 fff615363c1b4f7f66637aaed8fdc367f518177d8f67965fe9d29957131fd7080b95e2815281f41467a21452f54a217b52de68ca8da84b62d135bfed53393d56
 MISC metadata.xml 547 BLAKE2B c5c61e36e108060392467ad7bde0c8869b6df0f55367e528e9165d216f4c9674af13ec580c1b2fe6c231843cddd40b621f816c71e1d718126583085780649d66 SHA512 caf162b52bba166e74c1c1c9a6f157ee44d4b7f829c089dee93b6c84a99c847384ff7cd4f03ce191574e58562fdabe29eb4b00281551227f5d274adc3e7ba2d2
diff --git a/dev-python/tagpy/tagpy-2018.1.ebuild b/dev-python/tagpy/tagpy-2018.1.ebuild
index 18d27acee100..af8120b279b1 100644
--- a/dev-python/tagpy/tagpy-2018.1.ebuild
+++ b/dev-python/tagpy/tagpy-2018.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python Bindings for TagLib"
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index 1cf8f378dd1e..2889393a0025 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,3 +1,3 @@
 DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c
-EBUILD tappy-2.4.ebuild 1040 BLAKE2B cd6226af01c3ca7eaecad71a4bcae296c7f9e5352324bc3d8dd7c8d53452341290a95b3a5eb27bd05128cefea12a90a78c081d415dfc27cca50d3b9b81c201e7 SHA512 2da2c0c630d7c4cac42c95b5ba6b2679c6add611f325df611cdb218b1d89b0c411accbee39c3656c94e7f232bbe076d7a63f999ed3d5d732e170ab2afdad5371
+EBUILD tappy-2.4.ebuild 1037 BLAKE2B 72aec6d1d1f69cf91d129bfa22c87d862eee4759e171bb3d71e64b080da8c72f738f0336d1113f48e286fcadb66ad7923188c1bff2713d3552ddcb6a76924a8b SHA512 ec4b17d26075aeaa3b9f50bde9dfb344ea6ad755e28a188acb74a37bdfef3fbe61932491515446ccef9f510dfa92ecc8c98496b33bdc497df4dd1ace5bfe9d9d
 MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
diff --git a/dev-python/tappy/tappy-2.4.ebuild b/dev-python/tappy/tappy-2.4.ebuild
index 4864fcad139b..6ce8c8c03c0d 100644
--- a/dev-python/tappy/tappy-2.4.ebuild
+++ b/dev-python/tappy/tappy-2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN=tap.py
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index 3f568c3bee5d..04fd36d4e988 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -1,5 +1,5 @@
 DIST taskflow-3.4.0.tar.gz 1067856 BLAKE2B 1244fa3124cb09114130ecb1bf9bac1b7471cf6d9f6e297c8445a5a447d7fc81e435ef56783359bd00b35dc3219d35e0f1f26ff1b1593bf99ee83592178794e5 SHA512 16d0494e9062a1a22364ed0c4429d6fecca87b4d0328c3c711c53173e79bc1caeea24f4ea5e5d64c5d6d519fa2b5088eb3a232169e6f0062d964c98bf8b81241
 DIST taskflow-3.5.0.tar.gz 1068208 BLAKE2B 5c11faf60f332aad442c5415219f572a6b14735fdeb30f305a1e033067a847bbb6a827395bd1f02ae20e11b682adf31585848ecac47438b1860fd04b51a7d5b4 SHA512 635123ed975461a84790be2edb09f45e3c372fa03918f6f6257b4a3725f67a83a958f80ca15f1da5eb7d5f6223ba8fb8a6bdc6941b9eb9572c12274fb2d75ac0
-EBUILD taskflow-3.4.0.ebuild 1493 BLAKE2B aa44e7b3c6d1c5bf087043be62f3b287abbb6327fc7c5c49d48c759cdeabe78a4d4bc60474a9b98572b40482e9b8e175f941111b166ac8f7bd26e09c9eeb7b84 SHA512 35fb8b9798acf5180ff4981ce7f51e30af441b4aae585f80452391b82d403163ce05e25ae5a5b153b53f6656f40eafef407e299fd01bb6d02de4f53674dd07f1
-EBUILD taskflow-3.5.0.ebuild 1493 BLAKE2B aa44e7b3c6d1c5bf087043be62f3b287abbb6327fc7c5c49d48c759cdeabe78a4d4bc60474a9b98572b40482e9b8e175f941111b166ac8f7bd26e09c9eeb7b84 SHA512 35fb8b9798acf5180ff4981ce7f51e30af441b4aae585f80452391b82d403163ce05e25ae5a5b153b53f6656f40eafef407e299fd01bb6d02de4f53674dd07f1
+EBUILD taskflow-3.4.0.ebuild 1481 BLAKE2B 1aebffa8046ea3edac9dcf76efac0dffb69ad81f94ba06e877e8e4e87a9700c60c945427f6ec177c6575f7a4be0375508d242258184fa1687fbcc5ecec037ec5 SHA512 c3171ad8474e858cba2d2596939f59f5ab9acc32fbc051fb541c394a84658485237942b1c7413500014c21fdd8c76e5ecd21a4bebe6043b8e0a56ea95750991f
+EBUILD taskflow-3.5.0.ebuild 1481 BLAKE2B 1aebffa8046ea3edac9dcf76efac0dffb69ad81f94ba06e877e8e4e87a9700c60c945427f6ec177c6575f7a4be0375508d242258184fa1687fbcc5ecec037ec5 SHA512 c3171ad8474e858cba2d2596939f59f5ab9acc32fbc051fb541c394a84658485237942b1c7413500014c21fdd8c76e5ecd21a4bebe6043b8e0a56ea95750991f
 MISC metadata.xml 676 BLAKE2B 32a696fc754d94e1d1f37e67ec09de6c588f9ee3eb151dcf81f955f7b0632c522796343131a5acbf73e852ef78f89ce7bca6060c6fb83b9611e084e20a5df3e5 SHA512 c274ae9882c74b8bcaeb054b9feade463c1fa7f2f6ac559091a4bed85075198873c4b994cca1f28083b682bbcf66dbb31971da97f9074a1b04a57a6eb0a612ad
diff --git a/dev-python/taskflow/taskflow-3.4.0.ebuild b/dev-python/taskflow/taskflow-3.4.0.ebuild
index 3a6781627266..a5c21e4e83f8 100644
--- a/dev-python/taskflow/taskflow-3.4.0.ebuild
+++ b/dev-python/taskflow/taskflow-3.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
diff --git a/dev-python/taskflow/taskflow-3.5.0.ebuild b/dev-python/taskflow/taskflow-3.5.0.ebuild
index 3a6781627266..a5c21e4e83f8 100644
--- a/dev-python/taskflow/taskflow-3.5.0.ebuild
+++ b/dev-python/taskflow/taskflow-3.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index ee68fdc1a2ab..cc095e7ddc7c 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,4 +1,4 @@
 DIST tblib-1.3.2.tar.gz 26958 BLAKE2B 5c50f6b63b45f34f35843d9e39f03493715e19304804d38e134cd63621d1b72116a84d1403e25a4681d84568dfb87cba2874eaa10fccff6054e121aea86f88cd SHA512 c04d204e8dc53c87fecdb484162488ca10b509341ad030e67300d9c3ac61d298888dd56c1cef8318bcf13d90ccd5633520d75ab45dd0aea8de29ba7317adacce
-EBUILD tblib-1.3.2-r1.ebuild 466 BLAKE2B 6116e6ee82ee734edde7f99bf9f6f66da945d0644b8d95b0a35ce1dd774523b64c80be841c811f906e7ac11d4abc8f2205d405b3278495666c8970e188041581 SHA512 690f3c74f0fb6cda857aa222566d329dbf4ce5e65c793a5218e0120c03fcb3785d6681e1721d12f0657884789629bc756b8a996b1711048bdd9413bb1a28dbb8
-EBUILD tblib-1.3.2.ebuild 437 BLAKE2B c81b05859ada19c3f5b5edf96e78c84bbf43d96805ab8c1dca818b2464382e9ea14044c4c1b39755c2983c59bbeda1da0fce64cf2bb6e463449801d43d6a54e9 SHA512 e6cbcfc3d6110eb8e9551af6d048173c4a2731e36debdd73cd77dfaf0a6c9b2630517e823994606e625ab5ca5e49b92b2746680733b01d5376268b758f67a653
+EBUILD tblib-1.3.2-r1.ebuild 462 BLAKE2B 189827992e6b689b9eb2b65774266ec4ab425e147fb3ae18db411b6835dd7206a50db03f61224ef029c63361fbeef2b8942949f41b14c248bbc867c69838ab33 SHA512 5abdce6d5f865b7d3d101705930184ef9e9502272d8c7e53896b1894fe978c7520f4185d92e4a072f5a37c579d01f016eacae37fc0eaeef12bb9e554ae584551
+EBUILD tblib-1.3.2.ebuild 433 BLAKE2B 98648fa0fe21238371643921fe2b259a2814d8d6ca3174564490396fce47615a2b1b3bd12141e2c20aee61612460562c19d5c63e40ec65d29591d8e66da42bbd SHA512 a961cb3e2f229d10dcf564c8e8b547e3f072d3b93ab8c62077ec20c86cf6d6a44cf75ae4c3f71cb9744a0df1c7f03886bc3881bba353ccd467e1919335e71716
 MISC metadata.xml 380 BLAKE2B 2d2d82601724f6960ddd56f2c45b5e85c30bf1366c6bcfb6b6810e885c87bf974c7dae1cf0a4d01a5bbfcfa9c5b2bb8aca6460047f549786527b5d1742b315c2 SHA512 649b0a9457aeb0b3e211e293305a8bd93f0ae1c91c5c31f2d7d1d94c55eabff5df4f7bda64c19d07b216778cbe7bb68dbdaac3a06d9a627a06b8f205fe818d40
diff --git a/dev-python/tblib/tblib-1.3.2-r1.ebuild b/dev-python/tblib/tblib-1.3.2-r1.ebuild
index 3bfec71fb04b..3750e29e5280 100644
--- a/dev-python/tblib/tblib-1.3.2-r1.ebuild
+++ b/dev-python/tblib/tblib-1.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tblib/tblib-1.3.2.ebuild b/dev-python/tblib/tblib-1.3.2.ebuild
index d5e119a44712..138700e16896 100644
--- a/dev-python/tblib/tblib-1.3.2.ebuild
+++ b/dev-python/tblib/tblib-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/telarchive/Manifest b/dev-python/telarchive/Manifest
deleted file mode 100644
index 62dd92fad07a..000000000000
--- a/dev-python/telarchive/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST telarchive-1.8.3.tar.gz 79377 BLAKE2B 9f246f7247bd4d72b7a494b35ec92cbd450b64be57a097d66c47e8451d38a7b5a164087d473ea4674400d5bdfe8616547fce493f5286c27267ce21c48230230f SHA512 628937f8556d7197317aaa08b0ed757d92770a0929e77ea30245c1e52a3bf04e425d86c16e4711359634d0156f1d7128780abbead163ed119262fae22e9f35ae
-EBUILD telarchive-1.8.3.ebuild 499 BLAKE2B 512338409b39459ba6a7954ec30dc946ec5dc87e5a6ab0b30a7036e22324d0a690a92fac0c13609b4df2742d36c5e3ec8003023fe3915cd638c0cdefd8f406fe SHA512 6052352b6ca8c202dcc44ba6adbe754f8c66bd6cf170dd308d1ec60edbdcbc61f6ea1c372c44869696eb367bd2f705963801fe12fe0cac0c2393cdcbb4439d99
-MISC metadata.xml 718 BLAKE2B 7e29a8d4dd2caf72df751343f9c90a9ea4f9d0337e04d19f5eca9059d8f3050caa85c53c8fdc573a940fefd570eabb14fc48d28926634cc74e0704564c0de7fc SHA512 c124628773be76764508241a450c053b05f28f264c64e070b9b135646841278ce98e6b13221a01ad6840e66fcf11c81258482b3bf15a4ddee8109cc2fd73fc1c
diff --git a/dev-python/telarchive/metadata.xml b/dev-python/telarchive/metadata.xml
deleted file mode 100644
index 498822a1f085..000000000000
--- a/dev-python/telarchive/metadata.xml
+++ /dev/null
@@ -1,18 +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-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    telarchive is a Python command-line program for searching multiple
-    public telescope archives. It takes the name of an astronomical
-    object -- or a set of coordinates -- and checks the telescope
-    archives to see if they have observations within a user-specified
-    box centered on the object/coordinates.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">telarchive</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/telarchive/telarchive-1.8.3.ebuild b/dev-python/telarchive/telarchive-1.8.3.ebuild
deleted file mode 100644
index d42b8b33dbfa..000000000000
--- a/dev-python/telarchive/telarchive-1.8.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Script for automated searches of astronomical telescope archives"
-HOMEPAGE="http://www.mpe.mpg.de/~erwin/code/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tempest-lib/Manifest b/dev-python/tempest-lib/Manifest
index 74fa294b4db3..7bac8977113b 100644
--- a/dev-python/tempest-lib/Manifest
+++ b/dev-python/tempest-lib/Manifest
@@ -1,3 +1,3 @@
 DIST tempest-lib-1.0.0.tar.gz 115527 BLAKE2B 4937aaa84ad8b6315bc4db03edb64303a64801fb4915489f0e48262bd52224a047687d2adfb6524273763976053eca5f209d12f93914408f4c21e2e2e69a1171 SHA512 e47716d897c2df4be08b863352cbee986194db00d113a9135d57cc440436c97dea5c009d6a24c4b489360b04585b2a54a9b66a5776d17a988dfb9f0baf57e484
-EBUILD tempest-lib-1.0.0-r1.ebuild 1770 BLAKE2B 200ae70599b83ff1536855509bd4b8e6729251c926dfbb6e2f9e9b0a669cda15115267956ae30c67b641ca3de6e99af7572fde7cfd28e80525ca00f063437102 SHA512 14a20619454d33a7d34efbf7011f46335e16374e659b09971919d40a4e20055711966274bbaecafd5f7294742c974384903bd7fdc7c007ff2a181c3104ba4bbc
+EBUILD tempest-lib-1.0.0-r1.ebuild 1760 BLAKE2B fab74961da773066a56de7b993123c89d5717befc54b3a7827879aaeb9d80f12ee9fc3ea7a5fd9b6fe78f018c0bc047644f810922f6b76b29b4b29d382b13cd3 SHA512 0cab90160654a72f3c732bd8fa992f70dc49c552724f00f402aefaf3e136a6bba649189dfc09535610855a49a8e82655430e9a60c4940161fc889915e4942b14
 MISC metadata.xml 783 BLAKE2B 14e7df8454923e775a91e481b5c0fb30730fa9d255a9971600351392cc3f3e72d7c02d2bebd4cf0f65e1d02afcd152ccf73ee4de854b5ad0c082c4a2718b1216 SHA512 4c90ae3bab98585854785700c90545fcd89ef89e5f11f8f53a102a67f59342a347f683f98429cec498537a6c2307d36cad3f0f4c9bd0e7f12af75090f8d14dad
diff --git a/dev-python/tempest-lib/tempest-lib-1.0.0-r1.ebuild b/dev-python/tempest-lib/tempest-lib-1.0.0-r1.ebuild
index f4bd9a7b00c4..553ff74bd878 100644
--- a/dev-python/tempest-lib/tempest-lib-1.0.0-r1.ebuild
+++ b/dev-python/tempest-lib/tempest-lib-1.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tempita/Manifest b/dev-python/tempita/Manifest
index f6b08365b292..2314466d4739 100644
--- a/dev-python/tempita/Manifest
+++ b/dev-python/tempita/Manifest
@@ -1,6 +1,6 @@
 AUX tempita-0.5.3-pypy-tests.patch 933 BLAKE2B 9b49ab761c894a54f883645bbae9eba938d412aba65392fd78feffee1feadefe6f34f63f4aa7d61c5437d6697aae0dcd89434789d84055b6c089721ddb559cee SHA512 bad83c3e05d3aa8d151403ca71c527663b2268c3fee517ab5778a169b497ab491666bbb9be627369f41ba8444b6e98511953ece2744582d1abffd1ef206de312
 DIST tempita-0.5.3-bitbucket.tar.gz 22756 BLAKE2B 59d273b1dc206eea452f7e5265d59b3ef1248b2d920eae559d74f4c569852b2a127e2a906f866cb748a12663dca944d9080413410edd5c69bd93b0d9574e3026 SHA512 cebe443bf0fc7705304fe127c796801acb6cdc54e79315c2afddb79ece1d04427852c1d0924ab9dd54520b584ae09a0644a20ff2dd6ed0408ee103f5b3fb9410
 DIST tempita-0.5.3.tar.gz 12707 BLAKE2B 921087bf09454506db8cab7b37c780bba5298b206113e246b710367b92364f03055afda6b826ca3008e34e4ea8821c6aabf045a735ac0887db1ba8a82e048ddb SHA512 43bafd42ab0c07bec636d637bfcd42053559d188e13bccc66527dc5f735fd9c3ec30fcf29f3e650d88315fe8f2eb2c5af280f51d2c64db099e08d8a70969a1c4
-EBUILD tempita-0.5.3-r1.ebuild 606 BLAKE2B 84e961e0e66377afc577dc6c89da0a77a581c831f2edb954e34a4c2bd8342820a3401cde4bdf93808acef73c6e14a20da2331f4766c2064e712459f2531056da SHA512 ffdce81e5e92be1d71219d6a0b0a168a981f8ed58c99e542ad68494156476348cc95e43b6974b7cc1a3e334691a6e55c9b242bf76ee570998879fe2593ced4ef
-EBUILD tempita-0.5.3-r2.ebuild 1411 BLAKE2B 4157dec9a79ec1811278d300e91a9e6d6a5225a372bcbfb376701563fb1d26d4d0054800d0eb6a66f974e55f622f724cd69c79b6e4f46a4768171d30cdf6f535 SHA512 d8f20db3ee1588204a7d29ae1f22c6d8cf0fa15231ace8bbde2a521fdde65ea0d9b3211da3d3aa9424df7f07166f529dc5fb304aff37ce0cd3986d2e6564b501
+EBUILD tempita-0.5.3-r1.ebuild 597 BLAKE2B 933e7665b703d7d579f5ff1d8c5567591b2ba14332a3e820e727140dce9992d88051cacc7e12ea1a9db59df6b4ffb341c9431e9982aa339c728c86fbd0b0c9d4 SHA512 129f3f338cc9e9a60ad2c466e26b4115a47436d344c208f6ea50db9a484badbe0bbb564702f2469db2a66af1f41ba30626349fa6570ca2bd38f665a85084e9ae
+EBUILD tempita-0.5.3-r2.ebuild 1406 BLAKE2B f64ed5bb21271b0e5e9489ec772b22637ea525db752084c97a66d843ef0b1439b167a45d9ab2e0dda1140ee1922296a77137e7434f447356ba8802f49f9110f9 SHA512 1bf4f89638bd42015d94045aa3fbd2b4028b86db031021ae18cda301a97f9f4a433f572355b2f6b24f8d58801f4e59dec67489ce3605b590bb749f6db3ec6c94
 MISC metadata.xml 320 BLAKE2B d26cd9d2555b7d1a56ad44c86fb280a249a4f2d45c3f320cbb9a98de249e826701d49b814c209e6270d183084b8955e177fdac69af0136a7432cc5370b70fb3a SHA512 44f0ea2e06ab198180db9be4533b29c56e7cd0f3af9f522188e063cf787ad1eb1eff9fe2e09debe97be85769a09375385c1f838a7eedc2bc92835e846320f109
diff --git a/dev-python/tempita/tempita-0.5.3-r1.ebuild b/dev-python/tempita/tempita-0.5.3-r1.ebuild
index e21232447c18..5af06fa4b57c 100644
--- a/dev-python/tempita/tempita-0.5.3-r1.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tempita/tempita-0.5.3-r2.ebuild b/dev-python/tempita/tempita-0.5.3-r2.ebuild
index b26f6be9b70a..d71e9a3fdc57 100644
--- a/dev-python/tempita/tempita-0.5.3-r2.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index fdd9ae0e409a..587be8d23a52 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,10 +1,11 @@
 DIST tempora-1.12.tar.gz 15208 BLAKE2B ced6e5d069780b516ff791ee598683f59d02588d45282f1b6b6c2b8b61d354bc399d10c961b5a112c7ef1185c3661cbe9b1b9c95ab28d42ed2429fa4f504917e SHA512 4acd38fb464e858db371fc4ac6d2082f4f0c676016cdb95d8415895b7d0bdd3c787c2678737e437d1f5861368dd54040ce289407cfeea3ca43b130c56da133b6
 DIST tempora-1.14.1.tar.gz 19383 BLAKE2B f65896391e839c3da43bb42715459b9ab870a724722bfc83c129f18032e731d69b2d12635a519226ef4ce99e77a3418e7e1a05a116a80c222b4e8138f9966f9e SHA512 4ecd5430d4d90959b0985908a1e4f239a56ce0026cd315ef6b8c204b645caccb135db76bb2ca9cb95bc65bdf337b61e7c31514eb9c85036771469b6a058edfbb
-DIST tempora-1.14.tar.gz 16009 BLAKE2B 2f4c90da2aed42c2eaa24e5764c0ec163eeda3f5d7db908f5dfa9057eabaaa67654c100d049a389d43c0f8286c0dea12db3cc3cb9a8eea098925d2d7b011c1c5 SHA512 dea359fcb5eebda2db6b0de2e615ef6681860e9b8ecdb6041316623b9072067f08cd19d72d9a9e1fc792da7c5760f5e2382bedcbe09467109557448bae1fd8cf
 DIST tempora-1.7.tar.gz 11645 BLAKE2B d354fb863a8d30bd9e603ad942d7c7f61a70c24e7f1fe94fffd59982431190e2807c2dc577ff83eb90ffc5fd2b2f8415965de1d77e4dca0dd02291733bfbb97c SHA512 2420e32a9b8c990609d8f09225004e0b1c445cad1fe3c3c74625cb8317b552469acf2d3b28aa56633a87260a93c77d73b02178cb662016c514bc740aa01399e5
-EBUILD tempora-1.12.ebuild 1317 BLAKE2B fd670fd3dcb958924edded9e6e03f87fe99459ad35f619c2da9c1ed4ad37db24404c674402ce11c727df052699941a7b5109c785b502bd9f202fed8ecd5fd822 SHA512 81248c607361b8713b8771c78578ddd4f9fa85ee680d0a3c945d483877020b9bc71369be1ef5f5041a96bb0b11bbc1a1f6d5859d1809a7d6afd8da39c3619eb9
-EBUILD tempora-1.14.1-r1.ebuild 1442 BLAKE2B 1bb2f9ce6c712da3fc30a9a4d0498d5c17fc46204a63c9e0c123ffe2feb3f0eef42d58bb3e88f898648fbfa2663f50dbc9fd2fa9e57dbd23ef71c546b4c247e1 SHA512 5c5c74f3f73e73359e1c9ebf6cff35d70ce235a7dcc0526f02d5c086966fd3d5ca1a736f94420d9e8ca9a3025c3ac99d04fa8a6e8bf37b42997578868d0d8236
-EBUILD tempora-1.14.1.ebuild 1368 BLAKE2B ee4224f32bd7b6fbfb9553a4983a1e0c93ac4af3e186e34f47fb0b81b9f9b89bf150b7bd8c77ddd24f7e2e5616a8e594a0f1785e0197db14872d6dd889b5419d SHA512 5ecb32e8bf0dc8fe8070d39f800c963955dda5b6e9c5c4853863394e595c80425f6e844e3005b3bef61b4400513cdcc82831d41690181acd35b02a47379f6c7d
-EBUILD tempora-1.14.ebuild 1350 BLAKE2B dfae90b6707102cd6fd432d6759bfbeaa17fb188a93279480c92e1e551bcff221d92d20c33422a005dede5a5458e6d919b812929cf5e20e26db4d174e6b0b618 SHA512 d872b5c784cae7753e4d28b522d272f86c7315a90c3ec7dad15abfc6b5a781f877da93205cfbded783b87a286075cbc25a9c4976850c82234dec0165d204166d
-EBUILD tempora-1.7.ebuild 1203 BLAKE2B 376610c2124879ece7cd3dbbe4e216084553fb5f4009f7682a5731f83742ffbcc2564f5717bba1bb44211ec8fb6ec619b008c5e393bdea298bb15678572370ea SHA512 979f89dbe55e2595d6a8d51aec87fd717f9a42eb2a6d7c9dd8e1c4e09fb554b0dc0a34d3db9923dbc0264d2afe19a0b9e3e6b05569bcbc8c214c1a084a45e66e
+DIST tempora-2.0.0.tar.gz 19828 BLAKE2B af06f7cfd6742c41fa08333da30bd2b6173affe4d368024122d0464856fa3e2264c85d34505cae023167b4266ed0e927a5a8d620101c02c352cf08b269c8c6b4 SHA512 9f488ecca0673a0071503475378bc8f5ddcfabb32fcc548392434df45767fbeb8b914117622ec6f9dc6a8de90e5bfe6e5571a9a18ddecf7c25e94fc1f7fff102
+DIST tempora-2.1.0.tar.gz 21329 BLAKE2B a157a6b9bcb21aac08693ec72e60d011c29d4e6320706186b8a656f096ce19140731e41ca0b7b8b98110a2eed8cee2bfce5ca303b3a7526bbfaec8aafaffff3d SHA512 f66ebf03d5c6d71f1316e3ac9b2c16a96eb622e553917f7e52fe8881cbd5f4651174130e70d2212cad78811859dfb4fe248e6f81a5bb6c928a0c43e9363d2c4e
+EBUILD tempora-1.12.ebuild 1310 BLAKE2B 5668694ef124fbb3506335fa8f2c7f79b6fd92e65e7f2ad2d2d8e2d63e8dbc0695fd6cbf9e9cf433b49843551363749906dc846e86bbd99dd82e62e3cc42a977 SHA512 1d913cfe9d53b921b5e967637c7da4e3fbdb1e04e8ecd9bf31198b94335f2623e0cf946270b462b9bf382b0298878a1b8f42311235bf7d6a79c72ba59510d023
+EBUILD tempora-1.14.1-r1.ebuild 1440 BLAKE2B 703f20c95adbb0652cd54a8de482486bf173fd104010889cf5533ff7a44e3765a03d0ce3c2dd7013458a8282e0f16f5b3b5a7ffc823e88731d154fcb1c6e5482 SHA512 015646517fadd62dcf220e2049d623291d4e8c936ee05d80590acfcef15b67a1a3b40c63e7cf1a8f48ce32f3dbbc8a02a3ee6faa55a8d04fb7b82ce9283845a2
+EBUILD tempora-1.7.ebuild 1196 BLAKE2B 770c3e5b37b05350852fc12550def60214690fbfae1aa449b340d7fe892505e2d37db2def79beb18f63dbc995da97048c7576b1bd2f79bd5302a1d1ddaec3e85 SHA512 c624a8e51ef58b9cd3ceacc9178cd2922181aa2c98004fe76ca4d77047b36293556da60e46a62972d4d0aea617d65da063389bed4f34e9c8abb46468632e1f9f
+EBUILD tempora-2.0.0.ebuild 1532 BLAKE2B 725169e55525474f254ff9417654fb189da46eb011ac8c8af34e1e502af13ebbac6e321323236790c82504b950cfecdf74c331a91c5c98c5616f224b3bb8c5af SHA512 87f0f034dec5affddde9e398395c5aabd0a754c11bae4269dc89af5e7ee1b97b8cb1dd7392d9630c46d8cfdf70d44fdd440b7bea96b190335ab7f33798606b90
+EBUILD tempora-2.1.0.ebuild 1532 BLAKE2B 725169e55525474f254ff9417654fb189da46eb011ac8c8af34e1e502af13ebbac6e321323236790c82504b950cfecdf74c331a91c5c98c5616f224b3bb8c5af SHA512 87f0f034dec5affddde9e398395c5aabd0a754c11bae4269dc89af5e7ee1b97b8cb1dd7392d9630c46d8cfdf70d44fdd440b7bea96b190335ab7f33798606b90
 MISC metadata.xml 514 BLAKE2B a504d20d519ee139ccda1418b4a6f4d9c1b47a17dae26a57e2bc9e55d31b44f6f74b4a3835a6e9f376431b2428b5885b6931bdd6f11d57549c9ac29593b8e0ef SHA512 aed0cf45d8b0d1f3aa942dad7d74c572d6cb501c0c61438ca6bf97cbdfa51091cf9c32753cd92440ff69c7faae67daff0ccae28d9223b182ea89426bd4bf4fb1
diff --git a/dev-python/tempora/tempora-1.12.ebuild b/dev-python/tempora/tempora-1.12.ebuild
index 83ee056710a7..cc23b21d6a60 100644
--- a/dev-python/tempora/tempora-1.12.ebuild
+++ b/dev-python/tempora/tempora-1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tempora/tempora-1.14.1-r1.ebuild b/dev-python/tempora/tempora-1.14.1-r1.ebuild
index 2be971f26aa0..bf3ea9a1612a 100644
--- a/dev-python/tempora/tempora-1.14.1-r1.ebuild
+++ b/dev-python/tempora/tempora-1.14.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tempora/tempora-1.14.1.ebuild b/dev-python/tempora/tempora-1.14.1.ebuild
deleted file mode 100644
index 2914a9aa1bbb..000000000000
--- a/dev-python/tempora/tempora-1.14.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/tempora/tempora-1.14.ebuild b/dev-python/tempora/tempora-1.14.ebuild
deleted file mode 100644
index ca308edec773..000000000000
--- a/dev-python/tempora/tempora-1.14.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/tempora/tempora-1.7.ebuild b/dev-python/tempora/tempora-1.7.ebuild
index 64281dd389f3..b3164fe52561 100644
--- a/dev-python/tempora/tempora-1.7.ebuild
+++ b/dev-python/tempora/tempora-1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tempora/tempora-2.0.0.ebuild b/dev-python/tempora/tempora-2.0.0.ebuild
new file mode 100644
index 000000000000..b34ea9f5efc2
--- /dev/null
+++ b/dev-python/tempora/tempora-2.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
+		setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	# Skip a test that requires pytest-freezegun
+	# because it seems to be poorly maintained
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		--deselect tempora/__init__.py::tempora.get_nearest_year_for_day \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/tempora/tempora-2.1.0.ebuild b/dev-python/tempora/tempora-2.1.0.ebuild
new file mode 100644
index 000000000000..b34ea9f5efc2
--- /dev/null
+++ b/dev-python/tempora/tempora-2.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
+		setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	# Skip a test that requires pytest-freezegun
+	# because it seems to be poorly maintained
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		--deselect tempora/__init__.py::tempora.get_nearest_year_for_day \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index ed220bb21cef..61edf2147407 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,7 +1,3 @@
-DIST tenacity-3.7.1.tar.gz 22915 BLAKE2B 62b1fb72be624ecbc07cc2cd4fa5b67181e2da971ddc71b5ffbd26a1f7ee072e549f5372aa1c5c3451bf68b62bc93f9addca59445cba2ab4cde833f1136fadb8 SHA512 83f277da3ee7beca4d564610a4ef46c33a87590214a41c0c36c9bb46920e5e8e7e8a8d130dcaac2802d058f7e995fbe01e13d5b7a65821e9a1e83072b78e3f00
-DIST tenacity-4.4.0.tar.gz 26133 BLAKE2B 1f23e3cd4cd3caa73b5e1c1f3234ec5915adc0b04a46331cd97ba1e2adecacea241c7a9a534ec120c19ff95dde7dfb963fa5cc8827505cc91b9fb602b6582f88 SHA512 08f4eef91e38f8d166029625e337057bd9a934fd58473d8c3666436e6312a0f7dd7f24dea05c8427df627bd37c7003602089970079f214fa7b79beee64df3f96
 DIST tenacity-4.8.0.tar.gz 28057 BLAKE2B 31451b061c594a47fdf4e6ae97e09c601d95ef76afc805d6f746624e3cf18a0f7c288567a5fd5ff8c264d00ce55a635afa2920799c256168dd89ac800f0d3ca3 SHA512 4662a92325de6b2dd7f6dd8823cecfdf0cc2f1390d054c8ba14f84fedb917cf5896d5c26aaaba9816303dea06ad7f922877c8a09e248319317155e2d6f509873
-EBUILD tenacity-3.7.1.ebuild 626 BLAKE2B 8d046dd5965d4a8856a8f79544c5d71a55ec3435a295358090f5cf6f3da3f330efa20364140bd5ea9fad22c7201a6eea17bc0e8b85f22583b3970b21e8adfa21 SHA512 710e8e8e2876bd643a55175b08c4b828c3c457b23a4262f320e3486cf6e54f54a6788b21988a1c64866a40ec942a0d192120a8aef69e0de47c412a62c6ade767
-EBUILD tenacity-4.4.0.ebuild 616 BLAKE2B a1dee62db70202dd92f6b5d2e0101a4b68cea5b6697710b405218dc3654a6189078a7010720e63acac2f32c24b9e99fe44441c94101eac973aa7f6c96fc75722 SHA512 2f025bddea38ff64aa7c14cdd5733bce0b56b3dacced75bb1611387af0804bc424dac742144be0242334311c0789ab5bd602e2de65fc8ed0498098f1e890a515
-EBUILD tenacity-4.8.0.ebuild 617 BLAKE2B 207a2e2f157ced0f0e8d1355a58706c139e8a8a60d0fb9ceb32f87f96df5f0ffa024731d5df32b0d47c6103073a24dcbdefb8b5b0a9f1dc8153944a3bb22209a SHA512 5026a011eab33ac1c8e738fdba9766067810b8f5053f17d67a673c4343f27b939da4cd89285d8165bc5c480e51289a14383bbd7f7819d3a843c7b6dd9db7489c
+EBUILD tenacity-4.8.0.ebuild 605 BLAKE2B 405f51c6bec3528ec9a79de0a212e87c571658159fe489fd025e7527487ec3d45a45e65952bd4ccfcd2df9e3895e7cbe1e215abd67a9128947cb5b614ae20cdf SHA512 43ea33f64c47fe4e7c98d5b5fd583b6659c9e3009e9bfd6225e57f3b2f222c22be3e54f17d27fdd108cc57adff5a379aee15eae54858dad5d16109cc659d3f97
 MISC metadata.xml 730 BLAKE2B 11af1697135e424eec2e9a719f67a747e3888cf9e501fc65b99ef1eff28a153b47dc5e827792197dc9a19d1ff16c03a8c0b95ce44c177135ce44452ae3e097e1 SHA512 0b355562b481aebb7daf0940cc5548dc33e8252ae39e8bbd811f957f6253aa481c0fd02fefb7b30672392af50d5aa69731767915d47cbf83b71788cf8f5a6144
diff --git a/dev-python/tenacity/tenacity-3.7.1.ebuild b/dev-python/tenacity/tenacity-3.7.1.ebuild
deleted file mode 100644
index 38f9a5e1ff74..000000000000
--- a/dev-python/tenacity/tenacity-3.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="https://github.com/rholder/retrying"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	dev-python/debtcollector[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/tenacity/tenacity-4.4.0.ebuild b/dev-python/tenacity/tenacity-4.4.0.ebuild
deleted file mode 100644
index fc40ee3a9fba..000000000000
--- a/dev-python/tenacity/tenacity-4.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="https://github.com/rholder/retrying"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/tenacity/tenacity-4.8.0.ebuild b/dev-python/tenacity/tenacity-4.8.0.ebuild
index b1e057d8d57b..884aeef2154b 100644
--- a/dev-python/tenacity/tenacity-4.8.0.ebuild
+++ b/dev-python/tenacity/tenacity-4.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index 6db98945039c..6769ee63cda6 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,4 +1,4 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
-EBUILD termcolor-1.1.0-r1.ebuild 482 BLAKE2B 9584a7f2621a2753182509b1b98a405bd175ef9870b7f6c9bcb01604cca1fbe2c0dc18ee34e7a08eedbac944dddc5f57fc1f662b1a98106dcffa1b5881bfa669 SHA512 cb7aa31eb193da14a69bdbe577f259153e8fdc1f741dd7b2bf07fe62860b876f606913dcbb8920656a6c0b005f130bd1a72746afe31a8c81c78c7c1c831e7f52
-EBUILD termcolor-1.1.0-r2.ebuild 512 BLAKE2B 13255a9e04968cf51a027c35a7aab6ae5776595fcbc72fd33e7d90bcdd9617cb065d94bea6138b66aa8eb4c89ee6f06428b0f4a99bcdaf59874559e807dd53bc SHA512 867d891890396d377d809036a51e40ba15594e6e3d177442f0aaa7abb519aefbd2d9753e80837f96daa39f333e22cea33af26dd64bebb1e8c63f0130c946bf4b
+EBUILD termcolor-1.1.0-r1.ebuild 475 BLAKE2B 22cc3c6d5bfe233579be3f44a51f34567db13dcc68ada17b56ee28e162fd2adf25b92668f54ee51719e81801e5fabc2a0d43835e5f1eb341fc187578700fba17 SHA512 ae2cf2e300345dbb07220e333c881083d4daa88ae4a002fed9552c860bd8e1d214f04109f706a51b76e665178c8c8e14cad9897b2dd8536a569544413f99dd79
+EBUILD termcolor-1.1.0-r2.ebuild 484 BLAKE2B af7af10f51ef730a78a20e04b6a627d5bf6b4cfb99710ae1c8166c4136e86c16f1ed550cab3a6b938bbd1c080e365315f78684327fe107e2c42dead6de1e32fb SHA512 cf91cb1c17a6961a385bf21da01c80d836d567859a6ef01d636dbc12f49a8e04ce0eb8997260d6dabaca2195475ae1d2a07307ec8897eb798caf98edb5a29b52
 MISC metadata.xml 545 BLAKE2B e11f72c21c60624a387abecb92db37c886f2e5f7f5744003bc9ec1b3a33e50a3016178126fa60cc626926c132cb3690f7155b3c2e4a65227930e4e0342e52ce6 SHA512 475cd979340760bacfeb70aad2a0a046bafa5f1b8595a897d975615d4755c1b89f511f952d29af8390610fe445a03f3edfd8771d1b217d0258eed5f9f042adf0
diff --git a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
index 99c3f2461204..8eec81812694 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index 51971986bb54..ecd9d054dc0e 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +16,5 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 # no tests...
 RESTRICT="test"
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index e35e280bc8ba..de5d822a0f9a 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,7 +1,7 @@
 DIST terminado-0.5.tar.gz 10491 BLAKE2B 8beb4784c13ceeea47966efbf56e62b259adac533d2ff72f287984aa100837d8123be3109761c9c282fc081e26d0d26224a8d1bab6263d3abed00839cc576c9b SHA512 8c53e2c8fa837c171a8790744770f41d4fc8fe15fe8abd28af17317950c615e4c75c22ab896fd98984fd9c2bbbc7798e5ffe319827d84eb77889bca63660e421
 DIST terminado-0.6.tar.gz 10334 BLAKE2B 02ae2135da982cfe12ea0b3219a67a6b327bd3f4f45539f79629cb33ec0882586094b7084e4ca64567f55fbe6f0194a10934c558fd836f825ef81319920caf5f SHA512 9b9521917d4000aa45e61a1b88705e715f11686890671607cca81d4518f1e17feefdc2ad3de64dd0e053a6849956efbbd838c7b98d570dcc98a936c0a4cfce9c
 DIST terminado-0.8.1.tar.gz 21134 BLAKE2B 504fd13ab5efde77b38fbd79e4bbe4b08fb9bc1cf0f4aa8ca6cd90b4dbd20083088d6cc287f78ca159bf5f72a371c146dc0c648e310a0c892f283f2d9fd23199 SHA512 5cf5259954339d567c41b8ef3b4d77de4f69fe41fd371e63775c9d8d5870ee801795462654f16978f4c86e381fcd26437e307458db9ee4e575d31d5377f2a749
-EBUILD terminado-0.5.ebuild 717 BLAKE2B d26a28622faf46c22247258b6a9126bd7582f14fbc2c466f1b28b630f9f915f66bbfd3232b0e988d7558c361cefeff3469881cdefc75e05470f16914d7291031 SHA512 ced00366bc1b978200fa58759171619125e6c76836e75671b65815cc2478e756defe6623032ed2757e548c6723d0b3180d0b27b4b9f8d476efec93dc2189caa7
-EBUILD terminado-0.6.ebuild 731 BLAKE2B de93b8a2f9a483a9edd3c6ab75ebcbc359e300df6f61e6123a325964b0615b8e97cf1101a2cdaf2edd802b01c6c74b61d6093bd1b670eb4d76c920b0bad55637 SHA512 e2825af91204ee829c861bb0228996303483c2183199b0443c34f6f63cd48d13ae2c0903d981b6923bc0b1cf84e35c082b592a806c979e6176ec8f88db53bd53
-EBUILD terminado-0.8.1.ebuild 721 BLAKE2B 5baccd4e95c7d852176afa8365eb46dd274451394a25538a64c325d38d3e16e265562abd7aa079cf0573eaba4f50b5341c90de9a6723b3c66dca02f57c1403f0 SHA512 8a93795e027a56b3600f1355ca2f22e0d93404a9f2de731ddd296a140c2d3ba4f0821b2314285a5120ae262089ddba3578dab2112389e0f97b04522760e8beb3
+EBUILD terminado-0.5.ebuild 715 BLAKE2B c52bddeedc2d2fb54ca82a3a0209b44ccd9840d97c7c036226d40ec26cb296a7d3c1df7e64c0a872023a5d931fcf37ba85f5ab61aca0bcc681853f56a56f3a04 SHA512 befa396df824b1110b570974101021ba3461b691000d2e3bc77a95dc889e223adfb9e5a74b2c48f4003ed125adbe3a4de8d27c4cf7063cea993710fd532b8898
+EBUILD terminado-0.6.ebuild 727 BLAKE2B c2c5576bc13caef5e81f0aec74dd832e4aefa207e1e99e2d1d46f9afbc3959df4c89f613f39d3219b0590ed593c23caff6b71931169eb61847e1170df6a65757 SHA512 fec0e91857bfee46aa8b24fdab4b7c08aa8e99662765254ce0563fda32b7b1b63b0dc6fe0fb7377b48a1ac64454a8bcdf17bff182b3b6d5c63a161f1e9890f6e
+EBUILD terminado-0.8.1.ebuild 719 BLAKE2B 1b3d7524fa44bc75676f8ca9f1dd7e3d7c665731a34c3910cacdfd67fad2e27ec3963f0e42eb2fca3b615fbffbf68543251687efe479c971cb6437414a0e98db SHA512 ed4b87ec2f7fd720c7dcd5eaba2be6f76b934cb5cb8c5ca1612ab07345169241b678a234e395f6ed63461559dfad8c46cbe6554dee838032851a631133141e8a
 MISC metadata.xml 381 BLAKE2B 4daeebe708d2d0a70a215899420ee4e218258279629c0a5d2f11cd00c961900e7fc81706eb443899c4e9f6d25aa204b24718c09f5c0929f5dbb2273c04bc3f99 SHA512 22d6d48e2bed0de91f468bed90ad2f41c164f84cd89eb99e87cb1b0f528a0c79f632cdd4dc5cad919de9fbc166edf539fbeddad06ab9a864b8a46efc023b5fae
diff --git a/dev-python/terminado/terminado-0.5.ebuild b/dev-python/terminado/terminado-0.5.ebuild
index 8cc26dfab287..02689ee07d6b 100644
--- a/dev-python/terminado/terminado-0.5.ebuild
+++ b/dev-python/terminado/terminado-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/terminado/terminado-0.6.ebuild b/dev-python/terminado/terminado-0.6.ebuild
index f7fb4eeca29e..20948e3957e8 100644
--- a/dev-python/terminado/terminado-0.6.ebuild
+++ b/dev-python/terminado/terminado-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/terminado/terminado-0.8.1.ebuild b/dev-python/terminado/terminado-0.8.1.ebuild
index 433eab78e137..84e215698f6b 100644
--- a/dev-python/terminado/terminado-0.8.1.ebuild
+++ b/dev-python/terminado/terminado-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index a034316a966d..d17cc66b635c 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1,4 +1,4 @@
 DIST terminaltables-3.1.0.tar.gz 278484 BLAKE2B 733bcfcdc51c5e78e85e8f7fc9db00fa96c1ad48f76a9ec48ed546dc0acd62af90f437de346fe05d4cb09151b33ddea2f62beb21b418d7f76d8a719423a5f694 SHA512 dc49458652fff8bc6094d316d84c9b8e9fca1a26e3230c0b668bc03ec8528793f4ef024e8032d4a56fbfabfdfd4a1142870f550f0b373ba6a42dd2e3ead3f501
-EBUILD terminaltables-3.1.0.ebuild 767 BLAKE2B 694c68b9a42456e33312070c0cebb6db396ff1bbf4214341e9b8e5c58642cc058584b1051324354bd67558b6a9ad965bd7c2f1c819f5ef26a4ffc358170e0a53 SHA512 7b18189494ff4683fc7adf179c76164b6e6322718f45cd229faded499885dd68503619bf1c7c4f8b96d6b80033726b3a408317e11cbc9f8b33bbd0ecac24e667
-EBUILD terminaltables-9999.ebuild 747 BLAKE2B b731bf7e2c578d019ade1b5e47968078983ec726193d277a67d6a105845035b4ce19bbdcb10b5c01f4a7befad9c52a3c4ffefdb2855fba95c0fe4cbf5c993046 SHA512 9bb965b1414737bda07ef3f86384a8818830f6229502bce2738dc778f710c990dcde86cab68725dd0eb69b9714fe3b952c2bd2358b98d43d4c782551e95cd1cc
+EBUILD terminaltables-3.1.0.ebuild 763 BLAKE2B 442c7a6ff10f07427b5d4f64199e15798759b5a62c56a86c9068f15d02edab934fb84b17062eb74f537f3b07234e65cb334aa11a1dcc6e186ee1caa3ecf46b0d SHA512 7fe2f8803d3b2113f464d2bdcd7c95a3945479b151980e44595a525adc24c155a0970d41b547d6d36014a05a7df8224ceb062b6dfb015b8265149132b800d16c
+EBUILD terminaltables-9999.ebuild 743 BLAKE2B f5703b10e49514fdaf0949e3c82efde21e57d618a1bc5822a5548d74961ebc57db085f6ec72e2550bdeb7983b6960ffffed62d6e782a7af206e35cdbc74f8d88 SHA512 2ef0bdb5149449e1ae0afc9a3ccdd050be08ae1f34ca42d7c04ca9dd4c657064899032d672b1383db6e6091617b2fc28358c4dbb6e2a12c55e4d06f1e3150304
 MISC metadata.xml 413 BLAKE2B 7aef163d29b857e19732c69ff0a5745d511ba8619a9f44f6ab0ecaf5b046a439b109789855cc1ee13ac99b1b3dbff6ba5432ad4bb8d9644cb4aba43aa9a8abe8 SHA512 44b71c2921a4db4517cd9c2d64021f39988a0767dab2020b2c4b6354da7eeb79d783bcbe197109cffd0fed3bc01ca6a1a1d5a4d8793176792e4ef749e59fe975
diff --git a/dev-python/terminaltables/terminaltables-3.1.0.ebuild b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
index 851902172a43..850b353f1d1d 100644
--- a/dev-python/terminaltables/terminaltables-3.1.0.ebuild
+++ b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild
index 891efcd3a4e7..260b99550c11 100644
--- a/dev-python/terminaltables/terminaltables-9999.ebuild
+++ b/dev-python/terminaltables/terminaltables-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 EGIT_REPO_URI="https://github.com/Robpol86/${PN}.git"
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/test_server/Manifest b/dev-python/test_server/Manifest
index 6f1e683b6864..1981375fd554 100644
--- a/dev-python/test_server/Manifest
+++ b/dev-python/test_server/Manifest
@@ -1,3 +1,3 @@
 DIST test_server-0.0.31.tar.gz 18578 BLAKE2B a08c23a7db43f1c99a0cd270852d9ea841e0c0e9888d1d4a95b8879b436f8c016d1d10222127fc8024fe3560340fd65dc629677106a18c7bc01a565c85a6702e SHA512 f245165f6326e63fae6e51ae247cedade41a391c505d9899c00b886df192326aac32f2a479d322de079f77b252cf199746a7ea3e06089cab105646d194d4d775
-EBUILD test_server-0.0.31.ebuild 888 BLAKE2B d3add3374eab71b2431a3bb25bd29ea772959360d4bcd8d2244eba4897b42a2d4e4698b8e093eda1e65a280e25f7d00fc9793cd5e5aee978a462e2e0db382604 SHA512 953b822ee341a4037bf61f32dc85d7e88974556628c910a85c4a7decf60967c9ba32a26e57ff2ca7cf72ffad29ea9f37098c9fa046b567f0a11375ac753a6159
+EBUILD test_server-0.0.31.ebuild 885 BLAKE2B aadeeb6dbb28edbecfeb6dae4959f88e502fa429e2681802f47abd95075b00b5bcd8702dd125c36ef99ba3ae3468d8ba570595f64f8df83ce1e332b6138c010e SHA512 f68f5604a11ee317d923a98caed087dbd1ac2ce4cb8ace377655750e2fc77719341639ac4225b884983e35fdbf81c4961400ad7d735d8ac145be0f6b92fbe91a
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/test_server/test_server-0.0.31.ebuild b/dev-python/test_server/test_server-0.0.31.ebuild
index 823107ea4a80..722c8ee0daa0 100644
--- a/dev-python/test_server/test_server-0.0.31.ebuild
+++ b/dev-python/test_server/test_server-0.0.31.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Server to test HTTP clients"
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index a9840a19eeca..e2ccbb5e356c 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,5 +1,5 @@
 DIST testfixtures-4.9.1.tar.gz 90117 BLAKE2B 6560d4072f8b0108b7d7708c980f40df1a05af88df86dd01926bdf0eab107744fc89d75bdedaced7300c24a52a9d1c0685f5dd3f5f732121ff97af6d0859055a SHA512 20053d22297b7852382a4f2bf6d76bde6489f788a9073aaae407f68bb6b3d7bdc4a045868cf7c99fd294936768745ee7d652c86a4a96c33fb0e95fa0d96d2a59
 DIST testfixtures-6.8.2.tar.gz 110838 BLAKE2B 4b83a1459aec4bc4b4dcdff48603958bfd115806ce0c567faad37ac273e93096cf964af08d24b98c1743d6302d1b2f6f9c9498023c781ab3e9170e2eda74cefe SHA512 ce6561d976a0b8f79ae72aaca6f5ffa8d1cae30ad73d3d88625ed4fe55da5f0a913785fa3e9aeb4268dfb243a7b74dddc262554521a71c766089383aa5b0e022
-EBUILD testfixtures-4.9.1.ebuild 1627 BLAKE2B 3a5eb5d877f821673bb8493228d2b17ad4b492aedba6af183ab5f5d15b2443f84ee8dcf83268e6b2514652754b83f645688815f1db4b23307b38715be84d5c04 SHA512 28e21044ee40e0a3eefe53779d004eaefde8c4cb135c200aece8456e859f338cb5b062b104ef4f744babaddbe5b049219f48755974d36045770838f56c360a59
-EBUILD testfixtures-6.8.2.ebuild 1622 BLAKE2B ef522007404371bd9179665ec9f56f9e551fffa93cd0722fc46e8ee9a7a1bfee94af00277c6b3d644cb684887d2815663784658eaf1b3514ca9c09baec7218ee SHA512 e1b540eec8b7390d288a41dbb650e30cb4eb51cba2570d2f17f800532dab4bdd2c7c77f32779e0585917000bddd46721e7293807443ffd315f25e2322afbe87d
+EBUILD testfixtures-4.9.1.ebuild 1618 BLAKE2B bb0abdde4b93582e8d451177388109df5d44cf1180d831e716bb134d396d5b2b1d4e834ea99e596c379eee1c8f4a4a4dd70f6a356210577ada4809e62af287eb SHA512 e4d8cfc18acf0c1db482e95d9d6f14cfe19842ad0ec660754eae740426ef1b58f770b897f8d6da31d6a980b1be0eb02f5773ab5308cf779cb211f9444bc70bc0
+EBUILD testfixtures-6.8.2.ebuild 1620 BLAKE2B d53326fbc9548f146e3b1030a64fff0edd3c988c0154a1fcb9fcb92e18f5b7d413fb4a6550c9a9e1df6a04a10c32c6ff4d5df9871b99a6b744fe471ed4fa83e3 SHA512 c7322df37a08046af02e31968798a4c0890d72e6d1b77aa0629853b09db565960775ca3af1596183c7fbd76706fc78892be87d72e7e5f3d85be30ff5baf04278
 MISC metadata.xml 390 BLAKE2B 7211b89e4130b65db09254857e522420bae09bce05ff1065c6fa53802cddabe3536c8631e2ae79ab63d63f4d2550113e49a5d0834d7ed782524678a38b5c1144 SHA512 b5acb87f7a097840d861cf348e917f652b81712f9c4b408bd4a3b0f5a7b051bd1731735b2b3f63aa56144a032e6ea54fe3691c5858cb678666b6c4d701088776
diff --git a/dev-python/testfixtures/testfixtures-4.9.1.ebuild b/dev-python/testfixtures/testfixtures-4.9.1.ebuild
index 9b1e98b9d195..7c2dbd6ada6a 100644
--- a/dev-python/testfixtures/testfixtures-4.9.1.ebuild
+++ b/dev-python/testfixtures/testfixtures-4.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testfixtures/testfixtures-6.8.2.ebuild b/dev-python/testfixtures/testfixtures-6.8.2.ebuild
index bb48ad733d3c..a3b4728a12a9 100644
--- a/dev-python/testfixtures/testfixtures-6.8.2.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/testify/Manifest b/dev-python/testify/Manifest
index 0155237801af..cb26444b1f7e 100644
--- a/dev-python/testify/Manifest
+++ b/dev-python/testify/Manifest
@@ -1,3 +1,3 @@
 DIST testify-0.11.0.tar.gz 67914 BLAKE2B 8518f7f95ed83c7c8d779b58962f9b111639b4d5b9bbe80907a6e25ca70781945aa320a0cdcfefebe6c96b0a7f471f8334af332dad32beab5848e7601ed277e0 SHA512 ed19a9b5cfa509b65bfa366aa8c5fb311f00a2996dca9b5028a7dfe8d7ad06ab88964dd7e7ea7aa31e183537d769bbd81eb6dbd7d57d7576b6ec8fca9b684dd0
-EBUILD testify-0.11.0.ebuild 1330 BLAKE2B d32a078848dbf400ddd49e5843118b9254e2ee7b706213a0ea0f246c3091165c79806fde3a5ad3437a3107d81266092146f35c3030e88eed1c311fa0a9902de4 SHA512 a9cf0b566d6eb22046d86612f1f6bc654e6dace0367360f02277ae89a46c3afc7153f3eebc7373cff9ac5062252b8e0bc347c829e634c76be0afa3209ca6475e
+EBUILD testify-0.11.0.ebuild 1326 BLAKE2B 874412239c7748ad32bae903fef2e178c5ec6d68a482ba638bd0470748116bc8ed9aaa5ff44815e79ab3e50862a4016eb01e88e2a4c7d2b11ab0d75810cf80d7 SHA512 8fc6ff76b6677e71f28f5fc13821b7f34dd4e338bc10264d7868d8a89f8bb7a76eba07f5acc2089c1273cf3cab5e438f759d1fe2a0412f80256fee3c4010818e
 MISC metadata.xml 374 BLAKE2B 28e2fec88ebfc9fa2560301c0f566f72e6d4fd86ae01f61c6fc2161176b2855156d37a21383190c62d13c587c3cdef70f41c756013d7142226883fb45ae81fba SHA512 668324c1ff0e2977568abc0ff574acf07d445bb47e17781b7e6d4f409118496c5ab4668ea500e94a615ffcd93c4c5dd59960cb00b886b9c57174ae62ce24c8b0
diff --git a/dev-python/testify/testify-0.11.0.ebuild b/dev-python/testify/testify-0.11.0.ebuild
index a8c182ff48ae..58e313e75e0c 100644
--- a/dev-python/testify/testify-0.11.0.ebuild
+++ b/dev-python/testify/testify-0.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 87b526652bf1..d38f207a0987 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,6 +1,6 @@
 AUX testpath-0.2-setup.py.patch 944 BLAKE2B 4a65d8a99fa04115e4e24f91be2b32a5f26a26b1b8fa795472622efea1afa6d5df717c10fbfbf106180d1f6d5f8822350d9605de41fc7db9e37a7b4c7b887df9 SHA512 c27c2dda320d2c16239eb498b2f59f85746745ce1875879a17f41235081983fd1015f0dfd182c6823b998f85aaf460486a3ac6d955be969487692ed50c5648aa
 DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
-EBUILD testpath-0.3.1.ebuild 1121 BLAKE2B ef5faebee361201c0c6ef31691f01ea958cd2991f5d028a8a7cd108e751e54d2d00984a8148c55930c52f930221217afa6b8940360d3435b9998e6fa19982f7c SHA512 11edbe6c2d05ad63c30201c302014149b2ed5196fe490dbaaaf01c3b8f8e2bd904125f5dd6e4dd0c211d93205356b65728a1aa1b990c52f46f4c1b7c3c07f980
-EBUILD testpath-0.4.4.ebuild 892 BLAKE2B 80b794297efe4dd6f426fee747e7e83680835e10edd173a0e87578c4532c1dd819f684b0c4ee9d6607d93293e52f8aef6e3d6404950a4ac3821ed797b5686057 SHA512 83a5f608974c1a798372459dc4341539bf6e894e1abffe031e418d0606d163fe3dcf9742e1f3679e4bdf93f19cee12ac21bf1e4722e96f0342bd5a529130f763
+EBUILD testpath-0.3.1.ebuild 1116 BLAKE2B 4b63d38565eb24d7a4049afefe995d3920776330bc3ae94c16b3335461d4875304c15c7017aba859031c6bd95a85db7b00049c518d149069edcc1fb39d0af194 SHA512 330978027ab09b4e49dc9fdf34c0f4b8702882d14c13c71c3460fa02a589562431d50ce6c7484b0066fadc1c4b1e400e1d5009ee452acf9c957fc1cffb7e1e56
+EBUILD testpath-0.4.4.ebuild 887 BLAKE2B c9330d77fd3b9faa8348f5899201ddffdca43b68c7f7a0173f7ae549393ac350d4f3c406646af52fcc45e84aa2daa97104e68a80acb10ddac19ac7f8993858f5 SHA512 72b2f12d74d00d1610a9d17521968373b8354b4d6465ee89eb5e106e53fa1d9d564962681fa92dce90dbd7be6da6bd81e936efe9ae6c07e954937d1016c16b4c
 MISC metadata.xml 613 BLAKE2B 46ccd59fa5e42a573ba9fe1219a5e5a103876ef3e73363b3e003f76fce1138b7f6a9ef3a023be5b695bbbc1244c047d3f70b23b553b3412695a9791dac83c540 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e
diff --git a/dev-python/testpath/testpath-0.3.1.ebuild b/dev-python/testpath/testpath-0.3.1.ebuild
index dbe3bab5dd70..da39fc5e486b 100644
--- a/dev-python/testpath/testpath-0.3.1.ebuild
+++ b/dev-python/testpath/testpath-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/testpath/testpath-0.4.4.ebuild b/dev-python/testpath/testpath-0.4.4.ebuild
index 4dca8303f76f..fd9d7bfa7f92 100644
--- a/dev-python/testpath/testpath-0.4.4.ebuild
+++ b/dev-python/testpath/testpath-0.4.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
index c4310bd12e5d..3abcbe2156b6 100644
--- a/dev-python/testrepository/Manifest
+++ b/dev-python/testrepository/Manifest
@@ -4,6 +4,6 @@ AUX testrepository-0.0.20-test-backport1.patch 991 BLAKE2B c6318f8bc90195d713043
 AUX testrepository-0.0.20-test-backport2.patch 2270 BLAKE2B a34bf9c2ca3f0ad81958d0e7e30b6ded6f463877ea1315087cdcc3feee234885b2dc5282e6c9e8e09f6f9a552e94efa48bd101b6532caa6148927d533a4a48c8 SHA512 a5c41912d9dd73b288504b25ee1ae6faabbbe75d6992485a69c61d63b762c900567ea2bdd7ca9a11904aaa7bd41f8983d50a5fede05b4d94096a0681a486d200
 DIST testrepository-0.0.18.tar.gz 84886 BLAKE2B b6c0161c55271722644eddd5d620ea67b67774e92d2de0117f645fc1016c9de209de6a9557862a27e08850a3ade5a2406ea5eaa410a2ce4d44fc26c8121ddecf SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92
 DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6
-EBUILD testrepository-0.0.18-r1.ebuild 1286 BLAKE2B b3f6706444e3280cec2623577c63d7e4d389771e5f1f3cb554313089cb930e04a6819fe61741512a7c2151e6b4ef8e416c677fde503906a09fb70e980453db00 SHA512 b029781f7bd01d0ee8582fadb3d50697816a6db47a809f0db242bafb7dc83cc8c3e9e4e79dcccaa97a90ec4933cab54f19e2d1d5b3cbd214d979bfbda04bba4f
-EBUILD testrepository-0.0.20.ebuild 1320 BLAKE2B a3d23d9371da15e924e60cca212cdfc8538c0c7e64751c134a103893201355641aa683085c3ce89323aeebfc91b79c8204d914296d9efea0438cb33b10d215d9 SHA512 b932ed69722c11c14682cfd8467b3902a2bc85686e377018fb27e242636d0ffd47f980f71946f2d67f513c1f7e799d9bc79f6ea193f0c5d035ebc44dfeeb61ba
+EBUILD testrepository-0.0.18-r1.ebuild 1277 BLAKE2B 69b8f0db46a5436233a45cefe79c47aecde25d80bd573f3800e93203942694fee16452ef19a4d518c461b4826cc557780edfbaf738fd66065a7aaee8e8f17871 SHA512 9b7e2bb931c8523fbe9965c5eda2237c884baa9c9d087db85a5fa5c497e60113d42730f2f2d0b30168ec74751b7ee14c71001bfd13a51dfc6730a03eacb2f9b2
+EBUILD testrepository-0.0.20.ebuild 1315 BLAKE2B d6d040f20bc49e1eff798dcbe85bdaba2fd1db508a33929b2ea81676fe33ddfd756d9b26637ef9f96fc928d7b77dfde32aec8e250a810eb9844fc17b2efb0391 SHA512 1d1e084772a5fece73a797918b1112e1bb14984ed18a9abea95774b5596a86355a74f7e29d6b31b60ea149f2790a10c48516217bd69b55630925ce95dd17c7a3
 MISC metadata.xml 575 BLAKE2B 7a1c9930c814a2bd60788a38d12909871d068def9c39041ac346466bb2d3940a3df3dc771fac6b2bad39e2a85b20f2b4fb8dc269af4e7853f02206eac9044e22 SHA512 36f0681e6b41a80ee0f3cdbac0520640c67a5612e73baae30b0b5917576d343db3327e03a40e20b23f23b0c76ca797d5ccd09d8dd339dfdb5af6029a4f4d79f9
diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
index 780d759e2eb1..690d9023eb84 100644
--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
index 6b59ff42d96e..d62ecddc8497 100644
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index de4668d46c3a..35b2b61b49ab 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,7 +1,7 @@
 DIST testresources-0.2.7.tar.gz 32050 BLAKE2B 9ff16d2e33d7b528598d2f5b903e57625018ecbfd9484dab0d8a7d922429cc8d35dada91d84c897c426e06e01b7bd0befe23814996f4aa7b0651148edaa6f246 SHA512 29518f7326272c56a5f2f3f1f7741959dde9265ba5ce7e0c7d7afabd91bd44a519d1cad82a11a41944ff12d65e541536476f87afcac9a7cbb4869743a38547b7
 DIST testresources-1.0.0.tar.gz 44501 BLAKE2B a10cbf562241ee2a756a5de6a9334ff664db7569d3459548d4a9042ab8dffd0d715c16616ffe08ec86ad4a0b4940e0c09b83b57f7bea86b35b6f728e55384fe3 SHA512 7c9f9cbcc62066ab4a75d68780d88925484eeee23e2e0ef0395b63ec2a92968a6969d1bd6f483945e32ff5566e686b426f2f37daf4f803d2ef779032ea97cc6b
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
-EBUILD testresources-0.2.7-r2.ebuild 976 BLAKE2B 0efc5ff946b5387b6d3257c81729b90bf58ccab3f46991fde8a08f20de1c7ac268a32b1cb33955770abcd831041798b77dabe70d9ad4833b05f059f451c57d61 SHA512 39903da02791a4ce887f66b307a65c542a3f9f37457e0e6b87babade9003f00cef6281e37856de48d283bde2bbd4d365660033f089b8b23bac3ce84a0b4dbade
-EBUILD testresources-1.0.0.ebuild 982 BLAKE2B d70c90a2c5fad9e11941e536d27f6f3acb7903e08e024ddfce46c2943c1f2f4da76dbe0f8c9d37a4483d1a7f29f0dc1406296019271cddd862e542e10ba75266 SHA512 fbb81ee3af2278db20fa81b846c21ee2a10abcec3dc2f3b0b000e50ced5a1b1ff3db8a849001fe61a77c086b50a6d8a51e6e29ebffb7da97d082b7cab6fa91a5
-EBUILD testresources-2.0.1.ebuild 973 BLAKE2B 47799378211e488f119e3f8fe5f0683ba001dd38a5c8d81f4ca6efb840bc386c0909e1f959c7b548b466c7e1dd539fc4c2248d2f2cc6636cdc5944d07e6da272 SHA512 c31d20a88e4fef76c08951d5ec60cae9a93942b2da961b35dae86d3e131523b51641336935da0bf4b3689da81a59b14036d76d74631fdc743abbf089110ed2e0
+EBUILD testresources-0.2.7-r2.ebuild 967 BLAKE2B 168f1d808154a3f70d4be0e68d33f46bef508494a6f1c80a90d2fb9ffc964daa4751fc375fbf6228a0b95bb9a16810f8476bb0c968de03462caba5dee0831eda SHA512 6a31620168fb8b0171b7af71eb3c497e19b6f7d618b6edd7c43f783756295ef9e28f6772ae662bfa481534b0214d8761bb26031747207e92b5d98843a4c9d18a
+EBUILD testresources-1.0.0.ebuild 973 BLAKE2B a893ec87b17bd25250ea227771d4a4242308665b857b084631b713e207abf9ba9353bb2d16397008a739241bfbfb569a02a5d6010903c11b98e029c5502af6ea SHA512 1ce7c14c841bcb11a8af276c68adb413acef2953d538e34470b1fb6b1993489da39adef032f38ba304082f55b300806c2e750dedf5b2137f391f0bdb1699c854
+EBUILD testresources-2.0.1.ebuild 968 BLAKE2B cc76a41360f0d1b188307571e3ef1249e7ae13318041d94505498e1691bb1f94ab45e2764ed944e6278ea6fad23a91e5027a41bd248b1eb3ef9caf69bc2cf571 SHA512 22b32f233617659f022f324426b1fcb8211d5e5bc162a824305350532f42fdefb652b5b5d7390981ffcdb9a0452cf596eda9df9b8d004e4e6f491614a9d60bcb
 MISC metadata.xml 939 BLAKE2B db25bed8c4a747daf38631903c47491d4cd5ceeed168eb14c68ca0894c271d866616d9a2704beb446a1316a710c98b73a5e224afee7d1e6ceea092de834b958d SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5
diff --git a/dev-python/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild
index c844e0b15bff..f5fe0a5c9f1a 100644
--- a/dev-python/testresources/testresources-0.2.7-r2.ebuild
+++ b/dev-python/testresources/testresources-0.2.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testresources/testresources-1.0.0.ebuild b/dev-python/testresources/testresources-1.0.0.ebuild
index e45cb397ea84..53e170eb75a7 100644
--- a/dev-python/testresources/testresources-1.0.0.ebuild
+++ b/dev-python/testresources/testresources-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index cac85cb34dfe..11d03bd2bb10 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index c71a5ed3fb62..1bcc7c2b040a 100644
--- a/dev-python/testscenarios/Manifest
+++ b/dev-python/testscenarios/Manifest
@@ -1,3 +1,3 @@
 DIST testscenarios-0.5.0.tar.gz 20951 BLAKE2B 154915281456aad3353e144ffec8404514622fdeb8d2129ba530d3d5a02814599c2fead9dc25ab4904bad68b2892a435f9cbbcde92503d71477624bbec154f53 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521
-EBUILD testscenarios-0.5.0.ebuild 1026 BLAKE2B ce830dd69689ac9051fbcd9a5686451b6b93da0bd50c7642ed1a3585dd0211c426acd31dabd619d8dc4ddcffdefbf9c8749a2c152550456f0300edcc10b8f3b3 SHA512 32c7ade1464d31b5ea2c0884554492571eb27a308449473c5f0e9bd4cbe949f1185ecaf06d6499f4ce92686cd105e330aa11cf6013066e1ab693d16be68eca98
+EBUILD testscenarios-0.5.0.ebuild 1021 BLAKE2B 6a3ccdf01135a00221c4da77580eb5c4551ff5b9f286b15e4a25beb80dd0952dab4b015e105e99d94d5c590e4faa76a3a0ebcbff9cbe4b85e46c76616f792d8a SHA512 ad82d9b4bc97f41b3d62641f7438eb1a9dc6a182a565dd39da0883b49639da1e3583d88e0c0d05e604c55df5346252a087d56a64a7a32266a9aed3c5f450deec
 MISC metadata.xml 979 BLAKE2B ab0d7bfbefdae5ba546ff15669d1caec70e59bf398e6e2ae329821bb141aced038cc946fc309b79a0348051352f7d758e24c081348d6a7e587fc326df14dda09 SHA512 f043d2244673a34d80a88f07c79ac199ad6b2509c3af7a7e934c94330bf745e2dbfbf78fb7f38508cdb1968a87e30cea3e346aad63eb93f94ca762461b3d20e4
diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
index 6a1e86af6505..644fbd44ca69 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 8b87a3ff8f4c..651fa61378b5 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,4 +1,4 @@
 AUX testtools-2.3.0-py37.patch 1740 BLAKE2B 10a1e774fcc436b1e4f33075f807ab70ec79a7d16338cac35f63dbeaf4ab4f95d5f67c69886918405edb7ef939b9cbae00176202705d08a9f1ea80f08c3c6af1 SHA512 e8a441464b8d6e2a75f95b26e83c2b2fefad262fa193bf088b65c1101fb34a9d53ee7a3554cf005519a44cc007f78df74d32163e5910f447318c2e89e67529d3
 DIST testtools-2.3.0.tar.gz 231559 BLAKE2B 6ae098e368cabc0bfe45736324819687a6086eccf868de7eec312caf7c64b5d75a3168f3966d5cd0b05ad9295957a7aa1ee3c1589f076de1f5cb619b197ba08a SHA512 558fe6a1bdce7215f9f6f178f469a2b76948dc7ff0ce27400482a16683474edb81d9bf90ae48b6fcb8df9eb70759341b694aa162ed3d9d4abd372981cdcd8a64
-EBUILD testtools-2.3.0.ebuild 1525 BLAKE2B c0edf72446028ccb68488d6e4c66b49c4929a02498e170194b8ab1f95838948a4a7f83915673c39042ead8655edba1f64cb97d9299c44987b52a1db0e25acfad SHA512 78c2c8ba85de489240c625c2aacb597900befdeff1e4e216af57ac7672f455394ac5842ec3e480008016a57f6db91bafbea06d6769e01c5023def40a9fc15270
+EBUILD testtools-2.3.0.ebuild 1520 BLAKE2B 44b1d6fb117ba9d423a7ce122376d3133f7b167bba8d988bbb85e1ba4a48112df3fd6c9d1e5ea2e8f8ff88001ec112ffdad2663b8c86fd972970fbc0927901e3 SHA512 14d585714be8e55f643c0b3b1dc07372cc719973ca19b6678a0e3ad45c45d232b4512da87e9ec5a2522a694abfb467c8cec16d6ddb6ddc0813f2ade29265986e
 MISC metadata.xml 554 BLAKE2B 251f32aa81267f470d8f5d1f22bd2e2354fc39ec79ac326dd64333e73e5cc8ab35d6633e1ebce2bad5086d55f838fb129d7cbde2e1d36cf77945527e6e786157 SHA512 ebe5defc73dc62044732463b2d295c08ca24573c34b689150f3865247b34ef6d925437a0c97598c3260ec037c4ed3644017601fd2b7127521c7c352edc1e6384
diff --git a/dev-python/testtools/testtools-2.3.0.ebuild b/dev-python/testtools/testtools-2.3.0.ebuild
index e5492540dcc4..6c1e8b8d2e95 100644
--- a/dev-python/testtools/testtools-2.3.0.ebuild
+++ b/dev-python/testtools/testtools-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/textfsm/Manifest b/dev-python/textfsm/Manifest
index fa2739ed3d2f..9f653e76d739 100644
--- a/dev-python/textfsm/Manifest
+++ b/dev-python/textfsm/Manifest
@@ -1,3 +1,3 @@
 DIST textfsm-0.4.0.tar.gz 38355 BLAKE2B ae59973585ab0e1eed04ec300139165cf0634c154056f73697057928d2e17f25c7934171ab20825c6fdfb35f09b18cc0438443b28af356ae6be7a28f4cb8a5af SHA512 fe7d49c48b6e74859180b911a72e8c21bcf263b0403e8fdf28f9790633fb5b48ee2465eb3208c6649e489cb5fda3c4751e1748483042c934285636d190b01998
-EBUILD textfsm-0.4.0.ebuild 686 BLAKE2B 6ed9526c956abf1ca1b41f24badd9ec734136e1c96c8baf11f478d7499ee35a67d72cf337c62eab803f270352239596e6aba00d49d997c481483e2f3af79a666 SHA512 d78993db493b23a720c1399300326056b8ffe473c1e7b2645100f2a286bd145b7014b136980d38dfbc5cd00ff13cfe4b6490c3cc790ac58af4f8f03cb850831c
+EBUILD textfsm-0.4.0.ebuild 667 BLAKE2B df2a6e44458d31ca446033ba23d3dcaebec7ec20dafca6bb49444b6ab83b0a15dfd32c099480569b9887fae9bffc0f644c7400dfba779aa9d1084bd6ad154e11 SHA512 c2e6748ee3babd0606d74924f9313060e11c0ea5741e387b77286e6b4a7d8bea04fbc77549f2f085e30fb99b9246d069b4fb82537c91e051ca66004309b9d867
 MISC metadata.xml 381 BLAKE2B f7309078a84a9991b14e84ddf4ae26809e80a67d5995dfe3ec4c5eb261099345bfb53749eec5803dfb2502e9fda9e664622dc9e33ef1b266d7d7d554d3269f0a SHA512 03a1d5979ad678c1975b45b05a3d4f22d9a560416761781aadb0f9747ebb707392f61ad17c4863752587944aca373c9d137c2b226b1172fd97eef6c7079fd907
diff --git a/dev-python/textfsm/textfsm-0.4.0.ebuild b/dev-python/textfsm/textfsm-0.4.0.ebuild
index 086d5b31a6a7..185822d8b92e 100644
--- a/dev-python/textfsm/textfsm-0.4.0.ebuild
+++ b/dev-python/textfsm/textfsm-0.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index 1745401d2413..58d8013b4c4e 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,5 +1,3 @@
-DIST texttable-0.9.1.tar.gz 11074 BLAKE2B 465738a7b980f2a216d63b268044c1a1b8c0deb986fd398f0ba0ae30ab84020ac6f179b5314a2071592c38443f9cb86387b9ed573342533af9e825000472ebe5 SHA512 7ec37336ef4b253879d0232dcdb4500cad33ecce1067dd7ea26c221dc2c003ee56360bdbd1dd1e00133301c51c67fb2fe9b1703628804a65f2a6ab8a1e830e50
 DIST texttable-1.6.2.tar.gz 11450 BLAKE2B 8090914b20a93283ea3d533a8120d4d2c5f058a0e79550b29d4b9fa740db5e309d84a7983fb6665149e3624ba7039b67ff6a553b180b915a348e5b53e793d5cd SHA512 e59275c64813bd00fa5172c43491820122b6045e1a416c917576cbf595c1ec24d146e571708379f4b32775bda904f16ced0e9e15ab7b2dde78a214f26a1c4de6
-EBUILD texttable-0.9.1.ebuild 426 BLAKE2B e888f87140391d701eae59056abd2f60c30991efb1070234ebb2a9b2d39d1dd30a536c316f9088ba55e8cbd09d546a7d90009364498b94f77909a9419d378d1b SHA512 65182f08de9b8b952c60adf04fb87f02220f94ef6dd5c17980c57e7bf020161dd459831ae402a25bb7573c7f1717e83a948909743218ef8c9702708d676c38fb
-EBUILD texttable-1.6.2.ebuild 818 BLAKE2B ea52168c3b5b09ade19f3019f2e5127546f176f15ef7ed8b037cbe48c90113b037eb58a9e045ac960ee8716108ec62086668f6d0e09122fa7aad98779e7382fd SHA512 0bdb37f701ab1ff1706a5792fd2689242342d53f5bd5071e522c5f635b3c8c262ebac39db6f9e5d1815046579ea25fe365356a7271acec8c445b933283b50d8e
+EBUILD texttable-1.6.2.ebuild 774 BLAKE2B 6877455f8c4dccbc0b9e9811098a4f19272fcf6b4e752f3ce9f10878c31a3b5eab70b62dfa78a562f0d819e5fdb71f31f5c3eaf5a624da6f22e0309512bb16f1 SHA512 d302a9c0fd2107c240321073c2f745c5fdd567350ab067015c3991556ac56a86e4d56e935686fe171322b3a846bf0d8f95559cf9c251ea4bb0e2a91d6baeb9b4
 MISC metadata.xml 330 BLAKE2B ee4c551d00203affdb9666d0d3f58541249543f6aa6a586fda4b028f3b9c5255e61abdc6ef9faf62d1c6dda4f60afed5c8af2090bf6c54d229681c567ff6299a SHA512 900e4bcdc1580e4dee2ab5298c2b1115e0942d95c410d76dbf6cb062f759fecb3d633d9e7f223e92d997ce88d98c2a3d719cdf7cdcc7625a78cc5b3294c3ddec
diff --git a/dev-python/texttable/texttable-0.9.1.ebuild b/dev-python/texttable/texttable-0.9.1.ebuild
deleted file mode 100644
index 38c1e60962ff..000000000000
--- a/dev-python/texttable/texttable-0.9.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="module for creating simple ASCII tables"
-HOMEPAGE="https://github.com/foutaise/texttable"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-python_test() {
-	py.test tests.py || die
-}
diff --git a/dev-python/texttable/texttable-1.6.2.ebuild b/dev-python/texttable/texttable-1.6.2.ebuild
index 7b84c8a238b9..d64686e2e5f2 100644
--- a/dev-python/texttable/texttable-1.6.2.ebuild
+++ b/dev-python/texttable/texttable-1.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6..8}} )
 
 inherit distutils-r1
 
@@ -13,13 +13,12 @@ SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cjk test"
 
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/textx/Manifest b/dev-python/textx/Manifest
index 47c1607aa4de..be5c75715151 100644
--- a/dev-python/textx/Manifest
+++ b/dev-python/textx/Manifest
@@ -1,3 +1,3 @@
 DIST textX-1.4.tar.gz 21967 BLAKE2B b9e5b15715e370795470be855e0425075b1f704cab0ea2f24021345d8748f9f1a36e84618207c7684cadf86dae2ee0d613af3aaf217a881ba922385a544064ba SHA512 7783f4dd1358d8e0df126f1be893c58e32f57015fd577bd20d00a17b63111d6e48222c9b78420a307fcd0833f6d9ac3a1398d55986681251f7c378cdcd68c8a4
-EBUILD textx-1.4.ebuild 775 BLAKE2B 580f6909f8a6849cc6822e13e6688e676b0c6515532fb5de507f59fea40521a8355942cf811b1f9407357acd94099ad0084b6138df4aaa739bc37b6bd13e2c5c SHA512 cb55d3b34c18f885b9feb368f652de260b41b696363696bc441986ce9cb87e9d8bf1f471235056b27b44d2310cd716a4bf35ebdc328b7869373541a8a84e6ffa
+EBUILD textx-1.4.ebuild 761 BLAKE2B a4da969fcab2ab557cf38e7c368c1bd5ed6b85c4b1542e0416c81b5529e41019b50baaf625f04fead0e0d3e1f8f1fd24ba394adcd9408991b72f0cab8bd2492e SHA512 fbb02db696506501e08cd5892a6f711d13a1fd77248a0fc645b8ec1682d2837f51dbf406f9e1b15e736b033e868e4890a61ee1d1dfb076463ccfcff574caebef
 MISC metadata.xml 345 BLAKE2B a3db3e9008b38eccc86bc80783465edbebee22a3ffcd679911b07184cda3a3dcb6fe94eeceb22f05ca826d6fa7a00818ffd3f6e2aec3d3a114ba94192cb97b5a SHA512 6fd6e78938db784bfed2b97150513735680f015cd1c9f4701dba4ee0ad67bed79d5aaa6adbbfb21932e48aa27927abd69f532895e04a2b57d890327881dd191b
diff --git a/dev-python/textx/textx-1.4.ebuild b/dev-python/textx/textx-1.4.ebuild
index dc74666dda2b..4434231b96b0 100644
--- a/dev-python/textx/textx-1.4.ebuild
+++ b/dev-python/textx/textx-1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tgmochikit/Manifest b/dev-python/tgmochikit/Manifest
deleted file mode 100644
index 6f39fcf46412..000000000000
--- a/dev-python/tgmochikit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tgMochiKit-1.4.2.tar.gz 686356 BLAKE2B 00caa95c047fc00f6135c983f99926f979e498e4ddd78782375ccfead104107d9e5bb4a31f2b240cde9163a3725bc1471e4235a74b982b3ca7296f49afb5d931 SHA512 2c384dec39c2da46ab0420d2d672af2eba97c638a3cfe3077ec66a7858ec655c457b99f6b33956e4c70baf3c8dbdd160d1c4c11f05088ff2f6eacbfa244b18fa
-EBUILD tgmochikit-1.4.2-r1.ebuild 651 BLAKE2B b0e35b9ba341575cf7694e795007013d80e2dbf8af9f112d5ee2cbaf4e14788f3757284da6bac3e090eaf1ca6054c0f916943526a10d2f6acb8ac44aa91046e6 SHA512 5c755bb8b54b887bc99d82c5342173e339db57c5dafaf11203a801353f0ad9d1af56759fa70f7fb83bf555252ffb15e288739c7a2c21bab17452117e116ea9a0
-MISC metadata.xml 313 BLAKE2B 8d99e17fe068a7904fbb4625f401bd7ed266c5dc0deb7e757991b3c8e8eec46cc2f54d1bce24cbaf4842663cc921e522969faa5482aff901ba16454974e0c97a SHA512 9580fd9293547c9fab594adcfc6932432b3ef41ceefdb71289d81594c9cbf119e2e87314089c75f0a5e0b0b43b51e1061ca8c332ef829b68ab5ecfc3ba9b6b1e
diff --git a/dev-python/tgmochikit/metadata.xml b/dev-python/tgmochikit/metadata.xml
deleted file mode 100644
index d25e6bf996ac..000000000000
--- a/dev-python/tgmochikit/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">tgMochiKit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild b/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild
deleted file mode 100644
index 3fef61a99830..000000000000
--- a/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,30 +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
-
-MY_PN="tgMochiKit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MochiKit packaged as TurboGears widgets"
-HOMEPAGE="https://pypi.org/project/tgMochiKit/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( AFL-2.1 MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests || die "tests failed"
-}
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 708e23204c5e..06718980c69b 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1,9 +1,5 @@
 DIST Theano-0.7.0.tar.gz 1985387 BLAKE2B 00d547d5d1f6bb4049a1db71442381ae3803be683975ccca7536b8971e066ac1d09a4fc93a7f70693ae052bbf681e0c59a8b30a326f862f870e10422b438f979 SHA512 6e6bf9afdebf3c281d71f5ceda73792e0a52b403b18776a639665767ac73ac4920b5042e29d656d517b8f023e5f9cd5a27086e0456dc40c42abf6f3569da3f06
-DIST Theano-0.8.2.tar.gz 2914631 BLAKE2B d136630d689101e9ae47984cd13289b03943276ed0aa606478169d4334a302448f5a2c31d65b1e6d571648772d6f0760cc004f2eefd86d41d72f2b0270017763 SHA512 d7bad7ed4c9453470b66df2ada4587fbe9effc134c0604d11576630a613568386d41aa7dd4a77f8b7a1eb6d8a2f76a8e809b1ac3ae18c85a0c55ba4a059b865e
-DIST Theano-0.9.0.tar.gz 3116713 BLAKE2B bf38d3c504909caa7aaf8e704a6afc86ab56810199190a0a6beb86ff5e0f9a75c8681dee1f1411ddcfa40739576e4d725c2423e74a32e796987fbd4b09ffde76 SHA512 e0e59256d2442f929fb120b4b21cab735e0a8ba087c4ea7d7caeabe8fa30cc19a46181fe1b4e268e778344fb3506eb20d8090dfc8d2a499c1bf84b07352686ab
 DIST Theano-1.0.4.tar.gz 2840691 BLAKE2B 7f89caee3dd50d75ff09693fde7926f2b7da0f94758ef932f207feea29d74d38ed56591e6ebe0b46cfa043d5fb46d5b97028171acdfd324a01eb7b904169b4ac SHA512 3cc7f9dbb606c3c997c8651c34dd861721d5a8b99d06ed0887306d5a5ad0d7e402fbe29dcb5ad2f513b3bf75966e41a2854ebdf9a4fb212607345f84f367de8c
 EBUILD theano-0.7.0.ebuild 1029 BLAKE2B 1102c18021f02a5b612e5dfa4c31c854353d1903970464a43e169763b6f36ca13c41bd1244dd138e647b0e3d1237338277bd71bb044465ac8ba6a6bb557dc28a SHA512 874a719f06de4ff493aaf8696300414a475362b78ae0640e8e68e0b68d4cbf939470c9f90b7ca75033a365e5807f9a5879b1baff99477e930a90cd3769f95b39
-EBUILD theano-0.8.2.ebuild 1345 BLAKE2B 8a701c06a9c50d63ca19af870b92e00204c43ceff710f1bdfee3a6600af7906e365cbe18c537a63645f6acdabf71a9b1fcd4fdf8dc4b32c8f7c8fce393cc1487 SHA512 b1e688bf168e6e210980199fad81c64b71f14bf1e2fca62db9ea20a9e4451571ed79d291ada722226ac17636cd948da51e85cc86bb8b99306d4b39975a2f9b4e
-EBUILD theano-0.9.0.ebuild 1351 BLAKE2B 035343d0d09fe6b68319b51d1c7c531a41cd0007737f0e5a18ebf299bafada963dc868034a9c689e156fd0c5df2b475a7582ae8c3f0968b0a40400cf878ab2a5 SHA512 da99dc6aa1c496ef402e53032470b204755315f10df029fedb402a67e414bbce05cf32607e152cfca37237fa022ecf79b39be7dc8ef4f480f7a7532ab168af7e
-EBUILD theano-1.0.4.ebuild 1280 BLAKE2B a5d2f87aa9de8f919db66a732fb040c04fd7d0b380fb5183e27f4030d3cd07533f42c1fb827c0f497ed2e02872c8caa61f67a3c2d9eab230c2a50789a2164ce5 SHA512 a5458837aaf5e48f6d390309f29263264c9e5b1504a18dec2d433958d60adf6a46cc7d747b423d8b278cc9c2a9965e4429320acd881843c5b65588f5093bad09
+EBUILD theano-1.0.4.ebuild 1278 BLAKE2B e0add6415b33061b306ca6463f74bac16cf865545c2bd7df032ac31224855f15c7682472de3a2db29d060d67670e6f22dac7e1e8d49096a6979c0ebc36463bdf SHA512 8ca3bbf382b43eaef044985f2db4d9f89d3842c7c30e7169d14051189fb36f025dbd0aff9403f2e1d2d66fbd806adf3ccb207f92406e44dbf0e67a0d4fa55761
 MISC metadata.xml 632 BLAKE2B 2bee1d4912596b45d3f5cc0528a927078a072091148dfce38892319b91a0635859fa91dea32565b4a7f5ed02726364a50870bab22197c57ff33c88a48ad9d223 SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7
diff --git a/dev-python/theano/theano-0.8.2.ebuild b/dev-python/theano/theano-0.8.2.ebuild
deleted file mode 100644
index de0279333ae3..000000000000
--- a/dev-python/theano/theano-0.8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 versionator
-
-MYPN=Theano
-MYP=${MYPN}-$(replace_version_separator 3 '')
-
-DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
-HOMEPAGE="https://github.com/Theano/Theano"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-	   dev-python/flake8[${PYTHON_USEDEP}]
-	   dev-python/nose[${PYTHON_USEDEP}]
-	   dev-python/nose-parameterized[${PYTHON_USEDEP}]
-	   dev-python/pyflakes[${PYTHON_USEDEP}]
-	)"
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
-	# remove bundled six
-	find -type f -name "*.py" -exec \
-		 sed -e 's:theano.compat.six:six:g' -i '{}' + || die
-	rm ${PN}/compat/six.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
-
-pkg_postinst() {
-	optfeature "Make picture of Theano computation graph" dev-python/pydot-ng
-	optfeature "Required for GPU/CPU code generation" dev-python/pygpu
-}
diff --git a/dev-python/theano/theano-0.9.0.ebuild b/dev-python/theano/theano-0.9.0.ebuild
deleted file mode 100644
index 1de50901c43b..000000000000
--- a/dev-python/theano/theano-0.9.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 versionator
-
-MYPN=Theano
-MYP=${MYPN}-$(replace_version_separator 3 '')
-
-DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
-HOMEPAGE="https://github.com/Theano/Theano"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-	   dev-python/flake8[${PYTHON_USEDEP}]
-	   dev-python/nose[${PYTHON_USEDEP}]
-	   dev-python/nose-parameterized[${PYTHON_USEDEP}]
-	   dev-python/pyflakes[${PYTHON_USEDEP}]
-	)"
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
-	# remove bundled six
-	find -type f -name "*.py" -exec \
-		 sed -e 's:theano.compat.six:six:g' -i '{}' + || die
-	rm ${PN}/compat/six.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
-
-pkg_postinst() {
-	optfeature "Make picture of Theano computation graph" dev-python/pydot-ng
-	optfeature "Required for GPU/CPU code generation" dev-python/pygpu
-}
diff --git a/dev-python/theano/theano-1.0.4.ebuild b/dev-python/theano/theano-1.0.4.ebuild
index 2bfe26861e2f..68db6a25ddc7 100644
--- a/dev-python/theano/theano-1.0.4.ebuild
+++ b/dev-python/theano/theano-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/thrift/Manifest b/dev-python/thrift/Manifest
index e88a77e1ece4..cf8f122eb833 100644
--- a/dev-python/thrift/Manifest
+++ b/dev-python/thrift/Manifest
@@ -1,3 +1,3 @@
 DIST thrift-0.11.0.tar.gz 52467 BLAKE2B 72dca118476dc5d618f6434614e5d72c6f496088731de9b62fcf47e76dcf707a171721df2aa4c87fdcf90670b8fd11c3a1cdb2b090b78683a3f4a204ef8121cb SHA512 cba59eef2841fa008a19cd36b322491b67d711698205d6671c76e38a3de2b330db8aa54516de8cdd4020dc795e67ed55913df53466f5dbf07d38fed2d10f9349
-EBUILD thrift-0.11.0.ebuild 453 BLAKE2B 443d6d605c6a78cbbbcaff99c3a162e40bdddaf926d73fcadaaf1d2ad18fe0ca1af7f07624779c560bfb7c8b150787578ea34affacaad63ba3524f5f5ea422cf SHA512 2f431da278e85a015765cd39eaafe78eab4259bf3d274e9f603104b7f931091617f9c78f32a0d933b956d25366b58332a124737121b995b1185a0c758ce4c994
+EBUILD thrift-0.11.0.ebuild 480 BLAKE2B 25f029bb88f731e03e8ba26cf35efdc837598d8494e1a5554e8f127f90efde58f18a9e7ad2ccbd726d6c860a000a57ed30a79a68c144593d663d4aa2a5649861 SHA512 8a9dc2df142b8826c68c287f53834b3e5096cdd3ac4a02328cd793b790d3d057c5bee4b8dc28297ae16958349879987f05858b10b1acd4e2bb83a11c4be8f115
 MISC metadata.xml 327 BLAKE2B 68fffa25c9e88a87a56110743553819ef0591f40567594c2ec966e86228bd3a0b0ef0d84f9f002c427b90d1f139d51f1af9786a4451457a7edb43adbcba10ecd SHA512 5f1f04b5bf6a52319bf4810089b26ba4ea4e4ecb0fb44b70322cca98bac1ed2851535fa8d8e6eea38e45c0a411261c5ca966b13a68cd9f3f51c4f7ff003b7291
diff --git a/dev-python/thrift/thrift-0.11.0.ebuild b/dev-python/thrift/thrift-0.11.0.ebuild
index bbc8f37a7dd5..b2e382ac8ed6 100644
--- a/dev-python/thrift/thrift-0.11.0.ebuild
+++ b/dev-python/thrift/thrift-0.11.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of Thrift"
-HOMEPAGE="https://thrift.apache.org"
+HOMEPAGE="https://pypi.org/project/thrift/ https://thrift.apache.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/thriftpy/Manifest b/dev-python/thriftpy/Manifest
index a5a1101c58f7..a200ab2129df 100644
--- a/dev-python/thriftpy/Manifest
+++ b/dev-python/thriftpy/Manifest
@@ -1,3 +1,3 @@
 DIST thriftpy-0.3.9.tar.gz 208164 BLAKE2B 5ceb0479468cf7ee88f244163a247c878decdcf54844992b839259fd5be3fc8f0453bc861336ab4f21f4dc6c218eb2dc0a0fb2efa956675885bf710b8c32a86e SHA512 ad2b7f568db47f7f26235fc5fb6180c974eb6738f154461860c7329d263252ee627b979098c3e9ffe8ed42a0fb08a9110a6842a923ac800166d80a23d4e6a3cb
-EBUILD thriftpy-0.3.9.ebuild 662 BLAKE2B 264d9aa3e112285d8482e2b4e241f20a9ec62b924987f05d0e46bd87109bf346a2d231f0427f0ea43ecc9e3464a85bc82b9c631e2420be463b30273fbe14b5dd SHA512 5bbfe4eaa180d8b409cd904215504db2a6405e6179e2e978adb0f3cdb99b5f900ea2253e80df592d20bb2acca2880bd62eb2ee8a8475ac76a527575a6c296bc5
+EBUILD thriftpy-0.3.9.ebuild 658 BLAKE2B cdbd9fc234bc1bcee35eb9a666c6c19b71f4f24832408c282114089888c86383998bf40f8fa01e57ee7f4ddf999f53b94dadb0b48817212d6bb7842d8044b1ea SHA512 8954e7ca9e70bf1314012ae729326f5c555af72e2e94836dd93dd52722c08294735af58ff1daaacfc2b798a951b610ac89780766fa35243da48de6bed4c116fa
 MISC metadata.xml 778 BLAKE2B 6f83e8ead49cbabc5532cf915cc184af1070305ed153c97cfd1df5526e5d0db5c653c29fd746ba73b27d7cecc457cc24c2e37e733ee61a42f60fe8a2fd451ced SHA512 0bf7df25d46542f335eb9473e552b4fbaef70c43ccbffe2c982aad81c3d86b80f4c78c418848d51943849f18dd57bfeb9bb71ec92a2222565608457aa96b4749
diff --git a/dev-python/thriftpy/thriftpy-0.3.9.ebuild b/dev-python/thriftpy/thriftpy-0.3.9.ebuild
index 291f5a787c6d..ac202573d505 100644
--- a/dev-python/thriftpy/thriftpy-0.3.9.ebuild
+++ b/dev-python/thriftpy/thriftpy-0.3.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index 8c864823249f..1ee8191b5c17 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,3 +1,3 @@
 DIST thunarx-python-0.5.1.tar.bz2 334426 BLAKE2B 59f8e625b10ceeaefffa4b6dde150c32023365e76854c6e77ae2f222b509856353c8d62de26ba4e7b967cfcce1219205923938389fd1714a420bc9e1ac2b12b2 SHA512 0c1d8f20b74a3eb87b3c2c181c6438bc059dff75afdc26cfea19dffb7efe1f14e6a880689f73afcbbcb5922312741df72018e3b9980c4a45426e7a7d4651177f
-EBUILD thunarx-python-0.5.1.ebuild 729 BLAKE2B 0f3689fb636aede04ddb935dfbbe9b4af86324ca0b59bc348b9bfed5c3249099f28eb087689a139c984dbb52b5161526e936a7695ffbfb6b99b5c70e0caab30f SHA512 d1cb61f583f23f83f2556290ac0bcb21629880dcae49bbfede07210b0bcbed993649831e3fc47d299ff4e5cdf1083026fe600e3e1af66bcdd784ff4b5ece596b
+EBUILD thunarx-python-0.5.1.ebuild 725 BLAKE2B 915d9b4e988fb4adde7510d6945bf9ed7407bc97c8d72a92a4a5ab18eb0c9ad414fb7e4438f82b72414d51dcf2d3326f6fb21ef4c8a7d854c02c3fd5675f2987 SHA512 0737374855118c60fe80469d7f2f1a13bb7c37c768e4889dc0e2dd49e60d8852da84359387187ad359372703de3cf510500a90e1129afdc07bba9e45e05d5b5f
 MISC metadata.xml 249 BLAKE2B cfb34e0ab5b7155d26bee3e5cc55d570e05151273d6793455b82980b3e3411983eaee6a6ea94f896b18df24efdc964f180bb00b3852a98a2cc5571f1d22f6d84 SHA512 ec9e5427d44f20c2c0166fe103e6e8b8384a300685f7c9774f9177a1533d7057f332af1ba1046462f75bb3f2812e075d01b5eaeb625340c911d2bc6d2f9acf7c
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild
index 3d1832c091a2..6099069d8eea 100644
--- a/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild
+++ b/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-single-r1
 
diff --git a/dev-python/tinycss/Manifest b/dev-python/tinycss/Manifest
index 50775539707e..397ffe59eb8a 100644
--- a/dev-python/tinycss/Manifest
+++ b/dev-python/tinycss/Manifest
@@ -1,5 +1,3 @@
-DIST tinycss-0.3.tar.gz 72860 BLAKE2B 5f87145116f779955fc9557d6c983b6fc8848a413fe5348271c9476e7dc2a841feef5366d4606c9a0619b9a93bee2a1b30b7a46a4ddc720664993928561903c3 SHA512 1fdf29777ee7b3ef39cf2169d8f464a7e5aea850de8a7976acf3ed9e73e831ea0d7ee52b4c8c9979b2263509cbffe1bde85cf6da178ddeaac9009ace7a2b4441
 DIST tinycss-0.4.tar.gz 87759 BLAKE2B 9b7691f5d5fcfb5580a9f2a0f1f50caea3dba74853917e5e46ca93cab6f35f2f8c4f5babf01d25661d05ef1b26ccc35914750917fb92b394b0ca6530a19f3514 SHA512 13a50332cddc28026fd7ecc007e14085976284e69de6ea93d1013502fd9791694092c010947b13dcd23f3a2df65f277f62410abd90d03eac16fa5af913673b0a
-EBUILD tinycss-0.3.ebuild 650 BLAKE2B ca5d8c185ec97fd1b4280c176e0ac409e70f99277d6f350796f6ad4df7b164f56f404f9a0914e32ccb5a8acd952ce25b3137cbb388a89557c0790ba1ab64ee8a SHA512 66f4fe28e2a6491b18a54944d9d2924bcca22c93c549e215c14e719a6e1a984d1f92cc4ecf671b9017e216457a45a6065b0bff9556f85f8f2436eb75d47c5692
-EBUILD tinycss-0.4.ebuild 836 BLAKE2B deb299288bd4192d2104e5df85fd5e324f24998b6c4ad5587533f42d76ac6391f269212434023ca181662397a6e26406393f4d8f912fa8c41fc02138e8a0c10e SHA512 03f9b67abd3cef78c458ccd31676f457a91f3455b6c3684cb7363360a7489cce3765c7e8bfe6264e6a9ff75a3dbd7874c231f001fa9939cd6177765df396ec1f
+EBUILD tinycss-0.4.ebuild 832 BLAKE2B d55232f5d4dfed80f709a3638a68ed72ca63dfb0c8a7ab9377a7fda825766377e45958fbe59c56a76ccd7aea381e3005a25209b23ddc4903c150db53dd9142bd SHA512 3050fc7dd495fa659447d3e4867f16b2e698d3b81dd07005754552a8abf456a53624e13aa0faf853e9af1e6fd0ea8d1eba2aa126dcf3b72054927fdf0481af82
 MISC metadata.xml 380 BLAKE2B f32bbbd80838a147ab80701c03462b8949aa987f47fc7bb8cb2127720937888f484b7f1ceb9cb490901d07782c2c0c261e42277b55e39d78c44a05173391282a SHA512 b5e7005f5f93ebe86cac3643711928d83456e5ccbfcccbc3dc008daca1e341285342240cc032f69042bc5a19739679ec0ae5e2e2d83c46dd57395ab9e1c12bb1
diff --git a/dev-python/tinycss/tinycss-0.3.ebuild b/dev-python/tinycss/tinycss-0.3.ebuild
deleted file mode 100644
index c034db866cad..000000000000
--- a/dev-python/tinycss/tinycss-0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="https://github.com/SimonSapin/tinycss/
-	https://tinycss.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES README.rst )
-
-python_test() {
-	export TINYCSS_SKIP_SPEEDUPS_TESTS=1
-	local test
-	for test in ${PN}/tests/test_*.py; do
-		py.test $test
-	done
-}
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
index ad2e65fdb78a..61c40e7cfbc0 100644
--- a/dev-python/tinycss/tinycss-0.4.ebuild
+++ b/dev-python/tinycss/tinycss-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index f57cd3d3a261..19b2daf1941f 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,7 +1,7 @@
 DIST tinycss2-0.5.tar.gz 61802 BLAKE2B 2bb6093063e6a1b2bd9f78484db73d34c2336bbb00e9aad14a9c4c589e315ca377a5ec7f1b50b8c28f91d496bb668a65032a422ae9c9fda62218bfb7560e0a46 SHA512 321af21a80dbdf8d1ad218e33c87edbe7c0b4c1bffeeb38a9b14bed9064749f71636bf70775186e8785587d5fa96e3488465a76b59f643658f84b6bdc1c5c4bd
 DIST tinycss2-0.6.1.tar.gz 59548 BLAKE2B 9c80ea593ce4831bb4846eadca44595a5b30247a9a4ce9608bb4c505cebe47d151936361e0d9d4af124ce9097dc664b6a4eb7f926ce28c4336aebd08450b71cf SHA512 fa064bbb06d641a497a3c1eb35118bbf8ca8c4d32fbd3d8c64bb10d6cdab24387e77cd4c3277a957f23de2bd527a407836245f4387d7f880958858bd9cc7ab89
 DIST tinycss2-1.0.2.tar.gz 57728 BLAKE2B 966af74a499b9eb696beb3aca2c832d4e07641ed61415aa85a1798e30c568932875ff69f1ccf71cde8823194ea8dfbd54226fa93e718291f09645ea60620b43d SHA512 69bdf52898f9e704c01fe5fd11170e0efc9a6aca14646f5331fc06ebbdf941f9b6c798ded7d93636c7b810b35c659750c3ece3917c5c9cef4092e3e17b382dd1
-EBUILD tinycss2-0.5.ebuild 662 BLAKE2B 688726d799f95df41fccceedfa7ff532bd013d3cc1078999d05d45f5e385df4e48b0ed6f2bf30694f04dc3b1c60c764726a7f32bfb55ef6772031d6d2689d66d SHA512 6e2a96157c846636f2695e387db4a2831d8e2a571fb6fde01429bc7784b6568bf873888e699168fc4ca3b2bf0e3f1113da385b2cb210b4650e3f396c0c531bb7
-EBUILD tinycss2-0.6.1.ebuild 660 BLAKE2B 51963adff1c77c919b4ff1e97aa624b8163f2d863222932d4b9374579fe8c404d0ee73a1f29a5bcd9fbdea4f7aac1ff46913e042aa1fb47563c673c3f5b8ea38 SHA512 baa8ff9b42a4b163da3345d08fc96be1c1ec17a52aaff845fe68732aab4dc374959e32744bf6add2e0c94f0a74b75a2c62eb7d230a0f69ddd64e608a5f286b55
-EBUILD tinycss2-1.0.2.ebuild 897 BLAKE2B 616b6ef304c44be60a71c8c8b47a0ce91edcad70db9bdade529dde49dfccf45f43fc0ffa8b54d7259e231f04731c668ec9e3b7c31690884194143c32b0aeced6 SHA512 32e5f5822e36b4dae54dff96b0036c572177c9e9f59192a3411ddb08d50fb0cce2a27f237c1793643cf28fb81fadeed71e8e59288173d7bac1f9e5d339c1873b
+EBUILD tinycss2-0.5.ebuild 658 BLAKE2B ea66aaf6325b708e37bc288d23ca341bd0bac56bf4f8fb990673a9137dd15b812932cb271210ee98f27a3235ce731f5194b1c350faa5ec3ac81532a20b792fe9 SHA512 664ed9c117ccafb3bcc5ea3bfab427d9b85691a439cdaeef2bcf89bf7ef0e36a12dd89e2cfc28a994d1c9513c1e9748e6a8a81932d923f8893f851498703fe93
+EBUILD tinycss2-0.6.1.ebuild 656 BLAKE2B 6fba0c9363678f0bc1f01a96a2da2cea0f6e405d483245aab7c8b64ea784b794865df736eaeb5aecbfd10da346d339edacc8ecc435c03e200a66b53949fb5045 SHA512 b517bb7ae7d1982dadcb57084937c3d23251d6ac057b283e908cfa4b46863a19abb5fb8ca0b45e688c61aec9d21ca3a4b029ec50647e3b1566118fa6660c7184
+EBUILD tinycss2-1.0.2.ebuild 893 BLAKE2B 6b596622bff5ada3df982f8f51bb5ec66545250eb4435384181bacedf0c9bba790b54c35a133af9f2c0a4532533b518107b84a1836bfcec2f6f3983a96b6307a SHA512 2a29074c67adede5efaa240a71276f442af8d0fe00a1c36805ef2ab9a05596ec12bbcf3329510dc553eef7af9807aeaef05adefbb937e16f4a55d371aed83f7f
 MISC metadata.xml 497 BLAKE2B 99c42dc1977fae24cf0af136eab84efc6cd86bdfce5d92f96afbe941daf9a62656232c9da866ead72f82e35a709c4850d58a793a4261d511bf2c84fac32b5eed SHA512 8004da866ba4038adacebe1eb03c7304ee7937e643babc75ecdaff33d22a13ddd9583344e239f3be50ea3eaf0026ac626813f8aa10d1b192196f524eb5cf5027
diff --git a/dev-python/tinycss2/tinycss2-0.5.ebuild b/dev-python/tinycss2/tinycss2-0.5.ebuild
index 134351470cc0..d6d566173665 100644
--- a/dev-python/tinycss2/tinycss2-0.5.ebuild
+++ b/dev-python/tinycss2/tinycss2-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tinycss2/tinycss2-0.6.1.ebuild b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
index 0003e8fa4b97..289ce81f4ef8 100644
--- a/dev-python/tinycss2/tinycss2-0.6.1.ebuild
+++ b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tinycss2/tinycss2-1.0.2.ebuild b/dev-python/tinycss2/tinycss2-1.0.2.ebuild
index 308e5b1ea73a..dbf0755a9525 100644
--- a/dev-python/tinycss2/tinycss2-1.0.2.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tinyrpc/Manifest b/dev-python/tinyrpc/Manifest
index 3bc29ebe18d8..795b1d322a24 100644
--- a/dev-python/tinyrpc/Manifest
+++ b/dev-python/tinyrpc/Manifest
@@ -1,5 +1,5 @@
 DIST tinyrpc-0.9.4.tar.gz 18432 BLAKE2B 47f9b6c550a24869e962b8fa26ecd4befd7df0b892d2929d2a8fdfbf819a856461c9bfde952bd61ee6a735566583827d45487066bf73afd3543092505767a437 SHA512 4f806d94675ecbc56f74d5dcdd418337fb32d70360c69854112c20776ce38bfb3da2be82d19db0e94247ff2639347628f429b25bb3461500b97160b8995c170b
 DIST tinyrpc-1.0.1.tar.gz 23299 BLAKE2B c1b5b9028f978594907db7d7e23b0d5b4a7fcfabb49e660a8fc5352462fd7995f841f08d96fa4845a1b82a0718cdcfd26e94901ceaecfd30bd11b917a0987fc7 SHA512 9a27e002959a54fae1ac8d89ac931cdd52b7ee96eb08c4c19f7eda4bc402834b53b0d9a3f0be857e5205df7e9597a1391e1376d6354a7d0b6085b81d8dc24b93
-EBUILD tinyrpc-0.9.4.ebuild 986 BLAKE2B db453c42bf1ac63ed558c68dbe86aea2db047617a5a9e92859181792feac5aad13126a6c2815e926df6fdfbd1f809dae388315bb9257c620e6d95faae8eb03d4 SHA512 379f6d5364276bff7a7a5a0c09bb1fc4c0a58e1260f65d0d5429a3184c25c109b701a7bdab4a0e18ce68be8a6b663662b6ec1c11f58a2648946ae757e42dbb05
-EBUILD tinyrpc-1.0.1.ebuild 976 BLAKE2B f9b8c62f74af2aea50301332707f7e709bf6bd5c33cd43d86c1f766e015bdfc8ce25c5f7236b5aa4f7b342f1b9e341cf9d07267f04bad3b63fe07a194205b010 SHA512 6d4ef91d899de75651fab16f50357a74e17a49d2a182a71d611e9868c7b40c6e927fd1b4b5277b2b50d841da8d7af9a2971e6bbe2350bc2d0cf585721ddf17a1
+EBUILD tinyrpc-0.9.4.ebuild 981 BLAKE2B 37be5c6f8400fe5dd8887ccc8b8c9f92b9cd0ed5faec8926ab468462f9f608d53696dc2ac9f4b3dd15b4ec017da91d8a19645602dbcc7881693dbfbf7d71f06a SHA512 b61ee0ff4ddf6b3f3d87616b024ab87b089422531faeda42104dcefe1c15730577ec3bc10c5f7a715107b672c976367196ffdf2a198743b299d8a370317ff0c2
+EBUILD tinyrpc-1.0.1.ebuild 971 BLAKE2B ab954ac421e1841d1edf384f4e6bb653f25ce2b90bd2bcf04b3067159ceb7489c9d143989a066ab6d956f7161773cea4b90dc2fd83d6ad752251697572632495 SHA512 7d818e8e6e34042d977d0a09597ef409cea406989c9e3a318e3de6677290694b374d5201765df55873a0534dc8a0ef9fb00877bd90ca6230d66e6c0298816be2
 MISC metadata.xml 890 BLAKE2B a4ae092a73f9e43688cd809fd9e3129eeb20b53bcc17b2b3f385f6c15a6a3c248bd333ee1b288f527b1f84a5c1ed5273195bc47dc5e99fd3c5fabf16b308ecea SHA512 2cc182370624a60856ec5518d5d9dcc8c895bb11b9af8b828f3687c5d1b11fdb7aebfd87b7bb33d141137e41c09683b756350fd3548312b5f5a2a07ce0f72e6b
diff --git a/dev-python/tinyrpc/tinyrpc-0.9.4.ebuild b/dev-python/tinyrpc/tinyrpc-0.9.4.ebuild
index 321d64f1f5c0..262fba28cb81 100644
--- a/dev-python/tinyrpc/tinyrpc-0.9.4.ebuild
+++ b/dev-python/tinyrpc/tinyrpc-0.9.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tinyrpc/tinyrpc-1.0.1.ebuild b/dev-python/tinyrpc/tinyrpc-1.0.1.ebuild
index e05f2a18a04d..f5cfd1e93295 100644
--- a/dev-python/tinyrpc/tinyrpc-1.0.1.ebuild
+++ b/dev-python/tinyrpc/tinyrpc-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="A protocol neutral RPC library that supports JSON-RPC and zmq."
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index 07a4747ad462..1e6c5980afe3 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,7 +1,7 @@
 DIST tld-0.10.tar.gz 1072577 BLAKE2B b4fbd245e16e905a4dd40980c376cb52a3ec21581e25b09ae07d66799c922eb31964bfbbdffbb7e28437ba094500d32d9f34e6f7214ed530222e598bbefd28f1 SHA512 8fc993d9a8457e0130d576eeb9bccef0bac8246f428ade466f46cee6dca509985157d28ba260dfd027f9f7f6abcb6b7ff3157b2846f05fe94e9c415021ca5488
-DIST tld-0.11.1.tar.gz 1342605 BLAKE2B 839f64e958d85b7b87053a6cb7e55903f6ebda67fbbba81364bd51421c37c113feba72ab9813255948e30cd29fc7ee5a0dcff93eafee135fb4bb59f2f2136a96 SHA512 02853e8123609debd2e6038b851e9d94dbfb06c959a8aa8ef827a25003b1997fd4560d1e00ffeddf0593ba24fce44fc58c895441e72dd05d4443f4fad201aa60
+DIST tld-0.11.8.tar.gz 1344244 BLAKE2B 37c485cbb4067db78e68c07b5c68ad8ef67026b30dcc683dd2af9e468ef9bef3b2d7684c7d1a311c1867336e615af4d817ea204511701a0aae28b9bfc3c0d5fb SHA512 d36f5a13ef871f54b654df3a136416e4fde8552ccbec8a398f51ae391672f9ce3e5e9d5a7b7e3b5714e800116dd9db9c1080dcbed5f8d801d20930a70e4e64e4
 DIST tld-0.9.7.tar.gz 912360 BLAKE2B be5373040a689fc4d8831c85fb9da29070978c6ea6a7c279caf9dace80c3171ad414861f2558bcdd3ae0f15cba33e577f40869c536611a14eeafc4c1265fdcc4 SHA512 45a42f0c9ffe18912c33c26f30eda33117efd37688cfadbdb05514e22249d0c371629cb29a1d2eb4bce49efdb5d45bab3438f1b6e0dddef905b7ec6ad4fd99e5
-EBUILD tld-0.10.ebuild 505 BLAKE2B b598a7813f622a527646be066ab5cce12e42c7909f637de2a9fe22e847d7ce91cae8e7db35ad116430f993d050ac07e6a036eaaa0021fc2934557325ee0050d0 SHA512 b04fa5e67b2f4e76027f014e18da99f843d0afccaaaf1feb70656f83ca40418d517f460116a0d0b17ed9b1a6c7f3f68f9cfb859a1b2c648436a31a34a43bd709
-EBUILD tld-0.11.1.ebuild 493 BLAKE2B 9756a778725354943d0c87844ee32356203cbc97694c9929681fc30003b3a785230c2818cdedba41f807fb6fac77416f1f8ff358bf32c4e58ac7fa2cf849cf54 SHA512 64dad90266fb391036102007e4a12277537a54c7ec1bdc6c237dc4ea0ad25b7725ae119a05832fcb1c96f343bdbd727150977be65e944abd82b0190a7420a390
-EBUILD tld-0.9.7.ebuild 503 BLAKE2B fd6cfbb26baf0f87a2e8619664a95bab772e81670e4c0b484570cfc2bce7d593a3f0b948aeabdf28462580f02ce2fcadfe3d9d1eed972b9f69e87a3ba713c9f7 SHA512 b9ea3588726a643f4211f264f9a277e34458812a56ceac03cd398d6d4f6116d1864d7a8ba8fe5be602e135c30651675000fa2e9cd1c356fc64d4ce28b9d97426
+EBUILD tld-0.10.ebuild 503 BLAKE2B d290711c8f5eadff04f870c026edc2293926e92b6ea147113fe84eaa2a04c50adbdaf5a46178f0edc01a37eecf892214b54a8e8a9efca9d414979fec978fc8fb SHA512 0d32fc2aa166475f4934361ce81fe73c8474cfdb74128b85f3b867219ed1af54af4cbc8d256cc458b287d4effc663481fc7166a7efcf50074141ffb9fd0f32f4
+EBUILD tld-0.11.8.ebuild 503 BLAKE2B d290711c8f5eadff04f870c026edc2293926e92b6ea147113fe84eaa2a04c50adbdaf5a46178f0edc01a37eecf892214b54a8e8a9efca9d414979fec978fc8fb SHA512 0d32fc2aa166475f4934361ce81fe73c8474cfdb74128b85f3b867219ed1af54af4cbc8d256cc458b287d4effc663481fc7166a7efcf50074141ffb9fd0f32f4
+EBUILD tld-0.9.7.ebuild 501 BLAKE2B f1d1e91950238bfd6cf05a087c63ea311604a75849e790222896358d35bdbc18d24059f5ff66058406dc6ce4c3a8a82d67a9907eea6aa97813fd518f071bc6ba SHA512 0d2f6af7185742021aa0e37e0b26591a8b333b511aa107cc42ed6062930f184f9c8ceca9ddd1831a62af80854eb1245b22d22255348954726ff358cab140e670
 MISC metadata.xml 419 BLAKE2B 48f0e2b96669406551c66e56225022f649ede7feb5e435e73b229f2fba514fd90cc1c542b34c0f31ce5f3bf7197c16188d83cd63542b7017caf114b2a1f0feaa SHA512 fd4fa0a5a30087e046f21cd68d7f5772b20a12f24ebc16641c45e28c1e033a4cf8ac99419f4a70f8d6e7997e6c612681c34e9e576632691ec443360effc75d40
diff --git a/dev-python/tld/tld-0.10.ebuild b/dev-python/tld/tld-0.10.ebuild
index 4ea3d4e0326b..f5618b217951 100644
--- a/dev-python/tld/tld-0.10.ebuild
+++ b/dev-python/tld/tld-0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tld/tld-0.11.1.ebuild b/dev-python/tld/tld-0.11.1.ebuild
deleted file mode 100644
index 69a5552112df..000000000000
--- a/dev-python/tld/tld-0.11.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 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/tld/tld-0.11.8.ebuild b/dev-python/tld/tld-0.11.8.ebuild
new file mode 100644
index 000000000000..f5618b217951
--- /dev/null
+++ b/dev-python/tld/tld-0.11.8.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=( python2_7 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/tld/tld-0.9.7.ebuild b/dev-python/tld/tld-0.9.7.ebuild
index 4d524f15e246..b20939596455 100644
--- a/dev-python/tld/tld-0.9.7.ebuild
+++ b/dev-python/tld/tld-0.9.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 9e0e2cab6f7a..f6f4b641c402 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,3 +1,3 @@
 DIST tldextract-2.2.1.tar.gz 54538 BLAKE2B 0abfb1982d0b9e9cd767bc64db289da8bf2f58b599eaea7e703adf36934dae0d052170fa9a8205b8ac0b441d8f1ac75648ccc108515586b0bcacf2ecb43fef52 SHA512 db4f14e514c0e68f85f28226343d7ec91ceea2843ee01c9a2950f0972f365bf343640e07cfb118aff52bab975719be71d179fc6b3bd4da7eb62a47b62747cc0b
-EBUILD tldextract-2.2.1.ebuild 654 BLAKE2B 8773ffaea0bc887f92a0ebab4648ab7426dedb7f6c5d5cf58da3bce0b38385071a7f40e67470910beaea66c89b4905dc54e831e83c8c46713dcbfba33dd0fb3f SHA512 3ec76afb6cceb1af92b038bec64b8b84002cf50cdde0dc80825f1d89d079f32e49e6dbb2bab805da274786dcc8f48bf6e3b22787bb1d840ad3f387b255a6b310
+EBUILD tldextract-2.2.1.ebuild 646 BLAKE2B f64e2c3e9ab97ccaa42b2c89beec5ceea767a29c44926d952015eedb69038e6fdbd01bbbee71f4c0544fba71713b1b75c9ed0bbf344b931b646a9a4963612e14 SHA512 25c68b1f4c05b6c611e9152b3fed41fe28fa28be71dc596f7951098eda4ea68fe6ca92888574ae077d3ebcdde8b5998d59b42a6b581e75b91b31d257309b9cf3
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-python/tldextract/tldextract-2.2.1.ebuild b/dev-python/tldextract/tldextract-2.2.1.ebuild
index 8addd4d3a49b..0d1d65fbbb2f 100644
--- a/dev-python/tldextract/tldextract-2.2.1.ebuild
+++ b/dev-python/tldextract/tldextract-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
diff --git a/dev-python/tlslite/Manifest b/dev-python/tlslite/Manifest
index fb5793193125..05e4ca7c9aa6 100644
--- a/dev-python/tlslite/Manifest
+++ b/dev-python/tlslite/Manifest
@@ -1,3 +1,3 @@
 DIST tlslite-0.4.9.tar.gz 105402 BLAKE2B a26d0938dc713b701d6079263e46f44b23814708d04fef8698bd0b736e10d58ceb5e99dcb1ecdd66a225fc0a697aafdbb97ed46522229d3af7f760daf23f4d86 SHA512 5473139b5730ef946efa139fbb9adb3333dc67f33f03305f4a6d3b6eaaefce950ba93bc1053362fc31b9d68ff9f6deceb9449987e29ff44035b818d7310edbea
-EBUILD tlslite-0.4.9-r2.ebuild 872 BLAKE2B ab57eed8920900256033001d93f099125fd0ac6015f61f95bc3ba91b8298ce4fc87d968084526a51900d9bc465b753cfc4e7fb0b4774c6242fdc2931b94ae08d SHA512 d1346219820fb0b4bf4b1b6043bb605064e96f6a997a408ce6957693b4db1285a330d07ab79b3728e4f7fc7076ab8aeb09a83c83d52be4ae08c0a2825c64b9b9
+EBUILD tlslite-0.4.9-r2.ebuild 868 BLAKE2B 149eacac94bbcc9dd4ce3683ab72ef9ad125c8b5f1de7e4c8cacb6a826630d241aac4785160d32f666134fbce429b005b842ec57e80c5725085e1c287b3a290f SHA512 309fcd2b996a33eb8320e6aa36b254331bb3ca4c68fe5e9bf72ebdac7d584ac907d607c7f0f033fba43ad930e8c70388740c9fa140cfcde4760d8faba7a336cc
 MISC metadata.xml 862 BLAKE2B efac680351c088ebb5c54afec47d1ff6539eba67860a891dedcf142ea2bcd56ec53a9ea7b5f5f16f90c70807bdf563344efb14a3308463413962e57bb22a475e SHA512 1374c0176a6a8386e8123bf1be106431d616de1b70d4b4948327b3e8f20a5d346bb622a2b83389aca1a0eda3f33591e9327929f2a7c062f04af80618ed3b0b8f
diff --git a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
index 3485b76bbb17..d600d6e6a788 100644
--- a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
+++ b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index e136eded3546..57a7956c5bdf 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -2,6 +2,6 @@ AUX toml-0.10.0-depricationwarning.patch 586 BLAKE2B 6da04c9641095a4d0cd2b45ac09
 DIST toml-0.10.0-1.tar.gz 20396 BLAKE2B 3ddcb4cadfc68239cfcb34938a785b27326991ea89966aa6ba3ff2c8a430099664dce1474adf453f2d372b0d149c43584bce9c7abee4c8cbec3126adb3d2ab95 SHA512 ebad9d87606cf66f3db5abb2b0abd333d5536037446df131bda3f8138c33a6495a8923fc583328c27632d39448790e0e6788745d8acd7d600ea3ce57cb7dbd45
 DIST toml-0.10.0.tar.gz 16719 BLAKE2B f7863e9cf0ca5185a59d64010346b4b960c40bc3711d4cbd1ad907d15da823319b748df1a5536465e9f36428bf1599624ede3b1fa68cb420684a52ba137227c9 SHA512 26f26c38ce9cd48305218c2c34c5a5407b00aefc25a933f044bb7be22c23cfdfa3b8cf2da952d17760c4b9038df62e405fa039cc7b63dd3e94c9c312f04f9182
 DIST toml-test-39bb76d631ba103a94b377aaf52c979456677fb1.tar.gz 19304 BLAKE2B 5bb73ff91146ee85f6844132cdfc06673cdb384810c6c978cfc9f8ce6ba8b1607a0dc2d03aa868791d5fd33d00ebac96a4cd57a98948a3ef9318a52417904eda SHA512 931ba91b77da576979bde290c99f6cb1a2eeec3aee55b5041b0216094c584934d560487d329df21caa64b405ec50b4dd417dc910bbe4f15b1440686efc58da29
-EBUILD toml-0.10.0-r1.ebuild 1161 BLAKE2B e9a5c5003f3d0852e3c2efd59fc31d527798a5d54b446457f5121d2105cc67b9e874d99ba50273c393d40f1060ebdb882278ce03840c028d94e9845121d635be SHA512 35d29750cb6dd1ef4077c8a64b766199364a6db877c6b9f932cf8da28fdf1b86fd3d1788d70fd0578c9c41f0b9c87148eac4d15e9f655199faffc2f1e0dc21dd
-EBUILD toml-0.10.0.ebuild 596 BLAKE2B 7a23a9b2d4d7c21ef20f0ae101b9ab6eea08d961e146ba52134c646eb7fca2b66393f2c7c38f57d16526b49feee1d204092b45057e4061cf1aab9718bad3119e SHA512 eaf6d66414bd2d153be16512e0dfe8fccb58fe6195d7e924ef3b95a4a108a1a97f1681ecaf935169270d83cc443b348c5a05c02df5592ecf2ef9d0f2cf733f16
+EBUILD toml-0.10.0-r1.ebuild 1171 BLAKE2B 6b824d13e705799a6bd15dfc9c478c4164de2b66deaa0c4ef6df5be30a26aab90255d6073d08db42b1816c696d701257b261885a4125853e64abce993f0e8ae9 SHA512 58c53883a84152ddc5e43db14cb1f4000437ab9328e94f1556befc4e13f6fc78344f602dbde37e822f52062f6890c1eef35688784da64e00b6002f445e37bbc7
+EBUILD toml-0.10.0.ebuild 589 BLAKE2B c45241f49e20b07b97e85659ba76e609df70115d0c8e1221ab44c9cafbf095793c8d189c3d4175b5f1ed2bd793910774a05e613601cc19017cf4fa420c7d5a8f SHA512 4d28037aefd93828b83a36bd69cccf77dd14760ce1d3d0bd041187cafe781d9416b2a97585738ca17f9761ad21ec46198ebe51205686bed4aaf8bcf17355d4cc
 MISC metadata.xml 324 BLAKE2B d9ee23ed157896fac55ab5bddc1cf299572ad05d4b1de97749c0ae196f01515272feea6cbb3e93a71ad908cfb1cdac70a702b2d94b6ef2a74ebc25b044b5c049 SHA512 d5578a5e1e35bb8b263dba80e0f56ee663bfc6fafe052a82889e3d1551a5143345645fcb09107b5115f78a1d40dd4b2a50609a2df096cf870ec6409764d7715a
diff --git a/dev-python/toml/toml-0.10.0-r1.ebuild b/dev-python/toml/toml-0.10.0-r1.ebuild
index c0d855b0f8b4..24154b7d0b5c 100644
--- a/dev-python/toml/toml-0.10.0-r1.ebuild
+++ b/dev-python/toml/toml-0.10.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ IUSE="test"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # peculiar testing depending on https://github.com/BurntSushi/toml-test. Not
 # particularly worth the trouble.
diff --git a/dev-python/toml/toml-0.10.0.ebuild b/dev-python/toml/toml-0.10.0.ebuild
index b1d58275a40d..34ae49e3c755 100644
--- a/dev-python/toml/toml-0.10.0.ebuild
+++ b/dev-python/toml/toml-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 76ac4b609f4b..7444e80b5bb0 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,7 +1,7 @@
 DIST toolz-0.8.0.tar.gz 40768 BLAKE2B 5526dca9841b4d0eaee2f5691dc4dca17a231432eac795eae694c609d011ee85f3a6e818b206820168665b03338ab038326b485635022bdad2eb9289237b5de5 SHA512 678ec3120d1306fe0e79824caaa03060ba780c464e783d7e20c4149483babe63646b3facaec63ee4017b32be07cd052f4ebcdf73ba8f7734e80873df7127d469
 DIST toolz-0.8.2.tar.gz 45486 BLAKE2B fdc949807efc44c335e542c0a0f8262976747c5fb20a43c8de412d69289394b6ffb7200dfe9ce484b4f71a9c33ee1f8876e1fc14e9e18552f3ea923191bbbb46 SHA512 b03968b5f31474b2b5fd944d282b620861184cd26b256f6f92a141aa0f25c20baf2be6b1424bc945778fa05781730b477b16551c9f302c284d54c8be64f2699f
 DIST toolz-0.9.0.tar.gz 45544 BLAKE2B 8de1702a38423f71ae6da24396c7a00428b13cef262efb0fceee454bf67a09a1ab4f4093c84c38234713b38ae4058c4039f2bfcb3c7286daba112e4eda23186c SHA512 f55a773d322b4ece104724c58d89bb41a35ec43f45b14fe367865934162ef06cf7da783b53498405552df75d83fba15bb61ce5ee0661b6122c5984352e80de3d
-EBUILD toolz-0.8.0.ebuild 443 BLAKE2B c1560feeda2d941470730db0c68ea51ed46fd0c7856275a9c62548abeba95b12231386367a4ec799f43530215ee62aec10ff603127a356faba98dc13fd0340b9 SHA512 ceeab981705e15ce6396538a2a2a638292426eaee35b9fd22d29dc0a9c7f4cddccf6ff195cf073ac9cc5eae719ab86b09723d4f93badd783f6098ca150b4321d
-EBUILD toolz-0.8.2.ebuild 451 BLAKE2B 7755fc9362b2c08933f2b9bffa87e3644ff717068a9571428acf556bed79a11905e80c8082a126aedf564c732e4e78042b4bd3530200ff854762115a5b9559af SHA512 9bcab865b5b9bc9377a7dff08b094ee3db99bee9252278298b431b6caebed6f9363eb7ec894b36235e9083d7c7acfd8961b916fe8700a78bca8d73bd32503089
-EBUILD toolz-0.9.0.ebuild 452 BLAKE2B f59f2e43855bb506039b9adb7262d18d8d47863266f397907c5513bc91c3545d23432748742d492d5a0717ef77dec520655a3277f43d1e78fe7ea582ee5d625d SHA512 3af0843bff15e68b2ce59ce4a0c1661a36c4baf163a6b2f9ce049c2ad0189893eda0602f501198c2dd07b59ffef5d0ce9671ba7b38044db2476c4d13c242666b
+EBUILD toolz-0.8.0.ebuild 439 BLAKE2B c791d4506b82f4a8a85ce938bcfc25313720f69692b054116b5ef28a5d1a36bd1ff96aad74915729ba566b177bf6f7c1e857730eb67142467be955345f78af24 SHA512 4914bc7e34da6d1472568424865c5acf16c4af64f032eb8c47909dcd4537a8348dc82a46e2305e96d4f5cb82af50de535bdc64179c4e39521eee269df2bddfd9
+EBUILD toolz-0.8.2.ebuild 447 BLAKE2B 9359a265f8891112df0d6a425cf788b129f2e69591949c1ad6f112a72f6f78417705692eaa99343ffcb3fcb2a31caef07bf1a93e35bf0798070f427d3da3d6bd SHA512 3535a6d92a56853aed25226e143c7adee77596bc0a5f7a24d8473d06a1146a1ca4a81b0f23b8c01c5cb1df90feacb704e9a7d69625e8a0090681d619b081cbb3
+EBUILD toolz-0.9.0.ebuild 448 BLAKE2B 0003cf4dfc3d4d0280a73e0597edaa7fb5ce01bc6afb8ce664abb28271f3eadd0cb85e7691a6b688abaccf0d9692022fa23d91640e4214aa77bfa2111e78ace6 SHA512 b569045627b1687f8c03a4bf052dba196d7c679c62e81bb04db5cd21080e83a10c83ab76ef87bfb9e0ba389aa8dca16bbee85474ffaa53127a68f792ee94b178
 MISC metadata.xml 308 BLAKE2B 2f9bcec9b5e7f76a32f38ecfe3aaf74e6ee231151af12cd6c98671bd4fd40a31110c739e0dcc4d60a7413abf7d8dd268f244553e8b549a58bfb9cdf920b8fcf4 SHA512 06df1cb87c23af8446b55a5c3da9617686a03547ab9c1d4cbaeb53759f789961963ce947ccf559db057c01d0cebf8da1a37fe46da9133932717aabfb40a7e177
diff --git a/dev-python/toolz/toolz-0.8.0.ebuild b/dev-python/toolz/toolz-0.8.0.ebuild
index 7cb901874c0b..cf0e788c22db 100644
--- a/dev-python/toolz/toolz-0.8.0.ebuild
+++ b/dev-python/toolz/toolz-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/toolz/toolz-0.8.2.ebuild b/dev-python/toolz/toolz-0.8.2.ebuild
index 4e3c44699fa9..194bea99e184 100644
--- a/dev-python/toolz/toolz-0.8.2.ebuild
+++ b/dev-python/toolz/toolz-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/toolz/toolz-0.9.0.ebuild b/dev-python/toolz/toolz-0.9.0.ebuild
index a9ea1fccf435..5c7ce0a8da31 100644
--- a/dev-python/toolz/toolz-0.9.0.ebuild
+++ b/dev-python/toolz/toolz-0.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index 04ab0ad2ba6a..bf85d6581470 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,3 +1,3 @@
 DIST tooz-1.60.1.tar.gz 85330 BLAKE2B 0b75ebc5dcc3c9873fc41ce92e61be0591955b4bbbc4c7f16b87bcd27c24c8f83bd079fd9c24164563908fbb488ec4a259d65ee583146324b67acf048504817e SHA512 5dafaea570cc104b0e82eff3ec54d0969bf84c5d84e20c69957c55b2cd9e80bee2925e2ace6977fd499044df0bae02a18c17dcba9592ee3c4ccdb6b2b1dfae38
-EBUILD tooz-1.60.1.ebuild 1263 BLAKE2B 519f08fac165581f9af081df9b7c89f23f4c7141b2e209664c97b2869a89e4d5978666b91ab93cbeb72a3a119b1a1460f25ebc90eecc69a14392a98942bb03b9 SHA512 1e2834f636bf117d6db8657676868fd22f73b0ff827c0dd9d9a0f34ab5294db64f5ee198bf39ea3a9f0756c593255bfa5a1fe22e8a8166fdb82368313d1a5174
+EBUILD tooz-1.60.1.ebuild 1255 BLAKE2B 838f41a72c35519986b683ced02190ca49016a5c32c71f6c9c54728e42cf9751e5b6646a863be44d65ad4538fd025844e4bdd9f912aec4cd8175478dde56d6cb SHA512 c6e8d01d3a0ceb7029513d045a07157cf21d9f1fb20b3f7a54d428e62fa949cdb0c6c26da9de24149b103749c24b20d5670d7e834c3902c0baf95a5187ff39ca
 MISC metadata.xml 614 BLAKE2B b93f65d4b322a9cdd753886cfa8d506676fcbea6c8ab9656c310b245b42aa296667db500584fd19295fa978543834724c17358591f8450cf761907a83cd04d22 SHA512 2185ff992babb09b9c51b350c94237ac4d48e3b10ee118871f59aeb2a265f34b86f798b46c272db76a976d83f1cd005a01e4c965476227334084b0e1ff10d1d6
diff --git a/dev-python/tooz/tooz-1.60.1.ebuild b/dev-python/tooz/tooz-1.60.1.ebuild
index 79b696aefcd7..41b13e13828f 100644
--- a/dev-python/tooz/tooz-1.60.1.ebuild
+++ b/dev-python/tooz/tooz-1.60.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/toro/Manifest b/dev-python/toro/Manifest
index 4565e6c4abda..4abb278e35db 100644
--- a/dev-python/toro/Manifest
+++ b/dev-python/toro/Manifest
@@ -1,4 +1,4 @@
 AUX toro-1.0.1-no-test-install.patch 278 BLAKE2B 87ac93c1b5a70eee2995e1466b771a8d6667c209deac9c872888b970792b3de0eda32a4f62b25eeb714c6600906779e949bb3b07a52c7faa240e4846ca12751b SHA512 e1a7eb6ba8898a112603ac1bdb3eea692c3bc52931a617bc12343e7c60980a4bedab93584347777cd4869085872ca7b7f7c0c8a083d175e0e2597214680a5f00
 DIST toro-1.0.1.tar.gz 57343 BLAKE2B 2269aa9d99eda60013c695c9acbf4f808562c0d7f4a79ee7d7402255af2ff600ad292949ac789b7a7c9429009cec41587052440e64f99edb7f88646dabd3b814 SHA512 a8a498868ff32dbd8ba9a0adf62b1fa2e9dea4f34be4e2701c08c7b58ef28b8daf4eab93916855a711a557049e587e886d6ba362487c151c5db34f6135f4f3e5
-EBUILD toro-1.0.1.ebuild 840 BLAKE2B d7dbb5c4ed4af979310d1db55899836cd408ca448424854b58d6808ae52517b2196834b05865eae2faf1ed2cbbda1eb710a7e4366ba5a1b2ae45baf929f55687 SHA512 1989d05f89f5076836370b81c341ea9fe0dc2bf48682228a3b62519a6880b39b44bfac9011ea56782624c7e120a575bd57447ec9fc09c4c018570ff6a17b248b
+EBUILD toro-1.0.1.ebuild 836 BLAKE2B 47b3525c0a43d929de3c1c9c8d4f27fbbd770d8db4303e8a6cb47adb06efeac8c7779089b91d4a3223ac96ecd33b3d046f62b060f9e376646fcf0ac79a2587d1 SHA512 53c48b4bf92abf1860a5ac48bb17bfc33be2815715604738d83b1be8d115feab09eb0095ee0fd6c3adf379cd867ba1dcd29fcdb90818322c2cbf9bb0695c228b
 MISC metadata.xml 524 BLAKE2B 45ccb3fe7a751bcda58eb5948921c4c6e75080488ae7e40e1c924911c9ef2121dd9182dc638a411bb5892e80738afbe33cb909eb8b44f80ba4e4e4edc76796e8 SHA512 f95ad860f9ec86f41e8909c242e83262fc0ae48082d96891c7d00e937c8b87a1cf9585fc6c0fabe61ff5e94369c027c77a89de86415872dba47a0cb69fcb7164
diff --git a/dev-python/toro/toro-1.0.1.ebuild b/dev-python/toro/toro-1.0.1.ebuild
index 899e5b879b4e..f80a4d566ed4 100644
--- a/dev-python/toro/toro-1.0.1.ebuild
+++ b/dev-python/toro/toro-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index 716d6f85e909..08dfdddfba9d 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-19.2.0.tar.gz 18089 BLAKE2B d1e17e707b90089b19d9eedebd898b71fcc9a582cbae0166650a6bd52a8ac6bb3921a458a6d2c10e5930b92230ddf5efc5a428646c464edb6eb4bfc06949e217 SHA512 60999446c4ae404fb54ea6282a862621d49f62a2488d31eecf8fed9dd7afa6e01f4feac6e3dd26b882ee75f747424d63d05521e33b5f6b8df7059ce32dbe5c4f
-EBUILD towncrier-19.2.0.ebuild 894 BLAKE2B 3a7ee7022f3af265d468dd201c303e58e7b7231d535b4fa6bfc022ed5dc6b6a5ec2a93b89d072b45f581b7161a8cbebb8f175e0f1f4648047f799696943580d7 SHA512 99009cfd90a499ae9a5b9e343068613de86a2e3a4fc75c4defbb4cb0c06be85ccc11022e2d0393feb16e3704cabdee047b014c3c07bdc7929af3ec8000acb8cb
+EBUILD towncrier-19.2.0.ebuild 886 BLAKE2B afcc3b230cb3399ac99edf40cf57c29f76b6b8eb10f38702d7c5034f9d045bc910ab9368e51960b64af4a5c9e49ff4b11b44795bbc8d85489f1ebd263d098422 SHA512 7242730ecb254b32c88656709316d9d900d8d0e744fba7fe70712ea0a0cf8967e475459f7dfaacc69c0856ed17751a2471f1eda2fbe96e55301d5dd31eb7d6bf
 MISC metadata.xml 312 BLAKE2B fb9710abb0c693626d09df383f38a85e69b165f13f76aac9ba46da772e04d2679f4898dab39ed4d383854a4338713c24a389b7ac37b797eb78388e696c8191cf SHA512 4f75330d767fd48bd21128ea81256aa5c5031e0898eb07889a5ebf4c2275e7af174e715500a0724428bf8ef5d8051d29d2a489fdcf557b19a88d294b4c85e5b2
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index 02cb7a393567..cb8c66280384 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Building newsfiles for your project"
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 54c3fc01a32d..e7e6ebca1b1e 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -4,10 +4,12 @@ DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540
 DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a
 DIST tox-3.13.2.tar.gz 286403 BLAKE2B 579692b4902e9cff0ede954fcf2d1a7f1771c0e3ad4b6cd362f93b1e745b238c739ab857b2394700d736eb6a0d91c1f2b385de1926908c0c4aa5a9d183a6b29a SHA512 b2447d4300a7469eb53f094427a7bb92ac973b5fdcfdf9b98736225b3a315953e06e92a4accb2f84f8649fe79a9146fb804afdf9adebf9231afb0bd143e646cc
 DIST tox-3.14.2.tar.gz 288615 BLAKE2B d74de145c8e839938c332f1e5a4819126d2ab1212679cc5c50390a9c7b0edb8a7059c55d9c6c8d3697f36cace7c0d3361725f5020d3f9d7efcddf8faae8c9be5 SHA512 c573d4b6a8e6538eb17031f7432d6f52f75514309c5daad53286aeff00db51146a5de089bdc1efd76f8126c374efa02c0ea7a8ca4224c0ec0f9ee945edd62c97
+DIST tox-3.14.3.tar.gz 288938 BLAKE2B 1a7d6cb8446b83648b67814fb3413da1a9da93e76a508c1fff134c7738feb2a1a5e130201cd7c9f1229c2c05349139bd54aeae1183fdea9c1735ccbde82bcd5a SHA512 5ac912c4f1db7fe23dd6dad68bd15127d3db97498ca58f7b8573f1857634bdf41eb7fdb4cf8d22afa14547363b91a7b52fdd5ad80af5d60ef4dd95c1d103f8fb
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
-EBUILD tox-2.9.1.ebuild 1295 BLAKE2B 42e92124d10084a3e3f590699af9b455d3d3a453e0faada3d92eaed7f535a02d35144361df37b74588e6a25053a682ee5cc5c796f4a9b7b0e57cad4deeb1f6be SHA512 c2adc590bd462960943af135dd2b5782b35f90c06a2413ea50d46ebaef1cf4b0014368bb904d4332f619f2dbde4aa7f9633a0bed80303372e0f426ef6656ea88
-EBUILD tox-3.12.1.ebuild 1466 BLAKE2B ebdfeb3f2c2dd9276fe685667f4dc6f23e0fa7ebf6c006d0b9cd34c36752603e9059353ebffc68fb3ab5afe82b5c8dc3f034470f6f263f12d05d7cb804ad10d5 SHA512 eca0be5a74a97ee23c93b76a5cf7c9b4c667417b01235ab98bff8e5c7c98b5fb901338a65f208ed85ffb00a54f5130cf61157290f67a6f019c26129ed1c04bd8
-EBUILD tox-3.13.2.ebuild 2017 BLAKE2B 7d19851d54cc581c7975caee5934bfc9e29561d6a51ea37cabdbc4d8f425c052d4661f532c7df8bc6877180ffe304e7a110f3bd9515b2edafd9eb93fd4d34d53 SHA512 820e7a1728c30f0c538f0d9d457512d2196e966d6a0a0ea3922c95a3ab2697cd4b923ae7d1a4166852b9c7798461728a0fe3845a5548709174a020fffc4ea881
-EBUILD tox-3.14.2.ebuild 2223 BLAKE2B 0ded1bfb604a2659511fa18067f07745b6ff66b0765a44524bf76572b345811f8ff7e7a37fc9097a24ef3718558cf6c8755af66da88c80a33be10a569ea8880c SHA512 89990208337a8187c8315c85e51dbc5c6160e07af80dc43f7aa281f5fbcde2ead3a7686217e0902758d33f96c284c262c733880bd05fa4011c47e0aac1d2b7fa
-EBUILD tox-3.2.1.ebuild 1980 BLAKE2B 171526d62a97d38f8c7cd90aec04e82c90695e67bf68d842733d74fb1352979989290abbd52cad3ba619d04c4a9f301e551f552269d31382048bae067e2bc9a1 SHA512 cd2c04bee98b2b5bc33a01eb4269bfae4928a102cd9cdff091f4713324d822a9fb0dd3f5e3f9e7f6cfc882094ca84b186ffe5ea5e3ee7349bff8b84ab17f926f
+EBUILD tox-2.9.1.ebuild 1288 BLAKE2B 3e42bca1de4ea29dfce30ece9be5543f2501f43b9ffd31730fd67606d9abdbf3afe2244c5408f12cb6c04314efeaa9f07e0586726c1679034c80219af79f16a2 SHA512 813c4f90bad86dc76fc8d62968e373ef1cbbc8f1c1b38756e8dd927a70363a1eb4c6dd5b81f5da3351d8886562b088505b6d37f4f269a60a8e7894382911c486
+EBUILD tox-3.12.1.ebuild 1464 BLAKE2B dc081935636ae04e3d4c9ea74341441c6eb6c127d07eafe852aad8484d74af0d4780e4956f91da9b946fe83469716c3c8c3e45261d15ecaf831ea968fad4e1ce SHA512 3705a537cbf6f97edbeaf8b91fd5e9a5e5ba78c6120d0c5b8fceb854addf23cbd1088ca768c2b9cce1936cb9f26c2dd05d748469c4189f2500854932332113db
+EBUILD tox-3.13.2.ebuild 2015 BLAKE2B d675f1b4b7f6f10a9fdd515613990e55a956a6e2394aa57260236916123c914c35481de44ee2fc3a69fc210b3412e26c063b2d2f6757479e5c3eebb6d3da1927 SHA512 38406fe7ccb5add9df41e584330276a3200e1a62cec80b602ed93588b5eb23be108b7403fa989314b466aab17822890b24712ad4c550edd4b47b3c77f258a440
+EBUILD tox-3.14.2.ebuild 2221 BLAKE2B 9f4865c78aa66d3fb5937e783a57d3eb4d9bef3fbbe1fb302869dc8c74961fea510602071c939df0b8fbd90807494a76d446023d341ba7cbb57805ee0f6de2a0 SHA512 11b85a23c47a7d16e52ddf51f25b1ea212cbd1ca7937210b92238197ccf910ea8c500aad1aa7b8455adab78e9335f7a9b1ce5b1402fdc6762bf33dc45c2e599b
+EBUILD tox-3.14.3.ebuild 2233 BLAKE2B 87d45d6315ec648f7338ab389b4c0d06dac2bcccb9f2cd4e8666bc99fc60904ce5eec5a14f3edd6ab9f8eac7d1155674d1de68264681b2a6e17cf5d027d6e774 SHA512 b6e6f07c7aef216e776ebc53efcd292eab4826f48895c39e92c7931735ec86aa2932b16c2c4bfc8c5979e76ae2da8318a5cf8536b2cee5f5ca6f29de3a912b22
+EBUILD tox-3.2.1.ebuild 1975 BLAKE2B 16f3f857f3bf4c89eba1951455101a39de2e593fcede962cb8c36e6260ac3568c09bc759d8cc92c92bc24f742d68448843952278bac04a1711d222ad995e8dc0 SHA512 6bad81cdea97209d8befa10298b4ef1e496581ff5bd581d4e9e7a0c5437fff6da45338bd1abe1eb8af646a45e591ed9e50f55080d679e2eb26d55d8cb8d3becf
 MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/tox-2.9.1.ebuild b/dev-python/tox/tox-2.9.1.ebuild
index 4a1657f0194e..ba15d6f5b969 100644
--- a/dev-python/tox/tox-2.9.1.ebuild
+++ b/dev-python/tox/tox-2.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tox/tox-3.12.1.ebuild b/dev-python/tox/tox-3.12.1.ebuild
index 8f133f3ef0d7..e432ef3dc5f6 100644
--- a/dev-python/tox/tox-3.12.1.ebuild
+++ b/dev-python/tox/tox-3.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tox/tox-3.13.2.ebuild b/dev-python/tox/tox-3.13.2.ebuild
index c127fe10fc49..d255c099c483 100644
--- a/dev-python/tox/tox-3.13.2.ebuild
+++ b/dev-python/tox/tox-3.13.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tox/tox-3.14.2.ebuild b/dev-python/tox/tox-3.14.2.ebuild
index 8e6bee7f637d..eb8c4fbba74e 100644
--- a/dev-python/tox/tox-3.14.2.ebuild
+++ b/dev-python/tox/tox-3.14.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tox/tox-3.14.3.ebuild b/dev-python/tox/tox-3.14.3.ebuild
new file mode 100644
index 000000000000..8cccb8451fe1
--- /dev/null
+++ b/dev-python/tox/tox-3.14.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		<dev-python/flaky-4
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken without internet
+	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
+		tests/unit/session/test_provision.py || die
+	sed -i -e 's:test_provision_interrupt_child:_&:' \
+		tests/integration/test_provision_int.py || die
+	# broken with our mock version (?)
+	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
+		tests/unit/test_venv.py || die
+	# broken with Gentoo Python layout
+	sed -i -e 's:test_tox_get_python_executable:_&:' \
+		-e 's:test_find_alias_on_path:_&:' \
+		tests/unit/interpreters/test_interpreters.py || die
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tox/tox-3.2.1.ebuild b/dev-python/tox/tox-3.2.1.ebuild
index 458036b2e40c..a7c3a9df5999 100644
--- a/dev-python/tox/tox-3.2.1.ebuild
+++ b/dev-python/tox/tox-3.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tpg/Manifest b/dev-python/tpg/Manifest
index 989a0842b939..dce10037d2ab 100644
--- a/dev-python/tpg/Manifest
+++ b/dev-python/tpg/Manifest
@@ -1,3 +1,3 @@
 DIST TPG-3.2.2.tar.gz 377142 BLAKE2B 8ffe02529aac6b1ae00c6b0c306089d90fb11da9992a8a0cb43e24b2f75f3e048000d209f81198ee6724df4a1be0efb02e3fd06570f4d45806f7dd52182891c5 SHA512 c60a8ff644377abc3edea766d33b911c85a131d0c0ca70175b7614901d316efc4b4d2fba0f17938ab104511fcfe8bd73fb4b6cf295f6465ec08f5c0ccab1d358
-EBUILD tpg-3.2.2-r1.ebuild 694 BLAKE2B fbe30ed3b301a50cf4fe9c7c4e223cda1b6a84edb89ab6ef1ac63412e8d462cbba50693d2b4417a95333e87e2aecbe55b1c2a053cf8bd6715fb64a176cc88c12 SHA512 f431854df595e36833d0b4cf47d0148e9d7248b38987acfaa116e7f753dd3ce3bb49b1696a4d872001b59f94e8dbd57943c1a714068ce4496622cf7ca1dbc90c
+EBUILD tpg-3.2.2-r1.ebuild 658 BLAKE2B b20cf203782992fc390aeda19d36aebf7d067f8fed145c6086818c44f5a68f72e7c4ed77e0ea0e4c324a3e7064fe51288e3d057ae4445e103e412ac95bd1aafb SHA512 55e7865146ccdafb9075b9dae3f00316b0c82181a1a8c5b29807e83bbf0c866e359a628f0c0bdeb4e597f952ed2f9069a066fbb78a21afb232910ef97009bdb8
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/tpg/tpg-3.2.2-r1.ebuild b/dev-python/tpg/tpg-3.2.2-r1.ebuild
index ca5ed5595278..fb5a08994a09 100644
--- a/dev-python/tpg/tpg-3.2.2-r1.ebuild
+++ b/dev-python/tpg/tpg-3.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-# py2.6 doesn't pass tests
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index add5550a2a6b..e70a6bb3ad7a 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,8 +1,8 @@
 DIST tqdm-4.23.3.tar.gz 75941 BLAKE2B 9e5810765e8f7ea4f54b0f93f453d278d5ad4b1710f1476a6f00ff2e513789585e97dcd5a8331fe69d3593b18affd50bf9bf51cbaed29ecd68d4efad9318aa31 SHA512 40c853b7cf7611ba2ef7652417c0d42ea4392f5ea9cbe319dbb9e3dd063594e5c637fb5d13f77935fb9a034d395b28fa9480fec1c6cca1852644add4ac18cce8
 DIST tqdm-4.33.0.tar.gz 121571 BLAKE2B f4ee73cfa710462e148f6034ac69144d845d216bd97e16a78bc1f1ed5d658b6cd695d07aa1ea6ec93e2e747ab8fc52263a580c01516d1f111dcb5766b019925d SHA512 de86a2dc2c5f887b9671ee01e7c05820375b0ef83dec92f17da4d944dd02cbf96a133fd9d349ba5f9c75af70e7b87110a9a7ad3293c7eb81e49ed6ea288ba73c
 DIST tqdm-4.40.0.tar.gz 129225 BLAKE2B 85030c11bdba6c1d6da461e3c648bae6ae173577fb18986e3153badd73a28352f807782759aa52ed082d7ee0c13dc5f850c1da563ee5892f6bf5e8f49c48c7ee SHA512 1c326d98130c79f614cea502723e4202baa57b7b4639e208133cb464785e4a8d4eaa9d262ea484246d45e5eb8f21994e7ecf3fd6ef0f4966f9049fc8013d7442
-EBUILD tqdm-4.23.3.ebuild 677 BLAKE2B f3f71e02105b6d4c0a6b83721f50f2b70db1a582531bdbbb7785a1187da9692ce089f96d81d71fa909a8b8f16bd939882660583343f9ae613327c223cd48a293 SHA512 c4cdd7e8b753bbf59782fc7a13f626207253d5a486eb22b91a32c9c6a19d4bdb516461d0d8c11b8b35753b1989bacb71372633c7af4cc0d81565ad4b18aadeaa
-EBUILD tqdm-4.33.0.ebuild 1238 BLAKE2B fa7e498184f860bbd5d9e705292bdc1879860834c0514ed9bf630dfc72938e00ffdb3317caec36b50fd6ab6b7e97585ae33ecf48686e6bee44a8721bbf450cfa SHA512 555652476ef689ba78116b220e737d3b484b12da2bb89b13619a71ef79bb55a77466da7d75aa624f250e3aff47afc765eef71750441af97fdce789cfb3ae6a68
-EBUILD tqdm-4.40.0.ebuild 1337 BLAKE2B 80c41e2eecee4920f62f58ab0f44dbd5d886323720865cdb5121b71e7c1bd2dfd8f350b9466c5fcfc9fc383cdbc8a918217084d74119f6b47f880af7217abfb4 SHA512 9b991085ada05e7d50b1c4331b7c4ad0dc05dd8cc5dcac14e6c6649e9d7136576ced16b1b763b225b69340e9c77f16bd2679dedfb6c6a85bebca963b34661607
-EBUILD tqdm-9999.ebuild 1337 BLAKE2B 80c41e2eecee4920f62f58ab0f44dbd5d886323720865cdb5121b71e7c1bd2dfd8f350b9466c5fcfc9fc383cdbc8a918217084d74119f6b47f880af7217abfb4 SHA512 9b991085ada05e7d50b1c4331b7c4ad0dc05dd8cc5dcac14e6c6649e9d7136576ced16b1b763b225b69340e9c77f16bd2679dedfb6c6a85bebca963b34661607
+EBUILD tqdm-4.23.3.ebuild 673 BLAKE2B b49a8fdad4ee136a4b5149ab39a852d748c0a9f357587490fd272d37743ce530ed2b69fa8cd87a8ed657d26c0669c2e038d484afb7279ec3460562d281b0063c SHA512 2eb6fa8f796289073d92c07b6e7af8e7441d83bd32a01ac2a0d3dc8b530d1c796777ead4502cc6734b81adae01d8c0a496bff147cde268fe2d5223c4a8ad448a
+EBUILD tqdm-4.33.0.ebuild 1233 BLAKE2B 06c019bae07709c13627ec3b47c00c2745041b604d15a1f84445ab82cd82990506a61ce6c2d44cf9d84c4b1b2c5772ee6b03a4252af7035ac33fc4e6816d5ca1 SHA512 007d81a3e948d9b02e57a501d96ee8bfe8763bdbe5fa89d21332880873dc459cf184f3ffc3a9edf6b2b8b46933ae45d1e07b32b649c8d5ba15cfadf374bf2814
+EBUILD tqdm-4.40.0.ebuild 1332 BLAKE2B c372057e509aec0113bf1fb8c8fefc3280f569e543c4f4d524bfdd1d6e52e78d5127edd3ba41d4e773e864f81da752d36d231a9ba909581c8f03f49128d882ec SHA512 560ccebe59bc49c9fcc04d9982e245a70d8d90cd3a571201f9a91c2a3fc91e2a096aaa55947646fc62e0fd2796df187de58647a39d0a9baa780a41fb69860836
+EBUILD tqdm-9999.ebuild 1332 BLAKE2B c372057e509aec0113bf1fb8c8fefc3280f569e543c4f4d524bfdd1d6e52e78d5127edd3ba41d4e773e864f81da752d36d231a9ba909581c8f03f49128d882ec SHA512 560ccebe59bc49c9fcc04d9982e245a70d8d90cd3a571201f9a91c2a3fc91e2a096aaa55947646fc62e0fd2796df187de58647a39d0a9baa780a41fb69860836
 MISC metadata.xml 710 BLAKE2B 9495d9ce29f39e1594574e1ec2986becc8601f2ef1a30b9b13019d5711d0b75e84285e7cc04e2a47b96deee20b6bce8b15cb562e47edfaa77216afbac248e493 SHA512 bd4dd0763d6c332200c07e4c43830839e99b84ed7d2cebf4a2315a2a152ea7a0b2944a2976e8cd6a29d54adc185161380d13e26cfa689ab2bd48ef2f90395c7a
diff --git a/dev-python/tqdm/tqdm-4.23.3.ebuild b/dev-python/tqdm/tqdm-4.23.3.ebuild
index 386766f79b04..292ecf6c3149 100644
--- a/dev-python/tqdm/tqdm-4.23.3.ebuild
+++ b/dev-python/tqdm/tqdm-4.23.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tqdm/tqdm-4.33.0.ebuild b/dev-python/tqdm/tqdm-4.33.0.ebuild
index 832cf02c5bbe..92d9aba08cee 100644
--- a/dev-python/tqdm/tqdm-4.33.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.33.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tqdm/tqdm-4.40.0.ebuild b/dev-python/tqdm/tqdm-4.40.0.ebuild
index 78874a4508fc..c55f5112880f 100644
--- a/dev-python/tqdm/tqdm-4.40.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.40.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tqdm/tqdm-9999.ebuild b/dev-python/tqdm/tqdm-9999.ebuild
index 78874a4508fc..c55f5112880f 100644
--- a/dev-python/tqdm/tqdm-9999.ebuild
+++ b/dev-python/tqdm/tqdm-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/traceback2/Manifest b/dev-python/traceback2/Manifest
index 5203e9cb80ad..bbfc7b427fe8 100644
--- a/dev-python/traceback2/Manifest
+++ b/dev-python/traceback2/Manifest
@@ -1,3 +1,3 @@
 DIST traceback2-1.4.0.tar.gz 15872 BLAKE2B cd2e1fe91e1e71a6dd764675e083857f359cfa5aaa3d2fee7f1709e24c545bb9e337f0af1d87f9e286fa2c36dfa12dca84589a936dc9f9805a1c4891739f337b SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342
-EBUILD traceback2-1.4.0.ebuild 613 BLAKE2B 275db8915d3dfc2d8bf55d06320af3df1de2be8102eb467055588add6f0a42fdc79093cb295713817e663ffbb7e0e74374dc85322b00b2d063ff03a33c4fe7d4 SHA512 3648d9f34a7233259f15e6bffa954bb6d198640e70b9148f9447909e353a07592c9eb622b66749859df2b36aed56ddd2f6b0d67282c8d46e1b3e080a85548cff
+EBUILD traceback2-1.4.0.ebuild 608 BLAKE2B 67388889f3a5e3ec9df45b832b5ed3f3553b3eb863e2aea7eb08bfa8fe0917f9771d81c08b77643ae2786e6ce78d71cf8375cb81456029396e5de98a4bbb5535 SHA512 29fc6b0cc8c49d7d25b426d342ed99250e6cb54edf24c6ab4fd3017cfee41e6d889542e72fafef1cb55c656b223a645ecfc1be322a7838c336be3e071d5f54c9
 MISC metadata.xml 302 BLAKE2B 97962b0a7d9fff03c6bf59aa6b2702faf2153df607b896ceb41e6eb7886045b9180048b121102caee6229950711cac23acec5bfc72771b112fcac0fa59536dfd SHA512 59c7be20af309b3258f6d3208da4956963e89c47ac2d15b68c6917d5d33b9aecbb359111579959fcbba5c5abace520ab7181e1e993e015f1d1971e1f5e4a3564
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index 9feae311e4f0..96c45f094b0d 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index fad4a7935bc5..7accff62a854 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,3 +1,3 @@
 DIST traitlets-4.3.2.tar.gz 88173 BLAKE2B 51848cc4405521872391e2e4e55bb6c32ac939125337118bdc6282f4e7eacb116ddc94ff901fec18c2cf023af5d39aec77e6737bee2f915b28b4032611257860 SHA512 4f3239bc31af224814c8181dd1ac0fe5287160aee48b2b0f54afae841c8a9d7eaed010082044b6d16f91cd970bf0aa1eeba57d4503dd919fc8c4613ac5150ca9
-EBUILD traitlets-4.3.2.ebuild 1243 BLAKE2B 2b983d9d588a72f554410dcd832ac14a5eebce6f77fce661328c822f08d9903df8dc9f431ab465ae445b9d4f1889b2f94349e2d7cbcbca61bf17bbfad6b56e82 SHA512 4b32908f833bb86ac2134e89efba72b8eb7f5fd3e4fa48a3bd28565ec4871372bc5f00639047758a7b5f84b478a81f5b98bdb592a36be6a51bb5d26fb9dc7c17
+EBUILD traitlets-4.3.2.ebuild 1241 BLAKE2B 37cf84c78f631c852c61fd4cf6cce64c52b274d94be823436b94d328852cc22ebd410959a25027bc9da35557a645d28f024a2748fef92102dc79319f69a0a9dc SHA512 c90700e4e5db16999222450c6c1d862dc2c76e3203ae4aea2cc57b57203c586f21230cec22ba042838daf354bf39dd26157de862d06f9016d032d26d27b8e4bf
 MISC metadata.xml 604 BLAKE2B cdae6c5e9ea3e7b98e44d815f1f1865c83c78bf3457e3a26e5132fbb3648ec585e9224faf7197e0736e7ba98f19ef2ae0a3fb32f2b9615a2efa0fcaec80cc37d SHA512 0a7e7a4383b50e9c362a5135315d325f226640255521eb507ff7741a61ffe7a91a8a5896e641596d6ee83c1b70e8727e1820e8b29d53e466239d007b1155e221
diff --git a/dev-python/traitlets/traitlets-4.3.2.ebuild b/dev-python/traitlets/traitlets-4.3.2.ebuild
index 889182ebe6d3..972d6cd0d1d1 100644
--- a/dev-python/traitlets/traitlets-4.3.2.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index 76e2b29aca24..9bbf9b206bd0 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,3 +1,3 @@
 DIST transitions-0.7.1.tar.gz 1283833 BLAKE2B 5f2f2813ba158cf5ccac4e2d55700149b986bdd24f9e864cec8d03390724cf79d9d379afa06b1a7b56c6a91376410252fdda169024f6ebbba2ed976fe7a18e7b SHA512 3fe5989faf9dbfdc15d50beaf2656240317f00278727271e5bd64ad465be1640b67e760fb73f4b06a61920343215815a8be03d41dc4d32086222446463ef71d7
-EBUILD transitions-0.7.1.ebuild 988 BLAKE2B 2b13d78fb9a51dde7134e7eda337427d3ce377885df015be4debff0bb88e76d711418268a6b2bd511e7c694333058e979a07e98cf2f50508c5280148bf410ba5 SHA512 cabb855a45cebfaafbd9d77cc73365b5cf1cedc8c243193b6b00be52975616f8ebd2c69b302455b02e4da75b7f375d6f1997f6534864e103c6d1536d5bca68fb
+EBUILD transitions-0.7.1.ebuild 988 BLAKE2B e05858c89a8ad2bfa7a4b191875f6394a85632c9e5eed7a41c617edff8358e5d4099e5e8c47133b15f5fb0e105a7db9b51790064264cef057c7f256ab7215e13 SHA512 7b88838d7f40754f8ac71047c909b89933c9ee443c40df3fd1b60b59da7abc49ff3e2623e5cd8a1625b0de9efbd14e9422279e0bdc735e9e4e18d185afadf45e
 MISC metadata.xml 688 BLAKE2B aa20597be6470d32cc9a933d01f04f2b145d9d0dae23cd7bd3f4a3794e919c08cdee49f0c9a861b00e8971721091a315474d19f482afb6d009eceebb6a49ce15 SHA512 4b09b37102dbad8597aa58b1a0bbaae9c37360e58967c468226ae18122fa29e7c50902dd44a71e28a6822089ca9e787781d28d1e09e56a73ae34d8a7b9a6d941
diff --git a/dev-python/transitions/transitions-0.7.1.ebuild b/dev-python/transitions/transitions-0.7.1.ebuild
index 956ab1cc0623..bc0debae05d3 100644
--- a/dev-python/transitions/transitions-0.7.1.ebuild
+++ b/dev-python/transitions/transitions-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 42a81273e30a..b47fee89ba57 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,7 +1,3 @@
-DIST translate-toolkit-2.0.0.tar.gz 1106464 BLAKE2B 419caa924b36abd45cd285a28594dad7d1d49dd149961a686382f848e85d6bb15c4cbf52b28881efa7643a9470a51d2c00c57ce52c153a113296344054e31038 SHA512 a349f64438683bb00a7a7ba0537b7c9a268e6222d2df67991eb5d47b05a446a6049bf42918edc97ba8b08a89a42850eb37f6b4b917ccf5c44494885a853ffe1f
-DIST translate-toolkit-2.3.1.tar.gz 7668931 BLAKE2B b8426c06cfd01d6afcc88b629cf464e6fa91a49a6a3399cdc693395f67677bc8eeb4bb1ce0b5a1653ce0e6cafabf76cc102ab462d0482cbf311e5369f65df678 SHA512 8928d1d681dfb4cd9100ae6128f6e1d7e85ff518e6f529c37d01e34679470e9d964c08dfbb902edc23403ff6f6912d0a4236fe0cb21819d00d9ba46c3009ace3
 DIST translate-toolkit-2.4.0.tar.gz 7646438 BLAKE2B 5d956ce05b57aa3ec2c7896a36f199cab5a590d4d6a4ad84263d7b757e35d5e42a40cac38ea3da1c8a11c64b1cacff5a5742b79ad5a87436842a35547d89e611 SHA512 715d9e974c451a5c3d92471287f4da8e8ba663efda849398f77a3c3d6f16e0c9a8e685261ec07c02ce9bd13f3766f0b2b1ad441b92116bb3913036ffbd415658
-EBUILD translate-toolkit-2.0.0.ebuild 2123 BLAKE2B 373d36db17a6d38bceeebb03bd3dade8b2165c45358b87e0c9ea7ada23d53b27f0d00d2e16f5964c77f86be83eb4f2ac47cc114fad2d489ae6e45d803b109687 SHA512 9961aae2b6fc8b6c0efc505b0dcc185c088d0ced6ef120520ddeb8952985cc892ae381c7da9109b49bba55f38bcb481cc113579270341041f0bb7545ac69c51b
-EBUILD translate-toolkit-2.3.1.ebuild 1976 BLAKE2B 8d98110965f956162f8595bc812f6f8ecbe59ccf9d9411af007e3d992e381ff13e678318471de2e5ff4da19de1486bce4bd17e7d7d0d4661cc619b5d84897846 SHA512 c6a9c6a427fead36eb4f87da1c283ced505b38143b48546afb329e0e75307df5057bf9bf021aa5c6018bcb8ae2784be9326deda278ed47f9d60a3fe8cb0fbd8d
-EBUILD translate-toolkit-2.4.0.ebuild 2025 BLAKE2B fd21ddc4948795f87b0572f64678ec4f09dd320eb623bc962f98fbcc15c716dcc09991fd01eee9d6ea847deee4c3be5d47d7670b046e52e3f6772ac416459f2e SHA512 bf1faff48b911d5bba3ca5c271ce52e93b08981e5e7600746e78ea5f8b2c4daee3a0d642d5f7f70199850ed0172ed67644fa22a6c0bea1443594bc48af445dfe
+EBUILD translate-toolkit-2.4.0.ebuild 2022 BLAKE2B 4ba4ce0f57929e569f8453fd0640e8504838d701e99f32eba497b54aa00ecf73ce67936ce0df4e759f54cb289cf4a093a60f67120bd8d17383cf8d4611abbda2 SHA512 3af510327195e52e13d7c473b0be4ceb9e0c3df236082320c29c8b6db92f73cb7f95611d9f58d56b41ce3500ffd8c1b5fc721e43ffb89ed36462cbbc33cd5bdf
 MISC metadata.xml 666 BLAKE2B 8f550fcb2d34ecd84e4125645f127260c154022bd7cf03b7742313632627c207a476f1e4a98c83b5d5890beff7558ec548f16c675135822d790146c842bec04b SHA512 34bae48b0be0aa5ef195757bded33736a051ad563ceac7be514bee3b54c67637f308d7a7844fa0657bbb4bc6ad987bd3ee9b04d65d16fdbd6d5d7791e4bd155d
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.0.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.0.0.ebuild
deleted file mode 100644
index b2ad89f0d1e2..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-2.0.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-toolkit}"
-MY_PV="${PV/_beta/b}"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc +html +ical +ini +subtitles +yaml"
-
-COMMON_DEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	dev-python/diff-match-patch[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.5[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( dev-python/iniparse[${PYTHON_USEDEP}] )
-	subtitles? ( $(python_gen_cond_dep 'media-video/gaupol[${PYTHON_USEDEP}]' 'python3*') )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-
-REQUIRED_USE="
-	subtitles? ( || ( $(python_gen_useflags 'python3*') ) )
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-python_prepare_all() {
-	# Prevent unwanted d'loading in doc build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" \
-		-e "/html_theme/ s/sphinx-bootstrap/classic/" \
-		-i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( "${S}"/docs/_build/html/. )
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -Rf docs || die
-	if ! use html; then
-		rm "${ED%/}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED%/}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED%/}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED%/}"/usr/bin/{sub2po,po2sub} || die
-	fi
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.3.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.3.1.ebuild
deleted file mode 100644
index c7b1c595562b..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-2.3.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc +html +ical +ini +subtitles +yaml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/diff-match-patch[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.5[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-18.5.26[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( dev-python/iniparse[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	# Prevent unwanted d'loading in doc build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" \
-		-e "/html_theme/ s/sphinx-bootstrap/classic/" \
-		-i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( "${S}"/docs/_build/html/. )
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -Rf docs || die
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild
index c90761420f73..47d469e37696 100644
--- a/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc +html +ical +ini +subtitles +yaml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/dev-python/translationstring/Manifest b/dev-python/translationstring/Manifest
index 4149f19ee943..9e1d8b3a05c9 100644
--- a/dev-python/translationstring/Manifest
+++ b/dev-python/translationstring/Manifest
@@ -1,3 +1,3 @@
 DIST translationstring-1.3.tar.gz 29259 BLAKE2B 650c4e294796e1409246cf2f4effdd58bffecc2912e57ea4268d77d38997d2997b329936749af10c8c7625729a6503288cb8aa54baf1a3c07b3671cda0561833 SHA512 deba5b460d9ea640087cff8b5d7b9256708abd4340a54556f1f0542e2e4f9f0ae0a3482b66a176712fcd6925c470da621adbc5e4c4173c0ef29b9cca5fba1102
-EBUILD translationstring-1.3.ebuild 1100 BLAKE2B 6561efa3cf647b34bf124abccdd80e080529ce11e04dae308b7fc4d1650f30f53b30b9911360b406de1695ec291062f5d1e06e26d0c2d021ee6dd8180b0d1eb9 SHA512 4a11984251d1a48ed83a869f7784fb18afde563fba583f7a7dee67d90aafaebe78153c3784878780c02a4afbfbe850e5402d3527a3c189615d9fe63067a92b7b
+EBUILD translationstring-1.3.ebuild 1091 BLAKE2B 270faf31b141fe400b2d629f0facad0c652baab2884ab57a212838dd784121dd3a70be1b0a3cd8d7654128724972804784a2eb9588f246a7c232aac4e466b049 SHA512 fed14dedc86e380e7f537107e5e165fe8cd6fd1bd3bebf13f1806aa4c247f038c1f51c9f2a836c1aa3ca60cf395090b286792aa24753bcb6bad6e1815036cdfa
 MISC metadata.xml 396 BLAKE2B dd74b39a6a434cd88f9cdc36dfa838457d0a7e6677f68e4b687844c1861b25407cbe756af94995ceab82b55b0a607118060579c1c3bf40d78d8299f1a62a4066 SHA512 6cfbb09e766bb9c10523808ea4da01f0998e03c239f633347523f57177816bb4c6efca2567ba53b2bf5b41274a3845d8a379294172c94067bb02f901175cc9e8
diff --git a/dev-python/translationstring/translationstring-1.3.ebuild b/dev-python/translationstring/translationstring-1.3.ebuild
index 6c08cbfdcb4d..905f76add406 100644
--- a/dev-python/translationstring/translationstring-1.3.ebuild
+++ b/dev-python/translationstring/translationstring-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/transmissionrpc/Manifest b/dev-python/transmissionrpc/Manifest
index beb5ae5c664e..3f25005e6ba2 100644
--- a/dev-python/transmissionrpc/Manifest
+++ b/dev-python/transmissionrpc/Manifest
@@ -1,5 +1,5 @@
 DIST transmissionrpc-0.11.tar.gz 96091 BLAKE2B 8ccda6621db91bc5e825162e2f11c0847d96a6711113c59a600e7f74b3b802d5c084cfa34388d77784d1514675d0d0934b4838c7ce626c14b2b811d3b5740788 SHA512 778c4099264d38deefbcf05c8f9e5d165ce113b4180e3797eb3cf11f0a9ba5393c0b2e6f1f0ae7c2dcfc679bfc1d0d69cb3715b3db6ac90a1a840fbd0775f82f
 DIST ubuntu-12.04.2-alternate-amd64.iso.torrent 28541 BLAKE2B f88cb5b5820eb4b73faa0fe4aaf0aad538f120879ae8fe926bc5f2a76ca37e7e6e186b2a2cbfae746a0df1d32eb72777b21ce1fb5374a8f5c6bfa508c7fd4fc1 SHA512 a597d9c5258111cb9c42dfcbb0804e093b6c69d4cdf178c961de1d52ec64e75f76d078700b59535e631575e42d3a995844ac0d30c9f7e852ab1ece149ec1f6de
-EBUILD transmissionrpc-0.11.ebuild 949 BLAKE2B c6781b0f34999d40e8c29df6654680232019fcb764a36abd269c3a116d0b841118ba5c710ba2bce1ea47c1e57ac2f7a4d714f345f4f0b717fb494856317bfebd SHA512 6eca9a6746fbd6516ef0caaab758fdb36d30bdd455846e4511540be051458ff0d89452ac0fe9441f10cce45805b78b9354e4cde392bf2dbcad8388a81061b44b
-EBUILD transmissionrpc-9999.ebuild 709 BLAKE2B 8e407b7a746f622ba63c8afa736a190b692fa6fbdba91c9eb4c054d93cbfbe4a17bf4972f50b2c96ce47b13a18ad58589aab1968c9a7e87bb4529ba23e2abd3a SHA512 2c91f63ae9ace685eaa9f0bd22c021266a8867293ac7b3428ac936769b572481d01c9633bad351ba7c10a4209db2675b56b3938af699449bb02a7eb8ff0c659d
+EBUILD transmissionrpc-0.11.ebuild 934 BLAKE2B f1f62d311b867d34b868b48d2a4e25adc85d5065b6559ccdc71c6a81272ea0a137f4332b14768f40821e2c2531f28058f06c4468c1af31fa98744b5a2a4d42c0 SHA512 6a6e76f07c24f6207b94783e6fc31dacfbc2f0f28e61bb6a9f0754372fe2bd1dc5b3b729ca858899c6fc5bd166d29e116b5b20be585ccbfcaa3b231d19d68180
+EBUILD transmissionrpc-9999.ebuild 694 BLAKE2B 8f099b3f297fc5c0cf7c681cfb54d6b8a37671e566c78abd7ef950a91dbf473092263e1e9e5ac8637575e1e4008f18e828eb860898a5df0d0f3e8b261150836e SHA512 18d2e3629d415c273e27526bea3752eb11b22bebc737f51f76a09be28eaeb1ec501720127eb334ddebe9fff5c442ab8c834d609ffe44e31c6599cd70eb274a4f
 MISC metadata.xml 403 BLAKE2B 05840ebdbbf9bfd69e3a3dcd81d1673fe4265f50cf3fae71d98d002c8b6fb38cd520ca0bd3e3c08e1dd08d7235dbbb2e1fc934a62e38a904e4ff85ea613e6ed7 SHA512 c4a31c3eac5b356423d100f80440732c6351e782f764a3a4f27f97b311b3401d744b21d985599ecf72688fd2de5e1eac8631b549e2094b5c3b31d6961bba30df
diff --git a/dev-python/transmissionrpc/transmissionrpc-0.11.ebuild b/dev-python/transmissionrpc/transmissionrpc-0.11.ebuild
index 3e54180ce156..8784bbd62f01 100644
--- a/dev-python/transmissionrpc/transmissionrpc-0.11.ebuild
+++ b/dev-python/transmissionrpc/transmissionrpc-0.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/transmissionrpc/transmissionrpc-9999.ebuild b/dev-python/transmissionrpc/transmissionrpc-9999.ebuild
index a4eb9f25c43d..f2e1d5b79a88 100644
--- a/dev-python/transmissionrpc/transmissionrpc-9999.ebuild
+++ b/dev-python/transmissionrpc/transmissionrpc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index ac8884ab1dcd..e8aa1d61e961 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,9 +1,3 @@
-DIST treq-0.2.1.tar.gz 30954 BLAKE2B e7f97fea21c18821db2eba6c26f717cbd83297822e3e607c0a451bd5fc9be1d96200c9780857ac2aa2ce297a5bec681c54c4d3dc18ae3d8f391454e19e744e7e SHA512 d9236c395dca66d358fc9bb1b752e02a7d6335195235808452542de33145057c1c2e959658015b3c89c9a20c35b1a8edb752e151230e72edd313dde6cd6a4cac
-DIST treq-16.12.0.tar.gz 43685 BLAKE2B 3d05c41eb0a471e912959546f7e7abf0d8986dcb28b0c36cf1cccfeefd600c3a7141f93650a1b6947665c2ee24cda02ecc8e4ed927b1fb3c36309e23edaea33a SHA512 9385ada8cdf88e608937c118c29506372d8d3a8e7dcdc54998461652f106e4ccca4d6fa0a3f14ff5d9312da7ea1e531a9e4b0772b694b8dbe03f456101d63cca
-DIST treq-17.3.1.tar.gz 47380 BLAKE2B 61b51c46252629358c0ffaef7f4e7e2010e2d58c307461caf42982f8b6ad2714af57c37065bdd87a94d2b9e2fde150473b45116f2d8d270f783f20e1a8291020 SHA512 e52cccbfa663314e968b33c58a5be5782063b2d6313a4ee5a03df912146c6ca25abca82915f30791f865afd2c08bb04c9993d9204d876c7ec2b308c6e51cb821
 DIST treq-17.8.0.tar.gz 56439 BLAKE2B 3e39c84453793baf3107c38b656c8968e593845fc0d41035b558326ff947a9e17903ce33dee3157d2cb2f79ab3aa884ddebcd52e743cd6e1ad08a0de324cd6bc SHA512 62933a512fcc8b0e77333eb9268846ad17f4b44cf6ea317ada2565054100be3caf03bda0a1becd775ec85528fc2f5ddec33d23d3579cf484a3c6ba7c71c50a7f
-EBUILD treq-0.2.1.ebuild 1059 BLAKE2B f53cea821be35bf84cac761a9f485871d1286797c1e41bee6fd62c8cb9a47cab4dc32af347dbf9939a538869825f581069cf009a8fbc7cdd8035d2f3c97c6150 SHA512 5847a0e6a7fe5cdd48f7ed345e7c345165b773ec4a89fef175a4aecc519ce1038784114f318595b727f0b1e0ad953682541c7c5443852c88011057f96f40bab1
-EBUILD treq-16.12.0.ebuild 1254 BLAKE2B d8477c5c062b35f8305ef8d8d91cf4f24cb2db5cf47067667cd23663d866f0d9b774bb958a70310d488d4618f73dd1be446ac511f0c89324a277234613c5c12f SHA512 91894934fc089ddaa6cefde1c141a04a10f10e2e58e7a70a714afea5f9675d2fd7ad9132ad87b4bd60cfd6f634d2a73ebce9a7fcd1a6a0551ea3aeddaa637959
-EBUILD treq-17.3.1.ebuild 1557 BLAKE2B 62e2070019cc5efd7226903734d67045317b4b461eadb57217a2e06e9e740ad5d8bf2a88f28e24e3ec533a8ae89e2093b737a5e7561b3019e7c887fe4cbc73f8 SHA512 dc9d75896fc6414c0af1fdcf5a9bf28edf4b64ada3b4d2b87ee405099801ec5badf4a7f228d7efa518b6e081fd2f6e6e93899ddd2a4f92f81b4084c3728ff5bc
-EBUILD treq-17.8.0.ebuild 1675 BLAKE2B 3376111ad3d3ec0d39e8e37842cc6654d82ae10c81a22d3c0b912c673b6b6f302a6d6b65b51ece18b015a9980491b64fca0a8711dc338f31fa037838406107ab SHA512 ecd3a293525968586c44c341552f9d7eca62faa369725c094132532b28b34e08af02def13993310e0fb69caeec5888986ac1e532e3e2f96a3df770d993277c2c
+EBUILD treq-17.8.0.ebuild 1671 BLAKE2B 67c32e079da35c4c2955872270ebbd088301fc27149e1fa50cf007cea294f2e65171cca5a2161e116edaf01eeeb89505e36c69dafe9c378693d6dc0b1032ef75 SHA512 501d494a38355abe9b9c43715030bdb778553cea368f219a36ace326e6797aa08b56bdc1faf8b6449aa08f3354d0ba7ad3d362cacc593751027ae07408bbbdd1
 MISC metadata.xml 601 BLAKE2B 1abd105a142f5eba9c335cc1ed8fb97aacd796ad9e42e8c8c04438a9b6830ef3e9675b3bfddb6677f6e9b51c61038954ab1ac29cfdb81f8c05259d95bbdc7ba7 SHA512 e4092ac535738c5c82e5dab29a0a3faa017853011013bc4f35b9d9425c2c92c1f092fdcf7236644ac955b5b9509fafd1adfaf04fb64439bef2b3d155f3b770c8
diff --git a/dev-python/treq/treq-0.2.1.ebuild b/dev-python/treq/treq-0.2.1.ebuild
deleted file mode 100644
index 3ca277aaa03b..000000000000
--- a/dev-python/treq/treq-0.2.1.ebuild
+++ /dev/null
@@ -1,42 +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="Python requests like API built on top of Twisted's HTTP client."
-HOMEPAGE="https://github.com/dreid/${PN}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
-	>=dev-python/twisted-core-12.1.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-web-12.1.0[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/service_identity[${PYTHON_USEDEP}]"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx
-		${RDEPEND} )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C "${S}/docs" html
-}
-
-python_install_all() {
-	 use doc && dohtml -r "${S}/docs/_build/html/"*
-}
-
-python_test() {
-	trial treq || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/treq/treq-16.12.0.ebuild b/dev-python/treq/treq-16.12.0.ebuild
deleted file mode 100644
index ee407be18652..000000000000
--- a/dev-python/treq/treq-16.12.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit distutils-r1
-
-DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.0.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/service_identity-14.0.0[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx
-		${RDEPEND} )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/pep8[${PYTHON_USEDEP}]
-	)"
-
-python_compile_all() {
-	use doc && emake -C "${S}/docs" html
-}
-
-python_install_all() {
-	use doc && dohtml -r "${S}/docs/_build/html/"*
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	trial treq || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/treq/treq-17.3.1.ebuild b/dev-python/treq/treq-17.3.1.ebuild
deleted file mode 100644
index 42cf044eb013..000000000000
--- a/dev-python/treq/treq-17.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.4.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx
-		${RDEPEND} )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/pep8[${PYTHON_USEDEP}]
-	)"
-
-python_compile_all() {
-	use doc && emake -C "${S}/docs" html
-}
-
-python_install_all() {
-	use doc && dohtml -r "${S}/docs/_build/html/"*
-	distutils-r1_python_install_all
-}
-
-test_instructions(){
-	ewarn "The 'test' USE flag and FEATURE only ensures that the correct"
-	ewarn "dependenciess are installed for this package."
-	ewarn "Please run eg:"
-	ewarn "$ python3.4 /usr/bin/trial treq"
-	ewarn "as a user for each of the python versions it is installed to"
-	ewarn "to correctly test this package."
-}
-
-python_test() {
-	# Tests fail when run via emerge
-	# they need proper network access
-	test_instructions
-}
diff --git a/dev-python/treq/treq-17.8.0.ebuild b/dev-python/treq/treq-17.8.0.ebuild
index 5e1eee117998..a9ad848cb792 100644
--- a/dev-python/treq/treq-17.8.0.ebuild
+++ b/dev-python/treq/treq-17.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
diff --git a/dev-python/trollius/Manifest b/dev-python/trollius/Manifest
index f566420f5052..6288a6d3a401 100644
--- a/dev-python/trollius/Manifest
+++ b/dev-python/trollius/Manifest
@@ -1,5 +1,5 @@
 DIST trollius-2.1.tar.gz 276425 BLAKE2B 3337712e482c19ce06bced64a4169effee74f8e6d33e60f4ab411d636acae586a104766639f63d0075fb12a39f09ed7e54c7396f3295aa99db04e0b60aa433fa SHA512 d800e060e13da22c83fc20f2c0e61d6c50cca309d90e8faecaf24e68240d78ec7fc9cfbb68a968ba7e9d73268e974353d9bd9063eb0ca02a4f0e88610abd6018
 DIST trollius-2.2.tar.gz 276391 BLAKE2B 8debb662498551f2bee85605388813bdcdb720f798b2e2e2cb16a86340fe2759b1a59abcbd6d302e96f6d9860a464c140a521b9a7e731579329351fd11baeebd SHA512 d4a123cc0728eb3548f434ca227a36afce0fca8bfc9fdb0005ff501538c8fad9507608112c4b63c7d273cec2d2310b941068093c9bbdf28d984001753b4956cb
-EBUILD trollius-2.1.ebuild 664 BLAKE2B 379ad7dfe0fc7b384ac8c1c6f3f2358aed06ab68596fa0f95997bd9b0ed7aae8ee8dc3b45fd1565a41a846773cb952257baeefd54ec1c07b59b866825239943c SHA512 42762d8e9e55efc8a058e025f2fc82a69e090f6d4dc400c524e712652d9bd7a41951fbff0000ff38738a3f54486bf75da3539c6644f0b710386a8e5efdaa6aa1
-EBUILD trollius-2.2.ebuild 666 BLAKE2B a81ba883d52588fee17ae3c8cf1e40caa8c3b9ab1802dd1e702c8c5a68a2c5621d2483203d134792f708ab309df3eb25e286bf4dbcafbec0b87f4395381d5159 SHA512 fc485eea591095ab9139fb344d4d70351137fefa4216dbd13fb583f2ff07b2dbbc0fb2af1fbe82cf36a9f5c3c388aeaec399b79a1017f7260dff63112b6172ef
+EBUILD trollius-2.1.ebuild 655 BLAKE2B a9366a6872be66f59dc564bf2251ad1d835b71a66c304c1d1bdef5f5d1e6c88196ae6546f1c7a9ab3777678ac098bbde3d811bf5617fcad74117dde6dec007c1 SHA512 19be21d5f37e787acb3895f469657004e9013d08058a87a385e9da3e8083227d67fd152f243181e37fe973cff0089a0876b1c971518cb59ce31bb9ab3e67bd6c
+EBUILD trollius-2.2.ebuild 661 BLAKE2B bb95149b6cf5130b51e48083f0d9b5f8e5e6f39b635a69ec39dce4ed030b28d8355727750239ce9e030e7907640be4fb1f0981bb2f9b0c7855ea26927ff22afc SHA512 4e2266fb0d16c9692d92156146d26a582e996f29b717f28207c8de7ae895d03ce4cf753a17da01062586421f7828a505a161610097710915669f5ef781ec5cf7
 MISC metadata.xml 380 BLAKE2B 67950aab96abdce21c702fb2aacf3eb4f0376483105bc656988e7d95f65b3a47e2f027dfce5e1a75e23875aca710f8c0d20ec47bc02dee4ff4ea4733b7e8f4de SHA512 96c4e4f92d32c6a7844ffe4412e24ac7985c4c534d5c607873be067a89350b79a112557f9c88b63df6d1135706920a3e3cda79ec0c9aa534cc3f84e9043e6b71
diff --git a/dev-python/trollius/trollius-2.1.ebuild b/dev-python/trollius/trollius-2.1.ebuild
index e48d446fcf48..2cc2af11d175 100644
--- a/dev-python/trollius/trollius-2.1.ebuild
+++ b/dev-python/trollius/trollius-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/trollius/trollius-2.2.ebuild b/dev-python/trollius/trollius-2.2.ebuild
index 9de2fd0afd5d..b0922242a535 100644
--- a/dev-python/trollius/trollius-2.2.ebuild
+++ b/dev-python/trollius/trollius-2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 827ece0e38fa..842406e52015 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,7 +1,9 @@
 DIST trustme-0.5.0.tar.gz 21232 BLAKE2B 3804fe4e9b7049da0bab926bb1180af6bbb8f882cfb16109bed040ca50c85e7b83b5468c3388dd8478ee9fc6478523bba98c39b74cb76c86a72761a26685122e SHA512 7ce5041b8d3687fa462fe93e55b2f83549ab805cec4a2a94c9178a02af557cf8900fe6c05bae0bf100eb36181952fb2bc31cb1d4d6ad6ed2fd2b0706d569518f
 DIST trustme-0.5.2.tar.gz 21819 BLAKE2B 68516eee909851f16c092cff580b1267e57aad5641014c7e1ff5da98fc328e1e392cf0e08d1965be062f2be1c16de735ddeff2dfbb2f20b1bb34498a1b048861 SHA512 32ab33a82752228aad200203b7b217f9b9da970067330a273c9ff5c13c8ae15ef20c39e61fc9cd748b7030691ef4b003f279a50374f59b7743c4c90aeca56a22
 DIST trustme-0.5.3.tar.gz 35946 BLAKE2B 4150ebd8efad9033333325ed8e0f0d0da713b196391f55018d913af904fbc889596470fc02ba51db2c732a733f5561ca207876344daba970509aab98978de3ac SHA512 ac898c8531d54fefeef53986916e196b9cc808fc9e388c26b23b3fbc596204421b2a072ac4f2ceb8f263383a942cccc4ad7b23c776536b63e671e7e9e2141ab0
-EBUILD trustme-0.5.0-r1.ebuild 967 BLAKE2B 115659f861d5f4db966645a905d2dc61537eebcc6e412125fecedee3c5541dcff269c1167e72d0697c6b05f914f4fc084f4c9b42dd543abb333821180e446150 SHA512 f27dd90b117abb59a850da8c8fe304def4fbf3341ae5937135a4e2a22a129134b7a3b3b00798615152fa9ed0c3985cdd3a28fc127f2a7088f9b89f65b186d78d
-EBUILD trustme-0.5.2.ebuild 976 BLAKE2B 7fcbd480777a9861053c69779d4e93cbdc68305421643cf9f5850a99d9896ba3301d78d09bb4c2a2cab2554e960a14d2def863b09fd80d4bdb2ab39f1e05825f SHA512 f5291937f87fb8b0297714ca716fdfb9d6588426beb8c2455888253c9d07478fb5c21f580d167be82e8e18f8c18e23a4aa85d9afea5e9442a94d2486a099b5a9
-EBUILD trustme-0.5.3.ebuild 873 BLAKE2B 8087210f2e55ef2ed18c9677731220b1998746074afb263a91e16172cb52d9808e1acc30fe68f2c4822345a3137fe1ccc93178ed58f271b62a1bd2785e0f6650 SHA512 90749e2f50783bd5a60dbea55aa1e7222021940097617b551f0df6c5a1c157be3084fb341372d4232ab06d80bb28126b626d4719d3e4d14fcc1e8e4ca88469cb
+DIST trustme-0.6.0.tar.gz 24062 BLAKE2B 77f72ab225653e5cd4fdf57b22c4a227e7f186370cfca795df57b5f3c1acdd72b920c0a4ed8364bf2ab4b367a8cda71550d9ff801d6e864eac9ecdef91d947dc SHA512 9fda58320f2055d2c23369d2df213994cafd9af7b7eb3933162bbe09a81abd7a9cd2b2e7cae43b25d40d20311213d8a1c13155b61498b848a2850d22fa1e1418
+EBUILD trustme-0.5.0-r1.ebuild 963 BLAKE2B b5be6b49dfce9909255073aa78a35a765686983e0d1017ff27cecff0a00a5f778669b2cb765d7fc664d38a22f5057fb498dc79bdd324ad5dd06195fd903a7036 SHA512 73e1fe4f8962b6b428a44961a8b9702e2235f6ffeabecf9356901db81e9cacce7d539edc6d702787b6be5cc825ef407c820e18c39090affd81e626871619c38c
+EBUILD trustme-0.5.2.ebuild 972 BLAKE2B 22ae164a53c0cf9a10f24569801b5847700425b47065d8164eea977c2deb9c32720e63d69db023f523a9f7eb583ed192433881d2bb42cf64a112dc62066af6d6 SHA512 24abc3550b484960e3934a60cac78d988185b8f3435dbf56bdde9a8882e3b4056f35cf4b8edb9009cf9dff557405999b809acc06dfe0b55f17d8952f3b39f70c
+EBUILD trustme-0.5.3.ebuild 866 BLAKE2B f653449b3eb6a00591811a20913d70c68f6c5f4e513780d60ea583fada447a1b2e7aa7459769c83a94fd2d85f0128b1cb02a9d09d725e44ac102438e2bd77836 SHA512 f690cf8521117b6e85a7a194afd3ca9cb4b4f11069b483929ec9aeebd537474bf36757fef5e69a648763534d717d965bd607afaa4ac398065ec0950dd870282d
+EBUILD trustme-0.6.0.ebuild 866 BLAKE2B f653449b3eb6a00591811a20913d70c68f6c5f4e513780d60ea583fada447a1b2e7aa7459769c83a94fd2d85f0128b1cb02a9d09d725e44ac102438e2bd77836 SHA512 f690cf8521117b6e85a7a194afd3ca9cb4b4f11069b483929ec9aeebd537474bf36757fef5e69a648763534d717d965bd607afaa4ac398065ec0950dd870282d
 MISC metadata.xml 349 BLAKE2B d750432001725ac1266b82b174011a342b115739dcce7a9ba4da4465a907f64620f0e5e4e38cf6b41beffc4021cfd070b1f68b6da88f2a309f44c45d23b4b40f SHA512 6152f78467097c2e5ed0c65dbdf6bcedd84310b74c9ee92efda96fb855db3f0f990387a48f58f34e2c9f4769bc0f7a28b1c6c4be7e9561f6a3c4a22fa279cf0f
diff --git a/dev-python/trustme/trustme-0.5.0-r1.ebuild b/dev-python/trustme/trustme-0.5.0-r1.ebuild
index 9bb4bd6739ac..2ee610a95ceb 100644
--- a/dev-python/trustme/trustme-0.5.0-r1.ebuild
+++ b/dev-python/trustme/trustme-0.5.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
diff --git a/dev-python/trustme/trustme-0.5.2.ebuild b/dev-python/trustme/trustme-0.5.2.ebuild
index ee3f8b306297..3a66d60e0640 100644
--- a/dev-python/trustme/trustme-0.5.2.ebuild
+++ b/dev-python/trustme/trustme-0.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
diff --git a/dev-python/trustme/trustme-0.5.3.ebuild b/dev-python/trustme/trustme-0.5.3.ebuild
index 1bf6ac887382..3356406a8b53 100644
--- a/dev-python/trustme/trustme-0.5.3.ebuild
+++ b/dev-python/trustme/trustme-0.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
diff --git a/dev-python/trustme/trustme-0.6.0.ebuild b/dev-python/trustme/trustme-0.6.0.ebuild
new file mode 100644
index 000000000000..3356406a8b53
--- /dev/null
+++ b/dev-python/trustme/trustme-0.6.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=( python{2_7,3_6,3_7,3_8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
+HOMEPAGE="https://github.com/python-trio/trustme"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' -2 )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' -2 )
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ttfquery/Manifest b/dev-python/ttfquery/Manifest
deleted file mode 100644
index 774cf4c78c31..000000000000
--- a/dev-python/ttfquery/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TTFQuery-1.0.5.tar.gz 17850 BLAKE2B 8545308928c54bf5a0db23878e072c509f64693f8e44888bff5d35fbfc4799c5f8d7094b6fdd2f399c3659dae69415f82186cc36a4ed8058aab1888a8abeef86 SHA512 c5bbdd7cb020dd23f20341d53f400f592654293bd923f64a0d33e269cbd3bc44a97a5cf5bb16485a8978e0d35d729edefbdd6c7d2e51dc65820699bb1df0f60b
-EBUILD ttfquery-1.0.5-r1.ebuild 580 BLAKE2B 16f9cba69402e724ed9855b57d57a85eb1eb877ebf99bff109327f855940ca9cccc605606776913cf781fa4d902b419d83b9334d23bc29e387c058d649a4267a SHA512 c74f7a064384994939455597368da1e7068cbf820b22f8c3c7b1c506422a5c777b9a62f65e5bcd24e016bdcc086d2bb5d7c022478908318ccf607fac5d75901e
-MISC metadata.xml 463 BLAKE2B 21bb3489fd4a53dc57da4a4c09cfd66f6d870eb837c9acc2a1920bb34238b110ffc3cca05c009c3ae3905a25a6d474131874e9ef27a3550acc77fbe1356c7821 SHA512 92e611454eddf73f99c20519773688c2993149078577bfbff7f531bea5053735513b0731645ca6ab6bfe544ee8b7e6a718e1bde7dc7b54113097f48c17cd8d28
diff --git a/dev-python/ttfquery/metadata.xml b/dev-python/ttfquery/metadata.xml
deleted file mode 100644
index 47c6801f1000..000000000000
--- a/dev-python/ttfquery/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>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">TTFQuery</remote-id>
-		<remote-id type="sourceforge">ttfquery</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild b/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
deleted file mode 100644
index 6542cd8c44d9..000000000000
--- a/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-MY_PN="TTFQuery"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Font metadata and glyph outline extraction utility library"
-HOMEPAGE="http://ttfquery.sourceforge.net/ https://pypi.org/project/TTFQuery/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE=""
-
-DEPEND="dev-python/fonttools
-	dev-python/numpy"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
index dc2eebcf3003..912152bee97e 100644
--- a/dev-python/ttystatus/Manifest
+++ b/dev-python/ttystatus/Manifest
@@ -1,3 +1,3 @@
 DIST ttystatus-0.36.tar.gz 30766 BLAKE2B 4fbb298a86472305a01ed7a8a41cbbea3f0e1677c8f5b349e71631d3474a59cbd65d114f55ad64339804ecb97bfc3e745cd93d09bc110c2c32f53404f898ecd8 SHA512 0005d18834eca702e4c96ab85216e3bb06fadf58555641405b2657b9f296b750d1084947d1a39c4e2c0bf0711ff859df06f1e859d6e82af41d2945e980529dcc
-EBUILD ttystatus-0.36.ebuild 552 BLAKE2B 7417376df74181e02aef2d75c06e241cce41cf1c1ab4ca0637f6b03db216906943c49a0cbb8a0266cd6b918bbd73839af582945995679704b453524475d7e77f SHA512 c8b9d81d92c4ed049d2bffe458edd137d6bbbcb380511752af92a13b58dea313ad30704316fbac4e29dbefe529e3472e659cd3f05511dc79adc87384a8bed040
+EBUILD ttystatus-0.36.ebuild 550 BLAKE2B 464f40787e799e639a6a916dca3ec2d68fb6e64b735fe0a63e71c079fce0b156f7657a1b7fa29886db2d631e83fc624cc69f2b690a8578dbbaaf3616c12c7feb SHA512 42db8af37c016f71a6f848a6b768afdb994e2997a12e0ff1fb82135d717ab9d697ac04057b48f87bb918cb3df4f54dee30ab253d75c0b21123f8517824a05b21
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/ttystatus/ttystatus-0.36.ebuild b/dev-python/ttystatus/ttystatus-0.36.ebuild
index 0329dffa93f1..f8e79b5670ba 100644
--- a/dev-python/ttystatus/ttystatus-0.36.ebuild
+++ b/dev-python/ttystatus/ttystatus-0.36.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/dev-python/turbojson/Manifest b/dev-python/turbojson/Manifest
index d978df5b1598..ad230ff369bb 100644
--- a/dev-python/turbojson/Manifest
+++ b/dev-python/turbojson/Manifest
@@ -1,3 +1,3 @@
 DIST TurboJson-1.3.2.tar.gz 6613 BLAKE2B 0ea98ef43b1984b3bf5311fa0a8b7898ff7b3ad9d0b2f6b8da70038e55e7a2052018820c4adf8a7c8b2c36d11bea2b5e3922566c09f91585afe2f45cbfee5ec7 SHA512 5c3a2382f764ad42629b3f992f0fcef61b858a9ade4084b86d96c16efbf398a6ea5f8d04c3cc5618c681fe1a111877aa64777748535e9830495aaf59e53d11b1
-EBUILD turbojson-1.3.2-r1.ebuild 732 BLAKE2B e39588148194b767bfa37c54bf88d54b2eac53a62c5ce7a3d5337f3ac7b503a09bb5554beca1fd1043e5193c9139ec8d8ae734c1e60fd8e0464348e4d5d5fda9 SHA512 17c124b7008caa0980d2a3d959e5933fbc3d88fdb8777e32615cc19ac39541b4188376ea4178e397f7ca59767ebf2ba1fe0441b26ce9ffefdb6d238d9c722309
+EBUILD turbojson-1.3.2-r1.ebuild 724 BLAKE2B 4b100064bfae3c3b4fcb50786f6063affdf694937b287607417d9243cd371cc1a90c8e5e666ea338729a37a66eac56dc799b0eb991a13c4f944571253ba99e6c SHA512 cd75f25515cd592b6ff466ae2ae58d28659d370e3ff48a3038fdb729a0d222fc1b53daf6c2d9285419fd35dc2f9e1165f19682396774a71d8b65a9f1192d8f5f
 MISC metadata.xml 312 BLAKE2B 5e928b3a8ac4e726007e95adc0cb82829621a10bd765f14828254f48fc5af8efd93822f1fd4192da07930749e9882b4737fbd9b6cd68f38d8290a40b8540d085 SHA512 80643b876c5d02c364e0105039a339f8a7b49da7d4fa815b335c04a4e38552d35566941621f12ee6ac1a5b64ceb3df4738e4cf45b66c692fe325cac65e53f195
diff --git a/dev-python/turbojson/turbojson-1.3.2-r1.ebuild b/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
index 6dccc8843721..339e25c7424b 100644
--- a/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
+++ b/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/turbolift/Manifest b/dev-python/turbolift/Manifest
deleted file mode 100644
index 119d4bff7bfd..000000000000
--- a/dev-python/turbolift/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST turbolift-2.1.3.tar.gz 49672 BLAKE2B 5c3f1af7b03a475e92d1c0cf663a5ec048a7e881c3ad21a866cc6620dca8b9b34898568647ca020a4c84bc33963738f94a4438a94b075e01061edc768b39550a SHA512 9132f25cc965f68aba022f51d2f401dc706ffd775a504872f4706b4a59a7c99fd6ab2c41c5909533f08fd3fc81b2fcca5487fd6568ba43c196d35d1de3ccb703
-EBUILD turbolift-2.1.3.ebuild 824 BLAKE2B 02458c767554cd63f5a9ddc6bae3c62d0197881cd02aab4153b022bd52fb776ef07db6c5d165a5d47663efc24f916de6fc829b4730c35ba6498bdc8945647003 SHA512 7e7ce9e9e808706f057ad5706fc0120a6608a5a788fe52c23dab4dd2ef5cd58ffc1a02c21fdb38d9eb1c748f572ddcf2607698b78b71ef822855ba340f42f37c
-MISC metadata.xml 595 BLAKE2B 5affc64eee9ee49200ce21d32d95f04e0971d743a2c6340e5e2e289f829ea9b43d9c648b4c03e9f46146df90c45fb6a5483994ebe523100e4f75964945f9dc82 SHA512 2ae809b6210492f848ca8886a83f110b4acf0efa5ed4172357e996d3bb018bfbf829878756f62907aaa731957c32e405571fb7e05e89103add1cabbefc9ce1f7
diff --git a/dev-python/turbolift/metadata.xml b/dev-python/turbolift/metadata.xml
deleted file mode 100644
index bd0b47ab7ef1..000000000000
--- a/dev-python/turbolift/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    Openstack Swift sync/backup utility
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">turbolift</remote-id>
-    <remote-id type="github">cloudnull/turbolift</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/turbolift/turbolift-2.1.3.ebuild b/dev-python/turbolift/turbolift-2.1.3.ebuild
deleted file mode 100644
index ad4f95a505b8..000000000000
--- a/dev-python/turbolift/turbolift-2.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# tests are not distributed with the release tarball
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="Openstack Swift sync/backup utility"
-HOMEPAGE="https://github.com/cloudnull/turbolift/wiki"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools
-	test? (
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND=">=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cloudlib-0.5.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	${PYTHON} -m unit discover turbolift/tests || die "failed testsuite"
-}
diff --git a/dev-python/tvdb_api/Manifest b/dev-python/tvdb_api/Manifest
index 045665e7f047..6fe0f46ebd4d 100644
--- a/dev-python/tvdb_api/Manifest
+++ b/dev-python/tvdb_api/Manifest
@@ -1,7 +1,7 @@
 DIST tvdb_api-1.10_pre20150406.tar.gz 33758 BLAKE2B 929b9e1326b5665eab29b9361fb25a107c91cb34b8226f071f5ed07490f1f2a305644a00ba5fcfda68e1357f50b7ed52cd842c806d8da3fb00e5094db55a09f8 SHA512 a62680a8e18fa5cb246c0916232aecd06dd5f7381e589690f8fedf5b85a9eac01331a858880f888c14ece53c888ab8d18e7dd65a6665639f5f6f6d335138469d
 DIST tvdb_api-1.9.tar.gz 32429 BLAKE2B 41ffff7c76131db3ff37e35dec8356aec85ca1180927ea468e4f3ae0980df4fce317b0366dd39dd7a219d5078c3a77f0caa94ab359b71f6750ea8d1067bc1112 SHA512 6ce13f47275eb3f37897da1b9bfb2d101184e3797abeec965c170d9b007661c3e0745396bc93bf365d6a1552fb461a2fd7b33777b4a67e58281c8ac3efb788df
 DIST tvdb_api-2.0.tar.gz 32751 BLAKE2B 6228ea0d8e9e679b7a70d6357917537cf8a6e362010ff6d1a212d51919689c656f8dc5cf67c694ddf7b4e2fd5b2fc0674393036c5ac38d8254878559921fe39c SHA512 74b1e036c2c71bff9f3d04bbf670da4069f68152545b09882aeddb5d1ebc873956ed00e8e28f2bd77a72ff97ae5fda23f1cfedd91f87187c31917ee31df17f3b
-EBUILD tvdb_api-1.10_pre20150406-r1.ebuild 526 BLAKE2B 3c59ab522ccaae4a53b201c71a710b7dcb9713ce3c1385f5fc8eb2c6ceb55b23800dd6fc7171190fd89755a030158c6e2e1ef73ddf08b24f837511424936151c SHA512 4b7023b07f2e6f0aba42d5c1bb107c3d837e4ded9e196f80005e53bc03dde8d1bb5e57197a358b8a4313203f1986218e3b2ef69244ac46cf16fc5bfd491c82aa
+EBUILD tvdb_api-1.10_pre20150406-r1.ebuild 522 BLAKE2B 22449fb610c2fc94d0b8f8c123b0a05c8ee55fa766c211c038b5f4b452d799c7e17977f56ef610213ae00ae8aa42ddfa4716b42ad3bf5b2c53384e7880b38ad8 SHA512 7d6a3337a8d99a0e98ce575eba8236c6f5009337e9529f7e7cf71a676903b734ae6e886b8c10fde05ccdc5fd9dc11ffe3b36ea60b612a3f885ac755a4f3bdecd
 EBUILD tvdb_api-1.9.ebuild 446 BLAKE2B 0c0ccf22ed8d50565585005ec136ad1c7c1338388dafba9f0504453a300190c03cb0192eddc3b74918e1cc23050626d714384f61e57df4d6ebb68c02d44b757c SHA512 3c5fa40f31e2b05652f363fe684ec9267d52c65113ee3f77e7e7963a543f1f1e68e986c5734b0b5f9d4d28ff3a86657ebe89431b93f864f78912e3d2b555b14c
-EBUILD tvdb_api-2.0.ebuild 481 BLAKE2B 95e4aac6dca51070e8048d60069943dd0ffab784a942c511c95fe46249014f44830a0cff53272e294548c228c7053d6a342b9da4112dcea55bfc4c9fb345bc46 SHA512 fedfdbf6e002d7bdcae328ca725dce5633997cfa9c716a46d085f245bf70c3acb9fcb1f06a1c20682c52c532af285bd5158f0f0d32dfcfec6612a2b9f5800947
+EBUILD tvdb_api-2.0.ebuild 477 BLAKE2B 7c814bd34162dc8f3c8ebb938b0ac1770b42c43dff8077068704eaefb50924fcd05ff59adea01a4231ef5dc124062fc81cb6f05f2fb438d958564532f0d94025 SHA512 f392e69f59254aee9eae32d14a0b849803bb069c3a4bcdbed0fe2dd7aa0bd977fddf5da98d0c44751583aa4b270087a784ff067e5f745e41c733d862262186c0
 MISC metadata.xml 333 BLAKE2B 37ef6dce06fb7536eb18133f5dbe87b03a4cfcc54669dc7795dbfa9009920c020dc0fbca7d3ff82460e2e05bf3896fcaef8784078a4ab56899e9b7caff9dcb7d SHA512 5cdb8638da8db277b9228fd2ac53bb0fa4dd181da86b9aa3d9180e55c2d13ae494ab78af1168271158ce10469204028197bffac2e9b11afb48e0c71a15d583f4
diff --git a/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild b/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild
index 4b918db8656f..004cf95b6b19 100644
--- a/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild
+++ b/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python interface to thetvdb.com API"
diff --git a/dev-python/tvdb_api/tvdb_api-2.0.ebuild b/dev-python/tvdb_api/tvdb_api-2.0.ebuild
index df8357e712a9..73fcebaaec37 100644
--- a/dev-python/tvdb_api/tvdb_api-2.0.ebuild
+++ b/dev-python/tvdb_api/tvdb_api-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python interface to thetvdb.com API"
diff --git a/dev-python/tweepy/Manifest b/dev-python/tweepy/Manifest
index d3332d8248ff..10f783f3e5a6 100644
--- a/dev-python/tweepy/Manifest
+++ b/dev-python/tweepy/Manifest
@@ -1,5 +1,5 @@
 DIST tweepy-2.3.tar.gz 52352 BLAKE2B 6853f133e73d8a97d5a2326ef6c877a527fad87ba9767e6ee218efcb84f6b8332d4f66b044b572987e71d4d9dd8a7b743c7976cfa9947101f0df5c6f9de5d1c4 SHA512 23317a507174e108cf8d13232aa467d892aba1789ee4f610eef4f5503b045841b5c85e8ae63ddcfd1e07178afbf3bf9f4a9fed939426411a8566f1c949b9b831
 DIST tweepy-3.5.0.tar.gz 24348 BLAKE2B ea9d96abe4f364e1f77a97ce28fcd4fca3224ab307698e59a834c20becfa53ab68851e638946085431ef2edc1a4e3bf4f42a113c2ac41561930b7f4638e5d6c4 SHA512 cf87f0b7dea0ca444c17a3fdb9c2ebef814683c110511876c1997630b3202393276d3dd2de3b37fc21eb7a15382d22cc886109bda5a11b3d06a08081704c8c2a
-EBUILD tweepy-2.3.ebuild 1144 BLAKE2B 108f61f6a1a81212482fe7283c72c84c1cbb5e8abbe259831e97a985ad48aebce45bb42bb12e0ad3034cfae28d7e15b0eafb4831abbe9335928162872a58ba10 SHA512 9a1d6835ceb7e476d07cf98aee251701616d0de197b9c79822ff830cf457edda0e209b9e81af03aac875f001fe1d6f44b180d78d29f3b2ff012963132806cbbb
-EBUILD tweepy-3.5.0.ebuild 1219 BLAKE2B 2432b0c4c1ebb9552b6b9cd3518a92b4385a91edf61203a0f8b90a19789598846940e105fd4d2b52cc24a9f16b9fb9a868aa3e80def2276e984767eaa4953175 SHA512 21750ca74f8f31437390d63188058c1dfe6b8e8c1ec0e50d2147ccb132f8b1e3037794e2a30170f1fa21c2fa24305f8f75c56fcb057b9d610e442834fae6af5b
+EBUILD tweepy-2.3.ebuild 1136 BLAKE2B fa335da13355d7c4bfe46543536cfd84d5e2b64dc7416359d8539ea80d93d9bd13f85d44d24fd81e7378982394eac480085b397bec57a5fae5686613bd3bb7bd SHA512 1cfae88261e6af78b8488f01f3c48f848289aabc63661c1136ad6f301d698b52c48f9b1901d0f62770e4536dba931801889e26e05f47bfba29f0737a2e0b4202
+EBUILD tweepy-3.5.0.ebuild 1215 BLAKE2B d8cda39af7587ecfa91991dccdbad50bb828e256f50078acd109f55222a551f47b8af7f6d9352cf7ca5a9fbe42a49d1a394f7fc49758d58450be2703dbf23def SHA512 2efde6202ceb44ca6d0d2dc5247c2262c58bb0f863ad569cffdbb749ce0d9f6dad7390e4bfe53f7f94cfc73c5c3e9eec7bf5470ac905263fb202d668f60c02a1
 MISC metadata.xml 374 BLAKE2B 54949ade0005d71f03bcbf3c84676c9a8b6b10420c8b28ac1e2e27b772b4cc685d3d88d9fce150c3f8a46b137ee4c3441cb4eb1925487f4e42858b73b2e1596e SHA512 e2785876cc350cb7130905648a4f9013fc79c286697c6fdfac203678ff79217383fad2c4d4d2caa42107d83c6cc29ae0d149acea16d74aab804a3039a3e143fe
diff --git a/dev-python/tweepy/tweepy-2.3.ebuild b/dev-python/tweepy/tweepy-2.3.ebuild
index d348cf079cc8..810587b01250 100644
--- a/dev-python/tweepy/tweepy-2.3.ebuild
+++ b/dev-python/tweepy/tweepy-2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1 vcs-snapshot
diff --git a/dev-python/tweepy/tweepy-3.5.0.ebuild b/dev-python/tweepy/tweepy-3.5.0.ebuild
index cbcad4d6ebb5..008e2c23fb34 100644
--- a/dev-python/tweepy/tweepy-3.5.0.ebuild
+++ b/dev-python/tweepy/tweepy-3.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 018cc2b9d44a..e9504a7ad7a4 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -5,8 +5,8 @@ DIST twine-1.11.0.tar.gz 55301 BLAKE2B 88e88bc88a6dc8320064b3e296d85f1614d1ecf16
 DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
 DIST twine-3.0.0.tar.gz 138502 BLAKE2B 80cc475704979030435505103e45cfd051d2e3979e6fd9d4ad33fdbb2644bdebf789c504491f22a161f346295222287114ab68034560360f08a1beadefb20ac0 SHA512 1f5577c74c47618ae07672b53633110a5ecb486d25046cb87f36cbf5974b679714f962803b9dc6e970c57d8f2542b323e11437e76effe7172511557b56df5f12
 DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd19438d41fcbb154a98b854c669740b533a28cd79501933f0cef57767e63a83f135fcdbc196df8865cfc4d8a SHA512 446b36a1816db6131e279bda26e62c58f9659d86178d498ebb9f7c5287b61cf969e625debe4b4cb1e32832e0eecbcedcf4913319ae0bf7eb287f56e550d33ed9
-EBUILD twine-1.11.0.ebuild 1180 BLAKE2B 667e16f7b2f44a2ce42a1aaccf22741869b89d4733d0862eb38774d9719155ea794058d0b397f91edc944361f5094860c220e97893ff006980b7ca6640c9e905 SHA512 d73a7bd8a14364455974046438a44b0e83ce110b5c97d08483afa37882dae6263631b0b230528f493ac75404a05a699c0b52d0c268e8ee8786f3322724941219
-EBUILD twine-1.15.0.ebuild 1322 BLAKE2B 17fefac04daad1a0c03b292818d8c409afd77033af28b7f01adb89107d60f10b09732b98ddd7e82343141d7e692e2d0598821fc0d7922503fb83636917767d8d SHA512 f12bfca9375db7c8b82b6e2dfd21baf0ebcf5ba53f6439bee91c8d4d128e87e90a215b63127504c925e54068ba1f420f11139bf75b02be5776481cbd882bf38d
+EBUILD twine-1.11.0.ebuild 1176 BLAKE2B 483675af4fdd10de2677941e2b7f488fe23eb6fdc62d325793cc5ac281b5670fb74e588073924a6b86fb65777220b54e65d8b5360b46cdc675eb57ce3dfda7ac SHA512 5405f4ecaf9735a4e1e2ea2c3451234bdb9484c980a414924a9c9f2e373754ff56a699bbe6ec1bfd308486dfdc2d5e61aafd09cb06bca260af3bffd131c8b4e8
+EBUILD twine-1.15.0.ebuild 1317 BLAKE2B 0e6ac22c984e40a8f5bdb48928347850eb57adaff59e301eda38d93e9f72857df6923f180b2cab1bff3e6e0cc15759a272d9d27cb061bd1490153bf376b5c5f6 SHA512 2ba33364aadf813704a9212e803f2b99c25a8fd76e38530954ec3606ce4d43f50938a75a04ba7dde6029ab8b974b0a6caa5b3610b70468cf363ea7557c00a9e3
 EBUILD twine-3.0.0.ebuild 1757 BLAKE2B 783da90be51a5d9ef37493e137725b169df848e9271d368c39c52f34ac2f444bde7a81bac9cb9e2a0f7617426caf875baa60467e63567472f257ac59b65a1b20 SHA512 31c21078d3c7bac76ba3f6065953de708991890a401eef990835905cdc9fec9be56bef8eb9d2bfab22087d5731c89a342747a63d7e3142cb50b9a46d8754876b
 EBUILD twine-3.1.1.ebuild 1811 BLAKE2B 112908686d07e9cc9f4234cb33b7ce4725982310c290667c2bb942edf3c0fb1c191a93cd9efa5c483408a915b60fdc892d2491a3a08dc3a63c80b6a30b6a9463 SHA512 0e2a17da3847c03fff802cb11ff8475bd6330880f8bea480cef43e8bab3ad8d7d87c582e4866691dd6c00f389e72c50d9fd7e60b6aa47346020bd63310df9033
 MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
diff --git a/dev-python/twine/twine-1.11.0.ebuild b/dev-python/twine/twine-1.11.0.ebuild
index b94c9a70e0d6..2544b1ade11c 100644
--- a/dev-python/twine/twine-1.11.0.ebuild
+++ b/dev-python/twine/twine-1.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
index cbfaa18a3514..5a95c421b744 100644
--- a/dev-python/twine/twine-1.15.0.ebuild
+++ b/dev-python/twine/twine-1.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index f5a53c5f968e..afd1c184deee 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -15,10 +15,10 @@ DIST Twisted-18.4.0.tar.bz2 3037019 BLAKE2B 6fc32f7591493ccc4fe03233307b566899b8
 DIST Twisted-18.7.0.tar.bz2 3063847 BLAKE2B a71e7f0f2888eab2849b90405350194091731730e8507172744212b9af73ba440a0c21d5c5a45ae987752c813c07c4dbb06e0e27a8c8e436d7ea6f7c3026137e SHA512 feefa578bc1787648df07e4a53bd6fe29b43c4357472e4fba37526f075be9263e8c671b6781ce6ad3569c1b1666cb702efbee903f597714a749971695018f826
 DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-16.6.0-r3.ebuild 5784 BLAKE2B d3f1f2ee5622a18d75829f5b9d520a0b70b9e3f3b5c174766c4323feb1b56f9cf7c4198291ee8dc9b520b3b30757f7151089a12f544a46a8567bd5e227842ff6 SHA512 f7695142c52494d170cee705a831ca0b662ae37769de1221b265bcb9c91148dd6917b59dd132f4fceeb64a3077b5dee226ac90e1ee081e69c17a9ccb9b1fb9e7
-EBUILD twisted-17.1.0-r2.ebuild 5810 BLAKE2B 5b43ac83f60619fed176c1b24015c93d469c426b3c211c644a8551c9881ade4a0458ee0e4c0eb710a4b81ae994c9c16069638f4c6962cfdca958b0b0422ecdea SHA512 d45638d9feebad85e9cfd8e99fe5f7684a436bb400799f2cb554aeb9cef5e68a7eb20b94689e608aa5cca9c8b093be0bc8a82b18f394f43a6bd0ca0d4c513627
-EBUILD twisted-17.9.0.ebuild 6087 BLAKE2B bb007603512b4fefaf37bcde8b1d8556c4d5526cbaabd7e0acb50c60394f2b710641591295f9ad7d060f6b2e98f98facca6f949305c3fc997a6c54e3572d4de8 SHA512 dac6071d6fd1f7cb51720ea6a2993d95d364016e30f52a8c5dd1e60d95ec41e04881b742d61996a5a0c64e25d31597822b8abcabf3f2d3f6d8557ee741d66240
-EBUILD twisted-18.4.0.ebuild 5955 BLAKE2B 21119b158c09984358f3826c85ffcbe2a699f6660a13e544dc9f9eba81a9874c9fffa186937b7e50b7561c9d0848df295f7e2d7096310c1a65c8d8fc9800476a SHA512 c4aca8e6bfd49a9fde9ce074e936025dde439b5357351a6f55cd11f9baf7e447bdd37a899101dc1f8d6669e68b8b115b26bd5c346266965e3ef43fea180179e6
-EBUILD twisted-18.7.0.ebuild 6043 BLAKE2B a8dbab598b6c87d07e9f4e7ff882b39fe5d778d200a3afd933a92d1557bff167b31949ccef881eab904fa0b9c9255e8d87ca226cd625def2d1f31aa89ca0ddc2 SHA512 70888fddb19a79cc77bae3e1db3dda4439a36e10a5b1216630205085b1930bda46d05cb7ace649f35c814f3e9c0280be0b46ff84c6a4ac09ee523b4d492d17b0
-EBUILD twisted-19.10.0.ebuild 5200 BLAKE2B 40361055a4e2cb82579eb65afcb0a9ff4d53ac69ab3421515e5c188d9fed0ff4b1cbd73214e2eb29e68e0c0146a2e246948341ec8b8b33b217c3560fdc05be36 SHA512 a7de1f0964404a308f40b92ca6a55d26415a563d840ac4840c2504c0827f2bec29ef4527f268c1fd9d73f3ae7f27951052cc20c34c779f0151ff03d0885a2437
+EBUILD twisted-16.6.0-r3.ebuild 5780 BLAKE2B c40ba84907c0f150c63b27043f4d901b382a0bd2545d4b93368677d458bc3ed4b27146e9b3a89ff034afcaafe0ed0b858101f62ee4c99ba641247d83dbd6af79 SHA512 067865da1b4c3c59188cbd3edadf87985d68382ebd1a28457b391101e27efd6da11d03755e5d58bfa2650605933718710b6096053decf2b9c0fce8f7a0abf8d7
+EBUILD twisted-17.1.0-r2.ebuild 5806 BLAKE2B 4f226dc0edf4c316d641fbcf9d0686ea5e432c7c9dd1ed9798e121d5194c7ca3479a793286d08e3b6f6f4d16152ddb82bb6e3d1a9184841c34fef0cda964da50 SHA512 d486b29ff87b1c3fb839bc1d9b1e52b6ca73a5070fd7a7ad2562575d402b18f5e565888e35d772db7b276c7db9d15e169ea3d535af8fbb26033e5e257513090d
+EBUILD twisted-17.9.0.ebuild 6083 BLAKE2B 4ed1d5d980a8bc92ef97d74ad26454bd00bf9107c8743e73984e5d76906c20aae55236089ca74e73758e137e820965c8500c951b835a4503d88b816d66c25dae SHA512 784f4db11850b14bc44e3411bef33a9822a2e9a4a99f354c31842f71734723148a0707be4bb04cf3a7a908aaccd0a3de5e6d0f6a8d5cf3829a1f4c4b785a5414
+EBUILD twisted-18.4.0.ebuild 5951 BLAKE2B c964dfc21f41e6222227e8ce5e5901d1b2fffbdcedbb92eb3cc0365de7e032f8b07e823dbf2af0287f4e6cb09f745fee061eb309d019c9605edb87c4d1d612df SHA512 c7e25e4d8c59c4f8f7264074ea23e58214cd797476b424b51eebe15b94f742d27600783e5bc4d56d43aea385b55df8b07f9e27f7020e0d3667585365eacb5260
+EBUILD twisted-18.7.0.ebuild 6041 BLAKE2B f94f570668f9534e31748aca1b247ee457db073909d770e6b9e17e2a67c4fc90ba1ea8220d7345cf6153db97a44821f671d80c7275cfcc4886292ac54042cc9f SHA512 278163dd1115c11f45b02979242e8d6d8844c3d15e933ff2c6be1d8f80e7745a44d37be477f32a928d551e106e298209324526b010f09e0805ab436f11b5c437
+EBUILD twisted-19.10.0.ebuild 5205 BLAKE2B 94ff2052c616758ca87859c509eb10676ec6a5d82bf72e1bb13eb011697234342a7bb3a1025088a3acfbb2273652acfc81cf57ed421c41101af54b1c52d72327 SHA512 7d52e4bf7b007d3d8bbb4026fcd8794ecdb334dd739e229aeba85b7eda27e70b0b2420dc7ec5670d679876b256cf41944b5464d4a97753c055f52d0bae66b931
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-16.6.0-r3.ebuild b/dev-python/twisted/twisted-16.6.0-r3.ebuild
index 315263b8afbf..dfbb0b376be4 100644
--- a/dev-python/twisted/twisted-16.6.0-r3.ebuild
+++ b/dev-python/twisted/twisted-16.6.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 PYTHON_REQ_USE="threads(+)"
 
 inherit eutils flag-o-matic distutils-r1 versionator
diff --git a/dev-python/twisted/twisted-17.1.0-r2.ebuild b/dev-python/twisted/twisted-17.1.0-r2.ebuild
index 44a1434f4557..ab705a4c5a0c 100644
--- a/dev-python/twisted/twisted-17.1.0-r2.ebuild
+++ b/dev-python/twisted/twisted-17.1.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 PYTHON_REQ_USE="threads(+)"
 
 inherit eutils flag-o-matic distutils-r1 versionator
diff --git a/dev-python/twisted/twisted-17.9.0.ebuild b/dev-python/twisted/twisted-17.9.0.ebuild
index d53fe68b371b..6ac90e335a4a 100644
--- a/dev-python/twisted/twisted-17.9.0.ebuild
+++ b/dev-python/twisted/twisted-17.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 PYTHON_REQ_USE="threads(+)"
 
 inherit eutils flag-o-matic distutils-r1 versionator
diff --git a/dev-python/twisted/twisted-18.4.0.ebuild b/dev-python/twisted/twisted-18.4.0.ebuild
index 02a73d8f6220..cd49b1a30231 100644
--- a/dev-python/twisted/twisted-18.4.0.ebuild
+++ b/dev-python/twisted/twisted-18.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/twisted/twisted-18.7.0.ebuild b/dev-python/twisted/twisted-18.7.0.ebuild
index fcd1a76f41a3..0e4b0a4607d4 100644
--- a/dev-python/twisted/twisted-18.7.0.ebuild
+++ b/dev-python/twisted/twisted-18.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index aa4f3e91da15..06cd0b945fd5 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -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="amd64 ~arm arm64 ~mips ~s390 ~sh ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~mips ~s390 ~sh ~sparc ~amd64-linux ~x86-linux"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/twitter/Manifest b/dev-python/twitter/Manifest
index 12be6c9633bc..a45d0e6b0e3d 100644
--- a/dev-python/twitter/Manifest
+++ b/dev-python/twitter/Manifest
@@ -1,3 +1,3 @@
 DIST twitter-1.18.0.tar.gz 47695 BLAKE2B 2604370a303c479d371dd0c5b6c1855b990c38cf0d9ef710c740ae69740d0cfddb2a18d465deaca2146e43debea0175f9e444c0a7bb5931a95f9124d80237ae6 SHA512 dda752b194efe88df88a2c9e2279cd3045a36c466f05493727a73aaaa74ca99873c1dc1742491f2f4092eff5afb9ad7680a779f16041d9c3dae7c6eea013ea48
-EBUILD twitter-1.18.0.ebuild 441 BLAKE2B fc32e8feff79c9ae5acb30bedd41d46a4e02330df1ff876434b8ddf20e8a4b30480c7f8f5b4cc2023f226155f93e1bdbf3eeedfdaf35fb9b25a45a9a9a453db7 SHA512 6d8fce07284ea47d1298a1ada27e4605bc0eadfbaf47e59e94a9d076db536798d2fafd580dc96e3e6d0e6920fbe383cd320e7682ac644d33479d39a4d6b82767
+EBUILD twitter-1.18.0.ebuild 432 BLAKE2B f45381e979495eef260ef72f2f88723999e9514afeadf4af0c35f04d9d48e58415b1de19412fa026b7ce1d85094253e95a83817ae2c798b37784ac3b7287c3c8 SHA512 7e3296ba263ae124e635c786453e34fa4f649bb52a229068b9c94f1c600853f97b9c37123c60d01612e0f13f4abd004f7700b2e296c816a5c35305c2cd705463
 MISC metadata.xml 430 BLAKE2B 2e81a109681748c54ff8adabf59b7505651b87fd1e7bb41c0582eef0633dac9276961d833b8bdb3117683eab4483c17e06b61b82e82a44770c9ce408e8241850 SHA512 a09ea3d4855ee4999f5cd2b182066044cc578abf5a68bf6dc5c0c6fb2e3913aae825d2a5a174501957dbcd1fc92d047f4997ae067fbea6d2f674ed1f785f820a
diff --git a/dev-python/twitter/twitter-1.18.0.ebuild b/dev-python/twitter/twitter-1.18.0.ebuild
index f631475d8cfe..a6c5526e47a4 100644
--- a/dev-python/twitter/twitter-1.18.0.ebuild
+++ b/dev-python/twitter/twitter-1.18.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/twython/Manifest b/dev-python/twython/Manifest
index c97e1e76fc41..0113f6a30ed5 100644
--- a/dev-python/twython/Manifest
+++ b/dev-python/twython/Manifest
@@ -1,5 +1,5 @@
 DIST twython-3.3.0.tar.gz 34164 BLAKE2B 82320b4fc787c97a3b1f773fdd3d5c0c636e6062eb630cc7d78625f45fb8478789e4acc3c9a7ebf600d7abb591bb6113e167a11eaa7b6afebb419652f1d9833f SHA512 888f37c37f39c603b08605d2e209afc329e079c405adbe3a03fde4dab2b76b07d2badf1956d255d4b7ff0bf2a4c308b20f2a3333a7ccd0e7b9c046e9172b1d5f
 DIST twython-3.6.0.tar.gz 36268 BLAKE2B 24305d2221cf7856f5e51bc3ec0fb4c342a8ce19c248ccc680bb1847e20a262f15399b4fe904852a159fc83a85d5617bd57c3ea9de064a5a25069175ae02178d SHA512 b99ecb244598a489578e63cec8a470daca7efe019f6a5277a0fda70b3c61ba25b56688b0a383337ed1c46576e551c244da82cd808710c4b9bb8ba91c6bc29be1
-EBUILD twython-3.3.0.ebuild 522 BLAKE2B 9df2a92187f0b3d63d06631b8f29c439494545e6004712be8d0b23458d7c836ca5e25b292ebf7dcc01eb8c97216fd754c7299d36f93a76ce9043d61c0719b5f5 SHA512 95f5cb3696b4c9e2019f8d7e666708f215c87d87ee7c93dfc2e19b6aa038cf6c46cc1c177f5e52eb25ee0dbfde8bdcd0336411fbfb0fa2f2dded7f7b466f8837
-EBUILD twython-3.6.0.ebuild 524 BLAKE2B 7bfe39b4d5b7da06dfaca9024016fdebc91f812f4da6fa9b63cd2a034da3a3ed9c73461ec380b30c0dd741dd359faf6b29fb539b1e7e871525ba253bbd3c8526 SHA512 7bb84adb1a10eca9ba9ae5cb4732b04d4bfc5a1b0415f685c30bcda818e1dccb19c446594e12e3ae276757f0e6143f55c285274f3abd564cfae6950d858dead2
+EBUILD twython-3.3.0.ebuild 512 BLAKE2B 6dedd390a8a29ca97ced319b4791baf000e40cf447c773d651cea04009799238c63af060a257c5347538506286b75e8056a4ef74500920ee7b579c816c136610 SHA512 361f04048d38f73c01daaa5031e2f0431b7f9a69e0d202bc8536324d199d56f7c8cfca210e8c2ca539003bc4f815669f6dce20425b4c9bdc5d6de343263f3c08
+EBUILD twython-3.6.0.ebuild 514 BLAKE2B d7f27d452cfd2730b67f897dbb1b9716fdb2392f40eb5cc2f8c7d5c35dea5c9de8135df4653c1e88843a7e68415fea7eeea8793e93c4e35f6cfd39ebf0942197 SHA512 7acefb1a01c1d71a701cdec24fe12addbdff2a3f1d66e8375f7950145a897349308333aca3803b09f0c908bb17ffd063788cda385b393f49af10a148b25d11a1
 MISC metadata.xml 381 BLAKE2B 8c4300189076c3f5cb8498a4aae6ce79751ccc3b51295ac6c75b8b290f71cc9f0aea946a7d7c4e75434372459aedcf7d0286c31039221c06e48b945904e35814 SHA512 6ba06a2be42b96f85609cc2a10637ff911228a8f0a5b5fa1debc3d4c6ba6d9e57462f09cdcb96e12f75544fd3a161d5e3ecb5a89e8f50fa152dc7ccc795048f6
diff --git a/dev-python/twython/twython-3.3.0.ebuild b/dev-python/twython/twython-3.3.0.ebuild
index adf9981d1815..cda1f7b4a7ff 100644
--- a/dev-python/twython/twython-3.3.0.ebuild
+++ b/dev-python/twython/twython-3.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/twython/twython-3.6.0.ebuild b/dev-python/twython/twython-3.6.0.ebuild
index 62c78a6f8ea7..ce37c5a7b43e 100644
--- a/dev-python/twython/twython-3.6.0.ebuild
+++ b/dev-python/twython/twython-3.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/txAMQP/Manifest b/dev-python/txAMQP/Manifest
index b0052a7447b6..f1fcf95e2ed6 100644
--- a/dev-python/txAMQP/Manifest
+++ b/dev-python/txAMQP/Manifest
@@ -3,5 +3,5 @@ DIST txamqp-0.7.0.tar.gz 117964 BLAKE2B 0ad4c0e9606b6a333ee55f8717d8ead587e59802
 DIST txamqp-0.8.2.tar.gz 118560 BLAKE2B 6e60cc0785462b92d046a620cc09eda8b7783bd09186a60299eba11c8f6f5780fc38b094ea974e4f1e443d3d30ee1428f30ad25fdb43554d25db17f36d323527 SHA512 4a5e468482433e684dc690abddeba3e0a6c77630055afe44487de72feecad9c750d179c43dee4e781d09c9c21259cecd615dc9f6eaa7d9ff7ca0796248ad5a02
 EBUILD txAMQP-0.6.2.ebuild 515 BLAKE2B 9b305128a5cd4338a05a614015af3789f22a7a292f8e5da3cbf3a07f6882879e176c8f077bc35603a8eb806684cb1ef6074ef8defb74e512fe475ca4b445c270 SHA512 f1c5418b953c91d1f6ee56d51d9e07e2c013e54e5fb463e8d2b35cfdd06ae82bda5d4415273d5c11f53bae1b42b531e549097d922b20a5c5dc1a7fddc0f1036f
 EBUILD txAMQP-0.7.0.ebuild 1333 BLAKE2B c644f85fedc7edc8d3c643fb744cef4776694dffa44467223758163c6d9b2dd22bd196b15895deb52e0525c856349260d18d4a6bb3bf95a6e8e442c7714b54ce SHA512 d92469eb0a1415bc70f0d8eb3fd5116b2315bd2b0bfb392acb7e0a0f69278492157d9f6b56002a69d45f9a33ea68de78d9a2143e220402e9036669a0c678a8b0
-EBUILD txAMQP-0.8.2.ebuild 1432 BLAKE2B b30a45d777a78d91fc409b87d03215dff916643b57c4b5104b32f00c9c4d4758ab2a771dacc6082bb741496459177b4efa840da5ef6d13ba27493d74af2f56e9 SHA512 8f9c9273416fbf597768c29897c27f511e4ca3c80fdceb230fd586a5214f88ec07428cb5fee785e4102aa7ecfd3508209df216cff22430ac4bd82e39292a69ff
+EBUILD txAMQP-0.8.2.ebuild 1428 BLAKE2B 0609764434c8945435ae872aa514f4744eabe79b0b8ab23823e2f82174dab20dfbbab2eb5a14f6fee9f8ea38942adf0cc5c4004a069b23fe9ba03aa761365516 SHA512 4658da0af7902366f43a8b56e682a384cd4eb83ae2ec2c112acf3332fdcd95b2f375112115c99d48405b159d7b16abf4a64bbe41f30ddca9231c7ed647fa7858
 MISC metadata.xml 423 BLAKE2B 507dec1a447659fd4b519d029b63840460fcf93e9c5cc1d97e7eb0ae1278488c7f4dfaeabe53510da3c07cd079ca9e083a39586ba8e0b99a4e54e44efc27d3e5 SHA512 e80129432dd18c5d4e08d25d560a7144b6589feffe3c0bb6dae249868932fbd8290426531140bd4b0d124b1b06d198527d1a225cf454454f195a20699482a09d
diff --git a/dev-python/txAMQP/txAMQP-0.8.2.ebuild b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
index c809ae56cab5..45c57a24d486 100644
--- a/dev-python/txAMQP/txAMQP-0.8.2.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index 8b79a20aff8a..868c3d5a52c9 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -3,6 +3,6 @@ AUX txaio-2.7.1.f._result.patch 1140 BLAKE2B 675ffec2a0d4d9bb312492603765e79ddab
 AUX util.py 977 BLAKE2B ced53147ac1b8153d0b891b07514cee5692372bb630797d172c5b7daa3cb5f20b88935a2c9dcd0784968edda8586a00ea69552e72ffd04647ce4ef96928059da SHA512 a82754ff4b81cdacd7010cb30065ae1a3408b2ed6e8a47021a2c7066adb614a87cc3d70b7980f10b9a6b063f4087ee44c5df2adab0d23ce90c1beb1368b4a498
 DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a53c322444a95651f4dbb502443bdcc1d0da0ba5db8f9a832ad90b3c6dea06ca688d7120857854d3eb7c17e SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
-EBUILD txaio-2.7.1.ebuild 1837 BLAKE2B 55354b23d1eb52ff1f2bb7926d49de553ff34c991702e088770299337aaafc856acd4ab03caa7e2b76b95c55ed145b671e739d267361efe8fc34721cea50f83f SHA512 5a65dfedf137d3c4e936d9c67f178f8bfd6a3476118f0a2b41ad2ee637f901bf733e8a149de8ed47e40be4fbfc27898d4bd9ed07c363947ba6d12808bf5de2ff
-EBUILD txaio-2.9.0.ebuild 1464 BLAKE2B b6e8bd964f76ca572072a59ec33c3b3cef68d05b11822716cb97d4176a33b3f9bf7f67c7b8e8527fbbd9a96df0840b21f46d8488b3ad49749ccea6dc61bbd5a9 SHA512 23673e033da35a4e214c61c456048f4a4742f7610e70af5d48fc5764a66414a2ce05fd7912eee146f4c0e35e1db165cfcfb244bd88783c1a8bab986b5de6eab7
+EBUILD txaio-2.7.1.ebuild 1833 BLAKE2B 4320d109cb8b011df69eb5e90211dbb9a4dbc1d19378edc18bd5bd0fed2994001df0097a4b518bfbc69b3f375118565cf020100b8dafd398d723895e1c2912db SHA512 c266bb5a8f95f2c9348bf93438d3cd9fb17958fdcab780fcc08f9530bdc3df290b937da1ab747cca5968d4af6daae1ff9dc9812e5a0e9fdbbc364043b31eb8be
+EBUILD txaio-2.9.0.ebuild 1460 BLAKE2B f338860b5151589b7571a1f340f366959600aa857d4ee2e4d91e2da2680c2050d7b0294cd9c710aeb2fe1951c188e59e5446dd10dc85d43aeac2621bc465a93b SHA512 883cad1cf0919f53cddb5b6cb2b6b47d7afef47370a013638f786d81b1b6a864d903e8ab1c8e0fea9b2d383052354ebb11ceb578cc6e0414d65b28fbbcce3754
 MISC metadata.xml 487 BLAKE2B e04a40627282564f381f0070344ba6e2a08e572121e150b5775239dacf22212fb273253dae6ad19ba2cea7f15e84c7f92c6d0671353b2d159b9e7f40d3415914 SHA512 d7eb59861e36e29555d46c3a65814428e64473abff01b6d5489b7f4419f535c991a443345058a8f618574019d5581d3df94fc0339c3a53d4c3147f5e11ca3a11
diff --git a/dev-python/txaio/txaio-2.7.1.ebuild b/dev-python/txaio/txaio-2.7.1.ebuild
index a78e8f899d97..2557f0bbb7a9 100644
--- a/dev-python/txaio/txaio-2.7.1.ebuild
+++ b/dev-python/txaio/txaio-2.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index 4afc3b046889..6955208096ca 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/txgithub/Manifest b/dev-python/txgithub/Manifest
index 6ca05527ce65..bb1ca969f09e 100644
--- a/dev-python/txgithub/Manifest
+++ b/dev-python/txgithub/Manifest
@@ -1,3 +1,3 @@
 DIST txgithub-15.0.0.tar.gz 9871 BLAKE2B a5105132274cb878a0723cabebc17b4b6694d86e02325f6f29285b8bf939eb94ffa713283732634fbc0ea002490b05e7686adc6f98016e0c52300953b25d7f9d SHA512 40449089c7c82e901f738935e915a2a6e250600f46ceea7011ef48357851513dccd0fe0f45539cff6de8a45acfe3e34082156e2b70e54dec695633be01d03510
-EBUILD txgithub-15.0.0-r1.ebuild 834 BLAKE2B f967e0f8d2f1b3935b5d080687375097c29e15a2c125e2e2988e236fac8f9dde228d1fc180e63c08be69140eeb2a07ec201378cdc187126b6a07ee9a75328217 SHA512 fb2dc3b633b88c1f82397b93d7fc5d4d5a00b3feb3d53302ae9aef6da466dd7dd6aed0e88c875cd5ec6316540f73e7cb3cf0518015f38ac894a16c010446c453
+EBUILD txgithub-15.0.0-r1.ebuild 830 BLAKE2B 124a07f43ed9f9fa83bb5d5670a2e9521c973ee65504729866732a8761ebed417bf325702076499c66cf8a889cdeb042646ab20427f5dc0f8e4a9421f542d0fb SHA512 0819ca9a4b148669eb64a0b507fd8a0b8f61df738bc3e69adc65784d9790632d8515d2856a9f4b940561780aa734c6c08443857076fe71b8a9e0650ac8fefdbe
 MISC metadata.xml 581 BLAKE2B 83b9dc351444c0d4507ec265bf1cd98e84078aa14d4eae96874ed66893959a9a7959e1f20ba9f30da1f1ec91022786ff4e3f64c323809bf76be53513923f8675 SHA512 b6b326af1ed6eeb7a87fb3ef5865649045a1c69c353a836388b4fa4822d9a28f4bf8406f70667d1e4aa65f17898ff06e07374591e3772a12d46a5867be8f4e94
diff --git a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
index 7c5d187e20b1..b35c7eb58d1d 100644
--- a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
+++ b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/txrequests/Manifest b/dev-python/txrequests/Manifest
index 2adc68d0f54c..6508b62e788f 100644
--- a/dev-python/txrequests/Manifest
+++ b/dev-python/txrequests/Manifest
@@ -1,3 +1,3 @@
 DIST txrequests-0.9.5.tar.gz 5265 BLAKE2B e5e3cf66abc394ae5c457b0d5144fdd1d09af5fce651f888bd44f0e48d6d1386fdfd2ca1d350ba1abc856102d051270867a2da96b781fbacf53de01f80158f3d SHA512 e9f527eb2fed0038d7e68b5bd74d0a0e58a1d7cc3e181068423dce871ff10b2d5f1ae92e44248e75b4ad8d44b32366ee9eb6cf8fdd114a562baa6b35fab6eb7b
-EBUILD txrequests-0.9.5-r1.ebuild 547 BLAKE2B 1d415126bcdf8d1d9199bb1b1afdb40fd749fbfd8c2403eb88a3817cc072f63a474bbb3ff097c4261c4ecbbaece6fa20d90c6805cdf073b19698e73f823ad9db SHA512 7b389e3f985f1c712849ce2cc4f28d8785a66f996ca03a1ad19bd36c581d3f726a5e5545bfe58cc648faf8c2830d20078ccf2f82303509d381af2dedc944d977
+EBUILD txrequests-0.9.5-r1.ebuild 543 BLAKE2B 9714b0386dadadcc798431b99d3d44549d9b33cc8af10ed0796cf9bc43e4e36efe686b56817de368bf28df6869eeae8f0c67d097501885e36f43d4f0181494c9 SHA512 61680d98af8715deb59791aa1ecbb90b9aaaded0c76aae01ddd1d7dba692472ab100eb7955cd0b18f5090edd16bf20c1050dc92f084edcc70e6cb1a369a88641
 MISC metadata.xml 711 BLAKE2B 9f4ed9f02c903a57b4eed3d7f97d13b85d7e76f8027fcf7aedb389b319703d88ca98faa6c1c8625a42fa40f9adacfe6583e53c953603345b5c0075409de440d3 SHA512 154b6d2fbd2aad94d890a6e86509cfe5d12a2a68e2ea7a10bdf63469193400c398a0b3b1f65fd7ca122375cbfc491555a7e2f705df2345d93331e3549c032fed
diff --git a/dev-python/txrequests/txrequests-0.9.5-r1.ebuild b/dev-python/txrequests/txrequests-0.9.5-r1.ebuild
index baefcd14e6f0..110f786d4735 100644
--- a/dev-python/txrequests/txrequests-0.9.5-r1.ebuild
+++ b/dev-python/txrequests/txrequests-0.9.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6})
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest
index 65cdaa7c8f82..d7d43bbf4da0 100644
--- a/dev-python/txtorcon/Manifest
+++ b/dev-python/txtorcon/Manifest
@@ -3,5 +3,5 @@ AUX txtorcon-0.19.3-Removeinstalldocs.patch 1755 BLAKE2B db819619ede7aec946226cb
 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
-EBUILD txtorcon-0.19.3-r1.ebuild 1961 BLAKE2B 7741f326adc5a04c4ed38dda56643a74a612af1b31f5bcdbc156cbd4f473b253831175644469d60e7106801e34dffc5d72af924d984f8c503f5252d3a3442f85 SHA512 3972717db5686dcf7698d515e710ee1626ad8dc69c9a83f3311ceaaeb3364929cfdcccc83c1b17cd1b931e5a9804686e21057db6ba44765475bdb5ac78fa96e8
+EBUILD txtorcon-0.19.3-r1.ebuild 1957 BLAKE2B ae6709f35298bf15ac2eecd04f36a24e57c1d1758063f275f892eff932aa678cb4aa9f8638e7ca1a480309c3bf1642004d05cd18e338897bc05e22ec24abd621 SHA512 b52dc0b37b95539a2f9ef663835805fed638aab646e31a71510c21ba88e14bf868545688d2bd7e104539cd1ca7bba625fe8792aead9114420c6467af4b607ef7
 MISC metadata.xml 532 BLAKE2B 757c7b063ce80fd9a6c8534be25740c4dcb59a89b217491cb83bcee0be8ed9fe03543e2cd74da076f366a01174d0b93839642bd37808b41e2c9a9b72fe494b2f SHA512 34e60662826b41e73c51a35105adeb3a80a634ce620cd42c3354b3faf7651a1e979f66f140cf7b8f45b130170735242d4c4d7a34d018ec9cd9d717b3b6cc06e7
diff --git a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
index c72dc95ff5b9..a699641c2411 100644
--- a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
+++ b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index df82528ccbfa..8059265c2a31 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -2,8 +2,10 @@ DIST typed-ast-1.1.0.tar.gz 200587 BLAKE2B 09dd6d65513a37a57ecb6df2a505100f5fc08
 DIST typed-ast-1.2.0.tar.gz 202702 BLAKE2B 79e919019763f4af0a2f24108cfa418693dc5a1d791a0045a49fb128d715f91ec5bcca6d4bb6812e19b7a5438bcb27d239f2aba7de8b859d4e8e73027c59665f SHA512 801f59cdce48f7be3045c44d207a5a269bc1cd5ca9f0536d3d16f10ce82794a7e5cd5d3c83982927cebc52e1b1dbd47532140bcedca0ca4ace45b726aa0343ee
 DIST typed-ast-1.3.1.tar.gz 204285 BLAKE2B 209911e0dc7291ec4b48ce7c5163d738ccd0978027d2bb1b64004c0f08feb7567d83ba8f04dfe48975ecc2116ee365a903f455dddcaf1bc07cf5deb08572f92c SHA512 390547485878ccb7e3a168e24b8b63c1784888ecedfae980562c3c0c0073c73ebef27190feeac99745c205d18061ffe5e3eb0830068968176ef2a06fd3ae4b2a
 DIST typed_ast-1.4.0.tar.gz 206620 BLAKE2B 59d3ed516b63643e37d9530dcb82670dd0e36f436650880f9fb304d081c3a72ecd494646dbf8f62fe95d2e70742390a5be711bcb803f1f0b6524dec1bf43c8c3 SHA512 b74e7fc51cde16439eae7cf41f0bdb95b5998362eccb73cf736f343cdab64daab63bc0f95f05a4911b229761749bdd31ac83423b58f2f3e1e1dadc7e6015bc1c
-EBUILD typed-ast-1.1.0.ebuild 409 BLAKE2B 71cb7ab5568e37a8e72861e69a453289b21903bbc3441f5a72cdc47b127e65e7ddc78f1f2442d22f2cf8f05e918a7aacf96b4264987765b3ba0c6ad8aabbdc69 SHA512 aff63468afa0ea05f89c2704473c34eea72d80cdd8f9df76f9f89e49b47d36d0d9ff51aa5899cd5ea57b53a809b8df1e117e9d29e3b19d26bf277e36dcf5e76f
-EBUILD typed-ast-1.2.0.ebuild 451 BLAKE2B d2d3901d15afd51d55c47e4d532d11f5508d8319fc8ff8d5b17600dc8aa96388ce19e6383a3af890f5b48106024effe6c83fb47712b8bc4b461e9d80514777a9 SHA512 6d2629184ab9d972644c4f7c033aa5e73f7678e71f5851e13a28f68f9df9d31565e6eb46a1ad2ebda37b274453767576236af38910b038b7ba027fb029efaa4d
-EBUILD typed-ast-1.3.1.ebuild 470 BLAKE2B 1ab1e81bb5b52ce2a5e4ce032e34146ea01a736abb74c436f2f64a853b1f2d88ea771791952a67438435c744fa67a4153643af3da67b0dbda219f74cbda961db SHA512 fb249bf63ee8008cac8be6b5b3e5d8109bd223bcc5e20b95dd011d67b3511c5f69870c1f63a6d3d559a7463271bb61600e08092ec2b1e0a39adfb9748cb5bea8
-EBUILD typed-ast-1.4.0-r1.ebuild 562 BLAKE2B 41bacd43fce7dc952ff153d44d847ffff1f31e3ce8fd3596c9c77f4c8067e466731edc7007bc9e8a139ecc63d20908173e4aec4739bab523facda20f8a1bbd18 SHA512 98078d4d57dee1c4371a9474017720cbcc3dd02331fb0187f38e95bcd5af3d3a49efc18201d795e643bcf6a3aa4c98338f5a4b6d3df11eeb31e85813d1ecb8bc
+DIST typed_ast-1.4.1.tar.gz 208587 BLAKE2B db874caf459cb73345305051a7c4e97244e92b28e94e82f59b38bb91b7c6c69a2531a81c84d483eca8d641bc947f6aa1b98ba59cd880f7560fbdec55bce41787 SHA512 a3154fe723aeadf998694aba0faf516e5b9abb876e4c7d91843b3694474ff6911b3e77a6cb7366cfa8e5a573b331906b6a0b134b25627aaba0dcbe92c4e25590
+EBUILD typed-ast-1.1.0.ebuild 405 BLAKE2B 388f03413a81f01c297870a6bab54029d45f0570ab754ea97e4f6813ac98e97b838c850dbc05a14fb77fcc7dcc0c4aa46da17a87b5dff3e3fe7df3cb5a3e9d32 SHA512 8e3f0b79ce167b89a4b612ca031c27410685ca24f18d704fd9ec67a61691d2d991e2b01abc0925629b6d78275907b2a5874c2110ac2b1dd26d1eeae03069c5f4
+EBUILD typed-ast-1.2.0.ebuild 449 BLAKE2B d57ac48558f46255c0421377bc21a9710d21b0f0782b15ffa23a911a849dcdc959914c86cddd9c28535d40bfd8401fd054605613ad1e6e39856c9e9f64292440 SHA512 6c274d8f0db5911d0e5c366ec26fb6e697849a4748680ee0cdcc632aa0276dcc4a4aa793df6c9ff46e1b7da7a99ce7fa7dad203757a93018a137baf3429d24e3
+EBUILD typed-ast-1.3.1.ebuild 468 BLAKE2B 588c0ca32e48c7771219235a7b0fcd4ee9262d42e0bb91a94cd924651bec8abc1d75744ff7d1daf5067b20c2d42372a6ca994732c4d28fa9807bfd1016b9d388 SHA512 f01be2ddd40096bdacf68ec57b88cfed1a9db23b869b703f49fe69dc05c08bd59984de766876abfaa1998e39967850d06b94cacee3563651ee0ebff30806280a
+EBUILD typed-ast-1.4.0-r1.ebuild 560 BLAKE2B 00d2a1537469f64e8e30e5f5e04623aa1c8ddae09547c0d474f676b01d6c1832c79a68a9b1adac1b55a6dd90298618e82d72bcd658f4c37100c0402092c75385 SHA512 6a42c9e3b6791766df7ccda7fa81df9a0e0b1022a8e8f5832367548ad8d42edde3d25cca6831c32c7c40afc4ddc8bb3845bc294d5eb484f5285073e928344eb1
+EBUILD typed-ast-1.4.1.ebuild 562 BLAKE2B 04b8e0c4fdc8f7d0ef640138c29c6f3ca0d962b212a10151f29ddc7739ad7b04477346f69e01fcf6ee06a00535023c64ba05f43dcf7285e29c306b6746f30318 SHA512 0611c61f2290cddefd54c3e280f826d4ae58278d2ef603936a5a6a10895296e6481b3d2c4639e42897418930fbf323e4f5ce76f56467ce0445d8ce819f00f1c4
 MISC metadata.xml 371 BLAKE2B 79a6eb0c3d333193154ed5bb5364c38afe787e0e0a845ed1c77e98e305c4d5f396c0ae10303e94a8bb6c407f937674fa48b9f8dc27c2c41cd36f74bbe05563f7 SHA512 28a6e9c5ac51f6b86cfbb1f5cf06a1dbe524326a74e69ca63ff2440b116a4780d87de84d9de4e070ad3669d0732be5e4ff87681570a57ff22e395d59e19a1c3a
diff --git a/dev-python/typed-ast/typed-ast-1.1.0.ebuild b/dev-python/typed-ast/typed-ast-1.1.0.ebuild
index 1e2734bdd89d..7c70025fe0f0 100644
--- a/dev-python/typed-ast/typed-ast-1.1.0.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A fork of Python 2 and 3 ast modules with type comment support"
diff --git a/dev-python/typed-ast/typed-ast-1.2.0.ebuild b/dev-python/typed-ast/typed-ast-1.2.0.ebuild
index a7e919f6f144..439c03c60dcf 100644
--- a/dev-python/typed-ast/typed-ast-1.2.0.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python typed-ast backported"
diff --git a/dev-python/typed-ast/typed-ast-1.3.1.ebuild b/dev-python/typed-ast/typed-ast-1.3.1.ebuild
index 680a3a2fa802..c8a10e8068a2 100644
--- a/dev-python/typed-ast/typed-ast-1.3.1.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python typed-ast backported"
diff --git a/dev-python/typed-ast/typed-ast-1.4.0-r1.ebuild b/dev-python/typed-ast/typed-ast-1.4.0-r1.ebuild
index 1f0de6f15916..4e5093c540ce 100644
--- a/dev-python/typed-ast/typed-ast-1.4.0-r1.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python typed-ast backported"
diff --git a/dev-python/typed-ast/typed-ast-1.4.1.ebuild b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
new file mode 100644
index 000000000000..9e391ae03a11
--- /dev/null
+++ b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python typed-ast backported"
+HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${P/-/_}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 41922cfe5e58..a31deeeb7efa 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,5 @@
 DIST typing_extensions-3.7.4.1.tar.gz 36357 BLAKE2B 69a1dc0d86c73beb54c5b727ae0fa71a8891e729895a928be48bad49d71858d2e1fd52e029fc7f129a6990e52587eddccff985ea902cfb392534f3a299e52d84 SHA512 ef66388d035bf69f2f3f0ce5708bfb8c2284392cc9ce1804f8ad47dc1adf021637e779325d2cbb30ee76b4408defb1aa51fd2ea8cab88de2d515ab4f543c9a6f
 DIST typing_extensions-3.7.4.tar.gz 36058 BLAKE2B f9e5efe9a7d51beb683bd4a88d7c1cab247b2c4cfd300131591bd04837dc15af277a8725c04566b9317be577f8f11e330f2d0169b52c3e9f92a8d3140e9e69d0 SHA512 82c15e6e67dde23456c3b01705729804dc21bd2088dee3aa63e53a5e597f474d34b1a37fb16bc5e3497f93d338c0115f49a070621523fb0fa3e994632785c6d9
-EBUILD typing-extensions-3.7.4.1.ebuild 802 BLAKE2B 08a224cb8dac13a335b7b0d719336720d9b10e0fc5198930785e3622ea05f4c2bac367d547c88b2b4b578e2ae09a51d30a351d6db631519cb64b6f7d09b2ea40 SHA512 d7498a1703c7ad7b38aeb89a1bfd5aca4a3537763bfb2e1aafa3da766c41896f90b16d23ba2c44aa35471eb39a7688441ff9b14ec4f20dd6bbfd42ec70677405
-EBUILD typing-extensions-3.7.4.ebuild 792 BLAKE2B 97784c901ba949c7b06d69098fc17c191c64fc922b76d6e2ac20b9c4b5d3c276f19588116318b6bd803d6ff5ee91c84e6c6d0b6eb87e1917a1c27e4f4d614808 SHA512 49b60c1405c28909aeb258594ed1b48251d95094f0b003ab70b4b500570e5dc57da7cbb005c214a259703e731058c681197b41b0aadeb75d6344ee0079ef33a7
+EBUILD typing-extensions-3.7.4.1.ebuild 800 BLAKE2B 5bc611aa8118c3a13228fdf9d6515afd9df365666e98d28575debc8114a57cae9b991c84960b33ac337db31e6ecb0c5c0876577f9fe62d047ce9e85b1ebc76fa SHA512 20b74d093ceeedf4466f238379e30c1e182366def4c004b6bc32743232e852f73f2b4f7c5e48d537e212ee2a0909ec02ddc8d1d7f96665572f7e11c772ef908f
+EBUILD typing-extensions-3.7.4.ebuild 790 BLAKE2B 80864a7ddd2ffb587ea6aab4c5f73a0f0e6b3d6e10dbb654931830e9370df48cd0a86717432356d65227df75d907f96c16722f559b6a2a6d97ce226aa38cbfea SHA512 c461d3ae60007007438d642dc656c1f9ca45d62ec8e5b0c1ce28f2917548b3cbc2f26ec520e94a4a1a51e3a3fa9034976067952a277567356ea7b380bb0a03d7
 MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.1.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.1.ebuild
index e3af37b19252..e923c15e390e 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.1.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
index a415e5a0a41e..ba4d5c754eb2 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
index 43f5e4055d86..5c85a1dba6f5 100644
--- a/dev-python/typing/Manifest
+++ b/dev-python/typing/Manifest
@@ -1,7 +1,7 @@
 DIST typing-3.6.2.tar.gz 78726 BLAKE2B 80adf3cab2c37ce36bd33d14e475ed07918ec80ebb5bc68a820abe06dc862fe6b38e1a90f9bb3d37420b311cb4a32af871ae2ff72807daa8c1a334b6cbbe4d2a SHA512 a975980e7ba6ec3e15c938336877071785bec7212443da079770348ab9441c8d918cd806e85ebea8af66a5d94f684566ea07b55e7623ab11e7d922c8c3dfe981
 DIST typing-3.6.4.tar.gz 71347 BLAKE2B dd49919595698347ce4b1004abd075409296acf11e10dd6ae0697d2bf94dc9d1cebedb2afe454be95eddb80fd0a60aebe14ddadc8df8de86545dd2ea05986c57 SHA512 f595e0fc395ba13a129ae45681faca7b199fd5c23e8f1573f49e2a6f162b7f2aef680306e76cbf50b978de9f047c674323219981e89c476474295bb8c02211ce
 DIST typing-3.7.4.1.tar.gz 77982 BLAKE2B e770b1c028142a70799732159b295d3bd5c4911619fd5f200567f8b27813d86de643e9b79aa45fba8590c1e2a6c96c1411dabd0707190a237a79f6f11851e1e0 SHA512 5f5080bf66b1de094b7984ed3d1de22651de8ca018ffde927dfa67fe65b13f91602a877faa24e73d44558638b609be276b924b894d63999bb93b0657a2d5ec6e
-EBUILD typing-3.6.2-r1.ebuild 737 BLAKE2B eaff9d75ce24c69c6fa699d3bebd4d75e383184fc3db3510ef72e583785e180c516d9bcace31f279de731aab31551507ced1bc673609b8adf275cb6187816ea1 SHA512 704b45c3b142c0250429d2927e2bbec7aa801680c6b6307782be3e19aa4001e9d48bf233a293fb0aa6a6079580fe2fc1eae16f7705b82c1ab3a85d7ebb91477a
-EBUILD typing-3.6.4-r1.ebuild 772 BLAKE2B ea70f3ddb85c964baa67cf15e4cc9d3762958b0d40e9653e044b1e5a667df7b2cd86c161705d419c056b2669f95659a97819ec4829994ff2600c5c81164b610c SHA512 2fc643ae62f963447664cfd34ad1c2a9dfe03211fd123d5292d1fd1148614457ceec3950b950e4a6c6d04788398946abdb2266803738d182c9021712c71e3d38
-EBUILD typing-3.7.4.1.ebuild 962 BLAKE2B 5a2d4748c643fba8557fb2188fafea5db4811aeac3a9c9b1b226fd28a55dc7dbc40db5b4cf58f327440e3969f6e56562846299e52e509a185d6676ebb6e740cc SHA512 45c3265eb58b6cec942c5db45c0e9f66f4110a14700ffa3df5e99f9d4053f10984fb947a139e50e2d4f4c2ed494dea570cccc207c816fc1e9cbd1b6f726b612d
+EBUILD typing-3.6.2-r1.ebuild 732 BLAKE2B f269b7a2567c7383ab4a63d97e023a560ddac9d7031356735bfd67a50a523b253a252dd67a31926a8d1935379eb10a5166ebc8446a8d1ade2c0c794266d9009f SHA512 49edc4d7fa5833ac5b5f909b1302a96655a2aecf58ea6f72525c6316473a502c1ad9173a47d5f3d6ec165216d2bb2fe277050583383264c32f7cec4b9dfd8a8a
+EBUILD typing-3.6.4-r1.ebuild 767 BLAKE2B de260ea58a8b531653b26ed2663ca188c2f86a41f621bb0c9bac4fa90867e544d740cfb2d6e8aae36bfe219f678d63b2d8d204e95ac8050909291432991c5857 SHA512 5c75453e58f32ff4948bc001b745775425d6e51b4b9ffec0ace1e9be36ebba9f6e86178153cb161e95da2f6590e2de13ba5393a5b02b95f24df1f96cd5088d9b
+EBUILD typing-3.7.4.1.ebuild 957 BLAKE2B b8163d6e2cc71adeefe32529efb7eda65739ef1fac7416bc375429f3eba102ee37146aa5b81d67aba6a0336dd24f743ab19b908e7e43146e7a7c913f5e7987e6 SHA512 08cc95972dffc040a6e2ecc8f8a5a146a0650b48af21daddfbe53af0add3b0ade0c70a81f3b4ee26fdbf3060c5cf5b858136a919498228334e17ccd647dc8938
 MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
diff --git a/dev-python/typing/typing-3.6.2-r1.ebuild b/dev-python/typing/typing-3.6.2-r1.ebuild
index de9586a50e3d..c8ed7ff223f8 100644
--- a/dev-python/typing/typing-3.6.2-r1.ebuild
+++ b/dev-python/typing/typing-3.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/typing/typing-3.6.4-r1.ebuild b/dev-python/typing/typing-3.6.4-r1.ebuild
index ccae6676da62..770d3bdcb5cf 100644
--- a/dev-python/typing/typing-3.6.4-r1.ebuild
+++ b/dev-python/typing/typing-3.6.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/typing/typing-3.7.4.1.ebuild b/dev-python/typing/typing-3.7.4.1.ebuild
index 4f12ecec2d36..2910bb8fc386 100644
--- a/dev-python/typing/typing-3.7.4.1.ebuild
+++ b/dev-python/typing/typing-3.7.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 3698b0ad65e9..be68492df6f8 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,3 +1,3 @@
 DIST tzlocal-1.2.tar.gz 16149 BLAKE2B 3852fdf9672bdb3f5b5340eaa14682f0f64bf3bad3e920680ce8ae7e12e3a2fb475237f6b645075e5058a30eff07c8ceec3ba4fa2bf90d4ea65663788cbcd772 SHA512 eb4d1f73983579e109249884d2a343c441942fb0d4dc76aed693c4a05100b10a2337d72794fdb9c0cd28c3b73e11dbd030bdf6dc2f75e57c958655219973c814
-EBUILD tzlocal-1.2.ebuild 575 BLAKE2B 47c45d3529360ba1b0bd2ed63c222aca67ff77e8d6d94b3f8a3a6d9f2f6d3143bd63c378c3d946a9e4e6f945e0ed354a48e2eee05710eeb1eabd845969583801 SHA512 7fe79e9ba6b1e90a6696eae623662e30f53a93e8512f375540862a2c050829a5fae23629d355a00775c7b2cb68d5093e9dd3535108d3b2972bd14aef41e85758
+EBUILD tzlocal-1.2.ebuild 576 BLAKE2B 98c8727b5ed93efd2fc9540a4eea1dfb44a51c3d97b61f2368122549d23e60b974fccdf741c7789385476503a8bd45133ed13b06de30a0c480992712c178a6ab SHA512 6e6cbe6d7e9053e8ab581a20e199e982b7c04048c6f6d9549b39ee03e81f981a4ad04cf7321b291aa77a3ace4f0f9f2d56b72754d227a8d159a1a11a7196be8d
 MISC metadata.xml 377 BLAKE2B c85be3067a235a5d7546bcf7c3eb05857986a371bca6743e222e9016ab6d6d5a212f3f65d7e9db523ef9ddb8091b62c1cfbd2d5c5d6d8560fcf881aaa3ffad80 SHA512 3ada56c5037a2a59fb53408483f03bc3ae72c9d7f676dd046125b035b34d4195e653662b67529453d63556dedda4471a9c77daaa1137af1245e49174fef1fd87
diff --git a/dev-python/tzlocal/tzlocal-1.2.ebuild b/dev-python/tzlocal/tzlocal-1.2.ebuild
index 8794f68d7de8..4c02eea3f47b 100644
--- a/dev-python/tzlocal/tzlocal-1.2.ebuild
+++ b/dev-python/tzlocal/tzlocal-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index 4d15cef3cafa..ad659bca3c04 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,6 +1,6 @@
 AUX u-msgpack-2.4.1-little-endian.patch 2129 BLAKE2B d7bd75e409753dedc3e1e7ce984fd2401cb8dff71af6b3da90950b00ea7f2af35f8d3b87af0fa333b61f916bd904934ee5ca09a124bf17a4099f334afe76203a SHA512 978c6eede0b89238134b31b596f9e0fd87d31431fd95d9f44578bb782b17fe8c39fea20bd494581a633219f8137c23156d5bbc454040c137552c7a72901525b5
 DIST u-msgpack-2.4.1.tar.gz 12026 BLAKE2B d8f9c5558daba3afda53c4c1b8e10edd6baa08a58c82796171ae0752c10c638b76abc608349e2ba090e83b2df66611a5c0c03febd38c2a13c45fb617b6bcf74f SHA512 4c3edb72455e8eb8fa7a4ed9b6ef4461755b782391f2c362d52d0fafda3e790fb40d0d239d05ba99beb3ad4cfd9e200175e2a1917cd64ee1e5d8cc3c4e8b3f25
 DIST u-msgpack-2.5.2.tar.gz 17641 BLAKE2B 643984fd9ed2f87ad0cce9e64aaa064465048067098bf01bd844a04bc1b870d6688eac6bc9f1dddf9bf705fb14bc332796f06b8b59d0dfe79261e85ba11b60d1 SHA512 cefba7ed86d2b7c37b0d92e3a4fb4ec62c89dffee0be078c783010638413e6ce1af7ab959b43dfedb6fd8cf2943185c18fc2201a4a9764c423e8242bcedf21a9
-EBUILD u-msgpack-2.4.1.ebuild 870 BLAKE2B 1181fb5c9c11316f21688aa6609bb51e4fb16111e67e0b4964637cde7c9d773910de19820217f1718b97dd9d690521ad4849375cc8bde782837150c29baed8fe SHA512 7e790f2b61aa4ec8cb0d31271bfe127d79703ead7062923f63016b5a19f01debd0f4c58ac96f99df991e4ca429dac68c6795ea1624ef7352721e0d9708889a2e
-EBUILD u-msgpack-2.5.2.ebuild 674 BLAKE2B cd9a038310de81ec2fb1579e61d515fdea01dab18b3c735f2ac1133c4686f205b149c53eadb60a40f80d5f1be2799ad70e31101704353ad2190ec8743115f6fc SHA512 df14f39e0ddb6248cd53a0b32a97d6486fda08fa1a33d2c6fefe0a1896a765adb2293f721b1567972aa59b459836544522091822457f534c0d6c2c73f98d08d5
+EBUILD u-msgpack-2.4.1.ebuild 863 BLAKE2B 851afa4b73a631ca979ec61318c2165cbabd0e7dedf357f88c1a490d1e92b99dbbd9660a38db7b441d1aa1f99546ca9b8616397729bcfc5436eafbb20b3e6ca5 SHA512 609963506fa5eed159ebdba71cc18585062a3ea1b44641733f82367a7128a12151a6257fa993ee28b20777450cd2699f8c1d9753f2639b35efcf00727f2aff66
+EBUILD u-msgpack-2.5.2.ebuild 669 BLAKE2B a41b0eae191d46d8b7581477200e4e9d1e0b7943f1f67da9c349510c673eb04de627e5cfd2512d90cefc9c3fd39f00f960d53c1439bb5975619a3a0716b15d69 SHA512 86f4f565616497b07e836e37f3160a1c0c82f69ee35d33acba999fd4a55c520058250aee871d125b8fbbcafe44bb19e3f3a6a0bd9cc45201c98f0bcf28aeb150
 MISC metadata.xml 907 BLAKE2B a60035eedce681b6a0c19ce0d701082b64f83ebc121501b170fcfb0f179fa60348903d215435fbefcebf65a1beae39ff00e1757d6b6cf04bda82bfbe0583b81f SHA512 6c4ca8d0bb44563efecbcce894a6697758aa203814124bc45c1743d91cf0ebbf34f6ae868fa1a76f5a16691a37bf8b31fd36070044b3ccce56187abbcbc2ce51
diff --git a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
index 635dc8714d8d..8a807125988c 100644
--- a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild b/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild
index c128ce847af0..de23025e747e 100644
--- a/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ufoLib/Manifest b/dev-python/ufoLib/Manifest
index aa9740c2e6e1..95e79b2847f3 100644
--- a/dev-python/ufoLib/Manifest
+++ b/dev-python/ufoLib/Manifest
@@ -1,3 +1,3 @@
 DIST ufoLib-3.0.0.tar.gz 115234 BLAKE2B 0bf7dff335df312252f3ee19a365f26d43531ac2d9b5d526af24038326e6be9d3b21f631ccc85199baaa827e02380b11efbd845efdbac158ba9ee96b947c3bf6 SHA512 c9d833dc51d0b6760d41832704c502ecf114a03999e449976b15c675fca265d2c4a7b396934c89bd7e4d1c0e893c86c713bab77bb9b14c4aff4edacb0089773e
-EBUILD ufoLib-3.0.0.ebuild 667 BLAKE2B ab449ccf8d4d1eb2634e01e09a5f0d74dee0b921dd607dd242feefd0a8d97065bc5c279b5eb3e305e2623ffd9c96d390bcb0b473b08a49e9b240d794ce621be5 SHA512 86336aeee17573b9e57f2cc08c7889186066ab1adefa710423ff942696edc4cad3f6a627f46fa0d5f305d746da2e49d385f226df8c41b6a512cf3a838f7c9741
+EBUILD ufoLib-3.0.0.ebuild 657 BLAKE2B 18b6f431927f110db15e60aeff23606b5081ab95b1894d833264087aaaff545642f58d9ad5e423f5cf85ed0bd4c9ff169d6538b7305afb12cbdb79fb0dd0f733 SHA512 078e607748df36316a9cc0b15d5bdf3352e81f715f9211c83b8d9be0299172cfe0e4a10e9e9852ad9342750efab869a2ea14ff4640629e93628a10baa19ed039
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/ufoLib/ufoLib-3.0.0.ebuild b/dev-python/ufoLib/ufoLib-3.0.0.ebuild
index ba58e081657d..a9b45339f133 100644
--- a/dev-python/ufoLib/ufoLib-3.0.0.ebuild
+++ b/dev-python/ufoLib/ufoLib-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A low-level UFO reader and writer"
diff --git a/dev-python/uhashring/Manifest b/dev-python/uhashring/Manifest
index cc587409000c..31c0e486eb19 100644
--- a/dev-python/uhashring/Manifest
+++ b/dev-python/uhashring/Manifest
@@ -1,3 +1,3 @@
 DIST uhashring-1.0.tar.gz 13154 BLAKE2B 73763664ae13213c90cf61f7f9f1afd45908fc60a55ed38b8cd5e2289cc96ea44ecf429228ce88539626b794315f5c5abc5b178adb8a4ec225610b3eacf275f6 SHA512 2e3dc62e76263bcd337c53d3e13c93b8e017909714b5a2d44728e8eeef8e4f8149f4e11a23ae093685f620ab7504419bb6ce3258eb68ede6e75b372c3aa14fbe
-EBUILD uhashring-1.0.ebuild 514 BLAKE2B 4e6d9c2a88abf4e07e28a0c76e04b1fd3f648cd141c446e1db27ddb519414fb3650b1e9a506cad7bdb5893dadb7d01589ffffdd741557ce3718be2a37332868d SHA512 e1dfd17cfc16820c17e147d768aa477a4d38dfe0cd7304fbb8600e8376edda66987c8cde681e830b93a8b87406d4bd6cd417b99c5481c3a80aebb7c56b5e7340
+EBUILD uhashring-1.0.ebuild 494 BLAKE2B ebe8ac0631aacf31958629230598248590ebdf67d08f06b2e3c89756020794819078a0a255a2c2412ab3b99dcdedcfadda5df6b6c1e2e67c65dcb943fbb6df42 SHA512 fbd859667ff04ba7ffdc01a226e12f5351f0cac3bcbb7e02251514e218a54791d3e45db31561df0742b74a754ac85095a7c1d86133aaac84b039756ecbaec1d5
 MISC metadata.xml 370 BLAKE2B 6f59cf220e7650c62c57118e76f668514b6605172653cd186f4a49c414d3c246f132131dc8585d8a04931ebf85c22fdd247f1a1ba2ffba8558e469712d9cd58f SHA512 34f15d0013c3d21ece0543e6425334f0c1716edf3907a09898c10e2d8e43389d3a1cfe254f759ad319e585bb15b422bdf50029a89a22cbfdb4a6997b6032cc34
diff --git a/dev-python/uhashring/uhashring-1.0.ebuild b/dev-python/uhashring/uhashring-1.0.ebuild
index 7cef48eecc5e..825b4702a09b 100644
--- a/dev-python/uhashring/uhashring-1.0.ebuild
+++ b/dev-python/uhashring/uhashring-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 0555596ed237..e6570823b1bd 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,13 +1,10 @@
-AUX ujson-1.33-test-py3.patch 1256 BLAKE2B e3a6db8f7ba82a98fd03bf4dcd70dc474150aeb289af31e279c0dfd7460c0db4cd4d5d27774f1d0865a61e405c8b33d3d9cbdc946a194a18cd9fb8213fc01c98 SHA512 f05909d1ecc51123da75de817ce52d7d24e7510ebd353c11b483f8f4bad177d7031ed84336e60647425ec24f0dddeec1966511971bdaee4abbc10d2ac11cb32b
 AUX ujson-1.35-fix-for-overflowing-long.patch 2630 BLAKE2B 39bb394773d6cf8b395701d32b4e8afc6de09c901c4e22e38ba78c37788b0e6ed69c28c3782e2a196e00ee22f21b1c93579ced48d968a5c346b6ba16ecbbe199 SHA512 1006a559fba644985663acbf3a94b8485511a0b137e96191c15f791ef1b84824dfd3d26ffb7de3bcecd011ab94e04b46e2ffbdf90766cb95c11be9c508cfc847
 AUX ujson-1.35-fix-ordering-of-orderdict.patch 4046 BLAKE2B 24d5bc9401ec44939f355aff06cabb7e2a52f8dc41dff419e48d2d84c64c40fcfc786131f9973c1ba804d110443ec8af621602ecc33ca17a47b82036bf9ebf57 SHA512 e3c392a4298f65154549f077c55da7b78d6e9085a217b3ef574ccec4d9f0466f5d0901c039afb1fb44b1e26042881abc5007eb045a3594ee365c09f46443d134
 AUX ujson-1.35-sort_keys-segfault.patch 2360 BLAKE2B 774cd15a52a333456e0f7a4996d111123aa315c41c7e6d01f2618ca459227ae74458202b899d6676a8f03e229056759d1e3c0d36a7204cfd8ce947787a010b38 SHA512 aac5b264187be10cbfb2d128f1a415fd0d841a728b7c1975232e5fe37fc042b19aae084e9c807eb5c23b1fe8306565bb2867543c08d88c2abcf474401644f114
 AUX ujson-1.35-standard-handling-of-none.patch 2563 BLAKE2B 55a2ad075f7ed348ec4f92727e9bfab2c41a734412706102e1b0df8c04f969d4273354cdb570b3334a4bcb7ec3cdef7c1c836405345165e129ab82a0f53f8f35 SHA512 3d3b7a3dc3d055c4c3cc94acdced6d5b154bfe23ff371230924f5ac7ea982997b2d404dc643c53e606c76b41a5d8c41d506d3f5d3adcc6cd61633f7dbaf3e30e
 AUX ujson-1.35-test-depricationwarning.patch 369 BLAKE2B 9fbc92d557049d8790b664ef60a908b99f6cd657c5ade674979f1b05e4c61dbb514eba09d3727c6c61eddc5b08fde5043cdd2af0477c996d9fe9bb43a4838380 SHA512 71fc8012f1701a35def3d7533d8d8d4133550dd57bd22b11e1dcd2806d25e185678f047cc1fe61a35132ed1d546d1411d452bb0e7af66aefe9b53a99b5ef3c66
 AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f6be23b9dc5c3a7ff2d9a66c836dc75954f7625f7aef4d55e06e90f3c030f8bc2f4db80b34cb540e09183939880bbf32225bc23c58f3fa SHA512 fe96f88cde477bfdc63ad5cf360ab6c63e2cf00c192a8d70d80340b7e39820ca53554a775c8f32b7ca43259e9f299fe38ebaf4aa64ef12c035bf23085f5b5789
-DIST ujson-1.33.zip 197034 BLAKE2B 587e00292340d69fdda9720d66bb360ed646f8c709e279f905f7fdf2db79a2ec51856dce998fd3e2fe5b3bf067c72ad661f77154bc3d63cee4c3eea10bca29ec SHA512 0f1f66212fbf94c03e048ba64c3bd817c50443d1a29b87f6a3a38f697a050f38821be4ba36a3b17a96930c69ee92973ac31bdd41851dea071af14cd4bbaf8480
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
-EBUILD ujson-1.33.ebuild 1160 BLAKE2B d45318ba94420dc8d52b5368def390fc0734ab1691418a6f5ca9479547cbba5b3c78fc62a678cd3854bbd51ba3e83afab7360870ea8ad73299a71199ba790e94 SHA512 b64920ef59fcdbcce06641e7cbcbb696222f9ed82c0960f0b49d4ba02e0de741537951c06d0776147786d162a1b1518d6814e6cdb2193d76717d12c23b8e34e7
-EBUILD ujson-1.35-r1.ebuild 1000 BLAKE2B 1ebf42fb6427f3225c930b4f36299adedda1a902ba0ba980ed6995e13b2c9fa2c2799175cabcebeb8ad98dea82d2c36b7a01bba533eb014ce8185d10bdcbbb5a SHA512 45850703c1c621838d35cb1a4486c1562da3f0adf68f0bcddc7d2f5a4f8a04208c5ef889b02ce2420984c1196a066eb7d32b8eb4610cce0affedbd15aff80d74
-EBUILD ujson-1.35.ebuild 986 BLAKE2B bd3e25ae75e51bfc638d86a58cfc7b62a782e9c9907c4ac605746e514e30fc62517702aac8b46856a25a80af632c5cd2f9f7d72d6ee8edd04837167e5ebafb82 SHA512 f96d217eac09bfc694aeecdc48619b3b7948471c5b0668e38e6fdf655016fe8ccab268a4387c803595eeb06e6d317ebc7a3a1a82e2d16a509d08d2e450ed4ccb
+EBUILD ujson-1.35-r1.ebuild 995 BLAKE2B d984cc2382af805268e88f03a66406aad027071feec32d81cab14603e600d20ad78027f3c50b2921aa0ee53399cce8385cd45eb2f01521833dca3200fccac986 SHA512 9b8e7b97a26e867d9b66b129d5641d4330cc6f32924b23ce2bdc333485e971618c3c3d7f8149505921ee00a1b3f50f2894b8856f9ac7089c064bf01fd0e2af53
+EBUILD ujson-1.35.ebuild 984 BLAKE2B 771a4ee1cd391ea4032168207006c2204ed1beff5e92b85afaf9a729e331bf0d6554950dce6bd1e016e8b95f76cca9c357c5d7843b9859137ffcbac199dd2fd2 SHA512 89b7764fc440b65cabdc30a14aaf913452fab3408c40e2833b759c041f2931cd40dec552400019101269d46adbeb106fe76caed4fc5e9badcb0e4e6b5ceda115
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/files/ujson-1.33-test-py3.patch b/dev-python/ujson/files/ujson-1.33-test-py3.patch
deleted file mode 100644
index e497f396792c..000000000000
--- a/dev-python/ujson/files/ujson-1.33-test-py3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
- tests/tests.py | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/tests/tests.py b/tests/tests.py
-index d210bc6..71f8074 100644
---- a/tests/tests.py
-+++ b/tests/tests.py
-@@ -11,6 +11,7 @@ try:
- except ImportError:
-     import simplejson as json
- import math
-+import nose
- import platform
- import sys
- import time
-@@ -24,9 +25,10 @@ from functools import partial
- 
- PY3 = (sys.version_info[0] >= 3)
- 
--def _python_ver(skip_major, skip_minor=None):
-+def _skip_if_python_ver(skip_major, skip_minor=None):
-     major, minor = sys.version_info[:2]
--    return major == skip_major and (skip_minor is None or minor == skip_minor)
-+    if major == skip_major and (skip_minor is None or minor == skip_minor):
-+        raise nose.SkipTest
- 
- json_unicode = (json.dumps if sys.version_info[0] >= 3
-                 else partial(json.dumps, encoding="utf-8"))
-@@ -579,8 +581,8 @@ class UltraJSONTests(TestCase):
-         input = "-31337"
-         self.assertEquals (-31337, ujson.decode(input))
- 
--    #@unittest.skipIf(_python_ver(3), "No exception in Python 3")
-     def test_encodeUnicode4BytesUTF8Fail(self):
-+        _skip_if_python_ver(3)
-         input = "\xfd\xbf\xbf\xbf\xbf\xbf"
-         try:
-             enc = ujson.encode(input)
diff --git a/dev-python/ujson/ujson-1.33.ebuild b/dev-python/ujson/ujson-1.33.ebuild
deleted file mode 100644
index 21bf458e20fc..000000000000
--- a/dev-python/ujson/ujson-1.33.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# One test; FAIL: test_encodeToUTF8 (__main__.UltraJSONTests) under py2.5.
-# Fix and repair and re-insert if it's REALLY needed
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="https://pypi.org/project/ujson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	app-arch/unzip"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-py3.patch
-)
-
-python_test() {
-	# See setup.py; line 72. Again "${S}" is used for reading tests
-	# Since py3_2 is first in the queue it needs its own copy
-	# or else all py2s to follow will be reading read py3 tests
-	if [[ "${EPYTHON}" =~ 'python3' ]]; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -a "${S}"/tests/ .  || die
-		2to3 -w tests/tests.py || die
-		"${PYTHON}" tests/tests.py || die
-		rm -rf tests/ || die
-	else
-		"${PYTHON}" tests/tests.py || die
-	fi
-}
diff --git a/dev-python/ujson/ujson-1.35-r1.ebuild b/dev-python/ujson/ujson-1.35-r1.ebuild
index 006979f5c980..3629c11f8079 100644
--- a/dev-python/ujson/ujson-1.35-r1.ebuild
+++ b/dev-python/ujson/ujson-1.35-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ujson/ujson-1.35.ebuild b/dev-python/ujson/ujson-1.35.ebuild
index e74f14482d79..73d5ba00ca53 100644
--- a/dev-python/ujson/ujson-1.35.ebuild
+++ b/dev-python/ujson/ujson-1.35.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/uncertainties/Manifest b/dev-python/uncertainties/Manifest
index cd07d3672baf..eb275558b781 100644
--- a/dev-python/uncertainties/Manifest
+++ b/dev-python/uncertainties/Manifest
@@ -1,3 +1,3 @@
 DIST uncertainties-3.0.1.tar.gz 225752 BLAKE2B 6dc872d5617b8c4e9deda5a5a60492ae1eb0facd7f053f0799b3762831f9bad7da39726811feffa3630091e00dbedf89c296ed4e1b2b1f78399ed45663ea5339 SHA512 d4b2a905665c46224586f5f9702ad9e69580fc5afe8c6c045b04141fdc54e0c402cdee033ee0ee7055823b922bd33c732b3066453876509d45add15abf9d85f5
-EBUILD uncertainties-3.0.1.ebuild 995 BLAKE2B 94bc26b0a383899176d43bc87868f423fcd31a9e8629d5c0bcfd9a3605cd389ba921eb63300621e00f9b8081b50c6e33a04b4c3adf658503a346edd9b009a623 SHA512 aacb7d8b2e024f09ba664ab069e993f4e675094a1914703fd22457e1e6ffc7f798cb1b88ae95f00ba2f43dc79a3e19d4098efe53345be0e2a73da8c8ce0724b4
+EBUILD uncertainties-3.0.1.ebuild 981 BLAKE2B 310adc24cb8f21eb5d8c913894c965aa6ee264e5b5ee4d299f424c015e7f8f2c72fdc7a47e0adc6d4cd8345a9651660e873b1a7aea1a1258ac3eed6bf85a7b2f SHA512 b6999cbdb6e9403fb2c4737a1dd5e3dbb0e2bff9bd26f0b29ba8679c3986f1ba919eea9d643f1866dc38c7523048cac9621a17d9a83d717a68a03d1a48d21619
 MISC metadata.xml 859 BLAKE2B 54ae46c343fada9aabb973c5297eccb0abe7299a2a1f0009df1d083698c91ce25339cf63d77857febee0798b27a84ba83dde95e19255f45f8cb0141c6a009954 SHA512 833af2fd16f097d61942c7f9323d8e38688eead6d5d10ae8e7f2547c950cd53ab6ce28f434d2c1bb2f15b71ec55bfc30b8bd53a94a0c5f02e824e3ecb08ecc89
diff --git a/dev-python/uncertainties/uncertainties-3.0.1.ebuild b/dev-python/uncertainties/uncertainties-3.0.1.ebuild
index d3cb81ec37a3..f27c1d6e6cd8 100644
--- a/dev-python/uncertainties/uncertainties-3.0.1.ebuild
+++ b/dev-python/uncertainties/uncertainties-3.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/uncompyle6/Manifest b/dev-python/uncompyle6/Manifest
index c4a3233bf0de..d314276e5d46 100644
--- a/dev-python/uncompyle6/Manifest
+++ b/dev-python/uncompyle6/Manifest
@@ -1,3 +1,3 @@
 DIST uncompyle6-2.10.1.tar.gz 831835 BLAKE2B dbde4d8414804d55871d846ad42f9a4859913ee057dcea5f6f19e8104e39d3274e13c86538f3364e6829d2ca9ecd16929143e266a828558e870d0f78d3cdff1b SHA512 5be7c33749f3a2a02494aceebeeb2cb79bf71c39784dbe4e96cf9a5c6f02af89874bc25ba911308f01414e4ae4d9ac445864505c629d41a2c6f8b2eae2197b2b
-EBUILD uncompyle6-2.10.1.ebuild 995 BLAKE2B 03dcd2f102de31b0aef1cb76d464044b9516d50fbaee8b4e8958237eb49fedcbc68d922c0294adecc0f57c6e88a4296e362165afe346d7ee9c7cebfaaa5f9c28 SHA512 a473c2ed1f910b94693c50d3aec02e88e4eeb9b382cf804fd34b3faee2c58796c06aa3e6bb4ef00f5f533a056f4fa1c292b1fa5384c093ace8e4d2d6dafc1c79
+EBUILD uncompyle6-2.10.1.ebuild 976 BLAKE2B 397ae4f8bbf6c444522243dbe75297dac6c4fecf1eabf93faf41450f91761cac62d82201613544dd3c5149586ae6208e5924942b558d32eda164bc25046c155e SHA512 1ed5c35ad7da2c7222380ce3a3255ed014db9e6dd8099024076c755db06ed9615eae0a7cc2db602056f56bc50b137a3bf05241e37a80832a7204e53f455bab6a
 MISC metadata.xml 474 BLAKE2B a7dd20c02fba9d0f93c153a0a99533d723070da34a59e914a9552560b061358a6ef9c44c8226797b7777d3d4357e7f9a2845d8d239bf7e5c52a3988c296e0c95 SHA512 3d3068d7aee678259cd7927a1fc64ec2d8e09f116ae71b225d81e99018d857d4b117057f88b43174e8a9312db1cace10751bae9f861818bd64671404d4c78f54
diff --git a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
index b6efee3fc7bc..ee56d1ee0b03 100644
--- a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
+++ b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index 0b4f8b1a4165..b04dbcc24eed 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,3 +1,3 @@
 DIST unicodecsv-0.14.1.tar.gz 10267 BLAKE2B 06a8dcd8de319422fe85b10e87fe759ae23f0f375bef3c03fd7b2bd37c25a8e2b46d632e1a4849f0799a9702fd8f1d2d0ddb8eb9e8f41d7b3113e92bec11828f SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9
-EBUILD unicodecsv-0.14.1.ebuild 571 BLAKE2B 3cf2fdaed67711b8d587436581ae27e6fd58364199d5b4f736d2db4ee46df1bac6c0dc7bbfa0d6e1b0359a528b9f58b39f66a59df483b30aa303160b8727d493 SHA512 5d094cac8fbc0fcceef0ac0b4cdd8d658f951304e6e5cc3fcb69c07f0eb0b2938aac8f61d4ff51bd582cd6943d74df231003dff42003d15fd9dc21baf62fb0b1
+EBUILD unicodecsv-0.14.1.ebuild 562 BLAKE2B d8fbd0818d6f72f607945073e71450e9e7af43be4eb41f928cd4a34ac65cfa55bf871d7191c25bca316a1417eb70636ed8dd0fd2edee5fd0f2a07383aa0432ad SHA512 6db1d4dc305a580b22821219f96bac3830927ece1989580d14d33a92a6840645a928e0df7a7eff0fa1fdf1a462608b0d89c781fdb96d6cafe08949526403937c
 MISC metadata.xml 377 BLAKE2B e3a9bd3feb345bb487881810f332f1caa566eca8ba8279876eb6936dc98c47ddb5008623357b82a715d1459f3c50cd5e9b0e00433e678705b433a832d0f7a268 SHA512 6178e2b0559b35fd95211f26a7c7108469c62fea031b5698ee65209832a0aec87cab9f3f9890f051527350ee585eff18b83a270a4e55f68c88360836d29475b2
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
index ad318b042f8e..abfa9d11c8ba 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index bf3244de68e4..bc1e1b3b9b35 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -3,9 +3,9 @@ DIST Unidecode-0.04.21.tar.gz 205931 BLAKE2B 701afb86b89fc17a8eb9c769b4be1d08a30
 DIST Unidecode-1.0.22.tar.gz 208877 BLAKE2B 21df38361b9b66f5e2d6822afcdf4656cfb240dc679f7469b41652b95d3a6921b9409a65891e359708f5bee09dbeff1885801ca3842c8ecd12b31e31689d69ca SHA512 f7663b320040bc750bc10ac0ed222e4feeb22c903b103c148cfa31e9d4cbae146d9668dc45c6efc82e8ed28e0db28d5de5e3ef1259c712bf317f2c6b2543772a
 DIST Unidecode-1.0.23.tar.gz 210727 BLAKE2B 2d19139e2b337bf979585b99a5fdbe0fc629487413a0bf9928fff954f99bf06efdf59a85ef623ab9334e5420971613d8b748bee8173918e099c33c9210eb2c36 SHA512 f3f48a1c06942caf06a9be29250af6f2ddb022cbee6236e2f9ab897af0b11517be3300b4a391dd89befd531b138eb1c163f9bfac178496c01ff2870b6a522f3e
 DIST Unidecode-1.1.1.tar.gz 212151 BLAKE2B 9884f89bb45c7c99569d42e0b287731638b8b1b697afab2c812b56340c6bd12dc3214b42177554f1b0aa214ce1b73fe1f05208ac6fc33d1949ed1200e42914ab SHA512 5474f04be843ed94ddceb1a7e5f1ca986ee5f2e88ee35bd9347784c7a11b51e1d94d61e1a2a10dd2e71b3587c5b7b76717756f6cf4e2446d83222178c2360696
-EBUILD unidecode-0.04.20.ebuild 583 BLAKE2B 57998ebe8c8bb4bcb79223e8cc10a0c8b0f0d16586581be92b325c9663af50136aaf2d2de83fa924fe2659bd5aea6ef8795703368bce1b259035dd0f63c4119d SHA512 d430bbf9c09f237139fc68a2b8e68f4a18d68c552f91db3b6f122a9cdb96a2a1a4d354549f31636ba65d8a89f09f28c7b2ce4387c86198ecc896fb3ac5aabc81
-EBUILD unidecode-0.04.21.ebuild 598 BLAKE2B b700d8cc56b1da3bbfff9ad85c285b8ce72159a424bf99d49f4c35d0408102c22b4a79823e7c7f12ae2e8eeb5cc4e6face6c2076a65e0d7978a9904e9a130455 SHA512 a04b17f1be3f8137eeb5dfaaa12463b6b1dca6c5b6c53723db1a21103a9e0c3711c84495aeef53906afbe3192df6ce0cbfeb84da32475a14da72d65740c0ac09
-EBUILD unidecode-1.0.22.ebuild 602 BLAKE2B fb46c6985e4b6dee9361cc920e7bdafb6713c6f60bbc95e2783872cd974eff88b538dceb9fb989ee50995549c558e87c772a5a5911c3f442b8994b00211031b6 SHA512 e89b6f96a5a97bb5738bf09d59afdd2fd2b01894929f2f3beebe7bf9166009ca76d08ae13f61fd7e4a542175eeb2b6d6d2353aaaadee6e0ae9cd1dc8e4c0e6f2
-EBUILD unidecode-1.0.23.ebuild 685 BLAKE2B bcf879db95f4fd7f3d8ad59c3393c64544115a10a1d18ac0caf7ec2b5a530451fe15ae260bd7d459541c2be3369b821ee59eec79fedbf880becba5ae83851548 SHA512 05dbaa0ce7757b4363a9ec0a25cd5c1250bc0963b7e002099d7fc71d87d9777aa6ead514d40b6439e167f5bd254d5fca51c2c4832f021004d338044e9d2887d6
-EBUILD unidecode-1.1.1.ebuild 683 BLAKE2B ec68c3f3fafbbf21e70ee87d2cc91fb6d84fac0edaddddca81e85f544fc34eac72557b9ad2451fca2230d7eaf71db7f7f4f33a7343c212fc5f8d6f955201efe8 SHA512 95b347a527dc9820f16f957671bc6023447b457fac6489d02beb5b20a43744fa0c786c338ddb5b785c16e105990be6d77c35043f20a47ae69a861ce63316f663
+EBUILD unidecode-0.04.20.ebuild 574 BLAKE2B 51cbf4cee79c8ec4b0fe96bf7a4ab8104cc065a26a215ae9c73edfaea16593c21f0e5e8e39d56ae80992e1c0d79df655f270a58f3df5780705b014a08003e4a0 SHA512 c27e64df4611765be29ab929f9856d113e9eb3903699f99462482cc78b6f782ea435b0915e9f2757dd330d7c5199b8a5404b5ec047b8a16247ee2c73d712b08a
+EBUILD unidecode-0.04.21.ebuild 589 BLAKE2B 861ed8b52084edc3120fda5867487864077ce31ccc72ffa7e3076d2fc5cb48d88ed6b9dec1aa6e6146924eb0ba708f72cfbfbce3356df4a16f87edd80875c3c1 SHA512 f5e5fb77b42f1f2f127bf20cbe08243962d7228849f7b8de57cb3d3660e471860bde278613e686d08ebc6562a2ed47dbe3a1bd33d08dec4600d58fbbb7d57723
+EBUILD unidecode-1.0.22.ebuild 597 BLAKE2B 6ecafc2c3517881f9dd6409f2024090f5d8801b5d3155aa1fb619db2d91c5765b5386ae3e92b1b6d156dcdd07f133e7f6cbc1f039ba4f276142954a90e64d436 SHA512 df55a02d2a464ad2526e18cfc3b338fd651f803dcc1d47f533fd94ed5c5736afb4b1a3afd9d6b4580e5b59da0533f12db74fd73dca61eed6a575320593d54717
+EBUILD unidecode-1.0.23.ebuild 680 BLAKE2B 63b883d25715d8e427b4db59726fba9009d99949cfc4413e6ee145b21db290e5b6cbe01da234d50b7d65e129f0483ce9ca4074bdd30753699ce15563f2a22dac SHA512 193d1449e2072b93f0a7d4621d140e3d94214726bfc5a817c7f7807b37ca12b0c230fec81198f62e9b23230c0f986b8cd755602e6d075d77446651080a49e537
+EBUILD unidecode-1.1.1.ebuild 678 BLAKE2B e7a9edad5077d07aced5eea31c2342bcac468e9e7f560f987fda36fda9d1feab296f76e96de847f4ac1356c8de713d8d80e186e9667c196dee53fb6d08cbde18 SHA512 12cfec043e2c9ba0070e5a67e4cc5edfabe3e17973ee2a32c964831c5d061a07df8eafb436ecc279699f35d1043576038a254ecd7cd8882403f1f316d2ec0d31
 MISC metadata.xml 596 BLAKE2B 68ded8e71de4e3b964343ffbca55b2b5c6a58168513658e1c72607afd8a53c185e71bfd652a383cbabc0b49b0e36542bdb0066fc6ea8636b0e92f744c6b86615 SHA512 4df580a02af8983a753c80ec3ace0c356d701305b36669ae7796f7d0c0774348c6534bbf8d75f2e79b7a4e5471d500bcd34df33875996066b7c07d55a4a91f8d
diff --git a/dev-python/unidecode/unidecode-0.04.20.ebuild b/dev-python/unidecode/unidecode-0.04.20.ebuild
index 5932402b20f2..b73c07a2e5fb 100644
--- a/dev-python/unidecode/unidecode-0.04.20.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 MY_PN=Unidecode
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/unidecode/unidecode-0.04.21.ebuild b/dev-python/unidecode/unidecode-0.04.21.ebuild
index 4ddae9c18cea..bbc77e5281e3 100644
--- a/dev-python/unidecode/unidecode-0.04.21.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 MY_PN=Unidecode
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/unidecode/unidecode-1.0.22.ebuild b/dev-python/unidecode/unidecode-1.0.22.ebuild
index f550ea690d4e..94cfb742e7cc 100644
--- a/dev-python/unidecode/unidecode-1.0.22.ebuild
+++ b/dev-python/unidecode/unidecode-1.0.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 MY_PN=Unidecode
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/unidecode/unidecode-1.0.23.ebuild b/dev-python/unidecode/unidecode-1.0.23.ebuild
index 5cdc5ae57905..aa7ab2220adf 100644
--- a/dev-python/unidecode/unidecode-1.0.23.ebuild
+++ b/dev-python/unidecode/unidecode-1.0.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="wide-unicode(+)"
 
 MY_PN=Unidecode
diff --git a/dev-python/unidecode/unidecode-1.1.1.ebuild b/dev-python/unidecode/unidecode-1.1.1.ebuild
index cfed078c453f..c4a55a2a23c8 100644
--- a/dev-python/unidecode/unidecode-1.1.1.ebuild
+++ b/dev-python/unidecode/unidecode-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="wide-unicode(+)"
 
 MY_PN=Unidecode
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
index 356af8bc53b2..4b2baae5c314 100644
--- a/dev-python/unittest-mixins/Manifest
+++ b/dev-python/unittest-mixins/Manifest
@@ -1,5 +1,5 @@
 DIST unittest-mixins-1.3.tar.gz 12942 BLAKE2B 24183d35b6d269c45947f9fdfb89f668e7dddfd25a2e634e92b0318b7a90e535c4ca33ed497cd4af54416c2d4909b4fd4d6d13bf94d830ac8b13939411d36ea6 SHA512 8cdc7adf387d3576d1690c2ab62eff93c085a36b82b756d237cc177aa52718e7ce6c5ec103841f1581cd28576bb17fbbe034c21d1c1347da643dfde3b8033d3a
 DIST unittest-mixins-1.6.tar.gz 14156 BLAKE2B f47831355cb3f6606b36124af7d6634b8c012d8f85ce843fbb2882360006eaf3b964d6d2ed718137e0c37d330cfbabbafbfa75e4b1217f2a5546027f7379ba53 SHA512 0d4a0bbf80264f34a03aebbb2668733cd3753f99b24b006ea6704a2b97df9fb51755e8c4efd0094219e65d25756ea31ff27d3892b32ab6829050236a6bcbc986
-EBUILD unittest-mixins-1.3.ebuild 695 BLAKE2B 53c5b5820da3710263e84e3d43e2e7d6d4d4fea2be85168c2a10c99a032436024575791c41d609dd5831f7b286c5b51978784d59521edd5f018b08a87ccea62c SHA512 649518c88e87d06d5a6d9a72b9b6b105f7f4b090ec8ffa634fff5f5065a84dcb6abc978db872794e1cde9aff28e476599961292447e4840390d17a060006dab0
-EBUILD unittest-mixins-1.6.ebuild 624 BLAKE2B 6decb4b6f55dc898b63285e24daee7bbe48fbd846c082fa602a1d8cccee3db4d34fe49ca2e3eb25efd9272d4417fd0eba32adfa1f2439cc01f56c3206fc5f3b8 SHA512 8cc85b03bf65443b6aacdc22ab96d8a708131960064172005fc6e73e7db2565757b7d9723a465d8874ede9c782f46e8589d8cff698cdfa39d2d96da44d4dc39c
+EBUILD unittest-mixins-1.3.ebuild 686 BLAKE2B f0517dcadcf84d98fab0cfe5f4834633ebdd952d0c9ea2e6fe1f3d588ed0d1a9bd114c32cb1e06b3fca50d606e040fbd64884fe9f2817046ddfed65252cedc76 SHA512 891c20ab407491aca37c08cdde00b203842c90e1ae2b873ba01424cdda1c38b4b33a240ae5735144257397f5680805b83fba2cb05c60df19bc9e65d8b2348400
+EBUILD unittest-mixins-1.6.ebuild 633 BLAKE2B c4df2cbc524433586361e99c4e10a81d3f81463cb58431f5ad0a1a46b10d5ad4052e6df3dbb9cc058c0a1a3fd7888aa76045ab9df53080e3f90aa9b456aae662 SHA512 40d91271cfb0d2d3ab00d3d506037a964005231bb949df5f39c3f918e8e05a338fb8481d5ce1122d9264befdc21742cd38b85aa956aa56b757470cd4975fbc70
 MISC metadata.xml 380 BLAKE2B e11d1ea8ab352e953fb5de15031c23c8ad94b21420abdbd1e4b843aa7498be70e6c773bf5dafacc9da805c7d201027c91691067954e8907662f0a4aea7057b88 SHA512 3cd32540c94dc1a2b2f72f5cfd85192a94fa716cc37d70eed9b028fd1ce120d3f821b2d059465e7f26f4b7d75b8f3cb4848a65dde921d23bcb9b4e56ae321934
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
index 33de2e61d2f3..3df7c39aa5b2 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
index 264132fc0835..fb7ecae2f079 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~sparc"
 
 RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index 5f3f32565402..ff4139659178 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -1,5 +1,5 @@
 AUX remove-argparse-dependence.patch 424 BLAKE2B 6b59d1913f24b336f9cd8bd40a0d42f281fe452937be9b1f2b7187aaff611c07de8bfe138ce9bbd42c5c812d217400d4a49ee991e44821020b5d3a131b5dea18 SHA512 e4a7b803ba5e77484f4e800df4c78d5b4d35f2d66e5c416c256bd6e7fa3db193c32aa0a455aac66b34f27c1038accf7949f64d98bf4a31a896a43d790de810f7
 AUX unittest2-1.1.0-python3.5-test.patch 1304 BLAKE2B 390a1972a4f24ca348f6d1d35badd2fe9a88fada8961c16e759f39da6843a1c931040ea3cd236f20b9671efa505c58857a2872553029c88a98b75c8358ac7281 SHA512 502a72811581e3551ab8fdd80f0f72ee4f6be9a3b0ce01a131f240f2199babfa115ecb18c5d4efe297521e6951f9371869b9419c829396720623bff548f09398
 DIST unittest2-1.1.0.tar.gz 81432 BLAKE2B 02bf191baaa895689078e8f484bb368cd178ea2d1e275a5adcd3413eb25d18b9109c353046f60819c7ec26cd233867b7397e6e38004389aa928b4c53cfeb637c SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa
-EBUILD unittest2-1.1.0.ebuild 1000 BLAKE2B 11c39c9c9d7b1055d18713c04f073232d91aa9e46a073e6cd7f0a13c12be5a293435d0cceb84a46c5e8ece83fb6fc81ae8d707e7b83f531524f2c4c293ed9454 SHA512 3cb8675119afc7e7bfb19758037493e22f8a54823a8f8cd42c722909755d1db0be5349301b527949ad8710a5296b462697540e40f36ec654224a43aeb778cb6c
+EBUILD unittest2-1.1.0.ebuild 995 BLAKE2B 4a9a1100d91b56a6b3ecb060a56af96551347a3154b957d921dc1f2ea1a63f557d4ae75f8a968517033666afc3c4358755d9b8f0476a7b4172dea635d8b13fee SHA512 83a218d9ae043b5baa27d7cb8043e98fd669ff1c7c73c046cf4ab3f620c830a0c08394870f98372e0d2877346a506ef2678f11a0ced50d1dcccd011a35276f8b
 MISC metadata.xml 378 BLAKE2B e0a0ad885607d8593e090798b8facbacd746a69c3325f6d429743482a6265bff57b2d0fd6d12122e15336e063c4c1e539da10cc41ea5ab159b2c5673e8316c8e SHA512 b1db02e32f39f739de9a077d770579cd1adbca7bc7b9c1eb3e5800f5242a1706ec5a61694b98ea7e3e6f6099b128d22e731f4c49cf3c719bb38be52679845d34
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index d35ab2c255c6..0e2918f6f6ca 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 640465fbb1a9..c2372cdb583f 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -2,7 +2,7 @@ AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be
 DIST uranium-3.6.0.tar.gz 668552 BLAKE2B 84ab1eed5474bf14aec5b7782b332e9846d14f589c0dfa7366c74ad682fdc0a8e5ef94a0b9576f0e80cf792b49132d3abb3f17341a2e8570d08bf898231deca6 SHA512 41779e9cf76dff8f74252f668d1cf909c93f4f1416f75d2ed263f89fcfccfbcebce5580d8202d8d1697491139db448bbfa76e2dbc761dd24cb98030b3241e80d
 DIST uranium-4.2.0.tar.gz 711868 BLAKE2B 8098372704db0494519ab0a24046b72f2527695716286463e7ecffb776db351bfb4ffcd7b53276d59403b39e40ef605fb016e9ec57e18cd06e8f22f22d8ef732 SHA512 fab04efbb6337e366501ffc0336f208ddc0f9e568a2822363b84b6512268f2560a22bc71e745d30e66026d7a0bf9e150eda605ef8b511b59264407cab491eee1
 DIST uranium-4.3.0.tar.gz 899153 BLAKE2B 314dbeed1cce49d33439b2fa744d37e4b360edb041964d2c3336730295b88bb2af86df8eac8382a6696fbc9c1ba07fa0774089ec3aa7fd0f8fbb92c61ce2825b SHA512 eac28907ccd66e5a43012a6f5af2a97daea21f0e2832613562e848cca967e036fea117811d8a4cc519c1417a113449e7065233fc541347202c6a8ff85a9d60b7
-EBUILD uranium-3.6.0-r1.ebuild 1443 BLAKE2B 7bcc76856b0605e6274fa914dd6e30fe5769f62e4d85c3ea4748cffdff2a3f2287938a65ebf805af274d9aa5d594d157e5a4b1f16b02f3cdbcab4b2454944990 SHA512 43f9f8b9d4fcae3debf88e1074c90abc58a5c370c2e74ace8b9d721a7ae26c674c5c145770e6d533174bfe6cf55912631a89b69cab6ed6df81bb61b7668b813d
-EBUILD uranium-4.2.0.ebuild 1626 BLAKE2B 52962773da02a79ae87239f341c7672760eff3967091304af600b119180a83260eaa07e77fea0324dab5feede9470882ef53523f6350c0713fa8e10a2d535479 SHA512 2dc5594790bc7f976847573be4358a04e3e05c55451e5303d7e62766d1cfd4348ba8d2e43a3c04e5f69e3ca1bf5378579805baecdcba132e1212113f6924208c
-EBUILD uranium-4.3.0.ebuild 1665 BLAKE2B bb05bc2723c8f7eba32928c0ccc8295ca2f0574ff56ce23027c9bbf5f1d5a488ff8db3e0855b7e047701eac0a70aaceaddc6a99a9a0c11110b95d3622eb2974c SHA512 d3e08da60221ce5d5df9ecd280a0080b3b9e4791c0377109aecdc1d4127911bb5993535a82a596020f3cd3a54b912e6f1a9acd068b3678c6da33e2f1c4be05b6
+EBUILD uranium-3.6.0-r1.ebuild 1439 BLAKE2B de2da5441b945609c3abebff8e8e9299ac055afcd2397cab4767aa4cfc03ceac1a2853f3f18c108e648bae03e48808145fec79fb492290ad062914d522176b2b SHA512 57aaeeefe99a0af1aac710d3998f4d8b9f6804b9c45106e2aae449852d076180d275297a6bb3f9624f4e1d6164968c198c5388c4908f85ff0cdbd4bfbf20cdd2
+EBUILD uranium-4.2.0.ebuild 1594 BLAKE2B ba8d95279e4d97c56c180361d68134c62d608c4d0bfa55a9f8dfa920e96d0d64662342d60b0f9aab0b0d9368b516e81f57d3366f6d6b22ce68dd9fc97a067c9f SHA512 8d954206a0883ce24eb6937f238fdad437e9041c36e595a1254400bf98a3149861afbcf07f91348812fe7d5937fdbaf43152718ee0ce3d79139d0333cad30f6b
+EBUILD uranium-4.3.0.ebuild 1633 BLAKE2B 37084f7888d560a95461836fb333432ef607081f1adcbe45cb3bb84fbfd71937b02040f9b7e40a00a18fdd6071518cb52b91f0db3d69237db02b13e671cd9992 SHA512 11a980b42d45fbb724acb04e81b97b92b5d9e9e680ad9402bc567004a2f0b4abeda807e827853fe5c1dd75fff2c45c0903c5f841eead491227803a4c4cb6d83d
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-3.6.0-r1.ebuild b/dev-python/uranium/uranium-3.6.0-r1.ebuild
index 50fb43634038..fdbfe670aa9a 100644
--- a/dev-python/uranium/uranium-3.6.0-r1.ebuild
+++ b/dev-python/uranium/uranium-3.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils python-single-r1
 
diff --git a/dev-python/uranium/uranium-4.2.0.ebuild b/dev-python/uranium/uranium-4.2.0.ebuild
index d6cad85692f6..8b3f307a109c 100644
--- a/dev-python/uranium/uranium-4.2.0.ebuild
+++ b/dev-python/uranium/uranium-4.2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 MY_PN="Uranium"
 
@@ -17,9 +17,10 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc test"
-RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RESTRICT="!test? ( test )"
+
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
 	doc? ( app-doc/doxygen )
@@ -44,8 +45,9 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake_src_configure
 
 	if ! use debug; then
 		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die
@@ -54,14 +56,14 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
-		cmake-utils_src_compile doc
+		cmake_src_compile doc
 		DOCS+=( html )
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	python_optimize "${D}/usr/$(get_libdir)"
 }
diff --git a/dev-python/uranium/uranium-4.3.0.ebuild b/dev-python/uranium/uranium-4.3.0.ebuild
index 1024b2dba671..4ca593a01581 100644
--- a/dev-python/uranium/uranium-4.3.0.ebuild
+++ b/dev-python/uranium/uranium-4.3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 MY_PN="Uranium"
 
@@ -17,9 +17,10 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc test"
-RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RESTRICT="!test? ( test )"
+
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
 	doc? ( app-doc/doxygen )
@@ -47,8 +48,9 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake_src_configure
 
 	if ! use debug; then
 		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die
@@ -57,14 +59,14 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
-		cmake-utils_src_compile doc
+		cmake_src_compile doc
 		DOCS+=( html )
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	python_optimize "${D}/usr/$(get_libdir)"
 }
diff --git a/dev-python/urdf_parser_py/Manifest b/dev-python/urdf_parser_py/Manifest
index c29ce12d321f..4da1b2826399 100644
--- a/dev-python/urdf_parser_py/Manifest
+++ b/dev-python/urdf_parser_py/Manifest
@@ -1,7 +1,3 @@
-DIST urdf_parser_py-0.3.3.tar.gz 41536 BLAKE2B f2f57b12fb44d830976303eebeb33a8794075750b8c2490da0a0d0db4e6c561d854db59cdda920d5aad3016631b824bf90b639c3e34853e40836ae92ee63f875 SHA512 b0f2787f41cee077d7b13eb55ee9ea99fe31877b18f4fa62c6205320752c39f727311bda0b44906bd8b3509527cb22adf3fa9ce3a9269e4e9d250cdf6b7b26c7
-DIST urdf_parser_py-0.4.0.tar.gz 48137 BLAKE2B 6e0adf5c5b6e8c4c6da92536ef19b1b30b9b1a9612445aff26fa323fe20951e77cdae2bda31238b8f868cfc667e0a5657808fd4fb8f968fa1799b5f792852d2f SHA512 823469fe3a8227efddc5cc805e128ac565580c9bfe4467d4e96b6a15cc8da008b9d7d6a5bee1e7da092310482692da1ce279c3e843bb95b6849d4a9bf6c3ac3c
 DIST urdf_parser_py-0.4.1.tar.gz 20017 BLAKE2B 805ad1f86b7d79963cc03070efccae3a44602bb309949bd5f3ac613e48e9f6cbae01ba8973e128d654e88c51f59647828a2360966664b5bb0b045116dcb61092 SHA512 08466a76e64cd46b1e9188aec039b8a0c20499c43be7c859d98c55f2d8d36305a76f780789a019dbd2e6badad90e9bd421dcd1bc82d3b8529fd08a9f9d5885f3
-EBUILD urdf_parser_py-0.3.3.ebuild 532 BLAKE2B 4f6a6b75bf6276a7eb784ab643e5a2ba0dd2ab5992d50c01680c2400ea786d0d5b597d9167194da2f08f0979729d91eae330279836eb7d66783b23da985e22ff SHA512 8a84b9ccaaf995af35676b57c155bf35cf56d27b6af3379db465e7e63f852baf10560ab457fc824e279cfb7b4d8fe4db02ce37c59da30c4ac2c866d9f8ede9be
-EBUILD urdf_parser_py-0.4.0.ebuild 675 BLAKE2B d262a08db3816a8d659557f0932f0e96b36d94873eb9ae9e1ef20d2de4d35e2e2c0d46b1ea01a67ee1056bb6931bdfb6182a91dc37e849e6ff283285630cbc65 SHA512 4b5daf3ed5b7e6fda2ca43d4e9df76181a61865c26b80cf3816a06c8de1474f7c04812e670b2c090db118b57b192d31fe5a3c931974483fa77e18157a424885b
 EBUILD urdf_parser_py-0.4.1.ebuild 685 BLAKE2B d3583ebb23610bce3a3c0466a25169f91f887b858c163386f2a90e3815e40c2f8676e1fcdac8635719cf9290771bdefb834b4007b0278327208cbe4b89c1b4ac SHA512 e844ff8e793f53a1eea37953313c1bfa0a9054a5050b1664329aba6ddb757b0107caaa5d142f7e355c007002f836c8b977319fa88d51708d724e922a0151a7fe
 MISC metadata.xml 332 BLAKE2B e32fdf158e352a3e43c6465c4ad378e44b9e01112f06e245d717d9ab6404be91a7529dbfd7b85d68fcf0168b296d7a6e55465f9a7a291112195968e3d3863361 SHA512 6efdc6c159b3764bf93d401fe111e3b102ea30b80c6a653d87f2be031f49f0e34919d4257e1a052be2ed4b88f5451c7bc11332a0ca7dfb284df31e31f5d821f3
diff --git a/dev-python/urdf_parser_py/urdf_parser_py-0.3.3.ebuild b/dev-python/urdf_parser_py/urdf_parser_py-0.3.3.ebuild
deleted file mode 100644
index a59a2fa456bf..000000000000
--- a/dev-python/urdf_parser_py/urdf_parser_py-0.3.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-inherit distutils-r1
-
-DESCRIPTION="URDF parser for Python"
-HOMEPAGE="http://wiki.ros.org/urdfdom_py"
-SRC_URI="https://github.com/ros/urdf_parser_py/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/urdf_parser_py/urdf_parser_py-0.4.0.ebuild b/dev-python/urdf_parser_py/urdf_parser_py-0.4.0.ebuild
deleted file mode 100644
index 85329b4ee3d4..000000000000
--- a/dev-python/urdf_parser_py/urdf_parser_py-0.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="URDF parser for Python"
-HOMEPAGE="http://wiki.ros.org/urdfdom_py"
-SRC_URI="https://github.com/ros/urdf_parser_py/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --with-coverage || die
-}
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index ea3e8e8e14cb..ea5c25da29b4 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,5 +1,5 @@
 DIST uritemplate-0.6.tar.gz 3508 BLAKE2B 41abd9a347a6ab0fae668a63c185d64e857cb88431a3b8ecaa673076a1fb700869c1679313ed772c2aade5952cbad7f0ce898f4be4ea280fe8d867cf1c280911 SHA512 19e9d2f7cb6275c1a3bc6e287d9d3bdbed4391541f29765130a8e33825321e33fe3220adc349794d179354bcb9d77571ae20ba7836034962f3713994c7cdbfbd
 DIST uritemplate-3.0.0.tar.gz 30038 BLAKE2B eac4deaa980a9a4618a245bfdc8b3df2180a4285b9197488e7556e3cbce88c4a52ee8bdfecc5f500d80d14a59f8ff0e1ecbcb3aedff422fa9853cb2d40e25df4 SHA512 9988ae6db1d0234a2dfb393ab0205dd7902c814b8a85e06a666b8fec44cacec90fc8852b64da068242cb57cbb2ed63478567224fcb6751df82605d1f0881ad6e
-EBUILD uritemplate-0.6.ebuild 556 BLAKE2B 4369c5f59217c0b8f187c22013763dbd0374992d02601d81b6e613cce344350dc754123466706755674eaab4879d3f6544240603120d095adfa4da23fdd78200 SHA512 f47904727061da40080df7e1723fe768c99eb1e7257efc7b14a0205f111b8191957e97d2016851103dab6c7336cced15e985a7b76c6ff57ab7fdf1d10c69d4a0
-EBUILD uritemplate-3.0.0.ebuild 565 BLAKE2B 8819020234d91756fa7b90ae63ec86c0d77350ae994398734d7c6f3ecff0dac84dc7ad9a9fd84531fedb032596f19c0951c6a11293fb60182ad042f488389df7 SHA512 61878623015b79f7b18e984db755860191082c08a489569b8f21bae5b920d9ef1459126bcd6909e0b85a59b97542687d931619350753a6c27013fc8516be4c14
+EBUILD uritemplate-0.6.ebuild 547 BLAKE2B 4b8915058a479a3417548e834b6d8394ebc367fe02f1cc8c782291c721b12055be5d4363e85bfbc8432a5f4e30b37b902c4c26eb9a6c2c53ee9dad7ec42a6e09 SHA512 dcf2be4334b45d2afd7dfce78c8fb6f0f07e700cb75348eed258a231bb0e52cd9d5186c3d52a8d3eba69167129787d9aa5d88d605168fb1e2b27351d2dbac089
+EBUILD uritemplate-3.0.0.ebuild 558 BLAKE2B 7743a5be5337b568c04f79045ae45d5ad2a173025aaef0e7492ca87fac83277dfd351de54eebb20551991b56294405779403f62063b6694d0c43d88b74f055e8 SHA512 ca1f5fa9b290e1bf0ee663f2be2902697d94493e3dc33fe122083d5accdecb7ee4edf013640d16ab70b61ae8b4a5f58a25eccba2eaeaed6945a0f6da27343678
 MISC metadata.xml 324 BLAKE2B 2279bd09d0632113a7f87be6510c579d6fb0ab9feadf54b1196b68591c3ce0343e26d862cf045261b52ef9b9a535de1416d26a57ec88f82189bd7a9dc3df285d SHA512 ea995ed18707c72981d9174d1a35a30b0c86eb9035acd9b229766d0c0e5e2baf25ccd2bdd1c5091e58b2dae799643c1af81a3fa18b66ad5795ff50595d27a51e
diff --git a/dev-python/uritemplate/uritemplate-0.6.ebuild b/dev-python/uritemplate/uritemplate-0.6.ebuild
index 6a47db0a020a..570f4547912c 100644
--- a/dev-python/uritemplate/uritemplate-0.6.ebuild
+++ b/dev-python/uritemplate/uritemplate-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/uritemplate/uritemplate-3.0.0.ebuild b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
index c52161a23a1e..3bdb0a01acd3 100644
--- a/dev-python/uritemplate/uritemplate-3.0.0.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 7fd61626a4e7..3080ee796f54 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,5 @@
 DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2
 DIST urllib3-1.25.7.tar.gz 264636 BLAKE2B 32ee47df52e0d164865400ecb5f0b65d3640173b53e1d9cf8f2dbdec46ac34d56ca66991ab719d9fafb8d49440630a3318312a925f11e3c6b8d26cfa72600c4a SHA512 e43c1b7893488b77a38a9fdcfc9760ceea72c53cf176eb8e4d1d9990732c5c1936f85c653a646eaadb3eaf72a99ccdbb5023430b97beca6458b868095005eac2
-EBUILD urllib3-1.24.2.ebuild 1554 BLAKE2B 665d5b88df7b7d39792a5f37d172adca0cec998de0dbd4e08363e268e904b7817e77792c8cc2295a4558ce6bca3d830aa08bd024be3ae6baad6ad77155356b86 SHA512 28256083feaea0b450c8a31af3ee072f18869419bb499dc05ed1c388b2f9c422100f26cec88ac8e59b2da664043583ac94d89d58f59c0c626d211fbc1c5ce3f7
-EBUILD urllib3-1.25.7.ebuild 2234 BLAKE2B 5dd2199324d474ecf3d10aad35942753ab1d753b0dc6146617206b6da58b68539e714e4657c89b4f4c674930107f544218c1c2d822c070641a7761779a905c84 SHA512 ac74f582b27b96d7e1eafd35b350c04df1109fcb62d80d978dd43c8f937bb8d84806f0d1013f910cdf3985c659dcbe785b6151ca257b3a6890e031154a2f4b7d
+EBUILD urllib3-1.24.2.ebuild 1546 BLAKE2B 39803592372309905dc6371995be59211b4b94e5fafcc655822be8377acb78ea5afc6af7b2324be364e99ad9903c9ea4708cfe7e22071b868aecc7a4a6a8a389 SHA512 0e968b1b8d9f92fa5874b5cad6db3cf921d7f12dff271d45c5a7549584920e56f8b5b87b43cc24a9b51f2765ce0969832c24c0b331a908dbf73d4596fe3ee9ac
+EBUILD urllib3-1.25.7.ebuild 2255 BLAKE2B 84acdca971d5a9fc383322ae91f2883655b7de7a24c2e3bfc60637f9ff92dddda45a63ec72fa3d3736b678639ced3761964b5c5ca7d6f0b333c045489d235e4c SHA512 f998e4723410b7516dee1e64805146a20c3ef2a5b9dcdf5d0556b529af04b13535694205ecf3ceb1c6d1086ad27a52810980c5f7322cc57c6248c710e0b77761
 MISC metadata.xml 462 BLAKE2B fa1a23ff540c36b4d00a665f92e4fbc3651ef0d91669c3181b01c6caa3c0c2824ae5ad498c784e13b2b6bbd1763a6eda891385ac584c8657843d61eed03ee952 SHA512 b82fc435e84e67e5536dde9edcd40644706eec6198a65233db5e43f20027ecf70a827f33f7d6b34095151ec7d33b6935bd16022355ac2ba87657185d35210aa0
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild
index cf59c0ffa92f..19eed900a555 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -19,8 +19,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
 	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
@@ -38,7 +37,9 @@ DEPEND="
 	)
 "
 
-distutils_enable_sphinx docs
+distutils_enable_sphinx docs \
+	dev-python/alabaster \
+	dev-python/mock
 
 python_prepare_all() {
 	# skip appengine tests
diff --git a/dev-python/urllib3/urllib3-1.25.7.ebuild b/dev-python/urllib3/urllib3-1.25.7.ebuild
index 036868ec5be8..7d7b50ac8af2 100644
--- a/dev-python/urllib3/urllib3-1.25.7.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.7.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
 
 DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/shazow/urllib3"
+HOMEPAGE="https://github.com/urllib3/urllib3"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -19,8 +19,7 @@ IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
 	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
@@ -37,11 +36,15 @@ BDEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		>=dev-python/trustme-0.5.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.2.1[$(python_gen_usedep python{2_7,3_{5,6,7}})]
+		$(python_gen_cond_dep '
+			>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+		' python{2_7,3_{5,6,7}})
 	)
 "
 
-distutils_enable_sphinx docs
+distutils_enable_sphinx docs \
+	dev-python/alabaster \
+	dev-python/mock
 
 python_prepare_all() {
 	# tests requiring a route to be present
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index c165b024564f..a2da904dca69 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -2,6 +2,6 @@ AUX urwid-1.1.0-sphinx.patch 453 BLAKE2B 3ef9cbc0486cca3f7e8833d029a95e021cf7955
 AUX urwid-1.3.1-test-vterm-EINTR.patch 1384 BLAKE2B 91385ddb7b343a4bbe89718cdf095d6ff79f2ecf64140d993ae664972c66e672b18de353e4fa81f38f86863eb95cae1b15a7ade787048e7d3093d3cec0b7b41c SHA512 0746938ff78d98cda847adbe49f8848e603eca4d6460921e57ef8c211dd19a21aaa9027f83cb24c53e5396f4a3fdd194396ea82a457729b8b252306c00bfff97
 DIST urwid-1.3.1.tar.gz 588549 BLAKE2B b2e135fa1ba60ef75f6d748c7a51e5eecef2c7fd51e19782c4901ab2715c6afc01ac709cd79c74e3da9b8671dfd021c968aaf7c3fa393e607e0ed9ac54bcbbb4 SHA512 8b505d38f3a0c04bbf527b324dc36212f2580213dd55eca61c66705d3beaac4f074c39aaa0f4f71add1fe5f3fce4c4c6dc88dd1e981b04bac6d52195d7a3f0ed
 DIST urwid-2.0.1.tar.gz 604167 BLAKE2B 0c7c289175d023bb14fca2c48eeec9e149af301827874c17d3087532f19d120ca2208306db44c5fbfd28b68f4b192f176cd46b83e915a5cbb8200e442e69fedb SHA512 99c86a26b08c624c23207ce8e587e8442bece1f522e0c788600ad5f01a4c679efff95dd947edade8b6f4adc376edca949a40c305f9d5ddaf6a0ff97f13c6da30
-EBUILD urwid-1.3.1.ebuild 1223 BLAKE2B f3084c9bb80e9c87bcfe818fb2249f9989aad7bab56aaf60aa2e9a15a6dcf7156d8f552a2d2caea62a4a1f86cd98d62bc03b5616f494df47b65edcddce5d69e6 SHA512 9f654839af193cd8d368b501a8a187952f3252da78c2d2f9053966b4417d5aad7449d564c336e0f56307229b222fb4d8973fb825b202ae3303c68009cb415eed
-EBUILD urwid-2.0.1.ebuild 1030 BLAKE2B 5862db57bf6badadaadd8e3dd8264f36113444fabb556f2619b279a8c4bac25cae491ca37f68ff2509e7bed01e44e7e42fcf8d5673b316e8bf5a874d5bc1524c SHA512 0e87f392d7721b604e982470f52163886fb5ecddb4ba82fc96b4c313c8f762ce4d711b275ca80a8e233e89d14d3fbdf2d600da41066157a287fcc5fbf3120aa3
+EBUILD urwid-1.3.1.ebuild 1219 BLAKE2B 7eb13d92e9494b513c4450ace81bb5adaa4e4ccd26594e51a9496440f402b4cab7575d01297eb72c957903266740cdb62df49f6337f05d29dac429b95616c88e SHA512 4a1d1abaff1a6ecae8f32b76a12700f0725013d871f4d3d2f9b780f819dc266bf911899fa6ceeb9c390082dca2aeefd80fecd2a84e01a2ecd636c0c998d26edc
+EBUILD urwid-2.0.1.ebuild 1028 BLAKE2B c379b8b7ab8a9738cda6a1127a43f3177f5434705080c4d16b14dc416fb4b2c490c29bb422c4124276307b8ce1dce6fc78a9cca1496be30a6fe9cf1541e3dfe1 SHA512 8993a739ed021dbe28a348877a26f66029ffcb22f6ea4fad182f92996b0eed21db392e55c081d794ecc0b7705a332c099f04a2dbc329f6130f41256f8873488b
 MISC metadata.xml 1152 BLAKE2B 4b992c5bc6907498186b29eba5804d17341a20715dfd9ea568e0b066d5f6b8775a79a703be450a436badf46d052a790a62cb8ce7100cdb54f24faa68eae6ecda SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680
diff --git a/dev-python/urwid/urwid-1.3.1.ebuild b/dev-python/urwid/urwid-1.3.1.ebuild
index e6f3978e4381..f0c427c92330 100644
--- a/dev-python/urwid/urwid-1.3.1.ebuild
+++ b/dev-python/urwid/urwid-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/dev-python/urwid/urwid-2.0.1.ebuild b/dev-python/urwid/urwid-2.0.1.ebuild
index 33999a4c4c1c..776c45b2f032 100644
--- a/dev-python/urwid/urwid-2.0.1.ebuild
+++ b/dev-python/urwid/urwid-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/dev-python/urwidtrees/Manifest b/dev-python/urwidtrees/Manifest
index 643930c36fa4..c96521b16379 100644
--- a/dev-python/urwidtrees/Manifest
+++ b/dev-python/urwidtrees/Manifest
@@ -1,4 +1,4 @@
 DIST urwidtrees-1.0.2.tar.gz 36082 BLAKE2B fd9dad1c1b0425fae95930b00149932a2fb5bf537c510ef4dd788408c315d6657553b92f6d1cc21769ed2a7af1a4c15c8c476d5d5b244f57032a5537ba92b27e SHA512 535b99d91154c308260a0ee6490868724ce8dfa89acf3b623c08409ec6e15194d9e94085411dd7796cad98865ed57692a88cbc11540e6523fc371eaf0204ac17
-EBUILD urwidtrees-1.0.2-r1.ebuild 877 BLAKE2B 5d6aa326ccc205bb55a11b588810db7e57fa0952e10a85621d4e88b519cc14a92e6086d72270062cf32170388fbaaf9f685ac86569042be8fdeabbb09776907c SHA512 080f8ca5c550870e77369f27ae6d03f1205771ad869a6340d6a1cc0f233ab25d8e04e1846bcb20d9fcab33d250c81e6a29c41c3c1ca0be710732fcfa68ccbc8a
-EBUILD urwidtrees-1.0.2.ebuild 986 BLAKE2B 39abf4ff65cb71fe9843e51036d289a0abfe9f468d35760e844942676d806c2d88a0636105e78c47a8114b24214051e5753eeb563d33af9841b43085e6147b4d SHA512 2a83b5746e0e28a9aed9891a454fdc2f8c3409da8a820ffdb31d4fbc0338b78591f2adc713f346bcc8d325e35fcf98a0a642e42cc8957ec68b7cd6d359815153
+EBUILD urwidtrees-1.0.2-r1.ebuild 873 BLAKE2B cf796330c2f119dbd1474872370f1e505346ab6ffae11e9c11a7bac72e30f8afada1185444bdd2a0eb8cfd781bc6c1834cebab61b50de6418f6272424f658670 SHA512 0cd1feaae04b91fd6fc2ead6a23db80f9f112050c655b3128e8ab1e6cdb3f83c79786437093d31f94a4b17b77c8a213221f9270c697813223badf54979616045
+EBUILD urwidtrees-1.0.2.ebuild 976 BLAKE2B 522c4dc9bff8729e2a6bab395a08253085a1d38e6551b92fb94c1a33df355aa07595bce5b821c8f9deb9adc8f260a1a7a13b1cecca9368796ade32c3636c3e63 SHA512 e966a540100eab3318a8280da0166913ae2681e962ab54ab00125a117266b80298c3cde4cf86c29e4a494cc590720d2829aab05b6d7fbfe9105361ecdba61b89
 MISC metadata.xml 550 BLAKE2B d6355209f6388d488c91217a36158964d3a1db24f88990f9736a12bd29339f9ef60fb261c75df94a4233e2a6e8ec38b52116975c7734424b316998fb5cf49f44 SHA512 f76048059f997bb98de85f445bcd77a5fd1f0523a3c1a77859e0bf1dcdd1ef6f4a99312e7a0261b36753a9b2152231cb84b41f6270c028983033fcce6ec12298
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
index 57257e1b3565..a8dfefc6b359 100644
--- a/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
+++ b/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild
index 41ff41e7304b..c9ce81489262 100644
--- a/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild
+++ b/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ushlex/Manifest b/dev-python/ushlex/Manifest
deleted file mode 100644
index 887fa1321c40..000000000000
--- a/dev-python/ushlex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ushlex-0.99.1.tar.gz 4712 BLAKE2B e38a61465cc93f8e7a50a314e3832baf67ab5141213ffa94255f0092fe533da96723c313a2458cf9075a263582d1fc0fce9361c074d71d2387351639205d5645 SHA512 6ae138a9159886e47d7464bad170cb5abae15c67341280a60613fa0c81407ac8b84b4078bca8b3b60e9731cc6b168a3364c9122c9f0cd39c8354caefd32303d1
-EBUILD ushlex-0.99.1.ebuild 410 BLAKE2B c6c47ff29cea33122ea20c88da88068911e80bac2d7a1d531992a947bac2ffba35ecb87d40c4c9be6cf58da609561029874184a958462a35e2145778dc9b1615 SHA512 f3d2cdf79fd47fcf768a9104d3f04014db6ed0b5795aaae669090ca29566717d07b68d94a40b6641133f2782b26746c64a745cae85590edfa3a94997bd3191dc
-MISC metadata.xml 309 BLAKE2B f9d01e0145c7c6c89906dbdfed2a8150bf263248bca6a48981cc471fd44efaece00d7adb35be34facd4cdcbafc3a537723de0136c8fdd50cb8be56571f7430a4 SHA512 e32b89dc15ae34d2fb5f6886d815a497b65aa8b7aa3e8e971ac739ddf60b962d277afdbe8cab69187e3d77a0614eff3017986f87b3d2dc7a1b6c3a47d400e640
diff --git a/dev-python/ushlex/metadata.xml b/dev-python/ushlex/metadata.xml
deleted file mode 100644
index b1cc92cb96c6..000000000000
--- a/dev-python/ushlex/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">ushlex</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/ushlex/ushlex-0.99.1.ebuild b/dev-python/ushlex/ushlex-0.99.1.ebuild
deleted file mode 100644
index 0e0ffb36f51f..000000000000
--- a/dev-python/ushlex/ushlex-0.99.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Replacement for shlex for Python 2.X"
-HOMEPAGE="https://pypi.org/project/ushlex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
index ae9bac0202d3..f494beb6d105 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -1,5 +1,5 @@
 DIST uTidylib-0.3.tar.bz2 13809 BLAKE2B c6b495933ecdc21543c79e3ff200cc06ec4ebc1682cf9172bd988a08afef8b69db17eec4b88665aff5dc6cef371f3c665f6de3ffcc1dc515f778b523333c891b SHA512 4503f2a6366e5110740b312df2300d62bb68e1e1032184e9b56dee75995309c76d4f8e5851c73e7c8e08cca7bba9c74436d8dfc0524f115f3abb2bdf5529cc35
 DIST uTidylib-0.6.tar.gz 15771 BLAKE2B 9d4fe57d985ea6e52680bd528862d3236137221227a23fe05b886d01d240e21d7159dbf7d6da3af8020009ca45c60c2297e374bb7aa05cb6b5a8eaf444710c58 SHA512 a85506ef8824f66ee326ad651020dc3b4e00190e20dcd3814984fa27ff319f492fe5bac781b7c43c8694cbfc63409e3abda18981969c9be2c3cd023fe7a4f2f8
-EBUILD utidylib-0.3-r2.ebuild 970 BLAKE2B 02aca84cedeb527b3d2a1601d13d8715d3d794b991fc0722e8055ef4ce3761653cd13dae4c9fbe777569fd7bc96b2aea7add931d260828e0f98e50df151e8213 SHA512 d505f5a799f85c9e9a654e02c1595ed84834bf635e74ca34c9c9eae5615f7c9e7cc94c82f5b05716231239332bc3b935ad2cc2cdb92b8ee27a135f92a6143b86
-EBUILD utidylib-0.6.ebuild 1265 BLAKE2B 93e7227f5a5e8e97b7b1420faabb08bcee4d6045d07f5ca4f47019af777c35d95227a0c05ce8cc3b4595b844a2f736ac184d5bf853864181c557cf1305dc7529 SHA512 b8bf3e9994382ee098b04b6bb77b338a3bec7432f33a2db52c2e89967ba2b3a8538ba5078d2752f6d901f45474c2ffed9dbc8ccac5141874a5c8152c234a9820
+EBUILD utidylib-0.3-r2.ebuild 968 BLAKE2B 6b3582e90ce0f8460ff047f5e2705442b0964c9f6fb7bf3076d48e7776216e108f5a36675e81677fecb5aa7e60cc67d8a9b04ee0a4a93dfcc4b038b5ce780fa6 SHA512 fd2d476e1f02439d7cf0a911a953ab01fe7b2588197764247b033af194c0ffd7e182b2f5c11ec1b6db26e58c85b40b829fddc8290138b6217932a6403a051fa4
+EBUILD utidylib-0.6.ebuild 1260 BLAKE2B ff616270747b3d81eb3c6c86f22f4ebe7fb4c3cbc5d4def7e2023c3bc5420fb38884ffe1b26a10b1110eb1d643c7a5bee5fcf4fb63a95ae20fd587d2a83c21ee SHA512 9247440eed6ea1b2a269061868db5ac56f1c5824ba145ed0acb08efcf91d739081e5c74122391d9dd4a2623ffd61b5150ab4f60ce527e9253162a550e173e409
 MISC metadata.xml 372 BLAKE2B 58932a89c0765511f1231a3ea43ac6509792a03b345655f7d15ec306a33a0264d49b32352c57e8d3cc73294c8cfcbd679289011312bdbed55459f6751dabffa0 SHA512 d6602ff98aa2ae6a69cad590ab014cbe5b3f1fc1b28c64e91025140fbecaa78c49d6e45bc8b8b5432b0cfe4c91402db3d3954db92905ddc42c13540a9c1e2ab5
diff --git a/dev-python/utidylib/utidylib-0.3-r2.ebuild b/dev-python/utidylib/utidylib-0.3-r2.ebuild
index f3fdd8dbb5e2..fca127cceab8 100644
--- a/dev-python/utidylib/utidylib-0.3-r2.ebuild
+++ b/dev-python/utidylib/utidylib-0.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/utidylib/utidylib-0.6.ebuild b/dev-python/utidylib/utidylib-0.6.ebuild
index 5e18aa363d3e..de6f3ef3bcc4 100644
--- a/dev-python/utidylib/utidylib-0.6.ebuild
+++ b/dev-python/utidylib/utidylib-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc ppc64 x86"
 IUSE="doc test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/dev-python/utmp/Manifest b/dev-python/utmp/Manifest
index f11d2c00bd96..2b34a7f137f4 100644
--- a/dev-python/utmp/Manifest
+++ b/dev-python/utmp/Manifest
@@ -1,3 +1,3 @@
 DIST utmp-0.4.tar.gz 4300 BLAKE2B 944b4e58158a26609b225534c26547bc751ab67752177fa8a6bb8d52ee123180b51b30fab5fed09e6e21d5e8f9d9b274122e3a03b1f936b6d521333dfb7f6fd9 SHA512 802345227a9de972a7ae1127a006aab6bb51e1a7e81772a58b9c19bee74c79c4f5219519743133e8c02b90f8a72f52e22ab668c8a78a898c00e0a9a147a68472
-EBUILD utmp-0.4.ebuild 625 BLAKE2B 865ceaf9dd871e517cc000d0a434380993f8ab9f13468a7de88782301ec9144598eb1168af34fb747aa8097b4c09b9e8ea3156c464bc8a5220328da5c7656ecb SHA512 36dc954b17b8765e812532beb4c9fda79b3979ce4a05169dfe79f0a4ab3b634b6c1909049f4f97519fe915f2e39962ddd187bec107315bfbb781a68a87acdaa5
+EBUILD utmp-0.4.ebuild 619 BLAKE2B a518af5ad75190c068421d0b894288f6255d347c9f4b278d1a1190ac3cb42ea66e3938112dc3e2e2b302d926a1d6933e3580c92d4a75c19cb429dec565740b58 SHA512 76e78a32680d20c69a63a59b46e446f1195b16ad9eee26726a5ed8c65f22a97cfeaa07b900cfc94110a6fa8c6fb06b0ec54562893fa50f63e697f1138046875f
 MISC metadata.xml 307 BLAKE2B d6ae31f2be4537c6b2f53f7e84dc8f9551ca3b335481e62b0013d5764bc1dcc836e8bb7d098447794deed38eba8d95f1d7e5f4cf3de7661641e99abccd32fe60 SHA512 4b93db04a6c3737756bdbe1de7257a35e642c5913b4805c60385def5105c7cf57645dde785712e6a316172330969c35cc5f9208ca787b14e9fcdb4a669745ea5
diff --git a/dev-python/utmp/utmp-0.4.ebuild b/dev-python/utmp/utmp-0.4.ebuild
index cb10d31da959..040e8f075e9c 100644
--- a/dev-python/utmp/utmp-0.4.ebuild
+++ b/dev-python/utmp/utmp-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 078a6e333e25..5d4b9c45d21f 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -2,8 +2,8 @@ DIST uvloop-0.12.2.tar.gz 1922375 BLAKE2B 49d17dc0899d59975d02dcc0b56e53e506e83a
 DIST uvloop-0.13.0.tar.gz 1989805 BLAKE2B 5e825f54ab925056847b8369dfb4deaf9bc8120f7b9f3a0c58267954cf2d374f7ad91393744b7defaa3ec82f5d476f97a5555bc305d80106c84de71b7cdbc7f0 SHA512 4e24db94d207f23287a28d5b086cbd0a358f2fb3d35b55e9913b7b0867e4253259171f4d23969990b1e041fef0a28e44fcd1737e9be319293d223d987033de98
 DIST uvloop-0.14.0.tar.gz 2009041 BLAKE2B 4d984f5023e0974ee68795e6cf29585cee32345e8a682611a72dbc36efefdfeeecb3c22aecb581ff7e5ae826345e1de3b0e6c7a6e8319829b0b3cbe5a180ed11 SHA512 8a9a64c91fd34c65a1c40d8d76ad7dbd7e959d45188ef81cdc06995312f52106b2c648a504d51b64b470e54dfc4854dcf9a05cafa3d4a42f1bc1e31766114d61
 DIST uvloop-0.8.1.tar.gz 1719488 BLAKE2B eba6e15c8eb46286b6e8df6043280ec8b423f097fcf2d4d5be657ff18f0fb97ce83e5268a138cf46700f54b7040353b6588dc4b0140e11f38d7da2e26b1ff120 SHA512 45dba019a0dacaae6c2a732c3f321402c19c945b0d9fa35b9cae28f888a54c7d4b322b450c55a6cf21c1aac01dc49b90eccdffbf4cb8c812a5ec8b9e805e01e4
-EBUILD uvloop-0.12.2.ebuild 1187 BLAKE2B 19863628a45b97d7033efb15817b602dd6b83481c03fe3d47765b4027413c1fd2ab326f5f3096449131f684183c0a0ce1dfa73b51541ec3c78c07f279dff4358 SHA512 9dbd7934e45e04f06736994bc4b92ee0d36f8458402764332a22311435cecdbc46e398f7885bb7a933ffcc6502405bcdbe4f4180107857b83c6aafb127b96bb8
-EBUILD uvloop-0.13.0.ebuild 1148 BLAKE2B 89af9ff9acab2d2c2abb5a74b11a522c95bc1becdb1a44079227ab04f1e54eae4a628d0841fadc5aef3a8af33d5aefe4771e2bc58f7a7cdd67aeee1e440dfbda SHA512 309d37b79fefa06aba22b13029e872b6e25853853bcfbe68c5c3b125e77a509ec3502fc5df1ef2b763942309d2319b7880de74f34c89768e213b46e6eaaec1a1
-EBUILD uvloop-0.14.0.ebuild 1148 BLAKE2B 89af9ff9acab2d2c2abb5a74b11a522c95bc1becdb1a44079227ab04f1e54eae4a628d0841fadc5aef3a8af33d5aefe4771e2bc58f7a7cdd67aeee1e440dfbda SHA512 309d37b79fefa06aba22b13029e872b6e25853853bcfbe68c5c3b125e77a509ec3502fc5df1ef2b763942309d2319b7880de74f34c89768e213b46e6eaaec1a1
-EBUILD uvloop-0.8.1.ebuild 1035 BLAKE2B 90188af8cf92a6e6d2be035a855e5497332b0b98fd961e9d845c6fae0bc4bb47a8cb8e43d4ad957981ca10ad8035a1c3b05bfeb8c8f0246f1bb6cfec86cc18be SHA512 20a205be0e0d73a2a86cf428bc4e98a31da2ba53a1b9769260f4f9f3f760df936485b853ab332d12f9a99f8f777b0f20ebae05a77776a70bdb795a7eb3b4d580
+EBUILD uvloop-0.12.2.ebuild 1183 BLAKE2B 64b4b3b01c64c982df15a823a107877d4150b53ff828788398f0d2af58a7c841b79afc82ad5f1bdce42d42143cf0e47fe2708d73f41a9b76d8c1d99c19cef611 SHA512 a462d8320279b51ff7c4ce386d7bc55f9ed2b6bb22cfcfef6c9c26e76941c8c05454a7b416bd42acda13a5dc5d54c474cb4e5ea029b1bb14e5d9485b304279cc
+EBUILD uvloop-0.13.0.ebuild 1144 BLAKE2B 50e12e4734084e08c240eb968d7c2d2f0ca7009e8454a5ff1fcb91b8f04145289642c4691e0e2a30c28bca4002ca9f94722ff13be18e9fc9a6f954ac1574f2be SHA512 84c59fef0a0cc9eb9fccc4d4a4183c03dd57956e48b1211323507c4b0e37711c6fd3f89328f0e42f2bc0299786d02d63b68aa18126fba918a843a1e616c908c1
+EBUILD uvloop-0.14.0.ebuild 1144 BLAKE2B 50e12e4734084e08c240eb968d7c2d2f0ca7009e8454a5ff1fcb91b8f04145289642c4691e0e2a30c28bca4002ca9f94722ff13be18e9fc9a6f954ac1574f2be SHA512 84c59fef0a0cc9eb9fccc4d4a4183c03dd57956e48b1211323507c4b0e37711c6fd3f89328f0e42f2bc0299786d02d63b68aa18126fba918a843a1e616c908c1
+EBUILD uvloop-0.8.1.ebuild 1029 BLAKE2B ef6bfb59a26c9cf37b85baf20e5ba2b717c778ca8152780876096c5e4f14155c368a0fd1c9bd0f3c51a56d266870cad67253c762999bb7971ef125539fb78520 SHA512 c67302ebd5127101f0b4fc845d89f35dfdd931bf2783e2ae6969cd28bc9f7b8a807f03d631dab460d93660622dadae91c7dedd676ed3a34ed733d933904bb233
 MISC metadata.xml 544 BLAKE2B e4154e8b5cafb357fd48ff454db34f4f7e8e2c9811222ae19285660f2a237e30bb9558692be2b82572d3108f1252ac483f488274fb88337e4b9ab2d731046a66 SHA512 2c081d40c5477bd63d98ccccc8ce7f73933a01d7ee7f39b332a9a0cc3018cb9765dd81510fa9d27845760bf384ee40d5f699aa1a9df934d595624b1f5bff7518
diff --git a/dev-python/uvloop/uvloop-0.12.2.ebuild b/dev-python/uvloop/uvloop-0.12.2.ebuild
index 4b6fbd02211b..ebeaf7172235 100644
--- a/dev-python/uvloop/uvloop-0.12.2.ebuild
+++ b/dev-python/uvloop/uvloop-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
diff --git a/dev-python/uvloop/uvloop-0.13.0.ebuild b/dev-python/uvloop/uvloop-0.13.0.ebuild
index 1762033eea50..22d0a4812d14 100644
--- a/dev-python/uvloop/uvloop-0.13.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.13.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
diff --git a/dev-python/uvloop/uvloop-0.14.0.ebuild b/dev-python/uvloop/uvloop-0.14.0.ebuild
index 1762033eea50..22d0a4812d14 100644
--- a/dev-python/uvloop/uvloop-0.14.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.14.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
diff --git a/dev-python/uvloop/uvloop-0.8.1.ebuild b/dev-python/uvloop/uvloop-0.8.1.ebuild
index 39102e922c84..ade6488517f1 100644
--- a/dev-python/uvloop/uvloop-0.8.1.ebuild
+++ b/dev-python/uvloop/uvloop-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
diff --git a/dev-python/vatnumber/Manifest b/dev-python/vatnumber/Manifest
deleted file mode 100644
index 7ecc5b0d9592..000000000000
--- a/dev-python/vatnumber/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX vatnumber-1.1-skiptest.patch 605 BLAKE2B 1da3cabc9d90dd0cd79c65c57bcdeb180de5bac7c010ce2a722df2f0e0388a37ba9cd320d6179583cac24fceaab3b014cea4889b8577469dd20a4c7790fd5193 SHA512 dc9a45a9bfb0862aa22f9ea913480dc5e8873a49a3ee1f6d395850efe046eaded347e4bb5848ddfe80dc51780e0688f0b9664895b446268a78d3c4c23c3460fa
-DIST vatnumber-1.1.tar.gz 22032 BLAKE2B d9b4a0ebebf12f61c96fec1f7ae0ae1da577a161be8381fd9ff8da3787391bd6554ed11d0ca393d37ed25edc0fcbdf8b49d7b942be0a42ca620a58b7709bb67e SHA512 286be890f37dc3ea97beea22f6e34402a9e40738b33a94f98e16a09801656f64fde9f290ed857c5df1fd44896a9e0fbcbfcc8f1dbe2f1314015e473dadc0ebbe
-EBUILD vatnumber-1.1-r1.ebuild 724 BLAKE2B 559b59fe0080d197bf0076cbe8f40cebd3acf31afc76f42b34b528cfb67b7b37f5fc3d22641b69ffb5d8c254301192694bba38bd972e59ebfa2454b675495345 SHA512 96f0370592ac3a13f6eda5256adf36dbb4cf250fc0bae70dde61cf1859926627352451eda0d3df5c3a4ae3e008a10589ff4ff497036025666e4daef5092d8f6b
-MISC metadata.xml 455 BLAKE2B c24366cd226b8811bf2de929543bbde931d4ca0d3476fb86b55cda242943a015ff232a10672765a0690114ad3c0ddeae601ba0e4c4a5123063170472b3c00a8d SHA512 909a3ea15c3956e7e0a1d6674bd0c1d5f244d9f2df1b7624cd65c6733dd2101d9508e47790ed45106083026dc6fc4bfd16a090c3ca1393422fa7cc90456707da
diff --git a/dev-python/vatnumber/files/vatnumber-1.1-skiptest.patch b/dev-python/vatnumber/files/vatnumber-1.1-skiptest.patch
deleted file mode 100644
index 9c99901cd45b..000000000000
--- a/dev-python/vatnumber/files/vatnumber-1.1-skiptest.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Remove test that accesses network, bug 440964
-diff -ur vatnumber-1.0.orig/vatnumber/tests.py vatnumber-1.0/vatnumber/tests.py
---- vatnumber/tests.py	2011-09-28 18:32:09.000000000 +0800
-+++ vatnumber/tests.py	2012-11-26 12:32:46.177509425 +0800
-@@ -198,13 +198,6 @@
-                 test = self.assertFalse
-             test(vatnumber.check_vat(code + number), code + number)
- 
--    def test_vies(self):
--        '''
--        Test vies
--        '''
--        for vat in VIES_NUMBERS:
--            self.assert_(vatnumber.check_vies(vat))
--
-     def test_countries(self):
-         '''
-         Test countries
diff --git a/dev-python/vatnumber/metadata.xml b/dev-python/vatnumber/metadata.xml
deleted file mode 100644
index 30cf1007b1b4..000000000000
--- a/dev-python/vatnumber/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 type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		Python module to validate VAT numbers
-	</longdescription>
-	<use>
-		<flag name="vies">Enable VIES</flag>
-	</use>
-	<upstream>
-		<remote-id type="pypi">vatnumber</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/vatnumber/vatnumber-1.1-r1.ebuild b/dev-python/vatnumber/vatnumber-1.1-r1.ebuild
deleted file mode 100644
index 2bbe7ec2c0e9..000000000000
--- a/dev-python/vatnumber/vatnumber-1.1-r1.ebuild
+++ /dev/null
@@ -1,33 +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="Module to validate VAT numbers"
-HOMEPAGE="https://pypi.org/project/vatnumber/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test vies"
-RESTRICT="!test? ( test )"
-
-RDEPEND="vies? ( dev-python/suds[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/suds[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-skiptest.patch )
-
-python_test() {
-	esetup.py test
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc COPYRIGHT README CHANGELOG
-}
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index c162b2fddd6e..800ca5e9bc25 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,8 +1,6 @@
 AUX vcrpy-skip-network-tests.patch 772 BLAKE2B d98c50fde4e3df3d4e62285e9136061b877e632153c6a6ed35fc84734c3f2d744ee030930253655954bd25d334f87c1e9518fa1fd86a56b7c7b606b7ef7aa11c SHA512 90cd2cc3a89a7019b88687a54016deea9dd60cd1d80f0511f58d25efa7ad24ecaedf8e1187e3455bd7cdd88a4506787867fb04027e638ab66672cfd809ba6787
-DIST vcrpy-1.10.3.tar.gz 61804 BLAKE2B 58ef423cb7a7c059cf7dc863565420be6829e6b692becfcf8a38b94121265aab832d77deb04cd1c3a622df7bd9bdf1540fc74f63c0f3f85373536cd35c23a01e SHA512 976f3d9b58025ab5c3a8a666138fbbadccaf8612edea63ac4fbf307d55888eb688bf27dd0f24b0d2c5528c951ced533a52cf13c33bfb32d7e89f241ff508018d
 DIST vcrpy-1.11.1.tar.gz 63122 BLAKE2B da0fabb1eb342eb268923bcf433ac108d06fc111714834e99d9364358064ad0814bff1463f49bea60c59fe901c46fc8b78c4129e9bb4ab6736266f18b3bdf272 SHA512 d883b87d5b3017843dfc2e33241953ada27d50ffda4936ba4326a392acb9c7667474abd054d6e44b0208096cd96b68e87ec9780c0d6fab77369cc4e517617395
 DIST vcrpy-1.12.0.tar.gz 326731 BLAKE2B a0fd5aa3fea1bef336f0864a6d89e7025d2394f89af23ac9a3ed61430c85b9a46584c528398a03debcce646767bd85328360513476bc89ca067e705767fe85fd SHA512 c47d50cd399fa11eb6fd1d210b056ef9768e501799a9774f7338370177754e35b9a9ee43ff5cb7f1f43073624f9011cc1ca230dbdf317c1bccd0ec6b506c61e0
-EBUILD vcrpy-1.10.3.ebuild 1151 BLAKE2B 45a0f6cd8af42a73db82259fa6ed9af50b8695647d556d692e2391919116f10140569fc070504cb3a38d3b2e2532223258518ab0776a89c7ec608d8d1ac60f43 SHA512 46b91b18c5aeca8231be688fc368a237b8c4a65ab69408e04d2e20771844698e3f80259f7d27712bddc8d25219086c2641bbd01aadb7d88f49380f59f7b9a60d
-EBUILD vcrpy-1.11.1.ebuild 1283 BLAKE2B fae3d322fd9d9bc20f41e8dae872fe836dc706223c65df511a8530f8f044161f63ab1c50ec2928de3eb897f7e094f932e3d21b0c7887415092337873eb3f1402 SHA512 d7fdcab8e624143e35865ee96c38a6dd71b46a024707286c75e55de9a1d22271133c48c95800fb20b1690f7c088f56e74d322c109a60d9cd631b13d2ff45e530
-EBUILD vcrpy-1.12.0.ebuild 1287 BLAKE2B 3937a1a8d8d612a88cd65c055edbb1666fc4eed2a9e370a0236198de2aa086d08dcb75b6ab539392839db18f0ee184caf021ec27ae3f2356b713c068c4d2a879 SHA512 25eb9d818a6e092b779f2f02198a4c89780ea0f9c24bebcfc556bdbaf42eac0554831931c04d8a724ef80c52c964d32d6b57560ba405b8012135865120fd0d79
+EBUILD vcrpy-1.11.1.ebuild 1274 BLAKE2B 140a9ff05f90da5fc6e27e8a0691e2e6f6eab078046c9124d22f0b26937d843d7dd069a5d835fb77984beda0c28f041b88db55be822de67040ada08b576dcee0 SHA512 eb52502b42b1a73d5d91f7f6f3f41ef9b57db1b4678a10a7e7b82c4c80bf0e532d3fd62b5a5db608ae2de951ff66cddc642ef9a100afb865bfb8b545f560b5ad
+EBUILD vcrpy-1.12.0.ebuild 1278 BLAKE2B bcb4c5ed349eecae45c7bba67d0115cc1b53662289bf2d9cdf288313292fe2322ac238cd128b3d87ab70c540711f1cd069ca3689ace673f0af13fb335d53f5fb SHA512 30ebe63e05312a30ff6ac8d3809d71ec404f77f377f77d0efd311f1ae81b0a6181be0c001268ba2c3f98bce6da1ded18ee97ccf48bf01de85ca052a9175fe831
 MISC metadata.xml 363 BLAKE2B e447766d191bb1c155e27a7b892fd38df143e2bb0f45be8b635df6bcef92f6f292db010b22659d0e699f3f333f84d0be24d3c9a293e1a2f00f641e21a356daa3 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804
diff --git a/dev-python/vcrpy/vcrpy-1.10.3.ebuild b/dev-python/vcrpy/vcrpy-1.10.3.ebuild
deleted file mode 100644
index de91d5b7b15b..000000000000
--- a/dev-python/vcrpy/vcrpy-1.10.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
-HOMEPAGE="https://github.com/kevin1024/vcrpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-#SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7)
-	"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -vv -x tests/unit || die
-}
diff --git a/dev-python/vcrpy/vcrpy-1.11.1.ebuild b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
index 51472b897932..5a8a6c820808 100644
--- a/dev-python/vcrpy/vcrpy-1.11.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vcrpy/vcrpy-1.12.0.ebuild b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
index 6d3160563e14..46c4ba6d5865 100644
--- a/dev-python/vcrpy/vcrpy-1.12.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index 69b22ef6bcb2..eee0f70539c2 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,4 +1,4 @@
 AUX yaml.patch 1063 BLAKE2B 33d954db0dfb7caf5db07bdc287ff8f7fdb74edad7f92ea5ae3ec1076fd02077e3c87f2d12907a6eb9e419b506bafab7ca84dd0c2ca282aa08d24eccd3054ff8 SHA512 c2fa16dd567792cf7b31e1bc3a22d647ac40f4e3302c74e61202b8cc1bdb099031029ed8090ad27d54aed7d93052cc099a6bdc2e8849194ade2db44bea44eb5d
 DIST vcstools-0.1.42.tar.gz 65979 BLAKE2B 2deb29116e891bc93410e4a8f58938009140d01baaa834cccfdba2be3243d98bb11507fd134284bc1dbeca1434ea0eeaf2ed332dcb579bbacf1bc92815f8623d SHA512 1b54270c878684862eb607c2e445fe24d8edfdd8ea2cc75e899044d9e8e89a882fd2dd6fb7825553f83003ae7af08850c18fdeaabaa107a6bfdb2759b32e8fa6
-EBUILD vcstools-0.1.42.ebuild 1473 BLAKE2B 582d879431fe29da3b7b5429bc22db89b5d1d0e4c3daba3277884512da23a69e68be26d16ee478d9bb3e12b69c67402b8c47387f497bd576727ef685073a7e11 SHA512 ae62c8ca5f9b43d912bfdb8debe9b8075edb59d19c48356856d6247f4f2187849693a38fda5f824fe455d79cbff4a9e133cb8ea9cd65255cbe48f81e03d4fb70
+EBUILD vcstools-0.1.42.ebuild 1469 BLAKE2B 6aa211ba1456ab6b80a44761c98ba3a7195702522eb1f14839dc793e46e56b57cde1f3cba6c6d9cc96af6b6b9e5031bb87ae5a7a417a5109b41888882c7dc82e SHA512 a7fec4940064e188c24f384d02e8629f1b475c6afe59a0548cd1ae687801ba148cc4ae79e1a70dcd2e867c39ec9eea9a65f526582f901ddda789fc17be4eb22a
 MISC metadata.xml 331 BLAKE2B 11f0b79892ca57b4abcbd3e0538168569338972295dc250516dabf12f650416d013be219d17401ae24129ba40bea056e4831940982ae6b0368046e1efbb76974 SHA512 dbc3f8205ab4e4788a33377fd00d438a9bcc4558ff02989f20befb19de690428d377ca8e0450a47bfdc8654f74123e0e4b02a9a26ffe4f27e1a737266f5cf918
diff --git a/dev-python/vcstools/vcstools-0.1.42.ebuild b/dev-python/vcstools/vcstools-0.1.42.ebuild
index 721071fc589c..7ff43c36b5cd 100644
--- a/dev-python/vcstools/vcstools-0.1.42.ebuild
+++ b/dev-python/vcstools/vcstools-0.1.42.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/vcversioner/Manifest b/dev-python/vcversioner/Manifest
index 20f9952ca4d6..286c6f90ebc5 100644
--- a/dev-python/vcversioner/Manifest
+++ b/dev-python/vcversioner/Manifest
@@ -1,3 +1,3 @@
 DIST vcversioner-2.16.0.0.tar.gz 9024 BLAKE2B 70d61a0d65129c28c9febfae54454a50ce99fa3478b4948fb677b90f52d7abff4c14b69ad8e71b26c45cb40a7535be8f916cdf3951a1ca932e1b7d0f07ceae0c SHA512 e4e34693aa813e57991eca01d20102bd2e939b536461e2e9e063ac0e3558580e57d7e8d5e08d010690b3c901c97e53f187f20b48520b333eb492ec33e85757d8
-EBUILD vcversioner-2.16.0.0.ebuild 676 BLAKE2B 0310e0d75b690d84170bc09644a69a2145010127fa091a5c51787b889c62fd9e1a019198a4935cb39e8a959a94a0c620ac6ad5bfac4a066f0d5226207e9cc6ec SHA512 a0aac47cd44061787951c9f87fa4cdccfc3f34d9166a33e400b428f75261201b24181bbbce8edc38bd371d89aef327d99217853c2d1361668ee679f3c8b7c030
+EBUILD vcversioner-2.16.0.0.ebuild 669 BLAKE2B 46d918468246547b815a8af504094f8100f557b08b0357f39f1931bfd524689fd93cbaca7395d8372f3bfa550e8243b325f8f0f37388c8aeeeac029358de7dcc SHA512 97e416c009c9d39c1a8416c02f23d722ebdc6be45a56cd959ce90259962600c5ed05de10c1052ed80c7fc2e18b5fe9d2aa199f40f24c9c90360382a011a07b3a
 MISC metadata.xml 308 BLAKE2B 4d08920d23a6a0b63b12dd665f4002efc68eab182ee8be145f7d9f707bbf028ab84daaa2ac37386397173c9cb6251270a7500e776d9f3264d371bade8ac923d1 SHA512 550f181e53960f17bc2aff125dc10ffdce51bfff4e8b61572bbf1133e39a1e18ac8e473880504994447fdeba479c172c14aa0c20777ab4e7b07c0e855c686fcb
diff --git a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
index 4609569bd469..98c200abb4a8 100644
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
new file mode 100644
index 000000000000..58dfc30c02dd
--- /dev/null
+++ b/dev-python/vdf/Manifest
@@ -0,0 +1,3 @@
+DIST vdf-3.2.tar.gz 15050 BLAKE2B 62118879607462d9c205ae454f9187bb20267d5eefb3f0cf7efc5b93585b5400d565063dcacceb4dddf489371129bd4710ea2bc09db35a9739add1c4dafa992c SHA512 c9b60f6999c08b2610ea6ad1e6fd9d143ffabd6a93af65fc5ee39d775a6f9a2dccb002f19ce72a1d7de6e53188fb98bd4a0dc4074047b74ca53991294310175f
+EBUILD vdf-3.2.ebuild 519 BLAKE2B 5eb9825e4b86bcc83ff680f8c70ffbf423ba55fa59a8e29fa933991d31409cceb023947950a91bb4cdeeb0f0832f491a473a91d8ce87dadfadf63a55bfc83bc9 SHA512 6d5cee7a55fd63e9532b32ed9ca75d2cb4c16fe4d04764e8ce240c6e346513235692085ca544b968c685027193721dfd7eeb0e80fd3db9ddaaeb8903169bbda0
+MISC metadata.xml 366 BLAKE2B df19925265c9cbb45a9e51a18c52bd72e6b544cb42fe5ce192a94a351faa38242c0d85ba0d9ba1f83371990c011ea30233960c5a0ca3349bee27d1bd94ba1b61 SHA512 2cb7d9ef5bdfc2b9ba4d991c03fe882f41cd96be13e8e5d2ef49217c7ab5962c1f02ad21aa9bb8a3d4dccecacf0a9c5ea3c7022ee2cc0c88fb42662a3f8a751c
diff --git a/dev-python/vdf/metadata.xml b/dev-python/vdf/metadata.xml
new file mode 100644
index 000000000000..4807350e1a8a
--- /dev/null
+++ b/dev-python/vdf/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ValvePython/vdf</remote-id>
+		<remote-id type="pypi">vdf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/vdf/vdf-3.2.ebuild b/dev-python/vdf/vdf-3.2.ebuild
new file mode 100644
index 000000000000..4f55cc99fca6
--- /dev/null
+++ b/dev-python/vdf/vdf-3.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A module for (de)serialization to and from VDF, Valve's key-value text format"
+HOMEPAGE="https://github.com/ValvePython/vdf"
+SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="${PYTHON_DEPS}
+	test? ( dev-python/mock )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 268b7d57287a..0124067e45fd 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -2,8 +2,8 @@ DIST vdirsyncer-0.16.3.tar.gz 113327 BLAKE2B 9d293562962bb121b7dc48d7bd7585cd660
 DIST vdirsyncer-0.16.4.tar.gz 113368 BLAKE2B 6d3419456cb16dd10b9af19f7912a2a1e95af6d45e8fb3898f40f3c140ad26023556dd579de236850056cc6b78ffcbb95a45cfb427dc48f5425d0a40863f7aca SHA512 c01bf6bc5144629b82a3a60934fa6b89b0c24c55b09b98c54cba0a85d1e97f1c2ea157e159221ddfe4f11309cd5944eb2696ebc40b9d3ee95ea0801aa1eb9709
 DIST vdirsyncer-0.16.6.tar.gz 113249 BLAKE2B 51b12631c1847d68c5e9839cf8a69d09941a96b2907683246bd200271d6cd49041cb104ed59d01040724d4423cf1695a11dcf28a59c5affbf5fb8aa314e73a8e SHA512 b96467da4aeedbf6c582dfcc31cc6fbb88f8031e0e3c7c2fffc2e921cb927c6fcc937ac0da5ab74861bef34959dc05bd15208ec0380d83e727b3f55a5872404a
 DIST vdirsyncer-0.16.7.tar.gz 112786 BLAKE2B 19b9ce6e3e9de0a626b9562b4d54b270c1532d93169fe2d872f15c6bf6e1ac94bc623c171e51e871082422116636b4945b58dd172cfca527a010906737f1b6a3 SHA512 218c6781139a9e979077308dc732756cc27ecb67966e4b52be31cb1ebf04d224443036102d5c4bad253b9dcf533939f0b72082166f0fe94e042a7e946b8fad0e
-EBUILD vdirsyncer-0.16.3.ebuild 1496 BLAKE2B de3b7fa4d2c1f14a74a6c269622b280f85265575aeb3eb79b621bb2441ed385753eec30d9e7fbbcf3e8a34e3b73dc51b460ca932b0cc6f4839d82b8649e47476 SHA512 b67ee5fdef5d70d783f9f731115fe127079d97b4455b334db41f900cf86ca91caf56b2733d4f8cd80ab3e6b212b4edf785a4cb7159bbb609886fa6a2fa326bdd
-EBUILD vdirsyncer-0.16.4.ebuild 1496 BLAKE2B de3b7fa4d2c1f14a74a6c269622b280f85265575aeb3eb79b621bb2441ed385753eec30d9e7fbbcf3e8a34e3b73dc51b460ca932b0cc6f4839d82b8649e47476 SHA512 b67ee5fdef5d70d783f9f731115fe127079d97b4455b334db41f900cf86ca91caf56b2733d4f8cd80ab3e6b212b4edf785a4cb7159bbb609886fa6a2fa326bdd
-EBUILD vdirsyncer-0.16.6.ebuild 1496 BLAKE2B 2a29fd60d17ab437f556c9d67a43c3a8a57618e821d8666c87eb1a59b9d2c2d68293065b15f0d25cdc12f64c5bca3454f98404cbe119a9420a17f4b13988afb0 SHA512 68c31ce56e36047b71efd7fcf29f33d7d725077c5a6f3e09c62133e9c983e43c30226cd93f034f4ecdf4fdeb78fee80f3e1849fd752926ebd99ef7e35ff28fb9
-EBUILD vdirsyncer-0.16.7.ebuild 1496 BLAKE2B 2a29fd60d17ab437f556c9d67a43c3a8a57618e821d8666c87eb1a59b9d2c2d68293065b15f0d25cdc12f64c5bca3454f98404cbe119a9420a17f4b13988afb0 SHA512 68c31ce56e36047b71efd7fcf29f33d7d725077c5a6f3e09c62133e9c983e43c30226cd93f034f4ecdf4fdeb78fee80f3e1849fd752926ebd99ef7e35ff28fb9
+EBUILD vdirsyncer-0.16.3.ebuild 1492 BLAKE2B b82249d2b6c5f62b7cda5e2e4fad569ef901f1e8b6d646ca1fa3c702e816b1b3325f91457b25a332745089b19c5bd3cbf2832f2c13eb48009aba2bafdbd6acc1 SHA512 e1da2be731fa10b14b6a3622b4accd78ae8f59d70c3b6a1519a0bd5e97a1cadfb9049631e2c07116c2472982f54c628463691770b2a9df0b1b2ce4317ec7af07
+EBUILD vdirsyncer-0.16.4.ebuild 1492 BLAKE2B b82249d2b6c5f62b7cda5e2e4fad569ef901f1e8b6d646ca1fa3c702e816b1b3325f91457b25a332745089b19c5bd3cbf2832f2c13eb48009aba2bafdbd6acc1 SHA512 e1da2be731fa10b14b6a3622b4accd78ae8f59d70c3b6a1519a0bd5e97a1cadfb9049631e2c07116c2472982f54c628463691770b2a9df0b1b2ce4317ec7af07
+EBUILD vdirsyncer-0.16.6.ebuild 1492 BLAKE2B c1e9bc3e593b5e4f5b8e2a52727b7c80bd1a634f959b34bf3b92d9fb7ae2ea1c648fa321e4b6ab97092b86539504175a841b6c9e09edebc0b4a6f489eb133ae4 SHA512 6b5a14b28fa4e2d03ce239f4dc0ff6a08b107aaa2737ae1225e61b3831e17bdb5fa561c316266d595a4ce0593f25ec20ef07d60b6944e548b2dfe79c5d47218c
+EBUILD vdirsyncer-0.16.7.ebuild 1497 BLAKE2B b6136eea495e294a2247319bfb89626261c4c8a2e6d325b212e7196a733a4ae16f4f8be95960210b5e5e9807081207c65ac9238ba39219fbf2de6a1ebe29076f SHA512 de07ff64e6bc70013e9e449b26351dcb795409e2a2354287b69bdedbf186e04eee68011440161bf3a1301a312419fd04511279aac8a1db684b6bfce65f958ef3
 MISC metadata.xml 349 BLAKE2B 20ad2ded190f80b37283e6ef064168094e9edeec5ca6ba262e9e6d977bd28d1538056b21efa7fecc090b63424a23f87c54ec1e2e2dcd02a2f4c5ab7b4b82abe1 SHA512 5e2d7f27428065740bdee11e59053519c83054c19156f77ec03fc6e416ca44ea0b74178844ac8ef84d1993927bcf3ba0b80d84296a152a006681ed77e87ed14f
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.3.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.3.ebuild
index b71f1d3ed37d..a8b29435dc15 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.3.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.16.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.4.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.4.ebuild
index b71f1d3ed37d..a8b29435dc15 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.4.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.16.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.6.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.6.ebuild
index b3a7e313b673..3388b9ae8c69 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.6.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.16.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild
index b3a7e313b673..353f31c6da67 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/pimutils/vdirsyncer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/venusian/Manifest b/dev-python/venusian/Manifest
index aa2c1e578be9..07f141636034 100644
--- a/dev-python/venusian/Manifest
+++ b/dev-python/venusian/Manifest
@@ -1,5 +1,5 @@
 DIST venusian-1.0.tar.gz 45747 BLAKE2B 3ecd318efd3a886166a6376fe480701e4981c75df636101ed1e7d6ae522fa81097ab64e64b699b7fb3c03c90b8b081d37181e67b2786a282cad18603fe97679f SHA512 770780c4e4532b16e119365d3c9531e85aede9c2be2e3a333cfe43856271c7b232ce1b27c1379f677a7191c24e8736bf5307be7a926b613f7b81644d404e8453
 DIST venusian-1.0_p20161030.zip 64972 BLAKE2B cc83841177cf9f3d1fcec53b0b19a7f8df3ca4eba50f8e766ea8483eff2dd5aa2d1a01dd83cd5f6f1a2b9aaec97939a31301130264e4bb84f36f644b2725ebbf SHA512 d6e08beb7c6e29e8a30c2c94eb431bc1c2181dbe0a7fb911eb042035998b6c6a0c9fb827d46172916b3dd594335543c2670eb2100eeafac4cc25ec360b8adc57
-EBUILD venusian-1.0.ebuild 621 BLAKE2B b4acc9d0754dc05eb093b6c54500a676268d66f7cdef2bb3fbb77c10830cbe9396f9be323a7720f26ab812f370f4ef051822ce563011f3df6fa78fd60b1f48a1 SHA512 8067f8c7be628df847a35a9b6b5150c3100d5151e746e696765ff95c1a5274d5a178649834deb755cfbffccb3c6ca00d2d74f336e2a9095e6b4b4e2dd7e115ef
-EBUILD venusian-1.0_p20161030.ebuild 1058 BLAKE2B 5786e4d8b41a3ef50c65ce622002130f04b320182ee5d5e05208bf533df771b337769b1fcc0eddbe2f7f10b12f16192b35aaeadfc5b91c2db3f23bcd37a08d44 SHA512 e278a19365b3564dac68025897d40b165954e3f0c66ffc7389e6b42b4550ed379cebf91cea2879f28167288c8b8a432f0b83f77fe4b2fd21fee820b9a96f7f5a
+EBUILD venusian-1.0.ebuild 611 BLAKE2B 377fdcaaec84a506462f9c10437fd1487210c0f54b0fe031b907d65794aa38b33f8a51c35acc1df963b1362871e27650a509943d541d8ef7cd0a89e7ee8cd814 SHA512 34b7a742d09a4ca1e5ff768f52dcb112b27cb2fdac0330c95f263da6d785fd2ee839995f04b01ec235519da52062f5f961abe4d72163eb4173699e584ef30294
+EBUILD venusian-1.0_p20161030.ebuild 1048 BLAKE2B 7438acb4bb25b2734e5ddec186d7204a97cfd474a7f05c5fcb97bb9ace30d758b71e3eb611e31684d7bf3c46a445eb69aeee1583f5b536f7809907c2d4dd2292 SHA512 f6237cb061aebd518d67aabbdcf7bfd66076ed09143f439df6e5117c269c668d53cfe24aba0c931481adb8c9b4fd9ec3d479a81bbc27713589202bef4fcf4eee
 MISC metadata.xml 311 BLAKE2B 0aff809a96aa73a5c796c196c1f8751d5d45a9576e124395a247cfd7c2138c97bba7d08541a15edd6275123f9840dc0fb699f5db7188ba76a6ca87f35da4ec60 SHA512 fdbba18665ba09d35690fe85dba1e4a3736d7b799e20e4c4d656b0c7e724763fbce4eba75f3fedb2c8ba63e8be3b8d0fc25dca1d12061381a84b4bceaef50bf6
diff --git a/dev-python/venusian/venusian-1.0.ebuild b/dev-python/venusian/venusian-1.0.ebuild
index 4b0fe61727e0..404769d91937 100644
--- a/dev-python/venusian/venusian-1.0.ebuild
+++ b/dev-python/venusian/venusian-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/venusian/venusian-1.0_p20161030.ebuild b/dev-python/venusian/venusian-1.0_p20161030.ebuild
index 4fa1f2230896..1f12a2481536 100644
--- a/dev-python/venusian/venusian-1.0_p20161030.ebuild
+++ b/dev-python/venusian/venusian-1.0_p20161030.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 COMMIT="ec4032596e3aec987ba29b62cac701608ef3b523"
 
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
index a3f1ccf073e2..dcd0c2604301 100644
--- a/dev-python/verboselogs/Manifest
+++ b/dev-python/verboselogs/Manifest
@@ -1,3 +1,3 @@
 DIST verboselogs-1.6.tar.gz 8837 BLAKE2B e2bfa398e595c7229fae5b8087ecff8575441c0acde172ff81402cc64d27ee866557b0f7028b7c8a7b8a51cfa6f5601b94d600d48503f684d054b25536d4f600 SHA512 618556820c8585edea5ecf86d4b19800f216764c86eaf796dbdeaa5e2b6ace7940c01e9cf94a499a4619bda8b4b8761def8c6e4200a995da511bb23109dcc7e0
-EBUILD verboselogs-1.6.ebuild 489 BLAKE2B de0320c8c90d5411386e2eb02029e6d836f4425192032cc1bbc5ae1ee03185e947a72c230d9265e0f0b30172537e94cdb3a77814243fabcd378d98f9d5119133 SHA512 9762986a5185c023e86da4205709eba412dce174a0c8df2e001a1d5835df2a8cdf8a6ea5c744d6b528f59f07135883c1094c204553ff8bdfdbc9978a7ac6ecc4
+EBUILD verboselogs-1.6.ebuild 485 BLAKE2B d1eb2f2bf3b986d3a1b3ec11fe1c53ab2b6b2418057c367a91690e4681f6a41a2184d31ce28283c5c405e6df317e80556decd35f1fefa1b1f5eb13b2600088f5 SHA512 0385fb81e871b94a8c04799ead4f77cf8ed5f42575deaaf7d57ffc7bb404368a407ed31faa3b553336aabab303119b3e2c69793817d74caa4763f1ca58832411
 MISC metadata.xml 324 BLAKE2B 6c8d909bd018e46f81fef3a30b87b7dcec5d48a31e919c6c60b000982d31486cb6fd8639afe42351579099454757922d7b05be5e196a3902b6ee199ff5817955 SHA512 4e0057695d4ab3557dc29f6ae0031d780cceabbcf6c0b07cdf80f11052e64cd90994c93a4d09213f875d54a1bce1cee88287ab223bc4d7c0cf4a70095614c039
diff --git a/dev-python/verboselogs/verboselogs-1.6.ebuild b/dev-python/verboselogs/verboselogs-1.6.ebuild
index 2ffaa02ded98..39afaddffa20 100644
--- a/dev-python/verboselogs/verboselogs-1.6.ebuild
+++ b/dev-python/verboselogs/verboselogs-1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index e7ee16491be6..fb982568e9d3 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,5 +1,5 @@
 DIST versioneer-0.16.tar.gz 37736 BLAKE2B df66304770ca0ad85cde13ed1870df5901bb5526935b3a17a28dcbb267db3a8a822c1f43b16643c7f7237225c27b50db94cc0d4c3e87dd58a004475fcd64bc54 SHA512 90604d69351c822dd5a1e8eaddbe6af2e77895c7e29148a75306833f04c59e18ae8ab6c928860ce3b8c7ac46245f2ed856485fdcffd790f436e689c408ddeca3
 DIST versioneer-0.18.tar.gz 40552 BLAKE2B 640c010958a0178ec5ec5f06c986d83e3bc2f49df95583c4c90d3058449dcca5c7b5421ee5f2f56905b1d949bfe3bfbd87fb23ebc868ede591d078d811ccc2b3 SHA512 8d4522932b1f6aa1c13211008a57a572d54ea677cbdecd7d563ef8f77c76ed5d59f58f2e3be38a01e8cd102c264baf5c8949e9c17ea98d686ac497f8ad8b0011
-EBUILD versioneer-0.16.ebuild 809 BLAKE2B 15c975fef4b0ea57f287b9a488258cbd79d9357029ece2167f348887b26701832b2283fe02e95ab26031c1532398ab0e8eab119bf4986733d35639253f3c9bee SHA512 7262f1538ec2bbb39dd78872bef84df32ee3e2ac7bba93d738b7f43664abb6b12965b677d9554287e2b3b4c5a1315a91dc532c076a9666037a518c51df316e7d
-EBUILD versioneer-0.18.ebuild 811 BLAKE2B d30bde8695a9077a69612e9b5b32f233d068c0ec7486f7418098ef80a9ab4d0cceb4759aa51d9edf5463b22b72640f2ad1a14ea307694afb0bed25b1c7c04772 SHA512 452dd4398473e4134435222ee3c6494404c60fa822832a7827dc24611223cb8cfa330f4e0b357785403b4f236af5f6ef09cb72b4501a0d6f065d0d604fa84c1f
+EBUILD versioneer-0.16.ebuild 802 BLAKE2B b60060e845526b278520c542944350fcf963e1d3dfa90caebe007133d7f8a55dbda462e3caefd9c9bb2cae175cb5ebbb392a5468a067ecf0ab98cdb711df0b8c SHA512 9ff6f91c16fcabe8ba2496a00ffd47f4a42c58c7ee877cd811ee2aae53fbb123ea7bd9b2b8033172d0f50f375ece994f97bac16376064621f234452c2af2294d
+EBUILD versioneer-0.18.ebuild 804 BLAKE2B 5c4809ee1359b7804c80d5e1f1cba7ade833c64a44a8d2d09110d3bd7ea438a8c663d4455295ede81632902dc69da34a0ef7f0bc28e406dea800f59d22c6566b SHA512 8cc4f33d17a503c9f76ae966fc0451c3307973f61046500e1bef605c86f81bff3ea239a10b41160a98ae4b3a95ef408a36b1d9899c11ebb8232690554c3125c8
 MISC metadata.xml 389 BLAKE2B 44aa4001cf007b381c8b974b3cead34f1b403b0b604ae5bbc09fa40d7ee152e2f102e8ec3e52a2ea186404ab6758f4e4ed5dcdc74335d464255d5796144303a9 SHA512 56007f4ca5e05201b08750acf76d0f83a017b54b4d2533084615f2a74ed288cc0d82e6824d2da31684dd3027a3a53f8b261cb5e2371a089544f8edafce595ffc
diff --git a/dev-python/versioneer/versioneer-0.16.ebuild b/dev-python/versioneer/versioneer-0.16.ebuild
index af2a4b0df72a..2dc2682f99b1 100644
--- a/dev-python/versioneer/versioneer-0.16.ebuild
+++ b/dev-python/versioneer/versioneer-0.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/versioneer/versioneer-0.18.ebuild b/dev-python/versioneer/versioneer-0.18.ebuild
index 4c142e7b9ce3..4855fe2a603c 100644
--- a/dev-python/versioneer/versioneer-0.18.ebuild
+++ b/dev-python/versioneer/versioneer-0.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/versiontools/Manifest b/dev-python/versiontools/Manifest
index 7f0949ebeab9..cc56d0d23939 100644
--- a/dev-python/versiontools/Manifest
+++ b/dev-python/versiontools/Manifest
@@ -1,3 +1,3 @@
 DIST versiontools-1.9.1.tar.gz 19089 BLAKE2B 796f1387871067298acc60d274ba5a9c976978b4ff229d89123ded918c0873063343b5e5c32c00959d94c7a976bc878c4de5a7594ed629f16ea2ca3c638e3e6f SHA512 f062eecc9998bf194dcac7c52065757ef546aa94bbe7d5b6786ba10f1e44486df997e9a314ff60a0d4e88a2620824217c8add516011baa2ee4e26ec19f762892
-EBUILD versiontools-1.9.1-r1.ebuild 678 BLAKE2B fcee5a26799c98b0f1c9b977c5db9d8fbf1b1410b78cdff2447382e297259282ebd32a6aabe2acda1de4469070037b253e8fb26211daceb59edc7abf7c3440dd SHA512 603a3c0175b09e72daea9344b8b9893dbf67fcdf4d6b2e413d697360e75dfa3b6947c2218b8340a32c1f33d0812b678a8ad5ae001f28c200089f3ed2220d309b
+EBUILD versiontools-1.9.1-r1.ebuild 669 BLAKE2B 11b8bb546a3029d8e228cf544a1a230e89e3da4010c6047b587692da06026eb88a5b2d19740d67d2d910eb11d2b88de9882700c05bf928e481ad9918f61cd62c SHA512 f536d77f10c1791692812ad62c66b36453969e2b81de1c9b4014e5b93b69501f3bcef14bb656280df1a6dac9143f4f00b2007980751ef222679e5a101944f100
 MISC metadata.xml 370 BLAKE2B 3a2a2aab0c8e30234df740b1320606548df9e9f6e10f3b53b8822e28e7d0ece2aee643265c42a25273cab99eb38f0c5d5f3add94c5660bb8195e8ccbefe43e0c SHA512 2960d71bf6f0a11dd92600c4e62103ead304ab6d3215034fa72253bd57d7a64cea5a97c324df1d5672260b2f679b02e45efe01404cc65a45f55d751a721e48c1
diff --git a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
index 8b1b8dd4d492..2f6bdffb0545 100644
--- a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
+++ b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/vine/Manifest b/dev-python/vine/Manifest
index 138dbf465276..4c2861ca56e1 100644
--- a/dev-python/vine/Manifest
+++ b/dev-python/vine/Manifest
@@ -1,5 +1,5 @@
 DIST vine-1.1.3.tar.gz 52520 BLAKE2B 751fdc358aac52403ffd9c6f9f112f68b363fe0ded465ebda732744bc2dfd6e10d8bb57cef357e65fa16c1954ec2657bd8a4f80ae81f9432dd03aaafe79a2535 SHA512 7652b1527021b2f45f3a372c65a6f196c22edad60ab1e8adbafe7174b7dae912f24eaf34788672c762ea9145ebf3d48265fa4ad99f3084d85769242f4e8bd87f
 DIST vine-1.3.0.tar.gz 51953 BLAKE2B e58d750dd7a84f4a3abb24156de6ec7ab84a911692587643cabcb0df750d3768e70b14ea134da4a39978782ecc530f4fa08ba0ecb780a7a32fb2d9b506633ef5 SHA512 f7242378ebc9b591b6e0a7b6263514f32cee4b996bc6461313221b9a391dd0dd1d833591d6e9ca72ae003f6ce5c4204856d49bb5e57c69a125072cac25758688
-EBUILD vine-1.1.3.ebuild 632 BLAKE2B 86dd2ac0a221bec1d290316dac4173bc91f33ff8d99d1f0629cb7ac64fb49f8749fcb93bf12c4a2023ea15da52ba4bc4a00b7a539fcf53a1b67956e18b24d419 SHA512 23e7c6725e74d7e527399e8f57512d4432c3028d985f90019a33dda8a56816439054b53ce76d76f73992fb56696951fbbfdabeb893af309b9b562523a3055a78
-EBUILD vine-1.3.0.ebuild 634 BLAKE2B 80d866f163bee231497e9187995d61a4f8ac5ba49444cfea6c8e00f5e30b2dfae34021db4e681a229269348bc8f169690263b0e66a8d00e6b85b6aac4522ffbd SHA512 c2874c8d0abd0a8503503a8e72d872e90effff5402638b16c8884cb0993b7747408d003b2664ceaaa74b1aab34c5415cc08809729af80ec003bf330fb970d7d0
+EBUILD vine-1.1.3.ebuild 625 BLAKE2B 3e7e7df02c9e3daba96b8a489b88d7f35c8d523e89ee18c8c1d70eb4156748714a76ade39c6143a3e321dbf21e65c82dfa030a0a406a7f038333d7b7896cbdee SHA512 868ef89cbb58055be506a4a79396a4bc06f9d9aae122716bf5ef88196481be075614665ab5c9d96fcdf7e1efa72e576a229c0129efc39195805a35a0785461e4
+EBUILD vine-1.3.0.ebuild 627 BLAKE2B 0e412e931ed3b034b1c933c88e2b7761c5d9d25c0e4b86564b5694e9c4e6c990aa22add9c2f80ab79645d7f88f684fdb3436e9a7a17c011db6a9bc5a58e10525 SHA512 14aa07b2c6c288449badc4f81c8d2132267aa3f657398fe872600168ae7a5a743d42c189a13da32ee5e45b1af0225ff5c6a4b4a2d8a9632bd8c688c258f29a9c
 MISC metadata.xml 336 BLAKE2B c113bf51d676148154f535f077ce15d52100f3f2acd6e7cdbf715f41876e6401cf755d980d66cf61bc4b0fe0884135fa8478a7512c518253d081e3ef5b75494f SHA512 992b2b4914db3beeba877533b6ad293f6449f230e2eefd8ede373cd1f9ffaeeb79fbb92234434b38c9c392a88e52779e5b0cdc6b4f1e3f69098b7847925ec21f
diff --git a/dev-python/vine/vine-1.1.3.ebuild b/dev-python/vine/vine-1.1.3.ebuild
index 1fdad51c3851..cd4e2df612d0 100644
--- a/dev-python/vine/vine-1.1.3.ebuild
+++ b/dev-python/vine/vine-1.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vine/vine-1.3.0.ebuild b/dev-python/vine/vine-1.3.0.ebuild
index 99a42afb5a80..82e0d8e87842 100644
--- a/dev-python/vine/vine-1.3.0.ebuild
+++ b/dev-python/vine/vine-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index 7d81c68e35f6..f16ab02d01b6 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1,3 +1,5 @@
 DIST virtualenv-clone-0.2.6.tar.gz 5691 BLAKE2B e049f7661939d0cc9b5b85d4bb49c34d62c1f7dc388b974b55e0ef5899c4f44006ad1d2b0df2c50aee3047b54d8645666684df8ddac4f1f006c7e7fdc98e6f40 SHA512 e4963532a8f954ab9840f9f950ccb9c5a8c2bb863c6b0bc72576e5f464b321ef098f199192dbdbb342a232223be9d47b170ea6222d3ecb5848f965cb5ddf8256
-EBUILD virtualenv-clone-0.2.6.ebuild 477 BLAKE2B ae4299eb0df435ab74769fe48b802b12b57cae191706908230570a192965ed2d126867cfc4cb1c9b965a927628532325bd5e9ea3de7ef5dd02cff174dba60b7c SHA512 0ba1d0c4912ebcc9e188a7c5f2d029dfd3769fbccf12f20cef38682b4316d5f9fbe857de3c877d5c2a79c259f9f4029bec47334c14e34c2b3c88fc6fa53f0629
+DIST virtualenv-clone-0.5.3.tar.gz 6226 BLAKE2B 8d86b9c44fc2db49d609045342352c2d06a6b3008c44a891b9d1e1a7225d77c69708999ab1b1097df1f76bd858ca5cefec8693e4a9ccf74589bd159de37c442f SHA512 1ba34830d21e8d4ea2f448defbf769afb3a63049c31fab46cfd184f4e5a8745d58984392add327fd5139e5e05a61c172266e2102439577c0b3702152f87fef0d
+EBUILD virtualenv-clone-0.2.6.ebuild 473 BLAKE2B ab58834c55ce35967dc6ce0e4a30f9124c37d6a721598351dc20115b82de0c0fc4de152a96f37d0fdc6c3be038270cf436def4e77b6493382b83249b86a92021 SHA512 8e040418d48d3024d008f0a67f955d3077dd3256edd0f5effe37e7d418817fcad5ced906b6d87aabd22680d45a6d1a215a0dec728c32a7d2bde8d1ad28ca39db
+EBUILD virtualenv-clone-0.5.3.ebuild 513 BLAKE2B b9ef55b8ea90a03ebbeb4af85435a08a1fdefba99a595e490b16f12b87d6c54da43ebcc3b6ce6b6c705e81b5a2aed3d8681bd4f08f5580f07c575a13ab772b65 SHA512 41d477f9ca509df225752e974015302fef933b4c332102aafdade45d75f176c0e5c85647f1b85fa780fbb90fd47e1bbc8d9671f6799f38a601bd262bd4fb1b0a
 MISC metadata.xml 400 BLAKE2B c54a71099c147d9ec3dd825265a76a5434b385ceea45cee95501f27bf409678680d64e8ccb537344cfa4a0e302262d4ebe6b825f80196506e3231997f0d8f320 SHA512 da2e494e64d7692828f26fb9162641fd112e6e56b5e00facad571c5ded25157741bb9e27fc3296f2ce8b7f0c2c12de144b7d5240bf301713b346131fd7b47573
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
index 351273ebb798..73f4bcf275ce 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild
new file mode 100644
index 000000000000..58aa0a783d08
--- /dev/null
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.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=( python{2_7,3_{6,7,8}} )
+# rdepend is correct despite warning, see https://bugs.gentoo.org/705362
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A script for cloning a non-relocatable virtualenv"
+HOMEPAGE="https://github.com/edwardgeorge/virtualenv-clone"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index dde679bc457b..ea48b04eb883 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -6,8 +6,10 @@ DIST virtualenv-15.1.0.tar.gz 1865011 BLAKE2B aa460d9188189bf44557417a3a878f4f58
 DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
 DIST virtualenv-16.7.7.tar.gz 5113918 BLAKE2B b8189a2fa2c76f5571ff8964e644971ea3a2b7ba924eae860eb41789e3bfdb01096eca4a338a5b9634698ba4920a3ea77a5ea734dd7c6997317661ee3e7ee6f5 SHA512 d39af559c79e1a254bd6aa9a6f20db858867f858dd8cbe44141692166e7ab60bfce6f666250113cca33180a157bc65015c14ec554df335f73c1134120974d2a0
 DIST virtualenv-16.7.8.tar.gz 5116520 BLAKE2B 3a81583695abfa92193f5ffb769546abe4b8f736280bc85bca8c3f5b17c6a5ce4ed83ac2e0ee283b457bd1ce433554bfc515452cb075f4693fe0d127d2eb042b SHA512 fbecf6d0a3cb27e8b88d9063567813fbbbeda95cd6bd626cd612020c6733db762f24119ac1205aa82fcdfd0a69a8a5a084295278895fdd51a3b145aa30860206
-EBUILD virtualenv-15.1.0.ebuild 1234 BLAKE2B 01e743302b25912199a12a2b240359d66b22e32d96056b97e4b2e497d959eed439d5a83cddc42e9040a20f4326c816f5b3070b473db12c6b1c14d06085e360b6 SHA512 8af82ead5ff932a48449a023ff9346383d82d1e3b43e7adc660d727e603e531973939a56a5af0d15d7efa0ce84d318767eee64c07541d78ebef908107e75ae93
-EBUILD virtualenv-16.0.0.ebuild 1239 BLAKE2B c99be3960b68880cf490ce1f1a321885e3626a0a35e297c83ffbda072b23f6137a47906ac34947d79ffa1113d5515b618a82a5a4f3b2ef02369f8e6498a82a68 SHA512 e520e001c6bd4176cf4505930c061e3a00a03c442c502c5f8ab91f0504abeaf399994ef43a96da6b16765f2122d81cd1a62c6a4449ffab7db7f508d7ad5ee8ea
-EBUILD virtualenv-16.7.7.ebuild 1677 BLAKE2B 937171dc853c535baf975aff9040870491d6cdfb60f486dac485f28866a96288518e699d36a03246a0673ef6d938e7a7c56ca9b6f77c420cc9bc2f79d4a34011 SHA512 d2cb17757833aea0c41fd0cea042b5006e08d850306b63d5d8148af48aabd6cdc8922f05109e02fc1cd1579623dbe0ccafca8df9090b1001adca6979e924312c
-EBUILD virtualenv-16.7.8.ebuild 1762 BLAKE2B b6d9f24215f3e2c6c5f218e549b10bc99577a4ede3291234155f0ad1becd9b2b2ff909d64db58a91827ef73cbe96d10e929ec49b8786da09bdc585ed6d4f8c94 SHA512 3023e5cc9e4b9bfa9d0358f33597db64c74e7938ab8bd72fdd56d3a716b6f84a0a3e9508cf641dfe035ee6d5a0f29f072d5a83f510df914ff575b887b8640dec
+DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b48274893777313d7151350df1d8a7d86d7cbd299c6c04734cbad134512e2ea05f5bc694648b6e9307019ffd9b91f7d0cdaf5 SHA512 d7379941e299c44beba30eaab68d5f1a6650f767b24f95d5e8abd05c1529dca4c1423113a41ff42690bb2b2bd4fe05c3e47a8fed4f9df0972188f6c77034436b
+EBUILD virtualenv-15.1.0.ebuild 1227 BLAKE2B 1518ffa0109fa93b16d71cd1b880a89718c441fc4e0523be7f3c98f3652d6d8c5c539dfb20a0b502e699ae350a6d1fc8afc6e65f867a401eb4db55619c92413b SHA512 3d085a8c20682c0b8bf223cf83f581c6a1a5fddcccdd53c1ad6c7a03e794c2a414b8609899e4f19fef6d8990e48aa073e88f38507e3cba5038e9c5c9b00c23c6
+EBUILD virtualenv-16.0.0.ebuild 1232 BLAKE2B 9821b7f4a1b039623d354ae0bfe3321302f12fca35adb039410be92af540aecd30867d5331e87c2e37f0a0b6d3c1e2c679a46535522413af08a8ac28fd49dd12 SHA512 21fc397b502911b217ae347f84a40c54d6c35791229fc69c0b7ef3c9d85694080fcc9ef19aaabb17138248ebc7deb129034ca3f28175a195fb11e4ff760f1808
+EBUILD virtualenv-16.7.7.ebuild 1675 BLAKE2B bf6a00be3d73d74cdcba186ea1cd4c1fbdb18286db9c9a492ec689127a5ed6790b5378237141740af37b3dbd6bc7bd3e1cb03fde48fbda2a3261c4f11f7bd681 SHA512 80071bda5ec794ffbff619dbbc6e45164a3f3eea7ac748359151bc316a9332056311e1ab5e4c5236a5d9c402e99ffb88dc39e792fd84bffee896e165654a2f5e
+EBUILD virtualenv-16.7.8.ebuild 1757 BLAKE2B cf76b1789d298e690beb8836a4cc1d4d69938c53004563546439899c13d3e9a393d0f2ce7258341c27a2035405dbf701d687c6ce2c521693ffbdd57f4783cbe8 SHA512 2ed3a44c569a416e89160e0f29d8a220bed8910240b437f4f2b22d5af851be2d060a60638b38045941889ea086671fa1849d5072845050a5b4801898b34e6a98
+EBUILD virtualenv-16.7.9.ebuild 1757 BLAKE2B cf76b1789d298e690beb8836a4cc1d4d69938c53004563546439899c13d3e9a393d0f2ce7258341c27a2035405dbf701d687c6ce2c521693ffbdd57f4783cbe8 SHA512 2ed3a44c569a416e89160e0f29d8a220bed8910240b437f4f2b22d5af851be2d060a60638b38045941889ea086671fa1849d5072845050a5b4801898b34e6a98
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-15.1.0.ebuild b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
index 13f9106f31b0..6695b0fd0747 100644
--- a/dev-python/virtualenv/virtualenv-15.1.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv/virtualenv-16.0.0.ebuild b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
index d99fee81512f..9f9c249e57df 100644
--- a/dev-python/virtualenv/virtualenv-16.0.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/virtualenv-16.7.7.ebuild b/dev-python/virtualenv/virtualenv-16.7.7.ebuild
index a060296f7646..31e1e3c37996 100644
--- a/dev-python/virtualenv/virtualenv-16.7.7.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # pypy{,3} dropped until test deps are tested/updated
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv/virtualenv-16.7.8.ebuild b/dev-python/virtualenv/virtualenv-16.7.8.ebuild
index bb85f78d9a37..102845894fc4 100644
--- a/dev-python/virtualenv/virtualenv-16.7.8.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # pypy{,3} dropped until test deps are tested/updated
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv/virtualenv-16.7.9.ebuild b/dev-python/virtualenv/virtualenv-16.7.9.ebuild
new file mode 100644
index 000000000000..102845894fc4
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-16.7.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy{,3} dropped until test deps are tested/updated
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( docs/index.rst docs/changes.rst )
+
+PATCHES=(
+	"${FILESDIR}/virtualenv-16.7.7-tests.patch"
+
+	# disable tests that need internet access
+	"${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
+
+	# test fixes for pypy
+	"${FILESDIR}/virtualenv-16.7.8-tests-pypy.patch"
+)
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+
+python_test() {
+	cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
+		die "Could not copy LICENSE.txt with ${EPYTHON}"
+
+	pytest -vv tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest
index ac5adaf2014d..8ffdf4126391 100644
--- a/dev-python/virtualenvwrapper/Manifest
+++ b/dev-python/virtualenvwrapper/Manifest
@@ -1,8 +1,6 @@
-DIST virtualenvwrapper-4.7.1.tar.gz 89930 BLAKE2B 8e101f04e365dbb6244bc787f853dd90b15d7b33a44725ac1e047cfa74845b9fe11ca100c8437536d80943f29be1dbe10920eef2ce9766bd95ec05cd96951eba SHA512 f972179992728b8b600388b34562fa9de355f526e4ee25ea88840700a57f196a60eba91ac3137e7d826925c7a8ade7479af383bcbfb8b9b837d0a374b8b3c4fd
 DIST virtualenvwrapper-4.8.2.tar.gz 91331 BLAKE2B a01a971ccfdf1822d65fe6d2f3ae09fde2646c8a6246f54316afb6e5d5068078e77732fed3a9805371fefeed7a4357c27b52eed24e9bd03492965779d6a50836 SHA512 53d92f653b988873da5a46e316a40ef767d97f75072e311aa4a8ae45c8aabb49569e36cc35597f9bdfc1f883a51eb648d5f01f4ea8b3237fae30a21dca67d7bc
 DIST virtualenvwrapper-4.8.4.tar.gz 334920 BLAKE2B cd790b1e98cca7d09ea9c80df5d52380335d4a0ea4e6d95f7bd48d78583e0d842e1145ea08d8d8c73516adbe8d6c75bd53c17943723f859860a0cad105a2b058 SHA512 461938100061e11af0ee9b17405d991ae34e5ec9c79cc12614962d3178b588a2da710baa15ac626960b09177c1b5b10c7bc590cb4c126ebd2f719d0f1527c9c4
-EBUILD virtualenvwrapper-4.7.1.ebuild 1021 BLAKE2B 7e3cc545d7a42b64d0d1beadde301183f77bd0bf9ee11de271c166d61d8f32585e2ffed474ef5311fc509b06ca72fa935d794d6f142da7d51b454fee3de315b0 SHA512 ab17f961cf97c2e754d1b8a7b4863dbbbe4440009b39c6f04e7034d0cbe805e939b172debb51df6aea019f028a4545bddca789249b38b0ecbc178833c2295a6a
-EBUILD virtualenvwrapper-4.8.2-r1.ebuild 874 BLAKE2B e433509eeb612ca0574fc3a7246974466365db204f37c4ec8ca259ce6debd3c5eafd298ab325884df298a2cffe6b18549d3172a92959b76e95e30413f45dc73d SHA512 3a8565bfb30b6c70c95fdbcaa1c7970722873b8275826598cc40090b4d31b1ff4563afa88a422280e9ca332fb9630b2c4944048765f7bdd3b85a50136b10b6c9
-EBUILD virtualenvwrapper-4.8.2.ebuild 880 BLAKE2B b9b549c3c2e2987a267b01adfc40bc6faeedc361bdac4c069cb315075b4ba1d39c556c181c553229fc097e5e4cf43ac37528a5b64d150dff11715ebaf1be4809 SHA512 41d7f7df4ef57b7527667531d3140c0aacd293869f813344fa0ddf4ee2a5284d67125d2ceefe36cd2eb8ac19b72abb06c0dd22d1f371829593d9f36238fc9445
-EBUILD virtualenvwrapper-4.8.4.ebuild 874 BLAKE2B e433509eeb612ca0574fc3a7246974466365db204f37c4ec8ca259ce6debd3c5eafd298ab325884df298a2cffe6b18549d3172a92959b76e95e30413f45dc73d SHA512 3a8565bfb30b6c70c95fdbcaa1c7970722873b8275826598cc40090b4d31b1ff4563afa88a422280e9ca332fb9630b2c4944048765f7bdd3b85a50136b10b6c9
+EBUILD virtualenvwrapper-4.8.2-r1.ebuild 864 BLAKE2B 4f9985bd7580dc04ef27ea9378adcd074a1023be8e150be2c97f55044ff1f47c80607187dde372823814b395c2d3d6080887a1471790e130fc60928aeb89378e SHA512 4b6dbbec250af0a6608a8364cf8dd4db33659f67ba7f4223d400877344a7958444002ec56be5f1d89a19cc8354966a281159281f5de53569cf7436014f110162
+EBUILD virtualenvwrapper-4.8.2.ebuild 870 BLAKE2B 7714d65af4cc03d15bbdb743d212bd03508be84efff3d81589c1a6a0c2e9e74f294edd4221e43eeb167fa217d26938874cd461214c9fb95bb4b6b2bda73f4868 SHA512 8c539cc6ac6586554ad1c6f61af8739f3dede5def3628ac88dfa9b64f674bcbfb5a7aed500d69141a11c2384f0c933e37c8c9acb5d0f6fd7d32a5c7662784c48
+EBUILD virtualenvwrapper-4.8.4.ebuild 864 BLAKE2B 4f9985bd7580dc04ef27ea9378adcd074a1023be8e150be2c97f55044ff1f47c80607187dde372823814b395c2d3d6080887a1471790e130fc60928aeb89378e SHA512 4b6dbbec250af0a6608a8364cf8dd4db33659f67ba7f4223d400877344a7958444002ec56be5f1d89a19cc8354966a281159281f5de53569cf7436014f110162
 MISC metadata.xml 320 BLAKE2B b3b2f48545985da37bc3f4cd0a6f9fb8540a320cb6cc6e0be1cded9fc77862e47f0f30de3dbb683e9d7001cf05e221cb45f922013c155d5bf418d740ad3ef543 SHA512 dd5556b6b8cc96882032b3b00de65e2ca95cc0ee93c00639f1537e4abd31cc14022e2b61cb04f12b53480c273ef9be269128c4b683a9774590b1cdd552582386
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
deleted file mode 100644
index 7b6f6ecc1130..000000000000
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
-HOMEPAGE="https://bitbucket.org/dhellmann/virtualenvwrapper
-	https://pypi.org/project/virtualenvwrapper/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-# testsuite doesn't work out of the box.  Demand of a virtualenv outstrips setup by the eclass
-RESTRICT=test
-
-RDEPEND="
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-0.15-r1[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]"
-
-# Keep just in case
-python_prepare_all() {
-	sed -e 's:-o shwordsplit::' -i tests/run_tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	bash ./tests/run_tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2-r1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2-r1.ebuild
index 976d371facf7..b54c54e85724 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2-r1.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
index 35cc39469302..09ffe543e07b 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4.ebuild
index 976d371facf7..b54c54e85724 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/visitor/Manifest b/dev-python/visitor/Manifest
index 3666f215e1b8..5fa4a2714ab8 100644
--- a/dev-python/visitor/Manifest
+++ b/dev-python/visitor/Manifest
@@ -1,3 +1,3 @@
 DIST visitor-0.1.3.tar.gz 2985 BLAKE2B d645e3524ee5d072320e6feca39faef72b880ec7341053d078778765d9b279bd2ee3f892c0fcd5f21633e7851acd49ac23aef769eaf190147803ce711b717da6 SHA512 414c77df8efcc22df5ee8073e02b8c5c28563954ef9b9a869c4ea3f7f1268a97929c1fe29142ba41e3a5acafea52599f6bf073aacd654643d7d8380cd4f41fbc
-EBUILD visitor-0.1.3.ebuild 682 BLAKE2B 15a2c076f29f65652dac38283b74dff30a52a886da4329b8476b18e5396eba01762291256330473bf28623f7e3c576aab44accaff46710b9dfdfecc2571398b9 SHA512 4bed728c305b84bddde679b3650d9a95347e2320989a1d77d753fb009e06407e9d823ac73c28675c81a42c08ad5f9c2dd62de050231272d265a6c6bfca167ece
+EBUILD visitor-0.1.3.ebuild 677 BLAKE2B bc55a74d8e0fcbde12b8b30d267aa0d1c57492c8d03794307095ee7b35b7f7682d8ed4c406b5578eba2c8e1c51c1e4672adff6f42e2c3c38686ffb40fbe9f3f6 SHA512 64a599ec13edb11a882512ad14b37c52ee3bf848973c4576374b0e13fb7dcf28cd82037a5f2e43623bec36ea934e8959a6758c888b68823c6b197c074d565119
 MISC metadata.xml 425 BLAKE2B cc0a5e61430649338d19a17059161dceb4e843aad01757da22faf77c327750b901abc8bbcfe0879909febb0f94d764c77494aed2ab9eb4b7b241412a9a993a79 SHA512 21c655b1feebe9dd77a24e8af3fed6c8f40a79c6696940b455da05ad61c0cada17dc99f8c34f3b05309fcaaa1f96261d6546dfa3e8ca21d26323985f713d6bfa
diff --git a/dev-python/visitor/visitor-0.1.3.ebuild b/dev-python/visitor/visitor-0.1.3.ebuild
index 85cbd4c0a5c7..ad4dee9b9b25 100644
--- a/dev-python/visitor/visitor-0.1.3.ebuild
+++ b/dev-python/visitor/visitor-0.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index a0241df092a4..d61aea88bfe1 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,7 +1,7 @@
 DIST vobject-0.9.3.tar.gz 57744 BLAKE2B 01a9083faa7f2a84e2f6f09d9f9f14afb5558d86aefb1a9d5c7e3c8f0e664d6a292f79a340c1a32e510637784cdfb0f02d713e0bcdbb99d1531c50e742192063 SHA512 d77dac2e885ea752e900a2f6e3d9cf24fdd3365d1e9e2ba51c5c38b2889a62aaa61e5562799eb8063b5d4ded0bcd43108cd7e5d028cf7dbe72008b208b8e2e76
 DIST vobject-0.9.5.tar.gz 215577 BLAKE2B 0312a0c1377ce8141e32422fbf9b4dab253398ccf83bb530929ac052537213b065d7550cd0d926a52a00e27271faa942797b65899fcbe3b8b955ca15c6a114a8 SHA512 087b394ad6c48c359ee1cabb90cbc85cb305ed9e65199f33c19f386c7075b70273e5fddcf7fde5356b140ead7a581efd917594e4d493e720c4e1a632f797acc7
 DIST vobject-0.9.6.1.tar.gz 58556 BLAKE2B 74f9a7dc8058bb792492b1ac44a0310f58c603e677aedda35be0d8e94743e6e1e001a4ae888625f314f706891b7a31db77efa4c268482bbaf44ca37fff236cd6 SHA512 0b299fd4ca105a063f4ac7b03b157c54a3867d6fb798f9072897939b0ba275ba0887bb001c5ed38002a8eb1c10aee710af880413c072140b855af4b62d5aff72
-EBUILD vobject-0.9.3.ebuild 776 BLAKE2B feca2dbcc2838c43bc1feb48839199205c077ae65959a1def6132ac11a2fc5b46159b1a25993b2d4ccc84dc51614f123829e988d64975ca4a20c000a796fb120 SHA512 9ec2c9764f073f6bf2f581396928a978eb56ec6c4bc0eca1763829cd620e7aedbda3e736778f98d1eb490d8a416acde41e219ff30912e4a8d802248428a78c84
-EBUILD vobject-0.9.5.ebuild 788 BLAKE2B 41038a1014cc1bbac7683fa52be4acd5f21ee2cf67b856d8ddd75230afe8c9f2a0be3f94bc95c5a0102eab5128985b2202c5569e89d16285aef8b48dead015fc SHA512 3f57e3514674b059ce20ace6d3034b9123a0be77aae9a470de3dc92480deeaf66aba99a7f65e6e38954fd00128d824cef90faeaa0c3ce364543f7a5734ce187f
-EBUILD vobject-0.9.6.1-r1.ebuild 770 BLAKE2B a52b055254efb29e536f9057e47272119e59fcd449478faa7aa46bb9736da8fcc4fe672f0b4273fa48ef2ee6e8b659a0a73409687a3a341c8c712f2a1868c58d SHA512 31d92d1899d2e0469032823cc3e34cbaa9694151d14af44bc3b5ac4aad588b19dfff13ac1586f473390d332a30a057d717aced2f9875db1e4b27b520c9f3a4a6
+EBUILD vobject-0.9.3.ebuild 767 BLAKE2B cdcb7f11382d5b57de265ff6d70bc15518cdcfe75b8ca29b337d29b5cf715997d3da870791118aab86fa3a00a911b69a5db19c426d51a7bae6edc0636d2ffb34 SHA512 9ee9ac42c75919ea59eb43d52a1ff190e53d99ed02f0e6aed6396fc56e41eae7fbedb1e6c349b71609efe8095f830b394aa84583e1933ea0072a7768dba9e566
+EBUILD vobject-0.9.5.ebuild 779 BLAKE2B 86765a826a883728aba4303170dc7af8e5a91cd70b93d6bc5321b5292d3367e331f6cb8151881c6d3f835a3bc1e7064e6c736c49703f90747c6d3dbacead7ae6 SHA512 35518d5336299a9cf75b019423a97453ba5f9b0871e59cbc737f1adaa27fb0f086c4af5e986b608da1d4a3e5907275640ea39ace4b77e7ea36758f217000ea35
+EBUILD vobject-0.9.6.1-r1.ebuild 763 BLAKE2B 68a568e8b3bf2b4c68d1484bc06453bd191450266ddb7767ae72ed974f6f506e41f80b3b1a5f515f9366718f43fcf9d7e9f3efff95c49091c31d294711f9a6de SHA512 18d5aaaf49202630c7d6eab07a4000ea293295af2d971b96c93c1d353c3c8ae46ac1384564f65370ffbcd73b8ec648c2823ed371939a492c45dad59c2bdbdb54
 MISC metadata.xml 322 BLAKE2B e0e386d11610176cc9b83ec3e1c6cf3d53306b01dbe272be61538592057e125ae6eb196e60e8c6588d80a3f8413f9f5bbe9e373f7e6670f1bb53bd043cd9be39 SHA512 d50380968c2886e5fb7971f90ee38189b9f325513eb0e0e039638ec0b466b3c54c20be5ac056a49fd28923e061d658200898f26850dcbe2c0d58114c0b732a02
diff --git a/dev-python/vobject/vobject-0.9.3.ebuild b/dev-python/vobject/vobject-0.9.3.ebuild
index 1aee719ff462..7af19ae8e97d 100644
--- a/dev-python/vobject/vobject-0.9.3.ebuild
+++ b/dev-python/vobject/vobject-0.9.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vobject/vobject-0.9.5.ebuild b/dev-python/vobject/vobject-0.9.5.ebuild
index 22e324dd8021..28a51a761a8e 100644
--- a/dev-python/vobject/vobject-0.9.5.ebuild
+++ b/dev-python/vobject/vobject-0.9.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild b/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
index 1eab8ca38339..56fc20ec7141 100644
--- a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
+++ b/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index 57d72b6ad0d0..4e5835303d6b 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,5 +1,5 @@
 DIST voluptuous-0.10.5.tar.gz 41436 BLAKE2B a768e519157ed6999a67e7c759588c4558d3e694e4c5d4a1da0567737d249664e985661b57f9f8595fd7cf5f1b0d05d511616d6d44604443b948bd414b334412 SHA512 2024121c56a91cc3bf5102ca68f8347461b2041da9a352eade0e0ce3657d9a477a60a7a5823e8f3628eee7b327840b5c4eba13c106ea49ea91a553d6b5edd363
 DIST voluptuous-0.11.1.tar.gz 44346 BLAKE2B c0715293fbde6ce9008916d6e016d52920eda1906dc2ec292deee4b6b9f596f2d50592486b5a89df6a90e0512973e12cd69482e55f6c3a96ea0cc4b3e52bc77d SHA512 7e2f3ea122f739944a7820a536551abc45df9847a0c3daf5527eabd781b904706ea708c885d724828cfdaaac66774d2f8e7b42d3376de1c78ef2be9f535fd58f
-EBUILD voluptuous-0.10.5.ebuild 523 BLAKE2B d99c273c78b34cc8656310624e830b9f5f3271b25ec16360bd7c6ee28410a41a020b492c29628bb2ab7cce6aeeddc4f07f85d66e7ee32e22a3df45a08a5e8a71 SHA512 7435ed0cadd521b4fee3a88848e7d6bba362ba36a73425a00fece0ca38565df4e74e2d0be81addc7b74e309f9ab98ad57153bdd690f760be70cf9daf06dbf46c
-EBUILD voluptuous-0.11.1.ebuild 592 BLAKE2B 6ed63e19be196a711b76bc47c278acd5133bbef3ea6d0c5183b26c829651b1ee1be96c0c22be0210354e17afe2bfe64831071dd6710231e6b4047ec60afdc478 SHA512 a55399356201d1de4e3ba952160bdbf0797d11ea16459815c740bae549719ea84cd0e78c4070540e5bc826c02a92d157011e74ec2e6bfae3f38e863383413b01
+EBUILD voluptuous-0.10.5.ebuild 519 BLAKE2B 8c0ceae04c87ac9fe0dfc46b9ebbd02a8597eedd9aaf17f45ac526e5aa2d28f7976217d968dfd9c43f7731f2ac12d25961ecfcf2b7df74e5687043ff862b3d6e SHA512 9da49c14c3f5815558cdf0eabbea8b1e1f4e5eb79f864b996f25bf6ccc103c989ea2c77144ff06336ea4e777626a321aa5ee71cff45a9675ed5b373365dacab9
+EBUILD voluptuous-0.11.1.ebuild 588 BLAKE2B ec213100e702579d40904712fadaa42e7917d9c6d4ff272cbe05883ff49cc2b1dfbf4cb4e950129716935c312c4547b682cdc56dc54754c7f18104e9eacf95ea SHA512 f33687ff08ee6a66d8b54f38afca0ae95bdc66695dca9b9166829ebe869b8b774691869ee44046fd63e3a4d8b8bc76847dd81d22fb4bbee143de8be6d2470806
 MISC metadata.xml 590 BLAKE2B 6d6c101d04be60962c428dc495959500a2a80aab39b7353cbd2694d27794645766c1b92b1ff09f9d8c72c5cedb4f07472a94945e8a48263d44b0134a6a0eed2c SHA512 ff4732c5a379f2607a97a45c56def4955bc542446c5545ff807138eed3992d71ffd4b3638f122accf1a272537c071ab0304717a43706efef191dfc7b35422bab
diff --git a/dev-python/voluptuous/voluptuous-0.10.5.ebuild b/dev-python/voluptuous/voluptuous-0.10.5.ebuild
index 1a7fb61d7d19..975974c507e3 100644
--- a/dev-python/voluptuous/voluptuous-0.10.5.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.10.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/voluptuous/voluptuous-0.11.1.ebuild b/dev-python/voluptuous/voluptuous-0.11.1.ebuild
index 7bb7219d97eb..b6944710d0a0 100644
--- a/dev-python/voluptuous/voluptuous-0.11.1.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.11.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/vpython/Manifest b/dev-python/vpython/Manifest
index f80161f76fc3..010931c7011a 100644
--- a/dev-python/vpython/Manifest
+++ b/dev-python/vpython/Manifest
@@ -1,5 +1,5 @@
 DIST vpython-7.4.2.tar.gz 3960161 BLAKE2B e5a0d441f350af1b3390bea943fe5a5a9083234c415b93bf10bbc8109eb280050b447c95e93c18549f5c74a8c3ae43dfe6817cdc4055e4a8a7ad7f66b54c5342 SHA512 dd4db13743f733ac0bfcaac5520da193df9c0f7fc6198f1d55723e45a6e39f642f09f66a3f217669e70027a30c2f8426c0a80bee0d4cbc33b77ac5c927c7e3d0
 DIST vpython-7.4.6.tar.gz 3542460 BLAKE2B 358bd33f386b27ade92088af07fd5a73c1fccd5dbe729fe989f802b1db0eff38014bc38baf383324bb6299f53c68df8cfe9070a6d805303e0b50d4088af133ee SHA512 68591fc3bf71ae1b87e86a61574c46bb64a041ab29309ced64ef69c6d110e0fcd4f3d3adaab2ae76b21df9f66314095c4b3d79e6ebf1d60fa7725f85ae7a7b06
-EBUILD vpython-7.4.2.ebuild 633 BLAKE2B 1e3b803d954f9d266188c9f07caaaf05b5690f9c28c89ec7cf32f9712b7b0b965c09eb6fc6497a9645e918227e40413b6e61363d4a5570497093628a7c7a90b7 SHA512 47af47d9472f477bddd47cf9e70dd98bfc640ec133298432134742b21f4a0d4a09a2c0e59b126f4dfc9456dd9d214f4a292ff94af26802a67dea0c24987f342d
-EBUILD vpython-7.4.6.ebuild 633 BLAKE2B 1e3b803d954f9d266188c9f07caaaf05b5690f9c28c89ec7cf32f9712b7b0b965c09eb6fc6497a9645e918227e40413b6e61363d4a5570497093628a7c7a90b7 SHA512 47af47d9472f477bddd47cf9e70dd98bfc640ec133298432134742b21f4a0d4a09a2c0e59b126f4dfc9456dd9d214f4a292ff94af26802a67dea0c24987f342d
+EBUILD vpython-7.4.2.ebuild 624 BLAKE2B a8976f0cbd36719088e1416ea517740f5f06e01f876a9ed17d63975ded31b464ef49212d8014dbcac359e62b24601fc11796cb7c3d13d9e1337372152c23fd44 SHA512 bdc819ed4ed69a69c5d239fac747d6388acb8544c6fb467d86f2189a7a1d239662f752ae71aa771cfab6078f3073f61c08feae60b76064f0743f9dc7e6887d54
+EBUILD vpython-7.4.6.ebuild 624 BLAKE2B a8976f0cbd36719088e1416ea517740f5f06e01f876a9ed17d63975ded31b464ef49212d8014dbcac359e62b24601fc11796cb7c3d13d9e1337372152c23fd44 SHA512 bdc819ed4ed69a69c5d239fac747d6388acb8544c6fb467d86f2189a7a1d239662f752ae71aa771cfab6078f3073f61c08feae60b76064f0743f9dc7e6887d54
 MISC metadata.xml 621 BLAKE2B 9b76c9b14bafc55ba1e99bf584a43ebc4414183230809eae1994db3cf10b35e8d7591db002828c9a18e25c73c55183a0a27812d4b6491d282c2229bf17761733 SHA512 fa384102ed51e900a7b27be256688c2fe94cb9e08f5240f116ad3ee4b2581e47b2956efb6446de448554718311e212dde2eecedb5c9ecd01a59dff7e2f14eacc
diff --git a/dev-python/vpython/vpython-7.4.2.ebuild b/dev-python/vpython/vpython-7.4.2.ebuild
index 668b766f7ab6..f04d979bc1b4 100644
--- a/dev-python/vpython/vpython-7.4.2.ebuild
+++ b/dev-python/vpython/vpython-7.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="VPython for Jupyter notebook"
diff --git a/dev-python/vpython/vpython-7.4.6.ebuild b/dev-python/vpython/vpython-7.4.6.ebuild
index 668b766f7ab6..f04d979bc1b4 100644
--- a/dev-python/vpython/vpython-7.4.6.ebuild
+++ b/dev-python/vpython/vpython-7.4.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="VPython for Jupyter notebook"
diff --git a/dev-python/vulture/Manifest b/dev-python/vulture/Manifest
index 53cc1803a289..ac4b5e3655e7 100644
--- a/dev-python/vulture/Manifest
+++ b/dev-python/vulture/Manifest
@@ -1,3 +1,3 @@
 DIST vulture-0.10.tar.gz 10205 BLAKE2B 9aa7a0042c524b003babb6d612707a788c8104c4d70f7a925a65b20525571c01cafb83fdc25affc88a8e94fdbfa296dfa6db467d68bd2fb052ef633838f8f2a1 SHA512 05ec640a02de63e0d0dc8e4468e2be117ec2f0289918e58ef18b11ad58be1f753c32d892305c2a197d3048cdf253b4fda376cdf21b51078291d8297336134201
-EBUILD vulture-0.10.ebuild 476 BLAKE2B 6744232641f5d1f6c34fa2ac4f48da19467f970c9b12ab70c96fafc216c948e9d92f3b5486b1e2e53d23edd32ede8f899a18e3e588d8a1054de81ff6e3c84887 SHA512 741e990c0deff9dd03009c0a28a7715ffefb0735c4bf5e9277d9039202cf48babe3019696a3539d674d9e4cf48f3eef49d7c5927500725e6eadc23844564f4ce
+EBUILD vulture-0.10.ebuild 466 BLAKE2B 7324aa84582f8d622599e2008118a281a62d2e6ce62121b8b47b0154163434542bd88940e81c718f710beda92b5a72357140a7facfeb7c411500ad46b4b57747 SHA512 b4515c1785ceb4b641d8f7dee2c0b58773b7ba7134f45d403d38db49e63c2758236927078eaa2f59e7f249e17a4859fe9129df7a07b2f1def1c236f5db245728
 MISC metadata.xml 365 BLAKE2B 1af73510c97d8eda7162ace5e27c3864dacbc07138a7b478a8d7e96409429101ffc74a8777c89bc39bbe9738e058674fd291badcf0ce1c814fecd2fda5fd9031 SHA512 2666f1863c8c0c13545237de3ea5ed8d8549bbc5408680999b0b499087fc5619e68f54c36754ed6faf79f3cbba305462b933bd3d21b7f8e82703085a3a10d871
diff --git a/dev-python/vulture/vulture-0.10.ebuild b/dev-python/vulture/vulture-0.10.ebuild
index 31600cb4ea89..da361aa9dc57 100644
--- a/dev-python/vulture/vulture-0.10.ebuild
+++ b/dev-python/vulture/vulture-0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 61aade0b3676..c9905d189fb1 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,8 +1,5 @@
-DIST waitress-1.0.1.tar.gz 123934 BLAKE2B 1e7d2a2d0850096b6b0d5654208ebe23d4e78360d8eedf3bce98276b8710eac0f544158f9efe5fa72abbab27d3ca5c4f3ed9afed43144d4d06f88f8068b2f19a SHA512 0205a0a5fc9e65e20370fc1e97ba456337313c93817e9b2b283610e5045eb32de80f45d19ee0cfb9469a93e4fc9267b785feacedd70b362474f4af5c05a3ab21
 DIST waitress-1.0.2.tar.gz 124685 BLAKE2B 4c9edd2d7c37964616311ee6fe5a58ff1f6a7677226956e47f03f629d7765b3015c1f652f39ad7b0f81608f8638e63edeb35f120ee57347e89b029918e418c04 SHA512 b7000e1198ac306ce189f70c5dcfcf41318e5ec47c8d6183cdbc360c8759ca726405d5da70f1c7fe3cfeb39d528af94d693767c2a7a1a7fe460c6407857ec6f0
 DIST waitress-1.3.1.tar.gz 167097 BLAKE2B fc1d0327720daf26c1c00eec6bc617613582325adf16eab9ba49c53029241c5975981cdf54340cc5b051cf8159f0c6e46029ad5c0477adf46b757c4487719130 SHA512 ccb871fc46bd560bff2ece706c826a3407750112cfb014378a06ee077f969814a5695d053665a4d975070944a9449efffd61daab11d03be3b06f1907a2ba0f5f
-EBUILD waitress-1.0.1.ebuild 806 BLAKE2B dc0c15946d823edc425b8b778d6a5a6404b6a935a22d251e4ebb7a0025b5b56565f7d143c613a06ec5f2e6cdb480feb9a9d468143c16b2c9f1793ff59a937a2e SHA512 36934d4f3b5c19bb5cdf2460c23ce3873d6ff94028af68e043ad093c62f526c53c74d05be71da61da7bcd3de556cee2753681c80407fb49caae1201447261804
-EBUILD waitress-1.0.2-r1.ebuild 809 BLAKE2B 311f134a100703581e5ce1fa4bb67d03498d7be4566409ecc07147d7de3f073d1346b9477f467dad48129476a4ff73b5fbc6e606248cca67ddb795bf457309f4 SHA512 df0ec9b25a3a69b907df3b9456b957ee7461d55b40409b754d64e11d7147d64624d89d2c95a63bb960c15b7c3bdb78ef77a27cfd9ec395de3d3a1962df605219
-EBUILD waitress-1.0.2.ebuild 792 BLAKE2B 84681f350089de32528782118d382df5e0265e07a9071591ea5db14f774260a5fdda6c607a38205d5fa0328fc2392e64e5072faaaa0739374079ea154e60027b SHA512 25427ab1f77a32f86e25455ef54f4dbc7f939c3a14735dd7afb31db95ca0c62e4da5e78f23f34c346c9f1c1cbde2847beaa1fb05ff01360709dbdefb963bc8f0
-EBUILD waitress-1.3.1.ebuild 634 BLAKE2B a989bc2628eb371d22b64800769a9417c3751dffc1ae7fc962d2f5333822777d0c43921f9150e01312c23c7cb797a3c1081446830181e78ac899543660c2ad4b SHA512 5dc2382fcbf7e62e608c1b29673241d4c69323182bb4b0b98600240184c52cf471f46ef46173833b247e2258310f5d118f3333ccbe7e5320144fbde979a5c1e8
+EBUILD waitress-1.0.2.ebuild 783 BLAKE2B 4677ff78340370f2caba7b5bf5e1b528a87d3aba09a93dea6564ef6aa2e76737726c362ab2b8a8fb3b3889edd3f321b890a9384ef6d7c727adc8fb87d405ec56 SHA512 5e96afb39a780a309a7cfe8ee77d8eb27a2cdc1d74593af0846405cc4b0dced52aad3e8e9d22c11395a5c2b35dfcf28176f9133134a2bf05e27ecf29dc9dfca0
+EBUILD waitress-1.3.1.ebuild 629 BLAKE2B d81e8fe05b94f75839891fd10cc0d72cdf3d6bef312a8d9b6d3d5ff08958ab6874d098959661348b9cde612f23bde2f2633d58bae8a55e96491632f551e9667d SHA512 4c7aefe16219eac71d6b087aded4e1a987f3fb85f9f4355e89c38ad2f1ea622d3230beffc326280f49d5869dc4cc0c3cf6179f3fbf165cb782b1fb30d576139b
 MISC metadata.xml 378 BLAKE2B ce0ade449ef1c9d58ced1c883c0adb2a27573bd74f5299bdda36ee60fe073a56e8c44f5a81a36bdd7fa2c595c1a2f55abd3eb876fd5d0909256bff4310fdaabc SHA512 02bd27d7e984ce3ca047d34dd5acfe9c0b23e9d8fcf59484262e19e9df1206939fe2837a58ac00fe58575c2db4abe28b89a5a1c8a8b887d346c30635ee2b10fe
diff --git a/dev-python/waitress/waitress-1.0.1.ebuild b/dev-python/waitress/waitress-1.0.1.ebuild
deleted file mode 100644
index 49c2de61f54a..000000000000
--- a/dev-python/waitress/waitress-1.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-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="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/waitress/waitress-1.0.2-r1.ebuild b/dev-python/waitress/waitress-1.0.2-r1.ebuild
deleted file mode 100644
index 965eb82e14b5..000000000000
--- a/dev-python/waitress/waitress-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-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="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/waitress/waitress-1.0.2.ebuild b/dev-python/waitress/waitress-1.0.2.ebuild
index 2d480ebbcb12..629bc8dfa09b 100644
--- a/dev-python/waitress/waitress-1.0.2.ebuild
+++ b/dev-python/waitress/waitress-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/waitress/waitress-1.3.1.ebuild b/dev-python/waitress/waitress-1.3.1.ebuild
index 12733bc52c80..6544ea25f7cb 100644
--- a/dev-python/waitress/waitress-1.3.1.ebuild
+++ b/dev-python/waitress/waitress-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index 757d10735844..aec32b30e009 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,7 +1,7 @@
 DIST warlock-1.1.0.tar.gz 7879 BLAKE2B e132cad7d2d89845f255dca0ab16760c403c375ff89c2f2e465047dfdbe56677c5e52490dab056af6b8131758eaf9abae80c779da96db697de1173901ce4f143 SHA512 57353cb21ee7245cb27f29193d8c0987971535f1bc9f7a8914738ec15cd5712cf7001eae379041c0188e489365f23b0190dc13799b57a117b0bd3ed62cc2e30a
 DIST warlock-1.2.0.tar.gz 8210 BLAKE2B 61e7dc9e033d0893b93eb2e9e82310366dfbc6aa37a15bddbe72cd3a48329be6d5a1b44dd095235f8f828a4e365dbb9f6964e064ef2025c91ca46e6bf119ab91 SHA512 775362a80be7ab37d3a856947cc930e6be74d2b86e59ce44c9e24e54e111288dddae17f7d8b8885ea3d4cfa5674d327149d725a3acf4fc7bb48b2f63f5db63dd
 DIST warlock-1.3.0.tar.gz 8853 BLAKE2B 51b313f81cc7009b2b336d6ea7ecf5b78adfe33b3efee3abd9b2296f90716db25fcd4a06eb6946c26c3700ccf5d090da716bd4c5a7864f285e26bd2504700c3c SHA512 0c60c624e89782009a79a0174e6855a9d3a084403f5fa8fc676ad28c42184ff44c43684d6ab68262045f75588932ab4679dffb05f7762c290741ca645d90f32a
-EBUILD warlock-1.1.0.ebuild 1041 BLAKE2B 66d7be123df9aadbf6c8f1fca0e05d866798694813fba8bb84e76e356bf453ecca417e5fc30527e833e75e25136ddb2915daebe291da967994784bea6882bd20 SHA512 e203f5212ceb4b889386aa6ec42cac79089185da86a34ebf2a853e14e6d567243184af431fbe0d1fc9edce5bbf8a35d0aa7f179ea8f19ee45267cb1604557a7f
-EBUILD warlock-1.2.0.ebuild 1041 BLAKE2B 66d7be123df9aadbf6c8f1fca0e05d866798694813fba8bb84e76e356bf453ecca417e5fc30527e833e75e25136ddb2915daebe291da967994784bea6882bd20 SHA512 e203f5212ceb4b889386aa6ec42cac79089185da86a34ebf2a853e14e6d567243184af431fbe0d1fc9edce5bbf8a35d0aa7f179ea8f19ee45267cb1604557a7f
-EBUILD warlock-1.3.0.ebuild 1043 BLAKE2B c294a1a6c447837d5b1994707ccea2ed07a0f6dccc36ccefd2e0a83b147562ba018ded6a85d596f66c9c76d311aa7096a5d747266d10f3b8ef3af62c5c208500 SHA512 1c04fc62ed591713edb8688ee9155cb74e0013f8d35885ef8b2d58d45d533c0b14fb675e092de8514697ab0be768e80c78e269b8f80105a1b85a5a3493433ac8
+EBUILD warlock-1.1.0.ebuild 1037 BLAKE2B 20f71086429bcd18d9c0f05377409ac6033b1319510d229854c6f3e1a6de695a78e96b24ebaf917b1f5afeb111896805955383d8f7faf4d0d4d41cb5c8b4fbc7 SHA512 b3ebf0b7d2a6d4b23e6ae02eedece092b2c8c30850f1706242a2f551b04bdd5a3c9f12d38fe89fa0c77b3f607d90b2f2b9d661dcfa5394a90ee1ba7052d7a6f5
+EBUILD warlock-1.2.0.ebuild 1037 BLAKE2B 20f71086429bcd18d9c0f05377409ac6033b1319510d229854c6f3e1a6de695a78e96b24ebaf917b1f5afeb111896805955383d8f7faf4d0d4d41cb5c8b4fbc7 SHA512 b3ebf0b7d2a6d4b23e6ae02eedece092b2c8c30850f1706242a2f551b04bdd5a3c9f12d38fe89fa0c77b3f607d90b2f2b9d661dcfa5394a90ee1ba7052d7a6f5
+EBUILD warlock-1.3.0.ebuild 1041 BLAKE2B 75765b65b0a9baa38f2d144f41ce4d72badff9cad918dab524bea0ea201f60b4f35167b848e37b03293897dd1e58cace138f68fbebf2e24e8d620819475bcca8 SHA512 2791c430b1c5ca004a20ad57d462ae5aa54e18ecad3fdbeea4337a078dde54e1cabfc523528c09f4f382b9899d373a132a72114d897343844d1e54a682933283
 MISC metadata.xml 589 BLAKE2B d4c6019cd5e0683baa797b05835a7be6f335b5ec5fc16464e910a8cdd777c21678a319829b4893710a44a82d1194dab59656f9138cc792c7eef285696668c8e0 SHA512 35d027f2d7bb036d8b017e1c171839e7cb926d5764da9e61b3acc72a94419e850c87523a8b9852639d5cd6a6cef1e814dd65192a562da0a45c203968d5f152a7
diff --git a/dev-python/warlock/warlock-1.1.0.ebuild b/dev-python/warlock/warlock-1.1.0.ebuild
index 37b4aab18ef5..f275b1856f17 100644
--- a/dev-python/warlock/warlock-1.1.0.ebuild
+++ b/dev-python/warlock/warlock-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/warlock/warlock-1.2.0.ebuild b/dev-python/warlock/warlock-1.2.0.ebuild
index 37b4aab18ef5..f275b1856f17 100644
--- a/dev-python/warlock/warlock-1.2.0.ebuild
+++ b/dev-python/warlock/warlock-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/warlock/warlock-1.3.0.ebuild b/dev-python/warlock/warlock-1.3.0.ebuild
index 1df7e0b2e108..51516c988cd6 100644
--- a/dev-python/warlock/warlock-1.3.0.ebuild
+++ b/dev-python/warlock/warlock-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 0b8d5ec33805..46650dbaa942 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,6 +1,5 @@
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
 DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
-EBUILD watchdog-0.8.3-r1.ebuild 876 BLAKE2B 89918be3535b04ffe283d3560bc07abcf43e50dfb24e8ecb205e4ff6e1007090d5d3bf872371fe421f92600e7ccb570be8a3d4515cfde4694a4155a7b8f45c1b SHA512 c9ac4c196e35012d6d260791e80b099735f3da134822d000299c3e2d50e9c4ce359de4ac4f50ddcbf2fd2c7e4204553755bd8aaa8c1f86a708c4f6b7e497f3ad
-EBUILD watchdog-0.8.3-r2.ebuild 880 BLAKE2B ea994b824533b177825a9faeccd7b6061462ecc1f8c1b435567cda4241dbbd9b5082245bbbff84cdb3565d021f6508b010cd74f291e060811502bdf143b01aec SHA512 d61f100afe9327964628c9b2664c00d6a7395582c6024750c348ccb6e1d4c4ad827be4f6ae120ed605b4cbf4bd525d28578a7f4f671639089046425eb8527c61
-EBUILD watchdog-0.9.0.ebuild 965 BLAKE2B 5ac7ec329de6f2befcae9fe8a2772bad2bbabd6706108e7fde65004be5901107e7ec1bb0d4444851b4c593e8dcfdb908fcb05eac33b6bd357c5577511ba1c48e SHA512 d84113474ba8fd5a5fc97013e301fb0428e5c6da7c414c3dd1739785a898df3097e89a21d6b97475f124b7f1d09e8471ef21dec3a45dd0dd595f10303b9f30ae
+EBUILD watchdog-0.8.3-r2.ebuild 871 BLAKE2B 5fa1d5d91d5ed94e2265bb6ed005e651b2e5f22a263cf18244b0351ea19d80f6d18f40b0f80313140ea3a22e6d95e8dfb69da87223d99516c7cf6c109400c6cb SHA512 b5d47f81d21f0b33e8cd9b4428d3276781848bf8a3744f9990c6625738f5743b9866acf187da339634e3443fb3387246730e4da1df0bd2cac7b5476ad506a263
+EBUILD watchdog-0.9.0.ebuild 854 BLAKE2B 44aa76d83fef5cf1dc4b6c307a43bc1f1823f539ca0f5855544d4bcb4e50c56461a6e2d0afedc8ce23acc2a135f0197564d3fd1ed36b17f3030e0a234aaf9f64 SHA512 08cfae3fdfb7294ba331a7068ea62c27a2809cb08f5663c286901e9f9176bfac892d237f4001d1adfa1c6721296b5fd9a0e881f142632f325e934d5c8b89c36c
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.8.3-r1.ebuild b/dev-python/watchdog/watchdog-0.8.3-r1.ebuild
deleted file mode 100644
index adddcf54e178..000000000000
--- a/dev-python/watchdog/watchdog-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy)
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="mirror://pypi/w/watchdog/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]
-	dev-python/pathtools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-		)"
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
index b3659f601242..0eda092020e3 100644
--- a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
+++ b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/watchdog/watchdog-0.9.0.ebuild b/dev-python/watchdog/watchdog-0.9.0.ebuild
index 4dbe580e9f7c..66298b176993 100644
--- a/dev-python/watchdog/watchdog-0.9.0.ebuild
+++ b/dev-python/watchdog/watchdog-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 
 inherit distutils-r1 eutils
 
@@ -15,27 +15,21 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
 	dev-python/argh[${PYTHON_USEDEP}]
 	dev-python/pathtools[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
+	test? ( >=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
 
 src_prepare() {
 	default
 	rm tox.ini || die
 }
 
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
-
 pkg_postinst() {
 	optfeature "Bash completion" dev-python/argcomplete
 }
diff --git a/dev-python/wcsaxes/Manifest b/dev-python/wcsaxes/Manifest
deleted file mode 100644
index e1a0fd4efe23..000000000000
--- a/dev-python/wcsaxes/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX wcsaxes-0.8-disable_mpltest.patch 366 BLAKE2B ff4f6d28225fbfbc5df0c7c62141577ea755b97aad810c48b41439d0a8c77480eca5447e70264dc038f5a833c30f0cbd9160b3304a9393b1acf58040347b88df SHA512 fa40ad937d212f63bd9c9856c6b19d819f790b5025480dfe2ddb461b2d67d0c6f0f32f8f8f4b53275ece2f43856225d9b3533081fb32828ec3961a1755fc35b9
-DIST wcsaxes-0.8.tar.gz 226456 BLAKE2B 1efa7dcfc7033735599c85548010a1b4d8e134c294c224e37aed58d3814a4b67e8a9de998c61fdacaade0ca4440bf9222e95021c498e0f0a08edc72ef266e63b SHA512 77a08a99b4b3fd4f08633a10d4a3dfd6726bc1433aca2c2bdb505fd93c79a5ba3735523697c11084f0044a22a5bda345a946f5770185815f92b71b59c7fc0769
-DIST wcsaxes-0.9.tar.gz 213306 BLAKE2B cf15c25b93938bc8c600a1e1f74fcbec17e7f4a428930b7617179c93b0e239f0c3f2c7750a73e1546d87acdab32c97775868db05d5ba57a6ba7cb62da7ac9a8d SHA512 ae5a69f6f7ab71d186a128d902ae2f6d2d1d8a8b3358af88da120815493d24ffdc5d7a07ee96efe5adc91f68822f070b3d667e52e7cee5ac501abe62a468e2c4
-EBUILD wcsaxes-0.8.ebuild 1379 BLAKE2B 688450611f95e95f2aee0d529a27f585bb4dfed9b14164280192573fa54ea670699dc50e92f1038edc11a1512711c94fd8259d3413e6a7f0aa4ee9c31daabfea SHA512 8d01c70864fce2d7ef0c1bcb1749aa685344e632495a47ae2377a9e3b65fe57130f87155fed9fccbdf0dead71eff18d624324e97881bd0e0ab29493398298e8f
-EBUILD wcsaxes-0.9-r1.ebuild 1505 BLAKE2B 328bf95ff614751589c0713957f27633009c9928a18e3c2d0adad88071da04052c6712ad815c1971f928553055d54ce0a5ec02080ba15cacd9460d33baf39120 SHA512 4736d6695475e88da49f815af6462abbe9a212539c0bca9fc8b61856501a10274d2a4d2f293b5cbf9f46a9e26e43e5927644a71bed7c1feb129ace2cafb28f08
-EBUILD wcsaxes-0.9.ebuild 1501 BLAKE2B 77d6cddb3809a88ce92d4c3f5391e22787985b28052d324978a2393d8d3555681358a128d329274c3eb5978e36375ace251d4f15cd382f015b6f6cf5946b3143 SHA512 106976cb0d9e8f53abc69996d1b27ba451521b813e2c1e0515db52ae2e04df019a170cc38bab681614d91cbce2b3e07dc71f67644a8d24877561ff0ae8a5087b
-MISC metadata.xml 442 BLAKE2B 37a185bc318660ebf74b6fa15580a1935b1c305de8f1ba4fa19f47a0ce359012ac81ac4b00e683cc50a7b4098f3bd9961a6e1cf5e3af182b1c5c59ae13e6e180 SHA512 15756a6d3a6b4496eb16e989953302f3e61fc8547154b96b6dd63bb72cb0cdbf366ce9d4e3cc9efc1577c665ede63052a330e41d9421b3664112dcd5bd2a4859
diff --git a/dev-python/wcsaxes/files/wcsaxes-0.8-disable_mpltest.patch b/dev-python/wcsaxes/files/wcsaxes-0.8-disable_mpltest.patch
deleted file mode 100644
index 9426b3296c04..000000000000
--- a/dev-python/wcsaxes/files/wcsaxes-0.8-disable_mpltest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Remove the tests that require pytest-mpl
- Pytest_mpl is (still) not available in Debian.
- https://github.com/astrofrog/pytest-mpl
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -11,7 +11,6 @@
- minversion = 2.2
- norecursedirs = build docs/_build
- doctest_plus = enabled
--addopts = --mpl
- 
- [ah_bootstrap]
- auto_use = False
diff --git a/dev-python/wcsaxes/metadata.xml b/dev-python/wcsaxes/metadata.xml
deleted file mode 100644
index 6f611d0ffb0e..000000000000
--- a/dev-python/wcsaxes/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-astronomy@gentoo.org</email>
-		<name>Gentoo Astronomy Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Framework for plotting astronomical and geospatial data
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">wcsaxes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/wcsaxes/wcsaxes-0.8.ebuild b/dev-python/wcsaxes/wcsaxes-0.8.ebuild
deleted file mode 100644
index 0e4957138866..000000000000
--- a/dev-python/wcsaxes/wcsaxes-0.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Framework for plotting astronomical and geospatial data"
-HOMEPAGE="http://wcsaxes.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-	  dev-python/sphinx[${PYTHON_USEDEP}]
-	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8-disable_mpltest.patch"
-)
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wcsaxes/wcsaxes-0.9-r1.ebuild b/dev-python/wcsaxes/wcsaxes-0.9-r1.ebuild
deleted file mode 100644
index e24c215eabfd..000000000000
--- a/dev-python/wcsaxes/wcsaxes-0.9-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Framework for plotting astronomical and geospatial data"
-HOMEPAGE="http://wcsaxes.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-	  dev-python/sphinx[${PYTHON_USEDEP}]
-	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8-disable_mpltest.patch"
-)
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	echo "backend: Agg" > "${WORKDIR}"/matplotlibrc || die
-	export MATPLOTLIBRC="${WORKDIR}"
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wcsaxes/wcsaxes-0.9.ebuild b/dev-python/wcsaxes/wcsaxes-0.9.ebuild
deleted file mode 100644
index 89e7d6c0fe06..000000000000
--- a/dev-python/wcsaxes/wcsaxes-0.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Framework for plotting astronomical and geospatial data"
-HOMEPAGE="http://wcsaxes.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-	  dev-python/sphinx[${PYTHON_USEDEP}]
-	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8-disable_mpltest.patch"
-)
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	echo "backend: Agg" > "${WORKDIR}"/matplotlibrc || die
-	export MATPLOTLIBRC="${WORKDIR}"
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 9bb9bb98efa9..d23fa6414957 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,4 +1,4 @@
 DIST wcwidth-0.1.7.tar.gz 22884 BLAKE2B 6d51be31c6cf11a23de48bfecd00d8b95e15c80b83559f67689611ac0d8406c18e3a761dc57a868e8c991ee07e286aed66fe77d905483f63ee998ca431fd35f2 SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368
-EBUILD wcwidth-0.1.7-r1.ebuild 707 BLAKE2B 1135363585747ecdd49844a84a33d7f94952ad55c7c558df9febbc7ba98b9f3a216fb2bb86733ae6fd8b2d1079eee0c0e92576d15fcd80b278edee3905035615 SHA512 314fc9a1ebaed91f8754e315cf6a716db550e5e24f1fea92dead3bb4cf858c0f4ea96f516411fe4539638716b7f072ad7afc35c3239ba29e1884ec12473742a4
-EBUILD wcwidth-0.1.7-r2.ebuild 751 BLAKE2B 8bd009d8de91e9c09dab15b0068d4d21885df38ed6d1608255462eb599431a6bbd7ac229eb0d71332631562d9e2f83fa4951ac4dd850f3e9e613f49b0911b732 SHA512 7dfbb3811d831a3661044e3017ad78b80c04cd74ced75d7698b2f2e0dd08dca8691e52275c314514c86c2e07750283405e6b42e66006d1662b45998381694b13
+EBUILD wcwidth-0.1.7-r1.ebuild 705 BLAKE2B 8c8bb9409efd27a82e5236504ed05b16d510169e2a464e04cbb167feeb1f956f246c64e157370618dde3999c0e85808d4adbd9dc5eeae8b9ce9042d8315ca265 SHA512 d7c1c351ccffdce7745fd509ec82ba83b328cde6f271baffef3e24e3c9e239a70f52974cc2fa5840256f584a1862525ecbf460358a9c9bf15f6cb13d3778141a
+EBUILD wcwidth-0.1.7-r2.ebuild 743 BLAKE2B aa31fb0eb7f68381d27507681057dd5685a1e8f110569beaedbe0da8388fce3e3fb5556ba2cb32a38acd83591cbb7874346ba0be0f0dd2a0a5609956582aa509 SHA512 51a4542e03232c81cfdd7f06ef252679cb6f4e4b8b7a2d55251b437018ba47242adcb1c3a419feae535ee7fbb23e31e3f5059218eff6b2d8cf5a7747ff1bfc55
 MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
index 37faf7fe6b32..6efc6573eade 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
index 45fecefe1811..813ae5d4f22e 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/weakrefmethod/Manifest b/dev-python/weakrefmethod/Manifest
index bda92ee6281b..234232c6cc29 100644
--- a/dev-python/weakrefmethod/Manifest
+++ b/dev-python/weakrefmethod/Manifest
@@ -1,3 +1,3 @@
 DIST weakrefmethod-1.0.3.tar.gz 7472 BLAKE2B 44e8250275156ee88b95c8b308b1b18fd7899d028c8ef893f2defd2c71f44a94c416a1531bf0d4a71012f44cec69814bdc8e244c0349abb7dd1e5a3e76c89908 SHA512 c68dc806904eb954319984003506eb9b552005ce04722c6a3eb123ecde8f4413f9f9d114f0923c6f6ae2e25b4dbaf8c225c070a1720a6563cf1517f2411a60d5
-EBUILD weakrefmethod-1.0.3.ebuild 470 BLAKE2B 0ceb5ec49baef63eccd818b4f34aac9b4a0b321ec08f8fcb0424716155cb5a5204f2ca96546c4f5996b9d8ed1451a16163aaffbf1f3305c44fc84c5885ccbac4 SHA512 88860816c1b689fcdab41f545c077287f29acd0ba8fb6237b3ad172b02f69262db75dba6bf0bb16ea544c4229e44ef1c4a75db42c32f4e77017836d4f8552122
+EBUILD weakrefmethod-1.0.3.ebuild 462 BLAKE2B 4bbe90284a39546a6eda28024186f664be406e2bee6a39099a8c3785db0e4cabffa2b8dc1121b4cd372fc2b4b1f54ea5f42f8070b304dd258ec5eb41285f0760 SHA512 e57ff1f8639eacef353c98d5729b2dc6ac1c370ee5d9d2cef8e761f600506e6c985e7451f3f3d762fbb1e4c95db1151f441b2c6bcdfcec9e0ccdd96d75a39eac
 MISC metadata.xml 603 BLAKE2B dbb3d2f2f42f78b2a59b7ebadbb481575e4e21de81dde4b443136f38d5babccf5a05eb33c61b8e1777cc1483fffef547870dd42c9a903f6333de08c920769795 SHA512 97e9f0da46bbec178b6ba2fd9dfd99189f1a00bbad2b26cef5307c3dc0ec5dbb651b325d6ec7ae1cd429a8b23d1b654e1bb2fbc5960aa8d9752b593eac990fd0
diff --git a/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild b/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild
index 01ea69b6ab7e..befc420d0a79 100644
--- a/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild
+++ b/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 0f85b166bed0..d5131422df4c 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -2,6 +2,6 @@ AUX weasyprint-43-skip-failing-test.patch 517 BLAKE2B 27f574095d9dde6ac9cb99f64e
 AUX weasyprint-43-skip-useless-deps.patch 559 BLAKE2B c11b646137f26ad9a3398678534c2f8999ccdbd1baaecaf72eecdbcbf9870f168a51ee91482a3ca8aa8e0372e11c350204c14556e58b60839df571216a103492 SHA512 0d0be1d5234549d98a6c6ae43255a1dfd2ac543d72f85b9e54da4e864e961859100201de447bf88b428a66bc4a3762f4f1cc2e09465051058fd4563e3093a4f1
 DIST WeasyPrint-0.41.tar.gz 393866 BLAKE2B 895624ee547a9ed91157db6a7a72890a56f270d2ea00a508c42899e42922e51867782b1dff3ab55f98df0a130b727a7db13aaf3553a90c4405b75b6813c95ab9 SHA512 44b2d9e0a186c5767cd01d6e66495241d088908467e0fa28cee114a9c480bfcb4ef393236e9304653603f3917c73c452c05a38286932e0a271946860120d9a1f
 DIST WeasyPrint-43.tar.gz 315365 BLAKE2B af643f6a6d09d09d89802dd3823e43e9f05873738b14e4f853a324850ffc12902cb791c3f187f6b550dded40669d376cf3d2e4d7d83e9747e87795a4d57e9014 SHA512 fc4c4decb298d4f9caf244433566c9b675b23db2508093d8c43c6e361119c5fe8298213075f550bebc72fe4156cfc516f04c8d7a2c6215fcd5add14360821f40
-EBUILD weasyprint-0.41.ebuild 1306 BLAKE2B 6848cf170040682d258c1e199497fe03bad436614013616d0d370c47b823075bc5e42364f9c6c3f4977f070f3591fa3afcc4965ae4028f6eb77962096d2a1d8c SHA512 36265b73c2fc71f777a0cbf8a94470ede320cc55b5f25ddd286dd0c6e62e5eeb692dc273da852f0e5f01e984c2d4b78233b270d5d6ab474fc49118c9ab149096
-EBUILD weasyprint-43.ebuild 1385 BLAKE2B 6495af88e5c88f80acf4d56a8540defa01cfdb2d4cfbb32892a02961c0367bff07b92a67907ee9f1a0b5d254c255027b9ddfe6280b7d40f9c082d010a81f9bdf SHA512 e4b90dfc3b3e0b92f287d7aa43008a519f4df7c43c75e8f5902d090ba3d9ada7c152ad23e1cf66455843d327e803f09e2408d230e92ef7711d97b0a59ca76485
+EBUILD weasyprint-0.41.ebuild 1292 BLAKE2B 6fb4579eb430a2a8244dc7946f5a38d9ffc7033f5a47b0d775a90a3c8fea69f612058d341b8e5018577e13a8470bb22cf2ed278a85131503a9beb92583b8ce4f SHA512 833b80aa30d6eb63298f82c057f77bf4bcbe6583c18eb1e4b53dbb4b8e80d4bafab4ea71b6d9a90d0578175106e9e9931a2ce6753af9137694d457d3d85a5874
+EBUILD weasyprint-43.ebuild 1381 BLAKE2B 6ec2ac57641d599626a38afd1e84e29ac17480b5fa238164ebfc2248023e40b6c909d7c7d88e875e1c5e9ba1b4f98bf9b7b73259f7c1ef89d6865ff845f5890e SHA512 c74b5799d26a22540dbcf338aeecfd761a474f6759eb3982f1c2fb8a0bf0a789f5c09eed43f1f8b76ee3e55710a468841004a1626fba54c114229b5263c39b27
 MISC metadata.xml 381 BLAKE2B 422f89ba40bf25e47d53fa91f51ed8b12c5f37a7befd16a2cc2d78335b0dc472180c5e46c6bf890e7a30fc7936e672737e931867097e21a781819fd7ee644e94 SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398
diff --git a/dev-python/weasyprint/weasyprint-0.41.ebuild b/dev-python/weasyprint/weasyprint-0.41.ebuild
index 388d65177310..18d60ad1e73f 100644
--- a/dev-python/weasyprint/weasyprint-0.41.ebuild
+++ b/dev-python/weasyprint/weasyprint-0.41.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 RESTRICT="test"
 
diff --git a/dev-python/weasyprint/weasyprint-43.ebuild b/dev-python/weasyprint/weasyprint-43.ebuild
index 9208904696c2..d50684ae43a1 100644
--- a/dev-python/weasyprint/weasyprint-43.ebuild
+++ b/dev-python/weasyprint/weasyprint-43.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/webassets/Manifest b/dev-python/webassets/Manifest
index cb35f470faf0..414d34c8f9bd 100644
--- a/dev-python/webassets/Manifest
+++ b/dev-python/webassets/Manifest
@@ -1,5 +1,3 @@
 DIST webassets-0.12.1.tar.gz 181402 BLAKE2B 907a4184e0274a9543bda2b7c2fdfeabef346b0920d98e04abbfb3b9858ecae3c0da32b65efe8e4b52d82ab938e182e2e37f005ba25afb1d62235dcc5bc9bee7 SHA512 1e65956afc63dd4bbf43b3b7e220ec6edb8d69d817c6361de67bf8fc7a90b34d3f7e4d0bae4cc45cb3fc043802d2e5d5c8a7cc87421186000212a36605fbc26e
-DIST webassets-0.12.tar.gz 180368 BLAKE2B eb7484d724d41467a8c04c1407cba9666abc77d52b06736f489f20593deb265f30d682ce26ae8bec5f34bcd66b11d052c5ee240d9dab191e7c471c8ec62f9916 SHA512 ad95e5345f9f736389fc684c5b51bb47ad5abb3bdca03a3a4649892095d139722aaf5aa57677997fe869e751b1b82a63c3a882c58005bc6a2ab954bc479447b7
-EBUILD webassets-0.12.1.ebuild 1013 BLAKE2B 9cc5c7e0c3588867d597449a7a6d6002cf331d44bfe88ac298f80d908792438b5199e49f6d65b84097033097f338412144a3dddbe782c572e742d2ae722aa388 SHA512 d9ed449477cd013b1a820332abecb29c2d9e423a8daa630be0105e8458b61cc308ac3c4c6818f2cd97f540941f1ddf75998fafc146ab7058ad8504d343717a7f
-EBUILD webassets-0.12.ebuild 997 BLAKE2B ba58efca4778d12ba872ccf458222ceb5d41d7a7fd25517d4329ba33322dbf16af3eb9f2a0ad8960c647021b96f1f7e6641b8b393b57a024c71dc3391a540dff SHA512 8b57143db185b2a1dbc828b1dfe0faac1c308c36f1e99c53d10e2820880f237173d160a1b64bfc06f1e11ebd822e31b698ce14da8ec8ba4381e31539d946a946
+EBUILD webassets-0.12.1.ebuild 1009 BLAKE2B 74d98489308505b9fd084875cc6fd26f642442707298f39a999a8b93689ae8be3c84a20b2eaf37934c77ed082439ad045663c793fb44cecebc7e20441e53c532 SHA512 5a23d2b181043c52252bdab2f85b80b1958587d0571da6d321de8b5ce5d860c1c2195b8cdebd30a68179b6e5522039e4b6ee6d47f43358db96664be239723834
 MISC metadata.xml 334 BLAKE2B 070bcff10f1f0b3fdf01e30021d06ecfdc49952aedfde4a18c254eb9f160c8bf990d5816bdb510995818a73a2da25a77073a672d375cd07684214a325283e390 SHA512 5bcc0fe8286771e758641d97206f14e447f6e0ff49d6c6e91285e0cb6eb5a4116760851996679c79dcf5fdfb4c0252f299676847612fc345fca020e44fd4d2d8
diff --git a/dev-python/webassets/webassets-0.12.1.ebuild b/dev-python/webassets/webassets-0.12.1.ebuild
index 407dc4b0da8d..df50fbcfa7c8 100644
--- a/dev-python/webassets/webassets-0.12.1.ebuild
+++ b/dev-python/webassets/webassets-0.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/webassets/webassets-0.12.ebuild b/dev-python/webassets/webassets-0.12.ebuild
deleted file mode 100644
index c33b8e317594..000000000000
--- a/dev-python/webassets/webassets-0.12.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Asset management for Python web development"
-HOMEPAGE="https://github.com/miracle2k/webassets"
-SRC_URI="https://github.com/miracle2k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# ^^ pypi tarball is missing tests
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# webassets wants /usr/bin/babel from babeljs,
-	# but we have only one from openbabel
-	# ... and we don't have postcss
-	sed -i \
-		-e 's|\(TestBabel\)|No\1|' \
-		-e 's|\(TestAutoprefixer6Filter\)|No\1|' \
-		tests/test_filters.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index 5511938cf47a..bdf9738a7ed3 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,7 +1,7 @@
 DIST webcolors-1.10.tar.gz 36108 BLAKE2B 9856514e90b5ebd82cc619e19637db1862c5f94230e000c6779920fc84e1e690d5e34f080c5fb1f5a9f71769597c349fc55e12d339280836a47969314e63f6c5 SHA512 db02dcfc542d1fd08fccad815a02cbe01012a942329c53d468c7f9b6e0d628dd38abf4b2633bc8992fb914932ca4455e54c7ef98e101ca86d34825edfc3c1feb
 DIST webcolors-1.5.tar.gz 29960 BLAKE2B 0d46fa57b54525594547b1224801308961f9265dc76866153752e411dcf81d3ca2566cb289bb9f0cd486bd6ec1ffe7cf88f99a04f5554ae43f183175c9eb925e SHA512 84ce8cbbbdb4523bb146cf379845b549570623411a56651a7f9b9687152b7adc9dc42a3a0f684b55b61fb7a3d51d49d3871100b56725c86a727e3374b53c84b6
 DIST webcolors-1.8.1.tar.gz 33118 BLAKE2B e16ff2d9549eb09638722a6513749ec0bc91cd63ba69c19667ddea9c07aae7f9fa2b0fd3390a9b0f6f420f245ff3157d86a585301ba77e724146a7cee0ef4ad8 SHA512 45ddb4ec030206c3ff1edb7de6b8ec1b5f2f9ef5068f37a7c43b66531a2dc6b290cced2af1ca18794aaa9ba17f297022b2f9cc7a92a74ee9b68f758abf7c104e
-EBUILD webcolors-1.10.ebuild 671 BLAKE2B e04e681e605a3d8a455dc69e06069b888c43ca84b6ec0c44f25301fe577710f47aa75f0387d38d18c0ce4999446b49aed8ba528567e620295ff46b16840314c6 SHA512 931daba286824012861174996c32aff516d07716e60578017e3e5d22a2620d4b36516ee2d1050701247f929803c760e8dcfb358504dd221c65fdd8eff6e1585d
-EBUILD webcolors-1.5.ebuild 693 BLAKE2B b6b3a49813c29c69e50f0850edddc85eb9db3a6d338ac9d251fa2965861871fd25650381a3bf6661ff429a78898b7ad4f32e579222e86c21f94232fa166501cf SHA512 fa0bfbc6245882aa5e441557e11667266f55945953acd84783ba7cfd6e42d3d4fb6c799eb7a4e8eb287dbb86040f10da25b6e731aed7281f23488692d88cb9ec
-EBUILD webcolors-1.8.1.ebuild 742 BLAKE2B 11a4456d9dd399ea7abd253a76ad747e05823d55c058797a1c618db2bc43f4341f99d2bc2d52b3958116cbaea741d8ddc990b930434c794c738835e953f830ab SHA512 9bbc29098cc1b1186d8fef2a9949db265abfd32e1b3d42bae0f5c8049b995b0d2f015a5b366e16d2859579c8e36f5e3dbec88000f8de38743b52d9f50ecb8fa9
+EBUILD webcolors-1.10.ebuild 666 BLAKE2B 48c9fd43067543948b9b013d818d96831d4c0db40b7f408e228b88ef8c2bc4fec96642303f6b74f14e73c3d41edcee4ef645f779877e4d846b71c109ec8ce2d6 SHA512 c8b160b592fbcffb2d15d2c8e047ecc796f5b4dfa5323aa2406c0df2797c680bd73c29aedad01d5e3568fcdbc2c01c0b3c1fac0628a291a2ee465e327f4ad7e6
+EBUILD webcolors-1.5.ebuild 686 BLAKE2B 2c235267e536d4ef993227ca4e4f0bbcda509713b5c700e1110d16a7ce742404e1b18882d2e92f9dc01b792a5f1ebcb4d43c3bcddac726a6b38b89f1ce4efc63 SHA512 2916ec50d3ce437bf2efd18d472b6eede93bc0028937111c7bc7e78ddaf28089fe5921edca42874aa151b3b4b6b6d0ad576e63c4d04e214d013c945fb326b258
+EBUILD webcolors-1.8.1.ebuild 735 BLAKE2B fdd153ddc9dab0b51fbbcb30ec5bf3e764ed91e31c08a07d8c98efbef06e09db5ce5e44c4f336305ae52f577d7ca5d3425aa9515bdbe87d84271e80e5858531f SHA512 550dcda059378d7a5537345a85bf249dff69ec99b7fc8fd451f091ab800b592e190545739ec9fdcf597d26738626d674397a89d25c3a1143ffa840ce79e7d6b0
 MISC metadata.xml 373 BLAKE2B 77ba0f1d033aa4955155891349878942ffb67450d1e4891c87f068454546c73feade5f683574ae6a4263bf9cdce3f2beebc188e3812086d84a6cdeb840328c48 SHA512 0b99d1cca8cba614a64f182192f08d168e01c3d5dd3227f4425f41f438769b7b0566be41c9d3a3b3bd98825582315c035a7641766416fc5e57816b72d27d726b
diff --git a/dev-python/webcolors/webcolors-1.10.ebuild b/dev-python/webcolors/webcolors-1.10.ebuild
index ad20629542d1..aba80a49a3d0 100644
--- a/dev-python/webcolors/webcolors-1.10.ebuild
+++ b/dev-python/webcolors/webcolors-1.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
index cbfd85cc8131..7e167b681523 100644
--- a/dev-python/webcolors/webcolors-1.5.ebuild
+++ b/dev-python/webcolors/webcolors-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/webcolors/webcolors-1.8.1.ebuild b/dev-python/webcolors/webcolors-1.8.1.ebuild
index babe836529e7..f22485f36514 100644
--- a/dev-python/webcolors/webcolors-1.8.1.ebuild
+++ b/dev-python/webcolors/webcolors-1.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index 52486b08e434..ea589e24f335 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,4 +1,4 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
-EBUILD webencodings-0.5.1-r1.ebuild 772 BLAKE2B 2dea4a7790aa037bd53cff8632a52f0f74df50bcdf9ac11cd37dfbb6adbaddd2ce0cef82bc5119604e9d1bf0143e70b0d0d05441363d67e57ad060f2f6009e3f SHA512 53dcdd186597e75482de346ded67aebd9cb2ebfa5993d986d50d16b86e31512beb71d8f1e57a931b5cebee63ca8d76a3a6ee4f3bded1c013f198d0eb370ec094
-EBUILD webencodings-0.5.1.ebuild 869 BLAKE2B 82db584a59d3fbf7f845062cbb9a1dce5e8b44ede24bed8a8f174e8c8c86dced55fd5c7dd083cac0a757d0054f5777a4e19529943557607632757e930747e1f1 SHA512 5a10e57224556a23be783a94af026436ab0c45c874aaaf25aa85785594f926dc9a1b2289aab6e10844d76faedf7c1111242a499f7d576f5b9f2d4dd93e5f3bb7
+EBUILD webencodings-0.5.1-r1.ebuild 767 BLAKE2B 67c663cd64ee433add73e65e576fa93d1b26be4dfdf8fbf5fa224c5ddbbefa4c33da4b2c2a4c0ac27d4f91b909ea9d57f8a5ac00d974bc58da695eaad72b3e67 SHA512 2d2401d2b713cedb31c1fd040951436bbfd38fe75b708673b52a43b91b9e9f87196075ecd3d6b0615b3df5fef4d113138e2dd16e1d50ad08f166a3a0bcfec599
+EBUILD webencodings-0.5.1.ebuild 862 BLAKE2B 59a1e8a97b7dece742e44f434e78974090570e6965e9528f875fde8a9fc87a75dfc8fafd465650fb9b0e6865abe7920f2e1f5f580882b6575817fd9fdc9ee56a SHA512 b664dc77d3d583e926b0b65d6c0113ad148eefa89ebb6bc8e9609676bb72e048b750fade68381a8f0f5903c8ef31c27c5d6f683ec93bf1c856146f7923cb90be
 MISC metadata.xml 575 BLAKE2B e04ef356f2e32b91dcfcf94b1f02c86782491f811d71e45b19731f9e0262d42d2419a152b99c52f575db57f682d7a6820a2a2d1e4ee79ec1beb810c238907578 SHA512 c734aada8a2ab7aa8cc6f25fdab99d9ede6be164d23acb8dbda9f7988aadf9d12b6e3043f5adb050cef277523b4a0c84d770ad1f2f75ff7d21d774c403d960ce
diff --git a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
index 531b0c2dbcbf..b7b75476ffcb 100644
--- a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
index c0ea1069cb86..1086c617fe02 100644
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/weberror/Manifest b/dev-python/weberror/Manifest
deleted file mode 100644
index f09ed3e85e7f..000000000000
--- a/dev-python/weberror/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST WebError-0.13.1.tar.gz 85910 BLAKE2B d335511d9a7d6f4a4d68599547b1e610900026c50ca9fae733879daff4bda41b26ecfe2dadc8614c49427115f1c33ccb0e696f3445f2cc4327c1b656b03c3697 SHA512 eaf54ab27775ccb1bb7d58cbac29d2a8045070ab5c6aaf6b95899ec7d9a996f03df2b853ebb4ae39a816cde0985f04a45f2c0ce913b69229a1aef8adeb639a9f
-EBUILD weberror-0.13.1.ebuild 822 BLAKE2B e175d9be813a097c21793f67589385c26ed2126a9a47787dcefbf2606bd5ee9a2b3f9f687359d9573b1102d016acf63152284811cfc9f8f4b930af67e32f4067 SHA512 9ab492db2afad6f4fa0bd227e2b933082e2d17f030cecc0007c45ecc6b61370296acc2c641d3070ba3da0548b4fcd66d0047403c0da59a45013db484678cfc97
-MISC metadata.xml 311 BLAKE2B e1202fd287e5c482ed3f3d9112b7a824ab92315b28d372fe78aaf3210b52f6098a54963814c5647e9be78b87bf3d60bfe4c4d6c8635b46b12f94796ff2425579 SHA512 abde868f27134e744da2810a026c9005a3b8b1362e2fd530fdd546b0357873445d817972dcbc87c83f4747c25faa3b20bd85882c2cda5d67aec735a0837fadf3
diff --git a/dev-python/weberror/metadata.xml b/dev-python/weberror/metadata.xml
deleted file mode 100644
index 3c62abe15526..000000000000
--- a/dev-python/weberror/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">WebError</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/weberror/weberror-0.13.1.ebuild b/dev-python/weberror/weberror-0.13.1.ebuild
deleted file mode 100644
index 660a60547994..000000000000
--- a/dev-python/weberror/weberror-0.13.1.ebuild
+++ /dev/null
@@ -1,35 +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
-
-MY_PN="WebError"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Web Error handling and exception catching"
-HOMEPAGE="https://pypi.org/project/WebError/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/paste-1.7.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tempita[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/webtest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/webhelpers/Manifest b/dev-python/webhelpers/Manifest
deleted file mode 100644
index f46a7be2dba3..000000000000
--- a/dev-python/webhelpers/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mime9ad434b.patch 827 BLAKE2B 7718339e6b099a18bd8abf4be75342e7474444381b04b73a30ae426bdac19dfe7662d0eba4d5eb343c0656c6f694a2045b6560ab8dd163c212faef3d5b0ddcd0 SHA512 98ee96b72152d1c644ce398c9bd52e6e1ba45de1c93c739fbbc0e81fafb5387dfb41551c7752c251e24003abeaba1ff16b6d3367a5e441a1a864b698638c4af5
-DIST WebHelpers-1.3.tar.gz 729963 BLAKE2B 98a51d39f0ea8aaca894ffed1fb21fd05305fc70c9c07062231da16091b7b81fa425725b915fe36b09f7c2943633e9b0e6e326031b1e50c84676b567b2ffe762 SHA512 ff1f19c5b878bdcb05664523d16fce1abb012957f00a97c06b3b5db581c6a361a2db5516b47a0e2b107bc9ba73270ccb323afb240cc67a34d6f15ce9462fad77
-EBUILD webhelpers-1.3-r1.ebuild 1518 BLAKE2B 166e9c9e9330ffd8f3ea8bd92cc6402ac1349db2d331bd20137315a330c6718a7d7b6bb6bfa05a5419f88ba8cdade94c8ea44ef5b2733320546c625111bce336 SHA512 a894ef94df05381aa0f21e6e26060a3c5f1ad348b7bbd8b746d17bc2af6381e6520fc5cba86e4b002f753e3b46ad83886fe7b021af3ea35c4a9d3330170d74df
-MISC metadata.xml 313 BLAKE2B 39c2abc44dfcfb8c079f665ac17e7bc66fcf4ef09955bddebd6c9442bdb7ddf2e6c7b02cadfe024b671882a447c4045657a12b91db6d4182e3c44fd2e989ec64 SHA512 d3f3cb56d4fbc3690545df372cd447b9f34a613044372211037b9366dd0ae91168d0c465c80008b0d1e9ca78384d186b3a8dfa2516ccc7ddfa5b09b4e14009ec
diff --git a/dev-python/webhelpers/files/mime9ad434b.patch b/dev-python/webhelpers/files/mime9ad434b.patch
deleted file mode 100644
index 5e37216f3847..000000000000
--- a/dev-python/webhelpers/files/mime9ad434b.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bitbucket.org/bbangert/webhelpers/commits/9ad434bec9a16c06c1cfeed38cde02f00a95685d
-diff -ur WebHelpers-1.3.orig/webhelpers/mimehelper.py WebHelpers-1.3/webhelpers/mimehelper.py
---- webhelpers/mimehelper.py	2010-11-18 12:34:33.000000000 +0800
-+++ webhelpers/mimehelper.py	2013-06-17 15:45:40.603257640 +0800
-@@ -110,8 +110,7 @@
-             if '.' in last_part:
-                 has_extension = True
-         if 'HTTP_ACCEPT' in self.env:
--            possible_from_accept_header = webob.acceptparse.MIMEAccept('ACCEPT', 
--                self.env['HTTP_ACCEPT'])
-+            possible_from_accept_header = webob.acceptparse.MIMEAccept(self.env['HTTP_ACCEPT'])
-         if has_extension == False:
-             if possible_from_accept_header is None:
-                 return self._set_response_content_type(content_type)
diff --git a/dev-python/webhelpers/metadata.xml b/dev-python/webhelpers/metadata.xml
deleted file mode 100644
index f6028f47fc7b..000000000000
--- a/dev-python/webhelpers/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">WebHelpers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
deleted file mode 100644
index 53ca061c7f9f..000000000000
--- a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
+++ /dev/null
@@ -1,62 +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
-
-MY_PN="WebHelpers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Web Helpers"
-HOMEPAGE="https://docs.pylonsproject.org/projects/webhelpers/en/latest/
-	https://pypi.org/project/WebHelpers/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-	dev-python/routes[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# https://bitbucket.org/bbangert/webhelpers/issue/67
-	sed \
-		-e '/import datetime/a import os' \
-		-e 's:"/tmp/feed":os.environ.get("TMPDIR", "/tmp") + "/feed":' \
-		-i tests/test_feedgenerator.py || die "sed failed"
-
-	epatch "${FILESDIR}"/mime9ad434b.patch
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake html -C docs
-}
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		pushd docs/_build/html > /dev/null
-		docinto html
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static
-		popd > /dev/null
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 0d14811d61b7..1420fdc4d3f3 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,8 +1,8 @@
 DIST WebOb-1.8.2.tar.gz 271737 BLAKE2B c6eef650e9b03c83d7c618d0187ef7fbd3432d043ab27501cf8c4d6dc3889f3b542c54bf35963d8a313d62246183373c30706bcf5fd00495808e21d3dc9e0482 SHA512 691a6cfbbff376e7b1f71adcaac4dbe8cc26cb4ddc396e2ab946ddf15b34c05c638113f48ee396d4edaf6ef77498ca8539d1c63de9f58894afb0e4b88bbf04ae
 DIST WebOb-1.8.5.tar.gz 271955 BLAKE2B e1d22e91e8e04c88d6adcb4dcad93e1e0c37b5b3894eee7c2b5a92d2eea41719d3b42e05916bb355a3ac9a2f7357fe791ce6f776261bfc764eadf59d4be37bad SHA512 cc0b956a7c3b8ae58d6002baf5c6de4e442201280468f8fc8b5fbd2c7f7cb7a8f46447f97b98a32a9959c8d1aa7a2a8a7b9d624cb27ca79b2ad1ce94f891801b
-EBUILD webob-1.8.2-r1.ebuild 1064 BLAKE2B d0978ee0f5004de655051feb895f256d54b705e8ce7f33912f99e3028966b7a2157a7731a628f257b7465a3be2616d0ca22a870bb9f76b8f76bc999a48010cc4 SHA512 de83e6fa041aecf40aa5e63e5ae96a0c8b45efa3e27fe62eadbe6184b6086f977e684d25d0bf1303eddbbcb41b9afacd58b229f758a6cc720d27c72b8a5f6a0f
-EBUILD webob-1.8.2.ebuild 1048 BLAKE2B 3fba277f414a72b68e44c77d63d547b108c55f766d28969d8ed9903ace7e221f03f486662a672a646c66ac1a548d2ae5609e0222657bbd940a61fea436127278 SHA512 7c42316c9a6b81a990f2f5279ea4fc131e1a4899992a15ea4676e84d5ab67b031ef174c568a92e81cc687cada7e13d4af09ddca0c0f061fc2a1015d3f68da9d5
-EBUILD webob-1.8.5-r1.ebuild 1098 BLAKE2B e2d2bc70d903ee656555393894bc5889a233b8f320731c7d908bfaa0a17257bbc74ea4cff3b967d473c982b2800d1257be592e2fb77eec1f6596911cad8b483f SHA512 b2c4a992cfd537479559e41d7ac7eabbdd30def48af0c99a6e0cf223e49a81bfcd5e901cc05e3815ac3538722e0fac6635379df1da50d30d73341812b8e9d845
-EBUILD webob-1.8.5-r3.ebuild 797 BLAKE2B 8ff56481f29a0342082232febf0021ed9754e52c2a02ca5e8561af07b64a1555ea3540bc588c223710e5db19dc5f6031d8c5d4f11db481d9117e619ccd241365 SHA512 6a3f0df80dd24d2d2187dad70857e017f37b6a96be1f15a8f4c950a58469c5d73f461770fc960d8c478997e97bb9730caf014be509059f324ff011343cf338d1
-EBUILD webob-1.8.5.ebuild 1053 BLAKE2B 0a7bac288c8a18b040f502dca64ee897aceb7274e916e4784b559400e4abeec078cfde49835994f730f5507e4fef359b7723473514e7e599b6a3f23544c25ece SHA512 b252966ff71dcf092e518846a26273ef5fc8d4f398c4beee11ff7787c734f66d165ce186491654e4354982242595ad0adc8963b8e601a9f68713645ec7d21cad
+EBUILD webob-1.8.2-r1.ebuild 1057 BLAKE2B f4ca82dc46570b1bedf03507aabbeff65c2954831b1821a61b91105e3ea15e2c96d525126f51ba5e1ab835eeb4b0be9525dd1f904eb1677e8ef1bffaf69c1a96 SHA512 7c876d979b0f3d4318b8d078898a85e19d74848bd55ee883f23aaf4e70daf17a4a0f150d479460b2fd043358212cc91ca396d4098d7784629a97cc1b01daa30a
+EBUILD webob-1.8.2.ebuild 1039 BLAKE2B 1aba3d1a9c42b8782858f4d94d6131be60d9c4a86aade92c24aa9a0c24475bd2d8fc7ac03349f50ac79b8c176ed5dab254b9c78ace9ae9cc4e4ab63ac4cedb9c SHA512 12288e76cd27d98315a4adcc3771290ef7e29bd8f0fef8f283e0b8faf607b9488c8b07d170d005a8e44f614810c543dd2ae46cf1656efc11174b3c59da034ad1
+EBUILD webob-1.8.5-r1.ebuild 1093 BLAKE2B 3f8a91c71068fd8d223fa3f1ab36d3f6901d52d29411df6e1d63df7b996763aa79c410c1b13388926af56c379815349b513cfa355454c6bc952a002732f2e008 SHA512 db3b74f2491b5ebe7f3c57712dcf1e2943cce2908220edd138bd012d87834b3b3c6d6989c742264b5070efeaf1d7b05d79a66554f568cf6fd33463c0171e7277
+EBUILD webob-1.8.5-r3.ebuild 792 BLAKE2B 1972893da0310576d4aab3dba7575925fd2e1cbaf926e90a92dbd4d1bacec3f645c212795c8f3b4f19f200345bfa2647d2b37408a74d470a855db86e7b882906 SHA512 3ec29670f7834cc1326134d69a03085f4dcefc1f8e2dc0c4860158f32e9a8629d834e1409444fafd15cdb8fb6bb5e271b4020cd4f0419bb64c93e491abad587a
+EBUILD webob-1.8.5.ebuild 1046 BLAKE2B d5742f0f2e91d3c0a4d0c3cbeba8aaf85489d272327f5f72ea2bb392d494b66027d2a454b3a75572524c2b2076777aff1d8b22ca8c5fe2d6973f00a7a451b145 SHA512 a051b33ac18f2b9e7492cf53d97ad88ff2a6a22ca5d787c539db7fbf3b08d1ee424b191d461bb4dcef6d96c5b1c63ed8ccc7f0735799ae6bfe427dd669c39258
 MISC metadata.xml 420 BLAKE2B ed66ec7dfc302248e6e5b18c9ca6dd2c339ebe9b69e0d1fa964d86e7337321a0a4c6d5136454f9435013fda73ba3d52322dadaf67a3bfbf3764d504b5c1b7147 SHA512 a6b9423edcdffc02b7165beaad70ec8819a8da7bd564ec5b082c2c361ce1ac88e28a738b78c3bd2e92eeb344368e5690d8d3a90dfdc2675f0cedc0a026898f4b
diff --git a/dev-python/webob/webob-1.8.2-r1.ebuild b/dev-python/webob/webob-1.8.2-r1.ebuild
index 975e0eaa76f3..8b588251863e 100644
--- a/dev-python/webob/webob-1.8.2-r1.ebuild
+++ b/dev-python/webob/webob-1.8.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webob/webob-1.8.2.ebuild b/dev-python/webob/webob-1.8.2.ebuild
index f7e0745b1346..7ca5d48a9477 100644
--- a/dev-python/webob/webob-1.8.2.ebuild
+++ b/dev-python/webob/webob-1.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webob/webob-1.8.5-r1.ebuild b/dev-python/webob/webob-1.8.5-r1.ebuild
index fbec57e8dd0f..26b6bd423640 100644
--- a/dev-python/webob/webob-1.8.5-r1.ebuild
+++ b/dev-python/webob/webob-1.8.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webob/webob-1.8.5-r3.ebuild b/dev-python/webob/webob-1.8.5-r3.ebuild
index dafe74e49756..883277c597ca 100644
--- a/dev-python/webob/webob-1.8.5-r3.ebuild
+++ b/dev-python/webob/webob-1.8.5-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webob/webob-1.8.5.ebuild b/dev-python/webob/webob-1.8.5.ebuild
index 0223446624a6..a0ff31d4e67c 100644
--- a/dev-python/webob/webob-1.8.5.ebuild
+++ b/dev-python/webob/webob-1.8.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webpy/Manifest b/dev-python/webpy/Manifest
deleted file mode 100644
index da15e808b973..000000000000
--- a/dev-python/webpy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST web.py-0.37.tar.gz 90232 BLAKE2B 3c6e867ce54a6e2cb7c4a296d1191344ea88b643518d5a3a8f7248d217c54c40ab2bc4288551ed47714418fb234b68c08c4c677277e131c626927571035f0c78 SHA512 766e24d9df6ab1c3a214156794a19c23fcb16ca7a4ee7586a7723f802eab2ba0b8cda4653c2504ef63f773609436ac12dfd40bbe6cf20e2f93bf95493f041628
-DIST web.py-0.38.tar.gz 91877 BLAKE2B cb5f009e0004b58cb431aa2d78a6127c83873d77e119a242d2aa745e69c304866df8333b8039b5e52d47b23b6c9f38d1d47bc03f449ead577775b99e57b1a48a SHA512 cac697206945f918bbe657d019623132e0bde9eabb0836f617cf86482095c756d6f28984e0efbedaab954966b58578d30cd9ecfecc0ed79f7d0ac74d95a19a12
-EBUILD webpy-0.37-r1.ebuild 748 BLAKE2B 960c0f746b7f588c6087365827250ac2504403de93e3a183cb7d2c7fbaf50770c330bc98223450ce5cb1adaa4ff1b87ff0c98233b10065095d1b458676d377ba SHA512 9d5fded7c3129c280e216fac143669c475373c79682c7b172fb4ba4b3d97dc660bde50688a45b01be5c7b1d7dc08831ccc076be2842fa4aaa22737cfb2cee1fc
-EBUILD webpy-0.38.ebuild 669 BLAKE2B bb49c5e2031cb7e909bb1eb891145933db69f50bc1b120e39e2c097ef343bdfda07d4257dc3904ec06903109575f63657bff54c9d8efeed5bc000c0dfaa5439e SHA512 59c52dbf3243a232e88c89fac831c1eb3336cec1ca6f1f918878ed3e13e5699e85c66dd50adaa709ab5084d9eb26f315950a4231b8f32dc8d4486b83979d282c
-MISC metadata.xml 404 BLAKE2B f55a86cc26876e098449e828b2c92776d31440f6def680a65147d540e7aec1f015857e6f118453b227b59f84f9b3f6beb983ae861f4036cc261c8c3412ebe65f SHA512 0478b1b4559f96d7883af4b8f9d8c1aa33130e30548fa599b5a0824d7f183b63bce201fe4e77a933cd65d4ba010de8ead9d3042503c487fbbc777410bfb95674
diff --git a/dev-python/webpy/metadata.xml b/dev-python/webpy/metadata.xml
deleted file mode 100644
index fac6a719b9a3..000000000000
--- a/dev-python/webpy/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 lang="en">
-		web.py provides small and simple web framework for
-		python. It is a convenient tool for small sized
-		websites.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/webpy/webpy-0.37-r1.ebuild b/dev-python/webpy/webpy-0.37-r1.ebuild
deleted file mode 100644
index c59c79bb397c..000000000000
--- a/dev-python/webpy/webpy-0.37-r1.ebuild
+++ /dev/null
@@ -1,32 +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
-
-MY_PN="web.py"
-
-DESCRIPTION="A small and simple web framework for Python"
-HOMEPAGE="http://www.webpy.org https://pypi.org/project/web.py/"
-SRC_URI="http://www.webpy.org/static/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 hppa x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/web.py-${PV}"
-
-python_test() {
-	local return_status="0" test tests="db http net template utils"
-	for test in ${tests}; do
-		echo "Running doctests in ${test}.py..."
-		"${PYTHON}" web/${test}.py || return_status="$?"
-	done
-		return "${return_status}"
-}
diff --git a/dev-python/webpy/webpy-0.38.ebuild b/dev-python/webpy/webpy-0.38.ebuild
deleted file mode 100644
index 28895eb899d5..000000000000
--- a/dev-python/webpy/webpy-0.38.ebuild
+++ /dev/null
@@ -1,28 +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
-
-MY_PN="web.py"
-
-DESCRIPTION="A small and simple web framework for Python"
-HOMEPAGE="http://www.webpy.org https://pypi.org/project/web.py/"
-SRC_URI="http://www.webpy.org/static/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	local t
-	for t in db http net template utils; do
-		einfo "Running doctests in ${t}.py..."
-		"${EPYTHON}" web/${t}.py || die "Test ${t} failed with ${EPYTHON}"
-	done
-}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 3efa15e7cb40..0170168bd7bd 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -2,8 +2,8 @@ DIST websocket-client-0.37.0.tar.gz 194246 BLAKE2B 805482524b603fbfeb1039bcd99d7
 DIST websocket-client-0.40.0.tar.gz 196203 BLAKE2B 303aeed5bfc84139adfbef3f3198512172220d2670e38683d660def19dcd82015bf85edd26a5aa029ba021c1f9496dca33e5ee8afc790b87eb1fa7b7b17c9aed SHA512 b57593e14087ff36ab2133fb8077aa207bcdcc04fa82d00eb8fa3b86bdf7fa949c8ca25317a7fe035ef0f36d2c996e036d2b715399813604d5593584d409a5eb
 DIST websocket-client-0.47.0.tar.gz 202611 BLAKE2B 8258ac3186eedcf7e3a791768ddadbe32aa506f27889214a6a275d6710bb7adf8d0ba8354165a0d07b7a084fe5937fc65ee85e6d84fc8ad21a7d2ece4ae8d91d SHA512 0d384e96be66877ba0c24e7194e2f3d554f818c2e2f107b054e07034fa7678946738c2b08c68cd71ebe0237fa507fade319273c492871fbd0ad7085b87cf0a54
 DIST websocket-client-0.48.0.tar.gz 44492 BLAKE2B 39191416d0f80778edc261e96554d3955fcb71542c891fbc506e30c768d2d684942cf690647b65c2245da45c993e3e60d65bd7ab9d28bfa6eb304a95a3ccf619 SHA512 6c678a2671ce6cfb86a61effa836bbe4bb1702f22827934b1fcd7f0f8439be76037d9b6d4d6b416249361a9a74a92701d7b90bc6276b2433388644ed66f56333
-EBUILD websocket-client-0.37.0.ebuild 819 BLAKE2B 48c563e4045ab7b8792c84a5b92c253c77fd0f5b28dcc90c93467d30039264b9413245a7041d2dcb24a7e1750d7902d98b1718cf05c26bac29d6a1da9001b671 SHA512 eb53acdd45b208e693b8ee94b78b96e89190a921032e5a59377fd7719eb44ee3115917fe565383d24b742c6cf4f0b735372c998ac2595f403cfa2af1c03a3621
-EBUILD websocket-client-0.40.0.ebuild 808 BLAKE2B 35c70eb69d03c9845513ca0b243b73961a4890738567b2121c1a3760e698d85ce58828cbbe1ef8de5374efea7ac76e7dd18d6e3f8bdcc998facc4776ebca36d5 SHA512 5fb71f58f7c40001c2ada49e0687bce9f3db7b28f0315ef7adee08416d6b138a3416d0110c3a8e17017fec62defe086ec3b664bb6172329a11429cf2c7bdac3a
-EBUILD websocket-client-0.47.0.ebuild 832 BLAKE2B 483d76d21aa7fb6af7b4faa39f3616edd5ac900db5f99234abc391454aaecba0406f50d917e406c4e1c1d913b3d7345be9608ed316294a99c3c46f100332093d SHA512 f2914e3dd6ca83e8235e6bc5669cba4eb69fa57e57d0e30ca46b884f18ede677bcf32e0e65e058ca0b539cf53dbd573a06271b1c208da383ef54ac04baf4c0a3
-EBUILD websocket-client-0.48.0.ebuild 963 BLAKE2B 1b5e8426bd54bef457990ef3c54111d2ab2a6e61913cee52ff02fbfc8d235d11292f6d0ed00392bdb35a3f3af52a65acfe40c9d648d82246ab3cdee6ba2d98a6 SHA512 ec0deb7cb3c90cf1fbbc65226d66f0de6e22572eb5b535d3ea4b63ae91856afd0e710547df75f34eaebb60de695bb5c4bccd6283a49de5916bcc6e31bbb681cb
+EBUILD websocket-client-0.37.0.ebuild 815 BLAKE2B d28c6b5b6dc6b043f58a448c1a58a9b256075ad08ed7c7b19e4a6ebb7520877169aca5bff786cdf5fdbd82c4ad371a6b667decdf3a9f302cd552878b033d47a8 SHA512 784dca3b5bfbb1075fbff1291721b3ac3e8b3c5d72ddc3a7090fc232aad8c229a05d8071528a74841a179a7be72922ca86b0768dca67ed9025e660edfaafe521
+EBUILD websocket-client-0.40.0.ebuild 804 BLAKE2B e634ab5628c27e1972fb0369ae259a090430894b1c03ceb588956b3f40296b08f663bc8d7d13adc19af6d8b489450ccee086bcb78ff092fa0a80806def70006e SHA512 00a541bf29206ac8ee3a2cba5e9d9a4362ae327263a900d02b860281b91d066afd6ad5cf2ccecbbe6eb1640fece69216d9027bd45c34f7cc2064c6c493e96e98
+EBUILD websocket-client-0.47.0.ebuild 828 BLAKE2B b1511b3c0163a075f1ecd3a95d8c65c416b4b3063b77cc810df27906b8c9cbfb3b57b7c62588cf06664c6a291c09247721626136d81c1a16fd5364d53580571c SHA512 e3ea5db78691e129d85ad6eae5f28297f94e77085646357dd286cda73e896e70b9a093cfbd72493c696457173bf95ae97577c3bd377405ef28435aadf477cd3b
+EBUILD websocket-client-0.48.0.ebuild 958 BLAKE2B 809157ae54f741fe1a73f4d4f7867f246dab05c6c351d8761bbfc1762d15c700a5abe4e249306696475bda178951a716ae81e63b7ef410862bcd888bac01aaa2 SHA512 1edd70efd4a8b12c131ee27b47b0bc1cf2b1774b3793eeb9b7cb92d3522ffc299d3fa1cf4d63687a968e6058acd476bbb6cf608e0a7cb54b0cca4aa703b0d027
 MISC metadata.xml 473 BLAKE2B 22faac31bc833792ca0ed170d4a785a85275c81403da85cf04003672ce00c1b28fcbcb0834f03cc872dabef36af53a30e53949c154586f3346c3b731a1fbe56b SHA512 1ed56113c593335003b4ccaadac76f39bf05ca4f403c25bf7f2de655b0047bec86088d56aab803a20540193748b2063846f0c6ea552514907b4ec9da6b6aa106
diff --git a/dev-python/websocket-client/websocket-client-0.37.0.ebuild b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
index e8dd158a2bad..b0dcf3913af4 100644
--- a/dev-python/websocket-client/websocket-client-0.37.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/websocket-client/websocket-client-0.40.0.ebuild b/dev-python/websocket-client/websocket-client-0.40.0.ebuild
index 1ab89266e1cb..0bb02c9ef2fd 100644
--- a/dev-python/websocket-client/websocket-client-0.40.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.40.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/websocket-client/websocket-client-0.47.0.ebuild b/dev-python/websocket-client/websocket-client-0.47.0.ebuild
index 2c25a8b06bdd..e3c1a864e645 100644
--- a/dev-python/websocket-client/websocket-client-0.47.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.47.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/websocket-client/websocket-client-0.48.0.ebuild b/dev-python/websocket-client/websocket-client-0.48.0.ebuild
index e12b85e733c8..75cdcb3f9c87 100644
--- a/dev-python/websocket-client/websocket-client-0.48.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.48.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index cd524dd97f2a..206b98d96141 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,3 +1,3 @@
 DIST websockify-0.8.0.zip 319105 BLAKE2B 5c9a0e5f32239b35b5f41d5dd2b46b215cad6800e5752e8d9fa0c20fe77df2ae756cc74a527b50f545497abdc621ee402e02a9d2a788630a2cbfdeecb7b494df SHA512 625cecbf37149c82edd2ebb9cd1f1a20a35415f7c7696ebe88b2e86563a170573959f9ede2c7a1db82ace9edddfb9d2da6e2e20d29fd916ae238235880d9a943
-EBUILD websockify-0.8.0.ebuild 510 BLAKE2B 0e743399a2616dc50d6caec66ff50c4cdbe2665190ab8bd06c22eb9d467291db5f43e759b1c703d72ce9d963b8ebf8d9fb102d9ecc99774509c581c9435d9ee4 SHA512 1f2135dbd53e9f8acc49325b608689b1c348eefb80eda73ecdd6b9d652f0f4ce9b17325930ca12c3c394afb22dbc8b2c71e37e212302ec9d590b53ea270c670f
+EBUILD websockify-0.8.0.ebuild 508 BLAKE2B 99f6279669cbb8d14c7434588a639f7400020c82113709a60b3eb66569928420d2fff54aa094d9363a911db0f9e524f71d8b6465384eee59a7137693d4823ff3 SHA512 2975680f07ac4f3fc3a4cb59e9e3b3a43c893b4e1559a7467594d33adba67fbc8ecf5363b47cd9ac5f546f2445cef0403859c69a0336d5adb537fbd6d6052342
 MISC metadata.xml 554 BLAKE2B 4d53f25662d08966f53551fe7f47d0d43d8facd10841dc5c15fc7735703a8fd932b4c9d17a7dfd054a7a147f387e376e0a90e6aa6185a453ecc4132a636f7d1a SHA512 9140154c124bad88c19f2b8cad2e453508b0b41714b6d8e27e951edc38467124b28179713636d22491f0f41c79a0c52e2908abfec78c4304293389463cc5d9b6
diff --git a/dev-python/websockify/websockify-0.8.0.ebuild b/dev-python/websockify/websockify-0.8.0.ebuild
index f67e6e4de382..7723b535a7bb 100644
--- a/dev-python/websockify/websockify-0.8.0.ebuild
+++ b/dev-python/websockify/websockify-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 305ae9bb391e..9bb850638634 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -2,8 +2,8 @@ AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9f
 DIST WebTest-2.0.21.tar.gz 66866 BLAKE2B d2830fcce7fb4b91029838806952e3e9c6916c3b292c7142138f30486d936b4a1f0c2d28a5973b0c351c64e499f343f3711296c6e37c38548e3a81b108163a17 SHA512 21f58ee9192fd0eb0eb2d88179ffc015aa5cf04c8004db251bd65d13d54c34b9e6b5fc9fdd8e9fcbbc18fcfb2be714c0691b2ef034318861262f8705b4a44610
 DIST WebTest-2.0.29.tar.gz 74620 BLAKE2B 7fc68f1178b1abb0a0f126112b846853762ad78cb060718bc340f5ba17517180b7283f384503ff77a2c7396645ebe2d5528dbc0f027c5d44beb002c4204bf894 SHA512 319700d1444f6a681f8ed8a4ee8661ba0462b3f4bfeb7510232f58be92e017066da3bac494ebe1a3c5b9f2d06c025e08e6193277e13c6113e9485108d4ccd2d2
 DIST WebTest-2.0.33.tar.gz 76081 BLAKE2B 6c06d7cf6573282342ac190fe2365d041679fd9a75571a525cf0214f22a0631d5f97e94261090d9c2a372f77b005d22be5976f612c27c6b4c832c71469b33ee8 SHA512 9f5c614f8215837dc5cecc9c3e844c5e1678eb8275f9e27a0ec6a68648e9f4f09155aa72f6c731c34028b8671b7776a94235f3e54d7dbf5ff55de94840171ca8
-EBUILD webtest-2.0.21.ebuild 1826 BLAKE2B 263cf8e3cb907c535a4601fc37fd109dad206430fbd185c1cfaec5aa5dcd51b8162bc1fd346d032faa6d2a55bc606ba69a13ce73f92b23c41e3f9788c2f57273 SHA512 0e86ae36f3b2b4e21f1d17d99fd8dbe6e2af5d3d691666d77defea2f4644bc505dd4e766ca225f29892afeed48663800c7f56921b156f9b55dfcadcd7b63bf47
-EBUILD webtest-2.0.29-r1.ebuild 1804 BLAKE2B 41348dd6663ee8b891253605bcb7f0f3bd794651425cfc9f571469cf4bfc376175244aa1c6b9a4071667810f7cc7628d5df547fc09fb49fc18dd5e2fcacf33ae SHA512 d166a2b330e58488b7b1e5a7a4a676e2997a93eba95ffa2d1f0ab4ff9271f20e8000c7aaa215dca2989a29da32790ff491845ab96d5b703972bf398d88b02f00
-EBUILD webtest-2.0.29.ebuild 1790 BLAKE2B 7e1495a4ff208d9dba133d9f75d384088987305973e98a8a28aef30c4fadeeca56fe0a86f46420cca2eadbdb15465310e8a989fb7db9cd9cc7e6ac701248583a SHA512 4757ca7adbe64c8602e7f8c62789d45c28cca555b22a9aef8b12240951d6b21f4a153bd4c3fb84981f9d6c369839b583be9df35d76b2e161d0e0b344a22ec358
-EBUILD webtest-2.0.33.ebuild 1464 BLAKE2B 05afb0a70f659033976edd47a6ff00bf9bfb0658996071ca13bdcf6ab2a2a1d8657a429cff68d2d442bd4acfa26675ef2cfa8cb6a8611f74eead6b81a37213e1 SHA512 2446ef43b3ad3af304dfc70adab6c5987593beb119a899204e96ff0283b48823279e8e7c01f4719ad7cc596e0922b6c88b2a624dd20df283d7f114d1c2651f00
+EBUILD webtest-2.0.21.ebuild 1822 BLAKE2B c9c393224fa308eb952f026ddbff67a1997f4df365464cf0959cfe2a12c60af03082561f3b26fa7bc0d79f3f29a90fe44597f14c840d450e6c45e0474c8ccc39 SHA512 59b7ecb41bfb97e6f5174617489a20757ddda83d39bb40225fa192d022f4b4f34ed3da6faaf4b459d9ab8f93ef7f443f7d1b7d044d2c3d699ac9035ac3a7fdcf
+EBUILD webtest-2.0.29-r1.ebuild 1802 BLAKE2B a53080a329fbd75b0477530aa0d24489619d9690ae76a9d9801d0353b4b25770ff9ad8bd4763723e2e02f41e4b7657360f7e40100419a147d16cb26d9aa6d3bb SHA512 fe27c0bdf30e0bd1d0e850121bfcab821b2b022eae1857a036013717bf41811f6efe33b6052c7c42c68122b01e90686675c3d9ba9de374cc0ddf4422952a52ff
+EBUILD webtest-2.0.29.ebuild 1786 BLAKE2B a165410f63827888a4fe4ada27cdab5826fa3ed73c5fcad4b15dcbafdeb9ef0f25531bf7f9e5d48a2db1ad12709e1cb035de4fff027cbd71335fc2349c31ee60 SHA512 e6cb3958571f29f2422ebad10ef39779ab978c515764ff4476d09153ae5055c924695e5ab58db3cd46b8f073ca99bcf729d59bb72b4eed64a5c2fcda32ccf79e
+EBUILD webtest-2.0.33.ebuild 1459 BLAKE2B 40e2388fe1a10fb38ef17de84f06b9a4b95d70e3b2ccbb5d783964eff52df3281810fd8507ba87cfa702f43f5b32f3e34ad9b1aba0f9883cf1c4ca8f2f5ba427 SHA512 f2dd85134050f063eb530d4ab61711199efb0f3a25131de38036c9bf65d4100187851391968859ac318802a74e55f8696e398e120a87ffa72c648e3d7ba61710
 MISC metadata.xml 310 BLAKE2B 34f814fb04671947a228986ee91f8eaafec5a2931cdb87c63b8e135130dc60eff1a2fc2d15f0aba767fac07d853ffcdc339dfdd02495ccc40830b5452b6173d1 SHA512 0fb6e471cf00fcbea309bdb63d23c5917250f2de2e3e245a91d6ccf1258123ee6f0a8c3f311c526b7f9062c6ed93df1c89f44abf16879440dd1dc81c7fba2743
diff --git a/dev-python/webtest/webtest-2.0.21.ebuild b/dev-python/webtest/webtest-2.0.21.ebuild
index f3092e31f450..3a6a08b779bc 100644
--- a/dev-python/webtest/webtest-2.0.21.ebuild
+++ b/dev-python/webtest/webtest-2.0.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webtest/webtest-2.0.29-r1.ebuild b/dev-python/webtest/webtest-2.0.29-r1.ebuild
index 677e6864e782..31206c5679b9 100644
--- a/dev-python/webtest/webtest-2.0.29-r1.ebuild
+++ b/dev-python/webtest/webtest-2.0.29-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webtest/webtest-2.0.29.ebuild b/dev-python/webtest/webtest-2.0.29.ebuild
index 71fe717f0d03..da75d4930edc 100644
--- a/dev-python/webtest/webtest-2.0.29.ebuild
+++ b/dev-python/webtest/webtest-2.0.29.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webtest/webtest-2.0.33.ebuild b/dev-python/webtest/webtest-2.0.33.ebuild
index 463f35e3e2a7..3f9b7c6ca0e1 100644
--- a/dev-python/webtest/webtest-2.0.33.ebuild
+++ b/dev-python/webtest/webtest-2.0.33.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 6a9879d35b59..46bf12a63cb6 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -3,9 +3,9 @@ DIST Werkzeug-0.14.1.tar.gz 1185546 BLAKE2B 4c358688752adce870e8b44ffede56e44ab2
 DIST Werkzeug-0.15.4.tar.gz 925334 BLAKE2B ffb132026e5a43bdbbb6decf19c47b07bb38afe383fc6b769a793f9e72769bdb5a9507918590d485b9a84e8db392202fe985b0cd1fa00e8af17eccbf53bcdaec SHA512 b27b313cb29128ad1a1d0b04be7d1b29eacd4fb8280757510ce662b4f8743e7311966f7fb170531bd5dcb9668e9c6672f0cc0cf53bb4af3ec7328312a88b53ab
 DIST Werkzeug-0.15.5.tar.gz 926570 BLAKE2B 39d68f7ea2f99ffa60f5a2af7ebf8a01e68a83e32106abd8fcbba3a5402bf6c6c02f7bb9b84cd483aa061bb065a0f2f6d809db55a2f6950996d70cf62a620520 SHA512 e2980b649db0c246fa87b94972f1a1e00b19f20a90e34733267cb50b0d1c8e83701f4bde3e466f9f12243c47b3cc40c6977e63164f18ee5e518b75e952988edd
 DIST werkzeug-0.16.0.gh.tar.gz 939220 BLAKE2B 08f77bfbb8703b25be00dba018e9aea16cb4a6977ff3906f636fe24b4e16662f7777584839c8e153532f32a0551281a6fb28bf618da5d5e6c42cdc6e8b391162 SHA512 78e7d2ccceb8764f92a3252b2ff670065a42fe2ad1d2b4631e05c107d2128f8f6f4090e32bd975526e4b5985dbbdbac22e9ad1514d14e88ecfb064483107d0ed
-EBUILD werkzeug-0.12.2.ebuild 935 BLAKE2B e585b4c47c043a4e85c2b5006b710336b925a32248448733f5cc890e4cd404835b271ae69da4b2a7f72d1e9e44ea029d3456d44828ad0b9954dc9a81a523061c SHA512 e0aadd5ad535f509b15246c1c75e2eb832aa19ae1d657995308352eda1fa76d922ced7ac2a748d50787c6b5ec698c9d41bc6dd999cd58fe14b7e9454ee6b008f
-EBUILD werkzeug-0.14.1.ebuild 977 BLAKE2B 9b1f74ebe47c57b7fc2ddc15069d798c018b59fa7860009a7e0854cac2a0e3100839d375ab4a6e8b1c4be4e2658aa991af1367e37ca3f909265a9c9d997ee158 SHA512 d7bdacff3a8d361d8e4a90fef46613842366de1c806d5097a55816d0cb1ef20acf48e18a5ef1625f8263e6eb290f807009af92d347d1bb772ddc4868eeb2b41e
-EBUILD werkzeug-0.15.4.ebuild 1036 BLAKE2B 1037c844b2c62faa79ef16d601a6a190d93c8f21a143b7ab5a7cb9cebc37c24145e158ab67a519838b56eb4c39b8132e0f5aa5973d0f42c65293e9568cde305c SHA512 d23eff25e930e3eb1fa9f855fe148abbcaf43d056747e842980d56a81c00a270e0531fcb2d6cc1b9f23ce682482c1296f387076695b878205b1cd7b9efa2c23a
-EBUILD werkzeug-0.15.5.ebuild 1036 BLAKE2B 1037c844b2c62faa79ef16d601a6a190d93c8f21a143b7ab5a7cb9cebc37c24145e158ab67a519838b56eb4c39b8132e0f5aa5973d0f42c65293e9568cde305c SHA512 d23eff25e930e3eb1fa9f855fe148abbcaf43d056747e842980d56a81c00a270e0531fcb2d6cc1b9f23ce682482c1296f387076695b878205b1cd7b9efa2c23a
-EBUILD werkzeug-0.16.0.ebuild 1165 BLAKE2B 79a6fbfd75d7e6b1c3033709fb2b436d91d2d71acfe853f95668c62331c4fd13826952063c4149e8db30d8fcaba7be709429264b459c2c6384e8abc9bbfaced0 SHA512 3c44ea567904386d5d2c08da73b520e78d88ba3095d520a3c87587adc69718b402e2a62f4068e9c6293664035afc8158c066cb5fb3526cbf9de486a9eecbf4ff
+EBUILD werkzeug-0.12.2.ebuild 926 BLAKE2B ff0f1765c1871f08092604cb2d7c4b07343d5a825b80e33f8828206c8267cc5b197898156091af42a1eb01564404bdef79f1b6b1ac12937974cc86812855ce14 SHA512 9c2249f31babb97f4756b68f537009eafbc9fe0349d1c3245e32b3fc71e483b022f4b471817010bc678b060295371fe1dfc2e8365d01308eb6d4bd2c84bd9726
+EBUILD werkzeug-0.14.1.ebuild 970 BLAKE2B 179350973b45720053ac84edad202c5a4698ac135c94ea5ce22586bc15ce1ea27b2fb34d7d7c115572eda6d568d18dc6571003fd01ee827e9312ec8799359268 SHA512 a573936d9ab957b9add39c78169349e24b5be0031391f13ab5b3421858789b2908f51ee298e886082868b541b50d075bc205c61f53469061d6b13a588be1dcd7
+EBUILD werkzeug-0.15.4.ebuild 1029 BLAKE2B 17e20df54b38f869a322c64c8383cec1c6e0db02fb3d54fe814b269adea3c7b17b7790a21b860877e33385df004ed6c95d0213f820353d627d73fe49cff6f062 SHA512 0d76fb0ea2514acfa9c132a2fd878e8250dcfba690d2a64a281d27afbe8d5fd970d2d36c753f0f5c637c31474f5a13e3634245a62e7879ccc4db3c85ee078639
+EBUILD werkzeug-0.15.5.ebuild 1029 BLAKE2B 17e20df54b38f869a322c64c8383cec1c6e0db02fb3d54fe814b269adea3c7b17b7790a21b860877e33385df004ed6c95d0213f820353d627d73fe49cff6f062 SHA512 0d76fb0ea2514acfa9c132a2fd878e8250dcfba690d2a64a281d27afbe8d5fd970d2d36c753f0f5c637c31474f5a13e3634245a62e7879ccc4db3c85ee078639
+EBUILD werkzeug-0.16.0.ebuild 1160 BLAKE2B 65a60d43852951ca0928c61fc8917b33d681e7cb83fd1ace9789f809dec1dfd529249a1710b2df7074776091660772e6186cf9bfe3e1853ab4e6102e2e357a4d SHA512 7b76a1252734565a48ae7aafd7826f0e0401c9bbf6d50ca87b7342a983db9f712f0897edacad14fc7e3151e67f15404246de4a744fa90cafd5349db48942fa6b
 MISC metadata.xml 450 BLAKE2B 553ae7b037307259ba7c22b90f001cc7fcdd1c2a2437ad4a038eceec9e9787b3c2287b0f4ba40c9cc435ccc80dc60a96ceadd2ca3e892ae5e5083e4dd037525c SHA512 5bdd21ede3cc864b573ccd668ec99585baa7bf922f80137fd7880f73285510d0bd357707d44f9609b13f01245d011ff209e6c8d837c0f247fce08887bffc3cef
diff --git a/dev-python/werkzeug/werkzeug-0.12.2.ebuild b/dev-python/werkzeug/werkzeug-0.12.2.ebuild
index 5e2f41703a03..f29c93d3ce8a 100644
--- a/dev-python/werkzeug/werkzeug-0.12.2.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/werkzeug/werkzeug-0.14.1.ebuild b/dev-python/werkzeug/werkzeug-0.14.1.ebuild
index f02f7346bd3b..0bffe3903269 100644
--- a/dev-python/werkzeug/werkzeug-0.14.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.14.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/werkzeug/werkzeug-0.15.4.ebuild b/dev-python/werkzeug/werkzeug-0.15.4.ebuild
index 3478e1e50d13..35baad98bba4 100644
--- a/dev-python/werkzeug/werkzeug-0.15.4.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/werkzeug/werkzeug-0.15.5.ebuild b/dev-python/werkzeug/werkzeug-0.15.5.ebuild
index 3478e1e50d13..35baad98bba4 100644
--- a/dev-python/werkzeug/werkzeug-0.15.5.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.15.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/werkzeug/werkzeug-0.16.0.ebuild b/dev-python/werkzeug/werkzeug-0.16.0.ebuild
index 2543d391d0d9..81047c3beb4a 100644
--- a/dev-python/werkzeug/werkzeug-0.16.0.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 7051330b65aa..569d6456b69a 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,5 +1,5 @@
 DIST wheel-0.29.0.tar.gz 54143 BLAKE2B 8f29c81b9b3c8ee419c26f04e09f437a2113716f5096e1b6e21f23e6a7426e58b7ee00c0846cfcd816670bee4dd908ef577e4142fae546d4ea643af2c2612049 SHA512 b72dec3cf71e3d87c611ff41f1381ed7f2c654edb50c808fb4fd0f552bab3572434495bf18c36d2ecc7cb8b355782054d3d6dedd5589ffda15027e72cff24602
 DIST wheel-0.33.6.gh.tar.gz 50273 BLAKE2B bc315c87b83bed39ad4ec08dde31edd570e59b65ff28c64c89b1b5e1f2e526fd6035dbe9902dd9a3efd94b0c5584489f28ed895b36e4eb9dd1ddc225d7069275 SHA512 04edf619ee6fd06f1e4c8bc513c6e21ba91615eba42bca5473e60573e274133b1019774b8e3a960e05f5a69bb256508d0a8a31fd9ab91a28f1b87d1095b17b5e
-EBUILD wheel-0.29.0.ebuild 993 BLAKE2B 6bc24936c6192f56c9c61d69427d5c6e0a728a44fcd24d704ec611042406d33277f1b1b331ef69f4bea639387d86e6dc7529c0d663d86a06974226b11a4e0b05 SHA512 5798473527e104d6d0dc79834edef5465a6d2141b16906b80cebd2301c1cb583ddf5d2c82811dbf1bd5718118d9ed80bf7072a26d6337bd08a213d9607c9ad15
-EBUILD wheel-0.33.6.ebuild 715 BLAKE2B 4f61e4b609f9f08741f85aba37fdc9745f707f50307eec9284b0e1e5a07c8502f1c2a55aa1aad53939b63abcca31f5bc2bde9160a9174f363fa11eb7bfe88f3e SHA512 f031e97380d0a83728c372d7081bfd4491dc775879fa5b9e80eaecfdb66770c9c75bac83cb9f0c73dea57d3e2468f353a5b9cbeab72ab313989c73b73e6f35ed
+EBUILD wheel-0.29.0.ebuild 984 BLAKE2B 21920326e84656beeeeb405812739ea63a31378dabfd7faba2120e5b6e59772d96fcaa3f5edbaf6f4f66061ee3ab96efdf151c1a0064d9c5b1774ba5bb57ec98 SHA512 c3b9cdce4e09f7c06c525f508d94caafef9c62690dc876e45acc49144d64f19148cccb8a2a43a166362026a1be0ce4447da01f24981e439928796c8cd38d8ed4
+EBUILD wheel-0.33.6.ebuild 705 BLAKE2B 100bb3bfdd6127edf5ca834da95ba0b3a6ae2dfcd37228df928b672130664b5dc0d7b67b362c9b2fe0fca05cf74dedf8f157a67e194019e9374ceeea168edcaa SHA512 30f4135309551766483e89f8d3e288b68e5314c5466dc2f8800f005775a8263fcb85d1a832539f587ad6bea76b5f615b1be9e67c6202c055f23538a256a79cf6
 MISC metadata.xml 308 BLAKE2B 32390fb7a1a3de815d3a791850d9f96d8092be48cf2ac61f8cebdf132e7d1c5c4cba95bac3edc3f2ebd6a2d9e9437e0c9187f9668ed95c4ddb4ee6072f496d46 SHA512 d5fdaba19a51f826d45ba93cc77a08fd4be563634f51236cec379763f066ed925869a57c94c75a34ed58302619d419f31dcad641d9e85c68d11d72ec53d2d45d
diff --git a/dev-python/wheel/wheel-0.29.0.ebuild b/dev-python/wheel/wheel-0.29.0.ebuild
index 9bd72ca21f3e..0e8ecce7b767 100644
--- a/dev-python/wheel/wheel-0.29.0.ebuild
+++ b/dev-python/wheel/wheel-0.29.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/wheel/wheel-0.33.6.ebuild b/dev-python/wheel/wheel-0.33.6.ebuild
index 269e608ac741..5d6bbb71ab83 100644
--- a/dev-python/wheel/wheel-0.33.6.ebuild
+++ b/dev-python/wheel/wheel-0.33.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 eutils
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/whelk/Manifest b/dev-python/whelk/Manifest
index 5de1197b924f..fae477a5af7a 100644
--- a/dev-python/whelk/Manifest
+++ b/dev-python/whelk/Manifest
@@ -1,3 +1,3 @@
 DIST whelk-2.7.1.tar.gz 69983 BLAKE2B 4f9e46a91d5a8723b9d3de2a7c8b906e8d693733b6df74427f992d7318910eb74c58b7dd5e6aa08e56bd6c9cd344274d7b240f434d5804ffeb3b0af34b698e60 SHA512 39b73ed09a0d2442cdde5b8bae72805571a172c6acfa3f652c8cb125d3a400f2538fe6534179f95383d321e8975b6127115616372c60c736e8cd8ceba00ef093
-EBUILD whelk-2.7.1.ebuild 456 BLAKE2B eb2997bc953009b2890e82f54acced9a072b98ae985071ba3e1f8b1a9a5dae1093d927c89e9586515a7df0b0ed6bbdba64264f0813ace96d28d2a6a87a81a069 SHA512 7017617c3d87aa204c608216a05c2aeb120af1bde68c34be2c2f3c0329ae68686f65b358109447aa17c25bbb4a53bd0a27bba0c1e0358a4c6231e4b50d6671bd
+EBUILD whelk-2.7.1.ebuild 452 BLAKE2B 7fb2f02389ccdb25c7ddd5317b4089c44f947e8f5c61fac66cc56455088e713c8f7c086e5d11ba7c175e7cb0bc7b7a81fee1adec4cbdfee5e11681ec5630a9d5 SHA512 16d052cf244417e5838e26e36c404a8fb4e6f7b445158aa705425f16cf5744eb5971a1da224ecc9a9727c974834360838ef379f12f6b85800b0999a3a09bada1
 MISC metadata.xml 666 BLAKE2B cf11d18c507fb776bd45fa71f5d53903244a7f4151698f724e54b0dcecc8ddaaf1c4c202fbdd5789f4b0a23cadb327e9e0808881cf90d1c9163a32685b5d5dd1 SHA512 92f0a2758700c57debe1c5190c970c1b8279262af9809490368fe2e3c1c6d4a5960ac17633fef4aa5c3786bd4ff2dc42564b7d55102e81096f3f9e602cff4822
diff --git a/dev-python/whelk/whelk-2.7.1.ebuild b/dev-python/whelk/whelk-2.7.1.ebuild
index c0d14ba87ff3..4ccd784d6927 100644
--- a/dev-python/whelk/whelk-2.7.1.ebuild
+++ b/dev-python/whelk/whelk-2.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/whichcraft/Manifest b/dev-python/whichcraft/Manifest
index e74ad76d6594..c6c69390ba0e 100644
--- a/dev-python/whichcraft/Manifest
+++ b/dev-python/whichcraft/Manifest
@@ -1,3 +1,3 @@
 DIST whichcraft-0.4.1.tar.gz 8095 BLAKE2B 666e4919698226e1f252f96323dd1fb56350e7b63424a0022fcf67f7afb83e3ec944b3689f1e58fbc29f1decbf8ce3d87aee9a9cb3a69621b2f65f235682068b SHA512 92633be99badd0ce06cf28b23366f89f2104ef2364ec8f637230fe46b378d1398a64f4d8b367358c833a2038159debc70b0498e94d2729918b95847defd59cae
-EBUILD whichcraft-0.4.1.ebuild 635 BLAKE2B 7ec252f260085e60883e327715c6b877a26b7d3d3071fe268c5e9c2c859e139101752ca23310d4bab83d3aa5ed38919751ca030e3d4bf48a191f3a2ef54447d9 SHA512 f36d07a45fcfdc99d4882767ec3ef5c10d08442d16c54a5747507334500d8f24af79bd5c9feb6c8a345d15e85845c19536bd4ad0916085e2bfde2e277bab82f0
+EBUILD whichcraft-0.4.1.ebuild 631 BLAKE2B 1b1e15a54b40b457a226025f9a62279d2f772fa76879c46dfa2e6724c45a929b9befa2e5606f51d0f1f770944f9359d00b5a08f48cbf6e10a5dd5094cf141d3f SHA512 3f4294ba9b0abb25918bd8a3bfdeb40a976081c967c5c513d4be3c9ffe26f83b961c75e6ca7317836ea4771961481b43c6b8de6ad1311d947de2ceeec4fc32ed
 MISC metadata.xml 323 BLAKE2B c6cb200fc209a939570c4fc3df111f28a718c77d246ba4b5b12467913b137773ac13eb983a7b2aae04dae83764832fdea8a7b4d8cba35a6c745df41b3049fdbe SHA512 92c7755e3ce8289f8cb93c8fc453f8093c678c41f3fe04e0ea6d6fc3df93e1cc4754fb8b214b96a2bc35e0f6a51587c054cdad45c1061f7462db075558c38090
diff --git a/dev-python/whichcraft/whichcraft-0.4.1.ebuild b/dev-python/whichcraft/whichcraft-0.4.1.ebuild
index 6b6c363b9ee2..a62e773c723a 100644
--- a/dev-python/whichcraft/whichcraft-0.4.1.ebuild
+++ b/dev-python/whichcraft/whichcraft-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest
index 90b3464319e3..1a294716f1be 100644
--- a/dev-python/whisper/Manifest
+++ b/dev-python/whisper/Manifest
@@ -2,8 +2,8 @@ DIST whisper-0.9.13.tar.gz 14028 BLAKE2B 38c1d006c3b6334df8c18c7e5f695359912db22
 DIST whisper-0.9.15.tar.gz 15655 BLAKE2B d2f8a1333312038fdec2ed990c4657255242da74d68fb07aa1099fce345d95c15ea98a28a2a3a582b7972c6b67df9f0e2ea2280b9ba9168d65638548d53b8555 SHA512 bdc9d299ed713a3fc6104938c347682562d5f17a7f3650d823f9814410dc934899b81bb2f42f52e9cc25313d8ed33f7b4def6d8945561d63f6237492bda2a5e6
 DIST whisper-1.1.3.tar.gz 37716 BLAKE2B e0cad5c7ef8ca885cae2060838669d80e8b2e28d1039dce45fec601257c866d202a73279d923aff39781f71d7c9bfdc19300c991e7a5956af337d5ff18a37ede SHA512 cd2a1bece58ea4cb3f5df6adbe1966e1408c92a55b21bf7298d4b30fdd51780e236707cae1414d6c363a046a36870a6ac230ec30abe565fde9fbf17efc9e7cab
 DIST whisper-1.1.5.tar.gz 38104 BLAKE2B ab36c91c00dd8e8e26b24c0c2967c661f0bd69f3dcb0e52763f6527a233f656a984c738be720c0b5f2d27fff08daa164db87f0ab693d360bd0c087cf6a408340 SHA512 dee42adf1824c876cf15e9e55101d90d08889fd6e267a89c18fdb4a7d4c5a3a0d4f6f24bb0fdeb974fd194046c17e00f71033ddb72c74c4d4ded0a937e82c8a9
-EBUILD whisper-0.9.13.ebuild 391 BLAKE2B 8745f2a1c88c3d50acfbcde4b20c71588442bacae1b0255de0e315419052f3eb2ba79396a7c25ed17b86432b3d0e4d6217b4d65daf33ebc1cc55d754fc99588e SHA512 b7468b6c76c14690aa4981e9dd8f971afa5a155f3e52e69a72fcaa79374d48fc45881377285c08df060772eb30e5aeaffcbab4db7636d66f81a7741baf08a11d
-EBUILD whisper-0.9.15.ebuild 406 BLAKE2B 5c85028f7675f540b2ba5c10abb98e57b83963240e580e2eb3ec36caa86d6f6bdb38ed352bf8d4387cd4784e5c3854213361dd2dc43262997cd8dbb7a0efc355 SHA512 b39628ff109126f9954d3948d5c8c33ae88c728c5b914a40072d5c5b23499ea2f154a090ddafcdde3cbe054cc072a9648d2e2c4dca1bed1b67d72e6406a1abc4
-EBUILD whisper-1.1.3.ebuild 808 BLAKE2B fbd41c7af3831fdffc8b46b48a75d73851bde86c759a7cea04a77b1e4ca495cac57260a14f8726b5a3bbf593a45e4e9d8f8f32b250320eeacab930d53636d123 SHA512 9e8e83c26b0dea51c3bc2e8582bef508e17e4877ab0ce723c3e67dfd328b848c27bd3418a5b572dafcd48e88cf3e6870c5bac4ab32dc30845fa3300d73d5e563
-EBUILD whisper-1.1.5.ebuild 810 BLAKE2B 74eb1c0823dfce3fee8f2d228351a28fb7749e00c709a2f196ee28fe8898649b966cce8d9194a0fa2a963c14dd67dee6aa45faeef6033cd33d2ca4cca89905d4 SHA512 d6061a67f7f2e5f2bb2b8038df87fdf8c0793f846703ec34d7013e6793b29b7211f03a90d2cca32145ce7231738e921d12eb4252b9ec4dd3fca58cbb01b11057
+EBUILD whisper-0.9.13.ebuild 383 BLAKE2B f68359bc3cc00600f8d97d71531c09071d5ae016d9276169bd05956fbb329a5163dcde05d847aeae1f291c332e394152bc17f0b5079bbe76cc789f3e57cc1ba3 SHA512 fc358377c1f079730607f19170d6d04e7a38d2bf83a66168e9ead76cfcb8829fc9bc76415696848411389276a0e7e17e8e715699b0da2e64630fcf6ec03b47a3
+EBUILD whisper-0.9.15.ebuild 398 BLAKE2B af6b6b1bba63d4d21a34b7f92a1137d7487eb2de5d6e64b3fe6a5a446f4d612f8c737e1e2cddba2fd5e8c1d65375ab70d0539266c4c6f88cb819bca004b7e3fe SHA512 38b40883d09fb9c289eb9b277dc912f7ad267f41ee9457dc1c38400b00b13d3942a04809151c16249373bfccb61f466faeb4fa5e9e7c56657c05ac8c376d2980
+EBUILD whisper-1.1.3.ebuild 801 BLAKE2B 6ff1876d5ea9a73a9ed7bc07fa8af14e56b2610a5f01ba9c05fabb7e5f67096fe082398d766ad1c0a7b42ab81d0d193b76c6de93c6ef86b3fa48c624ee12d7b2 SHA512 486f29baf3303b4c5558c0257b669a7a3761df8e746221a9d5b0f1ddef5a2b0c34091bb2a3939369ef3c28fe04e833b4651558534976cc4042bafce19ed7e8f7
+EBUILD whisper-1.1.5.ebuild 805 BLAKE2B 91c28a8ac2b6862d2ab84120dd77a0516e851bc126ea140303cb2c5601c6128c8d59035256804f1b501ff013b4f2c46fff802d5c1cd6f50701f3cf59e867abc9 SHA512 a521ed0056de5d313a716c6935cdb19cecb4e56b89092642dc132b1c1be273c8dabcf5797497d4153007685939be261247e0f413714d2d872cecd8fc6a5ffb47
 MISC metadata.xml 556 BLAKE2B afcecd89f7f06cef8d991edd5476a6ec0db7753d2d58174ec5a1a955f6023a06d56f0ae933e438bc720b9cf777852df4d223a21557454ee7d6aeef7741f451ee SHA512 7f72e3305aa749df979f180e0d46efd3ce1edfd81e76f5cb8a808d433ee2b19741b756f0e2c7706fce8bf2b4ae9adc336e309d3ed902e3d122fd1617dcd26af0
diff --git a/dev-python/whisper/whisper-0.9.13.ebuild b/dev-python/whisper/whisper-0.9.13.ebuild
index fa44cb14b549..e28808b7c7cc 100644
--- a/dev-python/whisper/whisper-0.9.13.ebuild
+++ b/dev-python/whisper/whisper-0.9.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/whisper/whisper-0.9.15.ebuild b/dev-python/whisper/whisper-0.9.15.ebuild
index bace960c5989..0011e84462d1 100644
--- a/dev-python/whisper/whisper-0.9.15.ebuild
+++ b/dev-python/whisper/whisper-0.9.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/whisper/whisper-1.1.3.ebuild b/dev-python/whisper/whisper-1.1.3.ebuild
index e3945a05af6f..593f5228b98b 100644
--- a/dev-python/whisper/whisper-1.1.3.ebuild
+++ b/dev-python/whisper/whisper-1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{3,} python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/whisper/whisper-1.1.5.ebuild b/dev-python/whisper/whisper-1.1.5.ebuild
index 2ef09aa76867..ce6d7d32da43 100644
--- a/dev-python/whisper/whisper-1.1.5.ebuild
+++ b/dev-python/whisper/whisper-1.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{3,} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index a8ce6d402aed..ef271541dad5 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,6 +1,6 @@
 AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616ead64b1779c1bd96abff594a099ddeaa9aac3be86603dd0825507b30a900f38d80b184dfdbddfa42087969ec7fbce43cc8c1617 SHA512 53dc8336ac9895659d92001cb22137011d9da753c299bc3fecd34ed6b42f0f169967dfd41b0403462e54e62af1f6390c58386a91a89ddc880a4fe0a4e05ce14b
 DIST Whoosh-2.6.0.zip 1193541 BLAKE2B f5afea36c53a06e3f23e06e3b6f51acd2adafa02488912c52fdda207631a6adb071256d26ed455042de1c4c2a136156ba7c89f4d6773ec60b392b03de3c37da3 SHA512 e50e47ec0d1c65ad3c7d657586f5380a1be748945c1ce964305fa68b99379f0da676faef6f0ca45ef151df7be71150601162ee966f3aaf84047a20bca36f7e37
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
-EBUILD whoosh-2.6.0.ebuild 1279 BLAKE2B cf58ff738860c48e8523b3b000a5f203bce1d6eddf7d0d9a201b17cfa7e7d8b41a06d769e30ed7b3288e6b61ea89434e4fb55cd58b8e53d4a763171141d67d86 SHA512 16e83eebd90a36579f933a777c9c566aa97e7b1e66dd96f889e84a6c62d7867eabde41e0c705742d6885ae0db0ee6bd28cae0c272346f9f63148fa994923995b
-EBUILD whoosh-2.7.4.ebuild 1489 BLAKE2B 6648f316a50cb859194de39d51951cc9e4d17d2c3c9c34c973a4335996ad49c94b883e4926b0d84edaade6a4d82edab3eba4876544351ef30bad90a59aa661da SHA512 e4ae9332e194a701f7cd2d51ef4eab5edea39b7882f6a6606b48906fe3b2bf2fc77456786a16959328e5fea248e1ee52d2c0bc52cd0410090873598a34941d46
+EBUILD whoosh-2.6.0.ebuild 1270 BLAKE2B d011eb64b7718903ced2e36042a6dce2945c736294f9d893b17e1780597613546c7ee28841671d1b211022d2fa787bcade92cf3a7f80b9842216c8356672b458 SHA512 717fb81c9170fff9dfa8e350304d35dc7978bc174ee226ed3c5ac9ccccc62a07d0a68fd0ff8a20af827a51191d886760e4bfa9fdf680a3fce871ade2d483049e
+EBUILD whoosh-2.7.4.ebuild 1486 BLAKE2B b2504840739bbdf92989689e3b41a2a95f1f8dbc70dffb1a86b21f9b1c59320c658b792a25112863a7d40fb63b2b36e2dd88e3b44506caf39884a6b907e88223 SHA512 61d32ed4533667706c5fb1e62295d0374bffb700fff68fd5020f7c2ae2dd08e731703bf83b7ed991318425ddb1bab99c4bc8e37d0b5af6acb3540b47193c837d
 MISC metadata.xml 817 BLAKE2B dfecf5c1485e029a3614d0a45b78ae77fa7965000e5e9b95d6e7ed21155c4781f23b895f24b7189b1d7fbe7007828dd152d30c4013ea35d93ea1c5dcc985b834 SHA512 b9c1def2c09a31740729aed91c02a3382c9b8f10d9f959c0c80f41ac4822ac5ad3b2c7c998e244f91e64581c17c4d52a7264f679b44a9981587c053bc3b576ed
diff --git a/dev-python/whoosh/whoosh-2.6.0.ebuild b/dev-python/whoosh/whoosh-2.6.0.ebuild
index 16bbc949684c..8e5cd967a8b6 100644
--- a/dev-python/whoosh/whoosh-2.6.0.ebuild
+++ b/dev-python/whoosh/whoosh-2.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 MY_PN="Whoosh"
 
diff --git a/dev-python/whoosh/whoosh-2.7.4.ebuild b/dev-python/whoosh/whoosh-2.7.4.ebuild
index c668760eefec..56102441bfcf 100644
--- a/dev-python/whoosh/whoosh-2.7.4.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 098f1e02e2a4..c6a5606314ef 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,5 +1,5 @@
 DIST widgetsnbextension-3.0.0.tar.gz 1253392 BLAKE2B 88d435b06fcbf759f7ea919ee69d3523f86f2a150bb7d411d9f2a41f9e4a6176a7900595ae5bd30232c203b81f3462a1178c001fbbf456f847597b0acbd20f12 SHA512 079a2ce837e37a8d1707b6686e5c23989bb79af298847ae6bd01dd0f6e570f91e86ff53ff4aa3a8cb4f56f895e3839ef96c722bd156599eb01893870aa1fb4dd
 DIST widgetsnbextension-3.4.2.tar.gz 1103610 BLAKE2B 1cbd08dc1b9e4a8350b2d3a6e21ad106cacae8da308b82af5c55a7d520fa0ddb6c82cd7aeff7d7521430bbbbed2aaa276d869a8eaa1122cd5a3b8f69e1376352 SHA512 e50daec0a6fc7df2317a1c90ed7713057b35e4c0aba626cc70a9d886aaf0c6ec3f820344d1e1e79b7895de41b6721dc209278395cdce61291bd03ada51c14613
-EBUILD widgetsnbextension-3.0.0.ebuild 481 BLAKE2B b3d0beaf3995a6ebef88fc0ff3609f2f3513fcceaae512b799584209b1d8beecc850571eafe1b3e61ec6096b3a3b6d198389c81c7fe08d7d073d0d60ee9cb7e8 SHA512 3dbc7579e1e0f7bd9a0bb5ba78b2f83c6490c4f369514b95ce00d23aefd77e7f1e0c41ee1e781098456d6117250213c56d333752a246b3c4c43f1eb74d67c06e
-EBUILD widgetsnbextension-3.4.2.ebuild 475 BLAKE2B 1fa7fdcef008bf7fa4061a112b38d6e683daa307ee933599a626f9cf3908e884037146c563fe58ce677b299a3b7ea07233175c372f9a96f280bfb7b411a40823 SHA512 f05f8c77e7569033486b253b25654cb0810149822d72fa905c8caf52bb1e0a53bbf02b5c4571d41cd614da98e6c4520f0a09b6c83419c57b527d2209290ef45a
+EBUILD widgetsnbextension-3.0.0.ebuild 479 BLAKE2B 779446ca8c8a632a29d251dd2b396cd962f779bc018e22cd524238ab2f9f30d78517f0bef710a497417fb5bf755f23520057e080b3a1a3a566cdb85f0c27bc0c SHA512 96587904be55684d894ec1536cedc388b1d3962bc0e9ee7d5de87c56b56d431f4e807d973c890db596052d30ddf71b16af1ced128f5f29e5baba52712ab9dca9
+EBUILD widgetsnbextension-3.4.2.ebuild 473 BLAKE2B c8027dc2693c744a82bf15dccb866c2d5b2ac331ee4b6551413061dd851e53befd5eca5a1b4354781f658bfc46fab7d256b1a2207263599c4f6eb3b6e3d1f81c SHA512 9d378e8dd0f2aaf1f256789c858dfae15312b3404d20676857fe762c5b3c29f330a0902b03b00abe10d634e8d41d8b1b12f907a9858c1dab41365755775a8042
 MISC metadata.xml 505 BLAKE2B 7fea495f73e9db9d002d432894dcddb9e9b86cb4e38bd96e9841b4edf5338e659e440b9a47abef5fea5c4d04ad27d91f9fb4583f8ef334c2aa12d39b08fb83cf SHA512 4e7df3a611f92efd9e82d7fa7cffc23f1b90d93ff5c03153c4d34dff6e0acd862f56a2ee9a8a049e213d191c7f1cbd364572b85c6e7df9b3e99d3dd743217505
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild
index 1e7379ef185b..f58c7ee7a973 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.4.2.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.4.2.ebuild
index b8dcc914bf85..f7030c3323d1 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.4.2.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/workerpool/Manifest b/dev-python/workerpool/Manifest
deleted file mode 100644
index 79025ea47e86..000000000000
--- a/dev-python/workerpool/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST workerpool-0.9.4.tar.gz 5409 BLAKE2B 6b7d85097d2b189dd58680d982cf8c6992f3bbd0facc4627cc154bcf4b84d6be4e1a8fa39a049e9015377a9c3ab64150875c0a2b3b98ff4df0117f11ba63a979 SHA512 cf8092fa369b9767a8aaf88f22a7edc334f3e337ca9b3fdb1ea8cd50713a9ff9b94e5324452a2f3f4f37d5a2ca8b1b34abd3210452437e2911c66045221c74b3
-EBUILD workerpool-0.9.4.ebuild 589 BLAKE2B 79dd6181901def03e744c5b5c0d933696d657052afeb246d0033756f62352c821fcc6e422aa26b42eb856c19057bb79fdb17ccea7ab313215ff3c02da808a73f SHA512 e85168b464791b74fe58bf1bb99795fae980c48ed6233ba53473df0d3caf0d66588a42f1e1ccf6a4dc3c043c6f8618a550086e9fa597ad0e43f3ab3f4d018f0b
-MISC metadata.xml 382 BLAKE2B 3bfdb8690252426778b18446d358067e7df766c2094d089fb1ca5831040a94c30728a3212420d676e6bf5d3cd45fb3e172f4b1c5c6dc6975066ea8091c433b74 SHA512 5e279aa1d40ec8f7fac1b690a1e1373cce10d7cb063fec5a6a865160396d71323ef2a73a3fd5dc3805fa11bbf8aa5a51fa0a08fdf2bad7b14a1ed48e68cc0c9a
diff --git a/dev-python/workerpool/metadata.xml b/dev-python/workerpool/metadata.xml
deleted file mode 100644
index 162f4f178710..000000000000
--- a/dev-python/workerpool/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">workerpool</remote-id>
-    <remote-id type="github">shazow/workerpool</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/workerpool/workerpool-0.9.4.ebuild b/dev-python/workerpool/workerpool-0.9.4.ebuild
deleted file mode 100644
index 05004de15b02..000000000000
--- a/dev-python/workerpool/workerpool-0.9.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for distributing jobs to a pool of worker threads"
-HOMEPAGE="https://github.com/shazow/workerpool"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests -v test || die
-}
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 6f07d0cd7278..7b3403ace30b 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,7 +1,7 @@
 DIST wrapt-1.10.10.tar.gz 122052 BLAKE2B 216c3cf5ba3b91d2ed6c71c3a131242e8e668394b429e13d1a0ca3a0f806d380ca4e1a1a1d17ea029643fbc0d56defdacfcc9659a9eb1df67771dc03cdc7d292 SHA512 e18283cac7bbb137f43fa8c2839fff14072db1fdae57da2b393a5db4007656706838b64bc6785cea25602205b595fc4e7fe033e580d2fb484fd8c77351e046d1
 DIST wrapt-1.10.11.tar.gz 122499 BLAKE2B 1398bc84e3d5490ba6e6f6f386d5eb6439ec750a2a1c5c29acf91e87a9c9405b11ff10dcb56e4aa28d07d34f7a56fbe9154d2f30556f5a2ae4f1a0986033e05a SHA512 cc051749341bcd6fc1a950607fad94f74334a00acf0366129470181a5af7a3af32a26e5c5deee9242ee12bcc7e4c47dacb958c514aba8a764be3bcc662845b98
 DIST wrapt-1.11.2.tar.gz 124874 BLAKE2B 262518e097753830d80d834e1dcd5afe9c743e7cad8fad992146829255b99ef0c1a6d0344674935bb6beae9a8e5f42a1a4ade760f7300d104b1a17bc6f94f91f SHA512 2551247c46fbc34068e0f2d6efa91d8c87669c8bf1e16c3b5e2e5e0d84402301c38a78485b7e9a13120c99c9c942db680a84d87a52a072d530aba6444d86297d
-EBUILD wrapt-1.10.10.ebuild 1027 BLAKE2B 823c1a188764aa189b82e777a33f1f4dbde965c7de4f4f323f1f08506d9fea287aa67fb2372acaea94a535af7e9d904cb330a77bf8d08ea7305e0b93aadd8514 SHA512 efd3f2b17c48d4e8bc2dccb23ae2eba1e0a3180cbb5c7813387019495501517e3152dc049f40e81b159a94060291e30342d425f6eb1827cff3651559489c06fa
-EBUILD wrapt-1.10.11.ebuild 1061 BLAKE2B 8afcb114c2b285a6721523cce7a90e7f53e9feadd69f0ac02201cb77be74f9c54426be1085acd691afead83ed8ec81f81ab3dbfe69aedd727370a0cbccbf59bc SHA512 4f709f7759a76f0cafb654d5f6f04ee2759afb65150e7a0e4b0500baf8cc4e88e3c31a492e2f15349c84ea9259b12bfc3ddf18a937bcc9f72be887806db363c3
-EBUILD wrapt-1.11.2.ebuild 1057 BLAKE2B 00dc283f758d4dabbcd21c503f909b4683a16ee5a3335dc48d38395da18203216dfb94d8928830365dde8b035dd2548f285ffdb6db5852b6d93e8953c7b1733b SHA512 f12b3dfd1f58fa9df17d1d9d7ef383d51cee09151b8b990b0c1a7b59ba84950a46150fd7dc73fff0a48f1a04494066c2eb0f2749f0238417e7cdcfa096de1186
+EBUILD wrapt-1.10.10.ebuild 1018 BLAKE2B 8433013e1d23e71338ea047a372e6712d573c8aead7f4c0bcf8e6fec636f641ffa805abd7c57e0eec4e61239ce3ec5991e2f8a43d5abc19d50e5bfe4ba3f131f SHA512 49717e619310c829ac227051ff965fefba141761baceaba5521eb8be916e40b8373db378332f7725b29f383adca7d2530a2dffaf616b65be9ffacc1aad4c36f8
+EBUILD wrapt-1.10.11.ebuild 1054 BLAKE2B 01c2a5bcf69d2474f1ed99ec550be16a596bc5afc1bdd4747214927156ee4545f34621c859ff343ec3c20eccbc8f01a8f664601264f31a9aca1a1875684acad5 SHA512 b30588a2ebe1009a0a992436f5e63619a247d0c15e9a12e46f88691f9052cdaee1cc103b34db8184b1a809a221ff0fa019fa2d47137b5768c3e091f123298c6d
+EBUILD wrapt-1.11.2.ebuild 1078 BLAKE2B 864c72ab437537735688f181d469f4851a083d74c58c1bb364083cf330d4ec8181460cdc5482a727e90e0e07555cfff710c56a3b422ae0745fe58b9cfc84caed SHA512 67f7d79d3c8af177dc99df94b7f26b158b22553a07e151d4be32a813344e4efc228aa46b58b8c13639e31e8607610bcc43a90951cd00ee1a2cc1a905083ad09e
 MISC metadata.xml 369 BLAKE2B 6a901e590d47a47fb9fe27cafa1708f61f0a3285b651ddcb138ee1fe1add01a163a031dfb9f37b6706fe1712a9da42903317a7560915be98524168e7dfee438c SHA512 2e999c320cf8b1894ef8efea6262304c7902e37692cefb376c36a16cf457133255a8f7c709e329232614fce918d65a82b61f2f340fdc277ae8d1b37c6d60a3ad
diff --git a/dev-python/wrapt/wrapt-1.10.10.ebuild b/dev-python/wrapt/wrapt-1.10.10.ebuild
index fcc8e568b133..7e6aeaee326f 100644
--- a/dev-python/wrapt/wrapt-1.10.10.ebuild
+++ b/dev-python/wrapt/wrapt-1.10.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/wrapt/wrapt-1.10.11.ebuild b/dev-python/wrapt/wrapt-1.10.11.ebuild
index 813011fb8cc2..b6b8ecdbd4d8 100644
--- a/dev-python/wrapt/wrapt-1.10.11.ebuild
+++ b/dev-python/wrapt/wrapt-1.10.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/wrapt/wrapt-1.11.2.ebuild b/dev-python/wrapt/wrapt-1.11.2.ebuild
index 425c5ca2bd41..c3a57b0c8682 100644
--- a/dev-python/wrapt/wrapt-1.11.2.ebuild
+++ b/dev-python/wrapt/wrapt-1.11.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index 66f3e70c2b30..98bfc871950b 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -1,8 +1,7 @@
 AUX ws4py-0.3.4-tests.patch 2439 BLAKE2B 0d0a185104b073ceed3c745f46b67df5916b001f5e67be50000ef1c68f923f2375be248f4961739180d4992db6fdf11d2ba3558a4725cd4f3d330303fc9c01a1 SHA512 fb8cf920ac48aface7e50576c1038db47133c6a44e7d4ef1b965d6efc4374d22392e44bfdca64bd61696a5c6ed884ef6b1e410e515ed6e1856c7f3c4862d19ff
 DIST ws4py-0.3.4.tar.gz 65467 BLAKE2B c51e338f3c65e100b55e83cd7b09fb8e4eafec3adc118a2744ea4aabc54c91efacda94cb3018550049d617b6759198cfbdb4497a024c597de942abe9e5517ab6 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f
 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
-EBUILD ws4py-0.3.4-r1.ebuild 1809 BLAKE2B b963a03f3c9fe85dd4ff280ce4ab2e8944fc4cc20368fb1506e507a3bdb349f4ff9eeb4a0e89c738838efe4535c118356463d902d13c891365c060f28f379728 SHA512 2f900a12472ce45d1eb55220e1c7b112e805150820ede354103a380d75b972201812998e3ef659568c85fccd8384ab9bafbf85c045d08f5263e9ac03f64eb8c3
-EBUILD ws4py-0.3.4.ebuild 1763 BLAKE2B 38b05a74269cf0ec9d49e6c4a6e7230312093336276c7fa2cd34b6cfbd14a59fb6c52d72e518992525acfeb2140bc44849f28416d5916ba872bb209c274886c2 SHA512 1484c4419dd3b5a3a941a991563897c9339ec512f3e2b0372150aca743b96c874df98b7f56eda90836266848e6968e8d88da333c98049b9733ce408488f39c4f
-EBUILD ws4py-0.5.1.ebuild 1773 BLAKE2B f68232d145e9983165194ae249a22cae029006793b90df55bea420e4c81c24978ceb83b5222ec161972b84cbd6306fc8d45941bb418316a1336f911a9f500b53 SHA512 c97200693315e6cc4ce2701fa618098ece3a9166597656aafc3b08fab234fe764b56cb302ee16ce3475e905e6e97cde98f1db3ff6b2576dfc66a4ff8fd94df2d
-EBUILD ws4py-9999.ebuild 1776 BLAKE2B 38ac1115b4e8714a85f26104bf958510334e49222991f157047d13f204fdcc3a4873f3d7f8e150a9aac51eb6669fc29535e6accef39c99af5e42122112cfdf28 SHA512 d878423330468159e0bc9c4dc27d3804d573ba0bd5b040ddd53266685b3aca0585dc51730ce3d220a2b09a13f4aad7a1c738ad0ace88e609167a4a17863f5fe5
+EBUILD ws4py-0.3.4-r1.ebuild 1805 BLAKE2B 126d8870f982918235bec73085e65040ce722465179dc3c41ea54755c59115430d2ed5b9edd4fa7e5f14d3298c3a758a7d31a95b2aa7e6b508fa45a0977e5245 SHA512 2cbddd32f63b36c5103d3fca840e620a56ff482c4bca51bb06644db13382d464887b5803ef579daa83e61e83e5efb7fbb56bf9bcdefd9eec88f0af50163f74f3
+EBUILD ws4py-0.5.1.ebuild 1769 BLAKE2B 91894ab485866f9ffbf26675569b82e7dd87cb0423881941a3967699cf3cebe6e2309f063a77e037de2bb751e6d259292dda910a1774824538b2d5c03a066890 SHA512 7b8c127f37132b3d3bbc2c177543ed034ffa770cf86ac940065494468b9e3d5baa7dd08e5b4e8e5c69cc8ea68b13c21d1e04e37832e36e40ad230bd437690d3b
+EBUILD ws4py-9999.ebuild 1772 BLAKE2B af8b8309f66626d69b1e01abfde27e13ae6c06e03e9cf1ba6ec6885afe7378e988d3e1f4a3702a3ded90d012817c0c2d64c478849dff0e759b7d79d18f9eac2d SHA512 787b88819cf49f4de2a8bc462b8642988f50fa9cd9bde4fa24f62e0de705665adf7799b41c0a3d7b64688a801926bdf718bef4f335eae1984788a4574648a190
 MISC metadata.xml 469 BLAKE2B 7c2212a53fd485fe5e99a53741f0d828bf09fca7dac40ddd1c0326eebffb1f0fef0c305ac00d61747d6184f3f309e711157f0b715d3fc49694bedabb9f09d513 SHA512 a368692c9de68b711cae8c35305b35e445f47046ecf2226d36d5944be4e8a6d29311c28c6ed74ae794517eb2f20c0b2eeeb0ce33e719029b843c8d23b2e2e838
diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
index 1a4959e9d0ff..8637c4905841 100644
--- a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
+++ b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # We could depend on dev-python/cherrypy when USE=server, but
@@ -7,7 +7,7 @@
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="threads?"
 
 inherit distutils-r1
diff --git a/dev-python/ws4py/ws4py-0.3.4.ebuild b/dev-python/ws4py/ws4py-0.3.4.ebuild
deleted file mode 100644
index 25713f224f72..000000000000
--- a/dev-python/ws4py/ws4py-0.3.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# We could depend on dev-python/cherrypy when USE=server, but
-# that is an optional component ...
-# Same for www-servers/tornado and USE=client ... so why not???
-# pypy is viable but better with a cutdown set of deps
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-PYTHON_REQ_USE="threads?"
-
-inherit distutils-r1
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
-HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+client +server test +threads"
-RESTRICT="!test? ( test )"
-# doc build requires sphinxcontrib ext packages absent from portage
-
-RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-		client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
-		server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# testsuite displays an issue with mock under py3 but is non fatal
-	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
-	use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
-}
diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild
index d02c9669d063..34de8e37ab89 100644
--- a/dev-python/ws4py/ws4py-0.5.1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # We could depend on dev-python/cherrypy when USE=server, but
@@ -7,7 +7,7 @@
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="threads?"
 
 inherit distutils-r1
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index 5b8f748142d8..5c1543f24678 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # We could depend on dev-python/cherrypy when USE=server, but
@@ -7,7 +7,7 @@
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="threads?"
 
 inherit distutils-r1
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index 0078baf433bb..3001b76457ff 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1,3 +1,3 @@
 DIST wsaccel-0.6.2_p20170108.zip 21344 BLAKE2B ecb8ef7888fb2ca8e6566d2b3fcbd3911a0df5a8c9f4be86a3cffb95afc31603c2477bd983f9d24ee7cf48c33cbcfb10068c38640ee2a888f46402756313cf29 SHA512 d0cf13360bd6cc0b51b8bee1d36a8ee544816c318e828bf6129ff85827636642cfebae4ef0e99d841cdf64f6c67006a649994804aa42d3d76e977a861aafb3b9
-EBUILD wsaccel-0.6.2_p20170108.ebuild 748 BLAKE2B cb4e142622829de196237a61396c84d1995630d4c958bc762d90a9d579d59b4a0aa4082d16a409700dd8b42629930f6a5d1e1c6a4c8b8230557aa5e6bcbeff55 SHA512 b2f029df45ed6c7093a22300b67562dd723ef4980e0813d0b97ebc07d729953e6e5d16c21c852a359d68612e9221195821e15f0e5b6bddfe854682c0d004feff
+EBUILD wsaccel-0.6.2_p20170108.ebuild 744 BLAKE2B f3eca23b57bc7568d259b6449f881b0a5189849839128a5753c0923a4933e3386f7289ab9d50b5fb59b7853a37a24f274b00c234654550b5a7e857bdeb711b2d SHA512 f20198c28597f8e34faad58940d847e2d94d0294c1a4a1f20504b429eaef7c088e3a0a47249f8d0a8096487c10505d9939f67b39c9665b1e4a0430159a38c2fb
 MISC metadata.xml 377 BLAKE2B 9e994c8b6d0e89336fd1f2998f8544201ccccf3d647f3600e57ffddf21fb75e05bc3f8ffc2634dda9be9ba78709ac634d8d642cf110edd382d24ae055d860fc0 SHA512 cd6ff7d5e94219b550161b57a1c6f3736a8c78906a81a5e293046b9b3b454f97c1fb41dd7eb7034f45ab784c22189e3788f2e8d9c17a725743936796af3a4d6d
diff --git a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
index 819e425d4a2b..fe657bd61348 100644
--- a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 COMMIT="0fbd074c257c51b73de05b25ccb6488801320a32"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/wsgiintercept/Manifest b/dev-python/wsgiintercept/Manifest
index c08e1ef48ba2..44d47a7dea77 100644
--- a/dev-python/wsgiintercept/Manifest
+++ b/dev-python/wsgiintercept/Manifest
@@ -1,3 +1,3 @@
 DIST wsgi_intercept-1.3.1.tar.gz 24596 BLAKE2B fd585991c5fc928c6e499e6ed35be2b1ea21e71b4dd18500e4d77bea40cc974950571431da30b2c5c0673c1f8d21957f9938e67a61a132731bfc0d8aec147935 SHA512 6b435246b20694437ec0c79b9675af3a24c43b77e3b1ca6b8ede473c2077259197ada5c4dcb9f197331975ed97e7d475792f9ab4a7da2aa9c657203c55662479
-EBUILD wsgiintercept-1.3.1.ebuild 1623 BLAKE2B bdef43b1e04727deb2ceab3476c4f929707e270b9da2e484616e2c93ee3ef5e8b69ed21d9b1e29fcdca0723f5fa6a0092f73fffdd52ff5358230bbad24c67740 SHA512 71e7a2d170745d357d99c7231e13d7dc05010016dd34e53c7be639c0879003c4f99c974cb1f67c79c06e807d473944a18050202c41194f14937109ecf0fe1c61
+EBUILD wsgiintercept-1.3.1.ebuild 1604 BLAKE2B 40ed5b755bf92dacf38f25c64691b2e4316e867fbcd27318e7c94df700cf5f4e4c52f01967f2a4cbc92ece1f41fe72a0c7c96547d8076d8d31a5f8bbb3f3df01 SHA512 ce0d32ae75b4220d230432faa4820038617f7183e4526e82e7c8f5874e5f5258838d0f34c7a042b01265f3ece54bad545835409513faacb4c462e38a76b0b44d
 MISC metadata.xml 892 BLAKE2B 9172a2b13d71f443f574bd59462ec8a866bd079c8a5c06aab365bc7f726dc228f3c0a264bd063b02db0d0d3e67ae1a05e4018f3a8f82c66a7ad2c17157488c0b SHA512 776ed8e2f5df00109aae96f10c1ad5f678ac92c348b15d3597b8c48fd3961da19d0d397a7322c7f2c2b02fc7befa9db5cee8d4eb33b43c280c0076bcc1fa9ad9
diff --git a/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild b/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild
index 8cef5d0ea96b..33a90635a9d1 100644
--- a/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild
+++ b/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index 66bc665eed40..2f78aa4e08fd 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -2,7 +2,7 @@ AUX wsgiproxy2-0.4.6-tests.patch 736 BLAKE2B 4680b256f190d1bde89b5e8735cdd03a680
 DIST WSGIProxy2-0.4.2.zip 18817 BLAKE2B 90334926b726024c1a16b066d11cfe579ad80515861811766753aa772fa97e521466bce0a08c028a965e51ec40b977feb1f4b59aa6c023ca6a431deb63668ed5 SHA512 3dd750263485ceb644373d8ea9692c9a46126a1ed7cd640feba7d42b0fe618e290dcae2f76dc83be77de34211ac473f5a1496a8309e3fcc64982e9642af786fb
 DIST WSGIProxy2-0.4.4.tar.gz 16475 BLAKE2B 8cc91e8364204a03fb8f80abb926e69112c2224b595c695d25e2fa54553fe9c82e3420f68b58f266d04450dd49a6dbf9257c190da8645dfeee976ae101fc708b SHA512 6ae9fca65fe80f52924f42b26b447631e8c278f517ababc23d26e5f8598d6d9b7975197ec74faf64f2e051824366ac14c5db5727a014a187c70a1b4604105b42
 DIST WSGIProxy2-0.4.6.tar.gz 16481 BLAKE2B c33dc34d430da795e8144e06e1d6f100cce7d0155295c2d3038567a048647a4f008dbc0156fd4234ce069b3f4ec01af0e42b174dd68c92c9cb3ff4e13be83f8a SHA512 c60d794c0c8b383bf1857ec325d6d0b4fce9c4aec4a06cbf9d7549b609633e491e137342b7bbaf4eec12462eabba63096328c8517b0685e241d1baecd5827cad
-EBUILD wsgiproxy2-0.4.2.ebuild 1293 BLAKE2B 586a922155ebd09cda769b034782a566fc30ecde3b1843cbd3fe79a83b8ba2301cdc26873ea81de328c44da0e24e3ea007b13698f7d0d4ebd83f73632fa0109a SHA512 3c9bb2405c765a29d2c37ea45c0baa2769eefc2e1dc1c121cc2e43b2701c5d54dc903d0ee5b4c30961fceb916f9b368c51d7b0bdad8d15ca0b85be19d0ab05d5
-EBUILD wsgiproxy2-0.4.4-r1.ebuild 1311 BLAKE2B c5396a4a1329201da256cd167959aa440cd7acc8370eb3415b53aaf06318bdbbf37ad62097d746e1c89491846e9ca7b3767946c3b4df989e177aeb7489223f02 SHA512 aa37ca4f2508f90afee59d5b4a46355db9fcb30e214426bf6b024eef651e19b11a667dd86436365fc3d28c91be3ed07c1d5d590c6bdb9e41793b522941986a54
-EBUILD wsgiproxy2-0.4.6.ebuild 1220 BLAKE2B 1bd7650669c9aba7cd64c7afba330c5c5667cc28abb44a7522a503b7ff758cc787bdb3ba93cc223565b6f04e8bbc23e42269e8331c5a04d6d0341d57fd3b502f SHA512 a2460a08099d024218da049717cc8122f4537861bda094609cdbe77c63b467f5e0f98c58ee066db5fc6eee9dee96663c76c171c14cf99ebd1c1c352f8b338447
+EBUILD wsgiproxy2-0.4.2.ebuild 1289 BLAKE2B ce1d06a942f2466eccf8685fedcf2b812ecc613a6d9a7a64dc40b95452698a7d82ee1a597b7eca925a808a79a3eb7d6573c4ac173292156ca6614d8087d7ba94 SHA512 8178a10848154fc179b999e577efda0f439d81eb02b9d3f0659b8411dbab6cf75d2a7fb0c4d344e4e84b84d4f93c2f3e3a2086398cf4e27408d860e08bcf125d
+EBUILD wsgiproxy2-0.4.4-r1.ebuild 1309 BLAKE2B 1cd9e2efba376f54cd8f600ec5140fcc32e142c1da0a202b59f51b8bf0ec0d2bbdc2963a94bb7806875f613379f02912abc6e5da6eaba142fb95dee5fd092e6b SHA512 63d1d9ede89d997583af5ca90cb2cd66ab0881ed30d9fa77dbaedceb3f20dfd4a06e1d9423eadde3a48cc2eb9dd0f62ae6dc993c1fe6889230c2edef343c735c
+EBUILD wsgiproxy2-0.4.6.ebuild 1215 BLAKE2B 55daa29876d4bdd8c1f1916d70900a7a39fd829560c771052c6ef8a7725e5ca9cf695ebc4352e1f10c388aba9100c8d52be3ef60555a8c763600baf954ddc3c5 SHA512 86360e80947062cc6f19a93a5d7116213c2fa6502a7c961db3b44447c6b8d7c73681fdd1e14fa26d0fee797ffc03cb84f785a000cc7489846b9a7983cc5620ed
 MISC metadata.xml 313 BLAKE2B 45cd2545e5d5b03206c8c3f2db35c0a95ce08f6c29503c19deee7ebc90f578a8a68bc9ca98a504661d09866ccc0217067643efb84e99cda9d1678231ce01a79e SHA512 147915d551dc542cb68d4cab97a3b187ef698dc450cb730c80eec846e4d4debc954b68d04f76e1df835fcc4d179d705ee95379b38c7d39d0f1ffce809941a7c4
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
index cadf46216b04..e2dbe314ad5e 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild
index 3fa947ce702a..e4dae3014b2b 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild
index 257f448dd31d..531dfb3b9d94 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index 910b4c561df8..e0959271c616 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,5 @@
 DIST wsproto-0.11.0.tar.gz 41179 BLAKE2B 72486adde659e96910bcc56efe5f3ddd71d962e2844e332eabea2a0cbe5574678be85d330fdd54f951f679dfe5b1c185641a30169cc6cd9ac6c4ed066c6a3533 SHA512 583e030dc88971b3733e5e84e5fbaa70d6043d01485cabbbf45470baa31e4f511aea55e108132fc298aeae0031542af7bdd22b7ae25b11832179025a2fde4bdd
 DIST wsproto-0.12.0.tar.gz 45252 BLAKE2B 1be690faba6665b11e2e1c1725935addb132d7008f0ae81e7d5c383a152a5d79389287b3c152cb380e0bdfc97a3438e2a48b62f3c8acf6b501427bc617225ec0 SHA512 159b7f67eff60c2514cfca17036d95017109fe251def6cec132998ac82a037484e3e248d4335539fd03491f56c491a7cf51582aa3f74a44d7d150220a875b18d
-EBUILD wsproto-0.11.0.ebuild 697 BLAKE2B c18ed72f5df1bcf0b05f4d64b2e8d6224be98a263c3992c06423ce40d09591a67e60ec09b47a457a0e55db17be3d86d44bcf70e0fa45e33f715e03ff7a449872 SHA512 9eb45d142b1e1fc81b50bb9a97c8a54d004d4a033231bf9bf2280239c74aa5fcc20ceee8d244d07c7645c59835f82beaafed27d36d78550fe3bb19422f120fca
-EBUILD wsproto-0.12.0.ebuild 738 BLAKE2B 54a55ea55c6653851eefd3ad77c2263ea4435af20dad15ec2e5eaa232e10d094af3c0a02b5fd7c7d36ea61e40338d32d2df6e66f0b3624fdd8af35a0507f49e5 SHA512 9c5fc1df8f27293faf0bc108423b48f6afe73b3e8b9043881d8c47c6e9760b35109070484b0c7a96f290819f39b9a3854ff7a6195aaea090c887021aabf54ec9
+EBUILD wsproto-0.11.0.ebuild 695 BLAKE2B 304aa095233a1f515dc1d84d5aa5534b84c474782cec6e1b041de9ce43e358e4a3fad98d7b6204b4a298db18c857b3f2a4febb37e3fa3a807641d669510fead3 SHA512 6a618c18856fea8235e472edcd2719ee51919bc3006a20e57f0ce7224e73d5ec4c084f02a78f93e50e0a500b09f31473d4ae9cbc9fc0e44bd53e0dafe221cd7f
+EBUILD wsproto-0.12.0.ebuild 736 BLAKE2B 36fd6fd4a897a11ccd3a78fae5e6ccaea119a636418c6f22577606390d895cf448e0e77b140811c5063373abd919204cabafe295d811cc1cc5e1123d2ad49762 SHA512 a75402b8aa893437a0f3ee5cd1b7f63a3e393e690348435fc01824c7a5e37ffc5f995aa98cdbc84b87ed301636de41649f46ef2614795d74013511026ed6be27
 MISC metadata.xml 589 BLAKE2B cd779642e22d2843565d087f42dee8bc89abc872632f9a3accb251ba89498d7f4d7c494adf83db613ee06591a7a48b40584b4f3ff23f1cf900d6763364e3b843 SHA512 fd6b82b6ef0367af0227bafab043b9a02e84c61a39435d3b93e2b4c492d247ee121a5985510427ded8339db68f1471c18928b2c3fd12f87d72f72320c1d6d854
diff --git a/dev-python/wsproto/wsproto-0.11.0.ebuild b/dev-python/wsproto/wsproto-0.11.0.ebuild
index 2e95b72af236..9f398be48fd3 100644
--- a/dev-python/wsproto/wsproto-0.11.0.ebuild
+++ b/dev-python/wsproto/wsproto-0.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wsproto/wsproto-0.12.0.ebuild b/dev-python/wsproto/wsproto-0.12.0.ebuild
index 481b1f3a18e3..aff4557bef64 100644
--- a/dev-python/wsproto/wsproto-0.12.0.ebuild
+++ b/dev-python/wsproto/wsproto-0.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index c6daf6dd3480..b51731e75ef2 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,6 +1,6 @@
 AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c277f287b2444e2bfea9db8fa0344c8817d2316d17cff3d654c3eec3fed448ed200d1f873f6b8f85add6b81ca60a0 SHA512 ee0e9523de4f31bc98a993561e55004a9f877160c1f7a83b9ec83d0654a770972cdefe67692dbd01e322f507370aeee8c2927326ec1797c9c81ff52e085955fd
 DIST wstools-0.4.3.tar.gz 148878 BLAKE2B 96b1e9dc0310fb0fc5515a7c061f82897e2ecd1b6187167b57444394d1e64e8f63e5db011d77c80b5fe6df2f67fecffe82f861fb761190c6b3248346cd9f5b5c SHA512 e735e2ae63aa410a56c79bef0bec7196393bb8f52d8521001d298b6290a75662f7262b6cd3c3238eeaf33263036cc6dabf8435ebd2fd1c98481cea524d0382ed
 DIST wstools-0.4.5.tar.gz 201047 BLAKE2B 34c8d2c52ce9d1d67749ef6d0e1d5684a60718ef613688466d0992306f446b153d681b802fb142d1594bccaf37390495fb59e765f662e7550432d8866e038110 SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a
-EBUILD wstools-0.4.3.ebuild 581 BLAKE2B 869e9b577a39529e12daa7758c919a5f864c090854113fa9bcff70daf64dfcb773e548f4132060d18f3344aefbacf886cb62d5a81a1e226866bec7300e2f80ac SHA512 051351d85054cb867c0fb104e1b86c606bfa5e8df7053eade0f758a9bdd71fc3f6ffe761581e3b96d0ab6fd68b44dfc137bdf9003fe32f7c8e1d0dfa7b7a5d73
-EBUILD wstools-0.4.5-r1.ebuild 841 BLAKE2B f81a043e2f87c8e34a817cfda434e4c32e4aae90bd031f54df849c4edb832406e4929f66a5af29525721796b9507c8c9616dab2c916ccadbc2b73736d2638ea4 SHA512 308a420b5bf8ecfb9697bdaf7bca2840e34cf06d48532e66431e3cfc32e68a6ab8427bf8ef6437797a570f8e155cec1975b84f8a0024794f0f1aed828367e155
+EBUILD wstools-0.4.3.ebuild 573 BLAKE2B 5ba5fadad6d3e5f924486049114b8e107e45459e5e940f68a73d59f6c7b6478782fa1635f037604b2a17eaf6f648dabeccb6fe9543dac776f28935395b6329c2 SHA512 619f2606150481c2d126eff5a8bfebab900c44ff1678f1536da81a5cd94e55561265da3dd83f2424b0420efbd8a12013e91fc0a79208a56e05a48ac47c0554c5
+EBUILD wstools-0.4.5-r1.ebuild 832 BLAKE2B d9b362c95a79cc9d4b9062f3d405400913283c9800195da7f92f6afdf944bf8d9c099f0aabbe8228db7afcda207c4f287c91e87637fb3d669c8198edf83adaf5 SHA512 862083dc0b455b326c3f3fde9365acd9db46ba2940de04beaa6f91096ed006229f2fd0109eb97c661421a0b768058a929a6135bee8bf8c4c1a16cde75310d322
 MISC metadata.xml 376 BLAKE2B 4bee67bc37a09d4b34b1f67902a820f63563f87d9771eb462eb7f098955806e025196082a7e6c118e5ab0638c7ee70d1a63c8183f607d1ff9a26f1b0c16d5206 SHA512 fe2f379a3d41b128b1c817d4e56fe92b72541bcdfff4e40e05da8a661ab30b5eb623421ce6ec366cdb8431c924f6132a9d15982f1182f6a1f4c71f8301d954b8
diff --git a/dev-python/wstools/wstools-0.4.3.ebuild b/dev-python/wstools/wstools-0.4.3.ebuild
index 05c62af2d263..567a1fee74e9 100644
--- a/dev-python/wstools/wstools-0.4.3.ebuild
+++ b/dev-python/wstools/wstools-0.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
index aff7b8f136ef..5d7da026788e 100644
--- a/dev-python/wstools/wstools-0.4.5-r1.ebuild
+++ b/dev-python/wstools/wstools-0.4.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/wtf-peewee/Manifest b/dev-python/wtf-peewee/Manifest
index f2fb0604fbe5..7d33590d601b 100644
--- a/dev-python/wtf-peewee/Manifest
+++ b/dev-python/wtf-peewee/Manifest
@@ -1,5 +1,3 @@
-DIST wtf-peewee-0.2.6.tar.gz 61072 BLAKE2B 92069d6df08301e48ab38da1fadd0b63f16dc1cda441bc10afbb423f0c08d040817a3b24e9faf2931f38493a5b48e941cc869f64f8f566679f107c7f51c79861 SHA512 073973e1dbec17fb3b036447e5150d5de36aeb47c697878e4e97abec4de53a77275278000f4dc982bc1aa1a76736f5a15053d583ab04316c568085973025f833
 DIST wtf-peewee-3.0.0.tar.gz 61500 BLAKE2B 6e80bed253b86d2be6dd26342ae3bb3845354c3736bc5869338a2aec30fe24f2b83bfaa678188eaeb05d128cd9519fe0b99dfad2883efa7b7c5654abbd3524f7 SHA512 248bb39fb6b23006f87860982a249df2c7501f1cb2a9d86ef79d909fb41a0b79f61fcd19a504498587480812c7c2feb74e2a97f2c5c2548845413866ca60e053
-EBUILD wtf-peewee-0.2.6.ebuild 783 BLAKE2B 5957b1aa589f5543105188ffdf9ab27caf3b725e874d94aae2ebd13cbfc1b24b8f0b9149676311d2246e088aebf18fec8c04301617eb01d29ae268e562feec1a SHA512 818e3d2cadc595b245c9296ebbf4960544adc15e19e1412cee95c431b6ff2459aee2e58e3e04eadb66a0057e9fb9fb067f4e3fb1e093f957db2aa58465690bb6
-EBUILD wtf-peewee-3.0.0.ebuild 781 BLAKE2B 0f0176bac7b8f9f1487fc0e5a1b5168afb0cb863545a69a714185f344d096c177a814cd6dadbfbf24ce996553ab472e0299896a9078efb58ce379e57a03faed2 SHA512 2d76aaac6c8d8d5836cabb71f75260d24d68f6da6dc697b3bffdcb630e25537e32caf395006b90e8e96d1f3528dbb4beab53491e1e58667c147e8e86b47a15de
+EBUILD wtf-peewee-3.0.0.ebuild 777 BLAKE2B dccbbc23ee86bd017ce4d57bdd304815e852aa648d211d05d1491d4dd459731076be4d77c38ebf7edc523a5484595401d652556c216d7fa308352e868f0a9957 SHA512 f46862b929465d8c3e032c6dc8b0295c3b6d8865fa648b0f24838515c2b5f39315f0da90782dbecbc2ae8e7a36be74040d86a7b8bdf8ed81810d5ff9adcfe441
 MISC metadata.xml 334 BLAKE2B 9fbc878030dc5018305e9d5b0e9d18684c044faf4e8e4ef4826671ebe6e8fd909d019b86c96f90f18382416ad66f3f16e6e5081ee1cf013b7fdcf7ee4dd958ca SHA512 cf2d8a659c3cb78ada57d97b9bf4acdd1e7eb7324ba38ffa7ff09ed6e5863aa5633d06231cceb3b5741ff57d37b26804672cf06ba531bee3574539f472ec9a43
diff --git a/dev-python/wtf-peewee/wtf-peewee-0.2.6.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.2.6.ebuild
deleted file mode 100644
index 09df137ad8bf..000000000000
--- a/dev-python/wtf-peewee/wtf-peewee-0.2.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="WTForms integration for peewee models"
-HOMEPAGE="https://github.com/coleifer/wtf-peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/peewee-2.7.4[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" ./runtests.py || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r example
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wtf-peewee/wtf-peewee-3.0.0.ebuild b/dev-python/wtf-peewee/wtf-peewee-3.0.0.ebuild
index 51b1dbdb04ed..3504def12ada 100644
--- a/dev-python/wtf-peewee/wtf-peewee-3.0.0.ebuild
+++ b/dev-python/wtf-peewee/wtf-peewee-3.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index 0afe40c28089..f5f05b8cab70 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,5 +1,5 @@
 DIST WTForms-2.1.zip 553644 BLAKE2B 0db0c1d9b3249ad43ad5aa4da597fab3bca38f87eb636768b867365495a30d5f4d4a1def16c9965bfd4bce8ed28ffc7601b3b352af74208086feb7b54ab3de07 SHA512 2bdac0a35eca465021df9fb37dc0acd87bf487c6158b782d48870e9d5aab6ed3eb635af89bb38b9e8419688185f7c7b7875e68f7435d94bca8b074b2dddb12a0
 DIST WTForms-2.2.1.tar.gz 156904 BLAKE2B bec7c526f72b264888f7be45ba15d2bc4d194b09adc8ca5806cfc04cd1671663c851b7f1c99c602bb3e13d14a38733be61613058e46481bcea59901ac1f5b6b2 SHA512 06478790a8a4bf728e5436edaa63c7c0e596f71d63b273e1f296f9255d9fa3e31a7bfa95971c214a8cea684034ac3c77b05371f4b4e14da9d9ef2c5afadabde0
-EBUILD wtforms-2.1.ebuild 1230 BLAKE2B 3bfe62810f8daf6494777f656eac78ac63dc6d559073f620182e68542758c06b8f75f7625e0d524c1a07fbc52a4b12aaa735c1db31a2edcaaf8b7244a4c196d2 SHA512 3385dafe4037810956af74902d1635bec87489e625cc85702cb1b2e8d54c5ab7356ba713ea6e5923a061edd5fa1c998323a94ef66db34710e50786e797fe59a4
-EBUILD wtforms-2.2.1.ebuild 1337 BLAKE2B a4cba6118e6d21db8fbf5ac0efb2b6e3f2a0c4b8dde10a7a7a6dea097294fe473a14134a215a55e77c7e9a8be6bf0208bc6be677ca3da71f2c2bc7ff1b1a636d SHA512 85e08c0a57ed0e6c4b485edbf0d84f3bcab809dc73fddfe15251c94809e3081cebdf41fe6a34299d3dfb0c6e50748bd637deb233704369e306e42344689d5a85
+EBUILD wtforms-2.1.ebuild 1221 BLAKE2B 418b84a50ba9e6f74b0ebf580999a7feb5254f52f289589abb84076b8f64186db8569c369fe0e52e38f2106c9230f3261b243ba1f5c5256c6c211adf9fa56839 SHA512 e63639d87a91adf91dccb78c63a1acf97750b5f35b958f3a78963dc8556c8c461d62e9e03b9dca05f10453dd72855b392a4bad56af8e29203b29555b5b1f1df0
+EBUILD wtforms-2.2.1.ebuild 1332 BLAKE2B fc28f72f4e837e4acfb038fabcbbb34bb5df4f9026daef35e9b6dde2373b5c92d1787c6b7e376fbd5959bd8abefa0a3bc376d6b7e8df63a8f5e47da6afae8b42 SHA512 3e80b837cfb9e49f7e3093920db0fb5990c00a12abb562d57ffa2c5e35e146b997190aeb34d119e669536559a35cdf3f948337ee1c7927f73bd380deaf4b7230
 MISC metadata.xml 428 BLAKE2B 56881cd6ce12c4829ba29d6571369d4fe5f0d62810934c5f89b04c61cb00ec592773f7a6b79dc9034ee74240db95d9af690271027c87bc4e2997902a21614940 SHA512 2399e15e7dfc3dfeea12c49f3f4df7bab32e03a38860d268ce1de64ca7978dcf197c7658250778b4d4006eb7d2626f2d17632cb3dd2ca507c0d918e5996918a0
diff --git a/dev-python/wtforms/wtforms-2.1.ebuild b/dev-python/wtforms/wtforms-2.1.ebuild
index 955e22368cc8..cae6eb2f1e90 100644
--- a/dev-python/wtforms/wtforms-2.1.ebuild
+++ b/dev-python/wtforms/wtforms-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wtforms/wtforms-2.2.1.ebuild b/dev-python/wtforms/wtforms-2.2.1.ebuild
index 7e05ab5ba319..74ab98861301 100644
--- a/dev-python/wtforms/wtforms-2.2.1.ebuild
+++ b/dev-python/wtforms/wtforms-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wurlitzer/Manifest b/dev-python/wurlitzer/Manifest
new file mode 100644
index 000000000000..c7824ee8c2a5
--- /dev/null
+++ b/dev-python/wurlitzer/Manifest
@@ -0,0 +1,3 @@
+DIST wurlitzer-2.0.0.tar.gz 10203 BLAKE2B 526f1fa1cf2f257c126a4f2c67b27b373b23e113552e72372029ab69a6b629d9453c39feac083c1376e3996a44af8ad823d1ca119515b420d9fefbbf326da38e SHA512 5cafdf84e47e6d18074f6ed3af6bab2eaa1f5cfd3d658ea02a49d387127e9a9101de05c864480af42f5a7650cc47e0a218e822912a4ba3ef826e71206dd2f3e9
+EBUILD wurlitzer-2.0.0.ebuild 563 BLAKE2B 75fa4e8a559e826c23d1578d54144e7502c8645e455dcbe9a2c8aaed99b1b6c0a883802ee79272f73102f78dbb8963900f5a4b65929e7dbb337cd96cee8b0774 SHA512 fe2b9a2be875d49e8f9b08474140853646c05f4a24163530fea1b79f09d9859dd73f1e17733bc454ada2057ad0f404693d6240d71308fc97aa47342c32e5d2a1
+MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/wurlitzer/metadata.xml b/dev-python/wurlitzer/metadata.xml
new file mode 100644
index 000000000000..dd0bd9c021f6
--- /dev/null
+++ b/dev-python/wurlitzer/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+    <maintainer type="person">
+        <email>andrewammerlaan@riseup.net</email>
+        <name>Andrew Ammerlaan</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-python/wurlitzer/wurlitzer-2.0.0.ebuild b/dev-python/wurlitzer/wurlitzer-2.0.0.ebuild
new file mode 100644
index 000000000000..7ae94bdbdace
--- /dev/null
+++ b/dev-python/wurlitzer/wurlitzer-2.0.0.ebuild
@@ -0,0 +1,23 @@
+# 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="Capture C-level stdout/stderr in Python"
+HOMEPAGE="https://github.com/minrk/wurlitzer https://pypi.org/project/wurlitzer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/www-authenticate/Manifest b/dev-python/www-authenticate/Manifest
index 9446d3ab0b08..a235e96052d2 100644
--- a/dev-python/www-authenticate/Manifest
+++ b/dev-python/www-authenticate/Manifest
@@ -1,3 +1,3 @@
 DIST www-authenticate-0.9.2.tar.gz 2480 BLAKE2B 642640f29582983457134034d9d93ca20fb3d8992cbe3f5b3f9b35e3d95c154fb744dc8fbe35081d4af6b1b04ea37e27b35501bd783130d9e1bcf8aa6a0eeaba SHA512 5ee3ee733013d922bfef96981fd33b22947874c0a2a56c6d2dbfe11b0bc447a3ff6b6f294efaea2beaf2ff570cd3bf519a21bc71ce62fc0a8ce5edc5d68308f4
-EBUILD www-authenticate-0.9.2.ebuild 620 BLAKE2B e07d6ccab9d10b338f913e9d1549dec4b91a9ab80c5e063814b47e287decf0a9911405e6b190b2d18563238b9d4483dc75e5a920b91231e3a3ae17aa951810be SHA512 86bb5bbac05eb596f9a696ad80fbb336720d2fea8ee16a5eb3e290769182fcf52836135b2da8225abe65c7c225ae574420e6c3fabb98243a9866e03744da9a49
+EBUILD www-authenticate-0.9.2.ebuild 616 BLAKE2B 5e5689baec47d171875a1f9891aae816a7be4b97e1e971a9e8d8a7485f37e3a86f8c2f9dcd156bfed1b8b7948ea89d99deb920fab3c2cc9ecf90d31d69bf6e08 SHA512 6085b95bc6e4b29a635b2b0ee403fe16ea4f51040733a74871f27de4f90b4d40ece081b12d89496a826407deaa018845fd0ccaf3d2a7ef052b496961fab35b88
 MISC metadata.xml 387 BLAKE2B 48442f1e88e03bf55104ba3f54f61a4f09cbd0fc3761b8e4b79497e7dc746f90b90359cb783faa1813cdc19318dbe66303379357006bdcfe30d42bfadff244bc SHA512 c6a7433f233618ec283e6ba0c0ed2730fb01d5f85a795e340bddc29435cea3c6399095d9fee2b1795cbe5b7949e8a79ecef5c979b502bed2162643426410273c
diff --git a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
index 36d6618eef34..bea1084fbed8 100644
--- a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
+++ b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="WWW-Authenticate header parser"
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 5238b1994896..9ade10605374 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -9,5 +9,5 @@ DIST wxPython-4.0.6.tar.gz 68815031 BLAKE2B 49367f5d0867c28893c43d54c4ad6001807b
 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
 EBUILD wxpython-3.0.2.0.ebuild 4593 BLAKE2B 5b963f8c7e96173ebfb0fc3a6f4de213108de0a61183a3075145cbe67207105ee22ba2b38933778fbdf34e1dac81dab2402039f91e334ce39f0dae40211003bc SHA512 2a2c8dde789b018e019f60731f48ebae5087e3c7cff4d205ddce70eadda23571df67149302e49c5fe0390e05e184e3c6002f73847bd97ac79852f8853488f675
-EBUILD wxpython-4.0.6.ebuild 2392 BLAKE2B 5a3aaa73a912b61ccc8a4d5803ff9e0a6b9a6e2a814c88734192d3a96e663ed7406d7f9f324f178d15e5ae4cc29d3e3cc840f1944dad6020e73814b7d23118e5 SHA512 f1b565be02387acb5f83089de3022f1ff68fbb00d4a3accb1ec14c056ead169c24c6c3a4f5d4ad105911a673267e10e614f66e25f816cc6c34a9156237d28cdc
+EBUILD wxpython-4.0.6.ebuild 2390 BLAKE2B dd93fb0cbe88f5fa17f048b18668abd2ab4c14146f338f1993e1ca2e168d7175ed08321661e33cbe893fc89ac2fa4d4d67b78a26e72df7c9999d783766ba23ac SHA512 50a52469e12b1437ab9628454cce19140d644d331cebeb0ae3a0bb85d975019d81c089a478bc946227b103afaf38d56e92bd7bfd6c8ba5daab56876c442934b4
 MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
diff --git a/dev-python/wxpython/wxpython-4.0.6.ebuild b/dev-python/wxpython/wxpython-4.0.6.ebuild
index 4627a9776889..e5233480aff7 100644
--- a/dev-python/wxpython/wxpython-4.0.6.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # wxPython 4 supports python 2.7, but because it's going EOL soon and to ease
 # transition from wxPython 3.x, we make this package py3-only.
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 WX_GTK_VER="3.0-gtk3"
 
 inherit distutils-r1 multiprocessing virtualx wxwidgets
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index e898f229e7d8..cb1f33261c3a 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,3 +1,3 @@
 DIST xapp-1.0.1.tar.gz 12327 BLAKE2B a627a833adc8ca32823d4c04fd65ef3dedc2eedd031c3030105f1f2341fa17744fc81c976f4eaa1a238653392510d416692ce804ff5bcfe9ed12d9595245e8d3 SHA512 7dc4db03476f6972f6452800d2ea58d7f78d0bd5dd6719f2b49d1c2e3315c3fa09c294b1195bebd26357c30b4c43d7e5c01d160708dd17ee488b823344895e25
-EBUILD xapp-1.0.1-r2.ebuild 543 BLAKE2B ae2997f19e601ea1303381e818db62ed2acd38c684728144936ae497e2f758833f81577c3cce3056f0b6f3f40a1215750d42e9b049e0ad640162d2d88c2cf142 SHA512 28a21568e44363af128806f97bf0622aa7b508c767cdef56d29f81bbd3879010900f5219af4d4ed68e6027cd21837afacd06292749220143eb4ed5607dcdb497
+EBUILD xapp-1.0.1-r2.ebuild 539 BLAKE2B 8b7986950d82e88b26508272a707f42a5ca788e361d16d7fb5334c2cca8ab40cb5cc13be457a4f3a43a969df0c6b9738114c4774a9622835b559ac3f756ecd8b SHA512 a6f92d911cfcf74e93bc60660d96d16b08f69658123299e3281fad32e2dc0a646331d8e4ff01eb75bbaac1dc89fbbf6d6ee38284fd78240df16208ad3445c379
 MISC metadata.xml 220 BLAKE2B 3d3008b71006a64b0bc1899c37b1ea3c2048806badd09c02be51a29f1481475c704c5561d84f7caa1905c57e94e2ebe787839bb23b647a42543f31a9d8bf869f SHA512 1aa3933bda5909c7e7907b7c5218f4c214f5ba411fb8fc373e35ee2f490e4ab8a7813549c127b916e3c8b9527853a502fe298af1aa7139c213c2f31847120364
diff --git a/dev-python/xapp/xapp-1.0.1-r2.ebuild b/dev-python/xapp/xapp-1.0.1-r2.ebuild
index 91c11669095d..8b3cf6257741 100644
--- a/dev-python/xapp/xapp-1.0.1-r2.ebuild
+++ b/dev-python/xapp/xapp-1.0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 021f52cbe678..becc731c5cf3 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,6 +1,6 @@
 AUX xarray-0.10.8-skip-broken-test.patch 513 BLAKE2B c4d6298732029f509df209679b7d5fa285a9093053a08a1668a7f12e97a9d2d3738b170b05eb0b681c1a631268dc8213124eafa6cbcb9ba8dbfb53d6da0dbd49 SHA512 8b70650a30d0e5ce5d6c88c19515fb176de2151414042ba8a73b340e2cc6bdc1976ec0b4c723b4943178a886d29bae1e192059452c61e8eb2065b39ed18f23c5
 DIST xarray-0.10.8.tar.gz 1630608 BLAKE2B d211918a73c81842b0850ed65daa41015e5ab16da9aebe56b86252aeae16141cf540e22b6ed7c758f6db74ca68c9f81dce0ce65db7d054db6ca9d2b4b62e7b0d SHA512 962650f49690638cda9cd91e2d09209138127dd603a7a1e10407e114ee806f61a33f6e4ffaf63474c2d5ad0ce31717e5cae5e3965179a198c62bef013df252a5
 DIST xarray-0.12.1.tar.gz 1745116 BLAKE2B f38380503347a17cfe11e930b5e275912fb4fb3f02de057e61b21ad1515c8f5e2d5c28007ebb20cecda0f4398b7c71ce239fb3d6f25a79600f5da509f0976359 SHA512 f9e8033b9387ec4175c9d65199aff9cdfc442abb9d2736fb47ab6170ab1e1860b4eb693317a64dad560ab6974f08f7c13f24ecf24c087154ae2d71203e584426
-EBUILD xarray-0.10.8.ebuild 846 BLAKE2B 1380a6463a4c69a4c67c6111038c775899f998e39d057f8dfaa2cb4fd227b5224d6269d2c9adbabb5eb978cfbe129ff2fe6549e212e7801641332cf028ffbf37 SHA512 bafffe7450fe6fd112f28a68610525be74f185e78a6f63b1ea57ec52c322897dacc5fba3becc063c979ee3051c5ef9c0db755f990df3091a15d76bd8b996130c
-EBUILD xarray-0.12.1.ebuild 820 BLAKE2B 8c86f87eeb220982af91e3af756fa130a059aec331442c0539a528c1743840d797a1f6578921b6cc1d84984f9b1f1066679825c1b2a41c82b5eceeb8bd003684 SHA512 6747ea65665ec11412dd4c4dbdb6a65b4edd41252312994710522bd535cb58d522f7d5b93f0704a36aae7b12411b755d8d11541e9135518757a8b68c7bd0e409
+EBUILD xarray-0.10.8.ebuild 844 BLAKE2B ee30bc495b2b42b26522231ffdeb908e55b377da098d4d8c9643f7a894f3d7251db78c55af0a17069cfed8d3a2fc431d9dec7c698e6206ef3879fb0c174d3cd7 SHA512 d114b96e14c5f98ca1446ec5384d4abf0c17c8d9e007996a79e98b1f6860da8f31c81de087a533d3788e8b65ed7fc7757b6e36c6a4b75d236d8665273b44fb10
+EBUILD xarray-0.12.1.ebuild 818 BLAKE2B 108cb73c749d10edad561e1b9be7e33695c9608333aa81589682f1739069fdef02bbdce5a452f3c7a18212f1aca89cb43e922e9672d34ea54d1e259090b9eca6 SHA512 5da00e8860b4b10daf39feb9860bb1db28b1d905c474a5b4ff5adb19d29f0e1043461dd8d65129185f9ad88d941234dfa157dc5a3cea8cb7fec2a5336b7c9dcb
 MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
diff --git a/dev-python/xarray/xarray-0.10.8.ebuild b/dev-python/xarray/xarray-0.10.8.ebuild
index 9e06329a6be7..71388345bd94 100644
--- a/dev-python/xarray/xarray-0.10.8.ebuild
+++ b/dev-python/xarray/xarray-0.10.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xarray/xarray-0.12.1.ebuild b/dev-python/xarray/xarray-0.12.1.ebuild
index 37987da80dca..222eefe6c42e 100644
--- a/dev-python/xarray/xarray-0.12.1.ebuild
+++ b/dev-python/xarray/xarray-0.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 7995db81b89e..3ee7b1fdd77e 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -3,8 +3,8 @@ DIST xcffib-0.5.1.tar.gz 81274 BLAKE2B 17e19d16a5d1b5699a10bc93c80327ba2d4c38d18
 DIST xcffib-0.6.0.tar.gz 84360 BLAKE2B 0947e1a20e9ad73f77e6cb000ed9fc8d70e45080edb74c5d25642c2d5ae388cc97461633e8cee1d7676557735b57b9cc1a3de459e54f96888cf7d19451d24c21 SHA512 de78b738f2a75e6569a0529d1fe2844b2cafe48623f25c20a9572ce881cb97325c3823dfe883a2e14bc93d01342f20c4ab561928312f65d0a67364fecb5c8ba5
 DIST xcffib-0.7.0.tar.gz 83895 BLAKE2B b2f8f2a4fcba20bfedc4e174d61900ea20bb8968bbdff73700ceeacd6c9fa36288bfcfd67a7d4206376b3b45e6e51481604e3ea3d6aa6d9ff68eaa49df25a414 SHA512 ad655e897eb08b898e396290c0b4b64a1e228b21fc5ed1fbcb3cc73bae466fa5255d539d864f1a9fdcb1396e73f60a981e00aab82efc343c7f83c8f62a6d31c5
 DIST xcffib-0.8.1.tar.gz 82979 BLAKE2B 7f253a1a6faf77830f2835cc51ae3e2138bdc826b30afded951e276056e2f6b4a1168d3440874e11d539cef84de47e02e16ec435dc7ec55b5bbb933e43f0eb8b SHA512 c7eed1f2c31d87c9ec9b7fa01e11ae3c65d2d9493fe3f4c7286901c65cb4c81382b1c41906ee537372c98b58f680530d708b81826d41eb66be45d62ab22624bf
-EBUILD xcffib-0.5.1.ebuild 916 BLAKE2B 84ba1f727d9b0cd1fb65266561734f0257f5491de1c000cd1ee43969925b3c206e26c255c862cbecaa194b863383c339086a3df4bcccb345e2dac9976146fd72 SHA512 f3650455e0b1646e9fcebe5eb7a1acb1e30597fb640e66eaac7b6f27c77b21f5da207949d1a49db5fdb70cd5e77919aa237e76b54631a91495f487dbe10a22cd
-EBUILD xcffib-0.6.0.ebuild 920 BLAKE2B 4c41f79e5bdd806b9454492168e682cbf11596c8b87c13692e9211fe36fadf285a6dc6b92fe2b9d95ddfef351860792120924fa16910c0751cd8ae55b3bee33d SHA512 4d9edd67250315a7074526dee717e037ff271e2a4f3c2d73e65cdfd73b49e69079c8df385f6cf3d1f00308c8783c0aa7afa19e5d8a108f817c9d5bf21807797c
-EBUILD xcffib-0.7.0.ebuild 956 BLAKE2B 2fa250f5ce8f87ebad1b9a2f9cfe7d9af1ce7f944d1022ddd9217ace238946fd2fa25d59132f264a97d83d061d22d99e9d6dd6df6af67f0a34f0f5d105122993 SHA512 0bccbe6f7ab470a78fa1732709afed125d5545e32e97e9778b1b52b01e82b976d79bf7bba12238fed4a3095b6d4a984d0c8c170d87c03621a9764082ff270750
-EBUILD xcffib-0.8.1.ebuild 964 BLAKE2B 8a9e1706fa6884279c405d4c557bbd0f62c7d86695ec2c77e7e63040a79141422ef172834c75aaed90c32bd0334162e4c1ad865072ddedadc1a1aca48215a491 SHA512 e3c84bddee6b8706756013e1206d5bbfe80646b81474fe07d63728c2f276d2d7bb41ba2ea13e3a6eba733d86396b3af3db24b44bc38f6295b2eedd187ebb1eaa
+EBUILD xcffib-0.5.1.ebuild 856 BLAKE2B 1ddd81491d7755b91c6c8c1fe3521efde7a90277e25ce9dcf3534ef3402b9a2ce895b9ee60ea962fad62979e9791a326abb44f71ace3e9556068e66b5a6db1aa SHA512 b9fc38a364dcafce2cfdb4856313949037ce9a315b68b36cdca769aa397d9768e571dbbf43c814938c3131362f39760743c7b3f9389d1609ac3151ff350a76ee
+EBUILD xcffib-0.6.0.ebuild 860 BLAKE2B cc2dbf62cdc8b574b1107e555e57b23c11aa919997f2724ad7c8381b33d9f2ac87ee1f63a450a8a7cb3f7453a60cb69c20859c9dc72226adfa6d667f6b5c4224 SHA512 9768af62e3e52fd52f45bd4735fc99663a7a90bc135fda62684f9a7e74dda69ae034fe8561ac60d4ef33861ea7884514b4cf1177f9095b19f56cc67640c2fb91
+EBUILD xcffib-0.7.0.ebuild 896 BLAKE2B 8c579be7c0102ec3177ba2d1979ee8b84ce00798853667a68631c87aa685e2e9a1d266da8e21abdc34f5ce87b181b3d5abc2cd31c1ba42bfe84cf11ff4de6127 SHA512 a9f9868ca6d6aba04a1a425230daee4d2473d31e9864b26ed5651fe25e7551f47d029e02faf49eb1454e709cec897b005d31d209885a319006ad9bdc97f3821b
+EBUILD xcffib-0.8.1.ebuild 904 BLAKE2B 82ed9f07dcf955aff8c217d089fa58c469228ea6eeaa45d2aa84f4ed538c40f9adf9a27b8d5cd0135beb7500939be96b7666b06c80cfc0afd17a92bf4a02ae22 SHA512 4ba0bca738368815fa42469589ffe529929bdde417881022d5e88dc251fb787157c55a3dfc99e37794acbf959f8c4f4672f219d84e680cabf7f3437ae3f3ce78
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.5.1.ebuild b/dev-python/xcffib/xcffib-0.5.1.ebuild
index 93726e016cc5..571c792fc63e 100644
--- a/dev-python/xcffib/xcffib-0.5.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="x11-libs/libxcb"
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	dev-python/six[${PYTHON_USEDEP}]
 	${COMMON_DEPEND}"
 DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.6.0.ebuild b/dev-python/xcffib/xcffib-0.6.0.ebuild
index 60fabee1d1fc..13c878d5dd0c 100644
--- a/dev-python/xcffib/xcffib-0.6.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="x11-libs/libxcb"
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	dev-python/six[${PYTHON_USEDEP}]
 	${COMMON_DEPEND}"
 DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.7.0.ebuild b/dev-python/xcffib/xcffib-0.7.0.ebuild
index 077a6308d0c8..8910062edd08 100644
--- a/dev-python/xcffib/xcffib-0.7.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="x11-libs/libxcb"
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	dev-python/six[${PYTHON_USEDEP}]
 	${COMMON_DEPEND}"
 DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.8.1.ebuild b/dev-python/xcffib/xcffib-0.8.1.ebuild
index 48f82dd70d2d..f823f88b30d4 100644
--- a/dev-python/xcffib/xcffib-0.8.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 virtualx
 
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="x11-libs/libxcb"
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
 	dev-python/six[${PYTHON_USEDEP}]
 	${COMMON_DEPEND}"
 DEPEND="
diff --git a/dev-python/xdis/Manifest b/dev-python/xdis/Manifest
index c2e815b04991..3f3e6062f285 100644
--- a/dev-python/xdis/Manifest
+++ b/dev-python/xdis/Manifest
@@ -1,6 +1,6 @@
 AUX xdis-3.3.0-remove-pytest-runner-dep.patch 1093 BLAKE2B 98e3ed5a7b688b1ee2e12cff5a6214a79b184cdfd16a0725983b26d09ab330ab789fc97260a159830de548e36220339a69daaa70bbb7787250aa5fd6c0256eb8 SHA512 4eb02e8fed567903b1d4a51ab65f374008b0e939c0e192311974bb07b4fbfb877f8004580d67d7d1f3dd0bb27319bf17ecd289ede7e4420486c9998fbbef3464
 DIST xdis-3.3.1.tar.gz 154152 BLAKE2B e0997fb8bbc66cc3f019ee6855cbf9ae9f594698c989a0a1b9d0b08f03bb3fbf0ad44ca0292202674c8a8a8d92ce5d6e669dd01194567766262ce44bb154d631 SHA512 93b1a092ae7790e84dfd8dc4128659d48be85c4e00d9914bbd748fad5ec4246bbfc6c19a5c5de366f4bd6d91847dad4ce3c1c3affe8f7608652f2f6e343650e1
 DIST xdis-3.6.0.tar.gz 144766 BLAKE2B e9a33443d42ff71194180f0bb20423783107d4b1e3d6c364b824011d916041500048345cac4853d1ebb6363edf8df542b0363650bba42e187986f50c9696051f SHA512 8b45ccd6976204004f27ee5b1a9da9b29ec0e28f4b462d862be5a1238d3ebd4a5d6f3df5607f3e2f037d80b2d3ae77ec4246ab1aa0671466c1e07e3a65453f3b
-EBUILD xdis-3.3.1.ebuild 1149 BLAKE2B ae619bd34172cb48ffb1bf881e63bfc4a0f8e4d8b89b4dbf30e91a36060d9786af43885c0cc99ab7e97ab2318bedccfd7a565a2c255cb3cef52a3205462c6bdb SHA512 e2cee0b4935689e345058b7e808e41eef6d825def7409a9b9f9614e2d61afb0b1c50bccc0c5416e88dfd01893bdf89672f723a20204921c2d51f7939d5c00fb0
-EBUILD xdis-3.6.0.ebuild 1213 BLAKE2B aa04c39917c64ee566e05983d2318a743faac886a275792c016ec63957ce9bd29a17e9c19dd3d7214e6d43c67f0a9af066bc61f1c052b49ac00db38eba1a1468 SHA512 a5892559ef78209ca30cca8042fe965b43952373c48bcdd5bd6f0c956e693fa042a89d4c2f3d8ac4d3f6b517f7253fec92164b734e196147f87aabd3639e3114
+EBUILD xdis-3.3.1.ebuild 1140 BLAKE2B e6f652907d46a3ccab1062ca065b78aea6ffc6f28f6a78db7844bc90174559968ba785f5c20926357d6c69f2dcc3a1cd8497d293bd4584bbd10831e69937de56 SHA512 a9089626414f813640a785ac9b0ca630a45f7b91c1f4218fe681accc458d78f8ad5f61a8cd301bef69ead7f5354231e9de992e62a31f2cba4c425b771535f491
+EBUILD xdis-3.6.0.ebuild 1204 BLAKE2B f73234351a37977e01c372bb9de7ad0d1a0f35e15ddaf96748cfe8c66ab96e5268425fffabed5ef94145d10f998266f201aca0c6b61c2adb17a93b5508d4a0ec SHA512 335b048b5c30e6347c6021b83257acd77317205f2b329fb0cfeec3d970cbb797dc510b0f21b73c59229e10a788d6a7d589de409e53a9980a73480c23d7d68f89
 MISC metadata.xml 797 BLAKE2B b9b241f31c0a58195f0697c593da5e0cd68bbc753359fa2dca7b9d4171a9e5a3d6ac0dc6fab00ac585f282512d7c1b441b76f60b21a04dc7fad49a4f9490b405 SHA512 79ab1e93e4dd6c417a86f33dab9839a9f7bffbe94c1f1bb463f60b24daf7463f122e3f255a640cc73834bd33aa003176fe839e0498069033601c0b7e5d1c1cdd
diff --git a/dev-python/xdis/xdis-3.3.1.ebuild b/dev-python/xdis/xdis-3.3.1.ebuild
index 37b1b7b57c76..580eeb1baf96 100644
--- a/dev-python/xdis/xdis-3.3.1.ebuild
+++ b/dev-python/xdis/xdis-3.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/xdis/xdis-3.6.0.ebuild b/dev-python/xdis/xdis-3.6.0.ebuild
index bc4f16dc68c9..52d5f330a6c5 100644
--- a/dev-python/xdis/xdis-3.6.0.ebuild
+++ b/dev-python/xdis/xdis-3.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 42fdfb95a768..ae4cc6c4bb7f 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,6 +1,6 @@
 AUX xlrd-0.9.3-column.patch 2424 BLAKE2B 91f0870dd89b2a81519d35ac0e0615c04d969f2f2d586fd9077e273fc61ff5341679304ac931585193cc426c5f8c7535b99a168d6d3cfd6c8368e3e638d1970c SHA512 1d28f32101499dc9e22912aa92a0450e638c9d708bf42a93f10f7f07a7535532b61eb1028fc335a1c84e92608cbaefa6c1e042f70a005cdb0dc73392315d52f8
 DIST xlrd-0.9.4.tar.gz 322945 BLAKE2B cdeac4ab7c68e14d564fdd6f1da35e09a6c3a070af1111bb33e7533bdc534e05ddcb59384a72cdcbad452b26e35529431f50c2511e68422aa53f7133cfcf6141 SHA512 61d21a6b0bf5a72f75b98f6a62245fd2d0d8b091b56f31cd39e83ff0d68edba5370f81b50020f6ac52d08b0b49c0920bf44661d8501ecbde5baee7d991037a6d
 DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
-EBUILD xlrd-0.9.4.ebuild 843 BLAKE2B 07495c64f0ce5af4f96a35f3ee20cce6eee7985b49938f2da2c981b2f960cf5fc96435cb7f3d203d9e1d53a06914cfbd099534ced72cfe1118694c96de21a805 SHA512 37c2cf3d2cad32b352af169902a4ab2027a3041e97dac7895400bfe75e7d01b87020510ca47bcd08a0400ac3e5cd9b926ecdacf00ac0c0fb0c7c1cde93a12d15
-EBUILD xlrd-1.2.0.ebuild 777 BLAKE2B 3ed32bf3663acb8a0037419cee35478591a6bfe53bbcc492db80c52be0ac84a1bb528d6d0504b9e7a3af176fd949864d430029f9ef666c685165fe75ab7c5f83 SHA512 66593d1be7e756fb30e99ebb0e373c86cb22e8b9faee70f08d9dc06e8ff118b49e15f54a1026ccd903def6ffbe6401d6030b79d6a901f98693045ebf54417eea
+EBUILD xlrd-0.9.4.ebuild 834 BLAKE2B bc451fc011a23779ff987cc1c3902c3b6c6f72ede55e8f79b42d573744ab148af2965d482769192e06546d9e2ea6279c0e4207b57fe76e1254d99796b26eccf2 SHA512 51c90f2c8307924589532a4b8729f8977668b845ce3c0eaff5377d41a73f85f7a0021f1297c8c776cf8703343cb7276330d10f8cc585722f72f123e11e91754b
+EBUILD xlrd-1.2.0.ebuild 770 BLAKE2B 2a3091672137ad77d0a01c5f1cdbfa64dc6646287c10b31c209f1f23345ac01c12e57f743a9b2fff27e235074f3c8a02f918f321803525c0d9f180c7911831d8 SHA512 2b024941a9f90f7eae8309086cc88aa8548676c91f89d7c2fdd761ddba2c92ffce95a1f810b32f88bf8f8fbb86a79f4ffe81b5bc21440df57bff24bf3160bb14
 MISC metadata.xml 551 BLAKE2B 5c29003f7780590817cba46e664cc2475a7b00dff75dddcfb492928bfb8dfe1b3dbfe666beb9a159c3734f7c918e7115f95c79c530bd7b0abbf06a068f0a7411 SHA512 2b3c90ab71ffcca19fd58fb7b6ac173f149497e00a31a8e6c3ed14f512d34c990904f40e2828ddf9babb448094e026ed70c4afb3e76bbb9585c9e4b4b597149e
diff --git a/dev-python/xlrd/xlrd-0.9.4.ebuild b/dev-python/xlrd/xlrd-0.9.4.ebuild
index bc7a4868ed35..0bea912a045d 100644
--- a/dev-python/xlrd/xlrd-0.9.4.ebuild
+++ b/dev-python/xlrd/xlrd-0.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlrd/xlrd-1.2.0.ebuild b/dev-python/xlrd/xlrd-1.2.0.ebuild
index 60f8b54c6cf6..d019d67ec691 100644
--- a/dev-python/xlrd/xlrd-1.2.0.ebuild
+++ b/dev-python/xlrd/xlrd-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 3d7204b200d0..b073a8e8735e 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,6 +1,6 @@
 DIST XlsxWriter-0.7.8.tar.gz 233091 BLAKE2B fb5c3f50d56bf20633ceeade3be070028b11b689f2de4e816c188759793cd15e07f5915cb70a67859b459385ba03ec85d87b34840f462d266e2e2715ba9f6eec SHA512 2343155c765533bbc146e928dfc82924f089c7abee2f3607be2e5f9b1da9166090164f134256cbd36f319a97c9aa651fb346cc7502a3f1721f9687a9cddb9364
 DIST XlsxWriter-0.9.8.tar.gz 236187 BLAKE2B ff6f7392a72fe00107d2dfdc17a4d17f6505f9961e518115bf88412194ee8f32364709ee3da0756a7de038f1a699e32c000831b58aabe608564aa7171c20f702 SHA512 05c372c25142dc6726fa5475cdda433f5ecae1d0f92f87c50ca7bc26fb99f8ae369a1a8cb6ec5e909280c81f32c92ac23892fbd6326b8e1cf032abcf42c0d894
 DIST xlsxwriter-0.9.8-tests.zip 28345992 BLAKE2B 0cda3578f69ecb152d6f30da6f2ab9c6eae33f4f303f2c9b7fc1bcd661e07722031b8eb35e7e57ffb04c84f6121f3f304c40379f891a0f9c50667503391f8e6d SHA512 a30cf917642100d3ffb9616809e4860593ccfa271beed0baa757ccf6f0822af05daf602d67773ce1b5af020ead108bf7a844dafb426c020c9adaed19cc7aad29
-EBUILD xlsxwriter-0.7.8.ebuild 804 BLAKE2B 502fefe93c1d1fab6a357726d4a1934ec50cd1c1d99a3bf48d81d780400c7ceba4a5068f06ff6ed715abe3fc21e3660a9a57249a1c4f19c503609ece7776e6dd SHA512 3f3bb270da81cce327bd7c7577357d60843831e4a59116d6bf40bf9178b5251153e0660bb5c57998a36833ef59b79b54d9397222606ce379e0e7b7da3a2e7d97
-EBUILD xlsxwriter-0.9.8.ebuild 971 BLAKE2B 838d6e1f35e7febb3d9cae429c0745e417b33621e8d74ad3d095a0c96651b9b6fa4eed9cb2607ab9d6c0f97a0aa1049b0861aef59b40932a90d55689f12d0dd8 SHA512 5db3ad47fb2bf5354179b3ea77e5dda3bd1664261f50b8aa125bad6de61c645c12f8dc23598d0d5a948b9b47b7663c6a14d1afbacaf8f18edafcb37456c7a46a
+EBUILD xlsxwriter-0.7.8.ebuild 795 BLAKE2B 791305316b0ab9a9530818651ca45ee30cc645d593e6e7a6d48a703dc7722cc1efa04f9e7e591e72659ac88fc0e8d956c2eb49ea51fe3764acea5e1bb75807c0 SHA512 5f4e323cab685e890e7b01e793714101fd8e49db8eb63ff81c4095ee8a9bf30c95621d998a42a1d0245209c0d56bee12fcc16a08b0ef8a506b4bdd3c0c3355f0
+EBUILD xlsxwriter-0.9.8.ebuild 964 BLAKE2B 00580beb24e2b3b43c9727b4e2a8123e68deedcaad49447c0ceca4fd8de416e9aa9ac14e1b39458af164a4a24748a30ebaacbc99fb5d28bd0f8e2956a86226c2 SHA512 7d5ee57c752f36d864ae061e79d5d49fb0359fb9f5db8031a7d3e1fff348bca18258edab5eb5eff2cda9ade513ecebeefcfd3eb7c3bd52192d12cd09df2858af
 MISC metadata.xml 385 BLAKE2B 29615c2fcc24b4ee0ab796762a67d1e1a09b4208b18cc13a000b3e7380d5e56c74020436801a41e33a74b0122c3c2872e22a643c1a2fc724ebb6064170ab5c5e SHA512 62eca3ef002307f383a6c074c3dd956d9035488e1eeaaa4b0e20a6c4d7c328568a2178478e0a97d6b3bfef0c9673a1ae2b58ea39e4e5a2c111b0a34c44398545
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
index b72b3faa0021..004b24dc3bf0 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
index d62a705dd5cf..12c8bc9ea18e 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlutils/Manifest b/dev-python/xlutils/Manifest
index b6daf3d6f1f7..336a84dba095 100644
--- a/dev-python/xlutils/Manifest
+++ b/dev-python/xlutils/Manifest
@@ -1,6 +1,4 @@
 AUX xlutils-2.0.0-fix-tests.patch 651 BLAKE2B 9ea3c4c51fa818b29cf715813f2fcb3e48764b50df9499a7a233d9c2b8e57b467d21529713ab64359993b5925958e25db2e1ae3d5cfab6e4c24926f940836e33 SHA512 70e38d47a07232c025da62d2f7859f1a85b6cf5516a49b31e64066cd4feda066923d5f2b6ff4d7d0339e47bb0eba1b8d090eefae516c4bbeea8ae974d842ed2a
-DIST xlutils-1.7.1.tar.gz 62278 BLAKE2B 5d90074a660ad15405d6a6e75e2da9a8eb45a7e516c70f4e0a1d34eb8db0d8a9b865ad0241d7d39719f77b1bcc4b3bea5e5ce358ebabc81b46a2ed6d4176ee58 SHA512 196ec5cf99e7ad5a612c455e4e293461ac89e6e93c28790e34dcce544c8689a9ab122e37458d3b6ff24137c3646607fa8768ab3a4c2fa4a3e2e59e0ac05d675a
 DIST xlutils-2.0.0.tar.gz 61614 BLAKE2B 51fde8ef1a0a88ecccfb3cfb332fe8a31101d29865cfa6201001d272db34a5f210e988ccb99ba00344f80dd457a5c91866af12061af9342d556953700cf02916 SHA512 7b6c39912a2b23d718b1aaac2f21770f1e5b156fdc7416f11d4a7e6b52195ffffb982aecb52b5571599eb4928c7e09bbfb20fdf2554f0c49c286b243e2fb3ea9
-EBUILD xlutils-1.7.1.ebuild 894 BLAKE2B 2a9b8af8ea266caacbbe82d7c4506aa9490dce7c4dc424a54db79dbe18367d1b8013fda62561c30ebde52d2afb652df755775cf68473f03709fbd86131451172 SHA512 c5587345669d3e42d485ca36e1311c7b94dc06578e39a2369ed23d4b65ec347742ad49bb6f50930d16b636b6ed759d98b5e71692d9c0d23fb0f2db28665c7566
-EBUILD xlutils-2.0.0-r1.ebuild 1063 BLAKE2B 11cb5a841c5acf4666a192d58606a271d2ff5dee9303d886f8fd988bc3f8456fb8c347a7416bd1bfe106054577d85b4ed3a11bcdc938ec3410e4cbad464657ee SHA512 78698602e8351e01c9cddebba99142fec59d3c17a2aeddea967451dc8a916046e844ea6bdcf7513623295d320aa194d3e609dd146a6ce565d651eb7280e00348
+EBUILD xlutils-2.0.0-r1.ebuild 1053 BLAKE2B 58f8fc0f4248c5bb8ecacc49eab2f0278e127c2e99bcb0f93434154531984994155602775f6652144667b5e61ba8dbb250d0669898f5297262a7b642541a98ee SHA512 5675fad921d936235bd299e087da5106bcdb431d3d69283882dc712ae0f62789fb434ceb0c9d02e26ccfcaf8b7b819b92cb38adfcb8e3542bd3501064217f1c0
 MISC metadata.xml 320 BLAKE2B 73ea3f716e530a41155508ff0562a9264659d59bf40a8bdbd4a75e3d073a83e96a6c3a520be9ce1f300c32f3e5262f231464503e36f7988ddd9972447a308459 SHA512 c83e7b88d50078775118f9c2b9a7edeef32272247ae55c30a99d1c9927b4d3fdfe12393500f93fb3a2a7ec37d0d249355d39887a4f26e75f9c24d585ae3204c4
diff --git a/dev-python/xlutils/xlutils-1.7.1.ebuild b/dev-python/xlutils/xlutils-1.7.1.ebuild
deleted file mode 100644
index 9bbfcb5a0ba0..000000000000
--- a/dev-python/xlutils/xlutils-1.7.1.ebuild
+++ /dev/null
@@ -1,34 +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="provides a collection of utilities for working with Excel files"
-HOMEPAGE="https://pypi.org/project/xlutils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=dev-python/xlwt-0.7.3[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-0.7.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/errorhandler[${PYTHON_USEDEP}]
-		dev-python/manuel[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/testfixtures-1.6.1[${PYTHON_USEDEP}] )"
-
-DOCS="README.txt docs/*.txt"
-
-python_test() {
-	py.test -v xlutils/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xlutils/xlutils-2.0.0-r1.ebuild b/dev-python/xlutils/xlutils-2.0.0-r1.ebuild
index daa9a99667b1..9d2dc3f3532b 100644
--- a/dev-python/xlutils/xlutils-2.0.0-r1.ebuild
+++ b/dev-python/xlutils/xlutils-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 79786d85b817..9f32f9ae0624 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -2,6 +2,6 @@ AUX docbuild.patch 568 BLAKE2B 372adc29b0f7c8f8cb840979f49c555b87ba1e5f7801d5c5f
 AUX xlwt-1.3.0-no-intersphinx.patch 447 BLAKE2B 7d861dfcecf1a811c129569703dfb29bace4c8dd7de1b8bad89a4d93b03d80b7b79df5409c69b8ab4b132b16595d1c608885225ef41488382f4811147ae23ccb SHA512 f5c1e731a0a88f012dfc1b62ae37edc71082f3b6e5726389cf4722d69ce69821d1fffa8e2fb7537854325942c1157f68c168d8dbd82936918a1f164cd80f5010
 DIST xlwt-1.2.0.tar.gz 153909 BLAKE2B 553315b6f6ba822122c18cfabaf5a30f25a6ccdc1c507bf7fbf293df42e380520ef647d3501b51443a90f77c59497b87c70f6a71d3b3ce53658d3a6cf2356f6a SHA512 e0be61f6a54ac39c91cf03a1a7535c464045539f6a040f000921815e3280bd341770d72f4353891a10dde7c1b51eab4ccb1ae1c10bbf779108346fba8484eef8
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.2.0.ebuild 1277 BLAKE2B eb0657e47b776455d9bde9632ca5f9ea1452c54bb608eff8723f0772d190045b5809df3257cb402453b847c7c4d44431f243581cfa8faa73f4b2f2da77bd05c3 SHA512 0e2bd11944beb0f263ea704f7fd85b73e69c6547d54faa106d77f091738b9f5f09458e86794aaa9da0518ff0bb866f848dc869397ff042118ba3c32830a410b5
-EBUILD xlwt-1.3.0.ebuild 1301 BLAKE2B f0dec52c5ac8d20dbc6d766a0130d405345f4cdbc9b32bb604dc34d9ee88e5b5fc422ccece0f50d578f025ccd005d14381414ed46bc346baff089da2e405037b SHA512 2a1f0555342294c0270c8f6a3ace71bd941f5d388a9d6d2063d3067937da77887fcd4270dbac04c164d75e339f30ee6ab9ca09fae6de7cb74e301021a490d496
+EBUILD xlwt-1.2.0.ebuild 1270 BLAKE2B a07424fd5c1c5cf5d1710d098798d1797f5391bb3e952a32220dac61579480104a81670bef1f041071e284989fa43ed5ea0d7747bea13362cadc26d77974c30b SHA512 da634110dde9f522e8ca2e72928c8163c1ac0387e4f2b0f512c96ae9288d5d2604855f519b0620d64a9c813ed6c1c3ca7ba1993a6b257bcb87b05d9496da5cb9
+EBUILD xlwt-1.3.0.ebuild 1294 BLAKE2B e865f84d93ea19dd5f15fd85314b212128239742dc4cc4be89b58f33bc7595ecc7b9bd1acd37a96a9349143e8f78ef1e32aad1f677bcff28fd227498262e5194 SHA512 1259ac5788a76be4e2ca9b96083c07080ac6225bec6623b74985c6e78e4328d8fa448216cdcf1d87c58ecc9802e34aefd035bc347a2cbce9ac66ed07b93c48a5
 MISC metadata.xml 659 BLAKE2B e2b6dbf5e4f15d1c105a7d4e6d6e9014feaa235b203818d0d6bad64e9156bbad060e02d3e7e54bebc44e5e6a85d6c10e516e0793dcc0dbd48738ffa4e63ef069 SHA512 eb8056746b86c2e29196ab25a01cdb899716b4a76f6dab5134e863d43882df8b68ad1374a6c81733560612c187beeeda5106bfbb3aef3881c3b7a476db91921c
diff --git a/dev-python/xlwt/xlwt-1.2.0.ebuild b/dev-python/xlwt/xlwt-1.2.0.ebuild
index 13c0fa724781..c3abfc46f697 100644
--- a/dev-python/xlwt/xlwt-1.2.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlwt/xlwt-1.3.0.ebuild b/dev-python/xlwt/xlwt-1.3.0.ebuild
index 52f830bcf7de..6fb1875b7aca 100644
--- a/dev-python/xlwt/xlwt-1.3.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 96b06432f167..e0e57be35ff9 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,3 +1,3 @@
 DIST xmlschema-1.0.16.tar.gz 278082 BLAKE2B 284f71536f86475fbfccefe1130fbea9319282e34ec11a1ca13c6ddd0f8aad2747d66c8cc6443885982c6f98fa074778f2757d012d1380ae46136dc3e5df4a69 SHA512 5dd79e608036995d70b4da627f89c86cd8e7a66f80c2cb87d701395229daa920759769bf7efad34c33dd28ca14971eb155a654f8fec12fb6ace8cb5ecf979650
-EBUILD xmlschema-1.0.16.ebuild 785 BLAKE2B 205974d58f8a9ed656821bc199c9eb0e56b9b7740542036936fdff1044813dc9e9b8c875717c74637383afa70e6cb19b517781116d5437207370adbb71ec1f66 SHA512 6a80f08d9100dfd16630ebdcc07f578ea8d733744072720aa8236260e67ad6522fb345ee498187c64b4db53d6fb9fc9d687147408a1b26dd6ce3eb2acd22a14b
+EBUILD xmlschema-1.0.16.ebuild 788 BLAKE2B 4330f713ffebe425f9cda5b88ababbb4a143594b0f5c51fde13c244beff14be64ce59d2f145bc3e6447668107f7582cc7a5a8d596d7024fff928db862f1a18be SHA512 9346160fbc672edbd03be189be27049345bc95840bbc20ba643549a0467fe60b90e21269910d6c32858a886fcd425e6d1a29a41a89a16e5c4e2c1d9a0d89c7c7
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/xmlschema/xmlschema-1.0.16.ebuild b/dev-python/xmlschema/xmlschema-1.0.16.ebuild
index 26c6d0fdbab8..f8089f3c2ea6 100644
--- a/dev-python/xmlschema/xmlschema-1.0.16.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.0.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="An XML Schema validator and decoder"
diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
index 23811ec4e0c2..205fd74a73ec 100644
--- a/dev-python/xmltodict/Manifest
+++ b/dev-python/xmltodict/Manifest
@@ -1,6 +1,6 @@
 DIST xmltodict-0.11.0.tar.gz 26589 BLAKE2B 29498ac9c2f80828aa24d6cc4866aa6846fe10eb411a3e3617d85989c88628cc7c87ab80adb9ded492545fa2b4796a14b540479da75bfe464d1dfd811bbe1dc9 SHA512 d42ef146a40f386a5389958f890605c560ce9db2da4447099b8725edc1998339b77ea732576fc7e77fbe5a755a2dc3239dfae4a82fc6593c5f977145ab445295
 DIST xmltodict-0.12.0.tar.gz 18481 BLAKE2B f7b7b71a6eaacc833a54369be38aa988b5c27845b19001c1d13e955df1f3a26c04dd2a1b45f0c0e704c4df6f4d380abdda7189944cc45b001eeef55405c43299 SHA512 1ec3de3ebd05adbe032ca569a71048e72097c0f5fc864b63f168d661f72d13d0981e6e62bb9ca2ffe925a3b2f7c2fb90a44177427d4bdf68137842342a9cd2c8
-EBUILD xmltodict-0.11.0.ebuild 658 BLAKE2B bc1ddef2650175f07ac5d98d33b0b96f0043fa7b469a09a71de54ea36436d21e6305403d858ccc9a0a08fc49be108b82503712ca6d2b530d831e619a01b723e8 SHA512 d42fe42ac8bae6a84e0b99713065de470758e422befb904f44eae20957ee68698527c71501bf2e6d9e05157c87779b62bb1fb5d799e58b55de85206dd8abf95f
-EBUILD xmltodict-0.12.0-r1.ebuild 540 BLAKE2B eca8370aaedab2189c375fbc24b6154dc98d46eb54cbf75e53e18c84a1117457629b56c9aec0b814a49279607c509e8284630a10e13c890f5d4caf71d11f6a86 SHA512 0937d212946bda7af589badb957059eda7f21ff331153f7208985aac63d49487995bcbce9f5b995758192d4a23d6431d06c8ec0d07d90c05230426bda0957d73
-EBUILD xmltodict-0.12.0.ebuild 663 BLAKE2B 4ddb20ccbd438c79c6a5ebdf874c03985281751ed9e4fdc7b6046e7c659a759dfb21021547bd6b9e851b62e14e6d6b52749a398f1a4f0fab6af45ca956a3519c SHA512 0e1aaffe3b4cdfcefc3007b15fcb696819c2e8c1b158270c64f8397a907e6bbf0888c6ef41b42a2bd870b57d0a954a2d0e2b412112eea98c1b940fe9fdc4c2b2
+EBUILD xmltodict-0.11.0.ebuild 649 BLAKE2B 542b6ae1e867abc8472e63b7a8590e005cb5e9a81b63679ecb97f2b481b814f5beee4b34fe4dc4ef01f61321485566324bcb90b8d262929d179635bd65da8fbd SHA512 25baa1cafc2c46b9827b8fda10450d9120e3ca61d5775a8aaef04b037b4f454fdb61bd5f3816f00c0dbafd86d3446850583d7e04e6c69d5942a651beaa9e4066
+EBUILD xmltodict-0.12.0-r1.ebuild 535 BLAKE2B 3a70cbaf035d005b60abab5ae831670d873f907afe5b32eecacca6a02348c38d447990c8847c140f754cb17502854d129b3fe1ff7ea45cbc38dac25875b7e3ef SHA512 027ac5945a1b74e06ccdc6f949a6e256c41c00950e63daa7d91f4b1618c3b66ef9acfb19f02ea8e07d92f58ba0850a5cc57895167e671b251ff9d9adf24a3f7a
+EBUILD xmltodict-0.12.0.ebuild 654 BLAKE2B bb75a1f7bc35a7200922f307950aa67a0fbcc0ba83c7211d181df88966b0d5974634a73d3927f71d1833d3a5df014f5cf7912a615fda8963fc8343bd5e14bcf7 SHA512 b00381a24880ca3125a33eebbec7cbe64053768f22d215c52204aa473d31e99a6a928dd8ad1946aaafd7bb49a6486b6c9d6114e8860bdfe29b4391e8287a38ae
 MISC metadata.xml 385 BLAKE2B 6df98f89bbc4f9ce1e05dc86970c81d31f70559d4b87fd4d3908ceb1183906c1195544b2e99e96931ee26985f5e02b7fb4b036d8e6cd03c389cbe5764b964111 SHA512 ad748afd533651881c58295101e82097a0c4f4c15b205f4836315832ea3c08ee7cbbe18f652d09048c08532a3fe03b5fdd1f9da48d3378fac8624984c74df794
diff --git a/dev-python/xmltodict/xmltodict-0.11.0.ebuild b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
index 4270a7ed57b6..b73a4dfc4efd 100644
--- a/dev-python/xmltodict/xmltodict-0.11.0.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Makes working with XML feel like you are working with JSON"
diff --git a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
index 806632b8ff98..c0151ef824c5 100644
--- a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3}  )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3  )
 
 inherit distutils-r1
 
diff --git a/dev-python/xmltodict/xmltodict-0.12.0.ebuild b/dev-python/xmltodict/xmltodict-0.12.0.ebuild
index d6ee8799fb4c..300aef62099f 100644
--- a/dev-python/xmltodict/xmltodict-0.12.0.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Makes working with XML feel like you are working with JSON"
diff --git a/dev-python/xstatic-bootstrap-scss/Manifest b/dev-python/xstatic-bootstrap-scss/Manifest
index 21555aaa942a..d2bcaaef95d0 100644
--- a/dev-python/xstatic-bootstrap-scss/Manifest
+++ b/dev-python/xstatic-bootstrap-scss/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-bootstrap-scss-3.3.7.1.tar.gz 205503 BLAKE2B 29a2047ffd37ef2cf061d84396f421656f1d29c23a5995aca5eda6f30aa67552063d01a81e5f5c0223d0c9bb2e761774b12a0e567e12b9b854a6fba330e931d9 SHA512 523f0f5c4b3d95f2751731964a046c2ec5d7b2f52fd74947f240f51539615989a26bae19b2f689b7993bd0148cddcfbd9f44c6775ad240a6d6bc9421edd74b07
-EBUILD xstatic-bootstrap-scss-3.3.7.1.ebuild 728 BLAKE2B 8ddc0fbaeded427ba6ba2832d6d1544684c8fa3fdc83daf53673ac404493ed1f3331fae33cb87328a855ac5a95d8c57a952a96e1bf0c2b743353f4f6e8cb0387 SHA512 6dc81425f040292277291d7e788115a01c2e340197f9bcf5a3b2b219c490e375593bf49f98a33b25f3c1e9283ac9a121363239c64af6730bd25c4d0781578cac
+EBUILD xstatic-bootstrap-scss-3.3.7.1.ebuild 724 BLAKE2B 4c0966729984786b6b8cb3ae6adef87e5ba7f54dbd03c49928fcb89a5ee69ed5b43ac78927cd1a60dc99c7cffb4d1e6bb553a4496f4502d777ef805ad904762c SHA512 bb00f472b436843c6434619895189235c1cbc4177a1e3c57195b69301305fb49f0f799b097290d75c4c3bb7f597e07f6ca8c722504cde271cebe0271b959a5df
 MISC metadata.xml 343 BLAKE2B dbc8357d35e47c91214bee8dcd23c5d88e093d88a0c797bda88c25f41a6d2388e5c5cc6d9d6bb100e79dd9631029b8b4c1277d4189a9db76591499fda6ca8b4a SHA512 08754400557065ef1ab62bec132de871320cebc9d704bc4458aefec2bbbdb576e1ecddec6936175bf1d5bb66e156f29c95dbb969f5402921ec423fd863158b49
diff --git a/dev-python/xstatic-bootstrap-scss/xstatic-bootstrap-scss-3.3.7.1.ebuild b/dev-python/xstatic-bootstrap-scss/xstatic-bootstrap-scss-3.3.7.1.ebuild
index a2271525ed81..fbadb9293d29 100644
--- a/dev-python/xstatic-bootstrap-scss/xstatic-bootstrap-scss-3.3.7.1.ebuild
+++ b/dev-python/xstatic-bootstrap-scss/xstatic-bootstrap-scss-3.3.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xstatic-datatables/Manifest b/dev-python/xstatic-datatables/Manifest
index f23297b1dd7a..2daef7cfb16d 100644
--- a/dev-python/xstatic-datatables/Manifest
+++ b/dev-python/xstatic-datatables/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-datatables-1.10.15.1.tar.gz 209907 BLAKE2B 3e50c41bd5ec94386beb03de4d1fcd28cfa0594158232c2765a4f33512e1e1c822ecf1664f102f1cdf0204b81ab58eab38f6abdbb8cc196a29c16487d43029ce SHA512 33bbb9821b2acea56f2e85aca3a41433354df82455d47989c322fa572c5bb880ff7a9cbe9d9b556268159a3e9a8140a5d7215a4ecb8704db3f6d1e44860b015c
-EBUILD xstatic-datatables-1.10.15.1.ebuild 716 BLAKE2B 450aeb34a5144b3405e967f5ecf01ba39cc8c4b78afd00882010301d60df3536916438d91da916f05a490cd36f664d05ecb52599db3db18aa983cde2fe9ef716 SHA512 2dc9f435ae4b4cf12002740810de1a0a5ec57cb0b9c970c1b81b9faf9e401678adfb9fcb989ed00a558c163ec9db716d4c2e06411014359174129904b20fb9ad
+EBUILD xstatic-datatables-1.10.15.1.ebuild 712 BLAKE2B 20398e2806c67c7af18a4f588677e76b4c9907675174bcb7511b0c35b2a9cbd74a81d081bd34102502c09661dc11893f02bcaa9579011133c2f4c8f9008d812d SHA512 6d0910d1402f55116e86012e3ad6605cbf6bfd2de8e49ff312dcfdb164d7acd1e9bd9e0f06e2fe2c7e616af875da76d47cd27f5832e1b45b694b9858e6f5ce2d
 MISC metadata.xml 339 BLAKE2B 6ca3b9bbad74fe5cafbc6dc701361f131c6140328fe031d8368277e5874a05426099e5b472a7fd45ff5614d031160fd0a626910a12cd71d3ee05630f57e107ce SHA512 ff3e268d4ff1d113b64ae85dd14791539017bd0b0c9924e10517d3faff1ac8df7f9ecea3deea122eb9a750f63beb077505d16d0a71a84a7b285a97ec3cfe66ff
diff --git a/dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild b/dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild
index 245797a9a3c9..00d8da465448 100644
--- a/dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild
+++ b/dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xstatic-jquery/Manifest b/dev-python/xstatic-jquery/Manifest
index 9dd58cb18eb9..937bbc82ad6a 100644
--- a/dev-python/xstatic-jquery/Manifest
+++ b/dev-python/xstatic-jquery/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-jquery-1.10.2.1.tar.gz 116458 BLAKE2B cc02edfbbab45bbf397923188f163df8c6567789d9c0704947804047f0067bbee9ddf0b1b96d477d25d79bc65bc4bf5891e2a88beeac1ae92279c0eecc842304 SHA512 1f77c82d0025ba0fe56934d76fb5dfc0929bd91b18e6141023246e5ed1358600cb10a9b69be806bdfac29df83e42572ab8c8aa8da40b688d02711aadff393270
-EBUILD xstatic-jquery-1.10.2.1.ebuild 704 BLAKE2B 9dbede96fc0235f3ba01a3516d074d6fba972027af0689ffd86de3f668f5fa0e9f572d391b303a93e6a6ad21266f56c25823c7e3373f5da778248a6760bc0717 SHA512 8366c2fb6b8783ba056e457f88a87aa067d207130cd9fa41da64fb940927ca944f94980337df9ed2dc2e5d6f74205ebdd9fe22ddc53f82286128b843dc47414c
+EBUILD xstatic-jquery-1.10.2.1.ebuild 700 BLAKE2B 74982196862a5bfd77254c86b14aee33f3cf7597519c6ac298f6d50263aaf793aa1ffc3057590b1da73b5ff728ac621f01154e1d450d17432edbcd080843c5c2 SHA512 85124618a856c96ceafd28d434c5e81bd579c7ca6500fb6f168fa1903814b113fcee9f7d23e6860b015d4a31c38b748a70062cdc84ddc51bde6642d0a6be0ad1
 MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic-jquery/xstatic-jquery-1.10.2.1.ebuild b/dev-python/xstatic-jquery/xstatic-jquery-1.10.2.1.ebuild
index 75b9718b71ef..93c4e97957e1 100644
--- a/dev-python/xstatic-jquery/xstatic-jquery-1.10.2.1.ebuild
+++ b/dev-python/xstatic-jquery/xstatic-jquery-1.10.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xstatic-patternfly-bootstrap-treeview/Manifest b/dev-python/xstatic-patternfly-bootstrap-treeview/Manifest
index 2b432665a028..414a07fe54d6 100644
--- a/dev-python/xstatic-patternfly-bootstrap-treeview/Manifest
+++ b/dev-python/xstatic-patternfly-bootstrap-treeview/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-patternfly-bootstrap-treeview-2.1.3.2.tar.gz 19720 BLAKE2B 930f6aded2b42bb49b7b7865d64ff21923f720d15b375b018621fc1647cc0588226308e7c362d436f22074782a0e55ce7851fffbd47db1ea9c17f197e39c7e15 SHA512 51c3c60a56390b2c9662bf54a72a485ab0fa17872cd4163785c20b72fe4cc70b7a019214c1474d720e13e91eff807f0497d50bfaf5f3ce4f52a1bd488090b041
-EBUILD xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild 773 BLAKE2B 5e61ed6e704efe0d0ce5000f7ff3598b8721672ec042a675efa69a3212fb34ef984d07618a911e175e000fa982f011435b412820171e07dedb825977219bee44 SHA512 6f6983795394f3fc9f35f0680e8d1305526756aba08ec1f9732913549ab1fadc5db508ad772c2090fa6fe89a8e49553c1ee0e778b925a67b59698d9a783d8104
+EBUILD xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild 769 BLAKE2B 5e0fba52bf74265adf59660897ba3371c9213d04c89c896134f8f79e8e405b12d6e3b5b7ed5b8e396b8e4b629ce868629d164e787a3bc52d02977d233313827b SHA512 3f5522ebd7dafa098bb0a7febce6c6998788706ef981b757090ce58aa56af7929480762c15a94e24bd4a32b96e8bddc57f3611985d83340cfb17317711d1a897
 MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic-patternfly-bootstrap-treeview/xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild b/dev-python/xstatic-patternfly-bootstrap-treeview/xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild
index b70c7512aa6e..1b3ab7f747c3 100644
--- a/dev-python/xstatic-patternfly-bootstrap-treeview/xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild
+++ b/dev-python/xstatic-patternfly-bootstrap-treeview/xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xstatic-patternfly/Manifest b/dev-python/xstatic-patternfly/Manifest
index 2f36724070e1..bb9d32967820 100644
--- a/dev-python/xstatic-patternfly/Manifest
+++ b/dev-python/xstatic-patternfly/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-patternfly-3.21.0.1.tar.gz 5674553 BLAKE2B 23d14689bfd43195b26f818a0a766aa7ee3f70145baf776790dc642b09a38285370065538ca38aa85ed13924feadff2c97beb1c88026fb98a5d38b502c86ff76 SHA512 14ffebfefe00107cae16d6f2a6cfa11bc7be5b4cfec54f6fe0c0adb0d22b4730870ddd382b202d3489032680d9d4a43aca8ded4b654c44b083ee36c18ca70168
-EBUILD xstatic-patternfly-3.21.0.1.ebuild 716 BLAKE2B 022e2bba0b8f1ed270c90de277968c2fa3e6d0efa7ad84a08658ecc7851114457b4a50846f5fe4f28068db2cd0cd0be6b48f764484b74fc3afc28ee71de9d960 SHA512 b98f4c08b920ca0f0fbf39bde68be603dc2f4ab7a50d8c8271e029df165e902f8e6270051ee32ab755c047250b73bf957ebc53cf3a5471688f598d4534c1b889
+EBUILD xstatic-patternfly-3.21.0.1.ebuild 712 BLAKE2B 8f4890befce83e70c5048c33ab6b296700d3d7e3898a148572d3f1ecac6ca8330225a5ad5ba737e6695cd6e1098d68b64dc0416d8b667212e0bb8747e9cc0942 SHA512 ab9132cb7ae492ac6120baa1c4c7b9524c02e22f2c43ce2b2bb96f1575427d71bc79ccde41241da319fb3588693819c96b2c234d37e41b98b58d165215c3f151
 MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic-patternfly/xstatic-patternfly-3.21.0.1.ebuild b/dev-python/xstatic-patternfly/xstatic-patternfly-3.21.0.1.ebuild
index adad943042de..01fce94f3186 100644
--- a/dev-python/xstatic-patternfly/xstatic-patternfly-3.21.0.1.ebuild
+++ b/dev-python/xstatic-patternfly/xstatic-patternfly-3.21.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xstatic/Manifest b/dev-python/xstatic/Manifest
index 3f8344846e47..555841391cb0 100644
--- a/dev-python/xstatic/Manifest
+++ b/dev-python/xstatic/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-1.0.1.tar.gz 2588 BLAKE2B 55e937e62cb845a9095d41b42b484d740557681f4b811522093c6486d97b9e5daa3d12af953bc24a37ed39df58d3adad1cb578ca434b8c0cf0ab4f4b23fff0ff SHA512 03b227a5971959c79c6b389d3bd1f6db724a439101599b8ae65b7d010712184308e30377125bbf24ce84994aa6e9add3d462fba9bee0008154d3753d3199040f
-EBUILD xstatic-1.0.1.ebuild 652 BLAKE2B dc184d0b6a76a50cbd452cdec3eabfad9c8e08bf235bf469ca7fa76c15eb303aded84dd3d6092421594bcac9bc7932796c552ff90af4e8f28903cadc203a66e7 SHA512 1b7c3cd5ba86245dabc54121243ff48827b050c6d8726ffd2b17c57a60cbe9747536913df60ad3d8609472de91669e678c29ec3ea756e86b7ecd2f1180fdbbab
+EBUILD xstatic-1.0.1.ebuild 648 BLAKE2B 41afd370835156df648a07070a7cbd921cad89f02a9ab5a1dd59eee6a35d15999e905fc1668e311547270baea051e5c69e95bcbe61856951da281d1912d29f1d SHA512 9554c0bccf10b5aa0b24ace5342f0d50071111f1584ac12968306385d40aa8fd9dda3c96fbc3e6fb468633a411273f60f78ad9c83a509b0936b21a75ea63c116
 MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic/xstatic-1.0.1.ebuild b/dev-python/xstatic/xstatic-1.0.1.ebuild
index 42d620704bfe..3a15e0978d4a 100644
--- a/dev-python/xstatic/xstatic-1.0.1.ebuild
+++ b/dev-python/xstatic/xstatic-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xvfbwrapper/Manifest b/dev-python/xvfbwrapper/Manifest
index 9888e45f821e..d1e257bc0258 100644
--- a/dev-python/xvfbwrapper/Manifest
+++ b/dev-python/xvfbwrapper/Manifest
@@ -1,5 +1,5 @@
 DIST xvfbwrapper-0.2.8.tar.gz 4660 BLAKE2B 464a9f3d41d3c96a72c0cfc56994c32ccb94ac19267f5a701bd0ee18a17010216fd7ee163d8a532e62fd2256dc296201d4150f4f0d03fd4f20eae703b6bcaac1 SHA512 1b29b7e6bb336a9972e51249bbc96805733e305476cc559f5501cd09a343671c10333b5592e4c4868016d4510b37d6c592165a4683b1543e62c2205b1eeb0980
 DIST xvfbwrapper-0.2.9.tar.gz 5575 BLAKE2B a973e6ca6dd85713e7b350397113d63c15fd284c07d3a0d5c0b8b8dceed65c3a17a3e8222b79ec88fb124175259d51fcd31d09a95183f1cbd091ba11d9bbec3b SHA512 800f3489b2e1bbc884d7651e344ed73783d6c00856f3ab7ccfa6b9058dd6d3bb98d38f11172ba89dff5773d6c5b773bc000786c1f6c6aae5a27179b37017851e
-EBUILD xvfbwrapper-0.2.8.ebuild 745 BLAKE2B 543e1099e1781c8d169fbafb03d78ec963341b94dd823ee80e17a622b3d8ffbe7284513573ddf04fc138cc15cee0cdf2be7db4b545c0d76ded7aaefdee25fe3a SHA512 c621bbe7b5f122949f9c37f212bbdb4b6ff20930c53c6fb26b56192bbed71ec672a1df714c56baa4503328fef791011cc897c61c1834ff5dc3580d31c4dc81ef
-EBUILD xvfbwrapper-0.2.9.ebuild 720 BLAKE2B 534f8c6b3b3bc615f993480b109848cde9d895e8e6c8a9eb1e3c83ffc227a6bf7cb5b3b3b3adab3d70e5edc69c209217ecc7d4459e6f5a8e670a84a788a72cc2 SHA512 6c98c4cd57b083ef80e812c76b55584ba88b416297a92739c8a1cb406e8843419e372844c86537384b4156ea737d1382787f1c654d9966f83abc6950f37eece2
+EBUILD xvfbwrapper-0.2.8.ebuild 736 BLAKE2B 72ba03fabcf6f899c286bb794419e8266c29e1739e8f0c52413faf28725539368841ece77570e2aa987f255cf42fcb8ff188cb80ddce9a98f0eed059213c88b8 SHA512 0e9c13162d30e3028745cd75cd8397af0c152ce25b8c9072eb2511b7d880c1bb04b390d6d7ef87defe1ed78c5ae8f21d21fbf2f5e0b645a1226e41696f01a6f4
+EBUILD xvfbwrapper-0.2.9.ebuild 711 BLAKE2B b1f2cd44ef258a2441b991a3573de235d941831b768912c3a1603595939a5328d318642c703735648d80a05534574c78ab2f6c4735e38ab35dc1c86356ca4362 SHA512 48433e07a4381a8763d2125788f3c82e931b858049cba64e3a74f078c8af2f731b875b6d6575465672c7c1b2f66524df7b2b686d1e5c88b8a7650cdb35af0a45
 MISC metadata.xml 387 BLAKE2B 1371ad91acdddb84e00b9d88497327d9f969686caeb599467b702da40bc0bb59f324d143cbc285e2739c2afb49bf7984eca78ad9e02a89b8c5697ed21d33b3fb SHA512 d9e8ace17387367e585434a5b178a7a1715973828d6cf762ad82f2c4020413239e87b26dbcb9a8db1122ac57e2b09fe01f0f7fec1b48723cde989c0205b84885
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
index 1c0f153e9c63..226d1d3dee61 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
index 853148cacf6d..9c4b8f613007 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index a190a2bef102..b6b5cdedd63a 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,5 +1,5 @@
 DIST yapf-0.24.0.tar.gz 145607 BLAKE2B 2f85130a28d7daea5f656bc3d46ef34291dfa3ac739170b8f7e120acbaa62c5f255c6c69d3b1775ceb13a63c09c239d207f227c41234bc676e131d0b4b958356 SHA512 daa61faaa2877af8bc8579b1f6a8e9cf177d1caf27e0430cc508b86b42d907186a0fe14913530368097b888f12c19fc601fbcc1c4e605341ca328e8bf40ea399
 DIST yapf-0.28.0.tar.gz 157976 BLAKE2B 11dbbecd4a9cd77e6ff3f1f279cc4302b13445e3f0522f64a7e6b71155703f4c074a5bbf08cedc903533aeaee7338c63a98fc04870b8470a30377686dc66d2b4 SHA512 be9ed5278d085797aba4a582a37295716c76fd10a4cea4bb5090794dd53eba6d1340d8ba7508e33a146f189a863578c95b0a651bbfd90b0390076028e03ad9bf
-EBUILD yapf-0.24.0.ebuild 535 BLAKE2B a54fa44cae446082a11057382c4def04678f82481b17c51c9b9b3fed39c6735f091464f4db57fb3cd2422e9a39b4f6b811b6179d3feec46faf3813dbda983ab1 SHA512 37740cd1449e82f8853dc265b0ef1d056d8636f2cecd33aedecf997ac68df8fa08bf5d8b9f7bc5ffc26983827d3ee4a5aa93ca62658ca8d369cd42152a41e83b
-EBUILD yapf-0.28.0.ebuild 540 BLAKE2B 16dcea5f8f9b91157b3976831f01b25ab5122bf23160c2bc954ca1f913b6308c470439c9f1770edf7310541e61f8a505d2a934dc8720ccf4f18334dabae87a6d SHA512 33c9dafffdaacbae72e28c1ec6b8386d457eb6898ad83a6105e041ced3bd9245a58bfcd3bd0b8bfc8cb93cc1b3ec6bc639df4665377c52192cac0038a03d3eda
+EBUILD yapf-0.24.0.ebuild 528 BLAKE2B ccefde6fb323f8acdda6f4114ef8767796cac43c1adc22f03a8bc57552bf8693e0c672cdb11d864ab433331365cda505877520099b13aedb96f9e1e198ee8df8 SHA512 f206142ff46ae32092fdf0eb535d3b30e7b17c7c6582338076448470319119db246a4d206285d6dc0a88784e98d64b14d857c945e9977cca8da4719b96860b56
+EBUILD yapf-0.28.0.ebuild 528 BLAKE2B ccefde6fb323f8acdda6f4114ef8767796cac43c1adc22f03a8bc57552bf8693e0c672cdb11d864ab433331365cda505877520099b13aedb96f9e1e198ee8df8 SHA512 f206142ff46ae32092fdf0eb535d3b30e7b17c7c6582338076448470319119db246a4d206285d6dc0a88784e98d64b14d857c945e9977cca8da4719b96860b56
 MISC metadata.xml 666 BLAKE2B ef31442abd5b7c626a3e4068bb167e9ea1633364491f6466cc29c2ea64f6ef8e3b79c00471f568dc4e08b331788d7e64d8cd55b56f84b6a0f034878683deedea SHA512 47b4196f06d51df5383bd3b36bd3defb0ccd01f49339f4a5f1abd083e477660e0520e41d5632ec777f0bc3fab0d209eee8c28e0e619d81ea95d037de5911cfc6
diff --git a/dev-python/yapf/yapf-0.24.0.ebuild b/dev-python/yapf/yapf-0.24.0.ebuild
index 21bdf0621cf0..11aa475413dc 100644
--- a/dev-python/yapf/yapf-0.24.0.ebuild
+++ b/dev-python/yapf/yapf-0.24.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A formatter for Python files"
diff --git a/dev-python/yapf/yapf-0.28.0.ebuild b/dev-python/yapf/yapf-0.28.0.ebuild
index b4316410d2b9..11aa475413dc 100644
--- a/dev-python/yapf/yapf-0.28.0.ebuild
+++ b/dev-python/yapf/yapf-0.28.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A formatter for Python files"
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index 77cf9cc25f41..2b6d79b97fb4 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,5 +1,5 @@
 DIST yappi-0.98.tar.gz 37074 BLAKE2B 3a2c60f7c5987681f242230fc4fa0b87f924c0d1dbaedd3c240d30e6c440e2604e7add789cfd37052301a1f0ab99c81e2de30249fd6c83d5ba00624e131d266a SHA512 699e1845aac8e3c701c495913862597240b264c396b0b6ad0e9d6d533138caaeb883baeb036dc7b57bddf02ba411475401b2db77527d2ee63409d73b80f32098
 DIST yappi-1.0.tar.gz 38939 BLAKE2B b07b38bc07ffb6ba7aea3728ba6977680ca7f2dcc499778110aa31e733c512e5704cd580d01faf3344849df6772f110472a01328447228e9c45180beefc36f3e SHA512 d743c471ee3797b9f3b24c831fcb4ddf2cec7c13c56e567c0618eeada9a534ca0b114929da623a2c67142c61f3c38b024b25ba5e32883113148f4377f7574905
-EBUILD yappi-0.98.ebuild 548 BLAKE2B ce8bb6fe0db8462010127c5c18bd66b188bc7b69359aae26732d959fa84a09a1c01f0a75a66a3ce84e68f442eb3a8dd7a7bc9ba21d3dc8981460ca088c3ef382 SHA512 a9bbb8a0e104a288b66a4a6847b4cd2e602f2c0787c108c100b5cf6639720313f2aceafa36f144c69074e07082b3eefd29db2c2e8c90328cafd0d8cc4a0420a7
-EBUILD yappi-1.0.ebuild 555 BLAKE2B d2a7c4d41b94d1ae100517b68973b2e216cd8553083105eb5a5086a0ae6cab88d75283d6e4ca5ea86e9560dfd6c737979cca2537b711beb75a4253f870c48c13 SHA512 20e950fcddee7cb396c9e9d3dc1ff8d5248f19a576605c64001f1cd6a3d4ed97716dabf217702fc7beaf0d3594407a79d664001207f30233ddd71514289e77f5
+EBUILD yappi-0.98.ebuild 544 BLAKE2B 833ab7362d947d2941fec12652cdc5781437f92039bea3412ca51fc749574500922c9769653b252c17fa4e8ff9d7e9727f35df2c84cd9a7274194b1d0aec1b24 SHA512 0cb031ce66a6c04f4299807ceefbfd964f7254c0704a7e0b46d9bcb6318a574ab6a802121a32e6bbaa3b24ec1c4bb5383a2d76141d30801ff99b866602f8eafc
+EBUILD yappi-1.0.ebuild 553 BLAKE2B e053053ac813cca1e6f0c78ed71e52d2e29c3615415bcfa5603c050ab1fe19103a96dcc463d86dad4cc6df63e8b07e6b8f4324215b33db4703ed070040178442 SHA512 f2ec75410970993e066d03598e1fa273d8dcf65ca6a3db570b5854db98664cb8126f5b0e3972b52581bcabf3fac60671dae2706bbd69ba1a315d075f3d60eb8d
 MISC metadata.xml 491 BLAKE2B bd3b3283c39af67f7a1f55891d3168bf6bc054052007bec6303016d3f6b513cd20f94c83f427cd849b951102085b390e69dd4ac2d2d44a6b31bb5f1ff3f10af1 SHA512 d058a5d7d593e801967cbd8764ce0e55480580995a68cd3d35802932249fa015267052895d360fc13cda379333d1cf8222e02f486e68477afe1e2af1168731fc
diff --git a/dev-python/yappi/yappi-0.98.ebuild b/dev-python/yappi/yappi-0.98.ebuild
index e5279a984a08..272a40e1703e 100644
--- a/dev-python/yappi/yappi-0.98.ebuild
+++ b/dev-python/yappi/yappi-0.98.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_{5,6}})
+PYTHON_COMPAT=(python{2_7,3_6})
 inherit distutils-r1
 
 DESCRIPTION="Yet Another Python Profiler"
diff --git a/dev-python/yappi/yappi-1.0.ebuild b/dev-python/yappi/yappi-1.0.ebuild
index c8a9ad21d60a..9da154dabb7e 100644
--- a/dev-python/yappi/yappi-1.0.ebuild
+++ b/dev-python/yappi/yappi-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{5,6,7}})
+PYTHON_COMPAT=(python{2_7,3_{6,7}})
 inherit distutils-r1
 
 DESCRIPTION="Yet Another Python Profiler"
diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
index 3c9622bc809a..75874d7ec873 100644
--- a/dev-python/yapsy/Manifest
+++ b/dev-python/yapsy/Manifest
@@ -1,4 +1,4 @@
 AUX yapsy-1.11.223-python36-tests.patch 919 BLAKE2B 51e27515c9e4a129a11aca1e9f37859e0e74386c499fd093e304a27e72d104733a66e643de5303e6ac18df6ad16b2de840025d255f062aa360e3ff18f94dae66 SHA512 aa345024f6afde87f9e3a64da87778f1bd620cd8490d1c564cf74f3a5821eb034d94cf5b464bf567725972122ba78a981cb2d120b3e0f35541a01ecd4f97170a
 DIST Yapsy-1.11.223.tar.gz 80783 BLAKE2B 44f1224f66a35e3ff01d0fb0cf1e0c46fe7932d6fe2ddbaf1c7eed72b7324d8e9fba7be2d32cbec93f33a6d3779b17eb979af751778f672bbffc1119c912e30d SHA512 690d0ab78eafede5a75cf7b7bbcfce00b05c7b6f958980c3b67815bcaf848a8098b6e81afd1d95c5821fa4bb7affefab2cde208ff7c8ac7952615c8ddbafe305
-EBUILD yapsy-1.11.223-r2.ebuild 975 BLAKE2B d59f514ebc214bda21a606e164b721a9a0cd6b9f620be8c13043b837ec9de9b7dd827f03639d8b9ace240c3474d8ff40c07a32ada7adbc326fe5d7ded963ebf4 SHA512 bb4895681ddc6646055af2c38e61d296d47a0d4dc02609c6ca986a4e09917a629299df784ad6a2d9d052af907ed741225022db3ba8a0732fd182cc3886852732
+EBUILD yapsy-1.11.223-r2.ebuild 971 BLAKE2B 50c096a787ce476887f24bdad44a0ac116de4da1db614b45ee7fa220dc082fa8b7f05bc433e5e20b3f710d584fe54b3869690c0a00e2ebfab85be0f527b84a74 SHA512 cc3b0c960166e3e4a3d3f0279afae6c94b6e50004c4efa39c5e40bc190334ee324c8ccddba6a7e3eef23caa5387e4ef84cecbda2510d4b066002df5818191783
 MISC metadata.xml 423 BLAKE2B a30bb50714d2efa8d7bf299e53a3992ab24fd55ef2670fc7a15f25ed6fd864fd112940b0a202491307de2f74eb339292e32a475a7cbe89cf1dbd2ea4f6f47b8c SHA512 73e423d31a622b7b15bf672cdbada8378d069954acecdf6d729f05ca4297ef01016519adf362b322dced4694de829f079c80a17c836b5ee458b772a3c5fd36d8
diff --git a/dev-python/yapsy/yapsy-1.11.223-r2.ebuild b/dev-python/yapsy/yapsy-1.11.223-r2.ebuild
index 72329bb419b1..8e3879efcd33 100644
--- a/dev-python/yapsy/yapsy-1.11.223-r2.ebuild
+++ b/dev-python/yapsy/yapsy-1.11.223-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 MY_P="Yapsy-${PV}"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/yaql/Manifest b/dev-python/yaql/Manifest
index 796ea844a45e..a66a56793731 100644
--- a/dev-python/yaql/Manifest
+++ b/dev-python/yaql/Manifest
@@ -1,3 +1,3 @@
 DIST yaql-1.1.3.tar.gz 111546 BLAKE2B 2bb2567532cf22a200074baa2e85e0fe90e402dde66e2cbad5f750c95f4e76ee94a068d0be9f741fa932ba4f505f97a2bacf1ad367dea308ce0f69a4d94c9033 SHA512 e85712f65dc932126c75cc84403d14639f76098f4bd22ff2106a68afb6685794e1797154bbf1343e1f82a8b4a13e351d2d0dec1f235e31eecd96f6394116cd4b
-EBUILD yaql-1.1.3.ebuild 724 BLAKE2B 2611e7cc585d1aebe772786fb7e0c32299f3c6aa9e99328b565045af3bb6b2021183c80272c012efd48d26997252fc99b1f5f8b3b900c227082fef223b00193b SHA512 9bdfc99312efff377f358717f9110aa44bbdfd952fcdbedb01b5c6c3b1350c5822333ecd148e6ec8d200042f371d96f4715ad5e9a6745617aff624680eab6a81
+EBUILD yaql-1.1.3.ebuild 712 BLAKE2B 79b8989c1bf2ca51ba2d484a6fece66a57ee4865c6b13c0fd8beb7a886a2fd6cb5b8d4c8f4ed3dfb98ef55a42cd881852431265e47a84144ff35e9439d79a3d6 SHA512 94ffbbbb3b87ca98b132359f61c3148b23518f5a1c87ef3bb3f93460f77deae54addfad1a77795b9196654698f5fdf7520f1913016d8648d1208f014db77af5a
 MISC metadata.xml 893 BLAKE2B 47eb8ed10e4f376fd9f94ad4586d4fe6455d28e079cfe2e65172b4b7c232b9e6eb7f663835d8e7e7b225acb52917923163badf2be521d8e4e06d2f0302e512ec SHA512 48231ab1d3542bcdede43eb34ba2ceae332179545d726711d5f4730fbaeed48bf807ee461398c0f9f3c47d3236b08320c0393c19aefe383479d122ca8624fdd3
diff --git a/dev-python/yaql/yaql-1.1.3.ebuild b/dev-python/yaql/yaql-1.1.3.ebuild
index 24b5b7e57ad4..5e2d7e972e02 100644
--- a/dev-python/yaql/yaql-1.1.3.ebuild
+++ b/dev-python/yaql/yaql-1.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 4e582831d855..5af950b7772d 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,5 +1,5 @@
 DIST yarl-1.1.1.tar.gz 156284 BLAKE2B d070b0ea5cb06ef78f850a130d3292e66f592fd46ccf671cfe51f93c0e419a599f42f6a7255e3eb0f15ba96b1ac0cdcd0bce4deff81da6e5dcc25f7a8136bd78 SHA512 fe53e24401e91994d04fd7274200f92168bb08d78c460b49e800646a3e4611f6baefca4ede5b2b6727f2e6e4cd51296ca834305c0e2fb377ac3a928463f995cd
 DIST yarl-1.3.0.tar.gz 159748 BLAKE2B cd7844545f3ee749d1dce865e21065c2b8e0c1ebf4715a3f8ec01064e534fa5b8b872539aece8a7e3a7ae147942ff5e0dc1878d84449d8248fd8e33c4234e3f1 SHA512 58e539900e7754b0a3d41960ebe20d21fd7245ce71fccb31d6a1204298dd71cacd742b2cb2b4c49c3a9b28ce5c664c412334f29e23a3c608aad8018142ba3e14
-EBUILD yarl-1.1.1.ebuild 684 BLAKE2B 894d56ce3371a0c09089911ddc04da73a48c1304d5d8f48c4b7b76864a1ae8e02e3f61203f5f6f015bfbfb8aaba455fb078991ad09475a6c579d41a02bb70093 SHA512 5935e32d06d8e90c3ffd1ecf2297e77de6d8e4ea485939d2c5d3ea858c68471bf60896102643ddc5cd4c1782bd0e81836f44fab16f3b111d475f100786260ff2
-EBUILD yarl-1.3.0.ebuild 831 BLAKE2B 585e92faf3f82e4f48e640486d27fe8ba0cf68cea9bd1e4d95a537655ebcaa1ebf15fbc9d706d6399c28b427037b0136426aec4e4cc7114d00657d87f971b67c SHA512 4b15159d71dd0f97c1ebc16eacd49a5abc00d4728c4a540bad48df90a7b3ee74a439e5f5f620b8a66009b72f906c186c34173c4e99a96784e7732a1dab7f735a
+EBUILD yarl-1.1.1.ebuild 680 BLAKE2B 6d6b88fd0f63d036e74169e4fc767d3c0f4e64f260bf45483ffea89d0ef7e8c6be699f242575e5e7bc477f71c6b041613807a6a8b083ed1ea9cf1672c760c2e6 SHA512 662f52237301ccbba20055206489c7329eef367a94c9e3e415fd8bb6d52b11074a9f74e51b855095b2ca5d23d531e5518795434a3551a8342e5ec4f34a57f16d
+EBUILD yarl-1.3.0.ebuild 831 BLAKE2B 2ddf19659aed2b990c7c90e396b216651fb780826699a220bb8d445a76d96989c15a97545f29acb3e28cce90bd5c405788b0829c1cc113abc573578fdd6311be SHA512 2b831cc6410ba69f92dad1e01564729daf16a232774602495f4391b4373d8064d28801477c2988195d71bc302b7f89007f52e7a4b3eb9582dfbf4b0514e0e534
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.1.1.ebuild b/dev-python/yarl/yarl-1.1.1.ebuild
index 94d7db354fc8..8e54ae1a03f3 100644
--- a/dev-python/yarl/yarl-1.1.1.ebuild
+++ b/dev-python/yarl/yarl-1.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/yarl/yarl-1.3.0.ebuild b/dev-python/yarl/yarl-1.3.0.ebuild
index 821f1853688c..3bd01b198118 100644
--- a/dev-python/yarl/yarl-1.3.0.ebuild
+++ b/dev-python/yarl/yarl-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/yaswfp/Manifest b/dev-python/yaswfp/Manifest
index 16aec5623529..23a7eb4de959 100644
--- a/dev-python/yaswfp/Manifest
+++ b/dev-python/yaswfp/Manifest
@@ -1,3 +1,3 @@
 DIST yaswfp-0.9.3.tar.gz 29845 BLAKE2B 2c5961b79d8378b707a920a4c6a1d75cf8cb09cc6a689035c7118758de3fc1f6fddf6a23e91f4cddea5f7370e4b558b40dfd4a05b16d7fb5f881c5ca74beb4a5 SHA512 06fb5d38c92f418fff77d812507621236b3fc74cf75786031bbd81ac1e61767a29647c7f1d0ffbb25d2f6f1a8749e5a732896ad66956e16c886e24e85915f72b
-EBUILD yaswfp-0.9.3.ebuild 397 BLAKE2B a347c950d1b0caa504e9114c79894dae7a1b4c4dc0393b12cc4b3511a699fd112629bf5a4c6dd53f5ba71c5d933a696e8f3a032fcbe1f524300f7e104e18ace8 SHA512 5d9c040f9e769f49615c827753718f68badc9153547dab28dce26739c30ff9509b7036fd04d1532669138b02a0c013ae4e1c293290a2618c5a72cecd4778580a
+EBUILD yaswfp-0.9.3.ebuild 393 BLAKE2B b61c014020825a972975bafcdec8a4e37a16f22629741ca3d1d57325f3e91372b2b67dfd717f91b25e580eacb4abc292fd23c9cb2c98edae859f79bcdc1a3903 SHA512 dd0ad46986273faa853068ae648b4e32d30e2ac37f0b43242c04b716262f3bb2cae8248d1c8129297be19b4cd7e78acdf6b222f0b29bccf2900f364812a1f758
 MISC metadata.xml 422 BLAKE2B 0fed51023c52483d2d3eeba60346b73a868edd674560a780d3922f6fb1d71f0298dd9bb7dbcaed7db391f16256760bd6f62d6466d145a0f1e23d628bc097d023 SHA512 9d637b30376341d6d3f781b96d899021d78b29035ac41b4e33653ba50856dda8cb3764304899a9048f32ad459e651f31d1d83b18bbc0258038ccd09b8415bdcb
diff --git a/dev-python/yaswfp/yaswfp-0.9.3.ebuild b/dev-python/yaswfp/yaswfp-0.9.3.ebuild
index 002c267fd95f..6fc5f041843f 100644
--- a/dev-python/yaswfp/yaswfp-0.9.3.ebuild
+++ b/dev-python/yaswfp/yaswfp-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/yolk-portage/Manifest b/dev-python/yolk-portage/Manifest
deleted file mode 100644
index 0ffb61d182be..000000000000
--- a/dev-python/yolk-portage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yolk-portage-0.1.tar.gz 2497 BLAKE2B 09be975854def037f7ddc23d7e9e580ad32562335c292c5c8536a09332253ac990ccf7f5e9ad3d93eee259dd83cf43801b8b6fc7429b1e274a00961952194952 SHA512 e0d0ef4450276fbc5b1e6813cab63b5b2f9c2731e141d95ee23bfa3e5f78dd86c6bdda3dae4e056096be58916da406a7699c5cfea7a84f688e2721b6d8a36bb7
-EBUILD yolk-portage-0.1-r1.ebuild 469 BLAKE2B 706b8e9ee0dde36e259a6a967aa6e6742f2621d75e2e9454d9fd48718fcf8eb0db8535df5665f273e220a6e77713c4d98a83d7e119cd6117652e11e36fd2dd0e SHA512 7ddc115ebd5ea04111eeba7836ca6f583084fc5fb60b59cad9b72f6cda48cef53eb0892e6e30c767e7ef5c834201e51bf2f33e58e68ebd0cfe8c7f5d9aba1abf
-MISC metadata.xml 573 BLAKE2B c99a08194b0d21555fdb53270b9a00bd5fcc32094da4246f16b7dd452ce7c59775745a829632df5e5084844b887a222c63de2bb2128fbf45e5d2d6f492826dbf SHA512 b2344d54d3917701fb4300a8366fe3709058cb453913529546ef9de2405308f80dd32890d4ee9134de1d7142d972dc48acbd7abea111603ef35f27dab6408cde
diff --git a/dev-python/yolk-portage/metadata.xml b/dev-python/yolk-portage/metadata.xml
deleted file mode 100644
index f9ed8ee92ad5..000000000000
--- a/dev-python/yolk-portage/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 type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		yolk-portage is a plugin for dev-python/yolk
-		You can use yolk -l --portage to see which Python packages were
-		installed by portage or directly by setuptools, easy_install
-		or distutils (python &gt;=2.5)
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">yolk-portage</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild b/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
deleted file mode 100644
index 24b6f620f061..000000000000
--- a/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Gentoo Portage plugin for yolk"
-HOMEPAGE="https://pypi.org/project/yolk-portage/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=app-portage/portage-utils-0.1.23"
diff --git a/dev-python/yolk/Manifest b/dev-python/yolk/Manifest
deleted file mode 100644
index 425b8c5fc680..000000000000
--- a/dev-python/yolk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yolk-0.4.3.tar.gz 86100 BLAKE2B 811619b352a140c9892cac590c7e8a8c97d8f1aeb53a57e2721f80b3d1a2fe6ab7f3197ba8001313f2975e8c4e7937f87efaecd2f0f107fa251c2401bd6ce447 SHA512 ad707f4bff0cbcd3e77d9dec0734bb4d743dcada706ab1e296edafc51e1d511ab4565de64c9828275cbe0c82f35bd3f50316b74f140670f0af8276a49733f9ad
-EBUILD yolk-0.4.3-r1.ebuild 672 BLAKE2B 4ec707f62a4fcaee58d1c9acbffa8f3050bf2063aa6f875bdede3e83427cc636a86b0c97c2c51dfb38a10d3e32ed3b0a6bfcd2563f5570a8e9d302f1ae014427 SHA512 b4b408a1349eee18a78c4a823b16afeeb91a918cd44734495766e015898dbc13407bcf33f55ab33052921561760afd888bf2d309f58efb4a2035f5d1baec80f6
-MISC metadata.xml 565 BLAKE2B 2a57d0fb8d9318652672861f381fece1a78d57493a4cd4427b040b521c6fe5666d59cd97a69122279227176d1fdb5f22ff286ca4df1dbea58d5068c0f7ad9d7e SHA512 6c54d1bb7ae233221f01ae32b46c2e5addaa5bc34a7396a599ad30b6c32c3e83ae2fa43792f4989286bd13c854ba133aa80d9051e099b4a50cff21edf13db90a
diff --git a/dev-python/yolk/metadata.xml b/dev-python/yolk/metadata.xml
deleted file mode 100644
index c8d423e5cebc..000000000000
--- a/dev-python/yolk/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 type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		yolk-portage is a plugin for dev-python/yolk
-		You can use yolk -l --portage to see which Python packages were
-		installed by portage or directly by setuptools, easy_install
-		or distutils (python &gt;=2.5)
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">yolk</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/yolk/yolk-0.4.3-r1.ebuild b/dev-python/yolk/yolk-0.4.3-r1.ebuild
deleted file mode 100644
index f9ccf8becec6..000000000000
--- a/dev-python/yolk/yolk-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Tool and library for querying PyPI and locally installed Python packages"
-HOMEPAGE="https://pypi.org/project/yolk/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/yolk-portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples/plugins
-		dodoc -r examples/plugins/.
-	fi
-}
diff --git a/dev-python/zVMCloudConnector/Manifest b/dev-python/zVMCloudConnector/Manifest
index 615ec40f946c..2638f5eb04c8 100644
--- a/dev-python/zVMCloudConnector/Manifest
+++ b/dev-python/zVMCloudConnector/Manifest
@@ -1,5 +1,5 @@
 DIST zVMCloudConnector-1.2.2.tar.gz 183984 BLAKE2B cb7c16edb1ec332689ef8c4709e4cf82c64767c49b503279c9280b33b392715a2caaad6275f66a57cbf51f824d9e2f8f207308454955c2fcf89712945e160b28 SHA512 0f947d517efa705dc50494a1e4f2c201f980378eb4e51ef8d98a7af7be8a73ed0dccda836651d5b631fe0bcde58d208d107c54a1109ba892b37d73422db4ffee
 DIST zVMCloudConnector-1.4.1.tar.gz 238562 BLAKE2B 048caf53328cb96589ba4cdba747dce662cf931a9356e10325733800188e945a7f32cbfc5d6eed7900563b384952b8103b446d28c4c5c5ff7b51444605c7a8bc SHA512 206776bd04ef547df530438efe6209db7374c33727d13269f6f3632aa69c74713b358e628dc4fab8afc6657ac65a17bd2ec4c6f2984385de2187581fd734e65c
-EBUILD zVMCloudConnector-1.2.2.ebuild 794 BLAKE2B 0c15e1ad55f4f207152c0fcf57b5547e46c0c6034e9a37b38a7f16ec1e02ef0a8a0b8653f23b2293a8d3659d6fbeab204ee210d79bf3d03df97e50cbb9698727 SHA512 0b8bbf0ada7feffe0ab6e992d2d1779912d9b8983cd1d9b077c38fe89c6cc169d5735bd7baadbc05419b4ce2eea9ab2d0247dbd3238e102279c3c1913e55d8de
-EBUILD zVMCloudConnector-1.4.1.ebuild 804 BLAKE2B 1d99067b8e1f620ea2c3ed398964c40d75ce14714e2509b1cb12a99ea0c4fdb62606adfe19dcb98578a7fdb0a67dd32d48af346d9cfc7db3a7c2ee36480e645d SHA512 d7925a62dfc3d03a5d63d6eab6aadc476468ca40a21fd8f2b8ae754893f3ab16f92fcb10a583c8beb0c12ed9a190b550a95b9bf6469abbae75fa91ddfc31d6b9
+EBUILD zVMCloudConnector-1.2.2.ebuild 784 BLAKE2B a39e7eeb5911da36f7848e1be1a6ab4092697cfb846c8eb7c0134f42ae7de03bfe59d387078546eff70bd34c59cddb7a0803666752a3954b30883c811177fd7a SHA512 e8f279f8ad39e8bd066d9876a01597d0803a6d5569013306718983483a1a1b879720fde418a6108d2bf1bc45d41fbe807b231beb0127fb3d0759430ffd035124
+EBUILD zVMCloudConnector-1.4.1.ebuild 794 BLAKE2B dcfdd9840d7e5916e32d6b92c5a9a7acdd7dfb44ba9b7a7db51578817e10da2ad2adb65dbf9f07093b38004fc7f30dd2494bb7b83b621e61dd5951d448089619 SHA512 985bb6ba059cd16ef4d1c43a92dce759ded168f6c5f4eec876f88fba477b20de3871184a15749150c4133e1020283eb80e43d4b12791918e74e0912917c55926
 MISC metadata.xml 530 BLAKE2B 8376b5853991714f02d764dd8a29fc99eea8b524264114fb29118b55a30ac33aa643d1235ad2c8d4ed42836ea6e818e4a544defaa9eb598d13bb1405adb054bd SHA512 0a9490c18da93cc8d55373ba27ac71d4a81a77756bcbf9817a08a74c0903aa00f891cb758903007b0e17ee81256dd0eb4ab559d0e1974c8f94668552a11e5fbc
diff --git a/dev-python/zVMCloudConnector/zVMCloudConnector-1.2.2.ebuild b/dev-python/zVMCloudConnector/zVMCloudConnector-1.2.2.ebuild
index 9f8a523960f3..2d27d659b8c1 100644
--- a/dev-python/zVMCloudConnector/zVMCloudConnector-1.2.2.ebuild
+++ b/dev-python/zVMCloudConnector/zVMCloudConnector-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="a development sdk for managing z/VM"
diff --git a/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild b/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
index b98a792aa84c..ba727d9d53ac 100644
--- a/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
+++ b/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zake/Manifest b/dev-python/zake/Manifest
index 0df5d5c315ce..be1ac40dbbf9 100644
--- a/dev-python/zake/Manifest
+++ b/dev-python/zake/Manifest
@@ -1,3 +1,3 @@
 DIST zake-0.2.1.tar.gz 12972 BLAKE2B 35c3b6a3ba39084e059d75781de9f9de41dc20b150f12d437aabfdbe0ed3b66e4e0bf2427700f4cc8b78aec47cf70309ca1abbc3fd90d6b25ca7d6c576f34617 SHA512 a9f7ddeb202e16355680d8aeb39af920eeb4280352cf746c630d208567c948efe78036032d4a6ca7b1f719093eaeb1ffa071c66975bd8036a9015706d64a76d2
-EBUILD zake-0.2.1.ebuild 723 BLAKE2B fce5041ae60fcf4ab9a6c82e1b0959b5f114c5e0973f03ca6a685f3c69464d56c6b6f9aab8248b423e3305537b174db0d5abd2678699296d9a53dea16507c902 SHA512 25300da3fbe053357dfde8168a213cff140802ba1984dd934b98d6c0c930e33afac8eab222cf54524dfbfb3a42deb61ed5361578f8b46c0cc306d1dc0b2009db
+EBUILD zake-0.2.1.ebuild 707 BLAKE2B 28326d47a3b821f3b8d8041b1128bf9e58a5ef57cfa50bad46d542dd39f209c950dce3d7a958bd5a83d7399b405098912b302291417b90d7f8e253c3349cf317 SHA512 fe009b2c7675e94d737ecdad6fe6c4b6a76c5291a0fa09f2fe2f8c0a1b3762b15d4eb728655666ec5c32a82277088a0d74a39abcbc35f66aa28575c0f20644eb
 MISC metadata.xml 643 BLAKE2B e8d19d9fe1cf942a3580913c7b1d3284176bb8733e1e4101a1b02c9692b9451e895216cad363cae0af92f79bee19d26bb3e4976cb6c73717f8db198381d42dce SHA512 f37d7ebf54670af0b8af907385c88945a01467784163864fdc3e8a8a1f0a14bd342c4739bfc70307781df4b1c52f6a7c9ef74b3277fbe30127acb0afe34c0d0c
diff --git a/dev-python/zake/zake-0.2.1.ebuild b/dev-python/zake/zake-0.2.1.ebuild
index dda899e8e298..4ea3bf0a8d58 100644
--- a/dev-python/zake/zake-0.2.1.ebuild
+++ b/dev-python/zake/zake-0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zc-buildout/Manifest b/dev-python/zc-buildout/Manifest
index a314940314f7..eb1741316fe7 100644
--- a/dev-python/zc-buildout/Manifest
+++ b/dev-python/zc-buildout/Manifest
@@ -1,3 +1,3 @@
 DIST zc.buildout-2.5.3.tar.gz 305163 BLAKE2B 83ef87a8b61e109498117704e4055ac533bec9be9a5d2ceb0a573808f776ca6fe607ef542ef7e7486759612da9041162a44bba19692e8ffc65c4f3cb23f99760 SHA512 a4d4becac815531cd180795372ce5896d1fdab8606fff492502ef1f59d6d1ddd8427bb00ea96d36ec284a18b17b9273d8b94a405ebe410bae7e9a6e47a8dfad7
-EBUILD zc-buildout-2.5.3-r1.ebuild 1262 BLAKE2B 2794fa4077344501b99ba3f2bc1bbcc17433c1343258f8a63aefaa277547b4c0e8cf15952c05c14f699937f6ea4d6e2cbb1a8ec3e7fe2f5210ac214ff85d7340 SHA512 e697d32f8a549c7849d593337141cda2eb555afc189ec3da6ec60b70ad4db0579783d6a9ffacf34da5509ee1da07134f1ae6a41a70b1cdecb113b8034b37c60f
+EBUILD zc-buildout-2.5.3-r1.ebuild 1159 BLAKE2B d0ec202a6274e0eb276b63f17dfc0e3e68f7b0625dc9b421976e2520d1887f43dd1637a7363d503b66a3d02e2df83db418052cd6c1184180d3b90f4945e2ae0a SHA512 4ae569a72b6de567b491bc1c3010c29e7758f687610e36d4100599f4e60ab3289fd926ea25becc7c9f46dcd5dc0fdb678efb2962fcd8aeb35d5938ae6492fa54
 MISC metadata.xml 1414 BLAKE2B 0a15f64e7b7abac30ebf4264fb998845069e3288f9dd7886cf916c2dd40f85204e00bf3a2f6712b05b00b1139e195c9e08906527df8992fea32aac8ef43842c1 SHA512 a5940bca5da541fbd21a7b1d7c2dd3db0d4415d336974ec1c638ad003e117480a000e780435cf254ee66d61a9f7552a13eaad2209223c5f190c4a9c96603a4e7
diff --git a/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild b/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
index fdff18c3a853..b67c4242e886 100644
--- a/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
+++ b/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,8 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
+# Tests are broken
+RESTRICT="test"
 
 RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
@@ -34,11 +35,6 @@ python_prepare_all() {
 }
 
 python_test() {
-	if python_is_python3; then
-		ewarn "Tests are broken for ${EPYTHON}, skipping"
-		continue
-	fi
-
 	distutils_install_for_testing
 	"${PYTHON}" src/zc/buildout/tests.py || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index aa6b2faddfc7..5cbaf3cb7d31 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,5 +1,5 @@
 DIST zc.lockfile-1.4.tar.gz 11075 BLAKE2B 4fcc18b4d337c1b102916588aef7271fe189f30e442b5d2180b5a20d804f84649d4bf9dc6f601e6b7ee38c4a436c3848b83cbcb1a19974acdf072347b6822b83 SHA512 f145c34088770b50002d1caa88876f9fb11f3b9810fe68b8e1a38d27084d27ce058883228469abb05811f3f11a7b94acdaad8392eb1b6c34c98ddc885cdf77be
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
-EBUILD zc-lockfile-1.4.ebuild 1115 BLAKE2B c1564a43598a48bbae6104e2690a8776310b509f65c4bcda59e55303c3b604105e5fb6ba9d52cfea83704301a9d2eabfd16d53c3116bda6deee677a107f3dc47 SHA512 f18757dbf48f52e71020b45cfafdca82e385d6bb2329944f1800888d5e2c8326cb6eecd3b101662d5ac551eba0ac2f662080267c85322137f1ca200a198a331f
-EBUILD zc-lockfile-2.0.ebuild 1044 BLAKE2B eec4bc7e439daf85d27249bc5642a9ec468b3e0e8bc53fb014a3a2d306f67b766f707c2568f4fdfb866e074c6d9416170c3aaf0cacb3d99736f38f58fc20f62f SHA512 bded0c8e19c965fffdc517f0c25e7f57adbcd94ddb2045b765e64862a8436812132213f6d60e79fd51926280695313a65c38e4a7f97ce3efd1c7c29d37060d63
+EBUILD zc-lockfile-1.4.ebuild 1111 BLAKE2B 1729d2d05c835a3a9490755dba0e72dd09b3ccb4bfad2154d2c6bab13d50be5f2fd97e3a67f93164b40f9ecc7bdc1f0e20fb11f1213cb8dc1757c2b61c17fa57 SHA512 bef3b5165e8a9839b07ee0f4a33175dc2885a18090d0305d8d75b48b525411153bb19fcd4dfdfa0134e46b372eaac0b86d0709c4fa9f1ea83b15e4e3a5253562
+EBUILD zc-lockfile-2.0.ebuild 1042 BLAKE2B 0aedf5a624f33aa0892f941a74026b82c3fd88462033b42595aa586f0fc28dedbbf90bafa46b67c7f711a9f7a65a408f1ba3b6664e97a4c827724ff00f45a815 SHA512 78b862f992366812481c66ec095d75a1c0615026937f4be0c49f5e7422b5a9d265c7116e36c21eb22a9cf3c915fa6997670bac88a2d9e21bff7c30090ebdfcd9
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild b/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
index fc3baf934bd3..0cc2e04dc84b 100644
--- a/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
index 44e20f6b9d03..9b71a0beccb4 100644
--- a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index 0d41812180fd..4c6a587bb1dc 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -2,8 +2,8 @@ DIST zeep-2.4.0.tar.gz 146930 BLAKE2B 998e6f12b264b168f0af95847a88b1ac58a1645411
 DIST zeep-2.5.0.tar.gz 147413 BLAKE2B 30bedc5f95a5b911c402cdd5c13b117e478c0d63b37247a604a8b75eefb3404a5e4e7469ac1ae8188e9b3e841b706fd2bfe975bf8068e74ab07ed6aec9901c6a SHA512 f8eaf4eafd85d1464df28161a2cd39d9ad9079aa4fa39f3da11f352e52d3144b8d2c4b53a642c0ccaf70cac541cf7fca3a89b85b60bac7dd3330f4bb7a9bfc10
 DIST zeep-3.1.0.tar.gz 158081 BLAKE2B 6432c05d6bbcbade93c1f083a13a66d679b3060b1d44ff6c996b46e3f9602e6464a63c1ac2fd77ab07eff353e52613c327998d3dc2ae8c2d775c00e3f5e18f3c SHA512 392125b2bc6d796bfbe4869dfcfcaeefadbbd627cd92f6fb5006dc16d1692a3d20659b9c662852e47eb2c3f6671466dd836f67d0ad7cc34bf356c8822bfffcf4
 DIST zeep-3.4.0.tar.gz 163748 BLAKE2B 52709b22bf3dbe228630fcaca33dbfb1f9bb2fd6fab9a2f3ad1cfdf92f84aa2a5b1b71dbd5d41eca3bc12a9ac022d27191929533578441ff020e574fe2b95cd8 SHA512 31adea141ffaabb122a2127bcbba2742ed15d4cef91907c8db4aefd8550b2259502a4122825cbfa62559fd5babd3d0c6ce2bf82dd3b79cd9026d8ca008897349
-EBUILD zeep-2.4.0.ebuild 831 BLAKE2B fec81d8548a44432102e02d1aa304a1fbc67eea5141f113f058d7fb598003c7f0276f39a07303b6b95389df2cd279906408f434f7099749a2720a23d7d05d04c SHA512 0ce84203104e5f7aecfba5aba773b19a807982c9ee372295187b777c4e8d167caa5ed4221c23b85344ee12a29138e3be04c9477f5063bcdc7626737057f0511a
-EBUILD zeep-2.5.0.ebuild 831 BLAKE2B fec81d8548a44432102e02d1aa304a1fbc67eea5141f113f058d7fb598003c7f0276f39a07303b6b95389df2cd279906408f434f7099749a2720a23d7d05d04c SHA512 0ce84203104e5f7aecfba5aba773b19a807982c9ee372295187b777c4e8d167caa5ed4221c23b85344ee12a29138e3be04c9477f5063bcdc7626737057f0511a
-EBUILD zeep-3.1.0.ebuild 858 BLAKE2B b4b2263b48e2bebfea6ccceda1853ad88158781a71e70fba01e3dc97e40fc33d2bd242e423718662793da502d5a0adace88b844f39d031521ae406753cafafa4 SHA512 e4b14888dee8e1e8ce238668a4fbc580330c4e5facdac3248b662c1f121ff194832e0f8542c197eb6e6190d368a30e195ff35ca2951bfa29bd7a261708dd9337
-EBUILD zeep-3.4.0.ebuild 889 BLAKE2B 7b73ef6e3dddc60b847061411d2a5901dcdb84e9bd71db97047db552519afb07f4f8bdcf9b6dc279db8d8eed2744d1d593b6d9a16c118e4c1c3c5ce215c61c2f SHA512 d31c08c5e49649bd58ba7066f35df69444f72708d0829ed4fb3bb21c7f9e40a146dbcc6cb96f35806f397c472add8c81161ad57f28e76360663f2b5f7045458a
+EBUILD zeep-2.4.0.ebuild 822 BLAKE2B 9108b535427769a58f5b034865c6f1991cd8f245608ea017eb85629e4595f6cc1fa2d3090dd7fd5997791c5187a7933898f698316804bf67ceedb55760b58ad1 SHA512 2d70edec7a0f64f3452cecb2d370c650b27d05c4d980e51b024b80e08a5f3286f80af8294dd7b089805718f29676ecca1d00edc28e5b4a5418d9ac068e8fffa3
+EBUILD zeep-2.5.0.ebuild 822 BLAKE2B 9108b535427769a58f5b034865c6f1991cd8f245608ea017eb85629e4595f6cc1fa2d3090dd7fd5997791c5187a7933898f698316804bf67ceedb55760b58ad1 SHA512 2d70edec7a0f64f3452cecb2d370c650b27d05c4d980e51b024b80e08a5f3286f80af8294dd7b089805718f29676ecca1d00edc28e5b4a5418d9ac068e8fffa3
+EBUILD zeep-3.1.0.ebuild 849 BLAKE2B 6fd46ab24faa2489804c0afa284c279e67efeb9116e8e223c765fe51844b763b8fce26993e860aee6baa9ca291c50d279a37f345eae01aced4a4b18e39198caf SHA512 8235c86d1f3f95a8fa8ffbeca3ff6f96e499b40d6088cb597231926fcda96ee22178a8b42a6643fd4be90c402e636fca37681d3253b068211418676dd8b5ac9e
+EBUILD zeep-3.4.0.ebuild 882 BLAKE2B f70906ee2b3af41611be05cf468df138a887012fb1652e0ced65fb55f92a31586fe5ffd0edb6a2573007a22c7d557cc7ea64d3e5cd54b82524bfeb2b3b12604f SHA512 1074cc6848752f8f8f73ca2a8ea76e40a885b22ffae795870cce98326920c6fb4b96444863c6fe3c44aabde7d0b18899ab132072ddffbf1ef9bdf86ef47442a9
 MISC metadata.xml 589 BLAKE2B 7753eafe2db0c0494f397bdb185d121f6cf380a7007241d2a8a5e87b8a9080c026ee07c8d64d1ca1e661137c315492e28a6f6fd33578bcdc54432d9f183586c2 SHA512 b6d919287e23bc7a9aebaa3103678b7ca3927d7348a3470a266eaae25795851840c479307fd19a8fadb13f1e051b60bc617726fcfcd14983085fc33670f826ae
diff --git a/dev-python/zeep/zeep-2.4.0.ebuild b/dev-python/zeep/zeep-2.4.0.ebuild
index 72491ac5e0fe..42b6a193e8e4 100644
--- a/dev-python/zeep/zeep-2.4.0.ebuild
+++ b/dev-python/zeep/zeep-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
diff --git a/dev-python/zeep/zeep-2.5.0.ebuild b/dev-python/zeep/zeep-2.5.0.ebuild
index 72491ac5e0fe..42b6a193e8e4 100644
--- a/dev-python/zeep/zeep-2.5.0.ebuild
+++ b/dev-python/zeep/zeep-2.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
diff --git a/dev-python/zeep/zeep-3.1.0.ebuild b/dev-python/zeep/zeep-3.1.0.ebuild
index ae0dfd750ab9..c269134d312f 100644
--- a/dev-python/zeep/zeep-3.1.0.ebuild
+++ b/dev-python/zeep/zeep-3.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
diff --git a/dev-python/zeep/zeep-3.4.0.ebuild b/dev-python/zeep/zeep-3.4.0.ebuild
index 3a16c361608f..0eb50136832c 100644
--- a/dev-python/zeep/zeep-3.4.0.ebuild
+++ b/dev-python/zeep/zeep-3.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index fed2a053dee0..e537c128b9e4 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,3 +1,5 @@
 DIST zeroconf-0.19.1.tar.gz 22769 BLAKE2B a63332d70c5610da4fe44cc32d106893241284c3f70b5d6f55f68e3b3dd045a9c39b1009e9dce0b80c836d5ab0693b99974901ee664513c36f34c31907162d46 SHA512 1a7ac803caca1b230eba6c4bcfb714613f218850d9373ea0de609a3c9a509d13acfd14d64f9efbab78637b74aebdf385cf2deded1ff871fc6f3aea4477a07730
-EBUILD zeroconf-0.19.1.ebuild 967 BLAKE2B 41430ced18c83a26708ca94308066cde8fb4c5398ae449f3345bfd3ae683c5e525a3ac02070e198a742440b5554ea020321b947a85873ba526aa6d3fb6cfc048 SHA512 6688364b12edf22dd55f14de6c90e5852b00a10397d7245cf3e700b9e5294215563a5597aeeb5ec00b5ea044080ee1b35fbf7e95a6ea52069adfbbec212aecd9
+DIST zeroconf-0.24.4.tar.gz 51866 BLAKE2B dd71bda4b0759c61a3e5895e766dff6516ea81ca0c8c9f5a95a8093de8a3a9b15722b99a6af0092b02c1b292bcdb11c02c9f165003b56ca8a793f4a4ca8fd891 SHA512 71678521b05016a7404005a06c8109f861cc8bfe2b3375ac6f1da8f63771271a3d9a095a8db6ccea2e062c5cc28b750a50fbe69218de72646b13a5f03359ea17
+EBUILD zeroconf-0.19.1.ebuild 958 BLAKE2B 4a706d32d42e9c7111c6fb0f82e673d50eed811ddb93cce5e3efacbb6d35ab45024aa29ace7b4abba221568afdc2e73c152dcfc1cdb27284bbb5fe6296bf4997 SHA512 92aec4734cc62dbf8618037445c3830c0496b2d02ca7e3fa6f5ab94e5f6ccb1e3def6e7d846228f5ea61a040406f5558e5f7a71deb9605f35a8d02847f860c64
+EBUILD zeroconf-0.24.4.ebuild 878 BLAKE2B 78a537d2724242582ec57e70d34e3fcd4a4fd9469cc009cb1dca6903e58674e82fab9571649b402c65accd2c96a7cbfb0e9022e2f7c15a944d675998dc1654df SHA512 182988670d3c7602a8ec714b3ab07effba241187246488fb15ea672011a07bdda9e769aa4535598704e5588b8d8a0e280cb9fccbc66aa15177499174907b2669
 MISC metadata.xml 387 BLAKE2B 9dea981cf6247ad6fb6ddb3b060671ddb031ec703dc00e61e2efb4909478d01b5dfa309ed848dafe321d388156d16f44bc7b803dab79731205e374b5f046757c SHA512 ccee11a4aad084b1ac1dd901d966e1424b7ad3769b4bdf62c2dd44f9cbb6ec1a566443967ba45b37ef6241f43d2a06c17ebb5028254fbf40e0a480fcc3d76f89
diff --git a/dev-python/zeroconf/zeroconf-0.19.1.ebuild b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
index 70db7291fb44..1c30f94c58a8 100644
--- a/dev-python/zeroconf/zeroconf-0.19.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zeroconf/zeroconf-0.24.4.ebuild b/dev-python/zeroconf/zeroconf-0.24.4.ebuild
new file mode 100644
index 000000000000..8764e749eec3
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.24.4.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=( python{3_6,3_7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="https://github.com/jstasiak/python-zeroconf https://pypi.org/project/zeroconf/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/ifaddr[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+# Not included
+RESTRICT="test"
+
+python_prepare_all() {
+	# It's virtual/python-enum34
+	sed \
+		-e "s:'enum-compat',::g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/zict/Manifest b/dev-python/zict/Manifest
index c2f30c320532..d71e6907c51a 100644
--- a/dev-python/zict/Manifest
+++ b/dev-python/zict/Manifest
@@ -1,7 +1,7 @@
 DIST zict-0.1.2.tar.gz 10839 BLAKE2B 6256e6202f6cca1db025d21c42b98163ad897ceda6a1b878e75165b358ec0a4b9150f04ecdc05f5408dd74c97212b8301d1f45d91f92dad138789570ffcfa562 SHA512 13fc6647bc1506bc5e8f69d39a07851a06634949ce917f294762ff3143c8a539117f8731b103df2663708fa1e8c968359985d9c4273aa952f500a89019c176e3
 DIST zict-0.1.3.tar.gz 11199 BLAKE2B f91c51888816b3b3693ee272379e36c58141afeba14cf25eff9e1416cd59900ca9ab146d7fe806a22939e97dfb3f1657e443eb1420f4d5170a3723df32c3d73b SHA512 2051ff589f9dfc822ceb6a0adebb62e7b782bd426be5035163e78031814927dca221bfcc27ce47fb3d0287b1ec7e1ff120ccebf150e447df213aaa2136f744a4
 DIST zict-0.1.4.tar.gz 11335 BLAKE2B 30a70f04328762687ea9e6805e540469c26a85898278f2d83e1004d2663cd728a03df68e4900cf22b9d3b3ec6efc44a0fae3e5e0ff631a8bb8cc1d8ac510b8ee SHA512 3381c7fd64a99145f80800772dde381ae16225209aa9300f9d1a2c36b5ac1c4281d4068202e607985666ad44cce7d18317d4d8ca4d3ea4f9a227d4f4180e015c
-EBUILD zict-0.1.2.ebuild 683 BLAKE2B f8dfc78b0cfd81a16cfdb541d3945486ae601f5c4f8fd34d82a051c87896d2a4460c16b3ff649cb7588215e7d550917c45d200f1c50a858dc5c66411480c7b24 SHA512 214adad255e34c4a2689f0c5acf88b1dba69691ed58f7f0935e7a7941ccd603f870d09998bc6bc426c435ff43640ab940cba59b78daf881ddf17e5e108fce4f1
-EBUILD zict-0.1.3.ebuild 677 BLAKE2B c90f98063ce5540b46f728364dbd8e4b7e2eac894e1168d4fc34c444cb6606d0dd0ef7dd34c8873151bf1ad8953cd595af2dabefd53db1f95ac8e5c26deb6fd0 SHA512 2bf9e8c224d0e5fa91098811c75d60ad20aec98adffaf0e4e1fe9b539117c3c0b57c1daac26ff932402172678fb230bd50309a7fc9fb2ef4585da7885a7efb4b
-EBUILD zict-0.1.4.ebuild 679 BLAKE2B 8e1e7f71318a8909bb49c8844a8371544ea2bd44a269ca11c769f89ac35b33c513980a5cfa67daea736c6e98985c26411d855193e4168cb05d10c2767816cfa8 SHA512 e72e9b4a04b766c5158fd76338cad8c2679e6a33f9aa38d34a36ead3dfb5f2d18475c37cdf195e8b53898a70a38d7b7f840e8c276b2ab6f888691ec87636a1dd
+EBUILD zict-0.1.2.ebuild 679 BLAKE2B 5e9291882c0293135e17660fb840cc4c24e3768f8782ed893cc71b0d799efbc0b5e024ff163728d061de5036cd64e1885f99c74d6318faff2b2e488b20f6ce23 SHA512 1b0d99cbf31bc12df28f17121f23d0a0be006adb9a44b043da33e6e4bd428db10d337f812086684537e127ebc50cfd16b1a30847986dd82f41b70461d7872053
+EBUILD zict-0.1.3.ebuild 675 BLAKE2B 312ed628deaf8214490e86578090b742bcd3d134910726131def4a9f2a8e571129e30b16979cc3de4bbcc61bae30419b49faea378d6be221b651765b86c62b1a SHA512 8e368d6b22c56fcd3ae40b6f9fe09a22f014a5b760444cda177bace414b13ac1afde8363c63615cacac82e3a6311daebc3f46ccc9e0780cb1d6f7162a22436a3
+EBUILD zict-0.1.4.ebuild 677 BLAKE2B ad580411e4cb78026f7ae1c5425c657e9898d7993c9ebd69f448dc467f5015756e2b793631e1733171af4e0fffea5b30888227eac62fb45723ba95a04872a3d0 SHA512 b35edc9d0e3a88990a3c0ba5693b782ebea8abc3831e7a7a8a74354b87a09a6ccce7d9f856c468fed1606e7603d8d03a023686512f5052585bf026f35e41d41e
 MISC metadata.xml 372 BLAKE2B e0704ea4318d17b85ab75fb9818e2ec6993173823f2b0d8fb92413e9ea83095a5ad95c05e69c4f6ae447c9cc2fe7a2735355b311e84b6036780a6b48ae5e7ff4 SHA512 02db2dbf57dc6d87318e8b79fc845f7aff7c6b98d80ea897bf24dca8f762f80581d69fd8990bca0e0d736997a93f2fd5a24fdad481b352e6a907c4b37a983eb0
diff --git a/dev-python/zict/zict-0.1.2.ebuild b/dev-python/zict/zict-0.1.2.ebuild
index 4c2d7c728f81..c2c724b4931b 100644
--- a/dev-python/zict/zict-0.1.2.ebuild
+++ b/dev-python/zict/zict-0.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zict/zict-0.1.3.ebuild b/dev-python/zict/zict-0.1.3.ebuild
index 4dff93e158f6..409eb9478ea0 100644
--- a/dev-python/zict/zict-0.1.3.ebuild
+++ b/dev-python/zict/zict-0.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zict/zict-0.1.4.ebuild b/dev-python/zict/zict-0.1.4.ebuild
index 8b99ec6752a8..05b954bd6283 100644
--- a/dev-python/zict/zict-0.1.4.ebuild
+++ b/dev-python/zict/zict-0.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index d3e942181c22..074b8367c1e8 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,6 +1,7 @@
 DIST zipp-0.5.2.tar.gz 10875 BLAKE2B 97e56b8e1cbff2344ee6b385085e6c821d61bd2c2510ac54e50a3f706515f1e22789168c97599787787b47f09dabe55abb594f5724d1d540f62d8d68fc32e36f SHA512 8c84b620844315ab1f1aa3c5bb29dcdf1271a0139198b5c3d6aa31ecb9a86f0dcef963819403d971ae0461c737312c064572c57ecf32d73dc973a5f69cf0375c
 DIST zipp-0.6.0.tar.gz 10778 BLAKE2B 165ae85f51fe0c0232f6cf2dde70e2d7f8064413c15616d15e1ebd65cfe3c345bbd5b1b9713fa1171cad18015b605862509790bedd734edf5a7d8c80c5378af3 SHA512 18bef5aa3388ab3901bf08888127fc9cc17d8972a52f23ccf9a8035f09ee5598e17ddff833a10b81b2118461e0c517e88413518736763425a728cd0b19cc2052
-EBUILD zipp-0.5.2.ebuild 1134 BLAKE2B 964f7b2a90f233924c1d63f6e9204f8b0623c2907edb7c89fdbe4a5f5125ed5e4d45f9d16a543030531e8904ee92ab4b472ea468a7a205a56a24491034e36804 SHA512 ab4bfbf28319ae5c5e84157face7fd4b57dc08ee03c7d2aebeb5165ad1ec6a262df7105b29f7ead0f50ff9b4832b44e75d7a6dd793971b4822a264c3c6d70923
-EBUILD zipp-0.6.0-r1.ebuild 1187 BLAKE2B e0d85bcff75982cca7c41400cff9ea42adaff522642d7855847fd0fa1a08c5a895edd4ba21a63c31cc6dcf15449b81802c120ebbfd1fb65aaa553600bb35a1a6 SHA512 c912761bbe28caab8b7479359afeab924ebe84b57d23d36f4ae145b2f0aecfa2fd3f29ca93365b6f777d07849f20c0351159698e9d351e8bae582c79b4b436a2
-EBUILD zipp-0.6.0.ebuild 1201 BLAKE2B b77ccd226506b7b79fdb160dff2ca7f20ff6185c89cdc4c6122ac91b64332f6da33d83ae348e0ef79147cb70859968fc643aa5955f274057b9e77ee0585e531b SHA512 ba9141f8046bbdc3486d1e0eb07299b5993b5c64885c9aab79dd873c1412850a67b5b82ae3eab708aa519dfa7b240a36b982ea53ca0aa56af23225a54c7193a2
+DIST zipp-1.0.0.tar.gz 10821 BLAKE2B f5e0476cb0ca01054abc0c56f1a9581a6f537c002791c4a363238555ce9a211fe13114041374c1bfef426544545e3c654e5b0a7e0541c30b775757c43df6d756 SHA512 dbfadfedd30ca4cb31ac4163f367134d96e57405ef00d5f4c19c0af7a141f78487dec29a0ba94975584fcb462d22c8b536bf29c67b7e298368072e897b0e9d82
+EBUILD zipp-0.5.2.ebuild 1129 BLAKE2B f2c1151f8c9f27601288c5508dc099ed6c90cf668fc0075610dce2fddcbf442010ac9f3388097459cbb91de012d9cc9912496161517aaac3181d630f421f7ed1 SHA512 1dc2b4335d18b1ccdb7282e1dabe8f7d91fd2e817279de6a7669e38dcd9c3398a27f72331f442882a9b4f5c84adc421072d3672a2e7e27fe63bf998065cf66c0
+EBUILD zipp-0.6.0.ebuild 1196 BLAKE2B f4c446a07369d5d45f2b0563f070ed38cbf353bb66ed7453ea0931d9cb6e9fd77499dba623b869076e8b02de164b72a0bd207ec0238215bee77a751c73446427 SHA512 9f6570677e31aaf885bc458d44c8b9f6e2a67066fa5f284e5ed3681ef566d9caaf94064ba31563e1c881196960d47ef8a67da010180150a7a85adfdc14b4ba35
+EBUILD zipp-1.0.0.ebuild 1174 BLAKE2B 205255bae18e580668df8b3846b0afa55b335354539395dfa82fae4280c369b4262dba4b41c473a3f062f2dff7ff320b7684ad9416f8a844ad7469961975509e SHA512 a56049b22f5f50283fe43688f05702b95bfd54de25d2e2fdf5c076e28a4dfa65d057c52ee99a685f39af9ae0ae8e3b3f15173030f8f06e82b42deebee8ccbc72
 MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
diff --git a/dev-python/zipp/zipp-0.5.2.ebuild b/dev-python/zipp/zipp-0.5.2.ebuild
index 550d4f714b81..5bfbbf4ef3a5 100644
--- a/dev-python/zipp/zipp-0.5.2.ebuild
+++ b/dev-python/zipp/zipp-0.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zipp/zipp-0.6.0-r1.ebuild b/dev-python/zipp/zipp-0.6.0-r1.ebuild
deleted file mode 100644
index 4366045bcdaf..000000000000
--- a/dev-python/zipp/zipp-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/contextlib2[${PYTHON_USEDEP}]
-			dev-python/pathlib2[${PYTHON_USEDEP}]
-			dev-python/unittest2[${PYTHON_USEDEP}]
-		' pypy{,3} python{2_7,3_{5,6,7}})
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
-		setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/zipp/zipp-0.6.0.ebuild b/dev-python/zipp/zipp-0.6.0.ebuild
index e24fe1387bde..b936b98c8168 100644
--- a/dev-python/zipp/zipp-0.6.0.ebuild
+++ b/dev-python/zipp/zipp-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zipp/zipp-1.0.0.ebuild b/dev-python/zipp/zipp-1.0.0.ebuild
new file mode 100644
index 000000000000..5f9bd554565e
--- /dev/null
+++ b/dev-python/zipp/zipp-1.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=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="https://github.com/jaraco/zipp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+IUSE="test"
+
+RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/contextlib2[${PYTHON_USEDEP}]
+			dev-python/pathlib2[${PYTHON_USEDEP}]
+			dev-python/unittest2[${PYTHON_USEDEP}]
+		' pypy{,3} python{2_7,3_{5,6,7}})
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
+		setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 242cb464951d..277347bb094f 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,5 +1,5 @@
 DIST zope.component-4.3.0.tar.gz 85971 BLAKE2B af49d4e523edddaeaf288f8602f6f8c6a92e9fec9ada88878f6a0be2ed9c859842d312f9888c6e806ef762f1ddbb5260a2da37dc992551d496c090cdd4338486 SHA512 0c078bf2471bee44acac0c291c3159f4315cdbdb3eaa504f97c1b345fdba5efff6a1514ee2ab558ff3c3e4a18924f982de7c7ddf323080ee99f573d6776d91cc
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
-EBUILD zope-component-4.3.0-r1.ebuild 976 BLAKE2B 7d83ae12c48638e9e296ee6873abd7f26b3ca2f6c86c11692fbf737d3a501e8329d9234a48f88d64f3a8814d9f0dbffd4b78c9644d63117d643d7d64eaaaff6c SHA512 2419e33a6ead03dcb25b5272e00b3e3a5a5e556d8cf373f1a271339d2e74bca4734ee64ddb0f240c73934cf2abe189a4206f73dfc7d82cf63d92b7d31b701a4a
-EBUILD zope-component-4.4.1.ebuild 995 BLAKE2B e4f16d53f231e61ab0674d72c7168a63f7127291ac6a59cb5e309c1476aa3b456078e4ae9a11d61b5313c08efed18c56e95442eef8d8d33d838c4e7386e85065 SHA512 0010b02a28277f1dc9a8838b4ed4b2c7b244c854a5327f2b82c0e3e7659ca5acbe6e20874f7e18cfb9890aa3e45ec3f695ffe3704edaa0632e466e9971a83973
+EBUILD zope-component-4.3.0-r1.ebuild 972 BLAKE2B b942f0fbba84a03c844ace412846c32268af562200b5ac074d73b90a3388527bed72026b134c8461c5b33c99b4b5d37bb10b10336d69979806e50602e7d2cd5e SHA512 ef166d49d08e1008a96769df985e68df842c3716e6d96e354ec57d1a61b91275d9507deb48cf3e10761a3ef59c569ca8fad41b8890029356a858cf9c3b55d5d5
+EBUILD zope-component-4.4.1.ebuild 991 BLAKE2B 8faa49b4b99edd41b335ab319421d7fcc67bfcebbcdba8709623e00ae1f29ee0c2ce40c17b1f13e5935e46c1af43824b10ed0d7f290d59ea566bb121d8ca56c7 SHA512 df27dcf39016317331f93882c6855c3f848ba191d71751521aed149ca5d3bbe2bb8e3ee621b4c76f0c99b6b99da1daf846908d9d8ee84108b415433404f78732
 MISC metadata.xml 386 BLAKE2B 0a14d662d38198dc4d4075246edbd47d6645e8210cc5fcf92f2cb00f6e6f7d24a202bd0b57125f3b2057cd62c3745a0ba0cac27a437b2f479204cc74aed6c527 SHA512 adb346917ce5dd31ef902cb6e247143f753bb42e22f41300d89b192291f5bc9ab1b6c2aa43c63e5a21b7ceff4a4e6187bed6d8b398121411e5e9f04df2e736ad
diff --git a/dev-python/zope-component/zope-component-4.3.0-r1.ebuild b/dev-python/zope-component/zope-component-4.3.0-r1.ebuild
index 2cdca30b05f7..40f4c33fcdd9 100644
--- a/dev-python/zope-component/zope-component-4.3.0-r1.ebuild
+++ b/dev-python/zope-component/zope-component-4.3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1
 MY_PN=zope.component
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
index 9701ce3ed6f0..71515f44d271 100644
--- a/dev-python/zope-component/zope-component-4.4.1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 inherit distutils-r1
 MY_PN=zope.component
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index 229937fb7e63..db4c96767245 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1,3 +1,5 @@
 DIST zope.configuration-4.1.0.tar.gz 77780 BLAKE2B a3f0da446bbc858e43ccd4249c80db07b1f29df1fc31931c07bcd55116084a70b9618b15f22a8f1027e1fc53c8e2a7ba75bb3a80d8419c16cbef8f847299a3de SHA512 86bbc5ac22c61d485fcb55c4dafb5b81eaab0a08de1e5dc3cd586769323a09896e72b1e8aac790d3e8d8f93a133efd3f88a92a4b3c1075bdd0da62cd4e33c56a
-EBUILD zope-configuration-4.1.0.ebuild 1006 BLAKE2B 7532aa96211f6ce517e3aab9cf442ff84e368c0537d1275464762760870b5c2c53e025888a0f244a25bfaa3a7e1f05659d382d84a6f8a464565f4effeae902c5 SHA512 18be2804df475692b53015b7a4aa0c47975fe7b3b2032e4d9ca72dbf4ad164d214bf50033eaf1e0b7746bddcf5ebf08c875c8548ba25d7dea33f34557e1f83b2
+DIST zope.configuration-4.3.1.tar.gz 83223 BLAKE2B 9c55951932f34484fa6760a6a3cbdf89fbf8723c43b9b4ea2cf909b74716bcdd74d03327fc418f43bcfc8b6b5c17554cf8d062952d8d6880e49e6b270da9c1c8 SHA512 bc8edf84a391cab4f664ea3a4d24b65cb9db351c972b6118e69fe3c726bbe3337121ff59d687dddf463b3672ed6996f21d4437941c81dc456a4e5d837e0945d2
+EBUILD zope-configuration-4.1.0.ebuild 1002 BLAKE2B 26b763a4a356e7e719eeecfb955426774e08a44aa345c8b2caa892c2c9a72bce486823d46ad2fc4a4b97632ef16b91b8fdc113e65118fc60a724bdaaac427158 SHA512 7c7da37a1042f547d4f6a7b7285edd8aec95c8d618cc7b72785a60c901ae06534a1388d61564bda6a76ae55a7c69e993cb7aa89b5fea9fd95f5a77ea3e6ed82d
+EBUILD zope-configuration-4.3.1.ebuild 848 BLAKE2B 0bc69b75454af2640f60741988179491845cb78aafa026cbbf467fbaa54720b29810613637cd24a41962afe0808b2434f718cf5347268d3b6577c8069d6e4bc7 SHA512 b5ea2834754882221666fab02aa4f0c1e6b515bc4f1bbae804b2f6621a5491b6986f95f11eecefc246f52c879c0c06e2c48014a1682e04d31596c15c59347e3e
 MISC metadata.xml 646 BLAKE2B c556a67d6a337d654d52e94060d0a91587cf3ef8fe95fdc8808f0ed03328a26c2aeb91dc459182fcfbcd1300d38f6f70f8e7489ddd41b788205da6545934cc3b SHA512 a8660b5d1a2619030fe32a06a95ae75e83f923a0c0b63a736a3c1c95137a99aa447c85fc0665efb7196a014a5473cd47a33744ab6cd047a8d9f33deb401e06d6
diff --git a/dev-python/zope-configuration/zope-configuration-4.1.0.ebuild b/dev-python/zope-configuration/zope-configuration-4.1.0.ebuild
index 6e6336e5cf0a..f21f3228d8b7 100644
--- a/dev-python/zope-configuration/zope-configuration-4.1.0.ebuild
+++ b/dev-python/zope-configuration/zope-configuration-4.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1
 MY_PN=zope.configuration
diff --git a/dev-python/zope-configuration/zope-configuration-4.3.1.ebuild b/dev-python/zope-configuration/zope-configuration-4.3.1.ebuild
new file mode 100644
index 000000000000..fe5dcefb34b1
--- /dev/null
+++ b/dev-python/zope-configuration/zope-configuration-4.3.1.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=(python{2_7,3_6,3_7})
+
+inherit distutils-r1
+MY_PN=zope.configuration
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope Configuration Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.configuration
+	https://docs.zope.org/zope.configuration/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	>=dev-python/zope-schema-4.9[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-deprecation/Manifest b/dev-python/zope-deprecation/Manifest
index d273259b8500..93bdcef15c82 100644
--- a/dev-python/zope-deprecation/Manifest
+++ b/dev-python/zope-deprecation/Manifest
@@ -1,5 +1,5 @@
 DIST zope.deprecation-4.2.0.tar.gz 223338 BLAKE2B 377ac7708d686aaa5b461a11a8088b52dbda303464f34aa990d7f7ae52cbdec3aee70fb05ea685b44279c9ef8a4b88cee4a39c364ed8c9c2ca6c04ff685bc090 SHA512 8ae5428d8e76014aaf17bfc05c88e7423be892f35bc9ec61f2f2919bb043fe0937cb592eec81763d9b6841ba3afa938e047cbecfacb9e4d29350e99f6ed417e6
 DIST zope.deprecation-4.4.0.tar.gz 24737 BLAKE2B 993959f47e7808ad9d024d5df9d141cdbce3a1a3c281acc0d90bdb20747743936411714b52a29fcac6968cea50d5ab54820954f74c3f59081ce98f097715b9a3 SHA512 62371dc45fad6715f24cdcac1d25b559ed5248da774b5ecd215fb4d0b6fc0ab655bfb9e0fbceda964e8ffb7d70536e43f8fcf09d9f2742904717a6473869fa4a
-EBUILD zope-deprecation-4.2.0.ebuild 817 BLAKE2B cce5871ed7ed00894ec1cd927c36e6f000d49f6ce845246a4f2479fd7003b62b535e83ffa01d746b9c7c5b9d7357f8d7f26c886918da9e21051952afd5f94b74 SHA512 3f26bc47b795ee8006c26713d1348a0c1658008116b1193517a4af0ae0f0c0681f6c12e19e7638cc502a6ec8f583d78ddef64944771b448ffc893c5915c2c7bc
-EBUILD zope-deprecation-4.4.0.ebuild 703 BLAKE2B 0dd205d9acb03fb5978083fefc1ef95bb844581680b726e92eabf0b212995503887308ef0ce0fbd7d180e7afd259747d65f559dcfc03a2e78b088b43eb044a0b SHA512 279879bc421076dc0493913f47df68a21c7539892418a7a762be9bfb5625e63045034c16a8580367b141170ffdd46cfb2949fc4593f2d006104b3ad40b98fcb8
+EBUILD zope-deprecation-4.2.0.ebuild 804 BLAKE2B 001e8b1b83c23027d11b475186630a17ec8489fc6ba98cca0754fcc3f9a5909fd471eb71215da7120406d487489e12c0c4f58374f399af3be20ef72f2ff381cc SHA512 7410b9bc11c4bba9a40b01ae77c5cde9337a564be345f5f44a2403da1200d445d9cf68242854e4081d55e232e084055ef0120e85e4d0546b5ce2e574757fbf09
+EBUILD zope-deprecation-4.4.0.ebuild 692 BLAKE2B 2acbe25b9ec8393f2447cea779e88a092b3e34bae182d4472d46717871548e1477f52e9c2f1649da8ceac176b37b5e87749a1168758fba1e7ac0cdc848f90cc5 SHA512 f31db9e133c0f8bdf4d4f178ad43a3ca70ade690a37384500762397f8a14d8fa343492bf5a058a90140c09d3ddd006caeae2e258277effe325ccf8a564dba26e
 MISC metadata.xml 368 BLAKE2B c1ce605438814f19b09dff543b21baf02f65d922e12cca179a133ccd00b0f45abc38d7e4f8b328881630595250aa328420bc09209cefcd7e632740285992c7c4 SHA512 7fd7d1b36d207b8e91fa9d4f3f2c8e760e9705ab556bd8c6db12207958aa94469db6ce9353f6537a3ad0f5914a0b14ca3d8d8c90033a497870ee5856b8612c9e
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.2.0.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.2.0.ebuild
index dae11d667c5d..fcdf3e8efdab 100644
--- a/dev-python/zope-deprecation/zope-deprecation-4.2.0.ebuild
+++ b/dev-python/zope-deprecation/zope-deprecation-4.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
+PYTHON_COMPAT=( python3_6 pypy3 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
index 9932b793cd1c..87b980fed5e2 100644
--- a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
+++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index f8d4610388dc..267b87aeb51d 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,7 +1,7 @@
 DIST zope.event-4.2.0.tar.gz 488532 BLAKE2B 89c2c2e9e75a57afd43f7ee984cbe8f7add3cb4eaf1271695b2a5c31e77e5fccb0c884d3f8c44c54fbd06be209e4556bc2438cda9bc987124d46e795822bd841 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989
 DIST zope.event-4.3.0.tar.gz 17829 BLAKE2B 5d508c834321c70399eb9888bc2b000f5b18de625c68dc089f3ab8571a7948c1e43e76c62811c955777fc2caa65585347c124e24f2afc46b23e9d30b6c4a4599 SHA512 dad303d1b76c75dcc98f1164c6dec8f8458f1adc4109146942cf9ff40ed3f92579b2da742b10798bc720ab17cbdebc86e54008cfa5155616e2ac68b332e62571
 DIST zope.event-4.4.tar.gz 18818 BLAKE2B 628625280c1e3f06f2c2e6e9aa88d3e34958718ea4624d54a5b915f8a570e38d4893adc0a0c688a7f09d3c81ffd67fbb69a3bc89ad58d95be498c2de48fff697 SHA512 34dac7ce2e8faf464bdb3861217beb1dd0976b1cc047d45a79f1640dd256bf33162da6e105c00135217fcdb888fc3ac7a4b0b4b047f64ce310c4d11cff71a985
-EBUILD zope-event-4.2.0.ebuild 868 BLAKE2B 9265e60a2e1613ec55321cdb5ee35c2b75cf817bc5bf442a53032bc94f48fb75c66a5a017e0c4cf1f6a51942adeb4f50cb016947d4429b16f62b615cb52082fd SHA512 716e97dfdd9965a9dbee5690c3f61ab4d6354833d10020927f18c9594c0229224c77e6b4d21de2a7d9b6da9e17b8080cd6807cfa887e9eb80fffaeae4c28a444
-EBUILD zope-event-4.3.0.ebuild 1015 BLAKE2B 66bb348ed9f1c8e902372aa28f6919e16ae7a8f2ad57d2083fc44c66b5b3f24307d74d24247a354233b2ee2292c76f23ef24d877fcde2201c07dc8669870aac0 SHA512 da8cfb64e92aacf11839628e73b57d3b3e26f9a56438f59b6fe7fb35e5cf120445db82cc3e47e792d963ac905fc489751b9af35220d656bf626b70cc2135116e
-EBUILD zope-event-4.4.ebuild 1015 BLAKE2B e077170eb63ecd2045c8a2aea21e020bb9b3d1155b5ffb3d5850270469eeb6c93857fc2361fc4293c6414a55e2ca7c120f7412db24158b463128c04101275062 SHA512 76565c1c9a17531a6db32899045e2267f76634ca41ed167c9b5829a95afc09339aa8a9ae20820129642d1d8470fe997259af74fdcf7ce7c77ca11a2d4491c70a
+EBUILD zope-event-4.2.0.ebuild 861 BLAKE2B e3e7aed3ceef623b33d3a9e52a6393ed1d97198a2fdb2f43ff0d0ddd98a471824a441463e50b99b589f6f2ccbdbbc2be0197587787c76eb72389c589765fdd7c SHA512 3752aace579cd1c6618eb43d551b5d0e9e550f2d9344dadefca0abcd934c398cd4af1f544a537207cc07bb7e705c2aa5900b51aa19061ff1666f76fbd8547ed3
+EBUILD zope-event-4.3.0.ebuild 1010 BLAKE2B 4c017909de626c4d3e6a47f93a1022ee2c04c956a61fffc2b52005c7845bbe3e2e3e2b6c3aeb446fcf0955166289136ac6f69d12d8b2f07819a571e469f16010 SHA512 7b5724c240a292cc3bad7334fdae7576fc1ba84542be38e6cb34ea3081eabe224e98b0a2f9e1fbbad2217a95a7ef5d98d22391440865649e231c2d3a453b6773
+EBUILD zope-event-4.4.ebuild 1002 BLAKE2B bd2d9c91dd16532a5003356064a2c88999ebe213a397f69c15d40989cf51d8264ad2c6b623381f7ed9c2f34a322918be3c88113760a86356631e7bb7bed0cfd8 SHA512 3d358aa027fbab4b9af8fcb9b72c3bc04dc27d8eaec9687e1b516a2ddc057ab9a0df139f8c901842ab8839b37f3574373990d6e9a2c60db742c69d234b900f8b
 MISC metadata.xml 378 BLAKE2B 53e40f9f0e2a3c17be6503b23c943f72c4221f8d131e56378bc7aa56ed8d889706a4e09f177e137fd1cdece259a2b13a2c6aabf4709b57e20d7e3964fdc580d7 SHA512 b04f8e3a6a16e89458912a27c16154f89067883f11c35552a00cd273095b30ae085b19eb0bebe860055db4876d23085b062b57f937eca21bbc98098a8a06a831
diff --git a/dev-python/zope-event/zope-event-4.2.0.ebuild b/dev-python/zope-event/zope-event-4.2.0.ebuild
index 689b855e405c..a3124c8c010a 100644
--- a/dev-python/zope-event/zope-event-4.2.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1
 MY_PN=zope.event
diff --git a/dev-python/zope-event/zope-event-4.3.0.ebuild b/dev-python/zope-event/zope-event-4.3.0.ebuild
index 9304525d1aa7..e569780826a4 100644
--- a/dev-python/zope-event/zope-event-4.3.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-event/zope-event-4.4.ebuild b/dev-python/zope-event/zope-event-4.4.ebuild
index d9aca2f4d747..ab2929abdc04 100644
--- a/dev-python/zope-event/zope-event-4.4.ebuild
+++ b/dev-python/zope-event/zope-event-4.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} 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 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index 53b1484a8e08..96dbed579837 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,5 +1,5 @@
 DIST zope.exceptions-4.1.0.tar.gz 26605 BLAKE2B c57ed6536e4e2eee973864b2cff4e5559f7a184c49714ca5b8b6c7c5bf56aa0e4580d149a9dfe0607ba8b1738e88f05b65c145ccdeb20ef82826be2009eaca05 SHA512 7491a0558a999d6907d2d1adb33086ef047dd4fc5d39709da628a94ee11f5afaec4b2cb456c19b16595cfaf46cc0d25fb847196d331c9d9c80d2ba3a582b415f
 DIST zope.exceptions-4.3.tar.gz 30704 BLAKE2B aa5319c8f9b3555038809f8209d121b4a8944a9df1c683302749c12e1e5097139047583b1f033e6530005232fadc326aed7da64fa585b749ec50cd22cb3411a5 SHA512 348c8edb0246bb2035ca5c1bcfaca7d3be2525157e2c9267a59a061c8ba749b364428e3d6a3aa3f967306abd0a319e4d6fa935b7fc35fff3bb53960015505695
-EBUILD zope-exceptions-4.1.0.ebuild 991 BLAKE2B 7dd022dfde75d839dc524709179d54575070bd808e2f1674cdaa01d5f4f9462c65cd545aee7cb8126e9186c823696cf555e6d9cf434e485ec4094d2740aab8f0 SHA512 48f34dd0bd11a758e70044f4c49a46edcf2c4795c179a690835fe95e17cc293c81767d6860fd5461e564041bbc5d0d4fba3fc07405d9a1ead3adbb1d8cd2b1aa
-EBUILD zope-exceptions-4.3.ebuild 929 BLAKE2B 3cf4ce6d7a15bf177fd753279e907369726ae43f6ad6c16532dd9038623221fa5a498a813221f83cc747640d8d1d2a982810d62508499ad005473f3b9d9e05a4 SHA512 5171b8430a79aba8243a53c12aa18a75bb2ea071a5e6b93eee4f95c4602e9fe5434e50dcffd384a9fce3fba5b7e239fe6fb44fce978c94c3ad88a0bcb6fd4f5c
+EBUILD zope-exceptions-4.1.0.ebuild 984 BLAKE2B 505fb4df4b37eb71837fb453562dce7d103389160edc1fa1dcdb76930a363e77e65bafb37011c7b7a943b9808a68448f3a81bad0b4fc648fb1cf4188169c3cf6 SHA512 46d37921deeb5b723e2d8e5b5bf83ca7dbd0bed5a47f674bbf30e794e4612b28f3ff82332d14872cd5372872a0fad4999b96d6802e0de2b767c56eb83836c9ac
+EBUILD zope-exceptions-4.3.ebuild 943 BLAKE2B 86acd0a771a708a1053a587698863d689c3de138380667d1ac79d08c12e05b884c93905d22f6718c9dcc69c63e5ecb3c946046463cbd4f48530e2f6c24711495 SHA512 b72f4ade74ce03d6fb1e731ae646c31938cc0b5e75e0c5616d4fcf73430011f6d23087af3c033f4fcac84331bed1dc271018be77fddb399da0e9c52a1c316fb0
 MISC metadata.xml 388 BLAKE2B 81b6980b4187c8b5be0134c006c0327df68b4c4cd251085b132aeea84145894b189fff3bbae36fc685854caa3f3bae79eec6240d2cae2895012ceaab9f75be2a SHA512 8eeba4b9f4529cd57b811fbbab44a10dbb8c98e797def89845975e83f837f1b8c3a4607a4a32ad8450e4f9f046abe9388a54c89b007c5673976b3ba7186e60c9
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
index e01506accb07..cb3dd5aeea3e 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.3.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.3.ebuild
index 3a2d52809d5d..7a4b0e61b6c4 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.3.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index afe9e1c3c823..232cf628d321 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,5 +1,5 @@
 DIST zope.i18nmessageid-4.1.0.tar.gz 24166 BLAKE2B 378095bed1407c0025a6bddadc57be779f938ac914a5067aeeef28adc22217b2ec2a3ff41487ca9578a88b2fd27fb07d35996b71d2e82a698831d15e4bd6e630 SHA512 c787417ee67f951a7c72a4501d17cb75fa60aab26768f4dd31d2cc3915b162a148f08bd2f00270d55fb8ec3804bcca62d07cbdee952ab1647a75681daf291627
 DIST zope.i18nmessageid-5.0.0.tar.gz 28220 BLAKE2B 84727f56ce8dd069915b5b31a2f9824ee83b334d82e3b2a958e35e43842cee044ec47879809fe6256b51631a5baf9dfb4432f7e5e494faceca2f7ade479d38ff SHA512 76cf129e266f649ab379d1abea143b34e42f0ce66fdfcbebd1dbbca639a55c11a9d41687a7bb4dd04359fa1465e235035849786d142bafaa68d783c1f7aee2d6
-EBUILD zope-i18nmessageid-4.1.0.ebuild 764 BLAKE2B 27ed2a9fb96f9484920e0fb5457aeb1fd547a4d5a73b8f4f9a280dd92d19c6ac7c8820c3cfa2125011300eac55bbca88da4e0d490900d9c346f5275c30bdf4e8 SHA512 92fed7150aa43415cb43b00952f4edf16ed54443187a375cd0c3a3e12730ec61e2fccd17afbe1ad625243b519836fec65655167e3c6c3f256bec478d5376a1a0
-EBUILD zope-i18nmessageid-5.0.0.ebuild 826 BLAKE2B b0b290d892be5bada23ebd59cc09b0c3af549145f965a72ea2c9c5a110e41da192c436c24866334224f8af4c572bf1668ac57224219a476961a7e1d6527e3d39 SHA512 a5fc57b035824296ddf509ec2319b4729fe1f17e689f9a461fc27d9b0853a5612906910690135ecf9a9086ee121798509465a62e1ec853db8858fc420093d34c
+EBUILD zope-i18nmessageid-4.1.0.ebuild 760 BLAKE2B d6ea33892029219d3092f4da1463b8f7fb1b33a0343b1b936c55b0673bfc0a48fde1cfb839b053771fd44ccee463c41d17d82c5d90dd24f4d3f07c4cb4b7405e SHA512 b63f928e8218ce4e4a0847fec3a06280c6cc0269540138cdf71e3fa9ce135da60a8c5ccbb48840e81bb5cc5adbf6248b1c69e0bab87744617d05c159ca1dbd79
+EBUILD zope-i18nmessageid-5.0.0.ebuild 821 BLAKE2B 43426a9a3de7249c822538b3d93c26c1adeab22d201aae7beb381abd50ce2203f6cf93bdd4c172781100129c48df972e3739d427682efcdcf001f3bb6f1ac837 SHA512 fa90b3b86eaa476155494ee41c60d8cbfe43f7a45b5f04dd6c6b3225912f1391f1d4f26073e090122dbccedfb4a95390110bce515cc425df8f949ea0aa252e73
 MISC metadata.xml 487 BLAKE2B 7d59b64c324e8f6d9a38f6d95c2a672fbc8ebc3054e7786a114db8d99082a9d7d10c794c97a6b684f792475c79759a27cf48ed2d4f013201fe8f7b70ba00e3ff SHA512 5f2f2862d427dc342c90d1624ee7dd8d95ccc5f11410532dd892aa79b93c2e79a41bc6ead47e4f1ca43aa718ac619a01bfc03a71bcf7116aa39e2069dfc7da87
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-4.1.0.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-4.1.0.ebuild
index d25840fb3a39..34a8f8208a37 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-4.1.0.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-4.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1
 MY_PN=zope.i18nmessageid
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.0.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.0.ebuild
index 03fd892549b4..792f5b319cc5 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.0.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 891e996e666f..c50893a68169 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -4,10 +4,10 @@ DIST zope.interface-4.4.3.tar.gz 147052 BLAKE2B dea636ebed2f66035510d467615a9532
 DIST zope.interface-4.5.0.tar.gz 151261 BLAKE2B 45d84249c4c64e8c5a7406ca50f3fe960130727cf36dce4d6469b84da2747c1dc2eddbc29c779024c40bb7f2457559875ffd39e64c5e0ea7aaa911d7d19e2ca3 SHA512 d3a256723901bf505e4caa0f9988814cd583aefa1adced7ea9ce0a9130e67909f8d6b5dd20d986182a34ea216d63aec1aa4513fc76110e6d96a43a49f1719ee1
 DIST zope.interface-4.6.0.tar.gz 150884 BLAKE2B d31c006553b31f7a5096f69d33341c868723aa0eeee375265c61896fc2dc16109e3f5135a0007604f9e6049fc0cc905e0f8c7ad23e1156a636094d0b334febc7 SHA512 cb82144f0b228dd4d2f7cbfba130ee190265bf809d4e928262935c3b5551a3a298df4eba2dfe7ecde96fed27f39f59ab95e9c11f3eadf0fdc13f61b5c046f78f
 DIST zope.interface-4.7.1.tar.gz 151374 BLAKE2B 87900329d4634456287fe0fc78093df02f9b0e27fe2fd9f6dc039253f5814f2a00936e0f49e6001754c192eed323cfad068cf863d3e52ed31bad6352d83e1d0e SHA512 cb99cdf9733cdd2fb6637163167da0073145db1ed1788ae147098a23a9cafb4d661368a1780a44a231a2ea9f1adfa4fd6acac423a4a8d9cf026ee3a603ca7767
-EBUILD zope-interface-4.1.1.ebuild 959 BLAKE2B 3bdff323c4ada4e4a0af502d5df72237e80a7e3b677a5ce692502f0b15fb3455db01e53d9b4014c436fdc0380da5462b833a75b2fa1d54269973edaf615d7453 SHA512 d30cd0d549255dc69789699e59a080b4241a24773071e79e432c2fa9745f24b2200d6ddec80e6cd7285449162f9cdeb6a29827eeeb7b826541d350a8a389b1cf
-EBUILD zope-interface-4.3.2.ebuild 1034 BLAKE2B 06d2bb6048c00f51e8752db4497327ecb41623253be7314f07f39dffa30c3dea46aa64c357075a3ce254eba76f87d9051a3ce50233f40b3af7652a6d99991f95 SHA512 f4d930bb4d8e1c67d40d2c3cbb3489c6200c3da35d2299e9355bff8204af7622b7fc4bdf6a45d9af0c5327204d8cc9b7a4c8dd2f0320c88b4f72c5a77c258e56
-EBUILD zope-interface-4.4.3.ebuild 1279 BLAKE2B d2ccda8bcabd4941745586b890f28e431316a36029677f1d8061dae28c3538254d664dddd320256265ee1194d9a28e4cdb37e49f68fa3fc7d18aef33dfc57d15 SHA512 d1358deef807f7c4b64098605769d68946c8f4f1b98756e147d9c9ea2032659f80e1bd09e789b8751275c2d7dd243b8c73cdb9a620f6397d5cef6aa3eaa2cc82
-EBUILD zope-interface-4.5.0.ebuild 1292 BLAKE2B c57f2dfbeb75582ced4d29958561689c2379085491843b538c05b7d3e03fcd8184320f1bc0d30712f0f7204e8ffd183b5877eab31a8a365fa412df9d4c886923 SHA512 fca7734568d812fb6a4ac92f4cd54ed11e5b1768f3236ac95da6a9bd75e24633425906eba391aafb5a1deefe2fafeef03e8e4a1e66057c564bcaa73ab16a3aac
-EBUILD zope-interface-4.6.0.ebuild 1294 BLAKE2B 4178df09a23bf477e8358c370701836ae58974cc771ab2d78969ffecc063fa8552acc6be4779f400ed3a3c192f02c3663954ab71d0c5c97e30ce0439b9032560 SHA512 3d5915b93cbe9d876c0fb34f6c7eddf1f2061b34d50698c8d9fe56611fada5eca3b5cb1ea778f24d785eec8663dfc762da8f0bcac72c11f4871f81e4ac011da7
-EBUILD zope-interface-4.7.1.ebuild 1220 BLAKE2B e9b7b31a9b664220a7da7356f2bdc1a740bde3e1e43ca21b6d7c4d7498364a06b98847d60090be4f5db0161f67a93f9da5a8e414620c9da0fd680e973328fc55 SHA512 781fbb30d1d9dd13e620bdaac57a3c99dfcfdf05357c2ed92dc744a680c9f6cbf995ebab993603f4dc58ae1e5d0abea0cc99012ff5540c3b108808675d312e7d
+EBUILD zope-interface-4.1.1.ebuild 954 BLAKE2B dcc901c3edee5205d4d1f735a706ee147fff587dbac4a6a865f5db99d63da3caf13873c4a99a22c6fa70b46a5c52217392e05d4ed4c84be8113681c6558cd6bd SHA512 99a32cf5c438348ee94ef2091dd933f0196a0f8d6aec143f31ac30502dfcc82186eb9452802b56bd6b2389f23834ba1175ed6cbf89904ba894c8b2d06714ffcb
+EBUILD zope-interface-4.3.2.ebuild 1025 BLAKE2B 222c825ccc26b6a9be3fcae15711fc9a3fce9170aecadf19def9720ad82b5e5c0c3ed5f8681f8ab4d14857583663b9573be7d7d56c0e5197d60f00ea49edf36a SHA512 b4358780f94b36da90b8793038107aad616c49f40063c265be097a07ada925a28a1aa035951efa86ba970a569fbaab32b95b445a9ea15c22a435710adffeb8c5
+EBUILD zope-interface-4.4.3.ebuild 1272 BLAKE2B 203ee033b7f725ca28cace533d072c59eb9aadbce948da5064739eb356a7f232a98c49c4044284e8664fe3068698324b299110e045ed30ee2aaa2788cda3349b SHA512 3fd112acef8c3c83968b2e943432cb9ed62d21ec75007eb579fd48be615fd1e726bed7962263549d9a7a2b7162d49c81c9ea462a66a64a6827d7c2ccb3d158b6
+EBUILD zope-interface-4.5.0.ebuild 1287 BLAKE2B a0d06d2b81d4261f847a7592ef96acd3eac851340ec736486b285302013c3412f4bc9cd169282a8957c63f73f6b57d08b55cad2a9f200dbcaaabed373f16df14 SHA512 2db1984cbdd27263f9e7f1447361417de9e389babee55f2125175034efa6972b3cdbc2dc4c97098095a75c07e9d2254bddb94a8e3294d103a94d4739d3724de7
+EBUILD zope-interface-4.6.0.ebuild 1289 BLAKE2B ffcd2ed4bf58637d9a9d88e51992e970013136c31393cd51afbdc05a0db4489d74503b8943fb21830c106f4917a8df0308d1c80f3925f54d2553472fbaf75fba SHA512 13d7fa15da09ae965323f34de9ebad46bd0869c4eda1ba94f48967c41cb9ba0e660a30f4964761dcafc9577bb17a009e7ecca9935f0f46843ecb41ea9c1f0765
+EBUILD zope-interface-4.7.1.ebuild 1212 BLAKE2B ddfa6deb0f189cedef845dcc74a9fc2adbadf442bec18620473df9c9b01079becb3dc2d83b7f5c23df283224c2e148375fe1382575b084a4e60fe9d451516634 SHA512 6097d5782bfbb3eccac0d60e94b8799158f0312081cb27ce0e22cb072da544fec37a11564e39cb7e67409e63d511b76c6d92da3cd21fd421f0021d8a9825eba0
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.1.1.ebuild b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
index 6fa4b394436a..6f20a6aa9600 100644
--- a/dev-python/zope-interface/zope-interface-4.1.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/zope-interface/zope-interface-4.3.2.ebuild b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
index b1ae2a35ed3f..46deb02eb6a0 100644
--- a/dev-python/zope-interface/zope-interface-4.3.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/zope-interface/zope-interface-4.4.3.ebuild b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
index 66276ef1a0ae..9d5b1af518d7 100644
--- a/dev-python/zope-interface/zope-interface-4.4.3.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/zope-interface/zope-interface-4.5.0.ebuild b/dev-python/zope-interface/zope-interface-4.5.0.ebuild
index 667f3a5ef0b0..f5492eae59e1 100644
--- a/dev-python/zope-interface/zope-interface-4.5.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/zope-interface/zope-interface-4.6.0.ebuild b/dev-python/zope-interface/zope-interface-4.6.0.ebuild
index 233810630807..d61e9ab54a16 100644
--- a/dev-python/zope-interface/zope-interface-4.6.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/zope-interface/zope-interface-4.7.1.ebuild b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
index f340cd3d7bed..4e4e68a5ca5d 100644
--- a/dev-python/zope-interface/zope-interface-4.7.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
@@ -16,7 +16,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 ~m68k ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index 523d6e02e929..bd5ad07907e8 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,5 +1,5 @@
 DIST zope.schema-4.5.0.tar.gz 76962 BLAKE2B 2ce5ddc674381bc5270865e141196e3edd10a6ad8f96a191d9bc603c99305e186f3cda9f92cd565c1f4956b4c68f2ab083187a85dabc6dae4a3c2e25cc6dbc73 SHA512 77f3f65a3d0b52f770a381d869b254f5457223b5fdda4b031e9531c57664dd151b4dc293d3cdc6dff5cad58d656d951e0d964fad9521100b7e007b4c15e52740
 DIST zope.schema-4.9.3.tar.gz 98217 BLAKE2B 9b3288bf8b07174fbbd919398cc441f5585671e312651f9cbcbbab9f885af67f5f8e954d70bd4787e8f17bd465f8152c685b894188d05a0663344fb8b3c70569 SHA512 63cdf431ba2aa79eb5771f99cf0a60932182edae00a63873f96cc02c70f826d23c72ecabd736d0f6439d63af900b4ee2c05246eabe0b1689b01bc15a09648504
-EBUILD zope-schema-4.5.0.ebuild 852 BLAKE2B ab75e4ba08d4a5615a0133455aacff91b74fa16135596c09108006cde878f2236f6dafe5d6baabee51dbaa8beb177fd79ce0f45574c9f9fc9ebac5ed9d56a8d9 SHA512 04e359c78e1626468ff98880b238b210c9eb77815013640cd45a37d774f9a912fb208109e69f865cf8e8869e6e1174d8bb941d364b3d6bdff9775f3b573a5fab
-EBUILD zope-schema-4.9.3.ebuild 991 BLAKE2B 07af3dd5dbec88b16b30b5ed01e6abfb9a14ce196616111793b7c4429f09e2eeec912c65793a0a511f1d3085e15a8265529e7127fa53f4f337591dccba32810e SHA512 23a767d7d51580991df4cf1889cb946c14b96d1453d51f55d51515d4d6adc3901ef7bfded6e4261c41d2dc38307208e9998353b1cdf64bed86ac6e954bde8d98
+EBUILD zope-schema-4.5.0.ebuild 848 BLAKE2B 8cfd062a5c83faab8e1224fa53c248b2fc9132f16f08f3240bf0bd7ce000299287f74091e2878e6fea88fe3b565c63e6985860d42a3145f110207107c9965b71 SHA512 d86ead30351b1fce907fadca4d6b4db51a9ec893b4bf7391a60ad4c397944c202a371834ed498e9db3b0f1cbc4534f08c8ce01674e4fbe74ddd50b56b4e3f496
+EBUILD zope-schema-4.9.3.ebuild 1005 BLAKE2B 1585e8f0cec69b5e640503b7f9f79c16bda6e4f101467df0eba3ee2c43b99469e38e66bd88484a19bc3b2d1814965a38b4dfd2c035b3152081060b358081dc01 SHA512 8699bd15afc364501e906aee84ab9844d7bff833430fd2984a0b5fd60de737665fe7816d49420cc0a8ade4506180dc2d4893e48879aad04f3c2f7bda56f84e85
 MISC metadata.xml 473 BLAKE2B 9d4475a1da73bc0330a977dc4943fe10a2b51465cc79413b2d8fc780a6b1afd73f77e54025fce33be258546fd991e1fd9ff9c37a2c9654065c67867255382a15 SHA512 6d2c6bc56197b18365bdb11a2986c614234aa1e57f37b93f95f6616a3674890f7f02a901d58dbac0d2d98ceb1cb8535d9c2e84969778108e1e8bcdecb89c4299
diff --git a/dev-python/zope-schema/zope-schema-4.5.0.ebuild b/dev-python/zope-schema/zope-schema-4.5.0.ebuild
index 06e45c59d36c..6c0579015afe 100644
--- a/dev-python/zope-schema/zope-schema-4.5.0.ebuild
+++ b/dev-python/zope-schema/zope-schema-4.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1
 MY_PN=zope.schema
diff --git a/dev-python/zope-schema/zope-schema-4.9.3.ebuild b/dev-python/zope-schema/zope-schema-4.9.3.ebuild
index 2350510ec5a3..d1f836d2561b 100644
--- a/dev-python/zope-schema/zope-schema-4.9.3.ebuild
+++ b/dev-python/zope-schema/zope-schema-4.9.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} 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="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="dev-python/zope-event[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
index e6c511d8c384..0c93a8375295 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1,5 +1,5 @@
 DIST zope.testing-4.6.2.tar.gz 62710 BLAKE2B 4b70538dc8bbbc4445bcdc8eb2d49c36b4fede893a50007367195aa1017b088ae65805b59566daefd7cfad612ca20c24659cb3da65aa3e307cad3aaa03c67178 SHA512 816c87a38c847aad67857c364bb9999f4283484c933be2bcb54066dac4a6f8c6f94dfde61860397003e7f17b8669e7964a7fbe28e7ca7313f5d131f17c0b672d
 DIST zope.testing-4.7.tar.gz 63474 BLAKE2B dc825849c288b9f8ab9e4edfe670e09aa49f28c64047da8e0fb36cbfa6cf24d70cf6a49ea8a51ca1831b152f3ffa4b0c62cde29750036f13c9f754df2bb80da2 SHA512 cdf87f95196880a0f55c740f6340286bb29e96e9273d0c645bbb50def54a0645cce22d971adba3f15ff57b1021a72749219af83abc4e8fa775fb982d8164791d
-EBUILD zope-testing-4.6.2.ebuild 813 BLAKE2B 2e59467cd247de6c73df6060fdc41753b323388ebd836e8572903d44ddc5f12011d88535fbf1c265aa37323072642ab3bd4a2cab645d7b754104d30e3366b86f SHA512 2def90845bf5db3790645757dc38858ed1737de6e7fa9dd88cfcca582f4677fb37b3c45fd591ec8adbe53cb18961a4331d789222d7ffd0cc7b24896871a8d7b3
-EBUILD zope-testing-4.7-r1.ebuild 844 BLAKE2B c627595c33ff972ba947b3d26247c4aacd71ab600584be06afcf9e46f37d6ae7162acbb9169b993e6054a4deb761e575e4fe0759e65ba8fd2a90e66826950cb4 SHA512 3a54768161be03eaa47dfc52650b1bf77c0905fea0080e6968e6e3ae052b45726454ecba8c9b573c039bd217266e3fc421376aab10a34c6529eabb2c2e01cf51
+EBUILD zope-testing-4.6.2.ebuild 806 BLAKE2B 26e7e655645e4553bc9bb4dc9a4ea9f8dc18e71b044aab58a0635e2aa5aa160b05eafe3f74a3b92760f14581beaa49350f7115973e4e8c1100fc66339f8cf9a6 SHA512 6e3e819a72a565f268c4a9d136258be31d79eae6378b40ac26b8d227ef3c7af09be445d9f1724b0bb97435ca60ab6ae6c97338d3a8c7899a11b9e65d98aea79a
+EBUILD zope-testing-4.7-r1.ebuild 844 BLAKE2B 50f1369735561cdc85bd284da42eb0be0ccda9ae7d62bc4e8f60a97cfcbb49c35b751bcb0d118e333abd2003cf2b137daef83ae3b2ccb3ad336ff3b66b5603e4 SHA512 e7ee4bf69d6e5fa841e8ea11a7542c772fcc90fde186fca29bd47ba92e116df046038051c6d859fe2e816584f2cf116aa1ab2a373e9a048b9a68868aaf9edd3f
 MISC metadata.xml 382 BLAKE2B 3931e1281c2947e5d4582aeb10a79579e4b3c7bddca959fb1f6a65f47cd1b42df2a54f8d3200d3ab4f1dba843b978a4bfc29a9cc23070977ddfee1a74b3c69e1 SHA512 ddd7e2cd30860e71eee851d969e3ea69f72edaf4dff87dba784925e203cd1f0fada3c51090291fd8b5aee8e715f097a0bd6be1e89abe37526f57dde529c5e61d
diff --git a/dev-python/zope-testing/zope-testing-4.6.2.ebuild b/dev-python/zope-testing/zope-testing-4.6.2.ebuild
index 79eb6ef1dcff..b4e329f1d448 100644
--- a/dev-python/zope-testing/zope-testing-4.6.2.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
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 0a0141ce6a97..83dafe59fd6f 100644
--- a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
index 21254fc73656..9927c5b60d9e 100644
--- a/dev-python/zope-testrunner/Manifest
+++ b/dev-python/zope-testrunner/Manifest
@@ -1,5 +1,5 @@
 DIST zope.testrunner-4.7.0.zip 260508 BLAKE2B 5ff63debf8119aff46a8c3ee72a4431815b37de80922cb5b8e4a318cb99200acf7dd6181b15a8233ed879f312997aab68a3439dab3dbc737093cde1ae48d619e SHA512 edda96e6871d954bb1f46ca18e2de9d1726d68cb3787f080b3b858c4dbdc2ceeb809962d178350a354e16c04711a89b2c6d1f663f256e1f72c15a7c494e51d32
 DIST zope.testrunner-5.1.tar.gz 140679 BLAKE2B 4044b9c77bbda6610b803fbc91cb7bb4d1aaeeb041c32cb91ecd05e05d75a685cd4b6d4531fdcb74380e6ce3fc40f32d21f71ad346491667458a165a90e3a401 SHA512 685d1e1512bd85a00c34f4f89ca1e0f8d1f0939de7b25db0cb43da44e5e41e735e1e9a5ccf2a89b959d7d5f074da71dfe0fd931bd62082159ec65c0b53cd38c1
-EBUILD zope-testrunner-4.7.0.ebuild 1141 BLAKE2B d37c5a9e3ac122f4a9cd06b36966e2ed420607a0f8b0ab5fd14fc15686b1826234d2ec081b62cc65347ae760b73104a412b2457481ab4cf346f3c57b4bd90e63 SHA512 adbf464d7e7e0727d29a3f0e9fc952b7f9e3081f5f6e1036975716405dbc1b4276075d2c115004a2815b3bd2380773f851e70b4d76dc932bdd6304e6f8d82b8c
-EBUILD zope-testrunner-5.1.ebuild 1023 BLAKE2B 61ceb355e93dfa5f89de37e7a60838a4c128db8a78959b1c5651740f7da728033d89b161e194dcfb2b191a5340529186d8de61040f6d4b799704fce49253f989 SHA512 c7c0cd072bf1618a18712566e803b72a23d39173eb59b4d99e97869973a4958705ec47fca76a68ce7bb2e5b33be004c6abd9989db361b5ce65767948e9137124
+EBUILD zope-testrunner-4.7.0.ebuild 1134 BLAKE2B 05324fcd3c3ed1a353177ab56da502ec0a1da7c189bb4f7b0cea90c891ccfa97c9a56c8e5ff23dfefa2719a4423fbb82573b53caea1929710a0e36d96a8f2b46 SHA512 cd8e13c4e975f1e162058fdbd24b57967505717e64a067600a49cfbe0122ac44c6cca6925ecfd975ccb879118dbc594015a5e8a1fd342156d35126cdeec90a45
+EBUILD zope-testrunner-5.1.ebuild 1037 BLAKE2B 2dca6bb079089098c62067982bacdd7c36dd1a7852c97585c311ecb8d8ebecf312a0ed22f855e5f7d48672d0d26dfaf6e374513ef29e74f18d3fdbda1ba7b5bc SHA512 0767e9747fc29d03a575827ce10cfb15ca8f53a83e8cc8fcd685fc9483f1252dcb625d81cbe023528c1091452bb024b4b075b67d98f120316aed2a3408b791df
 MISC metadata.xml 388 BLAKE2B 7e19b9134023bf0117cb60760a8579041f1627be3c018be3cad9dfb69d38cc269b1a44350f79a8b282b0ad7035b0328dcaea341a84b09a0a828175d5ee68bac0 SHA512 a6f78bea0ba1c56a15e520c58411503dc976224e7fbf5cc263477f37d5744da29ea3cd4a52c317753a3b68d5efc60e4b3ef8199f9922484ae8b916ff67bd2a32
diff --git a/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild b/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
index f42adea0763e..f3b9415e8536 100644
--- a/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
+++ b/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.1.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.1.ebuild
index 40796ed4ea33..f147bb59206b 100644
--- a/dev-python/zope-testrunner/zope-testrunner-5.1.ebuild
+++ b/dev-python/zope-testrunner/zope-testrunner-5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 7b5d2e9fd7ca..fa68a7a20ced 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,7 +1,9 @@
 DIST zstandard-0.11.0.tar.gz 641440 BLAKE2B 291db5ecb798a186aaaa0779e2972eb3889cc318ba7a99f0c40988676556bad8c6978181fbe5f797e9936615f965a8b57e711ed99ab2fa761272797a340bffbd SHA512 96e6faa3c31fce59379e037e4e7789b91d1608703ad8540fc8fe3d249ec65670377f2c3233ff21d7ff90a1478ac1fbbd2e169fe2d798a6889a200d71540f75a7
 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.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
-EBUILD zstandard-0.11.0.ebuild 670 BLAKE2B d50ef13ab06e001181527671afec0d3154e93a5d4965526de7f287a6fbbde250918cf8f573794212b638ed2d71ae312486ed3c421559a0559396abbd793aeb24 SHA512 2f77dac42d7c8ac18bd9b61e99918a99eb7b7be6ab8cfc39284e6b17202a6e834b23a2deccb0f7f76ef35666010e871c43a932ca8d42214794b2cfa054aebb43
-EBUILD zstandard-0.12.0.ebuild 795 BLAKE2B f1a35982c2871bbb23c2185a6e4876ca51eaa28d6ff36b74fca91463b81e54b5a0b5fc0323616644f54eaee00fa8902c2aaba47c97f4f12e2134798e78f48725 SHA512 5fdfbbf08e7579a2b850cb0b80d94c96f6b5067938b665bd6acfc5dc7a3000c86335e407bb1a0555fca150f4ce21ba72a005a5a0a60d04003056995ddbdbacaa
-EBUILD zstandard-0.8.1.ebuild 672 BLAKE2B e90936815de88b0afb69bdc32aa16dec5d41aaa9f5383820124d9cf83f76ff12244d23e0028113f86c8584f5e707aef4254b81e54ad34f5e0b7547e43a0af4df SHA512 73c57f3d5e68281bf91fdfd35061ac0fda75a60d476265409c263910023e787b98a65884b23193afd8148a0420d3a6c42dad2ba07567eaa1bf7368bd51c494f8
+EBUILD zstandard-0.11.0.ebuild 668 BLAKE2B bf256ad39a55320643dde62e832da92c65bdae8519ff4021bb65ad49c6f8148cd235c1bd0fcb9524fe61dbe4e50d678a2797f5bbaecfa6e81db306a0ab124f3b SHA512 7a0c670db8be5b0bb6f305f6337c72aae5f729ac4129d363a5077ff8f9a1d2f31ae0bd4496b5448f7e0338aa52f3284b129d0d0a241af416ff1eeeacb3360e63
+EBUILD zstandard-0.12.0.ebuild 793 BLAKE2B 76b4881858bbd71bea8498befdd98d65e85a168422d4b7b371eb726b5163257e9f564299f9691a90b995a013cc47114aad48ca5c9809582615aca9f42ea63e3d SHA512 ec6b57a43b9fdfa6a13397aee422bba4cb3e3c9aa404057f537d6a49f37c3894cbb587b4555920a559355775d2a3f2bcbb60664c206aec56c84a5c9714d0a012
+EBUILD zstandard-0.13.0.ebuild 866 BLAKE2B ff64ad96c334aee50b6ded3ecfa3e21f09ffc8f3b0cdc17b1858ae2587374a9df7dc3951740218e5ac3d66b9044b12711604b798ceb5bd24570f95ee45418759 SHA512 c4740f3d3b1f44494188733cef44be83c0475eca24268421f2087aa4956a6039d4863fdcbf9c539a43aff8f5b43d1b9a58103f8dc92e399adeddd8c6a20d7599
+EBUILD zstandard-0.8.1.ebuild 668 BLAKE2B 3f131636cc0ad07f8104bd13ff22036e1d3468c75a3b4abfcf76565d89898f5a515a40e658903e1785c13c6b86d6ddb081e1bf76ace4a70c414411a77577e60a SHA512 d5542c88d82d2a94f68ffaebe78a4cf8711baed9d5fbfec807bea8aa37d287ef3ca2738ca8c282972e420dc6034dbba15cd4c746a7499e9c99f1b77a400b75e0
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.11.0.ebuild b/dev-python/zstandard/zstandard-0.11.0.ebuild
index 6664abda59e6..9d476621e41b 100644
--- a/dev-python/zstandard/zstandard-0.11.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zstandard/zstandard-0.12.0.ebuild b/dev-python/zstandard/zstandard-0.12.0.ebuild
index f4dd005d554e..e1d83cc6a607 100644
--- a/dev-python/zstandard/zstandard-0.12.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zstandard/zstandard-0.13.0.ebuild b/dev-python/zstandard/zstandard-0.13.0.ebuild
new file mode 100644
index 000000000000..b43dc65f0555
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.13.0.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=( python{2_7,3_{6,7,8}} )
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+python_compile() {
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index 452c1e0a4598..76fb03187463 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1