gentoo resync : 06.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
commit: f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree: a38046712bbc3a3844d77452d16c84e716caa3d4 /dev-python
parent: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)
139 files changed, 1234 insertions, 1924 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fa5af67aba79..a69eca82cdd5 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 7f4d314e6abd..84d88940362d 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,18 +1,6 @@
 AUX aiohttp-3.0.5-tests.patch 294 BLAKE2B c535d85c0ad73394897db4db2743e3e6c09faa98a5a8a013b5b5b7af79adffaaa30f20a4cdff65760911c8f3ff373318e144d7ace6a7de6b0fa7b6cf9b8bf352 SHA512 0e5871efad3d360757fdd1ef723b741669a1e0b98728f58fe689b66b765dd4607e05a72cb618ac55b6a61cd53247916f9d497ca147eb7c8c86b8473a298a4b38
-DIST aiohttp-1.3.3.tar.gz 526273 BLAKE2B 5721479dc2141167118f226b266b504d689fa6708d895817fa448c4ffcdcfd71f5e95c98015d3a0e159d1f8d67232f3ad8a31abbed2532eb60564518df017bee SHA512 39342270f615f7e5e01889ad50ccb60335151e94631007b105acda9930038d2fb66128469ca44043280c9f737130e2361129e2fa1c857a7654a1151b98a19a69
-DIST aiohttp-1.3.5.tar.gz 527432 BLAKE2B 6420ecc1eaa29713643dbe9a05061df5277f10e263469d82a24397fa2ec53cf57aaeac86c22a17f06102bfcc69bfe959b6e00b264d9ef30eb193405f4eb9ea70 SHA512 b99630fa9006163d61e0e010972aee8daad021c5ad0152b04fb6f8b661f18ea03fcfa8d35603ecfcdaef4ecbaff0159b49e2f40164241bb5def48b2847e2d966
 DIST aiohttp-2.3.10.tar.gz 848324 BLAKE2B c32a7be3f3d9ba0bd1308c5bea779a10e177b9c018a03fb3cf95d1a1392180f3b4ea294dc23e2e946cc1065d16d212a169ec262a79034ae94b3a5067fbaf362c SHA512 e4ea725bbd3d7d749f2ec21eea1ff9f5c836fbeaa17ad72f77e378c69b008448e57503175bee6adff86110f65edc915cb6368df3011d1d9d61cf47718b086be0
-DIST aiohttp-2.3.2.tar.gz 841030 BLAKE2B a291baa1c5e915815ec80ea1cbd8434b31f4098eeff20767898fc73d75c6194df4bc2a5d21147a8e5c506f5bc377e79b6e8937ce65b9c73616366f439e542c1a SHA512 e481787fec8c9f21d49978b378fb5ef8c06d06cd7a6625fc36c5d4a035e9047f4ed0e38b25b613f1b685ca40e18c796376750f4ac0970fcd1d72ca7fbe31d13f
-DIST aiohttp-3.0.6.tar.gz 738111 BLAKE2B 28a3560a7b351ee974db8bbdd372798e01696e66660b6330707c542253c4d8a0405e6e8c2c8ec03c3b0ea8b548516ffb2dfe14b800b5f17e908991244bfd9335 SHA512 43f1b3c2da1bc57ac6e83a01abb3568b71ed5514e9331aaba4b691ff036d2d3e72eeddadd0f2f20608fa1f622a673ce1d4489bced2096ae546a350ad5f438d0d
-DIST aiohttp-3.3.0.tar.gz 722307 BLAKE2B 3bf1906e8a518d443a2f1bfff536fe9c4024dd18d12ed791dd4a81cfa3f81260bbbf293ae093086fa45c068f3417bcc797d1ee01e64a890a9427944ac9836760 SHA512 e7dd320abb0d9baa0dd583ce034b2d2dd328aa37750197789207e80eabfaf1e998a58e9aa0a6b98ff213f8c78ca90b85698ac559c57f44ce1b643fc317735a4b
-DIST aiohttp-3.4.4.tar.gz 822110 BLAKE2B 808c125f0d826b11d5b333ecfc35ed15cfe5a4f4242df5dd1b1e8edf6502c78d6162ad21e4fb7026294bc7013251a3b55d50c9cf34539b06b32348be2b1627a9 SHA512 968b701b8a19aa445a4af402f4bb38754565e3b80b4248127e5017671c921c370eea63fcec4148b7229ac1a74bb8739f33513abd6cb7fe02f3feddfd3ec1a6b1
 DIST aiohttp-3.5.4.tar.gz 1097647 BLAKE2B 27d3631cf33cc5052deecfeca23f6c052fce344d9a889b0c0c0e68d9dcc19eb56e2ef2496f025c795dea4f906a59ae579ecd489188f8c56bc41255b4f450f4bf SHA512 9bc31457029f7db5bbfe1e213c1f428bf90ac96d83b6d2c8838261a3910ab9f7632a4299618377acb1bed04b0cbb4b4f6d9ee814495c05f210ed9bb4f4c61714
-EBUILD aiohttp-1.3.3.ebuild 1538 BLAKE2B 0a09a1834fdfa7acda3b6aeed04217f71d01b5db13142f5c2c6261c7e33d6dafbbecfd2bc4ef667960dfad9bc953d2398541811c4ff6093b3358107ec25fc051 SHA512 2fd4ad6d6f98ce4b66d6b9e4150ddac9cadc7664a40ca93ec0059e0fc8b846ba5fc94b372211d65704ec386800a48a40f4934670796fd1408524f8f1439a168a
-EBUILD aiohttp-1.3.5.ebuild 1538 BLAKE2B 0a09a1834fdfa7acda3b6aeed04217f71d01b5db13142f5c2c6261c7e33d6dafbbecfd2bc4ef667960dfad9bc953d2398541811c4ff6093b3358107ec25fc051 SHA512 2fd4ad6d6f98ce4b66d6b9e4150ddac9cadc7664a40ca93ec0059e0fc8b846ba5fc94b372211d65704ec386800a48a40f4934670796fd1408524f8f1439a168a
 EBUILD aiohttp-2.3.10.ebuild 1716 BLAKE2B a2736bc15b41a4a29bb45ff422b86c30d886fbc80e968bf7b435045addf953bef80e24950e5ab6573e5e84f358f89c59d217e56c717a9e13aa06410f8d5e7a2d SHA512 541325c91470dc74f8f51843c5544efed81ad52bf706a8160f6fb269ae9c594a4c1f86f556b846998667b8996a80dacbc86bad968dbf5824fa81b509f3dc4049
-EBUILD aiohttp-2.3.2.ebuild 1583 BLAKE2B 4f4268a8b8a32d4d8aa4f982cf386575f9aa00852819d07e08e4e128dae10d7247585b5ef798d58fd687eff109e70da671902b91073962bdbc3b2b19c8cdfddc SHA512 3dbc911cc0ed37b993a398722c9314636cd39aef0f2a47a58e825d5df90bc49a239d6d30192304b120a87d837968f21047b85faf108d9af94bce3c60d9638ce2
-EBUILD aiohttp-3.0.6.ebuild 1833 BLAKE2B c0d3a1c13ebd7699ae2d506e78de5df605cfcebcc5c25d06aa5d696e534768dea9a0439cb6dce1aec76c042a07f852e87a228f6b1b8150a8b3f3347f8d914e9f SHA512 67b964d4905c55423ed6a1ed30db93b8439a69d0ec1b3d642f4c9b79da669dcdf4cb012c750c34a616e23767df5a1094218337fc5037a29ea35b87e775755bf6
-EBUILD aiohttp-3.3.0.ebuild 1833 BLAKE2B afc0463eaac8b5bcf7317616a3dab30adb223792c64c7516a528c235e53e72e8254cccfc9c2ee8693b83e56c26ce41dfe0107736d00dfce169d587e7541fbd3e SHA512 5647745d6f7225498f8ff20a13cc050d6e6a45091f5e84b411075ea686772971ab3d82cdfa175353b50d567a01ee9002694b45e5fdf52bcba113ec116d946daf
-EBUILD aiohttp-3.4.4.ebuild 2261 BLAKE2B d2a2ed87c1966d02a25a3d644e3d6b7ddb51fbea0cb8f9db507fd59b562ed297f6bd86f47029cc65b9b6d7b126627776f9892f4f02c279cec89bdab60b452a13 SHA512 57d9346f6372cd6249d7cfb6887db812217868f59170dffc342d45caedf9f04ae716573fc6b583ceb966cd144790237b7f5dfae82a157de65248f49e45394c19
 EBUILD aiohttp-3.5.4.ebuild 2194 BLAKE2B 5d8c82f63b0f6aff4f640da121266e99489073653107f912ac224ea78e5c419af40909994fc8d4fd3e825d0acb4c01eee572b6f7ce77088c7a53f2a988eee4a1 SHA512 35012568426f847ba852b26db64dcd3f6d535692bf897c75b822cc33b5b826a1c526f9f300bc3496b38beef7d940c785b3634704f8137d6a8ea1a2af9ff211d1
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-1.3.3.ebuild b/dev-python/aiohttp/aiohttp-1.3.3.ebuild
deleted file mode 100644
index 15ef3ba76d75..000000000000
--- a/dev-python/aiohttp/aiohttp-1.3.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/yarl-0.9.8[${PYTHON_USEDEP}]
-	<dev-python/yarl-0.10[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || 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/aiohttp/aiohttp-1.3.5.ebuild b/dev-python/aiohttp/aiohttp-1.3.5.ebuild
deleted file mode 100644
index 15ef3ba76d75..000000000000
--- a/dev-python/aiohttp/aiohttp-1.3.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/yarl-0.9.8[${PYTHON_USEDEP}]
-	<dev-python/yarl-0.10[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || 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/aiohttp/aiohttp-2.3.2.ebuild b/dev-python/aiohttp/aiohttp-2.3.2.ebuild
deleted file mode 100644
index 54ad3a922519..000000000000
--- a/dev-python/aiohttp/aiohttp-2.3.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/async_timeout-1.2.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-0.11[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || 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/aiohttp/aiohttp-3.0.6.ebuild b/dev-python/aiohttp/aiohttp-3.0.6.ebuild
deleted file mode 100644
index 578bdb459407..000000000000
--- a/dev-python/aiohttp/aiohttp-3.0.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/async_timeout-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-PATCHES=( "${FILESDIR}"/${PN}-3.0.5-tests.patch )
-
-python_prepare_all() {
-	# skip failing tests until cause is determined
-	rm tests/{test_pytest_plugin.py,test_worker.py} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	#PYTHONPATH="${PWD}:${PYTHONPATH}" py.test -v tests || die "Tests failed under ${EPYTHON}"
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-3.3.0.ebuild b/dev-python/aiohttp/aiohttp-3.3.0.ebuild
deleted file mode 100644
index f4498aa7e38a..000000000000
--- a/dev-python/aiohttp/aiohttp-3.3.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-PATCHES=( "${FILESDIR}"/${PN}-3.0.5-tests.patch )
-
-python_prepare_all() {
-	# skip failing tests until cause is determined
-	rm tests/{test_pytest_plugin.py,test_worker.py} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	#PYTHONPATH="${PWD}:${PYTHONPATH}" py.test -v tests || die "Tests failed under ${EPYTHON}"
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-3.4.4.ebuild b/dev-python/aiohttp/aiohttp-3.4.4.ebuild
deleted file mode 100644
index ec6ebeb0b474..000000000000
--- a/dev-python/aiohttp/aiohttp-3.4.4.ebuild
+++ /dev/null
@@ -1,79 +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="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-aiohttp-theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-PATCHES=( "${FILESDIR}"/${PN}-3.0.5-tests.patch )
-
-python_prepare_all() {
-	# skip failing tests until cause is determined
-	rm tests/{test_pytest_plugin.py,test_worker.py} || die
-	# AttributeError: 'brotli.Decompressor' object has no attribute 'flush'
-	sed -e 's:test_compression_brotli:_\0:' \
-		-e 's:test_feed_eof_no_err_brotli:_\0:' \
-		-i tests/test_http_parser.py || die
-	# make pytest warnings non-fatal, to unbreak tests
-	sed -i -e '/filterwarnings/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 7e3eba56f92e..d09bc491cbf1 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,13 +1,7 @@
-DIST async-timeout-1.1.0.tar.gz 7590 BLAKE2B 855a630b1c1be6751ee416a9f394b93b25df7e3ebdadf1b34b6d992b643ee19ccaa4a895e66608ea0d84e10573bba90e02478964fc43c34c43ea02f1064a0b60 SHA512 7132b0616052623c17d7a541051f3e759f8dc87f9ff1730585a1010bc6e139c24d5b8835431749d695fde56fb465f22094ec3f98f5f95b0b7664ec9e1f990cac
-DIST async-timeout-1.2.0.tar.gz 7700 BLAKE2B a658cc80ba0b35d1f79286d8f6edac4aaf84e1bcef680b1ef096f6f9d14873800f948429d00fe09b26e20ab109c676fb1ca838931a83473f59863d490caf2c0e SHA512 81a8d3fd8a6756335ce7ea292afd0ba508ea120482dfc4526017dbf6ee809e6828818653be25dee123e8626fc89cc49cfbcff41748ec950b8797b2bb21f262db
 DIST async-timeout-1.2.1.tar.gz 7797 BLAKE2B d8f736423631a2b2c0fb748eb2857e0f9a143af9591ddfae15d42ab13af33196a6624db5b0a705265269ed28c6c15a4e8cfe56143ccedac75a555ae62a82891b SHA512 2072caeb65a74f1a24b59a4ea905ef96d70f8fb117e3dd9c95c1107b1d67ffaa4d76b68f00364049e6e29cdb0a6d247ba0c3638ccd0a8db27bd6ee0f180f9ccb
-DIST async-timeout-3.0.0.tar.gz 10803 BLAKE2B 3cee55e523a652c27f73bb3790d3c214f2744ef1ba3e0fe6fee80e5e4172cab808b08513d1beb99e71a36eda0a27d31fcf23e7a1ea0fb4569dc1310fef3557e6 SHA512 17df44da4d6038dcfa30b1394bcffbe9a31470c45fcd20c21da8dbea154fd2d508afafb19ce4da7f65422057e3a141be2bd9171d0a385556814759da0fb0496f
+DIST async-timeout-2.0.1.tar.gz 10463 BLAKE2B a9c1ab7ffd249f1d4d07a37f07743923a890d11bb9ff913b37f45e9f7be1110eba9cd24ce741b71a353ae349aceccd66a1853ed985416a85cdb4faa46f341681 SHA512 cb66bdc286082ef5570a7e3aa420434f82bb4131e9527c499c693a21d72b3f3772922c0ce2ad68e7de5f95960061e508effda56be398356ea75d55272f534a86
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-DIST async_timeout-1.0.0.tar.gz 7554 BLAKE2B a069f79eb25c1b698f688cff482970c60197ac6f22e610fe487e33180644a197961f97e1afc7d6ba86f9250add9c7c72d386b5209b8d99e0518c137246106225 SHA512 b02fa2f9558d23e6e1cc076f8d144dcfee7adeaad67c023ce747c99935c2809e2a2223f72b0a12274f11bacadc9b69a6bc3a2914c305ef05d483dc29908e9c97
-EBUILD async_timeout-1.0.0.ebuild 638 BLAKE2B 9461a752bcee0a1d66136c7466b3455057f75573d33d242620fdf64cf81393170d5a97bfe468b3de3edea41fad619d4e90f121bb70307689dbc4a26ac56a82cd SHA512 702b02fb755ea0c5395e07e28b8247799614d28921a7d4396c11b7e143987547c237687cad4ae696de7a58edb16ce8e02d98ce4a7aaa03bf181d39aee243b4c6
-EBUILD async_timeout-1.1.0.ebuild 687 BLAKE2B c31d7fa2f9f47cc275309a5d76d0a7e165efc67cab7a3c49fc4cf5b472d1fd89ff9895cc69d7a6d40e8a3e0473378d30ecd6acc3be0d9c92f2b17698ca18de24 SHA512 93c91df2eb301d17db8b4cb16ef1d8dd65c2aba649c66382784d515106acfe9d4448bea82664debbc87d6552ed761a6ab2f699f2473ed3e3d375eaf506acfea3
-EBUILD async_timeout-1.2.0.ebuild 679 BLAKE2B 79e40255cddfa20cff962f045fbf45d73bb967acaef923004574051bf64ec26920f041028c3370bf26732edfb0d32de9d4812e372a3ec677b38866c309299d15 SHA512 fdf7f5f6cc6d5c82e28e21c6e68f3a2d23bb72a43b1197fcdde29d346efe63acf63c6216a93ab3da29fbe315ef8a9d3ac7710a9059455fbacb21ea13c18bd51b
 EBUILD async_timeout-1.2.1.ebuild 769 BLAKE2B 6d8dca0f71de64dd55a2eab295818d2df64e51d774cd4c2fa1dddf6c69ea68f5dc1f35a702779bc76aa40daa4c143d8daa406ce365a004de1ebbf361fa035648 SHA512 dddd3320c35f7223504b500284ce96122b948a38a47144b5f92efc7a822e86ad5f8992d0cf4517af8e5a32adb293584845efe3cd597245ef98db9989219e2191
-EBUILD async_timeout-3.0.0.ebuild 877 BLAKE2B a01317eaaf886515525c77aaf49bf3a23ead7eb0b5ad686af1964fdb1dfe734a6c3ddb185c01a0b0599934608aac0c56df932523c134c20f3bf559726510832e SHA512 49ff65d96b9ba843699a3c04cb699ab68392ef2e2e076b326327a244e18e869357537f16dcc4feaf91f87f197b5cc0607a9a0fa8cdb576a35f635206bd274f55
+EBUILD async_timeout-2.0.1.ebuild 1010 BLAKE2B 5b83635cddfa16e2ad4395561b07be1cb579056b27c270ffa86849b182bf17c0e8f3617fd256dd9bbeffc11719438e1de96889c63f68d9ff25b298a21b5b9b54 SHA512 057b419ed3b6ebd4ae24c4b417914d90c659cf8f74bb8037f09bd0bc5ede828871a62ef435c94d604b289e887b41fc716207b770f33374d2ed8dd3213d8dc673
 EBUILD async_timeout-3.0.1.ebuild 973 BLAKE2B 1ae7cbf17557bb56256981a445da9c76465e2b576ec78c2931738863ca55c6bb75fb89c1013c88d979a40baba7b52042a7abe171040e84ad0a4ba2a68d5cb77a SHA512 43a969030e9de93dadb3dd07b47e8393e8b5036b313823f805655f3eff3af1b29d7b3a1e9d6b22de503e081df28cea4709eaab8e0948273e644b7790adf02dc2
 MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-1.0.0.ebuild b/dev-python/async_timeout/async_timeout-1.0.0.ebuild
deleted file mode 100644
index fde1383f0a3e..000000000000
--- a/dev-python/async_timeout/async_timeout-1.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Timeout context manager for asyncio programs"
-HOMEPAGE="https://github.com/aio-libs/async_timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# tests introduce a circular dependency on aiohttp
-RESTRICT="test"
-
-DEPEND="dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/async_timeout/async_timeout-1.1.0.ebuild b/dev-python/async_timeout/async_timeout-1.1.0.ebuild
deleted file mode 100644
index e268c983daa3..000000000000
--- a/dev-python/async_timeout/async_timeout-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-MY_P=${PN/_/-}-${PV}
-DESCRIPTION="Timeout context manager for asyncio programs"
-HOMEPAGE="https://github.com/aio-libs/async_timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# tests introduce a circular dependency on aiohttp
-RESTRICT="test"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/async_timeout/async_timeout-1.2.0.ebuild b/dev-python/async_timeout/async_timeout-1.2.0.ebuild
deleted file mode 100644
index 375a1916976e..000000000000
--- a/dev-python/async_timeout/async_timeout-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-MY_P=${PN/_/-}-${PV}
-DESCRIPTION="Timeout context manager for asyncio programs"
-HOMEPAGE="https://github.com/aio-libs/async_timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-aiohttp[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/async_timeout/async_timeout-3.0.0.ebuild b/dev-python/async_timeout/async_timeout-2.0.1.ebuild
index 01a364ef3d4c..96ae22608826 100644
--- a/dev-python/async_timeout/async_timeout-3.0.0.ebuild
+++ b/dev-python/async_timeout/async_timeout-2.0.1.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=( python3_{5,6} )
 
 inherit distutils-r1
@@ -13,21 +13,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 S=${WORKDIR}/${MY_P}
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-aiohttp[${PYTHON_USEDEP}] )"
+	test? (
+		<dev-python/aiohttp-3.3[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		<dev-python/pytest-aiohttp-0.3[${PYTHON_USEDEP}]
+	)"
 
 python_prepare_all() {
-	sed -i "s:, 'pytest-runner'::" -i setup.py || die
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
 	# tests fail due to missing fixture when trying to load this file
 	rm tests/conftest.py || die
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index 0df0e92c8aa0..84dd2671b04b 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -1,5 +1,7 @@
 DIST backports.unittest_mock-1.3.tar.gz 4687 BLAKE2B a01712eaf5cb32d7da803aa9034f68508faa4d8db8d6f6eb02e20cb9f42c4e6bda3b409a0e2f676b6b7782f16d78877da6f093af6ac1f1deb100b19969570787 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff
 DIST backports.unittest_mock-1.4.tar.gz 6034 BLAKE2B c347f1d45c610701b605cb75304f93c8fc7a8534e2c14efb4600a7c5cdbcff02e0534dbf572ac248d17dbc161dcabd8448941d8340a71734f29ff3294c8210f1 SHA512 ad19eba7c221fbb97ba710cbe96aa26de74ad8c70ea7b794d8dcad3dc86a55a45d36f542ad829fb8c4bcf09c772cf64532dabf337b40bf87c7b29e13236484a9
+DIST backports.unittest_mock-1.5.tar.gz 8941 BLAKE2B ba0ba99bd2668ffaf02f10cd5cf511e32660a2592550f879422400265a4b75732e03d2d0627c4563daca0063ac5759d30abf450c13f9d38b6b3a94b85cab9c17 SHA512 2f2d2c34f80009829935f9e97404bf1840d3ead9dad55fc6f967135b80ed572389d7f42ead2f82671ecfe341eb6ccf696a49560c848d1a36ec5570769a5820a5
 EBUILD backports-unittest-mock-1.3.ebuild 1481 BLAKE2B 5270648633c718bfbecff69278cb38cb0cb970bfdcdd9918e246ed5198e2ec1cfc66a27c9df3b3c0a9bde5bdcf1f01fa88e4b0ea8bf7c2b9661c79c73826dd92 SHA512 e32eadcd5c198926800f951576e3ffc081db46db662429375efb0d493307cde7de47c80bad864077f61b0c7df6ecbf241677b4e41ad80f2d250d348ac13006ab
 EBUILD backports-unittest-mock-1.4.ebuild 1592 BLAKE2B 805f016e27af7f6e37b8680b321596ef7d38d469f22d2f9a8d8812947a5e5fe4599063b38da1e33d33c7049f125b840942f6ad10d9798651023cc5d759668e3a SHA512 85bacc285529fcd48a970857c7ff9af7696806e690dea3fb637434bc3d67a0de553a4bece5d65e1a1c587bfb1e33a6f5cc94249b20afebcd47dfb684b1ca7569
+EBUILD backports-unittest-mock-1.5.ebuild 1593 BLAKE2B ffb1c9cdf9c96b9745f7f411ae17ece436e62f8041893f621d970ee3bb7a1ff1c09fe33d6d883c547ed5f171a509e87917636a4452704ebeed0ffb58cc6bec73 SHA512 5d3a248c228d8f180d26a732dace7a48a9f33f005a463d6ce8d37db4dfa6d988893487622e788f2dee351aa964b0592bd31733e212d88b249c9534e8b3b1d719
 MISC metadata.xml 657 BLAKE2B a5a51b30ebc334f17d09e38e1f42fc1e06fcf65de5a56810378909169cdce48bcb0acceb8b192bec54e67a254b0809a0339fb8ee11fee48e043a082f63fb9bf9 SHA512 5d0e58887da4b7362f3469c218af61c4ec31426aec212013f3ee19992fae9e664ce13b226c928fb0e6e6ea3efdd946d1c09b1da623a741e89b7b68b74e73cf24
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
new file mode 100644
index 000000000000..819ab1d71bf4
--- /dev/null
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# It is the developer's intention that backports.unittest_mock will be
+# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of unittest.mock"
+HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/backports[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	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-1.5.2[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# avoid a collision with dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 7a881ff8568b..d325fffaeaf7 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,11 +1,9 @@
 AUX catkin_prefix2.patch 1620 BLAKE2B 7c6824c35ac840429646e1804e417ea09971be6a497ba6e45daccd453aaf0a6e17608ddabdfbc681d5d83f0bf42496425aaf4c0fbc3c3f282fb62a4639bf0a0a SHA512 2750d043373d5a7ae0761feaf5210847fad08bbef96804cf6c4931fa751918241e0517bc538b1db12ae981d6a3a89afb53cfce8b2dfd7d80b849a6de203edb13
 AUX infinite_loop3.patch 1236 BLAKE2B f236f05623b5ee4414fe3da7efebf61d62ed8617d47a659e980907aafabe3c0f4a0fc41779c73872235a186c7457ece6991433c67acace597fe86f5088ab9cca SHA512 4d07d04cfe1a10531129494000be11fe6b2598c077658b212f888b24d3de997fa6730641055caa181a5a071585f41f82cd4783c46b314cf66fe1f34b70f538cf
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
-DIST catkin_pkg-0.4.10-gh.tar.gz 61272 BLAKE2B e4246d602fd8b8a8b8dda4f412aac4f88ae3328bf2602268566a0f761fa7c435412ae36f563e8082a2e0497c92ca302ea7505dfb32802d3ff00fe4323cd361b1 SHA512 55c2a03c922f647f25e74dce33486d09070c3089dfe2ae26d0673752298d6bb55652b9079b32694c9d80f52ae55fef2fac9f853b6d0b9d6121e6e8c233dc3530
 DIST catkin_pkg-0.4.12-gh.tar.gz 61535 BLAKE2B 9b1a60cfc6bfda6e0f126f062cf62636df162577d693aaa07c4e7433f74383686224c31e0d567a95de20e2643c39f84781be3f82b39d9dfbbd1aed0dd397587e SHA512 227a6f07a46ab62d51f408a8aa08d57199a8f4d7c954421bf9a605fce3a0dc447c9379987bcacbed3bce139f00e95bd565286a530b7177acfc29a172da30f7dd
-DIST catkin_pkg-0.4.9-gh.tar.gz 60919 BLAKE2B e7d4987022359fa7306df77ede2e07b2371bfa16b9787e513dd096ffe3988f9b7e6cbf61b96e00992334dadc6052811c20e0b7ea6c9198db332c1eac545c5031 SHA512 53e8440c0768b221526d134c5609c3088dd02e214150253469fe5883665936472486792db2d69c05fd352949f2350bda5960e71cd54e3f1d9164e0915c963295
-EBUILD catkin_pkg-0.4.10.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
+DIST catkin_pkg-0.4.13-gh.tar.gz 61790 BLAKE2B b879b6e71c84863fdcbca1023dd5850a226c850e47348a5ce3cfa846bd4dfb7fe0fa2c406003b4d1a0ae7ab97e57a983a499c3a27851d3101c928765c9620cdf SHA512 b971019fe2f8e66639d271ce3a7933368a4af7658d143cb042a315492926a4b0c3593dc9f784ea75150aa048266219fe80f2a104adc6d361a6725d4b24aef330
 EBUILD catkin_pkg-0.4.12.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
-EBUILD catkin_pkg-0.4.9.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
+EBUILD catkin_pkg-0.4.13.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
 EBUILD catkin_pkg-9999.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.10.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
index d24c376aa411..d24c376aa411 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.10.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.9.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.9.ebuild
deleted file mode 100644
index d24c376aa411..000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
-PATCHES=(
-	"${FILESDIR}/catkin_prefix2.patch"
-	"${FILESDIR}/ros_packages.patch"
-	"${FILESDIR}/infinite_loop3.patch"
-)
-
-python_test() {
-	nosetests -s --tests test || die
-}
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index a6bc8175b949..94513a796d0d 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -4,10 +4,12 @@ DIST cryptography_vectors-2.3.tar.gz 35303908 BLAKE2B 694f5a741ddedce2101632dcf1
 DIST cryptography_vectors-2.4.2.tar.gz 35087269 BLAKE2B 2a8df1e98b6bba127bb8634ed27b43d4d99c77115d0206b4730feeaf6179d31e0b54eb38ad809e828c2ac6db2ecaa5cbc47f6ab2f99a888eb7e738380cc3b8ee SHA512 cddd46916b6e5c9101589e6aaeaae0da61eabce9df21a196e09ed0c12bfa7da6e3afcddbb75c657f3370b2a3bc67ca862b22d6c7750301a867b6b03cb9bc83a3
 DIST cryptography_vectors-2.5.tar.gz 35094063 BLAKE2B 93b97e5483892a43e69c3bc8d408e0e831246e530b2665fe372f1caa6284a2701c119a85113a85f86128f71e8be0148328f623c6a48f7d4cafc774ea3eb42da5 SHA512 cdd066c597731eb782a3288ddd83ab97b13097360399e8368c7c7c8ba16ff3e6269405885c2ad81aeb0f79d8ff84395aa00639b3453576ac0b57d37d8d36dbf7
 DIST cryptography_vectors-2.6.1.tar.gz 35097785 BLAKE2B cf5784e97d288b464d79d0aa13bcd19fed3e1c585c1589b52092d654a9988dd52e64c317c50774d4dc54f535d37296df8e5da070fbaa5f38d4eef3cade671a87 SHA512 44d318d5f983955f42791cf182dd80070a87c3c05f7353e204a520588243041fec97367c6fb6d9febcdab0ce7bcf1d135a8e6b44a7387b599752b7c87fc81d9a
+DIST cryptography_vectors-2.7.tar.gz 35098743 BLAKE2B cbc789a2a5340f5d612c68aa59dffa53092dda48c1608558ad0b5d307c7cd0522198eb0a0b754e1c9238dc4ea4bcb9ddf4febf5514ebf3ab74e239d161468153 SHA512 c68950ca1cf2ac261acdeeb2c95f22b3338d0ee3f1064d6b0e0df36e0d22bb461fb6013c9da0097e7901c7e600e0067213a854359e586efc1a9fb082bd8e4b4f
 EBUILD cryptography-vectors-2.2.2.ebuild 683 BLAKE2B 14c689b0fe1ce428867ea594b3dd257b537aff0577a25c24b37efc28ac57b05427195fd51bbb54d1aec85a6d1acb0f85fb45846dbb9e1a65436df62da6dabd05 SHA512 ec57ff26c72f11f48257b19726e2f17916cb1dede23026d76b723079ec58a12ea561bb5e44a09269238049ae0443ac5e42145a89b868b80b7bda736cbe9815c5
 EBUILD cryptography-vectors-2.3.1.ebuild 708 BLAKE2B 7c013c701827c3b9388d6a51cdfe1fa3be55018054ec60130b59cae09104be198fc5ce7056e0e8ba3cae3bc2ebaa03eaa9bb56a6408e7262b2d34b21ab07f740 SHA512 06ba07ffdf41aa1de0ce0042ebbe8c52e0a2211d0856b0df560b9caffd4c5136df4cae3e112ac08d0a839bc72ae23e5f865992312dee6bbb2f8de7ead69b4d8f
 EBUILD cryptography-vectors-2.3.ebuild 706 BLAKE2B f76f74204d63ed328e92e56343d8886f37e235cf734183b88498afd83910dfd2bf4e108cf9163020d14eb74e498a6ebf174e6e424ebfa4e186275f201d41e9aa SHA512 7f2cb39ef10afa831733bf78eea20257ee29d8ab05dd5bba14131310c4a6f9bd8f16e24b4091e0b9756056fd96465dad8ee25c684343d93b2d70291b902c2110
 EBUILD cryptography-vectors-2.4.2.ebuild 706 BLAKE2B f76f74204d63ed328e92e56343d8886f37e235cf734183b88498afd83910dfd2bf4e108cf9163020d14eb74e498a6ebf174e6e424ebfa4e186275f201d41e9aa SHA512 7f2cb39ef10afa831733bf78eea20257ee29d8ab05dd5bba14131310c4a6f9bd8f16e24b4091e0b9756056fd96465dad8ee25c684343d93b2d70291b902c2110
 EBUILD cryptography-vectors-2.5.ebuild 706 BLAKE2B f76f74204d63ed328e92e56343d8886f37e235cf734183b88498afd83910dfd2bf4e108cf9163020d14eb74e498a6ebf174e6e424ebfa4e186275f201d41e9aa SHA512 7f2cb39ef10afa831733bf78eea20257ee29d8ab05dd5bba14131310c4a6f9bd8f16e24b4091e0b9756056fd96465dad8ee25c684343d93b2d70291b902c2110
 EBUILD cryptography-vectors-2.6.1.ebuild 693 BLAKE2B fca6d15447ed2bb690c11174eb7232611c0cc5fb71c064a7902d847fb6e94519961c3a0fd0d6784f60511ea8cbeebe73b0e2f5b4f85f520f9b439dbda02f8506 SHA512 cc88ec4012c7faa0d19a4518773b8225aa0e88fa739fa02ceb97314841062375cb9e786a830d6b1f519ff69ad5b518a8d20c19709ef7b8d3bfcaa1a72560f1d3
+EBUILD cryptography-vectors-2.7.ebuild 706 BLAKE2B f76f74204d63ed328e92e56343d8886f37e235cf734183b88498afd83910dfd2bf4e108cf9163020d14eb74e498a6ebf174e6e424ebfa4e186275f201d41e9aa SHA512 7f2cb39ef10afa831733bf78eea20257ee29d8ab05dd5bba14131310c4a6f9bd8f16e24b4091e0b9756056fd96465dad8ee25c684343d93b2d70291b902c2110
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.7.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.7.ebuild
new file mode 100644
index 000000000000..dc69a046a72f
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.7.ebuild
@@ -0,0 +1,25 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.org/project/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 6e5b7e505418..62765762ca08 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -8,10 +8,12 @@ DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19b
 DIST cryptography-2.4.2.tar.gz 468645 BLAKE2B 80ecde87cf1568239977fbe4f835db98f689a7dc3646d44229b5b33932885c288d4274427f5d04eb74e9e064b01b11b7eac40fc6221ea2241371bca618cc66df SHA512 800735fa86e9ad0f8517328d47e55dc79a2b86d8c7539ee2921c526085782d8dad5559bbee84f7effb42275503fa9a984b099a688c530c92f5672c423c0f1a28
 DIST cryptography-2.5.tar.gz 487694 BLAKE2B 9502e7b7987ee0101ad8e5fcd09208034222a7f20b6b3bc3126c8b59081c9d8ecf872985d5fca191fc132dd6759afd4d11c0e0d39268627f35990c005a2095d3 SHA512 5e8f8818fcaa8143526006b027107b8afbdc925d40c846701e65b2c7ee02235b7e0918246515520ef2030b1c87bb157d0d403c28ad68c31459d677af7e2d0b3f
 DIST cryptography-2.6.1.tar.gz 491580 BLAKE2B b81114b57e9973c80fe999a63a3b1269d6289ac67851fedc263927b74e9e5ec4f35356cf5d46e4a27a994d5a3b2b3b599fea264b3ebce3a0cac27abfde3ef046 SHA512 f14319e24d9dca52e74548cada5b78a6235f089ef875dbff4799e862f94da8b087f1b6e03e84dcef9fc7d7693c4a349c5f0cd54b8535806da777420ce8757d39
+DIST cryptography-2.7.tar.gz 495877 BLAKE2B 48654897ff6ecd2fcf732b2d0378b806a9162c07c9e8349128593f4e28b3df222ac6a9cc19bc9342d303d1930bfb12747f9831f2a1bc42b1e784d85d69f0bf00 SHA512 fa420f44b038b6fe1983c6f2c6d830e2668017c26e1e125ad621e37ea627a927ffe64d0e987e0a26dcc260834f2ec817cccd22da03b892190f46cb6e8131a5a8
 EBUILD cryptography-2.2.2-r1.ebuild 2167 BLAKE2B 8e134891d78e2e8651a21839784cc81d322f478616f12f6f3b550a77262065a3de42dc0fe58a4c8b8c82bb144cdf62b16011551abaed03c83e31407d87051af2 SHA512 fe98cf1615072076650bdc00c42a04b992e33f47ec27cf4153d1572017c622c2fa7285c7c759577e8750b215dac7663685564873ca83008d8cca6b172d770121
 EBUILD cryptography-2.3.1.ebuild 2162 BLAKE2B 107ab46113d303cb65ea7a525dc52cdbe4002effbc751cbbfe4e60eafa9cf9c7b6b991f8644503fab0a1114b2c63740fc966662a9a3f66576891753a8ec6e47d SHA512 788f58ba1a66ea0a658acb686fc2a9a1693274482e96cf95832c68df4c81f1a43ea545da163244385601cde5a56a83071d9340ccb2f100df6ba8474e2d019707
 EBUILD cryptography-2.3.ebuild 2117 BLAKE2B 3e57b574745c93c3418cacbff7e878c55b14623817dd3568146424b8a58e55e16365e8df0bc484f56e95914c50d5cec9babb8f77d1663512d458dc2e62a396d9 SHA512 6c507578db5f181ef9b72804d7b0ff33d2314bba8dc9a59d378e0ff7d36a51fdaaa1d71a06ddca25854850900159553e4597da96584e5a32baca4ac7d555a4fa
 EBUILD cryptography-2.4.2.ebuild 2117 BLAKE2B 3e57b574745c93c3418cacbff7e878c55b14623817dd3568146424b8a58e55e16365e8df0bc484f56e95914c50d5cec9babb8f77d1663512d458dc2e62a396d9 SHA512 6c507578db5f181ef9b72804d7b0ff33d2314bba8dc9a59d378e0ff7d36a51fdaaa1d71a06ddca25854850900159553e4597da96584e5a32baca4ac7d555a4fa
 EBUILD cryptography-2.5.ebuild 2132 BLAKE2B 1820f42eee23ede2b0248a3a962493030873c50c82f46dc76bfb56fdcfd7097ba3fbd078694a0ac19178ea5b929a2a31d8e4ca30f5e25fd3f1397243b1f6ed19 SHA512 a3bef75e92e4ecfea739ee7cc8f94179577bfc2d99d4ec7a5ae19a3a32afd50a0cefb0b83d2456e1f7b3c1c427a718702e70b3a16648727a33f10fc99c122146
 EBUILD cryptography-2.6.1.ebuild 2226 BLAKE2B f1d48009f72b3926a4531e5548251880bc209290a4a18cba100905616bc0ce44c71ebbf8a13fed23605193263e3137085491e606e02ceb0e4a8e8db9fc02b97c SHA512 1b2b0ca56e816a2c495a180cf7a6407ee77fc421d547ade989f25baab02d6e8b75f8afe2edd23310a7e98f90a25244e6e4f8f436745869461854f13b3bb8e9e1
+EBUILD cryptography-2.7.ebuild 2191 BLAKE2B f1859d0fba92e4d521287d1ff2cf1cbca9df68138846272cd299d63e9db80c4b9be822e73ef9b850649ffbf396b6c3ca67ab8b60f2bc00fef9018b82eeb614bc SHA512 6a4b90f09feb404a5e8f989b352b6ff67a8c32c630ef0c9f659d24e89ed9505105aa2e2a300e2a29ae3ce81f6a48699fd5e29a94061a373ab129c0bd8840fd94
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.7.ebuild b/dev-python/cryptography/cryptography-2.7.ebuild
new file mode 100644
index 000000000000..659f319fa658
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="libressl idna test"
+
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+RDEPEND="
+	!libressl? (
+		dev-libs/openssl:0= (
+			|| (
+				dev-libs/openssl:0[-bindist(-)]
+				>=dev-libs/openssl-1.0.2o-r6:0
+			)
+		)
+	)
+	libressl? ( dev-libs/libressl:0= )
+	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		!~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index d4335f8dae53..92c28151b4a5 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,4 +1,4 @@
 DIST css-parser-1.0.4.tar.gz 143977 BLAKE2B 94a42d751a90d306b0dd2d503d8d9c326509b438d1f52b5567e6f6db7d80e7a6d2c37cbfa0db79225cc4d0fd5df612b3e430fa1c62604a2f8990d20678019af0 SHA512 3781128e55c1e72aa00369873e214f683e3f42944ae83d399697adb7d2966f68fb500c39982845ce9cd06078e4021838d82b06f99d90938069371da8a89a0857
-EBUILD css-parser-1.0.4-r1.ebuild 456 BLAKE2B 7058f61f5f8ee1ba29a69de5fc522f8a45d94b114146966dec43f569a7c092cf1d99fc77c2577a809458a9d4a2bc2a3e70b7df6c04d34f654e36993dd22da1fc SHA512 3d0906af51d8b800cd4ec1711305eec4fc05195e4f6ce30c244723134358abd64af0aa1f4e651fd03ed5f077a9b183b3e29ec103fcf702100bbb95c73637ee3c
+EBUILD css-parser-1.0.4-r1.ebuild 454 BLAKE2B 54dcd27e65fd39ebde410af6218d19e334a273eda334ee98e312349fba947ae883a6d8a5eb7b01e962d6baa0602111f4ce8ad8035f0d37fb34f075ab502d4501 SHA512 799bd4da0ffa1219e68ae8bed097618b7c3d39b83b4ed600b56f1b1477b5b5eeac36575a2a4f6c70b89344f71f78375225dd11abc84288f5636cfdeac45e2dd1
 EBUILD css-parser-1.0.4.ebuild 513 BLAKE2B 0f71bdb613060632b0aa263ad32a1dff6f1cfccd2622c1e5b08dd80a990b27e79e29107a5adcb53baa378b5418b78d1afe7826352c34701b06a76b73ce53e305 SHA512 42eb2bc62415953f4d34cb550380c5c1a26fad3d34008be88b77a43086d3fdf3f6ee3372cb518080f74c778c5f632b5db10690c0d54852ebdac4f42e84da93ca
 MISC metadata.xml 313 BLAKE2B bf6a2cf19a6d43b19692e4d932d695a811d10530fadb6b33a6f329be4ce815bb36ded2c7a1b3b0081237543954972d58ae115576d4ff0c3d4fc0309fb77f3a58 SHA512 1ca073d67b4f5afa950071e961b091993c0f14a66073e28f33604bc5cf5820d9f4701901d93f8db46a91b1fb6b7a05b8164a749823e2c59959640e8771b3126f
diff --git a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
index 29254e698e30..e7bc561a48cf 100644
--- a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index bcefe00d3861..c8e6abe7eefa 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -3,6 +3,6 @@ DIST Cython-0.29.12.tar.gz 2050537 BLAKE2B 86c5ffd07e97d549f2d98ae0aa66a03dc2f8e
 DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
 DIST cython-0.29.13.gh.tar.gz 2072564 BLAKE2B 55a8c5c932262972cfa55ee2771e17ab5a57beab03d0dac5668f654a0bf68850ef62b7e59b322c527115af48b7243b9c919e739eaf440338a50b89c4645c0fbf SHA512 79efebfddabf31a046ae86a2c2170e0956098f4b1c7b8bbd338d30be7c96c31ee2d648332fc16ad9cf1e5d0ea4ca1a070b2d31ccbeae0c0f86a2f7700b92f656
 EBUILD cython-0.29.12.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
-EBUILD cython-0.29.13.ebuild 1971 BLAKE2B 37e685eac0b519a4c4bad0ce3b325bb63427f1dd39859f82b15c723e2e2225f4f922188b26c8fc0cd1069e2e4d2ebe6134a0f6c194e972869ad004203a9b02da SHA512 c22b620debddf7935d54738741b32ac65642c67f7434c9a3b5794365ec172ccc1ad01cd748a97d58e7daaee3d7e4bdfb3509e4964b7ce8e60bb3d9525c8b33a8
+EBUILD cython-0.29.13.ebuild 2014 BLAKE2B b9a1af5f3a3a6a9d8866cec7dba05a26635c33fdb0523605855773ce2524aad8fd31485cfbb3c6d5f801d0b4112913c011f6ef9bf1a0902ba3e30f5e7eb00b55 SHA512 d87c8d46ac2e2862d7ab694ec90a573fc16285d12a8dd78ff59128b9382e7641e69c0aafc59d38f52f14f28d6da6059da1d191e16e44524faa114f2480ade23b
 EBUILD cython-0.29.4.ebuild 2160 BLAKE2B 4a854e80cde14979e6a35131b7002a68745978eeda2d370b46f1d816a424296e61b43894e7e488ed7cfe238f2c0a8078639172ecbd9534326965e658b2fd3672 SHA512 b1b9f03ea3addd10e61ae1b855c28a495055a13a859df06ff3869cf3c917101dbe7c0259525103fdc3123c23c5f5c2c5804f7cefd073cb80a0248ea90097e4a2
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.13.ebuild b/dev-python/cython/cython-0.29.13.ebuild
index 5af794bfd500..fc895938e377 100644
--- a/dev-python/cython/cython-0.29.13.ebuild
+++ b/dev-python/cython/cython-0.29.13.ebuild
@@ -25,7 +25,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python*')
+	)"
 
 SITEFILE=50cython-gentoo.el
 
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index acb538d75c5e..d6fbf8903b1b 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-0.7.8.tar.gz 62774 BLAKE2B d601c24f6825202de69401c0778e8e1b5010d1475ef69a78aefa9ad18d0bfbbe99cc1405606c1a9f01d937e9937c0f33dc2f54b69213869b017571706014b444 SHA512 c7fc9b47b2acbca32277f8601f8dd63435a7e31c614f8cde6e101f9230691c389f3b758a2217fec9fbf15869dd95ceb371f88c4dbf121b25478e2713cfc7a09b
+DIST denonavr-0.7.10.tar.gz 62877 BLAKE2B 0b011f187f8952af81669d3568d5c6ae5584ce6b106ca769609711883bf62f7d4b7a605bc12e8cfac8f1a1e9622e7b37cc17be0545bbd24898b0a6f882f7adac SHA512 62b8a1f61f0fcf5c7d13b473d990a562e3fddf777b077bf5f9a0d7c24f9bc76810917421653dbbedd292b659e6c0ef7e1c303a5f152cf9d7aee2039d47702314
 DIST denonavr-0.7.9.tar.gz 62838 BLAKE2B 59a036a1b2fdd48731741180b143f69d0fc78e30cfafb88c675eb4a30b079eb3955b1e2f76306809d183d10a9583dbb500962cbae352203c570861687c58b539 SHA512 2c9cd25bd38d9128602b0bf009d3d147059d712a3ead99514a257e71ea2a1c97d94c151d42840dcff55ababffce53a23fab33759cf7bbc8bb786fefb91dbe362
-EBUILD denonavr-0.7.8.ebuild 741 BLAKE2B 129c4a678d34ba00d120ec0ece1de439f38c3456220623674aa5635436c880ee3b0087900467e7e15cc00d50dd2edbd9408b2e836000e1db0e3c07c5c4b656c9 SHA512 452739766312780a4465598a3970bdfb00a13aa8ac3999bc9eb80f44eb0ee118c0e22fbf723ef342b2a681b637a7b28ab8223da0cbe44741f7f4bba901d11e8e
+EBUILD denonavr-0.7.10.ebuild 741 BLAKE2B 129c4a678d34ba00d120ec0ece1de439f38c3456220623674aa5635436c880ee3b0087900467e7e15cc00d50dd2edbd9408b2e836000e1db0e3c07c5c4b656c9 SHA512 452739766312780a4465598a3970bdfb00a13aa8ac3999bc9eb80f44eb0ee118c0e22fbf723ef342b2a681b637a7b28ab8223da0cbe44741f7f4bba901d11e8e
 EBUILD denonavr-0.7.9.ebuild 741 BLAKE2B 129c4a678d34ba00d120ec0ece1de439f38c3456220623674aa5635436c880ee3b0087900467e7e15cc00d50dd2edbd9408b2e836000e1db0e3c07c5c4b656c9 SHA512 452739766312780a4465598a3970bdfb00a13aa8ac3999bc9eb80f44eb0ee118c0e22fbf723ef342b2a681b637a7b28ab8223da0cbe44741f7f4bba901d11e8e
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.7.8.ebuild b/dev-python/denonavr/denonavr-0.7.10.ebuild
index 82e01eee1a36..82e01eee1a36 100644
--- a/dev-python/denonavr/denonavr-0.7.8.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.10.ebuild
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index fef809af3d4e..de274fa9a400 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,3 @@
 DIST distro-1.0.4.tar.gz 28772 BLAKE2B 1a337c0a5c125b89adbd3173d17390c5cce12c8549a3e7d90d88fd71f53d1b4c7bc3d1fc87f7bec33d7b4b1311539deaa9414b143daf40108b15dd78370450d8 SHA512 466f2e14b169998e3ff7420e12bf270ad9f934962ae92c2d24bdd747897ad66cb348194dd1376b8b53ed298ea02039943c80d9ccc6b8a01c2bd0c6d2be82c7f6
-EBUILD distro-1.0.4.ebuild 590 BLAKE2B 7770ee1520e7384710661a58d18727e19d9633080a5e2a2f6add3802ba3433797f08ae61f0213a55cccef658063c8bd7b18292ff80c6b45304820ea69952b573 SHA512 01cbd734c3d9894b1d3d69a4d073c1ff464b9de1fc80b5653cea814c9b4c6fb9614e02b762066cfdc2488f7290bed89aa9253570423c1224cee9cacfc2be9e95
+EBUILD distro-1.0.4.ebuild 611 BLAKE2B f83c10a0a4afd449466fa779d7120268eb7f1622ecd0f11b60be310606bd3aca4a7468748f8eac3e869c68ad1525c7f332178fd3d7a3d8e1aaad8735ac18e614 SHA512 28bf9e5b17aa8ccd9b486c5d8d6910ecd46b85f5a6c6db272f2ab0588e9ac3ee6a03fdf1fc4060f250c341467400bfc48ea1fb5db868ff1ef12a2a5eee46a721
 MISC metadata.xml 813 BLAKE2B 7ca7237a784e0d321609382bb6427a39584f9ca36047975fc76926628d5b4b5d54543762bcec7a43eacfa91ac056a96d38a0e71a6baed93b18a9849b2563f502 SHA512 2d9fe5a2567f86d987d950a78d68f09ac45b1a50ff02d1f1c2849c381de1a5a2f164fd6850f427650789a0274af974e23c9b8ba7ef3b37c81ad653b3ba85e0b5
diff --git a/dev-python/distro/distro-1.0.4.ebuild b/dev-python/distro/distro-1.0.4.ebuild
index 7190e1f71a99..f4bb140dd689 100644
--- a/dev-python/distro/distro-1.0.4.ebuild
+++ b/dev-python/distro/distro-1.0.4.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
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index bc9a0109694d..12aac4f870ed 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,4 +1,9 @@
 DIST elasticsearch-oss-6.4.0.tar.gz 33727061 BLAKE2B dd0ff95bb124103ca340b480c5192c9919ef226d4c3ef1b61accd0df2ee9b60a8215693b3db0fa327a4d6791de66746654144a9172210687e8a2efa9f6f4dde3 SHA512 0197dcf24bdb81cbcfa492d899363528816143962abd1925a5092e8177c25e8ca490afe5868b41057b3cded296f59f38ed11ba0156a820b6c877c69a5888846c
+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
 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
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
new file mode 100644
index 000000000000..b941a308a924
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+ES_VERSION="6.4.0"
+
+inherit distutils-r1
+
+MY_PN=${PN/-py/}
+DESCRIPTION="Official Python low-level client for Elasticsearch"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( ${RDEPEND}
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	dev-python/nosexcover[${PYTHON_USEDEP}]
+	virtual/jre:1.8 )"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_INSTANCE="gentoo-es-py-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID} || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild
new file mode 100644
index 000000000000..d307f3933ab3
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild
@@ -0,0 +1,102 @@
+# 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 )
+ES_VERSION="7.0.1"
+
+inherit distutils-r1
+
+MY_PN=${PN/-py/}
+DESCRIPTION="Official Python low-level client for Elasticsearch"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}-no-jdk-linux-x86_64.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( ${RDEPEND}
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	virtual/jre:1.8 )"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -e '/coverage/d' \
+		-e '/nosexcover/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_INSTANCE="gentoo-es-py-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+	export JAVA_HOME=$(java-config -g JAVA_HOME)
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	nosetests -v || die
+
+	pkill -F ${PID} || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 74acd7e1740e..8b4c2e305e46 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -3,12 +3,12 @@ DIST eventlet-0.20.0.tar.gz 466828 BLAKE2B 43beb8f924c5e375a554db3fb90e3c39121ff
 DIST eventlet-0.20.1.tar.gz 469509 BLAKE2B 727844b70c4e1874a58efc95551dd7f12bec1c8d01cadeaedbc49f00a86e1393b690076fe720e8efdf00107f72b892a3a1f4c4921f95656b904221e748df7f09 SHA512 875c1ca82822a486bf28866c7d1f34df2419e7d33450a21740434d2e7f15c37a1090436cb7fe1feaeb5c810d39e4b238206c502323317897c8a42e844cbe7734
 DIST eventlet-0.21.0.tar.gz 484191 BLAKE2B 07d3f5d1dca11032d51fef9ceb624e07da9e93bed914233da9abbdff27f21f2482b9e3417b50a63f383cae13615c6a781104a05dfb66f28d6ab4e469bce06ef9 SHA512 4ee682ca8faf870ff6f1d72e93527028f73ae13d7f755eceafb23f3cde48e52b83ff04b645b7e90299997713de93c52f244db8b81d6abc7788a56ea38c7b0f47
 DIST eventlet-0.24.1.tar.gz 391579 BLAKE2B f8abfe6d18ed3b2edf4b2fa3d197abdd1e9029dd10c035427a2ddcb70cdaa76da114083ce7016af7151927fcb2f93ce6ffa0417dbe1a125948318baaed2f6184 SHA512 867f8ead3a6c0dd692c5cc5d9f1181b04456bdb270ea95d84f7f97da4603b333df539721cda002437c035fac51134bee8cc3495e09b6a25ae1c46fdaf015d0c3
-DIST eventlet-0.25.0.tar.gz 392105 BLAKE2B f528434dadfc15ce91b7842c47d1942963c430758483e56c756267f71910310e5ed6bc8b76cf3e8a9e3421c016776cf5afab6b675e49aaa4420685aee8c8b999 SHA512 f42549ecc6ca6833d611dc178593e69ff0d63881111fe7f9357b26c602a57dccbbc53101b86ed01e1e2b4a201afa8d170ade1052fcec36aab8776c56a8a15b42
+DIST eventlet-0.25.1.tar.gz 392719 BLAKE2B 7dbc23e63e9dc8b8bb0b4a53fc07cb467661bd695b6c778b973bd690bd24f3dd0f867d7ed803e1a89ffd36e5597fd244ef2c616c663d3d9130033f5f5928e816 SHA512 936aac45e24b2797cc8b6cd6238d493ce5eb60a47096e13827b8be145bd8dd14503f5ae624485c87b163718a85733b2317688366ef5fdf347f7d367fbf4d521d
 EBUILD eventlet-0.18.4.ebuild 2032 BLAKE2B 63837d2cd0c1bfc60a90edd9dd5fdd9fb350393bf2746b1a26308ab83d768f1929a2126d73fb846ce06db05f93631f806d27c8e8e8b4dd98f4dc38cf3a02093a SHA512 2306655b590f797fe6fde21ba7f0ebcc42480426d14c3a7a484924babf3b82649a4727386bb6ac8845545b698f9d20c563b6bfcec5c3ccd5b18799dc4f1d6c69
 EBUILD eventlet-0.20.0-r1.ebuild 2136 BLAKE2B 93e89d1901920feffc42f891cf588b23638b0ee8974c1653991d568dd3c407e69bf29cbd402677768f49baf99a816fda4b2cf685bd64236b9bca0353f473e7da SHA512 63897686d8a41c07c96047660a29b4c52d6647e65a9a0f832e445f43287b7d684ccf7ccb982d5814fc8e51cc2e680240fc09b50b815a986cde04e3a0d084662f
 EBUILD eventlet-0.20.1-r1.ebuild 2152 BLAKE2B 041c85d02ec79ee2aa0e7893d8b38f7609aff6b4b975b66eb1f1825fef6fe1584ea70fd7f8781b5515e7f77c1aa947cbdd0d4eb6179336f4d608da1db65de37a SHA512 6c6344ff54aa32452821c3b85c633b417034cb31d4fbed24d5cb8c735b81668d1971ea118b8e61a5fe5f2a0ecb684423f61f18f0e5822040332f9bfb342def5b
 EBUILD eventlet-0.21.0-r1.ebuild 2154 BLAKE2B 208f7c80894393af6f730f5b2e104b4e61790245b212ee4165f1f7c4a1072e1f6730ca378a31270a6e334ffc3eb6527543ed908cac608890dbbeb0d071040028 SHA512 12b9056a134542d0053ea237a1311b64aed89f4bbb7c2f61aba1c985b508b5ecaee92f86040ab2eae47ed8ced9f8eb92c22529349c9ef70cdbe75c8beb77eb58
 EBUILD eventlet-0.24.1-r1.ebuild 2353 BLAKE2B 5edc04a9ef60c05729cff78da418afcf058e5f4808bffcae8eb55cc381dcda6698b4b5a53e6a79252360b65276aab54799ac6be4e71650fe4c27a5cecd722e88 SHA512 fa0d91230fb90c4ecc38d7b0b94d0faf3c662019f7dbbc7962c451686e8101795da587003a58bfbb544b7020f446a82a121c381234d9159a29a8f24d0e1b22b3
 EBUILD eventlet-0.24.1.ebuild 2354 BLAKE2B cecac273fa58fca2446c00882b94314733951e3c8ec2c369ff9ba06faeb9fd56408f26d499b3613d96d1473ebdec46c162b2470c1162603980653624035293f1 SHA512 f60b7379073e01931f2134f9c10bbd5b668fb7c1ada4df730f490c3f83fcd872b530afbe240fd1bd9ced707ad183940a4b3efd21d648d845b11ef61859adab89
-EBUILD eventlet-0.25.0.ebuild 2356 BLAKE2B 6c623307f3ad7d1de61c0e80aee3f11cdc392ae0a8f8784b6c1e579e96f0453639b00693e9c7034d6683af1f43648f0046b32abee6c6597f4834586e3f3ade7f SHA512 f09afd1d165b090a4e4bd11b194655c6031dd1cb1391ddbecb71939d1cdc4faa8eb58535d837a32305ccb4dac823e032cb5d8b26766e16817d8e33d9b1b5ba6f
+EBUILD eventlet-0.25.1.ebuild 2354 BLAKE2B 0e1cbd60a6c5b17c0e9dbe19a534b3e1c0c09170e0a855139265e7a9e2fbe132001eab5aaa6dbc484d7fc4ce89c5735e7b2aed291b9fed7d3a6209a415b0561f SHA512 e7415426e02bdb62ffa156d677bef4f9ce29495d96b451836b22cd9331847308b6ff13f5300ea2443924cb5e1567c40db57de57591c4c8d9c26066a9e9b73b53
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.25.0.ebuild b/dev-python/eventlet/eventlet-0.25.1.ebuild
index ccae643ba72d..bf74019d7bf1 100644
--- a/dev-python/eventlet/eventlet-0.25.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 0f23e553f40f..482edcb5aff1 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,6 +1,10 @@
 DIST Flask-0.12.2.tar.gz 548510 BLAKE2B bd92d0e7e6ff36d371ffd958708517d16e41d1475af9153bf3d5234c33aa5c0ab415cbd254b711731cf8cffddac94b475f62d9fff2f9fe756b0fa30bb36d4343 SHA512 c00bb807e8fbc943e23a3721acf5b04320e7a58d658bca46bdf83a345b4c4d5729accae338505e134f01bc908adec9555fd94e8c87ef6f0367e6037215c06319
 DIST Flask-1.0.2.tar.gz 644534 BLAKE2B dd024f6f7a68691c759e3fd494a9482c4ab5216b5c7486fc1717346f953678c3198deedd657e7ddd3a5deff57ce31b1afdc40ef2ba9cc2fbed48f3afc223f6d0 SHA512 0ddf5d8bb0b0ae61f990096dffe3cf02744d7986015d05ae2cc09dfe0def17df44e2a4c58e330d17c7bd8c3eb74014dee5e2edef6e300b8e4ed756c251938f52
+DIST Flask-1.0.4.tar.gz 615497 BLAKE2B 4141de3754a8ce42c6978a72da80c991d13415a19946180f5fd8f08a1827209be605ec10283b78841bee94c5a2036b8e6083187a3e68c188fde93cb702a6d645 SHA512 2ed45ebdef80fe354a0a221f991560e17c442550f667fb76dd9c9631428fe8b6686127504f4ee81fcc6748f99cd376bed7a1ff4e0a9ae913cd70c9f5f4ac1c61
+DIST Flask-1.1.1.tar.gz 625458 BLAKE2B aea56848dd1f8bb2d96059adf069f8d19c55395e5dd0d98bf4e89c7d1b54241f1f476cbf7fdb91a2390cb5438a3bd7a5bdb58383f2a196b042e90f272cb39e53 SHA512 d4e6304bdb2e20deda5b9800dc9ebeabf0442528d6cef2d15416129c151b25ab32c41460939f64fb72b15ead8d4e9bcea5694039323d080d279bfba2f6266178
 EBUILD flask-0.12.2.ebuild 1832 BLAKE2B 3842b508f228388958d8f88cfa8379bbbefdb4dcb1946fb1ece67b3cd7339fcdb2d7674663381023d68e1355cbcfc2df1f2a6c40f2fa357f29029596d0f4768b SHA512 a05a66316c2727d75bdc7dc65616256241afa69fa83fff57e88ca25cce6f258b3f40950b1a38b9fe58799329441b8124f2bcfa2bec66f10b196dc6c13e5ffb52
 EBUILD flask-1.0.2.ebuild 1539 BLAKE2B 5e6d5e28412eed92ec448547a3a23335172d6d47fe551eeb0a2071ac81c12c6173f6b02d4953a3a56c529b27729fcdd1593e97b84b5c6a10b2aa9dfc6cc5aaa4 SHA512 4d7f130fc985b4dff5a488c2f34511a12fb6020e6cb3bc065273e2b9d55cdfed747e7ecfe90cad69246f4bf2f2266b7671127f5ddbb5a403ac6471eda7a9c1cf
-EBUILD flask-9999.ebuild 1547 BLAKE2B 52d6873119dc9dfd64af46303b01bbd1c69af7028fccb0bb24ada38179c4341f90cb4e9a80389a580191cd803ae68e9139d8460036099ff319fef1c69b1ccefd SHA512 7073f5d7507c8243499d90012310456d0b7e5d727a15f72d1be51e82ee37302397e92a47a83e5204fd5dc8aa8ab6c76daaae6b8932b98bcfb639c39a120fcf78
+EBUILD flask-1.0.4.ebuild 1544 BLAKE2B 38e1bf11882f98b282a0c6e107bbb02f50fc96912b87d8902b678a534354a8040d3c9af36d04686fa727c714677efb7f12552ac03e34cbb9c9b8f7d53228d4dc SHA512 49a45558f158e4ee72732288bb22912278b01a59c3e60d443db2638c4ece8a0b5e490bb437af2370379f09cdaaff8a82a7952d311ee76b967dd4cea3ea672d77
+EBUILD flask-1.1.1.ebuild 1544 BLAKE2B 38e1bf11882f98b282a0c6e107bbb02f50fc96912b87d8902b678a534354a8040d3c9af36d04686fa727c714677efb7f12552ac03e34cbb9c9b8f7d53228d4dc SHA512 49a45558f158e4ee72732288bb22912278b01a59c3e60d443db2638c4ece8a0b5e490bb437af2370379f09cdaaff8a82a7952d311ee76b967dd4cea3ea672d77
+EBUILD flask-9999.ebuild 1544 BLAKE2B 38e1bf11882f98b282a0c6e107bbb02f50fc96912b87d8902b678a534354a8040d3c9af36d04686fa727c714677efb7f12552ac03e34cbb9c9b8f7d53228d4dc SHA512 49a45558f158e4ee72732288bb22912278b01a59c3e60d443db2638c4ece8a0b5e490bb437af2370379f09cdaaff8a82a7952d311ee76b967dd4cea3ea672d77
 MISC metadata.xml 363 BLAKE2B f031e9e0d44bc626f4cc00538e6030e732f97286a09d061cfd8b7e03c8506cc9ddc8caab73d9c10363c5bd0eab1bfe6129a668bd6c66e3d82d9221cfd1175629 SHA512 33989d02b79b82d3256dbbf7402d79580d529e728222d74dbb80f740dfc1f8f1357f03ab5da857ff1821f2bb90f7b7eeae71d89e237516da62656d3d124ef4d6
diff --git a/dev-python/flask/flask-1.0.4.ebuild b/dev-python/flask/flask-1.0.4.ebuild
new file mode 100644
index 000000000000..80cc931b35be
--- /dev/null
+++ b/dev-python/flask/flask-1.0.4.ebuild
@@ -0,0 +1,57 @@
+# 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
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
+		py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild
new file mode 100644
index 000000000000..80cc931b35be
--- /dev/null
+++ b/dev-python/flask/flask-1.1.1.ebuild
@@ -0,0 +1,57 @@
+# 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
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
+		py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index 6b340034d517..80cc931b35be 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.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=7
@@ -28,7 +28,7 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.14[${PYTHON_USEDEP}]"
+	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 774252ddeabb..0f7adb5f44f1 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,5 +1,7 @@
 DIST hcloud-python-1.2.1.tar.gz 63592 BLAKE2B 9a6d2dae97ff405ebd9b92bc833c9d953c13840e68be4eb43fed375a60e55cf4bf9b4b742b26fb03401f631b7f7127815961861cb673adf4839c829141c8ed00 SHA512 cb70d190350457fc3c6e474bc6c943070102762595dac2f386041956f64255f390a928a2f2411be861645cd65b015ab9e0c931b36aeed0076b06d9f67ac72d1c
 DIST hcloud-python-1.3.0.tar.gz 71208 BLAKE2B 1a074f64aaff87991ef5c565bb8976184a1f5ca54c0d2fe19ac3dc4f8425d3a2d92ef13cbcec7ecbfb8958572ab5561953098cf0ed9f141ba43c3eb0a90ffc10 SHA512 6dfff2301ad91db3c79fc8f68a05b5a886f86824a34f044d14a6a35771d23fdba9764055c797d11f404cccf3ae6338af940e4814113859d7809733629d7c2659
+DIST hcloud-python-1.4.1.tar.gz 71379 BLAKE2B 8f6f0a4e23dd3b99bd4375644ebdd161fb0c305773ccf10992fdcc05cefa37ad58e33eb0516eccd377ebb642749f5014ed5baad4d37f3eea91cece7eeaac0c56 SHA512 3eff15d6b46caa2b46f398f26efc1f986af0818253888ee42c97652f5d0369738558eea57e6ca934c4f7e88fea379f5a0e9e671908717f07cf32ec74d8415d42
 EBUILD hcloud-python-1.2.1.ebuild 1056 BLAKE2B 94a8aeb9cf22f4263222ab52e186c8604912c1a0931d96e3a47698019245d318753fc5d5686255fa0ef6f9460fe55a94b2125804407da5f94ca92f4577189a37 SHA512 ac4b6bb887fb0b1ff076c4ba02dd1a33256f238eab49f250db3b8a1908c68784dfe5c51b5dfa2b7db7f5dc57496e472c8be8d50d152392984c2f2c6674722e18
 EBUILD hcloud-python-1.3.0.ebuild 876 BLAKE2B 62435cbddd008731368ceee8965656420e7b9f6a6b35b974e27b98ae9bf23ec9a50d3b467d472307f266a2368f9345a4695659228fc7c1eca48167f694ffb613 SHA512 b3d65bdd8814d8c8d6b0c5b62e35fb2563938db46d8213619c265eb9e737b4e9ba661264f5fb2eb7a1838bb8c6561a9bc62e0a1b1548f4e62bccb3b1527d44a1
+EBUILD hcloud-python-1.4.1.ebuild 928 BLAKE2B 05dd717554d8b02c3317c54e38b4028847c3ccaa41491b6da7867310893f59f9eae2cf423135ae4188ba2c82a86f16529f3191474d6335182ed3c8ea85fa03f2 SHA512 e4ee57fef367129a1c364000439020935b5b5b3286db30f761c99388299d5b19c8c5ccd4966b6ceef9836c70f41a63026da6a4ed3fb711eb5162e7ce8e8afa63
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.4.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.4.1.ebuild
new file mode 100644
index 000000000000..12cb839f08d9
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.4.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=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Official Hetzner Cloud python library"
+HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
+SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples"
+
+COMMON_DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/future[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 85b5b5a80191..026f1f97fd6d 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,5 @@
-DIST importlib_metadata-0.18.tar.gz 23341 BLAKE2B e1c43a760b141b0589973672ad1cd6c47e077293353f67ebe2c2b3631265712dcecc8e14a57803539d2276d5d908fae3c4ac07165ddd5937cf53955ff896001e SHA512 2f39789725548bcb37061b0b99f90802a2919339db6b29f95b38811b35f4cafc7acfb4cca1167e28a4738ba195af31344f59ab457d87710764d1ba8f06034b18
 DIST importlib_metadata-0.19.tar.gz 23338 BLAKE2B 10c43bee5324804b359f951e5d375559e3a58663b11f0bda1b39ce82dcdd0ba735083793a954e2ac18b5fd607d9ea5628a86f9c345c83d718a7e46738774e0ee SHA512 2d0126e7430804b2295ec159778082806957cb86b5c7408c38064cc7c7e62229d382778284a5a231925ab336a7cc6da8e705f6bd7ae6da66f11acd1229bda17b
-EBUILD importlib_metadata-0.18.ebuild 1366 BLAKE2B f4ae505284ce2d95ae2da39d4aa47fc5a83672ee41c0f8f379e23287e4d5f743ec3978132fae9c9dd1098f7f3621ed35402a27c867ffe48bf62cb370c7b9738b SHA512 793d3f8582b947f0812e3be611721c40b220bc3dcaff3534259e66c18ddeff6703704ec611cc8153160716adb852be89d65eab2e8eb72e276e635d26953b8b60
+DIST importlib_metadata-0.20.tar.gz 23712 BLAKE2B 0af0b4fad171f24aad0b387af98b9f5c0bfec14e7f358e45afb70650dd1daf3b8abde8012ebe2e4f5751792d542d2567dda856696de8cdf96f27b50560c55645 SHA512 663d6af2f2d83c4744809b4b58ebe4152962ee40ecf17070a532614c7238a88374aa70fcefb6b7ce26d2d351b00c0859ce590f734bdd2ef76ad58b041307a95b
 EBUILD importlib_metadata-0.19.ebuild 1421 BLAKE2B 1a847f367c90077958c6229ecfbd0c69e62f820f01c5a7e59e926e334f257b34dd8831edd506f30edaa6112094cc4ec33de50559a9dab6731cc14280ae699699 SHA512 fce535f98e691c07caf170679d86ec45fe6991b8b1a385af3ce23581c720354a8adb8009c37070de4e2186c9eeb323bc5faa64628d455908c5d6826b1e684f72
+EBUILD importlib_metadata-0.20.ebuild 1421 BLAKE2B 1a847f367c90077958c6229ecfbd0c69e62f820f01c5a7e59e926e334f257b34dd8831edd506f30edaa6112094cc4ec33de50559a9dab6731cc14280ae699699 SHA512 fce535f98e691c07caf170679d86ec45fe6991b8b1a385af3ce23581c720354a8adb8009c37070de4e2186c9eeb323bc5faa64628d455908c5d6826b1e684f72
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.18.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.20.ebuild
index 15de405a5ab5..8c74d5303223 100644
--- a/dev-python/importlib_metadata/importlib_metadata-0.18.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-0.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/loguru/Manifest b/dev-python/loguru/Manifest
index 760cfe139fec..8c84e5de34f6 100644
--- a/dev-python/loguru/Manifest
+++ b/dev-python/loguru/Manifest
@@ -1,5 +1,3 @@
-DIST loguru-0.2.6_pre20190412.tar.gz 362315 BLAKE2B 8273fd42522396d4a17c405bebf01f8de272a56515e4a63766126494b4449333e7c25f5be5851bdbcf922d35affa9ee091ac7138482f9e2daf30f48093cee812 SHA512 49320c19f2bfdc55569290740b49889133003329dbf6cae2e993730a957d69e5200b41b75d255d2e19d937658778945ffe44350431661162eaa6141edfcfc499
-DIST loguru-0.3.1.tar.gz 377834 BLAKE2B 4402a6dfd8e36efb966eb0f31ba2161183c03a7072f45ef86110587b1f3653e4711c0461d39d5e0047fb7b84c7da417c011644ffee815f82bf1f4847588b17b8 SHA512 b0b75aa265839be0a522101671bf9992c1fe548439988a5c2feb58702be77944137e4f78920ec5dd4fe5953daf7160714a4de940527d0987dba4907ac27a0e15
-EBUILD loguru-0.2.6_pre20190412.ebuild 1125 BLAKE2B 442009acf68b49846ca90ffb5b5234e9e99e0fd6d1c25d11fbbe01c9b5b9bb34e5d968b4a9035846912c1313b165969d8e920e6b93298b20d868122c53892389 SHA512 fa0e737d2b3710e7dd1bca02d4e94d2136084a930a43955b6c8c462efd2993ad6bb0a6a69ec9e0e10884a76d3d81fb6692df04bb07ffe792068c3238d46ab94b
-EBUILD loguru-0.3.1.ebuild 1013 BLAKE2B 2bfab0b4b5623bf2ee15605e619e315ae4b3c63f2571e25d17ef144de1134d51d3072231d9e981b30871769c0688b51bb70bce58cf34edc12d4a2259bb4c313d SHA512 590dc4cfc49b9050b3cd9b220d3505da83c827effdee520ec35fd7b23123f57049ee27c1cde064ca7ca306ad04d45e68de8807602307df0151d57df2d62bb58b
+DIST loguru-0.3.2.tar.gz 378160 BLAKE2B 83301f5bb79d0edb20d211e8ee4d05b3b93a0a9f13f13b2ff103f1e9759f227b80e5571ccda48098a1e45658d99a54768fdf456ffef7a13d08375ce62ad876e1 SHA512 e78f5f43fbf4891ff9b9a21c1a29e4f02877f73a09b7b7df25076bffb25a094eef561c469b22cbb999979de4dbf81df2298681fa219dc684f15fe7c52ecb5359
+EBUILD loguru-0.3.2.ebuild 965 BLAKE2B c699d420537376ce62fdba478512f1adf7a93bed1bbcef890cfc09eee72ae78bdbb2f06c53c60a1e5ec543527678dcfd8787d8a041371fb035e1ca31115cd8b6 SHA512 191f5cdeeba332ce0263e4bed5d4c805d9556964ff741d48a0bedf2a5c4a7132e4cc25d5bda92a6fa381b0d3b294fc64cfa2161e72d0c035fbc5a9240eb5544c
 MISC metadata.xml 683 BLAKE2B bd44db6c47f17a714eb8080d63d5002bbedf247787d568735f87f8aa01a13fc32d383f4eab2b92536a2f98f5b76b0ae01c407bf3c746b08c668ef562cf488ed0 SHA512 8a671ba69aa489f384c7074623f62c03905442b14b6b12bc9f306416a66390a334dcdadf84a5485936b47ff9992ac87e35ffbc8ae17d035b381f53f721b2369b
diff --git a/dev-python/loguru/loguru-0.2.6_pre20190412.ebuild b/dev-python/loguru/loguru-0.2.6_pre20190412.ebuild
deleted file mode 100644
index 04098605437c..000000000000
--- a/dev-python/loguru/loguru-0.2.6_pre20190412.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 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="6571879c37904e3a18567e694d70651c6886b860"
-
-DESCRIPTION="Python logging made (stupidly) simple"
-HOMEPAGE="https://github.com/Delgan/loguru"
-SRC_URI="https://github.com/Delgan/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	>=dev-python/ansimarkup-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/isort-4.3.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.9.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	pytest -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/loguru/loguru-0.3.1.ebuild b/dev-python/loguru/loguru-0.3.2.ebuild
index f3f34085887e..332532b9b7bb 100644
--- a/dev-python/loguru/loguru-0.3.1.ebuild
+++ b/dev-python/loguru/loguru-0.3.2.ebuild
@@ -25,7 +25,6 @@ DEPEND="
 	)
 	test? (
 		${RDEPEND}
-		>=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]
 		>=dev-python/pytest-4.5.0[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index ec09558a5e4b..a881580c5371 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,5 +1,5 @@
-DIST marshmallow-3.0.0b12.tar.gz 153870 BLAKE2B 4279bb477861cbcef219a7442ffa29cb1f5bb084b08a9812256898771560add3d8e5dbcd2348d8734c1701131e02f33c69ca17f2d1d9010712e11ada96e0374f SHA512 3155503630b2a85eeb4b04769de79346b334975ab3611695806e799a76dfca78cc3c7d490b18158c757dd15d550fa408b651fa4c69b3e5eb147c4cf38613e2ab
-DIST marshmallow-3.0.0b8.tar.gz 148882 BLAKE2B a83e9cb2ff7d5786e5a0d5c947e578f81d7d2ab008257df195096e06031b100cd6d31bdab3df63b6ab6704268b1915827dd89f7e5fce6a638d136686fc9ebc07 SHA512 34f7a974872d0cdad828e342788269ab19194e17f30716dc8db21bc3b86ab3f1be6bd5e31c7bcbeaad7b8c70acc39eab256eb938060eff42067f5f1b3ba51c1c
-EBUILD marshmallow-3.0.0_beta12.ebuild 878 BLAKE2B c05fa4202eddd5fdd656c6e682139ec89f8ea35ac31a2ee19ce7e321fac78c3f6cba625c4feb712999ed9d126bd71d8ac3f5be4f681a7442a591d7ba76e8b781 SHA512 80aa16b3b8ca9c45171ef0235b32984f4e79307941cb570c94b992f6d3bd9c6e4f7814ddd9cfcbe05cf75aa22f439ed3f572ef1a2ed0dfd6bfb120a3bf2d47da
-EBUILD marshmallow-3.0.0_beta8.ebuild 833 BLAKE2B 986b01cc8fe8065077f107c14a72613854e6c29923662c90b54c34e0853fd90b41bbd35dee2e6765d0ef142e8cef3de66e99f5e01282467b423279de72bb016d SHA512 dabb33192e4198947bef64a01132cc7a21d7e35ae45b38c6b68c67dfd786c7b3b1841ef0dc412f26a69abc663b01ddfbcbba2066e75e8415d13e35731190da6e
+DIST marshmallow-2.20.2.tar.gz 152437 BLAKE2B 0d31537051c45bad52d922439d1cb9d69fc4a4bc2767d6a13bfe32a9edc978cadf9b1c508ae51532f5661291f32ed4b7c5e54f5fcd092eb4ebd7d3045521e9b8 SHA512 05511aafa978377152ea8ea1b70dd5558782bf634df5ae52453bfa65c7ec9270a12cd7a32e11872808a3289cfab2ef0380e129e84878511872e7cc95b0792453
+DIST marshmallow-3.0.1.tar.gz 168186 BLAKE2B 6c89fed45c144a855c692bee39390e1c80b2977274acb704095e76567e6ed00643704473f95abac7fabb4c1d1d96b90cb9a6fe3a127a09a0d2a4c72c02358baf SHA512 085a7e9b265bb86232222e4decb32fa172d62bca3ba3c5303f12715be1b0ab6553b1978e28db520a6a7a25778915c770ac83c607bdebf5e4d26746cd69f2d555
+EBUILD marshmallow-2.20.2.ebuild 897 BLAKE2B 2d03ffc90f25b536777c5b4e38d2aadf1b8971b0eaeba06c3f2ed42add8b47c0c6e1ec8071e678cfda1ee73674dc860419890d2522a7cd8be6d6e0b7570f61c0 SHA512 f5ea20eb80e69fe8429971d319849e6f079db53d2b51f569189531ffc8a064bed95d3c5b5f916f142d01f1af2fe9c5cafdbf8df251508e5cbb9f94552d5365b1
+EBUILD marshmallow-3.0.1.ebuild 813 BLAKE2B 588504a5d93e0147d36d23a2316c2f03c7ea0bba93996f3b87d9544491972aa05fe65d547f1bd8f54b350b98909b599e6cecca4415fa2ee30942002d461fc1c2 SHA512 60a97f7e5db00eddb532494f7eb9174b4c64e293cd108be1d9af8c52edef31c514427086e8d6d87775584647ab722810267cf2391f44357898e565ffe4069a1e
 MISC metadata.xml 360 BLAKE2B ed1f62630b417aaefbfc1ce52c275f16187a1fac9ee46e7172c4b703452329b64de253eed111bde2e7bcb4b85e7806d8423fd5d80899f93b23e7c3da61030a2d SHA512 51665fe5adb03e70bb1582f393b95783c9e4956c24f664c09d08017663bc8373b07080c142f714fd4c93381cbd5c55bec2b58ca412df6aa55980f9a61abebc54
diff --git a/dev-python/marshmallow/marshmallow-3.0.0_beta8.ebuild b/dev-python/marshmallow/marshmallow-2.20.2.ebuild
index 8f154b24c445..a9acebf6251e 100644
--- a/dev-python/marshmallow/marshmallow-3.0.0_beta8.ebuild
+++ b/dev-python/marshmallow/marshmallow-2.20.2.ebuild
@@ -1,35 +1,38 @@
 # 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
 
-MY_P=${P/_beta/b}
 DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
 HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
 
 src_prepare() {
-	rm tests/test_py3/test_utils.py || die
 	distutils-r1_src_prepare
 }
 
 python_test() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		rm -rf tests/test_py3 || die
+	fi
 	py.test -v || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/marshmallow/marshmallow-3.0.0_beta12.ebuild b/dev-python/marshmallow/marshmallow-3.0.1.ebuild
index f0836cd38e57..7421ff3b53a4 100644
--- a/dev-python/marshmallow/marshmallow-3.0.0_beta12.ebuild
+++ b/dev-python/marshmallow/marshmallow-3.0.1.ebuild
@@ -1,20 +1,20 @@
 # 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=(  python3_{5,6,7} )
 
 inherit distutils-r1
 
-MY_P=${P/_beta/b}
 DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
 HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
@@ -26,10 +26,7 @@ DEPEND="${RDEPEND}
 		dev-python/simplejson[${PYTHON_USEDEP}]
 	)"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
-	rm tests/test_py3/test_utils.py || die
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/mini-amf/Manifest b/dev-python/mini-amf/Manifest
new file mode 100644
index 000000000000..dd80a2f1580f
--- /dev/null
+++ b/dev-python/mini-amf/Manifest
@@ -0,0 +1,3 @@
+DIST mini-amf-0.9.1.tar.gz 117016 BLAKE2B 22133a2a6f44ea8d485874924e6175383dfc9301d9bba193e4d9d2fd901671c64be3665617c02223dbd2075141071deed142e804a77816ae11ac4d00e72a870c SHA512 8487baa551a68f7882aedaa8b809089bf2e767b0055f292dab4074d48ed442cabc250297ded91daa2f2a1dcb950ddab5ddff60466ec84ab739a240b8e2665be0
+EBUILD mini-amf-0.9.1.ebuild 1090 BLAKE2B e85b1547ba43c281c1246fc5742d9edfb3d6972b8fb1cc62e92096de33257ece49d5973d46d423c4401ff996fa78280beda8b9ca6288f75bdf40cd201ab82c1e SHA512 2583b51b4aee14cbcc9cea2ae59376a908eb1bf701ccc6fee592e992198fc41624f0291b7362572374302be07fcd6bc8d74f52d3437c91c40637dc01d640bcff
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-python/yenc/metadata.xml b/dev-python/mini-amf/metadata.xml
index 664b1a9c9e03..6b0a0fb3a729 100644
--- a/dev-python/yenc/metadata.xml
+++ b/dev-python/mini-amf/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-	</maintainer>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/mini-amf/mini-amf-0.9.1.ebuild b/dev-python/mini-amf/mini-amf-0.9.1.ebuild
new file mode 100644
index 000000000000..3a0d464b7280
--- /dev/null
+++ b/dev-python/mini-amf/mini-amf-0.9.1.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=( python2_7 python3_{5..7} )
+inherit distutils-r1
+
+DESCRIPTION="Minimal AMF encoder and decoder for Python"
+HOMEPAGE="https://pypi.python.org/pypi/Mini-AMF"
+SRC_URI="https://github.com/zackw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)"
+BDEPEND="doc? ( dev-python/sphinx )"
+
+python_test() {
+	coverage run --source=miniamf setup.py test || die
+}
+
+python_compile_all() {
+	distutils-r1_python_compile
+
+	if use doc ; then
+		cd doc/ || die
+		sphinx-build -b html . _build || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	einstalldocs
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 26328dbb9733..91e8d348811e 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,6 +1,6 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
 DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
-EBUILD miniupnpc-2.1.20190408.ebuild 748 BLAKE2B 67ab0e95d689347412b7c08b9949a059adedd4c62b0705c8cebba7347bdae1727fdaab0138200457289ac1a7eaf425163894b850e69268e9bae55cc660784b1c SHA512 bc8300b2f4df692141a7a46307858677ae37c57b64655f21daad9ded09d51c7d9bd28e861482d08b7681fd4758a3f65ac169a150a0bfbd29be464b567a176ba8
+DIST miniupnpc-2.1.20190824.tar.gz 94564 BLAKE2B 1569e15bc9a886bdee5192526b83e0a628f0d6c9b4449c547c0c22c2ab1f912b1671d84ead6aa6961161bd99e5f62f8428f3867b8f9ca14e04d5f953e6553d4a SHA512 9ed5fc6fbe6f64fbfa23938043732db1999f3c8585422a660fde04fd9e203d7acf8a5c3f1f1433468ea179f090261702194cf5714601c5c0ed9094250352f175
 EBUILD miniupnpc-2.1.20190625.ebuild 752 BLAKE2B 6cfc3ea9ac5a47a1623131fc4f01e24c838072a78f5b563499e527a8234486a46e3327e3cf2a987226ec0d8ef2f41a5b3534c327eaaa4b04ee8a45d8891c81a4 SHA512 8027e251c442459f9458296d3d0339f23c90b4c8fe83af614c9f93e83fcb783e98d98bdfd0b8aead5bca8d44da0ec25be6486e4ac25d2dd82fd0765184c85f1d
+EBUILD miniupnpc-2.1.20190824.ebuild 756 BLAKE2B d17960d77602df26cde5b78783b1201a066353baea6895363e0a207cc318a7a7b3ceb62bf4494f2e2200c216743abc35e169b5c5bf6d5d24fc2a8a3ea2ae4cc5 SHA512 9c7405c5f98f2e5ae579a5155213f7b8827bf6458f47cb00d277a0d84cc3be2db982fb2042ee13a83aa86503638fac960fa844e31481eea8c22b4a899f9a5cce
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190408.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
index 454bb7265340..b29713da4bc7 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190408.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index b488031e874d..d6edcc10dda3 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -3,5 +3,5 @@ DIST mpi4py-3.0.0.tar.gz 1426843 BLAKE2B a68182c6abebac6af73654f04db9eba38f02079
 DIST mpi4py-3.0.2.tar.gz 1429331 BLAKE2B 9e35749a82698ec656553583f01ebd8edbfb3b649c7693a9ff63f9f6abfa3fd41a54cbe4e3a1de55cbaf4dc626602706c776c505d0f5c0d82ebe88f2b4ceeddb SHA512 0a18332fd45e8e80b8dab0761fbaa30444a0d55776af7a2333be17ade827e92d04ac5bb8619ce26937142f344f75de0e5ef6dcb7502f33389716aa9482ddf5ab
 EBUILD mpi4py-2.0.0.ebuild 1114 BLAKE2B e8ba3c2d390b3cb89f4d6a265a14e1a37db4d64de254dc6e0226c12339ded13ae217b03f202bb4f673b73c8225ce4a02aeaffa0bc15acdc2ed19a28a4d911e9a SHA512 2660ff53f787c9ce1dbae757c79328d53062ec317a8d4e72435fc1f8887cbec601f054a879be7465e95f2e385977630289a0bb48f550cc15b9df2e219fcd2aa1
 EBUILD mpi4py-3.0.0.ebuild 1116 BLAKE2B d6023428513b82e92623455a695cf07cacc524ba73ef7d2d4690f87f7da2a630e340993a54961ab12d6812dda09c3ecff3ef92cd846fc75dec8e288c2b33f697 SHA512 cb974499fdb92c7b1b701811bc7c75ed691c7e97e777f4de68c2e1e6546a9ffbfa0271ffa6218becd870597140ac6f1d39b615d7e0d1b0b852e12c3dac0344a0
-EBUILD mpi4py-3.0.2.ebuild 1124 BLAKE2B 011352a5f4293c584337fa2712bdd90f3719a2566833d33a25fc11c417276e990c38cb2b3a8568940812da5c659a238fd426a6d6f569be9adc3299d5e352c260 SHA512 b120ac44398a081b6e6f6de54ab5931e1c02a028736628ab9e4f68abd58a4cd9c84a9aa35c9c9fb2eb9fd9a4b4ad79a3a0c4a15fd549bfd2e0fc097322e16fad
+EBUILD mpi4py-3.0.2.ebuild 1122 BLAKE2B de24136836cf2950379d83caef88191f3bae516b8ed71e1a8468ef2e4163289dedea04e1777b0348965a662b772c7e5967442e0eda9e52c0288d8cb335ccee39 SHA512 3d59953cf84783fcb3181ef9002d0e48a5d1d9279d3c3d985f47962b82db729b97ccabb2c13450f5c2124a38e60da54406f1026cb3e9ebfcc452285c1f5d27a6
 MISC metadata.xml 1118 BLAKE2B 0bc626a2106e628d7eb639e6ce90c4badb63ec2ea66b0322e7b83418791b7edc4bd443294fba3d31133812416eb4428b5dc47d074da3aeebf6867e8a0998d046 SHA512 7afb6d05007036bf5562d6d262165d8c2576bb49a86f9230f939d6a2ef929affa8461fa6421ffd8d97203a4425b397a8dd8556190364f29622e53a67674978c7
diff --git a/dev-python/mpi4py/mpi4py-3.0.2.ebuild b/dev-python/mpi4py/mpi4py-3.0.2.ebuild
index a9ab0f634606..a9f36ad586d7 100644
--- a/dev-python/mpi4py/mpi4py-3.0.2.ebuild
+++ b/dev-python/mpi4py/mpi4py-3.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="virtual/mpi"
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 29100b197ab6..e40eef0b09cc 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,20 +1,6 @@
-DIST multidict-1.3.0_alpha1.tar.gz 98403 BLAKE2B 56f05fe00f9b551ccc9725719cb794e27d969611b29f6cd70a2c2cd09bb340bcd8d5529783084a08d65103f10abc874bbf67517ae49eb5856101be35fe988f6a SHA512 71831a567e7098aaf3f1273335249dab12a96595dd233f88dae114c7dd26beca53c6f55f9a5b2ec4145d62acf84f1734778d0ccb1a54c380569030ae4a3d2957
-DIST multidict-2.0.1.tar.gz 27586 BLAKE2B fda1d12d61f4ea08e4b0fe03b82276479453cbb60d8defb4a03cb93ed14fc5bc0b8d223e2807546b6e3bd4aa8ac23e5a3992ecf726231347224880299154532e SHA512 2de3743256cdf3849f767613a510d707716b978c964626846fd082edb52d169a5fb47becf76dc287858f2d06c7f4bbf8aa0f662e41e8bc73becabfe0518f7836
-DIST multidict-2.1.0.tar.gz 28131 BLAKE2B 8ee74eb58427cef667b2c208c6d6c43f86b5c14b928e2fd3271ac057597d672150e72f15f6cee9b2c76927abbe7fce11e9731dbee7079e27c5db2fe41b994e68 SHA512 124691f3654b202cc35c59bf4e1c38a9da7d89ca3fed71f800d15313fb4042b55c0df25c012be72b0cf64ca1b8cc00707f001d007df649840e0d7a76d171d385
-DIST multidict-2.1.2.tar.gz 28193 BLAKE2B cd705159b5e830ce8601f1b63bac103fdbb0a75400aaa5df8d9c31c45968d6f598682d8220e58dca243d507b0876d442fc93110855cc4a1865651c409c8ef486 SHA512 7debfe3c0abb3323a5ee82b7522ab86162b3d44333ea7dcb26c7c87d24fb4c4c062095db9603ac4a757d507971fff6252f4b3dd9d2183ea167caa5ae80ae3b33
-DIST multidict-2.1.4.tar.gz 28395 BLAKE2B deb08b2d1039aebc95b5c7b63261180847ef6565661c668058e9646839d81bacedb0f06db9efcd13bce482d3a869d5122d7b0b57ec6bced257f90a48365324b7 SHA512 1806f21a528f907ba16cada2eda05c7387d63bec45b7906a5a37eba834a87553c402766f4e50425a41414e93e2fc202d18ad9e6aaf02742fe06899e6a18109c8
-DIST multidict-2.1.5.tar.gz 28497 BLAKE2B 301248a428f3be7740dd04ccc8ae5e92d971736b04f7243949805ffcdd005c68b20340146dee690055554dee814354770269e48bda82094f35a4668b4ac7a61a SHA512 927f2e0c175e52edbf3a5385957e5988a08061160488df70f7431520ef75439011986365dfebac80e8da6e1874232c532ea96c53081c65c74c04f0e307db6729
-DIST multidict-3.3.2.tar.gz 40083 BLAKE2B 6622efd489d4f0046200b6b28a158306cff7a3e463688c512827b599500956793ac27f6ee839e076a921b84665bc932274a5ebf4c37e273fc02916dc9be1eed7 SHA512 d44c8b00ab7823b8840665aa1462ed547aea48874a408b2af8f1cb455727896cd77ef2201e8f234bcb3f2781599ffe931a5884fc55fc1f7286da29185c4d88fc
 DIST multidict-4.1.0.tar.gz 43492 BLAKE2B 4d53a12896f070fd029816742ccff11a12636164e51215bb22b368da10d555d52a9ab7d5dc4632baec9ebc628ca4f846ad7fb2ad0bb044f033fd7e567cda0da8 SHA512 8972ca48146b40fd88f5b0675ed6d45e6887c31fc1d5962203f0fa77a369ef11b0d7739593f5691ae1fd2bbef989940983ddcf0c09acfc5a65b39b6b336571f9
 DIST multidict-4.3.1.tar.gz 45342 BLAKE2B 12a0a8f0785c30e393d996c506a69d6ba03227e47040d46859e1289b47ce23b49a9bed48c3cb0b26f3bf4051cce3963d020a92ed28373038fb79b2204c13d380 SHA512 1b475836c776ddddfdc4f14882df41f9956ab06afac7b640e3f5ae3c50717f2b07267acbae2fa3e94cf8c5650273d4d7ce44329c0febea95046ee27d98db9288
 DIST multidict-4.5.2.tar.gz 56753 BLAKE2B 01db2ea847e5ef2fbd4eab89c8a6070f3febcb0046be7344469a7e8e6de6a3c2b2af49069e64953dfcac0044d581c6af09eee70eba78dda8cfa9e0d11d3f1947 SHA512 ec66cf3c57e3386e07e45641536a6eeb94e9707d8a0d3b485d22b8687f20282c9115d533c7b0e9fb6dba28b923cf68dd8cdda08c75e78ca4eca2f0c3ec23c58f
-EBUILD multidict-1.3.0_alpha1.ebuild 856 BLAKE2B c847272f885f964aeb0687f9db5b74bf491830aec3b65c41f7578bb973c05a1844370b23b6d08f85ec56962a02aa05b3a8a6a22ce9ccca6e01543863b44948fb SHA512 e6489bdea91e0ace6f95a7e2482716dff13e2203ac467388c33cfe1b96a14719ee536327a4bc94ee676144b3e109c53506d1db02810b2915d86b537f60994da4
-EBUILD multidict-2.0.1.ebuild 865 BLAKE2B d8e17f3c8d75ca314433732a5f8d5c6401798abb7f10c62a96de988e78016cb2094c05962c7670b8db6837df7560b27630b90043966405d7e25d4cfe927c68b2 SHA512 68b7e078bf80170d665b5797ce33b5c3b5cb172ffc41ae8ad49a0a8a27855e281880de8e1f95249c6ad9c41c642fa3df405ec5d903bab51a8d016838c898e407
-EBUILD multidict-2.1.0.ebuild 865 BLAKE2B d8e17f3c8d75ca314433732a5f8d5c6401798abb7f10c62a96de988e78016cb2094c05962c7670b8db6837df7560b27630b90043966405d7e25d4cfe927c68b2 SHA512 68b7e078bf80170d665b5797ce33b5c3b5cb172ffc41ae8ad49a0a8a27855e281880de8e1f95249c6ad9c41c642fa3df405ec5d903bab51a8d016838c898e407
-EBUILD multidict-2.1.2.ebuild 865 BLAKE2B d8e17f3c8d75ca314433732a5f8d5c6401798abb7f10c62a96de988e78016cb2094c05962c7670b8db6837df7560b27630b90043966405d7e25d4cfe927c68b2 SHA512 68b7e078bf80170d665b5797ce33b5c3b5cb172ffc41ae8ad49a0a8a27855e281880de8e1f95249c6ad9c41c642fa3df405ec5d903bab51a8d016838c898e407
-EBUILD multidict-2.1.4.ebuild 869 BLAKE2B 4620150b518f2b8172740bb607c64b99fdc3dc4b663aa1ce5233048f328b8f6db5e6d835071de3fb05c4457742d097034d08255987749c8880d0abf33c251e3d SHA512 2ec1d8174e299b1d3574b27f04ff34b21f66f6119996c3eb087df81640041572619f2518dc5d951392af92e69dbbbf04f71d45105b7eaab43aa6cfb6f7981804
-EBUILD multidict-2.1.5.ebuild 1044 BLAKE2B b172ea90b8e774c1fc9169f6f4429995f91444bd88a7537b9e748ca6786633e30e1f8dac9a53e1e450c892aead30dfda269383044d14cd6127d3b5dc6d3149d8 SHA512 134a060120779ea91dfc64323e2379684b58a6d7a9683ed799b4608846ccd88194308d098aaf88e5f0ac1cb56ae886d4d26e3b50b8a5a9c948029c6d426cea9b
-EBUILD multidict-3.3.2.ebuild 852 BLAKE2B a184bf43f1af7c01c579b1a102c17ea080bcded21a371515b02ad64045081b99f6a23253b973d7cd758e5a2fb234753204a19741f36916b13f213d53f7c41ba3 SHA512 43f7a15340cf264cd5c2efaa3afd9b999daf2284a0795e123186bb08f918ee97abd65f7d6b1b779adeaa39c36c98f3be6d32ecb05ab2f5663b11ae9383d58014
 EBUILD multidict-4.1.0.ebuild 1055 BLAKE2B 304aa42a971660b518e4d85d3f68a91514f2ee327d1b5cb7214c8949e7951b7bd343008e626d99f917b15d04196f412d117190485ace16f0c771499176078823 SHA512 abaf4e3f1997bbefadb4cad52acf78f75d2bce47b09fc6c942d7221a9b57cf2efd57ae4fb5172824b0d52b45def54ca75e31ec6773ad4b70eb17250feeb8c815
 EBUILD multidict-4.3.1.ebuild 1057 BLAKE2B c47c59a679f35c35a50be58b838f7d1218f5db4c7a350dacd69b783c5f1f7bce94cba8f2348e9f5cfdb41034f926c4d4f0e2a2467fa1d0ef5888d0f097a7b557 SHA512 29530ae8855fd675c2110c61c5262283c73fa66bdb9d56efdb3a510d1ae37ec1ba8cede328d62546b191301d4d25c94dd90aa2810783918dbe3334dc01519a60
 EBUILD multidict-4.5.2.ebuild 1080 BLAKE2B bb47730a0bb5b8e22c48e926c7aab4751edd52299d344a45639cf1ca8e9d50409bdf9500cb2d7205aec36296a74f023d4693b6b72c1d8dd753d8e12811808e99 SHA512 21f2d26b8854cd40683de267c2ec97a5625be9c21ec1d4968e7745b904f32136426a4a7f291b0674ab804653e31fb1245b15372984276db7bc082d5e8f2dd876
diff --git a/dev-python/multidict/multidict-1.3.0_alpha1.ebuild b/dev-python/multidict/multidict-1.3.0_alpha1.ebuild
deleted file mode 100644
index 52eefbc08443..000000000000
--- a/dev-python/multidict/multidict-1.3.0_alpha1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PV="${PV//_alpha/a}"
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m pytest tests || 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/multidict/multidict-2.0.1.ebuild b/dev-python/multidict/multidict-2.0.1.ebuild
deleted file mode 100644
index 154eb1da04dc..000000000000
--- a/dev-python/multidict/multidict-2.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m pytest tests || 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/multidict/multidict-2.1.0.ebuild b/dev-python/multidict/multidict-2.1.0.ebuild
deleted file mode 100644
index 154eb1da04dc..000000000000
--- a/dev-python/multidict/multidict-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m pytest tests || 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/multidict/multidict-2.1.2.ebuild b/dev-python/multidict/multidict-2.1.2.ebuild
deleted file mode 100644
index 154eb1da04dc..000000000000
--- a/dev-python/multidict/multidict-2.1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m pytest tests || 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/multidict/multidict-2.1.4.ebuild b/dev-python/multidict/multidict-2.1.4.ebuild
deleted file mode 100644
index f96d85f71c55..000000000000
--- a/dev-python/multidict/multidict-2.1.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m pytest tests || 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/multidict/multidict-2.1.5.ebuild b/dev-python/multidict/multidict-2.1.5.ebuild
deleted file mode 100644
index 48db0ee37cb8..000000000000
--- a/dev-python/multidict/multidict-2.1.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Running tests from ${S} fails as follows:
-	#     ImportError: No module named 'multidict._multidict'
-	pushd "${BUILD_DIR}" >/dev/null || die
-	"${PYTHON}" -m pytest "${S}/tests" || die "tests failed under ${EPYTHON}"
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/multidict/multidict-3.3.2.ebuild b/dev-python/multidict/multidict-3.3.2.ebuild
deleted file mode 100644
index 3b217f4f6a5b..000000000000
--- a/dev-python/multidict/multidict-3.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index eeb10b58c188..e0d19fa663c9 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,5 +1,6 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
 DIST notify2-0.3.tar.gz 8798 BLAKE2B 57e1eeaa96b9e5354991db36440abfbf80471887c094e41dd6ccff72f1b1b35524bebf83b44afa455c64cdc3fb7b0ef66d2517ca499340a3d001e796828ff9b6 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f
+EBUILD notify2-0.3.1-r1.ebuild 682 BLAKE2B 2e359b2bbd2abcf19fa5b6bfebe17b1c635ce6461a542dc360adfe0e7fb77d18c683ff5ccc339c0fb2238462d5b876149ae5b81d49221b3d439bee2cb0e0dd7e SHA512 9c70d4c345a2b20c197728ed2b9731c8c5f6ca332ffdbdd0a4a4c9efd9c4108086618e621473749b53cba25b66bf4750f557216db00b7ecd642279e395a63d55
 EBUILD notify2-0.3.1.ebuild 678 BLAKE2B 602e8091115dfd7de602b7c3647e5c37f369f63fbe0d7417e471ab89d80d9ed4f62aa2aa31aa31eeb320f94a691ea6281a3022c1c1921e92da9b9d92b8b6ae17 SHA512 755039c3dbc3e1f23e9b431ef4ffa2aa1d2ca18e3cc06193f10eef0c068218a78bef8d8aa3f59c8e78f822c509dea0e7c2b7ed321fa1028f93939b4247f9befb
 EBUILD notify2-0.3.ebuild 673 BLAKE2B d33eba87b4f9b6ac833a301a7fc5eda4ec0aed563502f5d710052d9048ecc52a839af973ba15771a329ee276fb30f1b42d06557ea2abbf4035ff204e05ff6ba5 SHA512 344ff5e49820b85635dd962bf369ec20fb1fb1619b0fb3a17c6ef7fcfafd9e3705b83120af5931257f6772a3a67c2cbf5c2aef25829ab82dae22c7d68a8656ab
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.1-r1.ebuild b/dev-python/notify2/notify2-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..d04e66c02b35
--- /dev/null
+++ b/dev-python/notify2/notify2-0.3.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python interface to DBus notifications."
+HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
+
+python_test() {
+	virtx ${EPYTHON} test_notify2.py || die
+}
+
+python_install_all() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index 9ec90249400f..b01b1aaf4369 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -1,7 +1,9 @@
 DIST ntlm-auth-1.1.0.tar.gz 38624 BLAKE2B 22c6fbe7ef95b7ee88b803b7ccc5f63f1a27ec9285a4527dac20c3d774abef9765f8a7aa7265effd70869f02e09e6d3b8012c50b703c3b0979e41c0134843be2 SHA512 0c41cfab957c48d5fabf391422323556289cc6d8ba5a50c82bb179f6cdbf68528f005c3987e0b47fb47aff2fbcf00deebb0ac4220df6bd08d335879344f8470a
 DIST ntlm-auth-1.2.0.tar.gz 40006 BLAKE2B 2fbe7533411dde27938412b3e5e1292ce0fa197abb048c0e52f521ff351bd7e51bdb83b5fd8c1f05e0bb3ce206a4442b8b7059c859eea7333ee2d20ed2e7f7dd SHA512 4fa537c5a6a7f3493df2fdf49261f9588b7aac876f72b7a7ef5b8a7a1dd971d9426dacdc8bbf520cecdbe5b7adb916ddcad9e9cf4df725b69793299304601912
 DIST ntlm-auth-1.3.0.tar.gz 40684 BLAKE2B 74c2b914f508b5291cc2a23ae99417db5e5ad9fe107c03f63c795bd4da202db2f1a4f6f289645d2164e708a5a5a2e3bf626aa749dff3367420d669965c462b71 SHA512 e2d5401161ba6f9fed377a7bfed501d49ad64d5104accd7df298747abade34a3ddac9e68332416a3ab68156e9bbf7a8de6a8a271542d080cafaa84ee19f01986
+DIST ntlm-auth-1.4.0.tar.gz 40745 BLAKE2B bf2c0dab7303cb0f87d83ed11d79bc12b8f74095f2f251c190eb43879bc0e9419dedf706fcb4929c51138658910bdfa836778084b34c974ca120aeb848e2da0e SHA512 abe0260c66e2b5f57c1fd672ea121129926f1c32020166dd61973cf51f6bd320f6057f3a148d602b96d8417c2ad57c335048da185100417401e049ff14b46004
 EBUILD ntlm-auth-1.1.0.ebuild 557 BLAKE2B c9b3a25a14d39832453351cb3383e258a6ab913b1966412c17d2985a884a399d70f8efeedf61e0471d23d5e4425f6be4cad63cf2f63f784eac962d40803566aa SHA512 88c9ec8e06ef96aa6fc2ab6f1fc74650339d7c09fb58ee80e86a2738b7b68c51e52bbcaf35a9e25e46e1b6f9f69fa1f02e18f87802b630ff57181a77116b4238
 EBUILD ntlm-auth-1.2.0.ebuild 557 BLAKE2B c9b3a25a14d39832453351cb3383e258a6ab913b1966412c17d2985a884a399d70f8efeedf61e0471d23d5e4425f6be4cad63cf2f63f784eac962d40803566aa SHA512 88c9ec8e06ef96aa6fc2ab6f1fc74650339d7c09fb58ee80e86a2738b7b68c51e52bbcaf35a9e25e46e1b6f9f69fa1f02e18f87802b630ff57181a77116b4238
 EBUILD ntlm-auth-1.3.0.ebuild 602 BLAKE2B 0bf33e4a7dfd47bd8e2069748047b2c25dc38f30103118748b46d16c1232352f66d4ffb95e7c1ea9fe17482891733398eb636fd2fe4de4e40602c860c024c86c SHA512 e071bd2d00dbe8efb332bf535a555182dfc2f94e14aa40a5e3ded396965130d993e47e6b044b20e455ac09d2fd430eaf5f596cb08e89ac5f44dea57bcfdc9091
+EBUILD ntlm-auth-1.4.0.ebuild 602 BLAKE2B 0bf33e4a7dfd47bd8e2069748047b2c25dc38f30103118748b46d16c1232352f66d4ffb95e7c1ea9fe17482891733398eb636fd2fe4de4e40602c860c024c86c SHA512 e071bd2d00dbe8efb332bf535a555182dfc2f94e14aa40a5e3ded396965130d993e47e6b044b20e455ac09d2fd430eaf5f596cb08e89ac5f44dea57bcfdc9091
 MISC metadata.xml 425 BLAKE2B 791b65f110ff47908b2ada3e140cbd1fb262f0cce02e5ac083cb4fecbfba686a44aece6a3d44a69b6876c4603dd74d343fd9a61638f908836250bf3badeb9524 SHA512 a38de76267e3e44d11a8e3571809031b94697d270e3c752629764300893e95ccb1e8daf8a9bf897a442fb3b097fd6da4f3d4d34fbaead847474335a53ab91768
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild
new file mode 100644
index 000000000000..2f680d17f344
--- /dev/null
+++ b/dev-python/ntlm-auth/ntlm-auth-1.4.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="Calculates NTLM Authentication codes"
+HOMEPAGE="https://github.com/jborean93/ntlm-auth"
+SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 228e5f01aee4..35443c32d104 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -5,21 +5,26 @@ AUX numpy-1.8.0-no-hardcode-blas.patch 1153 BLAKE2B d812ddc3069d23f211026c14ca36
 DIST numpy-1.14.5.zip 4904624 BLAKE2B 14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0 SHA512 e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
 DIST numpy-1.15.4.zip 4473522 BLAKE2B c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090 SHA512 9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676
 DIST numpy-1.16.1.zip 5070040 BLAKE2B 0429d27d88ec97e207822c9c7fa759453bbef97d1d5fdf3e68dab21ca098a6321e2e57d85561dd99084d190b8ed6fce20f00b421c8d14a249fc45dc1ea09569e SHA512 e4adce4f40a3cb6ac482f82db9fcd079179b03b0e878920cfc7d98b9f622adab997c68af892b209f417d5f31b4123a1c5ff5c07cf5b0aaa496d8be6c8354bde8
+DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437 SHA512 6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
 DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c
 DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370 SHA512 578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
 DIST numpy-html-1.15.4.zip 11158615 BLAKE2B eb264cd51fd61b389e858300d96be63f8e2eeaa0b7346beac571b62d96867d6820c19d5043a6f81088dc52b1e4d7f3f295e02ff5ff90351b0feccf657ce90001 SHA512 1cad60013f374f456bbb1fb6161545a94e252205c28054f9b33cde65330772ab243339289517a8825957a21e210455d33bcc0b9c588052c49c88257b1b04facb
 DIST numpy-html-1.16.1.zip 12132467 BLAKE2B 050a8cba160e36a4c547f1b67b8ab2b9220c9841a9f8343dce6f3221313505530a1687efa2116384a03d3bc9172a0298b4ea5ece2f423841d595e45f565ccbc2 SHA512 5af356313363e00f05db560902cc7578162c7d2ab9c1ef0f3713854682b63d76297d55eb9aac0dfc7f4b687ccea93a53462e2082ef1270e29e19680e1222b34d
+DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-html-1.8.1.zip 9703711 BLAKE2B 1f9d9cb4e65fc2f03d07da9bc34de9c8c4f93f5267689abccb0e2383b23babfed52ae6c3969738e78eeca7b32f49c90f9f7bb92dd432a6b87e082b67c1f214a5 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071
 DIST numpy-ref-1.14.5.pdf 4855150 BLAKE2B aa924542346bd06b1aa8b11ceb8eb5de936cfdccc10a8339720a297e27b5b34961044eb8db8dd7b9a19ba93b3cbf76ec278a9a50724653aafd2b9d57a00007f2 SHA512 717f58fcb1aa66ecc5f5d4c11c9923d2beb21a1b1a0ca1e46f3622c69f1122fd0547b7f7abaf6de008e2aa988b2453af3c2590877f5596fb6642479ece651746
 DIST numpy-ref-1.15.4.pdf 4843444 BLAKE2B 26154930a8c881f49e7eb7d9540d1deba27baed1acb15dbacd42a659c05f50605cd44b63b2474e66d1d22851145cc65b3e3f26302f8966e141cbd2afc666c654 SHA512 aebff74389e785bd588ccc287329aea4dbc3ef51b46fbffdf088853342fea724f79f712733e453877949e756a52e89de3b257e5feba86e830df84ed8f9bb0e30
 DIST numpy-ref-1.16.1.pdf 5175448 BLAKE2B 5cd692a0fc825216560dbbf48738a49b794973d4539bd778f0f9a2f7f72b32d3061675f9a76db4cbfbb38eec0793c70046180fcb07e23ffc6177dee76b16bb92 SHA512 6cad03e30d7c2204fb899f4e4d1167fefade60d20dedf0ea87ac15c70139fbcca8789cdf17af5a2d221ba06eb78e9376b4b542621f9d78772041c83ab2405d1a
+DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-ref-1.8.1.pdf 5348248 BLAKE2B f087fbbd3c789adebd2902db0a2acc8a8748ccbb5a1e7e064effdc91e92c7dcf087ae36436fc52d7afa12a12ca2fc0f5f5617177bcd8b9745a7155acd10d71fc SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5
 DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e0b03fe1428d0b3497466fa1164ccbad84969cb7bc8daebb5525094f0d0c7710e1d661b1c6bbaca0669bfcbf875 SHA512 fb00305408c56ee203ed71ac042474592e7e933f14a639f6dce0f6dc80206c13b844c2425a919f9072a114c7af2c2f9f85b78a07ba3874259e5d173290e51a13
 DIST numpy-user-1.15.4.pdf 596191 BLAKE2B 1387b7aac9cccba4b7ce259391f56372959db35c4ddce111afb9949347ebcf3290e7d3fb5b1b2d2e7850911259cddb07edfe104c1396ae8e31a58a81e9293f16 SHA512 2089753b48412f094b279c378be1d221ec9b171957171a4e26b4589d594e00b4f66b6f8a88a7eb665e8c3fa3e6ed505d63da80d4d01ced041544b97ea56fe212
 DIST numpy-user-1.16.1.pdf 592508 BLAKE2B 88ef7aac2998fd8eeebc3ab92df9ad9ba139b67ab0442cd4ed91cdc7b1cd72acf7905468118df25634640b709106758455c7d316539b941d7760010b8135fafa SHA512 d089b4c663f92c38aa075c37974df757bdc457f75980737477a4477f67311d28149bc4c20f5d1cd0877221a78e5a9ff10702b1ebcc8ab062d328cdda4087d0f7
+DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c
 EBUILD numpy-1.14.5.ebuild 4100 BLAKE2B ef8db45fdbcd2a3e43065b74e2498e8a555727925594073631b7743f6e73f244cb302abf29b11c567e83bfd2667362ae0bcaf7e89e97b7a8a9cf7151f7cfcddb SHA512 1c82e4f559c04130d2c70d43c1a9142eb7da2f1def3aeb8b736b8b97ad1c71b1b081dfe8b54a32f56342bccb8f55fa6a4ccc01abbe3153baf2d806a396122b60
 EBUILD numpy-1.15.4.ebuild 3911 BLAKE2B 93ec5d217f42a505248509d642a0039c6342d2011b9c41cbbc45ae9ebb34e8445b6aeef1e8e827b99a78525b37569e33b22c4a0ffdd1af4b4d4237d8dd2bba43 SHA512 c72491e09fb7d85bb33b245eb9106fde1e6209c891651d46c101ac43174d934f1994503f93db3ff032292ffc6a59c3b78e747fa310d6a9dd2a7fc4dc092cc431
-EBUILD numpy-1.16.1.ebuild 3940 BLAKE2B e53c0d7c1fbf619fc4df91428c411b5ff1b3d3195ac7b06cc568e29d11ac0cff6e93111e988bd50330c70723d5d21a542a3b4f42a603186644a4a22fad0c4dca SHA512 77d9e194f48bf57406e6ea974fa3d44ae848d78ac4a023f2ddedba31208fb72b820403aef2f053d105aaa20848f66762053f7d2818ceb14d21b80f97d5e10410
+EBUILD numpy-1.16.1.ebuild 3931 BLAKE2B ab8432f6fecf5b5a7d54410ffb22786808d958cbacac260262929d240721a00df3982bb679f47e238c3f769ab24cc08b1cc31a20c524dd85d98d48f9567d9a00 SHA512 ce0349a7b111f50cdbae132fec2de20647b0bb254c69408e5e68d8837a8a9039e8ce2259f4af1182876966f797b467857361f2a87f0ff3d1e78ff1f423acdae9
+EBUILD numpy-1.16.5.ebuild 4247 BLAKE2B 1ff4b4445605f49ca3a9775f44bb7f6e3da2b84b1b59f31fc1745f59b62258f5996e85ae76588911e18bc1d2db2d5522233996a1c08d728d7162d29b4a1c4c04 SHA512 2095b2c1662ada4d667b5c76a1892b446226e434a593b1392e2ffbac812f314d3258a65ee694439eaf95ddb922b21073dac9016a3582b71bb79217892d484c3f
 EBUILD numpy-1.8.2.ebuild 3986 BLAKE2B 398fe9fc9afbaaf6e92a70c311a18fc47856453446bdd1a0db578c9885c53640a6faa1a6c8bc5c61450b4eb6bbe07eabc5593cbd2ea21eea8c51a68306d68b4a SHA512 58879a52e5bd331fb7dd363f8f5548a5c85a7b931b2cd5ab8b87e6cbd735997bfa9ae9e58bb940e3cb3766c1cac8929a4043fa256b40d1ff5183b56a4eba2d8d
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.16.1.ebuild b/dev-python/numpy/numpy-1.16.1.ebuild
index 89aa5f734305..1ec2abd0447f 100644
--- a/dev-python/numpy/numpy-1.16.1.ebuild
+++ b/dev-python/numpy/numpy-1.16.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/numpy/numpy-1.16.5.ebuild b/dev-python/numpy/numpy-1.16.5.ebuild
new file mode 100644
index 000000000000..2556eeee4f8e
--- /dev/null
+++ b/dev-python/numpy/numpy-1.16.5.ebuild
@@ -0,0 +1,156 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV="1.16.4"
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://www.numpy.org"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	lapack? (
+		virtual/cblas
+		virtual/lapack
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15.4-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = $(pc_incdir cblas):${incdir}
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# disable fuzzed tests
+	find numpy/*/tests -name '*.py' -exec sed -i \
+		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
+	# very memory- and disk-hungry
+	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	local python_makeopts_jobs=""
+	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
+	distutils-r1_python_compile \
+		${python_makeopts_jobs} \
+		${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	"${EPYTHON}" -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	local DOCS=( THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
index 3fc9b78fe5d9..49eb6dda60a1 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -6,5 +6,6 @@ EBUILD pecan-1.0.4.ebuild 840 BLAKE2B e8e278e5b0505d02671cd90c92a236c027a7ca5ed3
 EBUILD pecan-1.1.2.ebuild 848 BLAKE2B 2423f4fb53310f0433f196b4b426b161f4e158d40aabedb7682842fbe9d40a896edf55202402066fe3e8e7d031dc897bb78ce238f7100aff8da2d6fa220fe6c5 SHA512 9ea55af4fc69e54bf1bd916e2016d2c033af39e26e802f1dfd544f4a555dea0ec807686a870e1e9f3ea4827942d8fad2835a0c8978161b564e56d1bf07b37a9c
 EBUILD pecan-1.2.1-r1.ebuild 857 BLAKE2B 0fc4cbbd54aa9ed32ac4cf11f31a172f1e1304190a30ca86727a3dcabd8152ec7a27fc79e5220215fe8d5ac55ecb1c3a38ab785eb1873051f8e47d4a4efab485 SHA512 93de7068eed04d839d1168ae722e744b1ce1e352e127f5053a4cf0ca02cacd1a632646cdc6ffaa2bb5b70944ffdb189e1dd13ce2a20de921d8ac113b7aaca0a5
 EBUILD pecan-1.2.1.ebuild 858 BLAKE2B 386b6264b7d70dff6dc944f157e51c735e932cc9d5bf47d8f302c6065539bb8817bc4cfecce323e908c69046257738bf8be7bb40572e7b94cc070d2c23e98899 SHA512 e6165cd6a4cbb3838730bcb651b4444f31e79e8c061f7c05288b2ad9337e2427af8d0f72d2d1e08633d5607a58ebbf061781b0545280d762b542a2e772449a94
+EBUILD pecan-1.3.3-r1.ebuild 826 BLAKE2B 5260439da89041a0c418a0789c6fa8455792ee6848813680151161d4c6d72b97596171d6563e2ef7b1437392be74bca5b5f7556513914a3fed1e2113644e8dd2 SHA512 825f9e5b24ddf3985df53426bc465832c78c0cc4c48bf7f99b3313bf3bcec10f9341bd9c1bfb5fd9c2e1291ef30c0deeedab16d48d79925eb4fecd92482dec24
 EBUILD pecan-1.3.3.ebuild 805 BLAKE2B c32b9f52a96d3f87783211976ad3f120742605d63d46e2aa4d0f29f7f3511d5f063251763997ddd0131f3ce8e46f4b27c4e5db0de25d413a02e4068296519dcc SHA512 1e45fd1cd0c196c41306d770ce3cf4c24f5f6bc04d9cb7daf83cdda9ac8786c35d75f90676d5479b816b98796da3097e1d8baed2a6c17bbb417d9c11bf5774d4
 MISC metadata.xml 322 BLAKE2B 4be3ea8f134925d142020ac8fcfb0adbba264d7576f30c012a70c5ac175ef79cf9293d6035c9c0eeb52c01ab1a6288a42c926dcd40ee48951ba10122e640017c SHA512 506ed5b74b1e2383261f2ce34595e4fce40864db017ac9a8b2497de0802949a5d2163956a860d037898cb0885a4990531f200767781615056dac07a4af3a4e7d
diff --git a/dev-python/pecan/pecan-1.3.3-r1.ebuild b/dev-python/pecan/pecan-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..e8f8563568b2
--- /dev/null
+++ b/dev-python/pecan/pecan-1.3.3-r1.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=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
+HOMEPAGE="https://pypi.org/project/pecan/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
+	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pgmagick/Manifest b/dev-python/pgmagick/Manifest
deleted file mode 100644
index 9bdcf1fa3acf..000000000000
--- a/dev-python/pgmagick/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pgmagick-0.6.7.tar.gz 357392 BLAKE2B 5994f0014ca8ed0ffbd9b1e62c8ed7304ff7c39e6b1ac2a2c829c628ea6912bcc9c7d9161aae3ff7eef5126b1c8d622ef7fc6392f4f2ea2dadc14976b40d0a6c SHA512 0a8812457c0803a1b7ca228c77691ebfb1d51689acfce7a3c36a3b10f16020cc6e4814808985b38a79fe1ecbe77cf29f4ed6b7bf813ecaa72545127919c59c7c
-EBUILD pgmagick-0.6.7.ebuild 844 BLAKE2B 467f95405dec50cce90efe15378169ea3d0406811351ca6089fc8fe6b12855faf79b9e459b70ca6747e781e9be247447c1d2ce0eff495863c36c30e09b9ad7e7 SHA512 6777932a939ef6ab512201227da942d86e2060c5288954e905bb40626c78b7816c04bc1b8fbbc86c50a8fe3da64730c461c0dd1c2b553977bd78e6ee6254dceb
-MISC metadata.xml 369 BLAKE2B 4b89e8b23267f66abf25a86a6e099608e5f45d223c6cd13f9064f1a93bf381ec79828f366325b5baca33556a7513c006afaa7c8abb1441998afe259286b10b2d SHA512 0d44d859e8682309c5b257594c122899c0be9658d8f4f60b8c94cf5cd8c64696fde6344b776e9859f3083d10cec41d2a6797f175fa55b77610885de69649e4d1
diff --git a/dev-python/pgmagick/metadata.xml b/dev-python/pgmagick/metadata.xml
deleted file mode 100644
index e116cc09bd20..000000000000
--- a/dev-python/pgmagick/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">pgmagick</remote-id>
-		<remote-id type="bitbucket">hhatto/pgmagick</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pgmagick/pgmagick-0.6.7.ebuild b/dev-python/pgmagick/pgmagick-0.6.7.ebuild
deleted file mode 100644
index be69b8977bb6..000000000000
--- a/dev-python/pgmagick/pgmagick-0.6.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another boost.python based wrapper for GraphicsMagick"
-HOMEPAGE="https://pypi.org/project/pgmagick/ https://bitbucket.org/hhatto/pgmagick/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	media-gfx/graphicsmagick:=[cxx]
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( media-fonts/corefonts )"
-
-python_test() {
-	cd test || die
-
-	local t
-	for t in test_*.py; do
-		"${EPYTHON}" "${t}" || die "test ${t} failed under ${EPYTHON}"
-	done
-	# As long as the order of python impls is not changed, this will suffice
-}
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 7f770dbae39c..524d41f76d04 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,7 +1,7 @@
 DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
-DIST pocketlint-0.18.tar.gz 22848 BLAKE2B a5a9abc3543026b1cffa66dcf6204342c5d1ee20219423174daf725688a381a5d58a403b963e95bd6eede629824ccb72bd93161def56778fcaca9ea115e2b6a5 SHA512 02453af8465598053b9591a95d9e62d2cb8e2a218e04ec6903ed166959b7e1eebb5d226b9eeed77c7b94a254808124ec9d2078e102a0bbe9487e0f328a2d3e86
 DIST pocketlint-0.19.tar.gz 23118 BLAKE2B 2e622ba1de20d2043d55261b79b8f78b2c5bbebb2d739da2766b56fc379a6433c56f7184d832356fefbb231fb271782d4a884739b55ab52ffd64ef3efc5c2ea4 SHA512 409ebe916b1c83e128ebb1cd12b7f1d695a999d8ada1555cf6710acbfbde241535f2a929d06ebddfffed66ea7db9f20ca6606e9dd9f1505914ae3c6480cdfb52
+DIST pocketlint-0.20.tar.gz 23443 BLAKE2B f3f50c8f54b35e6d1bcf544ed6f55f2e3e461289929a6da5cf3028283fd97781d7b41d6ea458146ae7b563441aa52b757b4a59a0ab44b9016652503b344f1e48 SHA512 02b05f4831b00ece03856938306f0410f2849212d9aa1b686fdf58e6a8e415ce689cdc990125b7baa3e16eeb0e166b49afe6ba574d553f56c7f9981ed01a15dd
 EBUILD pocketlint-0.17.ebuild 478 BLAKE2B 0e62254afe12db459a60567527acaf4b84545fd8945645a326f71cc20539d406db7c467ad3721a82ea000f6b4e91000474e20baaa682a50a096bee6e880a73b3 SHA512 6e695b91eb875f227d60baee88b4806bedc37b1745bc061931e97d5eab010d5328d9434c9ea3d61979e5ebb0f4c96d085b514387b0d4a5fb49d16f777299f6f9
-EBUILD pocketlint-0.18.ebuild 487 BLAKE2B 09bf182155b09e18579a20765d0d77ad0512fe61ac1f5c499c65f697da3f5e2bb158cd8ad512874e35f995d6462b3b5acff24f133be9b21250d5c035f1eb989a SHA512 cba74d08634f335e1e49c54708a3a7c1d7b9618ee77671e7d22214fc0353763e7a1a9f6ac3103797ec84b6ca76ed5149d0eeaa372b3edfe6428ecc8a6d72440f
 EBUILD pocketlint-0.19.ebuild 487 BLAKE2B 09bf182155b09e18579a20765d0d77ad0512fe61ac1f5c499c65f697da3f5e2bb158cd8ad512874e35f995d6462b3b5acff24f133be9b21250d5c035f1eb989a SHA512 cba74d08634f335e1e49c54708a3a7c1d7b9618ee77671e7d22214fc0353763e7a1a9f6ac3103797ec84b6ca76ed5149d0eeaa372b3edfe6428ecc8a6d72440f
+EBUILD pocketlint-0.20.ebuild 487 BLAKE2B 09bf182155b09e18579a20765d0d77ad0512fe61ac1f5c499c65f697da3f5e2bb158cd8ad512874e35f995d6462b3b5acff24f133be9b21250d5c035f1eb989a SHA512 cba74d08634f335e1e49c54708a3a7c1d7b9618ee77671e7d22214fc0353763e7a1a9f6ac3103797ec84b6ca76ed5149d0eeaa372b3edfe6428ecc8a6d72440f
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.18.ebuild b/dev-python/pocketlint/pocketlint-0.20.ebuild
index c5d0b13365c2..c5d0b13365c2 100644
--- a/dev-python/pocketlint/pocketlint-0.18.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.20.ebuild
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 38ec0892c797..10b1cee2d25d 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -5,7 +5,7 @@ DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498
 DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
 EBUILD protobuf-python-3.6.1.3.ebuild 1338 BLAKE2B c2992acc2383bf7ab469f2a538dbd344ecf65d20bec9ebfe1209de791c643bf069c75dfac08e7b8ce1d450b4a468fee47e4903fd2cd8c4df0d4fb8643147986a SHA512 522fd9478da9a732828c8ed4ecfe468ac15218b8527d41e797f792c462987a7e293c56928ab12bddd79002a24772eecfb59f122244e327182f860810cf7fbdc8
 EBUILD protobuf-python-3.7.1.ebuild 1581 BLAKE2B 0a1956a1e5168382d5db661b7ccce17f164ac5f34d5746b54f17c94b935d7f6566731440e5d7a560ff4f03314b55f85f65dd9b8b9adb5965cb8799879ccec151 SHA512 6724d4732e02042369ccf2e662964be6493caf34dd166ae58d9afb9dcf5117e425c8f22134357d0b3b72b8e9dfac65837db31f6c317e92eae3517622e3ffb520
-EBUILD protobuf-python-3.8.0.ebuild 1530 BLAKE2B c7dfc3e89e04b8b0efc2a5222b7ec6dfbb405005ddb2dcd1b7dc0c3e3e3f1431e08dd69eba662f23af34e3f729ed71dfce4badea9c9c732768241da5e2a49585 SHA512 e512cfddb602dc389a6d7f57ed20976a8d3e6f9f035b0a9e302f0d1a6abb8d341920f5c035dc1399e250df1282bd7aaefc4134871be1abdfa6884bfcbb8b9556
+EBUILD protobuf-python-3.8.0.ebuild 1526 BLAKE2B 470958057b556e18710dd5758c290bc80e0e674ce06ea32da89fdb2f034038e8606ddc8102f94fdcf438f1943957f1631af12f4053085e1303920c2ed5c82715 SHA512 1b7f8d7c12529b4b5f25daa546681f5348bee3cc21c41a929261b4fb52b03ad281fef2487ba4753889d30fb418184a9a636528bf19dfb17d0afb961efc7ef004
 EBUILD protobuf-python-3.9.1.ebuild 1532 BLAKE2B 1731a0fb3647828d002a6dece70dec5eb0d92e6e467457e7872740bc5a504998358ec9f55e7c31f6d8f805345d5e13db9619894b7d393b7b15cbc0013b5e813e SHA512 f703f0e64b604adaab42298543878ab13b9fdebe64832a17483c6da38c000a696fd1a4e16e464a459d18f82b09f5daf0e6eb5e5b4d89328c396aeb8f35eb2ff4
 EBUILD protobuf-python-9999.ebuild 1471 BLAKE2B 96473eb9817c078af97121297054a8dd253f22b3741a40d7df78d1494e229391111ade9998973a2f3b4e4f045f7f8389c4123e64fc0d764545cae35376ca6324 SHA512 f81f1b8146f9c26a9a6d343d3121e456f4b71dc6c6b42fbf8c73777d8b48f58088d3bb966b47da7fc01576f2a0989bcbddd414c19412060a2df8af1e97155ab0
 MISC metadata.xml 539 BLAKE2B 32831dd18b1c8c19a3e5339788b48bcbc6719654148fab93412bb91aa53ccad7b39529bbc2ea78b33b157eeb024e77cfa981088375466273e58b9d043ebdd70b SHA512 c6f28c8549dc8d3552836e81322db479ed4ac7ab5a12232f64d55cd909d8e4face39eed67b3f2c79f01023cfe3d00cf0540493acdb0aac419e6b58abcd430890
diff --git a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
index 1eab5950da37..8c37f8257387 100644
--- a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/19"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pycanberra/Manifest b/dev-python/pycanberra/Manifest
index eea42dc5b78e..993a0bc6de74 100644
--- a/dev-python/pycanberra/Manifest
+++ b/dev-python/pycanberra/Manifest
@@ -1,3 +1,3 @@
 DIST pycanberra-0_pre20130515.zip 14945 BLAKE2B ae90cf894cec24aa4d83f69d4a4a8c72303a16171d17e1dd74ee40e2031d87ccb51780e0aa2ef2a8ca0d448f5e7b26c8ed72fdfacceb49967a05c142e8b2a92a SHA512 9836ed3d5aea9a80a3ffd64ef85b327c7dcdf24793c65010f43139c548d7c77522ab32f407930efed89493509efd117c64ec0fbf4d1d6d567d4d34d12d1936aa
-EBUILD pycanberra-0_pre20130515.ebuild 734 BLAKE2B a4cbe1349667f57ea805aa49f39d0317dc8c795e2fb9ef61f22432f571cb93ad3981feb93ce042209e00e2f4b54771d0dbc720fef2743f8814a9b80578a438a7 SHA512 52b259c7d65977518bf5f9f7fbbbcb95437fb6ddd5653f88e42e13227f9ce774c383fe3939e598778f0b7934d4970ffb4f4415b5e3c6fc137693cf71321ef038
+EBUILD pycanberra-0_pre20130515.ebuild 751 BLAKE2B 02cbae9056b2b2a05950cf353d65e413fb1326a73362ea395ae72c1a7a4c6577df5bf09e8d7d1060df26f345f4c0d5cac49ab61f8e2f6a31c58bf11ef0fdd5fb SHA512 0f51d5369a92de73c1f5496517ba218c7e3b19df64ab1b63ba276242d598885e66b21852b91de0b0a19f0d69d1de2172d43f40c486bbef341edb6ef7ff4a0dc3
 MISC metadata.xml 575 BLAKE2B cb6d8d2df8e9bec22a3d5e64554e27d6b4a684530c62e5736d7a858f765b3701ddc6e88214d263ce1d4d485fc210e0e9f1eeb514a77354b2a0d1eedcb0dd3017 SHA512 19bc4b110c746d4a0e946164d0d0b4f43f0bbabef179596d6a6b6981a443122ff395aa892e6130be75dd92aeccb263c5ef5f7857b91f076158da11db3d6714ca
diff --git a/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild b/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
index 0c6ff027601c..23dd23e04f34 100644
--- a/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
+++ b/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	media-libs/libcanberra"
-DEPEND="${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+"
 
 S="${WORKDIR}/${PN}-${PCOMMIT}"
 
diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
index 11863508dad9..84d8823d852c 100644
--- a/dev-python/pychroot/Manifest
+++ b/dev-python/pychroot/Manifest
@@ -1,4 +1,6 @@
+DIST pychroot-0.10.0.tar.gz 23960 BLAKE2B 6d22ccbf3d71854d863577f0cf5ec3b1bea40f0f80d5c07942520d5d522ee299222e96cab4893c9cab93866c7f881052f67ad9091267c329a772fc4c3065bae1 SHA512 4a3941da9a94b75963e72536ec8f6218564dbdcb97e6314562044eb55f523e0704aecbc81e8e377338781e8bfd1a2aafb22cdc82f37bdb198a03e0e30d2323e5
 DIST pychroot-0.9.18.tar.gz 32879 BLAKE2B 769b3347bae3f7dfb47c0335015cc898ec851a3d45f774a4e21aeaf9b8d7937331bc69aa5bcbb298e76e7e51ffc2e55f049336fd90f6b08fc3bba87089f2205d SHA512 59c8750c9ba8d601eca485079c04d4153bba92531dbd30fba0104694e4435d76e65b762b76ef89a6a6f8908dd6054d1d95fe4be74825ac1c5a56e473370dfa41
+EBUILD pychroot-0.10.0.ebuild 1103 BLAKE2B 3abfa08dc253404e555048e88c3b48bf30c6e332cebbe95605f4b53740ac35794c058d465336edfae0364419d32505958a32fceec355012000517cecb0af5c3b SHA512 29b6f7551ceaccfc18717ac4254088543176c81a2cac94e5d5b08484a257233e4fab0b8507e186f85db9478b55276f1068e86c9f2840f8c310210301b6e2b76b
 EBUILD pychroot-0.9.18.ebuild 1142 BLAKE2B c8f1f4eb6f92378d0efc61c95d6e8e8bcaa1ffebe44db08d30b5552495f34ce84d4ce8e45ffcf753aac2f7cc01d26c763fc5cd829a7b53b65c322ccfc7958838 SHA512 be1db019faca07cefba2d1ef02b03792383ecd53ff9d1ced5e79151809bc6a60c258933718978b44f810cdde254be82d4c95c3c4b12e58249f05c3f9020326e3
-EBUILD pychroot-9999.ebuild 1075 BLAKE2B 99fd4195e1ab0e2804c64ccf69b19f32e34bcf0bb1ad86d4951529d597ac8b7f8c15c99e20f8a4837a44f3f5b298db5eb0ac49cacc67f798ea7b87b306157a4a SHA512 ace9b23a4ac509dcc3c9da7f2305ac71ce39eecba477a64e945a262259d1ec7ebe1346aa54604395a0b72573bfab5d84cafd63a458d6840235f4ad990c048e2a
+EBUILD pychroot-9999.ebuild 1103 BLAKE2B 3abfa08dc253404e555048e88c3b48bf30c6e332cebbe95605f4b53740ac35794c058d465336edfae0364419d32505958a32fceec355012000517cecb0af5c3b SHA512 29b6f7551ceaccfc18717ac4254088543176c81a2cac94e5d5b08484a257233e4fab0b8507e186f85db9478b55276f1068e86c9f2840f8c310210301b6e2b76b
 MISC metadata.xml 337 BLAKE2B 3c60605dbe9296fe7f6c285123fa649b47c4997af6f715cefcb5047817ddff55f15c4813c2c33dcffa4e771ab3d0afb83bd88506d915e313b237e51ca4729c70 SHA512 4b0da70f35cd4983f6f5cd8aa02e5555b770d3bc2b7e90a8e8287c64593fadf1fe532cef6becce24de96766f94d24d8ec731ac3acff6f42a2c7b06c3e1e1e4d0
diff --git a/dev-python/pychroot/pychroot-0.10.0.ebuild b/dev-python/pychroot/pychroot-0.10.0.ebuild
new file mode 100644
index 000000000000..e1419b49ab2e
--- /dev/null
+++ b/dev-python/pychroot/pychroot-0.10.0.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=( python3_{6,7} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pychroot.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a python library and cli tool that simplify chroot handling"
+HOMEPAGE="https://github.com/pkgcore/pychroot"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND=">=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]"
+fi
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	esetup.py build_man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst README.rst )
+	esetup.py install_man --mandir="${ED}/usr/share/man"
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index bda4fc26dfd5..e1419b49ab2e 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -19,16 +19,18 @@ HOMEPAGE="https://github.com/pkgcore/pychroot"
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND=">=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]"
+	RDEPEND=">=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]"
 fi
 
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
 [[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
 
 python_compile_all() {
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 5e8041cb1656..5f9e586188ae 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,3 @@
-DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
 DIST pygit2-0.28.2.tar.gz 496469 BLAKE2B 1173401d4555f6f40eaf5a27d9c0e83214b66afa609f15cc4d689e8c58cc0ae3865b4e6ebb31808d354ecef56f3a74cc777fe42314ef348c39f1f61d82655bc9 SHA512 3f742cdcc9d603c9cc9ef2e0a545da8bcfb555a0bdeea1c73c53a284b43d40ad6b28c87a029578ad7b1c8f2bf56ecd2859dac8dd836474bfc66223ff4af9e8f0
-EBUILD pygit2-0.26.4.ebuild 621 BLAKE2B 12689ec100e542aa3bb628e1395f1ccd8b3423812985dfe09414c0afd29c69881433355b5a8941bc8124e4ce02ca664084d18fb68cdba44dec0b9ade23356df2 SHA512 c13efaa6f3a1686f2fc6bbbbf0e9a67c004675cd5f07352b0bb2ccdb5875ec1acbe557a28631a2bbd6f8864e41f72f3f80741280bd1e54a07e8942626e2aa0e4
-EBUILD pygit2-0.28.2.ebuild 907 BLAKE2B c107bfe720ca781711038d307652e29cb0f1246abe96b60fd00764885283240999db89edaec84563fe6059bf615db1fa26d5e952cfbc7c5ee09de974d56a33a3 SHA512 9b1e2f9f0794d1fccd81dd0cb121507c3a116ca1f64f5013f6db029b29c03c001cee6fda11f8c7d899e25ad7da31f4bdb670b505750cf67b2a1e456886fd7d06
+EBUILD pygit2-0.28.2.ebuild 906 BLAKE2B 9454943a79010416c8bbde14d46822be2b5315ab6c1bf902bae6362597eb242951ea93e806b6fa6a2387599f096e4130a3f4d72c5a2d9ffb64d5e1f1168d525e SHA512 0658f9d3637c5e22ce942deace28d9e55e40eb72e76cefd6d93f76b9cf6f20bdfd592ba1529da38342a194c768fda38f4404feeb5c3c02b64a0633a50d673043
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.26.4.ebuild b/dev-python/pygit2/pygit2-0.26.4.ebuild
deleted file mode 100644
index 56414787598f..000000000000
--- a/dev-python/pygit2/pygit2-0.26.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test --args='-v'
-}
diff --git a/dev-python/pygit2/pygit2-0.28.2.ebuild b/dev-python/pygit2/pygit2-0.28.2.ebuild
index 5fc3e9c5bea1..9c99e10b931d 100644
--- a/dev-python/pygit2/pygit2-0.28.2.ebuild
+++ b/dev-python/pygit2/pygit2-0.28.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 924dab022213..8b3022cebd85 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,5 +1,3 @@
-DIST python-efl-1.21.0.tar.xz 9544352 BLAKE2B b49fc0e0d795a0334f647f414673fdaf3b086eda35f9e2d0e9e6a03d2cde572e6076eeb62c4f977b770a72e8f14d4ae536f46d0510b8753088d80e2dfc98e43f SHA512 23a8487b660e9885a1d43a4835c560edd8d27eeb9aa44f9e1878ac1d1acf9833fc62c14036fe0fe5e0bd1144cb993b0b67bcf42c78db8505ca1b8aad0715350f
 DIST python-efl-1.22.0.tar.xz 9523624 BLAKE2B b1b7573da8546f580dcd06be03e4746f2e991245c7bbc3477090c5a9365225bca663454a202f8e05ec6c73cbfb7496ee5f92bc2a9997900e6709b01017740db6 SHA512 27e29af764166e803ce6a833c8249a91226a4315dd658631cec57513befccdc9407b04b452054ceab3f77b429d899095b49dbada2e0fd1a63ff6059ef200e497
-EBUILD python-efl-1.21.0.ebuild 1769 BLAKE2B 0e3641a9fccf4f14f6a0739c2b132252c723ee54bf84345a87672d81c2bd8babf6ded15abe305b4c693c3611a52183937fc33928105e19498c07336ef5391757 SHA512 ab58581235bfe3e3135c36b06253d9eda8b440800112d47e1f2103931031a8eafa5e5503cf4980130c47cbdb49d7b45a2ef51f73cc5389041bdeb29bb7b9b7cf
-EBUILD python-efl-1.22.0.ebuild 1638 BLAKE2B 55f150e9de16b83d09867ee015f24db08f78e967efe177d4756df7b1069e4b5a892da0f3ffe1c0becf21671605dde3dffa767ca908451787eef61bd50f709249 SHA512 0f6214cfd4a15256c8dc1632fe30569f63bafa0294f9028603b16f2f1a776800cd6d51f7a0ec8f9eeb08231fe5d45a8082fdf63553b70dde2b9a1a202a7af908
+EBUILD python-efl-1.22.0.ebuild 1636 BLAKE2B d419249cb2b75e569d16158072f7340602c67e8c23123e3fae9ec5caec66960fb0287efc431a55bd55015ff728c6f4b638da95cc04299c5abd5a0b206e6e3b2e SHA512 954bf4b4732436f78c3f5c1001f966a5ba8185f17db901a3a3197064582fa539f75265e1a5f9abaee508cc32200581eb8209bb0dc5b7592838be8fc87d7bee71
 MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/python-efl-1.21.0.ebuild b/dev-python/python-efl/python-efl-1.21.0.ebuild
deleted file mode 100644
index 7a73f36bef29..000000000000
--- a/dev-python/python-efl/python-efl-1.21.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5..7} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
-HOMEPAGE="https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"
-SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-libs/efl-1.21*
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-"
-
-src_prepare() {
-	default
-
-	# Tries to download a file under /tmp
-	rm tests/ecore/test_09_file_download.py || die
-
-	# Tries to use that file which failed to download
-	rm tests/ecore/test_10_file_monitor.py || die
-
-	# Needs an active internet connetion
-	rm tests/ecore/test_11_con.py || die
-
-	# Test fails because of deleted files above
-	sed -i 's/>= 13/>= 10/g' tests/ecore/test_08_exe.py || die
-
-	# Make tests verbose
-	sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
-}
-
-python_compile_all() {
-	if use doc ; then
-		# Point sphinx to right location with built sources
-		sed -i 's|"../build/"+d|"'"${BUILD_DIR}"'/lib"|g' doc/conf.py || die
-
-		esetup.py build_doc --build-dir "${S}"/build/doc/
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd tests/ || die
-	${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc ; then
-		local HTML_DOCS=( build/doc/html/. )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-efl/python-efl-1.22.0.ebuild b/dev-python/python-efl/python-efl-1.22.0.ebuild
index 1f160f168884..8529f5f89dd0 100644
--- a/dev-python/python-efl/python-efl-1.22.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.22.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 0ab337b72cfc..4f12a364ad28 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1,5 @@
 DIST readme_renderer-17.2.tar.gz 14643 BLAKE2B a41c2b1b426f95f026092e6776587e68b09fbe314f148a02ba21edc17f4610f563718cb8469e3fc4baaa9c1c95ca501da205bec6abbf7f70171a1ee7e8710159 SHA512 2c25eb24b04b88fa8522ff0068e3a3a7b57b035641d0053ff93c295dde50cc6f21af9eeca1061eef794f52b0aff184f97c95b3c232f02b308e09682e50a6d40e
+DIST readme_renderer-24.0.tar.gz 24038 BLAKE2B f9c9dea1284cf8ac0a8280395916118fca13a4d7537a455e95436d1d7b818c11d197618dd22c3810790eacf8982d31378f3e22dc349e82fd6dbce84192c47b4f SHA512 202a7142ccca3f5bc4e6d92330f25284fcc4f3984ccdd886e4be2789518242ed659660db5a7c7224f838dc8f5ea9dd6e14c65746cf08a102431ddd77d62a434a
 EBUILD readme_renderer-17.2.ebuild 853 BLAKE2B b50c76c7348a91ebed2ac0efbec2ae947c3d71fb7ff481d4b6a152fa49421b705ddcc854d4592d4dc6cb8ebb8fa328e7c5c18f2fc62dcb5234f488396209a633 SHA512 668ab319e9584d98c1bf99b937f0b4147a62e702f4020340fe5bf39967ba6914e702158df5b7173c771e82f7463b43f8ec3be3f209d7b6b5256b8fb17a470e37
+EBUILD readme_renderer-24.0.ebuild 884 BLAKE2B 7bc73ffff2fea04b46780ae7b58ebb88b7b6b2b53e438dd26be2415722fe305b98fd0cc3b830ed42d6c6c6075e4c1e8c6c65252891cdfe32c52854f7e75c36b0 SHA512 c1bc96e48660f9000cd5333364103a9df58357b77d651816470d0f62e6a36f428d2bdea9a112c18c8b4958b03aec69d90e8d713279708a29e14e6e6e7ab9e1d7
 MISC metadata.xml 390 BLAKE2B 2a81aedd6207fe28eafb76c0eca7ead7543282f84979e07f3b417a4fb9ed6be27a33e6e41f60c37b649cea7c8bd6977703e596760d44a734a0ba3fa023339bd2 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f
diff --git a/dev-python/readme_renderer/readme_renderer-24.0.ebuild b/dev-python/readme_renderer/readme_renderer-24.0.ebuild
new file mode 100644
index 000000000000..47bdfdbe3b18
--- /dev/null
+++ b/dev-python/readme_renderer/readme_renderer-24.0.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
+HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst )
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 91a1d4ec2d43..c4214a141ca9 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,9 +1,7 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
-DIST rospkg-1.1.4.tar.gz 89554 BLAKE2B b307482cc3df0f2a178dd427a37160cfdc3c407b2135a28854f3df0ff964ed57c17a8ee358a1aa90b3d735e0913bc6c3c8ea1084efdef5fd01933166e21ebac8 SHA512 1758dcbe28c18c834a60bbda2e5e6be34629b3dd4f6519f24dfa1324ff9fc59fb7d0ae9d324c002eee06ff672309627e48f97119b36601390b24a24ae196d5c5
-DIST rospkg-1.1.7.tar.gz 90200 BLAKE2B 5b64be62b292ed8d216058d9e906451c74ebfecced92da2888b6e6340a217f56460b9dad6fb741a1b78c156513adfb435407dfac19a9fcbca49b180662b879a2 SHA512 7d6915a32370786384220cd0d62087e0f82648e96f2006853dfb1486ff5b6c3343e32b9ac8a33ad1c1a8c758499475553b081166ca7ee0c72659855a2b09f151
+DIST rospkg-1.1.10.tar.gz 90434 BLAKE2B 1eb128d7e3f6d07e8309ecf5ea6c4340afcbb6f0618fd4628543c046003782750c5013c13ff2ed17018abc6efc6ce2042ccf2c6dccea8933be7045ddfe3f4522 SHA512 54b1b0ca4683b9388989501781239cf35873f2bf2028d176718f624999835b21e44f0cc5988624b37f7172d21f0c01aa336d35a884753c842098e558c37ac6c8
 DIST rospkg-1.1.9.tar.gz 90412 BLAKE2B 4cca7d1ebfcba495aafd766f0d720a6bc6e5aade0bff098d4a1cbab3b55c7a720de7d1f97edf806a93cc21eeda4cac86e844b5e3b23f85cbcb7b328fd07da222 SHA512 d33005e29313ba06959189f8f563361fd9523c2368855f260347b4c509d8b4053f74db3e2cf5986031653d647ded097f272f65d617da93e13cf77a906cb56ca6
-EBUILD rospkg-1.1.4.ebuild 1076 BLAKE2B 8cd3171fd85c97e5c42382d0281de4629cdba1f36bf5046a671fd2f6b91089ee96e70c73524552e20b9d53ee5bee07896fde9210016ee8753cfe53b838c2eb27 SHA512 2a9964c1cd662b51ba68bb8d19f37cc3a9888dcc7376fe3efa229623e3de46cffe027847e457a7b2c04d52b599e159b30b699d2d29dfde9974f9451b7c133c48
-EBUILD rospkg-1.1.7.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f
+EBUILD rospkg-1.1.10.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f
 EBUILD rospkg-1.1.9.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f
 EBUILD rospkg-9999.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.1.7.ebuild b/dev-python/rospkg/rospkg-1.1.10.ebuild
index 0e81f9b79bb0..0e81f9b79bb0 100644
--- a/dev-python/rospkg/rospkg-1.1.7.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.10.ebuild
diff --git a/dev-python/rospkg/rospkg-1.1.4.ebuild b/dev-python/rospkg/rospkg-1.1.4.ebuild
deleted file mode 100644
index 695085ddf32e..000000000000
--- a/dev-python/rospkg/rospkg-1.1.4.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=( python{2_7,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index 9dd1bdb2cf0b..0c3c7b92c040 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,7 +1,9 @@
 DIST rply-0.7.4.tar.gz 27392 BLAKE2B 3604550646e083bf685a192dcf0dbc80c03cf4b97f6771ed37e228c84909c2518a58bde73ea584085351f1a2b5c865418ae671843087660d48f08e0e44e3ab2c SHA512 e3c3a828eb4b3cb20751ecb2d91efaabddbe3702d52b9adefe1748c07c843da1899e3944bcf0ab79f627ae428b8879cf99739ea7e0c6fd1acffc4ac4dee1b652
 DIST rply-0.7.5.tar.gz 27462 BLAKE2B 0f438e6fd786e7436f135da50fe90208970a0950422bb0d8e26b06cc2def964c0ebd7c3e5e3e282a1d56dbb9e804ac267095dc4da16eb57899f455d66fed2d71 SHA512 ccecc451d9e2e0fdf9df7eaaeabface782d9159cc1caf1feae6e46210f6384aa1a78c15ea3c0e9dcc0bd0d2b28e3b1328c8d37e94a8968b07ef7938e5f5ce201
 DIST rply-0.7.6.tar.gz 26216 BLAKE2B 5ec93739179df0d34762ea0ee004a00defa235a23af8b5cbf283e1e44c250469a704c9247463a8cdf9796c35da8aed0be025e73fe21aece3d376b1e66ffda1c3 SHA512 b0edcff1ca32c465b404a0b2f548f90d312bcb98d3f4aa4a61fb44986c8aa7ecb6f046e72112e2c1f5654173bcfcc96ab4e0625632e908ccf17b43cdb3d8d99d
+DIST rply-0.7.7.tar.gz 26366 BLAKE2B 09e6b93e9581745209b2d1fede6e0e4f08c2a34cc2495ea73aebb27b012353bbdb749ef127128cd5d9df201607f73625e248945038a927d788e324fb632341b4 SHA512 c01166b7df067a6a55d1b43caa7b5a349045e838899daf82e2ba70a2c2525fd68e95f11e5319a1fe36936e696352a37bdc13f132f739cd52759a9a9c91e317ba
 EBUILD rply-0.7.4.ebuild 902 BLAKE2B 062807535e3acd9c24edd1cef1751a83bee35c0ad777b489a6eef3a947e506f31524316aca27558145ed56c1ecea4f0b3d0fb8b24ef03f786fe98c0ba9096613 SHA512 595dda7dd3c5a18b27415323b37859029da4f9753fee44585687c28f8f1de902b66a79faeaf1ec3846f99d6bd876e3cbb212d3cf0c2b7c4f2e77cab080d1c37a
 EBUILD rply-0.7.5.ebuild 906 BLAKE2B 0d7bf337b49162d6a078b400133ff9df00bd2942fe63efb9358cded03d4fcff23ecc302103359facc8b93f2068c968c697ee41c24a486e3a075e8f81ef2697e0 SHA512 eb31a2bf2f70cfffdd8846b79132a7bff12c543d48f6b182247a5da53d1af94f66e2725c7a8b3e09358991126ed9503479511a4943ff4dff01af012f1cf5ba97
-EBUILD rply-0.7.6.ebuild 912 BLAKE2B f317952e46d3a409855cecb9f5e120244d346857b2d411332e69b7677476fabaafe825084e35d641d030dc96a61710ea3c31712e03d9df8dd83f4c36e1362edf SHA512 9846c399ed29aef6c5b8a8269811d8c1b146c69cc415e547d82cec0b466f9b89c42e51ea0bdb20dee16f91beeed0f8deb5331ffe82af8a1628f44458a09902ea
+EBUILD rply-0.7.6.ebuild 916 BLAKE2B 7b8b1280cda1acc894036a075c6f06339b7cf95d2528fe0b2dd4d7d2f8c4aa7022f35cbfe6d5f1ce4d631176d40378356a63e5c3b1bbb040b865c0db704f5e37 SHA512 87282212c197b57907c1212203ed1ab130dac5d042641f7bc9baa144ae1fb48b6ed577ae82125df8eeb8fa722de0b9ce287df17b3471c063d1d5d70f4737647c
+EBUILD rply-0.7.7.ebuild 698 BLAKE2B e723af385e80f35635cf3c432fe341dd578f291151b2c8a7e3ecd7e6b8deb27642c2aeb345c049b80060c66bc162e380f22dcb6ac7490409389686148e44d10f SHA512 e014828d0ac52e6ee1bc659066868294d2d4760b521be088a9fdb7807ce7538ba29dd62e8659ddce7122ab23701d16515157f61683fa79c535b43a2a8ae86397
 MISC metadata.xml 324 BLAKE2B d6027998ac0d5aee72ca31a60c53bdf7bbc628b16eacb329041fadb5ac5c9015f152e3e9f59495505eb73a2f8fe76ccff182026b6d5c80999274268056e63e14 SHA512 9378b0e52729cd011ed824e800aa1af7ed6b9f799de0802950dbf02eeb8dd27e356ea067a46aaa91b05d96f7ec5fc17a43c0d980b7b585fecb8220b0ddc20ba8
diff --git a/dev-python/rply/rply-0.7.6.ebuild b/dev-python/rply/rply-0.7.6.ebuild
index 29db68a22518..3499bd15290c 100644
--- a/dev-python/rply/rply-0.7.6.ebuild
+++ b/dev-python/rply/rply-0.7.6.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/appdirs[${PYTHON_USEDEP}]
@@ -26,11 +27,10 @@ python_prepare() {
 	# https://github.com/alex/rply/issues/26; fail under py[3-4]
 	if python_is_python3; then
 		sed -e s':test_simple:_&:' -e s':test_empty_production:_&:' \
-			-i tests/test_parsergenerator.py
+			-i tests/test_parsergenerator.py || die
 	fi
-	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/rply/rply-0.7.7.ebuild b/dev-python/rply/rply-0.7.7.ebuild
new file mode 100644
index 000000000000..cb3fca642b26
--- /dev/null
+++ b/dev-python/rply/rply-0.7.7.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=( python{2_7,3_5,3_6,3_7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python parser generator that also works with RPython"
+HOMEPAGE="https://github.com/alex/rply"
+SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index bbae4129adfa..ac6472daef4c 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,3 +1,3 @@
 DIST sabyenc-3.3.5.tar.gz 19578318 BLAKE2B d36182074682a00cdca15be12d9d1424f9d3a8f03130df905e53814135cb0f685086d643ad23f3aec47b56b50b3ca43925a0fb4a3ded14cae2559fd14b6beeaf SHA512 94b5114be111feafc65f75d6461e5135bc1b8c8a84d8501f28e1035150d5581e901e7290f5b4cc6cb5426fac5d4971d138c43f6a62ec3bfe43ea9b5f269c0a89
 EBUILD sabyenc-3.3.5.ebuild 597 BLAKE2B e57c4ea1bd7c5c089ea5af28c70c1adae83e6e77070d5f478439fdab6cee9a1c9c6dab738022125765b50bbb775c5cb971906710c93ec36de265468dc7b52e26 SHA512 75e4430d85c7f676c6b63271f82600b2407c98a83c3c309203c15e2f211744f07b2df9880f49b4afc561b91e6bfbf68d1db8a99e1681de62c0764c76a83b62dc
-MISC metadata.xml 220 BLAKE2B 59eda2baee6ffd0773806bfb555f2784ba2f8954133a6339cb3d3d6fe1360178bd789d0875262ea7904a299cf0bf36e9795264f42d7319463488375ad9cbade3 SHA512 878b4526d51f7901900ec97fb85bb90e0d1099d29bc8e49dd7cea6258da0737e71aec3377f1bc2621cf96fcf7c5699e424bbc5fb721af2f365742725612fe50d
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/sabyenc/metadata.xml b/dev-python/sabyenc/metadata.xml
index 664b1a9c9e03..7a38bb900964 100644
--- a/dev-python/sabyenc/metadata.xml
+++ b/dev-python/sabyenc/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index b68984f90991..604081234c21 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,18 +1,10 @@
 DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
 DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
-DIST setuptools-40.7.3.zip 842920 BLAKE2B 53b5845f157d088fa0848384770f185b2daf8f1bc0304e8d5ab3eb5cae44a42133e7cf2f655e95be351733760ed401d55e3717c4a1257c77644796c08cbe67f6 SHA512 fb61e4d7ae620684b128bd60112938a4a9721a82ed3aa4daa774837a2db60e989d608ce2ba7f51393f412b78244d6f4c8f1025416b137d8ce01a2c0375ffec65
-DIST setuptools-40.8.0.zip 845071 BLAKE2B a76b92a7e3a5cd87d74f3ff5f49fe4c6b2a1f0c5cc3b04219f6f773585be479ec5d092185129ada1fe5c5ef62714687beb3a316a6d50b559e9224aed468aef24 SHA512 f14976a76bff74b7494d44fcfffa511de0d142b4d308fcbf87b34c31c51491102e152acc11a383c5f6b693d1b18eb119c5186ca23deb12b2bbf186794b062868
-DIST setuptools-40.9.0.zip 847572 BLAKE2B 1ef3f05d747a67395f705ad46bf066f400c9a5ad97efe73175e72eb9091c929cb61a526da1206f431a4e054939e0fd2b2a841a892c6cc76a6116cf781112b472 SHA512 2d278ef162139dfb1dd3640154ae3db755ff5c2285810c85b0452d12e3f3cb199e3f1a1ec7cc43a377d42cd4f86e97e2c773d9f0a3bef8dc1acbf31e6f61033f
-DIST setuptools-41.0.0.zip 848208 BLAKE2B 8d92cfb25f4ac1d0fd209b524693d66eca8fbc43b0ae4bf81343dd97820fd3b0572c8994c6ed1ee8c18e86a7eb4a6154dba53d81da081c950fa1ae1b61e023cf SHA512 e0f310368c50d954c8b0499ca2ea0e969e82515d0526b854c47d74cf6bb5af505cc522d926a346ab636163af6a85d1b40658c1701e759fbdf36f817af79ba7b1
-DIST setuptools-41.0.1.zip 849016 BLAKE2B e07d3eb864c96fc797f1ef2f93b2adcdc310a817339b51af1fc1b3b262fe86ad1bf35741fa3485f94d267bcaa55fded92f62754b3bb4544a27e21b507465c269 SHA512 022ac63b27da157ddab5eef34d4452f30b3798c3555779255686ecedcb98d6d60a9ac0b1a077b28426e3306d4ed5e89f1eea2894f9da6def57376596c01595b9
 DIST setuptools-41.1.0.zip 851100 BLAKE2B 1a2dcb1d3f1a34d9a5dab5156b76cddb03da0f3745e57ebdd363cdd23512df0de8f0d3131c930e2b67ae34fc15f75a9c06802826f97508bfb937a9e45ff287f4 SHA512 07e3381fffc7b75051640c07e334794cb008682e05ab8bbd5bb1e9757fd36305997a2974c424fd474411941f5ff014a53ec1edc276543593b238fe1e97d7d106
+DIST setuptools-41.2.0.zip 851251 BLAKE2B 1c4896c429c670832a46f951dc4c4958f808f1a7c0ad88670705fe265bee23c1d2b6a348b13298b0a60b6c821d504567d4d35b33f388949028391219cd45191e SHA512 6ac0da9f2e452b2b2334c03eb1667d88ebffeb68da18a69fe14f9f0763ac391986dcc663f123015b63eb0c3f905e5a8be7408499ddb1ac20367109275cb66ac9
 EBUILD setuptools-36.7.2.ebuild 1921 BLAKE2B a1cd7bcb5fc4ae19d069e63f56081948d2fde3161354edb7429d43907f33effb8ed04fd91ebc55e443ff44feca82051754ccaeec86fda6a36d05ff9c580dd6c7 SHA512 cd34166c627d64ac0c8f4200ded764737471884e139f7cc48ef05bb35c4af2ac9d0893ae4e9c5b2431f8e5644e253a7ef9bcd185319c1e3941c173ae6295be3f
 EBUILD setuptools-40.6.3.ebuild 2047 BLAKE2B b96175e209a987179bb72e748bc3113fd4ca10bb186f3e684beb2694b84dabdca103dd323bdb64b80c8e707012e48fc092828b94f60e29e97212b0567de65719 SHA512 b37ebd23b91421ac6bbe07ce1e061b098d1d6be9a49145574a974ddb223c01c0077a5bff373b4398bed87d6395e15ca8602356db4bbb25dc351e5e6310db60cf
-EBUILD setuptools-40.7.3.ebuild 1991 BLAKE2B 8091b15d05917a3dd3ae98c808a3968e75acc076708a2b4fe01a4c02192f416df478cc53d5aee4ba0868d464b29596701bb5464a0904ffeb35f43bb98e97515d SHA512 6ae23ba85aef8892dbf73ff2adca2b60dc34efe77f35f65884d34c96d445d2961314071f717f005576a347d6b9eb5721a8604f734d136e0c97f28f48c55f7147
-EBUILD setuptools-40.8.0.ebuild 2018 BLAKE2B c9f297d7d1aab994e2be672b3d9d328f0c2970b80adf98271cd301e0145534ebf813fa1be2ffd4d5f4958ea1f32922c30b6734ec528fb71c38f595a5a0a180e8 SHA512 1fd06b39c2e3ef35bc717933211a47515563b1c54ef3fdb8ecc55914970597c1cb13c78887ce03d81085c15ef6dec8c228e4bb1efd1fb67c96870c5e9f197b2f
-EBUILD setuptools-40.9.0.ebuild 2071 BLAKE2B 83464819d7ff0864096ef6ef6f91db2c96682ea07be7c2f89e8a055f5db39ca5071be8dbf830c71bc206c9bc6ed4d08deb39b9b2264eba516c74b97c765aa738 SHA512 715fd7e4b820e407cd75f87089302528a6d321d264eab36c6612aea49ae17c01a11828cd6b11a4f5efa3acae9faeb6c62e079b0eb562f23c270cbf0982d0110a
-EBUILD setuptools-41.0.0.ebuild 2078 BLAKE2B 8b216d3b1ae28253f484bb1e237bca58b0b610d1fcd1c5b699b99437dc912ea3ae2acdb6c108b5f985c3a4edbafc655acae07b74f4c3f08e014305d83e1beb08 SHA512 a38f7b08573f16d9de993602064d6a3243cdabd69f46bdb88c5a183d206aefc05ad02d81407f7df5150f43fdd1211c4108e52acbad43c392011ab06f3e742711
-EBUILD setuptools-41.0.1.ebuild 2085 BLAKE2B 3074d40f314473a5e66211af72fa1778dad45d2aa84aaef70c0d32003f2d6df4bcc45ce80f19c6150effc416cbde43b0f44c621be430eba1d413bb7d05f41603 SHA512 3189de5a115a4395b0e43f5d48800e43f238414cf4ec548940ea6b7419e8efea9e44149993383e793a6a9f2b25abb625d2090b6a384d3b368b14f72b295d5f17
 EBUILD setuptools-41.1.0.ebuild 2085 BLAKE2B 3074d40f314473a5e66211af72fa1778dad45d2aa84aaef70c0d32003f2d6df4bcc45ce80f19c6150effc416cbde43b0f44c621be430eba1d413bb7d05f41603 SHA512 3189de5a115a4395b0e43f5d48800e43f238414cf4ec548940ea6b7419e8efea9e44149993383e793a6a9f2b25abb625d2090b6a384d3b368b14f72b295d5f17
+EBUILD setuptools-41.2.0.ebuild 2085 BLAKE2B 3074d40f314473a5e66211af72fa1778dad45d2aa84aaef70c0d32003f2d6df4bcc45ce80f19c6150effc416cbde43b0f44c621be430eba1d413bb7d05f41603 SHA512 3189de5a115a4395b0e43f5d48800e43f238414cf4ec548940ea6b7419e8efea9e44149993383e793a6a9f2b25abb625d2090b6a384d3b368b14f72b295d5f17
 EBUILD setuptools-9999.ebuild 2025 BLAKE2B 3a683337651c897d6158f6bd9c55b842e5e5d60eb1c9c34c79655ef5b6d105d34151fa0b9ea28de60a19570a40133159881308dca5eed6d4e9b44e836f309da8 SHA512 2f2f47a4209d735d84d949b69b6532d45030f15f983af04d3b3fc332711a57fd0cdbd69236f55a746c311e50a7195867aa6f12c69044a53a4be4528242f52a9c
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-40.7.3.ebuild b/dev-python/setuptools/setuptools-40.7.3.ebuild
deleted file mode 100644
index ca484ac29db2..000000000000
--- a/dev-python/setuptools/setuptools-40.7.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
-PYTHON_REQ_USE="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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~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"
-
-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-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-40.8.0.ebuild b/dev-python/setuptools/setuptools-40.8.0.ebuild
deleted file mode 100644
index 93e45f70f490..000000000000
--- a/dev-python/setuptools/setuptools-40.8.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} 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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~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-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-40.9.0.ebuild b/dev-python/setuptools/setuptools-40.9.0.ebuild
deleted file mode 100644
index 6dea4c656330..000000000000
--- a/dev-python/setuptools/setuptools-40.9.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} 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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~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.0.0.ebuild b/dev-python/setuptools/setuptools-41.0.0.ebuild
deleted file mode 100644
index 2a96b81ef9b4..000000000000
--- a/dev-python/setuptools/setuptools-41.0.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} 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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~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.0.1.ebuild b/dev-python/setuptools/setuptools-41.2.0.ebuild
index 913d8b00ffb9..913d8b00ffb9 100644
--- a/dev-python/setuptools/setuptools-41.0.1.ebuild
+++ b/dev-python/setuptools/setuptools-41.2.0.ebuild
diff --git a/dev-python/simplecv/Manifest b/dev-python/simplecv/Manifest
deleted file mode 100644
index fabee328c693..000000000000
--- a/dev-python/simplecv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX new-support-for-opencv-2.4.3-added.patch 4889 BLAKE2B 4f1ebacc61e86836b4dc81fc696a6deae9ccd211761a153616b3e474559591d2722188be51c09a67fe2751ced2adbbab4d1daf0fa1aa3142d2fe0413302a7815 SHA512 248a0cdaf74af780c10bbc805aa286c3dee4b93456cb2097460e5916ac94a791665355d1b814f593ac5fedbcbb12a797eff21290ce4db8a04b7c870b82db9293
-AUX remove-failing-test.patch 1476 BLAKE2B a72bb3c9dbf43617cfe891a3e47b049970693c89eaa811fa1283f238705497f835553e56bf0ff68526ac00d1ed47c734d035d817a86719368cbaac5d2c3e291f SHA512 d07daa7addc1f824a2e7bc70e51da05917e559ace9779035a032ce5358b1e0dee3184e44f9eaab137bf8f7a261a136f1f909ea1617e54a8eb7735876b5e74316
-DIST simplecv-1.3.tar.gz 42860284 BLAKE2B c94e484d8ff23fb4d2f2832aad9fdf10a2015e9ca9245d51a9c959273b8c003736f8ade34e04e3a400027cb512b1d228466a57e9d03bce106dab0b568d8205bc SHA512 47fa3c0bb41057ae17323aeb68711ef4716c4fe6607162218477af9070a1b1a03a7300f38b2c2a5c54ff69b916267504aeeac7c3108d6a45045a1469a93005b8
-EBUILD simplecv-1.3.ebuild 1226 BLAKE2B 53fb56076f35d4790d045a03ac41462db8a3ab00bd9205d4d97c752032a2dc264a5f256440e79f5085cef56939428d3ecc3ab3cb32c7d06d7e916e93a8961e87 SHA512 d479226dd26038fe8eb575bb32a8ee14359dc0e6c6a4991cb1e524a60b040a19c70412fd8c5b4b292a9199d2a7d366c4b44fcff5a7b16c3f1b6236537433415e
-MISC metadata.xml 395 BLAKE2B 3208750c8822bd57d815b05b1f9abce19adde87855bd588816c4fef73c1301d2368be1f2f2ad1a311576ac5151089ae7431ced2e200efbeefea60cc4d540ca18 SHA512 604a83919efa9e0b8ffecc3e8edc7058b6d4a1c5caefde04f0494911417bdc390f1436094602f5cc11d2c38fc034c96c209f1406386c890b027af8aed8872454
diff --git a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch b/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch
deleted file mode 100644
index 58f8639ea064..000000000000
--- a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 164d39c1be66eb35b02fb7c30f65b5929c9e407d Mon Sep 17 00:00:00 2001
-From: Vijay Mahantesh SM <vijay@vijay.(none)>
-Date: Sat, 8 Dec 2012 01:55:24 +0530
-Subject: [PATCH] new support for opencv 2.4.3 added
-
----
- SimpleCV/ImageClass.py | 52 ++++++++++++++++++++++++++++++++------------------
- 1 file changed, 33 insertions(+), 19 deletions(-)
-
-diff --git a/SimpleCV/ImageClass.py b/SimpleCV/ImageClass.py
-index a545b50..6fab39a 100644
---- a/SimpleCV/ImageClass.py
-+++ b/SimpleCV/ImageClass.py
-@@ -7610,11 +7610,12 @@ class Image:
-             new_version = 0
-             #For OpenCV versions till 2.4.0,  cv2.__versions__ are of the form "$Rev: 4557 $" 
-             if not ver.startswith('$Rev:'):
--	        if int(ver.replace('.','0'))>=20400 :
--                    new_version = 1
--                if int(ver.replace('.','0'))>=20402 :     
--                    new_version = 2
--                    
-+              if int(ver.replace('.','0'))>=20400:
-+                 new_version = 1
-+              if int(ver.replace('.','0'))>=20402:
-+                 new_version = 2
-+              if int(ver.replace('.','0'))>=20403:
-+                 new_version = 3    
-         except:
-             logger.warning("Can't run Keypoints without OpenCV >= 2.3.0")
-             return
-@@ -7622,11 +7623,11 @@ class Image:
-         if( forceReset ):
-             self._mKeyPoints = None
-             self._mKPDescriptors = None
--            
--        if( self._mKeyPoints is None or self._mKPFlavor != flavor ):
-+        
-+        if( not(self._mKeyPoints) or self._mKPFlavor != flavor ):
-             if ( new_version == 0):
-                 if( flavor == "SURF" ):
--                    surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1) 
-+                    surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1)
-                     self._mKeyPoints,self._mKPDescriptors = surfer.detect(self.getGrayNumpy(),None,False)
-                     if( len(self._mKPDescriptors) == 0 ):
-                         return None, None                     
-@@ -7659,10 +7660,9 @@ class Image:
-                     self._mKPDescriptors = None
-                     self._mKPFlavor = "STAR"
-                     del starer
--            
--            
--            elif( new_version == 2 and flavor in ["SURF", "FAST"] ): 
--                if( flavor == "SURF" ):
-+
-+            elif( new_version >= 2 and flavor in ["SURF", "FAST"] ): 
-+                if( flavor == "SURF" and new_version==2):
-                     surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1)
-                     #mask = self.getGrayNumpy()                    
-                     #mask.fill(255) 
-@@ -7678,6 +7678,20 @@ class Image:
-                     self._mKPFlavor = "SURF"
-                     del surfer
-             
-+                if( flavor == "SURF" and new_version==3):
-+                    surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1)
-+                    self._mKeyPoints,self._mKPDescriptors = surfer.detectAndCompute(self.getGrayNumpy(),None,useProvidedKeypoints = False)
-+                    if( len(self._mKPDescriptors) == 0 ):
-+                        return None, None                     
-+                
-+                    if( highQuality == 1 ):
-+                        self._mKPDescriptors = self._mKPDescriptors.reshape((-1,128))
-+                    else:
-+                        self._mKPDescriptors = self._mKPDescriptors.reshape((-1,64))
-+                
-+                    self._mKPFlavor = "SURF"
-+                    del surfer
-+
-                 elif( flavor == "FAST" ):
-                     faster = cv2.FastFeatureDetector(threshold=int(thresh),nonmaxSuppression=True)
-                     self._mKeyPoints = faster.detect(self.getGrayNumpy())
-@@ -7693,19 +7707,19 @@ class Image:
-                if( len(self._mKPDescriptors) == 0 ):
-                     return None, None     
-                self._mKPFlavor = flavor
--	       del FeatureDetector
-+               del FeatureDetector
- 
-             elif( new_version >= 1 and flavor in ["FAST", "STAR", "MSER", "Dense"] ):
-                FeatureDetector = cv2.FeatureDetector_create(flavor)
-                self._mKeyPoints = FeatureDetector.detect(self.getGrayNumpy())
-                self._mKPDescriptors = None
-                self._mKPFlavor = flavor
--               del FeatureDetector   
--               
--	    else:
--                logger.warning("ImageClass.Keypoints: I don't know the method you want to use")
--                return None, None
--
-+               del FeatureDetector
-+        
-+            else:
-+               logger.warning("ImageClass.Keypoints: I don't know the method you want to use")
-+               return None, None
-+        
-         return self._mKeyPoints,self._mKPDescriptors 
- 
-     def _getFLANNMatches(self,sd,td):
--- 
-1.8.1.5
-
diff --git a/dev-python/simplecv/files/remove-failing-test.patch b/dev-python/simplecv/files/remove-failing-test.patch
deleted file mode 100644
index 7ee326df02a5..000000000000
--- a/dev-python/simplecv/files/remove-failing-test.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d8abe3346d7aa2b192d384476d5f2c89ca9c70e9 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Fri, 14 Jun 2013 20:35:11 -0400
-Subject: [PATCH] remove failing test
-
-According to the docs, the UserWarning that is raised should not be an
-issue.  Ignore the failure during testings.
----
- SimpleCV/tests/tests.py | 32 --------------------------------
- 1 file changed, 32 deletions(-)
-
-diff --git a/SimpleCV/tests/tests.py b/SimpleCV/tests/tests.py
-index 94f4fc7..ce442e3 100644
---- a/SimpleCV/tests/tests.py
-+++ b/SimpleCV/tests/tests.py
-@@ -1731,38 +1731,6 @@ def test_movement_feature():
- 
-   pass 
- 
--def test_keypoint_extraction():
--  try:
--    import cv2
--  except:
--    pass
--    return 
--
--  img1 = Image("../sampleimages/KeypointTemplate2.png")
--  img2 = Image("../sampleimages/KeypointTemplate2.png")
--  img3 = Image("../sampleimages/KeypointTemplate2.png")
--
--  kp1 = img1.findKeypoints()
--  kp2 = img2.findKeypoints(highQuality=True)
--  kp3 = img3.findKeypoints(flavor="STAR")
--  kp1.draw()
--  kp2.draw()
--  kp3.draw()
--  #TODO: Fix FAST binding
--  #~ kp4 = img.findKeypoints(flavor="FAST",min_quality=10)
--  if( len(kp1)==190 and 
--      len(kp2)==190 and
--      len(kp3)==37
--      #~ and len(kp4)==521
--    ):
--    pass
--  else:
--    assert False
--  results = [img1,img2,img3]
--  name_stem = "test_keypoint_extraction"
--  perform_diff(results,name_stem,tolerance=3.0)    
--
--
- def test_keypoint_match():
-   try:
-     import cv2
--- 
-1.8.1.5
-
diff --git a/dev-python/simplecv/metadata.xml b/dev-python/simplecv/metadata.xml
deleted file mode 100644
index b317bb249d88..000000000000
--- a/dev-python/simplecv/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>jsbronder@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="shell">Enable the iPython SimpleCV shell</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">sightmachine/SimpleCV</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/simplecv/simplecv-1.3.ebuild b/dev-python/simplecv/simplecv-1.3.ebuild
deleted file mode 100644
index 146b07ce85cd..000000000000
--- a/dev-python/simplecv/simplecv-1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=SimpleCV
-
-DESCRIPTION="Python interface to several powerful open source computer vision libraries"
-HOMEPAGE="http://simplecv.org/"
-SRC_URI="https://github.com/sightmachine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shell test"
-
-DEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RDEPEND="
-	>=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	shell? ( dev-python/ipython[${PYTHON_USEDEP}] )"
-
-# 1. FeatureDetector being called with the wrong number of arguments
-# 2. Remove test that according to docs shouldn't be an issue
-PATCHES=(
-	"${FILESDIR}"/new-support-for-opencv-2.4.3-added.patch
-	"${FILESDIR}"/remove-failing-test.patch
-)
-
-src_test() {
-	cd "${S}/SimpleCV/tests"
-	nosetests tests.py || die "tests failed"
-}
-
-src_install() {
-	distutils-r1_src_install
-	if ! use shell; then
-		rm -rf "${D}"/usr/bin
-	fi
-}
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index e3e1f4ca38ba..1840b75cfc66 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,4 +1,8 @@
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
+DIST snakeoil-0.8.1.tar.gz 296997 BLAKE2B 0eef059c73f6f62ddf67ec3a76d48bc01383f5993236f43cbdef54f6c9e9f818b6065f266df2c8646963f74f8cf3b549ae8e3407cd3a38d38de95d7b84dcfb1b SHA512 70f379d06b000abd193db41fdd720161a22537320a538b6441a9cde86fe0755ec68ab393aa8442e035b134f88e20ddfd4e194961b53f7cfa7a857ec12bf7437c
+DIST snakeoil-0.8.2.tar.gz 297135 BLAKE2B fab94a4f085756228f4a74dc966ef34c94d0c33dba50e7d4d2f3a1417ca84e337a15688b171930af04a3ec3f55980025cc0c078a9b16670fb11d5f546077bca6 SHA512 401135f8b12321db5f65fb1431e8145ba1691ddc83ad106fef22beefeee5212e13fd1f9726b40267553dca46955ed1cd4dda0d3aa76cf25882bf0fc8017bba01
 EBUILD snakeoil-0.7.5.ebuild 961 BLAKE2B dfa8bdee5204a242d8445a7f73b11735c31334a368b4afb22ed04112ed5f6aad2aeef2cce592b3a18664308c9d2db05e6ead41ca9a780f8af8dbaf0d2f794263 SHA512 29daf7bf4ff953e2e3f2533528de2daf343ce355338a209a37ff396cb80ff375ca2428eb8a2e093cbe582bdd6b2f7f05c9b31a7d9b348326a99e0602073c478f
-EBUILD snakeoil-9999.ebuild 890 BLAKE2B 1578889268cc914672d064f43dd6a68ff3114f3b622d9af4dc22ace00d692e02577ad2a9c58e702171741f92e352f8854bd4f45713360c03a22bf354a30928d0 SHA512 9fc132ef92de1f43d4f46fa86046a3f1c7db096dea68fa43d417bfcb9cb4ae345383147681d1373b0f5325e78e86b8e6fb66a39f002dd57e639efbd4af7498a8
+EBUILD snakeoil-0.8.1.ebuild 886 BLAKE2B 746b7f5e4f734d116418de71d2817e6aaff486f500da34ac7b7c508ae2e9197e78d1a92e563ce6607e49b5fc4bab0ea7c75f1cb36716c34d5b813bdecf9a37f6 SHA512 97a0ce8b5e16666dab8e033ee70bffb013732373da2f86cebff7146fae52f121c5552699b0bfc522186803f7c9b943c7dbaefc6619b60c8b8de2af2dcda2af00
+EBUILD snakeoil-0.8.2.ebuild 886 BLAKE2B 746b7f5e4f734d116418de71d2817e6aaff486f500da34ac7b7c508ae2e9197e78d1a92e563ce6607e49b5fc4bab0ea7c75f1cb36716c34d5b813bdecf9a37f6 SHA512 97a0ce8b5e16666dab8e033ee70bffb013732373da2f86cebff7146fae52f121c5552699b0bfc522186803f7c9b943c7dbaefc6619b60c8b8de2af2dcda2af00
+EBUILD snakeoil-9999.ebuild 886 BLAKE2B 746b7f5e4f734d116418de71d2817e6aaff486f500da34ac7b7c508ae2e9197e78d1a92e563ce6607e49b5fc4bab0ea7c75f1cb36716c34d5b813bdecf9a37f6 SHA512 97a0ce8b5e16666dab8e033ee70bffb013732373da2f86cebff7146fae52f121c5552699b0bfc522186803f7c9b943c7dbaefc6619b60c8b8de2af2dcda2af00
 MISC metadata.xml 385 BLAKE2B 7e7195d4876c5cb5db98288566121559c8bd9208138fbd211edea15b324acb11d09a2bdd96c0200554d7e9c734202c7fd341f0d134f271c82dbfdfe75e5774f5 SHA512 32645380ddb0bd1edca1895714aeaef3e0c61c04cbacb50a414c2fd26b6978c8ea83b3c420538cadebf3a631b5aec2e9e3fc0dab98d1e1a99cfbad33b8d58715
diff --git a/dev-python/snakeoil/snakeoil-0.8.1.ebuild b/dev-python/snakeoil/snakeoil-0.8.1.ebuild
new file mode 100644
index 000000000000..e85e66b9b7a0
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.8.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/snakeoil/snakeoil-0.8.2.ebuild b/dev-python/snakeoil/snakeoil-0.8.2.ebuild
new file mode 100644
index 000000000000..e85e66b9b7a0
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.8.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index 901b625aba59..e85e66b9b7a0 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-	SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
 DESCRIPTION="misc common functionality and useful optimizations"
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/pkgcore/snakeoil"
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index ad6603c0085d..8e15f4d1ad13 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-notfound-page-0.4.tar.gz 5685 BLAKE2B 0bfc6cf98e0731a5cc95f1802dad1e7297ed764a626831b970d75d82ec0f7d6edb45c404851ea13bf38decc39aabf0e3dd6b136714a591e8ab595f11e23e67cd SHA512 56e867e6954f26da498b77e8fa43e8d62961ab33ee9c16d2084745dd54a998df51c7d882a47560196135d2fb4d473f7305ef19b31373bc205f8eaf0d3d4946f0
-EBUILD sphinx-notfound-page-0.4.ebuild 524 BLAKE2B a6755c61f8205c4edcd6b32d370c5b54eff5410f73e3ad79aba114249ccd276278d99d639b3c8f68dbbcf7745ef2c65dc10ff26127e02f68e06078088d3effbf SHA512 4382fe457097e1e153bd23d0ea3da3dd71627359b7f0cefa8b99ba6115e61ef729948d5041f1f780cd2b6519f28a53f74e6c81b83a6b7e94931c624be1f654f0
+EBUILD sphinx-notfound-page-0.4.ebuild 522 BLAKE2B 62600caad2a3876f5bccd9ac5f48e8a54bc631707905f628ebe3f7d2b86aa7973cf673f306faf3005e664d7f61404bf6598be497d88be15f3b2f1036a77f540e SHA512 ea94649ef28752c30a96c3442e2d7b8e645af58255ebde1a1656a65b202e39a26f80bf54cb6836466254f5c28bf29c894a38cb8b163b886b2711ffd3b0a002a6
 MISC metadata.xml 440 BLAKE2B 0a08957b47eac83866fdbfd2fc137fa09413c2f6e4cbe961a0c587cb1604951d76061d41acae0a925a9f1775c785e8dc0808255685c14d88b5543e729052aeca SHA512 84b278d6a84dccb896c1e5c10ff1018ec801ea1a36083896f08629db28e82f8b20be2cad95a13b2ad53ba3751c9f6ba0c8a6367ad9baeb2881d22211793c2671
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
index 8c43245b0561..d3d0c1a98b8e 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/swagger-spec-validator/Manifest b/dev-python/swagger-spec-validator/Manifest
index ac87318bce68..7e04f1f39647 100644
--- a/dev-python/swagger-spec-validator/Manifest
+++ b/dev-python/swagger-spec-validator/Manifest
@@ -1,3 +1,3 @@
 DIST swagger-spec-validator-2.4.3.tar.gz 19636 BLAKE2B 3805aa8663d141898e5106ad98d9aa0c697e87a474c0446151b0a6210684c8a0afbfa7a54b44e9aa7c4257c5e9f8713139943774bcacb38105b21c4cfe46492f SHA512 d785f1d9f2664fcf4f62e2e2c2adf9e17d7844e6febda69bcb718efa5f951ddc0496c7e2804e4269750a15f5b5c7f6cc11fac0f99363f7eadab8cf1209d152db
-EBUILD swagger-spec-validator-2.4.3.ebuild 594 BLAKE2B 77682ec5f93d052369b181531e462196f446ad935095f188293e5f19d7a7151b43818b1ba6c1bb47c1e8ef3aa6c22e5d73703ea321dcd47ea6d685b6b35a6182 SHA512 4cec0d281a484a85a80d3a6d783dd2fb366562178fee3d45f5e48e949aedf5cb1848bb155560290a2e7e27dac40669f3a2ac59b9075ed1bb9cfdf5b8b6b97a4d
+EBUILD swagger-spec-validator-2.4.3.ebuild 716 BLAKE2B aaa9c9bbd9b66f26fb58fc45854670cc25415f5000f02a5f7d1e0bc4c777009da558055ed4d6f18c062191bf6bc26ec408b694ffee70efcd19b62826e8a0190e SHA512 468a37b587ccf83066319d7e559c09b1eaa2e133eb24c16b0ed6bda027b8489975f174dad6d8b718b838efb9140e26179eff621bd8ff8e5f29d6aec6331deb42
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild b/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
index 1901a52e0a88..fd1346c2068f 100644
--- a/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
+++ b/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="validate Swagger specs  against Swagger 1.1 or 2.0 specification"
@@ -13,9 +13,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
+# PyPI tarball lacks unit tests
+RESTRICT="test"
 
 RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index c7c619295536..23d8303cbed4 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD uranium-3.6.0-r1.ebuild 1416 BLAKE2B 3ea73653aa36adc305b81759ded97af57a2a5bd901a73815a8d0372ebc8fd5d1565626016f5b4a9d7556817e376ff696cfc84049201a570cf58b6dffe383bf6b SHA512 2716709771e66c3d2de8912c5fe4c5ad8f5bcc453575a1045c9e44225e5cb52fdb06240457ef8bf1c193f5b141f76c8ed912393e7fbfb555c5a48c64f0970979
+EBUILD uranium-4.2.0.ebuild 1599 BLAKE2B 48553f297c6c730ff39c886c6912d8bacb068965f3ee55901cb1c0599d6db90da352b5a7f1150ab4b36f5e5c8239a419d13616ee82c1d9e27f6b45e7b39724f3 SHA512 e84ede7ae2a0b11f8c97925ea73e4fce30d4d0225320054dac6bce84c6e69740957b6a1945e8f9fd113b01b55717d3e35d768b525a354bf86c96cc7ab3c5a1bf
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-4.2.0.ebuild b/dev-python/uranium/uranium-4.2.0.ebuild
new file mode 100644
index 000000000000..4818481b4a53
--- /dev/null
+++ b/dev-python/uranium/uranium-4.2.0.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=( 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}] )"
+
+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/vcstools/Manifest b/dev-python/vcstools/Manifest
index edee2931b8c5..bd81c1ae543b 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,8 +1,6 @@
-DIST vcstools-0.1.38.tar.gz 54671 BLAKE2B b19730749878de8fb55706751b8a276e351d944803aecb45d8f07497ed9d4283939594d751e818c7fcc09a7cefc4238df978470e8f9da10f27bed5abfe76ce5c SHA512 a3693d34777235e562a5db006af8f33590df99ffce96f5d3cfd2d816ebdc23ee5fb3536bf289b64a36588e60ce20ce8396a448394f300a12672fd8bf5800973e
-DIST vcstools-0.1.39.tar.gz 51610 BLAKE2B 24997cf3981a70f9647c16a230ff776b32aaf7096d760976b6af7b1fa1fe78b4993299680d8aad53d82465e66c4fcd80389e26b8da1476df64ccaf9b40c705af SHA512 163ced29baa158d915169a4f8f432bd9ad60ddcd5abae0d3801b5d970049d717c11bd8aa95f7af9dfe48cdcbcce49d14331a82a9c41b9ded1ce4caa2e27cd901
 DIST vcstools-0.1.40.tar.gz 62109 BLAKE2B a5347ba62031e602421f26b081e26e55549e92fc4a0648b58a3c4c3b0134b91dba096604f83edcc51a99c989e60fa51e8af2f9ecbf992500a6e942c19da9c82c SHA512 7cd062f3c72b27f78361d3000ed8951b1723ea7dd99bf05ea711e8a8b93c42c2acebdfd6c7cf7384730c708da11bd0d2712a54e538dd833eafbcef46f23857cd
-EBUILD vcstools-0.1.38.ebuild 1392 BLAKE2B a866b12ba8609729d0050aa5f454451d9e02a6df11c7c33f248504e2a6bdef5127f641cf70ae63c6b417a0cf268c731c32e876152b9fe9ca4fcd6015d2aaeb28 SHA512 ee1f8b1e76ad91b98921e831c515c4d247b41b7c17a7d97402ba00b568a1feae45e4ebced1138c90c3045a08a777cc5a41d1e5bc13975681ae379598fda6af7c
-EBUILD vcstools-0.1.39.ebuild 1392 BLAKE2B a866b12ba8609729d0050aa5f454451d9e02a6df11c7c33f248504e2a6bdef5127f641cf70ae63c6b417a0cf268c731c32e876152b9fe9ca4fcd6015d2aaeb28 SHA512 ee1f8b1e76ad91b98921e831c515c4d247b41b7c17a7d97402ba00b568a1feae45e4ebced1138c90c3045a08a777cc5a41d1e5bc13975681ae379598fda6af7c
+DIST vcstools-0.1.42.tar.gz 65979 BLAKE2B 2deb29116e891bc93410e4a8f58938009140d01baaa834cccfdba2be3243d98bb11507fd134284bc1dbeca1434ea0eeaf2ed332dcb579bbacf1bc92815f8623d SHA512 1b54270c878684862eb607c2e445fe24d8edfdd8ea2cc75e899044d9e8e89a882fd2dd6fb7825553f83003ae7af08850c18fdeaabaa107a6bfdb2759b32e8fa6
 EBUILD vcstools-0.1.40.ebuild 1396 BLAKE2B 2911206f1e7d91b3551728434b783492ffe0a649ae002de716c025888e2f83145a0126c7163b785c76de6a20122fc7b957ddf05e9d093116b506147af1001f6a SHA512 3261819d9202c5dc324433434535163ee8ecd95607230198693f0dc6b79269e92e4d58a19c1c0af1dcc30fbcc97845f47fc6e8edb8bf9f5ff602655d992aaf09
+EBUILD vcstools-0.1.42.ebuild 1396 BLAKE2B 2911206f1e7d91b3551728434b783492ffe0a649ae002de716c025888e2f83145a0126c7163b785c76de6a20122fc7b957ddf05e9d093116b506147af1001f6a SHA512 3261819d9202c5dc324433434535163ee8ecd95607230198693f0dc6b79269e92e4d58a19c1c0af1dcc30fbcc97845f47fc6e8edb8bf9f5ff602655d992aaf09
 EBUILD vcstools-9999.ebuild 1396 BLAKE2B 2911206f1e7d91b3551728434b783492ffe0a649ae002de716c025888e2f83145a0126c7163b785c76de6a20122fc7b957ddf05e9d093116b506147af1001f6a SHA512 3261819d9202c5dc324433434535163ee8ecd95607230198693f0dc6b79269e92e4d58a19c1c0af1dcc30fbcc97845f47fc6e8edb8bf9f5ff602655d992aaf09
 MISC metadata.xml 331 BLAKE2B 11f0b79892ca57b4abcbd3e0538168569338972295dc250516dabf12f650416d013be219d17401ae24129ba40bea056e4831940982ae6b0368046e1efbb76974 SHA512 dbc3f8205ab4e4788a33377fd00d438a9bcc4558ff02989f20befb19de690428d377ca8e0450a47bfdc8654f74123e0e4b02a9a26ffe4f27e1a737266f5cf918
diff --git a/dev-python/vcstools/vcstools-0.1.39.ebuild b/dev-python/vcstools/vcstools-0.1.39.ebuild
deleted file mode 100644
index 8c3759ac4bd9..000000000000
--- a/dev-python/vcstools/vcstools-0.1.39.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Python library for interacting with various VCS systems"
-HOMEPAGE="http://wiki.ros.org/vcstools"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/bzr
-		dev-vcs/mercurial
-		dev-vcs/subversion
-	)
-"
-
-python_test() {
-	# From travis.yml
-	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
-	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	#git config --global user.email "you@example.com"
-	#git config --global user.name "Your Name"
-
-	nosetests --with-coverage --cover-package vcstools || die
-}
diff --git a/dev-python/vcstools/vcstools-0.1.38.ebuild b/dev-python/vcstools/vcstools-0.1.42.ebuild
index 8c3759ac4bd9..388682fd4ace 100644
--- a/dev-python/vcstools/vcstools-0.1.38.ebuild
+++ b/dev-python/vcstools/vcstools-0.1.42.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 99f52b47fc7e..75d29b0c52bb 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -2,6 +2,6 @@ AUX weasyprint-43-skip-failing-test.patch 517 BLAKE2B 27f574095d9dde6ac9cb99f64e
 AUX weasyprint-43-skip-useless-deps.patch 559 BLAKE2B c11b646137f26ad9a3398678534c2f8999ccdbd1baaecaf72eecdbcbf9870f168a51ee91482a3ca8aa8e0372e11c350204c14556e58b60839df571216a103492 SHA512 0d0be1d5234549d98a6c6ae43255a1dfd2ac543d72f85b9e54da4e864e961859100201de447bf88b428a66bc4a3762f4f1cc2e09465051058fd4563e3093a4f1
 DIST WeasyPrint-0.41.tar.gz 393866 BLAKE2B 895624ee547a9ed91157db6a7a72890a56f270d2ea00a508c42899e42922e51867782b1dff3ab55f98df0a130b727a7db13aaf3553a90c4405b75b6813c95ab9 SHA512 44b2d9e0a186c5767cd01d6e66495241d088908467e0fa28cee114a9c480bfcb4ef393236e9304653603f3917c73c452c05a38286932e0a271946860120d9a1f
 DIST WeasyPrint-43.tar.gz 315365 BLAKE2B af643f6a6d09d09d89802dd3823e43e9f05873738b14e4f853a324850ffc12902cb791c3f187f6b550dded40669d376cf3d2e4d7d83e9747e87795a4d57e9014 SHA512 fc4c4decb298d4f9caf244433566c9b675b23db2508093d8c43c6e361119c5fe8298213075f550bebc72fe4156cfc516f04c8d7a2c6215fcd5add14360821f40
-EBUILD weasyprint-0.41.ebuild 1321 BLAKE2B 8be7541521a71e229595cf94eea255ba691c8541e31ac1232b53a5911079d9bf7c24e47dc40d7425af2bc3a67e6d2207cae87ee32197fe98ed2b614c27afb399 SHA512 b8932f4ce5abff9f76cecf3f497acbc41bd1ace4ab02227a84e28e9b96b23e85b9931f70fc1906148454f661f2e356648bbd258a9303b95f6cd84c72f9debbee
-EBUILD weasyprint-43.ebuild 1373 BLAKE2B ddfed77772d48dd33f2ded8dcafd6fb1577a64b6e0372efdcc0e7ed6ce0fa6bb7c0c964ed3cff55d945ab0bbe7890c256992bdb6eb650119901a3cfe75561fee SHA512 87724c9fde4719c42a174cbd7523556004e9b1dfdec3576b3ea14d534f78fe9c16ca6d9f5e126598c8957117507e79e2ac772cee66928ffd9319dc2c98c3cf36
+EBUILD weasyprint-0.41.ebuild 1306 BLAKE2B 6848cf170040682d258c1e199497fe03bad436614013616d0d370c47b823075bc5e42364f9c6c3f4977f070f3591fa3afcc4965ae4028f6eb77962096d2a1d8c SHA512 36265b73c2fc71f777a0cbf8a94470ede320cc55b5f25ddd286dd0c6e62e5eeb692dc273da852f0e5f01e984c2d4b78233b270d5d6ab474fc49118c9ab149096
+EBUILD weasyprint-43.ebuild 1358 BLAKE2B 3a28aeda84988ed3b2fdc218a952e1310eb8fc8e44288f023043aee428009d3d0407761aeb2db38824bf51c7e2b3ac98dfca1f1f2964fc4ec04c97e042dc81f6 SHA512 7c0de4bdcf9714fed198c9df32d8ebed85f7ce1c9a1887d71f5f8bc5f50c936a90b0386bb8e22ffeb4ed996858bb553b40caeae9bb503af7a613dc863aa0c608
 MISC metadata.xml 381 BLAKE2B 422f89ba40bf25e47d53fa91f51ed8b12c5f37a7befd16a2cc2d78335b0dc472180c5e46c6bf890e7a30fc7936e672737e931867097e21a781819fd7ee644e94 SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398
diff --git a/dev-python/weasyprint/weasyprint-0.41.ebuild b/dev-python/weasyprint/weasyprint-0.41.ebuild
index 8efcd57fba04..388d65177310 100644
--- a/dev-python/weasyprint/weasyprint-0.41.ebuild
+++ b/dev-python/weasyprint/weasyprint-0.41.ebuild
@@ -18,12 +18,12 @@ HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="jpeg jpeg2k test tiff"
+IUSE="jpeg test tiff"
 
 # Note: specific subslot of pango since it inlines some of pango headers.
 RDEPEND="
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?]
+	x11-libs/gdk-pixbuf[jpeg?,tiff?]
 	x11-libs/pango:0/0
 	>=dev-python/cairocffi-0.5[${PYTHON_USEDEP}]
 	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
diff --git a/dev-python/weasyprint/weasyprint-43.ebuild b/dev-python/weasyprint/weasyprint-43.ebuild
index 5a36ffb74e9c..3863bc1fcd01 100644
--- a/dev-python/weasyprint/weasyprint-43.ebuild
+++ b/dev-python/weasyprint/weasyprint-43.ebuild
@@ -16,12 +16,12 @@ HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="jpeg jpeg2k test tiff"
+IUSE="jpeg test tiff"
 
 # Note: specific subslot of pango since it inlines some of pango headers.
 RDEPEND="
 	>=x11-libs/cairo-1.15.4
-	x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?]
+	x11-libs/gdk-pixbuf[jpeg?,tiff?]
 	x11-libs/pango:0/0
 	>=dev-python/cairocffi-0.9[${PYTHON_USEDEP}]
 	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index e6e1598977ae..1d4812c28b24 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,7 +1,9 @@
 DIST Werkzeug-0.12.2.tar.gz 1169770 BLAKE2B 12e7e422e7dae0ab2fc3cc52f80536362dea8edd61cdaec45a6cca35b789d731408e10cc46288b0c5c22138e20e9d52a88c2db78d22a215d5ab4bb9477526fcc SHA512 9ff45aeb51a71fd5115e8cdee40a7b2fddfa0574c356686050cb1bdced5c6c18f672b601ca2637010c7f59be75c66ee558efb4ea05052c550ec7da3644b88e0a
 DIST Werkzeug-0.14.1.tar.gz 1185546 BLAKE2B 4c358688752adce870e8b44ffede56e44ab26990f12c98cc75a7c7e0d40b1f39f4208237ed26a2acb1f78a3359272cb44bab4606c5bca55a5c5f5edfa22c9faa SHA512 64976cc46c1cee2203112c50aba6f9404d4e48d4a90f8b11837148b5415a28572b7e706095586045a46879e853fc5a80c63e7bf0c13eda29d564a37b4a554c0b
 DIST Werkzeug-0.15.4.tar.gz 925334 BLAKE2B ffb132026e5a43bdbbb6decf19c47b07bb38afe383fc6b769a793f9e72769bdb5a9507918590d485b9a84e8db392202fe985b0cd1fa00e8af17eccbf53bcdaec SHA512 b27b313cb29128ad1a1d0b04be7d1b29eacd4fb8280757510ce662b4f8743e7311966f7fb170531bd5dcb9668e9c6672f0cc0cf53bb4af3ec7328312a88b53ab
+DIST Werkzeug-0.15.5.tar.gz 926570 BLAKE2B 39d68f7ea2f99ffa60f5a2af7ebf8a01e68a83e32106abd8fcbba3a5402bf6c6c02f7bb9b84cd483aa061bb065a0f2f6d809db55a2f6950996d70cf62a620520 SHA512 e2980b649db0c246fa87b94972f1a1e00b19f20a90e34733267cb50b0d1c8e83701f4bde3e466f9f12243c47b3cc40c6977e63164f18ee5e518b75e952988edd
 EBUILD werkzeug-0.12.2.ebuild 918 BLAKE2B a943b20ad7b1d50a9473044cb5362fc8e77a3341836cc522d3c5f00d86846ad24b18a50afef0569e6c999499811cdd6d1c39143ec082b479cd9e5f1a7e068834 SHA512 7f98e54b94baae4abb16cd44b5cfd2c73f8fea7c7dd31634a203bafb84a499c585a3d445b8f5608d8235b6c615ca1210009349fac75e88e708477e1008031e38
 EBUILD werkzeug-0.14.1.ebuild 961 BLAKE2B 24fbb29fb1cf746e9a8f84e4b869e6744e5efb9cfa57fa6aa39a1c5185a22975a7dda892dc7a24822da4c1c3ad670493c882a36f9ae4698a80ea596136c85876 SHA512 ea1c981310d4069fb3e7c380fc823d8dbeda5b78c41cbdbaed3a24bbc8642783a3683e2828c01660db121e8eb10b4b86a161560e21347900227c568d3d530a35
 EBUILD werkzeug-0.15.4.ebuild 1019 BLAKE2B a6f38cbd9d6c38a1230d83d49ff061e22e7bd755372b993ff69686a467f3421de649a0c8fe08b73359975b4fcf68226379df92b6c79d5902ca942060832c4810 SHA512 6d6792784168648a9f44083a19dd95cfbc817c7a2df03a45b75be7d716ca393bef74d02f5519df888776203de7400a2626ecd62f74925be06ba0af4062d3d4b6
+EBUILD werkzeug-0.15.5.ebuild 1019 BLAKE2B a6f38cbd9d6c38a1230d83d49ff061e22e7bd755372b993ff69686a467f3421de649a0c8fe08b73359975b4fcf68226379df92b6c79d5902ca942060832c4810 SHA512 6d6792784168648a9f44083a19dd95cfbc817c7a2df03a45b75be7d716ca393bef74d02f5519df888776203de7400a2626ecd62f74925be06ba0af4062d3d4b6
 MISC metadata.xml 450 BLAKE2B 553ae7b037307259ba7c22b90f001cc7fcdd1c2a2437ad4a038eceec9e9787b3c2287b0f4ba40c9cc435ccc80dc60a96ceadd2ca3e892ae5e5083e4dd037525c SHA512 5bdd21ede3cc864b573ccd668ec99585baa7bf922f80137fd7880f73285510d0bd357707d44f9609b13f01245d011ff209e6c8d837c0f247fce08887bffc3cef
diff --git a/dev-python/werkzeug/werkzeug-0.15.5.ebuild b/dev-python/werkzeug/werkzeug-0.15.5.ebuild
new file mode 100644
index 000000000000..0b9d42512120
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-0.15.5.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
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pytest -vv tests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 1dcc0d64dcf3..4096a4cc7bb6 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,11 +1,5 @@
-DIST yarl-0.9.8.tar.gz 125806 BLAKE2B 983ccd2516ad00e89b75cb94a2237ea85325947d8fdfd7978b08addba08566b205b5c2a2863fb9943343857b976981b0b5735fe35b2c88f77d6178faa0d814d5 SHA512 67446ca618a2539f8c1fc8a7a96d1ce50a924ece0479e01103347f73a7bd75b0fbdd0ff5c007529195c3f12aa62d185563e761557fcb95b3226eaece65c0be9f
 DIST yarl-1.1.1.tar.gz 156284 BLAKE2B d070b0ea5cb06ef78f850a130d3292e66f592fd46ccf671cfe51f93c0e419a599f42f6a7255e3eb0f15ba96b1ac0cdcd0bce4deff81da6e5dcc25f7a8136bd78 SHA512 fe53e24401e91994d04fd7274200f92168bb08d78c460b49e800646a3e4611f6baefca4ede5b2b6727f2e6e4cd51296ca834305c0e2fb377ac3a928463f995cd
-DIST yarl-1.2.4.tar.gz 159570 BLAKE2B 2214917d01ba8f7ba4ea66e28711bcf2549fb1016be9da49147788d61a51168bc81b209ee1466482c93a8fddb4bec87c9ee072b703a1b0094553ecfcc525c0a9 SHA512 370fafa7ca507589660cb9f025bfa154c7b351fa6f7f7cfbedf8b20b64a175bba78e7673b122443132b10e6214e503668efd98c79dd79ee45364b1f779ecd8f1
-DIST yarl-1.2.6.tar.gz 159816 BLAKE2B f8f8525aaf3471baffc1c9640a2b95f7d1a0b8607ccbae41ccfea5296a1a40968020282ca40d06e38ff04e448b43af1d7ead8703d618c6fdd520ed6581fd7077 SHA512 44384a11944808583139bf87846cd0080545efddb04be750d923e1b7dc8a4f88c3801b9e6fe742136298c79e60ac94e2584e3b39e42f002af4d6bd970896d3f2
 DIST yarl-1.3.0.tar.gz 159748 BLAKE2B cd7844545f3ee749d1dce865e21065c2b8e0c1ebf4715a3f8ec01064e534fa5b8b872539aece8a7e3a7ae147942ff5e0dc1878d84449d8248fd8e33c4234e3f1 SHA512 58e539900e7754b0a3d41960ebe20d21fd7245ce71fccb31d6a1204298dd71cacd742b2cb2b4c49c3a9b28ce5c664c412334f29e23a3c608aad8018142ba3e14
-EBUILD yarl-0.9.8-r1.ebuild 575 BLAKE2B b3de33eca0253af917c22c7d153a857d6f0fa5837deeee658beeb7288b5b05e5b06d29bb88c146de611df3d7661ab60e63901994675f07ee7c20ae35959ace7e SHA512 e36b67454bcad531320ac6f84a822336d8fcbcd7a900b0e2ecaa8fe0debe2fb8d163a56ec21341030c65e0394f4b7ecd7f0587d2b696f5d558c1bef36903f7fe
 EBUILD yarl-1.1.1.ebuild 657 BLAKE2B f7abb81199d7e405cc6e5f4c19ca7cfbf7404e15d05847af28fd18999af46bbf137ba9b231decc8412f5c7325009d87e65bd5ec96d7377f38b798efa11351f7f SHA512 0a1fc1cde43da587a4dde229fa21b821c2366b66cd5da25b930807a8d72ea2fac4ee165ab768fdb4f31b74757125d843045693efd1bd7147ee2701a9b8f082d1
-EBUILD yarl-1.2.4.ebuild 659 BLAKE2B 5963ec86867e21a71048047e1a9c4ed3b3c3bf69fdad2be38df553d9fa4cead4efedbcae1636a117374c8724f6d1e67f10ed010194e7dc874967c6276f5a411c SHA512 a7252fbbd5db26efcb89ee149143a21d045e28c7f910b2859a414dd0e3125b8dc95bd1bffc2b6e85388e0412919ee1dd67714e4f00242f89ccb3b1b8930f33e8
-EBUILD yarl-1.2.6.ebuild 659 BLAKE2B 5963ec86867e21a71048047e1a9c4ed3b3c3bf69fdad2be38df553d9fa4cead4efedbcae1636a117374c8724f6d1e67f10ed010194e7dc874967c6276f5a411c SHA512 a7252fbbd5db26efcb89ee149143a21d045e28c7f910b2859a414dd0e3125b8dc95bd1bffc2b6e85388e0412919ee1dd67714e4f00242f89ccb3b1b8930f33e8
 EBUILD yarl-1.3.0.ebuild 806 BLAKE2B 99db9e22a2f6f9868641ee1a9862c38fdf76f1941d3bd18b0d342b4779ab8e36bbd164c7f7bcb5b2cbe13420bcdb9cb4cf94c10fb58c0e998d627402908d8937 SHA512 e4280ae0c5559cc5589f747d936802b442ee3ce01f47897bfc1059b99c5df792002acae9ccc77d5749271dfce605f62623939f3161d3b1b020a4c7115afb38c9
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-0.9.8-r1.ebuild b/dev-python/yarl/yarl-0.9.8-r1.ebuild
deleted file mode 100644
index 1b6af5976db9..000000000000
--- a/dev-python/yarl/yarl-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/multidict[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-runner[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/yarl/yarl-1.2.4.ebuild b/dev-python/yarl/yarl-1.2.4.ebuild
deleted file mode 100644
index e713f0324344..000000000000
--- a/dev-python/yarl/yarl-1.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/yarl/yarl-1.2.6.ebuild b/dev-python/yarl/yarl-1.2.6.ebuild
deleted file mode 100644
index e713f0324344..000000000000
--- a/dev-python/yarl/yarl-1.2.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/yenc/Manifest b/dev-python/yenc/Manifest
deleted file mode 100644
index 3737f1bdf06c..000000000000
--- a/dev-python/yenc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX yenc-remove-cflags.patch 489 BLAKE2B dd747efc818c43267a5b518ed237aedbe75f82f629dc67e7db496a19e9821e166b187c98a08f383350c34dfbcb7126113c43fff64130cce808c19d2551b9b8e2 SHA512 ab8d6522fd7355a1d9680126faec3a8588e1766c9ab4d46eced70f0f6db7482b1994e05d61d7246b4cc08dfa64a0aa88e85edda8a00efb0f3d95e92edbde37cc
-DIST yenc-0.4.0.tar.gz 63156 BLAKE2B 1f33aa66cda2646ac8bfcfd94f9ab904defd3e712ac450a961cc73a56ca2c887eb834f20ade6b9a711110a4c58c42171f4891182175813f317239456eb1e29d1 SHA512 06adf10daa3eb56d1960e48c4a42c432821b8c25fcf6c703560efb9d902dc7619b79509a409f436790506f12f172fe0f0c6c1bf6bff7ab5ce3856b272c62c4d9
-EBUILD yenc-0.4.0-r1.ebuild 586 BLAKE2B e15c0f22cc8903cbecbdea62daf75930df1917b7b896b75bcca739a4a7063e28c440f07d738bd111fec9534435ba988f16d42be705e21d9bdd52066ddf44b703 SHA512 66156b7aac333c691f09583ba1d4df118ec6eaa717f3d6728dea293d992f866f6d9ce23f1059130f464109ad8a028736ad67dd6e773c94931498bf20239f4e69
-MISC metadata.xml 220 BLAKE2B 59eda2baee6ffd0773806bfb555f2784ba2f8954133a6339cb3d3d6fe1360178bd789d0875262ea7904a299cf0bf36e9795264f42d7319463488375ad9cbade3 SHA512 878b4526d51f7901900ec97fb85bb90e0d1099d29bc8e49dd7cea6258da0737e71aec3377f1bc2621cf96fcf7c5699e424bbc5fb721af2f365742725612fe50d
diff --git a/dev-python/yenc/files/yenc-remove-cflags.patch b/dev-python/yenc/files/yenc-remove-cflags.patch
deleted file mode 100644
index 27721c727db3..000000000000
--- a/dev-python/yenc/files/yenc-remove-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py	2011-09-06 09:04:33.000000000 +0200
-+++ setup.py.NEW	2012-07-07 15:33:13.295906002 +0200
-@@ -33,7 +33,7 @@
-         platforms        = ["Unix"],
- 	package_dir	 = { '': 'lib' },
- 	py_modules	 = ["yenc"],
--	ext_modules	 = [Extension("_yenc",["src/_yenc.c"],extra_compile_args=["-O2","-g"])],
-+	ext_modules	 = [Extension("_yenc",["src/_yenc.c"])],
-         classifiers      = [
-             "Programming Language :: Python",
-             "Programming Language :: Python :: 2.5",
diff --git a/dev-python/yenc/yenc-0.4.0-r1.ebuild b/dev-python/yenc/yenc-0.4.0-r1.ebuild
deleted file mode 100644
index bd25cb3982c7..000000000000
--- a/dev-python/yenc/yenc-0.4.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="Module providing raw yEnc encoding/decoding"
-HOMEPAGE="http://www.golug.it/yenc.html"
-SRC_URI="http://www.golug.it/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Remove forced CFLAG on setup.py
-PATCHES=( "${FILESDIR}"/${PN}-remove-cflags.patch )
-DOCS=( README TODO CHANGES doc/${PN}-draft.1.3.txt )
-
-python_test() {
-	"${PYTHON}" test/test.py || die "Test failed."
-}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index b50759cdc25b..8d6c51964c90 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,5 +1,5 @@
-DIST zipp-0.5.1.tar.gz 10763 BLAKE2B 4f70d6ed94203d4b9fb9127930a07797c3cbfa023e0cd472e9d3a18e1877619dbefee654cd0364592a594b6e9e0aabc813e0560695bb18f8e3a64cb4ce76f0e2 SHA512 d4486ae98159677cd481cddb3bd00d5d2237dc94f0f3129b03994800b0e136c12b05e02d2ca7d628043dabce323f34dd919b9ba731549656802527abdcfea120
 DIST zipp-0.5.2.tar.gz 10875 BLAKE2B 97e56b8e1cbff2344ee6b385085e6c821d61bd2c2510ac54e50a3f706515f1e22789168c97599787787b47f09dabe55abb594f5724d1d540f62d8d68fc32e36f SHA512 8c84b620844315ab1f1aa3c5bb29dcdf1271a0139198b5c3d6aa31ecb9a86f0dcef963819403d971ae0461c737312c064572c57ecf32d73dc973a5f69cf0375c
-EBUILD zipp-0.5.1.ebuild 1045 BLAKE2B ba2452da28b41fdc3d8ed0db560f149fe77a4839a556fb8114d13490e51ac6a087665f427029585bb7877003d1fdcd53d9997a5250000f840f06643437cb2621 SHA512 ebdcdfeffddb439985b144ae72c3738d08503e400526cd7f3ce1ee4ee9ad29429904df5d5df3d42807b67c28f51eebe6e66cc2232ca90854fb35f97a3b802016
+DIST zipp-0.6.0.tar.gz 10778 BLAKE2B 165ae85f51fe0c0232f6cf2dde70e2d7f8064413c15616d15e1ebd65cfe3c345bbd5b1b9713fa1171cad18015b605862509790bedd734edf5a7d8c80c5378af3 SHA512 18bef5aa3388ab3901bf08888127fc9cc17d8972a52f23ccf9a8035f09ee5598e17ddff833a10b81b2118461e0c517e88413518736763425a728cd0b19cc2052
 EBUILD zipp-0.5.2.ebuild 1107 BLAKE2B c79bf6753de8cfbfaf3ff0e54ced1763d5594915211d2cedb95f3d25c605399ba65f1ce25ea0b9d2816dd71e0ba31d802f978dc3ce12da67c4cb93df91b3db7a SHA512 addadf9afc87bdd8c52c0407e42a4821628170cb1b7b06284ad72f0cf53735f1e48e3460bd2d88550aa241a41735ce75cd4f42eceda0364b8c6cc0a8f1d2b2be
+EBUILD zipp-0.6.0.ebuild 1174 BLAKE2B 1f4c65171e70f0f563177cf3ff3e18be0c2ba0a358bfc4893c48509522ed9ab10996334cf7bfb9cd0484cf9fb702ac788aee150648d79639e8223bb4cc0e0592 SHA512 f5bb949a6868e70885d88ef7592c24fa04ac20de019d1dbba5c1e85f31940c7d2625d706e75d80aa8b503405f5c4db4f433cef5654f9a256609ddb0dd8482e5f
 MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
diff --git a/dev-python/zipp/zipp-0.5.1.ebuild b/dev-python/zipp/zipp-0.6.0.ebuild
index 2d0e62d3d6e3..46f6ff270793 100644
--- a/dev-python/zipp/zipp-0.5.1.ebuild
+++ b/dev-python/zipp/zipp-0.6.0.ebuild
@@ -13,13 +13,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
 
+RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	test? (
+		${RDEPEND}
 		dev-python/contextlib2[${PYTHON_USEDEP}]
 		dev-python/pathlib2[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
commit	f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree	a38046712bbc3a3844d77452d16c84e716caa3d4 /dev-python
parent	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)