gentoo resync : 03.11.2019

393 files changed, 3146 insertions, 4222 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0ef44adf5aff..d3017278cef0 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/Ming/Manifest b/dev-python/Ming/Manifest
deleted file mode 100644
index 77e645f1153e..000000000000
--- a/dev-python/Ming/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Ming-0.5.4.tar.gz 62412 BLAKE2B d8978d78c4aa105c89aba8c9d9f6d9e49ace5ac90d16e99a5d64d7aa874d790b4a69f48d7b6a3eeab54243c25de7fc2fe5229bcfc226a66004f121a3e6fd3440 SHA512 93e280da04feaab2d7162a4b5d7da4b781d4a4140e114bc1512f695e1deee206397e5bff7ad3338eefd224e4646958e021353a323b809f45bbe7d56c43bf14c4
-EBUILD Ming-0.5.4.ebuild 858 BLAKE2B e70126d71a6a0c47119dcd73fa023689d98488f1d9ac5c66a7b5e7c0f156d161b50470222f1b55fd0d2c8fe0b220d3df95fcbec26439d9826d91d88de0542995 SHA512 1ab652b3cf4e338f5896c547d13364f07ef64fc10225cfcb34d862df2a479774163674388189d46be38364e6c76d5acc38b915276c1cb0bf7850f94305e8a0da
-MISC metadata.xml 295 BLAKE2B 9a1ddeb9ad603ba60c98702e07782a38a7b41d367e171d6c55df9746fe21e30ec684868f40bce528ca279ee2e4271c1354d0a69d8872465ae9d72419cb3ab103 SHA512 29d423b14460deaeb257b5196f7e762e5403b1118998e0139c492282891865f290e555f2ffa46421a98878dc808e2d3cebba259be1da4c7aecbd715ac9566d84
diff --git a/dev-python/Ming/Ming-0.5.4.ebuild b/dev-python/Ming/Ming-0.5.4.ebuild
deleted file mode 100644
index 4e3551dd2ba4..000000000000
--- a/dev-python/Ming/Ming-0.5.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=(python2_7)
-inherit distutils-r1
-
-DESCRIPTION="Database mapping layer for MongoDB on Python"
-HOMEPAGE="https://ming.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND=">=dev-python/formencode-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pymongo-2.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-1.6.1[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/Ming/metadata.xml b/dev-python/Ming/metadata.xml
deleted file mode 100644
index 6d9175d2b32e..000000000000
--- a/dev-python/Ming/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">Ming</remote-id>
-    <remote-id type="sourceforge">merciless</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index e7c69dccac45..2d74174342cd 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,3 +1,5 @@
 DIST PyGithub-1.43.8.gh.tar.gz 2842219 BLAKE2B 7711885beb4cb855ea5a5755abe881f7ae7825feb76cb0ab30aa9ba4a2530440d2816439c43da23a42f134286fa0806875d075920776960f04cdd21131bcf700 SHA512 dc58166ebb27f855ed4f32448029abe7e53b8050d8d99029d460f2dd94180ca8bcef68a75469293abd021f70cc3c67c32061e6439db1b3f1dc77af464c658bb6
+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.ebuild 1089 BLAKE2B fe2cc32412ec96bb845e5fdfcf4127309165497ea00142af5c3f7fd10a87f8f8d2dac102250c8485ecf9d5d61a219cff0c724f580d9198afc82d15198e83f231 SHA512 f970501be33ee797717c3d7556e9a0558c8af047349333572bfc89e14829876c86875dd602ed97ea25afecc51252997330e73c8735db8421a4e8809201b0fe95
 MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
diff --git a/dev-python/PyGithub/PyGithub-1.44.ebuild b/dev-python/PyGithub/PyGithub-1.44.ebuild
new file mode 100644
index 000000000000..48417603a98e
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.44.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=( 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/aiodns/Manifest b/dev-python/aiodns/Manifest
index 190b05bd65e4..79f0c664b2d1 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -3,5 +3,5 @@ DIST aiodns-1.2.0.tar.gz 6457 BLAKE2B c1035e5a31b179665be1c7c75e3e8f6665e04c43d5
 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.ebuild 620 BLAKE2B 888cb9792f90ba164b9b91566427b99e5ad53f19cadac04ad8eec09fd8624cd260ae1426d3c4acf2f3188c0ec4563cff96de387d5a845fb8ac6197f47c8e2a61 SHA512 57dddd8c913582912c15245133832dbf7b7480093ffa815f44ccc7e2e1fa12f4d1f68402687301c920ef35e4c48daa044881e64cc411d2d429d769d55508a4a7
+EBUILD aiodns-2.0.0-r1.ebuild 826 BLAKE2B 840cf7184879d8495ec087fddddc68b87d93301ecc4c602a542140eda31479ccac7086f7bb6b0bd5b4617362f27e9dfeb898e90cf83af882a4670432b36888db SHA512 ca0b65a0a60e88da1a29dcfde22c8d241a4b15f560758733838adde9d91155aea1afc19b5d8f538bdd26c1d763f2004526bc4ee3de7246a04f9aff30303d7ea7
 MISC metadata.xml 340 BLAKE2B e607777274ea754605542b7ade5ba3d118ff366ae3bc57f586031450dd54e43189e0e1b3fd8305e351380bda96289e0cd95e074fdebaa7816da757329203775f SHA512 b77ba4eb56072b4801832400361bcc80e73c2f0f1507e9abfd8c9beaa255594554b4a2555e3304307af6c515bea097311c70f515f875a7a98cc197e5cf538ce3
diff --git a/dev-python/aiodns/aiodns-2.0.0.ebuild b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
index 7763f5b57eb9..0799c11f85d1 100644
--- a/dev-python/aiodns/aiodns-2.0.0.ebuild
+++ b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
@@ -21,6 +21,13 @@ RDEPEND=">=dev-python/pycares-3[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	#692720 apply https://github.com/saghul/aiodns/pull/73
+	sed -e 's|typing; python_version<"3.7"|typing; python_version<"3.5"|' -i setup.py || die
+}
+
 python_test() {
 	"${EPYTHON}" tests.py -v || die
 }
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 9d469be24a49..3ccd7bb2d49b 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,3 +1,5 @@
 DIST aiohttp-cors-0.6.0.tar.gz 42507 BLAKE2B 7b63916b983d3dc208058c8b04445a30762eebc4999135ae802d1ceeeccc476a335eae66126bb3fd16f938af3649e8b9096433c2df09e82bf4e5d4ba8e38c42c SHA512 75453ebbc074d5f25cc8efc46ffdb76fc90b0a96a9e6fce0eee5a5f28dba31cb50301289cac3b36c70ccdbc10c8f4ba9e362d8e9f350ba7f9dfacd06e6f5e699
-EBUILD aiohttp-cors-0.6.0.ebuild 1112 BLAKE2B 009f09b9520da6d5b72e968be95e1463d1ef4e90137a3f4ead73d402f0c712b29729fc66ff410e63e5ac25d9fddf94817922d73eba0aaefc910d5edc42503057 SHA512 9c60033bcfaca86e7329acbd6ca9cc2fddae953ee3570b29865b733102e53067df1f252ccbd4a634d2ffbba6a22d530b422ea33a045891c03a0b587101ceec12
+DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b
+EBUILD aiohttp-cors-0.6.0.ebuild 1114 BLAKE2B 3f1f254f99f6d408fca471c99bcb5326f85a65c125110a22f1810cbdc52109f6b0a93cd82be0af8df5f44f2e12b91edaa2367adddb47956643449b4e1052664a SHA512 a99d07dcad0374b244b7dc3713dc6d9d9b69aa98ed1767f2b735d2e9575f2dcf2de97c3f71d0f96f0c8b8e523a8eb270948ca9f4c465b9d6349e2682fa559f98
+EBUILD aiohttp-cors-0.7.0.ebuild 1114 BLAKE2B d52a42162c78dc524ffce2389311335a1c4a6ea0147434571382d1bd3a6078f348984103081ce6b82b5a1a7431e66f79b8a8dd1fa01cc88d61982dff52f9e8a8 SHA512 64993361f2f3ef2de3d46803e1519665281c667b44322dd2ef2b381db1552c793ca94358c9796fe535ececcdc4ab7e0747c91754642f90fa8759c0217cc5eb37
 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 2ef943a0aea3..e5b671ad5b8e 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,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
new file mode 100644
index 000000000000..6bd3345141ef
--- /dev/null
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.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=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-cors"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp-cors"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pylint[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-pylint[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# for some reason, it is installed by 'setup.py test' on py!=3.4
+	# TODO: investigate
+	sed -i -e '/typing/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/attrdict/Manifest b/dev-python/attrdict/Manifest
deleted file mode 100644
index 39b708fe4f40..000000000000
--- a/dev-python/attrdict/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST attrdict-2.0.0.tar.gz 8994 BLAKE2B 5d2fa4faaf19d275cbf3c21125ea0916e5d52da5a443702c2c2fbfbacf362890218610cb799ef718e8131dacac403ab18e54e3e588012b6155d42ea7f3522855 SHA512 6dd363eb3bca83c84dcbcdd04fb2a7f5360ff5c97b7e52159c4efe61856a37bb6a9427da00da07cb9222f3cef6de18b94bf2da5d0192372f9252a130fa476b7d
-EBUILD attrdict-2.0.0.ebuild 606 BLAKE2B 1822ac4da040578a75fd3d5f584ee9026a1943581151d0cf0d78a89d4c4f5cab43a6a661ce4ec6cd7b33a5809af78a2e930a9d433024430b7178b496f58f657e SHA512 407f21708a7294d9cf085ebe8a6ff96d5ac1a7b3c9f3843678069f8f883cfe7fe270ba1616597cdbd9fa766c6a5440e871278dd6135a1e40fd6647eee8e8a0cb
-MISC metadata.xml 288 BLAKE2B 9a65e428e3e59387b1b012e1b18583e7df62c14944da5b02d14799bd178401c961c41f7857090e5a67e2c4e1629abfb0f15ba81de67d351c92eb5ec83b3163f5 SHA512 a05f6666787f9df3d1c0e5c69c371d93f5f9b081fc8fc5eb4cda7119c0b7d83a951ffb6f7f9b41e7f9307d3c7a3cb324bcd2838adfaa8b0f4828ff16082e8fcc
diff --git a/dev-python/attrdict/attrdict-2.0.0.ebuild b/dev-python/attrdict/attrdict-2.0.0.ebuild
deleted file mode 100644
index 03642d3ce00e..000000000000
--- a/dev-python/attrdict/attrdict-2.0.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,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A dict with attribute-style access"
-HOMEPAGE="https://github.com/bcj/AttrDict"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py nosetests
-}
diff --git a/dev-python/attrdict/metadata.xml b/dev-python/attrdict/metadata.xml
deleted file mode 100644
index a9a59b0d94aa..000000000000
--- a/dev-python/attrdict/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">attrdict</remote-id>
-		<remote-id type="github">bcj/AttrDict</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 57b73549fe96..53c259f91cff 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -5,6 +5,7 @@ DIST awscli-1.16.190.tar.gz 1283492 BLAKE2B 9030c7d1c992b15d816cb611a132ab6cc50e
 DIST awscli-1.16.215.tar.gz 1344712 BLAKE2B 408c30ec166d1614a6b877b0d88ce3c41668fe4c0e147c4a4df5652b5c9cd19735da8af857dba5534f84dc35dba1d35aaf2409ff68bfa4464e4abcdd711d26ff SHA512 16168fa034498df09587854e4c628b6b4e5ed589a7c023c2a48fb740715f14a2aba53bafa6dba7d6a16a50292f0bb19027bd5704901a009d95795c05cf71f5b5
 DIST awscli-1.16.220.tar.gz 1363235 BLAKE2B 9db063972092dee9d03cbd6567544df2c8c0fdcc57f447667b402903bd39c46ca61c3ee06e7c00bd37a99bdbc14847a86415ed2eb7621a5f57606c03ac602ee3 SHA512 b1c2d1e8ac41e92735b6b48f112b59ea869c210991511a51725b38223865c57bb64687ad6f1ef03ab620a133bc6afd1e530ea5f2912824097638c46926b7e3cd
 DIST awscli-1.16.233.tar.gz 1395357 BLAKE2B 4ebd3e51439891464864a2c8a089da96d3f33a77fe78810b073f746fa6015608f8650eb51c1b148c2cae6030f736ea2e6c01f3f21b2fe73bdc0878fd0215fea5 SHA512 356433221e352437d4f4997dd3a66a8cb866388ca480ef9ef405d8eb1d5d034d6a018c6b303446c07ff5b52778035e6b0df5922ca2fbfbb19628de3f04c9a34e
+DIST awscli-1.16.261.tar.gz 1503153 BLAKE2B c507c37905e06d976b246f4636462d79184c62a8ee55cbda82d835cdc7294419e7cadd6c2209a9f0b6768cedb6ee6dd201d3baa7edc0a0a545bd7d5ca7913d45 SHA512 3245d4bdab98d8385a370385b4f0f3038007740c3c6c3a2e30d64e7e4e83230b0d016bc55072fbff10c6e4e533633bf02dc3fcd9b7ed45c248b1136ea62b9c3b
 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
@@ -12,4 +13,5 @@ EBUILD awscli-1.16.190.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6
 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
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.16.261.ebuild b/dev-python/awscli/awscli-1.16.261.ebuild
new file mode 100644
index 000000000000..4ca105e91809
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.261.ebuild
@@ -0,0 +1,56 @@
+# 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 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.12.251[${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/behave/Manifest b/dev-python/behave/Manifest
deleted file mode 100644
index 7fd59121855e..000000000000
--- a/dev-python/behave/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST behave-1.2.5.tar.gz 385738 BLAKE2B 0474d6442339ea263cbbc58a3d4ce86bd576d3b4a9e46cc14ebf9b722a07c4d85f7203791bab427188d24ffc75b92011dac3c967503177cae4e0d26d25d171c2 SHA512 137ede0baed9df154087249df8dcae81ab0cdf1de91a5790fca7ccf3231ba2ba4e64623abd2b8c9bfc459ab6575f68b9ef7e03e33ef79e524d9443a8489ec7fe
-EBUILD behave-1.2.5-r1.ebuild 1409 BLAKE2B d2e703777f9ec5e2a3c1373f979bcbca103659ea9ca2391f13b8e620026f51e7442b61cf89d6fdce8f2ce84665d55e94d95c82b850fdfa4ad6a515f44165ca90 SHA512 749877c8c07b7c5298d56a1da86bcc89e16c3022720e3f751c58bd62071c1cdf1b66e64bbd69b3795b840a3908f7f308919164d5696a948eb0e511e7fb902abe
-MISC metadata.xml 287 BLAKE2B 44ef37aa60392839a27feaf73bb9e9c3d52addba0ba77a1fb3019c1d8ea4d9a5d925bdd8a3e8f589ba5a8afd56a80e2500f1974d83d7678f75c2ef3eae102872 SHA512 8debdc83fce934b6d17b07fdfe9f0f3fc6b3fd3fc12f012e0da02c74cf8f0854ef14cdc16b456143e137afbb5f9a76a6874c4b20d78126a046f4819773d3bb60
diff --git a/dev-python/behave/behave-1.2.5-r1.ebuild b/dev-python/behave/behave-1.2.5-r1.ebuild
deleted file mode 100644
index 31df6d6bd6af..000000000000
--- a/dev-python/behave/behave-1.2.5-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=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="behaviour-driven development, Python style"
-HOMEPAGE="https://github.com/behave/behave"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/parse-1.6.3[${PYTHON_USEDEP}]
-	>=dev-python/parse-type-0.3.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}]
-		>=dev-python/sphinxcontrib-cheeseshop-0.2[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3[${PYTHON_USEDEP}]
-		>=dev-python/pyhamcrest-1.8[${PYTHON_USEDEP}]
-	)"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests || die "nosetests failed under ${EPYTHON}"
-
-	${PYTHON} -m behave --tags='~@xfail' features/ || die "behave features failed under ${EPYTHON}"
-	${PYTHON} -m behave --tags='~@xfail' tools/test-features/ || die "behave test-festures failed under ${EPYTHON}"
-	${PYTHON} -m behave --tags='~@xfail' issue.features/ || die "behave issue.features failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/docs/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/behave/metadata.xml b/dev-python/behave/metadata.xml
deleted file mode 100644
index 99d6f508ed26..000000000000
--- a/dev-python/behave/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">behave</remote-id>
-		<remote-id type="github">behave/behave</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2c84a88fe52d..c03066d1cd2b 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,5 +1,7 @@
+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 1225 BLAKE2B 2d8dc5ba2b83ab3def6d37821147ed6e6c42676cac7def1cdf5ddfe0396c178a42662282157bce19421c8a57f51ef074514d306d0fb77bfd61a8c419a51bcc98 SHA512 cbc7886265dfb947f020b72498118dc3af9c00b75e3d2744316c02d7fe09c380b87568a34dfb38521be5e1f444f1fe251bcdf14cdbb2138f92562090ec58abfc
 EBUILD boto3-1.9.122.ebuild 1223 BLAKE2B 524f6253ae78c1a0732c364ff5cb83ed3477ee896c12ce1c66a76ccd9fa2e555a8b77c0bc77bafe96f77c5f90cf8e1a577ed39c4ccb97defadf8c45cb7d0713f SHA512 f4e8bd983fc057112f035e7b9768604f23859d301bab10cc138ab98207270bf1da8c4f96464128d2deeb75d501d89d150731b504aa2ff39ac9ad5ea3076d537e
 EBUILD boto3-1.9.4-r1.ebuild 1223 BLAKE2B 524f6253ae78c1a0732c364ff5cb83ed3477ee896c12ce1c66a76ccd9fa2e555a8b77c0bc77bafe96f77c5f90cf8e1a577ed39c4ccb97defadf8c45cb7d0713f SHA512 f4e8bd983fc057112f035e7b9768604f23859d301bab10cc138ab98207270bf1da8c4f96464128d2deeb75d501d89d150731b504aa2ff39ac9ad5ea3076d537e
 EBUILD boto3-9999.ebuild 1225 BLAKE2B 2d8dc5ba2b83ab3def6d37821147ed6e6c42676cac7def1cdf5ddfe0396c178a42662282157bce19421c8a57f51ef074514d306d0fb77bfd61a8c419a51bcc98 SHA512 cbc7886265dfb947f020b72498118dc3af9c00b75e3d2744316c02d7fe09c380b87568a34dfb38521be5e1f444f1fe251bcdf14cdbb2138f92562090ec58abfc
diff --git a/dev-python/boto3/boto3-1.10.2.ebuild b/dev-python/boto3/boto3-1.10.2.ebuild
new file mode 100644
index 000000000000..bb665fd73e2b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.10.2.ebuild
@@ -0,0 +1,53 @@
+# 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 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-1.12.4[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/s3transfer[${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}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test 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/Manifest b/dev-python/botocore/Manifest
index 0963b8b7c96e..7cba26fcc719 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,13 +3,17 @@ DIST botocore-1.12.122.tar.gz 5492931 BLAKE2B 05371245cd0de404713f920d0651f9bbdc
 DIST botocore-1.12.205.tar.gz 5794632 BLAKE2B dfa0813ee1cd4d6d699fc27f2777da95b1719779bbb84f3d7d61da5c85b76c79286acfe304c598bade8d5320088070d1d69d99689f32f6efb05f04ffa66492ac SHA512 53d3770d8b771f3bbedbc0d6046cebec0b3961550c38ec29be4dd2b8c5f4da0150e70417f2070131746ab5c0df40ebce4ef6a1a2d6de0ce8d03e9928dbeeb594
 DIST botocore-1.12.210.tar.gz 5859196 BLAKE2B 4ce448ea4bbf5bc21b84395188a7236a0d9f18c87c98fa3269185a2d947dd84f78cfa43b1806f51783f6009e1cbfba2d8833b5e3e6633eb3c4185dfd5ffaab77 SHA512 85e0679597935ed13ddd85997156a424df5b32bed1c96c65f89cc9eafd653015f87f261a042574bd8773dc46c76fb38da4bbddb031f20226fdab708c2438b1ce
 DIST botocore-1.12.223.tar.gz 5892788 BLAKE2B 32a25636c7e3882e567daefeb0945863dd1b3c096d0c8459bec1814a371b455347ca7dbf21d8fffa5f3edb75fade36bd1dd25d86c23e2a01a3b465f769f53dde SHA512 1dde1fa483f9227f1048bf3e28bbb67687016d61a61781808dfdfb36b6024d680581423b5240d513c9d96e24fa94a762feb1aa44ef92bbb916974dbcf7c3127a
+DIST botocore-1.12.251.tar.gz 5936418 BLAKE2B a665d8a4c22bde4e5968b845e6df072a3ed2ce53561e007f2eaae144a91a77a32566c3c7f7a0158136b3e6d67aacffd5b77eed5fab51fe60fdfa29eb93e918ce SHA512 b29930367c602d40a7ce2386070dbaf83f34ea9321c7da40bf76ad7dae0587258fa2b3a058d17932d3e5fa22248c3ea5c838716fec5dce8da49e851b5c4f88d9
 DIST botocore-1.12.4.tar.gz 4800384 BLAKE2B 121019d3c33872fdd874ddba36ecc8612a6354068ce7b759cbe7f35a9787e84c34d3a71ef3fdd2d721d3c3973a7600e4398cb7cd2a3ba698464c15137845bdf3 SHA512 8d196984f5623df403a8a23a9b7e7061e59c0ca56103f89d749d6ad7d92168ccae267f85312f2949cee322776d7948f1ecfda3d9d2783e8ba92fde7a178e8cac
 DIST botocore-1.12.81.tar.gz 5383717 BLAKE2B 0bafd6038cf4a5d1fa4f0597024b09eca48ab95d071cccd09b1910ccf839719114166fab7d78bd2b30dec4b4993a0751d9504260636174df5f76f02495e79960 SHA512 d3be22af53a8c6dd55be3fa0b84a55cdce22d30d6e6f04b0bb69539b8107c86de6b5494079e3af40f9b5285ef10c21e69c85295e5cd7c6dc5ab5be91718a2ea9
+DIST botocore-1.13.2.tar.gz 5560942 BLAKE2B a46c72fc62bb776e4d462fea49d7010f45502c201d956ce5878fe9b8673cadf186b5c61e60bda5d666eb47454799fa53f40cf59d7f10246c79374132fc3d03e8 SHA512 ef48ae18c61c83b43ac435c9b9e3e7c69963c19cc79bb34c7541d5d823f952c022b1b7e4eb1dfa33dd9fe5c14c87f7cf72d0e9d17012984c9f10c06abe27d279
 EBUILD botocore-1.12.122.ebuild 1489 BLAKE2B ae51526223136a8809a7c834cae3db2b95f940870ccc96b64d7c79dbdad83ca85e235cf169357fd25b4632aa0a87b0d8c7d7ebb739487435518a8a595b9139be SHA512 9c8e8400fad4fc0adef47bfa77767a0e59bef09c98a54492c0f0a56739b65b0689df8cf3702eab42e545a9dd257a5b820e39c31b9f23860f7792940dad4521b2
 EBUILD botocore-1.12.205.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
 EBUILD botocore-1.12.210.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
 EBUILD botocore-1.12.223.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
+EBUILD botocore-1.12.251.ebuild 1488 BLAKE2B 0e0b08cd23b6a311db992753ee65d6375771241a1b588f02de98d4dcf27d0bc534a9f3c3851322f7ff60c37a7c4afc5a28400756feb948a6ca7c71c08f41fcb2 SHA512 8d7bb8c5821453fcfbe6077666d7010ba1253f60afc34e23f8936e680e9fc84b3251b4e9f4ddccadf34b34aa4b828316351412b2c63f11845fe25dba7ee4eff0
 EBUILD botocore-1.12.4-r1.ebuild 1489 BLAKE2B ae51526223136a8809a7c834cae3db2b95f940870ccc96b64d7c79dbdad83ca85e235cf169357fd25b4632aa0a87b0d8c7d7ebb739487435518a8a595b9139be SHA512 9c8e8400fad4fc0adef47bfa77767a0e59bef09c98a54492c0f0a56739b65b0689df8cf3702eab42e545a9dd257a5b820e39c31b9f23860f7792940dad4521b2
 EBUILD botocore-1.12.81.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
+EBUILD botocore-1.13.2.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
 EBUILD botocore-9999.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
-MISC metadata.xml 375 BLAKE2B 562696aff0128b74dc4c2c0767fe03d53ae116cbc4fdb3a8649e36a8c689dcbd2a90bb5f46dcfa6a3cd71c9150f923281100ec098fe2212dfffa96d74e472d3f SHA512 c369567feea497a744245642a9a307b2a2ec06035fffc3b9b72d9f7ee9fe2f342d62cd1d06a668b47ac1b3187fc28845bcf3c220d942cfb2ac89f72809fc4a86
+MISC metadata.xml 487 BLAKE2B 4da33579cf14e968e507d4115e361aca7f13f618853758ae8cabd3ae7cc3adffdf374c091fe8086382728be8a59a8ee289408e53865807e0e0f93546d3eeadf8 SHA512 9df7187812d396f69b5a3499c20fa062a703c6a0385e63c812a2e1b7dd10a2c16343ff49d2585b17256623fe1b465f0e73d0fa39b07827338ed7fcfa38e45e90
diff --git a/dev-python/botocore/botocore-1.12.251.ebuild b/dev-python/botocore/botocore-1.12.251.ebuild
new file mode 100644
index 000000000000..a5470f903162
--- /dev/null
+++ b/dev-python/botocore/botocore-1.12.251.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=( python{2_7,3_5,3_6,3_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"
+
+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-0.16[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${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.2.ebuild b/dev-python/botocore/botocore-1.13.2.ebuild
new file mode 100644
index 000000000000..f81c7d0b849a
--- /dev/null
+++ b/dev-python/botocore/botocore-1.13.2.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=( 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"
+
+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/metadata.xml b/dev-python/botocore/metadata.xml
index b3df2bcad666..c2f3b25daba0 100644
--- a/dev-python/botocore/metadata.xml
+++ b/dev-python/botocore/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrey_utkin@gentoo.org</email>
 		<name>Andrey Utkin</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">boto/botocore</remote-id>
 		<remote-id type="pypi">botocore</remote-id>
diff --git a/dev-python/casuarius/Manifest b/dev-python/casuarius/Manifest
deleted file mode 100644
index f9266ad46d3d..000000000000
--- a/dev-python/casuarius/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST casuarius-1.1.tar.gz 139555 BLAKE2B 29905d1d6908f49fdbfd394a697dcd31a6ba34735ff9e06589c6b3b66a09569b1c4761abdfdfe30f6cb1b979ac6ad6303e35542f0f8907d722dd5e1f7f6073a9 SHA512 d0a77b285b923f72274b13240ab4ae079c4f69587093c43bb7375c8ba24517ba6a7e2ba429b3e9a6ee9c73736efafff00da9cde7d533f05de0c7675de1e62080
-EBUILD casuarius-1.1.ebuild 535 BLAKE2B 949286ff7c031389be5b63d28e650350e9bd3c10ad45c51a5a3313d4fdeb39a21a6aa1288bbad380fcf16465ff79a67f6a5a5afa80c3f379346380ecbbbaa313 SHA512 84ebc2975b07213c366a0060e3be067ae5f4375ef2a8fb53932c46c68a112f61c01ecb18667b0a2f93358d316fab82ce232cae80725c50c79b791de0e78925cd
-MISC metadata.xml 565 BLAKE2B 38e5c86fc39892dee86809ce9bb1bdfc28557a4b83008bdcdf65847dad351d77d5fbafd38bd183bea47cd07b38b89d2e74b559523a0519bb4aefa5d3f835c5f2 SHA512 2a6f233cfc6e2bf9728006b3a6b8bc30f046b8ab384320e68d97fc7fb2ad86163a454e93ff2f7bea4ef538dbe34b327ef488c4cd2bfc611f49d01ae6da2509a9
diff --git a/dev-python/casuarius/casuarius-1.1.ebuild b/dev-python/casuarius/casuarius-1.1.ebuild
deleted file mode 100644
index ca9ad6dc37d0..000000000000
--- a/dev-python/casuarius/casuarius-1.1.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="Cython wrapper for the Cassowary incremental constraint solver"
-HOMEPAGE="https://github.com/enthought/casuarius"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.15.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/casuarius/metadata.xml b/dev-python/casuarius/metadata.xml
deleted file mode 100644
index 78e902c3df34..000000000000
--- a/dev-python/casuarius/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-needed -->
-  <longdescription lang="en">
-  Casuarius is a Cython binding for Cassowary incremental constraint solver.
-  The solver source code is derived from the 0.6 release of
-  Cassowary. It has been modified by Svilen Dobrev to remove memory
-  leaks.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">encore</remote-id>
-    <remote-id type="github">enthought/casuarius</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 1dbdb04d417f..e61ce7e21d98 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -3,6 +3,6 @@ DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78a
 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.6.16.ebuild 1383 BLAKE2B 204499141ae1a75974ef6978c2d0d8677048816e316696be9ef9801b5f86d8d7deea2f57aa004bf12948c50077de6129afa1b18ef27794e2c62e2a6362acd9e7 SHA512 b54c0b704ed5e00c700ffd5deaa76252aaf8cd9ac5ed91fea97358e085d05a850bb440898803fc44451165c5b140035f4f448c572e5dcd984ce3f97363b770e8
+EBUILD certifi-2019.6.16.ebuild 1380 BLAKE2B 7180aa27e17db38fd7cdd36cfc20da801f6d87f2db041e8f5c1a0da23a4bcd6b9ae249e975a2e5df80134f2bbb34a10db7e07400ffdcdbfbd293caa9dd0ab07f SHA512 9b6a32ae29ec76ca6e7dc355634b2dc67e5fa8d414d5c6fdbb3f06fda4fa156fe74bd8a97e4650380777ccec20d0882802c200dfc28e25c16c98c63de749f5e9
 EBUILD certifi-2019.9.11.ebuild 1400 BLAKE2B 022ea73f054ea135c5f026166b650f0860e3ac3ee991b0c77ec05ee7d17c5384ad01b75d4b7591891b70aade4840b1f08e7cd6caae4580eb7e8d33a2ed5ae922 SHA512 c4d7db6ce1cb2e7ad9b8cfb3faf2f9396506ba9cd04b034337466db58ace2a7ce07ed122e27fee8a9e58ac45f3bf7151df267121f0c9530635fc38aa25c9f5fa
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2019.6.16.ebuild b/dev-python/certifi/certifi-2019.6.16.ebuild
index bae2921c91e1..b5a4c3be2473 100644
--- a/dev-python/certifi/certifi-2019.6.16.ebuild
+++ b/dev-python/certifi/certifi-2019.6.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-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"
+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=""
 
 RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/cfgio/Manifest b/dev-python/cfgio/Manifest
deleted file mode 100644
index eb808cf2c0c5..000000000000
--- a/dev-python/cfgio/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cfgio-0.1.2.tar.gz 17221 BLAKE2B d1fd3add411b221e77af0567e5bfaabcfdc3204a8045ab08286e94b91d5f57c904d5a4d2e9213546d3c22e313e4698a678bfdbf85e7bf505205b607571bceae9 SHA512 62b3d93097e088ca6a54efbeedfc42f2b565ec0692b2ed7b1f2ea028b087e3fea1d109ca4d268aa8d9cb499eecbd4c0b10c3092c8754809bf74ee62c03b947cc
-EBUILD cfgio-0.1.2.ebuild 552 BLAKE2B 24ad511682a1aa38498c120d3d5b3ea8a898d88bb1bd69d086c94172aba03cc270efd6e2c3d1dc3a53bd2b378cbaf4e52fa715d97ae1d6a171c083ab1bca7a85 SHA512 e750e7663cda0c5ccaf2418afee672c8cc1f14c41ce65c92654126fac379f77164c6e5b8b6dd5c6b710bc14e35557488b7710bcd1c20e7e1d9d23d478eb847d8
-MISC metadata.xml 248 BLAKE2B 4cf2cee3b29f73d36857d8ae741767564abf8fcef18fb022e109f40e949ff585bceffca957db7fab753887ba22ea6e655a3a509a84fc786b3bdaa99491cbf3c2 SHA512 5049b4d52501200442de9ca174923314f7c2a45c4f4c395ab0517603f26127f0781f6ac4d58d8b77fb7fa6d6760db525d78bc52e499bf7a9d66989406b628f37
diff --git a/dev-python/cfgio/cfgio-0.1.2.ebuild b/dev-python/cfgio/cfgio-0.1.2.ebuild
deleted file mode 100644
index df5ebff0b172..000000000000
--- a/dev-python/cfgio/cfgio-0.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=5
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing configuration file formats"
-HOMEPAGE="https://github.com/ercpe/cfgio"
-SRC_URI="https://github.com/ercpe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/cfgio/metadata.xml b/dev-python/cfgio/metadata.xml
deleted file mode 100644
index 7c0336919544..000000000000
--- a/dev-python/cfgio/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">ercpe/cfgio</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 6baa8f67e874..7e5ff68441f4 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,7 +1,9 @@
 AUX 6.5.4-fix-requirements.patch 272 BLAKE2B 9694f577198f94ee1634468750f4ca8a1d66014fd8f3a65719d53bd27d99855a76478a5946e4a5c9f3515ad39be28bd12829f7672e83c7b887740ae0dd2e6418 SHA512 de0d3be2d062cb6a3088eb4e75f0ea97f57c81ee2d207acfb28780a757adddcd4e1e718ff6afe27cf98981db5d8347186ba74bd89a940f8b7ac406429a4759ad
 DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
 DIST cheroot-6.5.4.tar.gz 81067 BLAKE2B 5304373bb8c7cefa341260d4fdb8a99b9e22041260342a716a6b95ba324b4f31d20fb44d8dc10840fb35d3b04de1283deb9aca11bc78772655bf7ad81cf16f3c SHA512 62a48ced225bf9167259b82f5e88a953bdc422982a6c0b0121b28e895cc8347cc033f573b57a048c59167586e0b21e94ad233ce2b65a1b72feb01db82b5ed411
-EBUILD cheroot-6.0.0-r1.ebuild 920 BLAKE2B 12fdfe0dde2dea1e41140a2c55fd99f7b5ae0e68d55e639992ab6c7965c539f75680cc543d54c56c49fdaa3242450f4c3006552d4d09caa5641502894468829e SHA512 7e62c7712e58d3666c9c1a309d9b0cc6a56ae526fa9bb7503cb7e10699cae8fbe417eb357980bf1eb2c3099b2e371873bdffbce087dd7116331e2dc6d4eed50f
-EBUILD cheroot-6.0.0.ebuild 923 BLAKE2B eb5a969eb7fbfffc1ec62a2d9b449fda59d64b187f0d7414d536bd86b13710bba42d55b13f6d1e8d41f03070d831e5cf785d2a23baa27dc3363d2c8705d8eb38 SHA512 9a6a50af9f739c9e985d415afaccf5c9bb0659e4c4f6300faad6f3b6935e5399123250dc64009dc2ff6016aa142a390b992288f5a8c259eef86e06d4be6a1d80
-EBUILD cheroot-6.5.4.ebuild 1749 BLAKE2B c2b8667ad88c37b326a6e1d6c101177c3415491f870e620d9f888dd1db9e1ae87dd0ba9477080b86d5fb191df8cb238c1a5650ec45380f1121dd87dd3c69e6a6 SHA512 3d9c52ab09d402c3b2bde8ea8485ed90450bc9259a72de7b13c8ed439274260a42b240dec2a126294bfeec8dd0a165d8e95c8b66f8cf7679f6e82efd5a3dd5b3
+DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360 SHA512 3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862
+EBUILD cheroot-6.0.0-r1.ebuild 928 BLAKE2B 19820055e86df187d6275757a0bdd8204e54a82898a8808fa361b4580ce1a7453f080ec7c83eaefa8062eecf6ca3aa1ffb87f31216c92568ab6a498f7a948816 SHA512 cf7dadecb9e0f46e9df84da6f271fa91e03995b002c278344684c82cc09416e71916a4efc13e195489db2f2da09996ff94635cc879e0bbf510314f1a8fab5ce7
+EBUILD cheroot-6.0.0.ebuild 931 BLAKE2B 26fd346bfc7525bab57373d11d2c2bda09085b6dc5a7883ea3cfcfda0cdb11be2491d1a382aa1db1e69db37020d2ee9957f328816636ad1cb01ee04de1ba5c0e SHA512 f0c3099b7137a8f577810dbf0f51f566a044661d60f7374c82e9146a2ec094594c69e74848539a89f2f99053aa9634dd53d3fdfe6153e9a52ed1460a1f323ba9
+EBUILD cheroot-6.5.4.ebuild 1757 BLAKE2B 91d67e14734ec541797afbfd6579c4bb30147500a7c51a7c8ddce734624cdf9653de60a0c22b73352e13e407a867eaf58e0a315023dcc652b5a5aaa8be18a5a9 SHA512 24fe894299387b4c92ed4aaf7ac7e710dee58923e22dc846e415b2916746bfa8ac19f078a91a50dc9141605d2b52a0e36fe5935edb0b001d77b1aecbd8d1da73
+EBUILD cheroot-8.2.1.ebuild 1681 BLAKE2B e6438a113aa7bb3a569655e071c7b57b6dfea757d073c32006b1a14611f405a1f495276b6f5bc071aa103f9535c3344ce0ffbd3d14f440980c9c3153cf71e961 SHA512 e794c82e118dec63a85e56882cf7242fab1cb0283b81d1f3586344d9b924a948f60d92452f8f202a9ab1f7e70d0858aad6c5a7b2b84251b9ad4bcef481ff25fb
 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 c2af48268b9b..1433e9d15da9 100644
--- a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="test"
 RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	<dev-python/setuptools-41.4.0[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	test? (
 		dev-python/portend[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild
index 21f4fc2d47a6..ce7dc4100fc3 100644
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -18,7 +18,7 @@ IUSE="test"
 RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	<dev-python/setuptools-41.4.0[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	test? (
 		dev-python/portend[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/cheroot-6.5.4.ebuild b/dev-python/cheroot/cheroot-6.5.4.ebuild
index 91d2b9382e2c..52823236539b 100644
--- a/dev-python/cheroot/cheroot-6.5.4.ebuild
+++ b/dev-python/cheroot/cheroot-6.5.4.ebuild
@@ -21,7 +21,7 @@ RESTRICT="test"
 RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	<dev-python/setuptools-41.4.0[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cheroot/cheroot-8.2.1.ebuild b/dev-python/cheroot/cheroot-8.2.1.ebuild
new file mode 100644
index 000000000000..bec1012424ea
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.2.1.ebuild
@@ -0,0 +1,47 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
+HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+# Unit tests are temporarily disabled for this version, see below for
+# what needs to be done.
+#IUSE="test"
+RESTRICT="test"
+
+RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]"
+
+	# Add the following for unit tests, some packages listed will need
+	# to be added and keyworded appropriately.
+#	test? (
+#		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+#		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+#		>=dev-python/pytest-sugar-0.9.1[${PYTHON_USEDEP}]
+#		>=dev-python/pytest-testmon-0.9.7[${PYTHON_USEDEP}]
+#		~dev-python/pytest-watch-4.2.0[${PYTHON_USEDEP}]
+#		>=dev-python/pytest-xdist-1.2.28[${PYTHON_USEDEP}]
+#		~dev-python/coverage-4.5.3[${PYTHON_USEDEP}]
+#		~dev-python/codecov-2.0.15[${PYTHON_USEDEP}]
+#		~dev-python/pytest-cov-2.7.1[${PYTHON_USEDEP}]
+#		>=dev-python/trustme-0.4.0[${PYTHON_USEDEP}]
+#		dev-python/pyopenssl[${PYTHON_USEDEP}]
+#		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+#	)"
+
+#python_test() {
+#	py.test -v || die "tests failed under ${EPYTHON}"
+#}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index f561ec6d19a6..ad73064e1ed8 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,10 +2,10 @@ DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e3297929
 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
-EBUILD clang-python-10.0.0.9999.ebuild 1059 BLAKE2B d2ddab5fbcf32eeae0491fdb41aedc2b1535183ab790f73231d18d3383c3ec729924305b183ae1748e09ea85d50b5ab4ed72b708b541bbb2129ba614b5fc7888 SHA512 1e3f11cde1a1bbe15894d0155ccd0122f2bd05d849e16c2a37a97677249c780d94ed3f94d20f1def8b1034e346a2a71596b514e76af35fb199ca8817485c24d9
+EBUILD clang-python-10.0.0.9999.ebuild 911 BLAKE2B 2be001063777b7960f8a65a96713d2e00b488c6786ff22f99d92607e2cec095d6655d969dfb035f50097044c72b445bf4ae6358fa5a0c33eb55c17f4d8fa53ab SHA512 28cf60ca9bb4b3973dae96063bfa276a56b78649667b450b20c86e1e4ec28738da150df5a2b4285396ee224028dd971fcc2e4e7d457ea3181e35a3bb3d5e3b94
 EBUILD clang-python-6.0.1.ebuild 1078 BLAKE2B 3027d387be07aa59fa005e3c78713396efad35c6c4d3f1f4ec78094b7bee22639cf15da7198be16f51077c8c09f89ca7c15500e21182bc89f106d26bb31bd28d SHA512 0aa123fa8a2dc91c5233646620e992d129c631f08064a3b57a358bfa13808ff26d922c70c84265bdb7119ef2364c17742b5ddfd424a9ee167deb0e408ffebdc5
 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 1114 BLAKE2B 177878f84ae0bac57c9fd13ac024fdd9e914444fcb6c8270e0ffba6722f356cd81434fd7d7c5142ab89553299244dd13854189e6772ba1f338298840e2356cdf SHA512 af2e0505567ea4746e9eab6624fa269d1c9e4f5b57fd550e3280d5f7194364feaf01a22d154d2c8aa3d07a1443c4e776f5663aeb982095855defb93f8c991381
-EBUILD clang-python-9.0.1.9999.ebuild 1084 BLAKE2B 21cf3f91928a3bdca3d6710983684965b1e1482eed624fb07a8923ee8fb600ea757f238b1c5e5ff26cb95788f8610336ef2cccadf626123df47fa17bc02cdc74 SHA512 2c5ca1cbbc34767d5e709eed66476bb6bf7806efaa003ab8167ce0ac06bc2c50747e95be21ff60c1c152d82ed733324277d0b801a97c43e6eee2ad8c19d6e37b
+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
 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 5a65d445f01f..3b6ab496dc37 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
@@ -4,15 +4,12 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit git-r3 python-r1
+inherit llvm.org python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-S=${WORKDIR}/${P}/bindings/python
-
-EGIT_REPO_URI="https://git.llvm.org/git/clang.git
-	https://github.com/llvm-mirror/clang.git"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -30,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout '' '' '' bindings/python
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clang-python/clang-python-9.0.0.ebuild b/dev-python/clang-python/clang-python-9.0.0.ebuild
index ad10831f6e23..6796e58d1b11 100644
--- a/dev-python/clang-python/clang-python-9.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-9.0.0.ebuild
@@ -4,13 +4,12 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit python-r1
+inherit llvm.org python-r1
 
-MY_P=cfe-${PV/_/}.src
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}/bindings/python
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -28,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
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
index d1c47b42ebfc..3b6ab496dc37 100644
--- a/dev-python/clang-python/clang-python-9.0.1.9999.ebuild
+++ b/dev-python/clang-python/clang-python-9.0.1.9999.ebuild
@@ -4,16 +4,12 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit git-r3 python-r1
+inherit llvm.org python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-S=${WORKDIR}/${P}/bindings/python
-
-EGIT_REPO_URI="https://git.llvm.org/git/clang.git
-	https://github.com/llvm-mirror/clang.git"
-EGIT_BRANCH="release_90"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -31,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout '' '' '' bindings/python
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clint/Manifest b/dev-python/clint/Manifest
index 967a33106205..a8aae1806a64 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 951 BLAKE2B e053b08e02cd6a38a1f2ebc58291632c54399ad64dcc3dc4abc34c9ebd8d6f4c91c7fe4a2f15cdbcb997e3341c889c57061a1aff4d060c9b119de3254db0a8cb SHA512 adcacd3a4dcc0d3b8fd034597aa22c22a4e9c7e5d9bbe1f7b8968e112bacee18fc593a6802895e4b83f1bc8752cb2a2cdd4e1da0cbd80727c4925ea2626cf2a7
+EBUILD clint-0.5.1-r1.ebuild 938 BLAKE2B 19302d1bb6be7b38ebbc021be570dbdaec5c2901cb1c4de93aecbf13ae8d76991f6dc4b218eb4be56b1f3707b9f68eebbbb0cdeeee94ec9d59ecf4c7918479ec SHA512 da0849b3f1500e1726dce370f2537f72fa7f34903e7ad1875a35cd9dc2531922f8677ee90f6559febd13a8a8284949236adcf677aee5bbadbb319ec3086c9c85
 EBUILD clint-0.5.1.ebuild 950 BLAKE2B ceca0d23d464abb06f3e8bc111033fc32629be61871c1ac58d0aa2ddff79d999b353fa5f7622dcc533f80e87e04a43e095a54c6109446b96bbe92d4834adf068 SHA512 af0ec1ee715c3d6ae902d807f541c1a2bafac90a7d7b655737aa6a357cf63657c57e158cc29a09e39e2ce2beeffbed9f1b6cf89fb676ac5ced0581c8201b7711
 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 f416abd9d86e..e32ea028bfd4 100644
--- a/dev-python/clint/clint-0.5.1-r1.ebuild
+++ b/dev-python/clint/clint-0.5.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
-inherit distutils-r1 vcs-snapshot
+inherit distutils-r1
 
 DESCRIPTION="Python Command-line Application Tools"
 HOMEPAGE="https://github.com/kennethreitz/clint"
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 0cb12c405cdf..188b1fb0e6db 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -3,5 +3,5 @@ DIST cloudpickle-1.2.1.tar.gz 42138 BLAKE2B 37579a1dbe6c38697236273f67221d2cc497
 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 749 BLAKE2B 6bb06894ea14b8949443688268f7c20334a6ced9715589b8463629d9965318cac3d9ac417c3e693450ce4f4d3889f14ed07366f82bf957c0401d3d3bbd678a8b SHA512 45f8b44bb3e387a1d7d5dec5530f70a690c00a3ffb2059434031ea7b5ca153bf33e475fa08cb99a6eea22450e250f458d4846ccf63a6874b4bd8333f372ed91b
+EBUILD cloudpickle-1.2.2.ebuild 759 BLAKE2B 65b38a291da4fac4f39467155ffbb37e3823137267a05d2086c6537e5f365c799f2ca392789d184f8aef89afc8cfd4fb5e7125ac746a74671a02f89be7af4bb8 SHA512 43a8b017e710e6372d08f116435fae7845bc31b3a804dbb5bfc893bab95c5d31a4d1d400584b509e4afc85d35a50a98ba3915010ef28773b7dc85a3ca1cfb7c5
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild b/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
index 74f40c775fc0..8d685def17e7 100644
--- a/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_5,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 9e4d083698b0..59851be66837 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,11 +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.16.tar.gz 550919 BLAKE2B 0c8fa50bc1df503b17fc1c753ddac755968a0d4886921baf5f1113cbe7d8928b6ee0be49c93e697e00a1951deaee5c35403da74ad4d14fabf566dbe8abf27bfc SHA512 63b973e63fe48675a25c76b5c79d3838aad8fea62e50287cc72f2dc431e798535fc24caf589a2358012e6c8c601e8b46ac08b0da63ca64e46727890657d7ddfa
-DIST cmd2-0.9.17.tar.gz 553819 BLAKE2B b805fc18ef4edf902b2797ecce3f09e1daca93d5e7525f633ccbdd4a2febdea849d6818ebc7d6d712693a3ee188d3815338718d8ba2d3ede258f8a2382d3bf1f SHA512 c03bcf7ec6a95987fd63b8d4f84ca6440219ec488245b9064408133570a222de391eef06dbbb951b2e34e14cffa8f30509b917a3e3ba4b36ebfb6bb14d9ede5d
 DIST cmd2-0.9.18.tar.gz 555054 BLAKE2B e0fb893a71a4acd2ded1ce83c3033c667351d1cc64834e587df883231ca2023409dbb58df305e029e2567868ab93254b570b7120ac1f09771f4c7748e3802567 SHA512 bb855893721dc5dc517276ab1af25c90e599cc5186f519b5b6a39b8ca64ca6d2c1b27d3a51cbef5568dad2f60a9636607a9a8bd289dd0de23f48376254157c3e
+DIST cmd2-0.9.19.tar.gz 555158 BLAKE2B f47a6de66ecf38a48b8784a6a7f549b2f1b80bcb6c0a928bdee7ab2828ff768b4e9d267a61a56face889251718fd04cc1b5035136fa6f80c24e862bcc120295c SHA512 3bac4ee23773dd9b721d179aa7085fdff2937a59b39409ba9acc53e4e8cc9726dbaf8e8d7a933a591bd97a6c35512afdc18c4d3228bfb9ba188bb672a56c045c
 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.16.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
-EBUILD cmd2-0.9.17.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
 EBUILD cmd2-0.9.18.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
+EBUILD cmd2-0.9.19.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
 MISC metadata.xml 665 BLAKE2B 796824fde35499ef70bd730f7e6c6ae4b239ea278f77188215ae0fc6e062598d943b0ae42ab5b378e8777c7c6a2162b330971bc00572e6dd43c663a3da677aab SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735
diff --git a/dev-python/cmd2/cmd2-0.9.17.ebuild b/dev-python/cmd2/cmd2-0.9.17.ebuild
deleted file mode 100644
index 715f6032dc28..000000000000
--- a/dev-python/cmd2/cmd2-0.9.17.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.16.ebuild b/dev-python/cmd2/cmd2-0.9.19.ebuild
index 715f6032dc28..715f6032dc28 100644
--- a/dev-python/cmd2/cmd2-0.9.16.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.19.ebuild
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 7407eb6a57dc..6bc98f7bb921 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -2,7 +2,9 @@ AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca
 DIST Cython-0.29.12.tar.gz 2050537 BLAKE2B 86c5ffd07e97d549f2d98ae0aa66a03dc2f8e86b3fca304f3fba69f63c1e6d176c57d19f4877cdfd500ca2ebed2eaaebe1ed7cea0099fa23bc7a08c23f1b4f26 SHA512 502756331d8c3618a75a881fc1a20b7e871cd3412904070f3080d5bd0918440230fdae96f096c255fec6b32b81ffcf838f22953b8da23b8845527810f457be60
 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.ebuild 1992 BLAKE2B 0b0b140208d6fc0c304b52ccf3b9812e9072fc69fb5371732181be934a2ff7a2f6095ce23ebff17b894fd9a5ee4e8430d73121864b6365b94fd49fd0d174b84a SHA512 7d2b74467d79ef2de680468cda3eef19ae3f2fe8df79fa7fe62796f8015d9acd46aafebeb0af303b5cd579ff002e4f682c3a93cafb279c34829d82a7b0afce71
 EBUILD cython-0.29.4.ebuild 2138 BLAKE2B 5d9c7a737b9704d1cbbadd67ab9eb2a6262bc63ddda154e3bd8c0dbce83584f70f66e960e6753acc24ba80aa66df85659898076756dbf5d5ce1532d93ef64739 SHA512 ca50d1b1bfa76454f460eb4cc368e64955eaf4df341521c5af62637c89f39e84e17b97c297410322e1ceb72367ddddf5c740287e07a1081e3cc548d846b9f303
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.14.ebuild b/dev-python/cython/cython-0.29.14.ebuild
new file mode 100644
index 000000000000..e05666fae50d
--- /dev/null
+++ b/dev-python/cython/cython-0.29.14.ebuild
@@ -0,0 +1,78 @@
+# 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(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python*')
+	)"
+
+SITEFILE=50cython-gentoo.el
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/cytoolz/Manifest b/dev-python/cytoolz/Manifest
index 38f686f6e2dc..fddad023bc71 100644
--- a/dev-python/cytoolz/Manifest
+++ b/dev-python/cytoolz/Manifest
@@ -1,5 +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 1046 BLAKE2B e8fbb3e4aca9ca307530d089b9967b7050cdb8bd4ad285b5ce374985a96b3297958723f25de131d1edf0d829616a273503b5d23fd18f9e564c0d25fca3e362eb SHA512 9110d1fa1f299d45513ea24a5deec91f4cf1159b4ecbff69038b0715ed98df4d65f5bcba6405ea3fe4c78aa58d8b87b46cd5edc5230391f6313867046bd0f0c9
 EBUILD cytoolz-0.8.0.ebuild 1016 BLAKE2B 126af961e1d4b6b5c70d50dde21de1fbf73dd2677073133de5ed0a8421f5260028c82722786a0cb9bfb5c57fdcdbc15617741dc63425b4ab9ddf5fd6bda3bfc2 SHA512 580dfafa32ab0935f8fc0801674a907726d8abeac66ff4e4173ad3d3c22916c6f8a80b926a922a00e66e5642a1e2f409ae3f53be33356dec26453a900bfdea35
 EBUILD cytoolz-0.8.2.ebuild 1042 BLAKE2B a006aa531ac1f8e022c2c8aa5a7ec0fc9b604e23f0231b97a23911e345e9fb55dd7eb77de678051ae2ceb962dc1df0acc11f4eac3bdc816dbc8d977a36d50d06 SHA512 6c0cd0aa91f37c427f6d56627907a2c231ca583179bb890cb19ccd6fbcabdbf031cde38e3c963b936fcae27ef44c3c7f0e178086fa54e6666e7f3ae872a7149b
 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
new file mode 100644
index 000000000000..3ca13821b155
--- /dev/null
+++ b/dev-python/cytoolz/cytoolz-0.10.0.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=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
+HOMEPAGE="https://pypi.org/project/cytoolz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# Informed by author the dep in toolz is not only required but the
+# tests are version sensitive.
+# https://github.com/pytoolz/cytoolz/issues/57
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/toolz-0.8[${PYTHON_USEDEP}] )"
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib/ > /dev/null || die
+	PYTHONPATH=.:${PN} nosetests --with-doctest ${PN} || die "tests failed under ${EPYTHON}"
+	popd > /dev/null || die
+}
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 1d902383ba0c..1ff43606e8c3 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,10 +1,5 @@
-DIST dbus-python-1.2.0.tar.gz 602426 BLAKE2B 86f5ba9283256b83d268ff7c27368e587896d58f87b15aefe9d29a90530ced591a2c6814dd37b91274910ed131fe031846071311bc6cc07c11d1f9cdda9e4602 SHA512 013b23e08fa1ed43f53a756587fefbc9770f7c51e93510e555acbd77230b7200693419bba9a69680d790bbaf123f4a195afa38b3eee1143da950fee0b5130bce
+DIST dbus-python-1.2.12.tar.gz 574727 BLAKE2B e5516e7109fad089af51d3e5db3921d056f327c27f9b74a870b1b31b04ba952ad3c9ba5916a18d674ab1179b94cf516b24e046feded8f2e542b196d162038944 SHA512 6f90eaeeb74ea71a026a331d4c611911eda6dfb6c9086a0a80352f9963a9ae126db6f3e32d183916b8517f177fc947f1ddb15df83ff0b5c886532116868383b4
 DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e2307357778371742a7fe26a0e419af41886efebb27a73f642d2ecd4603c79f4afe6e7002af95c831180e0e7844c079b2c8c SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
-DIST dbus-python-1.2.6.tar.gz 778893 BLAKE2B 1587bc9b1795e5c416397468b2061c869d923aea0983e604862342b27d37b946b1fcdd3bf07a612dba30087bdc6a5fa734906188c55756edf38d50eb67b7eef6 SHA512 6f2aec81defd2528d9876ec9a83843f8767275a5d6cf1b2b7b7a094f892f552f9a7b3d7b5006465254d410e503108e10138d7dd4cb3f1a4035d7f8d58c4d0684
-DIST dbus-python-1.2.8.tar.gz 787426 BLAKE2B 186cb8b1b25b2d2d12ab24ed304819ef18f953232d321bd425e7fda632c79a5a94f7b4118cc09f1bb13a0621980af67b4b55599fbbbcaf0e95f7912f4afd0a2e SHA512 6e486fd560944fc1461a27e6798e2c348c7fdf351602c082a0614c0a6822ff147875212bdcb1f818c0ab12470cffc613c0ffbd292cd9d445d3429bee65765905
-EBUILD dbus-python-1.2.0-r1.ebuild 2183 BLAKE2B 8b6176fce8df586d1e84bbe0d0d59d5036968ba78734fc1fb33dc652737079f5fd6a4cbb3e3ef88467f813b91416e7ada72fd59781c15e991627a5e93270385e SHA512 5a01c3faf9c94857ed0e961f60a64b48252c5ee3e479361cd3e7e021c859c47142fbb5aa8186d6b31a02288858af6ec0aebcd5f6ad5d086221626742d0779fc5
+EBUILD dbus-python-1.2.12.ebuild 1744 BLAKE2B 253744a2dccb166c992f3df8815fae42a42e1e3dec030328abc951119ceeda758978997947ddf9a7addb6ded06e58e828d38a953c6b718f55a758bc01d39b8f6 SHA512 3c7476d76ea82481d4b10c624bc4f01477ec26b24b1d7ae853d0ff24f848fe6a43459b3ef56ca0104f3c2c6a8db7e9e26e9694c2cabd785264c06fe4358df66a
 EBUILD dbus-python-1.2.4.ebuild 2200 BLAKE2B db58aeabcab8353407f051d88ce1c97fcb6b5b471647cec855238ebe28dde86519b564caccbcb2df74e2d0abd0f202122e71eead1e2f66681a0819415348e60b SHA512 6c03a6da3445b81b82a6d741c51ebb8cdd1ee686ba271cda0c0ef651fc1bd3d05a40f6da81eceb242d068e81660d97b472f4139b24c3dd47e73923f9d37ebf3e
-EBUILD dbus-python-1.2.6-r1.ebuild 2327 BLAKE2B 326f11176304c84a38a25de2a1455372e2c7d0cfeace345e6041f7a7473a2a517e1bb07df8c496c30b0508402beeb0e39c8ee97eaf2f165418655ca28bd4cf67 SHA512 ae968741c889da8dbfbdb013b36d69c1442ae79b1d076e33f762b059a8bdc04320aa9cd758cf008f86498a0e067f1f31b7cb6333fe63f6901e10e3b8ba631c13
-EBUILD dbus-python-1.2.6-r2.ebuild 1890 BLAKE2B 8a097ba7667768f84768548d493b25b7fda6c1cbf408749b82b20f97d5b1e4f8c56aa69f3dce58d787dcedfdb41f11ab33841be94b5e64cf26bc072dd48fbf07 SHA512 46d81d1c9cc7ab4b10d99a99718d90780a1e6404e0b4c65bf10aa870b138fadc6475519652d3b53c4d8b6a89b38d941355ae13f5696e4ee35f54d32c6164d25a
-EBUILD dbus-python-1.2.8.ebuild 1682 BLAKE2B cf378e2390263122e00ebf5d594f0faf8523cde1da2efba4de040d42b2c25fdedd3ef65a74b065da15dd8651b5c5fd7c3395d2afc31115949ab1c1894ca03eae SHA512 31a07c9b0f34749d0853a190a72cf1a6e999e49c7cdad1a0057536f4416cb590aba687f856d6e71a29e11d7c0778e0a8471bcf7090a228ad285a007337e13d19
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild b/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild
deleted file mode 100644
index 7f52d95af98c..000000000000
--- a/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,88 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit autotools eutils python-r1
-
-DESCRIPTION="Python bindings for the D-Bus messagebus"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="doc examples test"
-# API docs generated with epydoc, which is python2-only
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	doc? ( python_targets_python2_7 )"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.100:=
-	>=sys-apps/dbus-1.6:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		dev-python/docutils[python_targets_python2_7?]
-		=dev-python/epydoc-3*[python_targets_python2_7?] )
-	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	# Update py-compile, bug 529502.
-	eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	configuring() {
-		local PYTHON_CONFIG
-		python_export PYTHON_CONFIG
-
-		# epydoc is python2-only, bug #447642
-		local apidocs=--disable-api-docs
-		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
-
-		econf \
-			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-			--disable-html-docs \
-			${apidocs} \
-			PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \
-			PYTHON_LIBS="$(${PYTHON_CONFIG} --ldflags)"
-		# configure assumes that ${PYTHON}-config executable exists :/
-	}
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installing() {
-		default
-		[[ ${EPYTHON/.*} = "python2" ]] && use doc && dohtml -r api/*
-	}
-	python_foreach_impl run_in_build_dir installing
-	prune_libtool_files --modules
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}
diff --git a/dev-python/dbus-python/dbus-python-1.2.8.ebuild b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
index 924443010d05..1fb2cae012c7 100644
--- a/dev-python/dbus-python/dbus-python-1.2.8.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 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} )
 PYTHON_REQ_USE="threads(+)"
@@ -15,19 +15,24 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RESTRICT="!test? ( test )"
 
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	>=sys-apps/dbus-1.8:=
 	>=dev-libs/glib-2.40
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
+"
+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}]
-		dev-python/tappy[${PYTHON_USEDEP}] )"
+		dev-python/tappy[${PYTHON_USEDEP}] )
+"
 
 python_check_deps() {
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -67,7 +72,7 @@ src_test() {
 
 src_install() {
 	python_foreach_impl run_in_build_dir default
-	find "${D}" -name "*.la" -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 
 	use examples && dodoc -r examples
 }
diff --git a/dev-python/dbus-python/dbus-python-1.2.6-r1.ebuild b/dev-python/dbus-python/dbus-python-1.2.6-r1.ebuild
deleted file mode 100644
index d232d1e47965..000000000000
--- a/dev-python/dbus-python/dbus-python-1.2.6-r1.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=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit autotools eutils python-r1
-
-DESCRIPTION="Python bindings for the D-Bus messagebus"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
-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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="doc examples test"
-# API docs generated with epydoc, which is python2-only
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	doc? ( python_targets_python2_7 )"
-
-RDEPEND="
-	>=sys-apps/dbus-1.8:=
-	>=dev-libs/glib-2.40
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		dev-python/docutils[python_targets_python2_7?]
-		=dev-python/epydoc-3*[python_targets_python2_7?] )
-	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )"
-# TODO: Half the tests require tap.py from PyPI now, which we didn't have packaged; those tests just get skipped then though
-
-src_prepare() {
-	default
-	# Update py-compile, bug 529502.
-	eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	configuring() {
-		local PYTHON_CONFIG
-		python_export PYTHON_CONFIG
-
-		# epydoc is python2-only, bug #447642
-		local apidocs=--disable-api-docs
-		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
-
-		econf \
-			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-			--disable-html-docs \
-			${apidocs} \
-			PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \
-			PYTHON_LIBS="$(${PYTHON_CONFIG} --ldflags)"
-		# configure assumes that ${PYTHON}-config executable exists :/
-	}
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installing() {
-		default
-		[[ ${EPYTHON/.*} = "python2" ]] && use doc && dohtml -r api/*
-	}
-	python_foreach_impl run_in_build_dir installing
-	prune_libtool_files --modules
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}
diff --git a/dev-python/dbus-python/dbus-python-1.2.6-r2.ebuild b/dev-python/dbus-python/dbus-python-1.2.6-r2.ebuild
deleted file mode 100644
index 141df4dd8551..000000000000
--- a/dev-python/dbus-python/dbus-python-1.2.6-r2.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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit autotools python-r1
-
-DESCRIPTION="Python bindings for the D-Bus messagebus"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-# API docs generated with epydoc, which is python2-only
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	doc? ( python_targets_python2_7 )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sys-apps/dbus-1.8:=
-	>=dev-libs/glib-2.40
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		dev-python/docutils[python_targets_python2_7?]
-		=dev-python/epydoc-3*[python_targets_python2_7?] )
-	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/tappy[${PYTHON_USEDEP}] )"
-# TODO: Half the tests require tap.py from PyPI now, which we didn't have packaged; those tests just get skipped then though
-
-src_prepare() {
-	default
-	# Update py-compile, bug 529502.
-	eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	configuring() {
-		# epydoc is python2-only, bug #447642
-		local apidocs=--disable-api-docs
-		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
-
-		econf \
-			--disable-html-docs \
-			${apidocs}
-	}
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installing() {
-		default
-		[[ ${EPYTHON/.*} = "python2" ]] && use doc && dodoc -r api
-	}
-	python_foreach_impl run_in_build_dir installing
-	find "${D}" -name "*.la" -delete || die
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/django-opensearch/Manifest b/dev-python/django-opensearch/Manifest
deleted file mode 100644
index 8667c6c8eb4d..000000000000
--- a/dev-python/django-opensearch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-opensearch-0.2.5.tar.gz 15870 BLAKE2B 88229b8545633bb46d37cb03e1fc3a7f8854a36b14f662e4edfcc8c3518014cbb67fbc9b6c25775b4b22eca73de26ca94621e7f92c502d0fcb5dd41e1da30af7 SHA512 70ec931de2687bd6e688fd60262a85de553700247c852a686fea422bb5208b5a3e0441b5778dead1838ae693a22103ed3db1677fe395f000531573bac5a501c7
-EBUILD django-opensearch-0.2.5.ebuild 488 BLAKE2B 37f6d20556c8ca74b28e4c82947487825918a444a332a6d36d6b613c153765b00c9befb4686e6f1d9cd2d37fe5b6455f6379fe3c2369f0fa01eb89cd745150c4 SHA512 74524bf91879e87cef77ca0330e24040e99938d35bd5d7f279e54940e9739356754ce7bc639ad1b5d3862c3951fc2b6a2bc109f83226f88dee60794b4cb2baf9
-MISC metadata.xml 262 BLAKE2B 02a57996cba51af46d30d6745cc9c2562c062771a5f29ed3504d227b273bb68b383b263255f7f58518b72b34f5d3b31e0821900bc50ea79a5c24b7939829ad97 SHA512 ee8bf92400689f298273664ec2dcf58599c428a6c31a6c3b0a3e413afc43688bc77ea7ec553296d6ef6c7edfb7bbd076e96de837e62837dccf0040fe5cc30e18
diff --git a/dev-python/django-opensearch/django-opensearch-0.2.5.ebuild b/dev-python/django-opensearch/django-opensearch-0.2.5.ebuild
deleted file mode 100644
index f4bb011dd714..000000000000
--- a/dev-python/django-opensearch/django-opensearch-0.2.5.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=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A django reusable application to handle opensearch.xml"
-HOMEPAGE="https://github.com/vint21h/django-opensearch"
-SRC_URI="https://github.com/vint21h/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/django-1.7[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-opensearch/metadata.xml b/dev-python/django-opensearch/metadata.xml
deleted file mode 100644
index 6e90fd29d0fd..000000000000
--- a/dev-python/django-opensearch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">vint21h/django-opensearch</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-otp-yubikey/Manifest b/dev-python/django-otp-yubikey/Manifest
deleted file mode 100644
index aa287c8665a4..000000000000
--- a/dev-python/django-otp-yubikey/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-otp-yubikey-0.4.2.tar.gz 12670 BLAKE2B faf060cdc242378ba762ee6af4cfa124da60388ed23fbb33016e47dfe22542075573d9792924f72701aa09d1dde37a79f56674b26d83c2936223602f4ab1eea4 SHA512 bc6fca539e28b52086768c2874d333c7f42b69de4cbd99e57c3cbbb4d0aeae31335a54d6d7f03a9252c0524e75ca20263106d1aabe30a21f5b4046fb2fc2effd
-EBUILD django-otp-yubikey-0.4.2.ebuild 567 BLAKE2B 79d016d1e376b9bcc540bec07578aee03af6984fcf8d29712d3a1ed526d9c6249182aaba92025a94a18e190afb8ce1ccbe3a375016e3ab4e105ba570aad69b6a SHA512 0b1d35ecd9002fc65a15d097507dfabb73db3119d36048519f1dbac819b41befd0d6eebe7877578ae51720ad9931a667fc3d990f5606bcf63e90a879256a1130
-MISC metadata.xml 316 BLAKE2B 07e00fa2de594708826250b71745951204e35e8ab7c74257eca61057a7bea5b2d9fb5f18724b0048da782f415751ceea4dbf4e79bcbb2135c77421a71a8937a8 SHA512 0a65b77aa7db9ea74f8643b05534fcaffaaedce5e7edbfc35c0f86e831c942b4464d9e4c225e3373d18b1b3a61e58976ffbd222843efcede3eacbb0d4177e597
diff --git a/dev-python/django-otp-yubikey/django-otp-yubikey-0.4.2.ebuild b/dev-python/django-otp-yubikey/django-otp-yubikey-0.4.2.ebuild
deleted file mode 100644
index ca888bfa4a31..000000000000
--- a/dev-python/django-otp-yubikey/django-otp-yubikey-0.4.2.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=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="django-otp plugin that verifies YubiKey OTP tokens"
-HOMEPAGE="https://bitbucket.org/psagers/django-otp"
-SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/django-otp-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/yubiotp-0.2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-otp-yubikey/metadata.xml b/dev-python/django-otp-yubikey/metadata.xml
deleted file mode 100644
index b600756496f9..000000000000
--- a/dev-python/django-otp-yubikey/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">django-otp-yubikey</remote-id>
-    <remote-id type="bitbucket">psagers/django-otp</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-phonenumber-field/Manifest b/dev-python/django-phonenumber-field/Manifest
deleted file mode 100644
index 299231e8bdf8..000000000000
--- a/dev-python/django-phonenumber-field/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-phonenumber-field-1.3.0.tar.gz 14501 BLAKE2B f754f464376d684bf6d2cdaec8b16996cc4718947c5c4aab43e41d6dd66823d0ecfabc261bca918376ee92b33b1397786c88c82fede60261f073927a9a115470 SHA512 2a0065691f9874edef96e41c237d8a58b4ac5c3efe7a82c421dca269185962f518808083ce82e73a281c95675703b24820a7b5dae09a08474b6c2e3e7f529f1e
-EBUILD django-phonenumber-field-1.3.0.ebuild 612 BLAKE2B 0d8d78d8955de158c0f25a72356d606a4fd5c9bd96e8d6d7390e7cb0a8b44ac553e0bb28ee76cf43cc07e95eb04c11ff6546dff54695333a5f6659bc82b1d93b SHA512 0060635eeeb1d9fdf45db0269e1a40fe4b5e11846de339e4246be45f9c992864314eb8484e1fb929096faad8912f051063265fdf63f10a9e6a1995c6734cd11e
-MISC metadata.xml 338 BLAKE2B 12b47e6adabcc7a1310337756accea533bc1bf550204ecfae9d84805f14d71a71f8b2aea391642566605551a143dff1c026403d6de26e9ac70d84c5c67067257 SHA512 026eaadd2eee602dc6194d1e19a18c1d93be78dfa9b3ed5a4bfef0d614d3655ed130e8ca08ff9a7fd77609ebcc17dbfaf42582b4627983a9b08a5ec572822811
diff --git a/dev-python/django-phonenumber-field/django-phonenumber-field-1.3.0.ebuild b/dev-python/django-phonenumber-field/django-phonenumber-field-1.3.0.ebuild
deleted file mode 100644
index ca55b06f4bd5..000000000000
--- a/dev-python/django-phonenumber-field/django-phonenumber-field-1.3.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=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Phone number normalisation in Django with python-phonenumbers"
-HOMEPAGE="https://github.com/stefanfoulis/django-phonenumber-field"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/Babel[${PYTHON_USEDEP}]
-		>=dev-python/phonenumbers-7.0.2[${PYTHON_USEDEP}]
-		>=dev-python/django-1.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-phonenumber-field/metadata.xml b/dev-python/django-phonenumber-field/metadata.xml
deleted file mode 100644
index 2f001bbd9a63..000000000000
--- a/dev-python/django-phonenumber-field/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">stefanfoulis/django-phonenumber-field</remote-id>
-    <remote-id type="pypi">django-phonenumber-field</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index d35cfb398a6d..08394e97148e 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -2,7 +2,7 @@ DIST docutils_glep-1.1.tar.gz 6753 BLAKE2B 93e7fa03e6e5b4f7d7d338b04d906eac630d2
 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 97d8d904489d6b26104e6c8de98d371be35c1b6f8767d9f00f0af234f14bf2c7041d8f5fe5210dfa3f6174548c9ea0c39a225b938163b3f45d6981d61a8f7ca0 SHA512 0952c2eb7ed4914deac345773165a609258142d832c92bf5d57c25e4cb6d136a6750b6c5ebb4ab809ef2667cd47fb175505098f631ee596c3e7156bd0f2bfb14
-EBUILD docutils-glep-1.2.ebuild 812 BLAKE2B 97d8d904489d6b26104e6c8de98d371be35c1b6f8767d9f00f0af234f14bf2c7041d8f5fe5210dfa3f6174548c9ea0c39a225b938163b3f45d6981d61a8f7ca0 SHA512 0952c2eb7ed4914deac345773165a609258142d832c92bf5d57c25e4cb6d136a6750b6c5ebb4ab809ef2667cd47fb175505098f631ee596c3e7156bd0f2bfb14
-EBUILD docutils-glep-9999.ebuild 570 BLAKE2B cb654f71ce1c806d6a99796f7e8384d9c9e9c4b71c9a2a50cc900e5c9b7dac6774f5698f929fef77ea883bc75c219f6ad0e5273a98a6dafae4222c1398b75dcb SHA512 b4542db1a99d274ec73f9ec9d46e0bc4490091d7dcaff07173b401f28e1371f6a80356e33e0158fa1785d5ab949e05c7e7a0822b76e0a5eba437dc22ddd1c5f3
-MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
+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
+MISC metadata.xml 372 BLAKE2B e34273d2456e517c83d2ed1933ccdcce21d22ce96cff97c691d920c144e921b4f49b0018b4d9d5dd72a7fb0f2578dc0ed9d4958915fb386d0db3bb134d592df5 SHA512 da8ea65057ab402c29eab6fe2bb7fcc6f82052cb4fbacaac99c955da80da7286cd837bf0489420f04bf41aac1789a349ea50f624bb105f44021dabb92340d1e3
diff --git a/dev-python/docutils-glep/docutils-glep-1.1.ebuild b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
index 6866628462d9..01ae57043fa4 100644
--- a/dev-python/docutils-glep/docutils-glep-1.1.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Gentoo GLEP support for docutils"
-HOMEPAGE="https://github.com/gentoo/docutils-glep/"
+HOMEPAGE="https://github.com/mgorny/docutils-glep/"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index 6866628462d9..01ae57043fa4 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Gentoo GLEP support for docutils"
-HOMEPAGE="https://github.com/gentoo/docutils-glep/"
+HOMEPAGE="https://github.com/mgorny/docutils-glep/"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
diff --git a/dev-python/docutils-glep/docutils-glep-9999.ebuild b/dev-python/docutils-glep/docutils-glep-9999.ebuild
index 63cb59128bb4..bbc620a682be 100644
--- a/dev-python/docutils-glep/docutils-glep-9999.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-9999.ebuild
@@ -4,12 +4,12 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
-EGIT_REPO_URI="https://github.com/gentoo/docutils-glep.git"
+EGIT_REPO_URI="https://github.com/mgorny/docutils-glep.git"
 
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Gentoo GLEP support for docutils"
-HOMEPAGE="https://github.com/gentoo/docutils-glep/"
+HOMEPAGE="https://github.com/mgorny/docutils-glep/"
 SRC_URI=""
 
 LICENSE="public-domain"
diff --git a/dev-python/docutils-glep/metadata.xml b/dev-python/docutils-glep/metadata.xml
index 4c43a15ce6f4..3136117dc036 100644
--- a/dev-python/docutils-glep/metadata.xml
+++ b/dev-python/docutils-glep/metadata.xml
@@ -1,6 +1,10 @@
 <?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>
 		<name>Python</name>
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index bd231d540d49..4d9be08320d6 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,7 +1,10 @@
+DIST elasticsearch-7.3.2-linux-x86_64.tar.gz 285050383 BLAKE2B 730d8550f5887facae3075ce3b0bdb96b49350782fe7e687b8f4477bb363ce7c1595f2b1ece2b7d59d18539886b6e4806f56b0f5674bc417528232a92f1c00a8 SHA512 08e89347797ec6f008fb76cda17ec3e0dbc553fc992d07f4944fd99d17d5bc934849d9e534724d1541432c9844d3da57d875bc08a0c4cd95ba4251e2b03f833b
 DIST elasticsearch-curator-5.5.4.tar.gz 221161 BLAKE2B 41828800dd9237142767d3163b3d87770ea5b904858991598cce2feb7c3a22d85c0d73275a2f232099ea82e7346fc20080a3bfef692ee808b730d3e4e6de405d SHA512 99ed18592105d19791513ad713115b6e2a6b589ab8b4e3fc4435b2878e25f552e0bda8d63cb6279970afc6ba39d9f3db17af1b4fb44500fe8a14b060e1530258
 DIST elasticsearch-curator-5.6.0.tar.gz 221555 BLAKE2B cbf1f645b266d2d08914ff74fd5c63bcd5661ef68a8b9286ed59b05d52d50e18e8d18e00b3a0e037f8e6452ce79213280b5ecffaf6af0a3fb70ef92458c80efa SHA512 7dc02b5d15228ea96254dc7dd8069d8396c5d3df883b7ab42936c7612b0f16f5399131563703ccd05469facee7ddf20a720daf62a2713943a4b9a0c9448dd676
+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
 MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild
new file mode 100644
index 000000000000..f822977ef921
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1.ebuild
@@ -0,0 +1,159 @@
+# 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} )
+
+MY_PN="curator"
+ES_VERSION="7.3.2"
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elasticsearch/curator"
+SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+IUSE="doc test"
+
+# vulnerable pyyaml
+# https://github.com/elastic/curator/issues/1415
+RDEPEND="
+	>=dev-python/elasticsearch-py-7.0.4[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	<dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2019.9.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.25[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	~dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		virtual/jre
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	# avoid downloading from net
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+
+	# requests_aws4auth not in portage
+	sed -e '/boto3/d' \
+		-e '/requests_aws4auth/d' \
+		-e '/tests_require/s/, "coverage", "nosexcover"//g' \
+		-i setup.cfg setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# running tests in non-chroot environments:
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
+python_test_all() {
+	# starts two ES instances (local,remote) and runs the tests
+	# https://github.com/elastic/curator/blob/master/travis-run.sh
+	local ES_INSTANCES="local remote"
+	local ES_PATH="${WORKDIR}/elasticsearch-${ES_VERSION}"
+
+	declare -A ES_PORT
+	ES_PORT[local]=9200
+	ES_PORT[remote]=9201
+
+	local i transport
+	declare -A ES_CONFIG_DIR ES_CONFIG_PATH ES_INSTANCE ES_LOG ES_PID
+	for i in ${ES_INSTANCES}; do
+		ES_CONFIG_DIR[$i]="${ES_PATH}/$i"
+		ES_CONFIG_PATH[$i]="${ES_CONFIG_DIR[$i]}/elasticsearch.yml"
+		ES_PID[$i]="${ES_PATH}/$i.pid"
+		ES_LOG[$i]="${ES_PATH}/logs/$i.log"
+	done
+
+	# configure ES instances
+	for i in ${ES_INSTANCES}; do
+		mkdir -p "${ES_CONFIG_DIR[$i]}" || die
+		cp ${ES_PATH}/config/{jvm.options,log4j2.properties} "${ES_CONFIG_DIR[$i]}"/ || die
+		echo 'network.host: 127.0.0.1' > "${ES_CONFIG_PATH[$i]}" || die
+		echo "http.port: ${ES_PORT[$i]}" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "cluster.name: $i" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "node.name: $i" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo 'node.max_local_storage_nodes: 2' >> "${ES_CONFIG_PATH[$i]}" || die
+		transport=$((${ES_PORT[$i]}+100))
+		echo "transport.port: ${transport}" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "discovery.seed_hosts: [\"localhost:${transport}\"]" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "discovery.type: single-node" >> "${ES_CONFIG_PATH[$i]}" || die
+	done
+
+	echo 'path.repo: /' >> "${ES_CONFIG_PATH[local]}" || die
+	echo "reindex.remote.whitelist: localhost:${ES_PORT[remote]}" >> "${ES_CONFIG_PATH[local]}" || die
+
+	# start ES instances
+	for i in ${ES_INSTANCES}; do
+		ES_PATH_CONF=${ES_CONFIG_DIR[$i]} "${ES_PATH}/bin/elasticsearch" -d -p "${ES_PID[$i]}" || die
+
+		local j
+		local es_started=0
+		for j in {1..30}; do
+			grep -q "started" "${ES_LOG[$i]}" 2> /dev/null
+			if [[ $? -eq 0 ]]; then
+				einfo "Elasticsearch $i started"
+				es_started=1
+				eend 0
+				break
+			elif grep -q 'BindException\[Address already in use\]' "${ES_LOG[$i]}" 2>/dev/null; then
+				eend 1
+				eerror "Elasticsearch $i already running"
+				die "Cannot start Elasticsearch $i for tests"
+			else
+				einfo "Waiting for Elasticsearch $i"
+				eend 1
+				sleep 2
+				continue
+			fi
+		done
+
+		[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT[local]}"
+	export REMOTE_ES_SERVER="localhost:${ES_PORT[remote]}"
+
+	# run tests
+	nosetests -v || die
+
+	for i in ${ES_INSTANCES}; do
+		pkill -F ${ES_PID[$i]}
+	done
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 12aac4f870ed..8329b430ad23 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -2,8 +2,8 @@ DIST elasticsearch-oss-6.4.0.tar.gz 33727061 BLAKE2B dd0ff95bb124103ca340b480c51
 DIST elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz 68787752 BLAKE2B 63864deae4e0545a2cd1924c4e2f4c0bb61134fe9649037f23c10123efe0425d376183035171a952a10f1804196a97287c59b508e97dff5e9e05063a67ede020 SHA512 301e552b221369cca8365ee64d8b52b5e8abea0e26159f7a6e77a1722fb1107641fe2472138869f5156bbbf43c74e62ffb22d0c35062190505f7504e3f571e16
 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.2.tar.gz 102921 BLAKE2B 35ea3dd964a39caa594f380cea1508f0dea15486f1e0708f9daf3aa2e461429c76e0c7bf491a9aadb7187e30544597f6c41d20ff06b8b8d3b3b1655e6df387c9 SHA512 f91823dca2958fd0292ba623599d89138dd83ed2d41ecef1d5dcdd30a66c87db99d0576f41da15affd4e0027355eb20437e2dc104f98ffa86d0066d0b04b2590
+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.2.ebuild 2726 BLAKE2B 5a35e7889012d4da54bac7f10bd0abe02e861cea2f5fe2b3a873c33bda835fbae2c2ed46ba90aa991b6fa9d6c8df2b0c9874adba990dec572f94ed00e7fa54f0 SHA512 6746039965168f37a0824d715ed2b59f19ba88f54ad645abd2ae972028815a14c0818d65654ed33724e65da3072c1e2facb62d804e7e741635d6bfe985eaa858
+EBUILD elasticsearch-py-7.0.5.ebuild 2708 BLAKE2B 4c6c2d8eaca111767a0d7b36fb471d2771e6114151fb91cf991056a69f8eff5019efa6899fbc269161eea61dc63f18b149baf9d7518ae4ee81510b33f70443b8 SHA512 0d5ef6e0566e602f5cf621f5e484584d4aa997c5acdb9ecb037dd28618c086d433c7223b2d4a5b50a5fd2d47ae93e3d66d6dd4782d1776eccf981d6821bead59
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild
index d307f3933ab3..f12fb68275e3 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild
@@ -34,7 +34,7 @@ DEPEND="test? ( ${RDEPEND}
 	virtual/jre:1.8 )"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]"
+	>=dev-python/sphinx-1.3.1-r1"
 
 python_prepare_all() {
 	sed -e '/coverage/d' \
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 3c9f939e756d..57976ff5e166 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -4,10 +4,12 @@ DIST fido2-0.5.0.tar.gz 161562 BLAKE2B 20d4f6c4e54366a26d5a56a84a6ff84bec0f0e221
 DIST fido2-0.6.0.tar.gz 163137 BLAKE2B 3a30d4267a1aae00eac8fa8c05065163f992b72895097aca95dba72300bd9c30373c7537a867e532949af779e8e7528e1a3aad8f04cb0170678675294757b5d4 SHA512 1fb8e591480ac2ac9c405e4fc74895d55d630e462626f849952193c3ae6720104cca1da47af1f89adbcc026034f69dba12fc38577b00f9802434db2162d0d1d5
 DIST fido2-0.7.0.tar.gz 171787 BLAKE2B 6458a606ecbbd22ac7c49b2e32b46e43c0ca184645fff4c54e0204f044a415db05b3e7187b6138e4d1b67dad9ed5faf3eb561b11b391b5105bac4299481bd95d SHA512 65fdaeeb1932873fb2ae86257182eb6098d6bf4ce5ed45336327bd3e9040eddccd7f7559ece58d9bdcbfe8c98c2eb8646069556a6d00035fef5eade4907a45d8
 DIST fido2-0.7.1.tar.gz 176790 BLAKE2B d6e800b750902ad26ea6fc0634b37215ac57a65c18d0139b38263d7b97fdf0aaa41070abd5da35891a0dee0c788e43cc7c3bf47e8c1328e292352612ad719c9b SHA512 07024a4076d88bd9ec5d5dbfd924c88e314906668444d96aa9177c373309e90e33c18fd5313943fd83eb28b6d40f0c16a8f64c5d9a2aa50f2fc5115c1967ae3a
+DIST fido2-0.7.3.tar.gz 188262 BLAKE2B c1d832229ce741be3b81e4cded65b77e57c008aaba8ccbdf640bae1c27f4d86f2c0ce7ffc83405e3693646a8f2868030619c958ecbaa58a6a6328ece2cf6d3de SHA512 715779ecc9dba19de0e45df13d018e7dd223f20f5662860874aa8aa6f811c1df71c07656d21b49a4b6f14a149134d8af6bac076a7f71cb7392ca2fef70b173e1
 EBUILD fido2-0.3.0.ebuild 815 BLAKE2B 47d151f3b6815c8e4e1d1b1b358a990740de87fcddead0faf1e1b5af7a65f25605f14ff187552966639556a590339c15b9ee07d65a5c534d2f73e00c7aecbf84 SHA512 d362a8541aa7d38fb48cee5aedcf3d19f6cdaca0abcad46a4570fe878d5e87d4d54f4804fabf48945e69359242508ba64f5f5feaf65e27a7267bf20cf162a14f
 EBUILD fido2-0.4.0.ebuild 1105 BLAKE2B 962bd3af7f775bcf36789d49b5c38351f4e011ec6353b18efc7bb20ea87420499bbb04917c2f1dabca1315c4b4518b47f8eba73c94871d8a6e3f2c4ff67b227d SHA512 bcdf8004248851758b7ee65a7bd1ce50ad0ccb185c9ca00c11276096e1f75a370e34fe582bda443cfac6bb247ab2c0072b0c40aad53e1113afab570fa44485a5
 EBUILD fido2-0.5.0.ebuild 1108 BLAKE2B 3236a27d2332a0a7a8aabb6fb378ee154fb3f79be7573b35be91dbfc9455b0ff2f5eb610665bc09ad81b5aec1b3270bc6b6b84ec9fcde80f8f7b7139be3a5323 SHA512 73c2a5bd2063a5a08cba6cea1860f4e6b8b2d94e5363672d8155a6ab1a954eb0bc07aafacf67d7a113e0a05b45188efe312818d4151c15f7b0b6393e7cd4017f
 EBUILD fido2-0.6.0.ebuild 1156 BLAKE2B 3d8346c8709265241373b9c4b55efb19417f2d86f650f23693a28ec02756cd1958860bdd3c6a6ca04f280ab3222ac57414a3a1338a10a1dfa6d99576c7321b82 SHA512 a6b08fe75c9fb85deb6249eb6418e2f5f9153e9246d088ecf81c5cecab6a9f5382efba38cfcb46765a62a67e6b69be91824499a5749e9f5b8bc54d5261f25cf7
 EBUILD fido2-0.7.0.ebuild 1110 BLAKE2B 40dbd55cb02cfcea693faf5802a61ec010acf65b7e63757e8600021e4639a31c7aecd02087a422e2ab827175541fe31f7a38e14fa0e38b9b48a580ba801ea66c SHA512 da060d3128c54bc57b1b5d019c23e689bfbe96bc86ccbe3125e3196d03efb2c7b392f41ae722a91df79b14d6b349b0e4310ea6b8ce8bb402c6e167167e5ca25b
 EBUILD fido2-0.7.1.ebuild 1110 BLAKE2B 40dbd55cb02cfcea693faf5802a61ec010acf65b7e63757e8600021e4639a31c7aecd02087a422e2ab827175541fe31f7a38e14fa0e38b9b48a580ba801ea66c SHA512 da060d3128c54bc57b1b5d019c23e689bfbe96bc86ccbe3125e3196d03efb2c7b392f41ae722a91df79b14d6b349b0e4310ea6b8ce8bb402c6e167167e5ca25b
+EBUILD fido2-0.7.3.ebuild 1116 BLAKE2B 82adba5559e568c48f05209dc7f75cb279e017c37dcf72e27e32a07a11e1c6f0106f5629b2779a9606fd80076cebe6d96b3926bdf770d0dede231426f673edab SHA512 edd3532e21254a1e6ac2b29158f80880c10c9ae9288de581524821bc9b9f794f77a0fb084a872f359ea23fd05326a4d7650980a3af9313ad487faa8182da8278
 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
new file mode 100644
index 000000000000..311a481c34f0
--- /dev/null
+++ b/dev-python/fido2/fido2-0.7.3.ebuild
@@ -0,0 +1,49 @@
+# 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}} )
+inherit distutils-r1
+
+DESCRIPTION="Python based FIDO 2.0 library"
+HOMEPAGE="https://github.com/Yubico/python-fido2"
+SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	examples? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pyfakefs-3.4[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${S}"/examples/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index a930b664864d..2a0e1fc69be1 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,5 +1,7 @@
 DIST Flask-HTMLmin-1.2.1.tar.gz 2921 BLAKE2B 61601aceb58545972469ca3482e7e44464d3e3f1fd0b4a40d8f1c5e1c340c5b5292d59effc3a7a4881f1a012e90d961dcc0ec3b069f1c83d4b4cc76c99d3a301 SHA512 255dac2da4db1cdacb3cccf8dcd06507c249d97c6e92e7c413d3598fbfa247f657c294eb5f1ff1f50ed73ed656ca2a1015ab712f4ea880a209f13c1d8950d83e
 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
 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 639 BLAKE2B ddfa60aa436d38a56dfb01912a7ab6b2af48c31e1513c827b782e5bef143ea20a46186db0863ae264308a65264254039721ddebcee7460cc1905a314ff098dea SHA512 8ceda9fc0e9f3710aeabb9692839966754e9266e003a748bfdb1f32ce73c547df6daa6c92db59213f2201e2423fc3604322f4250ede83c165d465f1836ee2a19
 MISC metadata.xml 430 BLAKE2B 5e46d9cb5b03bc29264074d3abad076a3699e6753679cacf19134355f35265cc70dbc8fbad591eed798a36cde80a44d78244e88dd7deadc830440ac7724132b6 SHA512 78c978ecd3f4ef205b0ddef1cec9e60b95988ce92bafefb5134e8a1f1f8fec8ef47f50af05ce3f71047b7f72ecae76a9f4d83add103ebedbc374fc4e49a24180
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
new file mode 100644
index 000000000000..5a6912a24692
--- /dev/null
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
@@ -0,0 +1,35 @@
+# 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} )
+
+MY_PN="Flask-HTMLmin"
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Minimize your flask rendered html"
+HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/htmlmin
+	dev-python/flask
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# Needs some kind of magic to actually test.
+RESTRICT="test"
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index a09da112fe13..5d6926db6327 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,4 +1,6 @@
 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 840 BLAKE2B d1e3f50d074e5223e721783620362c6ae89120dbebbef79f8c5827284987f68126a8a00223b9327c6d26d68c8fc94fd598f24ae325c631b712bf68adfa78328a SHA512 8bf71d97d945b29714906f3cfe9405049e237f6afbdea6a1f1bb5abd61dad8009b36b52e59a6b359c2c153594fa45268ed98e4405c096bfbd8447a6fd7aebed1
 EBUILD flask-migrate-2.1.1.ebuild 836 BLAKE2B 07be010d9bc76d2316b18da92247e4cbe9c20ea76f614cdeeecd8bfa875faffd0ec0c726702374e9579b5c4c1eb34a43ecdf14838fc4bfdbe43067fe0d6a677e SHA512 9f9273e1d39fd457b4034ba2bdd251b1820c25f5079132c7560441a6960907903fc3a588fbfaca00636593290536f9b88034bfa269b92b2dba71961d00480f4a
+EBUILD flask-migrate-2.5.2.ebuild 846 BLAKE2B 6f9c7c14fbbf75c0e0a11f8f2987e6f39d33b9eab397ed1574e9bddc5fbc8addc6812f99ac48b236e54c49a4ab39774aea5fa1529ce88541bfc09b702755ae81 SHA512 192af404542a6e7733f7d297ec72acaac86dc89f79f5688b98dcefc53ae040e3b4e0f658061a5dab2a816db0e1790df98d7a6c9517bf2a4675080fda95d03a0e
 MISC metadata.xml 316 BLAKE2B d01833219129a9ba04f2198bd569d605319bc4c4d604e69cb6a50a5d855e0dddb6491f78a6674b939476b7128d15c11aa35d0f9eb44db149d3053c004ead4bf8 SHA512 1dfa03b638a9c39be69148ea8aabb4554326dc65bc3a004a2eb93b05fe4be8d667efc7470ea35a138bbe1bae17511a42d530448a98da5c5eaa3eb1c2d3126ede
diff --git a/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild b/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
new file mode 100644
index 000000000000..8cd9e3848fd1
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
@@ -0,0 +1,35 @@
+# 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} )
+
+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"
+
+RDEPEND="
+	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.9[${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-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 0fe1a322901b..9c7e03234b7d 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -2,6 +2,8 @@ AUX 2.3.2-mapping.patch 647 BLAKE2B 4b6243f35ce87b21825aae761512ea2cbbbf11639bd6
 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 1095 BLAKE2B 7e38fdab54fcbb246c71c18eca42e04b1115ba52d578acd35de141e57ad5b878a7bbf3c563607194101097b5be725ac7c1ff6b2b453054ad8022b92d48f12de0 SHA512 cc8eb06b195b3e8b0b2775f424c44bd4a1e6ad885e1e8600fca4fc26dc46b51f300b47d52dd7870e2b6b243639d36a56f4add529715ae715e36444f4b47c6873
+EBUILD flask-sqlalchemy-2.4.1.ebuild 1000 BLAKE2B f880b193e29f7b12114a62aa462b1a3199367c519ac2dc3c1a6cfc45f308dd7f1ef1c0a4e76090c7909d54fd5138ea1b1a0a501b7af8627d5c7fe1ddf24eafc1 SHA512 661feeb06d63d7ed093b1a7d011b75198d3fe28f2d5c507049cfd944a2967d560b780cf4600c5343b0712c64e4e7c655b2e3f56baf8a7f9a4446be1e5c3c4624
 MISC metadata.xml 699 BLAKE2B cbe5227ca3a346d4e26a0df966a64337d037ed790a1fa3c6d4bf71cb8bdbd78a0f35b0badad7507352b92ebb2a58965a300fec0c49a5c916eb7ddcecd327f78c SHA512 7d116340ea46dcc4c739c63071923e235b31d3eac197d36f6d347fb500092cdb9bdf3365b9dcc5f80eaffeb2cc7fe6391fd31c1a48d009cff1645d7aa1684542
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1.ebuild
new file mode 100644
index 000000000000..815d015a2f3d
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1.ebuild
@@ -0,0 +1,44 @@
+# 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 )
+
+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 test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# 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() {
+	pytest
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index 4ed670688fb4..1999f95d1348 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 436 BLAKE2B 307541e3e3c6b5d9f70ce404d4816753db5a7d557cb28c8fdfa33667912462b4a8c062c9dfc5bd59bf8abae1edf469178e5e3ca2b2d72e58400a81eb7f18fb40 SHA512 197f49a65e1ef719273c9f8a768d3e0e0a4f75a11448f4410699ff4cc75ee35d98e61fb80c1a3ac8090c0eee89bbbe6d80bb3bf84bebdb17198b47f915e743fa
+EBUILD funcy-1.10.1.ebuild 431 BLAKE2B 2388dd596831fb0ccb4e01678c374f77f4a8d27423de492c0976990e01f305fa97bb246b7e8d37e4b8da869817627d8bfbb6d90b0260281ee819b7436c6efe32 SHA512 7299b79b6a7eb4d5def7ae298f3bfd0e4a58d23a7561fc71f5cc848cab21d072352cf9a13cd1fe9f7afe0ffcbfb5fe5e78cca0d88f215d11f4e34ea916527bd2
 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 c94f09e0ac42..e77f54f8a1b2 100644
--- a/dev-python/funcy/funcy-1.10.1.ebuild
+++ b/dev-python/funcy/funcy-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/geoip-python/Manifest b/dev-python/geoip-python/Manifest
index 7e1984a58ea0..dd3d5ad7bc66 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 888 BLAKE2B 4bcf40afb5bc8dcf07deb9938f22ab824a2a0bce3fdc5d7d240eaee53f8e1f2d84421fd9b6798ccd7aaeb0a7f61877d03ea5638c2867dfce40c50dc738ae7c22 SHA512 d1b647a7c53c67609d170718173d2088f03d212081e179914435f069105f972a625217ea5b46e3be2ce7447c1eda66e91b01e7a48b6a5e169d72ebaf1fa5340f
+EBUILD geoip-python-1.3.2-r1.ebuild 892 BLAKE2B dece093ba10083bcf60c00637af85a16fad86512f8071fbf7a985fb7eb4f090a566f554147e3ee66781ec5171e2493e4085bafdb29f86f67d57dd9b49412ed29 SHA512 97f72ed38ee9a5b69a4dce2d8e637bd962207508a75ce0224e33a684659e23da44eadde1839592ceaca0d83fa3713ee6939deb97219de15ce1b970a5ae06e586
 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 c4b014d7e166..0e044c47a30a 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
@@ -2,7 +2,7 @@
 # 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_5,3_6,3_7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index efd874ce9174..c1b2c6e2b103 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1,9 +1,5 @@
-DIST glance_store-0.22.0.tar.gz 130377 BLAKE2B 7dc46dde1dbccddbbabf0e0d1d4033429e4ffa3d6dec6fe379b6f7aabcaa5eeed639aa2c76e5b85ccf3444f4e76ec894251bdb8ae573b094e657fe61acb7887b SHA512 3de073fd4926513674b87afb15a2d4485c4a98f76c7d36cd0957a9cd848399bfb1fc6b3b40550522b712e9bbddf8efec5c3fc629a944fe447543d35eb7184168
-DIST glance_store-0.23.0.tar.gz 140917 BLAKE2B 764510b2d24b633a9120d4c39e66100a75de23c0bd7ef633bff4d381369c67d6a21b4f16019432ac02c6ed1b995c5c6373014dd9a5bd4df4981721146ced4145 SHA512 ee3d1187ac47427981af294604bd4742a12b60bdf406039a86c5eb33645e1407bc077ae079ea07b9c031922d9350b0e2eb7eaba70f51854c288faf90f9cd7b41
-DIST glance_store-0.26.1.tar.gz 183314 BLAKE2B dd8cfa2b3e41016b0cb8e3cc6aba0c8288524f7ac3bbd42d23c2ecbc8df49a620d310ac2ccd155852b5731ba6c1cf071d8f0aca376d0ea888e474fe562b3a258 SHA512 ebaa8ad311e071972e2b9f4d8813b930cb6241ef4527d0cd1a6449d169f23b2ff5830d4a99009c15d62e4d767f5dafc8567631f1eaab28256cc4bffc33518509
 DIST glance_store-0.28.0.tar.gz 183622 BLAKE2B 327bbb498d9cc1e446361d026f2dac4d4cd057745790fdcf032583ef0869c302a453e1331028a47bdff34f4bda9f1c27d9c26a005febeecbe5e4d786d08cbcf1 SHA512 3ff1bf64c75c069f6bb22ad72438fcb97e569d8de10cb85065ee0f1f8f9e948cf6b895a184460080f90f091e082deafcee70730b8dd954a6b026a1796b70ea09
-EBUILD glance_store-0.22.0.ebuild 1618 BLAKE2B 1573062d8450a4aec612fc839660357b99f9528a0e44a2127ef23e69b2cc708862360769a00e2b4eb3078f69e665971cf8c3007bdd97d84c749d05147ef120eb SHA512 1e90ca29e7c8f0d99e6abc29cc8c564c8a3ead65aaa0fe25d6ae093dc8da68c450294eb1f2854074e7e67b2d7fbcb2ffa32aca79989b5ed779d858f6e5dfb139
-EBUILD glance_store-0.23.0.ebuild 1807 BLAKE2B fda5339c1a16479872e3724ebc9f6fefaa15cd2dec11fd7a03b6f0838efa0532686f04100a859d31cff4fa50b37a0776b538cb4a8ad5c23d16f7d65bc8920206 SHA512 a7396c28ff233d7b431c56238e4969c6de550fd1b610120b66b5adc8f3a8793a3f52c08335b812536612a32911e169d354b1c7e871200208b716048adbb10cdc
-EBUILD glance_store-0.26.1.ebuild 1803 BLAKE2B aa894e49506071cb4695f37c028de3da45388b9e17582bbedb5a03aa3795f25c028c91745d9825e46a7a69e76abd594551a90f591996ab6b227b4555b3b085c6 SHA512 99f4ca34af7be2a1ab1f3407c597c85d90883c3d9277a84162e69bbb586dbb593688c6671ffaa197ead038c423d022be44aa5d56070b6d9280bafb16c4ebbdfa
+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 1716 BLAKE2B 283470500aa91bdf7f43e594993f8737d1f40b9263a73b4300a2ca75d3c637538101398e09eed2b5bf14360877d8f069881c34102ac0aa5725afbe539556c9e5 SHA512 6dbbfd5d60b43913f93fbee57cd0639474fc4776c110143f949e7e0f46e67411861ea230e538f523e1c2df5f8d77846e58655abd3efd014f8f026ad3dccf38b4
 MISC metadata.xml 807 BLAKE2B c5195ef9669d04dc0f81f47b07e802984114b15bf4dedaf99b7214187befb556765a4b14c7d55c9bbbf1dcc2acb4f22e7c5a12a65912cb9f2bbcb73d1cafa4a5 SHA512 3479866f525828fbd21f7d0953088720d0045bf2e00d8dd4cb5bba25f7d5ba939c4bc9bac89d1f9bbf5c3a815f0d5199045f6ad0585c6712843dc1f26135705d
diff --git a/dev-python/glance_store/glance_store-0.22.0.ebuild b/dev-python/glance_store/glance_store-0.22.0.ebuild
deleted file mode 100644
index f385937f1181..000000000000
--- a/dev-python/glance_store/glance_store-0.22.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 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for glance"
-HOMEPAGE="https://github.com/openstack/glance_store"
-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.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=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-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${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/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.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/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/glance_store/glance_store-0.23.0.ebuild b/dev-python/glance_store/glance_store-0.23.0.ebuild
deleted file mode 100644
index 78938bbffd31..000000000000
--- a/dev-python/glance_store/glance_store-0.23.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for glance"
-HOMEPAGE="https://github.com/openstack/glance_store"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="cinder swift vmware"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-5.1.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}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	cinder? (
-		>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	)
-	swift? (
-		>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	)
-	vmware? ( >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] )
-"
diff --git a/dev-python/glance_store/glance_store-0.26.1.ebuild b/dev-python/glance_store/glance_store-1.0.1.ebuild
index fc6be631a5ef..dd1dae32cb10 100644
--- a/dev-python/glance_store/glance_store-0.26.1.ebuild
+++ b/dev-python/glance_store/glance_store-1.0.1.ebuild
@@ -1,8 +1,8 @@
 # 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} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,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"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="cinder swift vmware"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
@@ -30,12 +30,10 @@ RDEPEND="
 	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
diff --git a/dev-python/grafanalib/Manifest b/dev-python/grafanalib/Manifest
deleted file mode 100644
index a628f8d714ac..000000000000
--- a/dev-python/grafanalib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST grafanalib-0.4.0.tar.gz 19957 BLAKE2B 27c7a597020ab465d2a7536676d1021472cde25a669135b1efa8b18061e3c932a0262e826f4ab05dd5f5902c620167a82c56e4f534d185d4b330dc3a7f8c0619 SHA512 f061512f89375326d0c44854a123fe4335a6265be0f71b7df4310b21031ca4cc691e5cbe21a5fe32d2e56d72e7c8075e7369674a19887b7b03c0739a39898975
-EBUILD grafanalib-0.4.0.ebuild 597 BLAKE2B 4e3534e6fd8577aaa379faacb146ec2e69f7a2ed3fd623f9ec681f4705642e23296457778e21823c0deb6f0c2201ff180d3c9ee1a3a6e66c3ffb7ae8cf5bb5df SHA512 ca6e988eb2d08f7ff23547bb84829d161ad998eb4572ce0a4318e7b6b9ef097b0c4032f38b84a8ed9f435b6a1d5a9ecb6bda92eff0e719731ae284ba67a59997
-MISC metadata.xml 258 BLAKE2B 6ab7795bad72aa523ba2859d569c01fbf315d131cc411d25437e8247ec188a6af0d257929e0d5582e0397a36db5508e975f369927ab81e64786a05f3d6c04b73 SHA512 a358b17abbe52e2c4045bbf7fb97fe7e1edbd7610c9a7f4e4f752672b2ee9a2a8d0c8c01723de89c2cae47f483ac087e268a6e777a7ad431435bd5aa30d73aea
diff --git a/dev-python/grafanalib/grafanalib-0.4.0.ebuild b/dev-python/grafanalib/grafanalib-0.4.0.ebuild
deleted file mode 100644
index ef798f8284e0..000000000000
--- a/dev-python/grafanalib/grafanalib-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=( python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Library for building Grafana dashboards"
-HOMEPAGE="https://github.com/weaveworks/grafanalib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/attrs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/grafanalib/metadata.xml b/dev-python/grafanalib/metadata.xml
deleted file mode 100644
index 6bcc38bc3a1c..000000000000
--- a/dev-python/grafanalib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">weaveworks/grafanalib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 9ba2e2606b5e..56100a819b2a 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -6,6 +6,7 @@ DIST grpcio-testing-1.20.1.tar.gz 16553 BLAKE2B 5ea6a92238cc086a030c23666340f32b
 DIST grpcio-testing-1.21.1.tar.gz 16879 BLAKE2B 4595b99b174db549a2637c9e203e7de0a799086c0119751927b7d57b3837958e296671cbc7b6dd5598d8ea10fedbb23380de200604367308186c03ed77e607ea SHA512 3556c21f0d51a5b4cbfcf8eeec2b383b1aca5056337d3ee8f46a5dcc7c7fc4507b858d2309232e982650495a83d1d80f6fa251f25f77a6b180817fab8d4c4527
 DIST grpcio-testing-1.22.1.tar.gz 16718 BLAKE2B c90717c5910be42a161fd08746b898a691cdc80f631991f718c061bf56e3e8851b49ab2219a59ebe80f4d878c713230ef6355095e78aa1d0c164aad570dd27d9 SHA512 90f366bbf352e7f7165f91ac4605ed74a7f7b08f1981838f0d218396c54983cc0752121fa890abbfcdba719461093ab3e5ce47e95d3e68047fcba1b7f5820d73
 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
 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
@@ -14,4 +15,5 @@ EBUILD grpcio-testing-1.20.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569
 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
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.24.3.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.24.3.ebuild
new file mode 100644
index 000000000000..0f6ea5237441
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.24.3.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=( python2_7 python3_{5,6,7} )
+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 ~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 b839172d276e..dda5478ee7e8 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -6,6 +6,7 @@ DIST grpcio-tools-1.20.1.tar.gz 2018570 BLAKE2B 9c2ba04b06df9883ac79726aafec6eb1
 DIST grpcio-tools-1.21.1.tar.gz 2032788 BLAKE2B f26e94c92ebe076496a8738dcbdf9b67dedd5fd60426632589ba88bffd3943cd094881d61b4c67e25660902ec10887a0ed154dc9e6e33d97460313514f4d5eb6 SHA512 624f23bf9d7d6787d4b65e60d948feb88548ed6963443cf8cb1a3eaeaf03dd2ca9a8fd9e8a6882137b781b737b23934b84e3a922df95da95885bbd5f3de873b5
 DIST grpcio-tools-1.22.1.tar.gz 2022553 BLAKE2B bd94ece55c5e9e41c923c1beb5a2deb2b49d6ac479401b9de622d8a3fb0deb7e852d7da3a0239442d7560135565af1fda80ab43f7def870488dd17cf52c1dce5 SHA512 92d65c40ccda268154dbc21a9b7607f4ccee8feb0c5eeb0d88ae0d34ca80b3e1e7a6a2f8b7059aa904a7cb3654b0e23ceeebe44f58c08b713bf78ab7e4faed4d
 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
 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
@@ -14,4 +15,5 @@ EBUILD grpcio-tools-1.20.1.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5b
 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
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild
new file mode 100644
index 000000000000..36d23bc9bf4a
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild
@@ -0,0 +1,29 @@
+# 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 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}]
+	!<net-libs/grpc-1.16.0[tools]
+"
+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 00305d9ff352..a53d2f8e1806 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -7,6 +7,7 @@ DIST grpcio-1.20.1.tar.gz 13882426 BLAKE2B 4211d9dedc7ba858a5124798f17b3b158f255
 DIST grpcio-1.21.1.tar.gz 13919484 BLAKE2B dcad98da8db4aa588facc30d1b010ec1e4d5f8085751422277631329f1c4949ba3e2c3882829354025a845992ba9972df1c48a277df93caef9015969f9423aef SHA512 0ea20490ce5e776a6253d4b89dd9d9091afb7462d6bd6bd9d2d3329979d61360a3e31abbd043b90d0908512cf7ff2668bb21cb472fbf0ad5a3b5963073850dd7
 DIST grpcio-1.22.1.tar.gz 13923342 BLAKE2B 6d211b93a7597f568d106e0d6e3d30b90d7b4bf6fae42b163f2ae04e01c4b323c4d7c2a5380ccdbab14f9a6986c86fae4948bc827a97c189f915bc24738fc426 SHA512 5392041a021b0523fc7a615070ea0f907fc960cb69ffba1e7fcdf0aa8e498cb33f567d9eec795dc06662f558884dcabcc17a1ae4a26fcaa479b0a43c08e8b913
 DIST grpcio-1.23.0.tar.gz 13977223 BLAKE2B b9f95aaf397eae9610280937980e4b2694af98e6cd5f80015dd83c67ec6bf9c41e76474f873627d6c6cc35fe9af3b45f14aabb6ea809b51cf5f0bb0f3b702794 SHA512 ff3cd9d2380a158ea7a49ba2c9cd5bd1ec98194aa48cf2d45596ab93f0e8a6d6ed0291e5dfc52bca79c62950e6a0ce387819d19f036c0dd1e6dc7b737c1ee97f
+DIST grpcio-1.24.3.tar.gz 14030592 BLAKE2B aa9e61c692937d7fc06d0fb601f7632a6ac5fb165aabec9e7993cf1fa41254b004fff89f650f390544e5fb1972dca542169ce0fdae79a71d775fe3cbb44a2d95 SHA512 0dc90de5a06b9af7fa91d3e96117f69813e5fee31499e8e48daac7d164856594f164a434d3dd28d6e0220e417926aadceabb9b7597e86a6bb87d8943e6661dce
 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
@@ -15,4 +16,5 @@ EBUILD grpcio-1.20.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113
 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
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.24.3.ebuild b/dev-python/grpcio/grpcio-1.24.3.ebuild
new file mode 100644
index 000000000000..bcf535535b98
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.24.3.ebuild
@@ -0,0 +1,38 @@
+# 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 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/html5lib/Manifest b/dev-python/html5lib/Manifest
index 3c30060f29a7..f57fe861a1bb 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -2,6 +2,6 @@ DIST html5lib-0.9999999.tar.gz 889312 BLAKE2B 49cbab503692a1044ef37b11d9b776fb03
 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 1068 BLAKE2B 2f31610f5f160823ffec3b2fb3970c058751e00ab2f641c063df75f36b099918ad16d73e32ea4bf2c756eb1dde17032012ac28f59aa7284d03895076a0c90fbe SHA512 d6ff8bfbd5ca47fd05793a699fb27c8319b409a2ce83754f79ccde754a331f4583621c256caa97b1061371f298f07508e8f6d3a73a7cb438c9ffabdce2fee765
-EBUILD html5lib-0.999999999.ebuild 885 BLAKE2B 319d3c79f013779ffa0f7af882bfb441310273b78e712cd080f498dc8b8737b6e2d4d43c38b2d16118afef179d4014075fb5f0592c26b67318eb4eab8ea7a750 SHA512 efeb321aab391ee8ab02654e36fd9db4a82b415869d2ddce7928acab0ca6f962f75eaf39745411717482d231bf10e17a3d61a82775cfb33ae43247e9953fbff8
+EBUILD html5lib-0.999999999.ebuild 889 BLAKE2B 0766ec7a5a395a0ed97df86b491f7cbdc0b6b94f3b44085506765cee4cfe04eb91fd305ff78ea9992b133728271724eae2c67b2ed135f9f3ab706e2f31675226 SHA512 563977d6760b2e9dcd477ef50402fa55ddc20c1b7a6b070106f5683f53d03377f610e11ba10b3bf134fa38e1be94403f2f78e1aacc58de2c2b4c05291aa69262
 EBUILD html5lib-1.0.1.ebuild 888 BLAKE2B bc0e1877becb5cac6fe3d75ea35d4206e154142bfdd357298fb5d3f6f0975de5bbaac38d127a3539654b0d3e18539b705dcf870f25cfd43eb7211fa5fb2e7cc4 SHA512 fb69c8660d4914c612892df088c7fc8ed6b5136f818925e88bf20661db5c612264eea45ae8f2aba415d302bc97015ccbbc3fbba48fe3cbce3db60c46360bb271
 MISC metadata.xml 589 BLAKE2B d98d80202c045607de5843e34313a06e9493c50bb1154e3f90a7c1c9236de2b4369827d35cb8540125524b54c0453ce56ca7ecf3a359bd9bab6e548ea1377f9f SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a
diff --git a/dev-python/html5lib/html5lib-0.999999999.ebuild b/dev-python/html5lib/html5lib-0.999999999.ebuild
index b71a60e5a8a3..4487607de5ad 100644
--- a/dev-python/html5lib/html5lib-0.999999999.ebuild
+++ b/dev-python/html5lib/html5lib-0.999999999.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/imdbpy/Manifest b/dev-python/imdbpy/Manifest
deleted file mode 100644
index 4f15833d07cf..000000000000
--- a/dev-python/imdbpy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX imdbpy-4.6-data_location.patch 386 BLAKE2B d8d5d9696c8b16fc0b6b17e0c586fc4d13888656a5d6c197109ae2c9ea7899460f3db29c692b300599269bbade467a5a607dd0f9b1469299280c071ee1178cc7 SHA512 b6846126cf3eab62f454b1d8073d068a356ee792895939c9a4ee67eacd46616d0173bc85e52f6930f3ee8d96b95913afcc07b5b384a205559bce105e37038567
-DIST IMDbPY-5.0.tar.gz 367238 BLAKE2B 978748df2352725b5577b2a1274f807a62b26fa673a063929e0f6566dd0de3dad268f63ace03dea43a54b3621532be11a0a70781dd745579119042c33c909439 SHA512 924b9c9b7055c75abb1c48867ba9ccef3c5259c748a6f21e8344616da9ea58d5ae58a2f12a78dc61fea7c008956994687fdcf7ecd59f5f4e82daea62890086d4
-EBUILD imdbpy-5.0.ebuild 891 BLAKE2B c3d917590562c3b3dc543fce6b9544ca6114bcb0d7366565a2e9cb9feff45b474030d693006ad8262e74b5bf4cecf0ff3835629f8fae5622079e927768ad4fbb SHA512 67bd4a437793b5b8fde00c2b2bdc814feed5ea7c2cff1cfb108dda7d6d37abd66a6af4132b770416e1be0241c93c4594ebfc0cf80783a010b63fa3e4a465c709
-MISC metadata.xml 287 BLAKE2B 9a17b04e0dae1ad2e3003c9292fb4e622a483e549e880d2c4909cb6610622e1c0651ce1185f63bd330dce314f3470ccda272170f4a077a578b924aab96067c7b SHA512 73efa1a442676f1fea6bfa663d9615e9e55d2520d8a30749ceea26fbadf3df55358320ddb5ced57841b5d4eec5dc6948b3c85d2537d8fbed3cc1d4392f970767
diff --git a/dev-python/imdbpy/files/imdbpy-4.6-data_location.patch b/dev-python/imdbpy/files/imdbpy-4.6-data_location.patch
deleted file mode 100644
index 90dc467170eb..000000000000
--- a/dev-python/imdbpy/files/imdbpy-4.6-data_location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -70,7 +70,7 @@
- 
- # XXX: I'm not sure that 'etc' is a good idea.  Making it an absolute
- #      path seems a recipe for a disaster (with bdist_egg, at least).
--data_files = [('doc', setuptools.findall('docs')), ('etc', ['docs/imdbpy.cfg'])]
-+data_files = [('/etc', ['docs/imdbpy.cfg'])]
- 
- 
- # Defining these 'features', it's possible to run commands like:
diff --git a/dev-python/imdbpy/imdbpy-5.0.ebuild b/dev-python/imdbpy/imdbpy-5.0.ebuild
deleted file mode 100644
index 824232084770..000000000000
--- a/dev-python/imdbpy/imdbpy-5.0.ebuild
+++ /dev/null
@@ -1,41 +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="IMDbPY"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python package to access the IMDb movie database"
-HOMEPAGE="http://imdbpy.sourceforge.net/ https://pypi.org/project/IMDbPY/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=( docs/FAQS.txt docs/imdbpy48.dtd docs/imdbpy.cfg )
-
-PATCHES=( "${FILESDIR}/${PN}-4.6-data_location.patch" )
-
-src_configure() {
-	distutils-r1_src_configure --without-cutils
-}
-
-python_install_all() {
-	local doc
-	for doc in docs/README*
-	do
-		DOCS=( "${DOCS[@]}" $doc )
-	done
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/imdbpy/metadata.xml b/dev-python/imdbpy/metadata.xml
deleted file mode 100644
index 9a2bea3d2d20..000000000000
--- a/dev-python/imdbpy/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">IMDbPY</remote-id>
-		<remote-id type="sourceforge">imdbpy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index de6b644849e6..e004503e4de4 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,7 +1,9 @@
 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 1424 BLAKE2B 68756c48406db2d8eac445dcf29eb0b2697594d2868f5ce80864b0ee6542cc8cb80c705121e2460f8bde9db98be307d898edfec85840c42c976a217411161938 SHA512 c2be6e3d2ac5910ad1bda0da81403c31427e48383d6b32359525a2cd96ef61d766ca60d49ed80b10407964e49a56456bc2fb706ed934221471e1bb6be4cda8b6
 EBUILD jaraco-collections-1.6.0-r1.ebuild 1426 BLAKE2B 83ffd2b9c2a1638493655eace431cbc773701f73ff0863d489c6cee3fe66fb539d6de47441ed05979ff0ae2ce3665d56fc3bfb9be6e2b27781d99d13b8b4d8f3 SHA512 e26eeade216241cf611df10cb76ad8063f963e48c858e927577046dfb3d4d3ec053bd5c88c376a16db7f5e1522ad66e8d757472c72f7bbacd3d90bf5f9ae48e5
 EBUILD jaraco-collections-2.0.ebuild 1586 BLAKE2B e888ff4d24ff5541ed77a1cd480049a9ed9bd56fd4bea9e4ce5fa0e71811c41f6b00b04149bc37a3047ee4756bf749cb1488138e6cf7380fe9500acdb4d7741d SHA512 420cb499a3cdd767c025034aac18b1f4edff3d6c9b31a22cdbb2a78f4c7671947fb43bbb08cbc58658f1e29a0efc7b7229f7153c02695b578bf7fc0192eddcfd
+EBUILD jaraco-collections-2.1.ebuild 1586 BLAKE2B e888ff4d24ff5541ed77a1cd480049a9ed9bd56fd4bea9e4ce5fa0e71811c41f6b00b04149bc37a3047ee4756bf749cb1488138e6cf7380fe9500acdb4d7741d SHA512 420cb499a3cdd767c025034aac18b1f4edff3d6c9b31a22cdbb2a78f4c7671947fb43bbb08cbc58658f1e29a0efc7b7229f7153c02695b578bf7fc0192eddcfd
 MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
diff --git a/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild b/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild
new file mode 100644
index 000000000000..d8aefffd0776
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild
@@ -0,0 +1,60 @@
+# 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"
+
+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-text/Manifest b/dev-python/jaraco-text/Manifest
index 8903216e1c9d..4e4a53f32bac 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.0.1.tar.gz 11969 BLAKE2B 8eed750e81aa6a82baaa25483a2b60d2adb9f7a1769f92556a3a5c3fc53c3dc63a7910615317007dd0b934e73987da5de53d0e52a3cd44da955b717b48348dd4 SHA512 dcac7de44de4f1ae4dcfbe3e1857a4017b967bbbfc46df05cbf7d0f319a0f841440406b75a6e84b3283d8946ee1753c99f16438228dd2393fa023571c3911a10
-DIST jaraco.text-3.0.tar.gz 12082 BLAKE2B 474a3701460dc899015ef0331f2d4de996915e4b840dfcbb8963fd2eb98571bf7f398285dd4df0a0df36e5d1ba8ce04fa59d396dede5ac059c2b991f6a203a1d SHA512 449b917919f074e0b8a285083163fb5141fdee0db0e6d49c58c8e07ca6f284b5d53d01174e266bf8d21914870574672425abf9b094e815d0d9f0c94b1219de16
+DIST jaraco.text-3.1.tar.gz 13220 BLAKE2B f52ca11b8b20a42d2c36102d4d48cf27952314bf5304521fde020c6e52e92bf6f534b2c6c4d8cc0b73aec8bd118030e455d8a5eeb19fb4e927105fa7e4477817 SHA512 9edd50e3b67d40a1a5dfe8796dd55f80aac52cef9ba2f1ad565cf597c1ff8824d2c61900cedd104210b60dcc6dced8c01321af67e2e1a755be89e1c15945da1e
 EBUILD jaraco-text-1.10.1-r1.ebuild 1379 BLAKE2B f6721435bdb371f6f7061a4e575411a9a3812b0d4780fc5f87bd3866e295821e88d9df8891721e153a04415e678219942c92f3907dc8606736bae2ce03987985 SHA512 cce7096bd5dfe97bbc0c2fcb5ca04f2ed06016a8d4468b87286364e1ee7420663419caefbc9138d3dcc2a2f7bd9c11736192a4ee81d51618e4cac67c27b6fe53
 EBUILD jaraco-text-3.0.1.ebuild 1526 BLAKE2B b0ec3c68eceb40b5350e147b7b76b0fb3ce2fc625d951239c77839c9564320c1f6f0c5e1a4c66d32783a7c46907d8ab1602a59bd3d309993498777dc9c0ff073 SHA512 20577f82ae24da7621426e08a2015407cffdad9e55280ca3d4dabb2b42d2fc3c5fc51297eb52208e0876452c53d4ac1f17503a1e7bd3c05dabbccd9cbe88c295
-EBUILD jaraco-text-3.0.ebuild 1492 BLAKE2B 59108078857e6c8b893eca08cd23872ebe5862297514dcd7355ee16a01fa5987688c185f87cf0f3f97f44642ed805f0f926b5ffbc76218ca3ad176961d6e83b1 SHA512 9fb5f7bd11f48f24087d5a6ba9ec753f4d8b485775b2f5300bc11987bcbd84aad35bb6f458946813502839b765087f7bf6c7c3504abe072efebe39227380438f
+EBUILD jaraco-text-3.1.ebuild 1642 BLAKE2B 45156ceb2b164928f3beab053c3f2db9a9a6a6587f5f66368951ef2cd9a355f7c23c600da663bebf90c394b799376d8aee25b2b4f85ad3661565eee474dd1dac SHA512 055719a99840ae15049d205e27c591a1f496dcb358d91dea8d23e65a8f2c019ea83450426148e6a11a5e813e429aae3705c5bc5575e97fb84556bc1a4fbc3ad3
 MISC metadata.xml 530 BLAKE2B 15328b15f81e40af54c52ceef75adc55cc83d04c2ca52c8bcfe85d5fce1e8b70efb38b4a15c8390d283e72a2496dc0b148da0b51b3213440a6ca8379d091c927 SHA512 00c56e02c156ed1b402475dc24dab7c1943bdf6e3067da3f02fe91af0789cf87041cd7191869ab9a785aef21d4e696fc9b134a48fa769ca1f0d0337d1cdc5969
diff --git a/dev-python/jaraco-text/jaraco-text-3.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.1.ebuild
index cc95fcac5347..a3fda424dffe 100644
--- a/dev-python/jaraco-text/jaraco-text-3.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.1.ebuild
@@ -19,7 +19,9 @@ IUSE="doc test"
 
 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)
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jikanpy/Manifest b/dev-python/jikanpy/Manifest
new file mode 100644
index 000000000000..b19e7f80f90c
--- /dev/null
+++ b/dev-python/jikanpy/Manifest
@@ -0,0 +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
+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
new file mode 100644
index 000000000000..52e861dcab31
--- /dev/null
+++ b/dev-python/jikanpy/jikanpy-3.4.1.ebuild
@@ -0,0 +1,25 @@
+# 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/metadata.xml b/dev-python/jikanpy/metadata.xml
new file mode 100644
index 000000000000..12ee3e1826af
--- /dev/null
+++ b/dev-python/jikanpy/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">AWConant/jikanpy</remote-id>
+		<remote-id type="pypi">jikanpy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/kaa-base/Manifest b/dev-python/kaa-base/Manifest
deleted file mode 100644
index 58663eab1e49..000000000000
--- a/dev-python/kaa-base/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kaa-base-0.6.0.tar.gz 346849 BLAKE2B 55295f673ef95f4070c22c4facdece03d26be34d3ba73a35048532db71b9596637b9a47fa5af9dc878359208d55aa39c535f8c4782b0b09a124e71818d79144f SHA512 685bfbab9ccdfed529ce17185f50700f8b090c0ca2f5f8e937609c9f03efd19536cc8c2ae8218415eea3ccd89269c92aa4d9bfe88ca3e951d7546ea4ce91cd6f
-EBUILD kaa-base-0.6.0-r1.ebuild 1048 BLAKE2B 2498c421d9c362bab9384ebc5a42985f0985a6110dc7b742a9f541b2c153f9d9778f647058b3f36dd6389505879f351dbf65ac65f3cb59ff71fd1fa7884abd45 SHA512 5da7c7c0f1e5610ffb3bc7353215701773035b7c9d850403b8647b25df3bd530f7761d02309f847f9c6bf5339e3dd553c32c8c51553b55e94b0f953ace6719d8
-MISC metadata.xml 755 BLAKE2B d11e6041bc04da444cc808277fba1eee0842597dfe618e0ecca193ec7f0f65281151ad5300eadd0ec7eba12ee2c447de8ecbb6ed75c44f2ab1ed6911cc9b195d SHA512 4abbb8dfeb356be37a54c6fff2c4cc99a50ee966b5f513e7939139d211a825a643fb567a7fad53ae87909a7cdbb8b84d5b57c7d7a9e4f6b47fd14a2dd452defa
diff --git a/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild b/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild
deleted file mode 100644
index 02a7ed1b8652..000000000000
--- a/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite?,threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Basic Framework for all Kaa Python Modules"
-HOMEPAGE="http://www.freevo.org/ http://api.freevo.org/kaa-base/"
-SRC_URI="mirror://sourceforge/freevo/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="lirc sqlite tls zeroconf"
-
-DEPEND=">=dev-libs/glib-2.4.0:2
-	sqlite? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	zeroconf? ( net-dns/avahi[python] )
-"
-RDEPEND="${DEPEND}
-	dev-python/pynotifier[${PYTHON_USEDEP}]
-	lirc? ( dev-python/pylirc[${PYTHON_USEDEP}] )
-	tls? ( dev-python/tlslite[${PYTHON_USEDEP}] )"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -i -e 's:from pysqlite2 import dbapi2:import sqlite3:' \
-		src/db.py || die
-
-	rm -fr src/pynotifier
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	export CFLAGS
-	distutils-r1_python_compile
-}
diff --git a/dev-python/kaa-base/metadata.xml b/dev-python/kaa-base/metadata.xml
deleted file mode 100644
index e090a63899b3..000000000000
--- a/dev-python/kaa-base/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-needed -->
-	<longdescription>
-		Kaa-base provides the base Kaa framework and is an implicit
-		dependency for all kaa modules. The kaa framework includes a
-		mainloop facility with an API for signals and callbacks, timers,
-		process and thread management, file descriptor monitoring (with
-		INotify support), inter-process communication, as well as a
-		rich, practically magical API for asynchronous programming.
-	</longdescription>
-	<use>
-		<flag name="tls">SSL/TLS support via <pkg>dev-python/tlslite</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">freevo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/kaa-display/Manifest b/dev-python/kaa-display/Manifest
deleted file mode 100644
index 7bf986dd9d7b..000000000000
--- a/dev-python/kaa-display/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kaa-display-0.1.0.tar.gz 40263 BLAKE2B 574627802e7eacb7fe186903dc247a9f6f4e2bccc04b8775c9de87bdedc9c353c2489b3d3e2adb6de4eecc218153d055973464b704f54e47bfc864b4e873e39a SHA512 dec20eb8830567b07248fd4733d7576c9dfbe4f8577d4326e82baf434034e2b6105d3a6cf561f074fcf29b328d2daf6faf6a18dc467b030a3814d953b44a0b1b
-EBUILD kaa-display-0.1.0-r1.ebuild 699 BLAKE2B e3e20414b80da505d09659410fb6570ddb26eb468f7789119867e019ed21b953980fca6c21a1dfafd6bb172307994e3e58e12adde54883b907667a9a5b546004 SHA512 1e31803f7302b587c8d089158cde317fe79c6941027e21a85f7c80114f3f0c69d8c43e31a5e7df07c93083044e596b0dea7d24534af322ebefe7ce4d73f36b87
-MISC metadata.xml 243 BLAKE2B adb32d1048e134d13a7bfc2949d83c45f4e02c86f4928cecbab54f41b924a5e879c219f5f92f41c7769ff67358cf5f2f5eaf1a9d33afec982aa17b38631f68b1 SHA512 91cbaf89b9b153009959e68f86e71e7d58fb8fbdfd3348dcb19085faec7ff134b228b8ee1ae48e5f492596703f80f1c424eab7bf3be1975dd6d6a3c392c8a381
diff --git a/dev-python/kaa-display/kaa-display-0.1.0-r1.ebuild b/dev-python/kaa-display/kaa-display-0.1.0-r1.ebuild
deleted file mode 100644
index d4484e45f550..000000000000
--- a/dev-python/kaa-display/kaa-display-0.1.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
-
-DESCRIPTION="Python API providing Low level support for various displays, such as X11 or framebuffer"
-HOMEPAGE="http://www.freevo.org/ https://github.com/freevo/kaa-display"
-SRC_URI="mirror://sourceforge/freevo/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-python/kaa-base-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/kaa-imlib2-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pygame-1.6.0[${PYTHON_USEDEP}]
-	media-libs/imlib2[X]
-	>=x11-libs/libX11-1.0.0"
-RDEPEND="${DEPEND}"
-DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/kaa-display/metadata.xml b/dev-python/kaa-display/metadata.xml
deleted file mode 100644
index 77e5b28d4674..000000000000
--- a/dev-python/kaa-display/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">freevo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/kaa-imlib2/Manifest b/dev-python/kaa-imlib2/Manifest
deleted file mode 100644
index 9c09360cb656..000000000000
--- a/dev-python/kaa-imlib2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kaa-imlib2-remove-png-dep.patch 387 BLAKE2B fbde3afcb052d9762af1ac238b7e6448a0336c4920f7f14d190db7f751216364d652a292c31faed3bb7bdd053fdf690c82451691e7db71c466999484edd30bc8 SHA512 70434172fcdfa29889a8fd53ff504a6aa33e2f630ae76020894f776c81f8dd1923b0aa9d9460ee41ea1b973650835a735efee82cd27c83cff7b4f5d27e074c5c
-DIST kaa-imlib2-0.2.3.tar.gz 30671 BLAKE2B e38256948ef186ad429a6c15b47a2b27e942acf63bf6cddeeb57b99aa6ce8e3f20cef7d49df65161a80cd70d0f8ea2e5171c69f07b4082ae2be9831dfc804d37 SHA512 417e473befba7360160db8296fb20de9689f6620bf0940b35e68b4abf00ec49ffadf95f62b7c6baaf1465b6c69c2d14b149d9ff3a4a8450e5966cf53f160a5a0
-EBUILD kaa-imlib2-0.2.3-r2.ebuild 596 BLAKE2B 6f40b91946721f047039a30269004bce5cdf3a592712284e5cb3a76861857aef572eeb4ca1600f94d7d840a7b3a228f51dd369ac1db624c8ea80305916785279 SHA512 dc07bd47eea64d6582035c0daaef1792cd13c5613b769ff0b21076bae5e75f210ec8d4351a3ed22388efb8cac91d61cd48f740e59670e688c801eca5f40796e8
-MISC metadata.xml 326 BLAKE2B bf6015640e990ac61001ee8949d5c269500efc84b851d5472295bff80e2608d1d313f5f06e02511da18e6c7094e5a1cd3f25d789fce7f7f914326f82e4e3304d SHA512 c86649ad50d1dabde21a912791d88e9a20265e133184cb53ce48f2edd07fd92cf6dffb29deea251c0c94ab949c439c2a89327c310754c11f40fb42a579f3dc73
diff --git a/dev-python/kaa-imlib2/files/kaa-imlib2-remove-png-dep.patch b/dev-python/kaa-imlib2/files/kaa-imlib2-remove-png-dep.patch
deleted file mode 100644
index 0db6fefa9ca8..000000000000
--- a/dev-python/kaa-imlib2/files/kaa-imlib2-remove-png-dep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.old	2008-07-12 01:43:30.700296071 +0200
-+++ setup.py	2008-07-12 01:43:57.441547566 +0200
-@@ -39,7 +39,7 @@
-     sys.exit(1)
- 
- files = [ 'src/imlib2.c', 'src/image.c', 'src/font.c', 'src/rawformats.c' ]
--libraries = [ 'png']
-+libraries = []
- if not os.uname()[0] in ('FreeBSD', 'Darwin'):
-     libraries.append('rt')
- imlib2so = Extension('kaa.imlib2._Imlib2module', files,
diff --git a/dev-python/kaa-imlib2/kaa-imlib2-0.2.3-r2.ebuild b/dev-python/kaa-imlib2/kaa-imlib2-0.2.3-r2.ebuild
deleted file mode 100644
index 01b4d056decf..000000000000
--- a/dev-python/kaa-imlib2/kaa-imlib2-0.2.3-r2.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="Imlib2 wrapper for Python"
-HOMEPAGE="http://www.freevo.org/ http://api.freevo.org/kaa-imlib2/"
-SRC_URI="mirror://sourceforge/freevo/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-python/kaa-base-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python]
-	media-libs/imlib2"
-RDEPEND="${DEPEND}"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=( "${FILESDIR}/kaa-imlib2-remove-png-dep.patch" )
diff --git a/dev-python/kaa-imlib2/metadata.xml b/dev-python/kaa-imlib2/metadata.xml
deleted file mode 100644
index 602b261e8289..000000000000
--- a/dev-python/kaa-imlib2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		Kaa-Imlib2 is a python module for Imlib2.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">freevo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/kaa-metadata/Manifest b/dev-python/kaa-metadata/Manifest
deleted file mode 100644
index 1512789e8f4d..000000000000
--- a/dev-python/kaa-metadata/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kaa-metadata-0.7.7.tar.gz 257513 BLAKE2B 81fa8dc2d144e7870522184991fbbd78fd4112aa51d2ee626dbee0959ee117230ea7e4c296b946bbefb4e2d371ef5322d0680d27904d19f999ad5c63d0d81aba SHA512 a6ac02e4887cc0489903cf57f55666b30e1351a958572117a867285f34639bcd7302450177f0471cc4bf0ad02d8a42d1f015cd237948610357bdc2e2fb9cc131
-EBUILD kaa-metadata-0.7.7-r1.ebuild 807 BLAKE2B 4a873ec913937603ccd9db624d8f93e4c2046432e31a4c2d81204e3f6e4d29ff92b59a9e66e3ad3a8e1aa4f6cd955bc530d9c1e682080c32e01dae02ea54dcdd SHA512 9fc188772a0074f45a25413dd6441cabed9386dbef944a8d277071429a2f48b1a03a5a93b38d4bbdd3f2eb6368d1a1b154ad4393974000d8763b88091637b708
-MISC metadata.xml 528 BLAKE2B f617c03ab54207d814c110a61a00105e0f1702976eb0bc2d7b6efb5678375b2e92102e97e96dba694843acc391807a7e2cb29f800969337dfd610b5e03d6c962 SHA512 0d9748838b6ccd6f57c635ef5cbd2212ef6a606d2691737dd888b73bd973d4162bc6bc527526ac29b64c47b8a1c83d3f91f481b939e7094d9023f243d1063d88
diff --git a/dev-python/kaa-metadata/kaa-metadata-0.7.7-r1.ebuild b/dev-python/kaa-metadata/kaa-metadata-0.7.7-r1.ebuild
deleted file mode 100644
index c928e9c8f9b9..000000000000
--- a/dev-python/kaa-metadata/kaa-metadata-0.7.7-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 )
-PYTHON_REQ_USE="threads"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful media metadata parser for media files in Python, successor of MMPython"
-HOMEPAGE="http://www.freevo.org/ https://github.com/freevo/kaa-metadata"
-SRC_URI="mirror://sourceforge/freevo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="css dvd"
-
-DEPEND=">=dev-python/kaa-base-0.3.0[${PYTHON_USEDEP}]
-	css? ( media-libs/libdvdcss )
-	dvd? ( media-libs/libdvdread )"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	# Disable experimental exiv2 parser which fails to build.
-	sed -e "s/-lexiv2/&_nonexistent/" -i setup.py || die "sed setup.py failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/kaa-metadata/metadata.xml b/dev-python/kaa-metadata/metadata.xml
deleted file mode 100644
index 0ca285af2882..000000000000
--- a/dev-python/kaa-metadata/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		A powerful media metadata parser in Python. It can extract
-		metadata (such as id3 tags, for example) from a wide range of
-		media files. Attributes like codec, length, resolution,
-		audio/video/subtitle tracks, and chapters are also returned.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">freevo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index a70253ea9abc..d589662c781a 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,9 +1,11 @@
 DIST keystoneauth1-3.1.0.tar.gz 217744 BLAKE2B 4e07c7f4dd6fc097c6838b2a18105656b16f8e45dd553d2908c55fa7aeb5c8dcd2968ca0c3954be0b66044880eec7c33fd9c42413a1ae6c93258a902666bb896 SHA512 3214e08cf449a0eff35eff0400542cbb9e46051095d7955593fec89c4ba31062677f434c70c40037db213fa0e0db15c66d1058e0eca35b1d214967f7fa3fcf14
 DIST keystoneauth1-3.10.0.tar.gz 242560 BLAKE2B 40569c8078ab851d93ba2e4ecf3a3c77ccc2a74bae2866a0993e03021fb475f644a6b04956be756f67754dac31cbc3b53d085a0de82f5c7613b2fb6e138be427 SHA512 ed4451f26f775ea5580766eb431d563bc5bbdde5df24e529c2f3c4517ccfbb9a657e5af535fa6176d905922fc3b6540b5dfb98ce1627efe91861fdc23da8eccd
 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 894 BLAKE2B ecadcb6bbb258ed870260af880109dcd2f1afd39927c72456618204d4280864995ea8b82a3733c0795e2d20472d52284f7e550e83ef9dbb7205ead584b0b96f6 SHA512 d84ff38fc1e374585aa629de921f3b09607ca99647b92b2bff8a0862af7a4dc357b1d5bca78e11de1664c9a0b33398b59a5db97941584936eb904ce67d3fae5c
 EBUILD keystoneauth-3.4.0.ebuild 827 BLAKE2B 231931b5564237bc5f801b0b635646d36df95620a6caa7e40cf4e02e41b01d7d7622a24769aebba73e772f9136062331ba93ffea7efa14b1374c70c076c0044c SHA512 27ec3076051d78f5a93d0b9548020ea8eb34bbfe1a95b5ce2231788cdcb346bce4acfdf984a35df657970da5445658f7f036e1bc8148068f9314fdd2749a9098
 MISC metadata.xml 519 BLAKE2B 22f32029ae01c1067c8ce7c4ea3adca3e462ef4f274b278dcdbc45f74325c719df3ed89b77a6f5f40a3fdf2219b7ed1b1272a944b1e30ea2d50f4ab2b206e000 SHA512 8a00d549ee4cf755cb819cab370b9e66cea6d3396d7c15c3b644731991ad292b0a2c862b2be42e045584e1a429ff5b8950bfe55d58a904cbefaeda8d117ac117
diff --git a/dev-python/keystoneauth/keystoneauth-3.17.1.ebuild b/dev-python/keystoneauth/keystoneauth-3.17.1.ebuild
new file mode 100644
index 000000000000..8e79f6d1abd3
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-3.17.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 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="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${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/os-service-types-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 1d0c3c5b6b1a..b0fa268d2a9c 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,7 +1,9 @@
 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 2850 BLAKE2B 6b6c6af19cc88c251d6cf3ede4d8549bc9a27e2062b95a7c759d6d1bc21017963b902a6c9ee497c67f88d62a18bbad461f20b1ae8dbbc92c38d791ea42e4228d SHA512 9e97b903325501b1533aff49309a6132d9c290207e96b14840c603ff6d89f729fe7e493e8b54e5f3dde80b5558a5c56ca55d2018eebf7173b2b0e4ec692d3190
 EBUILD keystonemiddleware-4.21.0.ebuild 2657 BLAKE2B cdb4b2080eeea83d6e4835266a2fd87cae3a21693b509fe2c8de2a29483fdfb33af56f8cf9cc2b1e7b6b189efecf8340984d3e0eb0ae0653480c0a6e73b8e251 SHA512 0a33c73ffc651fc60337b796daa0512b0d45a94a8449a843bf38368eff622a9fdbf4f4987a117700b38b64f947bd7583c6ca219d2d25462634716278be9129c3
 EBUILD keystonemiddleware-6.0.0.ebuild 2442 BLAKE2B e317ae34bb6583809ba9887bf8e459f33e1e64f9fbb4a327a99857c7a0b64814ca481be590d8adf1898c127f3f71b3855f24188c20cac57ec5f387cce766ee40 SHA512 626e73827fb68c3179ad50bce2b41f1c3aeab037335807cf9e1e88a5541f95380adde131ecc4a2127328236deb290caf1525d9442f635d31268f0d8e21bf8ede
+EBUILD keystonemiddleware-7.0.1.ebuild 1480 BLAKE2B 3f99f6fc31292379f12e4e416ab48fa1eccb161d62d97748ac4b65c5c702a675d58a6a25c1600b9e7e116f8f58abb3ae007e4d10d56782f8eb8e18b343412566 SHA512 c8231fdc96ab9fcb359dca82fa38bf8d0fbd3ef7bd9b2a2ee18fd2f6203b0efd3f10d51a7f7e38dc3dc6f2551f153e8728559faeb291a2aa9f5f8a51499f69fc
 MISC metadata.xml 624 BLAKE2B 9431121807a163b4dac75bfe53e40ee4b86412db23d46c8fa6318ec6e0d2af338eb6423076879bbb863e7a2aa173d484d2f1a3c98211021e5357e07f9cae481b SHA512 5ca1f6ea10053be2f9f74c797cd1143f6b3ab267d0decb66f3609973c20637b55769bcb305ab70693d99d3ab09da6aa6ac7d2acc66431a4a52f6dc9aef79aa6c
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
new file mode 100644
index 000000000000..3ce665e132bc
--- /dev/null
+++ b/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
@@ -0,0 +1,48 @@
+# 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=""
+
+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/keystoneauth-3.12.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.20.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
+}
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 2fadc49ba3d1..85c96bf37016 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -5,5 +5,5 @@ DIST kombu-4.6.3.tar.gz 427754 BLAKE2B 0db078eb8d6afd18a5e9b48c970791d2c55c46f5f
 EBUILD kombu-4.1.0-r1.ebuild 2329 BLAKE2B 8824ed84a6185b64eacaa6322eadedf4a899418db15cd1ac6f718e4c32ad6185ea31facc833572f0ff654639d645b48ae340a9145e0c16d51db118346686f30f SHA512 0f88f9c70e0a93a57d5992f4592cdef1e405770a1a39aefdcd9e449a07c8df53876121c79238b906785d34122df852293e796a903ff05d0b3e4e7b0c2eb9ac48
 EBUILD kombu-4.2.1.ebuild 2329 BLAKE2B 80aabc0220c5224e974997de09f7e07fd5f8831fadbdf54e7832900e10452bba101928a5b57dec0a5ad50aa60bff879d557a6159278f2ba0703085233515304a SHA512 e28a667406c2b3ac86862488967230d5379c73ddfac0c2e027596f93a78bedfcccb0092c5b1573fb31b992502427406100e7c7040d98f2258bf4da34d302a73b
 EBUILD kombu-4.4.0.ebuild 2329 BLAKE2B c7eeddcd6c514bebd232533e75dd01cc398ceb44a1d7f26cd527533c42132df84bea0c1476892b856de038c04c7a87b1f0495e9cebb865296b26abe304f79bb1 SHA512 3a07a480a0e14148b778bd2c0b44728e8f0e3531cda2cab7b8996ae404de9b0d9f996b803dc4fa04269688bef258333d29bfd3e13caf7156eb843f311fbecb39
-EBUILD kombu-4.6.3.ebuild 2328 BLAKE2B 38d991543a1bde3c513d0d0fdabc1ea8514675873fbc5b2252aac9add7ab60b907bbe9459fc4b93e586b96608eaba9d56ad8c85ce4902d611a1bbddd70c50631 SHA512 41f7ad2d20e1055ec731a4e3bddea05a856c05321300aac1a752b14dcd441b00c84533a694653e19dbd97fbb2ec05d256b8d2b82c11154aa5ad6d0c64cd6348d
+EBUILD kombu-4.6.3.ebuild 2338 BLAKE2B 8dc9c353e86f6cb86fbdf9fbf3b5139c53be5bf5fc63fccf7dd6e29308193c1af1c80a678b5f1e979115c18c58eb2da0b1e3d35620dbbbb2a3e3a5d350993a00 SHA512 a6d89e2603bef8977a84b1bf78dc2ff7ec413fd744f3a8a1582d9b4dea4626726177d2704d9aae4d2fa6d47d479d4f5afa46476fb318db68e85d030874e20de4
 MISC metadata.xml 675 BLAKE2B 6bab5465ca22ad8ab27ff08418abb6c6616972605b2b9bec7ec559f887962c80df01e6c9aa8eed5b1ffcbc392a8476f86ea477fa3c4084ba37e1ba350786f8d5 SHA512 37288783570daecc3bd70a8f5e9b96e652cd2271f1a36f9ecd644b6fb98f4dadbb2f2cbe36457c46d4b99d67fc5cfa6fea78f37bfd96b3b639cd26de4e948541
diff --git a/dev-python/kombu/kombu-4.6.3.ebuild b/dev-python/kombu/kombu-4.6.3.ebuild
index 24fd55a80594..95e550c88780 100644
--- a/dev-python/kombu/kombu-4.6.3.ebuild
+++ b/dev-python/kombu/kombu-4.6.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/larch/Manifest b/dev-python/larch/Manifest
deleted file mode 100644
index 68e203b1d15d..000000000000
--- a/dev-python/larch/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX larch-1.20151025-coverage-4.0a6-compatibility.patch 744 BLAKE2B ae3af11a33d20d29fe9871f9a1bbd3ab257b60a417eb8c0304d38fbbde819d8c9f563117d4176316c6af7ac3dbbdc20f0ebffb75849d966c2e94acffd29f755f SHA512 e23e6a8ff656a85fa6511cb888611d172052ab7f9ae3b80b769f5f0fec473a5915e9e821279bbe5b7c24a901a8b43e115617766be87f0f7737d5ea6ab29d6fcc
-DIST larch-1.20151025.tar.gz 91990 BLAKE2B d5097fb3cd10063186dd7460b236be4564d2fef05926dad2958d200f05b44f1325fecce30d77c623cb21ae91a65af76824ebad1987a65467575ed194f3d35d5f SHA512 a0f0dd71e1558147f37e5d5f1cfd3e9b38fd925351067200376fa3644472a1c1e585d8f2f72a3d506eaea01d3dc834423d858d66d5c5fa1a746c6f4210380c33
-EBUILD larch-1.20151025.ebuild 762 BLAKE2B f05ceed5774ce43bf42e1d0490420e29d1e75f1bd3c790335c6453c7efd2c83555731b41a12510ae3363b8a021b8dde0fd43937184b2d23537e7098b0abfb58c SHA512 3a318f298125f241282f8b8b0831a1412f38d940330de1937d8f0287e6f9f672b49fd755b4cadccf0a016b8a933b344b361f93bd63581345a1b30a8960f7d37b
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/larch/files/larch-1.20151025-coverage-4.0a6-compatibility.patch b/dev-python/larch/files/larch-1.20151025-coverage-4.0a6-compatibility.patch
deleted file mode 100644
index 6e425ae77f36..000000000000
--- a/dev-python/larch/files/larch-1.20151025-coverage-4.0a6-compatibility.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ca548da9ba78ddee90779051210e3e89185e4f7d Mon Sep 17 00:00:00 2001
-From: Michel Alexandre Salim <michel@michel-slm.name>
-Date: Mon, 15 Feb 2016 23:03:42 +0700
-Subject: coverage-4.0a6 compatibility
-
-coverage 4.0a6 no longer generates .coverage file, so use -f when
-deleting .coverage to ensure deletion does not fail.
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 7818f57..362c07f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -23,7 +23,7 @@ fsck-larch.1: fsck-larch.1.in fsck-larch
- 
- check:
- 	python -m CoverageTestRunner --ignore-missing-from=without-tests
--	rm .coverage
-+	rm -f .coverage
- 	./insert-remove-test tempdir 100
- 	rm -r tempdir larch.log
- 	cmdtest tests
--- 
-cgit v1.1
-
diff --git a/dev-python/larch/larch-1.20151025.ebuild b/dev-python/larch/larch-1.20151025.ebuild
deleted file mode 100644
index 8a496e290cda..000000000000
--- a/dev-python/larch/larch-1.20151025.ebuild
+++ /dev/null
@@ -1,37 +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="Copy-on-write B-tree data structure"
-HOMEPAGE="https://liw.fi/larch/"
-SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/cliapp[${PYTHON_USEDEP}]
-	dev-python/tracing[${PYTHON_USEDEP}]
-	dev-python/ttystatus[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-python/coverage-test-runner[${PYTHON_USEDEP}] dev-util/cmdtest )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-coverage-4.0a6-compatibility.patch
-)
-
-src_test() {
-	addwrite /proc/self/comm
-	distutils-r1_src_test
-}
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/larch/metadata.xml b/dev-python/larch/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-python/larch/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-python/libasyncns-python/Manifest b/dev-python/libasyncns-python/Manifest
deleted file mode 100644
index 4ca8d2fe6fde..000000000000
--- a/dev-python/libasyncns-python/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libasyncns-python-0.7.1-glibc-2.25.patch 509 BLAKE2B 413bcd6ce21af2db95dee5448907f708d0737861875514bcfdae033969f2a77608f2cb212c9f010f6e1d51583228571e3eb53bd96cab45fae812a1395a48d9ef SHA512 56270790454eddffc0a546a557f0360d637ce441e194b94d2a2af917ac42f25e9a7f376c739dfb93bdea1dfba5e6eb7a00a26507bf5c5814a77aa068a71b7521
-DIST libasyncns-python-0.7.1.tar.bz2 20276 BLAKE2B 80891e79c16b9e81f65d54107e2b8b715828fa005c05f0fc2e3b43ce96307bbf7ca3b13a233f975e8566a9ea8a644b8c138e8245243ddbdbcc722e3f74452e99 SHA512 ac8bd46cb842e40bc0f3720a789fe17a6488d80bf68f5f60b3093708d9e5f91d8b0082255a77d37c1814232d46a4c44c58abe971ddbe54f881d8e6a78937f489
-EBUILD libasyncns-python-0.7.1-r1.ebuild 698 BLAKE2B abbd9e6c1cdae00dc3be0d29043a18b441366ee9a85ad94e481dd67fffc795d1876ba00716be637f4f4c77a83701a955c0a52729692e1c79875c72dde900d190 SHA512 3e9a2d95ca11a337290f3b72ef4920c9b489175c914e6618763b9c14477845d79c452bc0567fbcbfe3fe009c515e7480ae8bdd206b42b510ee2b1fa78f1f74a5
-MISC metadata.xml 252 BLAKE2B c7a550712f19ecf95dc9bab7c6ce2510c3a0ed6f3abbd00dedb7044505bf4ac0081eda52712bc5883c631fac47ec74340207384dce1cdbb8312974b0140120a9 SHA512 ea1f58fbe07f5912fc69ec2182812dde68f0b5d38a03daeed9d22e0bbf4fdd6fdebad11674a0b51ed7d5b85abdacc64afebb8883dded1cbd0e9b767ebc9f283c
diff --git a/dev-python/libasyncns-python/files/libasyncns-python-0.7.1-glibc-2.25.patch b/dev-python/libasyncns-python/files/libasyncns-python-0.7.1-glibc-2.25.patch
deleted file mode 100644
index 6ec84aa732b9..000000000000
--- a/dev-python/libasyncns-python/files/libasyncns-python-0.7.1-glibc-2.25.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://sourceware.org/git/?p=glibc.git;a=patch;h=4f157746e0c713965d9143b52fef606312087c48
-
-diff --git a/libasyncns-python-0.7.1/libasyncns.c b/libasyncns-python-0.7.1/libasyncns.c
-index 99a73de..5e3da0b 100644
---- a/libasyncns-python-0.7.1/libasyncns.c
-+++ b/libasyncns-python-0.7.1/libasyncns.c
-@@ -134,7 +134,6 @@ PyMODINIT_FUNC initlibasyncns(void)
- 	ADDNSCONST(ns_t_mailb);
- 	ADDNSCONST(ns_t_maila);
- 	ADDNSCONST(ns_t_any);
--	ADDNSCONST(ns_t_zxfr);
- 	ADDNSCONST(ns_t_max);
- 	
- 	ADDNSCONST(ns_c_invalid);
diff --git a/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild b/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild
deleted file mode 100644
index 8ac045130a29..000000000000
--- a/dev-python/libasyncns-python/libasyncns-python-0.7.1-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=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libasyncns"
-HOMEPAGE="https://launchpad.net/libasyncns-python/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=net-libs/libasyncns-0.4"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.7.1-glibc-2.25.patch" )
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-# Tests are network-dependent
diff --git a/dev-python/libasyncns-python/metadata.xml b/dev-python/libasyncns-python/metadata.xml
deleted file mode 100644
index da06078f5866..000000000000
--- a/dev-python/libasyncns-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-needed -->
-	<upstream>
-		<remote-id type="launchpad">libasyncns-python</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/libpillowfight/Manifest b/dev-python/libpillowfight/Manifest
index 31f767db3f09..e186253e7cf4 100644
--- a/dev-python/libpillowfight/Manifest
+++ b/dev-python/libpillowfight/Manifest
@@ -1,7 +1,5 @@
-DIST libpillowfight-0.2.2.tar.gz 23125494 BLAKE2B b9620b0e574869d1efcc9449e09f281a5d2611ec15f144ee24b385b5f6f693f037c844904f0abc715d49125df7d1a27d6c433aed83b33371b3f07310be8288db SHA512 76dcaf9105b4dbbe427851d794e92ba023453e2d750ecdd4e3feb864534f9d99adb562b719b7c9af299ae16c0778b510ab96b4997cf9bcc6ea4c6f8f7471ae8a
-DIST pypillowfight-0.2.3.tar.gz 39416 BLAKE2B e216ddb1717189c142fc3d81d41c91855c52468e1af350d8f5db470f8901bd883223cad56dc8ced9cf61e90e511e0a5ef508ec6966a7f01a837e2bb0d393589f SHA512 6d3e35ed567d66060f5bf4307b0bd7d9ee5c3e7ec430e6e04ee6a1e83e18ff829a7681a85186e6b2151f043f66453c12a60e7cce56c0558da3d72f1fce155097
 DIST pypillowfight-0.2.4.tar.gz 39411 BLAKE2B a890305e3c1650274426faf92178ca0b3742c413deac236a5ac23cb5ce9be372085cebfd7189a5e16e6f2176b5850c865cbfc899a036aedfad58c5f5fe08502a SHA512 440b0faccb9f393126306afb2a060e5dab5e68a02822ad4846498a2a6b07013837642cfb818b669820b268342be3c5b0ebed81f1e3265e1f383d74c1cfb16187
-EBUILD libpillowfight-0.2.2.ebuild 671 BLAKE2B 21c8152a484cc4bd948ccf9825698e3dbd870954da625c6303f2d3418a5eee67fce06c356cf09b45d8dacd4213987bd060dac25801c0502fd46cd1510bae5fff SHA512 091ee94c80eff41c0196efe7c20c36ef9a3ad5f9cd4b5bde9fe3e4b7b75d1d371cf081a72b66cb30cf2900547c0edd2e8834b4835b2a5bb419b8de30ba4bf648
-EBUILD libpillowfight-0.2.3-r1.ebuild 697 BLAKE2B ea9b6238477668072194760991747024af0c280f175457d71ad444244d2252796b97c1924e4e297141fd2d4576b3f2f8061f46823d9ea40a09e213412d9e7f50 SHA512 8d6915c304f0004ba9b0dc59d7b7c386824cbc5087aeb5b49039582dec00466ec2f8eeee9f328b2331e93a9546f00662eb7ae8b49ebe2427ad80ff1cf0c5af70
+DIST pypillowfight-0.3.0.tar.gz 41065 BLAKE2B 8e945bb5a96d7ebd610435fd868d12df371c29fbc26a9c57152988a990ad83daf70382bb94e8b5591144e18d6c54702c0a578ea5f29044fcdadd169effcf933c SHA512 2782030eabb665d20cf49de584220fb65417616c3a0e2a0376c91dc2c228b571768ea3a248ebd5ec4d244a1b825e98609a35b736f7f2fdbb3f674b08e891d9a7
 EBUILD libpillowfight-0.2.4.ebuild 697 BLAKE2B ea9b6238477668072194760991747024af0c280f175457d71ad444244d2252796b97c1924e4e297141fd2d4576b3f2f8061f46823d9ea40a09e213412d9e7f50 SHA512 8d6915c304f0004ba9b0dc59d7b7c386824cbc5087aeb5b49039582dec00466ec2f8eeee9f328b2331e93a9546f00662eb7ae8b49ebe2427ad80ff1cf0c5af70
+EBUILD libpillowfight-0.3.0.ebuild 699 BLAKE2B 7749ae423a0c01c96ec754b9e7baf6059a3c713ad3d3f457c7f1f9a6c95e3c63b758e974fccbf3e9768e9dc37942852e5b5cb4acc5ba9283b6bc5b463d0009e2 SHA512 58e08a2cf636211368020b61af428e1a95b9411867fd4cc7c5570d122c36ae3c1620cd37c6e5a04c48aa2e53a05956a45534cff2ac27ac08abf4099554969475
 MISC metadata.xml 408 BLAKE2B 6696490ab4ca4a1c5c27c4da76a781075e5bc248f6203a14d2116002e8aedf53d2ff0de76b119d822a251bd111772f2ab7c6376eb707813da079d972976689fd SHA512 a01430e7488806818e2cd64a8548fb339eef7ec6f408fe25c64a8d679a6afab988a068c4cbaab3b028fe28a2bd21265550eacf1af0b84f2c9b33c8d3e6f28b06
diff --git a/dev-python/libpillowfight/libpillowfight-0.2.2.ebuild b/dev-python/libpillowfight/libpillowfight-0.2.2.ebuild
deleted file mode 100644
index 6392c37d0c8c..000000000000
--- a/dev-python/libpillowfight/libpillowfight-0.2.2.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=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Small library containing various image processing algorithms"
-HOMEPAGE="https://github.com/openpaperwork/libpillowfight"
-SRC_URI="https://github.com/openpaperwork/libpillowfight/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e "/'nose>=1.0'/d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libpillowfight/libpillowfight-0.2.3-r1.ebuild b/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
index 63b6ba1a3720..dd2d0d9959ac 100644
--- a/dev-python/libpillowfight/libpillowfight-0.2.3-r1.ebuild
+++ b/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index c3c85f95aac3..7c32b15cad51 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,8 +1,10 @@
 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 979 BLAKE2B fb91ea46f10a7d83215fae5c8557626ca99e16d893f3c3ab27b2b528bf1e85e0473eb011d43597ff63105b8cffe5d9de28cd22688893715f8a13cb05c16b2268 SHA512 af012b0e554b13c1de26c9ebf67a384d553b03ef30e96f90253d441e8064a2b9cf586af9375f82339a2b16225fee326bbfaa9633f6173ad248d4f7f23673d6cd
 EBUILD libvirt-python-5.5.0.ebuild 979 BLAKE2B fb91ea46f10a7d83215fae5c8557626ca99e16d893f3c3ab27b2b528bf1e85e0473eb011d43597ff63105b8cffe5d9de28cd22688893715f8a13cb05c16b2268 SHA512 af012b0e554b13c1de26c9ebf67a384d553b03ef30e96f90253d441e8064a2b9cf586af9375f82339a2b16225fee326bbfaa9633f6173ad248d4f7f23673d6cd
 EBUILD libvirt-python-5.6.0.ebuild 972 BLAKE2B ff738ca6dc085799245e2b4abd6653cff131409c6ded81a5e647bb9b8f8879050d161dd415ece999e84bea6be572a4daeb832fc12354b2bdeef45654de5291f3 SHA512 fb4fd08b39be642fc824572f13eec89d505670641c1d4b0ac418584ace3f6c6ae2b545699a35e88111f97921a302e03a23be55d2f31a62e101514a5a033f73c1
+EBUILD libvirt-python-5.8.0.ebuild 972 BLAKE2B ff738ca6dc085799245e2b4abd6653cff131409c6ded81a5e647bb9b8f8879050d161dd415ece999e84bea6be572a4daeb832fc12354b2bdeef45654de5291f3 SHA512 fb4fd08b39be642fc824572f13eec89d505670641c1d4b0ac418584ace3f6c6ae2b545699a35e88111f97921a302e03a23be55d2f31a62e101514a5a033f73c1
 EBUILD libvirt-python-9999.ebuild 972 BLAKE2B ff738ca6dc085799245e2b4abd6653cff131409c6ded81a5e647bb9b8f8879050d161dd415ece999e84bea6be572a4daeb832fc12354b2bdeef45654de5291f3 SHA512 fb4fd08b39be642fc824572f13eec89d505670641c1d4b0ac418584ace3f6c6ae2b545699a35e88111f97921a302e03a23be55d2f31a62e101514a5a033f73c1
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild
new file mode 100644
index 000000000000..a020f3273876
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild
@@ -0,0 +1,46 @@
+# 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} )
+
+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 ~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"
+
+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/lit/Manifest b/dev-python/lit/Manifest
index 5ad17cdb279c..1901901216d3 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,10 +2,10 @@ DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f
 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
-EBUILD lit-10.0.0.9999.ebuild 996 BLAKE2B 297a6a2cc0ccf551e079328cdf1bfff1a953ba8fe8a3498e804f10a5bd05f91a79e323a3ab5ac4152f9541ca833ae7c787ea4b5a623590a7b6d86eabdd5a7426 SHA512 78b16c9e628b38e39988f8f0390b403e95d5f47e13451d613bda26fb7b9bf9df25e451fe1fe06c1bead107b9c47a35db95dd8bd02ee0b916d11cbdfe4727dbd0
+EBUILD lit-10.0.0.9999.ebuild 855 BLAKE2B 32e8b55977e5d42881f642b7d128722d2c21a59db6e32d7354aab3f105f82a27cf8edab2fc4d8e077209e35429d3091a14aa56a5799efb7a62aaa35b9d74ab43 SHA512 94e8a5836d4cce671eaf2e134c55b45fdc2c145210a099dc414a92a576859f220a9a382e59c332450470f19f519651d55b61ef8810ad04efc09de7ea83bcd6e1
 EBUILD lit-6.0.1.ebuild 997 BLAKE2B 349be0629cdc02423e53e52f6e8e7263816cbf20b0bec4d69841a692b469d6bef5b17392cfb0a7da8834ec61327b7a052c58270133be07b1c48ef2d8854aa7d9 SHA512 0a2489e5e3d775d775dceeaed033e548e812cc85e4a1dd4d285c2d4412adc9e54c6d799f162ca09e45a3a72e7eee655cd84436b300eab5d036f17448e82e35e0
 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 1061 BLAKE2B 6fb38fc7ef355463b093d8ebc48d110bca06d149371f9259114d223bdfc3241074a1fc821299d959ef9ca87dcdb3cdce41e8f6689feac70582e9770791344b37 SHA512 72ffcbee521cda35e0ee0c05fd37c0dae601af19c2116774f5338dd189411bff3a39bc332dae058a587c5126aeb1477ec006856ba74f2c301b655500bc6df64e
-EBUILD lit-9.0.1.9999.ebuild 1021 BLAKE2B 545e9a41c090bb4fc79d56752b4ca358b4cb4edf752a2a08ceb99e309ed346ce24d4c4fffb0b4fc3e4e2274d374cebab541d61636a16f5819ef118b880f60734 SHA512 dd729febc89cfa2822e19ff906d1e364b7956917c02b9bf3bfa559f416e2f62ccfac947d67e03bcee54aec5f08d5b1abc978a9b9951d840f3575c7c1480e17ca
+EBUILD lit-9.0.0.ebuild 885 BLAKE2B a8b1c3602c32f580835a435425984837adf00be61f65a6c1c60a709299aab54bd338ddbf4be3e11b3488f9425efb28139eba772da2ea5f792aa3bf1de2cd97fd SHA512 bb970e0376858268c43ffb9f4ee7acd22e90b44468390b88cd090334aacf9cce81d7456003077eae178fe5f035da28480625defff1f7c5db594cbf7406977891
+EBUILD lit-9.0.1.9999.ebuild 855 BLAKE2B 32e8b55977e5d42881f642b7d128722d2c21a59db6e32d7354aab3f105f82a27cf8edab2fc4d8e077209e35429d3091a14aa56a5799efb7a62aaa35b9d74ab43 SHA512 94e8a5836d4cce671eaf2e134c55b45fdc2c145210a099dc414a92a576859f220a9a382e59c332450470f19f519651d55b61ef8810ad04efc09de7ea83bcd6e1
 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 32320b7920e1..e051ca51410e 100644
--- a/dev-python/lit/lit-10.0.0.9999.ebuild
+++ b/dev-python/lit/lit-10.0.0.9999.ebuild
@@ -4,15 +4,12 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1 git-r3 multiprocessing
+inherit distutils-r1 llvm.org multiprocessing
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-S=${WORKDIR}/${P}/utils/lit
-
-EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
-	https://github.com/llvm-mirror/llvm.git"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -29,11 +26,6 @@ BDEPEND="
 
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout '' '' '' utils/lit
-}
-
 python_test() {
 	local -x LIT_PRESERVES_TMP=1
 	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
diff --git a/dev-python/lit/lit-9.0.0.ebuild b/dev-python/lit/lit-9.0.0.ebuild
index 379734458ba5..cbc3d5b9e6dd 100644
--- a/dev-python/lit/lit-9.0.0.ebuild
+++ b/dev-python/lit/lit-9.0.0.ebuild
@@ -4,13 +4,12 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1 multiprocessing
+inherit distutils-r1 llvm.org multiprocessing
 
-MY_P=llvm-${PV/_/}.src
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}/utils/lit
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -27,11 +26,6 @@ BDEPEND="
 
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
-}
-
 python_test() {
 	local -x LIT_PRESERVES_TMP=1
 	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
diff --git a/dev-python/lit/lit-9.0.1.9999.ebuild b/dev-python/lit/lit-9.0.1.9999.ebuild
index c9fb8cb28154..e051ca51410e 100644
--- a/dev-python/lit/lit-9.0.1.9999.ebuild
+++ b/dev-python/lit/lit-9.0.1.9999.ebuild
@@ -4,16 +4,12 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1 git-r3 multiprocessing
+inherit distutils-r1 llvm.org multiprocessing
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-S=${WORKDIR}/${P}/utils/lit
-
-EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
-	https://github.com/llvm-mirror/llvm.git"
-EGIT_BRANCH="release_90"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -30,11 +26,6 @@ BDEPEND="
 
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout '' '' '' utils/lit
-}
-
 python_test() {
 	local -x LIT_PRESERVES_TMP=1
 	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index d96de569de41..d308cb5e4af5 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,5 +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 1251 BLAKE2B e982209197c82851f6664ace40e37276e0c43c1534fed1ce63346e737074aa44494ed78cf5dfc68be4db843da4b0b71f4718a939a72ecfe69b3e834b0a969a8c SHA512 09acc2be84e5e57a5c1e99c5f61a083f3f85ab7bfddb349379388e988d9899268190c701c3db1d4231bd66074607c868b7c29e4b8778f2687f0dd4428354e7b1
-EBUILD lockfile-0.12.2-r1.ebuild 1076 BLAKE2B c725b302de664d2fa90c332d937abf73a5d74480cb90fef388001ec1e7bbdd36ef9a11061949e0e1bdf3455b2911fbe88d196bafea3d3361f3a4dbba0e5ae8b5 SHA512 b48d56e0632711693075fb6a18be91219200b6703fb002e492b25d1aca961ac5797a24d85d7e1831217f32a12d36e525c2b9ac85ff5ff91044ab1bd2765759f6
+EBUILD lockfile-0.12.2-r1.ebuild 1078 BLAKE2B 780caa8fb8c81f0ac11f2416efd5f8eee448c371c5104c2af7c0c2952a6fbc339af3df607df3cd9ae28d16edd7c636a87551fbd1f53e157fcf271391265eed0a SHA512 0bd036a96f377385e90d5bf566752bc5c7d081078d44e45f51da60c5b699708802c0e038c2132db184a2a829b1793770712628e9f115f3e9902ea88ff67331f1
+EBUILD lockfile-0.12.2-r2.ebuild 1078 BLAKE2B 4c8767af2f51064cbb31f2bceda6350a7517c01fef38873266ceda6c4d5370e42502610ec21f6d447d1916e0e0444c0dc5e980f3909c8b8127903dd5cce5d0ca SHA512 cc80a5fa7ce75c83d85ee9aa09491c9fcd8f36080ae47ac026d3d84cf38b4fca5e59920fb0460a9af5b902e564768ecfcd3812768b31a32a7e04c5aeeae1f716
 MISC metadata.xml 364 BLAKE2B 504dcb4ca67f92ab6554918b7dfa48d80f31439e35d6d1b5af441dde50455d27bea1f9e0f2284676cd9190cdacc839a322ac4ae556b45a371f98d5f032c5ae5c SHA512 b736cd5f710ac2c628d8379aa69fbf3cf5015a1edd80405ee695d56d0a0f86bc40c8ecbe70083338e6b7fdd115d11318358f5fd04b2397e0ab5ab7b315bfad5b
diff --git a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild b/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
index b7215d6376cd..42c9a45a7a40 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy 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
new file mode 100644
index 000000000000..3a1e91898328
--- /dev/null
+++ b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
@@ -0,0 +1,40 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Platform-independent file locking module"
+HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile/"
+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="doc test"
+
+DEPEND="
+	>dev-python/pbr-1.8[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+DOCS=( ACKS AUTHORS ChangeLog README.rst RELEASE-NOTES )
+
+python_compile_all() {
+	use doc && emake -C doc/source html
+}
+
+python_test() {
+	# "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
+	nosetests --verbose || die "test_lockfile failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && dodoc -r doc/source/.build/html
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/maybe/Manifest b/dev-python/maybe/Manifest
deleted file mode 100644
index bcc824c213bf..000000000000
--- a/dev-python/maybe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST maybe-0.4.0.tar.gz 6105 BLAKE2B 73052b156e8940769897b5b9505286d1b78cc156976445d5ebdceb6cbe503ce079872836ebaab5fda3fb77798909467af17bf37451eaf563ca9add7f2470aeb7 SHA512 39882c69375b408e809e899b997675c9395ddf50b8625fd04a0d78cbd041f6138e491b76578c8b530ba122b921c694bc27d256eab7485ea4638330f6e0411129
-EBUILD maybe-0.4.0.ebuild 701 BLAKE2B a80695c59b52145fa7e2a6b9280142d2f8d8b99c18f74d10bd6d591a76566d5a07c3c142c84a63a5c39b46686eeeaeed9bf3b61026484046cf19eedd1637f82e SHA512 2626f238bae1ab04bdf4ad9e72aa1bb47de6f9c78785bf2046137d81a9eba1b6d9140b54fe57543e554fd4db03396cc24769070a6c62187fc26326a1a20465ae
-MISC metadata.xml 432 BLAKE2B f76231919313dd725c8ffb701db9153ee9c08ffbf7833dc0d36405359137cf71d5873aed9aa437e9d34f448bd4c44b97477bea5e622c353575ca4b6691d81aab SHA512 1c30bebf7c6b34ba11e4f8bef92f9a2b4238eee49c19078d817063ad35c45008e8c53bd9f534677325005ab29c847c9fda9a2cd07c722e3250b00a8d07d41b95
diff --git a/dev-python/maybe/maybe-0.4.0.ebuild b/dev-python/maybe/maybe-0.4.0.ebuild
deleted file mode 100644
index fdbd9e00a6d5..000000000000
--- a/dev-python/maybe/maybe-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,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="See what a program does before deciding whether you really want it to happen"
-HOMEPAGE="https://github.com/p-e-w/maybe https://pypi.org/project/maybe/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/blessings[${PYTHON_USEDEP}]
-	dev-python/python-ptrace[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	>=dev-python/pytest-runner-2.7[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/maybe/metadata.xml b/dev-python/maybe/metadata.xml
deleted file mode 100644
index 18d4caa64bbb..000000000000
--- a/dev-python/maybe/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">maybe</remote-id>
-    <maintainer status="unknown">
-      <email>pew@worldwidemann.com</email>
-      <name>Philipp Emanuel Weidmann</name>
-    </maintainer>
-    <remote-id type="github">p-e-w/maybe</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/mockredispy/Manifest b/dev-python/mockredispy/Manifest
deleted file mode 100644
index 01c915b9a623..000000000000
--- a/dev-python/mockredispy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mockredispy-2.9.3.tar.gz 40462 BLAKE2B b6bf9ec020bebaecdf8c99a0f7bf08b970e7a9a8125dc6c852c964b258c5dd6406e0fa887b92566ecfaec5193964484a1ad3befef1ca98a024ff367511725600 SHA512 cedb3641ee5dadc81d9bb39193157ea3cbb5d53f1d56758b47a6c96d2f0713c6831094e2a7b45aceef72c45e1d7705df9783037ce17ee1180bffd799a17ebce9
-EBUILD mockredispy-2.9.3.ebuild 719 BLAKE2B 78ac95ef16428107cba55448a8b86e8ae40f91e864060f0a5937332f90b048809c39ad5d7aa137e68731938a129c8a0df44044e69c226d1a90fd2a37b7cc875f SHA512 ffca81d052b24241ef07bfb016c2f02e8a449e143af1b38a9453f506ff6e10b787ec05a63fea1503c595b53023e40c8241874ef561026077abca5c9446401690
-MISC metadata.xml 299 BLAKE2B 6568f38c4f1f3a0b018ff35eb6cad745ff5d5f56aa2bb6e6227d8f969b23b216440af99cdfe68ed8c2627b3f9af77b04956e94bfee1eb8df85e5ef3a076d5f88 SHA512 aeb1f555cac9cd16ad1c59d173ab61e5b78b115550571cf420e47b8e8156e6ac12b23534e90ab2f07a97910aafd4aab5d4402d4124ded980a04aad0402ac3f57
diff --git a/dev-python/mockredispy/metadata.xml b/dev-python/mockredispy/metadata.xml
deleted file mode 100644
index 8506f376cca6..000000000000
--- a/dev-python/mockredispy/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">mockredispy</remote-id>
-    <remote-id type="pypi">mockredispy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/mockredispy/mockredispy-2.9.3.ebuild b/dev-python/mockredispy/mockredispy-2.9.3.ebuild
deleted file mode 100644
index d0f123a4057d..000000000000
--- a/dev-python/mockredispy/mockredispy-2.9.3.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=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Mock for redis-py"
-HOMEPAGE="https://github.com/locationlabs/mockredis"
-SRC_URI="https://github.com/locationlabs/${PN%py}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="test" # Fail on python 2.7: https://github.com/locationlabs/mockredis/issues/105
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/nose[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.9.0[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN%py}-${PV}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
index c5a0cdbcb45b..ab20e968ad12 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.5.4.tar.gz 43050 BLAKE2B e36f870e7932c73133db9233d2305d4ae045fb5e19ef4b99978348574ac8b9c7c161730a70e8f7aec8685ff060f5f616d7148d48c0bc635abda9ec5c8e68efa4 SHA512 a2b1577b75f3099cae57750543c985ab60097d5fa70481d3c6d8394dd55d0d8f99aacf5db625be7fa12772e976cf34d4b51c7841c3a24ee9df8214a68aa66aed
 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.5.4-r2.ebuild 529 BLAKE2B ede567701ec44caad1552bccdb5e089e6b4493c9d11611aaadb72349c84092865040568ada776079e62d00880538f89af18c8b9df979e62a2edcabbd0b708ce0 SHA512 93c405d4411e7e6e68d29297cc719705095e5d671159d34fc3f25f133d02329dbe7e78d15e7a55d72c3ba136bc7e22e11d40ca9689448f0f8daa3bf47c2999a7
 EBUILD munkres-1.0.8.ebuild 453 BLAKE2B f3f417d2a6799d887f9b0475b434c42bdc2bae2ffb932f0424c827cf26f27f788f8d4cda2caa7a839cc8cdba42a77282b04cb8b0ff7203dbca925c0d7579f5df SHA512 9b84fb0fca427f61735c7771347706e3fd99a9660570d9cc258c2c2cb7fb640ea6961df1ca87a77b3dfd8f3f8501beebe6a8cc7f8b821940c9e04b289d8e4f3a
+EBUILD munkres-1.1.2.ebuild 522 BLAKE2B 1d1fddbbbeb77a439b9a96cbeb7715fc302eb65db2cd08529002e59118be4fb584b14870142e3d4f3f11f097fd957641c390f5e584d3e293029534050c82df96 SHA512 c62ec9163e115f09cd77dded1d891a878575c566468b0e6b821e17fc7755832bb0b0cc3d8e7d23c417b22ab0788b1236d05538c99dfb058e6c80aff9ea3cb292
 MISC metadata.xml 688 BLAKE2B 65040255d996c7256eada45681cd0580caf8922cc53e33d5816c73c73ac5686d6d4c6240e7b5904c22a0944c73f944bec9e565bea5ea53ae51deaebf777a0c56 SHA512 471f6eb808f978275dee54f9404c36a5a39d47c72caa9aaa5f2ad3bb455983f9c46a3196d1246d6830a50624d203b8dd2b68391b09b9b2e933c74bfeb877baf1
diff --git a/dev-python/munkres/munkres-1.0.5.4-r2.ebuild b/dev-python/munkres/munkres-1.1.2.ebuild
index c7d6bc0d8b59..4c71cf673103 100644
--- a/dev-python/munkres/munkres-1.0.5.4-r2.ebuild
+++ b/dev-python/munkres/munkres-1.1.2.ebuild
@@ -1,26 +1,22 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit distutils-r1
 
 DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
 HOMEPAGE="https://pypi.org/project/munkres/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/bmc/munkres/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test doc"
 
-python_test() {
-	"${PYTHON}" "${PN}.py" || die
-}
+S="${WORKDIR}/${PN}-release-${PV}"
 
-src_install() {
-	distutils-r1_src_install
-	use doc && dohtml -r html/
+python_test() {
+	"${EPYTHON}" ${PN}.py || die
 }
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 53729adfcdb8..7d98935ade04 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -6,6 +6,7 @@ DIST mypy-0.660.tar.gz 1274856 BLAKE2B da59dbae31df1c2c8530fddf44f02d608cc9019c9
 DIST mypy-0.670.tar.gz 1376917 BLAKE2B 1c7de26e48d91a1dd8b007607e6e8989e6b622eb62ad98b3c575faef1373ba510acba546977d26984689c5cd245ea341022ae68209d498d8bac78b01760daa24 SHA512 1fb994410acb3ae3ef6c4380f1b76d2f65790fa7822067dfd75eb34d0336547f85810e475563c797dca268de35b1594217cb3edfe32033eb012d121a3a2e6406
 DIST mypy-0.700.tar.gz 1413962 BLAKE2B 6739960bdb5984115b4bd84ec3ca63e6b7a4c4494c48fcde8bab4b3679814e3ffdbe1319a4c0e221e3cab6521d95568839ded58c29dc6f2528d15d684e3c870d SHA512 934adaaf8ef48a843c8cce159502a2d4ca9697cf44bfd9a1c0f77e05da9bfb75ec099819e5543a4bc2492c670ee1f1f843df82746aaf7573776006d7dc6b57b0
 DIST mypy-0.701.tar.gz 1413988 BLAKE2B e705a1da6af8c68b9226d67acaf7976951ff5ddfe926f52cf51f70be59e75cd12cf303aad98e136ee342487c07e1273d0ca8ea582621552924c40ee725e6c01d SHA512 6dde048c211d1dd8f3c02af9500d5151588810d9989528ec4bee0ccbb5a8636fc4e03a373b80d177ca0937c0c92e0ffad1faf82b23db22248b782ec6812e3c1a
+DIST mypy-0.740.tar.gz 1916030 BLAKE2B ef2259fbfa24baa7dc28ed4818c988f5708d1f0be8665e97c5be231fe43f6edfeaf7f8cb4a6f05a8051b95b9457752238f044890686fdad9dce2e3fcf7f1a67f SHA512 f583be8bcb05d8f2c772f7d416bb425590263d759a719de67dc1186d0a1a8178a0c5461f90811c7799b06a49df820c98a3e369b3fcc4b045703d38084eafd0fe
 DIST mypy-typeshed-0.570.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
 DIST mypy-typeshed-0.590.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
 DIST mypy-typeshed-0.600-2dc7d39.tar.gz 425045 BLAKE2B e2ef63f2ed988f77f52e2a01c158ff8e3fbdec118c1f613ffe6c57d025da8d5bcf6dc0e6bcbc1bb8655fbf340a0f358535d7e1ed214a5a1af8e3188f2dde5459 SHA512 9c960c2dcb2cd5ed36d77efa47a5632698e841b685386f8d5a31200c61235b68d627fc450d070955ab14962d6a70a2d538929e2dc845512e83161c0299d91807
@@ -14,6 +15,7 @@ DIST mypy-typeshed-0.660-f343150.tar.gz 456324 BLAKE2B b7a0f7e3da84b4be8c4cfdb43
 DIST mypy-typeshed-0.670-3eb66ba.tar.gz 462981 BLAKE2B 9e321e71637edf6b7b08bdad3ffe76798aec2ad9ff7be0d1649e29ae7543536a6a6d413d9bd9bc4b15e164500e95ee3ba2ad58abc8f984499493c4753dd39337 SHA512 2b3d59451caaf4779c6543cee70461afd9a95b809ba5db7b0fc43e02711d8c4b28c98f680d9ddb9f0c01dcfb5011b6626fe746187c47e737d87689245da9344a
 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
 EBUILD mypy-0.570.ebuild 1558 BLAKE2B 1ad1aaeade920ca6881464e62a446bc17faff14e41eab767977f3cc181892d9349b73169639e3234215edc80b02916c900e001917a60e64fef5e03d204ee32d8 SHA512 e2c0bd5ed2f77d1b9b3cffadb1522e9ebf78953ec9c172bc71f831cdc7b125974a3b051cd08339c5d5397635f3ab169e49c2703a18e6702c57c1e144d02f918d
 EBUILD mypy-0.590.ebuild 1558 BLAKE2B 1ad1aaeade920ca6881464e62a446bc17faff14e41eab767977f3cc181892d9349b73169639e3234215edc80b02916c900e001917a60e64fef5e03d204ee32d8 SHA512 e2c0bd5ed2f77d1b9b3cffadb1522e9ebf78953ec9c172bc71f831cdc7b125974a3b051cd08339c5d5397635f3ab169e49c2703a18e6702c57c1e144d02f918d
 EBUILD mypy-0.600.ebuild 1577 BLAKE2B fff5f2f4efac6e2c6cab22a9539a4117d67090b85d5f3b72f96721aeb90068b3398049a7c83ba736c446985753f80d4aa88de2403633b689ee7ad15ee3116211 SHA512 b3b471cd70711d43e90548bf8c17fd3d8ede706bd39ad896f4b50b14d6890d8c64f6fd7159992edeeb59c85b4326140ba8c7deeb4122c244f54e312f91f05abb
@@ -22,4 +24,5 @@ EBUILD mypy-0.660.ebuild 1823 BLAKE2B 3f82e348c8f6179a40cc49468d9a1c59e2c98a6526
 EBUILD mypy-0.670.ebuild 1823 BLAKE2B 037ba694acb544fff2f5f6c602e302d2e4348fad705acc19ebd0b8ca1dd6c326c686a86a403182afb3e8ab19f0d2eeca64244fb2ee2d69e194bd8ca87abccc5c SHA512 7f44a70ec9e0b4a4a97bd8a657aa7fa9a2e5d15c71bca119c09f129adb04ef02173697a12efa38da7442eed9a222c84621610d96dc2691d505f84a5948419bce
 EBUILD mypy-0.700.ebuild 1823 BLAKE2B 7f0efc2bd69373bc10872089728dbe2606d9754f43a54542f944dc1188a65293e9ed67a321def99340ba7d3bcb8aa79aacdfe578c87e19416f9405041b48f685 SHA512 74f225f3cf4f3b8ccfdade61706582571bb1b35eafb11d5fb86c1a723a535047d662cbff30da76efabbc1321ed5a1881a782d735c285002f076803daa98ddecf
 EBUILD mypy-0.701.ebuild 1695 BLAKE2B 5ec584dae0b7450b897a03abe200d733e386a9882d4b5e1c5bf977621a8a8dbc8bfd1453eca610d782215e28badaf70539b3a53e146313e9e11377b933df62d0 SHA512 25abd179cea08fbe49f7b8369d98b9212e876da04ca753dac98766ed907837bb1f97edbc63d71f856ebd3a09aaa4ffa4bf79e634201b25727961d516a1062c11
+EBUILD mypy-0.740.ebuild 1751 BLAKE2B c30b02e8c07590e097aad67ab30a3e9724bbc1d458260327c0bd9ee86f53819814703e66210865133e6021d0d55a87cb2f52b3371852867e11ac19de9f4532ef SHA512 3387af4ab9c8b0f8c22509f720d3bb3fb39920d8f6d2f486d18583b048ce43e031233daa2d79c859a3b461bff5ca5396a26bb9480653cadf1f41ac4ef36bc921
 MISC metadata.xml 318 BLAKE2B 26aeab57c568a3ebc431f846d61405428034bf9cf8333e5f52f43ec68d51fbbc2cb71deef622c07291312f63f46f29007ba4b02c21e90b4af3db039a43fda4ed SHA512 9e3c8432730d94d7ad9c65ccd1a48d7afc1b43662097f0844048ad107e81ba30e03bea99f64ee8a4171ff0504f1ff04d8d9a84407f414ff228cecadcb80c7c43
diff --git a/dev-python/mypy/mypy-0.740.ebuild b/dev-python/mypy/mypy-0.740.ebuild
new file mode 100644
index 000000000000..548803e201f8
--- /dev/null
+++ b/dev-python/mypy/mypy-0.740.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [ "${PV}" == "9999" ]; then
+	inherit distutils-r1 git-r3
+	EGIT_REPO_URI="https://github.com/python/${PN}"
+	SRC_URI=""
+else
+	inherit distutils-r1
+	TYPESHED_COMMIT="eca9375"
+	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-5.4.0[${PYTHON_USEDEP}]
+	<dev-python/psutil-5.5.0[${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.0[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	"
+
+RDEPEND="${CDEPEND}"
+
+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/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 9cf51aa20663..86abd7f2c980 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 336 BLAKE2B 280111bac38fbd60e25601789026033a61dab0c2706af1874a765aa3a697cdba5d5b051a0dc28490782cf135104f92e793c68d02b74bdcffdd113252b9a3ac7d SHA512 27da38ceaf7dc44250dcb4651e2d171f1ccf0d5a3a2c04845dc6369e1a264b71ea909f7d799d3eabbd989f4c9c37c201f511887956613bf7176697da63378838
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
new file mode 100644
index 000000000000..af4e24caa31b
--- /dev/null
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.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=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="Python client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples test"
+
+BDEPEND=">=dev-libs/protobuf-3.6.1"
+
+RDEPEND="
+	>=dev-db/mysql-connector-c-8.0
+	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
+"
+# tests/mysqld.py does not like MariaDB version strings.
+# See the regex MySQLServerBase._get_version.
+DEPEND="${RDEPEND} test? ( dev-db/mysql[server(+)] )"
+
+# Tests currently fail.
+# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
+RESTRICT="test"
+
+DOCS=( README.txt CHANGES.txt README.rst )
+
+python_test() {
+	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
+}
+
+# Yeah, this is really broken, but the extension will only build this way during "install"
+python_install() {
+	distutils-r1_python_install \
+		--with-mysql-capi="${EPREFIX}/usr" \
+		--with-protobuf-include-dir="${EPREFIX}/usr/include/google/protobuf/" \
+		--with-protobuf-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-protoc="${EPREFIX}/usr/bin/protoc"
+}
+
+python_install_all(){
+	distutils-r1_python_install_all
+	if use examples ; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index 651e7d792433..1b6ba90656ff 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1,5 +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 2067 BLAKE2B f1118432ef239e4375432a8d14efe643b43d4f47103273ed426d1c6dea200d970d5593fa16dbf2d8c30dfadc585c39a8f60259ed85941db4fdbdd61df64da585 SHA512 ecc77e2382ec6097589f5cc5c332cd9d392d93e9b49ae5eac6e4095782e636af8479564ab82f3ee6cf7e41b59c4d9340dd87092c510e7fe72e0989765db462a0
 MISC metadata.xml 478 BLAKE2B 479b1ffc2e6b3de332fbdd2612c50a3471bd26615beed90810463b56122faf219cb602818de421a16c1e3227d13f5553d9db330dbbcfd6e67a725a3479566f3c SHA512 c642bad9f710c347629fca6952be3efe57e247dee81fac187d4a6458b4cb8280dc0d3d4a66e4d329bfd293b9e27edbb7a38247311fbb817088eeb70c441737bc
diff --git a/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild b/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild
new file mode 100644
index 000000000000..05b744b8a266
--- /dev/null
+++ b/dev-python/neutron-lib/neutron-lib-1.29.1.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=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Neutron shared routines and utilities."
+HOMEPAGE="https://github.com/openstack/neutron-lib"
+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/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.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/os-ken-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.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-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/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/node-semver/Manifest b/dev-python/node-semver/Manifest
index 518425af5d1b..cfadd2a3e1e0 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1,5 +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 750 BLAKE2B 740e89bd8d3ebd462302b13f11a08573d34b0fa7cf0e7c50210e203bd9dc3d0bd8656cd97f19be80383b1927fded69d209bd5e839bc057bfdd2a99f2338b7716 SHA512 82474c5fc7f1d029a6ca5472c8557f538e2cf757f6602613addaf3cf8da1c62c85d7e460284abefb0ef89cf65f3293c4a75100d47eeebcc9438d994bae41d5b7
 EBUILD node-semver-0.6.1.ebuild 1079 BLAKE2B 6b90acfa6b90bb56b88abd1075220149eba6db06a78525025c492518f74ab6cb2a4e9d5e95873334ae76a57a1933d518c1780a85419148fbb76cbc19a5fb50c1 SHA512 edbe6c1d946b4ed617c7eb49007115785c8d4e85f230f8c4429995a8102d00c27be73e145aca2204274d419822ff5f6b91f4d8488753feeb1be450636f1a2d95
+EBUILD node-semver-0.7.0.ebuild 1079 BLAKE2B 6b90acfa6b90bb56b88abd1075220149eba6db06a78525025c492518f74ab6cb2a4e9d5e95873334ae76a57a1933d518c1780a85419148fbb76cbc19a5fb50c1 SHA512 edbe6c1d946b4ed617c7eb49007115785c8d4e85f230f8c4429995a8102d00c27be73e145aca2204274d419822ff5f6b91f4d8488753feeb1be450636f1a2d95
 MISC metadata.xml 786 BLAKE2B f7fc468fd3228c485674f4816c1cab1f5220024f39108ca033e4581233d0534376dcc907629774716b5cdc16e7d243e884fe6d17a57d362342e5edd32a4a8f81 SHA512 51b36d6a15b21c6490ba5f19494b23b94bcbe4a5aaf28e6bb6034596b850872bece0a066f3ea6f11f610759492e1060b3d932736254ff0af7a895a9261d74799
diff --git a/dev-python/node-semver/node-semver-0.7.0.ebuild b/dev-python/node-semver/node-semver-0.7.0.ebuild
new file mode 100644
index 000000000000..38da8d9ff050
--- /dev/null
+++ b/dev-python/node-semver/node-semver-0.7.0.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=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python version of node-semver, the semantic versioner for npm"
+HOMEPAGE="
+	https://pypi.org/project/node-semver/
+	https://github.com/podhmo/python-semver
+	https://github.com/npm/node-semver
+"
+# Tests are currently missing from PyPI tarballs
+# https://github.com/podhmo/python-semver/pull/31
+SRC_URI="https://github.com/podhmo/python-semver/archive/${PV}.tar.gz -> ${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"
+IUSE="test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/python-semver-${PV}"
+
+python_test() {
+	# Ignore 2 tests that fail with Python 2
+	# https://github.com/podhmo/python-semver/issues/30
+	pytest -vv --ignore semver/tests/test_passing_bytes.py \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index ea6cb245d109..b3512679a67a 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,3 +1,5 @@
 DIST nose2-0.6.5.tar.gz 134808 BLAKE2B 5f094d537ff7c48b7bfaf139b4c96a93875013ca5663d1e5b3feec543e7efd55335488321bcdd5752529cb36685dd28c91bd29665aed9e5f58fef837e5e2944b SHA512 fc84aa19d486ff1441dd43666182212e4a05b3be054f3c8967e36e624c08ee6eb10b01bba45b5f5dbbd38cfd057d53877e0bc0d9aba59b842688a5d4ec944b40
+DIST nose2-0.9.1.tar.gz 152411 BLAKE2B 39f2d992e5cab4b9e5cd4401ea9285884eeeac7d2e126b5aad5582186efa0f325139480a446950019e91a376b5992fea106064e5170c9ea7961f128b895a335c SHA512 48cfe3956a3cb696e344ea03e5e0ac8d52831b8272b7cad2bdee34681d1e4e7968fe9da9b71cc9db40b6edf289509c2af766e73611f3a6f23ebd5062f4d52c9e
 EBUILD nose2-0.6.5.ebuild 942 BLAKE2B bf5a88b98c0807c34a5aba0e4a7905f0905d2f081e955f824993fcde0935864a75107ce6cc0dca061f9c9903cafda1eae0ce642040d78a8832b0701361d1d256 SHA512 9c0ccf948ea72af4eda1b9c3c5728132f0d8e06bf9543146f5c0560dc2da25083e74b6af3d7ad21bdeb64f190603ea991bcc857f1012ae36130b3371a66dcb31
+EBUILD nose2-0.9.1-r1.ebuild 889 BLAKE2B 35466710489358f723731a5df4cd070ab61d1de1b3feb2bd2b0ca9392ed2d1969513ea3c17f1eb859e20ece6ea06ee05f0702e345012d63055ac4d65a889058e SHA512 be0d8dbb295d56ef22e3d4223b7447d8418a3e9669da08b9d60f2205aa3a9b9b3067bfae0ccc12004e86b86c52bc947454a08a93802c7b638f507562ef7b3f2a
 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
new file mode 100644
index 000000000000..22dd4594b981
--- /dev/null
+++ b/dev-python/nose2/nose2-0.9.1-r1.ebuild
@@ -0,0 +1,40 @@
+# 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="Next generation unittest with plugins"
+HOMEPAGE="https://github.com/nose-devs/nose2"
+SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.5[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.1[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m nose2.__main__ || 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/nosexcover/Manifest b/dev-python/nosexcover/Manifest
index aebd47557bf4..d0d92e488c68 100644
--- a/dev-python/nosexcover/Manifest
+++ b/dev-python/nosexcover/Manifest
@@ -1,5 +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.ebuild 642 BLAKE2B d13e7291269d04eee944fd1b7f47cf402c1040e88e8c3403309a50e51ac5e55e76438cb04c3e2fc59fb2e1344934940f8ae271fadaa69e7df264b6db2afd289e SHA512 a0f2623e794ec5968063570a9e93302521a61933e734c822a12027462ac21a663e25c17698f75c3795579a29290e7fd2aca0c677b514b3f33f48c6963a6b8bf3
+EBUILD nosexcover-1.0.11-r1.ebuild 644 BLAKE2B dbc59e3aa62373f32720dcb43eaf08ef0d76da8eb97e2be5a54e3f8391f357490bdb35fd19b5d68e67102f863019c40708a4291c199487ab2d5569395b88d923 SHA512 fa050126ba6920f75775c47187c83611e92bedabcaf73fb4b8fb39db06b9e9f57b75e2980beb174c28d3722fc05bc700118ff5d92f3c8857646cc189fff7a644
+EBUILD nosexcover-1.0.11.ebuild 644 BLAKE2B 25718b6af9aacb7b99aa5980b67982600e03131d003e1df81e11cf10fc43138e8d089f75857fdfcfc3e431433cadabf522cadc9804f8d79e4c912ffb1e9e8b0a SHA512 ac4051fa37ead40cdff6f9987ad0daec796f29d50d4e70459b29f60e82b04e11031f3280464e62f8ee5c240570aaaf25598f5ba48084634035922d2890616c48
 MISC metadata.xml 498 BLAKE2B b05a2fb406d49aa821b926dfdee1f45f12dfdb8bbd40fbbc064e9b3823a9dd6ca85609f860cac25bcf7dea29aa4f6050324fa36c6950a9f2c7240e4ddfe94790 SHA512 04961083f04775b64d14ef2be39d6a8a2379f6c82234316d29dfaca2941a24dbefff0abca2c5e8efed29a4894885c65ad49bba5acd0a30a8e71ebb2d0fe98e59
diff --git a/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild b/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
new file mode 100644
index 000000000000..361675192710
--- /dev/null
+++ b/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
@@ -0,0 +1,27 @@
+# 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="Extends nose.plugins.cover to add Cobertura-style XML reports"
+HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.4[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	nosetests -v nosexcover/tests.py || die
+}
diff --git a/dev-python/nosexcover/nosexcover-1.0.11.ebuild b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
index 1786118604a6..5138cc036a3b 100644
--- a/dev-python/nosexcover/nosexcover-1.0.11.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 9d0b16f51ead..d362b124b80b 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,9 +1,5 @@
-DIST openstacksdk-0.11.3.tar.gz 693350 BLAKE2B 6e5edc27a2c2d35682827fa9cf15a93bdc7cc5b5fcd440d15f7448a52fbf8fbbdb0f0f528828b23cc9585b72bde2d1537745c0176c8d117ed6fe7d40c6a01c56 SHA512 140d69d853e7e1049f2c539267f9199058b6f5a9452a80b8a6361efe70f42f07a91d94935ef75e43591a5cf70e8102aed31570c559fc89d83ce86ce26fb54d44
-DIST openstacksdk-0.17.2.tar.gz 735020 BLAKE2B 01cd0be40c2b7c95678e03d50d74125674cc70a190b6db90d6769aebb7e662df1e6cd0ad12f92fb617e0109655cf673ec0d21f19a040dffb4f72350f1fe8948e SHA512 c6608df8a618730f4542a7e01708acbe116729042730e2c7adf15c3e1186192b5b6a7fd39b74694290245d31b58c40214df73ca231547ca409a768c44f80750c
 DIST openstacksdk-0.27.0.tar.gz 818981 BLAKE2B 6ad4bdd75e9b6af8da256afaff4003b233164336edef1edcc13fef66bfc25eaa17f02cd2fc1cd57cc27076cc05d63dd646200fbbc809ccff48c5477bcf8178e1 SHA512 3eb2b26dfa37713967d533b66abb27ac107524bc48c5fa7d475fbcc58291e7531518226acdb1e0c20537a24fc6008e287545d61b40e3f1104c80a04df014d566
-DIST openstacksdk-0.9.17.tar.gz 335611 BLAKE2B 2f1ac157c957cc90d53d97dad1930a2cab7dc40c15cb76f22394762eefffa402480a8fa4b9fd30358690b401e2d362b4f7e29b8a17d0e7ef87885256d1d62bcf SHA512 4699e80ad68896cea709c861b013404234b1d6acf2fcd8bc4e8b21b8841f8c204e693c4e631a85906b5b415404cf50f35f395df6206e471920c68d2f26726696
-EBUILD openstacksdk-0.11.3.ebuild 1416 BLAKE2B 0a6df1e568f8c929ead2181faa1c29e8ce0ac10f9acceb7f06b4ae6f5830e54944e1be0d23f00833e7d2024e16e19c7a25e9040aabc6399045545542b5a609db SHA512 e4c086d55ed54ae4f9eabc94d18294a861bd2f1c2cceefb72dbeb3dcbb2458e0478a3ad82f065561752c9c55aef8659d23bd4a73029581e708a467a83ba8a451
-EBUILD openstacksdk-0.17.2.ebuild 1467 BLAKE2B 32954b0ae2af309e4c072c643f684e314de2d4a9c5a763209f99575d78cc9e17fb5f430d4f26ae68a30f1a119a1df300522bc320382301aca9ba126e6abfcbf0 SHA512 fb79da86eee7882f14e99d3b01b9083e25807c5e0b84dedace7a55cd36cc9b677e8d829c47ad2d999c827abb8c8f128edbd2f1622b6f570113f27e29a6aff5c5
+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.9.17.ebuild 894 BLAKE2B cd7b3970dee48d25ea293af523eaca58fd2f4ffc0677b43b7c68b59376d80e77f9f330d3eee504b94accf553bd90c3d884f2f6bbfdfc27ce4ac149b1d490f50b SHA512 1787197a9923bf0763a7a4c6b7b7ff520fa63b7f6885afc352af129c168e507576426a6d08919d42e1e91eea5d800fc1f01f2b63779f19785fb8af3f50eef27d
+EBUILD openstacksdk-0.36.0.ebuild 1424 BLAKE2B 11cfd553da0f9c3b726f493f739f176615f548ff8bfb103675394911733a206bd1328600efeb0dd9d858cb61f8bb93659c506f6a5a5a572df3fda7dab3c52b62 SHA512 f0da2b2161a4302eb514257aab66251c960c60838039904b59b2ab26b31fcff8efa3b0de1f56fbb2ee4cd635a33c767d5ed68790276571579789b1b21d740d83
 MISC metadata.xml 532 BLAKE2B 6432003077d4f17d035396d83fdd85037468296b4e58c7e93a773bfd99e1d65144d88ef93709e41fa5618a300fc1c9f2e85bdb3f8520d5ca2bdbb4a9520003a9 SHA512 1dd04969556dfc8648aefe2358c81dcbb2e6c36fe487d153f0b488d3a066130f99d31edabafd15933892a0b6b1979f0edba37ca88e1d62be9898380890d0977c
diff --git a/dev-python/openstacksdk/openstacksdk-0.11.3.ebuild b/dev-python/openstacksdk/openstacksdk-0.11.3.ebuild
deleted file mode 100644
index a623bd26f6e2..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.11.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=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
-HOMEPAGE="https://github.com/openstack/python-openstacksdk"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
-	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/deprecation-1.0[${PYTHON_USEDEP}]
-	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/openstacksdk/openstacksdk-0.17.2.ebuild b/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild
index 2c7af8a7b4db..f6d1f62d216a 100644
--- a/dev-python/openstacksdk/openstacksdk-0.17.2.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild
@@ -1,8 +1,8 @@
 # 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} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,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"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -26,9 +26,8 @@ RDEPEND="${CDEPEND}
 	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
 	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/deprecation-1.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
 	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/openstacksdk-0.9.17.ebuild b/dev-python/openstacksdk/openstacksdk-0.9.17.ebuild
deleted file mode 100644
index 62b2fa0a46b0..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.9.17.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 )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
-HOMEPAGE="https://github.com/openstack/python-openstacksdk"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/jsonpatch-1.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.27.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.21.0[${PYTHON_USEDEP}]
-	>=dev-python/deprecation-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/os-resource-classes/Manifest b/dev-python/os-resource-classes/Manifest
index c4590b8321a6..a17b6aaf30c9 100644
--- a/dev-python/os-resource-classes/Manifest
+++ b/dev-python/os-resource-classes/Manifest
@@ -1,3 +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 742 BLAKE2B 03c8b1d37ac02f35eb0e305b99d940e07ec8efd02974a88afd5c3b84f1ab76c72e6ccf1397818e045493616c594e5ead7cb17f353e318e548bd95bc7f3f23805 SHA512 b12dc707dfdc8c9c1eb9fc6cd9ac784812bc2e3fe428c4e85ed4122fca760dc90b3ed80f66b62fb7f332569d004f53df142d06c7b09d2d30bbd66eac38dafd7a
 MISC metadata.xml 405 BLAKE2B 63a7bd1834b0367846138475cdc9024abafca54967b74f09d2bc248663c3e0481417d735298f6076af2db4b7dd8c111b59f8f0fe615f8d09edc18b07fc484626 SHA512 256a3131b22660dadbb0522ae467e715b0a7e326f68308bfa76f8e3aabfcc25c44b64b483a4af6e0b6772c89425e9798dee0dcf3b5b1b775efcb2d836b63061b
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
new file mode 100644
index 000000000000..ab121613543a
--- /dev/null
+++ b/dev-python/os-resource-classes/os-resource-classes-0.5.0.ebuild
@@ -0,0 +1,29 @@
+# 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 list of standardized resource classes for OpenStack."
+HOMEPAGE="https://github.com/openstack/os-resource-classes"
+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/six-1.10.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index eaee740dd01f..b14178623d01 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,5 +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 563 BLAKE2B 0c45a9fbacbf3c31e19893e9bf6558d4c7f252068b397c0586cc62fe6cfb95e04c68e229a68b46b72406f6c086ed2cfd825f3216cde70bcaad4bffad96dea7fe SHA512 99674e55fe28318578a79c64fc5ce09b0b09893354c8b384c3e04cb5c0c65bab43adc987c3d3972673844968af8d33614ccddb7619eafa653188fd165518b5c0
 MISC metadata.xml 596 BLAKE2B cd24306b859d804610fccde33b67ec4e0e9ac1724449f67af93df2e98e840781d7a077daac575dd9401c03d53148192d3f520b488426d428f803ffe812fd631a SHA512 063efcfb4484e91c21d5b2d0ea66acb2362a791c402bc2f2fe5a7f8bd2401a732dc0859e9be2a87f5eed72454fc87e05eaaa7666a9f99f73b68c35baa1f734ba
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
new file mode 100644
index 000000000000..48917eb701ad
--- /dev/null
+++ b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
@@ -0,0 +1,21 @@
+# 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 library to handle official service types for OpenStack and it's aliases."
+HOMEPAGE="https://github.com/openstack/os-service-types"
+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="${CDEPEND}"
+RDEPEND="${CDEPEND}"
diff --git a/dev-python/os-traits/Manifest b/dev-python/os-traits/Manifest
index 4150fa0368e6..c10ddf7b9891 100644
--- a/dev-python/os-traits/Manifest
+++ b/dev-python/os-traits/Manifest
@@ -1,5 +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 739 BLAKE2B 24b04d0044e8ae9daa4e87040c6a2ccd757e0a0ae644cb6578d1011744d62eb6cbd2a4f55a0790d1ffc0a09d834ce5a15d6724f1abe3fbbd74a836aadf1457a4 SHA512 f5539868cf12391e8951ee01be9e8825f566623b65ee172d911b782225f11c12e0e36d84d0c9c77cab565e1dcdbdaec0067d3229494a327e679c0dd295646b7c
 EBUILD os-traits-0.5.0.ebuild 735 BLAKE2B b808414f5f8a7a92060aa785d347d5180e0b0c52dcb0bd01c85dabf15eeaaf64b78233420608233cd434f9c3299b52a95e121228c822abcadd0ede4cf7ee378f SHA512 f6bda726549e1a5fd4fa344c09c21612f0aefb920c5786018eddf78473c51fbbcdb6855f90417abc651c12c91bd71d559c9f0d81452d56ad41731cbc05c6e00e
 MISC metadata.xml 385 BLAKE2B 2ba965a78d301c8f0b65378ff482552eba70236b457b96461367e0ffa5cbab79ddac2296cab4184803f7970e4162faa0ace82762ff356eef2e739625bfc99878 SHA512 9dc66a1191f15d9a8569e229a59164a7527c2ad27c06f67d89a9a25910bdaafe70f6c9269a2482d5770105ce58a64705dde15db56b34f2568add1800df0cc42d
diff --git a/dev-python/os-traits/os-traits-0.16.0.ebuild b/dev-python/os-traits/os-traits-0.16.0.ebuild
new file mode 100644
index 000000000000..3ba218ddd663
--- /dev/null
+++ b/dev-python/os-traits/os-traits-0.16.0.ebuild
@@ -0,0 +1,29 @@
+# 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="os-traits is a library containing standardized trait strings."
+HOMEPAGE="https://github.com/openstack/os-traits"
+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/six-1.10.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-vif/Manifest b/dev-python/os-vif/Manifest
index fb1a2a66e7e6..85fcdc16a497 100644
--- a/dev-python/os-vif/Manifest
+++ b/dev-python/os-vif/Manifest
@@ -1,7 +1,5 @@
-DIST os_vif-1.15.1.tar.gz 85731 BLAKE2B c0855be5204513fcb18c39341cae0a51ab6ad961d6a5f6d96988b14e43beddc4fa7f8c3e8a590eb5f657af8590603cc516a194af1c73234566047b8059cacfc1 SHA512 5fe7ba1bccba81e8b03884e951012f181c4b0cff433ff9211ce750868811ad4a3e5b1188396c466a286df6a9db824fd07a7abc62fda2c0c302d6d07108f419a8
 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.1.ebuild 1418 BLAKE2B 575f1b3fe4398f8d15819439ba8dacd256211378d12428d05dcafedc6887da47e1d5e2c60aa7e80c5dc6ee1d2887866b689d621bce7ef42c9cff245d0410cb22 SHA512 9b53d5b13bdbee6bd2015c828c747dba4f2ec47c7c9355017085505e1db3bb6fafd183e063d54e16711fd941319816ca6ec5f29b0af1a26b7ec293bc491c66c4
-EBUILD os-vif-1.15.2.ebuild 1420 BLAKE2B 1d5eeadc98a27de20639ca046536de8622fa082d6c10e3916ffbf160ba0bf2c4f602e04fe5e43cc6b26ee48ae7cb1edc7ebb64dee00df638553f3a677e43ea40 SHA512 a3922882f31418a324d7c0ab4aa682012e978c3aea1dbff3b2104012e7f1a2421f3c89c72779ea4c7529cd787f8c96064377304b10c2918d78b96a88a7096e35
+EBUILD os-vif-1.15.2.ebuild 1418 BLAKE2B 575f1b3fe4398f8d15819439ba8dacd256211378d12428d05dcafedc6887da47e1d5e2c60aa7e80c5dc6ee1d2887866b689d621bce7ef42c9cff245d0410cb22 SHA512 9b53d5b13bdbee6bd2015c828c747dba4f2ec47c7c9355017085505e1db3bb6fafd183e063d54e16711fd941319816ca6ec5f29b0af1a26b7ec293bc491c66c4
 EBUILD os-vif-1.9.1.ebuild 1316 BLAKE2B fed08c77cb8740ab83da994b04d7f218cb8848c0e8e7d5635826b7cf56adf540823f96364685cd396649ca57b3ca9086fe1ee5bab466b448cd6617787415fb9f SHA512 50ebdb3012fb584797346da906f212011dc09a9d9cb11ea91df25daa60a446af246a9e5a6c7c4d3c4cc7b59cbe7c980a072c0e111f2c5ebf6fa9fcbe46bc7140
 MISC metadata.xml 379 BLAKE2B 9c4bc302bcb12ea964647546867a2f00cc84eda6f1193a700cd248248c6c992f6183c735ac55f021a8b89974ca336d4d840578444f02d1ac85cfdfcb8d48bc0c SHA512 3667aff7bf331a2383c2e4a854ceb0b1fa214bc605e98bcc9829dae0eb5e870ad123e9a2989a345134db916541005f54dce777c680e32ec6196785727a89831f
diff --git a/dev-python/os-vif/os-vif-1.15.1.ebuild b/dev-python/os-vif/os-vif-1.15.1.ebuild
deleted file mode 100644
index f40aad0c51cd..000000000000
--- a/dev-python/os-vif/os-vif-1.15.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=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/os-vif"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os_vif-${PV}.tar.gz"
-S="${WORKDIR}/os_vif-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.12.1[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^pbr/d' requirements.txt || die  # pbr should be uncapped in stable/ocata
-	distutils-r1_python_prepare_all
-}
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 4a5e87d488cf..f40aad0c51cd 100644
--- a/dev-python/os-vif/os-vif-1.15.2.ebuild
+++ b/dev-python/os-vif/os-vif-1.15.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/os_vif-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 1640f65e94c1..9fd3c704cfbc 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +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 1960 BLAKE2B 06f9c2f46329df6d2c328465c8038d41ad0b997850a39f1ebfee6429d97ccbe545c8161cd32bb01af6e1b5eec7d00f08c4216a53fca1d476820e87eb16ed423a SHA512 7fe8a0a7debdef366dd75de0ded98b9bc473800f312f6ad41491b46f03b7aaf9b5593aa132b9085a510cb0545048c6c891d1f60c5f1779cde5dc76ffd06717d4
 EBUILD oslo-log-3.42.3.ebuild 1847 BLAKE2B 672ca4c53d95546a415bc7ac440220588d6ce706b0f6d1ec36eeba1a2812205f6ef89c8fd9a6107c3b236c66116610fae844d1ea6ff94e7a701001e7b53ec25f SHA512 915f76017c90e8f56a4a56f193a7ac7f97042f832ea5e75e538e41744851be733354e8562d91f70bd49898e993e0107bfecf995b0ce42472445c7d2b5e64b83b
+EBUILD oslo-log-3.44.1.ebuild 1301 BLAKE2B 88e5e5b04375c98202cf3899608349d5250cefc91c013fbdcffe6ae5944e69c178e70a642b3e1ae53e76645fee44169e98dc62ae8c762eaddfa1c782a2285926 SHA512 b9d6eb37b135e8a4bf58ebc2803afafd55aea6d3c9fa1728b694f75871af5db30e93d926e950d71a3b6eda8954897ce81368c7e4e942c2b0cd70a02806e24c5c
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-3.44.1.ebuild b/dev-python/oslo-log/oslo-log-3.44.1.ebuild
new file mode 100644
index 000000000000..bdcfdf36f990
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-3.44.1.ebuild
@@ -0,0 +1,40 @@
+# 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="OpenStack logging config library, configuration for all openstack projects."
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index b43ee2e03df3..9fc0e062a21b 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,5 +1,7 @@
+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 1673 BLAKE2B 5a6334258ec641add69fcae904b72bafb8ee70f4e68c88eee67a4d8177925be8fb9bf89ba813b7ec6a97d46550af064379dba7bf970f0d7894c3042fb4ec6127 SHA512 030719b0ae2d950bcaac733125ef0251e46992df3f1807835a506562223dc28c3b36b8b8fbb08bdd703c8663cc6c182efdf4f9e4ff0180d263655948ffd41195
 EBUILD oslo-messaging-8.1.2.ebuild 1943 BLAKE2B 68098cb7a6988819d0a42d38a7e24288c964b3339451ce1919e7acfc683148fac7d1658deecca5f50461fa3c2eb98b5bbc2866750ccbe52bac50fb92fb8b7b08 SHA512 0e940f38b388211d6ca008782787d13e07f78ddd411ed145b6ac04f287a01f5c60e6ea62cf89daef9bac7b00e43619aa8dae66bfac0aac880848b4ac4e39273a
 EBUILD oslo-messaging-9.5.0.ebuild 1764 BLAKE2B 2e8a90aeba377eced243f1bb36e25baa7bf134ea5c0352208f9cc47e7cae17e722cfab9871fb29da356a88bf10561c3212b5ad68fc74bb3675418dada8079b13 SHA512 922f1b37c550db3fae096336e683a05ac2b5f7600ff33de5f4efefbdcd611627cf2d943a6d62e8bb2a4336c0190725eb05bda29e837f7cc472b5e5e6f1b80b0d
 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
new file mode 100644
index 000000000000..20a58844bd05
--- /dev/null
+++ b/dev-python/oslo-messaging/oslo-messaging-10.2.0.ebuild
@@ -0,0 +1,47 @@
+# 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="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/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.6.1[${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-policy/Manifest b/dev-python/oslo-policy/Manifest
index 07167c790b62..513aebe47de5 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,5 +1,7 @@
 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 1222 BLAKE2B a7d4e85837fbfad1608c19f495ef55ec9834eaf0dbe9f9f5c68276a0c6fa62444db3134b5b88bd7917cbcdaf152a98fc036f5344802d66ba5aafe35e45a0bafc SHA512 31e338b308c3a0f8a048f40b90d5170e1ac34d06549eab9449259b3e02b6422feb63e465a1fdca71235554a3ccad507e2463c3d9b1e5668e5452f10a84869c1b
 MISC metadata.xml 600 BLAKE2B 5c911411e88182db677743ddc559bdbd0695f12648a00fc6b0474535ba52493eb2dc291f51a2fd37701a17f951627fabd83c1ae3c616331c200fa231eb3c4dce SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe
diff --git a/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild b/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild
new file mode 100644
index 000000000000..e0ab35670b44
--- /dev/null
+++ b/dev-python/oslo-policy/oslo-policy-2.3.2.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=( python{2_7,3_{5,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 173e7a488784..5b55f2f0f502 100644
--- a/dev-python/oslo-privsep/Manifest
+++ b/dev-python/oslo-privsep/Manifest
@@ -1,5 +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 1770 BLAKE2B d3e3b81b321c03f485b82a05b2d2e3133c230682d6b96aed3f05ce417e582dceb52beb54d22928be9f6fec755df8b4c2f88297ccbd4c53684fa9ce159409dc9e SHA512 9a2998a515b0a873936d7a218b169351379bc17ac195075b7adf9d2790aa07525ce64eef36a81a075cb5940739b87559fa47b6570f28adadbc9806c89fb2854e
 EBUILD oslo-privsep-1.32.1.ebuild 1860 BLAKE2B 2a61ad5023dc6084bef82656bddfd26be128ed5155aa41d71ce8aa95f18efb6b21162d1e386d20e06a417bc21f85340a6e3c269450f0e8bf98e0795df2652358 SHA512 03bece5d5bf5be43674947b79494a2c1360b45bc8ae28bcb3a928a69f2ff7e9ddb822766dc2167f3197275e1cdfde07ea46f4310e8551595a69aa57e1240281a
+EBUILD oslo-privsep-1.33.3.ebuild 1315 BLAKE2B abe92daed899581c7ba350fa577db21227f77d0387bcd75d0ce1a753e056cfb2eec684f017a151291553aa45f66a22414c0bd14a64c29292466505e6993d7c05 SHA512 2cd12be189dc698eba02637c0c0084cd0a966d276f3c41696812c2a17a703af251d32c1753e9d920b2c860c52fe56ea3159ab65eaaa83d394c5d8193eeeabc6c
 MISC metadata.xml 544 BLAKE2B a76322f18a6f2b32d17934a5d8c747963f5bf647cae027babcc4508c4b15ad6c958baa30399247302aa696dcde2ade3a9ae4552de7c1538d4b0af79b3da2ce69 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.33.3.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.33.3.ebuild
new file mode 100644
index 000000000000..5cbae42dc218
--- /dev/null
+++ b/dev-python/oslo-privsep/oslo-privsep-1.33.3.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=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack library for privilege separation."
+HOMEPAGE="https://pypi.org/project/oslo.privsep/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
+S="${WORKDIR}/oslo.privsep-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index 7f52dfaee87d..04aac64e41b7 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,5 +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 2115 BLAKE2B 35356b6f20a63898f9d77c8696a01b3211318f2cd1f8dd2dbf69b8a5e4d3f362067421773c026b237e68e73f7a9604b2c22a7e2301e38cd447eb4f191349e0ec SHA512 314d5c7e452a5b810485fa1673871534c1159543ba2db07ec6b1eb87370cefefd522c338e30112605ff878475bd834ffa5fa5d961992b46812d42e7b0e344c35
 EBUILD oslo-service-1.38.0.ebuild 2258 BLAKE2B 45d4f7e21bdac6fc2392ff5837c25718c8560c02870b7dda2f7b2de25a6962a67b61f1e5024cf35c09e1f21b8a09e919a1cb72ac050e1017b753493e717e2a1b SHA512 19d10df401a9ab827808ba988ba4e1d4001ae61318cb4a4724974a33528db30d3266b03ebd0522f84c73f1225e625a8d42146fbc4a9a9bd3be7acfcf8182c153
+EBUILD oslo-service-1.40.2.ebuild 1557 BLAKE2B b9a0e6619bd75964f3c7e77ec09fbe327c218fe1dba9e7a5917fdb7c8bb651901e834f873575625f5f831e7d0fa4c50b4b6434be71a2568cb771afd6de2ed36a SHA512 a2fea56c03dbbdd363fb7a513871e40c82f2a85e01040992498310a32ae59b111591c2742d5f8e91b10978f888b78ba3cfe34e8d3e3fcda71634fed139b2d104
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.40.2.ebuild b/dev-python/oslo-service/oslo-service-1.40.2.ebuild
new file mode 100644
index 000000000000..ebd99afbb9d2
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-1.40.2.ebuild
@@ -0,0 +1,47 @@
+# 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="Library for running OpenStack services"
+HOMEPAGE="https://pypi.org/project/oslo.service/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/yappi-1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index cc77f9c0e2a0..560e0a138456 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,8 +1,4 @@
 AUX paho-mqtt-1.3.1-strip-test-dependency.patch 681 BLAKE2B 0ed9a448e5e72813aa05ad1d37ae957150ad09b6d48a54f668a969e5e98ad25f8d55b223064e01f6773d0e42da3ba26f2e0a7f43a628ff68fee4b619b8de96c9 SHA512 dbadb8c1bd7691a973d8c1cd146ac9bd72407625ddfc5042b25bc81ff74af6d554c06fa3b2972637acc4a466e75a65c9371990e43bbf649fe5a5a22da2bb36fb
-DIST paho-mqtt-1.1.zip 159529 BLAKE2B ca3a39628c9cab8c4f3606587a5c853e79535b37a92991ecc32903967952cc00f6a9b967af0d343c4619f3e46ace1330baebc7c2e9dc231673f51775e4e1de25 SHA512 ef6d1a29480671413dbb655bd8f668b99f8587c14589d2180a37142b368e0ce058f8ed967dbfaa82f239c86e295338bc35c9f28a3ea39d21a6034cd8787a63ce
-DIST paho-mqtt-1.3.1.tar.gz 102133 BLAKE2B 905a51824d487cb125e06114bcba6b1ba862de4ab816db16aadb6ff761145fd4724dc6523a0c6837b8a16ced6730c5558612deb138bd95721f15054f5d6851a4 SHA512 95adeeaffbbd4b39d19fbd46feb39ec4a2ac923addd3c754a474b7a91d620bfca1678645c1a09c925e38a33995575944b873e3b2300d7bc2f3c5be3005c74d4c
 DIST paho-mqtt-1.4.0.tar.gz 108278 BLAKE2B 0569f3cb5d262b3b7f6ae68261fe138d839afcc6fe91f880e29de24d5cf8e2491af81a30eb82c27fe63eee90114326eb75b06a32e05ec2fffed27b92d9601902 SHA512 2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c
-EBUILD paho-mqtt-1.1.ebuild 492 BLAKE2B 1f71471c32b22b4b0c069bc6b0146421957238ebf69e04f8ac05966abbc23a604d083cf27cd8c55aea4a4dee84be4770b9a3d97aa426b5938130548ec1b1dd75 SHA512 a3f7f041312079a2761be6306689401ee94fe7afb18e744b8e9fded6e70f694a427e143411862f9098e8c1776db2a1152de40263bb02beea659299445c6c4cc8
-EBUILD paho-mqtt-1.3.1.ebuild 828 BLAKE2B d6607b3246b2a558f48cef712d4c1a043dad250379306b5dab3eff1c704083e65f0ab6c16c2e793788264cd527f403e8693f488067ab60870d65356f41b34621 SHA512 8ddf020fb22f5a390fc751e467a3b562bbf68b8d269f7860895e51f1b0469625c57d1918b80392c06636ef638791a37ee8eaad4e0a2f46c9afcf63d598eb689e
 EBUILD paho-mqtt-1.4.0.ebuild 842 BLAKE2B 5ace569e1cf23eb13a25dad37fa8f4ba922884f8ca71051c83fadf0ca52d5e245e787dd4335e4aaf458ed967844c0d5aa8d6866c580fa777b3f27f9d48990648 SHA512 c9dbb00022e66bd1ab3746c0a6a0b84d59f13ef56d07fa9b6107ef593dd528ca4ac7b70767c496109abaea371643455f309827835831b78b3424fc6992b038ea
 MISC metadata.xml 461 BLAKE2B aafc02224eae792f2800211f291493df079437667e706879cff3d8f7e895f16b8b778fe623280434f36ee878db2da6edefb459ad7b59b3fe5ec6e4dc8e3c7b36 SHA512 a9b6ab584e14070bcc2087a7027b1e36bc91706124039938a7bc2eaef5c14247afbe3c4827a22a3899c8e3c527f0d0ca0e394f1465b42e759e2fd26cf965297c
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.1.ebuild
deleted file mode 100644
index 6ebebfea9704..000000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.1.ebuild
+++ /dev/null
@@ -1,16 +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 client class with support for both MQTT v3.1 and v3.1.1 on Python 2.7 or 3.x."
-HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
-SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/${PV}.zip -> ${P}.zip"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/paho.mqtt.python-${PV}"
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.3.1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.3.1.ebuild
deleted file mode 100644
index 2f64e09df756..000000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.3.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=( python{2_7,3_{5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
-HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
-SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	) "
-
-S="${WORKDIR}/paho.mqtt.python-${PV}"
-
-RESTRICT="test" #659106
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
-	default
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/parse-type/Manifest b/dev-python/parse-type/Manifest
deleted file mode 100644
index 4a43561b1ce9..000000000000
--- a/dev-python/parse-type/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX parse-type-0.3.4-python-3.5-tests-compat.patch 1382 BLAKE2B 0e2f122df1f8db5647cfcb30940b12d8c93c2e75309121314954eb8e78f7ac63a2bec50b065310bbb655072cb08d3aeb6546fdb5426b83e9141389b4e6f39b7a SHA512 95f66bbd323f5ca621db2803dcc118c392503188dd4569bee3418be85b644dabc0b15a48a83a66f218466e0764eba409abbe8574b3c7340589428de90a6a0acf
-DIST parse_type-0.3.4.tar.gz 62199 BLAKE2B 8d1c89d837c80ff9cdc3585cead4a24b44256e712f5ed7b824833ce35b25ffef27513c167c41266246da403fecdadec404a6a7cdf968bd35a827b5d02364739d SHA512 5ef80ed820cc7e2f4fa8fd0fbf64160c81f77b4a1af38015e3ec7e3be3f613ecc2211d5dba15ef600cbe11c556a2c1fb6cdc8374c52c608914aa903fad84267f
-EBUILD parse-type-0.3.4-r1.ebuild 937 BLAKE2B 05c8a53aacb7800da4479d1fd3c197b551e5a3b40f185b4d6002da75b28a8a9e4358fcd7e986163574bf70ce14072c89117568b56041658263ec0ddc2ac03efb SHA512 33b8f0300755e3b34fc09e9c291392c82d61bb85e4c7b59b251e5f50b31c93ac9933c82b83a955eacbb0c07b1a82bae5689f7a3b7ec9e7b9e52981dbfd741268
-MISC metadata.xml 296 BLAKE2B a5e861ce115e7ef1373426310befa894a13fe3c2f9ba48d62ae2d4e4a698f91e5bb8197fca46937fbe318d81dfc1153fa7391c55e4b35fdc7115d547c54d7170 SHA512 f8d5beb789d58e183e322fc448c086000a3511768673264586efa27b2d966cf3dcf91ee6ed652edca2a2f4fcbdf2ec2232007af7d7cf380e58396ee3ec075403
diff --git a/dev-python/parse-type/files/parse-type-0.3.4-python-3.5-tests-compat.patch b/dev-python/parse-type/files/parse-type-0.3.4-python-3.5-tests-compat.patch
deleted file mode 100644
index 54cfa59cb801..000000000000
--- a/dev-python/parse-type/files/parse-type-0.3.4-python-3.5-tests-compat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8f7ce32dc6bd466f1ea6ccc9260917016061bb4e Mon Sep 17 00:00:00 2001
-From: David King <dking@redhat.com>
-Date: Tue, 15 Dec 2015 08:52:26 +0000
-Subject: [PATCH] Adapt bundled parse for Python 3.5
-
-As the upstream pull request:
-
-https://github.com/r1chardj0n3s/parse/pull/34
----
- tests/test_parse_type_parse.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_parse_type_parse.py b/tests/test_parse_type_parse.py
-index 4151d37..cab6143 100644
---- a/tests/test_parse_type_parse.py
-+++ b/tests/test_parse_type_parse.py
-@@ -11,6 +11,7 @@
- 
- import unittest
- from datetime import datetime, time
-+import re
- # XXX-ADAPT:
- # ORIG: import parse
- from parse_type import parse
-@@ -611,8 +612,13 @@ def test_mixed_type_variant(self):
-         self.assertEqual(r.fixed[21], 'spam')
- 
-     def test_too_many_fields(self):
--        p = parse.compile('{:ti}' * 15)
--        self.assertRaises(parse.TooManyFields, p.parse, '')
-+        # Python 3.5 removed the limit of 100 named groups in a regular expression,
-+        # so only test for the exception if the limit exists.
-+        try:
-+            re.compile("".join("(?P<n{n}>{n}-)".format(n=i) for i in range(101)))
-+        except AssertionError:
-+            p = parse.compile('{:ti}' * 15)
-+            self.assertRaises(parse.TooManyFields, p.parse, '')
- 
- 
- class TestSearch(unittest.TestCase):
diff --git a/dev-python/parse-type/metadata.xml b/dev-python/parse-type/metadata.xml
deleted file mode 100644
index 958b45bd9ff9..000000000000
--- a/dev-python/parse-type/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">parse_type</remote-id>
-		<remote-id type="github">jenisys/parse_type</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/parse-type/parse-type-0.3.4-r1.ebuild b/dev-python/parse-type/parse-type-0.3.4-r1.ebuild
deleted file mode 100644
index 8f65368f3b1c..000000000000
--- a/dev-python/parse-type/parse-type-0.3.4-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=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simplifies to build parse types based on the parse module"
-HOMEPAGE="https://github.com/jenisys/parse_type"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=dev-python/parse-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'python3_3')"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}/${P}-python-3.5-tests-compat.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	py.test tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/parse/Manifest b/dev-python/parse/Manifest
deleted file mode 100644
index d86fa9b5817c..000000000000
--- a/dev-python/parse/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX parse-1.6.6-python-3.5-tests-compat.patch 1694 BLAKE2B 661b7bf97d4bbb392ad5b83aea092075765d133a655e1927ba5094ec3004d6120bbacea20160241d8d20f3210388a58fe54784662ca28c6838a61370a751ff44 SHA512 ed4fa6d689304798f289c11d441bb9c66c21dbde115da4f8bd87f538c5a1ccd7c1ea277ccca6d4c2b2e3560335130213b3d24bfbd6896033c55bd75f01424857
-DIST parse-1.6.6.tar.gz 24638 BLAKE2B dbf1844b09bfdd0fb8ebaecba14f4a6289de315f4d658eac4853696e11b32dc9cda5837ed654072941846f112b480315961d9660c7d111127f57aac8f2c30250 SHA512 fae467b6f6e35f04d9e501162117423506701d101b2265e941b5b34420e833a0f4dbc44f62c33d51836a62ef51da9b5b8a3a1d39b3ec490f9eb77c5b6f302cdf
-EBUILD parse-1.6.6.ebuild 547 BLAKE2B 2b24927a26aac92c7830fe81eb04bcc30558b4939eedf1b35de34bd67f59395008565db4dfc0abe8619c7a90ce5fd9fe3dd9366f2da1872db6fe830c6f56f9bc SHA512 c4c27c74bed52dc5cbd02069bba8b91052740a9bc098f142785aa728d79b6d1385cbfcf0cd44e703aed220eb1607e427f8f1ac9bb1e023a1d130410c44cb24c6
-MISC metadata.xml 291 BLAKE2B 0b6d9b55b3bbae1af67c0c99ea01cacaa7b5bf972c5ac46668e8ecb322150fd50832b8440ab0363e1dcb393daba2815a6df572c29e9f8efef353aa14196852fd SHA512 cd6f34b051251472999c026cb7af5e2d199de4b632dc5b39bd7ff149af2664d370e3b835505da730d9287034130ae18f66b1293039500ce2b1aa54fe7c582677
diff --git a/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch b/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch
deleted file mode 100644
index 5183cf5ef32e..000000000000
--- a/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 32f15cfefb7c7b6476360ac65cba807aa3dfccfa Mon Sep 17 00:00:00 2001
-From: David King <dking@redhat.com>
-Date: Mon, 14 Dec 2015 09:58:19 +0000
-Subject: [PATCH] Fix test_too_many_fields with Python 3.5
-
-Python versions before 3.5 had a limit of 100 groups in regular
-expressions. This limit was removed during 3.5 development:
-
-http://bugs.python.org/issue22437
-https://hg.python.org/cpython/rev/0b85ea4bd1af
-
-The test_too_many_fields test asserts that the limit exists by
-attempting to parse a string with 15 fields, which triggers the 100
-named groups limit.
-
-Adjust the test so that if first checks to see whether the limit of 100
-named groups exists, and only assert that parsing 15 fields fails if
-that is the case.
----
- test_parse.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/test_parse.py b/test_parse.py
-index c524349..1d50568 100755
---- a/test_parse.py
-+++ b/test_parse.py
-@@ -6,6 +6,7 @@
- 
- import unittest
- from datetime import datetime, time
-+import re
- 
- import parse
- 
-@@ -624,8 +625,13 @@ def test_mixed_type_variant(self):
-         self.assertEqual(r.fixed[21], 'spam')
- 
-     def test_too_many_fields(self):
--        p = parse.compile('{:ti}' * 15)
--        self.assertRaises(parse.TooManyFields, p.parse, '')
-+        # Python 3.5 removed the limit of 100 named groups in a regular expression,
-+        # so only test for the exception if the limit exists.
-+        try:
-+            re.compile("".join("(?P<n{n}>{n}-)".format(n=i) for i in range(101)))
-+        except AssertionError:
-+            p = parse.compile('{:ti}' * 15)
-+            self.assertRaises(parse.TooManyFields, p.parse, '')
- 
- 
- class TestSearch(unittest.TestCase):
diff --git a/dev-python/parse/metadata.xml b/dev-python/parse/metadata.xml
deleted file mode 100644
index 33e17f1c6c8a..000000000000
--- a/dev-python/parse/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">parse</remote-id>
-		<remote-id type="github">r1chardj0n3s/parse</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/parse/parse-1.6.6.ebuild b/dev-python/parse/parse-1.6.6.ebuild
deleted file mode 100644
index bb8a2ede0d4a..000000000000
--- a/dev-python/parse/parse-1.6.6.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="parse() is the opposite of format()"
-HOMEPAGE="https://github.com/r1chardj0n3s/parse"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-python-3.5-tests-compat.patch" )
-
-python_test() {
-	"${PYTHON}" test_parse.py || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index effee0258b74..c0ad259167d2 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -6,9 +6,11 @@ DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870
 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 2483 BLAKE2B 4b191b6e39b3abc6a96c1ec052d7d172bccaab10a8ef5c279b45774179dccc8a6dd446a733567fa20429189b909c42e0f735a56c6b099f34822d30bd035be0cb SHA512 d9c2e10d90f81856ad1b5f9c97cc84c369f028a99090e9a3deedb70d2f4f7cb2a9954529d160440e5c5b7d234c256e85f700aa7e052c75809b2179b589bd23ad
 EBUILD pillow-5.4.1.ebuild 2770 BLAKE2B e3a3b8f2ae0ff3aca9e881f6355651125cb3d606a0332d614d68be02cb8f5a81a4ce002d1676f9ece74bc8a120076ed9e2f9b741ae30996da6e4d1de85975f1b SHA512 bbf551cadcd03fde029c19678b47267c0558b42e0c7b93a64c634f5ddd576c05bea04b26e568bb3d632d0c18505eec4f4a1d0e797f9a66caed2de8e8d8dcba3a
 EBUILD pillow-6.0.0.ebuild 2773 BLAKE2B 9332930703d43e2600618b3ecf24471a52288348ea1067c2508948cdb2addbc22ee37ca077e2c5773e8335949ed0331dea1ecd57b43e9152abb70c9ab48af3a0 SHA512 89cb0af57b9fd3347a88418b65943d5c2569598bd4a2fa822c3fef9a2a538150506581342124080fb5a64f52f331aac65662947c0d514de6840e3c48cf4ce8a6
 EBUILD pillow-6.1.0.ebuild 2783 BLAKE2B dbe85b17382d85e30fed56c9bbfea8807a42e0edff06f7d8d53e2cfab69e42182a232328d046fcd394ff1e8e28e854132422d0f573ac2efe22a780e2d7f60956 SHA512 1f8d6408f63a6f5bc2bd182eee1c9cb1c1b6d455b182a91167c502b2033d058fa9bb88d59ad078ac6fce1cbbd8709a4161371d13d9cf5ee4dcd579254afc6ad7
 EBUILD pillow-6.2.0.ebuild 2809 BLAKE2B a1815519b845c7991d927275b429cbec0150fecbd58d65c0419e0c95e62a409e051e497e727ac3c331e4ee529086d176718db7c19688e37d5449090ea932c68f SHA512 7d226398eafa43935a293474a15ab2eddc972cd6844e3fe0b701c0ca49ca44a1e2f8ae72d3bb3d006f09710fe66ab54f67a54efc179f5dae03a6f108b7b231ca
+EBUILD pillow-6.2.1.ebuild 2809 BLAKE2B a1815519b845c7991d927275b429cbec0150fecbd58d65c0419e0c95e62a409e051e497e727ac3c331e4ee529086d176718db7c19688e37d5449090ea932c68f SHA512 7d226398eafa43935a293474a15ab2eddc972cd6844e3fe0b701c0ca49ca44a1e2f8ae72d3bb3d006f09710fe66ab54f67a54efc179f5dae03a6f108b7b231ca
 MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
diff --git a/dev-python/pillow/pillow-6.2.1.ebuild b/dev-python/pillow/pillow-6.2.1.ebuild
new file mode 100644
index 000000000000..dbe4d52efc2f
--- /dev/null
+++ b/dev-python/pillow/pillow-6.2.1.ebuild
@@ -0,0 +1,105 @@
+# 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/pip/Manifest b/dev-python/pip/Manifest
index c89399f2ef52..bc05f76310f8 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,20 +1,17 @@
-AUX pip-10.0.1-disable-system-install.patch 769 BLAKE2B 9e722c95f01a184bbc48df6979cde15d748311e5ee5d83e5d18659cffd7520145bb24af891ba0f760dcec4c17b17d31adf211f1a4f938598d1fec44be56e6891 SHA512 6b0d49d398940f2614b2a892be2169a6c2c2d26d7d700271df3819c71c284646cceac9dce4e907662690e17bc0ca372b6251e02f520bf3e60994b26725403029
-AUX pip-10.0.1-disable-version-check.patch 850 BLAKE2B 4ec0e8e0b172c51cdfa2df6ee934df8e25a03885ef7976c2f7cc844728e0359a1d5081296680576ea5780a15b639b3809063e663374ee11e252cd95bd9e876ae SHA512 b489eaf4fe17042807dd92ce77b016fcd032dd79bd5c766bdf9be38d2958e32400bdb5950ff2c400abac42d2a0a17803f5a2cfdc1161906c95c1d34a8bc83f8a
 AUX pip-19.1-disable-system-install.patch 795 BLAKE2B 03cf006ae4482d530a614d4e0b9b5420d924835c88118ea895bbd7db69faa07867d255585fe9b49ea6d81d9689324f1a4844bd2badf3a1304ad748db6c2d6aeb SHA512 fe6bd65e73ed389173b636e339c58de58a96ca6c6dece93e8e5c3178d0c1fcbe2aa5019efba34831b54b09aed956a186604f44da7a50026ec3bf5fad425eaf87
 AUX pip-19.1-disable-version-check.patch 782 BLAKE2B 3dbd3472396edd592d79b418c0c76a2d71cde8557e2c5598bc061c618a7f0028fb086afb7e28e5c051075b65abc65e3568d3ac0c85335d0f8a3db6ad44795ad2 SHA512 ad65449df3e68e406052e21b6349d897dd988a0a257f4ee92032b8c0607807a4427e04d22b32bbef12b3607364299f8521d3c5a6774e32886a665b315b0b6779
-AUX pip-6.0.2-disable-version-check.patch 465 BLAKE2B e3ae94267a8d0caf425d22968f6e640063eaca0d2c475d130d1d2f7281d6ef541c0c36c3871c67fd4947f54a4ca18cc9a9c0fa347a3960727483b3a3bcd46ed9 SHA512 fd3413fea4649aa6a34ff7a23e7442267dc07307aeb25398e4620d108ab144703db7431e2a158612d9ee67e448d1d66db7e8103364aa6635844672bea16c7d28
-AUX pip-8.0.0-unbundle.patch 1985 BLAKE2B dca355b40941ef5f805a4b247d75dc9d2ad560c7fd9752be2ca1d428522e83a4c318d3d361d2960fce79051df2ea9180a48c23e4af3048fe31ac535cd0cb8db9 SHA512 3b5f96160623eb2fad9c5978fc6512b21d48d5b91cb09c9d43deaee6de3c843af137a5df11c83b0d8395625482162d8cf40748b072692b305d6ab1220f3fb0c6
+AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8ee0272c5c4c3cb569e6c300ac62fc9fbe8ec2a1bfe257047c15ddcf9cc44c47b7f8b9ab99e17b722bd6ae4cf9dc2a168e01d6 SHA512 1ece773f66556e4380eabf76490430e8fbec23f7cfad27dac02c7e49f7136b632515ef04843e89dfae42c095dbf5280d64e61da1544801c998f802aa59be8e22
 AUX pip-9.0.1-disable-version-check.patch 1031 BLAKE2B 148e528aab19de021f193ac56d758c803e0875b618ee32e948eb103eb6b05eb56e2ecf5ed4dbe39893f5c44ddee17122fdd686f433f5ce89044b2c02291e0ba1 SHA512 8b5764d3ecdbfc871bdf051b41d9610d5028bc3b95a4bf990db46325d10e5d559449ec97ab052686148d6ab6abfa630fb38101c726b6648d19fa94ac593b0a28
 AUX pip-disable-system-install.patch 1070 BLAKE2B 85bfd82888a169cf771467f4f811b9859fddc1cfd134ac21be42b9fd93d84118354fa23a2f4b0ec9c67024f571ba7035665302671420221b52f3fc89f24b1af3 SHA512 bb0a9a32b2eac0a12276c3f0527534226c03868300f54945d20eec16902ad51cbfdace9d79b0caa304bc641323194031a5ca9e5e784366a44527441bd0f3c231
-DIST pip-10.0.1.tar.gz 1246072 BLAKE2B e08607be43e1d7b9c7bbc12dff73bc3170953f48f8f7439a0b27b9d540f23eb3bca7873211a5f1448b5cedd6e8e12983af6fa4666bba3ac4700059d170036733 SHA512 983cce8375ff0304263209c69be16e5be7a58af340b8c3ffddd64fcea130b2f8f8a98305ab31e9c3eed9a0d039c73777c88bde3bf2ea1e184fa3e0a2faa97fd4
 DIST pip-19.1.tar.gz 6320747 BLAKE2B 9b69fcdef751d6938a7c67f44692afa7088f660ab1e0ae113d21d0f48b4e29f43e0f0bcc137cf16ac0324ea3b500bd2a84234823f8d82556d6727f68139aab4b SHA512 0d2442c22c41133118353ba98f45260f0615a891725b2a069d8fbf26ec4033cc7297bb671944c3dcc1f68800b91e92e58fb407ca5a333382e20ac4bb5c9e0cb6
-DIST pip-19.2.2.tar.gz 6381643 BLAKE2B 3c7d3c070d9bc52557b67c8fc34274d8c769179e01758b63d69c5da48d94a5980ecba62f8b74135ee2f08b4686f8835dee5da5d30fc12af0044f7f0180b3f50b SHA512 ca634925e21aba338aa65f80d258833c6622b4c1d85eaf827fa5439aed62d7c6d64fde91cfebc05bd83eb215b019b690379cf5c4ac85a2f32d6357e6bd95fd88
+DIST pip-19.3.1.tar.gz 6409819 BLAKE2B b3aacd0bee60400a1f30b4be57871002072e5cc7a86e76cca1848e977ebdc85b6e282fc521c19bf7a518d1aef3280133fcd65a431cb2a16e202dd7721c5b97ad SHA512 39446c0ab6e4495d98f22923a2a76901b024d9047b60d92580b21d447a718e5285cfd66f8ad0c20befcfe1abc7f06be29b6a5644d1b30265d3b67399fe76e033
 DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25
 DIST setuptools-41.0.1-py2.py3-none-any.whl 575966 BLAKE2B 332986453a35e4ec36ab2bdb80a8b0a70ffe4fec1bb874f481b0d8e31016a26d53070f90d0eea9030b8c48a1f9bc21a54d8a5a2b70096e1f8db84d42449903e4 SHA512 c84ddf1d1ea90216b2c475f3e4879f4e6792a859adf61db70d67f49a35f2cb4df6fd6d93049881e6d2a8d914768edfcd091475206bb5da3ac66c41c4b9147102
+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
-EBUILD pip-10.0.1.ebuild 1358 BLAKE2B 652a3c8157121db0915586f4e325df8c6ec9acd9f93d1fee9aad1a53572ed87a17af9076881f50ffc3e041cb1fe70af8d1b8b60b47e907f22491e551e40aa150 SHA512 ef628498af91812af5e7fb5df32f7e72a3329ece9b09566f340df1cb8ad9d9f19def90378dcc41cdcc240428e91185191fb902c2c695c185a8cd339c4d27d34c
+DIST wheel-0.33.6-py2.py3-none-any.whl 21556 BLAKE2B 6b6124c1e8e70592399a90c88b2a70efc5885bad81d2ff07a2e243eee008ba5cb0c927454036915a61e97489e29fe1abc4ba2e63d7eadf1a8985c8a8b7cdf4c4 SHA512 4663cd55ee9d3de138216bb06870606b546b19cb6a733f1beab211c0ba72e63d849c422d320ddc8aa8275ad04a30119a84c1351e589150cd18c2a34f9fdb224a
 EBUILD pip-19.1.ebuild 3465 BLAKE2B 647982e0fa28779940255e9869b94521319c01559fc92f521b394cfb88e19719f0b069bb226a1c3add8186554456626ed323b429948deab3fa334614331a3c4f SHA512 89a138a6cb171b7e0e9ea60387038ebd7d515a627d9e9ba121dd55ddc60822da295e6718dbd75d63a91bf5a6c30d685524c2162a1ef801d387ea8a1a1f284b05
-EBUILD pip-19.2.2.ebuild 3467 BLAKE2B e57d949ae5510e7389cd8a12ca7d8ddf8051e8296e3ae8343e967d7f777fabaae2fa32ce283b7880858804630c8fc7e69d4dc4b7f762758b9fdf1a5bd6b71bdf SHA512 890c6da6d3bcb8a569a843d32a76a057b803c556d00f01cbc8e14708d3b2427adc04b033be34b25dff89e294d5d87425ba8c177f2d90f3ee85b17e11738bba48
+EBUILD pip-19.3.1.ebuild 4013 BLAKE2B c92d4c8df5e7405b549e571935472865e9267c05b3eae3ab85a4767889df1df0c90300bfedd2ad40e53982d36d4b879fb391c45f14203801fbd98999461f1fdc SHA512 1623cd813a364a89223c86526b999d539db3e7081296b65c5bce07d86d98f540a28191bd27dbf209473bae285c8bd8f3aae9b1da9c4675f8770b602b8356d59e
 EBUILD pip-9.0.1-r1.ebuild 2331 BLAKE2B edca4ecfeac1bc3bffbb066b83fa87669304ccd59dcfe165fd4cb207f8155ba2836df80a2e15c954ae5513b060fc9bab1df1d5a15870815f199bf51e19781b50 SHA512 711042823b41c10c1db502afc046424c71f081c38dc173e5bc06d58de5ca57f2e3106d4ef24134f8e79e557228f63f49c91eee1e037a2416cdfdbb592fabe221
 EBUILD pip-9.0.1-r2.ebuild 2474 BLAKE2B f9f8713be38bd3316e6fb37605b2efe913b759c1c8530ebdef06c3172ef3d13d09e3d4e251f082c167a0c56773195da830ad6f7148e69c0cf64affb748964b43 SHA512 69f38fdabaee85bf23a8f4302d77a7e6cc65ffa2bc1ffcbc7f598144002c5f59072ea24b21fbef891f7145d6a129fea3b45abbef0b90caf004c5264f01f5a4c4
 MISC metadata.xml 366 BLAKE2B 6cfb3fe9bd6fa72a5bc5aafb74d7f79eaa1fdf273cf45be4fb7989fd917ea8b1ad60a855770cc51944611e7590abeec450ed02c7c9ae8d850084c2b4f7c0d009 SHA512 43ccb12f2797cb70b59ff495d149c32c813e5145c65521eda9a86f675eac7756eefadeb9f4ca977e8e8c7019bae144b445240e6d7128da771eaf6d19559336f6
diff --git a/dev-python/pip/files/pip-10.0.1-disable-system-install.patch b/dev-python/pip/files/pip-10.0.1-disable-system-install.patch
deleted file mode 100644
index 776d395b7b94..000000000000
--- a/dev-python/pip/files/pip-10.0.1-disable-system-install.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-install: Raise an error to avoid breaking python-exec
-
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
-
---- pip-10.0.1/src/pip/_internal/commands/install.py
-+++ pip-10.0.1/src/pip/_internal/commands/install.py
-@@ -202,6 +202,9 @@
-         if options.upgrade:

-             upgrade_strategy = options.upgrade_strategy

- 

-+        if not options.use_user_site and not options.target_dir and not options.root_path:

-+            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")

-+

-         if options.build_dir:

-             options.build_dir = os.path.abspath(options.build_dir)

- 

diff --git a/dev-python/pip/files/pip-10.0.1-disable-version-check.patch b/dev-python/pip/files/pip-10.0.1-disable-version-check.patch
deleted file mode 100644
index ad146dc1507f..000000000000
--- a/dev-python/pip/files/pip-10.0.1-disable-version-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Don't check for new versions of pip.
-
---- pip-10.0.1/src/pip/_internal/basecommand.py
-+++ pip-10.0.1/src/pip/_internal/basecommand.py
-@@ -255,14 +255,6 @@
- 

-             return UNKNOWN_ERROR

-         finally:

--            # Check if we're using the latest version of pip available

--            if (not options.disable_pip_version_check and not

--                    getattr(options, "no_index", False)):

--                with self._build_session(

--                        options,

--                        retries=0,

--                        timeout=min(5, options.timeout)) as session:

--                    pip_version_check(session, options)

-             # Avoid leaking loggers

-             for handler in set(logging.root.handlers) - original_root_handlers:

-                 # this method benefit from the Logger class internal lock

diff --git a/dev-python/pip/files/pip-19.3-disable-version-check.patch b/dev-python/pip/files/pip-19.3-disable-version-check.patch
new file mode 100644
index 000000000000..e8fe868431d1
--- /dev/null
+++ b/dev-python/pip/files/pip-19.3-disable-version-check.patch
@@ -0,0 +1,24 @@
+diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py
+index 203e86a4..a2183f10 100644
+--- a/src/pip/_internal/cli/req_command.py
++++ b/src/pip/_internal/cli/req_command.py
+@@ -129,17 +129,8 @@ class IndexGroupCommand(Command, SessionCommandMixin):
+         # Make sure the index_group options are present.
+         assert hasattr(options, 'no_index')
+ 
+-        if options.disable_pip_version_check or options.no_index:
+-            return
+-
+-        # Otherwise, check if we're using the latest version of pip available.
+-        session = self._build_session(
+-            options,
+-            retries=0,
+-            timeout=min(5, options.timeout)
+-        )
+-        with session:
+-            pip_self_version_check(session, options)
++        # Disabled on Gentoo
++        return
+ 
+ 
+ class RequirementCommand(IndexGroupCommand):
diff --git a/dev-python/pip/files/pip-6.0.2-disable-version-check.patch b/dev-python/pip/files/pip-6.0.2-disable-version-check.patch
deleted file mode 100644
index a192c228a997..000000000000
--- a/dev-python/pip/files/pip-6.0.2-disable-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't check PyPI for new versions of pip by default, updates will occur when
-new releases are added to the tree.
-
---- pip-6.0.2/pip/cmdoptions.py
-+++ pip-6.0.2/pip/cmdoptions.py
-@@ -404,7 +404,7 @@
-     "--disable-pip-version-check",
-     dest="disable_pip_version_check",
-     action="store_true",
--    default=False,
-+    default=True,
-     help="Don't periodically check PyPI to determine whether a new version "
-          "of pip is available for download.")
- 
diff --git a/dev-python/pip/files/pip-8.0.0-unbundle.patch b/dev-python/pip/files/pip-8.0.0-unbundle.patch
deleted file mode 100644
index d508d51ab4fc..000000000000
--- a/dev-python/pip/files/pip-8.0.0-unbundle.patch
+++ /dev/null
@@ -1,43 +0,0 @@
- pip/_vendor/__init__.py | 15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
-index b09a7c3..b9fe6ee 100644
---- a/pip/_vendor/__init__.py
-+++ b/pip/_vendor/__init__.py
-@@ -14,7 +14,7 @@ import sys
- # Downstream redistributors which have debundled our dependencies should also
- # patch this value to be true. This will trigger the additional patching
- # to cause things like "six" to be available as pip.
--DEBUNDLED = False
-+DEBUNDLED = True
- 
- # By default, look in this directory for a bunch of .whl files which we will
- # add to the beginning of sys.path before attempting to import anything. This
-@@ -29,13 +29,10 @@ WHEEL_DIR = os.path.abspath(os.path.dirname(__file__))
- def vendored(modulename):
-     vendored_name = "{0}.{1}".format(__name__, modulename)
- 
--    try:
--        __import__(vendored_name, globals(), locals(), level=0)
--    except ImportError:
--        __import__(modulename, globals(), locals(), level=0)
--        sys.modules[vendored_name] = sys.modules[modulename]
--        base, head = vendored_name.rsplit(".", 1)
--        setattr(sys.modules[base], head, sys.modules[modulename])
-+    __import__(modulename, globals(), locals(), level=0)
-+    sys.modules[vendored_name] = sys.modules[modulename]
-+    base, head = vendored_name.rsplit(".", 1)
-+    setattr(sys.modules[base], head, sys.modules[modulename])
- 
- 
- # If we're operating in a debundled setup, then we want to go ahead and trigger
-@@ -85,8 +82,6 @@ if DEBUNDLED:
-     vendored("requests.packages.urllib3.packages.ordered_dict")
-     vendored("requests.packages.urllib3.packages.six")
-     vendored("requests.packages.urllib3.packages.ssl_match_hostname")
--    vendored("requests.packages.urllib3.packages.ssl_match_hostname."
--             "_implementation")
-     vendored("requests.packages.urllib3.poolmanager")
-     vendored("requests.packages.urllib3.request")
-     vendored("requests.packages.urllib3.response")
diff --git a/dev-python/pip/pip-10.0.1.ebuild b/dev-python/pip/pip-10.0.1.ebuild
deleted file mode 100644
index 19a0c39cdd04..000000000000
--- a/dev-python/pip/pip-10.0.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=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit eutils bash-completion-r1 distutils-r1
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="-vanilla"
-
-# required test data isn't bundled with the tarball
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-10.0.1-disable-version-check.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-10.0.1-disable-system-install.patch" )
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	"${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	"${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-19.2.2.ebuild b/dev-python/pip/pip-19.3.1.ebuild
index 1d2a8c7a3721..a188c772c1ba 100644
--- a/dev-python/pip/pip-19.2.2.ebuild
+++ b/dev-python/pip/pip-19.3.1.ebuild
@@ -8,8 +8,8 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit bash-completion-r1 distutils-r1 multiprocessing
 
-SETUPTOOLS_PV="41.0.1"
-WHEEL_PV="0.33.1"
+SETUPTOOLS_PV="41.4.0"
+WHEEL_PV="0.33.6"
 
 DESCRIPTION="Installs python packages -- replacement for easy_install"
 HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
@@ -53,7 +53,7 @@ DEPEND="
 
 python_prepare_all() {
 	local PATCHES=(
-		"${FILESDIR}/${PN}-19.1-disable-version-check.patch"
+		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
 	)
 	if ! use vanilla; then
 		PATCHES+=( "${FILESDIR}/pip-19.1-disable-system-install.patch" )
@@ -68,13 +68,35 @@ python_prepare_all() {
 }
 
 python_test () {
-	# Exclude tests that fail for some reason. Some of these failures may be Gentoo-specific.
-	python -m pytest \
-		-n $(makeopts_jobs) \
-		--timeout 300 \
-		-k "not (svn or git or bazaar or mercurial or test_pep518_uses_build_env or test_install_package_with_root or test_install_editable_with_prefix or install_from_user or install_user_conflict or upgrade_user_conflict or build_env_isolation or config_file_venv_option or get_legacy_build_wheel or install_user_wheel or uninstall_non_local_distutils or install_from_current_directory_into_usersite or uninstall_editable_from_usersite)" \
-		-m "not network" \
-		|| die
+	# pip test suite likes to test installed version of pip, both the module and the executable.
+	# Here we install it into a temporary dir and add to PATHs in a subshell.
+	EPYTHON_ROOT="${T}/${EPYTHON}_root"
+	esetup.py install --root "${EPYTHON_ROOT}"
+
+	if [[ ${EPYTHON} == python2* ]]; then
+		# These tests just fail on Python 2.
+		EXCLUDE_TESTS=( or pep518_uses_build_env or install_package_with_root or install_editable_with_prefix
+			or install_from_current_directory_into_usersite or install_user_wheel
+			or uninstall_from_usersite_with_dist_in_global_site
+			or uninstall_editable_from_usersite
+			or build_env_isolation
+		)
+	fi
+
+	(
+		export PATH="${EPYTHON_ROOT}/usr/bin:$PATH"
+		export PYTHONPATH="${EPYTHON_ROOT}/$(python_get_sitedir)"
+
+		# Disable VCS and network tests.
+		# version_check tests are excluded since we explicitly disable this feature entirely.
+		# uninstall test just fails, likely because of our test environment setup.
+		python -m pytest \
+			-n $(makeopts_jobs) \
+			--timeout 300 \
+			-k "not (svn or git or bazaar or mercurial or version_check or uninstall_non_local_distutils ${EXCLUDE_TESTS[*]})" \
+			-m "not network" \
+			|| die
+	)
 }
 
 python_install_all() {
diff --git a/dev-python/pybloomfiltermmap/Manifest b/dev-python/pybloomfiltermmap/Manifest
deleted file mode 100644
index 7e81dff77804..000000000000
--- a/dev-python/pybloomfiltermmap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pybloomfiltermmap-0.3.15.tar.gz 448288 BLAKE2B ed140f43d80f438e82c6659dac1c7e234872b0b1c620db3fbfdacdfa9476bf36e8508549a5cbdab88aa76c5db26ca958c45494c699c2080e17b7cdc07cd2d051 SHA512 36ceff5860e97686387932945d6ee2f342e07dd45b4320b09e8153987c5aa7da678db86179759528c5a4c0d8fbc1e1a98b549c55e17a6d66f1c83c0f1ee46ed1
-EBUILD pybloomfiltermmap-0.3.15.ebuild 624 BLAKE2B afed9dd680920d8d7f50379bb5560b22843d770b6a7a4e63b3cf844354d69cf2405c67b26508e9d23fe3609202c08f6bf845dafeb8f5a5f54289a3ee2d549f27 SHA512 96a95cc80be8a34796e57ae32c4ddade3b7716fb82edc1ec91cc24f55d95beb686b6c0992343f0fa8a188f5db255e7c6d164a66583b7352ff5a825a398d9337f
-MISC metadata.xml 248 BLAKE2B a94be11b599bc6cbb04189c01022a88c58b8edaaeff79568edabe3fea49173f82537d3d495982343cf0deac5b6551c480f4bafd0dc629057328e96285730bbd9 SHA512 e83bde93e79baa95018fa49df49461ea3c84313095099040492ed43c9eb5136fdd173564123ac69a8cd9bf6f591267a405a01ffb11eb46b7f04bca8da78bf6f6
diff --git a/dev-python/pybloomfiltermmap/metadata.xml b/dev-python/pybloomfiltermmap/metadata.xml
deleted file mode 100644
index 4dd49d64ad18..000000000000
--- a/dev-python/pybloomfiltermmap/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">pybloomfiltermmap</remote-id>
-	</upstream>
-</pkgmetadata>
-
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
deleted file mode 100644
index e64646f5d03f..000000000000
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.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=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/pybloomfiltermmap/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	# Failures X 2 by pypy are harmless; written for py2, reflect only how pypy handles exceptions
-	"${PYTHON}" -m unittest tests.test_all || die "Tests failed"
-}
diff --git a/dev-python/pycallgraph/Manifest b/dev-python/pycallgraph/Manifest
deleted file mode 100644
index 1cc229f186db..000000000000
--- a/dev-python/pycallgraph/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX python3.3-tests.patch 3268 BLAKE2B e6784c758e83ede0edadeae1a14d1e85657db1e715abf1a66562dd54e902cc8d2dd592f52723b6a79f14175d99e79944b41205ac3db6d30d07af42d2e13b3c50 SHA512 274b3af41f80058e1bbacf681b8f2ca7e09069dfb7f0a333cfc7ad417a1a88e738abb0d0ad340ab1b342076b7f331977617dce8b46bcd6e158764ffc09ee6a94
-DIST pycallgraph-1.0.1.tar.gz 458254 BLAKE2B 51cd70d131fc3ab1c702d40c6b411595f26f9547fa2d28dbfc38f4e4b6eb7b56d32c0f2c1c024482376ed4f91299f2a7e3afe099838c045912b18d60580cff8f SHA512 75a20cd8c50f070c961466f89b70384c914129c8ffcbca3ffde8c4729cd5f8a3dc94c4a33d54990e5cb9e502ccd1038c64e878da84cf832065fe4ece74356e2e
-EBUILD pycallgraph-1.0.1.ebuild 1817 BLAKE2B 7e5a152e4b6e6ccc402ee21fb010c4e8a8cc3fbf02f6a8756f7053e8b96d90f743510a628f8f03e268511c2f67ef449762164d070beb575c971318371bd6c66f SHA512 662d009053f1cf0d5c84fa90eb55b4ccf084b59b1228cfa5b785c9aa9333d59dfc88c326cf1ad8663a7da27dfaa0d47e03de206e6a99a1ebd44b3c7e6dcd0766
-MISC metadata.xml 245 BLAKE2B 794e70d186dbd6abb42251821d227dd36c04540fc5e27b414cd0dcbac013dd6dc3aaa96b8ddfce6446c01f98e009c7277adad6fef1cbb89d625b2491b85d8ee2 SHA512 de5888d4711d9b5d1f3007aef7d96600634f4c88f27e2165988fa51ed5a70d23a2e6cac16400483cc17828622089e10e445f45617e2b29a9556e1bb9b0bd3a8d
diff --git a/dev-python/pycallgraph/files/python3.3-tests.patch b/dev-python/pycallgraph/files/python3.3-tests.patch
deleted file mode 100644
index 90f31a09ce4b..000000000000
--- a/dev-python/pycallgraph/files/python3.3-tests.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/pycallgraph/config.py b/pycallgraph/config.py
-index 5911fef..e3492c1 100755
---- a/pycallgraph/config.py
-+++ b/pycallgraph/config.py
-@@ -34,7 +34,7 @@ class Config(object):
-         self.did_init = True
- 
-         # Update the defaults with anything from kwargs
--        [setattr(self, k, v) for k, v in kwargs.iteritems()]
-+        [setattr(self, k, v) for k, v in kwargs.items()]
- 
-         self.create_parser()
- 
-diff --git a/pycallgraph/output/graphviz.py b/pycallgraph/output/graphviz.py
-index 6f10049..d130d65 100644
---- a/pycallgraph/output/graphviz.py
-+++ b/pycallgraph/output/graphviz.py
-@@ -148,7 +148,7 @@ class GraphvizOutput(Output):
- 
-     def attrs_from_dict(self, d):
-         output = []
--        for attr, val in d.iteritems():
-+        for attr, val in d.items():
-             output.append('%s = "%s"' % (attr, val))
-         return ', '.join(output)
- 
-@@ -164,7 +164,7 @@ class GraphvizOutput(Output):
- 
-     def generate_attributes(self):
-         output = []
--        for section, attrs in self.graph_attributes.iteritems():
-+        for section, attrs in self.graph_attributes.items():
-             output.append('{} [ {} ];'.format(
-                 section, self.attrs_from_dict(attrs),
-             ))
-diff --git a/pycallgraph/output/output.py b/pycallgraph/output/output.py
-index 9660d58..48eef49 100644
---- a/pycallgraph/output/output.py
-+++ b/pycallgraph/output/output.py
-@@ -16,14 +16,14 @@ class Output(object):
-         self.edge_label_func = self.edge_label
- 
-         # Update the defaults with anything from kwargs
--        [setattr(self, k, v) for k, v in kwargs.iteritems()]
-+        [setattr(self, k, v) for k, v in kwargs.items()]
- 
-     def set_config(self, config):
-         '''
-         This is a quick hack to move the config variables set in Config into
-         the output module config variables.
-         '''
--        for k, v in config.__dict__.iteritems():
-+        for k, v in config.__dict__.items():
-             if hasattr(self, k) and callable(getattr(self, k)):
-                 continue
-             setattr(self, k, v)
-diff --git a/pycallgraph/tracer.py b/pycallgraph/tracer.py
-index 17e9286..74a1477 100644
---- a/pycallgraph/tracer.py
-+++ b/pycallgraph/tracer.py
-@@ -297,7 +297,7 @@ class TraceProcessor(Thread):
-         grp = defaultdict(list)
-         for node in self.nodes():
-             grp[self.group(node.name)].append(node)
--        for g in grp.iteritems():
-+        for g in grp.items():
-             yield g
- 
-     def stat_group_from_func(self, func, calls):
-@@ -315,14 +315,14 @@ class TraceProcessor(Thread):
-         return stat_group
- 
-     def nodes(self):
--        for func, calls in self.func_count.iteritems():
-+        for func, calls in self.func_count.items():
-             yield self.stat_group_from_func(func, calls)
- 
-     def edges(self):
--        for src_func, dests in self.call_dict.iteritems():
-+        for src_func, dests in self.call_dict.items():
-             if not src_func:
-                 continue
--            for dst_func, calls in dests.iteritems():
-+            for dst_func, calls in dests.items():
-                 edge = self.stat_group_from_func(dst_func, calls)
-                 edge.src_func = src_func
-                 edge.dst_func = dst_func
diff --git a/dev-python/pycallgraph/metadata.xml b/dev-python/pycallgraph/metadata.xml
deleted file mode 100644
index ebd15db30675..000000000000
--- a/dev-python/pycallgraph/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="github">gak/pycallgraph</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pycallgraph/pycallgraph-1.0.1.ebuild b/dev-python/pycallgraph/pycallgraph-1.0.1.ebuild
deleted file mode 100644
index 2cf0656bde37..000000000000
--- a/dev-python/pycallgraph/pycallgraph-1.0.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=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="library and command line tool to visualise the flow of Python applications"
-HOMEPAGE="http://pycallgraph.slowchop.com/"
-SRC_URI="https://github.com/gak/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples test"
-
-CDEPEND="media-gfx/graphviz"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	doc? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-	examples? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/python3.3-tests.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use examples; then
-		cd docs/examples || die "Couldn't change to docs/examples"
-		"${PYTHON}" generate.py || die "Couldn't generate examples"
-		cd - || die "Couldn't return to previous directory"
-
-		cd docs/guide/filtering || die "Couldn't change to docs/guide/filtering"
-		"${PYTHON}" generate.py || die "Couldn't generate filtering examples"
-		cd - || die "Couldn't return to previous directory"
-	fi
-
-	use doc && emake -C docs html
-
-	emake -C docs man
-}
-
-python_test() {
-	# gephi is not in portage; thus, skip the gephi tests
-	rm -f test/test_gephi.py || die "Couldn't remove gephi tests"
-
-	py.test --ignore=pycallgraph/memory_profiler.py test pycallgraph examples || 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
-
-	doman docs/_build/man/pycallgraph.1
-}
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index a619ce747838..da886d24b4be 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -2,8 +2,10 @@ DIST pycares-0c831407bc32c6e78a80c5b3d7865ba4c7ac26df.tar.gz 215641 BLAKE2B 36ae
 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-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
 MISC metadata.xml 342 BLAKE2B 673fd0795be11f8ede70971b4313e5b9cee3aec6b93ebdc38f4454f0c6bb024c8128598208a6ba9777f52b584a9faf71f386de2e33aad2b96bba1023c6599046 SHA512 fdd177da9082fc650173331be63823ef6eb8dd195c526c3f5e7a38521f3203fc12ca591ff2ac4bba5fa64aa2ac8a9b419385285991696c9f02dd29bede7784a6
diff --git a/dev-python/pycares/pycares-3.0.0.ebuild b/dev-python/pycares/pycares-3.0.0.ebuild
new file mode 100644
index 000000000000..5581faeccb30
--- /dev/null
+++ b/dev-python/pycares/pycares-3.0.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_{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/pychm/Manifest b/dev-python/pychm/Manifest
index 4204c2bb2fdc..126fdc321614 100644
--- a/dev-python/pychm/Manifest
+++ b/dev-python/pychm/Manifest
@@ -1,3 +1,5 @@
 DIST pychm-0.8.4.tar.gz 28803 BLAKE2B c6b66c83b1bd5b20280cb60636ccf2780f665fd589b107542c887fc791642f780701b84c8863883e02496c626b92552e3bbfdacd025723fccdb7947de62ada61 SHA512 0c0c107e59ea9f5fef97a0c2869349b5e90fc9eb7a37c35e8a929eaf764c7abe5a06a389340a912b9ba2f71172f3c94a78da016707bb201bbd07bdc3feddfe0d
+DIST pychm-0.8.5.gh.tar.gz 23539 BLAKE2B 4671ccca56153ee493f239de46a01c9e878448f46ecb7e1a39156457562d7f7ac951007e04bd534ea26455da68607eab9b2e2266eed71a7b14c90f103888887e SHA512 3f6b175710880fd4e45c4407af06bec580839517727ee0f5f706747c78be727171f7f8ad2d8fa9add0065825556c3a5d48cc1a6016705f34569350c495f5710d
 EBUILD pychm-0.8.4-r1.ebuild 428 BLAKE2B bc58690f32d7f106dfe4ec6f665fe240352ea747324c1c208b79ef6eee7f414663370621d5a4d23bda08aa80e3f99d156b74b1f3433d226a42e86f1534c7e9e9 SHA512 b854fa1ef64b8f82d589e0018014548570d89f981c9e47dccd10e3d23e891b08b4e4bc16b89ddadf6ceaaa798046024f14a58433354a7eee454c91f80ec0466e
+EBUILD pychm-0.8.5.ebuild 586 BLAKE2B 72ae6967e384a67736555278cf4e37b98431ba9a63ca85e84df0aeae9392881f73510624f68f1e38516983393d93614a5159b35ce7191e7747eac59cf68db98b SHA512 b69fe1ae321b59d27b785cd01d4e14e950fcaf67b323087e0fbb79929edc4c3bca2163237c40e527ad0a2f2898ec7da0d74e477c4ec2b51421be8cf9f2128bbc
 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
new file mode 100644
index 000000000000..301661fc7b72
--- /dev/null
+++ b/dev-python/pychm/pychm-0.8.5.ebuild
@@ -0,0 +1,26 @@
+# 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 bindings for the chmlib library"
+HOMEPAGE="https://github.com/dottedmag/pychm"
+SRC_URI="https://github.com/dottedmag/pychm/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/chmlib"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest -vv || die
+}
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 656674122042..26f53f5d4b92 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,5 +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 2567 BLAKE2B c5b7800a0caa375d2c152b5db5a291bd94c48f98c015d04750c2c91faa7c12e72f12fa50c713aad6be199344f6e4d53680ede2e330839b393c56d9946d13a0c1 SHA512 a3d525647a3a0922b9637851a4ee78b3bd86f0fbba43e1480b705d7f07629a82eca3269450e2a706cf9bad41294027a7957fc32fb298628ad7f4ef9b472d26c3
-EBUILD pycurl-7.43.0.ebuild 2511 BLAKE2B c98954daee1bfc2a8563b06fca7e030d8b09243b9774577ced3d5420f48049d45b1bd9a214720c5799b2e94bed7e2d913c3b3f7da57d11842a83596550a81517 SHA512 6d916a0e68c1fb7e8edd1c4172effdb1ffa292917f6893c976f3bd3694a18eb97e072b193e89571439cf6aa60eef90dd38dc4f343a6f7faa8f6e930353cda788
+EBUILD pycurl-7.43.0.2.ebuild 2659 BLAKE2B 09ec026b8dc3afe084d695b2665bb6b339b343c574ccfbb9743e16c99578813eb885996bb6b885404cb5f95552b080d9af9d0e04f237858a99d9eb4d0f9f14cd SHA512 50a8282839ee3be3b5cad8e3efaf877029900f55ec3c6a310895371b7abd417925079ddf37ce31ef345b11fdb3658a3324b867e6c4e704baa2d88c6a56e5d417
+EBUILD pycurl-7.43.0.3.ebuild 2659 BLAKE2B 09ec026b8dc3afe084d695b2665bb6b339b343c574ccfbb9743e16c99578813eb885996bb6b885404cb5f95552b080d9af9d0e04f237858a99d9eb4d0f9f14cd SHA512 50a8282839ee3be3b5cad8e3efaf877029900f55ec3c6a310895371b7abd417925079ddf37ce31ef345b11fdb3658a3324b867e6c4e704baa2d88c6a56e5d417
+EBUILD pycurl-7.43.0.ebuild 2603 BLAKE2B c4287c54cc5dd2524b3801cbb6665ce9cc2e53fe54695b328406a0a5a79946ce4b7a1cbbecf71bfa9a1c2a305ea85366a0b2a9e59af16e45c8aaf1c14b1f3d12 SHA512 dc44f7766954295edf9a66040f87bdc4b187f5867cacb529657187e5edac4742edbd6e2b203d099a95da0251e4b3a989cef4450dc4056b97eaf41fec144c33b7
 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 f80cf3bba8e5..9b0c7f968424 100644
--- a/dev-python/pycurl/pycurl-7.43.0.2.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.2.ebuild
@@ -27,10 +27,12 @@ IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples
 # does not need to initialize gcrypt threading and we do not need to
 # explicitly link to libgcrypt.
 RDEPEND="
-	>=net-misc/curl-7.25.0-r1[ssl=]
+	>=net-misc/curl-7.25.0-r1:=[ssl=]
 	ssl? (
 		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+		curl_ssl_libressl? ( dev-libs/libressl:= )
+		curl_ssl_openssl? ( dev-libs/openssl:= )
 	)"
 
 # bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
diff --git a/dev-python/pycurl/pycurl-7.43.0.3.ebuild b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
new file mode 100644
index 000000000000..9b0c7f968424
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="
+	https://github.com/pycurl/pycurl
+	https://pypi.org/project/pycurl/
+	http://pycurl.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+RDEPEND="
+	>=net-misc/curl-7.25.0-r1:=[ssl=]
+	ssl? (
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+		curl_ssl_libressl? ( dev-libs/libressl:= )
+		curl_ssl_openssl? ( dev-libs/openssl:= )
+	)"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+	)"
+# Needed for individual runs of testsuite by python impls.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycurl/pycurl-7.43.0.ebuild b/dev-python/pycurl/pycurl-7.43.0.ebuild
index cd33b0eb12c7..ada6e65f2531 100644
--- a/dev-python/pycurl/pycurl-7.43.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.ebuild
@@ -27,10 +27,12 @@ IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples
 # does not need to initialize gcrypt threading and we do not need to
 # explicitly link to libgcrypt.
 RDEPEND="
-	>=net-misc/curl-7.25.0-r1[ssl=]
+	>=net-misc/curl-7.25.0-r1:=[ssl=]
 	ssl? (
 		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+		curl_ssl_libressl? ( dev-libs/libressl:= )
+		curl_ssl_openssl? ( dev-libs/openssl:= )
 	)"
 
 # bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
diff --git a/dev-python/pydiff/Manifest b/dev-python/pydiff/Manifest
index 3ab1ea27ad3e..e893109b2070 100644
--- a/dev-python/pydiff/Manifest
+++ b/dev-python/pydiff/Manifest
@@ -1,3 +1,4 @@
 DIST pydiff-0.2.tar.gz 4108 BLAKE2B 868b9b31f96e49a4e375d2933fc158845ced4bc561816512f41c85dbd6d5373567a51153dedc527826ef2d03306288e3255d300fc2b400e28983e6616eec6a25 SHA512 0f55edf17138c4a1894a1ca03db21e6d6d21fb3961a2738c00d59e05d32a006413aee04005962f1ba6628c012bb018d43fcbbef50665ea10d3397539e5d3def1
-EBUILD pydiff-0.2.ebuild 481 BLAKE2B 750b479f69f6c705b410af1b7470652f1dbba6a141e8eed68850ea43531659b3555fcc2f854097401a5b9425147d00c9843ff77cc7c7a221b31c790618e51d92 SHA512 1554ce4fa301e343665a9fda56b276c3050cb430a13314f00632513fd0f9f0fa55cdaa9b24d97d8f4378be5248226b35013437df64096e145c0f22d540dff1a2
+EBUILD pydiff-0.2-r1.ebuild 485 BLAKE2B b6be22fe22a5d58b3ccad3283c4cc9361327673dd1c6ffc33240557749e4509789e479b78b9a5275cf8ccfc2b71a3f53f5bff9336aca1e3feae341aa6f19263e SHA512 ef4e9b4931a108d1c9a4bd52a436a0a639691026b7c26c5e5a2be41b948210ed0df7b0b4d3d80cc5c976c1a6edf6849bd2f2b8711c64031ede0c728115694ff1
+EBUILD pydiff-0.2.ebuild 483 BLAKE2B 3bfc27445e4b8452b5504e2f9026b6e188b4eb195a987bcf11330efee4ba0f3de59d34828528b1542586a7124ca80066ae42cc47f2c682dabf00fec9b42c9268 SHA512 27e9e4c3905b1854f07847b1e649be96fb97ef210fbf7afc30d927fda0517b3048a09e66e4ca54429ac4571337913c060fe37094acf105049a4bf03344cb153f
 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
new file mode 100644
index 000000000000..01cf57f0c8f7
--- /dev/null
+++ b/dev-python/pydiff/pydiff-0.2-r1.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=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Diffs two Python files at the bytecode level"
+HOMEPAGE="https://github.com/myint/pydiff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+python_test() {
+	"${PYTHON}" 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 98d70211bb01..adc543302a83 100644
--- a/dev-python/pydiff/pydiff-0.2.ebuild
+++ b/dev-python/pydiff/pydiff-0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylirc/Manifest b/dev-python/pylirc/Manifest
deleted file mode 100644
index 01fc91512fac..000000000000
--- a/dev-python/pylirc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pylirc-0.0.5.tar.gz 3538 BLAKE2B 297f4ad7bfa1d72317b2367468ad63e5c3a553c517c50d3e538266a7d9ca342b544bb3b9713ddf371a3ec3515490359179ed8bc0137b5a7b5787ea6569859b96 SHA512 c697e100e430dbd9f52322b6494b0cdb0fdd539ea94ea95c025801f1e8a80330ad8d23f075f3cea2ad98f57420658f98445f47969e7408f1f36d48063fb6c540
-EBUILD pylirc-0.0.5-r1.ebuild 440 BLAKE2B c63fda1d6b4982e5ab514f0b7255227efb971178cf059927744831afef005ef355b37b3a8d0f68c6bef8e600620777b768e7c9fb94a8534c01bfe25051e8cfb1 SHA512 233b11eefa43a6e0a37f50574244732208e74bdd5d8364071ee768405f8870e0c90fb17ae96b7f832990bcb8f837cdea17a9b8e87b32ac69096b90ffc13a29a9
-MISC metadata.xml 316 BLAKE2B e00148c36bfcec82a8da2ae8d491a380cb34bdfc0d3279b1228574a0cd4c3d18a6abd55559dc3b34e2f5aa316c5a1ffff3b33a1cbb68c28e7472e1008d537b58 SHA512 c5a33b6a974e45179c928388639ea01861b0ff8352be0fbdc50820040d365b399dd81ddfd8cba8a4508681d031f24bb36229cf7b7fc801306c0633c39f982457
diff --git a/dev-python/pylirc/metadata.xml b/dev-python/pylirc/metadata.xml
deleted file mode 100644
index 8282f7e5e115..000000000000
--- a/dev-python/pylirc/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">pylirc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pylirc/pylirc-0.0.5-r1.ebuild b/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
deleted file mode 100644
index b7df84c4d91b..000000000000
--- a/dev-python/pylirc/pylirc-0.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="lirc module for Python"
-HOMEPAGE="https://sourceforge.net/projects/pylirc/ https://pypi.org/project/pylirc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-misc/lirc"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pymilter/Manifest b/dev-python/pymilter/Manifest
index 6787065ce3e7..92a83ed8f9ce 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.ebuild 542 BLAKE2B d4bad3bcf14417511632dfe358a13cfaaa844da8192eee6e0afb436e891131ec17dd3bc3f295c4907ec879e8c3c84afa958c925c9266e14cfb930c13be1f8e4e SHA512 cb0bd7c2d7a54dc60ed82205c583740896be28665c1e32cddf3bca3e69ea8ff8a146dee520c6ce124da222fd039336d67cad336836259b5a4f853f40b1726c14
+EBUILD pymilter-1.0.4-r1.ebuild 567 BLAKE2B 6d71f2e22aaf824e2d393219ba517316a300b7ad176b26092da0c0f48abd4e21d7ffdc074e1ec14f3d5d0645f8d477d4b7bc22fab752289e9469dbe3c65300e9 SHA512 25eca55b7b96f10a5e331a4d0bbad228c0d9fdd933aca9562ed800ef9f7f096207e2b429e63d211fd35ce6c155c60990983531647afc8c0842a5b9fc9f1f1566
 MISC metadata.xml 745 BLAKE2B 20fb9f28930e8252bcbf5e678a4c53bdbdaf2dd0ae2d06a1ecabb993c1f172fb462419377b5a44d57d2e71a15b41676beee93c371a6b58642b5db02dbed868d2 SHA512 03a63f23eea33c7ea8d0de9b121b7edea4dc96199cc390a5488085865ed41272d7e599ff3f5043cdfe7582c3ed0dab7afb3d2bc6b173620390a118a282f5e800
diff --git a/dev-python/pymilter/pymilter-1.0.4.ebuild b/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
index f143496421bb..67a6c24beae2 100644
--- a/dev-python/pymilter/pymilter-1.0.4.ebuild
+++ b/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="mail-filter/libmilter"
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${P}"
diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
index e888514d97d7..3e96ff2cfc17 100644
--- a/dev-python/pyotherside/Manifest
+++ b/dev-python/pyotherside/Manifest
@@ -1,7 +1,5 @@
-DIST pyotherside-1.5.3.tar.gz 181811 BLAKE2B ce2b7c4b9490e3d30e0e8a3911907fe3ab5aa9f812d29cf4f633957d5ade5261ab7e3691751b0bc696459080089dfec0439b970ac7ad0bd36aa22eb0c9c87112 SHA512 ff6aa43e72f5492b18403559514e6fdf0d2cee0965556fcafe5fe394b654a7dd2fc3a7d64d4b8f9c0ebf95485821b77022407772b2414539f2ab287e1fb01e93
 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.3.ebuild 773 BLAKE2B d706b42ddbed5736605732074fca25cbe712301775392c8842c81c7821c8a48a4862051f605b81b52622a630f5cea1c7c101d62b56ebd413ce1960fae2d7abdc SHA512 9cd89b56dc933fbf9b19ef62229cf0f0c4d4f2e376ed13c0e16c0d6b9619d644a69ddc7c4323fab7f450db513d0e908ccb90904de836157dd9981b86a211e46c
 EBUILD pyotherside-1.5.4.ebuild 801 BLAKE2B 267d5893bdb8cecbcf78af63e8d8f9ced5a18c021624fea942da354a536b88c2f890f0bbb83a507b3ebe68623cf19a3de0fde211765ca48dbd54a0de3e9023f4 SHA512 dd701b7b779cc5748c3effff70d3ecd9a4162b5db038fe26450e631504868fdc3321921e8909a2d2b65a42c48866fae1e5181a42557326cf53c1423d7624dca5
 EBUILD pyotherside-1.5.8.ebuild 803 BLAKE2B 8686563a2dfce1249a715695b05cc02eb8ef6b1131006e63228376ea1486f4112bb6a28a6d06b85374164c90712ce7dd10d08fb2197e211532132aa5bdd3f0b5 SHA512 b8249cd3168b30e8822c25f987ac67c22d71441c5f8894bc123ef2bcb07721e6c3210d0b4abb77e3c686e3ab8811539545a5c53003c9406b25b0d55c6113342a
 MISC metadata.xml 257 BLAKE2B fd7fdb57fdce3a565a08cedc4d99216724e4013515d77ea89cb41a5c01e8f5479cab25fe53d44a705e3a71164cdc3c93e658e61deae654a13e5c2471dd83c57c SHA512 35e59430f93d3bb2e7e3042a2464b84f8e6cdf1e1624c1e7674bfc5147f9b9694da6b39ac081ed5fc22f1623aea889b743cfee11007911f3c8c17cf61443675b
diff --git a/dev-python/pyotherside/pyotherside-1.5.3.ebuild b/dev-python/pyotherside/pyotherside-1.5.3.ebuild
deleted file mode 100644
index 054abcb7d74d..000000000000
--- a/dev-python/pyotherside/pyotherside-1.5.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=( python3_{5,6} )
-
-inherit qmake-utils python-single-r1
-
-DESCRIPTION="Asynchronous Python 3 Bindings for Qt 5"
-HOMEPAGE="https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/"
-SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -i -e "s/qtquicktests//" pyotherside.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 994e55a02d2e..3d1dbe62cc7d 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,4 +1,3 @@
 DIST pyproj-1.9.5.1.tar.gz 4424543 BLAKE2B cdf954ec0fe794f354b246fcd5afeac01b796f84cc2456efce3e289fcfb12074d7352c9fa7e9d74356199135dfa9814c07da9379f85771dbb7130b8b9b7ecc34 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324
 EBUILD pyproj-1.9.5.1-r1.ebuild 705 BLAKE2B 2f7086856381e17a62e1cc78b9f815d3ab1dcb8b36706f5326c82256c012fb07322bc9cf495d86b97e0b061e066013b13a8478197b9dfcd8de739e9c771c3460 SHA512 b2fadc42b327263b6ba6baafb23de6ad5c63eccd35cbe41853e22710584f0e025ad041760ac979e9c5a04b16108816760a864581e12dbac0a95968405fd8a47c
-EBUILD pyproj-1.9.5.1.ebuild 701 BLAKE2B 3e8d8babd12a92447eb97be4831dd6c0c9ca91f1892c34b9869484650ee55e98eb8158910f6e7eba5048eb60a2bd88b10cb7e0fc3a06f5772c9a160ef6148126 SHA512 a589a2ee88bf5179c9efa6bc6c7fbf0222978d015fbd0e87b59da88cb9d5f2bcdd803744d921bbae293dd18145a1cea97cf034fbc760544e5cb84241aa5d69f2
 MISC metadata.xml 413 BLAKE2B 8b30b06984a66d228b50b463a7149f95bfb671d60c3089e88ec11cab7b88fc7c0f044cd879d9e5fec5bc61840c6f35b17e22b93921e3716ce42b3066fe8dedd7 SHA512 84f84c14bce12374abb5014771c1663bb8877d7808e65fe60f698c60b4c7df17db703c6c1c55cb692b0c8f6a94847758e756d6f9bd7e69f59e915b09c71682ea
diff --git a/dev-python/pyproj/pyproj-1.9.5.1.ebuild b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
deleted file mode 100644
index a9c9fc765b0c..000000000000
--- a/dev-python/pyproj/pyproj-1.9.5.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 flag-o-matic
-
-DESCRIPTION="Python interface to PROJ.4 library"
-HOMEPAGE="https://github.com/jswhit/pyproj"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	append-cflags -fno-strict-aliasing
-}
-
-python_test() {
-	"${EPYTHON}" unittest/test.py || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 555180ec8e05..c9013f72aa69 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,17 +1,11 @@
 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.1.1-amd64+bzip2+jit+libressl+ncurses.tar.lz 13220880 BLAKE2B d4b45f757069405f5641ed9b70ce8e94970b1a67c9ee2865fe4250c4c85b8dd44268c5e3aeb7c852fbb8822df4c0326d4d9fc5f77cc8db1dfa4eda749b6c1122 SHA512 b8d4b35ce8b1119fef4dc624cd28c71afdb13669e9c44f380440cd6275156f7f2a1ce240a855038bc82638152f69d1f27191d4937c23052e0a9b0ca4a4efa215
-DIST pypy-bin-7.1.1-amd64+bzip2+jit+ncurses.tar.lz 13081888 BLAKE2B f693f6148eae1583d4fcfcffa48cdf2317d99d4839ecc9e592868285f789e74a88b5aad1c842dd22e8c4b3c43a897fedd2ad95076105e95bf8cab53a27cb8308 SHA512 db4ac8050597da6a727b7cb4ee9549697796a1452b786888c9e9fb5cdd218817edcf4b3b6317a39716b589df140d831539185b6120eb516f80f472e8d7acd0b4
-DIST pypy-bin-7.1.1-amd64+bzip2+libressl+ncurses.tar.lz 7737448 BLAKE2B 02c5aa5227bc6d2fc4087b4767c63737378d90f222a7402b20fee166f36c636fae35855dbf1df9c63984df5624c6ec052e1ec598ca4eb367a6ffccec7c397952 SHA512 ab2b274b3aadf04d55dbc9e4df5ca59ea97ec7df4dd1f8bb24feee4d46d7c02d9c72d55fad784d7412382e0803f172e871f01f82deba2cc5155b97e5139602e9
-DIST pypy-bin-7.1.1-amd64+bzip2+ncurses.tar.lz 7771869 BLAKE2B b63cb64cd7d3c130a58829b786fdd3d35a7eaf192b0491046199e993b20d58ddd9fe83d264d077801f0d18632e5b06f281065150a725a8ae017867b18e036f62 SHA512 1383bfe7c4497f17833e48c3b6096d29f5da675e713e740a5836f5aa9b818fb5460af9ff682e34d9d409bdfa1283dde9cb796b79a6f62d9ba024379cbeff223d
-DIST pypy-bin-7.1.1-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 9944011 BLAKE2B daf397da1f9341ded52b8cafae7c92080cfef1b2dc146b73dade51737a2d765ff52ffe55070229e8faf7e79c420c2ea3de4e5ad7f4ba5ee38d7c3dcd5953c9e2 SHA512 107a2df768985a818d906d176967188975e1beddc067c33fe228e0d2fd53b6d35e75603eb9b4e723eb5278e7b0a5b4a33921b6b820be0fce7dead40f4b9f68d3
-DIST pypy-bin-7.1.1-x86+bzip2+jit+ncurses+sse2.tar.lz 9979104 BLAKE2B 999e620f47e45d0aee9cdb668e99e0ef8b9b8eea7393ef813f1116ec25f9143f77f78f6e26571e23248fb1c06fd1e5ad74186dc8dace7e4035b11078d2eec7d4 SHA512 803118af392da988070464155c3d95fdce70fd1ab8c37e59cb4ce9f719d2c354a6330cf5c759b0a92e8efe44ecc5cf894efd93e1882ae530027d2f6261321834
-DIST pypy-bin-7.1.1-x86+bzip2+libressl+ncurses+sse2.tar.lz 6092434 BLAKE2B 71141a8981fb006412b2a5cae3d93b08a83b68c22a3470eefe8ae15534ecf227c74f0fd878ba790d73b7cb4e0568881aa94b739fafb36e12b3d909fd4ce6f285 SHA512 92f5185a70aad8f2161452f490b001783fc75d275dba800c0ba73704914bdc2363553c33b72ecf8408133fd962ea9f53399b8316bd54a1f794569c6f08f28270
-DIST pypy-bin-7.1.1-x86+bzip2+libressl+ncurses.tar.lz 6060032 BLAKE2B 660d834c3a76ed699170b7c13d36f6dc00df3b4811a09c5dec161af7f9b0416c7fda461ca04481ad656bea39b6ed25f5220b8d38c8ec02c9634a025e3b3d6cfc SHA512 21baa8cd6bd255a335c67a1197ccef856553987740f517e1b33c27758e57b61c22b8274419b445a257ad32511d3c07901d4550151047e04adcd39c9cbf20058e
-DIST pypy-bin-7.1.1-x86+bzip2+ncurses+sse2.tar.lz 6091202 BLAKE2B c173cf6890143e27677e6d6ee68b2a1f55ec97897817622559c25f2f49ca5bbb5a0a2c32785a3356a6bb8f4899ff19164e550fd2762003ee018faadf80227c95 SHA512 a630e380177da78daef288e69f15a4cb333c4ef1ab2da8b4b6cf76ec139c1961d692873c7ec119e54f596ef4e1435a6c6b3ef933edca2b0b5cd6fc24963d3b0d
-DIST pypy-bin-7.1.1-x86+bzip2+ncurses.tar.lz 6088838 BLAKE2B 555bca61d4693b3e5d3c8344bac3781cfe06acc4a50bcd74add2d122c68f177258ef438a7801ca4633a006e8a001500110287934f232ceb52789f3cc72b9b34b SHA512 0748e14e903b0863bb2a067b558826f47cad2063c31c935b84249eee2a9cf96cfa36a5d5ef92f0facca61356499f4b9cfee6496a6cc3228bae7729e50edf6be0
-DIST pypy2.7-v7.1.1-src.tar.bz2 20027876 BLAKE2B a411d7312ed3b9be9297e7ff4cc569530529272156117ca037bbe29ad477e7ce3b8903d13c6a5a35e9867a8ccbfaa418061a7b37317b4b713508c429a41ffe9a SHA512 f998931ecf4f9aeee24f0fed95589716175971816c00e50bc53de6de0cfe2a8537b89c1aee636d15faecf91df8c29943295485686185f5247a3e0913fa514f48
+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.1.1.ebuild 6282 BLAKE2B 0f476e3f5011de66e0b783c0d0af329940e5874dedbf2fbc278f1ba580dfd1bfe3a590b0b25f26c9df4ff94fb98a58b8dd0fba9cfce052c3cb1f863f089d328a SHA512 e5642c50817bb249bac279e40ed195eba6f3def312a334256b3ad7a02e9d35fdcc410f05492d5c9479b23a572f6bfbb19985e963fd4499e209debe2155e29d51
+EBUILD pypy-bin-7.2.0.ebuild 5706 BLAKE2B fdbf3b5fc2db4399ebe80c365046a106ed697ca8bff5edbf531322a378e61e7d0a099b2b80be38f2c40c81cf2a5c44b500b693fd059c771d7d9349697667b3eb SHA512 1c96482af5a262ac1cf0719b09a41c9e7c636335ba6ae58f2e96483f56316ffa2b18664c0a7763e2bfe84ce055b4e5b52c177dcedb5c374913a6c3803e0216d7
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/pypy-bin-7.1.1.ebuild b/dev-python/pypy-bin/pypy-bin-7.2.0.ebuild
index 53daf3ce27be..5cc2d81de0b4 100644
--- a/dev-python/pypy-bin/pypy-bin-7.1.1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-7.2.0.ebuild
@@ -10,49 +10,28 @@ CPY_PATCHSET_VERSION="2.7.15"
 MY_P=pypy2.7-v${PV}
 
 DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
+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? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
-		)
+		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
 	)
 	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
-			)
+		cpu_flags_x86_sse2? (
+			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
 		)
 	)"
 
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
 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 test tk"
+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
@@ -63,8 +42,8 @@ RDEPEND="
 	sys-libs/ncurses:0/6
 	sys-libs/zlib:0/1
 	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
 		dev-lang/tk:0=
@@ -119,6 +98,7 @@ src_compile() {
 	# 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",
@@ -127,7 +107,7 @@ src_compile() {
 #    "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=( audioop curses syslog pwdgrp resource )
+	cffi_targets=( ssl audioop curses syslog pwdgrp resource )
 	use gdbm && cffi_targets+=( gdbm )
 	use sqlite && cffi_targets+=( sqlite3 )
 	use tk && cffi_targets+=( tkinter/tklib )
@@ -169,7 +149,7 @@ src_install() {
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/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
@@ -178,21 +158,21 @@ src_install() {
 	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
+		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
+		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
+		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
+	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
@@ -204,5 +184,5 @@ src_install() {
 	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
+	python_optimize "${ED}${dest}"
 }
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 4ae219960ca0..ab615879401f 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -2,8 +2,8 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5
 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.1.1-src.tar.bz2 20027876 BLAKE2B a411d7312ed3b9be9297e7ff4cc569530529272156117ca037bbe29ad477e7ce3b8903d13c6a5a35e9867a8ccbfaa418061a7b37317b4b713508c429a41ffe9a SHA512 f998931ecf4f9aeee24f0fed95589716175971816c00e50bc53de6de0cfe2a8537b89c1aee636d15faecf91df8c29943295485686185f5247a3e0913fa514f48
+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-7.1.1.ebuild 8171 BLAKE2B c9e84ac1b80219632d68e0f43fda967f29ca0a737810baca1f112acccb4f92e8977fe2a34717c45cfb89b38cb8bcaa026a9b611a428e873fe850d8603c312e0e SHA512 815c3aa66c6a84506f1226f075e4b28b3278816ed3b818aaa507b63a446daabb67b7ef011715d6b72fe35732b78b6eb5d366ceb334e95160dd4d31e31d3c9312
-EBUILD pypy-9999.ebuild 8181 BLAKE2B 65fa3643a8875871015f6878898cbe57c9f2f1f7568140ea74fa6b28dfac8bb07939ce50d22e623b43f43a9d1aadcc28a586f8a6b1ad21488d3b72405566724c SHA512 bb089f9837f9b2e4a0cc501c337f7b837a5900d4aee414a83c9b0cff027c8190ec7ba22d344c98cdc17f22e20831bec40299b811ed1240e0833a8fefcb91c1a1
+EBUILD pypy-7.2.0.ebuild 8177 BLAKE2B 041f2840bade9d67062bae561193346aebed505746430a95ab1ebe4e44e9076beb41c4756fee84c15084489a9b3683b365a91873221ad5f4f7bf7804dacf94fd SHA512 46a5a55c6adc208267ddf960b15f4834bff59ac91d0a72205e1244b57ec3c56ded1f999be4aa91288fa7f18cac32c58949ab9299c112073c8bee61a06378a114
+EBUILD pypy-9999.ebuild 8187 BLAKE2B 5e7e7654d7577193ec53a8e7628a38ece75e462932e91e08f917b8fe7f1eaa32ce8d8ea7a812b565260e85c0827ef019d3c83681079e1bf42fe018e1f4d70a55 SHA512 da15a379b6d88a02cc4e47507aaf156620138de8180d32e8d1b0bcd451ad7c49da26e7a67845afd1e208a5f2e0a928a6fdf59408b8f3bf0c341322410103f452
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy/pypy-7.1.1.ebuild b/dev-python/pypy/pypy-7.2.0.ebuild
index 7a956b9f4a0d..15c787deb86b 100644
--- a/dev-python/pypy/pypy-7.1.1.ebuild
+++ b/dev-python/pypy/pypy-7.2.0.ebuild
@@ -11,7 +11,7 @@ CPY_PATCHSET_VERSION="2.7.15"
 MY_P=pypy2.7-v${PV}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
+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"
 
@@ -20,7 +20,7 @@ LICENSE="MIT"
 # 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 test tk"
+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=
@@ -196,6 +196,7 @@ src_compile() {
 	# 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",
@@ -204,7 +205,7 @@ src_compile() {
 #    "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=( audioop syslog pwdgrp resource )
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
 	use gdbm && cffi_targets+=( gdbm )
 	use ncurses && cffi_targets+=( curses )
 	use sqlite && cffi_targets+=( sqlite3 )
@@ -247,7 +248,7 @@ src_install() {
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/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
@@ -256,21 +257,21 @@ src_install() {
 	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
+		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
+		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
+		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
+	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
@@ -282,5 +283,5 @@ src_install() {
 	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
+	python_optimize "${ED}${dest}"
 }
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index 708273fc4d5b..f4acfd24cccc 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -12,7 +12,7 @@ CPY_PATCHSET_VERSION="2.7.15"
 MY_P=pypy2.7-v${PV}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
+HOMEPAGE="https://pypy.org/"
 SRC_URI="
 	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
 
@@ -21,7 +21,7 @@ LICENSE="MIT"
 # 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 test tk"
+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=
@@ -202,6 +202,7 @@ src_compile() {
 	# 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",
@@ -210,7 +211,7 @@ src_compile() {
 #    "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=( audioop syslog pwdgrp resource )
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
 	use gdbm && cffi_targets+=( gdbm )
 	use ncurses && cffi_targets+=( curses )
 	use sqlite && cffi_targets+=( sqlite3 )
@@ -253,7 +254,7 @@ src_install() {
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/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
@@ -262,21 +263,21 @@ src_install() {
 	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
+		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
+		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
+		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
+	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
@@ -288,5 +289,5 @@ src_install() {
 	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
+	python_optimize "${ED}${dest}"
 }
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 1222c93c5987..c3d010482830 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -1,14 +1,11 @@
 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 060cdfaea2c4b0e607b7f9548a161e0df8d741d8a70ece28eeccc646aaf659b8ae6f425089380b908a588e2a0ca2ed521995ef3f3aa3bfeb58ecfb0083b3584b SHA512 e67c0bb96d3c66ceecdc11a3984dbeb65a4473020ee2d4e5b093fe987f1540dd7a5cc6982be6303e7e8c49a53e02883277597d00342312a0f8144a84ff132bae
-AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
+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.1.1-amd64+bzip2+jit+ncurses.tar.lz 11031375 BLAKE2B e01ac298d3c8ed06742429b36739223fd0dbf87a9df4d302349401aeda06dbaf5cd8b972ebe997a1e4130a378d63ab69ed25b3ded4b9608db5d59fbaef8d04f6 SHA512 e5ccf27683dc81a683df52f04092167774f3a9c9dd3a38347dc9d5cec181148885ed342165b16689d44533511cb58bfcfa397a5e51869649086fa362a3bebc98
-DIST pypy3-bin-7.1.1-amd64+bzip2+ncurses.tar.lz 6915836 BLAKE2B 0f3f2210e7f6e73872d32b2c01a911b52ad2a8c8987034709d9e4c72cfe11e422eea7b6522b19b3717876307d9fbbfbdfcc008dc2e3771dea083eeb61c202e6e SHA512 7fe6a19f56d7cdc142b368154e17af8936b8b730102c4a1c8a6b756a13b643d1375a51f45a0a3d345f7a8a23b75a81d35a6aa810129d231bf2091e156f69a914
-DIST pypy3-bin-7.1.1-x86+bzip2+jit+ncurses+sse2.tar.lz 8540485 BLAKE2B a7de0db24e4bc56d54cbc03d618f8e08932e23a1fe5a1ab227600c244e222a6dae723c72fbd5cdd059c3e3f52bd355c4c9ee18506f6b39961bd1473358d35bd3 SHA512 f3355109bc073e220a33e8763c2d2ccf152d223d3850bb85aac71c19170ce4b118a84f258a829c486209f3c3014264384b158de17c9a0156c24afcf5b130a8e0
-DIST pypy3-bin-7.1.1-x86+bzip2+ncurses+sse2.tar.lz 5523574 BLAKE2B 44f760842b0f232f7f5fb7a2fe3f60ff1f832dec3b0c16d1fd27ab36d09c12d6be8aa6727a880c3400506ea415317ddfb982439c1a581a03909099eeb6ea8cf6 SHA512 df664a7afa5bdd329d19046c81e362782c4f9358add2b7e54100df10a23434b9a341ec504ac1d49b2b017917937ab23ffd3cf723f86b65d7080789f795f5a4d3
-DIST pypy3-bin-7.1.1-x86+bzip2+ncurses.r1.tar.lz 5550959 BLAKE2B 72b1f84f0c70b07bd622b4d9ba67b165ce047037acc9a4fb46427b07db8793610f71dc389fc5cede209663c7d36750faf6247d5b6eb3be006c6cc58e4a94b0eb SHA512 3c522a9cf0e94aa8c14e9982a09231517c2c2b46e73a9c69bc6c43c44afefa3958de8879ac0fff2d43f8a0fc79117bdee645599d8e1d6a0def9806b44a4b1bc9
-DIST pypy3-bin-7.1.1-x86+bzip2+ncurses.tar.lz 5545191 BLAKE2B 2afc40968977cd6956cb305a829811640e8437f0a811435a20ec694181286c94c820fd4148e3b6323a014ff391400d5265a7c1ee8b918c3db91ac02b44f3d585 SHA512 a1dad750491c5f524217986817a046c5c7a97b2b250a1d24b6a077d2d8067e249966cd331a5336fa2960a3d317c1aa83196c3e3b2f4a0734d79fe43cd9b55032
-DIST pypy3.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473
-EBUILD pypy3-bin-7.1.1-r1.ebuild 5726 BLAKE2B 273bc2fc7a031821f7c52a644f5a995751f59d11eb2f61fa3732af9f4f76bcb87ac90c2d1949f8bd089f6f6b25654f3e8d5c4d47f8cd92a1af9eaf734c8b7fd3 SHA512 61cd3ace61262da6b07fdd7a399c0e00c01327ca07bca34faa85e8d59d2af123b11eb1d09e05407a202f9400c6042179574948b5a9ab81ba68c1e2b80a3ad963
-EBUILD pypy3-bin-7.1.1.ebuild 5723 BLAKE2B 5b65d80f0bae857db38ac6ba36f55fdece5c8f833504f4ef896b012434d5469a4228b4b790c4735ecaf66c6d0c733db6321f75814d3dff230bc614241588225a SHA512 d70f254db7483b55ff7addc62bda682cc0b4ddfb526b3bc93442100e2109d028fd0355eff759899b7b9fd3a8aad6ac3b475d23bfbfd68cf98d8aff09f29c719b
+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 5532 BLAKE2B b73d564bf4975f4dac88f598ec8d92c205100747d037b41104e1cedfcc7bc5cd2a2cecae7131bec777e136ed84780e16f2d1be604ee9d33586b15b596dd56fab SHA512 ef447b184cfe2833d6efde461d32d0fc93d905b5bf81194480e1eca5a639d6bc7fd5bae314d67b970a31f98e78988443b65dd4b78b4d844aa252c589b4c355dc
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
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
index 17409fa89a42..135e496f2536 100644
--- a/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch
+++ b/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch
@@ -39,7 +39,7 @@ index 77a1827d4b..255603967f 100644
          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.5'):
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy3.6'):
 +                # override paths for system-wide install
 +                name = 'gentoo'
 +            else:
diff --git a/dev-python/pypy3-bin/files/7.0.0_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/7.2.0-distutils-cxx.patch
index a9099e5c9dc3..89a38050c804 100644
--- a/dev-python/pypy3-bin/files/7.0.0_all_distutils_cxx.patch
+++ b/dev-python/pypy3-bin/files/7.2.0-distutils-cxx.patch
@@ -1,43 +1,5 @@
-From 5c396fb8b644e5de82d9b54cdb088ea673e16e14 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 17:42:33 +0200
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5/7.0.0
-
-https://bugs.python.org/issue1222585
----
- lib-python/3/_osx_support.py                | 10 ++--
- lib-python/3/distutils/cygwinccompiler.py   | 21 ++++++--
- lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++--
- lib-python/3/distutils/sysconfig_pypy.py    | 34 ++++++++++---
- lib-python/3/distutils/unixccompiler.py     | 54 +++++++++++----------
- lib_pypy/_sysconfigdata.py                  |  1 +
- 6 files changed, 100 insertions(+), 45 deletions(-)
-
-diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py
-index 13fcd8b8d2..0525be1cbc 100644
---- a/lib-python/3/_osx_support.py
-+++ b/lib-python/3/_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/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
-index c879646c0f..a6157fbd5f 100644
+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):
@@ -97,10 +59,10 @@ index c879646c0f..a6157fbd5f 100644
          # 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 573724ddd7..0a04f33a86 100644
+index b8340f1..a8c5473 100644
 --- a/lib-python/3/distutils/sysconfig_cpython.py
 +++ b/lib-python/3/distutils/sysconfig_cpython.py
-@@ -173,9 +173,12 @@ def customize_compiler(compiler):
+@@ -170,9 +170,12 @@ def customize_compiler(compiler):
                  _osx_support.customize_compiler(_config_vars)
                  _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
  
@@ -116,7 +78,7 @@ index 573724ddd7..0a04f33a86 100644
  
          if 'CC' in os.environ:
              newcc = os.environ['CC']
-@@ -190,19 +193,27 @@ def customize_compiler(compiler):
+@@ -187,19 +190,27 @@ def customize_compiler(compiler):
              cxx = os.environ['CXX']
          if 'LDSHARED' in os.environ:
              ldshared = os.environ['LDSHARED']
@@ -145,7 +107,7 @@ index 573724ddd7..0a04f33a86 100644
          if 'AR' in os.environ:
              ar = os.environ['AR']
          if 'ARFLAGS' in os.environ:
-@@ -211,13 +222,17 @@ def customize_compiler(compiler):
+@@ -208,13 +219,17 @@ def customize_compiler(compiler):
              archiver = ar + ' ' + ar_flags
  
          cc_cmd = cc + ' ' + cflags
@@ -165,7 +127,7 @@ index 573724ddd7..0a04f33a86 100644
  
          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 bf1748e300..70dfd72a1a 100644
+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):
@@ -247,7 +209,7 @@ index bf1748e300..70dfd72a1a 100644
  
          compiler.shared_lib_extension = shlib_suffix
 diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
-index 32030ed150..1db3d5498b 100644
+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):
@@ -331,7 +293,7 @@ index 32030ed150..1db3d5498b 100644
                  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 2ceafe80bf..ee3f802c41 100644
+index 4d2b0bc..5ed9641 100644
 --- a/lib_pypy/_sysconfigdata.py
 +++ b/lib_pypy/_sysconfigdata.py
 @@ -15,6 +15,7 @@ build_time_vars = {
@@ -342,6 +304,3 @@ index 2ceafe80bf..ee3f802c41 100644
      'EXT_SUFFIX': so_ext,
      'SHLIB_SUFFIX': ".so",
      'AR': "ar",
--- 
-2.20.1
-
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild
deleted file mode 100644
index 453ae142dbd3..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.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
-
-# 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="A fast, compliant alternative implementation of Python 3.6 (binary package)"
-HOMEPAGE="http://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 )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.r1.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-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=[-bindist] )
-	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.0.0_all_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 = {
-#    "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 )
-
-	einfo "Please disregard the import errors during CFFI cache generation."
-	einfo "They come from modules not built yet."
-
-	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.1.1.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.2.0-r1.ebuild
index 0f8954a4f842..53f4a07681af 100644
--- a/dev-python/pypy3-bin/pypy3-bin-7.1.1.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-7.2.0-r1.ebuild
@@ -10,8 +10,8 @@ inherit pax-utils python-any-r1 unpacker
 BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
 MY_P=pypy3.6-v${PV}
 
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.6 (binary package)"
-HOMEPAGE="http://pypy.org/"
+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 )
@@ -22,19 +22,16 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
 			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
 			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
 		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-		)
 	)"
 
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
+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
@@ -67,7 +64,7 @@ QA_PREBUILT="
 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.0.0_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
 
 	sed -e "s^@EPREFIX@^${EPREFIX}^" \
 		-i lib-python/3/distutils/command/install.py || die
@@ -98,12 +95,14 @@ src_compile() {
 	# 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,
+#    "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",
@@ -117,9 +116,6 @@ src_compile() {
 	use sqlite && cffi_targets+=( sqlite3 )
 	use tk && cffi_targets+=( tkinter/tklib )
 
-	einfo "Please disregard the import errors during CFFI cache generation."
-	einfo "They come from modules not built yet."
-
 	local t
 	# all modules except tkinter output to .
 	# tkinter outputs to the correct dir ...
@@ -148,7 +144,7 @@ src_install() {
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/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
@@ -157,22 +153,22 @@ src_install() {
 	dodoc README.rst
 
 	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+		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
+		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
+		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
+	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
@@ -184,5 +180,5 @@ src_install() {
 	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
+	python_optimize "${ED}${dest}"
 }
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index e7aa3d24ba27..aa9a7be5dc04 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,9 +1,9 @@
 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 060cdfaea2c4b0e607b7f9548a161e0df8d741d8a70ece28eeccc646aaf659b8ae6f425089380b908a588e2a0ca2ed521995ef3f3aa3bfeb58ecfb0083b3584b SHA512 e67c0bb96d3c66ceecdc11a3984dbeb65a4473020ee2d4e5b093fe987f1540dd7a5cc6982be6303e7e8c49a53e02883277597d00342312a0f8144a84ff132bae
-AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
+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.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473
-EBUILD pypy3-7.1.1.ebuild 7530 BLAKE2B 7cce55beece09dff0a3a8c8c985de1044af979d16e33fa000a80e786cccd2e07bfcba6ce1327e302d84e577cb56a001f3b88ceb4d17d8ca2cf4f4cd5f8ef8226 SHA512 04e8fa8450614bba800f310a6480c856335391580580df357fe40ae72fe5c5384fb1d1fc311c63bb61f9c5990c49b3e7cbe4a8a6a41fdd66d8ff611246d8989e
-EBUILD pypy3-9999.ebuild 7580 BLAKE2B 25c1e8ce02965e73b3f2cb57fd67c7be6d11905f17c648ebb4b025f6916bcbea737d38a9bffed535cfae615e6e7fd3b20272e95de1f4dc5d27009be30737450b SHA512 3c0851723c8bd47dce3cfdece5373e36d7b3d80420a7fc078ebd3690750b6b72eb10295d3a255cdb189c6ba62152c1d517dc41aa79a620f8c07da430c8376dff
+DIST pypy3.6-v7.2.0-src.tar.bz2 21850076 BLAKE2B 756ea3034fe8971c979ec83c9cbfac55a680f3ef03b276475aa4318f3480ae5ede609b8413412df64db553a33979670498b1f97184f3b57406619c9db7f01127 SHA512 bcbb53062a473d504bcc082cf6286f6169c83d1f38d22c4d7c4e46ddc32bca9d91e71194637e6650db5bec02b29fe262b22fe236d627b6bc3e6e0c59c66c07cc
+EBUILD pypy3-7.2.0-r1.ebuild 7382 BLAKE2B 42377d253011d2a1643b0cb68d0d719ae530bb6fd48f64592f7907f19e5a8d4f6574388aef305cd653743a4ce07d35773fffded9ea0e4a4b22d515a102f913a6 SHA512 ee2f630e7034bd64d32989d4e0114750b047012a5c7981754da36f4ccc6ac3ea3e1a783200543ef639eb17799174fd8f9defa34b172afda23a4fa7e8b40cf889
+EBUILD pypy3-9999.ebuild 7432 BLAKE2B f7fda6aa9308f9a5e0bfa20da5ae0a825d6ec1254ab14bfecb77a6d3b7e46a3788119c9f944bf06e440028e4bab31305ef7d1a26aff8f0395eae03ab623d1006 SHA512 348c6bc2dcd474e1c2423551d8fa57578366729dcf4d0740e0bed96f5f68e99dd11ddb88aed5fe34e0449bbf7d7e1b03f87c8d4e8a2b0aed49524da5979c42d5
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy3/files/7.0.0-gentoo-path.patch b/dev-python/pypy3/files/7.0.0-gentoo-path.patch
index 17409fa89a42..135e496f2536 100644
--- a/dev-python/pypy3/files/7.0.0-gentoo-path.patch
+++ b/dev-python/pypy3/files/7.0.0-gentoo-path.patch
@@ -39,7 +39,7 @@ index 77a1827d4b..255603967f 100644
          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.5'):
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy3.6'):
 +                # override paths for system-wide install
 +                name = 'gentoo'
 +            else:
diff --git a/dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch b/dev-python/pypy3/files/7.2.0-distutils-cxx.patch
index a9099e5c9dc3..89a38050c804 100644
--- a/dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch
+++ b/dev-python/pypy3/files/7.2.0-distutils-cxx.patch
@@ -1,43 +1,5 @@
-From 5c396fb8b644e5de82d9b54cdb088ea673e16e14 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 17:42:33 +0200
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5/7.0.0
-
-https://bugs.python.org/issue1222585
----
- lib-python/3/_osx_support.py                | 10 ++--
- lib-python/3/distutils/cygwinccompiler.py   | 21 ++++++--
- lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++--
- lib-python/3/distutils/sysconfig_pypy.py    | 34 ++++++++++---
- lib-python/3/distutils/unixccompiler.py     | 54 +++++++++++----------
- lib_pypy/_sysconfigdata.py                  |  1 +
- 6 files changed, 100 insertions(+), 45 deletions(-)
-
-diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py
-index 13fcd8b8d2..0525be1cbc 100644
---- a/lib-python/3/_osx_support.py
-+++ b/lib-python/3/_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/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
-index c879646c0f..a6157fbd5f 100644
+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):
@@ -97,10 +59,10 @@ index c879646c0f..a6157fbd5f 100644
          # 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 573724ddd7..0a04f33a86 100644
+index b8340f1..a8c5473 100644
 --- a/lib-python/3/distutils/sysconfig_cpython.py
 +++ b/lib-python/3/distutils/sysconfig_cpython.py
-@@ -173,9 +173,12 @@ def customize_compiler(compiler):
+@@ -170,9 +170,12 @@ def customize_compiler(compiler):
                  _osx_support.customize_compiler(_config_vars)
                  _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
  
@@ -116,7 +78,7 @@ index 573724ddd7..0a04f33a86 100644
  
          if 'CC' in os.environ:
              newcc = os.environ['CC']
-@@ -190,19 +193,27 @@ def customize_compiler(compiler):
+@@ -187,19 +190,27 @@ def customize_compiler(compiler):
              cxx = os.environ['CXX']
          if 'LDSHARED' in os.environ:
              ldshared = os.environ['LDSHARED']
@@ -145,7 +107,7 @@ index 573724ddd7..0a04f33a86 100644
          if 'AR' in os.environ:
              ar = os.environ['AR']
          if 'ARFLAGS' in os.environ:
-@@ -211,13 +222,17 @@ def customize_compiler(compiler):
+@@ -208,13 +219,17 @@ def customize_compiler(compiler):
              archiver = ar + ' ' + ar_flags
  
          cc_cmd = cc + ' ' + cflags
@@ -165,7 +127,7 @@ index 573724ddd7..0a04f33a86 100644
  
          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 bf1748e300..70dfd72a1a 100644
+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):
@@ -247,7 +209,7 @@ index bf1748e300..70dfd72a1a 100644
  
          compiler.shared_lib_extension = shlib_suffix
 diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
-index 32030ed150..1db3d5498b 100644
+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):
@@ -331,7 +293,7 @@ index 32030ed150..1db3d5498b 100644
                  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 2ceafe80bf..ee3f802c41 100644
+index 4d2b0bc..5ed9641 100644
 --- a/lib_pypy/_sysconfigdata.py
 +++ b/lib_pypy/_sysconfigdata.py
 @@ -15,6 +15,7 @@ build_time_vars = {
@@ -342,6 +304,3 @@ index 2ceafe80bf..ee3f802c41 100644
      'EXT_SUFFIX': so_ext,
      'SHLIB_SUFFIX': ".so",
      'AR': "ar",
--- 
-2.20.1
-
diff --git a/dev-python/pypy3/pypy3-7.1.1.ebuild b/dev-python/pypy3/pypy3-7.2.0-r1.ebuild
index 344f0da4013e..b703db56d2da 100644
--- a/dev-python/pypy3/pypy3-7.1.1.ebuild
+++ b/dev-python/pypy3/pypy3-7.2.0-r1.ebuild
@@ -10,12 +10,12 @@ 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="http://pypy.org/"
+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/71-py36"
+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"
@@ -88,7 +88,7 @@ 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.0.0_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
 
 	sed -e "s^@EPREFIX@^${EPREFIX}^" \
 		-i lib-python/3/distutils/command/install.py || die
@@ -180,18 +180,18 @@ src_compile() {
 	# 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,
+#    "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 syslog pwdgrp resource lzma decimal )
@@ -200,9 +200,6 @@ src_compile() {
 	use sqlite && cffi_targets+=( sqlite3 )
 	use tk && cffi_targets+=( tkinter/tklib )
 
-	einfo "Please disregard the import errors during CFFI cache generation."
-	einfo "They come from modules not built yet."
-
 	local t
 	# all modules except tkinter output to .
 	# tkinter outputs to the correct dir ...
@@ -231,7 +228,7 @@ src_install() {
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/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
@@ -240,22 +237,22 @@ src_install() {
 	dodoc README.rst
 
 	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+		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
+		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
+		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
+	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
@@ -267,5 +264,5 @@ src_install() {
 	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
+	python_optimize "${ED}${dest}"
 }
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index d6e6b0856eab..12b0e7fae866 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -13,12 +13,12 @@ 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="http://pypy.org/"
+HOMEPAGE="https://pypy.org/"
 SRC_URI=""
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
+SLOT="0/72-py36"
 KEYWORDS=""
 IUSE="bzip2 cpu_flags_x86_sse2 gdbm +jit libressl low-memory ncurses
 	sandbox sqlite tk"
@@ -96,7 +96,7 @@ 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.0.0_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
 
 	sed -e "s^@EPREFIX@^${EPREFIX}^" \
 		-i lib-python/3/distutils/command/install.py || die
@@ -188,18 +188,18 @@ src_compile() {
 	# 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,
+#    "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 syslog pwdgrp resource lzma decimal )
@@ -208,9 +208,6 @@ src_compile() {
 	use sqlite && cffi_targets+=( sqlite3 )
 	use tk && cffi_targets+=( tkinter/tklib )
 
-	einfo "Please disregard the import errors during CFFI cache generation."
-	einfo "They come from modules not built yet."
-
 	local t
 	# all modules except tkinter output to .
 	# tkinter outputs to the correct dir ...
@@ -239,7 +236,7 @@ src_install() {
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/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
@@ -248,22 +245,22 @@ src_install() {
 	dodoc README.rst
 
 	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+		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
+		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
+		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
+	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
@@ -275,5 +272,5 @@ src_install() {
 	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
+	python_optimize "${ED}${dest}"
 }
diff --git a/dev-python/pyringe/Manifest b/dev-python/pyringe/Manifest
deleted file mode 100644
index ca19835843f5..000000000000
--- a/dev-python/pyringe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyringe-1.0.2.tar.gz 42804 BLAKE2B d5557c8d72175e5f70ba82205f990126919816f03d856c67c97dbd48ae4586809b815a4889ccfa1220a2769bf940cfdcb1bbca2a6e2d070f77357850ed129d5e SHA512 8da1572fda50bd135dc5d49d41a2f5c9cf2f5a7af729aaa9c34cde892a76e5a1b0a6818a6ed67f0f757910eec77f9931daade627141dd9964e9545ccc75a6052
-EBUILD pyringe-1.0.2.ebuild 473 BLAKE2B 1dba162d68ee02d971c75e43c6a319a27dd8cfe01ad9be9d8de3581c335f192d39397a6e70dc021c738ff8b25d6eaf9595a771ce217f6247c2aefd70f05423dc SHA512 86d6a4db391452f4fed94b85fc3e29635429a1b3278bb0df66612182eeb4b1f66fbf9071761df128e0f76b6f0530b38522204677a48d582002e0e9973ac16014
-MISC metadata.xml 296 BLAKE2B 868acf6fef91fed55254e544120114e601a22a036eb07af1a8e91888d096c3cc3f3860bb5daf76724991b293faf458fb368ddc190c03a53c17a489a9963dd2f0 SHA512 11012332f2b51dc6fb1d0b54aad18db8646a2dd985d38511c7a57ec70e55572271f16fc38bd1a43a937c9b866b017ed71e1d17d34e2353f8a751c6a8e404ccb6
diff --git a/dev-python/pyringe/metadata.xml b/dev-python/pyringe/metadata.xml
deleted file mode 100644
index 68e5f99038b9..000000000000
--- a/dev-python/pyringe/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="pypi">pyringe</remote-id>
-    <remote-id type="github">google/pyringe</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyringe/pyringe-1.0.2.ebuild b/dev-python/pyringe/pyringe-1.0.2.ebuild
deleted file mode 100644
index a1c03e6be1ab..000000000000
--- a/dev-python/pyringe/pyringe-1.0.2.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="Debugger capable of attaching and injecting code"
-HOMEPAGE="https://github.com/google/pyringe https://pypi.org/project/pyringe/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-DOCS=( README.md )
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 7510096f7d56..74a26d45f5ab 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -7,5 +7,5 @@ EBUILD pyro-3.16-r1.ebuild 704 BLAKE2B 1270e3906b70a94640880fde94d51122843def778
 EBUILD pyro-4.41.ebuild 1872 BLAKE2B 51de78b3672b040abfc65da0b245510085e8dd051d59152a4b901dd4e7fa9e6cecd801c5bc17d5898f7acbf5b80c6a065ee033808aaacbd321149fe696301ae2 SHA512 e7ed9d0c300e62123b0b58b959ebfdee5097c58df9fc8cecdf62a548eaffbea7766eddd556f5d21af15203ce4194e676b97b39deab74a35fb7f4463985e03afd
 EBUILD pyro-4.56.ebuild 1872 BLAKE2B 509bbac0dac628598e27defe07f99ca6a025ca5d23522f1ed0f87eb24d069b32ffe3002b81d0afb86b18c93960c5e72d84c34fddb1a44c539652ba1a5f02ddaf SHA512 b7f57aabd06b9a21e5ee18c2012385d9e15e1d91b3668d19cc03f13af5f93ffb8522d5fe69107e3f01832b9e860094fd6438d48f8be22f953dcff87e1b746b9c
 EBUILD pyro-4.76.ebuild 1452 BLAKE2B 76c3db0f7b5cc172a197443b7da428529e54ac200cb96a0eee20f4388fee16347644ab61258e68e00483681e6fe7b42e355bd5f449e4d1f054a6ba51d19b9f48 SHA512 4d911303bff81350025d80c50771188a0083564f5bb61f18ce1197ca4b3ec459579edc2f2fdd954f9224949b358fdcf58b2ce27345a1947cbadab217f9503cc2
-EBUILD pyro-4.77.ebuild 1452 BLAKE2B 76c3db0f7b5cc172a197443b7da428529e54ac200cb96a0eee20f4388fee16347644ab61258e68e00483681e6fe7b42e355bd5f449e4d1f054a6ba51d19b9f48 SHA512 4d911303bff81350025d80c50771188a0083564f5bb61f18ce1197ca4b3ec459579edc2f2fdd954f9224949b358fdcf58b2ce27345a1947cbadab217f9503cc2
+EBUILD pyro-4.77.ebuild 1462 BLAKE2B 2eac2574914bf28d70f0a3ecb15b2ed084e40b47a36089e8d118a6b44b38358935a2a2e96c36b1b000a5c6a604312440f3aed7711e453dc974f27218cde6bb55 SHA512 4143e3657bcd26084db97e1525effa1f342e1dd880c54a274cd6279dd618bc96a0188b8e8b0b94dd1410a94135cb023f033d8c497a268887bb4b98450044d8bd
 MISC metadata.xml 370 BLAKE2B bf0ecf2b63d7e544a1193349f0d171d107d23e66a067012cdd0ecbc4b736631e3c78fabc0745e88efe711219e8c3ce187da3ac67f4477f8bcf4996546a56a94d SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544
diff --git a/dev-python/pyro/pyro-4.77.ebuild b/dev-python/pyro/pyro-4.77.ebuild
index c13f60a48f2a..dff323ca84d3 100644
--- a/dev-python/pyro/pyro-4.77.ebuild
+++ b/dev-python/pyro/pyro-4.77.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyroma/Manifest b/dev-python/pyroma/Manifest
deleted file mode 100644
index 29fa785fc4d8..000000000000
--- a/dev-python/pyroma/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyroma-1.7.zip 359654 BLAKE2B 8485b205225521455541eb82c21e9cc7b703434d3686e9b6b4afce62f6520872888a388b16b37c1eb583d5a22471f40d25faa1b64ed0cd5c6f2f07f6aea5ccdb SHA512 d7c95283273befbed6a747a1f3c0aa0af0db5c8d486128bcf5a3439dfe7204e1025afcf22cbdf5b96b6f4302b8d569c60c1eb9c646c035fd8a324e3d69f7195f
-EBUILD pyroma-1.7.ebuild 591 BLAKE2B 24aacbad4c75453e5e6aab05cb2b2128138bf2f9e43e51e66cd9ff36a6a7ed313c6ac102875e928615a807fbf03687d8fa1812ee4f3da77de23e9fdea3ca57fc SHA512 0e1e049ebdd13bfd0fd076322bdbb8ff13ff2c5c0bda492556648b6d1bc969c87d6a6e1b3dfbe2669526af2efdfb0d9875498be1f16790d7aa03b0efe718014e
-MISC metadata.xml 298 BLAKE2B c952b58d9292e42ea1c8f5e63839f9375ff3ffa01fc9170ebe484e3229d2ce33ddbf5d12aeab5218460049cf73753946293c235ee668af5ef0c7835ef9722a26 SHA512 88d93e8578e673c211d062271406be0a43759abdcf97491d3af916a4a3133cbe4aff4c233b61c2c5cdc0a43b49041ef7ae3e42dc47727d234ae45281ac54dd54
diff --git a/dev-python/pyroma/metadata.xml b/dev-python/pyroma/metadata.xml
deleted file mode 100644
index 6ab46b231085..000000000000
--- a/dev-python/pyroma/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="pypi">pyroma</remote-id>
-    <remote-id type="bitbucket">regebro/pyroma</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyroma/pyroma-1.7.ebuild b/dev-python/pyroma/pyroma-1.7.ebuild
deleted file mode 100644
index 596011dd47ef..000000000000
--- a/dev-python/pyroma/pyroma-1.7.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
-
-DESCRIPTION="Test project's packaging friendliness"
-HOMEPAGE="https://bitbucket.org/regebro/pyroma https://pypi.org/project/pyroma/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-DOCS=( README.txt HISTORY.txt )
-
-python_test() {
-	"${PYTHON}" setup.py test || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/pystdf/Manifest b/dev-python/pystdf/Manifest
deleted file mode 100644
index 8fdc3b29c7dd..000000000000
--- a/dev-python/pystdf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pystdf-1.3.1.tar.gz 19974 BLAKE2B 052950e4c53d929bca861d17fea34fb7688c4a8b395a4d9f9954424520f2b7269e132473086047561f3952a583a3e3ec30c101f252fa7a44ec4c25703d89a2e7 SHA512 134265a728f3fafab5a536d12bc53c017ec265bbf83b8980fb1a87d59a29c3e872b24d9121a3bb52f5feddacca8d01bcee070f9ac6fd366029129a327847515a
-EBUILD pystdf-1.3.1-r1.ebuild 389 BLAKE2B 17eecefa313dfbcb48da6194e01453c732fee5e77ccc8337004254660fcd00b68266cecb8769998b279684584b741fd8b20b3fa9a4f680c3d06be7ea9f2064db SHA512 986233674f1b6c2c06a8157db327fd98819b33c9a06c87c51d2ce422a8af771d96bca9e329e813978c0a74184fd47285f2bdb9d79b3d213b15a5594e87611ae2
-MISC metadata.xml 295 BLAKE2B 1037e1e193efaa613378f558868be404f0824a6e25d211c5239f70f43664b9fd8b122ac0b62418e0c40dc3581c7ccc6edb53fafa87b5de4fd6375ae33657b97c SHA512 20f56e4f086ce0d9959f40ff7a8740baaa6e37b0afb2f55b81eb3f26fa1985b3c294541cc826bf7dbf7b2ee19aecf2471b7bd5a9c5fff1c4e7f38253329ffdde
diff --git a/dev-python/pystdf/metadata.xml b/dev-python/pystdf/metadata.xml
deleted file mode 100644
index 0377393eb53c..000000000000
--- a/dev-python/pystdf/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="google-code">pystdf</remote-id>
-		<remote-id type="github">cmars/pystdf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pystdf/pystdf-1.3.1-r1.ebuild b/dev-python/pystdf/pystdf-1.3.1-r1.ebuild
deleted file mode 100644
index 9ddcd67e4204..000000000000
--- a/dev-python/pystdf/pystdf-1.3.1-r1.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 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module that makes it easy to work with STDF"
-HOMEPAGE="https://github.com/cmars/pystdf"
-SRC_URI="https://pystdf.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index ac57d5baf2af..af2033559569 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0.ebuild 690 BLAKE2B 9e13e85aea6632eca01f8c805da261e9a53a7dd407bba53821e175aa6cf16a1959c4a306fdb946069bbb15e93056711700fa3e5ce9b7a5ccea4b0e43c75087e1 SHA512 9b44b5f4ba0382d97b13a7097d158c87b256d324c14e6b73a93854282555ef768fa0e65cfa04e5c1dcc62e2f997c64f186ede94bd2b3a4e0123946cb6e276473
+EBUILD pytest-expect-1.1.0.ebuild 694 BLAKE2B 4da61d87ad1268cdafce2bb9b750468394e9ded2f12d4c9bb0a1c568c33109c76e8d72db34c7fba6fe6c6721f758c6d67ce1e389b385a1bc92d1c44d0ca23524 SHA512 01e7def124d9d273ef4a6e04468917130ab8e172ad7fcb06d6285503ef1ca299553eca11a557cd8617888a93fd90112200da77cbe627647461b19f2af2fd01fc
 MISC metadata.xml 357 BLAKE2B 29b8df313fa5bb9f7666ba95df518d3ada2f9bf783c2e14cde2f404cf10504e5631ad2a512303acfdd0a4ffdad845fe482082d5234e6b54818f38c83c07391f9 SHA512 6c6151ca1a141fdbecdb4eae172cf6d21bd41f2827db435f8d1a6a4dd95743fc291f302848b9afad0e1fdb9e7bb8030bf0f8e46a69e8d4ad9ed0d648b1aef870
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 043a6256e1e3..21635f2acab1 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index a7cc6c64d78e..7af8963120ff 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,7 +1,9 @@
 DIST pytest-mock-1.10.0.tar.gz 20754 BLAKE2B db60bfe6ee9d6d0a6ee4f0df7f5efa6ef05f5e2360945aa86ff6de02fc6a01f1e6715cbb61ced0c1e737c300965835fb08727b926852c5b71c0cc3d56c1171f1 SHA512 b8afba13da3e598b6493459298e395c0ecc06538733916659191bd5c5c22f40b0e296853ad940c16a6d492fcf46b2daf490ee589661d391e2c7cd1deb84da756
+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 1310 BLAKE2B bcac1ef3be8f944a61d18e222a4f39e402104159a2d92e90667f2f744fd32ef44c8615b941e56979b1def3ae80df58e570784ba877683903c600e82312e05a41 SHA512 6e6b28103c8283408261ed1b252fe4cfdae5951bd0909fed65ade3e0f76104f34eb33567bd9a1d42763c7689928ab40393d8c2180fb33b93c74f15c602049f09
 EBUILD pytest-mock-1.6.0.ebuild 1082 BLAKE2B 3bbb3cde15139fa3c9134250de2419623161f53a69689b64dfab6f81f73c4c1afa6001c0f8ba119376ebae6881f16c4f9a117609e0d6794aaf30cb4efc4be553 SHA512 c71cfc5c6c35799529fa21e9f0341dc5178bea61a7f6975a779c677dec3dad3e94540236839c5547a5ca179cb0cb16121cc3d0c17f7409c1812ef0312fe3c551
 EBUILD pytest-mock-1.6.3.ebuild 1053 BLAKE2B 4525429f621c5d06d9ec07ecfb14b429ac52fa7861168024d0d832449aa184ef04a5c331157cf10befe30c5902299741b2019326d2f197d080a6313388a42901 SHA512 ba49f51d47920280f96a9697c0ec81f14133019fa50b0bb43985a69908d56d6fc6ed7f1c12ff8e4c898de666f1a673216da802834f48420b0af14d77d9631a42
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
new file mode 100644
index 000000000000..9abdcee85b10
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
@@ -0,0 +1,39 @@
+# 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="Thin-wrapper around the mock package for easier use with py.test"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+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}]"
+
+src_prepare() {
+	if has_version dev-python/mock; then
+		# test fails when standalone mock is installed
+		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
+	fi
+	sed -e 's|^\(    def \)\(test_failure_message_with_no_name(\)|\1_\2|' \
+		-e 's|^\(    def \)\(test_failure_message_with_name(\)|\1_\2|' \
+		-e 's|^\(def \)\(test_detailed_introspection(\)|\1_\2|' \
+		-i tests/test_pytest_mock.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH}
+	py.test -vv tests/test_pytest_mock.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-pep8/Manifest b/dev-python/pytest-pep8/Manifest
index 92d35612bb0f..244c698cdbc9 100644
--- a/dev-python/pytest-pep8/Manifest
+++ b/dev-python/pytest-pep8/Manifest
@@ -1,4 +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.ebuild 710 BLAKE2B adb99416ca9130406105b5d60d31445eb88f62578cddef5778373f39e79e99bdc961f1f6a00ba89a703402b2f14154865afa0b05311611feecec98b87bf426f9 SHA512 2c72b1fb61d026f0614bfd63055acbef7af230a0d81a61766acbfe7437fe459d58cf7cee325d343e68d3664ebac9ed167959bddf147cb17b75ea4f5e636a308a
+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
 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
new file mode 100644
index 000000000000..bdf4a19b0b68
--- /dev/null
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
@@ -0,0 +1,33 @@
+# 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="pytest plugin to check PEP8 requirements"
+HOMEPAGE="https://pypi.org/project/pytest-pep8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pep8-1.3[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+	dev-python/pytest-cache[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/1.0.6-MANIFEST.patch
+)
+
+python_test() {
+	${EPYTHON} test_pep8.py || die
+}
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 56e5400f118d..75c30cd94505 100644
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-pylint/Manifest b/dev-python/pytest-pylint/Manifest
index 8cca9f0bdc40..b5809b9cee44 100644
--- a/dev-python/pytest-pylint/Manifest
+++ b/dev-python/pytest-pylint/Manifest
@@ -1,3 +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.7.1.ebuild 1013 BLAKE2B 616eca3a79636d7149781288c2e726b8696dc5aad74dda295872b740af38668fd24db02212adb126b82443a291e5a40c8c1e4b534fbc5b4ae6677013c9659a90 SHA512 c2602171bad9bb6ab3467f9b6968f5be458ff8b8d76e3fd2a0e67c6f28dc99aeeb8bc914ad34a68d76f941bd7e010bf22c7e824c0104af62c5e8494bd6419ad6
+EBUILD pytest-pylint-0.14.1.ebuild 1051 BLAKE2B d4874d3cd88183085f09656d6935e72788212ed4776034baf72746b6ff6222595495382b278f8ddb7626727067d4a4505f3de17107622461e57e831726c09f5b SHA512 e21b7021cd510481065f1e4019600e7c54efe2753e0145e767166508e925342305b359f94f5ce513aa8e1436f70854938850278e3608360d1a5dab8093dcf757
+EBUILD pytest-pylint-0.7.1.ebuild 1015 BLAKE2B ff47e2e7893628bc3b74c3ba1b7ee9c4a9396fa83707c374ca00ef403684ffdab450c962fcf6834de188efa0887247b1b519d4ad33eaa5847a54b68958d68b92 SHA512 c145f3ccfd63a3ca178cfbc2ebcaa7f506cf08a0fbc72d91a232509a5797c277a351fe9644d48145a196af7192821e94d2fb329b06908e01c2e3c62bef862f4c
 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
new file mode 100644
index 000000000000..4e165ea01922
--- /dev/null
+++ b/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
@@ -0,0 +1,38 @@
+# 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="pytest plugin to check source code with pylint"
+HOMEPAGE="https://github.com/carsongee/pytest-pylint"
+SRC_URI="https://github.com/carsongee/pytest-pylint/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-pep8[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# pytest grabs the options from tox.ini automatically
+	# but setup.py does not declare pytest-pep8 as a dep,
+	# so it's missing from env created by distutils_install_for_testing
+	sed -i -e 's:--pep8::' tox.ini || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
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 908603366e42..af94d60d1cb8 100644
--- a/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
+++ b/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin to check source code with pylint"
diff --git a/dev-python/pytest-raisesregexp/Manifest b/dev-python/pytest-raisesregexp/Manifest
deleted file mode 100644
index 75da0d1ab318..000000000000
--- a/dev-python/pytest-raisesregexp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-raisesregexp-2.1.tar.gz 3159 BLAKE2B dc1d45be8758c2e79e9dece38b6499d4d6e797e38dc4be58e9ab8fd67321683884a1f510107b1d0c3578e04d8364a939dc7528c6873457e0a5a2c104f1fb1659 SHA512 2d54413c3e5e1aa203738d5b1ad67cc478a0e57a5d5340908bee7d1da23702f52de45e6b7503b7122075733bde2b83080b20d563d4a485688dd889c7e1421130
-EBUILD pytest-raisesregexp-2.1.ebuild 736 BLAKE2B aa9e2e1568b9cb227cb1a8b5cdf161e3902e95ca38f94e567faec24743a80360b35944b0ea34662488536afc66d9dc483ed4905a02ef300803b0e52f08d70406 SHA512 8909bd0372cc0805638f93c2da5703d7f47a53f3253e894693d9db63fa0024d75c347b76122a4c09a430f227f2b02b601064fc2692333576dcb9d7c44ffa3dc3
-MISC metadata.xml 314 BLAKE2B f3621cac9b53d89969c5fb58a89270ab749940b7a2f000fb49d58048db09a0b7790f629d0b9c36de84623aaf9d71f6d45c8383c673ec934478f5c1adff697297 SHA512 9f54110185186f2837705670bab47bc66e256d87743724e83cf8bf7130575bcb3c537a67a8979c0da91f72b5d633724c110b5ca56372d9bd29fbc648e1789ffc
diff --git a/dev-python/pytest-raisesregexp/metadata.xml b/dev-python/pytest-raisesregexp/metadata.xml
deleted file mode 100644
index 2b89d8053b82..000000000000
--- a/dev-python/pytest-raisesregexp/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="github">Walkman/pytest_raisesregexp</remote-id>
-		<remote-id type="pypi">pytest-raisesregexp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.1.ebuild b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.1.ebuild
deleted file mode 100644
index caf8e246daee..000000000000
--- a/dev-python/pytest-raisesregexp/pytest-raisesregexp-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=( python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Simple pytest plugin to look for regex in Exceptions"
-HOMEPAGE="https://github.com/Walkman/pytest_raisesregexp"
-SRC_URI="https://github.com/kissgyorgy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${CDEPEND} )
-"
-RDEPEND="
-	${CDEPEND}
-	dev-python/py[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	distutils_install_for_testing
-	${PYTHON} -m pytest || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 8f01e5010091..ef8d04ba5be4 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -4,6 +4,6 @@ DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4
 DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
 DIST pytest-5.0.1.tar.gz 949744 BLAKE2B c949f0fb6bc0d1430ec7c780537f8aee8ca1ebea5f89035d882434236c6af7d431a610774dbafa93552406e38852627a9f949a6f9198a792de9371efadb4f6ff SHA512 92f5feb263a8708ef6cb8f4565688620b6bfeaef23536cfd24b9bc09515e37fdecd7fa8bcaeeb0775c0be1d8e9dcbd9a56e52f97fb13dc98116efc0056f870db
 EBUILD pytest-3.10.1.ebuild 2430 BLAKE2B 09a0bed17f8118487513408af620c233bdd3b7bc5f8ffb4b5b66becadcc4666393c9bb8783dab942ceeb5de4920a6f22aa2eb91d64f9e5fafa41422df298f75f SHA512 9c11e625e4526cf42bcc55a3ebd9ec1f9066d531ed4fff515733c983e379f32df7854d891a55fd5578276ca102b964ac1647e4f5f9c913a46cb2f21d677d5362
-EBUILD pytest-4.5.0.ebuild 2067 BLAKE2B 541b90c2eabe42fce024437e6c2a75989e4e69ec92e2ede9cb834e06653ab2a39278b3a04bdc3a6870e257c5b0af329fb93fcc453ad40ea75aab9f43945db848 SHA512 7ac11f365b05e5cd3b8eb811811d7a415791e440c0bc6d56a0a6287afc5cd61a1d5436a128a58ef7610a9c9a9eaacd10b0bf2932180deb879ba5548610d2082e
+EBUILD pytest-4.5.0.ebuild 2073 BLAKE2B 22c26d78b8e79da4bf2c63e76278257013a8d99a08d8cdeb7df0ec3af8c38a91451eb2052b736d2ed38eaff3e366839963e74989f8ca559bcb846d6e09bffaec SHA512 cf77ec627ad993bf2cb2cc4f1ffd3a6e1f80cb0e7376071793b1682746bb01dd1aa4a7c2106826cfbabb42702c36c39acca6fa2389bce4cde880004f407acd03
 EBUILD pytest-5.0.1.ebuild 1923 BLAKE2B ad6e07b32be669d7225fcb1c9d396c01a601130cb8e2b6a5f06485ee0a1778ee4580ef3d03f864561b99fd2eb91c9421acb3dae426f32a12f9c7acc8af36c4f0 SHA512 5bfb419b68015969f62ccce3c4579d4175ae1937228741dbf1c2a97f3e1828870333446623ec6e3c42cd57a049b5386539ab7479584e2e9030276309098477f2
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
index 4777368331e8..fbee5f5f5373 100644
--- a/dev-python/pytest/pytest-4.5.0.ebuild
+++ b/dev-python/pytest/pytest-4.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index 48f12971de5a..ed4b3ff1502a 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,7 +1,5 @@
-DIST python-augeas-0.4.1.tar.gz 89652 BLAKE2B 571c67fd6f10b209578eed7b3a7a1d628b8a23fa0cea81f3f6569031a36ce08536a03b714f13c0c3cc8fbe2727ff385b88eff81d498700ea6ba9197b4e31bf01 SHA512 ccd6ea10f927f06eba74dd48c21c7ca9a99c2910741ef925f078c09cd8a3421e63de3b74df2903a2cfd17f3defaa8df4624c9743d20e13bb5bfeacd7d50c5938
-DIST python-augeas-0.4.2_pre131218.tar.xz 77636 BLAKE2B 033063d449b4c5ec2daa7a6266a4cf378be1964509c77d0d02274b7e70c70d245db5139dad582510aa2cf71e12d43d258855d45f8137e1bf843a99f79af3f8a7 SHA512 3677dfa4d7b6bbb22009ebee4ed4b46e50f7e5712354f5061476d5d21c86b956c4408f5ca005b674ad0e14e26c970830572aa077af6bb594dbff116991676e86
 DIST python-augeas-0.5.0.tar.gz 90667 BLAKE2B 5d563350c3f80db45aad87326c445e93e3563ca6eb8de17889cdc91735c61dfcf0fda4e93f15c0d450ee156d57cb71598f32cdce6f6716b0fd610b793f103641 SHA512 d93d9e21c720084ee3c1841a2172dd1a4cfb41e668de0f557bd214efd65e685a1e5fc713a7d34e0fed727fe908bb1e8a09a1c10587bc27f3708cbcdee575cc51
-EBUILD python-augeas-0.4.1.ebuild 513 BLAKE2B 7b0c1f9f0dd86d93582b08514dbbf7aeadd70067b1665e0ce844a46d41e290859ad865b3b6324b21d543afab1a38b08bdf7c091af9d2d01b13bc1b3a93c052a0 SHA512 97e9201ecf56a5a9d4b7683099c11ae81c9a3f85ab9304c97fe27ccc73066feac6978e54ed89c3e1f28f62568606ec3f8d8a90fc8007d2ceb6717413be70d201
-EBUILD python-augeas-0.4.2_pre131218.ebuild 563 BLAKE2B e478f4ec00695b4f19846f54a5ff7159f03d2d614f11edbccdbf27e2b46d773e29b982a46cc280265fcdac8e2ef1804531f16bf03af80cfa3c27bb3e36287066 SHA512 17a7094a51d5c9f9ddd179dd8140e71dd7f917609e93660c45b88712d359e6f4f6bb286adbd6273652a0c8a22853f83dd575cc8bd1ff9abecbd39f0885fd6162
+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
-MISC metadata.xml 417 BLAKE2B 33e8c4549ea1d67e4007731ada6037aea72697414df3cb17a532c700670a8b47188b29726d41c888d840415b16c72cb1662ea552b73a5c96ec5ee3fc2e4b7009 SHA512 54f17c94e464ce5dde8dfc1135ea90b95ced67eac61f39a2b9e653740463396d2a564753d488e390bcec08b3e4360e92a71ce2ef5c1e1050738e71e61d27d10f
+EBUILD python-augeas-1.0.3.ebuild 557 BLAKE2B 6e2915ec3dee1effe92fb56fd9e04b6953037041cf42ae36ecb643a12f88c7fb6199d684030a9a8f6bb0e7947a18d9a0d356cb78a5b31f1f16f0788d1da8c015 SHA512 8eaa3f4781da80b1b9601620fbd7be633cc99dbcaae3fe35ef8376d56ac1f2634609359bd9b701c6cfe63490217491f43261a930ba262602e01d6a96cdd0597b
+MISC metadata.xml 486 BLAKE2B 8d3580820dd340e0021d4d016032e50741f1e975abeaea318433540848a62f67b24c00cb510da00f5c4e4890a153c899fc479c56b8a0fd535fecd059e9327d29 SHA512 8b95d59d81d418b1cd7ee5d95e445be02db004a3443d8aa6d610e03400d15ff0718a4295e8cb477f1da28b70e32fefd2e26ebe4c2eb75601c907440cfec91102
diff --git a/dev-python/python-augeas/metadata.xml b/dev-python/python-augeas/metadata.xml
index cdd8abd046a2..08cc0a07f306 100644
--- a/dev-python/python-augeas/metadata.xml
+++ b/dev-python/python-augeas/metadata.xml
@@ -9,5 +9,6 @@ python-augeas is a set of Python bindings around augeas.
   </longdescription>
   <upstream>
     <remote-id type="pypi">python-augeas</remote-id>
+    <remote-id type="github">hercules-team/python-augeas</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/python-augeas/python-augeas-0.4.1.ebuild b/dev-python/python-augeas/python-augeas-0.4.1.ebuild
deleted file mode 100644
index 2fba8bd08a00..000000000000
--- a/dev-python/python-augeas/python-augeas-0.4.1.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 bindings for Augeas"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-admin/augeas"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS README.txt PKG-INFO"
-
-python_test() {
-	cd test || die
-	"${PYTHON}" test_augeas.py || die
-}
diff --git a/dev-python/python-augeas/python-augeas-0.4.2_pre131218.ebuild b/dev-python/python-augeas/python-augeas-0.4.2_pre131218.ebuild
deleted file mode 100644
index 1cd7d8cba9ed..000000000000
--- a/dev-python/python-augeas/python-augeas-0.4.2_pre131218.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="Python bindings for Augeas"
-HOMEPAGE="http://augeas.net/"
-#SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-admin/augeas"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS README.txt"
-
-python_test() {
-	cd test || die
-	"${PYTHON}" test_augeas.py || die
-}
diff --git a/dev-python/python-augeas/python-augeas-1.0.3.ebuild b/dev-python/python-augeas/python-augeas-1.0.3.ebuild
new file mode 100644
index 000000000000..10b466c7506f
--- /dev/null
+++ b/dev-python/python-augeas/python-augeas-1.0.3.ebuild
@@ -0,0 +1,25 @@
+# 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 bindings for Augeas"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="app-admin/augeas
+	>=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	cd test && "${PYTHON}" test_augeas.py || die
+}
diff --git a/dev-python/python-consul/Manifest b/dev-python/python-consul/Manifest
deleted file mode 100644
index d026cea7edfc..000000000000
--- a/dev-python/python-consul/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-consul-1.1.0.tar.gz 27548878 BLAKE2B d048419b1e1a29dbc56b0b24aa4da011c80b0a9aa5b46cf6e0dc6c7156e7a53a51c9f58ce1dac942236c7a16aec6c6c5f52d214eb52f3d87762fff4fae162a8d SHA512 502baea07753efcf4012e2a337acaae78be60c2ac7a36d3ad50054259db71ff6297acf76314659d2c3cf9b1ff3a2d609244f07c0640b51623a76f8244880b890
-EBUILD python-consul-1.1.0.ebuild 814 BLAKE2B d73f3afde02b727c992af3c31d44922da439abe15577b8fb61a847b6821b3dcaad8d2fb5c66a544ae4b4501dc900c7644103e5c3dd291408ee849319887c9eac SHA512 c00a759c9af7915a79f0f05e1eafa8965cf1eac9e6a95f2a1945ba259142caa468c44fa1215a54611d96b0c500cb3c447382ac8e8a55e4c72574e1564e5dac47
-MISC metadata.xml 260 BLAKE2B 55654cd1e26710005b22dfdc0bd7b45e9b6f60798b3f573203c1cdf289941847d53d486861847a9b9d9e937d18d8cec2160247e300c9439c34f966a7f6b4f630 SHA512 21153691bfcfec2516b88d586217aa630add060e1d9132c1e1f319924752a74a1f1ded24df120ff35219d871f7817930097219a0ebd227880caa2986f9aae8f3
diff --git a/dev-python/python-consul/metadata.xml b/dev-python/python-consul/metadata.xml
deleted file mode 100644
index 84a921104f37..000000000000
--- a/dev-python/python-consul/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">cablehead/python-consul</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-consul/python-consul-1.1.0.ebuild b/dev-python/python-consul/python-consul-1.1.0.ebuild
deleted file mode 100644
index 414d22a70c4d..000000000000
--- a/dev-python/python-consul/python-consul-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python client for Consul"
-HOMEPAGE="https://github.com/cablehead/python-consul/"
-SRC_URI="https://github.com/cablehead/python-consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-	>=dev-python/treq-16[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
-	${RDEPEND} )"
-
-# needs pytest-twisted
-RESTRICT="test"
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index 1b53d964fe90..53d3e2b5f8c3 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,3 +1,4 @@
+AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch 3527 BLAKE2B eb793ad1ec92a944445a405f323aae660031d63db7612856265c1afe339db4b05f40f2d6c94f988d47dd769b7835bdb2d438718a1eb6d192c3213ee7f055fc86 SHA512 e0c48ed24aadd457cddc98f30965bfebb1b9c9b6f8921fb43d065877cb1344ee7f0d0ba157f9090e2190419f04470e7acbd34c388de07e3e8b586ded7012c2a0
 AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata.patch 3504 BLAKE2B b26810c285257c14eec697e7529c3a85c637619dc19979a48b16b0ce45780041e84946748b30b048de84f5b35bb320dd7f79a22a13f42954433ad7ec7f3286a4 SHA512 37ad4c6630b0055a57704b375e6fa869c87a16b0d5d6c79bf77dd5cdfd7aeac56ad696e5a8acc5028b34dec35b932fa76e9fa8b26095cd369508af3386d3f89c
 DIST python-dateutil-2.6.1.tar.gz 241428 BLAKE2B 93b1d43dacdfbf528b085864b04231c1a34b37b23bc64a58a0733f53ace0f7e0258ca58fbc725dc2aae15eebe8ed1f555b02862a4dfd360014e7ee9aa8d6a9f9 SHA512 f16dd29fc975629f594dd2683a525e2a86acb020bf8962558d19040b14ac6f19d4ab07a910d6bb55c9db3cc02b5472774a3a05ccc86cf624ca5e5144463646db
 DIST python-dateutil-2.7.1.tar.gz 298061 BLAKE2B a6bc2a3bf83ff234ddc53db5a3353b19303dd9e0c6d2d702537643e134508f96ccc69b962fd957d4cc754b07cd24b3c3c2ce07becc0add7db925b841d6a32b5d SHA512 3dbadeac3dd22bf51279c4237df96a925ed4063384a82e756a41e314c216751f2c90f8909a20ba96fdb065966034e9c7e40c1ea152876ca733a2176893c4deb2
@@ -5,6 +6,7 @@ DIST python-dateutil-2.7.2.tar.gz 298000 BLAKE2B 4091108b125eb080809c74cdb53daa2
 DIST python-dateutil-2.7.3.tar.gz 302871 BLAKE2B 8b6cff6f977d52b64665f33d10513a638addada91a00192eb1f522aa9b239d5fb051bff3cfb837871ea61d7ab69994cfe5b42bb3b00851b5f15368c26db06fd7 SHA512 6b9973fa7db69d931bc6e772201c67bb7bbfa693ba35484d34960bd7e6227f2a2343df814a9fdbbff253e750299c48e7cdb2a609bf4522595df8a7fc595784fd
 DIST python-dateutil-2.7.4.tar.gz 302229 BLAKE2B e2a43d8587f895a9a72ca5ab5c18a5c471497c8f8e89459450219e9f5ecb55223f36f219d77df8da4c04d55fb5feb3a17f9a5c2318c077dac4307da7c0bd9645 SHA512 3b02b397e3138dc755f34a2f7a50464f96a73b7be1f335ce7da3fa99e6d59f34a0643dfb1c933d4ef4fbaab88364fab6e760e4b1e7040b8cbbfebdd75e7e9a4f
 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
 EBUILD python-dateutil-2.6.1.ebuild 918 BLAKE2B d0333292ce21e4148d57a6abfcc9581c16905dad6ec7b9afbf67163454934eadb3cf78952e74f83e1aff6e9aac695a07d94456fb3be0d4c80b6f3c201bccc25a SHA512 271e22378c8a0404e420a64467fde4884e481c278a3bb150c916e5256a63bc3a99cb10355a9ca6fa146dd8a9560bfabde9e0fa37f1399a920e8e5034e3ad0f77
 EBUILD python-dateutil-2.7.1.ebuild 1105 BLAKE2B 5765b9b8d6dc90e37e30c0486cc98f5dcac0490d13912f67c53449a9338dc6501f3cab09a79674f940f8c4b27b92a3b1958f6bc4edc45a73a4a4e885dc192e60 SHA512 85ea14ba79e78b729ba2b5a70a7cce8c26092a50d189f7fbe247bb472081725569072e5a30c66b6fafc7f53de6f9ffa1b9c9e1b4892308010297d8f335e52ff9
 EBUILD python-dateutil-2.7.2-r1.ebuild 1189 BLAKE2B ceca9f7ca0085e3cf5d10e47f859ae61ee0e40ca9bb858feb0838802d6c3d9e203abf4452928bcaf1a5120d70a6c82b87c7ed51dd008609ba537e4f553d4d431 SHA512 38d9f695e5b13d56323b712d34f49e76c88dd42091e801eaf9d60ba649c2724c2f6f199ee7b414b8504d22d62a4e053109a2b5b699fcbf1349b1b7795af2a3c7
@@ -12,4 +14,5 @@ EBUILD python-dateutil-2.7.2.ebuild 1105 BLAKE2B 5765b9b8d6dc90e37e30c0486cc98f5
 EBUILD python-dateutil-2.7.3.ebuild 1200 BLAKE2B bb08ab86d4c73d72463a90c7917b78027fe4b6d26ed7face81b0725d4daf8912792e2afa02a7a88e214a9dd9d9e0a30e60011e953998b2cf5bf7aa6e1f76643f SHA512 0bd7a2cc33b4c343b597fcd8aa30f2626d6cd448d082a6c502276e6895d735f63f72606be7c5033058025012b6d3a90eaa9695c5d76c7f09d88c9680ac1f51b6
 EBUILD python-dateutil-2.7.4.ebuild 1242 BLAKE2B 04a67911289a967cf11b02b354d5c47ae2b70b7c658d8a949e93df479432a8f1b1552f85d0d34510100d137159ad425b199c799ae670e61b4ea3cd47fd1abd85 SHA512 7cfce82e1c081055b3c2af4b7adf973042d780c9eb5afcf9afc086cf8fc43205d02ae536fd9bb64cc5a7bfa4d6616edad921356cb6ed671b841d9b3ff5af1966
 EBUILD python-dateutil-2.7.5.ebuild 1242 BLAKE2B 04a67911289a967cf11b02b354d5c47ae2b70b7c658d8a949e93df479432a8f1b1552f85d0d34510100d137159ad425b199c799ae670e61b4ea3cd47fd1abd85 SHA512 7cfce82e1c081055b3c2af4b7adf973042d780c9eb5afcf9afc086cf8fc43205d02ae536fd9bb64cc5a7bfa4d6616edad921356cb6ed671b841d9b3ff5af1966
+EBUILD python-dateutil-2.8.0.ebuild 1245 BLAKE2B 35d1e718606c8f0ae89dbd41e57fd2bea2d486bd86b880c24826f33a9821b6423bf4e4cf7aefe4380c3b64a8d53800a49e576b9c3712ee24b1820aad241be936 SHA512 3a2974357443368d7c82454356223c76769fa76b170586a1c9f539f0bdd8a798aa70c0fabd741706ad36e423426e81cb0fa1d81380c9cf7bc24d154181051b1c
 MISC metadata.xml 603 BLAKE2B 1bf49feeeec3ffc2f767228a84b3f9edf53cf44d8a1df3fa8f85798c0d3ea8f448d6113d425baa6b4b342b88746133d2770b951488d602dbb175f5ff9a99ea36 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439
diff --git a/dev-python/python-dateutil/files/0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch b/dev-python/python-dateutil/files/0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch
new file mode 100644
index 000000000000..a937e6600a29
--- /dev/null
+++ b/dev-python/python-dateutil/files/0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch
@@ -0,0 +1,104 @@
+From f48e70ae846c161dfbfe6ddb36e4bcad4427ac8c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 3 Apr 2018 22:03:32 +0200
+Subject: [PATCH] zoneinfo: Get timezone data from system tzdata
+
+---
+ dateutil/test/test_imports.py |  3 +--
+ dateutil/zoneinfo/__init__.py | 25 ++++++++++++++-----------
+ 2 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/dateutil/test/test_imports.py b/dateutil/test/test_imports.py
+index 2a19b62..97d07e4 100644
+--- a/dateutil/test/test_imports.py
++++ b/dateutil/test/test_imports.py
+@@ -158,9 +158,8 @@ class ImportZoneInfoTest(unittest.TestCase):
+     def testZoneinfoStar(self):
+         from dateutil.zoneinfo import gettz
+         from dateutil.zoneinfo import gettz_db_metadata
+-        from dateutil.zoneinfo import rebuild
+ 
+-        zi_all = (gettz, gettz_db_metadata, rebuild)
++        zi_all = (gettz, gettz_db_metadata)
+ 
+         for var in zi_all:
+             self.assertIsNot(var, None)
+diff --git a/dateutil/zoneinfo/__init__.py b/dateutil/zoneinfo/__init__.py
+index 34f11ad..e9870ca 100644
+--- a/dateutil/zoneinfo/__init__.py
++++ b/dateutil/zoneinfo/__init__.py
+@@ -1,6 +1,7 @@
+ # -*- coding: utf-8 -*-
+ import warnings
+ import json
++import os
+ 
+ from tarfile import TarFile
+ from pkgutil import get_data
+@@ -10,7 +11,7 @@ from dateutil.tz import tzfile as _tzfile
+ 
+ __all__ = ["get_zonefile_instance", "gettz", "gettz_db_metadata"]
+ 
+-ZONEFILENAME = "dateutil-zoneinfo.tar.gz"
++ZONEDIRECTORY = "/usr/share/zoneinfo"
+ METADATA_FN = 'METADATA'
+ 
+ 
+@@ -19,12 +20,14 @@ class tzfile(_tzfile):
+         return (gettz, (self._filename,))
+ 
+ 
+-def getzoneinfofile_stream():
+-    try:
+-        return BytesIO(get_data(__name__, ZONEFILENAME))
+-    except IOError as e:  # TODO  switch to FileNotFoundError?
+-        warnings.warn("I/O error({0}): {1}".format(e.errno, e.strerror))
+-        return None
++def iter_zones(topdir):
++    for dirpath, dirnames, filenames in os.walk(topdir):
++        for f in filenames:
++            if f.endswith('.list') or f.endswith('.tab'):
++                continue
++            fpath = os.path.join(dirpath, f)
++            relpath = os.path.relpath(fpath, topdir)
++            yield (relpath, tzfile(fpath, filename=relpath))
+ 
+ 
+ class ZoneInfoFile(object):
+@@ -48,7 +51,7 @@ class ZoneInfoFile(object):
+                     # no metadata in tar file
+                     self.metadata = None
+         else:
+-            self.zones = {}
++            self.zones = dict(iter_zones(ZONEDIRECTORY))
+             self.metadata = None
+ 
+     def get(self, name, default=None):
+@@ -99,7 +102,7 @@ def get_zonefile_instance(new_instance=False):
+         zif = getattr(get_zonefile_instance, '_cached_instance', None)
+ 
+     if zif is None:
+-        zif = ZoneInfoFile(getzoneinfofile_stream())
++        zif = ZoneInfoFile()
+ 
+         get_zonefile_instance._cached_instance = zif
+ 
+@@ -140,7 +143,7 @@ def gettz(name):
+                   DeprecationWarning)
+ 
+     if len(_CLASS_ZONE_INSTANCE) == 0:
+-        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
++        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile())
+     return _CLASS_ZONE_INSTANCE[0].zones.get(name)
+ 
+ 
+@@ -163,5 +166,5 @@ def gettz_db_metadata():
+                   DeprecationWarning)
+ 
+     if len(_CLASS_ZONE_INSTANCE) == 0:
+-        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
++        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile())
+     return _CLASS_ZONE_INSTANCE[0].metadata
+-- 
+2.17.0
+
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild
new file mode 100644
index 000000000000..52b8a8decb78
--- /dev/null
+++ b/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild
@@ -0,0 +1,50 @@
+# 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="Extensions to the standard Python datetime module"
+HOMEPAGE="
+	https://dateutil.readthedocs.org/
+	https://pypi.org/project/python-dateutil
+	https://github.com/dateutil/dateutil/
+"
+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"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	sys-libs/timezone-data
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch
+	)
+
+	# don't install zoneinfo tarball
+	sed -i '/package_data=/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-dsv/Manifest b/dev-python/python-dsv/Manifest
deleted file mode 100644
index a36a1c6629ca..000000000000
--- a/dev-python/python-dsv/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST DSV-1.4.1.tar.gz 14682 BLAKE2B d34b2d72f2efa2d7aa11dd99ce1e891d3663649a47fea1538faa086806bbd1e3ed578143c870b4a76ab7f2ac76f3cb46b50b64d026655a1c643a2081276dbd5a SHA512 c26df1efabff9e70b6dfd17f6ff928f022ad19cfa39af431ef7ac663687e8d80406b0ad471376e238eeb6fcbab31aa2a84eaeae2949173e22316eb92e51f7ada
-DIST python-dsv-1.4.1-gentoo-patchset.tar.bz2 5259 BLAKE2B 3367d27bddcb7274dde2429147495f9c46c40e421034234ddc19ac1bb064d118289249ec575a51057008e0808f4d431c54a6792df60c10408dd55898421f3160 SHA512 c36335e5a6e423c53a9edec9dd795054e77b81a638d774a445bf1b621119c703064892eaff7ec67f85ce7e693af1156c39b3e60faaa5a800c1eca28ea7544f98
-EBUILD python-dsv-1.4.1-r2.ebuild 801 BLAKE2B 25d6a0181db9fece93c63983a745e8da3f99b89fb47320a0ac60865390ab3974c65e073e0b7b02e4dbb4353b85c6374a466750f8bacf3f358e41bb5e94854a4b SHA512 b258980d977cc4aa7892538d7b9cc4d99e60d8be0b863fad0eb313f80482299636e2782bc7178f67a2c127529e15a25c854225af29d4fe81ee0087289f417341
-MISC metadata.xml 501 BLAKE2B 62742bcd65f6d25178f1360ca3f9666292786342fd8eae2ae706bea30a0137b5614ca0c018eebac66352fdc19eca680e01eda34f0abe687ef8b47ca4abab7cff SHA512 e8094c00b37097b8f255a6f2ab3461340fcec715bbe63957369f2ee4c60c4e246ba53f3dcf0edcb248937e70316ef9c4c2ff3c2609c2f79ccdd485ceb54918f1
diff --git a/dev-python/python-dsv/metadata.xml b/dev-python/python-dsv/metadata.xml
deleted file mode 100644
index 0ae34c0a45ea..000000000000
--- a/dev-python/python-dsv/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>Python module for importing and exporting DSV (delimiter separated values) files.
-DSV is a generalization of CSV (comma separated values) and it is a common file
-format used by many programs to import and export data.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">python-dsv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-dsv/python-dsv-1.4.1-r2.ebuild b/dev-python/python-dsv/python-dsv-1.4.1-r2.ebuild
deleted file mode 100644
index b9159dd4d24f..000000000000
--- a/dev-python/python-dsv/python-dsv-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,30 +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 module for importing and exporting DSV files"
-HOMEPAGE="http://python-dsv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/DSV-${PV}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
-
-LICENSE="CNRI"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/wxpython:3.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/DSV-${PV}"
-
-PATCHES=(
-	# From Debian
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-env.patch
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-unicode.patch
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-wx-namespace.patch
-	"${WORKDIR}/${P}-gentoo-patchset"/${P}-wxpython30.patch
-)
diff --git a/dev-python/python-gudev/Manifest b/dev-python/python-gudev/Manifest
deleted file mode 100644
index ed8206140260..000000000000
--- a/dev-python/python-gudev/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX automake.patch 210 BLAKE2B 4691012ba55e2d8534701ea7e2b083691259cb9514d79df70c94b60e3ce14c8a29071b4bf6c8bd8cee372af23ea49ad058298292f0414ccf13b6da1bc2ef3039 SHA512 14e23d7427a35946bf0b6e80f9a98b3240d91a9e40b41043f5cdf2faf90fd4f95af5e07b34d7bc4d8f38b1e541dea64d7ccde0d365c45cbfa102995501abdeb6
-DIST python-gudev-147.2.tar.gz 10111 BLAKE2B 52e5a87ec27c308a0e2679996187702d0852c1b173b477a51dbb6b4dfece69c7c4acb215f88432e85b1a31cb65a7b89246e4fe44ece18fd61898f62cebcb07b6 SHA512 a022df2989154ac5f358df7ff33d6f976cae4d005756c3b73937e0668751b923a29c3e1f813e89a7297653df7744f10207c2bb33d2a6816470ea2ca10975493f
-EBUILD python-gudev-147.2-r1.ebuild 1019 BLAKE2B 53f04f71a75c247fb6b19a3d091888f04cd32ebe69e18c45bcc267c05542c7e6bad68e144805c50bf012c8dedde0bdacdb774cf835cf4cb9a45f11034759cf6e SHA512 7d609b0338d015d4557b10e00facc2f46d48c4e10fb203b184f3caa4708e86c03139e356c7515cf9940688ebc6c03039dfc493abdbf7f70fe1e34550cb443e86
-MISC metadata.xml 249 BLAKE2B ce43f0670028937165ae8e9203849d8d45031fa55581f0ac4e3af4c498c96bede72d4333abf6dfc251738c8767f0511afbfb794917f16ad338080e04bf97ed1e SHA512 184548c150dc06fa334ae7e2efaa90a176d4dab5a04c0d3afe034bc4207272438041e814fba7f1c305beb154800c12d6d73c2fe04c76e83f1b11e305b5aea7be
diff --git a/dev-python/python-gudev/files/automake.patch b/dev-python/python-gudev/files/automake.patch
deleted file mode 100644
index a25c9e4fd31a..000000000000
--- a/dev-python/python-gudev/files/automake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.org.ac	2013-05-02 00:22:58.181214757 +0200
-+++ configure.ac	2013-05-02 00:25:00.463686016 +0200
-@@ -8,7 +8,6 @@
- AC_PROG_MAKE_SET
- 
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_HEADER_STDC
- 
- AM_PROG_LIBTOOL
diff --git a/dev-python/python-gudev/metadata.xml b/dev-python/python-gudev/metadata.xml
deleted file mode 100644
index 4d742adbfbd6..000000000000
--- a/dev-python/python-gudev/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">nzjrs/python-gudev</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-gudev/python-gudev-147.2-r1.ebuild b/dev-python/python-gudev/python-gudev-147.2-r1.ebuild
deleted file mode 100644
index 8e07b1e8ef14..000000000000
--- a/dev-python/python-gudev/python-gudev-147.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=modules
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils python-r1 vcs-snapshot eutils
-
-DESCRIPTION="Python binding to the GUDev udev helper library"
-HOMEPAGE="https://github.com/nzjrs/python-gudev"
-SRC_URI="https://github.com/nzjrs/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
-	virtual/libgudev:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/automake.patch
-	python_foreach_impl autotools-utils_src_prepare
-}
-
-src_configure() {
-	python_foreach_impl autotools-utils_src_configure
-}
-
-src_compile() {
-	python_foreach_impl autotools-utils_src_compile
-}
-
-src_test() {
-	python_foreach_impl autotools-utils_src_test
-}
-
-src_install() {
-	python_foreach_impl autotools-utils_src_install
-}
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 78bf00133db4..06d0e6022a0a 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,7 +1,9 @@
 DIST python-keystoneclient-3.15.0.tar.gz 306850 BLAKE2B 5101f0854d3c9cc2ac2165e66df4fe28f9da64d6a96de2e4c1eb9bac26228d7a987f8149fc32a99a3015f43982f0d664555bc1361ca22c86ab68c2d36776605f SHA512 f02d6efe1563a92c5ae1a374568a7b47e281f3df026168eb8cc8e0b31e5029af6534341738b07423713705df845c63708a8f0f845e9a929c107a3f13dd5f9578
 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 1225 BLAKE2B b714a30ed93b88b76ae9861c3a8097f20b786025d35c1ab236649a3cd148d9c999e02e69636f02b1dc0e65539e18c429b4929bd23987d27217a7e590d7a1dcf5 SHA512 b93ac38d0435798d2adfdef8f551deb6ae5e1adffd49cfa1ad22825f4b3829d7e8f9dad6f72f4af328e7264657f0ab4682c47c80e45fb0df316cacf0cb656841
 MISC metadata.xml 557 BLAKE2B 83a915231d68ba03af636bfafe7a052f567bacf3d746e37093855c78ee1a2bcb11e919924f9aa4a721df0da9b22463ba732de9f9f105cc1ced03bc19ea1fe980 SHA512 5ec4344a761069fd31f8d86351548d0316c421e9a6795b604ece495883587cd8f579f535076cf43eba2114a4cf62eba77a6f96f49bca3a51acbcee6e3d24a718
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.21.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.21.0.ebuild
new file mode 100644
index 000000000000..ba975e3c0cf3
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.21.0.ebuild
@@ -0,0 +1,43 @@
+# 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="Client Library for OpenStack Identity"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RESTRICT="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+#PATCHES=(
+#)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-ptrace/Manifest b/dev-python/python-ptrace/Manifest
deleted file mode 100644
index e0cb4748f1a3..000000000000
--- a/dev-python/python-ptrace/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.8.1-python3.4.patch 4629 BLAKE2B eb1dd9f05b6c5f0e00d6f5dfbd4c04f4633ae8164cf5a4484c75c811cf6826c906b13a38402d015f1faaf469ff0c14fcd98ea81b69e5b9f13beff5ea41b95dde SHA512 3b5c072b55c138c97e9b6456354bdf17c820d448880e0d6bb5ce398b7dfd1bd432f9886da4f8b960578f60e24fb636142bdaa66566ac22e12cda0928753aa46e
-DIST python-ptrace-0.8.1.tar.gz 93674 BLAKE2B b0da886930920936751eae341981a767726e040d399b2ea31ffbd6e0fb38699b4967a0bf0db5169eafe224094f43137cf3ab33b39e61ffe8e7cfa334eec24079 SHA512 1c3dadf381ad0fe30374fe030fc3a81b5ec0885c31ac9be4ae561cf14ff891fc2e465555133b2efce6be0154b06768121aa068161bb3de10aca6df0eb181e25c
-EBUILD python-ptrace-0.8.1-r1.ebuild 825 BLAKE2B 55d68ce8352f7258d2f2fd041c83ce2c577e3e4e77a0e1c057e60767f190d00ff4d691ee8c6725d059856ffb17e795ec9d2804969076fc231726f25f9170f4e8 SHA512 d35f94868cb4ba2243287d9d2393c0f7ceacd7dec823e5c65c81cf4698635a0df6fc82b87f8ab710005961fda7c73a9b270f41f13f5748b30295f764013ca447
-MISC metadata.xml 390 BLAKE2B 345d04672a27ea1910c7da4176635861a037c2d5a5412720acba61f22ed3991ea96fe7d2f9b55d3d05f3712ea05823e2ad0bc5655535a2d45684f288ece7dfa4 SHA512 b9c75af73d22d67c125fafeb5615a03ef21cfa501a275d2139ef49364ba6bdd64c3757194e9dae7678aeff8f0cd4a9233796c907d4cfe6427aa43c6986bffa92
diff --git a/dev-python/python-ptrace/files/0.8.1-python3.4.patch b/dev-python/python-ptrace/files/0.8.1-python3.4.patch
deleted file mode 100644
index 2e6e76f8e6df..000000000000
--- a/dev-python/python-ptrace/files/0.8.1-python3.4.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-# HG changeset patch
-# User Victor Stinner <victor.stinner@gmail.com>
-# Date 1417423044 -3600
-#      Mon Dec 01 09:37:24 2014 +0100
-# Node ID eba1a6dba205559d724d32c80d955a65e078505e
-# Parent  e6fef4231a8a28ef91c1feaf3bfbcbd29822c939
-Issue #17: syscall parser now supports O_CLOEXEC and SOCK_CLOEXEC, fix unit
-tests on Python 3.4 and newer
-
-diff --git a/doc/changelog.rst b/doc/changelog.rst
---- a/doc/changelog.rst
-+++ b/doc/changelog.rst
-@@ -3,6 +3,12 @@
- Changelog
- =========
- 
-+python-ptrace 0.8.2
-+-------------------
-+
-+* Issue #17: syscall parser now supports O_CLOEXEC and SOCK_CLOEXEC, fix unit
-+  tests on Python 3.4 and newer
-+
- python-ptrace 0.8.1 (2014-10-30)
- --------------------------------
- 
-diff --git a/ptrace/syscall/posix_arg.py b/ptrace/syscall/posix_arg.py
---- a/ptrace/syscall/posix_arg.py
-+++ b/ptrace/syscall/posix_arg.py
-@@ -24,7 +24,7 @@
-     return formatBits(argument.value, ACCESS_MODE_BITMASK, "F_OK")
- 
- # From /usr/include/bits/fcntl.h (Ubuntu Feisty, i386)
--OPEN_MODE_BITMASK = (
-+OPEN_MODE_BITMASK = [
-     (0o1, "O_WRONLY"),
-     (0o2, "O_RDWR"),
-     (0o100, "O_CREAT"),
-@@ -40,10 +40,17 @@
-     (0o200000, "O_DIRECTORY"),
-     (0o400000, "O_NOFOLLOW"),
-     (0o1000000, "O_NOATIME"),
--)
-+]
-+O_CLOEXEC = 0o02000000
- 
- def formatOpenMode(argument):
--    return formatBits(int(argument.value), OPEN_MODE_BITMASK, "O_RDONLY", oct)
-+    value = argument.value
-+    cloexec = bool(value & O_CLOEXEC)
-+    value = value & ~O_CLOEXEC
-+    text = formatBits(int(value), OPEN_MODE_BITMASK, "O_RDONLY", oct)
-+    if cloexec:
-+        text += '|O_CLOEXEC'
-+    return text
- 
- CLONE_FLAGS_BITMASK = (
-     (0x00000100, "CLONE_VM"),
-diff --git a/ptrace/syscall/posix_constants.py b/ptrace/syscall/posix_constants.py
---- a/ptrace/syscall/posix_constants.py
-+++ b/ptrace/syscall/posix_constants.py
-@@ -1,5 +1,5 @@
- from ptrace.syscall.socketcall_constants import (
--    SOCKET_FAMILY, SOCKET_TYPE, SOCKET_PROTOCOL,
-+    SOCKET_FAMILY, SOCKET_PROTOCOL,
-     SETSOCKOPT_LEVEL, SETSOCKOPT_OPTNAME)
- 
- SYSCALL_ARG_DICT = {
-@@ -51,7 +51,6 @@
-     },
-     "socket": {
-         "domain": SOCKET_FAMILY,
--        "type": SOCKET_TYPE,
-         "protocol": SOCKET_PROTOCOL,
-     },
-     "getsockopt": {
-diff --git a/ptrace/syscall/socketcall_constants.py b/ptrace/syscall/socketcall_constants.py
---- a/ptrace/syscall/socketcall_constants.py
-+++ b/ptrace/syscall/socketcall_constants.py
-@@ -1,3 +1,5 @@
-+import socket
-+
- SOCKETCALL = {
-     1: "socket",
-     2: "bind",
-@@ -56,6 +58,19 @@
-     10: "SOCK_PACKET",
- }
- 
-+def formatSocketType(argument):
-+    value = argument.value
-+    text = []
-+    if hasattr(socket, 'SOCK_CLOEXEC'):
-+        cloexec = value & socket.SOCK_CLOEXEC
-+        value &= ~socket.SOCK_CLOEXEC
-+    else:
-+        cloexec = False
-+    text = SOCKET_TYPE.get(value, value)
-+    if cloexec:
-+        text += '|SOCK_CLOEXEC'
-+    return text
-+
- SOCKET_PROTOCOL = {
-      1: "IPPROTO_ICMP",
-     58: "IPPROTO_ICMPV6",
-diff --git a/ptrace/syscall/syscall_argument.py b/ptrace/syscall/syscall_argument.py
---- a/ptrace/syscall/syscall_argument.py
-+++ b/ptrace/syscall/syscall_argument.py
-@@ -22,6 +22,7 @@
-     from ptrace.syscall.freebsd_constants import SYSCALL_ARG_DICT
- else:
-     SYSCALL_ARG_DICT = {}
-+from ptrace.syscall.socketcall_constants import formatSocketType
- 
- KNOWN_STRUCTS = []
- if RUNNING_LINUX:
-@@ -35,6 +36,7 @@
-     "mmap": {"prot": formatMmapProt},
-     "mmap2": {"prot": formatMmapProt},
-     "clone": {"flags": formatCloneFlags},
-+    "socket": {"type": formatSocketType},
-     "setsockopt": {"optval": formatOptVal},
- }
- 
-diff --git a/tests/test_strace.py b/tests/test_strace.py
---- a/tests/test_strace.py
-+++ b/tests/test_strace.py
-@@ -39,10 +39,19 @@
-             expected = os.fsencode(expected)
-         self.assertEqual(match.group(1), expected)
- 
-+    def test_open(self):
-+        if PY3:
-+            code = 'open(%a).close()' % __file__
-+        else:
-+            code = 'open(%r).close()' % __file__
-+        stdout = self.strace(sys.executable, '-c', code)
-+        pattern = re.compile(br"^open\(.*test_strace\.py', O_RDONLY(\|O_CLOEXEC)?\)", re.MULTILINE)
-+        self.assertTrue(pattern.search(stdout), stdout)
-+
-     def test_socket(self):
-         code = 'import socket; socket.socket(socket.AF_INET, socket.SOCK_STREAM).close()'
-         stdout = self.strace(sys.executable, '-c', code)
--        pattern = re.compile(b'^socket\\(AF_INET, SOCK_STREAM, ', re.MULTILINE)
-+        pattern = re.compile(br'^socket\(AF_INET, SOCK_STREAM(\|SOCK_CLOEXEC)?, ', re.MULTILINE)
-         self.assertTrue(pattern.search(stdout), stdout)
- 
- if __name__ == "__main__":
diff --git a/dev-python/python-ptrace/metadata.xml b/dev-python/python-ptrace/metadata.xml
deleted file mode 100644
index b9062dfa01ed..000000000000
--- a/dev-python/python-ptrace/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-ptrace</remote-id>
-    <remote-id type="bitbucket">haypo/python-ptrace</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild b/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
deleted file mode 100644
index e06a9ef4932c..000000000000
--- a/dev-python/python-ptrace/python-ptrace-0.8.1-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=( python{2_7,3_{5,6}} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A debugger using ptrace (Linux, BSD and Darwin system call to trace processes)"
-HOMEPAGE="https://github.com/haypo/python-ptrace/ https://pypi.org/project/python-ptrace/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-PATCHES=( "${FILESDIR}/0.8.1-python3.4.patch" )
-
-python_test() {
-	"${PYTHON}" runtests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	# doc folder missing key files to effect a proper doc build
-	use doc && local DOCS=( README doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-spidermonkey/Manifest b/dev-python/python-spidermonkey/Manifest
deleted file mode 100644
index 6c52768fc19c..000000000000
--- a/dev-python/python-spidermonkey/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX python-spidermonkey-0.0.10-tests.patch 367 BLAKE2B fbb66a1303b9a02adcf2a6f3ac8d2b1e095b50c0ea900cc3e2aba37105551b3d3d557ab3415149c5cdc1dae1c855344db85d079e869e38cd8cf8165c3afcc160 SHA512 621375af9ee114ec01d1176e1ccb578a84b81d524a8d762d76998e38906167ba7eb47561ec60aa3f5fb31b5f78668df2be937e79bcb4a2a23e11dbdfe042f0c1
-DIST python-spidermonkey-0.0.10.tar.gz 787526 BLAKE2B 95a49c3735ee71c16a76b2e768a17454549625dee5c429456da1cc3f7bc3a1bc238c85c29d66eb02f64bc73b55193186d90f4a872f4e4b7ab0c550c0384fe5b9 SHA512 e3d45ba2e747f8f382e273962f8015be8e736cbd49246864d894d7db1d436c9e14c5e945f4bd3cf3a7aca8d4f60d0f57855704c5d2cac94630df26e67898f591
-EBUILD python-spidermonkey-0.0.10.ebuild 598 BLAKE2B c2dc4e9f73c75b0f556ced4cbd01589d2691950b57b98164779ed7b2d302fa166065c81cfdea2ccf2a7ec4c8e33f51e4d7c9f554d41ab690130944e88f3b3964 SHA512 535b59ee834362dda665dd3fb9c179b8055354bc9502ded06a273dc2a9f4b85651b1d2ae3ebbecfdd487d5128604999cfe5607d1553d129cd87acc9655b2f85a
-MISC metadata.xml 383 BLAKE2B 6915312d399c4d76172c43c41e0f048f1e7e86b4d7d52ac817599350b9925db2f44189f9a5cdc9cd93c441c2818bcd35cfc467b98bd2da4da6805a350414ec80 SHA512 6e797e5902ba63378abdea1901aed16645d95a664909a8fb86e30ecf6e63a606731a268a6b3a541b969e40c74e5c86bdc93a444529341fbc010ea950687880df
diff --git a/dev-python/python-spidermonkey/files/python-spidermonkey-0.0.10-tests.patch b/dev-python/python-spidermonkey/files/python-spidermonkey-0.0.10-tests.patch
deleted file mode 100644
index fca5fdd3d79c..000000000000
--- a/dev-python/python-spidermonkey/files/python-spidermonkey-0.0.10-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/test-syntax-error.py b/tests/test-syntax-error.py
-index ab14deb..78fc0ed 100644
---- a/tests/test-syntax-error.py
-+++ b/tests/test-syntax-error.py
-@@ -9,7 +9,3 @@ import traceback
- def test_syntax_error(cx):
-     t.raises(t.JSError, cx.execute, "function(asdf;")
- 
--@t.cx()
--def test_invalid_octal(cx):
--    t.raises(t.JSError, cx.execute, "09;")
--
diff --git a/dev-python/python-spidermonkey/metadata.xml b/dev-python/python-spidermonkey/metadata.xml
deleted file mode 100644
index e92ae67745a0..000000000000
--- a/dev-python/python-spidermonkey/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		JavaScript / Python bridge
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">python-spidermonkey</remote-id>
-		<remote-id type="github">davisp/python-spidermonkey</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-spidermonkey/python-spidermonkey-0.0.10.ebuild b/dev-python/python-spidermonkey/python-spidermonkey-0.0.10.ebuild
deleted file mode 100644
index 0d4c1265b247..000000000000
--- a/dev-python/python-spidermonkey/python-spidermonkey-0.0.10.ebuild
+++ /dev/null
@@ -1,28 +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="JavaScript / Python bridge"
-HOMEPAGE="https://github.com/davisp/python-spidermonkey"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-		dev-libs/nspr
-		>=dev-python/nose-0.10.0[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}"
-
-PATCHES=("${FILESDIR}"/${P}-tests.patch)
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-virtkey/Manifest b/dev-python/python-virtkey/Manifest
deleted file mode 100644
index f4c3e7a1b3c6..000000000000
--- a/dev-python/python-virtkey/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-virtkey-0.60.0.tar.gz 40328 BLAKE2B 057fea284d35dc8b09d61eb7e0487a2cf67b94b33e308ca71fcc7c7f57ebf50bf33a5cecac8a3829a57fc9a52708df465e6b61677d147906adaaab266d8d96ea SHA512 96e48fd5ab861d5bccc40dfed1b71c7ea5ce01aeafaa5b1a58ba7a0250dfe191eab35ef0a95f247e64ea49213a20cc596bbfd64e091fd4624daae38edba2840b
-EBUILD python-virtkey-0.60.0-r2.ebuild 685 BLAKE2B 0530550f139ab0f196301b188c5c62e44ade8049c6441cebde44dac4947dd70496ec15721fcfb46afcccab8b761c1830bf4ac9c6077d84c87a43dde10b5916e4 SHA512 34e01e50bc44cf92d169d739a0c86d585ecea1bb6031b7aa6a48177a935dbb36c9e09409cb4c741cec733a32988fee16221032041f408dfe4954c2b0819a26df
-MISC metadata.xml 249 BLAKE2B ee9d3487322aa02173ea2019a36b6ed44d211c7d6b7403dfad43a8814409478ffe9562a48013e92681eb8fd963f2f0c342d57b73554198916635a61774fce08f SHA512 d96c9862d2288c9a38cebbc52ea7880b9593f020c105f969ac900d33a5549131a4f3735f55c82346cbba974f4de696142c58d541fad5d86d7bf76343f47b1df8
diff --git a/dev-python/python-virtkey/metadata.xml b/dev-python/python-virtkey/metadata.xml
deleted file mode 100644
index 2acdbda35fba..000000000000
--- a/dev-python/python-virtkey/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="launchpad">python-virtkey</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-virtkey/python-virtkey-0.60.0-r2.ebuild b/dev-python/python-virtkey/python-virtkey-0.60.0-r2.ebuild
deleted file mode 100644
index b4cfca78c478..000000000000
--- a/dev-python/python-virtkey/python-virtkey-0.60.0-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 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 eapi7-ver flag-o-matic
-
-DESCRIPTION="Python module to simulate keypresses and get current keyboard layout"
-HOMEPAGE="https://launchpad.net/virtkey"
-SRC_URI="https://launchpad.net/python-virtkey/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	append-cflags -fno-strict-aliasing
-	python-single-r1_pkg_setup
-}
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 2508843d5819..e81c39147a3d 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 816 BLAKE2B c94e85a5075755a92e5cdc33378ddbb573955decb4fc9cc99be7749a37fb60149032828f6019c18ecacc0e0edd54df2e0c57d6ba9a9215ee161f37aa6d773d4c SHA512 abe1ff09f1031b7a66c346f38712683b98ff529244092494df0f6698b8de8430c31933996025a00a22acaacf8a98bec99b968d8a122a7542e91fb2e82caa6c29
+EBUILD pyusb-1.0.2.ebuild 820 BLAKE2B ef7581ceae27b938460f6b39b47ffb78f66550ddf3775584dcbcf2316cf50c97a94ef90a4b46d8672f49c754a1226df1f38c004bf892593ce29e2b6eb815ea58 SHA512 4eca133994c7a795cf375a9880cd5bcfc5eb28961df86b3ea233a8731ae6a3c360847b11751d187577b83c303b9b478679a62ebe15cf8853e239cc4c2ea960dd
 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 61879989a8c5..1666b403fe09 100644
--- a/dev-python/pyusb/pyusb-1.0.2.ebuild
+++ b/dev-python/pyusb/pyusb-1.0.2.ebuild
@@ -2,7 +2,7 @@
 # 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_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyuv/Manifest b/dev-python/pyuv/Manifest
deleted file mode 100644
index 391d13d44f5f..000000000000
--- a/dev-python/pyuv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyuv-1.2.0.tar.gz 98578 BLAKE2B 01f7bfd2b3a7d2480ebef75c746a5f2d7b0212b6fa562122df2d7fefbdf4b2c63017836f316f5d6d9ae7d7cbeb2ff0d24ab3d04f4e9d15370b6d6077175611d6 SHA512 10a8448700c609b6e9844c6bc9bd6428920a455c94bee79569006f783c7f5d2683abe46c4692d0f0016a621d0c6d0ef2decc42a9f0418e1242b79ab0f06ee9f2
-EBUILD pyuv-1.2.0.ebuild 628 BLAKE2B 7dedf009bf567df784c65556e6972069aea32e938ed817d3ac9d0c86bfd1e3570b96c7dcc48a29a952186a0f2f1584348449234856727ad641bed3a8d49bc2bc SHA512 0a0fe8296e04a757ddb198cbedbf67d257c79f5231cdfbd6ad18f2a84888ea82ac29bfa23392db2e3f8e9d5c9c440409d1a74fd830894463e2774413a9fb1e0d
-MISC metadata.xml 1362 BLAKE2B d7bd3fd33aa758f3a81e48a14809c44e7eb52ed9876078042f0ab8f3aabd19e9bbcd61adc60a51aa3a93b60999baaf59ea141eac9d50c1cdfbd5e238b77d6aeb SHA512 4a8f25d9345f5be1674a3844cb86e96d2a3f2d4e0d8ae0cbb6bd50c0e19009da50b8ef234b66b5796077a6ca3c6dd7b1289291e53e0f7f2e7c931ac1812f1cf5
diff --git a/dev-python/pyuv/metadata.xml b/dev-python/pyuv/metadata.xml
deleted file mode 100644
index 53d991102794..000000000000
--- a/dev-python/pyuv/metadata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription lang="en">
-		pyuv is a Python module which provides an interface to
-		<pkg>dev-libs/libuv</pkg>.
-		libuv is a high performance asynchronous networking and platform
-		abstraction library.
-
-		libuv is built on top of epoll/kequeue/event ports/etc on Unix and
-		IOCP on Windows systems providing a consistent API on top of them.
-
-		pyuv's features:
-		* Non-blocking TCP sockets
-		* Non-blocking named pipes
-		* UDP support (including multicast)
-		* Timers
-		* Child process spawning
-		* Asynchronous DNS resolution (getaddrinfo)
-		* Asynchronous file system APIs
-		* High resolution time
-		* System memory information
-		* System CPUs information
-		* Network interfaces information
-		* Thread pool scheduling
-		* ANSI escape code controlled TTY
-		* File system events (inotify style and stat based)
-		* IPC and TCP socket sharing between processes
-		* Arbitrary file descriptor polling
-		* Thread synchronization primitives
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>saghul@gmail.com</email>
-			<name>Saúl Ibarra Corretgé</name>
-		</maintainer>
-		<remote-id type="github">saghul/pyuv</remote-id>
-		<remote-id type="pypi">pyuv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyuv/pyuv-1.2.0.ebuild b/dev-python/pyuv/pyuv-1.2.0.ebuild
deleted file mode 100644
index 03628c06ef33..000000000000
--- a/dev-python/pyuv/pyuv-1.2.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="5"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for libuv"
-HOMEPAGE="https://pyuv.readthedocs.org/en"
-SRC_URI="https://github.com/saghul/pyuv/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# https://github.com/saghul/pyuv/blob/v1.x/setup_libuv.py#L117
-RDEPEND=">=dev-libs/libuv-1.7.3:0/1"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/pyuv-pyuv-${PV}"
-
-src_configure() {
-	mydistutilsargs=( build_ext --use-system-libuv )
-	distutils-r1_src_configure
-}
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index ba19f7bcbd89..30ed23ca4ad0 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -2,5 +2,6 @@ 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
 EBUILD pyxattr-0.6.0-r1.ebuild 1955 BLAKE2B 9667994511193b8a8eeeaf57cfe37b18e6a312a5815a1b14774c4b379dc934b6eee7bc18c38d635b5c5f1b538dc4dfaa7f0b68eb891adb6947154f381427b0d3 SHA512 b32596b71412070328f49bbd12a4f0b4da8c6e2e43da60613d9d7a06137260bd45b038ed304751a218a22badf7bc50deaeac5cd607fdf8a8e83ec5f8b78f3f74
+EBUILD pyxattr-0.6.1-r1.ebuild 1940 BLAKE2B 766cff999a97236397a4d273ceebd152864af9c5124102d6774171bd50c698fc0046032924bfae94cb6ba52bac354959b837036c2e0d7f083ad1d95caf269c58 SHA512 5a8f7dadf933e39f6bd232e9c9c05258e0d52a6cc4923c20519d54c9e42f2e02508893f4d9284578c26ad2427c2cf442ff0a6caceb0fac73bb60f3040e97f34c
 EBUILD pyxattr-0.6.1.ebuild 1909 BLAKE2B 81f6f6654af345b2269daa2310f39a01bb7791fe49610b5a54368c1e696a8961a8e1de644feb21858e3c75ee4b5677583a8d2eed2ff7817fcfab083b9f97aef3 SHA512 20b0d4c820f6ec87bb441d0f35bdcd7bf78aa255e003d7fb572005fde38ec7576eb2aea38109494361162937fe063612f93e1ca97b822adc20c5e89252521b51
 MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild b/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..5ce00c43a28a
--- /dev/null
+++ b/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild
@@ -0,0 +1,66 @@
+# 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} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python interface to xattr"
+HOMEPAGE="https://pyxattr.k1024.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://pyxattr.k1024.org/downloads/${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"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/attr"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e 's:, "-Werror"::' setup.py || die
+	# Bug 548486
+	sed -e "s:html_theme = 'default':html_theme = 'classic':" \
+		-i doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake doc
+}
+
+src_test() {
+	# Perform the tests in /var/tmp; that location is more likely
+	# to have xattr support than /tmp which is often tmpfs.
+	local -x TEST_DIR="${TEST_DIR:-/var/tmp}"
+	# Ignore selinux attributes by default, bug #503946.
+	local -x TEST_IGNORE_XATTRS="${TEST_IGNORE_XATTRS:-security.selinux}"
+
+	einfo "Please note that the tests fail if xattrs are not supported"
+	einfo "by the filesystem used for ${TEST_DIR}."
+	einfo
+	einfo "The location for tests can be overriden using TEST_DIR variable:"
+	einfo "  $ export TEST_DIR=/my/test/place"
+	einfo
+	einfo "Additionally, TEST_IGNORE_XATTRS can be set to control which"
+	einfo "external attributes are ignored by the tests."
+	einfo "See https://bugs.gentoo.org/503946 for details."
+	einfo
+	distutils-r1_src_test
+}
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyxenstore/Manifest b/dev-python/pyxenstore/Manifest
index cc1f20d82190..f9d88c8b2b76 100644
--- a/dev-python/pyxenstore/Manifest
+++ b/dev-python/pyxenstore/Manifest
@@ -1,4 +1,3 @@
 DIST pyxenstore-0.0.2.tar.gz 4471 BLAKE2B 91e004884b880ad5307fa0bd13c3d07a57c540e9dc004a167fe82b2e964a75f2de0328aabd2f848c362111205e46e01d8e3dcd11bb3eea41b8b64555c5f2749a SHA512 0c4cfccd1f943d39f0524798504069514bd811886714b121cf03addb344ca4aa10a718178b3e8eb1cfc9ac9e4c2d6e61a1bbfaa47e1ec4941a7429e629f982d0
 EBUILD pyxenstore-0.0.2.ebuild 434 BLAKE2B 58ed6862ca4d011c7d2a16a4ec0dbbc68c8aa88c7390863da83b527eaf1f63c178c7c0aa45c9ebdd8e63d7298859402bd39288df5b6c93a1b99c77e872d7e324 SHA512 2ab2d977ef8cbfbcf786441b95fdd5ee6f98ddb8a424e7d47d2a0b45498432e442627fae9111882828cca74bfaaeea91eef00ee39b9e692c5bb545cd53c06451
-EBUILD pyxenstore-9999.ebuild 461 BLAKE2B ba665591191f30251c26035e4541ae0ae19490a38ed2456a3beadb863a4d2bfc8416b34701f63572dce522cd434d25c9affde1f7655bc31e177854be1f1855e1 SHA512 5242a4e64f8caf44d6011873d9f380193a0496e30ff8ff64cf37a05f17932407bf41fec78f267358ad378426ccfd9db49f45eac02271fe2ed8e8e735d4290051
 MISC metadata.xml 445 BLAKE2B 0838c540cc694048a7b9a305299f994b13e3195129d9727a2bcd2bdf8b30810aa71dbe5de0469bc9a1d33799f99eeadb878e2ab96046c295fdf6de25b68162b6 SHA512 6cb234fa3b6b01d216e9aa02dddb16a9862c7d589fea5f27d39071bd321daffa47a28d44887e8e0f3320b6aad4680dd93e76609cd19b01825e6ca2758f4926dc
diff --git a/dev-python/pyxenstore/pyxenstore-9999.ebuild b/dev-python/pyxenstore/pyxenstore-9999.ebuild
deleted file mode 100644
index 26a6a6466e68..000000000000
--- a/dev-python/pyxenstore/pyxenstore-9999.ebuild
+++ /dev/null
@@ -1,21 +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 bzr
-
-EBZR_REPO_URI="https://code.launchpad.net/~cbehrens/pyxenstore/trunk"
-
-DESCRIPTION="Provides Python interfaces for Xen's XenStore"
-HOMEPAGE="https://launchpad.net/pyxenstore"
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="app-emulation/xen-tools"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index fe56f6300c7c..dc765c07a488 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -4,5 +4,5 @@ DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052
 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.ebuild 1131 BLAKE2B 54f61157a25c182d5252739ab929955c247db7431f23ad947d9697182a285002ca9738888109eae56c0665aa87f5a959f9087d62b6b3546930ca68d5db1d21f7 SHA512 3c34b8509f92c017afcb555f86250b2a78ab0b0dcd35fbde9016fa035ceb30c63495674bc972d602c0cdc4f45ded34584115d937f07b83191cfe16cc3c8b61aa
+EBUILD pyyaml-5.1.ebuild 1129 BLAKE2B 52648efcbe5433c22de07e2db1d0718fc165560427efeadc58795a60722aac9d7dab8e9e9093a24672d2bf286c0f61defc4d23430874d1025d8c26bae61e75f5 SHA512 3c121c361e229b18cf6dc2245878dae51981903af858866ec5bfd279f4ed2d30bbf6defd7b1ddaf8ef9eda1cf16279261e854e080c3af09db0e63bb4f4c95456
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
index d55fdbbb6807..2efa52728c0b 100644
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/rtf2xml/Manifest b/dev-python/rtf2xml/Manifest
deleted file mode 100644
index b0701beddee4..000000000000
--- a/dev-python/rtf2xml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rtf2xml-1.33.tar.gz 421817 BLAKE2B 36d08b552fa52b088bab0657075df99056d15b1a11f654e8483ea3927e1c49e32c10f49fb9aacaba73cbf4d8b21405926d54aabfbd1110bc363d406d0e65d087 SHA512 ffca0f091319432e7d3f3b94fe8946a4665b026fe91ad90f3b9fa8671e3d7c31b71739df3655e368c44c26ad3b5d0e6a5b80ebd58856fb135253337b6b703031
-EBUILD rtf2xml-1.33-r1.ebuild 505 BLAKE2B 5ebfff37ff7c41d1214dfe76deb299763437113c6274af3a149495a5034f35c2abb4ec80366bfca06394dd9c62cbfc5be75687cec13d6192a8699bf22d9f6b85 SHA512 a4c33a2ef655b5aaab082e896d4c48b80b8db8ec57ed768846d69cac66dc9e92d9cc5d32b15007c74dabdc1f21874e890c21640ba0faa8c961256982e62039d1
-MISC metadata.xml 244 BLAKE2B f51c18e36863694a93df03e6dcc7d2ed0e0e0b68ffe9868f2b9b33fde2971949aeca628bf23339c8d5224b7133c58e130c30ff443561fffac75c140bf00175b3 SHA512 6be507453a172dd94ee39a7eceaa4ea8ae9993ec27dd3a1baca423ed0e3fefd205948640d86cfa28db4d90ed4380b0ae4b28936d2da3c63aa4fe495c18c6e082
diff --git a/dev-python/rtf2xml/metadata.xml b/dev-python/rtf2xml/metadata.xml
deleted file mode 100644
index 474028237505..000000000000
--- a/dev-python/rtf2xml/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">rtf2xml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/rtf2xml/rtf2xml-1.33-r1.ebuild b/dev-python/rtf2xml/rtf2xml-1.33-r1.ebuild
deleted file mode 100644
index 50ffa736f4e4..000000000000
--- a/dev-python/rtf2xml/rtf2xml-1.33-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="Converts a Microsoft RTF file to structured XML"
-HOMEPAGE="http://rtf2xml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 0c3bc033687f..c3ff63e32478 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,6 +1,8 @@
 AUX s3transfer-0.1.13-tests.patch 753 BLAKE2B 7b168d35c9287eade9b9e1ca0393c625f742d1a698df9996f9ddbe6cb892128badb3a77dc9804e3bc9905d0982f240c3dd5021459e3d050a7647e279efd93491 SHA512 3fd66ae7574ee5263582006292a19a782aa3c2d4ebef00e005b02d1cb5192a99c36325114e49aa13ddc2fa1cb8604f65f87dcac8994b2845eaa45b409a5b8ff6
 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 944 BLAKE2B 350913de6efa9e25c743b41900391d9fc3135c78aaddaa702e0579a9cd5119202ba788cfe0fc66a808475f5dbcde8a6c4f2f4e22e14f8f70d4abe767827851d1 SHA512 6a2bcb722657f4c5f3ebf08b59366645bb1f7236acb1881dc6525a2b7aefb31b6d4959a85bf0620ce26ad1fbf81219b6c01f990322736c96a03ed6d6fc55995e
 EBUILD s3transfer-0.2.0.ebuild 888 BLAKE2B ef6182a1695f199f1ad2833aa52d337287fec13407343d71ce9f18a3cb212402a4b990e539298d2c372ba46381b16981e2b8ac9c8877d669e181ff6c7954f5fd SHA512 22d8796942ce3be9197a372588d7272d0e0ffe4880fc6a64d701278b21732f6115652ae28a98f32d09e7a5c59f469f5b8db611f4b6ffd07e53a5ba52a54fc641
+EBUILD s3transfer-0.2.1.ebuild 890 BLAKE2B 1134c78b75c8fc4b9c841213e54a4c9499875433fb267e97cce54bded9be69e480d897cc0becff8cafe888a998966d67880e35dc0d5f71c4efee0a0f918466a9 SHA512 2bd9e55c010705a0a06379ef491840c0fba0de08e06d21337e65dff8970ec86979d3fe6e170fe462f9fd0f4d1968d87baa46b506c83edf93d7b5ab151ec9082f
 MISC metadata.xml 379 BLAKE2B 71ab13315921746f0b71ac09c3f7a5e4e182e4efc0dda7f0e9cd6fe2948f52eddde9b9fe7c117ced64f4e3f6646a2d15a1fd3630ab814b067a10dadd11448def SHA512 452e566006f5a6ec91765cdeb4fe75edbf890f3a8e495bca7d1db859a882109eecb252dca18f1d1e4dc970c62c7810b5e51cf1b5ab61553c76d4dc04e38bc5ee
diff --git a/dev-python/s3transfer/s3transfer-0.2.1.ebuild b/dev-python/s3transfer/s3transfer-0.2.1.ebuild
new file mode 100644
index 000000000000..d48af8926036
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 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="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
+"
+# Pin mock to 1.3.0 if testing failures due to mock occur.
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/safety/Manifest b/dev-python/safety/Manifest
deleted file mode 100644
index a6fed4fbba31..000000000000
--- a/dev-python/safety/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST safety-1.4.1.tar.gz 1506167 BLAKE2B 1ff3299158f8c692dca37230289d0d18ea293db14a1d9c4ecbab903119b5e381b58b2f289876ae6c3644c1d04b5040a15c3426eb790a6ae630517133ef27f121 SHA512 ae26ba6c9de77d42a132cedc398e425efde891a7832ac6a95c736ca00400834a3c5b867e362b9b908e40fcee3c9bbc1009a40e4a0489154960695adaefe1c06a
-EBUILD safety-1.4.1.ebuild 707 BLAKE2B 6630d29af3c057e1521cc1176f58263929c55d79efe43936921aa9648bc93d6824dfacdb101afc67d77bd7f1b94bef872c2bcee320d0ae5eb989772403e23d30 SHA512 e25618a5b85114f83aadb082050d656a5cd64b6c41b88c16c408ca64abf39319015f0551a9be494057b06f1ddc6e35e6b073824f1161ad727dafbf68881dc8b2
-MISC metadata.xml 245 BLAKE2B e2c573d373daf28b93d979284b38699688d594e0cb7da8a446918a12ee6b4b14fd0887967fe92f2d9807cffb5c2af1868ea3c5c80303cc910db898ced7b98ad1 SHA512 f7920ffedce17524370277be40a0dd6cdaf9771413a2c22ab8b9d2f8d4bd678ee6a9a3305a91ea2b79bb3556ffee79f731e792380531d551902a347839926ba1
diff --git a/dev-python/safety/metadata.xml b/dev-python/safety/metadata.xml
deleted file mode 100644
index b13ca56b4121..000000000000
--- a/dev-python/safety/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">pyupio/safety</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/safety/safety-1.4.1.ebuild b/dev-python/safety/safety-1.4.1.ebuild
deleted file mode 100644
index 19072d616ae6..000000000000
--- a/dev-python/safety/safety-1.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} )
-inherit distutils-r1
-
-DESCRIPTION="Checks your installed dependencies for known security vulnerabilities"
-HOMEPAGE="https://github.com/pyupio/safety"
-SRC_URI="https://github.com/pyupio/safety/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/setuptools-16[${PYTHON_USEDEP}]
-	>=dev-python/click-6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index fd4d2f7aaaa5..a9446b0db3e7 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,5 +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 589 BLAKE2B a59e1b571c811719877371c623b48f452666a76a6d16f6ef1fc2757a54cd53c6dfee62219af28bcf55b222073e9583dea257f70f1d359aa51794fe75be945697 SHA512 6b7fdfba0301083133f51490cbf78b7763a1296709368968403de754f47a82ac902054f8833105f4e852982ac13ebed0dfbd5ee8a9788c64a5d860af8eab2988
+EBUILD selenium-3.13.0.ebuild 591 BLAKE2B fa6b129471614451f6219e78e70ddf35b852d22079a04acd8728cd6f5573bf9d2ede650a292cd376189a320197e77a414d28e5f14988e5fb50bef399e2ce5e61 SHA512 8467144e9659a2232dd1d31fd6aed7d1d76def84a496a7e921b98c0c14fead48f0a89c15106b2a31f57773588eb3e0bc0bb4fa074ba720630298d9e64f5b5f57
+EBUILD selenium-3.141.0.ebuild 591 BLAKE2B 6f5453534c2b5ceb7dfde8183cdce3961a7a57f4dcbb1166c75995bb4cd51e6de5153418a8aa4d5b859187dbeabe6cf2dd5d2a4398c04edc6dc8d52ff744f52f SHA512 00c65249cdbfff734a2ca28a889cf5b20424f5270c90a0231977caeeb21b5c784885655379c05ce4faf5b071f90bd1d498bc7b0c23d69a1fd49c36c2c4719c7e
 MISC metadata.xml 382 BLAKE2B 2069f6989e396728b0de8e072c064980714dfa75f5bc8ac56b17d7b311e553c2a821a2d58433ca43289b059ae40f7a822c788c1af1d8eb883936662d6eb17bfc SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955
diff --git a/dev-python/selenium/selenium-3.13.0.ebuild b/dev-python/selenium/selenium-3.13.0.ebuild
index 0231c9b51bdd..72b77a8bf84e 100644
--- a/dev-python/selenium/selenium-3.13.0.ebuild
+++ b/dev-python/selenium/selenium-3.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,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
new file mode 100644
index 000000000000..0ac1802c399b
--- /dev/null
+++ b/dev-python/selenium/selenium-3.141.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=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python language binding for Selenium Remote Control"
+HOMEPAGE="http://www.seleniumhq.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( CHANGES README.rst )
+
+QA_PREBUILT="/usr/lib*/python*/site-packages/${PN}/webdriver/firefox/*/x_ignore_nofocus.so"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 1e92cd47111b..34fb8a8bae10 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,10 +3,14 @@ DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31
 DIST setuptools-41.1.0.zip 851100 BLAKE2B 1a2dcb1d3f1a34d9a5dab5156b76cddb03da0f3745e57ebdd363cdd23512df0de8f0d3131c930e2b67ae34fc15f75a9c06802826f97508bfb937a9e45ff287f4 SHA512 07e3381fffc7b75051640c07e334794cb008682e05ab8bbd5bb1e9757fd36305997a2974c424fd474411941f5ff014a53ec1edc276543593b238fe1e97d7d106
 DIST setuptools-41.2.0.zip 851251 BLAKE2B 1c4896c429c670832a46f951dc4c4958f808f1a7c0ad88670705fe265bee23c1d2b6a348b13298b0a60b6c821d504567d4d35b33f388949028391219cd45191e SHA512 6ac0da9f2e452b2b2334c03eb1667d88ebffeb68da18a69fe14f9f0763ac391986dcc663f123015b63eb0c3f905e5a8be7408499ddb1ac20367109275cb66ac9
 DIST setuptools-41.4.0.zip 855608 BLAKE2B 8047a5915d37168c04eded6e0b0b2273557bba7558a173d3f904985471124703797e2b5d00ce8c28096213a181e268a9bae5566f112683b3bee21df26795f5d3 SHA512 3b8406dd6ea23623112b8ba418e70fa97317449838a5dfc54d46738dbde3f2fc15657466e296e2f9bf72cbbaa0aa28ba42d8392afe29f9583cca258645e189b7
+DIST setuptools-41.5.0.zip 851068 BLAKE2B 1a45674719fb661eccb43789f0851a1bb1800d13e5a0f99916762c9391bf49acd580b6500e0f5e8f0b23f6a671891b82c48d6300c9d9b7605cb0dfdca7a15075 SHA512 d02c5db7649281fcdc010837a600611af260bb7563440da4ad84cdbaa35b19c7cc1890ae7bdc58b49dfed20041b0ac52a8dbe0dfb340a804668cbecaea6b2bb7
+DIST setuptools-41.5.1.zip 851097 BLAKE2B 2411db77cffb24190c1510c7fab623ae0fb2a248994eae01e1a79427d35d8bf6a2f065de0d95dc11105df0bb42962a57c914486b48dc91115ec32e4dbcbc059d SHA512 eb6e944c80448873f8970477aaf474e75879e2b81b91fdc7a308670fed231d52880c3be3452e7ed3f094f20d4afe54b1db24ec4d98845ed47ee5e71dbf66261d
 EBUILD setuptools-36.7.2.ebuild 1921 BLAKE2B a1cd7bcb5fc4ae19d069e63f56081948d2fde3161354edb7429d43907f33effb8ed04fd91ebc55e443ff44feca82051754ccaeec86fda6a36d05ff9c580dd6c7 SHA512 cd34166c627d64ac0c8f4200ded764737471884e139f7cc48ef05bb35c4af2ac9d0893ae4e9c5b2431f8e5644e253a7ef9bcd185319c1e3941c173ae6295be3f
 EBUILD setuptools-40.6.3.ebuild 2035 BLAKE2B 6c93bb41ce77fc6593fe2d8ec78387dc77076f54feda974de13426e20f3ba7691f425323b7d918c4c27664f376ae96ff202ecff5439330019fb4f0e9f74f5db7 SHA512 402524d29595c3d4c76b0fbeb3f049dfe004fba93372e21f3f86ec9c31cb74bd148b0eb23ddcfa720cca2bd2ddb102c9317839791e2370cc2abbc28f1321a6bc
 EBUILD setuptools-41.1.0.ebuild 2073 BLAKE2B f52c67f7f42c9d8dc9a66b58d8ef3b5339e1c21c04083d94b0e5ebce3c76451f4609adf34945218e5845ca52f6f1fd4b019799a0528a97149f506d753eb24f98 SHA512 92da410f706e73e6597c4de56c0e0e2a1c35000ced3e75e7707b1ee23aeb4dc39e1d3cbac305227ada07bb55936733b8786794f7bab16fb9890697883fabbe2a
 EBUILD setuptools-41.2.0.ebuild 2073 BLAKE2B f52c67f7f42c9d8dc9a66b58d8ef3b5339e1c21c04083d94b0e5ebce3c76451f4609adf34945218e5845ca52f6f1fd4b019799a0528a97149f506d753eb24f98 SHA512 92da410f706e73e6597c4de56c0e0e2a1c35000ced3e75e7707b1ee23aeb4dc39e1d3cbac305227ada07bb55936733b8786794f7bab16fb9890697883fabbe2a
 EBUILD setuptools-41.4.0.ebuild 2073 BLAKE2B f52c67f7f42c9d8dc9a66b58d8ef3b5339e1c21c04083d94b0e5ebce3c76451f4609adf34945218e5845ca52f6f1fd4b019799a0528a97149f506d753eb24f98 SHA512 92da410f706e73e6597c4de56c0e0e2a1c35000ced3e75e7707b1ee23aeb4dc39e1d3cbac305227ada07bb55936733b8786794f7bab16fb9890697883fabbe2a
+EBUILD setuptools-41.5.0.ebuild 2073 BLAKE2B f52c67f7f42c9d8dc9a66b58d8ef3b5339e1c21c04083d94b0e5ebce3c76451f4609adf34945218e5845ca52f6f1fd4b019799a0528a97149f506d753eb24f98 SHA512 92da410f706e73e6597c4de56c0e0e2a1c35000ced3e75e7707b1ee23aeb4dc39e1d3cbac305227ada07bb55936733b8786794f7bab16fb9890697883fabbe2a
+EBUILD setuptools-41.5.1.ebuild 2050 BLAKE2B 17bfa3cb371bd5d3fc288bc9aa0ec68c0592f0c6b8db3277fa53b871e539161d404dbf9addd70ccfb61bf3b588429c5e940f83eeff1057004decfee02f54156d SHA512 b351105eb31a777f03ad5b69adea64f1c900a93f1b0f1562d210f61c252b0a801044cedcc7905f86c28ae510d8734b1f5c0f41eeb03bff0afdb1e1c297d8181d
 EBUILD setuptools-9999.ebuild 2013 BLAKE2B 7bc1db57ae83e5e8ca5b5733d8b2b708dbf9bef02d67c56addd4e9a7a8de41fa32b58e2bba5bcd22ae275c2a1576b7dbcecbc030e9bca54eaf46122b838a06a1 SHA512 62e5a684052e0f667d54e01906ed7f17a92f29bf5038503b2d86edc5b2555020f1e874a3ed567a10ba68033c81b86d133a8129a73f264a803616ff6b6c68e25b
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-41.5.0.ebuild b/dev-python/setuptools/setuptools-41.5.0.ebuild
new file mode 100644
index 000000000000..f3990f7b4a64
--- /dev/null
+++ b/dev-python/setuptools/setuptools-41.5.0.ebuild
@@ -0,0 +1,73 @@
+# 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="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-4
+		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/setuptools-41.5.1.ebuild b/dev-python/setuptools/setuptools-41.5.1.ebuild
new file mode 100644
index 000000000000..69da3de1a382
--- /dev/null
+++ b/dev-python/setuptools/setuptools-41.5.1.ebuild
@@ -0,0 +1,72 @@
+# 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="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/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 045f3c5c272a..770531d411ca 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,5 +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
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
new file mode 100644
index 000000000000..b6446239067b
--- /dev/null
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -0,0 +1,25 @@
+# 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="${PN#sphinx-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sphinx theme for aiohttp"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-theme"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/sphinxcontrib-cheeseshop/Manifest b/dev-python/sphinxcontrib-cheeseshop/Manifest
deleted file mode 100644
index 74e14e699936..000000000000
--- a/dev-python/sphinxcontrib-cheeseshop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sphinxcontrib-cheeseshop-0.2.tar.gz 3568 BLAKE2B 1d3d8378cf5c1d13ba2ba3f9c47a8f2f7eeb4b48daa4c57e639c65101cd7440932e3f62bd112a87ae24bfc3578a1e4b227584d011cb05a0df5f699c05daae69a SHA512 5d6c88c0c43f37b94ebe6a2a62f795a6f7d5d6c407b808d6b21d54c1775fc4b5f22466c13e61adc16ac7973ba11e99a66da8650c869856f766e6bb3a6e99923b
-EBUILD sphinxcontrib-cheeseshop-0.2-r2.ebuild 743 BLAKE2B 44bfa6856c8eadeed00e5824badcc8b6e0ea44061524d21b4547ab36c47ffd33c7f4612e66182a8c75339538d484199bbe2ba32c8a6775ac1c58510ac884c8bd SHA512 c60cae92ca6b469f8927c2bdd5fc69953495b176cbe4b2c9a1b74556aefb1f8190ae94b8f646410276fb6e10d55b8a79581340d852bad1818cd00f9e20b32fbb
-MISC metadata.xml 320 BLAKE2B aa668887453d4114659d84b157fc186d07f0ffd776f04f1637d5cb3379751ca7ee84ae89793ebab4bc86bbafe0c532483ae122351e047265aea930ce48e1f3d3 SHA512 93a35e740af47448bbc48981f7d2912bde5783da7d2ee40fca7c72e164fd5f3d4d4d64beae5d2df610c13b4216c5a657f3375b48de1135ad7060fb8026af0df4
diff --git a/dev-python/sphinxcontrib-cheeseshop/metadata.xml b/dev-python/sphinxcontrib-cheeseshop/metadata.xml
deleted file mode 100644
index 61161ea3ebf6..000000000000
--- a/dev-python/sphinxcontrib-cheeseshop/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">sphinxcontrib-cheeseshop</remote-id>
-		<remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r2.ebuild b/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r2.ebuild
deleted file mode 100644
index 896bb924aa43..000000000000
--- a/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r2.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="Sphinx extension cheeseshop"
-HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed \
-		-e '5s/file/open/' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/structlog/Manifest b/dev-python/structlog/Manifest
deleted file mode 100644
index 04d87617045f..000000000000
--- a/dev-python/structlog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST structlog-16.1.0.tar.gz 150604 BLAKE2B 928ad43206eeeb25d76eb2708d8ff8a5c1f886256be98bf18372ade227de96167a9bab855945eb94abb843c09d28799557f759c0a9b2bfbed5004ea6f009e030 SHA512 eafa89516b99adb02527d0b374f12b438e83a961f08cf42aa10a7196ec81df6ad5492772ae7c52747ac926d8f5a7ca8d89cc12f4dc6d37d21b9935f009894a37
-EBUILD structlog-16.1.0.ebuild 470 BLAKE2B 582c1fbd89fed3fe8df1f3ec71e8c2441fd457a8e75a8dfea8dcd626594b79309cf294320c528a8936319b840e983b697e9e4dc709bba6379f258780356903eb SHA512 f886a253e488d14e74c80950760dec2e73c415c17b6f1fdff2c09b68385ffbeb0c3ed9cd4faa3d7f45d91894f94818d66afd3acf422a44fa631b9a9a9c4ad9bf
-MISC metadata.xml 386 BLAKE2B 83313d79f0acd137cfa519b21c19854e27579676c101dd5396f7e24ddc22b6d22a7894851c99bbfe44ba1ff88f6e4e3aec0858d166f12d57594531499dc6c16c SHA512 d7abe2285438f10e3ac525c5cfdff1518667ea090770f9680fb06b1ccbd7d78affc2f97da5d6f1334f666471761703f3fe139707c37d6574119ed48f98e9be85
diff --git a/dev-python/structlog/metadata.xml b/dev-python/structlog/metadata.xml
deleted file mode 100644
index f53d2c1bd114..000000000000
--- a/dev-python/structlog/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-    Structured Logging for Python
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">structlog</remote-id>
-    <remote-id type="github">hynek/structlog</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/structlog/structlog-16.1.0.ebuild b/dev-python/structlog/structlog-16.1.0.ebuild
deleted file mode 100644
index ec7a3fdbbecd..000000000000
--- a/dev-python/structlog/structlog-16.1.0.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,6} pypy)
-inherit distutils-r1
-
-DESCRIPTION="Structured Logging for Python"
-HOMEPAGE="http://www.structlog.org/en/stable/"
-SRC_URI="https://github.com/hynek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index f6a65d89ebd7..8c864823249f 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,5 +1,3 @@
-DIST thunarx-python-0.3.0.tar.bz2 303035 BLAKE2B af0193a3bc97c859ba98f52c612d5af81c5b7a0d8142a8283cf2b308fa183ac57ac1a2163cd882749b6fd33e0529f20f1f9e2db2dcc1aed26cb40cd5995780fb SHA512 9be3e8b50cd668e0b63fbf54da5dec3685dde40528067b35bd1cfa87db7e037962baafce3059818a7de76101472a2b07ae209c590f2f143dbc71646e8addb28f
 DIST thunarx-python-0.5.1.tar.bz2 334426 BLAKE2B 59f8e625b10ceeaefffa4b6dde150c32023365e76854c6e77ae2f222b509856353c8d62de26ba4e7b967cfcce1219205923938389fd1714a420bc9e1ac2b12b2 SHA512 0c1d8f20b74a3eb87b3c2c181c6438bc059dff75afdc26cfea19dffb7efe1f14e6a880689f73afcbbcb5922312741df72018e3b9980c4a45426e7a7d4651177f
-EBUILD thunarx-python-0.3.0-r2.ebuild 778 BLAKE2B 57afb8f9b5469211715bee3139ad5c07d665e42331a940014695376a2b881b3e2d3e94b81af7e38ecaec8504bac59c34201b2ce8c2ba938b35af24cad9fef536 SHA512 7313f7552e7cbcf31fc83305d81e65452651e77f17d7d57b5d9a4dbe917c8dbe3343a2f02f7d76f2ff1f2475dd46b2fc3bd7ad41c6173adaf6b98387bd957e1f
 EBUILD thunarx-python-0.5.1.ebuild 729 BLAKE2B 0f3689fb636aede04ddb935dfbbe9b4af86324ca0b59bc348b9bfed5c3249099f28eb087689a139c984dbb52b5161526e936a7695ffbfb6b99b5c70e0caab30f SHA512 d1cb61f583f23f83f2556290ac0bcb21629880dcae49bbfede07210b0bcbed993649831e3fc47d299ff4e5cdf1083026fe600e3e1af66bcdd784ff4b5ece596b
 MISC metadata.xml 249 BLAKE2B cfb34e0ab5b7155d26bee3e5cc55d570e05151273d6793455b82980b3e3411983eaee6a6ea94f896b18df24efdc964f180bb00b3852a98a2cc5571f1d22f6d84 SHA512 ec9e5427d44f20c2c0166fe103e6e8b8384a300685f7c9774f9177a1533d7057f332af1ba1046462f75bb3f2812e075d01b5eaeb625340c911d2bc6d2f9acf7c
diff --git a/dev-python/thunarx-python/thunarx-python-0.3.0-r2.ebuild b/dev-python/thunarx-python/thunarx-python-0.3.0-r2.ebuild
deleted file mode 100644
index 8d348aeb4c1a..000000000000
--- a/dev-python/thunarx-python/thunarx-python-0.3.0-r2.ebuild
+++ /dev/null
@@ -1,34 +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 python-single-r1
-
-DESCRIPTION="Python bindings for the Thunar file manager"
-HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
-SRC_URI="https://archive.xfce.org/src/bindings/${PN}/0.3/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	x11-libs/gtk+:2
-	dev-libs/glib:2
-	>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	<xfce-base/thunar-1.7"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/tmdb3/Manifest b/dev-python/tmdb3/Manifest
deleted file mode 100644
index d01976d71197..000000000000
--- a/dev-python/tmdb3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tmdb3-0.7.2.tar.gz 39545 BLAKE2B edb84ecedb7c23a6f8887bb1320d18d408bd969a19f5a269f0bcd906fc13edc67089f0994ae2354fea9183a5b291b8ee8372833d74e52ebeeb262fb467fa0041 SHA512 d4294cbc5811776f7514f5dca82421c61538409c6d76704ed22272bbd9b6a362b7887c392526f285d81da29500530e684f1e829722f646d1d3eea4293a748a64
-EBUILD tmdb3-0.7.2.ebuild 399 BLAKE2B 9113195dd02560d591bc910772e429d5c8da0efdba315c6b5a4fa48ba7d5a2bd473350e70b279729956d6d06a2f33e249ac1526ab3b20e2771f2a2d6537264ad SHA512 003716db96469ef18e4530b1b599b98a5df45d4659abaa8ab00076fad78d78f9d3195be66082d657f26432f7c6c29778eed033e33564f096204e5e338a7f4d75
-MISC metadata.xml 298 BLAKE2B f6f179a2928436f27c7c5bd469f536c6d1c60200bbfe386bb462f643955209c029f687cb73489e645afa7bf7cba9fe9fe442ca3876fe6558b1757af70939c6ae SHA512 92423b0c7ec1f1bfab4c2957a46acdc01f198872fee30c44066023aad0a1dc9544bdb7769a0692c0269ac40f9c805853243e7e6796e894f86f21168ab06117f2
diff --git a/dev-python/tmdb3/metadata.xml b/dev-python/tmdb3/metadata.xml
deleted file mode 100644
index de71a1dd9966..000000000000
--- a/dev-python/tmdb3/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">tmdb3</remote-id>
-    <remote-id type="github">wagnerrp/pytmdb3</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/tmdb3/tmdb3-0.7.2.ebuild b/dev-python/tmdb3/tmdb3-0.7.2.ebuild
deleted file mode 100644
index 8bbf9e7064c2..000000000000
--- a/dev-python/tmdb3/tmdb3-0.7.2.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 )
-
-inherit distutils-r1
-
-DESCRIPTION="TheMovieDB.org APIv3 interface"
-HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.org/project/tmdb3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/torment/Manifest b/dev-python/torment/Manifest
deleted file mode 100644
index b1801cf34cc3..000000000000
--- a/dev-python/torment/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST torment-3.0.3.tar.gz 33976 BLAKE2B df784ee7ae367e9c94c04885114176238748524ab511e161608ef59e08b7b1f765c361563bdd2799381e9679a58816d5f907f0467284274c3a8c1d0b206f1a91 SHA512 85876668ce2ee898f876711aa11186ee2edb092ac1b768ee828670a6aef8bfc9cbcdee4aa07d8068ebed2edb60aa0774d74d2e7976a6c021ae5264aee1e83fbd
-EBUILD torment-3.0.3.ebuild 943 BLAKE2B e18f350c8076f657e4b7b4ef4919538b489549ddfdb0bed8d2fcc036eab28ecc4dbada7c4f685005560be9caed065941b1b620bf543d5015e0f515a2d930dd6a SHA512 a1e2d7285654519b059e4317c7eba66b2e6919361906f8ad9519328705d438ca4f60fbef1873438b7a5aefcdf3cdd74559de585ec72d66c18351502991eda8df
-MISC metadata.xml 289 BLAKE2B df99d201706d1e9d9f9fc0b7d78d9feaa5f88d95456bc054b2d0e3f23b2d8dc177cb0e2284f69d7d989b6ee3bdd4d0f5efce56a3844fa8c4e21b9adb4bdd3bb8 SHA512 2b22fe1fa9e573f4ccbf45c868cba66c2a8474582aa494cc100110c0c16ee9a81eefeaed7e9de923cd822b9e46f76d89930a03e6dd2e4fb8f715f6e0c7c132fb
diff --git a/dev-python/torment/metadata.xml b/dev-python/torment/metadata.xml
deleted file mode 100644
index 6e5c3d93ec80..000000000000
--- a/dev-python/torment/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">torment</remote-id>
-		<remote-id type="github">kumoru/torment</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/torment/torment-3.0.3.ebuild b/dev-python/torment/torment-3.0.3.ebuild
deleted file mode 100644
index 27d964344340..000000000000
--- a/dev-python/torment/torment-3.0.3.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=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Study in Fixture Based Testing Frameworking"
-HOMEPAGE="https://github.com/kumoru/torment"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="dev-python/mypy[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests || die "Tests failed on ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tracing/Manifest b/dev-python/tracing/Manifest
deleted file mode 100644
index fd99f3580133..000000000000
--- a/dev-python/tracing/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tracing-0.10.tar.gz 20364 BLAKE2B 8c37ed178d037c8a3db22955999df3c6716c4cb35b1eca04e53e788aa0219e2eafa77ff489b1b6f77c60c6aba078d8e12f67a191e9a25d22bc112ee5124d85ee SHA512 3e9874d55df3b599cddc817680e49fed2bbaaf510597c4f41984a742b22c0b3596d29875f2fedcb890b3acf43cd5c52faad7de334781d9eec16676e9f10bf5d1
-EBUILD tracing-0.10.ebuild 758 BLAKE2B 4dba19ba2f88ba4003a47c71d131f51a3c066406ded765b28b59414a8976d9724a41007324713e7cf49350234f7db8c83839aa900b5b16d2950bdd07c6ae7c8d SHA512 9390a17afe47ff4ce07fc0f5a0a0048ecfdcd269afce6cd6187ff1b1304f3293a4f1f391980134a18920830fbdab8863a78076f11917d2eb9925cbbe419da9c2
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/tracing/metadata.xml b/dev-python/tracing/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-python/tracing/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-python/tracing/tracing-0.10.ebuild b/dev-python/tracing/tracing-0.10.ebuild
deleted file mode 100644
index 5bac6d5c7215..000000000000
--- a/dev-python/tracing/tracing-0.10.ebuild
+++ /dev/null
@@ -1,37 +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="Debug log/trace messages"
-HOMEPAGE="https://liw.fi/tracing/"
-SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/python-tracing/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-DEPEND="doc? ( dev-python/sphinx )"
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/. )
-		rm -rf doc/_build/html/{objects.inv,_sources} || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc example.py
-		docompress -x /usr/share/doc/${PF}/examples/
-	fi
-}
diff --git a/dev-python/twilio/Manifest b/dev-python/twilio/Manifest
deleted file mode 100644
index 047fd955e636..000000000000
--- a/dev-python/twilio/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST twilio-3.6.9.tar.gz 226151 BLAKE2B 841e37385b3d11e5423dcaf813e8568da204f9f34cc381b26869517ace2781db9aad0c6ab243a72b2f5144ef1ef103676ff5b9f5f95b38e9cc38a7f11c880ec5 SHA512 f4e0f13e3f12ae8e15817a285a4388859b458ba7759acce4d5f6ee425bd6a06742bf271a01e1cc5140d63bc599828b940f1e96a6ed7f5744c1c9eaef2dd65b29
-EBUILD twilio-3.6.9.ebuild 762 BLAKE2B 56bdcf4fa818ccda0a6b85ab12875e6a131f76e6d76e81f331fa064490a5d8706f130ff5796fbc494f85f057f8f2a49b4300bc2739cfbb8a4ffc44663199b1ea SHA512 daff26f5bd2ed1b9c4a770b7520bc315d9576c44a4f6612098028d8176c73bd54cb021c0f0a57b2b4a1f05f3e18063dac14323a20d8fceec94be9f0b320c4668
-MISC metadata.xml 257 BLAKE2B c32821ae545a6d09172ee687af7af45673681c792c5b8e1843265ad2da114563ae3f6fdaae395973ff8e56d4f1e14c3eb3134309aa0bf71d1aad96e28fd1d44c SHA512 02a24ffac80ef671327118a115df5c90d0e6456680e2aba09356aea600791be6bf7dd7d6a79cf4a91180a3d4528899075f4558ebe382f8e8b112413960efa05e
diff --git a/dev-python/twilio/metadata.xml b/dev-python/twilio/metadata.xml
deleted file mode 100644
index 5676c411dfe5..000000000000
--- a/dev-python/twilio/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">twilio/twilio-python</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/twilio/twilio-3.6.9.ebuild b/dev-python/twilio/twilio-3.6.9.ebuild
deleted file mode 100644
index 879900445a1e..000000000000
--- a/dev-python/twilio/twilio-3.6.9.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=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Helper library for the Twilio API"
-HOMEPAGE="https://github.com/twilio/twilio-python http://www.twilio.com/docs/python/install"
-SRC_URI="https://github.com/twilio/${PN}-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-
-CDEPEND="dev-python/six[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/PySocks[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}"
-DEPEND="test? (
-			${CDEPEND}
-			dev-python/nose[${PYTHON_USEDEP}]
-		)"
-
-python_test() {
-	nosetests tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/txsocksx/Manifest b/dev-python/txsocksx/Manifest
deleted file mode 100644
index 333c636214ba..000000000000
--- a/dev-python/txsocksx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST txsocksx-1.15.0.2.tar.gz 19350 BLAKE2B 2c7df5e892abdd7ec4fe15afa70a1d33bd494d04f4dec4756876e1b796609859b1a4385652f87a18b5146560ed52b81eebe09fab35af0bac23fc424c36966fbd SHA512 a9a214248aa299b3f2def0e15c3a9c2f78286bc245421844f17d1535b5bb62b7a0a6ee8f1e72963556f8658c8eb914ce4e2e2e0c135abdea3e5a8a1d2165f988
-EBUILD txsocksx-1.15.0.2.ebuild 748 BLAKE2B b32e95daaab2b258154e7869a6df1081ac7c9db0183acd1f22187da5a20a541c9ea5c7ed622f14c9b1bc2d3994046947535efda51df91bc10d1a6688622e224b SHA512 bdb35ef63da74c96709f15924521c33a360e28e9733942b2d8a0f42ba522e312f3075c678a677b78c3129bb49eda69c014310646ae5213af4208c71f6e0ee7ef
-MISC metadata.xml 303 BLAKE2B 53b1ee2e2b5ae5ac76d6df4be3d96c40e6f244552906c7f4a9564ac23884c4b661b52e9067984123b9e8765deed10694c63891894ea7d17f586afeb639399922 SHA512 7c547760f8e1e57644e0a8d40f7749f6a9bc20579ca2cf85b98179aaabf59d2ccae614aa5f7c8ed3279d71107502af079d42b1383f251cfeb626e4b819e88701
diff --git a/dev-python/txsocksx/metadata.xml b/dev-python/txsocksx/metadata.xml
deleted file mode 100644
index 4cc68979d354..000000000000
--- a/dev-python/txsocksx/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed --> 
-  <upstream>
-    <remote-id type="pypi">txsocksx</remote-id>
-    <remote-id type="github">habnabit/txsocksx</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/txsocksx/txsocksx-1.15.0.2.ebuild b/dev-python/txsocksx/txsocksx-1.15.0.2.ebuild
deleted file mode 100644
index 2ec5ff1f85ae..000000000000
--- a/dev-python/txsocksx/txsocksx-1.15.0.2.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 )
-
-inherit distutils-r1
-
-DESCRIPTION="Twisted client endpoints for SOCKS{4,4a,5}"
-HOMEPAGE="https://github.com/habnabit/txsocksx"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/parsley-1.2[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP},crypt]
-	dev-python/twisted-web[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="dev-python/vcversioner[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index d8d135a796e6..bacd5f99d700 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST typing_extensions-3.7.4.tar.gz 36058 BLAKE2B f9e5efe9a7d51beb683bd4a88d7c1cab247b2c4cfd300131591bd04837dc15af277a8725c04566b9317be577f8f11e330f2d0169b52c3e9f92a8d3140e9e69d0 SHA512 82c15e6e67dde23456c3b01705729804dc21bd2088dee3aa63e53a5e597f474d34b1a37fb16bc5e3497f93d338c0115f49a070621523fb0fa3e994632785c6d9
-EBUILD typing-extensions-3.7.4.ebuild 790 BLAKE2B b4eb31dfef93d1f4b772b213d36405c3680cac236afb0c6de2e9018398294d9a6fb5561dcc51e70c7215e02a088ef2be4426f8c46f820619f1e120cefb812dd5 SHA512 ece770d6cdd5d8b8d96f132aec950c19a75af58a845bfccf20036b8dd98e5ff7595508610e86e4fb2de18addfbccfa798f11d7edd4adbd14ea807fb5cbc7a705
+EBUILD typing-extensions-3.7.4.ebuild 792 BLAKE2B 97784c901ba949c7b06d69098fc17c191c64fc922b76d6e2ac20b9c4b5d3c276f19588116318b6bd803d6ff5ee91c84e6c6d0b6eb87e1917a1c27e4f4d614808 SHA512 49b60c1405c28909aeb258594ed1b48251d95094f0b003ab70b4b500570e5dc57da7cbb005c214a259703e731058c681197b41b0aadeb75d6344ee0079ef33a7
 MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
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 d19958a3ba88..a415e5a0a41e 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index bb789e5e2cff..b7c29f8dadb3 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,4 +1,4 @@
 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
-EBUILD u-msgpack-2.4.1.ebuild 838 BLAKE2B 62c6a8b3d3238feee9a339ae30037aff5080d0d217552e6f4a912faa6905d6b3fb52243b99c6f7eb0bb7aefef98f5bf5063ec1495d07a35d2d1ee9275f088c79 SHA512 b71c3ec07ccf29ec9080197c04c888d515f487c08fde7d44aa94783ff4f2a5f309bf11c16e0d4a921112655fa349866b273bf125339ff8d68327c2d2558cf792
+EBUILD u-msgpack-2.4.1.ebuild 842 BLAKE2B f7c2ae25f63f56a0d75b485c06149d963ad93ef5784b98a8aa666dba760846c73d119fadef24ca7c36edb138cb1193ff9c7e8edb10bbdea4eda04247bc31f797 SHA512 b1a700e167ad794528d29c65e015fd3455b92fd31a2592b72740deb7a0d3b55a7406b0c6db5ceb6f39e65afcc54322516265780a55714b737e9c6c6b7dd1c061
 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 c8bbd54781c8..813f83f755c0 100644
--- a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 23d8303cbed4..22ac827674ab 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,6 +1,8 @@
 AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be8281110bbca5abd39b78807fe67317052579efa0498bc8a321d09fc953c9358dfb963ed210451549d14d6f58ac4a94cc3e9a5d1 SHA512 a7007c74a2e46e281dc0db6fcc45475e36f3a261445c2162fe0a548e577cd7cc344957e3284c52fffdd21cf223e91ab5b4fc1936b6893de614c4143cd1b40419
 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 1416 BLAKE2B 3ea73653aa36adc305b81759ded97af57a2a5bd901a73815a8d0372ebc8fd5d1565626016f5b4a9d7556817e376ff696cfc84049201a570cf58b6dffe383bf6b SHA512 2716709771e66c3d2de8912c5fe4c5ad8f5bcc453575a1045c9e44225e5cb52fdb06240457ef8bf1c193f5b141f76c8ed912393e7fbfb555c5a48c64f0970979
 EBUILD uranium-4.2.0.ebuild 1599 BLAKE2B 48553f297c6c730ff39c886c6912d8bacb068965f3ee55901cb1c0599d6db90da352b5a7f1150ab4b36f5e5c8239a419d13616ee82c1d9e27f6b45e7b39724f3 SHA512 e84ede7ae2a0b11f8c97925ea73e4fce30d4d0225320054dac6bce84c6e69740957b6a1945e8f9fd113b01b55717d3e35d768b525a354bf86c96cc7ab3c5a1bf
+EBUILD uranium-4.3.0.ebuild 1638 BLAKE2B 31795f16ab0148c0205c148117f5bcace599e0500a5e497eb18d40758830b49fd46c2c955a940af46aac491666013f5d6af92a528207240c196bdf8ce6ed06d4 SHA512 87348165d073558882310ee85210b95aa791df0c6a8a671e3c047d51a55917bc0b978d290f8eb5a6da7d0251826a6b03ea32de49d610088ab195565873384b7d
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-4.3.0.ebuild b/dev-python/uranium/uranium-4.3.0.ebuild
new file mode 100644
index 000000000000..00956f788e6d
--- /dev/null
+++ b/dev-python/uranium/uranium-4.3.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit cmake-utils python-single-r1
+
+MY_PN="Uranium"
+
+DESCRIPTION="A Python framework for building 3D printing related applications"
+HOMEPAGE="https://github.com/Ultimaker/Uranium"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mypy[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	sci-libs/Shapely[${PYTHON_USEDEP}]
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+
+	if ! use debug; then
+		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die
+		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/FileLogger/FileLogger.py || die
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+		DOCS+=( html )
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${D}/usr/$(get_libdir)"
+}
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 69600d6fdbb2..36b341cb2a4b 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 680 BLAKE2B dd84d57b1d6facb4f00628adae6f299386a26022985b41445e9ceead3fcd1ae9638788f92f8b717cc8978e111dfefc633036c7ee941ce3e083633c1a508606ab SHA512 9827e9fc4ecca0fc8c688ca3fa400bf624199ed42cebcf29c9a775842b6036c9b9748b84ef9c82ea559a6dc557dc107e59cb49eb3d0bb79399405af9ec63d8d2
-EBUILD wcwidth-0.1.7-r2.ebuild 711 BLAKE2B eb547e8fa22030a3edf003e51871b0cb282340d8c2d8c5ae461e08b4e1172c2445c50340c96c16197262884c5e62848a6d8da23972f9afbc842ed9bf965da563 SHA512 db808d6472ae598f67af74019cb30da9a124c9e8eb228d90b6f8c1276e8b2b584413546484163bc316fe57342d18ddaa9dc839bcf94fa7c9d03a0fd30adf381e
+EBUILD wcwidth-0.1.7-r2.ebuild 717 BLAKE2B 19361c49f527fbc2334afdd09c43f360d571a2cabe5ddd75435e23cb48b03d78e916662c0fb9dc895ccaed60851152815950d3428f281909f3ef6a074f2a6852 SHA512 c0af1145cbe11731cd9642677fd13836d46bc4d75fc036395b1a5d5cd864edbf97814aeed815e54ad37d396b622cb9ddf270f118228499d761741ff330bf274a
 MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
index a7352c66497d..0cfa10b56e13 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index 384591cf532a..11e32969baaa 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,3 +1,3 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
-EBUILD webencodings-0.5.1.ebuild 837 BLAKE2B d9f5bd84338e601f192e3740907d50c8b9927b47c7509ac6979761773b91d480fbdefa18aaaf68330354f6c9952ac52e8bdd0faa2c6ef7e163ae44577eec8c53 SHA512 62c29b5b496cead23a32b3f6ce5837462dc5c9a324c70254d4cbe4f4af8d3c9bd1208eceab8c789456dceae376a76f9088eaee8e75b1034b5b30ca652ce1d423
+EBUILD webencodings-0.5.1.ebuild 841 BLAKE2B 04cf32d676bf331db3cf93fbd78ff310bec5ae9701a4ffb1519e90b1f7b04b0b99c2ef850c4f91cce1da897586dee306fa28b842b2363ac8b7c1779a58df8709 SHA512 e916f8110e773b2db43ef2cf3ebf4190597c092ae42153d62eee8be4b8a6144b5b20edc11983d0158cafc879644aea8f7d3cf34192fc7bf77d212b4a75897441
 MISC metadata.xml 575 BLAKE2B e04ef356f2e32b91dcfcf94b1f02c86782491f811d71e45b19731f9e0262d42d2419a152b99c52f575db57f682d7a6820a2a2d1e4ee79ec1beb810c238907578 SHA512 c734aada8a2ab7aa8cc6f25fdab99d9ede6be164d23acb8dbda9f7988aadf9d12b6e3043f5adb050cef277523b4a0c84d770ad1f2f75ff7d21d774c403d960ce
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
index 055f302ceec7..4b2dbca83027 100644
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1.ebuild
@@ -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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/wsgilog/Manifest b/dev-python/wsgilog/Manifest
deleted file mode 100644
index 22a7e3012e80..000000000000
--- a/dev-python/wsgilog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wsgilog-0.3.tar.gz 4299 BLAKE2B 7ae5cd592cff0a09783e64138131510581de0cc1e649215682c495e07d94607aa7518d7281eaee8f1d44e629285302997908380444feed2305bdeb5e343cceb4 SHA512 be6788c059f1901b21d272b53b6f9ba4096d1f02f244635c5661f75ce40b3f778ca1b72df76c070b50cab3c44a0cefe0044bae75541b20769da61c9d4fe0863b
-EBUILD wsgilog-0.3-r1.ebuild 436 BLAKE2B 5e6011d9fe02ac80fb8725fe7e0e62e1069b2584729d1dfc348ddb7e49d6e58edfa370ec9958c0693580dd880fea893d7c69e01eaed5f4bcb8d42cf6dac16bd3 SHA512 1d3f65cbe54fdf8d316b44b4fc10a0b1bba2bfda410c69df9d20d28729d5c88079340e53c28cbd79374cc0120072719e65a0190fa8c53954bcf2cc8f4d16c433
-MISC metadata.xml 237 BLAKE2B e49ed85c47e990b058d0db940d2ca11f896cfbef812ee846fd7f2f036efe4d3a091c65cfbf10d607c48b39e7de2d32d92a13deafbaf9d245459e85428bc06083 SHA512 5a666dae911b6aa7e75d85d61503a786b70676d14cef28f99968cffbdecd7175ae722e4cb0da9abb0926d9909e5eeb6bded9363a38c681b60c35d2fad221c8d7
diff --git a/dev-python/wsgilog/metadata.xml b/dev-python/wsgilog/metadata.xml
deleted file mode 100644
index 9a7f68fda601..000000000000
--- a/dev-python/wsgilog/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->	
-	<upstream>
-		<remote-id type="pypi">wsgilog</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/wsgilog/wsgilog-0.3-r1.ebuild b/dev-python/wsgilog/wsgilog-0.3-r1.ebuild
deleted file mode 100644
index 96f6b2c4c794..000000000000
--- a/dev-python/wsgilog/wsgilog-0.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 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Class for logging in WSGI-applications"
-HOMEPAGE="https://pypi.org/project/wsgilog/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="PKG-INFO"
diff --git a/dev-python/xmpppy/Manifest b/dev-python/xmpppy/Manifest
deleted file mode 100644
index 51fa41fe0ff5..000000000000
--- a/dev-python/xmpppy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xmpppy-0.5.0_rc1-ssl_fields.patch 1243 BLAKE2B 64ae57e8ae53529d1c5bd36d76195f85574e3c73436d4e09811ee31a7e1f085531d8747174821a9bf5b7ace90ecdb98e871ed6bb1948a7d1cd22bea10da94463 SHA512 4f9065add9da4a1ef66ee13834f0a3f16b9fa8b2ffc5d3938756683ff6ee3b514fd154739e08e471f5ef7eb6331c25abd6c60ec9d56f8a4e1c57521e8510b766
-AUX xmpppy-hashlib_ssl_deprecation.patch 2990 BLAKE2B 42d41ede7f8283ab39f6024a478c082511700a978ff87046efdae7c25116fb4230ddcdf8ca6ebe7dbfaf6bb2e0c5575be700a28caf241314324445fcd08d62ef SHA512 1b085dad2d71daf81d7be877a4710c900895f6725322e52210ad3f3e2eba0ef609119ada5ab6c42a3f880317a66555ba3e13187b06cacd7c454189c4152f67f7
-DIST xmpppy-0.5.0-rc1.tar.gz 84993 BLAKE2B 69cac1653e5bc8a31ed1e88acc89c5f04937d3f1dc618fef85f97167a8f4afbe8ab2d469b718dbd614508214e4074899b7ad4f31c28f6677086c1112f7dfd58f SHA512 53a37d1a8adcdc8a652e4a6efce2a7c35b4c5ef79ee7ae93134ab6d5a74f96647efbd0954eac60c26a2b507fdb7ee3e607427b11fbd1e22290a23793f03b4699
-EBUILD xmpppy-0.5.0_rc1-r3.ebuild 811 BLAKE2B 72685e44cf9981e7ad4b5a457f93f0261e371bc162a148a1eed212f08df99e22cde3525c6c9a11a3f5aa22522af93e9c23b8dbf557b39b8c384f9f20356da3cd SHA512 c1f12a039b20db8da4a605c43d1c02310d18f1628b3955f05d956496b7bd9526f4e69febc549ab0724a5d9832d3962c1789c4ccb7acd96345ba8436100d3cb20
-MISC metadata.xml 722 BLAKE2B 146d079cb57b6ba7b69df6b13621ccb3a8af275f104d221f783c3a51ca90b99e9057cf49f9e2ad2f970fea32ecc14e0995eaae31aba7c96d727c5ad5dc51bf20 SHA512 669662f0f5c8f767b221abc07d59eedc4d97762316951bcda01ba249c831a7ef47e90dfd18c22f243e2b8851b7a616128c78036a619ca1a5dd846208e7632773
diff --git a/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch b/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch
deleted file mode 100644
index a39af1821fdb..000000000000
--- a/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Taken from https://bugs.gentoo.org/show_bug.cgi?id=535758
-Kudos to Anton Bolshakov <blshkv@pentoo.ch> for this patch
-
---- xmpp/transports.py.orig	2015-01-05 15:41:23.000000000 +0800
-+++ xmpp/transports.py	2015-01-06 15:52:25.916240681 +0800
-@@ -27,7 +27,7 @@
- Also exception 'error' is defined to allow capture of this module specific exceptions.
- """
- 
--import socket,select,base64,dispatcher,sys
-+import socket,ssl,select,base64,dispatcher,sys
- from simplexml import ustr
- from client import PlugIn
- from protocol import *
-@@ -314,9 +314,10 @@
-         """ Here we should switch pending_data to hint mode."""
-         tcpsock=self._owner.Connection
-         warnings.filterwarnings("ignore", "socket\.ssl.*ssl\.wrap_socket", DeprecationWarning)
--        tcpsock._sslObj    = socket.ssl(tcpsock._sock, None, None)
--        tcpsock._sslIssuer = tcpsock._sslObj.issuer()
--        tcpsock._sslServer = tcpsock._sslObj.server()
-+        tcpsock._sslObj    = ssl.wrap_socket(tcpsock._sock, None, None)
-+        tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer')
-+        tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server')
-+
-         tcpsock._recv = tcpsock._sslObj.read
-         tcpsock._send = tcpsock._sslObj.write
- 
diff --git a/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch b/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch
deleted file mode 100644
index 489de037a488..000000000000
--- a/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- xmpp/auth.py
-+++ xmpp/auth.py
-@@ -21,11 +21,16 @@
- 
- from protocol import *
- from client import PlugIn
--import sha,base64,random,dispatcher,re
-+import base64,random,dispatcher,re
- 
--import md5
--def HH(some): return md5.new(some).hexdigest()
--def H(some): return md5.new(some).digest()
-+try:
-+    from hashlib import md5, sha1
-+except ImportError:
-+    from md5 import new as md5
-+    from sha import new as sha1
-+
-+def HH(some): return md5(some).hexdigest()
-+def H(some): return md5(some).digest()
- def C(some): return ':'.join(some)
- 
- class NonSASL(PlugIn):
-@@ -54,15 +59,15 @@
- 
-         if query.getTag('digest'):
-             self.DEBUG("Performing digest authentication",'ok')
--            query.setTagData('digest',sha.new(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest())
-+            query.setTagData('digest',sha1(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest())
-             if query.getTag('password'): query.delChild('password')
-             method='digest'
-         elif query.getTag('token'):
-             token=query.getTagData('token')
-             seq=query.getTagData('sequence')
-             self.DEBUG("Performing zero-k authentication",'ok')
--            hash = sha.new(sha.new(self.password).hexdigest()+token).hexdigest()
--            for foo in xrange(int(seq)): hash = sha.new(hash).hexdigest()
-+            hash = sha1(sha1(self.password).hexdigest()+token).hexdigest()
-+            for foo in xrange(int(seq)): hash = sha1(hash).hexdigest()
-             query.setTagData('hash',hash)
-             method='0k'
-         else:
-@@ -81,7 +86,7 @@
-     def authComponent(self,owner):
-         """ Authenticate component. Send handshake stanza and wait for result. Returns "ok" on success. """
-         self.handshake=0
--        owner.send(Node(NS_COMPONENT_ACCEPT+' handshake',payload=[sha.new(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()]))
-+        owner.send(Node(NS_COMPONENT_ACCEPT+' handshake',payload=[sha1(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()]))
-         owner.RegisterHandler('handshake',self.handshakeHandler,xmlns=NS_COMPONENT_ACCEPT)
-         while not self.handshake:
-             self.DEBUG("waiting on handshake",'notify')
---- xmpp/transports.py
-+++ xmpp/transports.py
-@@ -31,6 +31,7 @@
- from simplexml import ustr
- from client import PlugIn
- from protocol import *
-+import warnings
- 
- # determine which DNS resolution library is available
- HAVE_DNSPYTHON = False
-@@ -312,6 +313,7 @@
-         """ Immidiatedly switch socket to TLS mode. Used internally."""
-         """ Here we should switch pending_data to hint mode."""
-         tcpsock=self._owner.Connection
-+        warnings.filterwarnings("ignore", "socket\.ssl.*ssl\.wrap_socket", DeprecationWarning)
-         tcpsock._sslObj    = socket.ssl(tcpsock._sock, None, None)
-         tcpsock._sslIssuer = tcpsock._sslObj.issuer()
-         tcpsock._sslServer = tcpsock._sslObj.server()
diff --git a/dev-python/xmpppy/metadata.xml b/dev-python/xmpppy/metadata.xml
deleted file mode 100644
index f972de4d8621..000000000000
--- a/dev-python/xmpppy/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-needed -->
-	<longdescription lang="en">
-		xmpppy is a Python library that is targeted to provide easy scripting with
-		Jabber. Similar projects are Twisted Words and jabber.py. This library was
-		not designed from scratch. It inherits some code from jabberpy and have very
-		similar API in many places. Though it is separate project since it have almost
-		completely different architecture and primarily aims to work with jabberd2 -
-		the new Open Source Jabber Server.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">xmpppy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r3.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r3.ebuild
deleted file mode 100644
index 3fc1671aa609..000000000000
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r3.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 )
-
-inherit distutils-r1 eutils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Python library providing easy scripting with Jabber"
-HOMEPAGE="http://xmpppy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xmpppy/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND="
-	|| (
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		dev-python/pydns:2[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch"
-	"${FILESDIR}/${P}-ssl_fields.patch"
-)
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/xonsh/Manifest b/dev-python/xonsh/Manifest
deleted file mode 100644
index b6c94f06e686..000000000000
--- a/dev-python/xonsh/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xonsh-0.4.7.tar.gz 545249 BLAKE2B e7207274cccbd96a32942dad7e5b0e44c4a053c52a0f4e06bc789d86414d678192ce885e3d2cccf2c4f4d208567a2beb1319ffd01e150b5a1a953cb82ca75598 SHA512 133a493b1245048e4b8a51f01f0629283736753a7636d8bb0c123b623122b285fed9ba415972e5f44dbb9a1439a83858da50a9b01ebe6bb11e4e390708e08c9f
-EBUILD xonsh-0.4.7.ebuild 998 BLAKE2B 3aa3a9451f8373e0a0215240853f161b04012996d3d84a32e04d86d1b68a3e28bc5d476f1bcaaf127e3017674e2cb0fa6756d6481694463021dac8cdfa30596f SHA512 de46319a6b1f03ac910f1fc6caa37ba1c81f0060174a74b12c656454c4f7efb7770f545487080702b53237fcd58861351a3d7d0a528c0ef85e8960ec36fbae14
-MISC metadata.xml 421 BLAKE2B 61c8423ad1c450e2a42a32fab7f839151ca56529b73633169fbebfb09e9cf8bf35d3387e06eaf0cb4951cb74478c69114acc3c7a7aea4e0fb4cc1bc46abdec66 SHA512 7a6b4489d4ccadf9659bffc020893f0282a843a8fefc04326a9a40964304416bd021613f231b46b1c39ff4f91a623f8e521c8f5b9d1a9311574fd6b83a5c40b3
diff --git a/dev-python/xonsh/metadata.xml b/dev-python/xonsh/metadata.xml
deleted file mode 100644
index a3f8a4d9815a..000000000000
--- a/dev-python/xonsh/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">xonsh</remote-id>
-    <maintainer status="unknown">
-      <email>scopatz@gmail.com</email>
-      <name>Anthony Scopatz</name>
-    </maintainer>
-    <remote-id type="github">scopatz/xonsh</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/xonsh/xonsh-0.4.7.ebuild b/dev-python/xonsh/xonsh-0.4.7.ebuild
deleted file mode 100644
index 18aa5230d084..000000000000
--- a/dev-python/xonsh/xonsh-0.4.7.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=( python3_{5,6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="An exotic, usable shell"
-HOMEPAGE="
-	https://github.com/scopatz/xonsh
-	https://pypi.org/project/xonsh/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed \
-		-e "/install_jupyter_hook/s:prefix=prefix:prefix=u\"${ED}/usr\":g" \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbose || die
-}
-
-pkg_postinst() {
-	elog "Please install"
-	optfeature "Jupyter kernel support" dev-python/jupyter
-	optfeature "Alternative to readline backend" dev-python/prompt_toolkit
-}
diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
index ccfdae5632e8..3c9622bc809a 100644
--- a/dev-python/yapsy/Manifest
+++ b/dev-python/yapsy/Manifest
@@ -1,5 +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-r1.ebuild 917 BLAKE2B 7dc3183ae3392f7cca4791c0571c6ddd884c78704cc1a3d583057c498fa495dab248306eaa2338e1be7a00d9b2e48b3f1689c699c498fb711554e50d875fd103 SHA512 3a3171a00a8f7445c1fab629e891a90536aa406ef3c950375f0162d2e5f1584796e9b6fe3ab9b21806c63963c9d81ce8aba64ee958a371a6912647d37d587db6
 EBUILD yapsy-1.11.223-r2.ebuild 975 BLAKE2B d59f514ebc214bda21a606e164b721a9a0cd6b9f620be8c13043b837ec9de9b7dd827f03639d8b9ace240c3474d8ff40c07a32ada7adbc326fe5d7ded963ebf4 SHA512 bb4895681ddc6646055af2c38e61d296d47a0d4dc02609c6ca986a4e09917a629299df784ad6a2d9d052af907ed741225022db3ba8a0732fd182cc3886852732
 MISC metadata.xml 423 BLAKE2B a30bb50714d2efa8d7bf299e53a3992ab24fd55ef2670fc7a15f25ed6fd864fd112940b0a202491307de2f74eb339292e32a475a7cbe89cf1dbd2ea4f6f47b8c SHA512 73e423d31a622b7b15bf672cdbada8378d069954acecdf6d729f05ca4297ef01016519adf362b322dced4694de829f079c80a17c836b5ee458b772a3c5fd36d8
diff --git a/dev-python/yapsy/yapsy-1.11.223-r1.ebuild b/dev-python/yapsy/yapsy-1.11.223-r1.ebuild
deleted file mode 100644
index 13dba5efd1f4..000000000000
--- a/dev-python/yapsy/yapsy-1.11.223-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"
-
-MY_P="Yapsy-${PV}"
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A fat-free DIY Python plugin management toolkit"
-HOMEPAGE="http://yapsy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/yapsy/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable erroneous test
-	sed -e 's:test_default_plugins_place_is_parent_dir:_&:' \
-		-i test/test_PluginFileLocator.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/yubiotp/Manifest b/dev-python/yubiotp/Manifest
deleted file mode 100644
index 6e22d501e73b..000000000000
--- a/dev-python/yubiotp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST YubiOTP-0.2.1.tar.gz 17493 BLAKE2B 7dbc6b2c9383f7ff942fa2bd5d84b27f6f15795f96ec89c0352f5df126cfdf04cf113e6f5de628652a24147258cdecf9fbfb86093bc455a1d639f5ee21b0beca SHA512 3b505fed17ed27d1ef325598a5899d4ed4ae5ed7938d1ae71155f889a6533a969e07e1172661e411cdbf23a2060e8f521cd90779c314524c4a564fbf852a670c
-EBUILD yubiotp-0.2.1.ebuild 712 BLAKE2B b898f8c326190ccec42c124a5e85abce6fdd16e2a7c3a1cb472430974a75a73b71f33021db818708ab1d475cee728753dabc013cf6f5ea21de41a06e8e2b0080 SHA512 2e45c187fbc85d6bd290c026606717cf98e1861cf0e5dce6b624ba7adb4781848be3456eb0d4f1688fe1ab21a2873fae0b01379f8c6a9261efe62ee5dc8015c4
-MISC metadata.xml 302 BLAKE2B 854793c7e98a8cb8d289dfb155f02de3b3d0b214cc3ecf7b132541ace1847fffd7a699dba45f7a68df6445b09807bf3f5a9243119e5455a8ee4badb84497a5b7 SHA512 68f95948e3b59c58eb47190e4d11c9c6f7979c4b073678b46a2e98f5fafca4c8c8ef86bcbf15c4065c7818efec0b829c1bd52f3f9455cf0f1530bb29bb28d709
diff --git a/dev-python/yubiotp/metadata.xml b/dev-python/yubiotp/metadata.xml
deleted file mode 100644
index a31c338a5c29..000000000000
--- a/dev-python/yubiotp/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">YubiOTP</remote-id>
-    <remote-id type="bitbucket">psagers/yubiotp</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/yubiotp/yubiotp-0.2.1.ebuild b/dev-python/yubiotp/yubiotp-0.2.1.ebuild
deleted file mode 100644
index 6ec225af7b3d..000000000000
--- a/dev-python/yubiotp/yubiotp-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=5
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit eutils distutils-r1
-
-MY_PN="YubiOTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Library verifying YubiKey OTP tokens, locally and using Yubico web service"
-HOMEPAGE="https://bitbucket.org/psagers/yubiotp"
-SRC_URI="mirror://pypi/Y/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-
-S="${WORKDIR}/${MY_P}"
-
-CDEPEND="dev-python/six[${PYTHON_USEDEP}]
-		|| ( dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] )"
-
-RDEPEND="${CDEPEND}"
-DEPEND="test? ( ${CDEPEND} )"
-
-python_test() {
-	esetup.py test
-}